From 1f5c7aa59d4ba8d6c167614a118f7e1352ada11c Mon Sep 17 00:00:00 2001 From: sirserg Date: Wed, 25 Sep 2024 20:49:41 +0300 Subject: [PATCH 1/3] feat: add check for initial load in use search filters hook gf-540 --- .../hooks/use-search-filters/use-search-filters.hook.ts | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/apps/frontend/src/libs/hooks/use-search-filters/use-search-filters.hook.ts b/apps/frontend/src/libs/hooks/use-search-filters/use-search-filters.hook.ts index 48ad95fb..c2f59aaa 100644 --- a/apps/frontend/src/libs/hooks/use-search-filters/use-search-filters.hook.ts +++ b/apps/frontend/src/libs/hooks/use-search-filters/use-search-filters.hook.ts @@ -20,7 +20,15 @@ const useSearchFilters = ({ : ""; const [search, setSearch] = useState(searchParameter); + const [isInitialLoad, setIsInitialLoad] = useState(true); + useEffect(() => { + if (isInitialLoad) { + setIsInitialLoad(false); + + return; + } + if (isSavedToUrl) { const updatedSearchParameters = new URLSearchParams(searchParameters); updatedSearchParameters.set(queryParameterName, search); From db35237dfb9aacd3092a3c5459314a682876d6ca Mon Sep 17 00:00:00 2001 From: sirserg Date: Thu, 26 Sep 2024 18:38:22 +0300 Subject: [PATCH 2/3] feat: add contributor name search preselected on redirection gf-540 --- .../libs/components/contributor-card/contributor-card.tsx | 1 + 1 file changed, 1 insertion(+) diff --git a/apps/frontend/src/pages/project/libs/components/contributor-card/contributor-card.tsx b/apps/frontend/src/pages/project/libs/components/contributor-card/contributor-card.tsx index f365455d..01d49837 100644 --- a/apps/frontend/src/pages/project/libs/components/contributor-card/contributor-card.tsx +++ b/apps/frontend/src/pages/project/libs/components/contributor-card/contributor-card.tsx @@ -47,6 +47,7 @@ const ContributorCard = ({ }: Properties): JSX.Element => { const analyticsRoute = configureQueryString(AppRoute.ANALYTICS, [ [QueryParameterName.PROJECT_ID, projectId], + [QueryParameterName.SEARCH, contributor.name], ]); const currentDate = getStartOfDay(new Date()); From 1aae916f563e08807a0cf53a9fa77660b82e593c Mon Sep 17 00:00:00 2001 From: sirserg Date: Thu, 26 Sep 2024 18:58:07 +0300 Subject: [PATCH 3/3] fix: add link to contributor item activity chart gf-540 --- apps/frontend/src/libs/components/chart/chart.tsx | 10 ++++++++-- .../components/contributor-card/contributor-card.tsx | 6 +++++- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/apps/frontend/src/libs/components/chart/chart.tsx b/apps/frontend/src/libs/components/chart/chart.tsx index 90bcf9cc..a5cc23be 100644 --- a/apps/frontend/src/libs/components/chart/chart.tsx +++ b/apps/frontend/src/libs/components/chart/chart.tsx @@ -6,11 +6,17 @@ import styles from "./styles.module.css"; type Properties = { data: ChartData; + isCursorPointer: boolean; }; -const Chart = ({ data }: Properties): JSX.Element => { +const Chart = ({ data, isCursorPointer }: Properties): JSX.Element => { return ( - + ); diff --git a/apps/frontend/src/pages/project/libs/components/contributor-card/contributor-card.tsx b/apps/frontend/src/pages/project/libs/components/contributor-card/contributor-card.tsx index 01d49837..d4e270aa 100644 --- a/apps/frontend/src/pages/project/libs/components/contributor-card/contributor-card.tsx +++ b/apps/frontend/src/pages/project/libs/components/contributor-card/contributor-card.tsx @@ -95,7 +95,11 @@ const ContributorCard = ({ {hasActivityIndicator && ( )} - {hasActivityData && } + {hasActivityData && ( + + + + )}