@civicactions/cmsds-open-data-components 4.0.19 → 4.0.20-alpha.0

package/dist/main.js

@@ -1452,12 +1452,23 @@ const $e873081a6e8f024e$var$DatasetSearch = (props)=>{
         defaultOrder: 'desc'
     }, pageTitle: pageTitle = 'Dataset Explorer', categoriesTitle: categoriesTitle = 'Categories', filterTitle: filterTitle = 'Tags', showLargeFileWarning: showLargeFileWarning = false, largeFileThemes: largeFileThemes, introText: introText = '', showDownloadIcon: showDownloadIcon = false, altMobileSearchButton: altMobileSearchButton, dataDictionaryLinks: dataDictionaryLinks = false, showDateDetails: showDateDetails = false, showTopics: showTopics = false, topicSlugFunction: topicSlugFunction, children: children } = props;
     const { ACA: ACA } = (0, $hgUW1$useContext)((0, $844981eac9b63865$export$eccc29c8d0ff408));
-    const [searchParams, setSearchParams] = (0, $hgUW1$useSearchParams)();
+    const [searchParams] = (0, $hgUW1$useSearchParams)();
+    const navigate = (0, $hgUW1$useNavigate)();
     // Derive all search state from URL params
-    const selectedFacets = (0, $hgUW1$useMemo)(()=>({
-            theme: searchParams.getAll('theme'),
-            keyword: searchParams.getAll('keyword')
-        }), [
+    const selectedFacets = (0, $hgUW1$useMemo)(()=>{
+        const parsed = (0, $hgUW1$qs).parse(searchParams.toString());
+        const toArray = (val)=>{
+            if (Array.isArray(val)) return val.filter((v)=>typeof v === 'string');
+            if (typeof val === 'string') return [
+                val
+            ];
+            return [];
+        };
+        return {
+            theme: toArray(parsed.theme),
+            keyword: toArray(parsed.keyword)
+        };
+    }, [
         searchParams
     ]);
     const page = Number(searchParams.get('page')) || 1;
@@ -1474,29 +1485,33 @@ const $e873081a6e8f024e$var$DatasetSearch = (props)=>{
     }, [
         fulltext
     ]);
-    function buildNextParams(overrides) {
-        const next = new URLSearchParams(searchParams);
+    function buildNextQueryString(overrides) {
+        const current = (0, $hgUW1$qs).parse(searchParams.toString());
+        const merged = {
+            ...current
+        };
         Object.entries(overrides).forEach(([key, value])=>{
-            next.delete(key);
-            if (value === null) return;
-            const values = Array.isArray(value) ? value : [
-                value
-            ];
-            values.forEach((v)=>next.append(key, v));
+            if (value === null) delete merged[key];
+            else merged[key] = value;
+        });
+        return (0, $hgUW1$qs).stringify(merged, {
+            arrayFormat: 'indices',
+            encodeValuesOnly: true
         });
-        return next;
     }
     function updateSelectedFacets(key, value) {
-        const current = searchParams.getAll(key);
+        const current = selectedFacets[key] || [];
         const idx = current.indexOf(value);
         const updated = idx > -1 ? current.filter((_, i)=>i !== idx) : [
             ...current,
             value
         ];
-        setSearchParams(buildNextParams({
-            [key]: updated.length ? updated : null,
-            page: null
-        }));
+        navigate({
+            search: buildNextQueryString({
+                [key]: updated.length ? updated : null,
+                page: null
+            })
+        });
     }
     const setSortOptionsHandler = (value)=>{
         let nextSort;
@@ -1525,11 +1540,15 @@ const $e873081a6e8f024e$var$DatasetSearch = (props)=>{
             sort: nextSort === defaultSort.defaultSort ? null : nextSort,
             sortOrder: nextSortOrder === defaultSort.defaultOrder ? null : nextSortOrder
         };
-        setSearchParams(buildNextParams(overrides));
+        navigate({
+            search: buildNextQueryString(overrides)
+        });
     };
     function resetFilters() {
         setFilterText('');
-        setSearchParams({});
+        navigate({
+            search: ''
+        });
     }
     const pageSize = defaultPageSize;
     const params = {
@@ -1626,17 +1645,21 @@ const $e873081a6e8f024e$var$DatasetSearch = (props)=>{
                                         if (filterText) {
                                             if ($e873081a6e8f024e$export$1040147c129fdde9(filterText)) {
                                                 setInvalidSearch(false);
-                                                setSearchParams(buildNextParams({
-                                                    fulltext: filterText,
-                                                    page: null
-                                                }));
+                                                navigate({
+                                                    search: buildNextQueryString({
+                                                        fulltext: filterText,
+                                                        page: null
+                                                    })
+                                                });
                                             } else setInvalidSearch(true);
                                         } else {
                                             setInvalidSearch(false);
-                                            setSearchParams(buildNextParams({
-                                                fulltext: null,
-                                                page: null
-                                            }));
+                                            navigate({
+                                                search: buildNextQueryString({
+                                                    fulltext: null,
+                                                    page: null
+                                                })
+                                            });
                                         }
                                     },
                                     className: "dkan-dataset-search ds-l-form-row ds-u-padding-bottom--4 ds-u-border-bottom--1",
@@ -1795,15 +1818,17 @@ const $e873081a6e8f024e$var$DatasetSearch = (props)=>{
                                             onPageChange: (evt, page)=>{
                                                 evt.preventDefault();
                                                 window.scroll(0, 0);
-                                                setSearchParams(buildNextParams({
-                                                    page: page > 1 ? String(page) : null
-                                                }));
+                                                navigate({
+                                                    search: buildNextQueryString({
+                                                        page: page > 1 ? String(page) : null
+                                                    })
+                                                });
                                             },
                                             renderHref: (p)=>{
-                                                const next = buildNextParams({
+                                                const nextQs = buildNextQueryString({
                                                     page: p > 1 ? String(p) : null
                                                 });
-                                                return `/datasets?${next.toString()}`;
+                                                return `/datasets?${nextQs}`;
                                             }
                                         })
                                     ]