feat(jira-server): Save and allow to reuse recent search queries in the scope phase of poker meeting for JiraServer #6551

igorlesnenko · 2022-05-12T16:22:55Z

Fixes: #5820

This PR introduces a new PostgreSQL table and new mutaton for storing integrations search queries.

Recent Jira Server search queries are now automatically saved

Also see the next issue with suggeted improvements: #6567

How to test:

Create a poker Meeting with Jira Server integration connected
On a Jira Server tab:
Enter any search string and pick any found issue, see the search query was saved in the dropdown menu.
Select any project in the project filter menu, enter any search string and pick any found issue, see the search query was saved in the dropdown menu.
Clear the search query and the project filter, select both previous saved queries, see that they were executed correctly
Remove queries, see they were removed correctly

…er-persist-search

igorlesnenko · 2022-05-18T12:23:13Z

packages/client/mutations/PersistJiraServerSearchQueryMutation.ts

+    $providerId: Int
+    $jiraServerSearchQuery: JiraServerSearchQueryInput
+  ) {
+    persistIntegrationSearchQuery(


We still need to wrap the generic mutation in an individual one on a frontend to request the specific integration response above. An issue with the suggestion to improve: #6567

igorlesnenko · 2022-05-18T12:27:56Z

packages/client/mutations/PersistJiraServerSearchQueryMutation.ts

+    $teamId: ID!
+    $service: IntegrationProviderServiceEnum!
+    $providerId: Int
+    $jiraServerSearchQuery: JiraServerSearchQueryInput


There is currently no way to accept union as input, so we need to define individual fields for each integration like we do for add integration provider mutation.
An alternative approach is to use JSON type, but it will require additional validation on the backend.
Later we will be able to use oneof as soon as it will be released in graphql

For oneof you would need to group all input union types into one input object and just add the directive. All it does is adding server side verification. We can already arrange the types in this form and we could also implement the directive now if you feel it's worth it.

oneof feels cleaner, as we do not need to pass service, however I think it is ok as is for now

igorlesnenko · 2022-05-18T12:33:47Z

packages/client/mutations/RemoveJiraServerSearchQueryMutation.ts

+
+const mutation = graphql`
+  mutation RemoveJiraServerSearchQueryMutation($id: ID!, $teamId: ID!) {
+    removeIntegrationSearchQuery(id: $id, teamId: $teamId) {


We still need to wrap the generic mutation in an individual one on a frontend to request the specific integration response above. An issue with the suggestion to improve: #6567

igorlesnenko · 2022-05-18T12:56:15Z

packages/server/graphql/public/mutations/persistIntegrationSearchQuery.ts

+    ) {
+      return {error: {message: `Provider does not exists`}}
+    }
+    await upsertIntegrationSearchQueryWithProviderId({


We need to define two separate SQL queries to correctly handle ON CONFLICT with nullable providerId field

Now we handle uniqueness and sorting on PostgreSQL side, instead of doing that manually in code

igorlesnenko · 2022-05-18T13:04:18Z

packages/server/graphql/types/JiraServerIntegration.ts

+          return null
+        }
+
+        const searchQueries = await getLatestIntegrationSearchQueriesWithProviderId({


Two separate SQL queries to be able to request AND providerId IS null

packages/server/postgres/queries/src/getLatestIntegrationSearchQueriesWithProviderIdQuery.sql

…er-persist-search

Dschoordsch

Only looked at the DB part yet. I don't see why we need two separate kinds of queries and indexes. Even with allowing null for "providerId" that's just another value.

packages/server/postgres/migrations/1652861495447_addIntegrationSearchQuery.ts

...es/server/postgres/queries/generated/getLatestIntegrationSearchQueriesWithProviderIdQuery.ts

packages/server/postgres/queries/getLatestIntegrationSearchQueriesWithProviderId.ts

Dschoordsch · 2022-05-20T10:05:12Z

Let's get a reviewer review in first, @nickoferrall could you please take a look?

nickoferrall

This looks great! I've tested it and everything is working. One tiny issue is when removing a saved query, it currently takes the user to that query. Instead, I think it should just remove the saved query and not alter the current search.

packages/client/components/JiraServerScopingSearchResults.tsx

packages/client/mutations/PersistJiraServerSearchQueryMutation.ts

packages/server/graphql/public/mutations/persistIntegrationSearchQuery.ts

packages/server/graphql/types/JiraServerIntegration.ts

packages/client/components/ScopingSearchHistoryMenu.tsx

packages/server/graphql/public/mutations/persistIntegrationSearchQuery.ts

packages/server/postgres/queries/src/upsertIntegrationSearchQueryWithProviderIdQuery.sql

packages/server/postgres/queries/src/upsertIntegrationSearchQueryQuery.sql

Dschoordsch · 2022-05-20T05:22:11Z

packages/server/postgres/queries/src/removeIntegrationSearchQueryQuery.sql

+  @name removeIntegrationSearchQueryQuery
+*/
+DELETE FROM "IntegrationSearchQuery"
+WHERE "id" = :id AND "userId" = :userId AND "teamId" = :teamId;


+1 Why do we need "userId" and "teamId" here if "id" is already the primary key?

@Dschoordsch I added this as a validation, to not fetch IntegrationQuery first and manually check userId and teamId.

Could you leave a comment so it's clear for the next one?

Added a comment

packages/client/components/JiraUniversalScopingSearchHistoryToggle.tsx

packages/client/components/JiraServerScopingSearchResults.tsx

packages/server/graphql/types/JiraServerIntegration.ts

Dschoordsch · 2022-05-25T11:24:05Z

packages/server/graphql/types/JiraServerIntegration.ts

+          return ''
+        }
+
+        return `jiraServer:${auth.providerId}`


-2 The id is not unique, a user can have the same provider for multiple teams, each team has a different auth. Thus you need to use jiraServer:${auth}.id here.

The main issue here is that we're mixing the providers (which are per team and should be non-null) with the auth (which is per team member and should be nullable). So what we really should do is:

make JiraServerIntegration nullable (also GitLab, AzureDevOps, MSTeams, ...)

move IntegrationProvider fields to Team object.

No need to do it in this change, but we should address that.

@Dschoordsch

a user can have the same provider for multiple teams

So in future provider will be added to the whole organisation?
Currently, I see that we have teamId column in the IntegrationProvider table.
Can we have IntegrationProviderTeam table with id | providerId | teamId columns?

auth object does not have id. Made it like this:

return `jiraServer:${teamId}:${auth.providerId}

That's the current state, each "IntegrationProvider" has scope "org" or "team". Right now the organization is derived from the team, but we may store it separately at some point #6014

Dschoordsch · 2022-05-25T11:34:05Z

packages/server/graphql/types/JiraServerIntegration.ts

+          }
+
+          return {
+            id: searchQuery.id,


-1 This will not be unique, so we need to prefix it. There is already SearchQueryId.join but that's Meeting specific.

@Dschoordsch pushed a commit that uses toGlobalId and fromGlobalId from graphql-relay package. I think this way we can avoid creating a new function every time. What do you think?

The issue with the proposal #6642

Dschoordsch · 2022-05-25T11:48:28Z

packages/server/graphql/public/types/RemoveIntegrationSearchQuerySuccess.ts

+    source: RemoveIntegrationSearchQuerySuccessSource
+  ) => RemoveIntegrationSearchQuerySuccessSource
+} = {
+  jiraServerIntegration: (source) => {


+1 did you test this resolver is actually necessary? Also you would usually import the generated types here

const RemoveIntegrationSearchQuerySuccess: RemoveIntegrationSearchQuerySuccessResolvers = {

You might need to define the JiraServerIntegration source properly though.

@Dschoordsch Does not work for me without this resolver, jiraServerIntegration returned as `null.

Picking generated type RemoveIntegrationSearchQuerySuccessResolvers does not work in this case as I need to just forward plain source here, not actually resolve.

* feat(jira-server): Add pagination of results in sprint poker * Tweak comments

…er-persist-search

…rabol into jira-server-persist-search

packages/server/graphql/types/JiraServerIntegration.ts

vercel · 2022-05-31T10:17:04Z

The latest updates on your projects. Learn more about Vercel for Git ↗︎

Name	Status	Preview	Updated
parabol	❌ Failed (Inspect)		May 31, 2022 at 10:19AM (UTC)

igorlesnenko added 2 commits May 12, 2022 20:21

feat(jira-server): persist search query

92cfc9e

Remove search query mutation

b4a2a85

igorlesnenko changed the title ~~feat(jira-server): persist search query~~ feat(jira-server): Automatically save search queries for JiraS erver in the scope phase of poker meeting May 17, 2022

igorlesnenko changed the title ~~feat(jira-server): Automatically save search queries for JiraS erver in the scope phase of poker meeting~~ feat(jira-server): Automatically save search queries for JiraServer in the scope phase of poker meeting May 17, 2022

igorlesnenko changed the title ~~feat(jira-server): Automatically save search queries for JiraServer in the scope phase of poker meeting~~ feat(jira-server): Save and list recent search queries for JiraServer in the scope phase of poker meeting May 17, 2022

igorlesnenko changed the title ~~feat(jira-server): Save and list recent search queries for JiraServer in the scope phase of poker meeting~~ feat(jira-server): Save and show recent search queries for JiraServer in the scope phase of poker meeting May 17, 2022

igorlesnenko changed the title ~~feat(jira-server): Save and show recent search queries for JiraServer in the scope phase of poker meeting~~ feat(jira-server): Save and allow to reuse recent search queries in the scope phase of poker meeting for JiraServer May 17, 2022

igorlesnenko added 2 commits May 18, 2022 12:18

Merge branch 'master' of github.com:ParabolInc/parabol into jira-serv…

274bd82

…er-persist-search

Fix project filter name display

4b746b9

igorlesnenko marked this pull request as ready for review May 18, 2022 12:14

Clean

0cabd42

igorlesnenko commented May 18, 2022

View reviewed changes

igorlesnenko requested a review from Dschoordsch May 18, 2022 13:17

Merge branch 'master' of github.com:ParabolInc/parabol into jira-serv…

643a4d7

…er-persist-search

Dschoordsch requested changes May 19, 2022

View reviewed changes

igorlesnenko added 3 commits May 19, 2022 13:27

Fix

e9741e8

Use single query

0e5ba81

updatedAt trigger

901dff8

igorlesnenko requested a review from Dschoordsch May 19, 2022 13:39

Dschoordsch requested a review from nickoferrall May 20, 2022 10:04

Dschoordsch requested review from Dschoordsch and removed request for Dschoordsch May 20, 2022 10:05

nickoferrall requested changes May 23, 2022

View reviewed changes

igorlesnenko added 4 commits May 24, 2022 15:40

Fix delete selecting a query

6eb7d3d

code style

733fb60

Fix potential undefined in id

56dc53f

Specify query type

d2741e8

igorlesnenko requested a review from nickoferrall May 24, 2022 13:20

nickoferrall approved these changes May 24, 2022

View reviewed changes

Dschoordsch requested changes May 25, 2022

View reviewed changes

igorlesnenko added 11 commits May 25, 2022 20:57

Nullable ids

b6a9df5

feat(jira-server): Add pagination of results in sprint poker (#6607)

e5d7a8b

* feat(jira-server): Add pagination of results in sprint poker * Tweak comments

Merge branch 'master' of github.com:ParabolInc/parabol into jira-serv…

d3ee341

…er-persist-search

JiraProjectId.split

7d1499b

Tweak persistQuery

f7d8e64

removeIntegrationSearchQuery

ccdaebc

Merge branch 'jira-server-persist-search' of github.com:ParabolInc/pa…

e1b9bed

…rabol into jira-server-persist-search

Add a comment to removeIntegrationSearchQueryQuery

f4565f9

Use fromGlobalId and toGlobalId

c80e548

providerId ID

e8a5d34

Tweak jira server integration id

7ec5dd3

igorlesnenko requested a review from Dschoordsch May 30, 2022 18:43

Dschoordsch approved these changes May 31, 2022

View reviewed changes

packages/server/graphql/types/JiraServerIntegration.ts Outdated Show resolved Hide resolved

Use globalIdField

988b412

vercel bot had a problem deploying to Preview May 31, 2022 10:19 Failure

igorlesnenko merged commit 018ab70 into master May 31, 2022

igorlesnenko deleted the jira-server-persist-search branch May 31, 2022 10:32

github-actions bot mentioned this pull request Sep 26, 2022

chore: release v6.75.1 #7229

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat(jira-server): Save and allow to reuse recent search queries in the scope phase of poker meeting for JiraServer #6551

feat(jira-server): Save and allow to reuse recent search queries in the scope phase of poker meeting for JiraServer #6551

igorlesnenko commented May 12, 2022 •

edited

Loading

igorlesnenko May 18, 2022

igorlesnenko May 18, 2022

Dschoordsch May 25, 2022

igorlesnenko May 30, 2022

igorlesnenko May 18, 2022

igorlesnenko May 18, 2022

igorlesnenko May 18, 2022

igorlesnenko May 18, 2022

Dschoordsch left a comment

Dschoordsch commented May 20, 2022

nickoferrall left a comment

Dschoordsch May 20, 2022

igorlesnenko May 30, 2022

Dschoordsch May 30, 2022

igorlesnenko May 30, 2022

Dschoordsch May 25, 2022

igorlesnenko May 30, 2022 •

edited

Loading

igorlesnenko May 30, 2022 •

edited

Loading

Dschoordsch May 30, 2022 •

edited

Loading

Dschoordsch May 25, 2022

igorlesnenko May 30, 2022 •

edited

Loading

igorlesnenko May 30, 2022

Dschoordsch May 25, 2022

igorlesnenko May 30, 2022 •

edited

Loading

vercel bot commented May 31, 2022 •

edited

Loading

feat(jira-server): Save and allow to reuse recent search queries in the scope phase of poker meeting for JiraServer #6551

feat(jira-server): Save and allow to reuse recent search queries in the scope phase of poker meeting for JiraServer #6551

Conversation

igorlesnenko commented May 12, 2022 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Dschoordsch left a comment

Choose a reason for hiding this comment

Dschoordsch commented May 20, 2022

nickoferrall left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

igorlesnenko May 30, 2022 • edited Loading

Choose a reason for hiding this comment

igorlesnenko May 30, 2022 • edited Loading

Choose a reason for hiding this comment

Dschoordsch May 30, 2022 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

igorlesnenko May 30, 2022 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

igorlesnenko May 30, 2022 • edited Loading

Choose a reason for hiding this comment

vercel bot commented May 31, 2022 • edited Loading

igorlesnenko commented May 12, 2022 •

edited

Loading

igorlesnenko May 30, 2022 •

edited

Loading

igorlesnenko May 30, 2022 •

edited

Loading

Dschoordsch May 30, 2022 •

edited

Loading

igorlesnenko May 30, 2022 •

edited

Loading

igorlesnenko May 30, 2022 •

edited

Loading

vercel bot commented May 31, 2022 •

edited

Loading