@bygd/nc-report-ui 0.1.40 → 0.1.42

package/dist/default/cjs/index.cjs

@@ -67,6 +67,7 @@ var LocalizationProvider = require('@mui/x-date-pickers/LocalizationProvider');
 var DatePicker = require('@mui/x-date-pickers/DatePicker');
 var AdapterDayjs = require('@mui/x-date-pickers/AdapterDayjs');
 var dayjs = require('dayjs');
+var CalculateIcon = require('@mui/icons-material/Calculate');
 var styles = require('@mui/material/styles');
 
 function _interopDefault (e) { return e && e.__esModule ? e : { default: e }; }
@@ -144,6 +145,7 @@ var BoltIcon__default = /*#__PURE__*/_interopDefault(BoltIcon);
 var FilterAltIcon__default = /*#__PURE__*/_interopDefault(FilterAltIcon);
 var InfoOutlinedIcon__default = /*#__PURE__*/_interopDefault(InfoOutlinedIcon);
 var dayjs__default = /*#__PURE__*/_interopDefault(dayjs);
+var CalculateIcon__default = /*#__PURE__*/_interopDefault(CalculateIcon);
 
 function _extends() {
   return _extends = Object.assign ? Object.assign.bind() : function (n) {
@@ -1653,6 +1655,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)
@@ -2574,6 +2609,140 @@ const ProviderSelection = ({
   }, renderSelectionChain()));
 };
 
+// Shared drag-and-drop primitives for the index-identified, arrow-reorderable
+// lists used across the report builder (Dimensions, Metrics, Column Order).
+// Previously duplicated per-tab; consolidated here so all three behave and
+// look identical and only need to be fixed in one place.
+
+const useSortableListSensors = () => core.useSensors(core.useSensor(core.PointerSensor), core.useSensor(core.KeyboardSensor, {
+  coordinateGetter: sortable.sortableKeyboardCoordinates
+}));
+
+// Builds drag/move handlers for a list where dnd-kit item ids are the array
+// index. `onReorder` receives the whole reordered list.
+const makeListReorderHandlers = (list, onReorder) => {
+  const handleDragEnd = ({
+    active,
+    over
+  }) => {
+    if (over && active.id !== over.id) {
+      const oldIndex = list.findIndex((_, i) => i === active.id);
+      const newIndex = list.findIndex((_, i) => i === over.id);
+      onReorder(sortable.arrayMove(list, oldIndex, newIndex));
+    }
+  };
+  const handleMoveUp = index => {
+    if (index > 0) {
+      onReorder(sortable.arrayMove(list, index, index - 1));
+    }
+  };
+  const handleMoveDown = index => {
+    if (index < list.length - 1) {
+      onReorder(sortable.arrayMove(list, index, index + 1));
+    }
+  };
+  return {
+    handleDragEnd,
+    handleMoveUp,
+    handleMoveDown
+  };
+};
+
+// Wraps DndContext + SortableContext + the vertical list container.
+// `itemIds` must line up with the ids passed to each item's useSortable().
+const SortableListContext = ({
+  sensors,
+  itemIds,
+  onDragEnd,
+  children
+}) => /*#__PURE__*/React__namespace.default.createElement(core.DndContext, {
+  sensors: sensors,
+  collisionDetection: core.closestCenter,
+  onDragEnd: onDragEnd
+}, /*#__PURE__*/React__namespace.default.createElement(sortable.SortableContext, {
+  items: itemIds,
+  strategy: sortable.verticalListSortingStrategy
+}, /*#__PURE__*/React__namespace.default.createElement(material.Box, {
+  sx: {
+    display: "flex",
+    flexDirection: "column",
+    gap: 1
+  }
+}, children)));
+
+// Per-row useSortable() wiring shared by every sortable chip/row component.
+const useSortableRow = id => {
+  const {
+    attributes,
+    listeners,
+    setNodeRef,
+    transform,
+    transition,
+    isDragging
+  } = sortable.useSortable({
+    id
+  });
+  const style = {
+    transform: utilities.CSS.Transform.toString(transform),
+    transition,
+    opacity: isDragging ? 0.5 : 1,
+    display: "flex",
+    alignItems: "center",
+    width: "100%"
+  };
+  return {
+    attributes,
+    listeners,
+    setNodeRef,
+    style
+  };
+};
+const DragHandle = ({
+  listeners
+}) => /*#__PURE__*/React__namespace.default.createElement(material.Box, _extends({}, listeners, {
+  sx: {
+    display: "flex",
+    alignItems: "center",
+    cursor: "grab",
+    "&:active": {
+      cursor: "grabbing"
+    }
+  }
+}), /*#__PURE__*/React__namespace.default.createElement(DragIndicatorIcon__default.default, {
+  sx: {
+    cursor: "grab",
+    color: "rgba(110, 110, 110, 0.62)"
+  }
+}));
+const MoveButtons = ({
+  onMoveUp,
+  onMoveDown,
+  isFirst,
+  isLast
+}) => /*#__PURE__*/React__namespace.default.createElement(material.Box, {
+  className: "hover-icons",
+  sx: {
+    display: "flex",
+    gap: 0.5,
+    opacity: 0,
+    transition: "opacity 0.2s"
+  }
+}, /*#__PURE__*/React__namespace.default.createElement(material.IconButton, {
+  size: "small",
+  onClick: onMoveUp,
+  disabled: isFirst,
+  "aria-label": "move up"
+}, /*#__PURE__*/React__namespace.default.createElement(ArrowUpwardIcon__default.default, {
+  fontSize: "small"
+})), /*#__PURE__*/React__namespace.default.createElement(material.IconButton, {
+  size: "small",
+  onClick: onMoveDown,
+  disabled: isLast,
+  "aria-label": "move down"
+}, /*#__PURE__*/React__namespace.default.createElement(ArrowDownwardIcon__default.default, {
+  fontSize: "small"
+})));
+
 // Replace {{key}} placeholders in a title with values from the report
 // parameters (e.g. "Balance ({{base_currency}})" -> "Balance (EUR)").
 // Unknown keys are left as-is so missing parameters remain visible.
@@ -2585,6 +2754,50 @@ const interpolateTitle = (template, params) => {
   });
 };
 
