@bygd/nc-report-ui 0.1.40 → 0.1.42

package/dist/app/esm/index.js

@@ -1,6 +1,6 @@
 var n,l$1,u$2,i$1,r$2,o$1,e$1,f$2,c$1,a$1,s$1,h$1,p$1,v$1,y$1,d$1={},w$2=[],_$1=/acit|ex(?:s|g|n|p|$)|rph|grid|ows|mnc|ntw|ine[ch]|zoo|^ord|itera/i,g$2=Array.isArray;function m$1(n,l){for(var u in l)n[u]=l[u];return n}function b$1(n){n&&n.parentNode&&n.parentNode.removeChild(n);}function k$2(l,u,t){var i,r,o,e={};for(o in u)"key"==o?i=u[o]:"ref"==o?r=u[o]:e[o]=u[o];if(arguments.length>2&&(e.children=arguments.length>3?n.call(arguments,2):t),"function"==typeof l&&null!=l.defaultProps)for(o in l.defaultProps) void 0===e[o]&&(e[o]=l.defaultProps[o]);return x$2(l,e,i,r,null)}function x$2(n,t,i,r,o){var e={type:n,props:t,key:i,ref:r,__k:null,__:null,__b:0,__e:null,__c:null,constructor:void 0,__v:null==o?++u$2:o,__i:-1,__u:0};return null==o&&null!=l$1.vnode&&l$1.vnode(e),e}function M$1(){return {current:null}}function S(n){return n.children}function C$2(n,l){this.props=n,this.context=l;}function $$1(n,l){if(null==l)return n.__?$$1(n.__,n.__i+1):null;for(var u;l<n.__k.length;l++)if(null!=(u=n.__k[l])&&null!=u.__e)return u.__e;return "function"==typeof n.type?$$1(n):null}function I$1(n){if(n.__P&&n.__d){var u=n.__v,t=u.__e,i=[],r=[],o=m$1({},u);o.__v=u.__v+1,l$1.vnode&&l$1.vnode(o),q$2(n.__P,o,u,n.__n,n.__P.namespaceURI,32&u.__u?[t]:null,i,null==t?$$1(u):t,!!(32&u.__u),r),o.__v=u.__v,o.__.__k[o.__i]=o,D$2(i,o,r),u.__e=u.__=null,o.__e!=t&&P$2(o);}}function P$2(n){if(null!=(n=n.__)&&null!=n.__c)return n.__e=n.__c.base=null,n.__k.some(function(l){if(null!=l&&null!=l.__e)return n.__e=n.__c.base=l.__e}),P$2(n)}function A$2(n){(!n.__d&&(n.__d=true)&&i$1.push(n)&&!H$1.__r++||r$2!=l$1.debounceRendering)&&((r$2=l$1.debounceRendering)||o$1)(H$1);}function H$1(){try{for(var n,l=1;i$1.length;)i$1.length>l&&i$1.sort(e$1),n=i$1.shift(),l=i$1.length,I$1(n);}finally{i$1.length=H$1.__r=0;}}function L$1(n,l,u,t,i,r,o,e,f,c,a){var s,h,p,v,y,_,g,m=t&&t.__k||w$2,b=l.length;for(f=T$2(u,l,m,f,b),s=0;s<b;s++)null!=(p=u.__k[s])&&(h=-1!=p.__i&&m[p.__i]||d$1,p.__i=s,_=q$2(n,p,h,i,r,o,e,f,c,a),v=p.__e,p.ref&&h.ref!=p.ref&&(h.ref&&J$1(h.ref,null,p),a.push(p.ref,p.__c||v,p)),null==y&&null!=v&&(y=v),(g=!!(4&p.__u))||h.__k===p.__k?(f=j$2(p,f,n,g),g&&h.__e&&(h.__e=null)):"function"==typeof p.type&&void 0!==_?f=_:v&&(f=v.nextSibling),p.__u&=-7);return u.__e=y,f}function T$2(n,l,u,t,i){var r,o,e,f,c,a=u.length,s=a,h=0;for(n.__k=new Array(i),r=0;r<i;r++)null!=(o=l[r])&&"boolean"!=typeof o&&"function"!=typeof o?("string"==typeof o||"number"==typeof o||"bigint"==typeof o||o.constructor==String?o=n.__k[r]=x$2(null,o,null,null,null):g$2(o)?o=n.__k[r]=x$2(S,{children:o},null,null,null):void 0===o.constructor&&o.__b>0?o=n.__k[r]=x$2(o.type,o.props,o.key,o.ref?o.ref:null,o.__v):n.__k[r]=o,f=r+h,o.__=n,o.__b=n.__b+1,e=null,-1!=(c=o.__i=O$1(o,u,f,s))&&(s--,(e=u[c])&&(e.__u|=2)),null==e||null==e.__v?(-1==c&&(i>a?h--:i<a&&h++),"function"!=typeof o.type&&(o.__u|=4)):c!=f&&(c==f-1?h--:c==f+1?h++:(c>f?h--:h++,o.__u|=4))):n.__k[r]=null;if(s)for(r=0;r<a;r++)null!=(e=u[r])&&0==(2&e.__u)&&(e.__e==t&&(t=$$1(e)),K$1(e,e));return t}function j$2(n,l,u,t){var i,r;if("function"==typeof n.type){for(i=n.__k,r=0;i&&r<i.length;r++)i[r]&&(i[r].__=n,l=j$2(i[r],l,u,t));return l}n.__e!=l&&(t&&(l&&n.type&&!l.parentNode&&(l=$$1(n)),u.insertBefore(n.__e,l||null)),l=n.__e);do{l=l&&l.nextSibling;}while(null!=l&&8==l.nodeType);return l}function F$2(n,l){return l=l||[],null==n||"boolean"==typeof n||(g$2(n)?n.some(function(n){F$2(n,l);}):l.push(n)),l}function O$1(n,l,u,t){var i,r,o,e=n.key,f=n.type,c=l[u],a=null!=c&&0==(2&c.__u);if(null===c&&null==e||a&&e==c.key&&f==c.type)return u;if(t>(a?1:0))for(i=u-1,r=u+1;i>=0||r<l.length;)if(null!=(c=l[o=i>=0?i--:r++])&&0==(2&c.__u)&&e==c.key&&f==c.type)return o;return  -1}function z$2(n,l,u){"-"==l[0]?n.setProperty(l,null==u?"":u):n[l]=null==u?"":"number"!=typeof u||_$1.test(l)?u:u+"px";}function N$1(n,l,u,t,i){var r,o;n:if("style"==l)if("string"==typeof u)n.style.cssText=u;else {if("string"==typeof t&&(n.style.cssText=t=""),t)for(l in t)u&&l in u||z$2(n.style,l,"");if(u)for(l in u)t&&u[l]==t[l]||z$2(n.style,l,u[l]);}else if("o"==l[0]&&"n"==l[1])r=l!=(l=l.replace(s$1,"$1")),o=l.toLowerCase(),l=o in n||"onFocusOut"==l||"onFocusIn"==l?o.slice(2):l.slice(2),n.l||(n.l={}),n.l[l+r]=u,u?t?u[a$1]=t[a$1]:(u[a$1]=h$1,n.addEventListener(l,r?v$1:p$1,r)):n.removeEventListener(l,r?v$1:p$1,r);else {if("http://www.w3.org/2000/svg"==i)l=l.replace(/xlink(H|:h)/,"h").replace(/sName$/,"s");else if("width"!=l&&"height"!=l&&"href"!=l&&"list"!=l&&"form"!=l&&"tabIndex"!=l&&"download"!=l&&"rowSpan"!=l&&"colSpan"!=l&&"role"!=l&&"popover"!=l&&l in n)try{n[l]=null==u?"":u;break n}catch(n){}"function"==typeof u||(null==u||false===u&&"-"!=l[4]?n.removeAttribute(l):n.setAttribute(l,"popover"==l&&1==u?"":u));}}function V$1(n){return function(u){if(this.l){var t=this.l[u.type+n];if(null==u[c$1])u[c$1]=h$1++;else if(u[c$1]<t[a$1])return;return t(l$1.event?l$1.event(u):u)}}}function q$2(n,u,t,i,r,o,e,f,c,a){var s,h,p,v,y,d,_,k,x,M,$,I,P,A,H,T,j=u.type;if(void 0!==u.constructor)return null;128&t.__u&&(c=!!(32&t.__u),o=[f=u.__e=t.__e]),(s=l$1.__b)&&s(u);n:if("function"==typeof j){h=e.length;try{if(x=u.props,M=j.prototype&&j.prototype.render,$=(s=j.contextType)&&i[s.__c],I=s?$?$.props.value:s.__:i,t.__c?k=(p=u.__c=t.__c).__=p.__E:(M?u.__c=p=new j(x,I):(u.__c=p=new C$2(x,I),p.constructor=j,p.render=Q$1),$&&$.sub(p),p.state||(p.state={}),p.__n=i,v=p.__d=!0,p.__h=[],p._sb=[]),M&&null==p.__s&&(p.__s=p.state),M&&null!=j.getDerivedStateFromProps&&(p.__s==p.state&&(p.__s=m$1({},p.__s)),m$1(p.__s,j.getDerivedStateFromProps(x,p.__s))),y=p.props,d=p.state,p.__v=u,v)M&&null==j.getDerivedStateFromProps&&null!=p.componentWillMount&&p.componentWillMount(),M&&null!=p.componentDidMount&&p.__h.push(p.componentDidMount);else {if(M&&null==j.getDerivedStateFromProps&&x!==y&&null!=p.componentWillReceiveProps&&p.componentWillReceiveProps(x,I),u.__v==t.__v||!p.__e&&null!=p.shouldComponentUpdate&&!1===p.shouldComponentUpdate(x,p.__s,I)){u.__v!=t.__v&&(p.props=x,p.state=p.__s,p.__d=!1),u.__e=t.__e,u.__k=t.__k,u.__k.some(function(n){n&&(n.__=u);}),w$2.push.apply(p.__h,p._sb),p._sb=[],p.__h.length&&e.push(p);break n}null!=p.componentWillUpdate&&p.componentWillUpdate(x,p.__s,I),M&&null!=p.componentDidUpdate&&p.__h.push(function(){p.componentDidUpdate(y,d,_);});}if(p.context=I,p.props=x,p.__P=n,p.__e=!1,P=l$1.__r,A=0,M)p.state=p.__s,p.__d=!1,P&&P(u),s=p.render(p.props,p.state,p.context),w$2.push.apply(p.__h,p._sb),p._sb=[];else do{p.__d=!1,P&&P(u),s=p.render(p.props,p.state,p.context),p.state=p.__s;}while(p.__d&&++A<25);p.state=p.__s,null!=p.getChildContext&&(i=m$1(m$1({},i),p.getChildContext())),M&&!v&&null!=p.getSnapshotBeforeUpdate&&(_=p.getSnapshotBeforeUpdate(y,d)),H=null!=s&&s.type===S&&null==s.key?E$1(s.props.children):s,f=L$1(n,g$2(H)?H:[H],u,t,i,r,o,e,f,c,a),p.base=u.__e,u.__u&=-161,p.__h.length&&e.push(p),k&&(p.__E=p.__=null);}catch(n){if(e.length=h,u.__v=null,c||null!=o){if(n.then){for(u.__u|=c?160:128;f&&8==f.nodeType&&f.nextSibling;)f=f.nextSibling;null!=o&&(o[o.indexOf(f)]=null),u.__e=f;}else if(null!=o)for(T=o.length;T--;)b$1(o[T]);}else u.__e=t.__e;null==u.__k&&(u.__k=t.__k||[]),n.then||B$2(u),l$1.__e(n,u,t);}}else null==o&&u.__v==t.__v?(u.__k=t.__k,u.__e=t.__e):f=u.__e=G$1(t.__e,u,t,i,r,o,e,c,a);return (s=l$1.diffed)&&s(u),128&u.__u?void 0:f}function B$2(n){n&&(n.__c&&(n.__c.__e=true),n.__k&&n.__k.some(B$2));}function D$2(n,u,t){for(var i=0;i<t.length;i++)J$1(t[i],t[++i],t[++i]);l$1.__c&&l$1.__c(u,n),n.some(function(u){try{n=u.__h,u.__h=[],n.some(function(n){n.call(u);});}catch(n){l$1.__e(n,u.__v);}});}function E$1(n){return "object"!=typeof n||null==n||n.__b>0?n:g$2(n)?n.map(E$1):void 0!==n.constructor?null:m$1({},n)}function G$1(u,t,i,r,o,e,f,c,a){var s,h,p,v,y,w,_,m=i.props||d$1,k=t.props,x=t.type;if("svg"==x?o="http://www.w3.org/2000/svg":"math"==x?o="http://www.w3.org/1998/Math/MathML":o||(o="http://www.w3.org/1999/xhtml"),null!=e)for(s=0;s<e.length;s++)if((y=e[s])&&"setAttribute"in y==!!x&&(x?y.localName==x:3==y.nodeType)){u=y,e[s]=null;break}if(null==u){if(null==x)return document.createTextNode(k);u=document.createElementNS(o,x,k.is&&k),c&&(l$1.__m&&l$1.__m(t,e),c=false),e=null;}if(null==x)m===k||c&&u.data==k||(u.data=k);else {if(e="textarea"==x&&null!=k.defaultValue?null:e&&n.call(u.childNodes),!c&&null!=e)for(m={},s=0;s<u.attributes.length;s++)m[(y=u.attributes[s]).name]=y.value;for(s in m)y=m[s],"dangerouslySetInnerHTML"==s?p=y:"children"==s||s in k||"value"==s&&"defaultValue"in k||"checked"==s&&"defaultChecked"in k||N$1(u,s,null,y,o);for(s in k)y=k[s],"children"==s?v=y:"dangerouslySetInnerHTML"==s?h=y:"value"==s?w=y:"checked"==s?_=y:c&&"function"!=typeof y||m[s]===y||N$1(u,s,y,m[s],o);if(h)c||p&&(h.__html==p.__html||h.__html==u.innerHTML)||(u.innerHTML=h.__html),t.__k=[];else if(p&&(u.innerHTML=""),L$1("template"==t.type?u.content:u,g$2(v)?v:[v],t,i,r,"foreignObject"==x?"http://www.w3.org/1999/xhtml":o,e,f,e?e[0]:i.__k&&$$1(i,0),c,a),null!=e)for(s=e.length;s--;)b$1(e[s]);c&&"textarea"!=x||(s="value","progress"==x&&null==w?u.removeAttribute("value"):null!=w&&(w!==u[s]||"progress"==x&&!w||"option"==x&&w!=m[s])&&N$1(u,s,w,m[s],o),s="checked",null!=_&&_!=u[s]&&N$1(u,s,_,m[s],o));}return u}function J$1(n,u,t){try{if("function"==typeof n){var i="function"==typeof n.__u;i&&n.__u(),i&&null==u||(n.__u=n(u));}else n.current=u;}catch(n){l$1.__e(n,t);}}function K$1(n,u,t){var i,r;if(l$1.unmount&&l$1.unmount(n),(i=n.ref)&&(i.current&&i.current!=n.__e||J$1(i,null,u)),null!=(i=n.__c)){if(i.componentWillUnmount)try{i.componentWillUnmount();}catch(n){l$1.__e(n,u);}i.base=i.__P=i.__n=null;}if(i=n.__k)for(r=0;r<i.length;r++)i[r]&&K$1(i[r],u,t||"function"!=typeof n.type);t||b$1(n.__e),n.__c=n.__=n.__e=void 0;}function Q$1(n,l,u){return this.constructor(n,u)}function R$1(u,t,i){var r,o,e,f;t==document&&(t=document.documentElement),l$1.__&&l$1.__(u,t),o=(r="function"==typeof i)?null:i&&i.__k||t.__k,e=[],f=[],q$2(t,u=(!r&&i||t).__k=k$2(S,null,[u]),o||d$1,d$1,t.namespaceURI,!r&&i?[i]:o?null:t.firstChild?n.call(t.childNodes):null,e,!r&&i?i:o?o.__e:t.firstChild,r,f),D$2(e,u,f),u.props.children=null;}function U$1(n,l){R$1(n,l,U$1);}function W$1(l,u,t){var i,r,o,e,f=m$1({},l.props);for(o in l.type&&l.type.defaultProps&&(e=l.type.defaultProps),u)"key"==o?i=u[o]:"ref"==o?r=u[o]:f[o]=void 0===u[o]&&null!=e?e[o]:u[o];return arguments.length>2&&(f.children=arguments.length>3?n.call(arguments,2):t),x$2(l.type,f,i||l.key,r||l.ref,null)}function X$1(n){function l(n){var u,t;return this.getChildContext||(u=new Set,(t={})[l.__c]=this,this.getChildContext=function(){return t},this.componentWillUnmount=function(){u=null;},this.shouldComponentUpdate=function(n){this.props.value!=n.value&&u.forEach(function(n){n.__e=true,A$2(n);});},this.sub=function(n){u.add(n);var l=n.componentWillUnmount;n.componentWillUnmount=function(){u&&u.delete(n),l&&l.call(n);};}),n.children}return l.__c="__cC"+y$1++,l.__=n,l.Provider=l.__l=(l.Consumer=function(n,l){return n.children(l)}).contextType=l,l}n=w$2.slice,l$1={__e:function(n,l,u,t){for(var i,r,o;l=l.__;)if((i=l.__c)&&!i.__)try{if((r=i.constructor)&&null!=r.getDerivedStateFromError&&(i.setState(r.getDerivedStateFromError(n)),o=i.__d),null!=i.componentDidCatch&&(i.componentDidCatch(n,t||{}),o=i.__d),o)return i.__E=i}catch(l){n=l;}throw n}},u$2=0,C$2.prototype.setState=function(n,l){var u;u=null!=this.__s&&this.__s!=this.state?this.__s:this.__s=m$1({},this.state),"function"==typeof n&&(n=n(m$1({},u),this.props)),n&&m$1(u,n),null!=n&&this.__v&&(l&&this._sb.push(l),A$2(this));},C$2.prototype.forceUpdate=function(n){this.__v&&(this.__e=true,n&&this.__h.push(n),A$2(this));},C$2.prototype.render=S,i$1=[],o$1="function"==typeof Promise?Promise.prototype.then.bind(Promise.resolve()):setTimeout,e$1=function(n,l){return n.__v.__b-l.__v.__b},H$1.__r=0,f$2=Math.random().toString(8),c$1="__d"+f$2,a$1="__a"+f$2,s$1=/(PointerCapture)$|Capture$/i,h$1=0,p$1=V$1(false),v$1=V$1(true),y$1=0;
 
