Fix updates to count

seasketch · Nov 13, 2024 · f038b08 · f038b08
1 parent 56be1f1
commit f038b08
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 7 deletions.
diff --git a/packages/client/src/formElements/FilterInputContext.tsx b/packages/client/src/formElements/FilterInputContext.tsx
@@ -79,11 +79,13 @@ export function FilterInputServiceContextProvider({
     updatingCount: boolean;
     count: number;
     fullCellCount: number;
+    filterString: string;
   }>({
     loading: false,
     updatingCount: true,
     count: 0,
     fullCellCount: 0,
+    filterString: "",
   });
 
   const mapContext = useContext(MapContext);
@@ -107,13 +109,16 @@ export function FilterInputServiceContextProvider({
       .then((res) => res.json())
       .then((metadata: FilterServiceMetadata) => {
         setState((prev) => {
+          const count =
+            // @ts-ignore
+            metadata.attributes.find((a) => a.attribute === "id")?.count || 0;
           return {
             ...prev,
             metadata,
             loading: false,
-            fullCellCount:
-              // @ts-ignore
-              metadata.attributes.find((a) => a.attribute === "id")?.count || 0,
+            fullCellCount: count,
+            count,
+            updatingCount: false,
           };
         });
       })
@@ -158,17 +163,21 @@ export function FilterInputServiceContextProvider({
           )
         );
         filterLayerManager.updateFilter(filterString);
-        if (filterString.length === 0) {
+        if (filterString === state.filterString) {
+          // do nothing
+        } else if (filterString.length === 0) {
           setState((prev) => ({
             ...prev,
             updatingCount: false,
             count: prev.fullCellCount,
+            filterString: "",
           }));
-        } else if (serviceLocation && state.fullCellCount === 0) {
+        } else if (serviceLocation) {
           // TODO: update count from service
           setState((prev) => ({
             ...prev,
             updatingCount: true,
+            filterString,
           }));
           fetch(
             `${serviceLocation.replace(/\/$/, "")}/count?filter=${filterString}`
@@ -299,7 +308,7 @@ export function filterStateToSearchString(filters: FilterState) {
   } = {};
   for (const attr in filters) {
     const filter = filters[attr];
-    if (filter.selected) {
+    if (filter && filter.selected) {
       if ("numberState" in filter) {
         state[attr] = filter.numberState!;
       } else if ("stringState" in filter) {

diff --git a/packages/client/src/projects/Sketches/FilteredPlanningUnitCountHeader.tsx b/packages/client/src/projects/Sketches/FilteredPlanningUnitCountHeader.tsx
@@ -5,7 +5,6 @@ import Spinner from "../../components/Spinner";
 
 export default function FilteredPlanningUnitCountHeader() {
   const context = useContext(FilterInputServiceContext);
-  console.log("context", context);
   return (
     <div
       className={`w-full flex items-center p-2 px-4 border-b bg-gray-50 text-sm ${