@civicactions/cmsds-open-data-components 3.6.0-rc.3 → 3.6.0-rc.4

package/dist/main.js

@@ -19,7 +19,6 @@ import {restrictToVerticalAxis as $hgUW1$restrictToVerticalAxis} from "@dnd-kit/
 import {CSS as $hgUW1$CSS} from "@dnd-kit/utilities";
 import $hgUW1$reactdatepicker from "react-datepicker";
 import "react-datepicker/dist/react-datepicker.css";
-import {usePopper as $hgUW1$usePopper} from "react-popper";
 
 // Components
 
@@ -1731,7 +1730,6 @@ var $e873081a6e8f024e$export$2e2bcd8739ae039 = (0, $61ff88fb3f6ee2c8$export$2e2b
 
 
 
-
 const $b4aa9c66f2e86959$var$useMetastoreDataset = (datasetId, rootAPIUrl, additionalParams = {})=>{
     const [dataset, setDataset] = (0, $hgUW1$useState)({
         title: "",
@@ -3470,7 +3468,7 @@ const $d98f94c79ddf4e0e$var$DataTable = ({ columns: columns, sortTransform: sort
     });
     const [highlightRow, setHighlightRow] = (0, $hgUW1$useState)(null);
     (0, $hgUW1$useEffect)(()=>{
-        if (!columnOrder.length) setColumnOrder(table_columns.map((c)=>c.accessorKey));
+        if (columnOrder && !columnOrder.length) setColumnOrder(table_columns.map((c)=>c.accessorKey));
     }, [
         columnOrder
     ]);
@@ -4148,7 +4146,7 @@ function $ee4ad47aa483e5b5$var$updateQueryForDatastore(condition) {
     if (Array.isArray(cond.value)) cond.value = cond.value.map((v)=>v.trim().replace(/(^\%+|\%+$)/gm, ""));
     return cond;
 }
-const $ee4ad47aa483e5b5$var$QueryBuilder = ({ resource: resource, id: id, includeSearchParams: includeSearchParams = true, customColumns: customColumns, isModal: isModal = false })=>{
+const $ee4ad47aa483e5b5$var$QueryBuilder = ({ resource: resource, id: id, customColumns: customColumns, isModal: isModal = false })=>{
     const { conditions: conditions, schema: schema, setConditions: setConditions } = resource;
     const fields = Object.keys(schema[id].fields);
     const [queryConditions, setQueryConditions] = (0, $hgUW1$useState)([]);
@@ -4205,16 +4203,14 @@ const $ee4ad47aa483e5b5$var$QueryBuilder = ({ resource: resource, id: id, includ
         };
     });
     const updateBrowserURL = (newConditions)=>{
-        if (includeSearchParams) {
-            const url = new URL(window.location.href);
-            const urlString = (0, $hgUW1$qs).stringify({
-                conditions: newConditions
-            }, {
-                encodeValuesOnly: true,
-                addQueryPrefix: true
-            });
-            window.history.pushState({}, "", `${url.origin}${url.pathname}${urlString}`);
-        }
+        const url = new URL(window.location.href);
+        const urlString = (0, $hgUW1$qs).stringify({
+            conditions: newConditions
+        }, {
+            encodeValuesOnly: true,
+            addQueryPrefix: true
+        });
+        window.history.pushState({}, "", `${url.origin}${url.pathname}${urlString}`);
     };
     const submitConditions = (e)=>{
         // only update the data conditions when "Apply filters" is pressed
@@ -4421,6 +4417,40 @@ var $39bc4d98030a5599$export$2e2bcd8739ae039 = $39bc4d98030a5599$var$DataTableSt
 
 
 
+
+
+
+const $2bd73bb95b0c04ed$var$DatasetDescription = ({ distribution: distribution, dataset: dataset, resource: resource, customDescription: customDescription, updateAriaLive: updateAriaLive })=>{
+    const [description, setDescription] = (0, $hgUW1$useState)("");
+    if (!distribution && !dataset?.identifier) return null;
+    (0, $hgUW1$useEffect)(()=>{
+        let newDescription = "";
+        if (customDescription) newDescription = customDescription(dataset, distribution, resource);
+        else {
+            if (distribution.data && distribution.data.description) newDescription = distribution.data.description;
+            else if (dataset.description) newDescription = dataset.description;
+        }
+        if (description !== newDescription && updateAriaLive) updateAriaLive(newDescription);
+        setDescription(newDescription);
+    }, [
+        resource,
+        distribution,
+        dataset,
+        customDescription
+    ]);
+    return /*#__PURE__*/ (0, $hgUW1$jsx)("div", {
+        className: "ds-u-measure--wide ds-u-margin-bottom--7",
+        children: /*#__PURE__*/ (0, $hgUW1$jsx)("div", {
+            className: "ds-u-margin-top--0 dc-c-metadata-description",
+            dangerouslySetInnerHTML: {
+                __html: (0, $hgUW1$dompurify).sanitize(description)
+            }
+        })
+    });
+};
+var $2bd73bb95b0c04ed$export$2e2bcd8739ae039 = $2bd73bb95b0c04ed$var$DatasetDescription;
+
+
 const $a0f13962e513caa1$var$getDataDictionary = (dataDictionaryUrl, additionalParams)=>{
     const { data: data, isPending: isPending, error: error } = (0, $hgUW1$useQuery)({
         queryKey: [
@@ -4438,7 +4468,7 @@ const $a0f13962e513caa1$var$getDataDictionary = (dataDictionaryUrl, additionalPa
         dataDictionaryLoading: isPending
     };
 };
-const $a0f13962e513caa1$var$Dataset = ({ id: id, rootUrl: rootUrl, additionalParams: additionalParams, 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 })=>{
+const $a0f13962e513caa1$var$Dataset = ({ id: id, rootUrl: rootUrl, additionalParams: additionalParams, 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 })=>{
     const options = location.search ? {
         ...(0, $hgUW1$qs).parse(location.search, {
             ignoreQueryPrefix: true
@@ -4554,14 +4584,12 @@ const $a0f13962e513caa1$var$Dataset = ({ id: id, rootUrl: rootUrl, additionalPar
                         }),
                         /*#__PURE__*/ (0, $hgUW1$jsx)("div", {
                             className: "ds-l-md-col--9",
-                            children: /*#__PURE__*/ (0, $hgUW1$jsx)("div", {
-                                className: "ds-u-measure--wide ds-u-margin-bottom--7",
-                                children: /*#__PURE__*/ (0, $hgUW1$jsx)("div", {
-                                    className: "dc-c-metadata-description ds-u-margin--0",
-                                    dangerouslySetInnerHTML: {
-                                        __html: (0, $hgUW1$dompurify).sanitize(dataset.description)
-                                    }
-                                })
+                            children: /*#__PURE__*/ (0, $hgUW1$jsx)((0, $2bd73bb95b0c04ed$export$2e2bcd8739ae039), {
+                                distribution: distribution,
+                                dataset: dataset,
+                                resource: resource,
+                                customDescription: customDescription,
+                                updateAriaLive: updateAriaLive
                             })
                         })
                     ]
@@ -4620,7 +4648,7 @@ const $a0f13962e513caa1$var$Dataset = ({ id: id, rootUrl: rootUrl, additionalPar
                                         metadataMapping: metadataMapping
                                     })
                                 }),
-                                /*#__PURE__*/ (0, $hgUW1$jsxs)((0, $hgUW1$TabPanel), {
+                                !hideDataDictionary && /*#__PURE__*/ (0, $hgUW1$jsxs)((0, $hgUW1$TabPanel), {
                                     id: "data-dictionary",
                                     tab: /*#__PURE__*/ (0, $hgUW1$jsxs)("span", {
                                         className: "ds-u-color--primary",
@@ -5627,8 +5655,6 @@ var $59a079354baa335c$export$2e2bcd8739ae039 = $59a079354baa335c$var$Hero;
 
 
 
-
-
 const $1e012d1e3b534af0$var$DataTableDensity = ({ setTablePadding: setTablePadding, tablePadding: tablePadding })=>{
     return /*#__PURE__*/ (0, $hgUW1$jsx)("div", {
         className: "ds-u-display--flex",
@@ -5784,122 +5810,96 @@ var $ec9e1550b0b034d0$export$2e2bcd8739ae039 = $ec9e1550b0b034d0$var$SettingsIco
 
 
 
-const $af099c546cb226c7$var$ResourceHeader = ({ setTablePadding: setTablePadding, id: id, distribution: distribution, includeFiltered: includeFiltered, includeDensity: includeDensity, includeDownload: includeDownload, resource: resource, tablePadding: tablePadding, downloadUrl: downloadUrl })=>{
+const $af099c546cb226c7$var$ResourceHeader = ({ setTablePadding: setTablePadding, includeDensity: includeDensity, includeDownload: includeDownload, resource: resource, tablePadding: tablePadding, downloadUrl: downloadUrl })=>{
     const md = (0, $hgUW1$useMediaQuery)({
         minWidth: 0,
         maxWidth: 768
     });
     const { limit: limit, offset: offset, count: count, setLimit: setLimit, setOffset: setOffset } = resource;
     const intCount = count ? parseInt(count) : 0;
-    const [referenceElement, setReferenceElement] = (0, $hgUW1$useState)(null);
-    const [popperElement, setPopperElement] = (0, $hgUW1$useState)(null);
-    const [arrowElement, setArrowElement] = (0, $hgUW1$useState)(null);
-    const { styles: styles, attributes: attributes } = (0, $hgUW1$usePopper)(referenceElement, popperElement, {
-        modifiers: [
-            {
-                name: "arrow",
-                options: {
-                    element: arrowElement
-                }
-            }
-        ]
-    });
-    return /*#__PURE__*/ (0, $hgUW1$jsxs)("div", {
+    return /*#__PURE__*/ (0, $hgUW1$jsx)("div", {
         className: "dc-c-resource-header",
-        children: [
-            /*#__PURE__*/ (0, $hgUW1$jsx)("div", {
-                className: "ds-l-row",
-                children: /*#__PURE__*/ (0, $hgUW1$jsx)("div", {
-                    className: "ds-l-col--12",
-                    children: includeFiltered && /*#__PURE__*/ (0, $hgUW1$jsx)((0, $hgUW1$Link), {
-                        className: "ds-c-button ds-c-button--solid",
-                        to: `/dataset/${id}/data`,
-                        children: "View and filter data"
-                    })
-                })
-            }),
-            /*#__PURE__*/ (0, $hgUW1$jsx)("div", {
-                className: "ds-l-row ds-u-align-items--center",
-                children: /*#__PURE__*/ (0, $hgUW1$jsxs)("div", {
-                    className: "ds-l-col--12 ds-u-display--flex ds-u-justify-content--between ds-u-align-items--center",
-                    children: [
-                        /*#__PURE__*/ (0, $hgUW1$jsx)("div", {
-                            className: "ds-u-font-weight--bold ds-u-margin-bottom--2",
-                            children: /*#__PURE__*/ (0, $hgUW1$jsx)((0, $2ed0091f7e32d1e6$export$2e2bcd8739ae039), {
-                                totalRows: parseInt(intCount),
-                                limit: parseInt(limit),
-                                offset: parseInt(offset)
-                            })
-                        }),
-                        /*#__PURE__*/ (0, $hgUW1$jsxs)("div", {
-                            className: "dc-c-resource-header--buttons",
-                            children: [
-                                includeDownload && /*#__PURE__*/ (0, $hgUW1$jsxs)((0, $hgUW1$Fragment), {
-                                    children: [
-                                        /*#__PURE__*/ (0, $hgUW1$jsxs)((0, $hgUW1$Button), {
-                                            size: "small",
-                                            className: "ds-u-text-align--left ds-u-font-weight--normal ds-u-font-size--base ds-u-margin-right--1",
-                                            href: downloadUrl,
-                                            children: [
-                                                /*#__PURE__*/ (0, $hgUW1$jsx)((0, $e973bc477cdc2dc7$export$2e2bcd8739ae039), {}),
-                                                !md && /*#__PURE__*/ (0, $hgUW1$jsx)("span", {
-                                                    className: "ds-u-font-weight--semibold ds-u-margin-left--1",
-                                                    children: "Download filtered data (CSV)"
-                                                })
-                                            ]
-                                        }),
-                                        /*#__PURE__*/ (0, $hgUW1$jsxs)((0, $hgUW1$Tooltip), {
-                                            onOpen: ()=>{
-                                                navigator.clipboard.writeText(window.location.href);
-                                            },
-                                            className: "ds-c-button ds-c-button--small ds-u-text-align--left ds-u-margin-right--1 display-settings-font",
-                                            placement: "bottom",
-                                            dialog: true,
-                                            ariaLabel: "Copy link to filtered data",
-                                            title: "Link copied to clipboard",
-                                            children: [
-                                                /*#__PURE__*/ (0, $hgUW1$jsx)((0, $7ec5423a30aa3f61$export$2e2bcd8739ae039), {}),
-                                                !md && /*#__PURE__*/ (0, $hgUW1$jsx)("span", {
-                                                    className: "ds-u-font-weight--semibold ds-u-margin-left--1",
-                                                    children: "Copy link to filtered data"
-                                                })
-                                            ]
-                                        })
-                                    ]
-                                }),
-                                /*#__PURE__*/ (0, $hgUW1$jsxs)((0, $hgUW1$Tooltip), {
-                                    className: "ds-c-button ds-c-button--small ds-u-text-align--left display-settings-font",
-                                    placement: "bottom",
-                                    dialog: true,
-                                    ariaLabel: "Display settings",
-                                    title: /*#__PURE__*/ (0, $hgUW1$jsxs)("div", {
-                                        className: "dc-c-display-settings",
+        children: /*#__PURE__*/ (0, $hgUW1$jsx)("div", {
+            className: "ds-l-row ds-u-align-items--center",
+            children: /*#__PURE__*/ (0, $hgUW1$jsxs)("div", {
+                className: "ds-l-col--12 ds-u-display--flex ds-u-justify-content--between ds-u-align-items--center ds-u-margin-bottom--2",
+                children: [
+                    /*#__PURE__*/ (0, $hgUW1$jsx)("div", {
+                        className: "ds-u-font-weight--bold",
+                        children: !resource.loading && resource.count !== null && /*#__PURE__*/ (0, $hgUW1$jsx)((0, $2ed0091f7e32d1e6$export$2e2bcd8739ae039), {
+                            totalRows: parseInt(intCount),
+                            limit: parseInt(limit),
+                            offset: parseInt(offset)
+                        })
+                    }),
+                    /*#__PURE__*/ (0, $hgUW1$jsxs)("div", {
+                        className: "dc-c-resource-header--buttons",
+                        children: [
+                            includeDownload && /*#__PURE__*/ (0, $hgUW1$jsxs)((0, $hgUW1$Fragment), {
+                                children: [
+                                    /*#__PURE__*/ (0, $hgUW1$jsxs)((0, $hgUW1$Button), {
+                                        size: "small",
+                                        className: "ds-u-text-align--left ds-u-font-weight--normal ds-u-font-size--base ds-u-margin-right--1",
+                                        href: downloadUrl,
                                         children: [
-                                            /*#__PURE__*/ (0, $hgUW1$jsx)((0, $7848c69a021266f7$export$2e2bcd8739ae039), {
-                                                limit: limit,
-                                                setLimit: setLimit,
-                                                setOffset: setOffset
-                                            }),
-                                            includeDensity && /*#__PURE__*/ (0, $hgUW1$jsx)((0, $1e012d1e3b534af0$export$2e2bcd8739ae039), {
-                                                setTablePadding: setTablePadding,
-                                                tablePadding: tablePadding
+                                            /*#__PURE__*/ (0, $hgUW1$jsx)((0, $e973bc477cdc2dc7$export$2e2bcd8739ae039), {}),
+                                            !md && /*#__PURE__*/ (0, $hgUW1$jsx)("span", {
+                                                className: "ds-u-font-weight--semibold ds-u-margin-left--1",
+                                                children: "Download filtered data (CSV)"
                                             })
                                         ]
                                     }),
+                                    /*#__PURE__*/ (0, $hgUW1$jsxs)((0, $hgUW1$Tooltip), {
+                                        onOpen: ()=>{
+                                            navigator.clipboard.writeText(window.location.href);
+                                        },
+                                        className: "ds-c-button ds-c-button--small ds-u-text-align--left ds-u-margin-right--1 display-settings-font",
+                                        placement: "bottom",
+                                        dialog: true,
+                                        ariaLabel: "Copy link to filtered data",
+                                        title: "Link copied to clipboard",
+                                        children: [
+                                            /*#__PURE__*/ (0, $hgUW1$jsx)((0, $7ec5423a30aa3f61$export$2e2bcd8739ae039), {}),
+                                            !md && /*#__PURE__*/ (0, $hgUW1$jsx)("span", {
+                                                className: "ds-u-font-weight--semibold ds-u-margin-left--1",
+                                                children: "Copy link to filtered data"
+                                            })
+                                        ]
+                                    })
+                                ]
+                            }),
+                            /*#__PURE__*/ (0, $hgUW1$jsxs)((0, $hgUW1$Tooltip), {
+                                className: "ds-c-button ds-c-button--small ds-u-text-align--left display-settings-font",
+                                placement: "bottom",
+                                dialog: true,
+                                ariaLabel: "Display settings",
+                                title: /*#__PURE__*/ (0, $hgUW1$jsxs)("div", {
+                                    className: "dc-c-display-settings",
                                     children: [
-                                        /*#__PURE__*/ (0, $hgUW1$jsx)((0, $ec9e1550b0b034d0$export$2e2bcd8739ae039), {}),
-                                        !md && /*#__PURE__*/ (0, $hgUW1$jsx)("span", {
-                                            className: "ds-u-font-weight--semibold ds-u-margin-left--1",
-                                            children: "Display settings"
+                                        /*#__PURE__*/ (0, $hgUW1$jsx)((0, $7848c69a021266f7$export$2e2bcd8739ae039), {
+                                            limit: Number(limit),
+                                            setLimit: setLimit,
+                                            setOffset: setOffset
+                                        }),
+                                        includeDensity && /*#__PURE__*/ (0, $hgUW1$jsx)((0, $1e012d1e3b534af0$export$2e2bcd8739ae039), {
+                                            setTablePadding: setTablePadding,
+                                            tablePadding: tablePadding
                                         })
                                     ]
-                                })
-                            ]
-                        })
-                    ]
-                })
+                                }),
+                                children: [
+                                    /*#__PURE__*/ (0, $hgUW1$jsx)((0, $ec9e1550b0b034d0$export$2e2bcd8739ae039), {}),
+                                    !md && /*#__PURE__*/ (0, $hgUW1$jsx)("span", {
+                                        className: "ds-u-font-weight--semibold ds-u-margin-left--1",
+                                        children: "Display settings"
+                                    })
+                                ]
+                            })
+                        ]
+                    })
+                ]
             })
-        ]
+        })
     });
 };
 var $af099c546cb226c7$export$2e2bcd8739ae039 = $af099c546cb226c7$var$ResourceHeader;
@@ -5940,6 +5940,7 @@ const $626282d9a03c51d5$var$ResourcePreview = ({ tablePadding: tablePadding, id:
             columns: customColumns ? customColumns : $626282d9a03c51d5$export$1147582dfae658c6(resource.columns, resource.schema[id]),
             sortTransform: (0, $aa4450dcbeef3ac0$export$385a5aba38cc3325),
             tablePadding: tablePadding,
+            loading: resource.loading,
             className: "dc-c-datatable",
             customColumnFilter: $626282d9a03c51d5$var$DefaultColumnFilter
         })
@@ -5955,7 +5956,6 @@ const $072291d44ce1834a$var$ResourceFooter = ({ resource: resource })=>{
     const { limit: limit, values: values, offset: offset, count: count, setOffset: setOffset } = resource;
     return /*#__PURE__*/ (0, $hgUW1$jsx)("div", {
         children: values.length > 0 && /*#__PURE__*/ (0, $hgUW1$jsx)((0, $hgUW1$Pagination), {
-            id: "test-default",
             currentPage: Number(offset) / limit + 1,
             totalPages: Math.ceil(Number(count) / limit),
             onPageChange: (evt, page)=>{
@@ -6178,7 +6178,7 @@ function $3b6ca952e79f0695$var$updateQueryForDatastore(condition) {
     if (Array.isArray(cond.value)) cond.value = cond.value.map((v)=>v.trim().replace(/(^\%+|\%+$)/gm, ""));
     return cond;
 }
-const $3b6ca952e79f0695$var$QueryBuilder = ({ resource: resource, id: id, includeSearchParams: includeSearchParams = true, customColumns: customColumns })=>{
+const $3b6ca952e79f0695$var$QueryBuilder = ({ resource: resource, id: id, customColumns: customColumns })=>{
     const { conditions: conditions, schema: schema, setConditions: setConditions } = resource;
     const fields = Object.keys(schema[id].fields);
     const [queryConditions, setQueryConditions] = (0, $hgUW1$useState)([]);
@@ -6227,16 +6227,14 @@ const $3b6ca952e79f0695$var$QueryBuilder = ({ resource: resource, id: id, includ
         setConditions(submitConditions);
         setTitleConditions(queryConditions.map((oc)=>Object.assign({}, oc)));
         setConditionsChanged(false);
-        if (includeSearchParams) {
-            const url = new URL(window.location);
-            const urlString = (0, $hgUW1$qs).stringify({
-                conditions: submitConditions
-            }, {
-                encodeValuesOnly: true,
-                addQueryPrefix: true
-            });
-            window.history.pushState({}, "", `${url.origin}${url.pathname}${urlString}`);
-        }
+        const url = new URL(window.location);
+        const urlString = (0, $hgUW1$qs).stringify({
+            conditions: submitConditions
+        }, {
+            encodeValuesOnly: true,
+            addQueryPrefix: true
+        });
+        window.history.pushState({}, "", `${url.origin}${url.pathname}${urlString}`);
     };
     const updateCondition = (index, key, value)=>{
         let newConditions = [
@@ -6306,28 +6304,8 @@ var $3b6ca952e79f0695$export$2e2bcd8739ae039 = $3b6ca952e79f0695$var$QueryBuilde
 
 
 
-const $de780c924c98fa31$var$FilteredResourceDescription = ({ distribution: distribution, dataset: dataset })=>{
-    if (!distribution && !dataset) return null;
-    let description = "";
-    if (distribution.data && distribution.data.description) description = distribution.data.description;
-    else if (dataset.description) description = dataset.description;
-    return /*#__PURE__*/ (0, $hgUW1$jsx)("div", {
-        className: "ds-u-measure--wide ds-u-margin-bottom--7",
-        children: /*#__PURE__*/ (0, $hgUW1$jsx)("div", {
-            className: "ds-u-margin-top--0 dc-c-metadata-description",
-            dangerouslySetInnerHTML: {
-                __html: (0, $hgUW1$dompurify).sanitize(description)
-            }
-        })
-    });
-};
-var $de780c924c98fa31$export$2e2bcd8739ae039 = $de780c924c98fa31$var$FilteredResourceDescription;
-
 
-
-
-
-const $dd6eb2b30d7ad75d$var$FilteredResourceBody = ({ id: id, dataset: dataset, distIndex: distIndex, location: location, additionalParams: additionalParams, customColumns: customColumns, columnSettings: columnSettings, columnWidths: columnWidths, customTitle: customTitle, rootUrl: rootUrl })=>{
+const $dd6eb2b30d7ad75d$var$FilteredResourceBody = ({ id: id, dataset: dataset, distIndex: distIndex, location: location, additionalParams: additionalParams, customColumns: customColumns, columnSettings: columnSettings, columnWidths: columnWidths, customTitle: customTitle, customDescription: customDescription, rootUrl: rootUrl, updateAriaLive: updateAriaLive })=>{
     const [tablePadding, setTablePadding] = (0, $hgUW1$react).useState("ds-u-padding-y--1");
     let apiDocs = (0, $hgUW1$useRef)();
     let distribution = {};
@@ -6393,9 +6371,12 @@ const $dd6eb2b30d7ad75d$var$FilteredResourceBody = ({ id: id, dataset: dataset,
                     }),
                     /*#__PURE__*/ (0, $hgUW1$jsx)("div", {
                         className: "ds-l-md-col--9",
-                        children: /*#__PURE__*/ (0, $hgUW1$jsx)((0, $de780c924c98fa31$export$2e2bcd8739ae039), {
+                        children: /*#__PURE__*/ (0, $hgUW1$jsx)((0, $2bd73bb95b0c04ed$export$2e2bcd8739ae039), {
                             distribution: distribution,
-                            dataset: dataset
+                            dataset: dataset,
+                            resource: resource,
+                            customDescription: customDescription,
+                            updateAriaLive: updateAriaLive
                         })
                     }),
                     Object.keys(resource).length && resource.columns && Object.keys(resource.schema).length && /*#__PURE__*/ (0, $hgUW1$jsx)("div", {
@@ -6420,32 +6401,19 @@ const $dd6eb2b30d7ad75d$var$FilteredResourceBody = ({ id: id, dataset: dataset,
                                 /*#__PURE__*/ (0, $hgUW1$jsx)((0, $af099c546cb226c7$export$2e2bcd8739ae039), {
                                     includeDensity: true,
                                     setTablePadding: setTablePadding,
-                                    distribution: distribution,
                                     resource: resource,
                                     downloadUrl: downloadUrl,
                                     tablePadding: tablePadding,
                                     includeDownload: true
                                 }),
-                                /*#__PURE__*/ (0, $hgUW1$jsxs)((0, $ebda441784d176a5$export$2e2bcd8739ae039).Provider, {
-                                    value: {
-                                        columnOrder: [],
-                                        setColumnOrder: ()=>{},
-                                        columnVisibility: {},
-                                        setColumnVisibility: ()=>{},
-                                        page: 1,
-                                        setPage: ()=>{}
-                                    },
-                                    children: [
-                                        /*#__PURE__*/ (0, $hgUW1$jsx)((0, $626282d9a03c51d5$export$2e2bcd8739ae039), {
-                                            id: distribution.identifier,
-                                            tablePadding: tablePadding,
-                                            columnSettings: columnSettings,
-                                            columnWidths: columnWidths
-                                        }),
-                                        /*#__PURE__*/ (0, $hgUW1$jsx)((0, $072291d44ce1834a$export$2e2bcd8739ae039), {
-                                            resource: resource
-                                        })
-                                    ]
+                                /*#__PURE__*/ (0, $hgUW1$jsx)((0, $626282d9a03c51d5$export$2e2bcd8739ae039), {
+                                    id: distribution.identifier,
+                                    tablePadding: tablePadding,
+                                    columnSettings: columnSettings,
+                                    columnWidths: columnWidths
+                                }),
+                                /*#__PURE__*/ (0, $hgUW1$jsx)((0, $072291d44ce1834a$export$2e2bcd8739ae039), {
+                                    resource: resource
                                 })
                             ]
                         })
@@ -6478,7 +6446,7 @@ var $dd6eb2b30d7ad75d$export$2e2bcd8739ae039 = $dd6eb2b30d7ad75d$var$FilteredRes
 
 
 
-const $f61ecf9f84951a61$var$FilteredResource = ({ id: id, dist_id: dist_id, location: location, apiDocPage: apiDocPage, additionalParams: additionalParams, customColumns: customColumns, setDatasetTitle: setDatasetTitle, columnSettings: columnSettings, columnWidths: columnWidths, customTitle: customTitle, rootUrl: rootUrl })=>{
+const $f61ecf9f84951a61$var$FilteredResource = ({ id: id, dist_id: dist_id, location: location, apiDocPage: apiDocPage, additionalParams: additionalParams, customColumns: customColumns, setDatasetTitle: setDatasetTitle, columnSettings: columnSettings, columnWidths: columnWidths, customTitle: customTitle, customDescription: customDescription, rootUrl: rootUrl, updateAriaLive: updateAriaLive })=>{
     const [ready, setReady] = (0, $hgUW1$useState)(false);
     const [error, setError] = (0, $hgUW1$useState)(false);
     const { dataset: dataset } = (0, $b4aa9c66f2e86959$export$2e2bcd8739ae039)(id, rootUrl, additionalParams);
@@ -6541,7 +6509,9 @@ const $f61ecf9f84951a61$var$FilteredResource = ({ id: id, dist_id: dist_id, loca
                 columnSettings: columnSettings,
                 columnWidths: columnWidths,
                 customTitle: customTitle,
-                rootUrl: rootUrl
+                customDescription: customDescription,
+                rootUrl: rootUrl,
+                updateAriaLive: updateAriaLive
             })
         })
     });