@datawheel/data-explorer 1.2.0-rc.5 → 1.3.0

package/dist/main.d.mts

@@ -204,6 +204,7 @@ interface TesseractDimension {
     type: DimensionType;
     hierarchies: TesseractHierarchy[];
     default_hierarchy: string;
+    required?: boolean;
 }
 interface TesseractHierarchy {
     name: string;
@@ -407,7 +408,9 @@ interface QueryResult<D = Record<string, unknown>> {
     url: string;
 }
 interface ResultEntityType {
-    level: TesseractLevel;
+    level: TesseractLevel & {
+        dimension?: string;
+    };
     property: TesseractProperty;
     measure: TesseractMeasure;
 }
@@ -766,20 +769,22 @@ declare const defaultTranslation: {
             title: string;
         };
         list: {
-            join: string;
-            suffix: string;
-            prefix: string;
             n_more: string;
         };
         title: {
+            main: string;
             main_on_period: string;
             main_over_period: string;
-            main: string;
             measure_on_period: string;
             measure_over_period: string;
             nonidealstate: string;
-            series_members: string;
+            scale_day: string;
+            scale_month: string;
+            scale_quarter: string;
+            scale_week: string;
+            scale_year: string;
             series: string;
+            series_members: string;
             time_range: string;
             total: string;
         };

package/dist/main.mjs

@@ -309,15 +309,20 @@ var vizbuilderTranslation = {
   },
   title: {
     main_on_period: "{{values}} by {{series}} on {{time_period}}",
-    main_over_period: "{{values}} by {{series}} over {{time}}",
+    main_over_period: "{{values}} by {{series}} over {{time_scale}}",
     main: "{{values}} by {{series}}",
     measure_on_period: "{{measure}} on {{period}}",
-    measure_over_period: "{{values}} over {{time}}",
+    measure_over_period: "{{values}} over {{time_scale}}",
     nonidealstate: "No results",
     series_members: "{{series}} ({{members}})",
     series: "{{series}}",
     time_range: "in {{from}}-{{to}}",
-    total: "Total: {{value}}"
+    total: "Total: {{value}}",
+    scale_year: "Annualy",
+    scale_quarter: "Quarterly",
+    scale_month: "Monthly",
+    scale_week: "Weekly",
+    scale_day: "Daily"
   },
   transient: {
     title_one_row: "The dataset has only one row and can't be used to generate charts.",
@@ -330,7 +335,10 @@ var defaultTranslation = {
   ...explorerTranslation,
   vizbuilder: vizbuilderTranslation
 };
-var { useTranslation, TranslationConsumer, TranslationProvider } = translationFactory({ defaultLocale: "en", defaultTranslation });
+var { useTranslation, TranslationConsumer, TranslationProvider } = translationFactory({
+  defaultLocale: "en",
+  defaultTranslation
+});
 
 // src/components/DebugView.tsx
 function DebugView(props) {
@@ -1725,17 +1733,19 @@ var useCubeItems = () => {
   return getValues(cubeItems || {});
 };
 var useDimensionItems = () => {
-  var _a;
+  var _a, _b;
   const { data: schema } = useServerSchema();
   const { params } = useSelector(selectCurrentQueryItem);
   const dimensions = ((_a = schema == null ? void 0 : schema.cubeMap[params.cube]) == null ? void 0 : _a.dimensions) || [];
+  const requiredDimensions = ((_b = schema == null ? void 0 : schema.cubeMap[params.cube]) == null ? void 0 : _b.annotations.required_dimensions) || [];
   return dimensions.map((dim) => ({
     item: {
       ...dim,
       hierarchies: dim.hierarchies.slice().map((hierarchy) => {
         hierarchy.levels.slice().sort((a, b) => getOrderValue(a) - getOrderValue(b));
         return hierarchy;
-      }).sort((a, b) => getOrderValue(a) - getOrderValue(b))
+      }).sort((a, b) => getOrderValue(a) - getOrderValue(b)),
+      required: requiredDimensions.includes(dim.name)
     },
     count: dim.hierarchies.reduce((acc, hie) => acc + hie.levels.length, 0),
     alpha: dim.hierarchies.reduce((acc, hie) => acc.concat(hie.name, "-"), "")
@@ -1947,27 +1957,27 @@ function calcMaxMemberCount(lengths) {
   return lengths.reduce((prev, curr) => prev * curr);
 }
 function pickDefaultDrilldowns(dimensions, cube) {
-  var _a;
+  var _a, _b;
   const levels = [];
-  let timeComplete = void 0;
+  let timeComplete;
   let suggestedLevels = [];
+  let requiredDimensions = [];
   for (const key in cube.annotations) {
     if (key === "suggested_levels") {
       suggestedLevels = ((_a = cube.annotations[key]) == null ? void 0 : _a.split(",")) || [];
     }
+    if (key === "required_dimensions") {
+      requiredDimensions = ((_b = cube.annotations[key]) == null ? void 0 : _b.split(",")) || [];
+    }
   }
   const findDefaultHierarchy = (dim) => dim.hierarchies.find((h) => h.name === dim.default_hierarchy) || dim.hierarchies[0];
   for (const dimension of dimensions) {
-    if (dimension.type === "time" || levels.length < 4) {
+    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];
-      const suggestedLevelInHierarchy = hierarchy.levels.find(
-        (level) => suggestedLevels.includes(level.name)
-      );
-      const isSuggestedLevelDeepest = (suggestedLevelInHierarchy == null ? void 0 : suggestedLevelInHierarchy.depth) === hierarchyDepth;
-      if (dimension.type === "time" && dimension.annotations.de_time_complete === "true" && defaultLevel.depth < hierarchyDepth && !isSuggestedLevelDeepest) {
+      if (dimension.type === "time" && dimension.annotations.de_time_complete === "true" && defaultLevel.depth < hierarchyDepth) {
         timeComplete = defaultLevel.name;
       }
       levels.push({ ...defaultLevel, type: dimension.type });
@@ -2990,6 +3000,15 @@ function FullScreenSVG() {
 function isColumnSorted(column, key) {
   return column == key;
 }
+function isRequiredColumn(column, finalKeys, dimensions) {
+  if (column.entityType !== "level") return false;
+  const dimCount = finalKeys.filter(
+    (c) => c.entityType === "level" && c.entity.dimension === column.entity.dimension
+  ).length;
+  const dimension = dimensions.find((dim) => dim.name === column.entity.dimension);
+  const isRequired = dimension ? dimension.required && dimCount <= 1 : false;
+  return isRequired;
+}
 var removeColumn = (queryItem, entity) => {
   const newQuery = buildQuery(cloneDeep(queryItem));
   const params = newQuery.params;
@@ -3026,9 +3045,9 @@ var removeColumn = (queryItem, entity) => {
   }
 };
 var isProperty = (entity) => entity === "property";
-function showTrashIcon(columns, type) {
-  const result = columns.filter((c) => c.entityType === type);
-  return result.length > 1 || isProperty(type);
+function showTrashIcon(entity, columns) {
+  const result = columns.filter((c) => c.entityType === entity.entityType);
+  return result.length > 1 || isProperty(entity.entityType);
 }
 var getActionIcon = (entityType) => {
   if (entityType === "measure") {
@@ -3129,6 +3148,7 @@ function useTable({
   const drilldowns = useSelector$1(selectDrilldownItems);
   const { code: locale } = useSelector$1(selectLocale);
   const measures = useSelector$1(selectMeasureItems);
+  const dimensions = useDimensionItems();
   const actions2 = useActions();
   const { limit, offset } = useSelector$1(selectPaginationParams);
   const queryItem = useSelector$1(selectCurrentQueryItem);
@@ -3195,7 +3215,19 @@ function useTable({
   const tableData = (data == null ? void 0 : data.data) || [];
   const tableTypes = (data == null ? void 0 : data.types) || {};
   const totalRowCount = data == null ? void 0 : data.page.total;
-  const finalKeys = Object.values(tableTypes).filter((t2) => !t2.isId).filter(columnFilter).sort(columnSorting);
+  const finalKeys = Object.values(tableTypes).map((d) => {
+    var _a;
+    if (d.entityType === "level") {
+      return {
+        ...d,
+        entity: {
+          ...d.entity,
+          dimension: ((_a = drilldowns.find((dd) => dd.key === d.entity.name)) == null ? void 0 : _a.dimension) || ""
+        }
+      };
+    }
+    return d;
+  }).filter((t2) => !t2.isId).filter(columnFilter).sort(columnSorting);
   const { translate: t } = useTranslation();
   const { getFormat, getFormatter } = useFormatter();
   const { idFormatters } = useidFormatters();
@@ -3216,7 +3248,7 @@ function useTable({
       maxSize: 50,
       size: 50
     };
-    const columnsDef = finalKeys.map((column) => {
+    const columnsDef = finalKeys.map((keyCol) => {
       const {
         entity,
         entityType,
@@ -3225,8 +3257,8 @@ function useTable({
         valueType,
         range,
         isId
-      } = column;
-      const isNumeric = valueType === "number" && columnKey !== "Year";
+      } = keyCol;
+      const isNumeric = valueType === "number" && !/Year/i.test(columnKey);
       const formatterKey = getFormat(
         "aggregator" in entity ? entity : columnKey,
         isNumeric ? "Decimal" : "identity"
@@ -3249,8 +3281,9 @@ function useTable({
           }
           return 0;
         },
-        Header: ({ column: column2 }) => {
+        Header: ({ column }) => {
           const isSorted = isColumnSorted(entity.name, sortKey);
+          const showTrash = showTrashIcon(keyCol, finalKeys) && !isRequiredColumn(keyCol, finalKeys, dimensions);
           const isMobile = useMediaQuery(
             `(max-width: ${theme.breakpoints.sm}${/(?:px|em|rem|vh|vw|%)$/.test(theme.breakpoints.xs) ? "" : "px"})`
           );
@@ -3318,12 +3351,12 @@ function useTable({
               /* @__PURE__ */ React15__default.createElement(Text, { size: "sm" }, header),
               !isMobile && /* @__PURE__ */ React15__default.createElement(Box, { ml: "auto" }, actionSort)
             )),
-            /* @__PURE__ */ React15__default.createElement(Group, { position: "apart", w: { base: "100%", sm: "auto" } }, isMobile && actionSort, showTrashIcon(finalKeys, entityType) && /* @__PURE__ */ React15__default.createElement(
+            /* @__PURE__ */ React15__default.createElement(Group, { position: "apart", w: { base: "100%", sm: "auto" } }, isMobile && actionSort, showTrash && /* @__PURE__ */ React15__default.createElement(
               CustomActionIcon_default,
               {
                 label: `At least one ${getEntityText(entityType)} is required.`,
-                key: `remove-${column2.columnDef.header}`,
-                disabled: !showTrashIcon(finalKeys, entityType) || isLoading || isFetching,
+                key: `remove-${column.columnDef.header}`,
+                disabled: !showTrash || isLoading || isFetching,
                 onClick: () => {
                   const nextQueryItem = removeColumn(queryItem, entity);
                   if (nextQueryItem) {
@@ -3331,7 +3364,7 @@ function useTable({
                     updateURL(nextQueryItem);
                   }
                 },
-                showTooltip: !showTrashIcon(finalKeys, entityType),
+                showTooltip: !showTrash,
                 size: 25,
                 ml: rem(5)
               },
@@ -3349,7 +3382,7 @@ function useTable({
           const cellValue = cell.getValue();
           const row = cell.row;
           const cellId = row.original[`${cell.column.id} ID`];
-          const idFormatter = idFormatters[`${column.localeLabel} ID`];
+          const idFormatter = idFormatters[`${keyCol.localeLabel} ID`];
           return /* @__PURE__ */ React15__default.createElement(Flex, { justify: "space-between", sx: { width: "100%", maxWidth: 400 }, gap: "sm" }, /* @__PURE__ */ React15__default.createElement(
             Text,
             {
@@ -3903,14 +3936,14 @@ function LevelItem({
     });
   }, [locale, dimension, hierarchy, level, isSubMenu, t]);
   const currentDrilldown = drilldowns[level.name];
-  const otherHierarchyItems = activeItems.filter(
+  const isOtherHierarchySelected = activeItems.some(
     (activeItem) => activeItem.dimension === dimension.name && activeItem.hierarchy !== hierarchy.name
   );
-  const isOtherHierarchySelected = otherHierarchyItems.length > 0;
+  const isLastLevelInRequiredDimension = dimension.required && activeItems.filter((item) => item.dimension === dimension.name).length === 1;
   const cut = cutItems.find((cut2) => cut2.level === level.name);
   const checked = activeItems.map((i) => i.level).includes(level.name);
-  const disableUncheck = activeItems.length === 1 && checked && !otherHierarchyItems.length;
-  const isDisabled = otherHierarchyItems.length || !checked;
+  const disableUncheck = activeItems.length === 1 && checked;
+  const isDisabled = isLastLevelInRequiredDimension && checked;
   if (!currentDrilldown) return;
   const paddingLeft = `${5 * depth + 5}px`;
   const properties = currentDrilldown.properties.length ? currentDrilldown.properties : null;
@@ -3921,12 +3954,11 @@ function LevelItem({
       sx: { cursor: "pointer", paddingLeft },
       onChange: () => {
         var _a;
-        if (isOtherHierarchySelected) {
-          otherHierarchyItems.forEach((item) => {
-            actions2.updateDrilldown({
-              ...item,
-              active: false
-            });
+        if (isOtherHierarchySelected && !checked) {
+          activeItems.filter(
+            (item) => item.dimension === dimension.name && item.hierarchy !== hierarchy.name
+          ).forEach((item) => {
+            actions2.updateDrilldown({ ...item, active: false });
           });
         }
         actions2.updateDrilldown({
@@ -3960,7 +3992,7 @@ function LevelItem({
       checked,
       label,
       size: "xs",
-      disabled: disableUncheck
+      disabled: isDisabled || disableUncheck
     }
   ), /* @__PURE__ */ React15__default.createElement(Group, { sx: { flexWrap: "nowrap" } }, /* @__PURE__ */ React15__default.createElement(
     ActionIcon,
@@ -6679,7 +6711,15 @@ function ChartCard(props) {
       w: "100%",
       style: { overflow: "hidden", height: resolvedHeight, ...props.style }
     },
-    /* @__PURE__ */ React15__default.createElement(Stack, { spacing: "xs", p: "xs", style: { position: "relative" }, h: "100%", w: "100%" }, /* @__PURE__ */ React15__default.createElement(Group, { position: "center", spacing: "xs", align: "center" }, isFullMode && shareButton, downloadButtons, onFocus && focusButton), /* @__PURE__ */ React15__default.createElement(Box, { style: { flex: "1 1 auto" }, ref: setRefs, sx: { "& > .viz": { height: "100%" } } }, ChartComponent && (inView || hasBeenInView) ? /* @__PURE__ */ React15__default.createElement(ChartComponent, { config }) : /* @__PURE__ */ React15__default.createElement("div", { style: { height: "100%", width: "100%" } })))
+    /* @__PURE__ */ React15__default.createElement(Stack, { spacing: "xs", p: "xs", style: { position: "relative" }, h: "100%", w: "100%" }, /* @__PURE__ */ React15__default.createElement(Group, { position: "center", spacing: "xs", align: "center" }, isFullMode && shareButton, downloadButtons, onFocus && focusButton), /* @__PURE__ */ React15__default.createElement(
+      Box,
+      {
+        style: { flex: "1 1 auto" },
+        ref: setRefs,
+        sx: { "& > .viz": { height: "100%" } }
+      },
+      ChartComponent && (inView || hasBeenInView) ? /* @__PURE__ */ React15__default.createElement(ChartComponent, { config }) : /* @__PURE__ */ React15__default.createElement("div", { style: { height: "100%", width: "100%" } })
+    ))
   ));
 }
 var getBackground = (node) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@datawheel/data-explorer",
-  "version": "1.2.0-rc.5",
+  "version": "1.3.0",
   "main": "./dist/main.mjs",
   "types": "./dist/main.d.mts",
   "files": [
@@ -79,4 +79,4 @@
     "vite": "^6.3.0",
     "wrangler": "^4.11.0"
   }
-}
+}