@civicactions/cmsds-open-data-components 4.1.7-alpha.3 → 4.1.7-alpha.4

package/dist/main.js

@@ -1450,11 +1450,10 @@ const $e873081a6e8f024e$var$DatasetSearch = (props)=>{
     const { rootUrl: rootUrl, enableSort: enableSort = true, enablePagination: enablePagination = true, defaultPageSize: defaultPageSize = 10, defaultSort: defaultSort = {
         defaultSort: 'modified',
         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, updateDateMonthYearOnly: updateDateMonthYearOnly = false, showTopics: showTopics = false, topicSlugFunction: topicSlugFunction, analytics: analytics = false, onAnalyticsEvent: onAnalyticsEvent = ()=>{}, children: children } = props;
+    }, 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, updateDateMonthYearOnly: updateDateMonthYearOnly = false, showTopics: showTopics = false, topicSlugFunction: topicSlugFunction, children: children } = props;
     const { ACA: ACA } = (0, $hgUW1$useContext)((0, $844981eac9b63865$export$eccc29c8d0ff408));
     const [searchParams] = (0, $hgUW1$useSearchParams)();
     const navigate = (0, $hgUW1$useNavigate)();
-    const location = (0, $hgUW1$useLocation)();
     // Derive all search state from URL params
     const selectedFacets = (0, $hgUW1$useMemo)(()=>{
         const parsed = (0, $hgUW1$qs).parse(searchParams.toString());
@@ -1602,12 +1601,6 @@ const $e873081a6e8f024e$var$DatasetSearch = (props)=>{
         noResults,
         currentResultNumbers
     ]);
-    (0, $hgUW1$useEffect)(()=>{
-        if (analytics && location.search) onAnalyticsEvent(location);
-    }, [
-        analytics,
-        location.search
-    ]);
     return /*#__PURE__*/ (0, $hgUW1$jsxs)((0, $hgUW1$Fragment), {
         children: [
             /*#__PURE__*/ (0, $hgUW1$jsx)((0, $5723016a5461c1ca$export$2e2bcd8739ae039), {
@@ -2627,13 +2620,12 @@ const $5d9e2ce238d53d29$var$ManageColumns = ({ id: id, columns: columns, default
     ]);
     // keep state in sync
     (0, $hgUW1$useEffect)(()=>{
-        if (columnOrder?.length) setCards(columnOrder.map((c)=>{
-            const column = columns.filter((col)=>col.id === c)[0];
-            return {
+        if (columnOrder?.length) setCards(columnOrder.map((id)=>columns.find((col)=>col.id === id)) // Get list of cards in order
+        .filter(Boolean) // Filter out any possible undefined/non-matches
+        .map((column)=>({
                 id: column.id,
                 visible: column.getIsVisible()
-            };
-        }));
+            })));
     }, [
         columnOrder
     ]);
@@ -2769,13 +2761,12 @@ const $5d9e2ce238d53d29$var$ManageColumns = ({ id: id, columns: columns, default
                                     onClick: ()=>{
                                         // reset to default column order and set all cards to visible
                                         // do not save this to the table state until the "Save" button is clicked
-                                        setCards(defaultColumnOrder.map((column)=>{
-                                            const card = cards.filter((c)=>c.id === column)[0];
-                                            return {
+                                        setCards(defaultColumnOrder.map((id)=>cards.find((c)=>c.id === id)) // Get list of cards in order
+                                        .filter(Boolean) // Filter out any possible undefined/non-matches
+                                        .map((card)=>({
                                                 ...card,
                                                 visible: true
-                                            };
-                                        }));
+                                            })));
                                     },
                                     children: "Reset Columns"
                                 })
@@ -3467,7 +3458,7 @@ function $a35cf16d1488f54e$export$1147582dfae658c6(columns, schema) {
             accessor: column
         }));
 }
-const $a35cf16d1488f54e$var$DatasetTable = ({ isModal: isModal = false, showCopyLinkButton: showCopyLinkButton = true, showDataTableToolbar: showDataTableToolbar = true, showDownloadFilteredDataButton: showDownloadFilteredDataButton = true, showDownloadFullDataButton: showDownloadFullDataButton = true, showStoredQueryDownloadButton: showStoredQueryDownloadButton = false, showTableResults: showTableResults = true, showFilterDatasetButton: showFilterDatasetButton = true, showManageColumnsButton: showManageColumnsButton = true, showDisplaySettingsButton: showDisplaySettingsButton = true, showFullScreenButton: showFullScreenButton = true, showInfoShareContainer: showInfoShareContainer = true })=>{
+const $a35cf16d1488f54e$var$DatasetTable = ({ isModal: isModal = false, showCopyLinkButton: showCopyLinkButton = true, showDataTableToolbar: showDataTableToolbar = true, showDownloadFilteredDataButton: showDownloadFilteredDataButton = true, showDownloadFullDataButton: showDownloadFullDataButton = true, showStoredQueryDownloadButton: showStoredQueryDownloadButton = false, showTableResults: showTableResults = true, showFilterDatasetButton: showFilterDatasetButton = true, showManageColumnsButton: showManageColumnsButton = true, showDisplaySettingsButton: showDisplaySettingsButton = true, showFullScreenButton: showFullScreenButton = true, showInfoShareContainer: showInfoShareContainer = true, errorHomeButtonHref: errorHomeButtonHref = '/' })=>{
     const { id: id, distribution: distribution, resource: resource, rootUrl: rootUrl, customColumns: customColumns = [], dataDictionaryBanner: dataDictionaryBanner } = (0, $hgUW1$useContext)((0, $43a30d745a7bbc86$export$2e2bcd8739ae039));
     const { page: page, setPage: setPage, tableDensity: tableDensity } = (0, $hgUW1$useContext)((0, $ee0d4d4f34048447$export$f814ea079e65d8fe));
     const defaultPageSize = 10;
@@ -3481,7 +3472,18 @@ const $a35cf16d1488f54e$var$DatasetTable = ({ isModal: isModal = false, showCopy
     }, {
         encode: true
     })}&format=csv`;
-    if (Object.keys(resource).length && columns.length && resource.schema && Object.keys(distribution).length) return /*#__PURE__*/ (0, $hgUW1$jsxs)((0, $hgUW1$Fragment), {
+    const useDatastoreErrorMessages = {
+        400: {
+            title: 'Data unavailable',
+            message: 'This data is not available for preview at this time. Please try again later.'
+        },
+        500: {
+            title: 'Something went wrong',
+            message: 'Something went wrong on our end. Please try again later.'
+        }
+    };
+    // Data loaded successfully
+    if (!resource.error && Object.keys(resource).length && columns.length && resource.schema && Object.keys(distribution).length) return /*#__PURE__*/ (0, $hgUW1$jsxs)((0, $hgUW1$Fragment), {
         children: [
             /*#__PURE__*/ (0, $hgUW1$jsx)("div", {
                 className: isModal ? 'dkan-datatable-fullscreen-mode' : '',
@@ -3532,7 +3534,28 @@ const $a35cf16d1488f54e$var$DatasetTable = ({ isModal: isModal = false, showCopy
             })
         ]
     });
-    else return /*#__PURE__*/ (0, $hgUW1$jsx)((0, $hgUW1$Spinner), {
+    else if (resource.error && !resource.loading) {
+        const resourceErrorStatus = resource.error.status in useDatastoreErrorMessages ? resource.error.status : 500;
+        return /*#__PURE__*/ (0, $hgUW1$jsxs)("div", {
+            children: [
+                /*#__PURE__*/ (0, $hgUW1$jsx)("h2", {
+                    className: "ds-text-heading--lg ds-u-margin--0 ds-u-color--primary",
+                    children: useDatastoreErrorMessages[resourceErrorStatus].title
+                }),
+                /*#__PURE__*/ (0, $hgUW1$jsx)("p", {
+                    className: "ds-u-padding-bottom--2 ds-u-margin-bottom--7",
+                    children: useDatastoreErrorMessages[resourceErrorStatus].message
+                }),
+                /*#__PURE__*/ (0, $hgUW1$jsx)((0, $hgUW1$Button), {
+                    href: errorHomeButtonHref,
+                    variation: "solid",
+                    className: "",
+                    children: "Go to home"
+                })
+            ]
+        });
+    // Data loading
+    } else return /*#__PURE__*/ (0, $hgUW1$jsx)((0, $hgUW1$Spinner), {
         "aria-valuetext": "Dataset loading",
         role: "status",
         className: "ds-u-margin--3"
@@ -6041,13 +6064,23 @@ const $1d3d480a9cfaabe0$var$useDatastore = (resourceId, rootAPIUrl, options, add
     }
     // Change whether distribution API or dataset API is used based on option
     const queryID = useDatasetAPI && datasetID ? `${datasetID}/0` : id;
+    async function fetchJson(url) {
+        const res = await fetch(url);
+        const body = await res.json().catch(()=>({}));
+        if (!res.ok) {
+            const err = new Error(body.message || body.error || res.statusText);
+            err.status = res.status;
+            throw err;
+        }
+        return body;
+    }
     const { data: data, isPending: isPending, error: error } = (0, $hgUW1$useQuery)({
         queryKey: [
             "datastore" + id + paramsString
         ],
         queryFn: ()=>{
             setCount(null);
-            return fetch(`${rootUrl}/datastore/query/${queryID}?${paramsString}`).then((res)=>res.json());
+            return fetchJson(`${rootUrl}/datastore/query/${queryID}?${paramsString}`);
         },
         enabled: enabled
     });
@@ -6061,7 +6094,7 @@ const $1d3d480a9cfaabe0$var$useDatastore = (resourceId, rootAPIUrl, options, add
                 count: true,
                 schema: true
             };
-            return fetch(`${rootUrl}/datastore/query/${queryID}?${(0, $hgUW1$qs).stringify((0, $6d5c0212e738499b$export$34e95918366a058e)(unfilteredParams, ACA))}`).then((res)=>res.json());
+            return fetchJson(`${rootUrl}/datastore/query/${queryID}?${(0, $hgUW1$qs).stringify((0, $6d5c0212e738499b$export$34e95918366a058e)(unfilteredParams, ACA))}`);
         }
     });
     (0, $hgUW1$useEffect)(()=>{
@@ -6084,6 +6117,7 @@ const $1d3d480a9cfaabe0$var$useDatastore = (resourceId, rootAPIUrl, options, add
     ]);
     return {
         loading: enabled ? isPending : false,
+        error: error,
         values: values,
         count: count,
         columns: columns,