@datawheel/data-explorer 1.0.7 → 1.0.9

package/dist/main.mjs

@@ -2812,14 +2812,35 @@ var propertiesUpdateHandler = (actions2, item, activeProps) => {
   );
   actions2.updateDrilldown({ ...item, properties });
 };
-var removeColumn = (actions2, entity, measures, drilldowns, type) => {
+var removeColumn = (actions2, entity, measures, drilldowns, type, queryItem, updateURL) => {
+  const newQuery = buildQuery(_.cloneDeep(queryItem));
   if ("aggregator" in entity) {
     const measure = measures.find((d) => d.name === entity.name);
-    measure && actions2.updateMeasure({ ...measure, active: false });
+    if (measure) {
+      const newMeasure = { ...measure, active: false };
+      actions2.updateMeasure(newMeasure);
+      newQuery.params.measures[newMeasure.name] = newMeasure;
+      updateURL({
+        ...newQuery,
+        params: {
+          ...newQuery.params
+        }
+      });
+    }
   }
   if ("depth" in entity) {
     const drilldown = drilldowns.find((d) => d.level === entity.name);
-    drilldown && actions2.updateDrilldown({ ...drilldown, active: false });
+    if (drilldown) {
+      const newDrilldown = { ...drilldown, active: false };
+      actions2.updateDrilldown(newDrilldown);
+      newQuery.params.drilldowns[newDrilldown.key] = newDrilldown;
+      updateURL({
+        ...newQuery,
+        params: {
+          ...newQuery.params
+        }
+      });
+    }
   }
   if (isProperty(type)) {
     const activeDrilldowns = drilldowns.filter((d) => d.active);
@@ -3069,6 +3090,7 @@ function useTable({
         header,
         enableHiding: true,
         accessorFn: (row) => row[columnKey],
+        // This functions is not being used. Manual sorting is enabled.
         sortingFn: (rowA, rowB, columnId) => {
           if (rowA.original[columnId] < rowB.original[columnId]) {
             return -1;
@@ -3089,12 +3111,38 @@ function useTable({
               onClick: () => {
                 if (!isSorted) {
                   actions2.updateSorting({ key: entity.name, dir: "desc" });
+                  const newQuery = buildQuery(_.cloneDeep(queryItem));
+                  updateURL({
+                    ...newQuery,
+                    params: {
+                      ...newQuery.params,
+                      sortKey: `${entity.name}`,
+                      sortDir: "desc"
+                    }
+                  });
                 }
                 if (isSorted && sortDir === "desc") {
                   actions2.updateSorting({ key: entity.name, dir: "asc" });
+                  const newQuery = buildQuery(_.cloneDeep(queryItem));
+                  updateURL({
+                    ...newQuery,
+                    params: {
+                      ...newQuery.params,
+                      sortKey: `${entity.name}`,
+                      sortDir: "asc"
+                    }
+                  });
                 }
                 if (isSorted && sortDir === "asc") {
                   actions2.clearSorting();
+                  const newQuery = buildQuery(_.cloneDeep(queryItem));
+                  updateURL({
+                    ...newQuery,
+                    params: {
+                      ...newQuery.params,
+                      sortKey: void 0
+                    }
+                  });
                 }
               }
             },
@@ -3104,8 +3152,18 @@ function useTable({
             {
               label: `At least one ${getEntityText(entityType)} is required.`,
               key: `remove-${column2.columnDef.header}`,
-              disabled: !showTrashIcon(finalKeys, entityType),
-              onClick: () => removeColumn(actions2, entity, measures, drilldowns, entityType),
+              disabled: !showTrashIcon(finalKeys, entityType) || isLoading || isFetching,
+              onClick: () => {
+                removeColumn(
+                  actions2,
+                  entity,
+                  measures,
+                  drilldowns,
+                  entityType,
+                  queryItem,
+                  updateURL
+                );
+              },
               showTooltip: !showTrashIcon(finalKeys, entityType),
               size: 25,
               ml: rem(5)
@@ -4779,16 +4837,24 @@ function QueryProvider({ children, defaultCube }) {
       newQuery.params.locale = defaultLocale || newQuery.params.locale;
       if (newQuery) {
         const promises = Object.values(newQuery.params.drilldowns).map((dd) => {
-          return fetchMembers(dd.level, newQuery == null ? void 0 : newQuery.params.locale, cube).then((levelMeta) => {
-            const cut = buildCut({ ...dd, active: false });
-            return {
-              drilldown: {
-                ...dd,
-                members: levelMeta.members
-              },
-              cut
-            };
-          });
+          const currentDrilldown = queryItem.params.drilldowns[dd.key];
+          if (currentDrilldown && currentDrilldown.members && currentDrilldown.members.length > 0) {
+            return Promise.resolve({
+              drilldown: currentDrilldown,
+              cut: buildCut({ ...currentDrilldown, active: false })
+            });
+          } else {
+            return fetchMembers(dd.level, newQuery == null ? void 0 : newQuery.params.locale, cube).then((levelMeta) => {
+              const cut = buildCut({ ...dd, active: false });
+              return {
+                drilldown: {
+                  ...dd,
+                  members: levelMeta.members
+                },
+                cut
+              };
+            });
+          }
         });
         runFetchMembers(Promise.all(promises)).then((data) => {
           const drilldowns = data.map((item) => item.drilldown);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@datawheel/data-explorer",
-  "version": "1.0.7",
+  "version": "1.0.9",
   "main": "./dist/main.mjs",
   "types": "./dist/main.d.mts",
   "files": [