Revert "Support #32267 - Saved search doesn't remember the group"

This reverts commit dfc4c54.
AAFC-BICoE · Nov 23, 2023 · ecd8d83 · ecd8d83
1 parent dfc4c54
commit ecd8d83
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 13 deletions.
diff --git a/packages/dina-ui/components/storage/StorageFilter.tsx b/packages/dina-ui/components/storage/StorageFilter.tsx
@@ -63,19 +63,16 @@ export function StorageFilter({ onChange }: StorageFilterProps) {
             ]
           : []),
         ...(groupNames
-          ? [
-              {
-                id: -1234,
+          ? groupNames.map((group, index) => {
+              return {
+                id: -index,
                 type: "FILTER_ROW" as const,
+                attribute: "group",
                 predicate: "IS" as const,
                 searchType: "EXACT_MATCH" as const,
-                value: groupNames.join(","),
-                attribute: {
-                  allowRange: true,
-                  name: "group"
-                }
-              }
-            ]
+                value: group
+              };
+            })
           : [])
       ]
     });

diff --git a/packages/dina-ui/components/storage/__tests__/BrowseStorageTree.test.tsx b/packages/dina-ui/components/storage/__tests__/BrowseStorageTree.test.tsx
@@ -77,7 +77,7 @@ const mockGet = jest.fn<any, any>(async (path, params = {}) => {
     case "collection-api/storage-unit":
       if (
         params.filter?.parentStorageUnit === null ||
-        params.filter?.rsql === "group=in=(aafc,cnc)"
+        params.filter?.rsql === "group==aafc;group==cnc"
       ) {
         // Top-level units:
         return { data: [STORAGE_A], meta: { totalResourceCount: 1 } };
@@ -158,7 +158,7 @@ describe("BrowseStorageTree component", () => {
     // With no filter, gets the top-level units:
     expect(mockGet).lastCalledWith("collection-api/storage-unit", {
       filter: {
-        rsql: "group=in=(aafc,cnc)"
+        rsql: "group==aafc;group==cnc"
       },
       include: "storageUnitChildren,storageUnitType",
       page: {
@@ -179,7 +179,7 @@ describe("BrowseStorageTree component", () => {
     // With a filter, gets units from any level matching the search text:
     expect(mockGet).lastCalledWith("collection-api/storage-unit", {
       filter: {
-        rsql: "name==*test-search-text*;group=in=(aafc,cnc)"
+        rsql: "name==*test-search-text*;group==aafc;group==cnc"
       },
       include: "storageUnitChildren,storageUnitType",
       page: {