@bygd/nc-report-ui 0.1.43 → 0.1.44

package/dist/app/esm/index.js

@@ -77759,6 +77759,16 @@ const SortableComputedChip = ({
       handleCancel();
     }
   };
+
+  // The value field is multiline, so Enter inserts a newline instead of
+  // saving; only Escape (cancel) and Cmd/Ctrl+Enter (save) are handled here.
+  const handleValueKeyDown = e => {
+    if (e.key === "Escape") {
+      handleCancel();
+    } else if (e.key === "Enter" && (e.metaKey || e.ctrlKey)) {
+      handleSave();
+    }
+  };
   return /*#__PURE__*/gn.createElement("div", _extends({
     ref: setNodeRef,
     style: style
@@ -77862,10 +77872,13 @@ const SortableComputedChip = ({
   }), /*#__PURE__*/gn.createElement(TextField, {
     value: editValue,
     onChange: e => setEditValue(e.target.value),
-    onKeyDown: handleKeyDown,
+    onKeyDown: handleValueKeyDown,
     size: "small",
     label: "Value",
-    helperText: " ",
+    helperText: "Cmd/Ctrl+Enter to save",
+    multiline: true,
+    minRows: 2,
+    maxRows: 10,
     sx: {
       flex: 1,
       minWidth: "200px",
@@ -78275,6 +78288,9 @@ const Dimensions = ({
     value: computedValue,
     onChange: e => setComputedValue(e.target.value),
     size: "small",
+    multiline: true,
+    minRows: 2,
+    maxRows: 10,
     sx: {
       width: "400px",
       "& .MuiInputBase-input": {
@@ -90517,6 +90533,50 @@ class AdapterDayjs {
   };
 }
 
+// Small text input + button for adding a filter value that isn't present in
+// the "Select Filter Values" dropdown (e.g. because no existing row has that
+// value). Kept as an uncontrolled local field so it clears itself after add.
+const CustomFilterValueInput = ({
+  onAdd
+}) => {
+  const [value, setValue] = d('');
+  const handleAdd = () => {
+    const trimmed = value.trim();
+    if (!trimmed) return;
+    onAdd(trimmed);
+    setValue('');
+  };
+  return /*#__PURE__*/gn.createElement(Box, {
+    sx: {
+      display: 'flex',
+      gap: 1,
+      mt: 1
+    }
+  }, /*#__PURE__*/gn.createElement(TextField, {
+    size: "small",
+    fullWidth: true,
+    placeholder: "Add a value not in the list above",
+    value: value,
+    onChange: e => setValue(e.target.value),
+    onKeyDown: e => {
+      if (e.key === 'Enter') {
+        e.preventDefault();
+        handleAdd();
+      }
+    }
+  }), /*#__PURE__*/gn.createElement(Button, {
+    variant: "outlined",
+    size: "small",
+    onClick: handleAdd,
+    disabled: !value.trim(),
+    sx: {
+      textTransform: 'none',
+      whiteSpace: 'nowrap',
+      borderColor: "rgb(70, 134, 128)",
+      color: "rgb(70, 134, 128)"
+    }
+  }, "Add"));
+};
 const Filters = ({
   providersData,
   rootProvider,
@@ -90656,8 +90716,9 @@ const Filters = ({
       }
     } else {
       // For regular filters, set selected values and fetch available values
-      setSelectedFilterValues(filter.values || []);
-      await fetchFilterValues(fullPath);
+      const currentValues = filter.values || [];
+      setSelectedFilterValues(currentValues);
+      await fetchFilterValues(fullPath, '', currentValues);
     }
   };
   const handleSaveEditedFilter = fullPath => {
@@ -90752,7 +90813,11 @@ const Filters = ({
   };
 
   // Fetch distinct values for the selected dimension
-  const fetchFilterValues = async (fullPath, searchText = '') => {
+  // preserveValues lets a caller pass the values that must survive the merge
+  // explicitly, instead of relying on the selectedFilterValues closure - a
+  // setSelectedFilterValues() call right before fetchFilterValues() hasn't
+  // committed yet by the time this function reads that state.
+  const fetchFilterValues = async (fullPath, searchText = '', preserveValues = null) => {
     setLoadingFilterValues(true);
     try {
       // Get parameters from context if available, otherwise use default
@@ -90825,7 +90890,8 @@ const Filters = ({
       // Merge with currently selected values to ensure they're always available
       // This is important when editing filters with search text - we don't want to lose
       // previously selected values that don't match the current search
-      const selectedValueItems = selectedFilterValues.map(key => ({
+      const valuesToPreserve = preserveValues !== null ? preserveValues : selectedFilterValues;
+      const selectedValueItems = valuesToPreserve.map(key => ({
         key: String(key),
         value: String(key)
       }));
@@ -91054,6 +91120,21 @@ const Filters = ({
     }
   };
 
+  // Add a value typed in the "custom value" box directly into the selected
+  // filter values, and inject it into availableFilterValues too, since
+  // CheckboxMultiAutocomplete only renders a chip for keys it can resolve
+  // against its items list.
+  const handleAddCustomFilterValue = rawValue => {
+    const value = rawValue.trim();
+    if (!value) return;
+    if (selectedFilterValues.includes(value)) return;
+    setAvailableFilterValues(prev => prev.some(item => item.key === value) ? prev : [{
+      key: value,
+      value
+    }, ...prev]);
+    setSelectedFilterValues(prev => [...prev, value]);
+  };
+
   // Handler for search text input in filter values dropdown (debounced - triggers API call)
   const handleFilterSearchChange = searchText => {
     // Determine the fullPath based on current mode
@@ -91273,6 +91354,8 @@ const Filters = ({
       loading: loadingFilterValues,
       helperText: selectedFilterValues.length > 0 ? `${selectedFilterValues.length} value(s) selected` : 'Select at least one value',
       debounceMs: 1000
+    }), /*#__PURE__*/gn.createElement(CustomFilterValueInput, {
+      onAdd: handleAddCustomFilterValue
     })));
   })(), /*#__PURE__*/gn.createElement(Box, {
     sx: {
@@ -91424,6 +91507,8 @@ const Filters = ({
       loading: loadingFilterValues,
       helperText: selectedFilterValues.length > 0 ? `${selectedFilterValues.length} value(s) selected` : 'Select at least one value',
       debounceMs: 1000
+    }), /*#__PURE__*/gn.createElement(CustomFilterValueInput, {
+      onAdd: handleAddCustomFilterValue
     })));
   })(), /*#__PURE__*/gn.createElement(Box, {
     sx: {
@@ -91713,6 +91798,8 @@ const Filters = ({
       loading: loadingFilterValues,
       helperText: selectedFilterValues.length > 0 ? `${selectedFilterValues.length} value(s) selected` : 'Select at least one value',
       debounceMs: 1000
+    }), /*#__PURE__*/gn.createElement(CustomFilterValueInput, {
+      onAdd: handleAddCustomFilterValue
     })), /*#__PURE__*/gn.createElement(Box, {
       sx: {
         display: 'flex',
@@ -93104,14 +93191,24 @@ const ReportBuilder = ({
       queryObj.ordered_metrics = report.metrics.map(metric => metric.id);
     }
 
-    // Persist the optional unified column order (Column Order tab) so the
-    // results grid can reproduce it on reload. Absent when no custom order
-    // has been defined, so old/untouched reports keep their current
-    // dimensions-then-metrics column order unchanged.
-    if (report.columnOrder.length > 0) {
-      queryObj.ordered_columns = report.columnOrder.map(entry => ({
-        type: entry.type,
-        ref: entry.key
+    // Persist the full resolved column order - the explicit Column Order tab
+    // arrangement when defined, otherwise dimensions/computed (in their own
+    // order) followed by metrics (in their own order), same as what the
+    // results grid renders. Always emitted (not just when a custom order
+    // exists) so the API/results grid get an explicit order even for
+    // untouched reports, rather than having to fall back to guessing it.
+    const orderedDimensionItems = report.dimensionOrder.map(entry => entry.type === "dimension" ? {
+      kind: "dimension",
+      data: dimensionById[entry.key]
+    } : {
+      kind: "computed",
+      data: computedByName[entry.key]
+    }).filter(item => item.data);
+    const resolvedColumnItems = resolveColumnOrder(report.columnOrder, orderedDimensionItems, report.metrics);
+    if (resolvedColumnItems.length > 0) {
+      queryObj.ordered_columns = resolvedColumnItems.map(item => ({
+        type: item.kind,
+        ref: item.key
       }));
     }
 

package/dist/default/cjs/index.cjs

@@ -3172,6 +3172,16 @@ const SortableComputedChip = ({
       handleCancel();
     }
   };
+
+  // The value field is multiline, so Enter inserts a newline instead of
+  // saving; only Escape (cancel) and Cmd/Ctrl+Enter (save) are handled here.
+  const handleValueKeyDown = e => {
+    if (e.key === "Escape") {
+      handleCancel();
+    } else if (e.key === "Enter" && (e.metaKey || e.ctrlKey)) {
+      handleSave();
+    }
+  };
   return /*#__PURE__*/React__namespace.default.createElement("div", _extends({
     ref: setNodeRef,
     style: style
@@ -3275,10 +3285,13 @@ const SortableComputedChip = ({
   }), /*#__PURE__*/React__namespace.default.createElement(material.TextField, {
     value: editValue,
     onChange: e => setEditValue(e.target.value),
-    onKeyDown: handleKeyDown,
+    onKeyDown: handleValueKeyDown,
     size: "small",
     label: "Value",
-    helperText: " ",
+    helperText: "Cmd/Ctrl+Enter to save",
+    multiline: true,
+    minRows: 2,
+    maxRows: 10,
     sx: {
       flex: 1,
       minWidth: "200px",
@@ -3688,6 +3701,9 @@ const Dimensions = ({
     value: computedValue,
     onChange: e => setComputedValue(e.target.value),
     size: "small",
+    multiline: true,
+    minRows: 2,
+    maxRows: 10,
     sx: {
       width: "400px",
       "& .MuiInputBase-input": {
@@ -4582,6 +4598,50 @@ const Metrics = ({
   })))));
 };
 
+// Small text input + button for adding a filter value that isn't present in
+// the "Select Filter Values" dropdown (e.g. because no existing row has that
+// value). Kept as an uncontrolled local field so it clears itself after add.
+const CustomFilterValueInput = ({
+  onAdd
+}) => {
+  const [value, setValue] = React.useState('');
+  const handleAdd = () => {
+    const trimmed = value.trim();
+    if (!trimmed) return;
+    onAdd(trimmed);
+    setValue('');
+  };
+  return /*#__PURE__*/React__namespace.default.createElement(material.Box, {
+    sx: {
+      display: 'flex',
+      gap: 1,
+      mt: 1
+    }
+  }, /*#__PURE__*/React__namespace.default.createElement(material.TextField, {
+    size: "small",
+    fullWidth: true,
+    placeholder: "Add a value not in the list above",
+    value: value,
+    onChange: e => setValue(e.target.value),
+    onKeyDown: e => {
+      if (e.key === 'Enter') {
+        e.preventDefault();
+        handleAdd();
+      }
+    }
+  }), /*#__PURE__*/React__namespace.default.createElement(material.Button, {
+    variant: "outlined",
+    size: "small",
+    onClick: handleAdd,
+    disabled: !value.trim(),
+    sx: {
+      textTransform: 'none',
+      whiteSpace: 'nowrap',
+      borderColor: "rgb(70, 134, 128)",
+      color: "rgb(70, 134, 128)"
+    }
+  }, "Add"));
+};
 const Filters = ({
   providersData,
   rootProvider,
@@ -4721,8 +4781,9 @@ const Filters = ({
       }
     } else {
       // For regular filters, set selected values and fetch available values
-      setSelectedFilterValues(filter.values || []);
-      await fetchFilterValues(fullPath);
+      const currentValues = filter.values || [];
+      setSelectedFilterValues(currentValues);
+      await fetchFilterValues(fullPath, '', currentValues);
     }
   };
   const handleSaveEditedFilter = fullPath => {
@@ -4817,7 +4878,11 @@ const Filters = ({
   };
 
   // Fetch distinct values for the selected dimension
-  const fetchFilterValues = async (fullPath, searchText = '') => {
+  // preserveValues lets a caller pass the values that must survive the merge
+  // explicitly, instead of relying on the selectedFilterValues closure - a
+  // setSelectedFilterValues() call right before fetchFilterValues() hasn't
+  // committed yet by the time this function reads that state.
+  const fetchFilterValues = async (fullPath, searchText = '', preserveValues = null) => {
     setLoadingFilterValues(true);
     try {
       // Get parameters from context if available, otherwise use default
@@ -4890,7 +4955,8 @@ const Filters = ({
       // Merge with currently selected values to ensure they're always available
       // This is important when editing filters with search text - we don't want to lose
       // previously selected values that don't match the current search
-      const selectedValueItems = selectedFilterValues.map(key => ({
+      const valuesToPreserve = preserveValues !== null ? preserveValues : selectedFilterValues;
+      const selectedValueItems = valuesToPreserve.map(key => ({
         key: String(key),
         value: String(key)
       }));
@@ -5119,6 +5185,21 @@ const Filters = ({
     }
   };
 
+  // Add a value typed in the "custom value" box directly into the selected
+  // filter values, and inject it into availableFilterValues too, since
+  // CheckboxMultiAutocomplete only renders a chip for keys it can resolve
+  // against its items list.
+  const handleAddCustomFilterValue = rawValue => {
+    const value = rawValue.trim();
+    if (!value) return;
+    if (selectedFilterValues.includes(value)) return;
+    setAvailableFilterValues(prev => prev.some(item => item.key === value) ? prev : [{
+      key: value,
+      value
+    }, ...prev]);
+    setSelectedFilterValues(prev => [...prev, value]);
+  };
+
   // Handler for search text input in filter values dropdown (debounced - triggers API call)
   const handleFilterSearchChange = searchText => {
     // Determine the fullPath based on current mode
@@ -5338,6 +5419,8 @@ const Filters = ({
       loading: loadingFilterValues,
       helperText: selectedFilterValues.length > 0 ? `${selectedFilterValues.length} value(s) selected` : 'Select at least one value',
       debounceMs: 1000
+    }), /*#__PURE__*/React__namespace.default.createElement(CustomFilterValueInput, {
+      onAdd: handleAddCustomFilterValue
     })));
   })(), /*#__PURE__*/React__namespace.default.createElement(material.Box, {
     sx: {
@@ -5489,6 +5572,8 @@ const Filters = ({
       loading: loadingFilterValues,
       helperText: selectedFilterValues.length > 0 ? `${selectedFilterValues.length} value(s) selected` : 'Select at least one value',
       debounceMs: 1000
+    }), /*#__PURE__*/React__namespace.default.createElement(CustomFilterValueInput, {
+      onAdd: handleAddCustomFilterValue
     })));
   })(), /*#__PURE__*/React__namespace.default.createElement(material.Box, {
     sx: {
@@ -5778,6 +5863,8 @@ const Filters = ({
       loading: loadingFilterValues,
       helperText: selectedFilterValues.length > 0 ? `${selectedFilterValues.length} value(s) selected` : 'Select at least one value',
       debounceMs: 1000
+    }), /*#__PURE__*/React__namespace.default.createElement(CustomFilterValueInput, {
+      onAdd: handleAddCustomFilterValue
     })), /*#__PURE__*/React__namespace.default.createElement(material.Box, {
       sx: {
         display: 'flex',
@@ -7165,14 +7252,24 @@ const ReportBuilder = ({
       queryObj.ordered_metrics = report.metrics.map(metric => metric.id);
     }
 
-    // Persist the optional unified column order (Column Order tab) so the
-    // results grid can reproduce it on reload. Absent when no custom order
-    // has been defined, so old/untouched reports keep their current
-    // dimensions-then-metrics column order unchanged.
-    if (report.columnOrder.length > 0) {
-      queryObj.ordered_columns = report.columnOrder.map(entry => ({
-        type: entry.type,
-        ref: entry.key
+    // Persist the full resolved column order - the explicit Column Order tab
+    // arrangement when defined, otherwise dimensions/computed (in their own
+    // order) followed by metrics (in their own order), same as what the
+    // results grid renders. Always emitted (not just when a custom order
+    // exists) so the API/results grid get an explicit order even for
+    // untouched reports, rather than having to fall back to guessing it.
+    const orderedDimensionItems = report.dimensionOrder.map(entry => entry.type === "dimension" ? {
+      kind: "dimension",
+      data: dimensionById[entry.key]
+    } : {
+      kind: "computed",
+      data: computedByName[entry.key]
+    }).filter(item => item.data);
+    const resolvedColumnItems = resolveColumnOrder(report.columnOrder, orderedDimensionItems, report.metrics);
+    if (resolvedColumnItems.length > 0) {
+      queryObj.ordered_columns = resolvedColumnItems.map(item => ({
+        type: item.kind,
+        ref: item.key
       }));
     }
 

package/dist/default/esm/index.js

@@ -3091,6 +3091,16 @@ const SortableComputedChip = ({
       handleCancel();
     }
   };
+
+  // The value field is multiline, so Enter inserts a newline instead of
+  // saving; only Escape (cancel) and Cmd/Ctrl+Enter (save) are handled here.
+  const handleValueKeyDown = e => {
+    if (e.key === "Escape") {
+      handleCancel();
+    } else if (e.key === "Enter" && (e.metaKey || e.ctrlKey)) {
+      handleSave();
+    }
+  };
   return /*#__PURE__*/React__default.createElement("div", _extends({
     ref: setNodeRef,
     style: style
@@ -3194,10 +3204,13 @@ const SortableComputedChip = ({
   }), /*#__PURE__*/React__default.createElement(TextField, {
     value: editValue,
     onChange: e => setEditValue(e.target.value),
-    onKeyDown: handleKeyDown,
+    onKeyDown: handleValueKeyDown,
     size: "small",
     label: "Value",
-    helperText: " ",
+    helperText: "Cmd/Ctrl+Enter to save",
+    multiline: true,
+    minRows: 2,
+    maxRows: 10,
     sx: {
       flex: 1,
       minWidth: "200px",
@@ -3607,6 +3620,9 @@ const Dimensions = ({
     value: computedValue,
     onChange: e => setComputedValue(e.target.value),
     size: "small",
+    multiline: true,
+    minRows: 2,
+    maxRows: 10,
     sx: {
       width: "400px",
       "& .MuiInputBase-input": {
@@ -4501,6 +4517,50 @@ const Metrics = ({
   })))));
 };
 
+// Small text input + button for adding a filter value that isn't present in
+// the "Select Filter Values" dropdown (e.g. because no existing row has that
+// value). Kept as an uncontrolled local field so it clears itself after add.
+const CustomFilterValueInput = ({
+  onAdd
+}) => {
+  const [value, setValue] = useState('');
+  const handleAdd = () => {
+    const trimmed = value.trim();
+    if (!trimmed) return;
+    onAdd(trimmed);
+    setValue('');
+  };
+  return /*#__PURE__*/React__default.createElement(Box$1, {
+    sx: {
+      display: 'flex',
+      gap: 1,
+      mt: 1
+    }
+  }, /*#__PURE__*/React__default.createElement(TextField, {
+    size: "small",
+    fullWidth: true,
+    placeholder: "Add a value not in the list above",
+    value: value,
+    onChange: e => setValue(e.target.value),
+    onKeyDown: e => {
+      if (e.key === 'Enter') {
+        e.preventDefault();
+        handleAdd();
+      }
+    }
+  }), /*#__PURE__*/React__default.createElement(Button, {
+    variant: "outlined",
+    size: "small",
+    onClick: handleAdd,
+    disabled: !value.trim(),
+    sx: {
+      textTransform: 'none',
+      whiteSpace: 'nowrap',
+      borderColor: "rgb(70, 134, 128)",
+      color: "rgb(70, 134, 128)"
+    }
+  }, "Add"));
+};
 const Filters = ({
   providersData,
   rootProvider,
@@ -4640,8 +4700,9 @@ const Filters = ({
       }
     } else {
       // For regular filters, set selected values and fetch available values
-      setSelectedFilterValues(filter.values || []);
-      await fetchFilterValues(fullPath);
+      const currentValues = filter.values || [];
+      setSelectedFilterValues(currentValues);
+      await fetchFilterValues(fullPath, '', currentValues);
     }
   };
   const handleSaveEditedFilter = fullPath => {
@@ -4736,7 +4797,11 @@ const Filters = ({
   };
 
   // Fetch distinct values for the selected dimension
-  const fetchFilterValues = async (fullPath, searchText = '') => {
+  // preserveValues lets a caller pass the values that must survive the merge
+  // explicitly, instead of relying on the selectedFilterValues closure - a
+  // setSelectedFilterValues() call right before fetchFilterValues() hasn't
+  // committed yet by the time this function reads that state.
+  const fetchFilterValues = async (fullPath, searchText = '', preserveValues = null) => {
     setLoadingFilterValues(true);
     try {
       // Get parameters from context if available, otherwise use default
@@ -4809,7 +4874,8 @@ const Filters = ({
       // Merge with currently selected values to ensure they're always available
       // This is important when editing filters with search text - we don't want to lose
       // previously selected values that don't match the current search
-      const selectedValueItems = selectedFilterValues.map(key => ({
+      const valuesToPreserve = preserveValues !== null ? preserveValues : selectedFilterValues;
+      const selectedValueItems = valuesToPreserve.map(key => ({
         key: String(key),
         value: String(key)
       }));
@@ -5038,6 +5104,21 @@ const Filters = ({
     }
   };
 
+  // Add a value typed in the "custom value" box directly into the selected
+  // filter values, and inject it into availableFilterValues too, since
+  // CheckboxMultiAutocomplete only renders a chip for keys it can resolve
+  // against its items list.
+  const handleAddCustomFilterValue = rawValue => {
+    const value = rawValue.trim();
+    if (!value) return;
+    if (selectedFilterValues.includes(value)) return;
+    setAvailableFilterValues(prev => prev.some(item => item.key === value) ? prev : [{
+      key: value,
+      value
+    }, ...prev]);
+    setSelectedFilterValues(prev => [...prev, value]);
+  };
+
   // Handler for search text input in filter values dropdown (debounced - triggers API call)
   const handleFilterSearchChange = searchText => {
     // Determine the fullPath based on current mode
@@ -5257,6 +5338,8 @@ const Filters = ({
       loading: loadingFilterValues,
       helperText: selectedFilterValues.length > 0 ? `${selectedFilterValues.length} value(s) selected` : 'Select at least one value',
       debounceMs: 1000
+    }), /*#__PURE__*/React__default.createElement(CustomFilterValueInput, {
+      onAdd: handleAddCustomFilterValue
     })));
   })(), /*#__PURE__*/React__default.createElement(Box$1, {
     sx: {
@@ -5408,6 +5491,8 @@ const Filters = ({
       loading: loadingFilterValues,
       helperText: selectedFilterValues.length > 0 ? `${selectedFilterValues.length} value(s) selected` : 'Select at least one value',
       debounceMs: 1000
+    }), /*#__PURE__*/React__default.createElement(CustomFilterValueInput, {
+      onAdd: handleAddCustomFilterValue
     })));
   })(), /*#__PURE__*/React__default.createElement(Box$1, {
     sx: {
@@ -5697,6 +5782,8 @@ const Filters = ({
       loading: loadingFilterValues,
       helperText: selectedFilterValues.length > 0 ? `${selectedFilterValues.length} value(s) selected` : 'Select at least one value',
       debounceMs: 1000
+    }), /*#__PURE__*/React__default.createElement(CustomFilterValueInput, {
+      onAdd: handleAddCustomFilterValue
     })), /*#__PURE__*/React__default.createElement(Box$1, {
       sx: {
         display: 'flex',
@@ -7084,14 +7171,24 @@ const ReportBuilder = ({
       queryObj.ordered_metrics = report.metrics.map(metric => metric.id);
     }
 
-    // Persist the optional unified column order (Column Order tab) so the
-    // results grid can reproduce it on reload. Absent when no custom order
-    // has been defined, so old/untouched reports keep their current
-    // dimensions-then-metrics column order unchanged.
-    if (report.columnOrder.length > 0) {
-      queryObj.ordered_columns = report.columnOrder.map(entry => ({
-        type: entry.type,
-        ref: entry.key
+    // Persist the full resolved column order - the explicit Column Order tab
+    // arrangement when defined, otherwise dimensions/computed (in their own
+    // order) followed by metrics (in their own order), same as what the
+    // results grid renders. Always emitted (not just when a custom order
+    // exists) so the API/results grid get an explicit order even for
+    // untouched reports, rather than having to fall back to guessing it.
+    const orderedDimensionItems = report.dimensionOrder.map(entry => entry.type === "dimension" ? {
+      kind: "dimension",
+      data: dimensionById[entry.key]
+    } : {
+      kind: "computed",
+      data: computedByName[entry.key]
+    }).filter(item => item.data);
+    const resolvedColumnItems = resolveColumnOrder(report.columnOrder, orderedDimensionItems, report.metrics);
+    if (resolvedColumnItems.length > 0) {
+      queryObj.ordered_columns = resolvedColumnItems.map(item => ({
+        type: item.kind,
+        ref: item.key
       }));
     }
 

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@bygd/nc-report-ui",
-	"version": "0.1.43",
+	"version": "0.1.44",
 	"files": [
 		"dist/*",
 		"fnet/input.yaml",