@civicactions/cmsds-open-data-components 4.0.12-alpha.3 → 4.1.0-alpha.1

package/dist/main.js

@@ -1408,10 +1408,10 @@ const $17711e94d2ce0ee4$var$DatasetDateItem = (props)=>{
         })
     };
     return /*#__PURE__*/ (0, $hgUW1$jsxs)("div", {
-        className: `dataset-date-item${boldLabel ? " bold-label" : ""}`,
+        className: "dataset-date-item",
         children: [
             /*#__PURE__*/ (0, $hgUW1$jsxs)("span", {
-                className: "dataset-data-item-label",
+                className: `dataset-data-item-label ${boldLabel ? "ds-u-font-weight--bold" : ""}`,
                 children: [
                     /*#__PURE__*/ (0, $hgUW1$jsx)("span", {
                         children: dateText[type]
@@ -1424,7 +1424,7 @@ const $17711e94d2ce0ee4$var$DatasetDateItem = (props)=>{
             }),
             displayTooltips === true && /*#__PURE__*/ (0, $hgUW1$jsx)((0, $hgUW1$Tooltip), {
                 "aria-label": dateText[type],
-                className: "ds-c-tooltip__trigger-icon ds-u-display--inline ds-u-padding-left--0 ds-uw-padding-right--0",
+                className: "ds-c-tooltip__trigger-icon ds-u-display--inline ds-u-padding-left--0 ds-uw-padding-right--0 ds-u-font-weight--normal",
                 title: tooltipContent[type],
                 placement: "top",
                 children: /*#__PURE__*/ (0, $hgUW1$jsx)((0, $hgUW1$TooltipIcon), {})
@@ -1435,31 +1435,24 @@ const $17711e94d2ce0ee4$var$DatasetDateItem = (props)=>{
 var $17711e94d2ce0ee4$export$2e2bcd8739ae039 = $17711e94d2ce0ee4$var$DatasetDateItem;
 
 
+
 const $20de4fedf33d4f9a$var$DatasetDate = (props)=>{
-    const { date: date, updatedBoldLabel: updatedBoldLabel = false, releasedBoldLabel: releasedBoldLabel = false, refreshBoldLabel: refreshBoldLabel = false, displayTooltips: displayTooltips = true } = props;
-    const { modified: modified, released: released, refresh: refresh } = date;
+    const { date: date, modifiedBoldLabel: modifiedBoldLabel = false, releasedBoldLabel: releasedBoldLabel = false, refreshBoldLabel: refreshBoldLabel = false, displayTooltips: displayTooltips = true } = props;
     // Create an array of date items to render
     const dateItems = [];
-    if (modified) dateItems.push(/*#__PURE__*/ (0, $hgUW1$jsx)((0, $17711e94d2ce0ee4$export$2e2bcd8739ae039), {
-        displayTooltips: displayTooltips,
-        type: "modified",
-        date: modified,
-        boldLabel: updatedBoldLabel
-    }, "modified"));
-    if (released) dateItems.push(/*#__PURE__*/ (0, $hgUW1$jsx)((0, $17711e94d2ce0ee4$export$2e2bcd8739ae039), {
-        displayTooltips: displayTooltips,
-        type: "released",
-        date: released,
-        boldLabel: releasedBoldLabel
-    }, "released"));
-    if (refresh) dateItems.push(/*#__PURE__*/ (0, $hgUW1$jsx)((0, $17711e94d2ce0ee4$export$2e2bcd8739ae039), {
-        displayTooltips: displayTooltips,
-        type: "refresh",
-        date: refresh,
-        boldLabel: refreshBoldLabel
-    }, "refresh"));
+    Object.entries(date).forEach(([key, value])=>{
+        if (value) {
+            const bold = key === "modified" && modifiedBoldLabel || key === "released" && releasedBoldLabel || key === "refresh" && refreshBoldLabel;
+            dateItems.push(/*#__PURE__*/ (0, $hgUW1$jsx)((0, $17711e94d2ce0ee4$export$2e2bcd8739ae039), {
+                type: key,
+                displayTooltips: displayTooltips,
+                date: value,
+                boldLabel: bold
+            }, key));
+        }
+    });
     return /*#__PURE__*/ (0, $hgUW1$jsx)("div", {
-        className: "dataset-date",
+        className: "dataset-date ds-u-display--flex ds-u-font-size--sm ds-u-align-items--start",
         children: dateItems.map((item, index)=>/*#__PURE__*/ (0, $hgUW1$jsxs)((0, $hgUW1$react).Fragment, {
                 children: [
                     item,
@@ -4544,42 +4537,6 @@ const $e873081a6e8f024e$var$DatasetSearch = (props)=>{
         window.history.pushState({}, "", `${url.origin}${url.pathname}${urlString}`);
     }
     const pageSize = defaultPageSize;
-    (0, $hgUW1$useEffect)(()=>{
-        const baseNumber = Number(totalItems) > 0 ? 1 : 0;
-        const startingNumber = baseNumber + (Number(pageSize) * Number(page) - Number(pageSize));
-        const endingNumber = Number(pageSize) * Number(page);
-        setCurrentResultNumbers({
-            total: Number(totalItems),
-            startingNumber: Number(totalItems) >= startingNumber ? startingNumber : 0,
-            endingNumber: Number(totalItems) < endingNumber ? Number(totalItems) : endingNumber
-        });
-        setTimeout(()=>{
-            setAnnouncementText(`Showing ${startingNumber} to ${endingNumber} of ${totalItems} datasets`);
-        }, 100);
-        if (totalItems <= 0 && currentResultNumbers !== null) setNoResults(true);
-        else setNoResults(false);
-    }, [
-        totalItems,
-        pageSize,
-        page
-    ]);
-    (0, $hgUW1$useEffect)(()=>{
-        if (page !== 1 && (transformedParams.fulltext !== fulltext || transformedParams.selectedFacets !== selectedFacets)) setPage(1);
-    }, [
-        fulltext,
-        selectedFacets
-    ]);
-    (0, $hgUW1$useEffect)(()=>{
-        if (totalItems !== null && totalItems !== undefined && totalItems > 0) {
-            var params = buildSearchParams(true);
-            if (params !== location.search) setSearchParams(params);
-        }
-    }, [
-        page,
-        sort,
-        sortOrder,
-        totalItems
-    ]);
     function resetFilters() {
         setFullText(defaultFulltext);
         setFilterText(defaultFulltext);
@@ -4627,6 +4584,50 @@ const $e873081a6e8f024e$var$DatasetSearch = (props)=>{
         theme: null,
         keyword: null
     };
+    (0, $hgUW1$useEffect)(()=>{
+        const baseNumber = Number(totalItems) > 0 ? 1 : 0;
+        const startingNumber = baseNumber + (Number(pageSize) * Number(page) - Number(pageSize));
+        const endingNumber = Number(pageSize) * Number(page);
+        setCurrentResultNumbers({
+            total: Number(totalItems),
+            startingNumber: Number(totalItems) >= startingNumber ? startingNumber : 0,
+            endingNumber: Number(totalItems) < endingNumber ? Number(totalItems) : endingNumber
+        });
+        if (totalItems <= 0 && currentResultNumbers !== null) setNoResults(true);
+        else setNoResults(false);
+    }, [
+        totalItems,
+        pageSize,
+        page
+    ]);
+    (0, $hgUW1$useEffect)(()=>{
+        if (page !== 1 && (transformedParams.fulltext !== fulltext || transformedParams.selectedFacets !== selectedFacets)) setPage(1);
+    }, [
+        fulltext,
+        selectedFacets
+    ]);
+    (0, $hgUW1$useEffect)(()=>{
+        if (totalItems !== null && totalItems !== undefined && totalItems > 0) {
+            var params = buildSearchParams(true);
+            if (params !== location.search) setSearchParams(params);
+        }
+    }, [
+        page,
+        sort,
+        sortOrder,
+        totalItems
+    ]);
+    (0, $hgUW1$useEffect)(()=>{
+        // No results found
+        if (noResults) setAnnouncementText("No results found.");
+        else if (!isPending && (!data || !data.data.results)) setAnnouncementText("Could not connect to the API.");
+        else setAnnouncementText(`Showing ${currentResultNumbers.startingNumber} to ${currentResultNumbers.endingNumber} of ${currentResultNumbers.total} datasets`);
+    }, [
+        data,
+        isPending,
+        noResults,
+        currentResultNumbers
+    ]);
     return /*#__PURE__*/ (0, $hgUW1$jsxs)((0, $hgUW1$Fragment), {
         children: [
             /*#__PURE__*/ (0, $hgUW1$jsx)((0, $5723016a5461c1ca$export$2e2bcd8739ae039), {
@@ -4635,6 +4636,15 @@ const $e873081a6e8f024e$var$DatasetSearch = (props)=>{
             /*#__PURE__*/ (0, $hgUW1$jsxs)("section", {
                 className: "ds-l-container",
                 children: [
+                    /*#__PURE__*/ (0, $hgUW1$jsx)("div", {
+                        children: /*#__PURE__*/ (0, $hgUW1$jsx)("p", {
+                            className: "ds-u-visibility--screen-reader",
+                            "aria-live": "assertive",
+                            "aria-atomic": "true",
+                            "data-testid": "currentResults",
+                            children: announcementText
+                        })
+                    }),
                     /*#__PURE__*/ (0, $hgUW1$jsx)("div", {
                         className: "ds-l-row",
                         children: /*#__PURE__*/ (0, $hgUW1$jsxs)("div", {
@@ -4719,34 +4729,23 @@ const $e873081a6e8f024e$var$DatasetSearch = (props)=>{
                                         /*#__PURE__*/ (0, $hgUW1$jsxs)("div", {
                                             className: "ds-u-display--flex ds-u-justify-content--between ds-u-align-items--end ds-u-flex-wrap--reverse ds-u-sm-flex-wrap--wrap",
                                             children: [
-                                                enablePagination && /*#__PURE__*/ (0, $hgUW1$jsxs)("div", {
+                                                enablePagination && /*#__PURE__*/ (0, $hgUW1$jsx)("div", {
                                                     className: "ds-l-col--12 ds-l-sm-col--6 ds-l-md-col--8 ds-u-sm-padding-left--0",
-                                                    children: [
-                                                        /*#__PURE__*/ (0, $hgUW1$jsx)("p", {
-                                                            className: "ds-u-margin-y--0",
-                                                            "aria-hidden": "true",
-                                                            children: currentResultNumbers && data && /*#__PURE__*/ (0, $hgUW1$jsxs)((0, $hgUW1$Fragment), {
-                                                                children: [
-                                                                    "Showing ",
-                                                                    currentResultNumbers.startingNumber,
-                                                                    " -",
-                                                                    " ",
-                                                                    currentResultNumbers.endingNumber,
-                                                                    " of ",
-                                                                    data.data.total,
-                                                                    " datasets"
-                                                                ]
-                                                            })
-                                                        }),
-                                                        /*#__PURE__*/ (0, $hgUW1$jsx)("p", {
-                                                            className: "ds-u-visibility--screen-reader",
-                                                            role: "status",
-                                                            "aria-live": "assertive",
-                                                            "aria-atomic": "true",
-                                                            "data-testid": "currentResults",
-                                                            children: announcementText
+                                                    children: /*#__PURE__*/ (0, $hgUW1$jsx)("p", {
+                                                        className: "ds-u-margin-y--0",
+                                                        children: currentResultNumbers && data && /*#__PURE__*/ (0, $hgUW1$jsxs)((0, $hgUW1$Fragment), {
+                                                            children: [
+                                                                "Showing ",
+                                                                currentResultNumbers.startingNumber,
+                                                                " -",
+                                                                " ",
+                                                                currentResultNumbers.endingNumber,
+                                                                " of ",
+                                                                data.data.total,
+                                                                " datasets"
+                                                            ]
                                                         })
-                                                    ]
+                                                    })
                                                 }),
                                                 enableSort && /*#__PURE__*/ (0, $hgUW1$jsx)("div", {
                                                     className: "ds-l-col--12 ds-l-sm-col--6 ds-l-md-col--4 ds-u-sm-padding-right--0",
@@ -4767,6 +4766,7 @@ const $e873081a6e8f024e$var$DatasetSearch = (props)=>{
                                             children: [
                                                 noResults && /*#__PURE__*/ (0, $hgUW1$jsx)((0, $hgUW1$Alert), {
                                                     variation: "error",
+                                                    role: "region",
                                                     heading: "No results found."
                                                 }),
                                                 data && data.data.results ? Object.keys(data.data.results).map((key)=>{
@@ -4794,6 +4794,7 @@ const $e873081a6e8f024e$var$DatasetSearch = (props)=>{
                                                     }, item.identifier);
                                                 }) : /*#__PURE__*/ (0, $hgUW1$jsx)((0, $hgUW1$Alert), {
                                                     variation: "error",
+                                                    role: "region",
                                                     heading: "Could not connect to the API."
                                                 })
                                             ]
@@ -4906,37 +4907,6 @@ const $550bcc185f420ff5$var$DatasetList = ({ rootUrl: rootUrl, enableSort: enabl
         }
     };
     const pageSize = defaultPageSize;
-    (0, $hgUW1$useEffect)(()=>{
-        // Update browser URL with current search params
-        const params = buildSearchParams(true);
-        const url = new URL(window.location.href);
-        window.history.pushState({}, "", `${url.origin}${url.pathname}${params}`);
-        const baseNumber = Number(totalItems) > 0 ? 1 : 0;
-        const startingNumber = baseNumber + (Number(pageSize) * Number(page) - Number(pageSize));
-        const endingNumber = Number(pageSize) * Number(page);
-        setCurrentResultNumbers({
-            total: Number(totalItems),
-            startingNumber: Number(totalItems) >= startingNumber ? startingNumber : 0,
-            endingNumber: Number(totalItems) < endingNumber ? Number(totalItems) : endingNumber
-        });
-        setTimeout(()=>{
-            setAnnouncementText(`Showing ${startingNumber} to ${endingNumber} of ${totalItems} datasets`);
-        }, 100);
-        if (totalItems <= 0 && currentResultNumbers !== null) setNoResults(true);
-        else setNoResults(false);
-    }, [
-        totalItems,
-        pageSize,
-        page
-    ]);
-    (0, $hgUW1$useEffect)(()=>{
-        var params = buildSearchParams(true);
-        if (params !== location.search) setSearchParams(params);
-    }, [
-        page,
-        sort,
-        sortOrder
-    ]);
     function buildSearchParams(includePage) {
         let newParams = {};
         if (Number(page) !== 1 && includePage) newParams.page = page;
@@ -4966,6 +4936,45 @@ const $550bcc185f420ff5$var$DatasetList = ({ rootUrl: rootUrl, enableSort: enabl
         }
     });
     if (data && data.data.total && totalItems != data.data.total) setTotalItems(data.data.total);
+    (0, $hgUW1$useEffect)(()=>{
+        // Update browser URL with current search params
+        const params = buildSearchParams(true);
+        const url = new URL(window.location.href);
+        window.history.pushState({}, "", `${url.origin}${url.pathname}${params}`);
+        const baseNumber = Number(totalItems) > 0 ? 1 : 0;
+        const startingNumber = baseNumber + (Number(pageSize) * Number(page) - Number(pageSize));
+        const endingNumber = Number(pageSize) * Number(page);
+        setCurrentResultNumbers({
+            total: Number(totalItems),
+            startingNumber: Number(totalItems) >= startingNumber ? startingNumber : 0,
+            endingNumber: Number(totalItems) < endingNumber ? Number(totalItems) : endingNumber
+        });
+        if (totalItems <= 0 && currentResultNumbers !== null) setNoResults(true);
+        else setNoResults(false);
+    }, [
+        totalItems,
+        pageSize,
+        page
+    ]);
+    (0, $hgUW1$useEffect)(()=>{
+        var params = buildSearchParams(true);
+        if (params !== location.search) setSearchParams(params);
+    }, [
+        page,
+        sort,
+        sortOrder
+    ]);
+    (0, $hgUW1$useEffect)(()=>{
+        // No results found
+        if (noResults) setAnnouncementText("No results found.");
+        else if (!isPending && (!data || !data.data.results)) setAnnouncementText("Could not connect to the API.");
+        else setAnnouncementText(`Showing ${currentResultNumbers.startingNumber} to ${currentResultNumbers.endingNumber} of ${currentResultNumbers.total} datasets`);
+    }, [
+        data,
+        isPending,
+        noResults,
+        currentResultNumbers
+    ]);
     return /*#__PURE__*/ (0, $hgUW1$jsxs)((0, $hgUW1$Fragment), {
         children: [
             /*#__PURE__*/ (0, $hgUW1$jsx)((0, $5723016a5461c1ca$export$2e2bcd8739ae039), {
@@ -4974,6 +4983,15 @@ const $550bcc185f420ff5$var$DatasetList = ({ rootUrl: rootUrl, enableSort: enabl
             /*#__PURE__*/ (0, $hgUW1$jsxs)("section", {
                 className: "ds-l-container",
                 children: [
+                    /*#__PURE__*/ (0, $hgUW1$jsx)("div", {
+                        children: /*#__PURE__*/ (0, $hgUW1$jsx)("p", {
+                            className: "ds-u-visibility--screen-reader",
+                            "aria-live": "assertive",
+                            "aria-atomic": "true",
+                            "data-testid": "currentResults",
+                            children: announcementText
+                        })
+                    }),
                     /*#__PURE__*/ (0, $hgUW1$jsx)("div", {
                         className: "ds-l-row",
                         children: /*#__PURE__*/ (0, $hgUW1$jsx)("div", {
@@ -5014,33 +5032,22 @@ const $550bcc185f420ff5$var$DatasetList = ({ rootUrl: rootUrl, enableSort: enabl
                                                         className: "ds-u-margin-bottom--3",
                                                         children: introText ? introText : null
                                                     }),
-                                                    enablePagination && /*#__PURE__*/ (0, $hgUW1$jsxs)("div", {
-                                                        children: [
-                                                            /*#__PURE__*/ (0, $hgUW1$jsx)("p", {
-                                                                className: "ds-u-margin-y--0",
-                                                                "aria-hidden": "true",
-                                                                children: currentResultNumbers && data && /*#__PURE__*/ (0, $hgUW1$jsxs)((0, $hgUW1$Fragment), {
-                                                                    children: [
-                                                                        "Showing ",
-                                                                        currentResultNumbers.startingNumber,
-                                                                        " -",
-                                                                        " ",
-                                                                        currentResultNumbers.endingNumber,
-                                                                        " of ",
-                                                                        data.data.total,
-                                                                        " datasets"
-                                                                    ]
-                                                                })
-                                                            }),
-                                                            /*#__PURE__*/ (0, $hgUW1$jsx)("p", {
-                                                                className: "ds-u-visibility--screen-reader",
-                                                                role: "status",
-                                                                "aria-live": "assertive",
-                                                                "aria-atomic": "true",
-                                                                "data-testid": "currentResults",
-                                                                children: announcementText
+                                                    enablePagination && /*#__PURE__*/ (0, $hgUW1$jsx)("div", {
+                                                        children: /*#__PURE__*/ (0, $hgUW1$jsx)("p", {
+                                                            className: "ds-u-margin-y--0",
+                                                            children: currentResultNumbers && data && /*#__PURE__*/ (0, $hgUW1$jsxs)((0, $hgUW1$Fragment), {
+                                                                children: [
+                                                                    "Showing ",
+                                                                    currentResultNumbers.startingNumber,
+                                                                    " -",
+                                                                    " ",
+                                                                    currentResultNumbers.endingNumber,
+                                                                    " of ",
+                                                                    data.data.total,
+                                                                    " datasets"
+                                                                ]
                                                             })
-                                                        ]
+                                                        })
                                                     })
                                                 ]
                                             }),
@@ -5063,6 +5070,7 @@ const $550bcc185f420ff5$var$DatasetList = ({ rootUrl: rootUrl, enableSort: enabl
                                         children: [
                                             noResults && /*#__PURE__*/ (0, $hgUW1$jsx)((0, $hgUW1$Alert), {
                                                 variation: "error",
+                                                role: "region",
                                                 heading: "No results found."
                                             }),
                                             data && data.data.results ? Object.keys(data.data.results).map((key)=>{
@@ -5077,6 +5085,7 @@ const $550bcc185f420ff5$var$DatasetList = ({ rootUrl: rootUrl, enableSort: enabl
                                                 }, item.identifier);
                                             }) : /*#__PURE__*/ (0, $hgUW1$jsx)((0, $hgUW1$Alert), {
                                                 variation: "error",
+                                                role: "region",
                                                 heading: "Could not connect to the API."
                                             })
                                         ]
@@ -5193,11 +5202,6 @@ const $1d3d480a9cfaabe0$var$useDatastore = (resourceId, rootAPIUrl, options, add
     const [schema, setSchema] = (0, $hgUW1$useState)({});
     // const [joins, setJoins] = useState()
     const [properties, setProperties] = (0, $hgUW1$useState)(options.properties ? options.properties : undefined);
-    // Check drupalSettings for datastore_query_api
-    const useDatasetAPI = typeof window !== "undefined" && window.drupalSettings?.datastore_query_api === true;
-    const datasetID = additionalParams.datasetID;
-    // Remove datasetID from params to avoid sending it to the API
-    const { datasetID: _, ...restAdditionalParams } = additionalParams;
     let params = {
         keys: keys,
         limit: limit,
@@ -5206,7 +5210,7 @@ const $1d3d480a9cfaabe0$var$useDatastore = (resourceId, rootAPIUrl, options, add
         sorts: sort,
         properties: properties,
         groupings: groupings,
-        ...restAdditionalParams
+        ...additionalParams
     };
     params = (0, $6d5c0212e738499b$export$34e95918366a058e)(params, ACA);
     const paramsString = Object.keys(params).length ? `${(0, $hgUW1$qs).stringify(params)}` : "";
@@ -5215,15 +5219,13 @@ const $1d3d480a9cfaabe0$var$useDatastore = (resourceId, rootAPIUrl, options, add
         if (!requireConditions) enabled = true;
         if (conditions && conditions.length) enabled = true;
     }
-    // Change whether distribution API or dataset API is used based on option
-    const queryID = useDatasetAPI && datasetID ? `${datasetID}/0` : id;
     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 fetch(`${rootUrl}/datastore/query/${id}?${paramsString}`).then((res)=>res.json());
         },
         enabled: enabled
     });
@@ -5237,7 +5239,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 fetch(`${rootUrl}/datastore/query/${id}?${(0, $hgUW1$qs).stringify((0, $6d5c0212e738499b$export$34e95918366a058e)(unfilteredParams, ACA))}`).then((res)=>res.json());
         }
     });
     (0, $hgUW1$useEffect)(()=>{
@@ -6332,6 +6334,7 @@ var $2bd73bb95b0c04ed$export$2e2bcd8739ae039 = $2bd73bb95b0c04ed$var$DatasetDesc
 
 
 
+
 const $a0f13962e513caa1$var$getDataDictionary = (dataDictionaryUrl)=>{
     const { ACA: ACA } = (0, $hgUW1$useContext)((0, $844981eac9b63865$export$eccc29c8d0ff408));
     const { data: data, isPending: isPending, error: error } = (0, $hgUW1$useQuery)({
@@ -6350,7 +6353,8 @@ const $a0f13962e513caa1$var$getDataDictionary = (dataDictionaryUrl)=>{
         dataDictionaryLoading: isPending
     };
 };
-const $a0f13962e513caa1$var$Dataset = ({ id: id, rootUrl: rootUrl, customColumns: customColumns, setDatasetTitle: setDatasetTitle, customMetadataMapping: customMetadataMapping, apiPageUrl: apiPageUrl = "/api", dataDictionaryUrl: dataDictionaryUrl, borderlessTabs: borderlessTabs = false, defaultPageSize: defaultPageSize = 25, dataDictionaryCSV: dataDictionaryCSV = false, dataDictionaryBanner: dataDictionaryBanner = false, disableTableControls: disableTableControls = false, hideDataDictionary: hideDataDictionary = false, customDescription: customDescription, updateAriaLive: updateAriaLive, showRowLimitNotice: showRowLimitNotice = false })=>{
+const $a0f13962e513caa1$var$Dataset = ({ id: id, rootUrl: rootUrl, customColumns: customColumns, setDatasetTitle: setDatasetTitle, customMetadataMapping: customMetadataMapping, apiPageUrl: apiPageUrl = "/api", dataDictionaryUrl: dataDictionaryUrl, borderlessTabs: borderlessTabs = false, defaultPageSize: defaultPageSize = 25, dataDictionaryCSV: dataDictionaryCSV = false, dataDictionaryBanner: dataDictionaryBanner = false, disableTableControls: disableTableControls = false, hideDataDictionary: hideDataDictionary = false, customDescription: customDescription, updateAriaLive: updateAriaLive, showRowLimitNotice: showRowLimitNotice = false, tabHrefPrepend: tabHrefPrepend = "", showDateDetails: showDateDetails = false })=>{
+    const tabHref = `/dataset/${id}`;
     const options = location.search ? {
         ...(0, $hgUW1$qs).parse(location.search, {
             ignoreQueryPrefix: true
@@ -6370,8 +6374,6 @@ const $a0f13962e513caa1$var$Dataset = ({ id: id, rootUrl: rootUrl, customColumns
     const resource = (0, $1d3d480a9cfaabe0$export$2e2bcd8739ae039)("", rootUrl, {
         ...options,
         limit: defaultPageSize
-    }, {
-        datasetID: id // pass datasetID into additional params to enable dataset API option in useDatastore
     });
     const siteWideDataDictionary = dataDictionaryUrl ? $a0f13962e513caa1$var$getDataDictionary(rootUrl + dataDictionaryUrl).dataDictionary : null;
     // compare schema fields with siteWideDataDictionary to display commonalities for now
@@ -6437,6 +6439,11 @@ const $a0f13962e513caa1$var$Dataset = ({ id: id, rootUrl: rootUrl, customColumns
         window.location.hash
     ]);
     const displayDataDictionaryTab = distribution.data && distribution.data.describedBy && distribution.data.describedByType === "application/vnd.tableschema+json" || datasetSitewideDictionary && datasetSitewideDictionary.length > 0;
+    const date = {
+        modified: dataset.modified,
+        released: dataset.released,
+        refresh: dataset.nextUpdateDate
+    };
     return /*#__PURE__*/ (0, $hgUW1$jsx)((0, $hgUW1$Fragment), {
         children: dataset.error ? /*#__PURE__*/ (0, $hgUW1$jsx)((0, $026cb986f9fea2b1$export$2e2bcd8739ae039), {
             content: notFoundContent,
@@ -6455,13 +6462,17 @@ const $a0f13962e513caa1$var$Dataset = ({ id: id, rootUrl: rootUrl, customColumns
                             })
                         }),
                         /*#__PURE__*/ (0, $hgUW1$jsx)("div", {
-                            className: "ds-l-md-col--12 ds-u-margin-y--1 ds-u-text-align--right",
-                            children: /*#__PURE__*/ (0, $hgUW1$jsxs)("p", {
-                                className: "ds-u-margin--0",
+                            className: "ds-l-md-col--12 ds-u-margin-y--2",
+                            children: showDateDetails ? /*#__PURE__*/ (0, $hgUW1$jsx)((0, $20de4fedf33d4f9a$export$2e2bcd8739ae039), {
+                                date: date,
+                                modifiedBoldLabel: true,
+                                displayTooltips: true
+                            }) : /*#__PURE__*/ (0, $hgUW1$jsxs)("p", {
+                                className: "ds-u-margin--0 ds-u-font-weight--bold",
                                 children: [
                                     "Updated ",
                                     /*#__PURE__*/ (0, $hgUW1$jsx)((0, $bd76a91923d7e8a7$export$2e2bcd8739ae039), {
-                                        date: dataset.modified
+                                        date: date.modified
                                     })
                                 ]
                             })
@@ -6499,6 +6510,7 @@ const $a0f13962e513caa1$var$Dataset = ({ id: id, rootUrl: rootUrl, customColumns
                                             "Data Table"
                                         ]
                                     }),
+                                    tabHref: `${tabHrefPrepend}${tabHref}#data-table`,
                                     className: borderlessTabs ? "ds-u-border--0 ds-u-padding-x--0" : "",
                                     children: (0, $f764661366bd9e1b$export$ee48b7e0e4eb536e)(distribution) === "csv" ? /*#__PURE__*/ (0, $hgUW1$jsx)((0, $43a30d745a7bbc86$export$2e2bcd8739ae039).Provider, {
                                         value: {
@@ -6526,6 +6538,7 @@ const $a0f13962e513caa1$var$Dataset = ({ id: id, rootUrl: rootUrl, customColumns
                                             "Overview"
                                         ]
                                     }),
+                                    tabHref: `${tabHrefPrepend}${tabHref}#overview`,
                                     className: borderlessTabs ? "ds-u-border--0 ds-u-padding-x--0" : "",
                                     children: /*#__PURE__*/ (0, $hgUW1$jsx)((0, $364dc44850cd8f7f$export$2e2bcd8739ae039), {
                                         resource: resource,
@@ -6546,6 +6559,7 @@ const $a0f13962e513caa1$var$Dataset = ({ id: id, rootUrl: rootUrl, customColumns
                                             "Data Dictionary"
                                         ]
                                     }),
+                                    tabHref: `${tabHrefPrepend}${tabHref}#data-dictionary`,
                                     className: borderlessTabs ? "ds-u-border--0 ds-u-padding-x--0" : "",
                                     children: displayDataDictionaryTab ? /*#__PURE__*/ (0, $hgUW1$jsx)((0, $6012b86ffcaf3f71$export$2e2bcd8739ae039), {
                                         datasetSitewideDictionary: datasetSitewideDictionary,
@@ -6567,6 +6581,7 @@ const $a0f13962e513caa1$var$Dataset = ({ id: id, rootUrl: rootUrl, customColumns
                                             "API"
                                         ]
                                     }),
+                                    tabHref: `${tabHrefPrepend}${tabHref}#api`,
                                     className: borderlessTabs ? "ds-u-border--0 ds-u-padding-x--0" : "",
                                     children: /*#__PURE__*/ (0, $hgUW1$jsx)((0, $cf6eaefd6b928de3$export$2e2bcd8739ae039), {
                                         id: id,
@@ -7779,8 +7794,6 @@ const $dd6eb2b30d7ad75d$var$FilteredResourceBody = ({ id: id, dataset: dataset,
     const resource = (0, $1d3d480a9cfaabe0$export$2e2bcd8739ae039)("", rootUrl, {
         ...options,
         limit: 25
-    }, {
-        datasetID: id
     });
     (0, $hgUW1$useEffect)(()=>{
         if (distribution.identifier) resource.setResource(distribution.identifier);