Add project start date as start date in ary dashboard

the-deep · Feb 29, 2024 · cbd4d9e · cbd4d9e
1 parent a24bb25
commit cbd4d9e
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 15 deletions.
diff --git a/app/gqlFragments.ts b/app/gqlFragments.ts
@@ -298,6 +298,7 @@ export const LAST_ACTIVE_PROJECT_FRAGMENT = gql`
         membershipPending
         enablePubliclyViewableAnalysisReportSnapshot
         isRejected
+        createdAt
     }
 `;
 

diff --git a/app/views/AryDashboard/index.tsx b/app/views/AryDashboard/index.tsx
@@ -17,11 +17,7 @@ import {
 import { gql, useQuery } from '@apollo/client';
 import { removeNull } from '@togglecorp/toggle-form';
 
-import {
-    todaysDate,
-    lastYearStartDate,
-    DEEP_START_DATE,
-} from '#utils/common';
+import { todaysDate } from '#utils/common';
 import { resolveTime } from '#utils/temporal';
 import ProjectContext from '#base/context/ProjectContext';
 import {
@@ -199,10 +195,15 @@ function AryDashboard(props: Props) {
     const [selectedRegion, setSelectedRegion] = useState<string>();
     const [activeAdminLevel, setActiveAdminLevel] = useState<string>();
 
+    const projectStartDate = resolveTime(
+        project?.createdAt ? new Date(project?.createdAt) : todaysDateTime,
+        'day',
+    ).getTime();
+
     const [
-        startDate = todaysDateTime,
+        startDate = projectStartDate,
         setStartDate,
-    ] = useState<number | undefined>(todaysDateTime);
+    ] = useState<number | undefined>(projectStartDate);
     const [
         endDate = todaysDateTime,
         setEndDate,
@@ -234,11 +235,6 @@ function AryDashboard(props: Props) {
             skip: !activeProject,
             variables: activeProject ? { projectId: activeProject } : undefined,
             onCompleted: (response) => {
-                const projectStartDate = resolveTime(
-                    new Date(response.project?.createdAt ?? todaysDateTime),
-                    'day',
-                ).getTime();
-                setStartDate(Math.max(projectStartDate, new Date(lastYearStartDate).getTime()));
                 setSelectedRegion(response.project?.regions?.[0].id);
 
                 if (isDefined(activeAdminLevel)) {
@@ -293,9 +289,6 @@ function AryDashboard(props: Props) {
     }, [projectMetadata]);
 
     const projectData = removeNull(data?.project);
-    const projectStartDate = useMemo(() => (
-        resolveTime(new Date(projectMetadata?.createdAt ?? DEEP_START_DATE), 'day').getTime()
-    ), [projectMetadata?.createdAt]);
 
     const handleEndDateChange = useCallback((newDate: number | undefined) => {
         if (isDefined(newDate)) {