From ddc8bc6350341a1d099df156d95bd421606d45df Mon Sep 17 00:00:00 2001 From: sjaanus Date: Fri, 8 Nov 2024 14:35:33 +0200 Subject: [PATCH 1/4] feat: remove excessing debug logging --- src/lib/features/maintenance/maintenance-service.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/src/lib/features/maintenance/maintenance-service.ts b/src/lib/features/maintenance/maintenance-service.ts index 7339f86f6e72..a185347afe7a 100644 --- a/src/lib/features/maintenance/maintenance-service.ts +++ b/src/lib/features/maintenance/maintenance-service.ts @@ -45,7 +45,6 @@ export default class MaintenanceService implements IMaintenanceStatus { } async getMaintenanceSetting(): Promise { - this.logger.debug('getMaintenanceSetting called'); return this.settingService.getWithDefault(maintenanceSettingsKey, { enabled: false, }); From 7cee449b070f1903dd12c7f1dc9d806e74374bba Mon Sep 17 00:00:00 2001 From: sjaanus Date: Fri, 8 Nov 2024 14:57:54 +0200 Subject: [PATCH 2/4] feat: remove archive tooltip conditionally --- frontend/src/component/filter/AddFilterButton.tsx | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/frontend/src/component/filter/AddFilterButton.tsx b/frontend/src/component/filter/AddFilterButton.tsx index 4915a92990a0..f40fa4d8e78e 100644 --- a/frontend/src/component/filter/AddFilterButton.tsx +++ b/frontend/src/component/filter/AddFilterButton.tsx @@ -13,6 +13,7 @@ import { HtmlTooltip } from 'component/common/HtmlTooltip/HtmlTooltip'; import useSplashApi from 'hooks/api/actions/useSplashApi/useSplashApi'; import { useAuthSplash } from 'hooks/api/getters/useAuth/useAuthSplash'; import { useOptionalPathParam } from 'hooks/useOptionalPathParam'; +import { useAuthUser } from '../../hooks/api/getters/useAuth/useAuthUser'; const StyledButton = styled(Button)(({ theme }) => ({ padding: theme.spacing(0, 1.25, 0, 1.25), @@ -49,6 +50,7 @@ export const AddFilterButton = ({ }: IAddFilterButtonProps) => { const projectId = useOptionalPathParam('projectId'); const simplifyProjectOverview = useUiFlag('simplifyProjectOverview'); + const { user } = useAuthUser(); const { setSplashSeen } = useSplashApi(); const { splash } = useAuthSplash(); @@ -73,6 +75,15 @@ export const AddFilterButton = ({ handleClose(); }; + const isOldCustomer = (createdAt: string | undefined) => { + if (!createdAt) return false; + const cutoffDate = new Date('2024-11-08T00:00:00.000Z'); + return new Date(createdAt) < cutoffDate; + }; + + const showArchiveTooltip = + simplifyProjectOverview && projectId && isOldCustomer(user?.createdAt); + const ArchiveTooltip = () => { return ( @@ -97,7 +108,7 @@ export const AddFilterButton = ({ }; return (
- {simplifyProjectOverview && projectId ? ( + {showArchiveTooltip ? ( Date: Fri, 8 Nov 2024 15:25:32 +0200 Subject: [PATCH 3/4] Fix --- frontend/src/component/filter/AddFilterButton.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/src/component/filter/AddFilterButton.tsx b/frontend/src/component/filter/AddFilterButton.tsx index f40fa4d8e78e..970f484e1f19 100644 --- a/frontend/src/component/filter/AddFilterButton.tsx +++ b/frontend/src/component/filter/AddFilterButton.tsx @@ -13,7 +13,7 @@ import { HtmlTooltip } from 'component/common/HtmlTooltip/HtmlTooltip'; import useSplashApi from 'hooks/api/actions/useSplashApi/useSplashApi'; import { useAuthSplash } from 'hooks/api/getters/useAuth/useAuthSplash'; import { useOptionalPathParam } from 'hooks/useOptionalPathParam'; -import { useAuthUser } from '../../hooks/api/getters/useAuth/useAuthUser'; +import { useAuthUser } from 'hooks/api/getters/useAuth/useAuthUser'; const StyledButton = styled(Button)(({ theme }) => ({ padding: theme.spacing(0, 1.25, 0, 1.25), From 8e6aa3a4a41b0be0dd75cca7deda2208cd13428e Mon Sep 17 00:00:00 2001 From: sjaanus Date: Fri, 8 Nov 2024 15:26:08 +0200 Subject: [PATCH 4/4] Fix --- src/lib/features/maintenance/maintenance-service.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/src/lib/features/maintenance/maintenance-service.ts b/src/lib/features/maintenance/maintenance-service.ts index a185347afe7a..7339f86f6e72 100644 --- a/src/lib/features/maintenance/maintenance-service.ts +++ b/src/lib/features/maintenance/maintenance-service.ts @@ -45,6 +45,7 @@ export default class MaintenanceService implements IMaintenanceStatus { } async getMaintenanceSetting(): Promise { + this.logger.debug('getMaintenanceSetting called'); return this.settingService.getWithDefault(maintenanceSettingsKey, { enabled: false, });