feat(sprint-poker): Filter GitLab issues by project #6323

nickoferrall · 2022-03-31T15:17:43Z

Note: there is a bug as mentioned in the comment below, but the PR is accomplishing the AC of being able to filter issues by projects, so I think it's safe to move this to Reviewer Review.

…ctsFullPath

…er-gitlab

nickoferrall · 2022-03-31T16:24:25Z

Hey @mattkrick, the problem we discussed yesterday during our 1-1 is still causing trouble. After selecting one of the project filters in GitLabScopingSearchFilterMenu, the GitLabScopingSearchResults query successfully filters by the selected project. However, the GitLabScopingSearchFilterMenu query also filters even though no ids have been passed as an arg.

In the gif above, I'm using a network-only fetch policy. If I use a store-or-network policy, unselecting the selected project filter does not result in all menu options returning to the menu, i.e. there's still only one project in the menu.

I suspect the GitLab queries are being tangled up when they're stitched together. Georg came across a similar problem when reviewing one of my other PRs: #6321

nickoferrall · 2022-03-31T16:49:55Z

packages/client/components/GitLabScopingSearchResults.tsx

@@ -126,7 +129,6 @@ const GitLabScopingSearchResults = (props: Props) => {
    query
  )

-  const lastItem = useLoadNextOnScrollBottom(paginationRes, {}, 20)


Scrolling to the bottom of the page when the projects query contains a projectsIds causes an infinite loop. I spent time digging into this, but as we're refactoring this query in #6325 and as the user can still find the desired issue using the search & filter menu, I think it's safe to remove for now.

nickoferrall · 2022-03-31T16:54:06Z

packages/client/components/GitLabScopingSearchFilterMenu.tsx

