@datawheel/data-explorer 0.2.1 → 0.2.2

package/dist/main.js

@@ -1002,14 +1002,14 @@ var queriesSlice = createSlice({
      */
     updateCut(state, { payload }) {
       const query = taintCurrentQuery(state);
-      query.params.cuts[payload.key] = payload;
+      query.params.cuts[payload.fullName] = payload;
     },
     /**
      * Replaces a single DrilldownItem in the current QueryItem.
      */
     updateDrilldown(state, { payload }) {
       const query = taintCurrentQuery(state);
-      query.params.drilldowns[payload.key] = payload;
+      query.params.drilldowns[payload.fullName] = payload;
     },
     /**
      * Replaces a single FilterItem in the current QueryItem.
@@ -1032,7 +1032,7 @@ var queriesSlice = createSlice({
      */
     updateMeasure(state, { payload }) {
       const query = taintCurrentQuery(state);
-      query.params.measures[payload.key] = payload;
+      query.params.measures[payload.name] = payload;
     },
     /**
      * Replaces the pagination settings in the current QueryItem.
@@ -2803,8 +2803,12 @@ function LevelItem({ dimension, hierarchy, isSubMenu, level, locale, activeItems
   const { translate: t } = useTranslation();
   const actions2 = useActions();
   const cutItems = useSelector$1(selectCutItems);
-  const dimensions = useSelector$1(selectOlapDimensionItems);
+  useSelector$1(selectOlapDimensionItems);
   const drilldowns = useSelector$1(selectDrilldownMap);
+  const stringifyNameInternal = (level2) => joinName(levelRefToArray(level2));
+  const [currentDrilldown, setCurrentDrilldown] = useState(
+    drilldowns[stringifyNameInternal(level)] || drilldowns[stringifyName(level)]
+  );
   const label = useMemo(() => {
     const captions = [
       getCaption(dimension, locale),
@@ -2821,38 +2825,28 @@ function LevelItem({ dimension, hierarchy, isSubMenu, level, locale, activeItems
       level: captions[2]
     });
   }, [locale, dimension, hierarchy, level, isSubMenu]);
-  const createCutHandler2 = React10__default.useCallback((level2) => {
+  React10__default.useCallback((level2) => {
     const cutItem = buildCut({ ...level2, members: [], key: level2.fullName });
     cutItem.active = false;
     actions2.updateCut(cutItem);
   }, []);
   function createDrilldown(level2, cuts) {
     const drilldown = buildDrilldown({ ...level2, key: stringifyName(level2), active: false });
-    actions2.updateDrilldown(drilldown);
-    const cut2 = cuts.find((cut3) => cut3.uniqueName === drilldown.uniqueName);
-    if (!cut2) {
-      createCutHandler2({ ...level2, key: stringifyName(level2) });
-    }
-    actions2.willFetchMembers({ ...level2, level: level2.name }).then((members) => {
-      const dimension2 = dimensions.find((dim) => dim.name === level2.dimension);
-      if (!dimension2) return;
-      actions2.updateDrilldown({
-        ...drilldown,
-        dimType: dimension2.dimensionType,
-        memberCount: members.length,
-        members
-      });
-    });
     return drilldown;
   }
-  const currentDrilldown = drilldowns[stringifyName(level)] || createDrilldown(level, cutItems);
+  React10__default.useEffect(() => {
+    if (!currentDrilldown) {
+      setCurrentDrilldown(createDrilldown(level));
+    }
+  }, []);
   const cut = cutItems.find((cut2) => {
-    return cut2.uniqueName === currentDrilldown.uniqueName;
+    return cut2.uniqueName === (currentDrilldown == null ? void 0 : currentDrilldown.uniqueName);
   });
   const updatecutHandler = React10__default.useCallback((item, members) => {
     actions2.updateCut({ ...item, members });
   }, []);
   const checked = activeItems.map(stringifyName).includes(stringifyName(level));
+  if (!currentDrilldown) return;
   return /* @__PURE__ */ React10__default.createElement(React10__default.Fragment, null, /* @__PURE__ */ React10__default.createElement(Group, { mt: "sm", position: "apart", key: level.uri, noWrap: true }, /* @__PURE__ */ React10__default.createElement(
     Checkbox,
     {
@@ -2861,6 +2855,7 @@ function LevelItem({ dimension, hierarchy, isSubMenu, level, locale, activeItems
           const active = checked ? false : cut.members.length ? true : false;
           actions2.updateCut({ ...cut, active });
         }
+        console.log({ currentDrilldown });
         actions2.updateDrilldown({ ...currentDrilldown, active: !currentDrilldown.active });
       },
       checked,
@@ -3176,20 +3171,18 @@ function useTableData({ offset, limit, columns, filters, cuts, pagination }) {
   const actions2 = useActions();
   const columnsStr = JSON.stringify(columns.sort());
   const page = pagination.pageIndex;
-  const [filterKeydebouced, setDebouncedTerm] = useState([
-    columnsStr,
-    filterKey,
-    cutKey,
-    page
-  ]);
+  const enabled = Boolean(columns.length) || Boolean(filters.length) || Boolean(cuts.length);
+  const initialKey = enabled ? [columnsStr, filterKey, cutKey, page] : "";
+  const [filterKeydebouced, setDebouncedTerm] = useState(initialKey);
   useEffect(() => {
+    if (!enabled) return;
     const handler = debounce(() => {
       const term = [columnsStr, filterKey, cutKey, page];
       setDebouncedTerm(term);
     }, 700);
     handler();
     return () => handler.cancel();
-  }, [columnsStr, offset, filterKey, cutKey, page]);
+  }, [columnsStr, filterKey, cutKey, page, enabled]);
   return useQuery({
     queryKey: ["table", filterKeydebouced],
     queryFn: () => {
@@ -3200,7 +3193,7 @@ function useTableData({ offset, limit, columns, filters, cuts, pagination }) {
       });
     },
     staleTime: 3e5,
-    enabled: !!filterKeydebouced
+    enabled: enabled && !!filterKeydebouced
   });
 }
 function usePrefetch({
@@ -4164,6 +4157,7 @@ function LocaleSelector() {
     if (currentCode !== l.value) {
       resetGraph();
       actions2.updateLocale(l.value);
+      actions2.willRequestQuery();
     }
   };
   if (localeOptions.length < 2) {
@@ -6607,11 +6601,9 @@ function createVizbuilderView(settings) {
   return VizbuilderView;
   function VizbuilderView(props) {
     const { cube, panelKey, params, result } = props;
+    console.log(result);
     const { actions: actions2, formatters } = useSettings();
-    const [panelName, currentChart] = useMemo(
-      () => `${panelKey || ""}-`.split("-"),
-      [panelKey]
-    );
+    const [panelName, currentChart] = useMemo(() => `${panelKey || ""}-`.split("-"), [panelKey]);
     const resetCurrentPanel = useCallback(() => {
       actions2.switchPanel(panelName);
     }, [panelName]);
@@ -6620,7 +6612,7 @@ function createVizbuilderView(settings) {
         [
           {
             cube,
-            dataset: result.data,
+            dataset: result.data.data,
             params: {
               locale: params.locale || defaultLocale,
               booleans: params.booleans,
@@ -6653,7 +6645,7 @@ function createVizbuilderView(settings) {
         ],
         chartGenOptions
       ),
-      [cube, result.data, params]
+      [cube, result.data.data, params]
     );
     const content = useMemo(() => {
       const isSingleChart = charts.length === 1;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@datawheel/data-explorer",
-  "version": "0.2.1",
+  "version": "0.2.2",
   "exports": {
     ".": {
       "import": "./dist/main.js"