@civicactions/cmsds-open-data-components 3.1.7 → 3.1.8-alpha.2

package/dist/main.js

@@ -1304,7 +1304,7 @@ var $b4aa9c66f2e86959$export$2e2bcd8739ae039 = $b4aa9c66f2e86959$var$useMetastor
 
 
 
-const $1d3d480a9cfaabe0$var$useDatastore = (resourceId, rootAPIUrl, options, additionalParams = {})=>{
+const $1d3d480a9cfaabe0$var$useDatastore = (resourceId, rootAPIUrl, options, additionalParams = {}, enabledParam = true)=>{
     const keys = options.keys ? options.keys : true;
     const { prepareColumns: prepareColumns } = options;
     const [values, setValues] = (0, $hgUW1$useState)([]);
@@ -1331,13 +1331,15 @@ const $1d3d480a9cfaabe0$var$useDatastore = (resourceId, rootAPIUrl, options, add
         ...additionalParams
     };
     const additionalParamsString = Object.keys(params).length ? `&${(0, $hgUW1$qs).stringify(params)}` : "";
+    const enabled = enabledParam && id !== null && id != "";
     const { data: data, isPending: isPending, error: error } = (0, $hgUW1$useQuery)({
         queryKey: [
             "datastore" + id + additionalParamsString
         ],
         queryFn: ()=>{
             return fetch(`${rootUrl}/datastore/query/${id}?${additionalParamsString}`).then((res)=>res.json());
-        }
+        },
+        enabled: enabled
     });
     (0, $hgUW1$useEffect)(()=>{
         if (data) {
@@ -1350,7 +1352,7 @@ const $1d3d480a9cfaabe0$var$useDatastore = (resourceId, rootAPIUrl, options, add
         data
     ]);
     return {
-        loading: isPending,
+        loading: enabled ? isPending : false,
         values: values,
         count: count,
         columns: columns,
@@ -2451,8 +2453,8 @@ const $ee4ad47aa483e5b5$var$QueryBuilder = (props)=>{
     };
     return /*#__PURE__*/ (0, $hgUW1$jsx)("div", {
         className: "dc-query-builder ds-u-margin-bottom--3",
-        children: /*#__PURE__*/ (0, $hgUW1$jsx)((0, $hgUW1$Accordion), {
-            bordered: true,
+        children: /*#__PURE__*/ (0, $hgUW1$jsx)("div", {
+            className: "ds-c-accordion ds-c-accordion--bordered",
             children: /*#__PURE__*/ (0, $hgUW1$jsx)((0, $hgUW1$AccordionItem), {
                 heading: /*#__PURE__*/ (0, $hgUW1$jsx)((0, $bef7bff2823feea2$export$2e2bcd8739ae039), {
                     schema: schema[id],
@@ -2959,6 +2961,7 @@ var $cf6eaefd6b928de3$export$2e2bcd8739ae039 = $cf6eaefd6b928de3$var$DatasetAPI;
 
 
 
+
 const $6765a74df807d015$var$DataDictionaryTable = ({ tableColumns: tableColumns, tableData: tableData, count: count, pageSize: pageSize })=>{
     const [pagination, setPagination] = (0, $hgUW1$useState)({
         pageIndex: 1,
@@ -3137,11 +3140,12 @@ const $6012b86ffcaf3f71$var$DataDictionary = ({ datasetDictionaryEndpoint: datas
             "dictionary" + datasetDictionaryEndpoint
         ],
         queryFn: ()=>{
-            return fetch(`${datasetDictionaryEndpoint}?${(0, $hgUW1$qs).stringify(additionalParams, {
+            return (0, $hgUW1$axios).get(`${datasetDictionaryEndpoint}?${(0, $hgUW1$qs).stringify(additionalParams, {
                 arrayFormat: "comma",
                 encode: false
-            })}`).then((res)=>res.json());
-        }
+            })}`).then((res)=>res.data).catch((error)=>console.error(error));
+        },
+        enabled: datasetDictionaryEndpoint !== undefined
     });
     const datasetDictionary = data && data.data && data.data.fields && data.data.fields.length ? data.data.fields : null;
     return /*#__PURE__*/ (0, $hgUW1$jsxs)((0, $hgUW1$Fragment), {
@@ -5475,8 +5479,8 @@ const $3b6ca952e79f0695$var$QueryBuilder = ({ resource: resource, id: id, includ
     };
     return /*#__PURE__*/ (0, $hgUW1$jsx)("div", {
         className: "dc-query-builder ds-u-margin-bottom--3",
-        children: /*#__PURE__*/ (0, $hgUW1$jsx)((0, $hgUW1$Accordion), {
-            bordered: true,
+        children: /*#__PURE__*/ (0, $hgUW1$jsx)("div", {
+            className: "ds-c-accordion ds-c-accordion--bordered",
             children: /*#__PURE__*/ (0, $hgUW1$jsx)((0, $hgUW1$AccordionItem), {
                 heading: /*#__PURE__*/ (0, $hgUW1$jsx)((0, $bef7bff2823feea2$export$2e2bcd8739ae039), {
                     schema: schema[id],