@bygd/nc-report-ui 0.1.40 → 0.1.41

package/dist/default/cjs/index.cjs

@@ -1653,6 +1653,39 @@ const ReportingProvider = ({
   }, children);
 };
 
+/**
+ * useReportingContext - Hook to access reporting context
+ * 
+ * @returns {Object} Context value with parameters, api, and setter functions
+ * @returns {Object} return.parameters - Current parameters object
+ * @returns {Function} return.setParameters - Function to update parameters
+ * @returns {Object} return.api - Current API configuration
+ * @returns {Function} return.setApi - Function to update API configuration
+ * @returns {Function} return.setReportingContext - Function to update both parameters and api
+ * 
+ * @example
+ * const { parameters, setParameters, api, setApi, setReportingContext } = useReportingContext();
+ * 
+ * // Update parameters only
+ * setParameters({ base_currency: 'USD', merchants: [...] });
+ * 
+ * // Update API only
+ * setApi({ token: 'new-token', base_url: 'https://api.example.com' });
+ * 
+ * // Update both at once
+ * setReportingContext({
+ *   parameters: { base_currency: 'EUR' },
+ *   api: { token: 'token', base_url: 'https://api.example.com' }
+ * });
+ */
+const useReportingContext = () => {
+  const context = React.useContext(ReportingContext);
+  if (context === undefined) {
+    throw new Error('useReportingContext must be used within a ReportingProvider');
+  }
+  return context;
+};
+
 /**
  * useReportingContextOptional - Hook to optionally access reporting context
  * Returns null if used outside of ReportingProvider (useful for optional fallback)
@@ -2896,7 +2929,6 @@ const SortableChip$1 = ({
 // the top-of-page Add form, so it stays visible regardless of scroll position.
 const SortableComputedChip = ({
   id,
-  index,
   name,
   value,
   onDelete,
@@ -2949,13 +2981,13 @@ const SortableComputedChip = ({
     setEditValue(value);
     setIsEditing(true);
   };
-  const nameError = editName.trim() !== "" && isNameTaken(editName.trim(), index);
+  const nameError = editName.trim() !== "" && isNameTaken(editName.trim(), name);
   const handleSave = () => {
     const trimmedName = editName.trim();
     const trimmedValue = editValue.trim();
     if (!trimmedName || !trimmedValue) return;
-    if (isNameTaken(trimmedName, index)) return;
-    onUpdate(index, {
+    if (isNameTaken(trimmedName, name)) return;
+    onUpdate(name, {
       name: trimmedName,
       value: trimmedValue
     });
@@ -3153,7 +3185,7 @@ const Dimensions = ({
   savedDimensions = [],
   onSaveDimension,
   onRemoveDimension,
-  onReorderDimensions,
+  onUpdateDimensionSortOrder,
   titleOverrides = {},
   onUpdateTitle,
   onResetTitle,
@@ -3163,7 +3195,8 @@ const Dimensions = ({
   onSaveComputedDimension,
   onUpdateComputedDimension,
   onRemoveComputedDimension,
-  onReorderComputedDimensions
+  dimensionOrder = [],
+  onReorderDimensionItems
 }) => {
   const reportingContext = useReportingContextOptional();
   const parameters = reportingContext?.parameters;
@@ -3179,49 +3212,56 @@ const Dimensions = ({
     coordinateGetter: sortable.sortableKeyboardCoordinates
   }));
 
-  // Handle drag end
+  // Resolve the unified dimensionOrder into the actual dimension / computed
+  // dimension objects, so dimensions and computed dimensions can be shown
+  // (and dragged) as a single list while staying stored in their own arrays.
+  const dimensionByFullPath = Object.fromEntries(savedDimensions.map(d => [d.fullPath, d]));
+  const computedDimensionByName = Object.fromEntries(savedComputedDimensions.map(cd => [cd.name, cd]));
+  const orderedItems = dimensionOrder.map(entry => entry.type === "dimension" ? {
+    kind: "dimension",
+    key: entry.key,
+    data: dimensionByFullPath[entry.key]
+  } : {
+    kind: "computed",
+    key: entry.key,
+    data: computedDimensionByName[entry.key]
+  }).filter(item => item.data);
+
+  // Handle drag end for the unified list
   const handleDragEnd = event => {
     const {
       active,
       over
     } = event;
     if (over && active.id !== over.id) {
-      const oldIndex = savedDimensions.findIndex((_, i) => i === active.id);
-      const newIndex = savedDimensions.findIndex((_, i) => i === over.id);
-      const newOrder = sortable.arrayMove(savedDimensions, oldIndex, newIndex);
-      onReorderDimensions(newOrder);
+      const oldIndex = dimensionOrder.findIndex((_, i) => i === active.id);
+      const newIndex = dimensionOrder.findIndex((_, i) => i === over.id);
+      onReorderDimensionItems(sortable.arrayMove(dimensionOrder, oldIndex, newIndex));
     }
   };
 
   // Handle move up
   const handleMoveUp = index => {
     if (index > 0) {
-      const newOrder = sortable.arrayMove(savedDimensions, index, index - 1);
-      onReorderDimensions(newOrder);
+      onReorderDimensionItems(sortable.arrayMove(dimensionOrder, index, index - 1));
     }
   };
 
   // Handle move down
   const handleMoveDown = index => {
-    if (index < savedDimensions.length - 1) {
-      const newOrder = sortable.arrayMove(savedDimensions, index, index + 1);
-      onReorderDimensions(newOrder);
+    if (index < dimensionOrder.length - 1) {
+      onReorderDimensionItems(sortable.arrayMove(dimensionOrder, index, index + 1));
     }
   };
 
-  // Handle sort order change
-  const handleSortOrderChange = (index, sortOrder) => {
-    const newDimensions = [...savedDimensions];
-    newDimensions[index] = {
-      ...newDimensions[index],
-      sortOrder
-    };
-    onReorderDimensions(newDimensions);
+  // Handle sort order change (dimensions only - computed dimensions have no order_by)
+  const handleSortOrderChange = (fullPath, sortOrder) => {
+    onUpdateDimensionSortOrder(fullPath, sortOrder);
   };
 
   // Computed Dimensions: { name, value } pairs independent of any provider.
   // Their `value` is a raw SQL literal/expression sent to the API as-is.
-  const isComputedNameTaken = (name, excludeIndex = null) => savedComputedDimensions.some((cd, i) => cd.name === name && i !== excludeIndex);
+  const isComputedNameTaken = (name, excludeName = null) => savedComputedDimensions.some(cd => cd.name === name) && name !== excludeName;
   const computedNameError = computedName.trim() !== "" && isComputedNameTaken(computedName.trim());
   const handleAddComputedClick = () => {
     setIsAddingComputed(true);
@@ -3245,27 +3285,6 @@ const Dimensions = ({
     });
     handleCancelComputed();
   };
-  const handleComputedDragEnd = event => {
-    const {
-      active,
-      over
-    } = event;
-    if (over && active.id !== over.id) {
-      const oldIndex = savedComputedDimensions.findIndex((_, i) => i === active.id);
-      const newIndex = savedComputedDimensions.findIndex((_, i) => i === over.id);
-      onReorderComputedDimensions(sortable.arrayMove(savedComputedDimensions, oldIndex, newIndex));
-    }
-  };
-  const handleMoveComputedUp = index => {
-    if (index > 0) {
-      onReorderComputedDimensions(sortable.arrayMove(savedComputedDimensions, index, index - 1));
-    }
-  };
-  const handleMoveComputedDown = index => {
-    if (index < savedComputedDimensions.length - 1) {
-      onReorderComputedDimensions(sortable.arrayMove(savedComputedDimensions, index, index + 1));
-    }
-  };
 
   // Get the current provider based on selection chain
   const getCurrentProvider = () => {
@@ -3708,7 +3727,7 @@ const Dimensions = ({
         boxShadow: "none"
       }
     }
-  }, "Save Dimension"))), savedDimensions.length > 0 && /*#__PURE__*/React__namespace.default.createElement(material.Box, {
+  }, "Save Dimension"))), orderedItems.length > 0 && /*#__PURE__*/React__namespace.default.createElement(material.Box, {
     sx: {
       marginTop: 0
     }
@@ -3731,7 +3750,7 @@ const Dimensions = ({
     collisionDetection: core.closestCenter,
     onDragEnd: handleDragEnd
   }, /*#__PURE__*/React__namespace.default.createElement(sortable.SortableContext, {
-    items: savedDimensions.map((_, index) => index),
+    items: orderedItems.map((_, index) => index),
     strategy: sortable.verticalListSortingStrategy
   }, /*#__PURE__*/React__namespace.default.createElement(material.Box, {
     sx: {
@@ -3739,67 +3758,35 @@ const Dimensions = ({
       flexDirection: "column",
       gap: 1
     }
-  }, savedDimensions.map((dim, index) => /*#__PURE__*/React__namespace.default.createElement(SortableChip$1, {
-    key: index,
+  }, orderedItems.map((item, index) => item.kind === "dimension" ? /*#__PURE__*/React__namespace.default.createElement(SortableChip$1, {
+    key: `dim-${item.key}`,
     id: index,
-    label: dim.dimensionTitle,
-    fullLabel: `${formatProviderPath(dim)} → ${dim.dimensionTitle} (${dim.fullPath})`,
-    onDelete: () => onRemoveDimension(index),
+    label: item.data.dimensionTitle,
+    fullLabel: `${formatProviderPath(item.data)} → ${item.data.dimensionTitle} (${item.data.fullPath})`,
+    onDelete: () => onRemoveDimension(item.key),
     onMoveUp: () => handleMoveUp(index),
     onMoveDown: () => handleMoveDown(index),
     isFirst: index === 0,
-    isLast: index === savedDimensions.length - 1,
-    sortOrder: dim.sortOrder || null,
-    onSortOrderChange: sortOrder => handleSortOrderChange(index, sortOrder),
-    fullPath: dim.fullPath,
-    defaultTitle: dim.dimensionTitle,
-    customTitle: titleOverrides[dim.fullPath],
+    isLast: index === orderedItems.length - 1,
+    sortOrder: item.data.sortOrder || null,
+    onSortOrderChange: sortOrder => handleSortOrderChange(item.key, sortOrder),
+    fullPath: item.data.fullPath,
+    defaultTitle: item.data.dimensionTitle,
+    customTitle: titleOverrides[item.data.fullPath],
     onUpdateTitle: onUpdateTitle,
     onResetTitle: onResetTitle
-  })))))), savedComputedDimensions.length > 0 && /*#__PURE__*/React__namespace.default.createElement(material.Box, {
-    sx: {
-      marginTop: 2
-    }
-  }, /*#__PURE__*/React__namespace.default.createElement(material.Typography, {
-    variant: "h6",
-    sx: {
-      fontSize: "16px",
-      fontWeight: 600,
-      marginTop: 2,
-      color: "rgb(37, 37, 37)"
-    }
-  }, "Saved Computed Dimensions"), /*#__PURE__*/React__namespace.default.createElement(material.Typography, {
-    sx: {
-      fontSize: "13px",
-      color: "#666",
-      marginBottom: 2
-    }
-  }, "Drag to reorder or use arrows"), /*#__PURE__*/React__namespace.default.createElement(core.DndContext, {
-    sensors: sensors,
-    collisionDetection: core.closestCenter,
-    onDragEnd: handleComputedDragEnd
-  }, /*#__PURE__*/React__namespace.default.createElement(sortable.SortableContext, {
-    items: savedComputedDimensions.map((_, index) => index),
-    strategy: sortable.verticalListSortingStrategy
-  }, /*#__PURE__*/React__namespace.default.createElement(material.Box, {
-    sx: {
-      display: "flex",
-      flexDirection: "column",
-      gap: 1
-    }
-  }, savedComputedDimensions.map((cd, index) => /*#__PURE__*/React__namespace.default.createElement(SortableComputedChip, {
-    key: index,
+  }) : /*#__PURE__*/React__namespace.default.createElement(SortableComputedChip, {
+    key: `comp-${item.key}`,
     id: index,
-    index: index,
-    name: cd.name,
-    value: cd.value,
+    name: item.data.name,
+    value: item.data.value,
     onUpdate: onUpdateComputedDimension,
     isNameTaken: isComputedNameTaken,
-    onDelete: () => onRemoveComputedDimension(index),
-    onMoveUp: () => handleMoveComputedUp(index),
-    onMoveDown: () => handleMoveComputedDown(index),
+    onDelete: () => onRemoveComputedDimension(item.key),
+    onMoveUp: () => handleMoveUp(index),
+    onMoveDown: () => handleMoveDown(index),
     isFirst: index === 0,
-    isLast: index === savedComputedDimensions.length - 1
+    isLast: index === orderedItems.length - 1
   })))))));
 };
 
@@ -5782,9 +5769,8 @@ const formatValue = (value, def) => {
 const isNumericType = type => type === 'integer' || type === 'currency';
 const ReportDataGrid = ({
   reportData,
-  dimensions,
+  orderedDimensionItems = [],
   metrics,
-  computedDimensions = [],
   loading,
   onPageChange,
   totalRows = 0,
@@ -5804,11 +5790,26 @@ const ReportDataGrid = ({
   const columns = React__namespace.default.useMemo(() => {
     const cols = [];
 
-    // Add dimension columns
-    // Field naming logic:
+    // Add dimension + computed-dimension columns, in the single unified
+    // order the user arranged them in on the Dimensions tab.
+    // Field naming logic (dimensions):
     // - If from base provider: baseAlias.field -> baseAlias_field
     // - If from nested provider: baseAlias_rel1_rel2.field -> rel1_rel2_field (drops base alias)
-    dimensions.forEach(dim => {
+    // Computed dimensions have no provider/relations chain, so the API
+    // returns each row keyed by the computed dimension's own `name`.
+    orderedDimensionItems.forEach(item => {
+      if (item.kind === 'computed') {
+        const cd = item.data;
+        cols.push({
+          field: cd.name,
+          headerName: cd.name,
+          flex: 1,
+          minWidth: 150,
+          type: 'string'
+        });
+        return;
+      }
+      const dim = item.data;
       let fieldName;
       let headerName;
 
@@ -5846,18 +5847,6 @@ const ReportDataGrid = ({
       });
     });
 
-    // Add computed dimension columns. These have no provider/relations chain,
-    // so the API returns each row keyed by the computed dimension's own `name`.
-    computedDimensions.forEach(cd => {
-      cols.push({
-        field: cd.name,
-        headerName: cd.name,
-        flex: 1,
-        minWidth: 150,
-        type: 'string'
-      });
-    });
-
     // Add metric columns
     // The API returns metric keys in two different forms depending on the path depth:
     //
@@ -5917,7 +5906,7 @@ const ReportDataGrid = ({
       });
     });
     return cols;
-  }, [dimensions, metrics, computedDimensions, titleOverrides, parameters]);
+  }, [orderedDimensionItems, metrics, titleOverrides, parameters]);
 
   // Transform report data to rows with unique IDs.
   // Keys are normalised by replacing dots with underscores so that MUI DataGrid
@@ -6024,7 +6013,10 @@ const ReportBuilder = ({
     dimensions: [],
     metrics: [],
     filters: {},
-    computedDimensions: []
+    computedDimensions: [],
+    // Unified display/execution order across dimensions + computedDimensions.
+    // Entries: { type: 'dimension', key: fullPath } | { type: 'computed', key: name }
+    dimensionOrder: []
   });
   const [titleOverrides, setTitleOverrides] = React.useState({
     dimensions: {},
@@ -6070,6 +6062,16 @@ const ReportBuilder = ({
     }
   }, [autoRun, reportLoaded]);
 
+  // Re-run the currently displayed report when base_currency changes in context
+  const currentBaseCurrency = reportingContext?.parameters?.base_currency;
+  const prevBaseCurrencyRef = React.useRef(currentBaseCurrency);
+  React.useEffect(() => {
+    if (reportData && prevBaseCurrencyRef.current !== undefined && prevBaseCurrencyRef.current !== currentBaseCurrency) {
+      runReportWithPagination(currentPage, pageSize);
+    }
+    prevBaseCurrencyRef.current = currentBaseCurrency;
+  }, [currentBaseCurrency]);
+
   // Utility function to reconstruct dimension object from fullPath
   const reconstructDimensionFromPath = (fullPath, providersData, rootProvider) => {
     try {
@@ -6199,6 +6201,52 @@ const ReportBuilder = ({
       return null;
     }
   };
+
+  // Build the unified display/execution order for dimensions + computed
+  // dimensions. Prefers the persisted `ordered_dimensions` field; falls back
+  // to "dimensions first, then computed dimensions" for report definitions
+  // saved before this field existed.
+  const buildDimensionOrder = (rawOrderedDimensions, dimensions, computedDimensions) => {
+    const dimensionOrder = [];
+    const seenDimensionKeys = new Set();
+    const seenComputedKeys = new Set();
+    if (Array.isArray(rawOrderedDimensions)) {
+      rawOrderedDimensions.forEach(entry => {
+        if (entry.type === "dimension" && dimensions.some(d => d.fullPath === entry.ref)) {
+          dimensionOrder.push({
+            type: "dimension",
+            key: entry.ref
+          });
+          seenDimensionKeys.add(entry.ref);
+        } else if (entry.type === "computed" && computedDimensions.some(cd => cd.name === entry.ref)) {
+          dimensionOrder.push({
+            type: "computed",
+            key: entry.ref
+          });
+          seenComputedKeys.add(entry.ref);
+        }
+      });
+    }
+
+    // Append anything not covered by ordered_dimensions (older reports, or drift)
+    dimensions.forEach(d => {
+      if (!seenDimensionKeys.has(d.fullPath)) {
+        dimensionOrder.push({
+          type: "dimension",
+          key: d.fullPath
+        });
+      }
+    });
+    computedDimensions.forEach(cd => {
+      if (!seenComputedKeys.has(cd.name)) {
+        dimensionOrder.push({
+          type: "computed",
+          key: cd.name
+        });
+      }
+    });
+    return dimensionOrder;
+  };
   const loadReportDefinition = async id => {
     try {
       console.log("Loading report definition:", id);
@@ -6294,13 +6342,15 @@ const ReportBuilder = ({
       // Computed dimensions are self-contained { name, value } pairs with no
       // provider/relation chain, so they're loaded as-is (no reconstruction needed)
       const computedDimensions = reportDef.definition?.doc?.query?.computed_dimensions || [];
+      const dimensionOrder = buildDimensionOrder(reportDef.definition?.doc?.query?.ordered_dimensions, reconstructedDimensions, computedDimensions);
 
       // Set the report state
       setReport({
         dimensions: reconstructedDimensions,
         metrics: reconstructedMetrics,
         filters: loadedFilters,
-        computedDimensions
+        computedDimensions,
+        dimensionOrder
       });
 
       // Set title overrides
@@ -6409,13 +6459,15 @@ const ReportBuilder = ({
       // Computed dimensions are self-contained { name, value } pairs with no
       // provider/relation chain, so they're loaded as-is (no reconstruction needed)
       const computedDimensions = reportDef.definition?.doc?.query?.computed_dimensions || [];
+      const dimensionOrder = buildDimensionOrder(reportDef.definition?.doc?.query?.ordered_dimensions, reconstructedDimensions, computedDimensions);
 
       // Set the report state
       setReport({
         dimensions: reconstructedDimensions,
         metrics: reconstructedMetrics,
         filters: loadedFilters,
-        computedDimensions
+        computedDimensions,
+        dimensionOrder
       });
 
       // Set title overrides
@@ -6448,7 +6500,8 @@ const ReportBuilder = ({
       dimensions: [],
       metrics: [],
       filters: {},
-      computedDimensions: []
+      computedDimensions: [],
+      dimensionOrder: []
     });
     // Reset title overrides
     setTitleOverrides({
@@ -6525,51 +6578,68 @@ const ReportBuilder = ({
     setReport(prev => {
       const newReport = {
         ...prev,
-        dimensions: [...prev.dimensions, dimensionData]
+        dimensions: [...prev.dimensions, dimensionData],
+        dimensionOrder: [...prev.dimensionOrder, {
+          type: "dimension",
+          key: dimensionData.fullPath
+        }]
       };
       console.log("Dimension saved:", dimensionData);
       console.log("Complete report:", newReport);
       return newReport;
     });
   };
-  const handleRemoveDimension = index => {
+  const handleRemoveDimension = fullPath => {
     setReport(prev => ({
       ...prev,
-      dimensions: prev.dimensions.filter((_, i) => i !== index)
+      dimensions: prev.dimensions.filter(d => d.fullPath !== fullPath),
+      dimensionOrder: prev.dimensionOrder.filter(entry => !(entry.type === "dimension" && entry.key === fullPath))
     }));
   };
-  const handleReorderDimensions = newOrder => {
+  const handleUpdateDimensionSortOrder = (fullPath, sortOrder) => {
     setReport(prev => ({
       ...prev,
-      dimensions: newOrder
+      dimensions: prev.dimensions.map(d => d.fullPath === fullPath ? {
+        ...d,
+        sortOrder
+      } : d)
     }));
   };
-  const handleSaveComputedDimension = computedDimensionData => {
+
+  // Reorders the single unified dimensions + computed-dimensions list;
+  // `dimensions`/`computedDimensions` arrays themselves are unordered from
+  // this perspective, so only `dimensionOrder` needs to change.
+  const handleReorderDimensionItems = newDimensionOrder => {
     setReport(prev => ({
       ...prev,
-      computedDimensions: [...prev.computedDimensions, computedDimensionData]
+      dimensionOrder: newDimensionOrder
     }));
   };
-  const handleUpdateComputedDimension = (index, computedDimensionData) => {
-    setReport(prev => {
-      const newComputedDimensions = [...prev.computedDimensions];
-      newComputedDimensions[index] = computedDimensionData;
-      return {
-        ...prev,
-        computedDimensions: newComputedDimensions
-      };
-    });
+  const handleSaveComputedDimension = computedDimensionData => {
+    setReport(prev => ({
+      ...prev,
+      computedDimensions: [...prev.computedDimensions, computedDimensionData],
+      dimensionOrder: [...prev.dimensionOrder, {
+        type: "computed",
+        key: computedDimensionData.name
+      }]
+    }));
   };
-  const handleRemoveComputedDimension = index => {
+  const handleUpdateComputedDimension = (name, computedDimensionData) => {
     setReport(prev => ({
       ...prev,
-      computedDimensions: prev.computedDimensions.filter((_, i) => i !== index)
+      computedDimensions: prev.computedDimensions.map(cd => cd.name === name ? computedDimensionData : cd),
+      dimensionOrder: prev.dimensionOrder.map(entry => entry.type === "computed" && entry.key === name ? {
+        ...entry,
+        key: computedDimensionData.name
+      } : entry)
     }));
   };
-  const handleReorderComputedDimensions = newOrder => {
+  const handleRemoveComputedDimension = name => {
     setReport(prev => ({
       ...prev,
-      computedDimensions: newOrder
+      computedDimensions: prev.computedDimensions.filter(cd => cd.name !== name),
+      dimensionOrder: prev.dimensionOrder.filter(entry => !(entry.type === "computed" && entry.key === name))
     }));
   };
   const handleSaveMetric = metricData => {
@@ -6625,10 +6695,20 @@ const ReportBuilder = ({
     });
   };
 
-  // Convert internal report structure to API format
-  const convertReportToApiFormat = (page = 0, size = 50) => {
+  // Builds the query object shared between running (paginated) and saving
+  // (unpaginated) a report. Dimension and computed-dimension order both
+  // derive from the single unified `report.dimensionOrder` list, so the
+  // saved `dimensions`/`computed_dimensions` arrays, `order_by`, and the
+  // persisted `ordered_dimensions` field all stay consistent with whatever
+  // order the user arranged on screen.
+  const buildQueryObject = () => {
+    const dimensionByPath = Object.fromEntries(report.dimensions.map(d => [d.fullPath, d]));
+    const computedByName = Object.fromEntries(report.computedDimensions.map(cd => [cd.name, cd]));
+    const orderedDimensionsOnly = report.dimensionOrder.filter(entry => entry.type === "dimension").map(entry => dimensionByPath[entry.key]).filter(Boolean);
+    const orderedComputedOnly = report.dimensionOrder.filter(entry => entry.type === "computed").map(entry => computedByName[entry.key]).filter(Boolean);
+
     // Build order_by array - include all dimensions, add desc property only when needed
-    const orderBy = report.dimensions.map(dim => {
+    const orderBy = orderedDimensionsOnly.map(dim => {
       const orderItem = {
         name: dim.fullPath
       };
@@ -6684,21 +6764,29 @@ const ReportBuilder = ({
       titles.filters = titleOverrides.filters;
     }
     const queryObj = {
-      dimensions: report.dimensions.map(dim => dim.fullPath),
+      dimensions: orderedDimensionsOnly.map(dim => dim.fullPath),
       metrics: report.metrics.map(metric => metric.fullPath),
-      order_by: orderBy,
-      limit: size,
-      offset: page * size
+      order_by: orderBy
     };
 
     // Only add computed_dimensions if there are any
-    if (report.computedDimensions && report.computedDimensions.length > 0) {
-      queryObj.computed_dimensions = report.computedDimensions.map(cd => ({
+    if (orderedComputedOnly.length > 0) {
+      queryObj.computed_dimensions = orderedComputedOnly.map(cd => ({
         name: cd.name,
         value: cd.value
       }));
     }
 
+    // Persist the unified dimension + computed-dimension order so it can be
+    // reconstructed on reload and so executed reports render columns in the
+    // same order they were arranged in the builder.
+    if (report.dimensionOrder.length > 0) {
+      queryObj.ordered_dimensions = report.dimensionOrder.map(entry => ({
+        type: entry.type,
+        ref: entry.key
+      }));
+    }
+
     // Only add titles if there are any overrides
     if (Object.keys(titles).length > 0) {
       queryObj.titles = titles;
@@ -6708,6 +6796,14 @@ const ReportBuilder = ({
     if (filter) {
       queryObj.filter = filter;
     }
+    return queryObj;
+  };
+
+  // Convert internal report structure to API format
+  const convertReportToApiFormat = (page = 0, size = 50) => {
+    const queryObj = buildQueryObject();
+    queryObj.limit = size;
+    queryObj.offset = page * size;
 
     // Get parameters from context if available, otherwise use default
     const parameters = reportingContext?.parameters || {
@@ -6801,77 +6897,7 @@ const ReportBuilder = ({
     }
     try {
       setSaving(true);
-
-      // Build order_by array - include all dimensions, add desc property only when needed
-      const orderBy = report.dimensions.map(dim => {
-        const orderItem = {
-          name: dim.fullPath
-        };
-        if (dim.sortOrder === "desc") {
-          orderItem.desc = true;
-        }
-        // For 'asc' or null, just include { name: fullPath } without desc property
-        return orderItem;
-      });
-
-      // Build titles object - only include overridden titles
-      const titles = {};
-      if (Object.keys(titleOverrides.dimensions).length > 0) {
-        titles.dimensions = titleOverrides.dimensions;
-      }
-      if (Object.keys(titleOverrides.metrics).length > 0) {
-        titles.metrics = titleOverrides.metrics;
-      }
-      if (Object.keys(titleOverrides.filters).length > 0) {
-        titles.filters = titleOverrides.filters;
-      }
-      const queryObj = {
-        dimensions: report.dimensions.map(dim => dim.fullPath),
-        metrics: report.metrics.map(metric => metric.fullPath),
-        order_by: orderBy
-      };
-
-      // Only add computed_dimensions if there are any
-      if (report.computedDimensions && report.computedDimensions.length > 0) {
-        queryObj.computed_dimensions = report.computedDimensions.map(cd => ({
-          name: cd.name,
-          value: cd.value
-        }));
-      }
-
-      // Only add titles if there are any overrides
-      if (Object.keys(titles).length > 0) {
-        queryObj.titles = titles;
-      }
-
-      // Add filter if there are any - NEW API format with top-level 'and' operator
-      // NEW format: { and: [ { "ft.currency": ["USD", "EUR"] }, { "ft_ba.created_at": {gte: "2025-05-01", lte: "2025-12-31"} } ] }
-      if (Object.keys(report.filters).length > 0) {
-        const conditions = [];
-        Object.entries(report.filters).forEach(([fullPath, filterData]) => {
-          if (filterData.values) {
-            // Check if values is an object (date range) or array (regular filter)
-            if (Array.isArray(filterData.values)) {
-              // Regular filter - only add if array has values
-              if (filterData.values.length > 0) {
-                conditions.push({
-                  [fullPath]: filterData.values
-                });
-              }
-            } else if (typeof filterData.values === "object") {
-              // Date range filter - add the object as-is
-              conditions.push({
-                [fullPath]: filterData.values
-              });
-            }
-          }
-        });
-        if (conditions.length > 0) {
-          queryObj.filter = {
-            and: conditions
-          };
-        }
-      }
+      const queryObj = buildQueryObject();
 
       // Build the doc object
       const docObj = {
@@ -6916,6 +6942,18 @@ const ReportBuilder = ({
     }
   };
   const canSaveReport = selectedProvider && reportTitle.trim() && (report.dimensions.length > 0 || report.metrics.length > 0 || report.computedDimensions.length > 0);
+
+  // Resolve the unified dimensionOrder into actual dimension/computed-dimension
+  // objects so the results grid can render columns in that same order.
+  const dimensionByFullPath = Object.fromEntries(report.dimensions.map(d => [d.fullPath, d]));
+  const computedDimensionByName = Object.fromEntries(report.computedDimensions.map(cd => [cd.name, cd]));
+  const orderedDimensionItems = report.dimensionOrder.map(entry => entry.type === "dimension" ? {
+    kind: "dimension",
+    data: dimensionByFullPath[entry.key]
+  } : {
+    kind: "computed",
+    data: computedDimensionByName[entry.key]
+  }).filter(item => item.data);
   return /*#__PURE__*/React__namespace.default.createElement(material.Box, {
     sx: {
       p: 3,
@@ -7194,7 +7232,7 @@ const ReportBuilder = ({
     savedDimensions: report.dimensions,
     onSaveDimension: handleSaveDimension,
     onRemoveDimension: handleRemoveDimension,
-    onReorderDimensions: handleReorderDimensions,
+    onUpdateDimensionSortOrder: handleUpdateDimensionSortOrder,
     titleOverrides: titleOverrides.dimensions,
     onUpdateTitle: handleUpdateDimensionTitle,
     onResetTitle: handleResetDimensionTitle,
@@ -7204,7 +7242,8 @@ const ReportBuilder = ({
     onSaveComputedDimension: handleSaveComputedDimension,
     onUpdateComputedDimension: handleUpdateComputedDimension,
     onRemoveComputedDimension: handleRemoveComputedDimension,
-    onReorderComputedDimensions: handleReorderComputedDimensions
+    dimensionOrder: report.dimensionOrder,
+    onReorderDimensionItems: handleReorderDimensionItems
   })), /*#__PURE__*/React__namespace.default.createElement(TabPanel, {
     value: activeTab,
     index: 1
@@ -7240,9 +7279,8 @@ const ReportBuilder = ({
     index: 3
   }, reportData && /*#__PURE__*/React__namespace.default.createElement(ReportDataGrid, {
     reportData: reportData,
-    dimensions: report.dimensions,
+    orderedDimensionItems: orderedDimensionItems,
     metrics: report.metrics,
-    computedDimensions: report.computedDimensions,
     loading: loading,
     onPageChange: handlePageChange,
     totalRows: totalRows,
@@ -7305,6 +7343,44 @@ const ReportDefinitionsManager = () => {
   });
 };
 
+// TODO: replace with currencies fetched from the API once that's available.
+const CURRENCY_OPTIONS = [{
+  key: "USD",
+  value: "USD"
+}, {
+  key: "EUR",
+  value: "EUR"
+}, {
+  key: "SEK",
+  value: "SEK"
+}, {
+  key: "GBP",
+  value: "GBP"
+}, {
+  key: "DKK",
+  value: "DKK"
+}, {
+  key: "NOK",
+  value: "NOK"
+}];
+const CurrencySelector = () => {
+  const {
+    parameters,
+    setParameters
+  } = useReportingContext();
+  return /*#__PURE__*/React__namespace.default.createElement(SingleSelect, {
+    items: CURRENCY_OPTIONS,
+    value: parameters.base_currency,
+    label: "Currency",
+    onChange: e => setParameters({
+      ...parameters,
+      base_currency: e.target.value
+    }),
+    sx: {
+      width: 110
+    }
+  });
+};
 const ReportApp = ({
   params,
   api
@@ -7371,7 +7447,13 @@ const ReportApp = ({
         }
       }
     })
-  }, /*#__PURE__*/React__namespace.default.createElement(ReportDefinitionsManager, null))));
+  }, /*#__PURE__*/React__namespace.default.createElement(Box__default.default, {
+    sx: {
+      display: "flex",
+      justifyContent: "flex-end",
+      p: 1
+    }
+  }, /*#__PURE__*/React__namespace.default.createElement(CurrencySelector, null)), /*#__PURE__*/React__namespace.default.createElement(ReportDefinitionsManager, null))));
 };
 
 var index = {