convert initial date range into a constant

AllenInstitute · Feb 21, 2024 · 61b6d61 · 61b6d61
1 parent 1d147c1
commit 61b6d61
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/packages/core/constants/index.ts b/packages/core/constants/index.ts
@@ -106,6 +106,12 @@ export const RELATIVE_DATE_RANGES = [
         sort: undefined,
     },
 ];
+export const INITIAL_DATE_FILTER = [
+    new FileFilter(
+        AnnotationName.UPLOADED,
+        `RANGE(${DATE_LAST_YEAR.toISOString()},${END_OF_TODAY.toISOString()})`
+    ),
+];
 
 export const TOP_LEVEL_FILE_ANNOTATIONS = [
     new Annotation({

diff --git a/packages/core/state/selection/reducer.ts b/packages/core/state/selection/reducer.ts
@@ -2,7 +2,7 @@ import { makeReducer } from "@aics/redux-utils";
 import { castArray, difference, omit, without } from "lodash";
 
 import interaction from "../interaction";
-import { AnnotationName, RELATIVE_DATE_RANGES } from "../../constants";
+import { AnnotationName, INITIAL_DATE_FILTER } from "../../constants";
 import Annotation from "../../entity/Annotation";
 import FileFilter from "../../entity/FileFilter";
 import FileFolder from "../../entity/FileFolder";
@@ -46,10 +46,6 @@ export interface SelectionStateBranch {
     tutorial?: Tutorial;
 }
 
-const initialDateFilter = RELATIVE_DATE_RANGES.filter((relativeDateRange) =>
-    relativeDateRange.name.toLowerCase().includes("last year")
-)[0].filters;
-
 export const initialState = {
     annotationHierarchy: [],
     availableAnnotationsForHierarchy: [],
@@ -62,7 +58,7 @@ export const initialState = {
     },
     displayAnnotations: [],
     fileSelection: new FileSelection(),
-    filters: [...initialDateFilter],
+    filters: [...INITIAL_DATE_FILTER],
     openFileFolders: [],
     shouldDisplaySmallFont: false,
     sortColumn: new FileSort(AnnotationName.UPLOADED, SortOrder.DESC),