@datawheel/data-explorer 1.3.0 → 1.3.2

package/dist/main.d.mts

@@ -220,6 +220,7 @@ interface TesseractLevel {
     properties: TesseractProperty[];
     type?: "geo" | "time" | string;
     count?: number;
+    time_scale?: string;
 }
 interface TesseractProperty {
     name: string;
@@ -475,6 +476,7 @@ interface ViewProps<TData extends Record<string, any> = Record<string, string |
     table?: MRT_TableInstance<TData & Record<string, any>>;
     isError?: boolean;
     isLoading?: boolean;
+    isFetching?: boolean;
     data?: Record<string, string | number>[];
     columns?: MRT_ColumnDef<TData>[];
     pagination?: MRT_PaginationState;

package/dist/main.mjs

@@ -1,6 +1,6 @@
 import { keyframes, createStyles, Select, Center, Text, rem, Input, Box, Stack, Group, Button, SimpleGrid, Flex, ScrollArea, LoadingOverlay, Table, MultiSelect, NumberInput, Menu, ActionIcon, UnstyledButton, Loader, Container, Title, useMantineTheme, TextInput, CopyButton, MantineProvider, Alert, Space, Modal, Tooltip, useComponentDefaultProps, Skeleton, Anchor, Paper, packSx, CloseButton, Tabs, ThemeIcon, Drawer, Switch, Divider, Accordion, Popover, Checkbox } from '@mantine/core';
 import { useClipboard, useDebouncedState, useMediaQuery, useFullscreen, useDisclosure } from '@mantine/hooks';
-import { IconWorld, IconExternalLink, IconClipboard, IconSettings, IconMathGreater, IconMathLower, IconArrowsLeftRight, IconWorldWww, IconClipboardCheck, IconAlertCircle, IconAlertTriangle, IconLanguage, IconCopy, IconArrowLeft, IconArrowRight, IconX, IconChevronLeft, IconChevronRight, IconVectorTriangle, IconPhotoDown, IconDownload, IconArrowsMinimize, IconArrowsMaximize, IconCheck, IconShare, IconSearch, IconBox, IconDotsVertical, IconTrash, IconPlus, IconStack3, IconInfoCircleFilled, IconArrowsSort, IconSortDescendingNumbers, IconSortDescendingLetters, IconSortAscendingNumbers, IconSortAscendingLetters, IconHelpCircle, IconFilterOff, IconFilter, IconClock, IconAdjustments } from '@tabler/icons-react';
+import { IconWorld, IconExternalLink, IconClipboard, IconSettings, IconMathGreater, IconMathLower, IconArrowsLeftRight, IconWorldWww, IconClipboardCheck, IconAlertCircle, IconAlertTriangle, IconLanguage, IconCopy, IconArrowLeft, IconArrowRight, IconX, IconChevronLeft, IconChevronRight, IconVectorTriangle, IconPhotoDown, IconDownload, IconArrowsMinimize, IconArrowsMaximize, IconCheck, IconShare, IconSearch, IconDotsVertical, IconTrash, IconPlus, IconStack3, IconInfoCircleFilled, IconArrowsSort, IconSortDescendingNumbers, IconSortDescendingLetters, IconSortAscendingNumbers, IconSortAscendingLetters, IconHelpCircle, IconFilterOff, IconFilter, IconBox, IconClock, IconAdjustments } from '@tabler/icons-react';
 import * as React15 from 'react';
 import React15__default, { createContext, forwardRef, useMemo, useCallback, useContext, useRef, useEffect, useState, Suspense, useLayoutEffect } from 'react';
 import { translationFactory } from '@datawheel/use-translation';
@@ -1179,18 +1179,31 @@ function describeData(cube, params, result) {
       const entityResult = entityFinder(cube, column);
       if (!entityResult) return null;
       const [entity] = entityResult;
+      let entityType;
+      if (hasProperty(entity, "aggregator")) {
+        entityType = "measure";
+      } else if (hasProperty(entity, "depth")) {
+        entityType = "level";
+      } else {
+        entityType = "property";
+      }
       const typeSet = new Set(result.data.map((item) => typeof item[column]));
-      const valueType = typeSet.size === 1 ? typeSet.has("number") ? "number" : typeSet.has("boolean") ? "boolean" : (
-        /* else */
-        "string"
-      ) : typeSet.has("number") ? "number" : "string";
+      let valueType;
+      if (entityType === "measure" || typeSet.has("number")) {
+        valueType = "number";
+      } else if (typeSet.size === 1 && typeSet.has("boolean")) {
+        valueType = "boolean";
+      } else {
+        valueType = "string";
+      }
       const isId = column !== entity.name;
-      const entityType = hasProperty(entity, "aggregator") ? "measure" : hasProperty(entity, "depth") ? "level" : "property";
+      const caption = getCaption(entity, locale) || column;
+      const localeLabel = isId ? `${caption} ID` : caption;
       return [
         column,
         {
           label: column,
-          localeLabel: getCaption(entity, locale) + (isId ? " ID" : "") || column,
+          localeLabel,
           entity,
           entityType,
           isId,
@@ -1974,12 +1987,8 @@ function pickDefaultDrilldowns(dimensions, cube) {
   for (const dimension of dimensions) {
     if (dimension.type === "time" || requiredDimensions.includes(dimension.name) || levels.length < 4) {
       const hierarchy = findDefaultHierarchy(dimension);
-      const hierarchyDepth = Math.max(...hierarchy.levels.map((l) => l.depth));
       const levelIndex = dimension.type === "geo" ? hierarchy.levels.length - 1 : 0;
       const defaultLevel = hierarchy.levels[levelIndex];
-      if (dimension.type === "time" && dimension.annotations.de_time_complete === "true" && defaultLevel.depth < hierarchyDepth) {
-        timeComplete = defaultLevel.name;
-      }
       levels.push({ ...defaultLevel, type: dimension.type });
     }
   }
@@ -2004,6 +2013,25 @@ function pickDefaultDrilldowns(dimensions, cube) {
       }
     }
   }
+  for (const dimension of dimensions) {
+    if (dimension.annotations.de_time_complete === "true") {
+      const hierarchy = findDefaultHierarchy(dimension);
+      const hierarchyLevels = hierarchy.levels;
+      const availableLevels = hierarchyLevels.filter((hl) => levels.some((l) => l.name === hl.name));
+      if (availableLevels.length > 0) {
+        const timeCompleteLevel = availableLevels.reduce(
+          (prev, curr) => curr.depth < prev.depth ? curr : prev
+        );
+        const deepestLevel = hierarchyLevels.reduce(
+          (prev, curr) => curr.depth > prev.depth ? curr : prev
+        );
+        const deepestLevelSelected = availableLevels.some((l) => l.depth === deepestLevel.depth);
+        if (timeCompleteLevel.depth < deepestLevel.depth && !deepestLevelSelected) {
+          timeComplete = timeCompleteLevel.name;
+        }
+      }
+    }
+  }
   let totalCount = calcMaxMemberCount(levels.map((l) => l.count));
   while (totalCount > 5e6) {
     const geoIndex = levels.findIndex((level) => level.type === "geo");
@@ -3258,7 +3286,8 @@ function useTable({
         range,
         isId
       } = keyCol;
-      const isNumeric = valueType === "number" && !/Year/i.test(columnKey);
+      const isYearDrilldown = entityType === "level" && entity.time_scale && /Year/i.test(columnKey);
+      const isNumeric = valueType === "number" && !isYearDrilldown;
       const formatterKey = getFormat(
         "aggregator" in entity ? entity : columnKey,
         isNumeric ? "Decimal" : "identity"
@@ -3758,7 +3787,8 @@ var MultiFilter = ({ header }) => {
   ));
 };
 var NoRecords = React15__default.memo(() => {
-  return /* @__PURE__ */ React15__default.createElement(Center, { style: { height: "calc(100% - 210px)" } }, /* @__PURE__ */ React15__default.createElement(Text, { size: "xl", color: "gray", italic: true }, "No records to display."));
+  const { translate: t } = useTranslation();
+  return /* @__PURE__ */ React15__default.createElement(Center, { style: { height: "calc(100% - 210px)" }, my: "xl" }, /* @__PURE__ */ React15__default.createElement(Text, { size: "md", color: "gray", italic: true }, t("results.error_emptyresult_detail")));
 });
 TableView.displayName = "TesseractExplorer:TableView";
 
@@ -4310,7 +4340,9 @@ function FilterItem2({
       onChange: () => {
         if (!isLastSelected) {
           actions2.updateMeasure({ ...measure, active: !measure.active });
-          actions2.updateFilter({ ...filter, active: !checked });
+          if (checked) {
+            actions2.updateFilter({ ...filter, active: false });
+          }
         }
       },
       checked,
@@ -5022,17 +5054,6 @@ function SuccessResult(props) {
   const { table, isError, isLoading, data, columns, result, pagination, isFetching } = useTable({
     cube
   });
-  if ((data == null ? void 0 : data.length) === 0 && !isLoading && !isError) {
-    return /* @__PURE__ */ React15__default.createElement(
-      FailureResult,
-      {
-        className: cx(classes.container, props.className),
-        icon: /* @__PURE__ */ React15__default.createElement(IconBox, { color: "orange", size: "5rem" }),
-        title: t("results.error_emptyresult_title"),
-        description: t("results.error_emptyresult_detail")
-      }
-    );
-  }
   return /* @__PURE__ */ React15__default.createElement(
     Flex,
     {

package/package.json

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