+// Resolves the final column display order for the results grid: dimensions,
+// computed dimensions, and metrics combined into a single list.
+//
+// `columnOrder` is the optional, explicitly-arranged order (raw entries
+// `{ type: 'dimension' | 'computed' | 'metric', key }`) set on the Column
+// Order tab. When present, its entries come first, in that order. Anything
+// not covered by it (new fields added since it was last touched, or when
+// it's empty/undefined because no custom order has ever been defined) is
+// appended in the pre-existing default order: dimensions/computed (in their
+// own `dimensionOrder`) first, then metrics (in their own array order) —
+// this keeps behavior unchanged for reports that never define a column order.
+const resolveColumnOrder = (columnOrder, orderedDimensionItems, metrics) => {
+  // Normalise every candidate item to a uniform { kind, key, data } shape
+  // up front, so callers (e.g. the Column Order tab) can always read
+  // `.key` regardless of where the item came from.
+  const normalizedDimensionItems = orderedDimensionItems.map(item => ({
+    kind: item.kind,
+    key: item.kind === 'computed' ? item.data.name : item.data.fullPath,
+    data: item.data
+  }));
+  const normalizedMetricItems = metrics.map(m => ({
+    kind: 'metric',
+    key: m.fullPath,
+    data: m
+  }));
+  const byKey = Object.fromEntries([...normalizedDimensionItems, ...normalizedMetricItems].map(item => [`${item.kind}:${item.key}`, item]));
+  const resolved = [];
+  const seen = new Set();
+  (columnOrder || []).forEach(entry => {
+    const seenKey = `${entry.type}:${entry.key}`;
+    if (seen.has(seenKey) || !byKey[seenKey]) return;
+    resolved.push(byKey[seenKey]);
+    seen.add(seenKey);
+  });
+  [...normalizedDimensionItems, ...normalizedMetricItems].forEach(item => {
+    const seenKey = `${item.kind}:${item.key}`;
+    if (!seen.has(seenKey)) {
+      resolved.push(item);
+      seen.add(seenKey);
+    }
+  });
+  return resolved;
+};
+
 // Sortable Chip Component
 const SortableChip$1 = ({
   id,
@@ -2613,20 +2826,8 @@ const SortableChip$1 = ({
     attributes,
     listeners,
     setNodeRef,
-    transform,
-    transition,
-    isDragging
-  } = sortable.useSortable({
-    id
-  });
-  const style = {
-    transform: utilities.CSS.Transform.toString(transform),
-    transition,
-    opacity: isDragging ? 0.5 : 1,
-    display: "flex",
-    alignItems: "center",
-    width: "100%"
-  };
+    style
+  } = useSortableRow(id);
 
   // Focus input when entering edit mode
   React.useEffect(() => {
@@ -2735,21 +2936,9 @@ const SortableChip$1 = ({
         opacity: 1 // show icons on hover
       }
     }
-  }, /*#__PURE__*/React__namespace.default.createElement(material.Box, _extends({}, listeners, {
-    sx: {
-      display: "flex",
-      alignItems: "center",
-      cursor: "grab",
-      "&:active": {
-        cursor: "grabbing"
-      }
-    }
-  }), /*#__PURE__*/React__namespace.default.createElement(DragIndicatorIcon__default.default, {
-    sx: {
-      cursor: "grab",
-      color: "rgba(110, 110, 110, 0.62)"
-    }
-  })), !isEditing ? /*#__PURE__*/React__namespace.default.createElement(React__namespace.default.Fragment, null, /*#__PURE__*/React__namespace.default.createElement(material.Box, {
+  }, /*#__PURE__*/React__namespace.default.createElement(DragHandle, {
+    listeners: listeners
+  }), !isEditing ? /*#__PURE__*/React__namespace.default.createElement(React__namespace.default.Fragment, null, /*#__PURE__*/React__namespace.default.createElement(material.Box, {
     sx: {
       minWidth: 0
     }
@@ -2812,29 +3001,12 @@ const SortableChip$1 = ({
     sx: {
       flex: 1
     }
-  }), /*#__PURE__*/React__namespace.default.createElement(material.Box, {
-    className: "hover-icons",
-    sx: {
-      display: "flex",
-      gap: 0.5,
-      opacity: 0,
-      transition: "opacity 0.2s"
-    }
-  }, /*#__PURE__*/React__namespace.default.createElement(material.IconButton, {
-    size: "small",
-    onClick: onMoveUp,
-    disabled: isFirst,
-    "aria-label": "move up"
-  }, /*#__PURE__*/React__namespace.default.createElement(ArrowUpwardIcon__default.default, {
-    fontSize: "small"
-  })), /*#__PURE__*/React__namespace.default.createElement(material.IconButton, {
-    size: "small",
-    onClick: onMoveDown,
-    disabled: isLast,
-    "aria-label": "move down"
-  }, /*#__PURE__*/React__namespace.default.createElement(ArrowDownwardIcon__default.default, {
-    fontSize: "small"
-  })))) : /*#__PURE__*/React__namespace.default.createElement(React__namespace.default.Fragment, null, /*#__PURE__*/React__namespace.default.createElement(material.TextField, {
+  }), /*#__PURE__*/React__namespace.default.createElement(MoveButtons, {
+    onMoveUp: onMoveUp,
+    onMoveDown: onMoveDown,
+    isFirst: isFirst,
+    isLast: isLast
+  })) : /*#__PURE__*/React__namespace.default.createElement(React__namespace.default.Fragment, null, /*#__PURE__*/React__namespace.default.createElement(material.TextField, {
     inputRef: inputRef,
     value: editValue,
     onChange: e => setEditValue(e.target.value),
@@ -2896,7 +3068,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,
@@ -2911,24 +3082,12 @@ const SortableComputedChip = ({
     attributes,
     listeners,
     setNodeRef,
-    transform,
-    transition,
-    isDragging
-  } = sortable.useSortable({
-    id
-  });
+    style
+  } = useSortableRow(id);
   const [isEditing, setIsEditing] = React.useState(false);
   const [editName, setEditName] = React.useState("");
   const [editValue, setEditValue] = React.useState("");
   const containerRef = React.useRef(null);
-  const style = {
-    transform: utilities.CSS.Transform.toString(transform),
-    transition,
-    opacity: isDragging ? 0.5 : 1,
-    display: "flex",
-    alignItems: "center",
-    width: "100%"
-  };
 
   // Handle click outside to cancel
   React.useEffect(() => {
@@ -2949,13 +3108,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
     });
@@ -2991,21 +3150,9 @@ const SortableComputedChip = ({
         opacity: 1
       }
     }
-  }, /*#__PURE__*/React__namespace.default.createElement(material.Box, _extends({}, listeners, {
-    sx: {
-      display: "flex",
-      alignItems: "center",
-      cursor: "grab",
-      "&:active": {
-        cursor: "grabbing"
-      }
-    }
-  }), /*#__PURE__*/React__namespace.default.createElement(DragIndicatorIcon__default.default, {
-    sx: {
-      cursor: "grab",
-      color: "rgba(110, 110, 110, 0.62)"
-    }
-  })), !isEditing ? /*#__PURE__*/React__namespace.default.createElement(React__namespace.default.Fragment, null, /*#__PURE__*/React__namespace.default.createElement(material.Chip, {
+  }, /*#__PURE__*/React__namespace.default.createElement(DragHandle, {
+    listeners: listeners
+  }), !isEditing ? /*#__PURE__*/React__namespace.default.createElement(React__namespace.default.Fragment, null, /*#__PURE__*/React__namespace.default.createElement(material.Chip, {
     icon: /*#__PURE__*/React__namespace.default.createElement(FunctionsIcon__default.default, {
       sx: {
         fontSize: "15px !important"
@@ -3069,29 +3216,12 @@ const SortableComputedChip = ({
     sx: {
       flex: 1
     }
-  }), /*#__PURE__*/React__namespace.default.createElement(material.Box, {
-    className: "hover-icons",
-    sx: {
-      display: "flex",
-      gap: 0.5,
-      opacity: 0,
-      transition: "opacity 0.2s"
-    }
-  }, /*#__PURE__*/React__namespace.default.createElement(material.IconButton, {
-    size: "small",
-    onClick: onMoveUp,
-    disabled: isFirst,
-    "aria-label": "move up"
-  }, /*#__PURE__*/React__namespace.default.createElement(ArrowUpwardIcon__default.default, {
-    fontSize: "small"
-  })), /*#__PURE__*/React__namespace.default.createElement(material.IconButton, {
-    size: "small",
-    onClick: onMoveDown,
-    disabled: isLast,
-    "aria-label": "move down"
-  }, /*#__PURE__*/React__namespace.default.createElement(ArrowDownwardIcon__default.default, {
-    fontSize: "small"
-  })))) : /*#__PURE__*/React__namespace.default.createElement(React__namespace.default.Fragment, null, /*#__PURE__*/React__namespace.default.createElement(material.TextField, {
+  }), /*#__PURE__*/React__namespace.default.createElement(MoveButtons, {
+    onMoveUp: onMoveUp,
+    onMoveDown: onMoveDown,
+    isFirst: isFirst,
+    isLast: isLast
+  })) : /*#__PURE__*/React__namespace.default.createElement(React__namespace.default.Fragment, null, /*#__PURE__*/React__namespace.default.createElement(material.TextField, {
     value: editName,
     onChange: e => setEditName(e.target.value),
     onKeyDown: handleKeyDown,
@@ -3153,7 +3283,7 @@ const Dimensions = ({
   savedDimensions = [],
   onSaveDimension,
   onRemoveDimension,
-  onReorderDimensions,
+  onUpdateDimensionSortOrder,
   titleOverrides = {},
   onUpdateTitle,
   onResetTitle,
@@ -3163,7 +3293,8 @@ const Dimensions = ({
   onSaveComputedDimension,
   onUpdateComputedDimension,
   onRemoveComputedDimension,
-  onReorderComputedDimensions
+  dimensionOrder = [],
+  onReorderDimensionItems
 }) => {
   const reportingContext = useReportingContextOptional();
   const parameters = reportingContext?.parameters;
@@ -3175,53 +3306,38 @@ const Dimensions = ({
   const [computedValue, setComputedValue] = React.useState("");
 
   // Setup drag and drop sensors
-  const sensors = core.useSensors(core.useSensor(core.PointerSensor), core.useSensor(core.KeyboardSensor, {
-    coordinateGetter: sortable.sortableKeyboardCoordinates
-  }));
-
-  // Handle drag end
-  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);
-    }
-  };
-
-  // Handle move up
-  const handleMoveUp = index => {
-    if (index > 0) {
-      const newOrder = sortable.arrayMove(savedDimensions, index, index - 1);
-      onReorderDimensions(newOrder);
-    }
-  };
-
-  // Handle move down
-  const handleMoveDown = index => {
-    if (index < savedDimensions.length - 1) {
-      const newOrder = sortable.arrayMove(savedDimensions, index, index + 1);
-      onReorderDimensions(newOrder);
-    }
-  };
+  const sensors = useSortableListSensors();
+
+  // 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/move for the unified list
+  const {
+    handleDragEnd,
+    handleMoveUp,
+    handleMoveDown
+  } = makeListReorderHandlers(dimensionOrder, onReorderDimensionItems);
 
-  // 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 +3361,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 +3803,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
     }
@@ -3726,81 +3821,40 @@ const Dimensions = ({
       color: "#666",
       marginBottom: 2
     }
-  }, "Drag to reorder or use arrows"), /*#__PURE__*/React__namespace.default.createElement(core.DndContext, {
+  }, "Drag to reorder or use arrows"), /*#__PURE__*/React__namespace.default.createElement(SortableListContext, {
     sensors: sensors,
-    collisionDetection: core.closestCenter,
+    itemIds: orderedItems.map((_, index) => index),
     onDragEnd: handleDragEnd
-  }, /*#__PURE__*/React__namespace.default.createElement(sortable.SortableContext, {
-    items: savedDimensions.map((_, index) => index),
-    strategy: sortable.verticalListSortingStrategy
-  }, /*#__PURE__*/React__namespace.default.createElement(material.Box, {
-    sx: {
-      display: "flex",
-      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
+  })))));
 };
 
 const MetricSourceIcon = ({
@@ -3875,20 +3929,8 @@ const SortableChip = ({
     attributes,
     listeners,
     setNodeRef,
-    transform,
-    transition,
-    isDragging
-  } = sortable.useSortable({
-    id
-  });
-  const style = {
-    transform: utilities.CSS.Transform.toString(transform),
-    transition,
-    opacity: isDragging ? 0.5 : 1,
-    display: 'flex',
-    alignItems: 'center',
-    width: '100%'
-  };
+    style
+  } = useSortableRow(id);
 
   // Focus input when entering edit mode
   React.useEffect(() => {
@@ -3966,21 +4008,9 @@ const SortableChip = ({
         opacity: 1 // show icons on hover
       }
     }
-  }, /*#__PURE__*/React__namespace.default.createElement(material.Box, _extends({}, listeners, {
-    sx: {
-      display: "flex",
-      alignItems: "center",
-      cursor: "grab",
-      "&:active": {
-        cursor: "grabbing"
-      }
-    }
-  }), /*#__PURE__*/React__namespace.default.createElement(DragIndicatorIcon__default.default, {
-    sx: {
-      cursor: "grab",
-      color: "rgba(110, 110, 110, 0.62)"
-    }
-  })), !isEditing ? /*#__PURE__*/React__namespace.default.createElement(React__namespace.default.Fragment, null, source && /*#__PURE__*/React__namespace.default.createElement(material.Box, {
+  }, /*#__PURE__*/React__namespace.default.createElement(DragHandle, {
+    listeners: listeners
+  }), !isEditing ? /*#__PURE__*/React__namespace.default.createElement(React__namespace.default.Fragment, null, source && /*#__PURE__*/React__namespace.default.createElement(material.Box, {
     sx: {
       display: 'flex',
       alignItems: 'center',
@@ -4042,29 +4072,12 @@ const SortableChip = ({
     sx: {
       flex: 1
     }
-  }), /*#__PURE__*/React__namespace.default.createElement(material.Box, {
-    className: "hover-icons",
-    sx: {
-      display: "flex",
-      gap: 0.5,
-      opacity: 0,
-      transition: "opacity 0.2s"
-    }
-  }, /*#__PURE__*/React__namespace.default.createElement(material.IconButton, {
-    size: "small",
-    onClick: onMoveUp,
-    disabled: isFirst,
-    "aria-label": "move up"
-  }, /*#__PURE__*/React__namespace.default.createElement(ArrowUpwardIcon__default.default, {
-    fontSize: "small"
-  })), /*#__PURE__*/React__namespace.default.createElement(material.IconButton, {
-    size: "small",
-    onClick: onMoveDown,
-    disabled: isLast,
-    "aria-label": "move down"
-  }, /*#__PURE__*/React__namespace.default.createElement(ArrowDownwardIcon__default.default, {
-    fontSize: "small"
-  })))) : /*#__PURE__*/React__namespace.default.createElement(React__namespace.default.Fragment, null, /*#__PURE__*/React__namespace.default.createElement(material.TextField, {
+  }), /*#__PURE__*/React__namespace.default.createElement(MoveButtons, {
+    onMoveUp: onMoveUp,
+    onMoveDown: onMoveDown,
+    isFirst: isFirst,
+    isLast: isLast
+  })) : /*#__PURE__*/React__namespace.default.createElement(React__namespace.default.Fragment, null, /*#__PURE__*/React__namespace.default.createElement(material.TextField, {
     inputRef: inputRef,
     value: editValue,
     onChange: e => setEditValue(e.target.value),
@@ -4139,39 +4152,14 @@ const Metrics = ({
   const [selectedMetric, setSelectedMetric] = React.useState('');
 
   // Setup drag and drop sensors
-  const sensors = core.useSensors(core.useSensor(core.PointerSensor), core.useSensor(core.KeyboardSensor, {
-    coordinateGetter: sortable.sortableKeyboardCoordinates
-  }));
-
-  // Handle drag end
-  const handleDragEnd = event => {
-    const {
-      active,
-      over
-    } = event;
-    if (over && active.id !== over.id) {
-      const oldIndex = savedMetrics.findIndex((_, i) => i === active.id);
-      const newIndex = savedMetrics.findIndex((_, i) => i === over.id);
-      const newOrder = sortable.arrayMove(savedMetrics, oldIndex, newIndex);
-      onReorderMetrics(newOrder);
-    }
-  };
-
-  // Handle move up
-  const handleMoveUp = index => {
-    if (index > 0) {
-      const newOrder = sortable.arrayMove(savedMetrics, index, index - 1);
-      onReorderMetrics(newOrder);
-    }
-  };
+  const sensors = useSortableListSensors();
 
-  // Handle move down
-  const handleMoveDown = index => {
-    if (index < savedMetrics.length - 1) {
-      const newOrder = sortable.arrayMove(savedMetrics, index, index + 1);
-      onReorderMetrics(newOrder);
-    }
-  };
+  // Handle drag/move
+  const {
+    handleDragEnd,
+    handleMoveUp,
+    handleMoveDown
+  } = makeListReorderHandlers(savedMetrics, onReorderMetrics);
 
   // Get the current provider based on selection chain
   const getCurrentProvider = () => {
@@ -4510,19 +4498,10 @@ const Metrics = ({
       marginBottom: 1,
       color: "rgb(37, 37, 37)"
     }
-  }, "Saved Metrics"), /*#__PURE__*/React__namespace.default.createElement(core.DndContext, {
+  }, "Saved Metrics"), /*#__PURE__*/React__namespace.default.createElement(SortableListContext, {
     sensors: sensors,
-    collisionDetection: core.closestCenter,
+    itemIds: savedMetrics.map((_, index) => index),
     onDragEnd: handleDragEnd
-  }, /*#__PURE__*/React__namespace.default.createElement(sortable.SortableContext, {
-    items: savedMetrics.map((_, index) => index),
-    strategy: sortable.verticalListSortingStrategy
-  }, /*#__PURE__*/React__namespace.default.createElement(material.Box, {
-    sx: {
-      display: 'flex',
-      flexDirection: 'column',
-      gap: 1
-    }
   }, savedMetrics.map((metric, index) => /*#__PURE__*/React__namespace.default.createElement(SortableChip, {
     key: index,
     id: index,
@@ -4539,7 +4518,7 @@ const Metrics = ({
     onUpdateTitle: onUpdateTitle,
     onResetTitle: onResetTitle,
     source: metric.metric?.source
-  })))))));
+  })))));
 };
 
 const Filters = ({
@@ -5766,9 +5745,208 @@ const Filters = ({
   }))));
 };
 
-// Default numeral.js formats applied when a dimension/metric definition has a
-// known type but no explicit `format` set on the provider.
-const DEFAULT_FORMATS_BY_TYPE = {
+const KIND_LABEL = {
+  dimension: "Dimension",
+  computed: "Computed",
+  metric: "Metric"
+};
+const KindChip = ({
+  kind,
+  source
+}) => {
+  if (kind === "metric") {
+    return /*#__PURE__*/React__namespace.default.createElement(material.Box, {
+      sx: {
+        display: "flex",
+        alignItems: "center",
+        flexShrink: 0
+      }
+    }, /*#__PURE__*/React__namespace.default.createElement(MetricSourceIcon, {
+      source: source
+    }));
+  }
+  return /*#__PURE__*/React__namespace.default.createElement(material.Chip, {
+    icon: kind === "computed" ? /*#__PURE__*/React__namespace.default.createElement(CalculateIcon__default.default, {
+      sx: {
+        fontSize: "15px !important"
+      }
+    }) : undefined,
+    label: KIND_LABEL[kind],
+    size: "small",
+    sx: {
+      fontWeight: 500,
+      backgroundColor: "rgba(70, 134, 128, 0.1)",
+      color: "rgb(70, 134, 128)",
+      flexShrink: 0
+    }
+  });
+};
+
+// Read-only sortable row: this tab only reorders columns. Adding, removing,
+// and renaming stay on the Dimensions/Metrics tabs so there's one place each
+// field is managed.
+const SortableColumnRow = ({
+  id,
+  label,
+  fullPath,
+  kind,
+  source,
+  onMoveUp,
+  onMoveDown,
+  isFirst,
+  isLast
+}) => {
+  const reportingContext = useReportingContextOptional();
+  const parameters = reportingContext?.parameters;
+  const {
+    attributes,
+    listeners,
+    setNodeRef,
+    style
+  } = useSortableRow(id);
+  const displayLabel = interpolateTitle(label, parameters);
+  return /*#__PURE__*/React__namespace.default.createElement("div", _extends({
+    ref: setNodeRef,
+    style: style
+  }, attributes), /*#__PURE__*/React__namespace.default.createElement(material.Box, {
+    sx: {
+      display: "flex",
+      alignItems: "center",
+      width: "100%",
+      gap: 1,
+      backgroundColor: "white",
+      border: "1px solid #e0e0e0",
+      borderRadius: 2,
+      padding: 1,
+      transition: "transform 0.2s ease, box-shadow 0.2s ease",
+      "&:hover .hover-icons": {
+        opacity: 1
+      }
+    }
+  }, /*#__PURE__*/React__namespace.default.createElement(DragHandle, {
+    listeners: listeners
+  }), /*#__PURE__*/React__namespace.default.createElement(KindChip, {
+    kind: kind,
+    source: source
+  }), /*#__PURE__*/React__namespace.default.createElement(material.Tooltip, {
+    title: fullPath,
+    arrow: true,
+    placement: "top"
+  }, /*#__PURE__*/React__namespace.default.createElement(material.Typography, {
+    variant: "h6",
+    sx: {
+      fontWeight: 500,
+      color: "#1a1a1a",
+      fontSize: "14px",
+      whiteSpace: "nowrap",
+      overflow: "hidden",
+      textOverflow: "ellipsis"
+    }
+  }, displayLabel)), /*#__PURE__*/React__namespace.default.createElement(material.Box, {
+    sx: {
+      flex: 1
+    }
+  }), /*#__PURE__*/React__namespace.default.createElement(MoveButtons, {
+    onMoveUp: onMoveUp,
+    onMoveDown: onMoveDown,
+    isFirst: isFirst,
+    isLast: isLast
+  })));
+};
+const ColumnOrder = ({
+  orderedDimensionItems = [],
+  metrics = [],
+  columnOrder = [],
+  onReorderColumnItems,
+  titleOverrides = {
+    dimensions: {},
+    metrics: {}
+  }
+}) => {
+  const isCustomized = columnOrder.length > 0;
+  const resolvedItems = resolveColumnOrder(columnOrder, orderedDimensionItems, metrics);
+  const sensors = useSortableListSensors();
+  const reorderResolved = newResolvedItems => {
+    onReorderColumnItems(newResolvedItems.map(item => ({
+      type: item.kind,
+      key: item.key
+    })));
+  };
+  const {
+    handleDragEnd,
+    handleMoveUp,
+    handleMoveDown
+  } = makeListReorderHandlers(resolvedItems, reorderResolved);
+  const labelFor = item => {
+    if (item.kind === "computed") return item.data.name;
+    if (item.kind === "metric") {
+      return titleOverrides.metrics[item.key] || item.data.metricTitle || item.key;
+    }
+    return titleOverrides.dimensions[item.key] || item.data.dimensionTitle || item.key;
+  };
+  return /*#__PURE__*/React__namespace.default.createElement("div", null, /*#__PURE__*/React__namespace.default.createElement(material.Box, {
+    sx: {
+      display: "flex",
+      justifyContent: "space-between",
+      alignItems: "flex-start",
+      mb: 2,
+      gap: 2
+    }
+  }, /*#__PURE__*/React__namespace.default.createElement(material.Typography, {
+    sx: {
+      fontSize: "13px",
+      color: "#666"
+    }
+  }, "Optional: define a single order for all columns (dimensions, computed dimensions and metrics together) in the results grid. Drag to reorder or use the arrows. Newly added dimensions/metrics are appended to the end automatically. Without a custom order, columns follow the Dimensions tab order, then the Metrics tab order."), isCustomized && /*#__PURE__*/React__namespace.default.createElement(material.Tooltip, {
+    title: "Discard the custom order and go back to the default (Dimensions, then Metrics)",
+    arrow: true
+  }, /*#__PURE__*/React__namespace.default.createElement(material.Button, {
+    variant: "outlined",
+    size: "small",
+    startIcon: /*#__PURE__*/React__namespace.default.createElement(RestartAltIcon__default.default, null),
+    onClick: () => onReorderColumnItems([]),
+    sx: {
+      height: "36px",
+      flexShrink: 0,
+      fontFamily: "system-ui",
+      fontSize: "13px",
+      fontWeight: 500,
+      borderRadius: "8px",
+      boxShadow: "none",
+      textTransform: "none",
+      borderColor: "#e0e0e0",
+      color: "rgb(37, 37, 37)",
+      "&:hover": {
+        backgroundColor: "#f5f5f5",
+        borderColor: "#d0d0d0"
+      }
+    }
+  }, "Reset to Default"))), resolvedItems.length === 0 ? /*#__PURE__*/React__namespace.default.createElement(material.Typography, {
+    sx: {
+      fontSize: "13px",
+      color: "#999"
+    }
+  }, "Add dimensions or metrics in the other tabs first.") : /*#__PURE__*/React__namespace.default.createElement(SortableListContext, {
+    sensors: sensors,
+    itemIds: resolvedItems.map((_, index) => index),
+    onDragEnd: handleDragEnd
+  }, resolvedItems.map((item, index) => /*#__PURE__*/React__namespace.default.createElement(SortableColumnRow, {
+    key: `${item.kind}-${item.key}`,
+    id: index,
+    label: labelFor(item),
+    fullPath: item.kind === "computed" ? item.data.value : item.key,
+    kind: item.kind,
+    source: item.kind === "metric" ? item.data.metric?.source : undefined,
+    onMoveUp: () => handleMoveUp(index),
+    onMoveDown: () => handleMoveDown(index),
+    isFirst: index === 0,
+    isLast: index === resolvedItems.length - 1
+  }))));
+};
+
+// Default numeral.js formats applied when a dimension/metric definition has a
+// known type but no explicit `format` set on the provider.
+const DEFAULT_FORMATS_BY_TYPE = {
   currency: '0,0.00',
   integer: '0,0'
 };
@@ -5780,11 +5958,107 @@ const formatValue = (value, def) => {
   return def?.prefix ? `${def.prefix} ${formatted}` : formatted;
 };
 const isNumericType = type => type === 'integer' || type === 'currency';
+
+// Builds a single DataGrid column definition for one resolved column item
+// (a dimension, computed dimension, or metric). Field naming logic:
+// - Dimensions from base provider: baseAlias.field -> baseAlias_field
+// - Dimensions from nested provider: baseAlias_rel1_rel2.field -> rel1_rel2_field (drops base alias)
+// - Computed dimensions have no provider/relations chain, so the API returns
+//   each row keyed by the computed dimension's own `name`.
+// - Metrics: API returns metric keys in different forms depending on path depth
+//   (see comment inline below), normalised to match the row-key normalisation
+//   done when building `rows`.
+const buildColumn = (item, titleOverrides, parameters) => {
+  if (item.kind === 'computed') {
+    const cd = item.data;
+    return {
+      field: cd.name,
+      headerName: cd.name,
+      flex: 1,
+      minWidth: 150,
+      type: 'string'
+    };
+  }
+  if (item.kind === 'metric') {
+    const metric = item.data;
+    const metricDef = metric.metric;
+    let fieldName;
+    const dotCount = (metric.fullPath.match(/\./g) || []).length;
+    if (dotCount >= 2) {
+      // 3+-part namespaced path: API returns the full dotted path as the key.
+      // Normalise dots to underscores to match the row key normalisation below.
+      // Example: "mc.dkpi.activeAgreementsCount" -> "mc_dkpi_activeAgreementsCount"
+      fieldName = metric.fullPath.replace(/\./g, '_');
+    } else if (metric.relations && metric.relations.length > 0) {
+      // 2-part path from a nested provider: API drops the base provider alias.
+      // Example: "mc_fa.total_amount" -> "fa_total_amount"
+      const parts = metric.fullPath.split('.');
+      const pathWithoutField = parts[0]; // e.g., "mc_fa"
+      const field = parts[1]; // e.g., "total_amount"
+
+      const pathParts = pathWithoutField.split('_');
+      pathParts.shift(); // remove base provider alias
+      const pathWithoutBase = pathParts.join('_');
+      fieldName = pathWithoutBase ? `${pathWithoutBase}_${field}` : field;
+    } else {
+      // 2-part path from the base provider: API returns just the metric name.
+      // Example: "mc.record_count" -> "record_count"
+      fieldName = metric.metricName;
+    }
+    const headerName = interpolateTitle(titleOverrides.metrics[metric.fullPath] || metric.metricTitle || fieldName, parameters);
+    return {
+      field: fieldName,
+      headerName: headerName,
+      flex: 1,
+      minWidth: 150,
+      type: isNumericType(metricDef?.type) ? 'number' : 'string',
+      renderHeader: () => /*#__PURE__*/React__namespace.default.createElement(material.Box, {
+        sx: {
+          display: 'flex',
+          alignItems: 'center',
+          gap: 0.5
+        }
+      }, /*#__PURE__*/React__namespace.default.createElement(MetricSourceIcon, {
+        source: metricDef?.source
+      }), /*#__PURE__*/React__namespace.default.createElement("span", null, headerName)),
+      valueFormatter: value => formatValue(value, metricDef)
+    };
+  }
+
+  // Dimension
+  const dim = item.data;
+  let fieldName;
+  if (dim.relations && dim.relations.length > 0) {
+    // From nested provider: drop the base provider alias
+    // Example: ft_fa_db.currency -> fa_db_currency
+    const parts = dim.fullPath.split('.');
+    const pathWithoutField = parts[0]; // e.g., "ft_fa_db"
+    const field = parts[1]; // e.g., "currency"
+
+    const pathParts = pathWithoutField.split('_');
+    pathParts.shift(); // Remove base provider alias
+    const pathWithoutBase = pathParts.join('_'); // e.g., "fa_db"
+
+    fieldName = pathWithoutBase ? `${pathWithoutBase}_${field}` : field;
+  } else {
+    // From base provider: keep the full path with underscore
+    // Example: ba.created_at -> ba_created_at
+    fieldName = dim.fullPath.replace('.', '_');
+  }
+  const headerName = interpolateTitle(titleOverrides.dimensions[dim.fullPath] || dim.dimensionTitle || fieldName, parameters);
+  const dimDef = dim.dimension;
+  return {
+    field: fieldName,
+    headerName: headerName,
+    flex: 1,
+    minWidth: 150,
+    type: isNumericType(dimDef?.type) ? 'number' : 'string',
+    valueFormatter: value => formatValue(value, dimDef)
+  };
+};
 const ReportDataGrid = ({
   reportData,
-  dimensions,
-  metrics,
-  computedDimensions = [],
+  columnItems = [],
   loading,
   onPageChange,
   totalRows = 0,
@@ -5800,124 +6074,10 @@ const ReportDataGrid = ({
     pageSize: 50
   });
 
-  // Generate columns dynamically from dimensions and metrics
-  const columns = React__namespace.default.useMemo(() => {
-    const cols = [];
-
-    // Add dimension columns
-    // Field naming logic:
-    // - 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 => {
-      let fieldName;
-      let headerName;
-
-      // Check if there are relations (nested providers)
-      if (dim.relations && dim.relations.length > 0) {
-        // From nested provider: drop the base provider alias
-        // Example: ft_fa_db.currency -> fa_db_currency
-        const parts = dim.fullPath.split('.');
-        const pathWithoutField = parts[0]; // e.g., "ft_fa_db"
-        const field = parts[1]; // e.g., "currency"
-
-        // Remove the base provider alias (first part before first underscore)
-        const pathParts = pathWithoutField.split('_');
-        pathParts.shift(); // Remove base provider alias
-        const pathWithoutBase = pathParts.join('_'); // e.g., "fa_db"
-
-        fieldName = pathWithoutBase ? `${pathWithoutBase}_${field}` : field;
-      } else {
-        // From base provider: keep the full path with underscore
-        // Example: ba.created_at -> ba_created_at
-        fieldName = dim.fullPath.replace('.', '_');
-      }
-
-      // Check for title override, otherwise use the friendly dimension title from provider
-      headerName = titleOverrides.dimensions[dim.fullPath] || dim.dimensionTitle || fieldName;
-      headerName = interpolateTitle(headerName, parameters);
-      const dimDef = dim.dimension;
-      cols.push({
-        field: fieldName,
-        headerName: headerName,
-        flex: 1,
-        minWidth: 150,
-        type: isNumericType(dimDef?.type) ? 'number' : 'string',
-        valueFormatter: value => formatValue(value, dimDef)
-      });
-    });
-
-    // 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:
-    //
-    //  • 2-part path  "mc.record_count"              → API key: "record_count"
-    //  • 2-part path  "mc_fa.total_amount"  (nested) → API key: "fa_total_amount"
-    //  • 3+-part path "mc.dkpi.activeAgreementsCount"→ API key: "mc.dkpi.activeAgreementsCount" (dots)
-    //
-    // For 3+-part paths the API key contains dots. MUI DataGrid interprets dots
-    // in field names as nested-object accessors, so the rows useMemo normalises
-    // those keys (dots → underscores). The column field must match that normalised key.
-    metrics.forEach(metric => {
-      const metricDef = metric.metric;
-      let fieldName;
-      let headerName;
-      const dotCount = (metric.fullPath.match(/\./g) || []).length;
-      if (dotCount >= 2) {
-        // 3+-part namespaced path: API returns the full dotted path as the key.
-        // Normalise dots to underscores to match the row key normalisation below.
-        // Example: "mc.dkpi.activeAgreementsCount" -> "mc_dkpi_activeAgreementsCount"
-        fieldName = metric.fullPath.replace(/\./g, '_');
-      } else if (metric.relations && metric.relations.length > 0) {
-        // 2-part path from a nested provider: API drops the base provider alias.
-        // Example: "mc_fa.total_amount" -> "fa_total_amount"
-        const parts = metric.fullPath.split('.');
-        const pathWithoutField = parts[0]; // e.g., "mc_fa"
-        const field = parts[1]; // e.g., "total_amount"
-
-        const pathParts = pathWithoutField.split('_');
-        pathParts.shift(); // remove base provider alias
-        const pathWithoutBase = pathParts.join('_');
-        fieldName = pathWithoutBase ? `${pathWithoutBase}_${field}` : field;
-      } else {
-        // 2-part path from the base provider: API returns just the metric name.
-        // Example: "mc.record_count" -> "record_count"
-        fieldName = metric.metricName;
-      }
-
-      // Check for title override, otherwise use the friendly metric title from provider
-      headerName = titleOverrides.metrics[metric.fullPath] || metric.metricTitle || fieldName;
-      headerName = interpolateTitle(headerName, parameters);
-      cols.push({
-        field: fieldName,
-        headerName: headerName,
-        flex: 1,
-        minWidth: 150,
-        type: isNumericType(metricDef?.type) ? 'number' : 'string',
-        renderHeader: () => /*#__PURE__*/React__namespace.default.createElement(material.Box, {
-          sx: {
-            display: 'flex',
-            alignItems: 'center',
-            gap: 0.5
-          }
-        }, /*#__PURE__*/React__namespace.default.createElement(MetricSourceIcon, {
-          source: metricDef?.source
-        }), /*#__PURE__*/React__namespace.default.createElement("span", null, headerName)),
-        valueFormatter: value => formatValue(value, metricDef)
-      });
-    });
-    return cols;
-  }, [dimensions, metrics, computedDimensions, titleOverrides, parameters]);
+  // Generate columns dynamically, in the final resolved column order
+  // (custom Column Order tab arrangement when defined, otherwise
+  // dimensions/computed then metrics).
+  const columns = React__namespace.default.useMemo(() => columnItems.map(item => buildColumn(item, titleOverrides, parameters)), [columnItems, titleOverrides, parameters]);
 
   // Transform report data to rows with unique IDs.
   // Keys are normalised by replacing dots with underscores so that MUI DataGrid
@@ -6024,7 +6184,15 @@ const ReportBuilder = ({
     dimensions: [],
     metrics: [],
     filters: {},
-    computedDimensions: []
+    computedDimensions: [],
+    // Unified display/execution order across dimensions + computedDimensions.
+    // Entries: { type: 'dimension', key: fullPath } | { type: 'computed', key: name }
+    dimensionOrder: [],
+    // Optional unified display order across dimensions + computedDimensions +
+    // metrics, set on the Column Order tab. Empty means "not defined" — the
+    // results grid falls back to dimensionOrder followed by metrics order.
+    // Entries: { type: 'dimension' | 'computed' | 'metric', key }
+    columnOrder: []
   });
   const [titleOverrides, setTitleOverrides] = React.useState({
     dimensions: {},
@@ -6070,6 +6238,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 +6377,92 @@ 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;
+  };
+
+  // Build the optional unified column order (dimensions + computed
+  // dimensions + metrics) from the persisted `ordered_columns` field.
+  // Unlike buildDimensionOrder, entries that no longer resolve are simply
+  // dropped rather than backfilled — an empty/partial result just means "no
+  // custom order defined (yet)", which resolveColumnOrder treats as
+  // "fall back to the default order".
+  const buildColumnOrder = (rawOrderedColumns, dimensions, computedDimensions, metrics) => {
+    if (!Array.isArray(rawOrderedColumns)) return [];
+    const dimensionPaths = new Set(dimensions.map(d => d.fullPath));
+    const computedNames = new Set(computedDimensions.map(cd => cd.name));
+    const metricPaths = new Set(metrics.map(m => m.fullPath));
+    const columnOrder = [];
+    rawOrderedColumns.forEach(entry => {
+      if (entry.type === "dimension" && dimensionPaths.has(entry.ref)) {
+        columnOrder.push({
+          type: "dimension",
+          key: entry.ref
+        });
+      } else if (entry.type === "computed" && computedNames.has(entry.ref)) {
+        columnOrder.push({
+          type: "computed",
+          key: entry.ref
+        });
+      } else if (entry.type === "metric" && metricPaths.has(entry.ref)) {
+        columnOrder.push({
+          type: "metric",
+          key: entry.ref
+        });
+      }
+    });
+    return columnOrder;
+  };
+
+  // Auto-append a newly added dimension/computed dimension/metric to the end
+  // of columnOrder — but only once a custom order actually exists. While
+  // columnOrder is empty (no custom order defined) it's left untouched, so
+  // the results grid keeps falling back to the default dimensions-then-
+  // metrics order until the user visits the Column Order tab.
+  const appendToColumnOrder = (columnOrder, entry) => columnOrder.length > 0 ? [...columnOrder, entry] : columnOrder;
   const loadReportDefinition = async id => {
     try {
       console.log("Loading report definition:", id);
@@ -6294,13 +6558,17 @@ 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);
+      const columnOrder = buildColumnOrder(reportDef.definition?.doc?.query?.ordered_columns, reconstructedDimensions, computedDimensions, reconstructedMetrics);
 
       // Set the report state
       setReport({
         dimensions: reconstructedDimensions,
         metrics: reconstructedMetrics,
         filters: loadedFilters,
-        computedDimensions
+        computedDimensions,
+        dimensionOrder,
+        columnOrder
       });
 
       // Set title overrides
@@ -6409,13 +6677,17 @@ 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);
+      const columnOrder = buildColumnOrder(reportDef.definition?.doc?.query?.ordered_columns, reconstructedDimensions, computedDimensions, reconstructedMetrics);
 
       // Set the report state
       setReport({
         dimensions: reconstructedDimensions,
         metrics: reconstructedMetrics,
         filters: loadedFilters,
-        computedDimensions
+        computedDimensions,
+        dimensionOrder,
+        columnOrder
       });
 
       // Set title overrides
@@ -6448,7 +6720,9 @@ const ReportBuilder = ({
       dimensions: [],
       metrics: [],
       filters: {},
-      computedDimensions: []
+      computedDimensions: [],
+      dimensionOrder: [],
+      columnOrder: []
     });
     // Reset title overrides
     setTitleOverrides({
@@ -6525,58 +6799,93 @@ const ReportBuilder = ({
     setReport(prev => {
       const newReport = {
         ...prev,
-        dimensions: [...prev.dimensions, dimensionData]
+        dimensions: [...prev.dimensions, dimensionData],
+        dimensionOrder: [...prev.dimensionOrder, {
+          type: "dimension",
+          key: dimensionData.fullPath
+        }],
+        columnOrder: appendToColumnOrder(prev.columnOrder, {
+          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)),
+      columnOrder: prev.columnOrder.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
+      }],
+      columnOrder: appendToColumnOrder(prev.columnOrder, {
+        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),
+      columnOrder: prev.columnOrder.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)),
+      columnOrder: prev.columnOrder.filter(entry => !(entry.type === "computed" && entry.key === name))
     }));
   };
   const handleSaveMetric = metricData => {
     setReport(prev => {
       const newReport = {
         ...prev,
-        metrics: [...prev.metrics, metricData]
+        metrics: [...prev.metrics, metricData],
+        columnOrder: appendToColumnOrder(prev.columnOrder, {
+          type: "metric",
+          key: metricData.fullPath
+        })
       };
       console.log("Metric saved:", metricData);
       console.log("Complete report:", newReport);
@@ -6584,15 +6893,29 @@ const ReportBuilder = ({
     });
   };
   const handleRemoveMetric = index => {
+    setReport(prev => {
+      const fullPath = prev.metrics[index]?.fullPath;
+      return {
+        ...prev,
+        metrics: prev.metrics.filter((_, i) => i !== index),
+        columnOrder: prev.columnOrder.filter(entry => !(entry.type === "metric" && entry.key === fullPath))
+      };
+    });
+  };
+  const handleReorderMetrics = newOrder => {
     setReport(prev => ({
       ...prev,
-      metrics: prev.metrics.filter((_, i) => i !== index)
+      metrics: newOrder
     }));
   };
-  const handleReorderMetrics = newOrder => {
+
+  // Sets the unified column order shown on the Column Order tab. An empty
+  // array (e.g. via "Reset to Default") clears the customization, and the
+  // results grid falls back to dimensionOrder followed by metrics order.
+  const handleReorderColumnItems = newColumnOrder => {
     setReport(prev => ({
       ...prev,
-      metrics: newOrder
+      columnOrder: newColumnOrder
     }));
   };
   const handleSaveFilter = (fullPath, filterData) => {
@@ -6625,10 +6948,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 +7017,40 @@ 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
+      }));
+    }
+
+    // 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
+      }));
+    }
+
     // Only add titles if there are any overrides
     if (Object.keys(titles).length > 0) {
       queryObj.titles = titles;
@@ -6708,6 +7060,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 || {
@@ -6750,8 +7110,8 @@ const ReportBuilder = ({
   const handleRunReport = async () => {
     setCurrentPage(0);
     await runReportWithPagination(0, pageSize);
-    // Switch to Results tab after running report (now index 3 after adding Filters tab)
-    setActiveTab(3);
+    // Switch to Results tab after running report (index 4: Dimensions, Metrics, Filters, Column Order, Results)
+    setActiveTab(4);
   };
   const handleDownloadReport = async () => {
     try {
@@ -6801,77 +7161,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 +7206,23 @@ 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);
+
+  // Final column list for the results grid: the explicit Column Order tab
+  // arrangement when defined, otherwise dimensions/computed (in their own
+  // order) followed by metrics (in their own order) — today's behavior.
+  const columnItems = resolveColumnOrder(report.columnOrder, orderedDimensionItems, report.metrics);
   return /*#__PURE__*/React__namespace.default.createElement(material.Box, {
     sx: {
       p: 3,
@@ -7170,9 +7477,36 @@ const ReportBuilder = ({
       }
     }
   }), /*#__PURE__*/React__namespace.default.createElement(material.Tab, {
-    label: reportData ? "Results" : "Results (Run report first)",
+    label: /*#__PURE__*/React__namespace.default.createElement(material.Badge, {
+      variant: "dot",
+      invisible: report.columnOrder.length === 0,
+      sx: {
+        "& .MuiBadge-dot": {
+          backgroundColor: "rgb(70, 134, 128)"
+        }
+      }
+    }, /*#__PURE__*/React__namespace.default.createElement("span", {
+      style: {
+        marginRight: report.columnOrder.length > 0 ? "8px" : "0"
+      }
+    }, "Column Order")),
     id: "report-tab-3",
     "aria-controls": "report-tabpanel-3",
+    sx: {
+      height: "41px",
+      fontFamily: "system-ui",
+      borderRadius: "0.5rem",
+      boxShadow: "none",
+      textTransform: "none",
+      color: "rgb(37, 37, 37)",
+      "&.Mui-selected": {
+        color: "rgb(70, 134, 128)"
+      }
+    }
+  }), /*#__PURE__*/React__namespace.default.createElement(material.Tab, {
+    label: reportData ? "Results" : "Results (Run report first)",
+    id: "report-tab-4",
+    "aria-controls": "report-tabpanel-4",
     disabled: !reportData,
     sx: {
       height: "41px",
@@ -7194,7 +7528,7 @@ const ReportBuilder = ({
     savedDimensions: report.dimensions,
     onSaveDimension: handleSaveDimension,
     onRemoveDimension: handleRemoveDimension,
-    onReorderDimensions: handleReorderDimensions,
+    onUpdateDimensionSortOrder: handleUpdateDimensionSortOrder,
     titleOverrides: titleOverrides.dimensions,
     onUpdateTitle: handleUpdateDimensionTitle,
     onResetTitle: handleResetDimensionTitle,
@@ -7204,7 +7538,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
@@ -7238,11 +7573,18 @@ const ReportBuilder = ({
   })), /*#__PURE__*/React__namespace.default.createElement(TabPanel, {
     value: activeTab,
     index: 3
+  }, /*#__PURE__*/React__namespace.default.createElement(ColumnOrder, {
+    orderedDimensionItems: orderedDimensionItems,
+    metrics: report.metrics,
+    columnOrder: report.columnOrder,
+    onReorderColumnItems: handleReorderColumnItems,
+    titleOverrides: titleOverrides
+  })), /*#__PURE__*/React__namespace.default.createElement(TabPanel, {
+    value: activeTab,
+    index: 4
   }, reportData && /*#__PURE__*/React__namespace.default.createElement(ReportDataGrid, {
     reportData: reportData,
-    dimensions: report.dimensions,
-    metrics: report.metrics,
-    computedDimensions: report.computedDimensions,
+    columnItems: columnItems,
     loading: loading,
     onPageChange: handlePageChange,
     totalRows: totalRows,
@@ -7305,6 +7647,50 @@ 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();
+
+  // Hidden by default; only shown when a `cur` query parameter is present in the top-level URL.
+  const showCurrencySelector = new URLSearchParams(window.location.search).has("cur");
+  if (!showCurrencySelector) {
+    return null;
+  }
+  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 +7757,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 = {