-var t,r$1,u$1,i,o=0,f$1=[],c=l$1,e=c.__b,a=c.__r,v=c.diffed,l=c.__c,m=c.unmount,p=c.__;function s(n,t){c.__h&&c.__h(r$1,n,o||t),o=0;var u=r$1.__H||(r$1.__H={__:[],__h:[]});return n>=u.__.length&&u.__.push({}),u.__[n]}function d(n){return o=1,y(D$1,n)}function y(n,u,i){var o=s(t++,2);if(o.t=n,!o.__c&&(o.__=[i?i(u):D$1(void 0,u),function(n){var t=o.__N?o.__N[0]:o.__[0],r=o.t(t,n);t!==r&&(o.__N=[r,o.__[1]],o.__c.setState({}));}],o.__c=r$1,!r$1.__f)){var f=function(n,t,r){if(!o.__c.__H)return  true;var u=false,i=o.__c.props!==n;if(o.__c.__H.__.some(function(n){if(n.__N){u=true;var t=n.__[0];n.__=n.__N,n.__N=void 0,t!==n.__[0]&&(i=true);}}),c){var f=c.call(this,n,t,r);return u?f||i:f}return !u||i};r$1.__f=true;var c=r$1.shouldComponentUpdate,e=r$1.componentWillUpdate;r$1.componentWillUpdate=function(n,t,r){if(this.__e){var u=c;c=void 0,f(n,t,r),c=u;}e&&e.call(this,n,t,r);},r$1.shouldComponentUpdate=f;}return o.__N||o.__}function h(n,u){var i=s(t++,3);!c.__s&&C$1(i.__H,u)&&(i.__=n,i.u=u,r$1.__H.__h.push(i));}function _(n,u){var i=s(t++,4);!c.__s&&C$1(i.__H,u)&&(i.__=n,i.u=u,r$1.__h.push(i));}function A$1(n){return o=5,T$1(function(){return {current:n}},[])}function F$1(n,t,r){o=6,_(function(){if("function"==typeof n){var r=n(t());return function(){n(null),r&&"function"==typeof r&&r();}}if(n)return n.current=t(),function(){return n.current=null}},null==r?r:r.concat(n));}function T$1(n,r){var u=s(t++,7);return C$1(u.__H,r)&&(u.__=n(),u.__H=r,u.__h=n),u.__}function q$1(n,t){return o=8,T$1(function(){return n},t)}function x$1(n){var u=r$1.context[n.__c],i=s(t++,9);return i.c=n,u?(null==i.__&&(i.__=true,u.sub(r$1)),u.props.value):n.__}function P$1(n,t){c.useDebugValue&&c.useDebugValue(t?t(n):n);}function b(n){var u=s(t++,10),i=d();return u.__=n,r$1.componentDidCatch||(r$1.componentDidCatch=function(n,t){u.__&&u.__(n,t),i[1](n);}),[i[0],function(){i[1](void 0);}]}function g$1(){var n=s(t++,11);if(!n.__){for(var u=r$1.__v;null!==u&&!u.__m&&null!==u.__;)u=u.__;var i=u.__m||(u.__m=[0,0]);n.__="P"+i[0]+"-"+i[1]++;}return n.__}function j$1(){for(var n;n=f$1.shift();){var t=n.__H;if(n.__P&&t)try{t.__h.some(z$1),t.__h.some(B$1),t.__h=[];}catch(r){t.__h=[],c.__e(r,n.__v);}}}c.__b=function(n){r$1=null,e&&e(n);},c.__=function(n,t){n&&t.__k&&t.__k.__m&&(n.__m=t.__k.__m),p&&p(n,t);},c.__r=function(n){a&&a(n),t=0;var i=(r$1=n.__c).__H;i&&(u$1===r$1?(i.__h=[],r$1.__h=[],i.__.some(function(n){n.__N&&(n.__=n.__N),n.u=n.__N=void 0;})):(i.__h.length&&j$1(),t=0)),u$1=r$1;},c.diffed=function(n){v&&v(n);var t=n.__c;t&&t.__H&&(t.__H.__h.length&&(1!==f$1.push(t)&&i===c.requestAnimationFrame||((i=c.requestAnimationFrame)||w$1)(j$1)),t.__H.__.some(function(n){n.u&&(n.__H=n.u,n.u=void 0);})),u$1=r$1=null;},c.__c=function(n,t){t.some(function(n){try{n.__h.some(z$1),n.__h=n.__h.filter(function(n){return !n.__||B$1(n)});}catch(r){t.some(function(n){n.__h&&(n.__h=[]);}),t=[],c.__e(r,n.__v);}}),l&&l(n,t);},c.unmount=function(n){m&&m(n);var t,r=n.__c;r&&r.__H&&(r.__H.__.some(function(n){try{z$1(n);}catch(n){t=n;}}),r.__H=void 0,t&&c.__e(t,r.__v));};var k$1="function"==typeof requestAnimationFrame;function w$1(n){var t,r=function(){clearTimeout(u),k$1&&cancelAnimationFrame(t),setTimeout(n);},u=setTimeout(r,35);k$1&&(t=requestAnimationFrame(r));}function z$1(n){var t=r$1,u=n.__c;"function"==typeof u&&(n.__c=void 0,u()),r$1=t;}function B$1(n){var t=r$1;n.__c=n.__(),r$1=t;}function C$1(n,t){return !n||n.length!==t.length||t.some(function(t,r){return t!==n[r]})}function D$1(n,t){return "function"==typeof t?t(n):t}
+var t,r$1,u$1,i,o=0,f$1=[],c=l$1,e=c.__b,a=c.__r,v=c.diffed,l=c.__c,m=c.unmount,p=c.__;function s(n,t){c.__h&&c.__h(r$1,n,o||t),o=0;var u=r$1.__H||(r$1.__H={__:[],__h:[]});return n>=u.__.length&&u.__.push({}),u.__[n]}function d(n){return o=1,y(D$1,n)}function y(n,u,i){var o=s(t++,2);if(o.t=n,!o.__c&&(o.__=[i?i(u):D$1(void 0,u),function(n){var t=o.__N?o.__N[0]:o.__[0],r=o.t(t,n);t!==r&&(o.__N=[r,o.__[1]],o.__c.setState({}));}],o.__c=r$1,!r$1.__f)){var f=function(n,t,r){if(!o.__c.__H)return  true;var u=false,i=o.__c.props!==n;if(o.__c.__H.__.some(function(n){if(n.__N){u=true;var t=n.__[0];n.__=n.__N,n.__N=void 0,t!==n.__[0]&&(i=true);}}),c){var f=c.call(this,n,t,r);return u?f||i:f}return !u||i};r$1.__f=true;var c=r$1.shouldComponentUpdate,e=r$1.componentWillUpdate;r$1.componentWillUpdate=function(n,t,r){if(this.__e){var u=c;c=void 0,f(n,t,r),c=u;}e&&e.call(this,n,t,r);},r$1.shouldComponentUpdate=f;}return o.__N||o.__}function h(n,u){var i=s(t++,3);!c.__s&&C$1(i.__H,u)&&(i.__=n,i.u=u,r$1.__H.__h.push(i));}function _(n,u){var i=s(t++,4);!c.__s&&C$1(i.__H,u)&&(i.__=n,i.u=u,r$1.__h.push(i));}function A$1(n){return o=5,T$1(function(){return {current:n}},[])}function F$1(n,t,r){o=6,_(function(){if("function"==typeof n){var r=n(t());return function(){n(null),r&&"function"==typeof r&&r();}}if(n)return n.current=t(),function(){return n.current=null}},null==r?r:r.concat(n));}function T$1(n,r){var u=s(t++,7);return C$1(u.__H,r)&&(u.__=n(),u.__H=r,u.__h=n),u.__}function q$1(n,t){return o=8,T$1(function(){return n},t)}function x$1(n){var u=r$1.context[n.__c],i=s(t++,9);return i.c=n,u?(null==i.__&&(i.__=true,u.sub(r$1)),u.props.value):n.__}function P$1(n,t){c.useDebugValue&&c.useDebugValue(t?t(n):n);}function b(n){var u=s(t++,10),i=d();return u.__=n,r$1.componentDidCatch||(r$1.componentDidCatch=function(n,t){u.__&&u.__(n,t),i[1](n);}),[i[0],function(){i[1](void 0);}]}function g$1(){var n=s(t++,11);if(!n.__){for(var u=r$1.__v;null!==u&&!u.__m&&null!==u.__;)u=u.__;var i=u.__m||(u.__m=[0,0]);n.__="P"+i[0]+"-"+i[1]++;}return n.__}function j$1(){for(var n;n=f$1.shift();){var t=n.__H;if(n.__P&&t)try{t.__h.some(z$1),t.__h.some(B$1),t.__h=[];}catch(r){t.__h=[],c.__e(r,n.__v);}}}c.__b=function(n){r$1=null,e&&e(n);},c.__=function(n,t){n&&t.__k&&t.__k.__m&&(n.__m=t.__k.__m),p&&p(n,t);},c.__r=function(n){a&&a(n),t=0;var i=(r$1=n.__c).__H;i&&(u$1===r$1?(i.__h=[],r$1.__h=[],i.__.some(function(n){n.__N&&(n.__=n.__N),n.u=n.__N=void 0;})):(i.__h.some(z$1),i.__h.some(B$1),i.__h=[],t=0)),u$1=r$1;},c.diffed=function(n){v&&v(n);var t=n.__c;t&&t.__H&&(t.__H.__h.length&&(1!==f$1.push(t)&&i===c.requestAnimationFrame||((i=c.requestAnimationFrame)||w$1)(j$1)),t.__H.__.some(function(n){n.u&&(n.__H=n.u,n.u=void 0);})),u$1=r$1=null;},c.__c=function(n,t){t.some(function(n){try{n.__h.some(z$1),n.__h=n.__h.filter(function(n){return !n.__||B$1(n)});}catch(r){t.some(function(n){n.__h&&(n.__h=[]);}),t=[],c.__e(r,n.__v);}}),l&&l(n,t);},c.unmount=function(n){m&&m(n);var t,r=n.__c;r&&r.__H&&(r.__H.__.some(function(n){try{z$1(n);}catch(n){t=n;}}),r.__H=void 0,t&&c.__e(t,r.__v));};var k$1="function"==typeof requestAnimationFrame;function w$1(n){var t,r=function(){clearTimeout(u),k$1&&cancelAnimationFrame(t),setTimeout(n);},u=setTimeout(r,35);k$1&&(t=requestAnimationFrame(r));}function z$1(n){var t=r$1,u=n.__c;"function"==typeof u&&(n.__c=void 0,u()),r$1=t;}function B$1(n){var t=r$1;n.__c=n.__(),r$1=t;}function C$1(n,t){return !n||n.length!==t.length||t.some(function(t,r){return t!==n[r]})}function D$1(n,t){return "function"==typeof t?t(n):t}
 
 function g(n,t){for(var e in t)n[e]=t[e];return n}function E(n,t){for(var e in n)if("__source"!==e&&!(e in t))return  true;for(var r in t)if("__source"!==r&&n[r]!==t[r])return  true;return  false}function C(n,t){var e=t(),r=d({t:{__:e,u:t}}),u=r[0].t,o=r[1];return _(function(){u.__=e,u.u=t,R(u)&&o({t:u});},[n,e,t]),h(function(){return R(u)&&o({t:u}),n(function(){R(u)&&o({t:u});})},[n]),e}function R(n){try{return !((t=n.__)===(e=n.u())&&(0!==t||1/t==1/e)||t!=t&&e!=e)}catch(n){return  true}var t,e;}function x(n){n();}function w(n){return n}function k(){return [false,x]}var I=_;function M(n,t){this.props=n,this.context=t;}function N(n,e){function r(n){var t=this.props.ref;return t!=n.ref&&t&&("function"==typeof t?t(null):t.current=null),e?!e(this.props,n)||t!=n.ref:E(this.props,n)}function u(e){return this.shouldComponentUpdate=r,k$2(n,e)}return u.displayName="Memo("+(n.displayName||n.name)+")",u.__f=u.prototype.isReactComponent=true,u.type=n,u}(M.prototype=new C$2).isPureReactComponent=true,M.prototype.shouldComponentUpdate=function(n,t){return E(this.props,n)||E(this.state,t)};var T=l$1.__b;l$1.__b=function(n){n.type&&n.type.__f&&n.ref&&(n.props.ref=n.ref,n.ref=null),T&&T(n);};var A="undefined"!=typeof Symbol&&Symbol.for&&Symbol.for("react.forward_ref")||3911;function D(n){function t(t){var e=g({},t);return delete e.ref,n(e,t.ref||null)}return t.$$typeof=A,t.render=n,t.prototype.isReactComponent=t.__f=true,t.displayName="ForwardRef("+(n.displayName||n.name)+")",t}var F=function(n,t){return null==n?null:F$2(F$2(n).map(t))},L={map:F,forEach:F,count:function(n){return n?F$2(n).length:0},only:function(n){var t=F$2(n);if(1!==t.length)throw "Children.only";return t[0]},toArray:F$2},O=l$1.__e;l$1.__e=function(n,t,e,r){if(n.then)for(var u,o=t;o=o.__;)if((u=o.__c)&&u.__c)return null==t.__e&&(t.__e=e.__e,t.__k=e.__k||[]),u.__c(n,t);O(n,t,e,r);};var U=l$1.unmount;function V(n,t,e){return n&&(n.__c&&n.__c.__H&&(n.__c.__H.__.forEach(function(n){"function"==typeof n.__c&&n.__c();}),n.__c.__H=null),null!=(n=g({},n)).__c&&(n.__c.__P===e&&(n.__c.__P=t),n.__c.__e=true,n.__c=null),n.__k=n.__k&&n.__k.map(function(n){return V(n,t,e)})),n}function W(n,t,e){return n&&e&&(n.__v=null,n.__k=n.__k&&n.__k.map(function(n){return W(n,t,e)}),n.__c&&n.__c.__P===t&&(n.__e&&e.appendChild(n.__e),n.__c.__e=true,n.__c.__P=e)),n}function P(){this.__u=0,this.o=null,this.__b=null;}function j(n){var t=n.__&&n.__.__c;return t&&t.__a&&t.__a(n)}function z(n){var e,r,u,o=null;function i(i){if(e||(e=n()).then(function(n){n&&(o=n.default||n),u=true;},function(n){r=n,u=true;}),r)throw r;if(!u)throw e;return o?k$2(o,i):null}return i.displayName="Lazy",i.__f=true,i}function B(){this.i=null,this.l=null;}l$1.unmount=function(n){var t=n.__c;t&&(t.__z=true),t&&t.__R&&t.__R(),t&&32&n.__u&&(n.type=null),U&&U(n);},(P.prototype=new C$2).__c=function(n,t){var e=t.__c,r=this;null==r.o&&(r.o=[]),r.o.push(e);var u=j(r.__v),o=false,i=function(){o||r.__z||(o=true,e.__R=null,u?u(c):c());};e.__R=i;var l=e.__P;e.__P=null;var c=function(){if(!--r.__u){if(r.state.__a){var n=r.state.__a;r.__v.__k[0]=W(n,n.__c.__P,n.__c.__O);}var t;for(r.setState({__a:r.__b=null});t=r.o.pop();)t.__P=l,t.forceUpdate();}};r.__u++||32&t.__u||r.setState({__a:r.__b=r.__v.__k[0]}),n.then(i,i);},P.prototype.componentWillUnmount=function(){this.o=[];},P.prototype.render=function(n,e){if(this.__b){if(this.__v.__k){var r=document.createElement("div"),o=this.__v.__k[0].__c;this.__v.__k[0]=V(this.__b,r,o.__O=o.__P);}this.__b=null;}var i=e.__a&&k$2(S,null,n.fallback);return i&&(i.__u&=-33),[k$2(S,null,e.__a?null:n.children),i]};var H=function(n,t,e){if(++e[1]===e[0]&&n.l.delete(t),n.props.revealOrder&&("t"!==n.props.revealOrder[0]||!n.l.size))for(e=n.i;e;){for(;e.length>3;)e.pop()();if(e[1]<e[0])break;n.i=e=e[2];}};function Z(n){return this.getChildContext=function(){return n.context},n.children}function Y(n){var e=this,r=n.h;if(e.componentWillUnmount=function(){R$1(null,e.v),e.v=null,e.h=null;},e.h&&e.h!==r&&e.componentWillUnmount(),!e.v){for(var u=e.__v;null!==u&&!u.__m&&null!==u.__;)u=u.__;e.h=r,e.v={nodeType:1,parentNode:r,childNodes:[],__k:{__m:u.__m},contains:function(){return  true},namespaceURI:r.namespaceURI,insertBefore:function(n,t){this.childNodes.push(n),e.h.insertBefore(n,t);},removeChild:function(n){this.childNodes.splice(this.childNodes.indexOf(n)>>>1,1),e.h.removeChild(n);}};}R$1(k$2(Z,{context:e.context},n.__v),e.v);}function $(n,e){var r=k$2(Y,{__v:n,h:e});return r.containerInfo=e,r}(B.prototype=new C$2).__a=function(n){var t=this,e=j(t.__v),r=t.l.get(n);return r[0]++,function(u){var o=function(){t.props.revealOrder?(r.push(u),H(t,n,r)):u();};e?e(o):o();}},B.prototype.render=function(n){this.i=null,this.l=new Map;var t=F$2(n.children);n.revealOrder&&"b"===n.revealOrder[0]&&t.reverse();for(var e=t.length;e--;)this.l.set(t[e],this.i=[1,0,this.i]);return n.children},B.prototype.componentDidUpdate=B.prototype.componentDidMount=function(){var n=this;this.l.forEach(function(t,e){H(n,e,t);});};var q="undefined"!=typeof Symbol&&Symbol.for&&Symbol.for("react.element")||60103,G=/^(?:accent|alignment|arabic|baseline|cap|clip(?!PathU)|color|dominant|fill|flood|font|glyph(?!R)|horiz|image(!S)|letter|lighting|marker(?!H|W|U)|overline|paint|pointer|shape|stop|strikethrough|stroke|text(?!L)|transform|underline|unicode|units|v|vector|vert|word|writing|x(?!C))[A-Z]/,J=/^on(Ani|Tra|Tou|BeforeInp|Compo)/,K=/[A-Z0-9]/g,Q="undefined"!=typeof document,X=function(n){return ("undefined"!=typeof Symbol&&"symbol"==typeof Symbol()?/fil|che|rad/:/fil|che|ra/).test(n)};function nn(n,t,e){return null==t.__k&&(t.textContent=""),R$1(n,t),"function"==typeof e&&e(),n?n.__c:null}function tn(n,t,e){return U$1(n,t),"function"==typeof e&&e(),n?n.__c:null}C$2.prototype.isReactComponent=true,["componentWillMount","componentWillReceiveProps","componentWillUpdate"].forEach(function(t){Object.defineProperty(C$2.prototype,t,{configurable:true,get:function(){return this["UNSAFE_"+t]},set:function(n){Object.defineProperty(this,t,{configurable:true,writable:true,value:n});}});});var en=l$1.event;l$1.event=function(n){return en&&(n=en(n)),n.persist=function(){},n.isPropagationStopped=function(){return this.cancelBubble},n.isDefaultPrevented=function(){return this.defaultPrevented},n.nativeEvent=n};var rn,un={configurable:true,get:function(){return this.class}},on$1=l$1.vnode;l$1.vnode=function(n){"string"==typeof n.type&&function(n){var t=n.props,e=n.type,u={},o=-1==e.indexOf("-");for(var i in t){var l=t[i];if(!("value"===i&&"defaultValue"in t&&null==l||Q&&"children"===i&&"noscript"===e||"class"===i||"className"===i)){var c=i.toLowerCase();"defaultValue"===i&&"value"in t&&null==t.value?i="value":"download"===i&&true===l?l="":"translate"===c&&"no"===l?l=false:"o"===c[0]&&"n"===c[1]?"ondoubleclick"===c?i="ondblclick":"onchange"!==c||"input"!==e&&"textarea"!==e||X(t.type)?"onfocus"===c?i="onfocusin":"onblur"===c?i="onfocusout":J.test(i)&&(i=c):c=i="oninput":o&&G.test(i)?i=i.replace(K,"-$&").toLowerCase():null===l&&(l=void 0),"oninput"===c&&u[i=c]&&(i="oninputCapture"),u[i]=l;}}"select"==e&&(u.multiple&&Array.isArray(u.value)&&(u.value=F$2(t.children).forEach(function(n){n.props.selected=-1!=u.value.indexOf(n.props.value);})),null!=u.defaultValue&&(u.value=F$2(t.children).forEach(function(n){n.props.selected=u.multiple?-1!=u.defaultValue.indexOf(n.props.value):u.defaultValue==n.props.value;}))),t.class&&!t.className?(u.class=t.class,Object.defineProperty(u,"className",un)):t.className&&(u.class=u.className=t.className),n.props=u;}(n),n.$$typeof=q,on$1&&on$1(n);};var ln=l$1.__r;l$1.__r=function(n){ln&&ln(n),rn=n.__c;};var cn=l$1.diffed;l$1.diffed=function(n){cn&&cn(n);var t=n.props,e=n.__e;null!=e&&"textarea"===n.type&&"value"in t&&t.value!==e.value&&(e.value=null==t.value?"":t.value),rn=null;};var fn={ReactCurrentDispatcher:{current:{readContext:function(n){return rn.__n[n.__c].props.value},useCallback:q$1,useContext:x$1,useDebugValue:P$1,useDeferredValue:w,useEffect:h,useId:g$1,useImperativeHandle:F$1,useInsertionEffect:I,useLayoutEffect:_,useMemo:T$1,useReducer:y,useRef:A$1,useState:d,useSyncExternalStore:C,useTransition:k}}},an="18.3.1";function sn(n){return k$2.bind(null,n)}function hn(n){return !!n&&n.$$typeof===q}function vn(n){return hn(n)&&n.type===S}function dn(n){return !!n&&"string"==typeof n.displayName&&0==n.displayName.indexOf("Memo(")}function mn(n){return hn(n)?W$1.apply(null,arguments):n}function pn(n){return !!n.__k&&(R$1(null,n),true)}function yn(n){return n&&(n.base||1===n.nodeType&&n)||null}var _n=function(n,t){return n(t)},bn=function(n,t){var r=l$1.debounceRendering;l$1.debounceRendering=function(n){return n()};var u=n(t);return l$1.debounceRendering=r,u},Sn=hn,gn={useState:d,useId:g$1,useReducer:y,useEffect:h,useLayoutEffect:_,useInsertionEffect:I,useTransition:k,useDeferredValue:w,useSyncExternalStore:C,startTransition:x,useRef:A$1,useImperativeHandle:F$1,useMemo:T$1,useCallback:q$1,useContext:x$1,useDebugValue:P$1,version:"18.3.1",Children:L,render:nn,hydrate:tn,unmountComponentAtNode:pn,createPortal:$,createElement:k$2,createContext:X$1,createFactory:sn,cloneElement:mn,createRef:M$1,Fragment:S,isValidElement:hn,isElement:Sn,isFragment:vn,isMemo:dn,findDOMNode:yn,Component:C$2,PureComponent:M,memo:N,forwardRef:D,flushSync:bn,unstable_batchedUpdates:_n,StrictMode:S,Suspense:P,SuspenseList:B,lazy:z,__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED:fn};
 
