Move date-utils fn

Author: sandrahoang686

app/scripts/components/exploration/data-utils-no-faux-module.ts

@@ -1,14 +1,20 @@
-import { DatasetLayer, VedaDatum, DatasetData } from '$types/veda';
+import eachMonthOfInterval from 'date-fns/eachMonthOfInterval';
+import eachDayOfInterval from 'date-fns/eachDayOfInterval';
+import eachYearOfInterval from 'date-fns/eachYearOfInterval';
 import {
   EnhancedDatasetLayer,
   TimelineDataset,
-  DatasetStatus
+  DatasetStatus,
+  StacDatasetData,
+  TimeDensity,
 } from './types.d.ts';
 import {
   DataMetric,
   DATA_METRICS,
   DEFAULT_DATA_METRICS
 } from './components/datasets/analysis-metrics';
+import { utcString2userTzDate } from '$utils/date';
+import { DatasetLayer, VedaDatum, DatasetData } from '$types/veda';
 
 export const getDatasetLayers = (datasets: VedaDatum<DatasetData>) => Object.values(datasets)
   .flatMap((dataset: VedaDatum<DatasetData>) => {
@@ -21,7 +27,6 @@ export const getDatasetLayers = (datasets: VedaDatum<DatasetData>) => Object.val
     }));
   });
 
-
 /**
  * Returns an array of metrics based on the given Dataset Layer configuration.
  * If the layer has metrics defined, it returns only the metrics that match the
@@ -81,4 +86,39 @@ export function reconcileDatasets(
       }
     };
   });
-}
+}
+
+export function resolveLayerTemporalExtent(
+  datasetId: string,
+  datasetData: StacDatasetData
+): Date[] {
+  const { domain, isPeriodic, timeDensity } = datasetData;
+
+  if (!domain || domain.length === 0) {
+    throw new Error(`Invalid domain on dataset [${datasetId}]`);
+  }
+
+  if (!isPeriodic) return domain.map((d) => utcString2userTzDate(d));
+
+  switch (timeDensity) {
+    case TimeDensity.YEAR:
+      return eachYearOfInterval({
+        start: utcString2userTzDate(domain[0]),
+        end: utcString2userTzDate(domain[domain.length-1])
+      });
+    case TimeDensity.MONTH:
+      return eachMonthOfInterval({
+        start: utcString2userTzDate(domain[0]),
+        end: utcString2userTzDate(domain[domain.length-1])
+      });
+    case TimeDensity.DAY:
+      return eachDayOfInterval({
+        start: utcString2userTzDate(domain[0]),
+        end: utcString2userTzDate(domain[domain.length-1])
+      });
+    default:
+      throw new Error(
+        `Invalid time density [${timeDensity}] on dataset [${datasetId}]`
+      );
+  }
+}

app/scripts/components/exploration/data-utils.ts

@@ -1,11 +1,11 @@
 import {
   eachDayOfInterval,
-  eachMonthOfInterval,
   eachYearOfInterval,
   startOfDay,
   startOfYear
 } from 'date-fns';
 import startOfMonth from 'date-fns/startOfMonth';
+import eachMonthOfInterval from 'date-fns/eachMonthOfInterval';
 import {
   EnhancedDatasetLayer,
   StacDatasetData,
@@ -22,7 +22,8 @@ import { veda_datasets } from '$data-layer/datasets';
 import { DatasetLayer, DatasetData, VedaDatum } from '$types/veda';
 import { utcString2userTzDate } from '$utils/date';
 
-// @TODO: These should be updated to take in datasets as a param instead of using veda_datasets directly
+// @TODO: This file should be deprecated and merged with `data-utils-no-faux-module` 
+// to get rid of the faux modules dependency
 
 export const findParentDataset = (layerId: string) => {
   const parentDataset: VedaDatum<DatasetData> | undefined = Object.values(veda_datasets).find((dataset: VedaDatum<DatasetData>) =>

app/scripts/components/exploration/hooks/use-stac-metadata-datasets.ts

@@ -4,58 +4,16 @@ import {
   UseQueryResult
 } from '@tanstack/react-query';
 import axios from 'axios';
-import {
-  eachDayOfInterval,
-  eachYearOfInterval,
-} from 'date-fns';
-import eachMonthOfInterval from 'date-fns/eachMonthOfInterval';
 import {
   StacDatasetData,
   TimeDensity,
   TimelineDataset,
   DatasetStatus,
   VizDataset
 } from '../types.d.ts';
+import { resolveLayerTemporalExtent } from '../data-utils-no-faux-module';
 import { useEffectPrevious } from '$utils/use-effect-previous';
 import { SetState } from '$types/aliases';
-import { utcString2userTzDate } from '$utils/date';
-
-
-export function resolveLayerTemporalExtent(
-  datasetId: string,
-  datasetData: StacDatasetData
-): Date[] {
-  const { domain, isPeriodic, timeDensity } = datasetData;
-
-  if (!domain || domain.length === 0) {
-    throw new Error(`Invalid domain on dataset [${datasetId}]`);
-  }
-
-  if (!isPeriodic) return domain.map((d) => utcString2userTzDate(d));
-
-  switch (timeDensity) {
-    case TimeDensity.YEAR:
-      return eachYearOfInterval({
-        start: utcString2userTzDate(domain[0]),
-        end: utcString2userTzDate(domain.last)
-      });
-    case TimeDensity.MONTH:
-      return eachMonthOfInterval({
-        start: utcString2userTzDate(domain[0]),
-        end: utcString2userTzDate(domain[domain.length - 1])
-      });
-    case TimeDensity.DAY:
-      return eachDayOfInterval({
-        start: utcString2userTzDate(domain[0]),
-        end: utcString2userTzDate(domain.last)
-      });
-    default:
-      throw new Error(
-        `Invalid time density [${timeDensity}] on dataset [${datasetId}]`
-      );
-  }
-}
-
 
 function didDataChange(curr: UseQueryResult, prev?: UseQueryResult) {
   const currKey = `${curr.errorUpdatedAt}-${curr.dataUpdatedAt}-${curr.failureCount}`;