From 3e9a3948b0fe3a892b1f3b51ee7cd3b2b3335d54 Mon Sep 17 00:00:00 2001 From: calvin Date: Fri, 4 Aug 2023 17:14:45 -0600 Subject: [PATCH 1/4] fix: [code-706]: fix refetch --- .../PullRequest/Conversation/Conversation.tsx | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/web/src/pages/PullRequest/Conversation/Conversation.tsx b/web/src/pages/PullRequest/Conversation/Conversation.tsx index e5430e869..0ae24ab55 100644 --- a/web/src/pages/PullRequest/Conversation/Conversation.tsx +++ b/web/src/pages/PullRequest/Conversation/Conversation.tsx @@ -51,7 +51,8 @@ export const Conversation: React.FC = ({ }) const showSpinner = useMemo(() => loading && !activities, [loading, activities]) const { data: reviewers, refetch: refetchReviewers } = useGet({ - path: `/api/v1/repos/${repoMetadata.path}/+/pullreq/${pullRequestMetadata.number}/reviewers` + path: `/api/v1/repos/${repoMetadata.path}/+/pullreq/${pullRequestMetadata.number}/reviewers`, + debounce: 1000 }) const { showError } = useToaster() const [dateOrderSort, setDateOrderSort] = useState(orderSortDate.ASC) @@ -133,7 +134,7 @@ export const Conversation: React.FC = ({ if (prHasChanged) { refetchActivities() } - }, [prHasChanged, refetchActivities]) + }, [prHasChanged, refetchActivities, refetchReviewers]) return ( @@ -349,14 +350,13 @@ export const Conversation: React.FC = ({ /> - {repoMetadata ? ( - - ) : null} + + From fbc3705b4e1fd0e49e801368ad8415d8efed12ca Mon Sep 17 00:00:00 2001 From: calvin Date: Fri, 4 Aug 2023 17:46:05 -0600 Subject: [PATCH 2/4] fix: [code-706]: fix refetch --- .../components/ReviewerSelect/ReviewerSelect.module.scss | 8 ++++++++ .../ReviewerSelect/ReviewerSelect.module.scss.d.ts | 2 ++ web/src/components/ReviewerSelect/ReviewerSelect.tsx | 3 ++- web/src/pages/PullRequest/Conversation/Conversation.tsx | 2 +- 4 files changed, 13 insertions(+), 2 deletions(-) diff --git a/web/src/components/ReviewerSelect/ReviewerSelect.module.scss b/web/src/components/ReviewerSelect/ReviewerSelect.module.scss index 7d2fec5d0..b96c62576 100644 --- a/web/src/components/ReviewerSelect/ReviewerSelect.module.scss +++ b/web/src/components/ReviewerSelect/ReviewerSelect.module.scss @@ -57,9 +57,17 @@ min-height: 50px; max-height: 300px; overflow-y: auto; + + .menuItem:hover { + background: var(--primary-5); + } } .newBtnText { font-weight: normal; } } + +.avatar { + padding: var(--spacing-small) 0; +} diff --git a/web/src/components/ReviewerSelect/ReviewerSelect.module.scss.d.ts b/web/src/components/ReviewerSelect/ReviewerSelect.module.scss.d.ts index 79b872fb6..edc2bdacd 100644 --- a/web/src/components/ReviewerSelect/ReviewerSelect.module.scss.d.ts +++ b/web/src/components/ReviewerSelect/ReviewerSelect.module.scss.d.ts @@ -9,6 +9,8 @@ declare const styles: { readonly branchesOnly: string readonly popover: string readonly listContainer: string + readonly menuItem: string readonly newBtnText: string + readonly avatar: string } export default styles diff --git a/web/src/components/ReviewerSelect/ReviewerSelect.tsx b/web/src/components/ReviewerSelect/ReviewerSelect.tsx index 3160c6f8a..8a43114f6 100644 --- a/web/src/components/ReviewerSelect/ReviewerSelect.tsx +++ b/web/src/components/ReviewerSelect/ReviewerSelect.tsx @@ -159,9 +159,10 @@ function GitRefList({ {data.map(({ display_name, email, id }) => ( - + diff --git a/web/src/pages/PullRequest/Conversation/Conversation.tsx b/web/src/pages/PullRequest/Conversation/Conversation.tsx index 0ae24ab55..870c90f21 100644 --- a/web/src/pages/PullRequest/Conversation/Conversation.tsx +++ b/web/src/pages/PullRequest/Conversation/Conversation.tsx @@ -52,7 +52,7 @@ export const Conversation: React.FC = ({ const showSpinner = useMemo(() => loading && !activities, [loading, activities]) const { data: reviewers, refetch: refetchReviewers } = useGet({ path: `/api/v1/repos/${repoMetadata.path}/+/pullreq/${pullRequestMetadata.number}/reviewers`, - debounce: 1000 + debounce: 500 }) const { showError } = useToaster() const [dateOrderSort, setDateOrderSort] = useState(orderSortDate.ASC) From 488ef6096630117c9aef8fd8f570279d7e7b397d Mon Sep 17 00:00:00 2001 From: calvin Date: Fri, 4 Aug 2023 18:28:46 -0600 Subject: [PATCH 3/4] fix: [code-706]: fix ui issues on reviewer dropdown --- .../components/ReviewerSelect/ReviewerSelect.module.scss | 9 ++++++++- .../ReviewerSelect/ReviewerSelect.module.scss.d.ts | 2 ++ web/src/components/ReviewerSelect/ReviewerSelect.tsx | 4 ++-- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/web/src/components/ReviewerSelect/ReviewerSelect.module.scss b/web/src/components/ReviewerSelect/ReviewerSelect.module.scss index b96c62576..778ef8f30 100644 --- a/web/src/components/ReviewerSelect/ReviewerSelect.module.scss +++ b/web/src/components/ReviewerSelect/ReviewerSelect.module.scss @@ -15,6 +15,11 @@ font-weight: normal; } } +.layout { + > .TextInput--main { + margin-bottom: var(--spacing-1) !important; + } +} .main { .input { @@ -59,7 +64,9 @@ overflow-y: auto; .menuItem:hover { - background: var(--primary-5); + background: unset; + border: 1px solid var(--primary-7); + border-radius: 4px; } } diff --git a/web/src/components/ReviewerSelect/ReviewerSelect.module.scss.d.ts b/web/src/components/ReviewerSelect/ReviewerSelect.module.scss.d.ts index edc2bdacd..58aba4be3 100644 --- a/web/src/components/ReviewerSelect/ReviewerSelect.module.scss.d.ts +++ b/web/src/components/ReviewerSelect/ReviewerSelect.module.scss.d.ts @@ -3,6 +3,8 @@ declare const styles: { readonly button: string readonly prefix: string + readonly layout: string + readonly textInputMain: string readonly main: string readonly input: string readonly tabContainer: string diff --git a/web/src/components/ReviewerSelect/ReviewerSelect.tsx b/web/src/components/ReviewerSelect/ReviewerSelect.tsx index 8a43114f6..9b684dcd7 100644 --- a/web/src/components/ReviewerSelect/ReviewerSelect.tsx +++ b/web/src/components/ReviewerSelect/ReviewerSelect.tsx @@ -88,7 +88,7 @@ const PopoverContent: React.FC = ({ repoMetadata, gitRef, o return ( - + (inputRef.current = ref)} @@ -154,7 +154,7 @@ function GitRefList({ )} {!!data?.length && ( - + {data.map(({ display_name, email, id }) => ( Date: Fri, 4 Aug 2023 18:39:48 -0600 Subject: [PATCH 4/4] fix: [code-706]: fix color of hover --- web/src/components/ReviewerSelect/ReviewerSelect.module.scss | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/web/src/components/ReviewerSelect/ReviewerSelect.module.scss b/web/src/components/ReviewerSelect/ReviewerSelect.module.scss index 778ef8f30..687f365bc 100644 --- a/web/src/components/ReviewerSelect/ReviewerSelect.module.scss +++ b/web/src/components/ReviewerSelect/ReviewerSelect.module.scss @@ -64,8 +64,7 @@ overflow-y: auto; .menuItem:hover { - background: unset; - border: 1px solid var(--primary-7); + background: rgba(0, 146, 228, 0.0392156863) !important; border-radius: 4px; } }