Merge pull request #221 from UW-Macrostrat/streamline-url-functions

Streamline map page state management
UW-Macrostrat · Jun 12, 2024 · 3d8a8b1 · 3d8a8b1
2 parents 76d4283 + 1c44dac
commit 3d8a8b1
Show file tree

Hide file tree

Showing 19 changed files with 327 additions and 432 deletions.
diff --git a/.gitignore b/.gitignore
@@ -16,8 +16,13 @@ docker-compose.yaml
 !.yarn/sdks
 !.yarn/versions
 
+# IntelliJ
+.idea/workspace.xml
+.idea/tasks.xml
+
+
 # For ignoring static files
 *.png
-*.jpg 
+*.jpg
 
-.vite
+.vite
diff --git a/.idea/prettier.xml b/.idea/prettier.xml
diff --git a/.idea/watcherTasks.xml b/.idea/watcherTasks.xml
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
diff --git a/deps/web-components b/deps/web-components
diff --git a/src/pages/map/map-interface/app-state/handlers/fetch.ts b/src/pages/map/map-interface/app-state/handlers/fetch.ts
@@ -1,8 +1,8 @@
 import { SETTINGS, apiV2Prefix } from "@macrostrat-web/settings";
 import axios from "axios";
 import { joinURL } from "~/pages/map/map-interface/utils";
-import { ColumnGeoJSONRecord } from "../reducers";
-import { UPDATE_FILTERED_COLUMNS } from "../reducers/filtered-columns";
+import { ColumnGeoJSONRecord } from "./columns";
+import { UPDATE_COLUMN_FILTERS } from "../reducers/core/types";
 import { XDDSnippet } from "~/types";
 
 export const base = apiV2Prefix;
@@ -54,7 +54,7 @@ function buildColumnQueryParams(filters) {
 
 export async function fetchFilteredColumns(
   providedFilters
-): Promise<UPDATE_FILTERED_COLUMNS | void> {
+): Promise<UPDATE_COLUMN_FILTERS | void> {
   let queryString = buildColumnQueryParams(providedFilters);
   let url = `${base}/columns`;
   if (Object.keys(queryString).length === 0) {

diff --git a/src/pages/map/map-interface/app-state/handlers/filters.ts b/src/pages/map/map-interface/app-state/handlers/filters.ts
@@ -22,7 +22,7 @@ export async function runFilter(filter: Filter): Promise<FilterData> {
       return {
         category: "lithology",
         id: filter.name ?? filter.id,
-        name: filter.name ?? filter.id,
+        name: filter.name ?? filter.id.toString(),
         type: filter.type,
         legend_ids: [],
       };
@@ -169,11 +169,13 @@ export const fetchIntervalFilter = async (
 type LithologyClassFilter = {
   type: FilterType.LithologyClasses;
   name: string;
+  id: number;
 };
 
 type LithologyTypeFilter = {
   type: FilterType.LithologyTypes;
   name: string;
+  id: number;
 };
 
 type LithologyFilter = {
@@ -285,7 +287,8 @@ async function fetchAllLithTypes(
   return {
     category: "lithology",
     id,
-    name: id,
+    // TODO: revisit name/id differences
+    name: id.toString(),
     type,
     legend_ids,
   };