+            label={
+              <StyledMenuItemLabel>
+                <StyledCheckBox active={isSelected} />
+                <TypeAheadLabel query={searchQuery} label={fullPath} />


In GitLab, a project can have subprojects. In the Parabol1 repo, we have several projects that contain several subprojects. So, if we show the name of the project in the filter menu, there can be several projects that have the same name. In Parabol1, we have many subprojects called ppmi, for example. To differentiate between projects, I think it's best to use fullPath instead of name in the menu.

mattkrick · 2022-03-31T21:49:28Z

to fix the search thing, just use search: "" on the search filter args list to tell relay it's a totally different query.
loom: https://www.loom.com/share/33c450c0c9394aab8765f6d0ce009636

… in project connection so we can add issues with a filter

igorlesnenko · 2022-04-05T11:59:19Z

packages/client/components/GitLabScopingSearchResults.tsx

@@ -53,7 +56,7 @@ const GitLabScopingSearchResults = (props: Props) => {
    graphql`
      fragment GitLabScopingSearchResults_query on Query
        @argumentDefinitions(
-          projectsFirst: {type: "Int", defaultValue: 20}
+          projectsFirst: {type: "Int", defaultValue: 75}


Is it safe to increase to that number?

In this discussion, we decided to have a large initial query where we grab many projects and their issues. We could reduce the default value to 50 if 75 feels too large?

This will ultimately get refactored in this issue: #6325

Yeah, I just remember we had this issue. If we have refactor issue, I think it is fine

igorlesnenko

Looks good to me. Just a couple of things.

We removed gitlabTypes.ts from Git but here we seem to be bringing it back
While testing various GitLab issues, I noticed that sometimes I need to reconnect GitLab. Usually, I open a list of issues and see it is empty but no error is displayed. Reconnecting GitLab fixes the issue for me. Feels like at some point GitLab token expires and we do not handle it. Is it a known issue?

nickoferrall · 2022-04-05T13:36:50Z

Great, thanks for the review. I've removed the GitLab types. I've also noticed GitLab needing to be reintegrated occasionally so I've created an issue to dig into this: #6343

mattkrick

-2 just 1 fatal edge case, everything else is pretty minor. great job!

mattkrick · 2022-04-06T23:41:12Z

packages/client/components/GitHubScopingSearchFilterMenu.tsx

@@ -26,6 +26,10 @@ const StyledCheckBox = styled(Checkbox)({
 })
 const StyledMenuItemLabel = styled(MenuItemLabel)({})

+const StyledMenu = styled(Menu)({
+  maxWidth: '100%'


+1 i tried commenting this out & it looked the same. any steps to reproduce the problem?

If a project fullPath is particularly long, it gets truncated without setting maxWidth to 100%.
Without maxWidth: '100%':

With maxWidth: '100%':

mattkrick · 2022-04-06T23:48:02Z

packages/client/components/GitLabScopingSearchResultsRoot.tsx

+  const {queryString, selectedProjectsIds} = gitlabSearchQuery!
+  const normalizedQueryString = queryString.trim()
+  const normalizedSelectedProjectsIds = selectedProjectsIds?.length
+    ? (selectedProjectsIds as string[])


+1 can remove casting, the end result can still be null

I think we have to keep the casting here because if we remove it, TS complains that normalizedSelectedProjectsIds can be readonly

mattkrick · 2022-04-06T23:49:55Z

packages/client/components/ScopePhaseArea.tsx

@@ -70,8 +70,7 @@ const ScopePhaseArea = (props: Props) => {
  const {meeting} = props
  const isDesktop = useBreakpoint(Breakpoint.SIDEBAR_LEFT)
  const {viewerMeetingMember} = meeting
-  if (!viewerMeetingMember) return null
-  const {user, teamMember} = viewerMeetingMember
+  const {user, teamMember} = viewerMeetingMember!


-2 what if a user visits a meeting that they didn't join while it was active?
if this is about a lint rule you can just add a comment to ignore that rule for this file

Yep, I was just trying to remove the lint rule. Change reverted 👍

packages/server/graphql/types/GitLabSearchQuery.ts

…filter-gitlab

mattkrick · 2022-04-19T00:46:17Z

LGTM!

* render list of gitlab issues * use usePaginationFragment * increase default value for usePaginationFragment * implement GitLabScopingSearchResultItem * add GitLabScopingSelectAllIssues * can add and remove gitlab issues in scope phase * add UpdatePokerScopeMutation gitlab optimistic updater * able to select all issues * clean up type errors * add projects name alias to rootSchema * include projectIds in search query * return iid from GitLabIssueId * sort projects by lastActivityAt * implement fetchGitLabProjects * implement gitlab issue menu * implement NewGitLabIssueMenuRoot instead of using useAllIntegrations * load next if projects dont have any issues * update comment * remove gitlab menu root and use defaultProjects query to populate menu * increase projectsFirst from 10 to 20 * query all gitlab projects * chore(comment): how to extend BaseTaskIntegration * able to create a new gitlab issue * use GitLabServerManager and implement parseWebPath * fix undefined baseUri * changed taskIntegrationGitLab and GitLabId to use providerId * lowercase gitlabRequest to be consistent with gh * add handle create gitlab issue * add info fragment and return data instead of data.issue * add serverBaseUrl * adjusted root schema and can now render projects in input menu again * clean up update poker scope and create task gitlab * fix ts errors * add gitlab query types * add fullPath to gitLab issue edge if exists * get nodes appearing on insert * get gitlab issue title in create task updater * include webUrl in createTask query so user can click on newly create issue url * add first and sort to allProjects query * rename GitLabRepo to GitLabProject * pass meetingId to issue input rather than querying it * add gitlab search query * filter by gitlab search query * refactor to hooks * remove __typename and resolveTypes * update UpdatePokerScopeMutation to fix selectAll bug * add search icon * remove searchQuery from scoping results query * clean-up return statement in fetchGitLabProjects * add search to issue args * include search string when adding new gitlab issue * refactor search query to a gql object * merge with master * use react-swipeable-views workaround * add _xGitLabProject resolver * merge with master * remove resolverTypes and gitlabTypes * map over tabs instead of contents * fix(gitlab): add proper client-side alias handling (#6361) * resolve to aliased fields * resolve to aliased fields * make poker input menu a dropdown and fix width * refactor baseTabs to include Component * create a single source of truth for gitlab issue args * remove refetchable from gitlab scoping results query * feat(sprint-poker): Filter GitLab issues by project (#6323) * query projects from project filter menu * render projects in filter menu * use fullPath in gitlab menu and adjust max width * refactor gitlab search query from string to object with projectIds * selecting a project in the filter menu adds the item to selectedProjectsFullPath * selecting a project filters the results * add search icon * remove alias * make selectedProjectIds nullable * remove useLoadNextOnScrollBottom and increase default projects first * fix selectedProjects type err * add search string to differentiate project menu query and include ids in project connection so we can add issues with a filter * remove gitlab types * add viewerMeetingMember check and remove selectedProjectsIds resolver * make selectedProjectsIds null if empty array Co-authored-by: Matt Krick <[email protected]> Co-authored-by: Matt Krick <[email protected]>

* render list of gitlab issues * use usePaginationFragment * increase default value for usePaginationFragment * implement GitLabScopingSearchResultItem * add GitLabScopingSelectAllIssues * can add and remove gitlab issues in scope phase * add UpdatePokerScopeMutation gitlab optimistic updater * able to select all issues * clean up type errors * add projects name alias to rootSchema * include projectIds in search query * return iid from GitLabIssueId * sort projects by lastActivityAt * implement fetchGitLabProjects * implement gitlab issue menu * implement NewGitLabIssueMenuRoot instead of using useAllIntegrations * load next if projects dont have any issues * update comment * remove gitlab menu root and use defaultProjects query to populate menu * increase projectsFirst from 10 to 20 * query all gitlab projects * chore(comment): how to extend BaseTaskIntegration * able to create a new gitlab issue * use GitLabServerManager and implement parseWebPath * fix undefined baseUri * changed taskIntegrationGitLab and GitLabId to use providerId * lowercase gitlabRequest to be consistent with gh * add handle create gitlab issue * add info fragment and return data instead of data.issue * add serverBaseUrl * adjusted root schema and can now render projects in input menu again * clean up update poker scope and create task gitlab * fix ts errors * add gitlab query types * add fullPath to gitLab issue edge if exists * get nodes appearing on insert * get gitlab issue title in create task updater * include webUrl in createTask query so user can click on newly create issue url * add first and sort to allProjects query * rename GitLabRepo to GitLabProject * pass meetingId to issue input rather than querying it * add gitlab search query * filter by gitlab search query * refactor to hooks * remove __typename and resolveTypes * update UpdatePokerScopeMutation to fix selectAll bug * add search icon * remove searchQuery from scoping results query * clean-up return statement in fetchGitLabProjects * add search to issue args * include search string when adding new gitlab issue * refactor search query to a gql object * merge with master * use react-swipeable-views workaround * add _xGitLabProject resolver * merge with master * remove resolverTypes and gitlabTypes * map over tabs instead of contents * fix(gitlab): add proper client-side alias handling (ParabolInc#6361) * resolve to aliased fields * resolve to aliased fields * make poker input menu a dropdown and fix width * refactor baseTabs to include Component * create a single source of truth for gitlab issue args * remove refetchable from gitlab scoping results query * feat(sprint-poker): Filter GitLab issues by project (ParabolInc#6323) * query projects from project filter menu * render projects in filter menu * use fullPath in gitlab menu and adjust max width * refactor gitlab search query from string to object with projectIds * selecting a project in the filter menu adds the item to selectedProjectsFullPath * selecting a project filters the results * add search icon * remove alias * make selectedProjectIds nullable * remove useLoadNextOnScrollBottom and increase default projects first * fix selectedProjects type err * add search string to differentiate project menu query and include ids in project connection so we can add issues with a filter * remove gitlab types * add viewerMeetingMember check and remove selectedProjectsIds resolver * make selectedProjectsIds null if empty array Co-authored-by: Matt Krick <[email protected]> Co-authored-by: Matt Krick <[email protected]>

nickoferrall added 12 commits March 28, 2022 17:24

query projects from project filter menu

85c0ba1

render projects in filter menu

6d9f8e7

use fullPath in gitlab menu and adjust max width

dfd3385

refactor gitlab search query from string to object with projectIds

b9afa63

selecting a project in the filter menu adds the item to selectedProje…

be34a9e

…ctsFullPath

selecting a project filters the results

17be732

add search icon

e5889e1

remove alias

ef51f23

make selectedProjectIds nullable

6749e72

Merge branch 'feat/6033/add-gitlab-issue' into feat/6046/project-filt…

a28f3e4

…er-gitlab

merge with search issues branch

0b4ac3f

remove useLoadNextOnScrollBottom and increase default projects first

2cf7ddd

nickoferrall changed the base branch from feat/6045/search-gitlab-issues to master March 31, 2022 15:55

fix selectedProjects type err

87f71fd

nickoferrall changed the base branch from master to feat/6045/search-gitlab-issues March 31, 2022 16:03

merge with search issues pr

8cb3ed4

nickoferrall commented Mar 31, 2022

View reviewed changes

nickoferrall requested a review from igorlesnenko March 31, 2022 16:57

Merge branch 'master' into feat/6046/project-filter-gitlab

204e3da

add search string to differentiate project menu query and include ids…

c106ffc

… in project connection so we can add issues with a filter

nickoferrall changed the base branch from feat/6045/search-gitlab-issues to master April 1, 2022 11:10

nickoferrall changed the base branch from master to feat/6045/search-gitlab-issues April 1, 2022 11:10

nickoferrall mentioned this pull request Apr 4, 2022

feat(sprint-poker): Search GitLab issues #6290

Merged

nickoferrall linked an issue Apr 4, 2022 that may be closed by this pull request

Sprint Poker: GitLab v1: Project filter menu #6046

Closed

6 tasks

fix merge conflicts

fe3381a

igorlesnenko reviewed Apr 5, 2022

View reviewed changes

remove gitlab types

5b43e8b

nickoferrall requested a review from igorlesnenko April 5, 2022 13:36

igorlesnenko approved these changes Apr 5, 2022

View reviewed changes

igorlesnenko requested a review from mattkrick April 5, 2022 14:36

mattkrick requested changes Apr 6, 2022

View reviewed changes

add viewerMeetingMember check and remove selectedProjectsIds resolver

3a7a3ef

nickoferrall requested a review from mattkrick April 7, 2022 11:47

nickoferrall added 4 commits April 7, 2022 16:54

fix merge conflicts

359ee30

make selectedProjectsIds null if empty array

41f2d9e

merge with master

2f63534

Merge branch 'feat/6045/search-gitlab-issues' into feat/6046/project-…

04442d0

…filter-gitlab

mattkrick merged commit 86f3b43 into feat/6045/search-gitlab-issues Apr 19, 2022

mattkrick deleted the feat/6046/project-filter-gitlab branch April 19, 2022 00:46

mattkrick mentioned this pull request Apr 19, 2022

Sprint Poker: GitLab v1: Project filter menu #6046

Closed

6 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat(sprint-poker): Filter GitLab issues by project #6323

feat(sprint-poker): Filter GitLab issues by project #6323

nickoferrall commented Mar 31, 2022 •

edited

Loading

nickoferrall commented Mar 31, 2022

nickoferrall Mar 31, 2022

nickoferrall Mar 31, 2022

mattkrick commented Mar 31, 2022

igorlesnenko Apr 5, 2022

nickoferrall Apr 5, 2022

igorlesnenko Apr 6, 2022

igorlesnenko left a comment

nickoferrall commented Apr 5, 2022

mattkrick left a comment

mattkrick Apr 6, 2022

nickoferrall Apr 7, 2022

mattkrick Apr 6, 2022

nickoferrall Apr 7, 2022

mattkrick Apr 6, 2022

nickoferrall Apr 7, 2022

mattkrick commented Apr 19, 2022

feat(sprint-poker): Filter GitLab issues by project #6323

feat(sprint-poker): Filter GitLab issues by project #6323

Conversation

nickoferrall commented Mar 31, 2022 • edited Loading

nickoferrall commented Mar 31, 2022

Choose a reason for hiding this comment

Choose a reason for hiding this comment

mattkrick commented Mar 31, 2022

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

igorlesnenko left a comment

Choose a reason for hiding this comment

nickoferrall commented Apr 5, 2022

mattkrick 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

Choose a reason for hiding this comment

mattkrick commented Apr 19, 2022

nickoferrall commented Mar 31, 2022 •

edited

Loading