@vuu-ui/vuu-table 0.7.2-debug → 0.7.3-debug

package/cjs/index.js

@@ -162,7 +162,10 @@ function buildAggregationMenuItems(options, dataSource) {
   return [
     {
       label: `Aggregate ${label}`,
-      children: [{ label: "Count", action: "agg-count", options }].concat(
+      children: [
+        { label: "Count", action: "agg-count", options },
+        { label: "Distinct", action: "agg-distinct", options }
+      ].concat(
         (0, import_vuu_utils.isNumericColumn)(column) ? [
           { label: "Sum", action: "agg-sum", options },
           { label: "Avg", action: "agg-avg", options },
@@ -271,7 +274,7 @@ var removeFilterColumn = (dataSourceFilter, column) => {
     return dataSourceFilter;
   }
 };
-var { Average, Count, High, Low, Sum } = import_vuu_utils2.AggregationType;
+var { Average, Count, Distinct, High, Low, Sum } = import_vuu_utils2.AggregationType;
 var useTableContextMenu = ({
   dataSource,
   onPersistentColumnOperation
@@ -309,6 +312,8 @@ var useTableContextMenu = ({
           return dataSource.aggregations = (0, import_vuu_utils2.setAggregations)(dataSource.aggregations, column, Low), true;
         case "agg-count":
           return dataSource.aggregations = (0, import_vuu_utils2.setAggregations)(dataSource.aggregations, column, Count), true;
+        case "agg-distinct":
+          return dataSource.aggregations = (0, import_vuu_utils2.setAggregations)(dataSource.aggregations, column, Distinct), true;
         case "agg-sum":
           return dataSource.aggregations = (0, import_vuu_utils2.setAggregations)(dataSource.aggregations, column, Sum), true;
         case "column-pin-floating":
@@ -456,7 +461,7 @@ var { DEPTH, IS_LEAF } = import_vuu_utils4.metadataKeys;
 var getGroupValueAndOffset = (columns, row) => {
   const { [DEPTH]: depth, [IS_LEAF]: isLeaf } = row;
   if (isLeaf || depth > columns.length) {
-    return [null, depth === null ? 0 : depth - 1];
+    return [null, depth === null ? 0 : Math.max(0, depth - 1)];
   } else if (depth === 0) {
     return ["$root", 0];
   } else {
@@ -1712,14 +1717,18 @@ var getCellRendererForColumn = (column) => {
     return (0, import_vuu_utils11.getCellRenderer)((_a = column.type) == null ? void 0 : _a.renderer);
   }
 };
-var getDataType = (column, columnNames, dataTypes) => {
-  var _a;
-  const index = columnNames.indexOf(column.name);
-  if (index !== -1 && dataTypes[index]) {
-    return dataTypes[index];
-  } else {
-    return (_a = column.serverDataType) != null ? _a : "string";
+var getServerDataTypeForColumn = (column, tableSchema) => {
+  if (column.serverDataType) {
+    return column.serverDataType;
+  } else if (tableSchema) {
+    const schemaColumn = tableSchema.columns.find(
+      (col) => col.name === column.name
+    );
+    if (schemaColumn) {
+      return schemaColumn.serverDataType;
+    }
   }
+  return "string";
 };
 var numericTypes = ["int", "long", "double"];
 var getDefaultAlignment = (serverDataType) => serverDataType === void 0 ? void 0 : numericTypes.includes(serverDataType) ? "right" : "left";
@@ -1732,8 +1741,8 @@ var columnReducer = (state, action) => {
       return moveColumn(state, action);
     case "resizeColumn":
       return resizeColumn(state, action);
-    case "setTypes":
-      return setTypes(state, action);
+    case "setTableSchema":
+      return setTableSchema(state, action);
     case "hideColumns":
       return hideColumns(state, action);
     case "showColumns":
@@ -1785,9 +1794,13 @@ var getLabel = (label, columnFormatHeader) => {
   return label;
 };
 var toKeyedColumWithDefaults = (options) => (column, index) => {
+  const serverDataType = getServerDataTypeForColumn(
+    column,
+    options.tableSchema
+  );
   const { columnDefaultWidth = DEFAULT_COLUMN_WIDTH, columnFormatHeader } = options;
   const {
-    align = getDefaultAlignment(column.serverDataType),
+    align = getDefaultAlignment(serverDataType),
     key,
     name,
     label = name,
@@ -1802,6 +1815,7 @@ var toKeyedColumWithDefaults = (options) => (column, index) => {
     key: key != null ? key : index + KEY_OFFSET,
     name,
     originalIdx: index,
+    serverDataType,
     valueFormatter: (0, import_vuu_utils11.getValueFormatter)(column),
     width
   };
@@ -1879,12 +1893,12 @@ function resizeColumn(state, { column, phase, width }) {
       throw Error(`useTableModel.resizeColumn, invalid resizePhase ${phase}`);
   }
 }
-function setTypes(state, { columnNames, serverDataTypes }) {
+function setTableSchema(state, { tableSchema }) {
   const { columns } = state;
   if (columns.some(columnWithoutDataType)) {
     const cols = columns.map((column) => {
       var _a;
-      const serverDataType = getDataType(column, columnNames, serverDataTypes);
+      const serverDataType = getServerDataTypeForColumn(column, tableSchema);
       return {
         ...column,
         align: (_a = column.align) != null ? _a : getDefaultAlignment(serverDataType),
@@ -1893,10 +1907,14 @@ function setTypes(state, { columnNames, serverDataTypes }) {
     });
     return {
       ...state,
-      columns: cols
+      columns: cols,
+      tableSchema
     };
   } else {
-    return state;
+    return {
+      ...state,
+      tableSchema
+    };
   }
 }
 function pinColumn2(state, action) {
@@ -1962,6 +1980,13 @@ function updateTableConfig(state, { columns, confirmed, filter, groupBy, sort })
               key
             };
           }
+        } else {
+          return toKeyedColumWithDefaults(state)(
+            {
+              name: colName
+            },
+            index
+          );
         }
         throw Error(`useTableModel column ${colName} not found`);
       })
@@ -2391,15 +2416,15 @@ var useTable = ({
     size: containerMeasurements.innerSize
   });
   const onSubscribed = (0, import_react20.useCallback)(
-    (subscription) => {
-      if (subscription.tableMeta) {
-        const { columns: columnNames, dataTypes: serverDataTypes } = subscription.tableMeta;
+    ({ tableSchema }) => {
+      if (tableSchema) {
         expectConfigChangeRef.current = true;
         dispatchColumnAction({
-          type: "setTypes",
-          columnNames,
-          serverDataTypes
+          type: "setTableSchema",
+          tableSchema
         });
+      } else {
+        console.log("usbscription message with no schema");
       }
     },
     [dispatchColumnAction]