@@ -44182,6 +44182,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 = x$1(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)
@@ -77135,6 +77168,140 @@ var ArrowDownwardIcon = createSvgIcon$1(/*#__PURE__*/u("path", {
   d: "m20 12-1.41-1.41L13 16.17V4h-2v12.17l-5.58-5.59L4 12l8 8z"
 }));
 
+// 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 = () => useSensors(useSensor(PointerSensor), useSensor(KeyboardSensor, {
+  coordinateGetter: 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(arrayMove(list, oldIndex, newIndex));
+    }
+  };
+  const handleMoveUp = index => {
+    if (index > 0) {
+      onReorder(arrayMove(list, index, index - 1));
+    }
+  };
+  const handleMoveDown = index => {
+    if (index < list.length - 1) {
+      onReorder(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__*/gn.createElement(DndContext, {
+  sensors: sensors,
+  collisionDetection: closestCenter,
+  onDragEnd: onDragEnd
+}, /*#__PURE__*/gn.createElement(SortableContext, {
+  items: itemIds,
+  strategy: verticalListSortingStrategy
+}, /*#__PURE__*/gn.createElement(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
+  } = useSortable({
+    id
+  });
+  const style = {
+    transform: CSS$1.Transform.toString(transform),
+    transition,
+    opacity: isDragging ? 0.5 : 1,
+    display: "flex",
+    alignItems: "center",
+    width: "100%"
+  };
+  return {
+    attributes,
+    listeners,
+    setNodeRef,
+    style
+  };
+};
+const DragHandle = ({
+  listeners
+}) => /*#__PURE__*/gn.createElement(Box, _extends({}, listeners, {
+  sx: {
+    display: "flex",
+    alignItems: "center",
+    cursor: "grab",
+    "&:active": {
+      cursor: "grabbing"
+    }
+  }
+}), /*#__PURE__*/gn.createElement(DragIndicatorIcon, {
+  sx: {
+    cursor: "grab",
+    color: "rgba(110, 110, 110, 0.62)"
+  }
+}));
+const MoveButtons = ({
+  onMoveUp,
+  onMoveDown,
+  isFirst,
+  isLast
+}) => /*#__PURE__*/gn.createElement(Box, {
+  className: "hover-icons",
+  sx: {
+    display: "flex",
+    gap: 0.5,
+    opacity: 0,
+    transition: "opacity 0.2s"
+  }
+}, /*#__PURE__*/gn.createElement(IconButton, {
+  size: "small",
+  onClick: onMoveUp,
+  disabled: isFirst,
+  "aria-label": "move up"
+}, /*#__PURE__*/gn.createElement(ArrowUpwardIcon, {
+  fontSize: "small"
+})), /*#__PURE__*/gn.createElement(IconButton, {
+  size: "small",
+  onClick: onMoveDown,
+  disabled: isLast,
+  "aria-label": "move down"
+}, /*#__PURE__*/gn.createElement(ArrowDownwardIcon, {
+  fontSize: "small"
+})));
+
 var SortIcon = createSvgIcon$1(/*#__PURE__*/u("path", {
   d: "M3 18h6v-2H3zM3 6v2h18V6zm0 7h12v-2H3z"
 }));
@@ -77170,6 +77337,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,
@@ -77198,20 +77409,8 @@ const SortableChip$1 = ({
     attributes,
     listeners,
     setNodeRef,
-    transform,
-    transition,
-    isDragging
-  } = useSortable({
-    id
-  });
-  const style = {
-    transform: CSS$1.Transform.toString(transform),
-    transition,
-    opacity: isDragging ? 0.5 : 1,
-    display: "flex",
-    alignItems: "center",
-    width: "100%"
-  };
+    style
+  } = useSortableRow(id);
 
   // Focus input when entering edit mode
   h(() => {
@@ -77320,21 +77519,9 @@ const SortableChip$1 = ({
         opacity: 1 // show icons on hover
       }
     }
-  }, /*#__PURE__*/gn.createElement(Box, _extends({}, listeners, {
-    sx: {
-      display: "flex",
-      alignItems: "center",
-      cursor: "grab",
-      "&:active": {
-        cursor: "grabbing"
-      }
-    }
-  }), /*#__PURE__*/gn.createElement(DragIndicatorIcon, {
-    sx: {
-      cursor: "grab",
-      color: "rgba(110, 110, 110, 0.62)"
-    }
-  })), !isEditing ? /*#__PURE__*/gn.createElement(gn.Fragment, null, /*#__PURE__*/gn.createElement(Box, {
+  }, /*#__PURE__*/gn.createElement(DragHandle, {
+    listeners: listeners
+  }), !isEditing ? /*#__PURE__*/gn.createElement(gn.Fragment, null, /*#__PURE__*/gn.createElement(Box, {
     sx: {
       minWidth: 0
     }
@@ -77397,29 +77584,12 @@ const SortableChip$1 = ({
     sx: {
       flex: 1
     }
-  }), /*#__PURE__*/gn.createElement(Box, {
-    className: "hover-icons",
-    sx: {
-      display: "flex",
-      gap: 0.5,
-      opacity: 0,
-      transition: "opacity 0.2s"
-    }
-  }, /*#__PURE__*/gn.createElement(IconButton, {
-    size: "small",
-    onClick: onMoveUp,
-    disabled: isFirst,
-    "aria-label": "move up"
-  }, /*#__PURE__*/gn.createElement(ArrowUpwardIcon, {
-    fontSize: "small"
-  })), /*#__PURE__*/gn.createElement(IconButton, {
-    size: "small",
-    onClick: onMoveDown,
-    disabled: isLast,
-    "aria-label": "move down"
-  }, /*#__PURE__*/gn.createElement(ArrowDownwardIcon, {
-    fontSize: "small"
-  })))) : /*#__PURE__*/gn.createElement(gn.Fragment, null, /*#__PURE__*/gn.createElement(TextField, {
+  }), /*#__PURE__*/gn.createElement(MoveButtons, {
+    onMoveUp: onMoveUp,
+    onMoveDown: onMoveDown,
+    isFirst: isFirst,
+    isLast: isLast
+  })) : /*#__PURE__*/gn.createElement(gn.Fragment, null, /*#__PURE__*/gn.createElement(TextField, {
     inputRef: inputRef,
     value: editValue,
     onChange: e => setEditValue(e.target.value),
@@ -77481,7 +77651,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,
@@ -77496,24 +77665,12 @@ const SortableComputedChip = ({
     attributes,
     listeners,
     setNodeRef,
-    transform,
-    transition,
-    isDragging
-  } = useSortable({
-    id
-  });
+    style
+  } = useSortableRow(id);
   const [isEditing, setIsEditing] = d(false);
   const [editName, setEditName] = d("");
   const [editValue, setEditValue] = d("");
   const containerRef = A$1(null);
-  const style = {
-    transform: CSS$1.Transform.toString(transform),
-    transition,
-    opacity: isDragging ? 0.5 : 1,
-    display: "flex",
-    alignItems: "center",
-    width: "100%"
-  };
 
   // Handle click outside to cancel
   h(() => {
@@ -77534,13 +77691,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
     });
@@ -77576,21 +77733,9 @@ const SortableComputedChip = ({
         opacity: 1
       }
     }
-  }, /*#__PURE__*/gn.createElement(Box, _extends({}, listeners, {
-    sx: {
-      display: "flex",
-      alignItems: "center",
-      cursor: "grab",
-      "&:active": {
-        cursor: "grabbing"
-      }
-    }
-  }), /*#__PURE__*/gn.createElement(DragIndicatorIcon, {
-    sx: {
-      cursor: "grab",
-      color: "rgba(110, 110, 110, 0.62)"
-    }
-  })), !isEditing ? /*#__PURE__*/gn.createElement(gn.Fragment, null, /*#__PURE__*/gn.createElement(Chip, {
+  }, /*#__PURE__*/gn.createElement(DragHandle, {
+    listeners: listeners
+  }), !isEditing ? /*#__PURE__*/gn.createElement(gn.Fragment, null, /*#__PURE__*/gn.createElement(Chip, {
     icon: /*#__PURE__*/gn.createElement(FunctionsIcon, {
       sx: {
         fontSize: "15px !important"
@@ -77654,29 +77799,12 @@ const SortableComputedChip = ({
     sx: {
       flex: 1
     }
-  }), /*#__PURE__*/gn.createElement(Box, {
-    className: "hover-icons",
-    sx: {
-      display: "flex",
-      gap: 0.5,
-      opacity: 0,
-      transition: "opacity 0.2s"
-    }
-  }, /*#__PURE__*/gn.createElement(IconButton, {
-    size: "small",
-    onClick: onMoveUp,
-    disabled: isFirst,
-    "aria-label": "move up"
-  }, /*#__PURE__*/gn.createElement(ArrowUpwardIcon, {
-    fontSize: "small"
-  })), /*#__PURE__*/gn.createElement(IconButton, {
-    size: "small",
-    onClick: onMoveDown,
-    disabled: isLast,
-    "aria-label": "move down"
-  }, /*#__PURE__*/gn.createElement(ArrowDownwardIcon, {
-    fontSize: "small"
-  })))) : /*#__PURE__*/gn.createElement(gn.Fragment, null, /*#__PURE__*/gn.createElement(TextField, {
+  }), /*#__PURE__*/gn.createElement(MoveButtons, {
+    onMoveUp: onMoveUp,
+    onMoveDown: onMoveDown,
+    isFirst: isFirst,
+    isLast: isLast
+  })) : /*#__PURE__*/gn.createElement(gn.Fragment, null, /*#__PURE__*/gn.createElement(TextField, {
     value: editName,
     onChange: e => setEditName(e.target.value),
     onKeyDown: handleKeyDown,
@@ -77738,7 +77866,7 @@ const Dimensions = ({
   savedDimensions = [],
   onSaveDimension,
   onRemoveDimension,
-  onReorderDimensions,
+  onUpdateDimensionSortOrder,
   titleOverrides = {},
   onUpdateTitle,
   onResetTitle,
@@ -77748,7 +77876,8 @@ const Dimensions = ({
   onSaveComputedDimension,
   onUpdateComputedDimension,
   onRemoveComputedDimension,
-  onReorderComputedDimensions
+  dimensionOrder = [],
+  onReorderDimensionItems
 }) => {
   const reportingContext = useReportingContextOptional();
   const parameters = reportingContext?.parameters;
@@ -77760,53 +77889,38 @@ const Dimensions = ({
   const [computedValue, setComputedValue] = d("");
 
   // Setup drag and drop sensors
-  const sensors = useSensors(useSensor(PointerSensor), useSensor(KeyboardSensor, {
-    coordinateGetter: 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 = arrayMove(savedDimensions, oldIndex, newIndex);
-      onReorderDimensions(newOrder);
-    }
-  };
-
-  // Handle move up
-  const handleMoveUp = index => {
-    if (index > 0) {
-      const newOrder = 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 move down
-  const handleMoveDown = index => {
-    if (index < savedDimensions.length - 1) {
-      const newOrder = arrayMove(savedDimensions, index, index + 1);
-      onReorderDimensions(newOrder);
-    }
-  };
+  // 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);
@@ -77830,27 +77944,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(arrayMove(savedComputedDimensions, oldIndex, newIndex));
-    }
-  };
-  const handleMoveComputedUp = index => {
-    if (index > 0) {
-      onReorderComputedDimensions(arrayMove(savedComputedDimensions, index, index - 1));
-    }
-  };
-  const handleMoveComputedDown = index => {
-    if (index < savedComputedDimensions.length - 1) {
-      onReorderComputedDimensions(arrayMove(savedComputedDimensions, index, index + 1));
-    }
-  };
 
   // Get the current provider based on selection chain
   const getCurrentProvider = () => {
@@ -78293,7 +78386,7 @@ const Dimensions = ({
         boxShadow: "none"
       }
     }
-  }, "Save Dimension"))), savedDimensions.length > 0 && /*#__PURE__*/gn.createElement(Box, {
+  }, "Save Dimension"))), orderedItems.length > 0 && /*#__PURE__*/gn.createElement(Box, {
     sx: {
       marginTop: 0
     }
@@ -78311,81 +78404,40 @@ const Dimensions = ({
       color: "#666",
       marginBottom: 2
     }
-  }, "Drag to reorder or use arrows"), /*#__PURE__*/gn.createElement(DndContext, {
+  }, "Drag to reorder or use arrows"), /*#__PURE__*/gn.createElement(SortableListContext, {
     sensors: sensors,
-    collisionDetection: closestCenter,
+    itemIds: orderedItems.map((_, index) => index),
     onDragEnd: handleDragEnd
-  }, /*#__PURE__*/gn.createElement(SortableContext, {
-    items: savedDimensions.map((_, index) => index),
-    strategy: verticalListSortingStrategy
-  }, /*#__PURE__*/gn.createElement(Box, {
-    sx: {
-      display: "flex",
-      flexDirection: "column",
-      gap: 1
-    }
-  }, savedDimensions.map((dim, index) => /*#__PURE__*/gn.createElement(SortableChip$1, {
-    key: index,
+  }, orderedItems.map((item, index) => item.kind === "dimension" ? /*#__PURE__*/gn.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__*/gn.createElement(Box, {
-    sx: {
-      marginTop: 2
-    }
-  }, /*#__PURE__*/gn.createElement(Typography, {
-    variant: "h6",
-    sx: {
-      fontSize: "16px",
-      fontWeight: 600,
-      marginTop: 2,
-      color: "rgb(37, 37, 37)"
-    }
-  }, "Saved Computed Dimensions"), /*#__PURE__*/gn.createElement(Typography, {
-    sx: {
-      fontSize: "13px",
-      color: "#666",
-      marginBottom: 2
-    }
-  }, "Drag to reorder or use arrows"), /*#__PURE__*/gn.createElement(DndContext, {
-    sensors: sensors,
-    collisionDetection: closestCenter,
-    onDragEnd: handleComputedDragEnd
-  }, /*#__PURE__*/gn.createElement(SortableContext, {
-    items: savedComputedDimensions.map((_, index) => index),
-    strategy: verticalListSortingStrategy
-  }, /*#__PURE__*/gn.createElement(Box, {
-    sx: {
-      display: "flex",
-      flexDirection: "column",
-      gap: 1
-    }
-  }, savedComputedDimensions.map((cd, index) => /*#__PURE__*/gn.createElement(SortableComputedChip, {
-    key: index,
+  }) : /*#__PURE__*/gn.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
+  })))));
 };
 
 var StorageIcon = createSvgIcon$1(/*#__PURE__*/u("path", {
@@ -78472,20 +78524,8 @@ const SortableChip = ({
     attributes,
     listeners,
     setNodeRef,
-    transform,
-    transition,
-    isDragging
-  } = useSortable({
-    id
-  });
-  const style = {
-    transform: CSS$1.Transform.toString(transform),
-    transition,
-    opacity: isDragging ? 0.5 : 1,
-    display: 'flex',
-    alignItems: 'center',
-    width: '100%'
-  };
+    style
+  } = useSortableRow(id);
 
   // Focus input when entering edit mode
   h(() => {
@@ -78563,21 +78603,9 @@ const SortableChip = ({
         opacity: 1 // show icons on hover
       }
     }
-  }, /*#__PURE__*/gn.createElement(Box, _extends({}, listeners, {
-    sx: {
-      display: "flex",
-      alignItems: "center",
-      cursor: "grab",
-      "&:active": {
-        cursor: "grabbing"
-      }
-    }
-  }), /*#__PURE__*/gn.createElement(DragIndicatorIcon, {
-    sx: {
-      cursor: "grab",
-      color: "rgba(110, 110, 110, 0.62)"
-    }
-  })), !isEditing ? /*#__PURE__*/gn.createElement(gn.Fragment, null, source && /*#__PURE__*/gn.createElement(Box, {
+  }, /*#__PURE__*/gn.createElement(DragHandle, {
+    listeners: listeners
+  }), !isEditing ? /*#__PURE__*/gn.createElement(gn.Fragment, null, source && /*#__PURE__*/gn.createElement(Box, {
     sx: {
       display: 'flex',
       alignItems: 'center',
@@ -78639,29 +78667,12 @@ const SortableChip = ({
     sx: {
       flex: 1
     }
-  }), /*#__PURE__*/gn.createElement(Box, {
-    className: "hover-icons",
-    sx: {
-      display: "flex",
-      gap: 0.5,
-      opacity: 0,
-      transition: "opacity 0.2s"
-    }
-  }, /*#__PURE__*/gn.createElement(IconButton, {
-    size: "small",
-    onClick: onMoveUp,
-    disabled: isFirst,
-    "aria-label": "move up"
-  }, /*#__PURE__*/gn.createElement(ArrowUpwardIcon, {
-    fontSize: "small"
-  })), /*#__PURE__*/gn.createElement(IconButton, {
-    size: "small",
-    onClick: onMoveDown,
-    disabled: isLast,
-    "aria-label": "move down"
-  }, /*#__PURE__*/gn.createElement(ArrowDownwardIcon, {
-    fontSize: "small"
-  })))) : /*#__PURE__*/gn.createElement(gn.Fragment, null, /*#__PURE__*/gn.createElement(TextField, {
+  }), /*#__PURE__*/gn.createElement(MoveButtons, {
+    onMoveUp: onMoveUp,
+    onMoveDown: onMoveDown,
+    isFirst: isFirst,
+    isLast: isLast
+  })) : /*#__PURE__*/gn.createElement(gn.Fragment, null, /*#__PURE__*/gn.createElement(TextField, {
     inputRef: inputRef,
     value: editValue,
     onChange: e => setEditValue(e.target.value),
@@ -78736,39 +78747,14 @@ const Metrics = ({
   const [selectedMetric, setSelectedMetric] = d('');
 
   // Setup drag and drop sensors
-  const sensors = useSensors(useSensor(PointerSensor), useSensor(KeyboardSensor, {
-    coordinateGetter: sortableKeyboardCoordinates
-  }));
+  const sensors = useSortableListSensors();
 
-  // 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 = arrayMove(savedMetrics, oldIndex, newIndex);
-      onReorderMetrics(newOrder);
-    }
-  };
-
-  // Handle move up
-  const handleMoveUp = index => {
-    if (index > 0) {
-      const newOrder = arrayMove(savedMetrics, index, index - 1);
-      onReorderMetrics(newOrder);
-    }
-  };
-
-  // Handle move down
-  const handleMoveDown = index => {
-    if (index < savedMetrics.length - 1) {
-      const newOrder = 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 = () => {
@@ -79107,19 +79093,10 @@ const Metrics = ({
       marginBottom: 1,
       color: "rgb(37, 37, 37)"
     }
-  }, "Saved Metrics"), /*#__PURE__*/gn.createElement(DndContext, {
+  }, "Saved Metrics"), /*#__PURE__*/gn.createElement(SortableListContext, {
     sensors: sensors,
-    collisionDetection: closestCenter,
+    itemIds: savedMetrics.map((_, index) => index),
     onDragEnd: handleDragEnd
-  }, /*#__PURE__*/gn.createElement(SortableContext, {
-    items: savedMetrics.map((_, index) => index),
-    strategy: verticalListSortingStrategy
-  }, /*#__PURE__*/gn.createElement(Box, {
-    sx: {
-      display: 'flex',
-      flexDirection: 'column',
-      gap: 1
-    }
   }, savedMetrics.map((metric, index) => /*#__PURE__*/gn.createElement(SortableChip, {
     key: index,
     id: index,
@@ -79136,7 +79113,7 @@ const Metrics = ({
     onUpdateTitle: onUpdateTitle,
     onResetTitle: onResetTitle,
     source: metric.metric?.source
-  })))))));
+  })))));
 };
 
 var FilterAltIcon = createSvgIcon$1(/*#__PURE__*/u("path", {
@@ -91699,6 +91676,209 @@ const Filters = ({
   }))));
 };
 
+var CalculateIcon = createSvgIcon$1(/*#__PURE__*/u("path", {
+  d: "M19 3H5c-1.1 0-2 .9-2 2v14c0 1.1.9 2 2 2h14c1.1 0 2-.9 2-2V5c0-1.1-.9-2-2-2m-5.97 4.06L14.09 6l1.41 1.41L16.91 6l1.06 1.06-1.41 1.41 1.41 1.41-1.06 1.06-1.41-1.4-1.41 1.41-1.06-1.06 1.41-1.41zm-6.78.66h5v1.5h-5zM11.5 16h-2v2H8v-2H6v-1.5h2v-2h1.5v2h2zm6.5 1.25h-5v-1.5h5zm0-2.5h-5v-1.5h5z"
+}));
+
+const KIND_LABEL = {
+  dimension: "Dimension",
+  computed: "Computed",
+  metric: "Metric"
+};
+const KindChip = ({
+  kind,
+  source
+}) => {
+  if (kind === "metric") {
+    return /*#__PURE__*/gn.createElement(Box, {
+      sx: {
+        display: "flex",
+        alignItems: "center",
+        flexShrink: 0
+      }
+    }, /*#__PURE__*/gn.createElement(MetricSourceIcon, {
+      source: source
+    }));
+  }
+  return /*#__PURE__*/gn.createElement(Chip, {
+    icon: kind === "computed" ? /*#__PURE__*/gn.createElement(CalculateIcon, {
+      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__*/gn.createElement("div", _extends({
+    ref: setNodeRef,
+    style: style
+  }, attributes), /*#__PURE__*/gn.createElement(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__*/gn.createElement(DragHandle, {
+    listeners: listeners
+  }), /*#__PURE__*/gn.createElement(KindChip, {
+    kind: kind,
+    source: source
+  }), /*#__PURE__*/gn.createElement(Tooltip, {
+    title: fullPath,
+    arrow: true,
+    placement: "top"
+  }, /*#__PURE__*/gn.createElement(Typography, {
+    variant: "h6",
+    sx: {
+      fontWeight: 500,
+      color: "#1a1a1a",
+      fontSize: "14px",
+      whiteSpace: "nowrap",
+      overflow: "hidden",
+      textOverflow: "ellipsis"
+    }
+  }, displayLabel)), /*#__PURE__*/gn.createElement(Box, {
+    sx: {
+      flex: 1
+    }
+  }), /*#__PURE__*/gn.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__*/gn.createElement("div", null, /*#__PURE__*/gn.createElement(Box, {
+    sx: {
+      display: "flex",
+      justifyContent: "space-between",
+      alignItems: "flex-start",
+      mb: 2,
+      gap: 2
+    }
+  }, /*#__PURE__*/gn.createElement(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__*/gn.createElement(Tooltip, {
+    title: "Discard the custom order and go back to the default (Dimensions, then Metrics)",
+    arrow: true
+  }, /*#__PURE__*/gn.createElement(Button, {
+    variant: "outlined",
+    size: "small",
+    startIcon: /*#__PURE__*/gn.createElement(RestartAltIcon, 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__*/gn.createElement(Typography, {
+    sx: {
+      fontSize: "13px",
+      color: "#999"
+    }
+  }, "Add dimensions or metrics in the other tabs first.") : /*#__PURE__*/gn.createElement(SortableListContext, {
+    sensors: sensors,
+    itemIds: resolvedItems.map((_, index) => index),
+    onDragEnd: handleDragEnd
+  }, resolvedItems.map((item, index) => /*#__PURE__*/gn.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 = {
@@ -91713,11 +91893,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__*/gn.createElement(Box, {
+        sx: {
+          display: 'flex',
+          alignItems: 'center',
+          gap: 0.5
+        }
+      }, /*#__PURE__*/gn.createElement(MetricSourceIcon, {
+        source: metricDef?.source
+      }), /*#__PURE__*/gn.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,
@@ -91733,124 +92009,10 @@ const ReportDataGrid = ({
     pageSize: 50
   });
 
-  // Generate columns dynamically from dimensions and metrics
-  const columns = gn.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__*/gn.createElement(Box, {
-          sx: {
-            display: 'flex',
-            alignItems: 'center',
-            gap: 0.5
-          }
-        }, /*#__PURE__*/gn.createElement(MetricSourceIcon, {
-          source: metricDef?.source
-        }), /*#__PURE__*/gn.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 = gn.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
@@ -91957,7 +92119,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] = d({
     dimensions: {},
@@ -92003,6 +92173,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 = A$1(currentBaseCurrency);
+  h(() => {
+    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 {
@@ -92132,6 +92312,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);
@@ -92227,13 +92493,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
@@ -92342,13 +92612,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
@@ -92381,7 +92655,9 @@ const ReportBuilder = ({
       dimensions: [],
       metrics: [],
       filters: {},
-      computedDimensions: []
+      computedDimensions: [],
+      dimensionOrder: [],
+      columnOrder: []
     });
     // Reset title overrides
     setTitleOverrides({
@@ -92458,58 +92734,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);
@@ -92517,15 +92828,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) => {
@@ -92558,10 +92883,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
       };
@@ -92617,21 +92952,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;
@@ -92641,6 +92995,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 || {
@@ -92683,8 +93045,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 {
@@ -92734,77 +93096,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 = {
@@ -92849,6 +93141,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__*/gn.createElement(Box, {
     sx: {
       p: 3,
@@ -93103,9 +93412,36 @@ const ReportBuilder = ({
       }
     }
   }), /*#__PURE__*/gn.createElement(Tab, {
-    label: reportData ? "Results" : "Results (Run report first)",
+    label: /*#__PURE__*/gn.createElement(Badge, {
+      variant: "dot",
+      invisible: report.columnOrder.length === 0,
+      sx: {
+        "& .MuiBadge-dot": {
+          backgroundColor: "rgb(70, 134, 128)"
+        }
+      }
+    }, /*#__PURE__*/gn.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__*/gn.createElement(Tab, {
+    label: reportData ? "Results" : "Results (Run report first)",
+    id: "report-tab-4",
+    "aria-controls": "report-tabpanel-4",
     disabled: !reportData,
     sx: {
       height: "41px",
@@ -93127,7 +93463,7 @@ const ReportBuilder = ({
     savedDimensions: report.dimensions,
     onSaveDimension: handleSaveDimension,
     onRemoveDimension: handleRemoveDimension,
-    onReorderDimensions: handleReorderDimensions,
+    onUpdateDimensionSortOrder: handleUpdateDimensionSortOrder,
     titleOverrides: titleOverrides.dimensions,
     onUpdateTitle: handleUpdateDimensionTitle,
     onResetTitle: handleResetDimensionTitle,
@@ -93137,7 +93473,8 @@ const ReportBuilder = ({
     onSaveComputedDimension: handleSaveComputedDimension,
     onUpdateComputedDimension: handleUpdateComputedDimension,
     onRemoveComputedDimension: handleRemoveComputedDimension,
-    onReorderComputedDimensions: handleReorderComputedDimensions
+    dimensionOrder: report.dimensionOrder,
+    onReorderDimensionItems: handleReorderDimensionItems
   })), /*#__PURE__*/gn.createElement(TabPanel, {
     value: activeTab,
     index: 1
@@ -93171,11 +93508,18 @@ const ReportBuilder = ({
   })), /*#__PURE__*/gn.createElement(TabPanel, {
     value: activeTab,
     index: 3
+  }, /*#__PURE__*/gn.createElement(ColumnOrder, {
+    orderedDimensionItems: orderedDimensionItems,
+    metrics: report.metrics,
+    columnOrder: report.columnOrder,
+    onReorderColumnItems: handleReorderColumnItems,
+    titleOverrides: titleOverrides
+  })), /*#__PURE__*/gn.createElement(TabPanel, {
+    value: activeTab,
+    index: 4
   }, reportData && /*#__PURE__*/gn.createElement(ReportDataGrid, {
     reportData: reportData,
-    dimensions: report.dimensions,
-    metrics: report.metrics,
-    computedDimensions: report.computedDimensions,
+    columnItems: columnItems,
     loading: loading,
     onPageChange: handlePageChange,
     totalRows: totalRows,
@@ -93238,6 +93582,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__*/gn.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
@@ -93304,7 +93692,13 @@ const ReportApp = ({
         }
       }
     })
-  }, /*#__PURE__*/gn.createElement(ReportDefinitionsManager, null))));
+  }, /*#__PURE__*/gn.createElement(Box, {
+    sx: {
+      display: "flex",
+      justifyContent: "flex-end",
+      p: 1
+    }
+  }, /*#__PURE__*/gn.createElement(CurrencySelector, null)), /*#__PURE__*/gn.createElement(ReportDefinitionsManager, null))));
 };
 
 const Root = () => {