@datawheel/data-explorer 1.0.10 → 1.0.11

package/dist/main.mjs

@@ -4209,6 +4209,150 @@ function Toolbar({
   return smallerThanLg ? /* @__PURE__ */ React13__default.createElement(Menu, null, /* @__PURE__ */ React13__default.createElement(Menu.Target, null, /* @__PURE__ */ React13__default.createElement(ActionIcon, null, /* @__PURE__ */ React13__default.createElement(IconSettings, null))), /* @__PURE__ */ React13__default.createElement(Menu.Dropdown, null, settings)) : settings;
 }
 
+// src/context/query.tsx
+init_esm_shims();
+var QueryContext = createContext(void 0);
+function QueryProvider({ children, defaultCube }) {
+  const { tesseract } = useLogicLayer();
+  const location2 = useLocation();
+  const { updateCurrentQuery } = useActions();
+  const { paginationConfig, measuresActive, serverURL, defaultLocale } = useSettings();
+  const { data: schema, isLoading: schemaLoading, isError: schemaError } = useServerSchema();
+  const updateUrl = useUpdateUrl();
+  const queryItem = useSelector$1(selectCurrentQueryItem);
+  const prevLocaleRef = useRef();
+  function fetchMembers(level, localeStr, cubeName) {
+    return tesseract.fetchMembers({ request: { cube: cubeName || "", level, locale: localeStr } });
+  }
+  const {
+    run: runFetchMembers,
+    data: membersData,
+    isSuccess: isMembersSuccess,
+    isLoading: membersLoading
+  } = useAsync();
+  const [transintionLocaleLoading, setTransintionLocaleLoading] = React13__default.useState(false);
+  useEffect(() => {
+    if (schemaLoading) {
+      setTransintionLocaleLoading(true);
+    }
+    const searchParams = new URLSearchParams(location2.search);
+    const cube = searchParams.get("cube");
+    const cubeMap = (schema == null ? void 0 : schema.cubeMap) || void 0;
+    if (cube && cubeMap && serverURL && cubeMap[cube] && (schema == null ? void 0 : schema.online)) {
+      let newQuery = parsePermalink(cubeMap[cube], searchParams);
+      newQuery = isValidQuery(newQuery == null ? void 0 : newQuery.params) ? newQuery : buildQuery({ params: { cube } });
+      newQuery.params.locale = defaultLocale || newQuery.params.locale;
+      if (newQuery) {
+        const promises = Object.values(newQuery.params.drilldowns).map((dd) => {
+          const currentDrilldown = queryItem.params.drilldowns[dd.key];
+          const localeChanged = prevLocaleRef.current !== (newQuery == null ? void 0 : newQuery.params.locale);
+          if (currentDrilldown && currentDrilldown.members && currentDrilldown.members.length > 0 && !localeChanged) {
+            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) => {
+          setTransintionLocaleLoading(false);
+          prevLocaleRef.current = newQuery == null ? void 0 : newQuery.params.locale;
+          const drilldowns = data.map((item) => item.drilldown);
+          const cuts = data.map((item) => item.cut);
+          newQuery.params.drilldowns = keyBy(drilldowns, "key");
+          const existingCuts = keyBy(
+            Object.values(newQuery.params.cuts || {}).map((c) => ({ ...c, key: c.level })),
+            "key"
+          );
+          const newCuts = keyBy(cuts, "key");
+          newQuery.params.cuts = { ...newCuts, ...existingCuts };
+          const newQueryItem = isValidQuery(newQuery.params) ? newQuery : void 0;
+          if (newQueryItem) {
+            updateCurrentQuery({ ...newQuery, link: serializePermalink(newQuery) });
+          }
+        });
+      }
+    }
+    if (!cube && cubeMap && serverURL && (schema == null ? void 0 : schema.online)) {
+      const cubeDefault = defaultCube && hasProperty(cubeMap, defaultCube) ? defaultCube : Object.keys(cubeMap)[0];
+      setDefaultValues(cubeMap[cubeDefault]);
+    }
+  }, [location2.search, runFetchMembers, schema, schemaLoading, serverURL, defaultLocale]);
+  const onChangeCube = (table, subtopic) => {
+    const locale = defaultLocale || queryItem.params.locale;
+    const cubeMap = (schema == null ? void 0 : schema.cubeMap) || {};
+    const cubeArray = getValues(cubeMap);
+    const cube = cubeArray.find(
+      (cube2) => cube2.name === table && getAnnotation(cube2, "subtopic", locale) === subtopic
+    );
+    if (cube) {
+      setDefaultValues(cube);
+    }
+  };
+  function setDefaultValues(cube) {
+    const drilldowns = pickDefaultDrilldowns(cube.dimensions).map(
+      (level) => buildDrilldown({
+        ...level,
+        key: level.name,
+        active: true,
+        properties: level.properties.map(
+          (prop) => buildProperty({ level: level.name, name: prop.name })
+        )
+      })
+    );
+    const measuresLimit = typeof measuresActive !== "undefined" ? measuresActive : cube.measures.length;
+    const measures = cube.measures.slice(0, measuresLimit).map((measure) => {
+      return buildMeasure({
+        active: true,
+        key: measure.name,
+        name: measure.name,
+        caption: measure.caption
+      });
+    });
+    const panel = queryItem.panel;
+    const locale = defaultLocale || queryItem.params.locale;
+    const query = buildQuery({
+      params: {
+        cube: cube.name,
+        measures: keyBy(measures, (item) => item.key),
+        drilldowns: keyBy(drilldowns, (item) => item.key),
+        locale
+      },
+      panel: panel != null ? panel : "table"
+    });
+    updateUrl(query);
+  }
+  return /* @__PURE__ */ React13__default.createElement(
+    QueryContext.Provider,
+    {
+      value: {
+        onChangeCube,
+        schemaLoading,
+        membersLoading,
+        transintionLocaleLoading
+      }
+    },
+    children
+  );
+}
+function useQueryItem() {
+  const context = useContext(QueryContext);
+  if (context === void 0) {
+    throw new Error("useQuery must be used within a QueryProvider");
+  }
+  return context;
+}
+
 // src/components/ExplorerResults.tsx
 var useStyles2 = createStyles(() => ({
   container: {
@@ -4224,6 +4368,7 @@ function ExplorerResults(props) {
     isError: schemaError,
     error: schemaErrorDetail
   } = useServerSchema();
+  const { transintionLocaleLoading } = useQueryItem();
   const { params } = useSelector$1(selectCurrentQueryItem);
   const cubeMap = (schema == null ? void 0 : schema.cubeMap) || {};
   const cube = cubeMap[params.cube];
@@ -4251,7 +4396,7 @@ function ExplorerResults(props) {
       }
     );
   }
-  if (isServerOnline == null || !cube) {
+  if (isServerOnline == null || !cube || schemaLoading || transintionLocaleLoading) {
     return /* @__PURE__ */ React13__default.createElement(
       Paper,
       {
@@ -4396,7 +4541,7 @@ init_esm_shims();
 
 // src/utils/create-context.ts
 init_esm_shims();
-var createContext3 = (name4) => {
+var createContext4 = (name4) => {
   const Context = React13__default.createContext(void 0);
   const useContext5 = () => {
     const ctx = React13__default.useContext(Context);
@@ -4609,7 +4754,7 @@ function useCubeSearch(input, graph) {
 }
 
 // src/components/SideBar.tsx
-var [useSideBar, Provider] = createContext3("SideBar");
+var [useSideBar, Provider] = createContext4("SideBar");
 function SideBarProvider(props) {
   const [input, setInput] = useDebouncedState("", 200);
   const [expanded, setExpanded] = useState(true);
@@ -4808,143 +4953,6 @@ init_esm_shims();
 
 // src/components/Results.tsx
 init_esm_shims();
-
-// src/context/query.tsx
-init_esm_shims();
-var QueryContext = createContext(void 0);
-function QueryProvider({ children, defaultCube }) {
-  const { tesseract } = useLogicLayer();
-  const location2 = useLocation();
-  const { updateCurrentQuery } = useActions();
-  const { paginationConfig, measuresActive, serverURL, defaultLocale } = useSettings();
-  const { data: schema, isLoading: schemaLoading, isError: schemaError } = useServerSchema();
-  const updateUrl = useUpdateUrl();
-  const queryItem = useSelector$1(selectCurrentQueryItem);
-  function fetchMembers(level, localeStr, cubeName) {
-    return tesseract.fetchMembers({ request: { cube: cubeName || "", level, locale: localeStr } });
-  }
-  const {
-    run: runFetchMembers,
-    data: membersData,
-    isSuccess: isMembersSuccess,
-    isLoading: membersLoading
-  } = useAsync();
-  useEffect(() => {
-    const searchParams = new URLSearchParams(location2.search);
-    const cube = searchParams.get("cube");
-    const cubeMap = (schema == null ? void 0 : schema.cubeMap) || void 0;
-    if (cube && cubeMap && serverURL && cubeMap[cube] && (schema == null ? void 0 : schema.online)) {
-      let newQuery = parsePermalink(cubeMap[cube], searchParams);
-      newQuery = isValidQuery(newQuery == null ? void 0 : newQuery.params) ? newQuery : buildQuery({ params: { cube } });
-      newQuery.params.locale = defaultLocale || newQuery.params.locale;
-      if (newQuery) {
-        const promises = Object.values(newQuery.params.drilldowns).map((dd) => {
-          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);
-          const cuts = data.map((item) => item.cut);
-          newQuery.params.drilldowns = keyBy(drilldowns, "key");
-          const existingCuts = keyBy(
-            Object.values(newQuery.params.cuts || {}).map((c) => ({ ...c, key: c.level })),
-            "key"
-          );
-          const newCuts = keyBy(cuts, "key");
-          newQuery.params.cuts = { ...newCuts, ...existingCuts };
-          const newQueryItem = isValidQuery(newQuery.params) ? newQuery : void 0;
-          if (newQueryItem) {
-            updateCurrentQuery({ ...newQuery, link: serializePermalink(newQuery) });
-          }
-        });
-      }
-    }
-    if (!cube && cubeMap && serverURL && (schema == null ? void 0 : schema.online)) {
-      const cubeDefault = defaultCube && hasProperty(cubeMap, defaultCube) ? defaultCube : Object.keys(cubeMap)[0];
-      setDefaultValues(cubeMap[cubeDefault]);
-    }
-  }, [location2.search, runFetchMembers, schema, serverURL, defaultLocale]);
-  const onChangeCube = (table, subtopic) => {
-    const locale = defaultLocale || queryItem.params.locale;
-    const cubeMap = (schema == null ? void 0 : schema.cubeMap) || {};
-    const cubeArray = getValues(cubeMap);
-    const cube = cubeArray.find(
-      (cube2) => cube2.name === table && getAnnotation(cube2, "subtopic", locale) === subtopic
-    );
-    if (cube) {
-      setDefaultValues(cube);
-    }
-  };
-  function setDefaultValues(cube) {
-    const drilldowns = pickDefaultDrilldowns(cube.dimensions).map(
-      (level) => buildDrilldown({
-        ...level,
-        key: level.name,
-        active: true,
-        properties: level.properties.map(
-          (prop) => buildProperty({ level: level.name, name: prop.name })
-        )
-      })
-    );
-    const measuresLimit = typeof measuresActive !== "undefined" ? measuresActive : cube.measures.length;
-    const measures = cube.measures.slice(0, measuresLimit).map((measure) => {
-      return buildMeasure({
-        active: true,
-        key: measure.name,
-        name: measure.name,
-        caption: measure.caption
-      });
-    });
-    const panel = queryItem.panel;
-    const locale = defaultLocale || queryItem.params.locale;
-    const query = buildQuery({
-      params: {
-        cube: cube.name,
-        measures: keyBy(measures, (item) => item.key),
-        drilldowns: keyBy(drilldowns, (item) => item.key),
-        locale
-      },
-      panel: panel != null ? panel : "table"
-    });
-    updateUrl(query);
-  }
-  return /* @__PURE__ */ React13__default.createElement(
-    QueryContext.Provider,
-    {
-      value: {
-        onChangeCube,
-        schemaLoading,
-        membersLoading
-      }
-    },
-    children
-  );
-}
-function useQueryItem() {
-  const context = useContext(QueryContext);
-  if (context === void 0) {
-    throw new Error("useQuery must be used within a QueryProvider");
-  }
-  return context;
-}
-
-// src/components/Results.tsx
 function Results(props) {
   const { graph, selectedItem, locale, getCube: getCube2, isSelected: isSelected2, isSelectionInProgress } = props;
   const { classes } = useStyles3();
@@ -5628,7 +5636,6 @@ var useStyles5 = createStyles((theme) => ({
 function PivotView(props) {
   var _a;
   const { cube, params, result, isLoading, ...mantineReactTableProps } = props;
-  console.log("PivotView", props);
   const locale = params.locale;
   const { translate: t } = useTranslation();
   const { data: schema } = useServerSchema();

package/package.json

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