@datawheel/data-explorer 1.0.8 → 1.0.10

package/dist/main.d.mts

@@ -1333,4 +1333,6 @@ declare function VizbuilderView(props: {
 
 declare function TourStep(props: TourStepsPropsType): React.JSX.Element;
 
-export { DebugView, ExplorerComponent as Explorer, type ExplorerState, type ExplorerStepType, PivotView, SettingsConsumer, TableView, ToolbarButton, TourStep, TranslationConsumer, type Translation as TranslationDict, type ViewProps, VizbuilderView, reducer as explorerReducer, thunkExtraArg as explorerThunkExtraArg, defaultTranslation as translationDict, useSettings, useTranslation };
+declare function RawResponseView(props: any): React.JSX.Element;
+
+export { DebugView, ExplorerComponent as Explorer, type ExplorerState, type ExplorerStepType, PivotView, RawResponseView, SettingsConsumer, TableView, ToolbarButton, TourStep, TranslationConsumer, type Translation as TranslationDict, type ViewProps, VizbuilderView, reducer as explorerReducer, thunkExtraArg as explorerThunkExtraArg, defaultTranslation as translationDict, useSettings, useTranslation };

package/dist/main.mjs

@@ -1,6 +1,6 @@
-import { keyframes, createStyles, Select, rem, Input, Box, Text, Stack, Group, Button, SimpleGrid, Flex, ScrollArea, LoadingOverlay, Table, MultiSelect, Center, NumberInput, Menu, ActionIcon, UnstyledButton, Alert, Loader, Container, Title, useMantineTheme, MantineProvider, Modal, Space, useComponentDefaultProps, Anchor, Paper, Accordion, Tooltip, Tabs, Switch, ThemeIcon, CloseButton, Drawer, Divider, Checkbox, packSx, Affix, Popover } from '@mantine/core';
+import { keyframes, createStyles, Select, rem, Input, Box, Text, Stack, Group, Button, SimpleGrid, Flex, ScrollArea, LoadingOverlay, Table, MultiSelect, Center, NumberInput, Menu, ActionIcon, UnstyledButton, Alert, Loader, Container, Title, useMantineTheme, TextInput, CopyButton, MantineProvider, Modal, Space, useComponentDefaultProps, Anchor, Paper, Accordion, Tooltip, Tabs, Switch, ThemeIcon, CloseButton, Drawer, Divider, Checkbox, packSx, Affix, Popover } from '@mantine/core';
 import { useClipboard, useFullscreen, useDebouncedState, useMediaQuery, useDisclosure } from '@mantine/hooks';
-import { IconWorld, IconExternalLink, IconClipboard, IconSettings, IconMathGreater, IconMathLower, IconArrowsLeftRight, IconAlertCircle, IconAlertTriangle, IconCopy, IconDownload, IconDotsVertical, IconBox, IconArrowRight, IconArrowLeft, IconBrandGithub, IconCheck, IconShare, IconLanguage, IconTrash, IconInfoCircleFilled, IconChevronLeft, IconChevronRight, IconSearch, IconArrowsMinimize, IconArrowsMaximize, IconCircleOff, IconArrowsSort, IconSortDescendingNumbers, IconSortDescendingLetters, IconSortAscendingNumbers, IconSortAscendingLetters, IconPlus, IconStack3, IconFilterOff, IconFilter, IconAdjustments, IconClock, IconHelpCircle, IconPhotoDown, IconVectorTriangle } from '@tabler/icons-react';
+import { IconWorld, IconExternalLink, IconClipboard, IconSettings, IconMathGreater, IconMathLower, IconArrowsLeftRight, IconAlertCircle, IconAlertTriangle, IconWorldWww, IconClipboardCheck, IconCopy, IconDownload, IconDotsVertical, IconBox, IconArrowRight, IconArrowLeft, IconBrandGithub, IconCheck, IconShare, IconLanguage, IconTrash, IconInfoCircleFilled, IconChevronLeft, IconChevronRight, IconSearch, IconArrowsMinimize, IconArrowsMaximize, IconCircleOff, IconArrowsSort, IconSortDescendingNumbers, IconSortDescendingLetters, IconSortAscendingNumbers, IconSortAscendingLetters, IconPlus, IconStack3, IconFilterOff, IconFilter, IconAdjustments, IconClock, IconHelpCircle, IconPhotoDown, IconVectorTriangle } from '@tabler/icons-react';
 import * as React13 from 'react';
 import React13__default, { createContext, forwardRef, useMemo, useCallback, useContext, useRef, useEffect, useState, Suspense, Component, useLayoutEffect } from 'react';
 import { translationFactory } from '@datawheel/use-translation';
@@ -1886,7 +1886,7 @@ var selectOlapMeasureItems = createSelector(
   selectOlapCube,
   (cube) => cube ? cube.measures : []
 );
-var selectOlapMeasureMap = createSelector(
+createSelector(
   selectOlapMeasureItems,
   (measures) => Object.fromEntries(measures.map((item) => [item.name, item]))
 );
@@ -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);
@@ -3131,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)
@@ -3148,7 +3179,7 @@ function useTable({
           return /* @__PURE__ */ React13__default.createElement("span", { style: { display: "block", textAlign: "right" } }, formatter2(cell.getValue(), locale));
         } : ({ cell, renderedCellValue, row }) => {
           const cellId = row.original[`${cell.column.id} ID`];
-          const idFormatter = idFormatters[`${cell.column.id} ID`];
+          const idFormatter = idFormatters[`${column.localeLabel} ID`];
           return /* @__PURE__ */ React13__default.createElement(Flex, { justify: "space-between", sx: { width: "100%", maxWidth: 400 }, gap: "sm" }, /* @__PURE__ */ React13__default.createElement(
             Text,
             {
@@ -3264,6 +3295,7 @@ function useTable({
     table,
     isError,
     isLoading,
+    isFetching,
     data: tableData,
     columns,
     pagination,
@@ -3427,7 +3459,7 @@ function MultiFilter({ header }) {
   const { translate: t } = useTranslation();
   const cutItems = useSelector$1(selectCutItems);
   const drilldownItems = useSelector$1(selectDrilldownItems);
-  const label = header.column.id;
+  header.column.id;
   const localeLabel = header.column.columnDef.header;
   const drilldown = drilldownItems.find((d) => d.level === header.column.id);
   const actions2 = useActions();
@@ -3473,7 +3505,7 @@ function MultiFilter({ header }) {
       placeholder: t("params.filter_by", { name: localeLabel }),
       value: cut.members || [],
       data: drilldown.members.map((m) => {
-        const idFormatter = idFormatters[`${label} ID`];
+        const idFormatter = idFormatters[`${localeLabel} ID`];
         const formattedKey = idFormatter ? idFormatter(m.key) : m.key;
         return {
           value: `${m.key}`,
@@ -4284,7 +4316,7 @@ function SuccessResult(props) {
     actions2.switchPanel(newTab);
     updateUrl({ ...queryItem, panel: newTab });
   };
-  const { table, isError, isLoading, data, columns, result, pagination, setPagination } = useTable({
+  const { table, isError, isLoading, data, columns, result, pagination, isFetching, setPagination } = useTable({
     cube
   });
   if ((data == null ? void 0 : data.length) === 0 && !isLoading && !isError) {
@@ -4350,7 +4382,8 @@ function SuccessResult(props) {
             isLoading,
             columns,
             pagination,
-            setPagination
+            setPagination,
+            isFetching
           }
         ))))
       )
@@ -4806,16 +4839,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);
@@ -5585,11 +5626,15 @@ var useStyles5 = createStyles((theme) => ({
   }
 }));
 function PivotView(props) {
+  var _a;
   const { cube, params, result, isLoading, ...mantineReactTableProps } = props;
-  if (!result) return null;
+  console.log("PivotView", props);
   const locale = params.locale;
   const { translate: t } = useTranslation();
-  const measureMap = useSelector$1(selectOlapMeasureMap);
+  const { data: schema } = useServerSchema();
+  const measures = (_a = schema == null ? void 0 : schema.cubeMap[cube.name]) == null ? void 0 : _a.measures;
+  if (!result || !measures) return null;
+  const measureMap = Object.fromEntries(measures.map((item) => [item.name, item]));
   const { classes, cx } = useStyles5();
   const measureOptions = useMemo(
     () => filterMap(Object.values(params.measures), (item) => {
@@ -7693,10 +7738,80 @@ function VizbuilderView(props) {
     }
   );
 }
+
+// src/components/RawResponseView.tsx
+init_esm_shims();
+function RawResponseView(props) {
+  const { result, isLoading, isFetching } = props;
+  console.log(result);
+  const theme = useMantineTheme();
+  const token = "tokenValue";
+  const tokenizedUrl = (result == null ? void 0 : result.url) ? `${result.url}${`&token=${token}` }` : "";
+  const curlCommand = `curl "${tokenizedUrl}"`;
+  return /* @__PURE__ */ React13__default.createElement(Container, { fluid: true, py: "xl" }, /* @__PURE__ */ React13__default.createElement(Stack, null, /* @__PURE__ */ React13__default.createElement(Group, { align: "flex-end", noWrap: true, w: "100%" }, /* @__PURE__ */ React13__default.createElement(
+    TextInput,
+    {
+      icon: /* @__PURE__ */ React13__default.createElement(IconWorldWww, { size: 20 }),
+      label: "API URL",
+      readOnly: true,
+      value: tokenizedUrl,
+      w: "100%",
+      mb: 0,
+      disabled: isLoading || isFetching
+    }
+  ), /* @__PURE__ */ React13__default.createElement(Button.Group, null, /* @__PURE__ */ React13__default.createElement(
+    Button,
+    {
+      component: "a",
+      href: tokenizedUrl,
+      target: "_blank",
+      leftIcon: /* @__PURE__ */ React13__default.createElement(IconExternalLink, null),
+      sx: {
+        borderBottomRightRadius: 0,
+        borderTopRightRadius: 0
+      }
+    },
+    "Open"
+  ), /* @__PURE__ */ React13__default.createElement(CopyButton, { value: tokenizedUrl }, ({ copied, copy }) => /* @__PURE__ */ React13__default.createElement(
+    Button,
+    {
+      color: copied ? theme.colors.teal[5] : theme.colors.green[7],
+      leftIcon: copied ? /* @__PURE__ */ React13__default.createElement(IconClipboardCheck, null) : /* @__PURE__ */ React13__default.createElement(IconClipboard, null),
+      onClick: copy,
+      sx: (theme2) => ({
+        borderBottomLeftRadius: 0,
+        borderTopLeftRadius: 0,
+        "&:hover": {
+          background: theme2.colors.green[7]
+        }
+      })
+    },
+    copied ? "Copied" : "Copy"
+  )))), /* @__PURE__ */ React13__default.createElement(Group, { align: "flex-end", noWrap: true, w: "100%" }, /* @__PURE__ */ React13__default.createElement(
+    TextInput,
+    {
+      icon: /* @__PURE__ */ React13__default.createElement(IconWorldWww, { size: 20 }),
+      label: "Curl Command",
+      readOnly: true,
+      value: curlCommand,
+      w: "100%",
+      mb: 0,
+      disabled: isLoading || isFetching
+    }
+  ), /* @__PURE__ */ React13__default.createElement(CopyButton, { value: curlCommand }, ({ copied, copy }) => /* @__PURE__ */ React13__default.createElement(
+    Button,
+    {
+      color: copied ? theme.colors.teal[5] : theme.colors.green[7],
+      leftIcon: copied ? /* @__PURE__ */ React13__default.createElement(IconClipboardCheck, null) : /* @__PURE__ */ React13__default.createElement(IconClipboard, null),
+      onClick: copy
+    },
+    copied ? "Copied" : "Copy"
+  )))));
+}
 /*! Bundled license information:
 
 file-saver/FileSaver.js:
   (*! @source http://purl.eligrey.com/github/FileSaver.js/blob/master/FileSaver.js *)
 */
 
-export { DebugView, ExplorerComponent as Explorer, PivotView, SettingsConsumer, TableView, ToolbarButton, TourStep, TranslationConsumer, VizbuilderView, reducer as explorerReducer, thunkExtraArg as explorerThunkExtraArg, defaultTranslation as translationDict, useSettings, useTranslation };
+export { DebugView, ExplorerComponent as Explorer, PivotView, RawResponseView, SettingsConsumer, TableView, ToolbarButton, TourStep, TranslationConsumer, VizbuilderView, reducer as explorerReducer, thunkExtraArg as explorerThunkExtraArg, defaultTranslation as translationDict, useSettings, useTranslation };

package/package.json

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