@finos/legend-application-repl 0.0.24 → 0.0.25

package/lib/components/dataCube/grid/DataCubeGrid.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"DataCubeGrid.d.ts","sourceRoot":"","sources":["../../../../src/components/dataCube/grid/DataCubeGrid.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAGH,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,2CAA2C,CAAC;AAqB3E,eAAO,MAAM,YAAY,WAAoB;IAAE,WAAW,EAAE,SAAS,CAAA;CAAE;;CAsCrE,CAAC"}
+{"version":3,"file":"DataCubeGrid.d.ts","sourceRoot":"","sources":["../../../../src/components/dataCube/grid/DataCubeGrid.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAGH,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,2CAA2C,CAAC;AAqB3E,eAAO,MAAM,YAAY,WAAoB;IAAE,WAAW,EAAE,SAAS,CAAA;CAAE;;CAwCrE,CAAC"}

package/lib/components/dataCube/grid/DataCubeGrid.js

@@ -41,7 +41,7 @@ export const DataCubeGrid = observer((props) => {
             LicenseManager.setLicenseKey(dataCubeState.grid.clientLicenseKey);
         }
     }, [dataCubeState.grid.clientLicenseKey]);
-    return (_jsx(_Fragment, { children: _jsx(AgGridReact, { rowGroupPanelShow: "always", suppressBrowserResizeObserver: true, suppressScrollOnNewData: true, alwaysMultiSort: true, rowModelType: "serverSide", serverSideDatasource: dataCubeState.grid.clientDataSource, modules: [
+    return (_jsx(_Fragment, { children: _jsx(AgGridReact, { rowGroupPanelShow: "always", suppressBrowserResizeObserver: true, suppressScrollOnNewData: true, alwaysMultiSort: true, rowModelType: "serverSide", serverSideDatasource: dataCubeState.grid.clientDataSource, suppressAggFuncInHeader: true, suppressServerSideInfiniteScroll: true, modules: [
                 // community
                 ClientSideRowModelModule,
                 // enterprise

package/lib/components/dataCube/grid/DataCubeGrid.js.map

@@ -1 +1 @@
-{"version":3,"file":"DataCubeGrid.js","sourceRoot":"","sources":["../../../../src/components/dataCube/grid/DataCubeGrid.tsx"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAE3C,OAAO,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAC;AAC1D,OAAO,EAAE,wBAAwB,EAAE,MAAM,0CAA0C,CAAC;AACpF,OAAO,EAAE,wBAAwB,EAAE,MAAM,2CAA2C,CAAC;AACrF,OAAO,EAAE,iBAAiB,EAAE,MAAM,kCAAkC,CAAC;AACrE,OAAO,EAAE,UAAU,EAAE,MAAM,0BAA0B,CAAC;AACtD,OAAO,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AACvD,OAAO,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;AAElC,mGAAmG;AACnG,kCAAkC;AAClC,+FAA+F;AAC/F,MAAM,kCAAkC,GAAG,OAAO,CAAC,KAAK,CAAC,CAAC,iCAAiC;AAC3F,0CAA0C;AAC1C,IAAI,OAAO,CAAC,GAAG,CAAC,QAAQ,KAAK,aAAa,EAAE,CAAC;IAC3C,sCAAsC;IACtC,OAAO,CAAC,KAAK,GAAG,CAAC,OAAiB,EAAE,GAAG,cAAyB,EAAQ,EAAE;QACxE,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,iCAAiC;IACzD,CAAC,CAAC;AACJ,CAAC;AAED,MAAM,CAAC,MAAM,YAAY,GAAG,QAAQ,CAAC,CAAC,KAAiC,EAAE,EAAE;IACzE,MAAM,EAAE,WAAW,EAAE,GAAG,KAAK,CAAC;IAC9B,MAAM,aAAa,GAAG,WAAW,CAAC,aAAa,CAAC;IAEhD,SAAS,CAAC,GAAG,EAAE;QACb,IAAI,aAAa,CAAC,IAAI,CAAC,gBAAgB,EAAE,CAAC;YACxC,cAAc,CAAC,aAAa,CAAC,aAAa,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC;QACpE,CAAC;IACH,CAAC,EAAE,CAAC,aAAa,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC,CAAC;IAE1C,OAAO,CACL,4BACE,KAAC,WAAW,IACV,iBAAiB,EAAC,QAAQ,EAC1B,6BAA6B,EAAE,IAAI,EACnC,uBAAuB,EAAE,IAAI,EAC7B,eAAe,EAAE,IAAI,EACrB,YAAY,EAAC,YAAY,EACzB,oBAAoB,EAAE,aAAa,CAAC,IAAI,CAAC,gBAAgB,EACzD,OAAO,EAAE;gBACP,YAAY;gBACZ,wBAAwB;gBACxB,aAAa;gBACb,wBAAwB;gBACxB,iBAAiB;gBACjB,UAAU;aACX,EACD,WAAW,EAAE,CAAC,MAAM,EAAQ,EAAE;gBAC5B,aAAa,CAAC,IAAI,CAAC,eAAe,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;gBAC/C,0CAA0C;gBAC1C,IAAI,OAAO,CAAC,GAAG,CAAC,QAAQ,KAAK,aAAa,EAAE,CAAC;oBAC3C,OAAO,CAAC,KAAK,GAAG,kCAAkC,CAAC,CAAC,iCAAiC;gBACvF,CAAC;YACH,CAAC,EACD,SAAS,EAAC,iBAAiB,GAC3B,GACD,CACJ,CAAC;AACJ,CAAC,CAAC,CAAC"}
+{"version":3,"file":"DataCubeGrid.js","sourceRoot":"","sources":["../../../../src/components/dataCube/grid/DataCubeGrid.tsx"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAE3C,OAAO,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAC;AAC1D,OAAO,EAAE,wBAAwB,EAAE,MAAM,0CAA0C,CAAC;AACpF,OAAO,EAAE,wBAAwB,EAAE,MAAM,2CAA2C,CAAC;AACrF,OAAO,EAAE,iBAAiB,EAAE,MAAM,kCAAkC,CAAC;AACrE,OAAO,EAAE,UAAU,EAAE,MAAM,0BAA0B,CAAC;AACtD,OAAO,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AACvD,OAAO,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;AAElC,mGAAmG;AACnG,kCAAkC;AAClC,+FAA+F;AAC/F,MAAM,kCAAkC,GAAG,OAAO,CAAC,KAAK,CAAC,CAAC,iCAAiC;AAC3F,0CAA0C;AAC1C,IAAI,OAAO,CAAC,GAAG,CAAC,QAAQ,KAAK,aAAa,EAAE,CAAC;IAC3C,sCAAsC;IACtC,OAAO,CAAC,KAAK,GAAG,CAAC,OAAiB,EAAE,GAAG,cAAyB,EAAQ,EAAE;QACxE,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,iCAAiC;IACzD,CAAC,CAAC;AACJ,CAAC;AAED,MAAM,CAAC,MAAM,YAAY,GAAG,QAAQ,CAAC,CAAC,KAAiC,EAAE,EAAE;IACzE,MAAM,EAAE,WAAW,EAAE,GAAG,KAAK,CAAC;IAC9B,MAAM,aAAa,GAAG,WAAW,CAAC,aAAa,CAAC;IAEhD,SAAS,CAAC,GAAG,EAAE;QACb,IAAI,aAAa,CAAC,IAAI,CAAC,gBAAgB,EAAE,CAAC;YACxC,cAAc,CAAC,aAAa,CAAC,aAAa,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC;QACpE,CAAC;IACH,CAAC,EAAE,CAAC,aAAa,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC,CAAC;IAE1C,OAAO,CACL,4BACE,KAAC,WAAW,IACV,iBAAiB,EAAC,QAAQ,EAC1B,6BAA6B,EAAE,IAAI,EACnC,uBAAuB,EAAE,IAAI,EAC7B,eAAe,EAAE,IAAI,EACrB,YAAY,EAAC,YAAY,EACzB,oBAAoB,EAAE,aAAa,CAAC,IAAI,CAAC,gBAAgB,EACzD,uBAAuB,EAAE,IAAI,EAC7B,gCAAgC,EAAE,IAAI,EACtC,OAAO,EAAE;gBACP,YAAY;gBACZ,wBAAwB;gBACxB,aAAa;gBACb,wBAAwB;gBACxB,iBAAiB;gBACjB,UAAU;aACX,EACD,WAAW,EAAE,CAAC,MAAM,EAAQ,EAAE;gBAC5B,aAAa,CAAC,IAAI,CAAC,eAAe,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;gBAC/C,0CAA0C;gBAC1C,IAAI,OAAO,CAAC,GAAG,CAAC,QAAQ,KAAK,aAAa,EAAE,CAAC;oBAC3C,OAAO,CAAC,KAAK,GAAG,kCAAkC,CAAC,CAAC,iCAAiC;gBACvF,CAAC;YACH,CAAC,EACD,SAAS,EAAC,iBAAiB,GAC3B,GACD,CACJ,CAAC;AACJ,CAAC,CAAC,CAAC"}

package/lib/grid.css

@@ -1,4 +1,4 @@
-/** @license @finos/legend-application-repl v0.0.24
+/** @license @finos/legend-application-repl v0.0.25
  * Copyright (c) 2020-present, Goldman Sachs
  *
  * Licensed under the Apache License, Version 2.0 (the "License");

package/lib/index.css

@@ -1,4 +1,4 @@
-/** @license @finos/legend-application-repl v0.0.24
+/** @license @finos/legend-application-repl v0.0.25
  * Copyright (c) 2020-present, Goldman Sachs
  *
  * Licensed under the Apache License, Version 2.0 (the "License");

package/lib/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@finos/legend-application-repl",
-    "version": "0.0.24",
+    "version": "0.0.25",
     "description": "Legend REPL Grid client application core",
     "keywords": [
         "legend",

package/lib/repl.css

@@ -1,4 +1,4 @@
-/** @license @finos/legend-application-repl v0.0.24
+/** @license @finos/legend-application-repl v0.0.25
  * Copyright (c) 2020-present, Goldman Sachs
  *
  * Licensed under the Apache License, Version 2.0 (the "License");

package/lib/stores/dataCube/DataCubeMetaModelConst.d.ts

@@ -42,6 +42,20 @@ export declare enum DATA_CUBE_AGGREGATE_FUNCTION {
     FIRST = "first",
     LAST = "last"
 }
+export declare enum DATA_CUBE_FILTER_OPERATION {
+    EQUALS = "equal",
+    NOT_EQUAL = "notEqual",
+    GREATER_THAN = "greaterThan",
+    GREATER_THAN_OR_EQUAL = "greaterThanOrEqual",
+    LESS_THAN = "lessThan",
+    LESS_THAN_OR_EQUAL = "lessThanOrEqual",
+    BLANK = "isEmpty",
+    NOT_BLANK = "isNotEmpty",
+    CONTAINS = "contains",
+    NOT_CONTAINS = "notContains",
+    STARTS_WITH = "startsWith",
+    ENDS_WITH = "endsWith"
+}
 export declare enum DATA_CUBE_COLUMN_SORT_DIRECTION {
     ASCENDING = "ascending",
     DESCENDING = "descending"

package/lib/stores/dataCube/DataCubeMetaModelConst.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"DataCubeMetaModelConst.d.ts","sourceRoot":"","sources":["../../../src/stores/dataCube/DataCubeMetaModelConst.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,oBAAY,mBAAmB;IAE7B,MAAM,4CAA4C;IAClD,MAAM,4CAA4C;IAClD,QAAQ,6CAA6C;IACrD,KAAK,2CAA2C;IAChD,KAAK,2CAA2C;IAChD,MAAM,4CAA4C;IAClD,MAAM,4CAA4C;IAClD,KAAK,2CAA2C;IAChD,IAAI,0CAA0C;IAG9C,IAAI,sCAAsC;IAC1C,IAAI,8BAA8B;IAGlC,GAAG,+CAA+C;IAClD,IAAI,gDAAgD;IAGpD,GAAG,wCAAwC;IAC3C,GAAG,wCAAwC;IAC3C,EAAE,uCAAuC;CAG1C;AAED,eAAO,MAAM,4BAA4B,MAAM,CAAC;AAChD,eAAO,MAAM,iCAAiC,UAAU,CAAC;AAEzD,oBAAY,4BAA4B;IACtC,GAAG,QAAQ;IACX,GAAG,QAAQ;IACX,GAAG,QAAQ;IACX,KAAK,UAAU;IACf,GAAG,QAAQ;IACX,KAAK,UAAU;IACf,IAAI,SAAS;CACd;AAED,oBAAY,+BAA+B;IACzC,SAAS,cAAc;IACvB,UAAU,eAAe;CAC1B"}
+{"version":3,"file":"DataCubeMetaModelConst.d.ts","sourceRoot":"","sources":["../../../src/stores/dataCube/DataCubeMetaModelConst.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,oBAAY,mBAAmB;IAE7B,MAAM,4CAA4C;IAClD,MAAM,4CAA4C;IAClD,QAAQ,6CAA6C;IACrD,KAAK,2CAA2C;IAChD,KAAK,2CAA2C;IAChD,MAAM,4CAA4C;IAClD,MAAM,4CAA4C;IAClD,KAAK,2CAA2C;IAChD,IAAI,0CAA0C;IAG9C,IAAI,sCAAsC;IAC1C,IAAI,8BAA8B;IAGlC,GAAG,+CAA+C;IAClD,IAAI,gDAAgD;IAGpD,GAAG,wCAAwC;IAC3C,GAAG,wCAAwC;IAC3C,EAAE,uCAAuC;CAG1C;AAED,eAAO,MAAM,4BAA4B,MAAM,CAAC;AAChD,eAAO,MAAM,iCAAiC,UAAU,CAAC;AAEzD,oBAAY,4BAA4B;IACtC,GAAG,QAAQ;IACX,GAAG,QAAQ;IACX,GAAG,QAAQ;IACX,KAAK,UAAU;IACf,GAAG,QAAQ;IACX,KAAK,UAAU;IACf,IAAI,SAAS;CACd;AAED,oBAAY,0BAA0B;IACpC,MAAM,UAAU;IAChB,SAAS,aAAa;IACtB,YAAY,gBAAgB;IAC5B,qBAAqB,uBAAuB;IAC5C,SAAS,aAAa;IACtB,kBAAkB,oBAAoB;IACtC,KAAK,YAAY;IACjB,SAAS,eAAe;IACxB,QAAQ,aAAa;IACrB,YAAY,gBAAgB;IAC5B,WAAW,eAAe;IAC1B,SAAS,aAAa;CACvB;AAED,oBAAY,+BAA+B;IACzC,SAAS,cAAc;IACvB,UAAU,eAAe;CAC1B"}

package/lib/stores/dataCube/DataCubeMetaModelConst.js

@@ -49,6 +49,21 @@ export var DATA_CUBE_AGGREGATE_FUNCTION;
     DATA_CUBE_AGGREGATE_FUNCTION["FIRST"] = "first";
     DATA_CUBE_AGGREGATE_FUNCTION["LAST"] = "last";
 })(DATA_CUBE_AGGREGATE_FUNCTION || (DATA_CUBE_AGGREGATE_FUNCTION = {}));
+export var DATA_CUBE_FILTER_OPERATION;
+(function (DATA_CUBE_FILTER_OPERATION) {
+    DATA_CUBE_FILTER_OPERATION["EQUALS"] = "equal";
+    DATA_CUBE_FILTER_OPERATION["NOT_EQUAL"] = "notEqual";
+    DATA_CUBE_FILTER_OPERATION["GREATER_THAN"] = "greaterThan";
+    DATA_CUBE_FILTER_OPERATION["GREATER_THAN_OR_EQUAL"] = "greaterThanOrEqual";
+    DATA_CUBE_FILTER_OPERATION["LESS_THAN"] = "lessThan";
+    DATA_CUBE_FILTER_OPERATION["LESS_THAN_OR_EQUAL"] = "lessThanOrEqual";
+    DATA_CUBE_FILTER_OPERATION["BLANK"] = "isEmpty";
+    DATA_CUBE_FILTER_OPERATION["NOT_BLANK"] = "isNotEmpty";
+    DATA_CUBE_FILTER_OPERATION["CONTAINS"] = "contains";
+    DATA_CUBE_FILTER_OPERATION["NOT_CONTAINS"] = "notContains";
+    DATA_CUBE_FILTER_OPERATION["STARTS_WITH"] = "startsWith";
+    DATA_CUBE_FILTER_OPERATION["ENDS_WITH"] = "endsWith";
+})(DATA_CUBE_FILTER_OPERATION || (DATA_CUBE_FILTER_OPERATION = {}));
 export var DATA_CUBE_COLUMN_SORT_DIRECTION;
 (function (DATA_CUBE_COLUMN_SORT_DIRECTION) {
     DATA_CUBE_COLUMN_SORT_DIRECTION["ASCENDING"] = "ascending";

package/lib/stores/dataCube/DataCubeMetaModelConst.js.map

@@ -1 +1 @@
-{"version":3,"file":"DataCubeMetaModelConst.js","sourceRoot":"","sources":["../../../src/stores/dataCube/DataCubeMetaModelConst.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,MAAM,CAAN,IAAY,mBA0BX;AA1BD,WAAY,mBAAmB;IAC7B,WAAW;IACX,yEAAkD,CAAA;IAClD,yEAAkD,CAAA;IAClD,4EAAqD,CAAA;IACrD,uEAAgD,CAAA;IAChD,uEAAgD,CAAA;IAChD,yEAAkD,CAAA;IAClD,yEAAkD,CAAA;IAClD,uEAAgD,CAAA;IAChD,qEAA8C,CAAA;IAE9C,OAAO;IACP,iEAA0C,CAAA;IAC1C,yDAAkC,CAAA;IAElC,OAAO;IACP,yEAAkD,CAAA;IAClD,2EAAoD,CAAA;IAEpD,SAAS;IACT,kEAA2C,CAAA;IAC3C,kEAA2C,CAAA;IAC3C,gEAAyC,CAAA;IAEzC,YAAY;AACd,CAAC,EA1BW,mBAAmB,KAAnB,mBAAmB,QA0B9B;AAED,MAAM,CAAC,MAAM,4BAA4B,GAAG,GAAG,CAAC;AAChD,MAAM,CAAC,MAAM,iCAAiC,GAAG,OAAO,CAAC;AAEzD,MAAM,CAAN,IAAY,4BAQX;AARD,WAAY,4BAA4B;IACtC,2CAAW,CAAA;IACX,2CAAW,CAAA;IACX,2CAAW,CAAA;IACX,+CAAe,CAAA;IACf,2CAAW,CAAA;IACX,+CAAe,CAAA;IACf,6CAAa,CAAA;AACf,CAAC,EARW,4BAA4B,KAA5B,4BAA4B,QAQvC;AAED,MAAM,CAAN,IAAY,+BAGX;AAHD,WAAY,+BAA+B;IACzC,0DAAuB,CAAA;IACvB,4DAAyB,CAAA;AAC3B,CAAC,EAHW,+BAA+B,KAA/B,+BAA+B,QAG1C"}
+{"version":3,"file":"DataCubeMetaModelConst.js","sourceRoot":"","sources":["../../../src/stores/dataCube/DataCubeMetaModelConst.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,MAAM,CAAN,IAAY,mBA0BX;AA1BD,WAAY,mBAAmB;IAC7B,WAAW;IACX,yEAAkD,CAAA;IAClD,yEAAkD,CAAA;IAClD,4EAAqD,CAAA;IACrD,uEAAgD,CAAA;IAChD,uEAAgD,CAAA;IAChD,yEAAkD,CAAA;IAClD,yEAAkD,CAAA;IAClD,uEAAgD,CAAA;IAChD,qEAA8C,CAAA;IAE9C,OAAO;IACP,iEAA0C,CAAA;IAC1C,yDAAkC,CAAA;IAElC,OAAO;IACP,yEAAkD,CAAA;IAClD,2EAAoD,CAAA;IAEpD,SAAS;IACT,kEAA2C,CAAA;IAC3C,kEAA2C,CAAA;IAC3C,gEAAyC,CAAA;IAEzC,YAAY;AACd,CAAC,EA1BW,mBAAmB,KAAnB,mBAAmB,QA0B9B;AAED,MAAM,CAAC,MAAM,4BAA4B,GAAG,GAAG,CAAC;AAChD,MAAM,CAAC,MAAM,iCAAiC,GAAG,OAAO,CAAC;AAEzD,MAAM,CAAN,IAAY,4BAQX;AARD,WAAY,4BAA4B;IACtC,2CAAW,CAAA;IACX,2CAAW,CAAA;IACX,2CAAW,CAAA;IACX,+CAAe,CAAA;IACf,2CAAW,CAAA;IACX,+CAAe,CAAA;IACf,6CAAa,CAAA;AACf,CAAC,EARW,4BAA4B,KAA5B,4BAA4B,QAQvC;AAED,MAAM,CAAN,IAAY,0BAaX;AAbD,WAAY,0BAA0B;IACpC,8CAAgB,CAAA;IAChB,oDAAsB,CAAA;IACtB,0DAA4B,CAAA;IAC5B,0EAA4C,CAAA;IAC5C,oDAAsB,CAAA;IACtB,oEAAsC,CAAA;IACtC,+CAAiB,CAAA;IACjB,sDAAwB,CAAA;IACxB,mDAAqB,CAAA;IACrB,0DAA4B,CAAA;IAC5B,wDAA0B,CAAA;IAC1B,oDAAsB,CAAA;AACxB,CAAC,EAbW,0BAA0B,KAA1B,0BAA0B,QAarC;AAED,MAAM,CAAN,IAAY,+BAGX;AAHD,WAAY,+BAA+B;IACzC,0DAAuB,CAAA;IACvB,4DAAyB,CAAA;AAC3B,CAAC,EAHW,+BAA+B,KAA/B,+BAA+B,QAG1C"}

package/lib/stores/dataCube/core/DataCubeQueryBuilder.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"DataCubeQueryBuilder.d.ts","sourceRoot":"","sources":["../../../../src/stores/dataCube/core/DataCubeQueryBuilder.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EAWL,KAAK,qBAAqB,EAC3B,MAAM,qBAAqB,CAAC;AAC7B,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,4BAA4B,CAAC;AAwBxE,wBAAgB,gCAAgC,CAC9C,QAAQ,EAAE,qBAAqB,GAC9B,qBAAqB,CA+EvB"}
+{"version":3,"file":"DataCubeQueryBuilder.d.ts","sourceRoot":"","sources":["../../../../src/stores/dataCube/core/DataCubeQueryBuilder.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EAwBL,KAAK,qBAAqB,EAC3B,MAAM,qBAAqB,CAAC;AAC7B,OAAO,KAAK,EAGV,qBAAqB,EACtB,MAAM,4BAA4B,CAAC;AAgOpC,wBAAgB,gCAAgC,CAC9C,QAAQ,EAAE,qBAAqB,GAC9B,qBAAqB,CA8LvB"}

package/lib/stores/dataCube/core/DataCubeQueryBuilder.js

@@ -13,9 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { V1_AppliedFunction, V1_ClassInstance, V1_ClassInstanceType, V1_ColSpec, V1_Collection, V1_Multiplicity, V1_PackageableElementPtr, V1_deserializeValueSpecification, extractElementNameFromPath, } from '@finos/legend-graph';
-import { guaranteeNonNullable } from '@finos/legend-shared';
-import { DATA_CUBE_COLUMN_SORT_DIRECTION, DATA_CUBE_FUNCTIONS, } from '../DataCubeMetaModelConst.js';
+import { PRIMITIVE_TYPE, V1_AppliedFunction, V1_AppliedProperty, V1_CBoolean, V1_CDateTime, V1_CDecimal, V1_CFloat, V1_CInteger, V1_CStrictDate, V1_CStrictTime, V1_CString, V1_ClassInstance, V1_ClassInstanceType, V1_ColSpec, V1_ColSpecArray, V1_Collection, V1_Lambda, V1_Multiplicity, V1_PackageableElementPtr, V1_Variable, V1_deserializeValueSpecification, extractElementNameFromPath, } from '@finos/legend-graph';
+import { guaranteeNonNullable, guaranteeIsString, guaranteeIsBoolean, guaranteeIsNumber, UnsupportedOperationError, } from '@finos/legend-shared';
+import { DATA_CUBE_AGGREGATE_FUNCTION, DATA_CUBE_COLUMN_SORT_DIRECTION, DATA_CUBE_FILTER_OPERATION, DATA_CUBE_FUNCTIONS, DEFAULT_LAMBDA_VARIABLE_NAME, } from '../DataCubeMetaModelConst.js';
 function createColSpec(name, type, function1, function2) {
     const instance = new V1_ClassInstance();
     instance.type = V1_ClassInstanceType.COL_SPEC;
@@ -27,6 +27,161 @@ function createColSpec(name, type, function1, function2) {
     instance.value = colSpec;
     return instance;
 }
+function getAggregationColSpec(column, functionName, columnType, 
+// Temporary. Remove it when we support groupBy with empty aggregations
+columnName) {
+    const colSpec = new V1_ColSpec();
+    const aggLambda = new V1_Lambda();
+    const property = new V1_AppliedProperty();
+    property.property = column;
+    property.class = columnType;
+    const defaultVariable = new V1_Variable();
+    defaultVariable.name = DEFAULT_LAMBDA_VARIABLE_NAME;
+    property.parameters = [defaultVariable];
+    aggLambda.body.push(property);
+    aggLambda.parameters.push(defaultVariable);
+    colSpec.function1 = aggLambda;
+    const funcLambda = new V1_Lambda();
+    const aggFunc = new V1_AppliedFunction();
+    aggFunc.function = functionName;
+    const aggVariable = new V1_Variable();
+    aggVariable.name = 'agg';
+    funcLambda.body.push(aggFunc);
+    aggFunc.parameters.push(aggVariable);
+    funcLambda.parameters.push(aggVariable);
+    colSpec.function2 = funcLambda;
+    colSpec.name = columnName ?? column;
+    return colSpec;
+}
+function getPrimitiveValueSpecification(type, column) {
+    switch (type) {
+        case PRIMITIVE_TYPE.STRING: {
+            const stringValue = new V1_CString();
+            stringValue.value = guaranteeIsString(column);
+            return stringValue;
+        }
+        case PRIMITIVE_TYPE.BOOLEAN: {
+            const booleanValue = new V1_CBoolean();
+            booleanValue.value = guaranteeIsBoolean(column);
+            return booleanValue;
+        }
+        case PRIMITIVE_TYPE.NUMBER:
+        case PRIMITIVE_TYPE.DECIMAL: {
+            const cDecimal = new V1_CDecimal();
+            cDecimal.value = guaranteeIsNumber(column);
+            return cDecimal;
+        }
+        case PRIMITIVE_TYPE.INTEGER: {
+            const cInteger = new V1_CInteger();
+            cInteger.value = guaranteeIsNumber(column);
+            return cInteger;
+        }
+        case PRIMITIVE_TYPE.FLOAT: {
+            const cFloat = new V1_CFloat();
+            cFloat.value = guaranteeIsNumber(column);
+            return cFloat;
+        }
+        case PRIMITIVE_TYPE.DATE:
+        case PRIMITIVE_TYPE.DATETIME: {
+            const cDateTime = new V1_CDateTime();
+            cDateTime.value = guaranteeIsString(column);
+            return cDateTime;
+        }
+        case PRIMITIVE_TYPE.STRICTDATE: {
+            const cStrictDate = new V1_CStrictDate();
+            cStrictDate.value = guaranteeIsString(column);
+            return cStrictDate;
+        }
+        case PRIMITIVE_TYPE.STRICTTIME: {
+            const cStrictTime = new V1_CStrictTime();
+            cStrictTime.value = guaranteeIsString(column);
+            return cStrictTime;
+        }
+        default:
+            throw new UnsupportedOperationError(`Unsupported dataCube column type ${type}`);
+    }
+}
+function processFilterQuery(filter) {
+    const defaultVariable = new V1_Variable();
+    defaultVariable.name = DEFAULT_LAMBDA_VARIABLE_NAME;
+    if ('groupOperation' in filter) {
+        const groupFilter = filter;
+        let conditionExpressions = [];
+        groupFilter.conditions.forEach((condition) => {
+            const conditionExpression = processFilterQuery(condition);
+            conditionExpressions.push(conditionExpression);
+            if (conditionExpressions.length === 2) {
+                const groupCondition = groupFilter.groupOperation;
+                const groupFunc = new V1_AppliedFunction();
+                groupFunc.function = groupCondition;
+                groupFunc.parameters = conditionExpressions;
+                conditionExpressions = [groupFunc];
+            }
+        });
+        if (conditionExpressions.length === 1) {
+            return guaranteeNonNullable(conditionExpressions[0]);
+        }
+    }
+    else {
+        const condition = filter;
+        const filterCondition = new V1_AppliedFunction();
+        const property = new V1_AppliedProperty();
+        property.property = condition.name;
+        property.class = condition.type;
+        property.parameters = [defaultVariable];
+        switch (condition.operation) {
+            case DATA_CUBE_FILTER_OPERATION.EQUALS:
+            case DATA_CUBE_FILTER_OPERATION.GREATER_THAN:
+            case DATA_CUBE_FILTER_OPERATION.GREATER_THAN_OR_EQUAL:
+            case DATA_CUBE_FILTER_OPERATION.LESS_THAN:
+            case DATA_CUBE_FILTER_OPERATION.LESS_THAN_OR_EQUAL:
+            case DATA_CUBE_FILTER_OPERATION.CONTAINS:
+            case DATA_CUBE_FILTER_OPERATION.ENDS_WITH:
+            case DATA_CUBE_FILTER_OPERATION.STARTS_WITH: {
+                filterCondition.function = condition.operation;
+                filterCondition.parameters.push(property);
+                filterCondition.parameters.push(getPrimitiveValueSpecification(condition.type, condition.value));
+                break;
+            }
+            case DATA_CUBE_FILTER_OPERATION.BLANK: {
+                filterCondition.function = condition.operation;
+                filterCondition.parameters.push(property);
+                break;
+            }
+            case DATA_CUBE_FILTER_OPERATION.NOT_EQUAL: {
+                filterCondition.function = extractElementNameFromPath(DATA_CUBE_FUNCTIONS.NOT);
+                const filterConditionFunc = new V1_AppliedFunction();
+                filterConditionFunc.function = DATA_CUBE_FILTER_OPERATION.EQUALS;
+                filterConditionFunc.parameters.push(property);
+                filterConditionFunc.parameters.push(getPrimitiveValueSpecification(condition.type, condition.value));
+                filterCondition.parameters.push(filterConditionFunc);
+                break;
+            }
+            case DATA_CUBE_FILTER_OPERATION.NOT_BLANK: {
+                filterCondition.function = extractElementNameFromPath(DATA_CUBE_FUNCTIONS.NOT);
+                const filterConditionFunc = new V1_AppliedFunction();
+                filterConditionFunc.function = DATA_CUBE_FILTER_OPERATION.BLANK;
+                filterConditionFunc.parameters.push(property);
+                filterConditionFunc.parameters.push(getPrimitiveValueSpecification(condition.type, condition.value));
+                filterCondition.parameters.push(filterConditionFunc);
+                break;
+            }
+            case DATA_CUBE_FILTER_OPERATION.NOT_CONTAINS: {
+                filterCondition.function = extractElementNameFromPath(DATA_CUBE_FUNCTIONS.NOT);
+                const filterConditionFunc = new V1_AppliedFunction();
+                filterConditionFunc.function = DATA_CUBE_FILTER_OPERATION.CONTAINS;
+                filterConditionFunc.parameters.push(property);
+                filterConditionFunc.parameters.push(getPrimitiveValueSpecification(condition.type, condition.value));
+                filterCondition.parameters.push(filterConditionFunc);
+                break;
+            }
+            default:
+                throw new UnsupportedOperationError(`Unsupported filter operation ${condition.operation}`);
+        }
+        return filterCondition;
+    }
+    throw new UnsupportedOperationError(`Unsupported dataCube filter`, filter);
+}
 export function buildExecutableQueryFromSnapshot(snapshot) {
     const sourceQuery = V1_deserializeValueSpecification(snapshot.sourceQuery, []);
     const sequence = [];
@@ -34,10 +189,63 @@ export function buildExecutableQueryFromSnapshot(snapshot) {
     // TODO: @akphi - implement this
     // --------------------------------- FILTER ---------------------------------
     // TODO: @akphi - implement this
+    // --------------------------------- GROUP BY FILTER ---------------------------------
+    if (snapshot.groupByFilter) {
+        const filter = snapshot.groupByFilter;
+        const filterValueSpec = processFilterQuery(filter);
+        const filterLambda = new V1_Lambda();
+        const defaultVariable = new V1_Variable();
+        defaultVariable.name = DEFAULT_LAMBDA_VARIABLE_NAME;
+        filterLambda.body = [filterValueSpec];
+        filterLambda.parameters = [defaultVariable];
+        const filterFunc = new V1_AppliedFunction();
+        filterFunc.function = extractElementNameFromPath(DATA_CUBE_FUNCTIONS.FILTER);
+        filterFunc.parameters.push(filterLambda);
+        sequence.push(filterFunc);
+    }
     // --------------------------------- RENAME ---------------------------------
     // TODO: @akphi - implement this
     // --------------------------------- GROUP BY ---------------------------------
     // TODO: @akphi - implement this
+    if (snapshot.groupByColumns.length) {
+        const groupByInstance = new V1_ClassInstance();
+        groupByInstance.type = V1_ClassInstanceType.COL_SPEC_ARRAY;
+        const groupByColSpecArray = new V1_ColSpecArray();
+        const aggregationColSpecArray = new V1_ColSpecArray();
+        const aggregationInstance = new V1_ClassInstance();
+        aggregationInstance.type = V1_ClassInstanceType.COL_SPEC_ARRAY;
+        if (snapshot.groupByExpandedKeys.length !== snapshot.groupByColumns.length) {
+            const groupKeys = snapshot.groupByExpandedKeys;
+            for (let index = 0; index <= groupKeys.length; index++) {
+                const currentGroupByColumn = snapshot.groupByColumns[index];
+                const columnSpec = new V1_ColSpec();
+                columnSpec.name = guaranteeNonNullable(currentGroupByColumn).name;
+                groupByColSpecArray.colSpecs.push(columnSpec);
+            }
+            // Temporary. Remove it later when we support empty aggregations
+            if (snapshot.groupByAggColumns.length === 0) {
+                const column = guaranteeNonNullable(snapshot.groupByColumns[0]);
+                const colSpec = getAggregationColSpec(column.name, DATA_CUBE_AGGREGATE_FUNCTION.COUNT, PRIMITIVE_TYPE.STRING, DATA_CUBE_AGGREGATE_FUNCTION.COUNT);
+                aggregationColSpecArray.colSpecs.push(colSpec);
+            }
+        }
+        if (snapshot.groupByExpandedKeys.length === 0 ||
+            snapshot.groupByExpandedKeys.length !== snapshot.groupByColumns.length) {
+            snapshot.groupByAggColumns.forEach((agg) => {
+                const colSpec = getAggregationColSpec(agg.name, agg.function, agg.type);
+                aggregationColSpecArray.colSpecs.push(colSpec);
+            });
+        }
+        groupByInstance.value = groupByColSpecArray;
+        aggregationInstance.value = aggregationColSpecArray;
+        if (groupByColSpecArray.colSpecs.length !== 0 ||
+            aggregationColSpecArray.colSpecs.length !== 0) {
+            const groupBy = new V1_AppliedFunction();
+            groupBy.function = extractElementNameFromPath(DATA_CUBE_FUNCTIONS.GROUP_BY);
+            groupBy.parameters = [groupByInstance, aggregationInstance];
+            sequence.push(groupBy);
+        }
+    }
     // --------------------------------- SELECT ---------------------------------
     // TODO: @akphi - implement this
     // --------------------------------- PIVOT ---------------------------------
@@ -45,7 +253,31 @@ export function buildExecutableQueryFromSnapshot(snapshot) {
     // --------------------------------- CAST ---------------------------------
     // TODO: @akphi - implement this
     // --------------------------------- GROUP EXTEND ---------------------------------
-    // TODO: @akphi - implement this
+    if (snapshot.groupByExpandedKeys.length !== snapshot.groupByColumns.length) {
+        const extendFunc = new V1_AppliedFunction();
+        extendFunc.function = extractElementNameFromPath(DATA_CUBE_FUNCTIONS.EXTEND);
+        const classInstance = new V1_ClassInstance();
+        classInstance.type = V1_ClassInstanceType.COL_SPEC_ARRAY;
+        const colSpecArray = new V1_ColSpecArray();
+        classInstance.value = colSpecArray;
+        snapshot.columns.forEach((col) => {
+            if (!snapshot.groupByColumns.find((c) => c.name === col.name)) {
+                const colSpec = new V1_ColSpec();
+                const lambda = new V1_Lambda();
+                const defaultVariable = new V1_Variable();
+                defaultVariable.name = DEFAULT_LAMBDA_VARIABLE_NAME;
+                lambda.parameters.push(defaultVariable);
+                const variableValue = new V1_CString();
+                variableValue.value = '';
+                lambda.body.push(variableValue);
+                colSpec.function1 = lambda;
+                colSpec.name = col.name;
+                colSpecArray.colSpecs.push(colSpec);
+            }
+        });
+        extendFunc.parameters.push(classInstance);
+        sequence.push(extendFunc);
+    }
     // --------------------------------- SORT ---------------------------------
     if (snapshot.sortColumns.length) {
         const sort = new V1_AppliedFunction();
@@ -53,15 +285,22 @@ export function buildExecutableQueryFromSnapshot(snapshot) {
         const sortInfos = new V1_Collection();
         sortInfos.multiplicity = new V1_Multiplicity(snapshot.sortColumns.length, snapshot.sortColumns.length);
         snapshot.sortColumns.forEach((sortCol) => {
-            const sortInfo = new V1_AppliedFunction();
-            sortInfo.function = extractElementNameFromPath(sortCol.direction === DATA_CUBE_COLUMN_SORT_DIRECTION.ASCENDING
-                ? DATA_CUBE_FUNCTIONS.ASC
-                : DATA_CUBE_FUNCTIONS.DESC);
-            sortInfo.parameters.push(createColSpec(sortCol.name));
-            sortInfos.values.push(sortInfo);
+            if (snapshot.groupByColumns.length ===
+                snapshot.groupByExpandedKeys.length ||
+                snapshot.groupByColumns.map((col) => col.name).indexOf(sortCol.name) ===
+                    snapshot.groupByExpandedKeys.length) {
+                const sortInfo = new V1_AppliedFunction();
+                sortInfo.function = extractElementNameFromPath(sortCol.direction === DATA_CUBE_COLUMN_SORT_DIRECTION.ASCENDING
+                    ? DATA_CUBE_FUNCTIONS.ASC
+                    : DATA_CUBE_FUNCTIONS.DESC);
+                sortInfo.parameters.push(createColSpec(sortCol.name));
+                sortInfos.values.push(sortInfo);
+            }
         });
         sort.parameters.push(sortInfos);
-        sequence.push(sort);
+        if (sortInfos.values.length) {
+            sequence.push(sort);
+        }
     }
     // --------------------------------- LIMIT ---------------------------------
     // TODO: @akphi - implement this

package/lib/stores/dataCube/core/DataCubeQueryBuilder.js.map

@@ -1 +1 @@
-{"version":3,"file":"DataCubeQueryBuilder.js","sourceRoot":"","sources":["../../../../src/stores/dataCube/core/DataCubeQueryBuilder.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"DataCubeQueryBuilder.js","sourceRoot":"","sources":["../../../../src/stores/dataCube/core/DataCubeQueryBuilder.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EACL,cAAc,EACd,kBAAkB,EAClB,kBAAkB,EAClB,WAAW,EACX,YAAY,EACZ,WAAW,EACX,SAAS,EACT,WAAW,EACX,cAAc,EACd,cAAc,EACd,UAAU,EACV,gBAAgB,EAChB,oBAAoB,EACpB,UAAU,EACV,eAAe,EACf,aAAa,EACb,SAAS,EACT,eAAe,EACf,wBAAwB,EAExB,WAAW,EACX,gCAAgC,EAChC,0BAA0B,GAE3B,MAAM,qBAAqB,CAAC;AAM7B,OAAO,EACL,oBAAoB,EACpB,iBAAiB,EACjB,kBAAkB,EAClB,iBAAiB,EACjB,yBAAyB,GAC1B,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EACL,4BAA4B,EAC5B,+BAA+B,EAC/B,0BAA0B,EAC1B,mBAAmB,EACnB,4BAA4B,GAC7B,MAAM,8BAA8B,CAAC;AAEtC,SAAS,aAAa,CACpB,IAAY,EACZ,IAAyB,EACzB,SAAiC,EACjC,SAAiC;IAEjC,MAAM,QAAQ,GAAG,IAAI,gBAAgB,EAAE,CAAC;IACxC,QAAQ,CAAC,IAAI,GAAG,oBAAoB,CAAC,QAAQ,CAAC;IAC9C,MAAM,OAAO,GAAG,IAAI,UAAU,EAAE,CAAC;IACjC,OAAO,CAAC,IAAI,GAAG,IAAI,CAAC;IACpB,OAAO,CAAC,IAAI,GAAG,IAAI,CAAC;IACpB,OAAO,CAAC,SAAS,GAAG,SAAS,CAAC;IAC9B,OAAO,CAAC,SAAS,GAAG,SAAS,CAAC;IAC9B,QAAQ,CAAC,KAAK,GAAG,OAAO,CAAC;IACzB,OAAO,QAAQ,CAAC;AAClB,CAAC;AAED,SAAS,qBAAqB,CAC5B,MAAc,EACd,YAAoB,EACpB,UAAkB;AAClB,uEAAuE;AACvE,UAAmB;IAEnB,MAAM,OAAO,GAAG,IAAI,UAAU,EAAE,CAAC;IACjC,MAAM,SAAS,GAAG,IAAI,SAAS,EAAE,CAAC;IAClC,MAAM,QAAQ,GAAG,IAAI,kBAAkB,EAAE,CAAC;IAC1C,QAAQ,CAAC,QAAQ,GAAG,MAAM,CAAC;IAC3B,QAAQ,CAAC,KAAK,GAAG,UAAU,CAAC;IAC5B,MAAM,eAAe,GAAG,IAAI,WAAW,EAAE,CAAC;IAC1C,eAAe,CAAC,IAAI,GAAG,4BAA4B,CAAC;IACpD,QAAQ,CAAC,UAAU,GAAG,CAAC,eAAe,CAAC,CAAC;IACxC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;IAC9B,SAAS,CAAC,UAAU,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;IAC3C,OAAO,CAAC,SAAS,GAAG,SAAS,CAAC;IAE9B,MAAM,UAAU,GAAG,IAAI,SAAS,EAAE,CAAC;IACnC,MAAM,OAAO,GAAG,IAAI,kBAAkB,EAAE,CAAC;IACzC,OAAO,CAAC,QAAQ,GAAG,YAAY,CAAC;IAChC,MAAM,WAAW,GAAG,IAAI,WAAW,EAAE,CAAC;IACtC,WAAW,CAAC,IAAI,GAAG,KAAK,CAAC;IACzB,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IAC9B,OAAO,CAAC,UAAU,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;IACrC,UAAU,CAAC,UAAU,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;IACxC,OAAO,CAAC,SAAS,GAAG,UAAU,CAAC;IAE/B,OAAO,CAAC,IAAI,GAAG,UAAU,IAAI,MAAM,CAAC;IACpC,OAAO,OAAO,CAAC;AACjB,CAAC;AAED,SAAS,8BAA8B,CACrC,IAAY,EACZ,MAAe;IAEf,QAAQ,IAAI,EAAE,CAAC;QACb,KAAK,cAAc,CAAC,MAAM,CAAC,CAAC,CAAC;YAC3B,MAAM,WAAW,GAAG,IAAI,UAAU,EAAE,CAAC;YACrC,WAAW,CAAC,KAAK,GAAG,iBAAiB,CAAC,MAAM,CAAC,CAAC;YAC9C,OAAO,WAAW,CAAC;QACrB,CAAC;QACD,KAAK,cAAc,CAAC,OAAO,CAAC,CAAC,CAAC;YAC5B,MAAM,YAAY,GAAG,IAAI,WAAW,EAAE,CAAC;YACvC,YAAY,CAAC,KAAK,GAAG,kBAAkB,CAAC,MAAM,CAAC,CAAC;YAChD,OAAO,YAAY,CAAC;QACtB,CAAC;QACD,KAAK,cAAc,CAAC,MAAM,CAAC;QAC3B,KAAK,cAAc,CAAC,OAAO,CAAC,CAAC,CAAC;YAC5B,MAAM,QAAQ,GAAG,IAAI,WAAW,EAAE,CAAC;YACnC,QAAQ,CAAC,KAAK,GAAG,iBAAiB,CAAC,MAAM,CAAC,CAAC;YAC3C,OAAO,QAAQ,CAAC;QAClB,CAAC;QACD,KAAK,cAAc,CAAC,OAAO,CAAC,CAAC,CAAC;YAC5B,MAAM,QAAQ,GAAG,IAAI,WAAW,EAAE,CAAC;YACnC,QAAQ,CAAC,KAAK,GAAG,iBAAiB,CAAC,MAAM,CAAC,CAAC;YAC3C,OAAO,QAAQ,CAAC;QAClB,CAAC;QACD,KAAK,cAAc,CAAC,KAAK,CAAC,CAAC,CAAC;YAC1B,MAAM,MAAM,GAAG,IAAI,SAAS,EAAE,CAAC;YAC/B,MAAM,CAAC,KAAK,GAAG,iBAAiB,CAAC,MAAM,CAAC,CAAC;YACzC,OAAO,MAAM,CAAC;QAChB,CAAC;QACD,KAAK,cAAc,CAAC,IAAI,CAAC;QACzB,KAAK,cAAc,CAAC,QAAQ,CAAC,CAAC,CAAC;YAC7B,MAAM,SAAS,GAAG,IAAI,YAAY,EAAE,CAAC;YACrC,SAAS,CAAC,KAAK,GAAG,iBAAiB,CAAC,MAAM,CAAC,CAAC;YAC5C,OAAO,SAAS,CAAC;QACnB,CAAC;QACD,KAAK,cAAc,CAAC,UAAU,CAAC,CAAC,CAAC;YAC/B,MAAM,WAAW,GAAG,IAAI,cAAc,EAAE,CAAC;YACzC,WAAW,CAAC,KAAK,GAAG,iBAAiB,CAAC,MAAM,CAAC,CAAC;YAC9C,OAAO,WAAW,CAAC;QACrB,CAAC;QACD,KAAK,cAAc,CAAC,UAAU,CAAC,CAAC,CAAC;YAC/B,MAAM,WAAW,GAAG,IAAI,cAAc,EAAE,CAAC;YACzC,WAAW,CAAC,KAAK,GAAG,iBAAiB,CAAC,MAAM,CAAC,CAAC;YAC9C,OAAO,WAAW,CAAC;QACrB,CAAC;QACD;YACE,MAAM,IAAI,yBAAyB,CACjC,oCAAoC,IAAI,EAAE,CAC3C,CAAC;IACN,CAAC;AACH,CAAC;AAED,SAAS,kBAAkB,CAAC,MAAc;IACxC,MAAM,eAAe,GAAG,IAAI,WAAW,EAAE,CAAC;IAC1C,eAAe,CAAC,IAAI,GAAG,4BAA4B,CAAC;IACpD,IAAI,gBAAgB,IAAI,MAAM,EAAE,CAAC;QAC/B,MAAM,WAAW,GAAG,MAA6B,CAAC;QAClD,IAAI,oBAAoB,GAA4B,EAAE,CAAC;QACvD,WAAW,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,SAAS,EAAE,EAAE;YAC3C,MAAM,mBAAmB,GAAG,kBAAkB,CAAC,SAAS,CAAC,CAAC;YAC1D,oBAAoB,CAAC,IAAI,CAAC,mBAAmB,CAAC,CAAC;YAC/C,IAAI,oBAAoB,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;gBACtC,MAAM,cAAc,GAAG,WAAW,CAAC,cAAc,CAAC;gBAClD,MAAM,SAAS,GAAG,IAAI,kBAAkB,EAAE,CAAC;gBAC3C,SAAS,CAAC,QAAQ,GAAG,cAAc,CAAC;gBACpC,SAAS,CAAC,UAAU,GAAG,oBAAoB,CAAC;gBAC5C,oBAAoB,GAAG,CAAC,SAAS,CAAC,CAAC;YACrC,CAAC;QACH,CAAC,CAAC,CAAC;QACH,IAAI,oBAAoB,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACtC,OAAO,oBAAoB,CAAC,oBAAoB,CAAC,CAAC,CAAC,CAAC,CAAC;QACvD,CAAC;IACH,CAAC;SAAM,CAAC;QACN,MAAM,SAAS,GAAG,MAAsC,CAAC;QACzD,MAAM,eAAe,GAAG,IAAI,kBAAkB,EAAE,CAAC;QACjD,MAAM,QAAQ,GAAG,IAAI,kBAAkB,EAAE,CAAC;QAC1C,QAAQ,CAAC,QAAQ,GAAG,SAAS,CAAC,IAAI,CAAC;QACnC,QAAQ,CAAC,KAAK,GAAG,SAAS,CAAC,IAAI,CAAC;QAChC,QAAQ,CAAC,UAAU,GAAG,CAAC,eAAe,CAAC,CAAC;QAExC,QAAQ,SAAS,CAAC,SAAS,EAAE,CAAC;YAC5B,KAAK,0BAA0B,CAAC,MAAM,CAAC;YACvC,KAAK,0BAA0B,CAAC,YAAY,CAAC;YAC7C,KAAK,0BAA0B,CAAC,qBAAqB,CAAC;YACtD,KAAK,0BAA0B,CAAC,SAAS,CAAC;YAC1C,KAAK,0BAA0B,CAAC,kBAAkB,CAAC;YACnD,KAAK,0BAA0B,CAAC,QAAQ,CAAC;YACzC,KAAK,0BAA0B,CAAC,SAAS,CAAC;YAC1C,KAAK,0BAA0B,CAAC,WAAW,CAAC,CAAC,CAAC;gBAC5C,eAAe,CAAC,QAAQ,GAAG,SAAS,CAAC,SAAS,CAAC;gBAC/C,eAAe,CAAC,UAAU,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;gBAC1C,eAAe,CAAC,UAAU,CAAC,IAAI,CAC7B,8BAA8B,CAAC,SAAS,CAAC,IAAI,EAAE,SAAS,CAAC,KAAK,CAAC,CAChE,CAAC;gBACF,MAAM;YACR,CAAC;YACD,KAAK,0BAA0B,CAAC,KAAK,CAAC,CAAC,CAAC;gBACtC,eAAe,CAAC,QAAQ,GAAG,SAAS,CAAC,SAAS,CAAC;gBAC/C,eAAe,CAAC,UAAU,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;gBAC1C,MAAM;YACR,CAAC;YACD,KAAK,0BAA0B,CAAC,SAAS,CAAC,CAAC,CAAC;gBAC1C,eAAe,CAAC,QAAQ,GAAG,0BAA0B,CACnD,mBAAmB,CAAC,GAAG,CACxB,CAAC;gBAEF,MAAM,mBAAmB,GAAG,IAAI,kBAAkB,EAAE,CAAC;gBACrD,mBAAmB,CAAC,QAAQ,GAAG,0BAA0B,CAAC,MAAM,CAAC;gBACjE,mBAAmB,CAAC,UAAU,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;gBAC9C,mBAAmB,CAAC,UAAU,CAAC,IAAI,CACjC,8BAA8B,CAAC,SAAS,CAAC,IAAI,EAAE,SAAS,CAAC,KAAK,CAAC,CAChE,CAAC;gBAEF,eAAe,CAAC,UAAU,CAAC,IAAI,CAAC,mBAAmB,CAAC,CAAC;gBACrD,MAAM;YACR,CAAC;YACD,KAAK,0BAA0B,CAAC,SAAS,CAAC,CAAC,CAAC;gBAC1C,eAAe,CAAC,QAAQ,GAAG,0BAA0B,CACnD,mBAAmB,CAAC,GAAG,CACxB,CAAC;gBAEF,MAAM,mBAAmB,GAAG,IAAI,kBAAkB,EAAE,CAAC;gBACrD,mBAAmB,CAAC,QAAQ,GAAG,0BAA0B,CAAC,KAAK,CAAC;gBAChE,mBAAmB,CAAC,UAAU,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;gBAC9C,mBAAmB,CAAC,UAAU,CAAC,IAAI,CACjC,8BAA8B,CAAC,SAAS,CAAC,IAAI,EAAE,SAAS,CAAC,KAAK,CAAC,CAChE,CAAC;gBAEF,eAAe,CAAC,UAAU,CAAC,IAAI,CAAC,mBAAmB,CAAC,CAAC;gBACrD,MAAM;YACR,CAAC;YACD,KAAK,0BAA0B,CAAC,YAAY,CAAC,CAAC,CAAC;gBAC7C,eAAe,CAAC,QAAQ,GAAG,0BAA0B,CACnD,mBAAmB,CAAC,GAAG,CACxB,CAAC;gBAEF,MAAM,mBAAmB,GAAG,IAAI,kBAAkB,EAAE,CAAC;gBACrD,mBAAmB,CAAC,QAAQ,GAAG,0BAA0B,CAAC,QAAQ,CAAC;gBACnE,mBAAmB,CAAC,UAAU,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;gBAC9C,mBAAmB,CAAC,UAAU,CAAC,IAAI,CACjC,8BAA8B,CAAC,SAAS,CAAC,IAAI,EAAE,SAAS,CAAC,KAAK,CAAC,CAChE,CAAC;gBAEF,eAAe,CAAC,UAAU,CAAC,IAAI,CAAC,mBAAmB,CAAC,CAAC;gBACrD,MAAM;YACR,CAAC;YACD;gBACE,MAAM,IAAI,yBAAyB,CACjC,gCAAgC,SAAS,CAAC,SAAS,EAAE,CACtD,CAAC;QACN,CAAC;QACD,OAAO,eAAe,CAAC;IACzB,CAAC;IACD,MAAM,IAAI,yBAAyB,CAAC,6BAA6B,EAAE,MAAM,CAAC,CAAC;AAC7E,CAAC;AAED,MAAM,UAAU,gCAAgC,CAC9C,QAA+B;IAE/B,MAAM,WAAW,GAAG,gCAAgC,CAClD,QAAQ,CAAC,WAAW,EACpB,EAAE,CACH,CAAC;IACF,MAAM,QAAQ,GAAyB,EAAE,CAAC;IAE1C,kFAAkF;IAClF,gCAAgC;IAEhC,6EAA6E;IAC7E,gCAAgC;IAEhC,sFAAsF;IACtF,IAAI,QAAQ,CAAC,aAAa,EAAE,CAAC;QAC3B,MAAM,MAAM,GAAG,QAAQ,CAAC,aAAa,CAAC;QACtC,MAAM,eAAe,GAAG,kBAAkB,CAAC,MAAM,CAAC,CAAC;QACnD,MAAM,YAAY,GAAG,IAAI,SAAS,EAAE,CAAC;QACrC,MAAM,eAAe,GAAG,IAAI,WAAW,EAAE,CAAC;QAC1C,eAAe,CAAC,IAAI,GAAG,4BAA4B,CAAC;QACpD,YAAY,CAAC,IAAI,GAAG,CAAC,eAAe,CAAC,CAAC;QAEtC,YAAY,CAAC,UAAU,GAAG,CAAC,eAAe,CAAC,CAAC;QAC5C,MAAM,UAAU,GAAG,IAAI,kBAAkB,EAAE,CAAC;QAC5C,UAAU,CAAC,QAAQ,GAAG,0BAA0B,CAC9C,mBAAmB,CAAC,MAAM,CAC3B,CAAC;QACF,UAAU,CAAC,UAAU,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;QACzC,QAAQ,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;IAC5B,CAAC;IAED,6EAA6E;IAC7E,gCAAgC;IAEhC,+EAA+E;IAC/E,gCAAgC;IAChC,IAAI,QAAQ,CAAC,cAAc,CAAC,MAAM,EAAE,CAAC;QACnC,MAAM,eAAe,GAAG,IAAI,gBAAgB,EAAE,CAAC;QAC/C,eAAe,CAAC,IAAI,GAAG,oBAAoB,CAAC,cAAc,CAAC;QAC3D,MAAM,mBAAmB,GAAG,IAAI,eAAe,EAAE,CAAC;QAClD,MAAM,uBAAuB,GAAG,IAAI,eAAe,EAAE,CAAC;QACtD,MAAM,mBAAmB,GAAG,IAAI,gBAAgB,EAAE,CAAC;QACnD,mBAAmB,CAAC,IAAI,GAAG,oBAAoB,CAAC,cAAc,CAAC;QAE/D,IACE,QAAQ,CAAC,mBAAmB,CAAC,MAAM,KAAK,QAAQ,CAAC,cAAc,CAAC,MAAM,EACtE,CAAC;YACD,MAAM,SAAS,GAAG,QAAQ,CAAC,mBAAmB,CAAC;YAC/C,KAAK,IAAI,KAAK,GAAG,CAAC,EAAE,KAAK,IAAI,SAAS,CAAC,MAAM,EAAE,KAAK,EAAE,EAAE,CAAC;gBACvD,MAAM,oBAAoB,GAAG,QAAQ,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC;gBAC5D,MAAM,UAAU,GAAG,IAAI,UAAU,EAAE,CAAC;gBACpC,UAAU,CAAC,IAAI,GAAG,oBAAoB,CAAC,oBAAoB,CAAC,CAAC,IAAI,CAAC;gBAClE,mBAAmB,CAAC,QAAQ,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;YAChD,CAAC;YAED,gEAAgE;YAChE,IAAI,QAAQ,CAAC,iBAAiB,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;gBAC5C,MAAM,MAAM,GAAG,oBAAoB,CAAC,QAAQ,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,CAAC;gBAChE,MAAM,OAAO,GAAG,qBAAqB,CACnC,MAAM,CAAC,IAAI,EACX,4BAA4B,CAAC,KAAK,EAClC,cAAc,CAAC,MAAM,EACrB,4BAA4B,CAAC,KAAK,CACnC,CAAC;gBACF,uBAAuB,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;YACjD,CAAC;QACH,CAAC;QAED,IACE,QAAQ,CAAC,mBAAmB,CAAC,MAAM,KAAK,CAAC;YACzC,QAAQ,CAAC,mBAAmB,CAAC,MAAM,KAAK,QAAQ,CAAC,cAAc,CAAC,MAAM,EACtE,CAAC;YACD,QAAQ,CAAC,iBAAiB,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE;gBACzC,MAAM,OAAO,GAAG,qBAAqB,CAAC,GAAG,CAAC,IAAI,EAAE,GAAG,CAAC,QAAQ,EAAE,GAAG,CAAC,IAAI,CAAC,CAAC;gBACxE,uBAAuB,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;YACjD,CAAC,CAAC,CAAC;QACL,CAAC;QAED,eAAe,CAAC,KAAK,GAAG,mBAAmB,CAAC;QAC5C,mBAAmB,CAAC,KAAK,GAAG,uBAAuB,CAAC;QAEpD,IACE,mBAAmB,CAAC,QAAQ,CAAC,MAAM,KAAK,CAAC;YACzC,uBAAuB,CAAC,QAAQ,CAAC,MAAM,KAAK,CAAC,EAC7C,CAAC;YACD,MAAM,OAAO,GAAG,IAAI,kBAAkB,EAAE,CAAC;YACzC,OAAO,CAAC,QAAQ,GAAG,0BAA0B,CAC3C,mBAAmB,CAAC,QAAQ,CAC7B,CAAC;YACF,OAAO,CAAC,UAAU,GAAG,CAAC,eAAe,EAAE,mBAAmB,CAAC,CAAC;YAC5D,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QACzB,CAAC;IACH,CAAC;IAED,6EAA6E;IAC7E,gCAAgC;IAEhC,4EAA4E;IAC5E,gCAAgC;IAEhC,2EAA2E;IAC3E,gCAAgC;IAEhC,mFAAmF;IACnF,IAAI,QAAQ,CAAC,mBAAmB,CAAC,MAAM,KAAK,QAAQ,CAAC,cAAc,CAAC,MAAM,EAAE,CAAC;QAC3E,MAAM,UAAU,GAAG,IAAI,kBAAkB,EAAE,CAAC;QAC5C,UAAU,CAAC,QAAQ,GAAG,0BAA0B,CAC9C,mBAAmB,CAAC,MAAM,CAC3B,CAAC;QACF,MAAM,aAAa,GAAG,IAAI,gBAAgB,EAAE,CAAC;QAC7C,aAAa,CAAC,IAAI,GAAG,oBAAoB,CAAC,cAAc,CAAC;QACzD,MAAM,YAAY,GAAG,IAAI,eAAe,EAAE,CAAC;QAC3C,aAAa,CAAC,KAAK,GAAG,YAAY,CAAC;QACnC,QAAQ,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE;YAC/B,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC;gBAC9D,MAAM,OAAO,GAAG,IAAI,UAAU,EAAE,CAAC;gBACjC,MAAM,MAAM,GAAG,IAAI,SAAS,EAAE,CAAC;gBAC/B,MAAM,eAAe,GAAG,IAAI,WAAW,EAAE,CAAC;gBAC1C,eAAe,CAAC,IAAI,GAAG,4BAA4B,CAAC;gBACpD,MAAM,CAAC,UAAU,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;gBACxC,MAAM,aAAa,GAAG,IAAI,UAAU,EAAE,CAAC;gBACvC,aAAa,CAAC,KAAK,GAAG,EAAE,CAAC;gBACzB,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;gBAChC,OAAO,CAAC,SAAS,GAAG,MAAM,CAAC;gBAC3B,OAAO,CAAC,IAAI,GAAG,GAAG,CAAC,IAAI,CAAC;gBACxB,YAAY,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;YACtC,CAAC;QACH,CAAC,CAAC,CAAC;QACH,UAAU,CAAC,UAAU,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;QAE1C,QAAQ,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;IAC5B,CAAC;IAED,2EAA2E;IAE3E,IAAI,QAAQ,CAAC,WAAW,CAAC,MAAM,EAAE,CAAC;QAChC,MAAM,IAAI,GAAG,IAAI,kBAAkB,EAAE,CAAC;QACtC,IAAI,CAAC,QAAQ,GAAG,0BAA0B,CAAC,mBAAmB,CAAC,IAAI,CAAC,CAAC;QACrE,MAAM,SAAS,GAAG,IAAI,aAAa,EAAE,CAAC;QACtC,SAAS,CAAC,YAAY,GAAG,IAAI,eAAe,CAC1C,QAAQ,CAAC,WAAW,CAAC,MAAM,EAC3B,QAAQ,CAAC,WAAW,CAAC,MAAM,CAC5B,CAAC;QACF,QAAQ,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;YACvC,IACE,QAAQ,CAAC,cAAc,CAAC,MAAM;gBAC5B,QAAQ,CAAC,mBAAmB,CAAC,MAAM;gBACrC,QAAQ,CAAC,cAAc,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC;oBAClE,QAAQ,CAAC,mBAAmB,CAAC,MAAM,EACrC,CAAC;gBACD,MAAM,QAAQ,GAAG,IAAI,kBAAkB,EAAE,CAAC;gBAC1C,QAAQ,CAAC,QAAQ,GAAG,0BAA0B,CAC5C,OAAO,CAAC,SAAS,KAAK,+BAA+B,CAAC,SAAS;oBAC7D,CAAC,CAAC,mBAAmB,CAAC,GAAG;oBACzB,CAAC,CAAC,mBAAmB,CAAC,IAAI,CAC7B,CAAC;gBACF,QAAQ,CAAC,UAAU,CAAC,IAAI,CAAC,aAAa,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC;gBACtD,SAAS,CAAC,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;YAClC,CAAC;QACH,CAAC,CAAC,CAAC;QACH,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QAChC,IAAI,SAAS,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC;YAC5B,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACtB,CAAC;IACH,CAAC;IAED,4EAA4E;IAC5E,gCAAgC;IAEhC,2EAA2E;IAE3E,MAAM,QAAQ,GAAG,IAAI,kBAAkB,EAAE,CAAC;IAC1C,QAAQ,CAAC,QAAQ,GAAG,0BAA0B,CAAC,mBAAmB,CAAC,IAAI,CAAC,CAAC;IACzE,MAAM,UAAU,GAAG,IAAI,wBAAwB,EAAE,CAAC;IAClD,UAAU,CAAC,QAAQ,GAAG,QAAQ,CAAC,OAAO,CAAC;IACvC,QAAQ,CAAC,UAAU,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;IACrC,QAAQ,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;IAExB,+EAA+E;IAE/E,IAAI,CAAC,QAAQ,CAAC,MAAM,EAAE,CAAC;QACrB,OAAO,WAAW,CAAC;IACrB,CAAC;IACD,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,QAAQ,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;QACzC,oBAAoB,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,OAAO,CAClD,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,oBAAoB,CAAC,QAAQ,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAC9D,CAAC;IACJ,CAAC;IAED,OAAO,oBAAoB,CAAC,QAAQ,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC;AAC7D,CAAC;AAED,0DAA0D;AAC1D,qCAAqC;AACrC,MAAM;AACN,8BAA8B;AAC9B,qBAAqB;AACrB,4BAA4B;AAC5B,8BAA8B;AAC9B,OAAO;AACP,IAAI;AAEJ,iBAAiB;AACjB,kBAAkB;AAClB,yBAAyB;AACzB,gCAAgC;AAChC,yCAAyC"}

package/lib/stores/dataCube/core/DataCubeQuerySnapshot.d.ts

@@ -16,8 +16,15 @@
 import type { V1_Lambda, V1_ValueSpecification } from '@finos/legend-graph';
 import type { DataCubeConfiguration } from '../../../server/models/DataCubeQuery.js';
 import { type PlainObject } from '@finos/legend-shared';
-import type { DATA_CUBE_AGGREGATE_FUNCTION, DATA_CUBE_COLUMN_SORT_DIRECTION } from '../DataCubeMetaModelConst.js';
-export type DataCubeQueryFilter = {};
+import type { DATA_CUBE_AGGREGATE_FUNCTION, DATA_CUBE_COLUMN_SORT_DIRECTION, DATA_CUBE_FILTER_OPERATION } from '../DataCubeMetaModelConst.js';
+export type DataCubeQueryFilterCondition = DataCubeQuerySnapshotColumn & {
+    value: unknown;
+    operation: DATA_CUBE_FILTER_OPERATION;
+};
+export type DataCubeQueryFilter = {
+    groupOperation: string;
+    conditions: (DataCubeQueryFilterCondition | DataCubeQueryFilter)[];
+};
 export declare enum DataCubeQuerySnapshotColumnOrigin {
     SOURCE = 0,
     LEAF_EXTENDED = 1,
@@ -58,7 +65,9 @@ export type DataCubeQuerySnapshot = {
     filter?: DataCubeQueryFilter | undefined;
     renamedColumns: DataCubeQuerySnapshotRenamedColumn[];
     groupByColumns: DataCubeQuerySnapshotColumn[];
+    groupByExpandedKeys: string[];
     groupByAggColumns: DataCubeQuerySnapshotAggregateColumn[];
+    groupByFilter?: DataCubeQueryFilter | undefined;
     selectedColumns: DataCubeQuerySnapshotColumn[];
     pivotColumns: DataCubeQuerySnapshotColumn[];
     pivotAggColumns: DataCubeQuerySnapshotAggregateColumn[];

package/lib/stores/dataCube/core/DataCubeQuerySnapshot.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"DataCubeQuerySnapshot.d.ts","sourceRoot":"","sources":["../../../../src/stores/dataCube/core/DataCubeQuerySnapshot.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,KAAK,EAAE,SAAS,EAAE,qBAAqB,EAAE,MAAM,qBAAqB,CAAC;AAC5E,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,yCAAyC,CAAC;AACrF,OAAO,EAAQ,KAAK,WAAW,EAAiB,MAAM,sBAAsB,CAAC;AAC7E,OAAO,KAAK,EACV,4BAA4B,EAC5B,+BAA+B,EAChC,MAAM,8BAA8B,CAAC;AA0EtC,MAAM,MAAM,mBAAmB,GAAG,EAEjC,CAAC;AAEF,oBAAY,iCAAiC;IAC3C,MAAM,IAAA;IACN,aAAa,IAAA;IACb,MAAM,IAAA;IACN,QAAQ,IAAA;IACR,MAAM,IAAA;IACN,KAAK,IAAA;IACL,cAAc,IAAA;CACf;AAED,MAAM,MAAM,2BAA2B,GAAG;IACxC,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;CACd,CAAC;AAEF,MAAM,MAAM,qCAAqC,GAC/C,2BAA2B,GAAG;IAC5B,MAAM,EAAE,iCAAiC,CAAC;CAC3C,CAAC;AAEJ,MAAM,MAAM,mCAAmC,GAC7C,2BAA2B,GAAG;IAC5B,MAAM,EAAE,WAAW,CAAC,SAAS,CAAC,CAAC;IAC/B,IAAI,EAAE,MAAM,CAAC;CACd,CAAC;AAEJ,MAAM,MAAM,kCAAkC,GAAG,2BAA2B,GAAG;IAC7E,OAAO,EAAE,MAAM,CAAC;CACjB,CAAC;AAEF,MAAM,MAAM,+BAA+B,GAAG,2BAA2B,GAAG;IAC1E,SAAS,EAAE,+BAA+B,CAAC;CAC5C,CAAC;AAEF,MAAM,MAAM,oCAAoC,GAC9C,2BAA2B,GAAG;IAC5B,QAAQ,EAAE,4BAA4B,CAAC;CACxC,CAAC;AAEJ,MAAM,MAAM,qBAAqB,GAAG;IAClC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;IAChB,WAAW,EAAE,WAAW,CAAC,qBAAqB,CAAC,CAAC;IAChD,aAAa,EAAE,qBAAqB,CAAC;IAErC,eAAe,EAAE,2BAA2B,EAAE,CAAC;IAC/C,mBAAmB,EAAE,mCAAmC,EAAE,CAAC;IAC3D,MAAM,CAAC,EAAE,mBAAmB,GAAG,SAAS,CAAC;IACzC,cAAc,EAAE,kCAAkC,EAAE,CAAC;IACrD,cAAc,EAAE,2BAA2B,EAAE,CAAC;IAC9C,iBAAiB,EAAE,oCAAoC,EAAE,CAAC;IAC1D,eAAe,EAAE,2BAA2B,EAAE,CAAC;IAC/C,YAAY,EAAE,2BAA2B,EAAE,CAAC;IAC5C,eAAe,EAAE,oCAAoC,EAAE,CAAC;IACxD,WAAW,EAAE,2BAA2B,EAAE,CAAC;IAC3C,oBAAoB,EAAE,mCAAmC,EAAE,CAAC;IAC5D,WAAW,EAAE,+BAA+B,EAAE,CAAC;IAC/C,KAAK,EAAE,MAAM,GAAG,SAAS,CAAC;IAC1B,OAAO,EAAE,qCAAqC,EAAE,CAAC;CAClD,CAAC;AAIF,wBAAgB,cAAc,CAC5B,IAAI,EAAE,MAAM,EACZ,OAAO,EAAE,MAAM,EACf,WAAW,EAAE,WAAW,CAAC,qBAAqB,CAAC,EAC/C,aAAa,EAAE,qBAAqB,GACnC,qBAAqB,CAuBvB;AAED,wBAAgB,aAAa,CAC3B,QAAQ,EAAE,qBAAqB,GAC9B,qBAAqB,CAIvB"}
+{"version":3,"file":"DataCubeQuerySnapshot.d.ts","sourceRoot":"","sources":["../../../../src/stores/dataCube/core/DataCubeQuerySnapshot.ts"],"names":[],"mappings":"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"}

package/lib/stores/dataCube/core/DataCubeQuerySnapshot.js

@@ -37,12 +37,14 @@ export function createSnapshot(name, runtime, sourceQuery, configuration) {
         filter: undefined,
         renamedColumns: [],
         groupByColumns: [],
+        groupByExpandedKeys: [],
         groupByAggColumns: [],
         selectedColumns: [],
         pivotColumns: [],
         pivotAggColumns: [],
         castColumns: [],
         groupExtendedColumns: [],
+        groupByFilter: undefined,
         sortColumns: [],
         limit: undefined,
         columns: [],

package/lib/stores/dataCube/core/DataCubeQuerySnapshot.js.map

@@ -1 +1 @@
-{"version":3,"file":"DataCubeQuerySnapshot.js","sourceRoot":"","sources":["../../../../src/stores/dataCube/core/DataCubeQuerySnapshot.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAIH,OAAO,EAAE,IAAI,EAAmC,MAAM,sBAAsB,CAAC;AAkF7E,MAAM,CAAN,IAAY,iCAQX;AARD,WAAY,iCAAiC;IAC3C,6FAAM,CAAA;IACN,2GAAa,CAAA;IACb,6FAAM,CAAA;IACN,iGAAQ,CAAA;IACR,6FAAM,CAAA;IACN,2FAAK,CAAA;IACL,6GAAc,CAAA;AAChB,CAAC,EARW,iCAAiC,KAAjC,iCAAiC,QAQ5C;AAsDD,wFAAwF;AAExF,MAAM,UAAU,cAAc,CAC5B,IAAY,EACZ,OAAe,EACf,WAA+C,EAC/C,aAAoC;IAEpC,OAAO;QACL,IAAI,EAAE,IAAI,EAAE;QACZ,IAAI;QACJ,OAAO;QACP,WAAW;QACX,aAAa;QAEb,eAAe,EAAE,EAAE;QACnB,mBAAmB,EAAE,EAAE;QACvB,MAAM,EAAE,SAAS;QACjB,cAAc,EAAE,EAAE;QAClB,cAAc,EAAE,EAAE;QAClB,iBAAiB,EAAE,EAAE;QACrB,eAAe,EAAE,EAAE;QACnB,YAAY,EAAE,EAAE;QAChB,eAAe,EAAE,EAAE;QACnB,WAAW,EAAE,EAAE;QACf,oBAAoB,EAAE,EAAE;QACxB,WAAW,EAAE,EAAE;QACf,KAAK,EAAE,SAAS;QAChB,OAAO,EAAE,EAAE;KACZ,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,aAAa,CAC3B,QAA+B;IAE/B,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,CAA0B,CAAC;IAC3E,KAAyC,CAAC,IAAI,GAAG,IAAI,EAAE,CAAC;IACzD,OAAO,KAAK,CAAC;AACf,CAAC"}
+{"version":3,"file":"DataCubeQuerySnapshot.js","sourceRoot":"","sources":["../../../../src/stores/dataCube/core/DataCubeQuerySnapshot.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAIH,OAAO,EAAE,IAAI,EAAmC,MAAM,sBAAsB,CAAC;AAyF7E,MAAM,CAAN,IAAY,iCAQX;AARD,WAAY,iCAAiC;IAC3C,6FAAM,CAAA;IACN,2GAAa,CAAA;IACb,6FAAM,CAAA;IACN,iGAAQ,CAAA;IACR,6FAAM,CAAA;IACN,2FAAK,CAAA;IACL,6GAAc,CAAA;AAChB,CAAC,EARW,iCAAiC,KAAjC,iCAAiC,QAQ5C;AAwDD,wFAAwF;AAExF,MAAM,UAAU,cAAc,CAC5B,IAAY,EACZ,OAAe,EACf,WAA+C,EAC/C,aAAoC;IAEpC,OAAO;QACL,IAAI,EAAE,IAAI,EAAE;QACZ,IAAI;QACJ,OAAO;QACP,WAAW;QACX,aAAa;QAEb,eAAe,EAAE,EAAE;QACnB,mBAAmB,EAAE,EAAE;QACvB,MAAM,EAAE,SAAS;QACjB,cAAc,EAAE,EAAE;QAClB,cAAc,EAAE,EAAE;QAClB,mBAAmB,EAAE,EAAE;QACvB,iBAAiB,EAAE,EAAE;QACrB,eAAe,EAAE,EAAE;QACnB,YAAY,EAAE,EAAE;QAChB,eAAe,EAAE,EAAE;QACnB,WAAW,EAAE,EAAE;QACf,oBAAoB,EAAE,EAAE;QACxB,aAAa,EAAE,SAAS;QACxB,WAAW,EAAE,EAAE;QACf,KAAK,EAAE,SAAS;QAChB,OAAO,EAAE,EAAE;KACZ,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,aAAa,CAC3B,QAA+B;IAE/B,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,CAA0B,CAAC;IAC3E,KAAyC,CAAC,IAAI,GAAG,IAAI,EAAE,CAAC;IACzD,OAAO,KAAK,CAAC;AACf,CAAC"}

package/lib/stores/dataCube/grid/DataCubeGridClientEngine.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"DataCubeGridClientEngine.d.ts","sourceRoot":"","sources":["../../../../src/stores/dataCube/grid/DataCubeGridClientEngine.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,KAAK,EACV,qBAAqB,EACrB,wBAAwB,EAEzB,MAAM,yBAAyB,CAAC;AACjC,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAchE,OAAO,EAAE,KAAK,cAAc,EAAa,MAAM,qBAAqB,CAAC;AAIrE,MAAM,MAAM,4BAA4B,GACpC,MAAM,GACN,MAAM,GACN,OAAO,GACP,IAAI,GACJ,SAAS,CAAC;AAEd,MAAM,MAAM,qBAAqB,GAAG;IAClC,CAAC,GAAG,EAAE,MAAM,GAAG,4BAA4B,CAAC;CAC7C,CAAC;AAEF,oBAAY,uBAAuB;IACjC,SAAS,QAAQ;IACjB,UAAU,SAAS;CACpB;AAED,eAAO,MAAM,SAAS,QAAS,cAAc,KAAG,qBAAqB,EAWjE,CAAC;AAEL,qBAAa,sCACX,YAAW,qBAAqB;IAEhC,QAAQ,CAAC,IAAI,EAAE,iBAAiB,CAAC;gBAErB,IAAI,EAAE,iBAAiB;IAI7B,SAAS,CACb,MAAM,EAAE,wBAAwB,CAAC,OAAO,EAAE,OAAO,CAAC,GACjD,OAAO,CAAC,IAAI,CAAC;IAsBhB,OAAO,CAAC,MAAM,EAAE,wBAAwB,CAAC,OAAO,EAAE,OAAO,CAAC,GAAG,IAAI;IAWjE,OAAO,CAAC,YAAY;CAuCrB"}
+{"version":3,"file":"DataCubeGridClientEngine.d.ts","sourceRoot":"","sources":["../../../../src/stores/dataCube/grid/DataCubeGridClientEngine.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,KAAK,EACV,qBAAqB,EACrB,wBAAwB,EAEzB,MAAM,yBAAyB,CAAC;AACjC,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAkBhE,OAAO,EACL,KAAK,cAAc,EAIpB,MAAM,qBAAqB,CAAC;AAQ7B,MAAM,MAAM,4BAA4B,GACpC,MAAM,GACN,MAAM,GACN,OAAO,GACP,IAAI,GACJ,SAAS,CAAC;AAEd,MAAM,MAAM,qBAAqB,GAAG;IAClC,CAAC,GAAG,EAAE,MAAM,GAAG,4BAA4B,CAAC;CAC7C,CAAC;AAEF,oBAAY,uBAAuB;IACjC,SAAS,QAAQ;IACjB,UAAU,SAAS;CACpB;AAED,eAAO,MAAM,SAAS,QAAS,cAAc,KAAG,qBAAqB,EAWjE,CAAC;AAEL,qBAAa,sCACX,YAAW,qBAAqB;IAEhC,QAAQ,CAAC,IAAI,EAAE,iBAAiB,CAAC;gBAErB,IAAI,EAAE,iBAAiB;IAI7B,SAAS,CACb,MAAM,EAAE,wBAAwB,CAAC,OAAO,EAAE,OAAO,CAAC,GACjD,OAAO,CAAC,IAAI,CAAC;IAsBhB,OAAO,CAAC,MAAM,EAAE,wBAAwB,CAAC,OAAO,EAAE,OAAO,CAAC,GAAG,IAAI;IAWjE,OAAO,CAAC,YAAY;CAmFrB"}

package/lib/stores/dataCube/grid/DataCubeGridClientEngine.js

@@ -16,8 +16,8 @@
 import { cloneSnapshot, } from '../core/DataCubeQuerySnapshot.js';
 import { LogEvent, assertErrorThrown, deepEqual, guaranteeNonNullable, isBoolean, } from '@finos/legend-shared';
 import { buildExecutableQueryFromSnapshot } from '../core/DataCubeQueryBuilder.js';
-import { V1_Lambda } from '@finos/legend-graph';
-import { DATA_CUBE_COLUMN_SORT_DIRECTION } from '../DataCubeMetaModelConst.js';
+import { V1_Lambda, PRIMITIVE_TYPE, extractElementNameFromPath, } from '@finos/legend-graph';
+import { DATA_CUBE_COLUMN_SORT_DIRECTION, DATA_CUBE_FILTER_OPERATION, DATA_CUBE_FUNCTIONS, } from '../DataCubeMetaModelConst.js';
 import { APPLICATION_EVENT } from '@finos/legend-application';
 export var GridClientSortDirection;
 (function (GridClientSortDirection) {
@@ -69,7 +69,37 @@ export class DataCubeGridClientServerSideDataSource {
     syncSnapshot(request, baseSnapshot) {
         let createNew = false;
         // --------------------------------- GROUP BY ---------------------------------
-        // TODO: @akphi - Implement this
+        const groupByExpandedKeys = request.groupKeys;
+        const groupByColumns = request.rowGroupCols.map((r) => {
+            const column = baseSnapshot.columns.find((col) => col.name === r.id);
+            return {
+                name: r.id,
+                type: guaranteeNonNullable(column).type,
+            };
+        });
+        const groupByAggColumns = request.valueCols.map((v) => {
+            const type = baseSnapshot.columns.find((col) => col.name === v.field)?.type;
+            return {
+                name: v.field,
+                type: type,
+                function: v.aggFunc,
+            };
+        });
+        let groupByFilter;
+        for (let index = 0; index < groupByExpandedKeys.length; index++) {
+            const groupFilter = {
+                conditions: [
+                    {
+                        name: guaranteeNonNullable(groupByColumns.at(index)).name,
+                        type: PRIMITIVE_TYPE.STRING,
+                        operation: DATA_CUBE_FILTER_OPERATION.EQUALS,
+                        value: groupByExpandedKeys.at(index),
+                    },
+                ],
+                groupOperation: extractElementNameFromPath(DATA_CUBE_FUNCTIONS.AND),
+            };
+            groupByFilter = groupFilter;
+        }
         // --------------------------------- SORT ---------------------------------
         const newSortColumns = request.sortModel.map((sortInfo) => {
             const column = guaranteeNonNullable(baseSnapshot.columns.find((col) => col.name === sortInfo.colId));
@@ -81,13 +111,21 @@ export class DataCubeGridClientServerSideDataSource {
                     : DATA_CUBE_COLUMN_SORT_DIRECTION.DESCENDING,
             };
         });
-        if (!deepEqual(newSortColumns, baseSnapshot.sortColumns)) {
+        if (!deepEqual(newSortColumns, baseSnapshot.sortColumns) ||
+            !deepEqual(groupByExpandedKeys, baseSnapshot.groupByExpandedKeys) ||
+            !deepEqual(groupByColumns, baseSnapshot.groupByColumns) ||
+            !deepEqual(groupByAggColumns, baseSnapshot.groupByAggColumns) ||
+            !deepEqual(groupByFilter, baseSnapshot.groupByFilter)) {
             createNew = true;
         }
         // --------------------------------- FINALIZE ---------------------------------
         if (createNew) {
             const newSnapshot = cloneSnapshot(baseSnapshot);
             newSnapshot.sortColumns = newSortColumns;
+            newSnapshot.groupByExpandedKeys = groupByExpandedKeys;
+            newSnapshot.groupByColumns = groupByColumns;
+            newSnapshot.groupByAggColumns = groupByAggColumns;
+            newSnapshot.groupByFilter = groupByFilter;
             return newSnapshot;
         }
         return baseSnapshot;