@finos/legend-application-repl 0.0.29 → 0.0.31

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

@@ -13,8 +13,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { DataCubeQuerySnapshotSortDirection, _getCol, DataCubeQuerySnapshotAggregateFunction, } from '../core/DataCubeQuerySnapshot.js';
-import { IllegalStateError, deepEqual, guaranteeNonNullable, isNonNullable, } from '@finos/legend-shared';
+import { DataCubeQuerySnapshotSortOperation, _getCol, DataCubeQuerySnapshotAggregateFunction, } from '../core/DataCubeQuerySnapshot.js';
+import { IllegalStateError, guaranteeNonNullable, isNonNullable, } from '@finos/legend-shared';
 import { GridClientAggregateOperation, GridClientSortDirection, } from './DataCubeGridClientEngine.js';
 // --------------------------------- UTILITIES ---------------------------------
 function _aggFunc(func) {
@@ -35,12 +35,13 @@ function _aggFunc(func) {
 }
 // --------------------------------- MAIN ---------------------------------
 export function buildQuerySnapshot(request, baseSnapshot) {
-    let createNew = false;
+    const snapshot = baseSnapshot.clone();
+    // --------------------------------- SELECT ---------------------------------
+    // TODO: @akphi - Implement this
     // --------------------------------- GROUP BY ---------------------------------
-    let groupBy = undefined;
     if (request.rowGroupCols.length) {
         const availableCols = baseSnapshot.stageCols('aggregation');
-        groupBy = {
+        snapshot.data.groupBy = {
             columns: request.rowGroupCols.map((col) => ({
                 name: col.id,
                 type: _getCol(availableCols, col.id).type,
@@ -54,30 +55,17 @@ export function buildQuerySnapshot(request, baseSnapshot) {
             })),
         };
     }
-    // --------------------------------- SORT ---------------------------------
-    let sortColumns = [];
-    if (request.sortModel.length) {
-        const availableCols = baseSnapshot.stageCols('sort');
-        sortColumns = request.sortModel.map((item) => ({
-            ..._getCol(availableCols, item.colId),
-            direction: item.sort === GridClientSortDirection.ASCENDING
-                ? DataCubeQuerySnapshotSortDirection.ASCENDING
-                : DataCubeQuerySnapshotSortDirection.DESCENDING,
-        }));
+    else {
+        snapshot.data.groupBy = undefined;
     }
-    // --------------------------------- SELECT ---------------------------------
-    // TODO: @akphi - Implement this
+    // --------------------------------- SORT ---------------------------------
+    snapshot.data.sortColumns = request.sortModel.map((item) => ({
+        ..._getCol(baseSnapshot.stageCols('sort'), item.colId),
+        operation: item.sort === GridClientSortDirection.ASCENDING
+            ? DataCubeQuerySnapshotSortOperation.ASCENDING
+            : DataCubeQuerySnapshotSortOperation.DESCENDING,
+    }));
     // --------------------------------- FINALIZE ---------------------------------
-    if (!deepEqual(sortColumns, baseSnapshot.data.sortColumns) ||
-        !deepEqual(groupBy, baseSnapshot.data.groupBy)) {
-        createNew = true;
-    }
-    if (createNew) {
-        const newSnapshot = baseSnapshot.clone();
-        newSnapshot.data.sortColumns = sortColumns;
-        newSnapshot.data.groupBy = groupBy;
-        return newSnapshot;
-    }
-    return baseSnapshot;
+    return snapshot.finalize();
 }
 //# sourceMappingURL=DataCubeGridQuerySnapshotBuilder.js.map

package/lib/stores/dataCube/grid/DataCubeGridQuerySnapshotBuilder.js.map

@@ -1 +1 @@
-{"version":3,"file":"DataCubeGridQuerySnapshotBuilder.js","sourceRoot":"","sources":["../../../../src/stores/dataCube/grid/DataCubeGridQuerySnapshotBuilder.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAUH,OAAO,EAGL,kCAAkC,EAClC,OAAO,EACP,sCAAsC,GAEvC,MAAM,kCAAkC,CAAC;AAC1C,OAAO,EACL,iBAAiB,EACjB,SAAS,EACT,oBAAoB,EACpB,aAAa,GACd,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EACL,4BAA4B,EAC5B,uBAAuB,GACxB,MAAM,+BAA+B,CAAC;AAEvC,gFAAgF;AAEhF,SAAS,QAAQ,CACf,IAAkC;IAElC,QAAQ,IAAI,EAAE,CAAC;QACb,KAAK,4BAA4B,CAAC,OAAO;YACvC,OAAO,sCAAsC,CAAC,OAAO,CAAC;QACxD,KAAK,4BAA4B,CAAC,KAAK;YACrC,OAAO,sCAAsC,CAAC,KAAK,CAAC;QACtD,KAAK,4BAA4B,CAAC,GAAG;YACnC,OAAO,sCAAsC,CAAC,GAAG,CAAC;QACpD,KAAK,4BAA4B,CAAC,GAAG;YACnC,OAAO,sCAAsC,CAAC,GAAG,CAAC;QACpD,KAAK,4BAA4B,CAAC,GAAG;YACnC,OAAO,sCAAsC,CAAC,GAAG,CAAC;QACpD;YACE,MAAM,IAAI,iBAAiB,CAAC,mCAAmC,IAAI,GAAG,CAAC,CAAC;IAC5E,CAAC;AACH,CAAC;AAED,2EAA2E;AAE3E,MAAM,UAAU,kBAAkB,CAChC,OAAkC,EAClC,YAAmC;IAEnC,IAAI,SAAS,GAAG,KAAK,CAAC;IAEtB,+EAA+E;IAE/E,IAAI,OAAO,GAA6C,SAAS,CAAC;IAElE,IAAI,OAAO,CAAC,YAAY,CAAC,MAAM,EAAE,CAAC;QAChC,MAAM,aAAa,GAAG,YAAY,CAAC,SAAS,CAAC,aAAa,CAAC,CAAC;QAC5D,OAAO,GAAG;YACR,OAAO,EAAE,OAAO,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;gBAC1C,IAAI,EAAE,GAAG,CAAC,EAAE;gBACZ,IAAI,EAAE,OAAO,CAAC,aAAa,EAAE,GAAG,CAAC,EAAE,CAAC,CAAC,IAAI;aAC1C,CAAC,CAAC;YACH,UAAU,EAAE,OAAO,CAAC,SAAS;iBAC1B,MAAM,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,aAAa,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,aAAa,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;iBACvE,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;gBACb,IAAI,EAAE,oBAAoB,CAAC,GAAG,CAAC,KAAK,CAAC;gBACrC,IAAI,EAAE,OAAO,CAAC,aAAa,EAAE,oBAAoB,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI;gBAClE,QAAQ,EAAE,QAAQ,CAAC,GAAG,CAAC,OAAuC,CAAC;aAChE,CAAC,CAAC;SACN,CAAC;IACJ,CAAC;IAED,2EAA2E;IAE3E,IAAI,WAAW,GAAsC,EAAE,CAAC;IACxD,IAAI,OAAO,CAAC,SAAS,CAAC,MAAM,EAAE,CAAC;QAC7B,MAAM,aAAa,GAAG,YAAY,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;QACrD,WAAW,GAAG,OAAO,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;YAC7C,GAAG,OAAO,CAAC,aAAa,EAAE,IAAI,CAAC,KAAK,CAAC;YACrC,SAAS,EACP,IAAI,CAAC,IAAI,KAAK,uBAAuB,CAAC,SAAS;gBAC7C,CAAC,CAAC,kCAAkC,CAAC,SAAS;gBAC9C,CAAC,CAAC,kCAAkC,CAAC,UAAU;SACpD,CAAC,CAAC,CAAC;IACN,CAAC;IAED,6EAA6E;IAC7E,gCAAgC;IAEhC,+EAA+E;IAE/E,IACE,CAAC,SAAS,CAAC,WAAW,EAAE,YAAY,CAAC,IAAI,CAAC,WAAW,CAAC;QACtD,CAAC,SAAS,CAAC,OAAO,EAAE,YAAY,CAAC,IAAI,CAAC,OAAO,CAAC,EAC9C,CAAC;QACD,SAAS,GAAG,IAAI,CAAC;IACnB,CAAC;IAED,IAAI,SAAS,EAAE,CAAC;QACd,MAAM,WAAW,GAAG,YAAY,CAAC,KAAK,EAAE,CAAC;QACzC,WAAW,CAAC,IAAI,CAAC,WAAW,GAAG,WAAW,CAAC;QAC3C,WAAW,CAAC,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;QACnC,OAAO,WAAW,CAAC;IACrB,CAAC;IACD,OAAO,YAAY,CAAC;AACtB,CAAC"}
+{"version":3,"file":"DataCubeGridQuerySnapshotBuilder.js","sourceRoot":"","sources":["../../../../src/stores/dataCube/grid/DataCubeGridQuerySnapshotBuilder.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAUH,OAAO,EAEL,kCAAkC,EAClC,OAAO,EACP,sCAAsC,GACvC,MAAM,kCAAkC,CAAC;AAC1C,OAAO,EACL,iBAAiB,EACjB,oBAAoB,EACpB,aAAa,GACd,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EACL,4BAA4B,EAC5B,uBAAuB,GACxB,MAAM,+BAA+B,CAAC;AAEvC,gFAAgF;AAEhF,SAAS,QAAQ,CACf,IAAkC;IAElC,QAAQ,IAAI,EAAE,CAAC;QACb,KAAK,4BAA4B,CAAC,OAAO;YACvC,OAAO,sCAAsC,CAAC,OAAO,CAAC;QACxD,KAAK,4BAA4B,CAAC,KAAK;YACrC,OAAO,sCAAsC,CAAC,KAAK,CAAC;QACtD,KAAK,4BAA4B,CAAC,GAAG;YACnC,OAAO,sCAAsC,CAAC,GAAG,CAAC;QACpD,KAAK,4BAA4B,CAAC,GAAG;YACnC,OAAO,sCAAsC,CAAC,GAAG,CAAC;QACpD,KAAK,4BAA4B,CAAC,GAAG;YACnC,OAAO,sCAAsC,CAAC,GAAG,CAAC;QACpD;YACE,MAAM,IAAI,iBAAiB,CAAC,mCAAmC,IAAI,GAAG,CAAC,CAAC;IAC5E,CAAC;AACH,CAAC;AAED,2EAA2E;AAE3E,MAAM,UAAU,kBAAkB,CAChC,OAAkC,EAClC,YAAmC;IAEnC,MAAM,QAAQ,GAAG,YAAY,CAAC,KAAK,EAAE,CAAC;IAEtC,6EAA6E;IAC7E,gCAAgC;IAEhC,+EAA+E;IAE/E,IAAI,OAAO,CAAC,YAAY,CAAC,MAAM,EAAE,CAAC;QAChC,MAAM,aAAa,GAAG,YAAY,CAAC,SAAS,CAAC,aAAa,CAAC,CAAC;QAC5D,QAAQ,CAAC,IAAI,CAAC,OAAO,GAAG;YACtB,OAAO,EAAE,OAAO,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;gBAC1C,IAAI,EAAE,GAAG,CAAC,EAAE;gBACZ,IAAI,EAAE,OAAO,CAAC,aAAa,EAAE,GAAG,CAAC,EAAE,CAAC,CAAC,IAAI;aAC1C,CAAC,CAAC;YACH,UAAU,EAAE,OAAO,CAAC,SAAS;iBAC1B,MAAM,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,aAAa,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,aAAa,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;iBACvE,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;gBACb,IAAI,EAAE,oBAAoB,CAAC,GAAG,CAAC,KAAK,CAAC;gBACrC,IAAI,EAAE,OAAO,CAAC,aAAa,EAAE,oBAAoB,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI;gBAClE,QAAQ,EAAE,QAAQ,CAAC,GAAG,CAAC,OAAuC,CAAC;aAChE,CAAC,CAAC;SACN,CAAC;IACJ,CAAC;SAAM,CAAC;QACN,QAAQ,CAAC,IAAI,CAAC,OAAO,GAAG,SAAS,CAAC;IACpC,CAAC;IAED,2EAA2E;IAE3E,QAAQ,CAAC,IAAI,CAAC,WAAW,GAAG,OAAO,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;QAC3D,GAAG,OAAO,CAAC,YAAY,CAAC,SAAS,CAAC,MAAM,CAAC,EAAE,IAAI,CAAC,KAAK,CAAC;QACtD,SAAS,EACP,IAAI,CAAC,IAAI,KAAK,uBAAuB,CAAC,SAAS;YAC7C,CAAC,CAAC,kCAAkC,CAAC,SAAS;YAC9C,CAAC,CAAC,kCAAkC,CAAC,UAAU;KACpD,CAAC,CAAC,CAAC;IAEJ,+EAA+E;IAE/E,OAAO,QAAQ,CAAC,QAAQ,EAAE,CAAC;AAC7B,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@finos/legend-application-repl",
-  "version": "0.0.29",
+  "version": "0.0.31",
   "description": "Legend REPL Grid client application core",
   "keywords": [
     "legend",
@@ -49,19 +49,21 @@
     "@ag-grid-community/core": "31.3.2",
     "@ag-grid-community/react": "31.3.2",
     "@ag-grid-community/styles": "31.3.2",
+    "@ag-grid-enterprise/clipboard": "31.3.2",
     "@ag-grid-enterprise/core": "31.3.2",
     "@ag-grid-enterprise/menu": "31.3.2",
+    "@ag-grid-enterprise/range-selection": "31.3.2",
     "@ag-grid-enterprise/row-grouping": "31.3.2",
     "@ag-grid-enterprise/server-side-row-model": "31.3.2",
-    "@finos/legend-application": "15.1.11",
-    "@finos/legend-art": "7.1.39",
-    "@finos/legend-graph": "31.10.6",
-    "@finos/legend-lego": "1.2.42",
-    "@finos/legend-shared": "10.0.41",
+    "@finos/legend-application": "15.1.13",
+    "@finos/legend-art": "7.1.41",
+    "@finos/legend-graph": "31.10.8",
+    "@finos/legend-lego": "1.2.44",
+    "@finos/legend-shared": "10.0.43",
     "@types/react": "18.3.3",
     "@types/react-dom": "18.3.0",
     "antlr4": "4.13.1-patch-1",
-    "mobx": "6.12.4",
+    "mobx": "6.12.5",
     "mobx-react-lite": "4.0.7",
     "monaco-editor": "0.50.0",
     "react": "18.3.1",
@@ -70,7 +72,7 @@
     "serializr": "3.0.2"
   },
   "devDependencies": {
-    "@finos/legend-dev-utils": "2.1.9",
+    "@finos/legend-dev-utils": "2.1.11",
     "@jest/globals": "29.7.0",
     "cross-env": "7.0.3",
     "eslint": "8.57.0",

package/src/components/dataCube/DataCube.tsx

@@ -20,39 +20,62 @@ import { useEffect, useRef } from 'react';
 import { DataCubeGrid } from './grid/DataCubeGrid.js';
 import { DataCubeEditor } from './editor/DataCubeEditor.js';
 import { useApplicationStore } from '@finos/legend-application';
-import { DataCubeIcon } from '@finos/legend-art';
+import { DataCubeIcon, ProgressBar } from '@finos/legend-art';
 
 const DataCubeStatusBar = observer(() => {
   const dataCubeStore = useREPLStore();
-  const dataCubeState = dataCubeStore.dataCubeState;
+  const dataCube = dataCubeStore.dataCube;
 
   return (
-    <div className="flex h-5 w-full bg-neutral-100">
-      <button className="pl-2">
-        <DataCubeIcon.Documentation className="text-xl text-sky-600" />
-      </button>
-      <button
-        className="flex w-1/2 items-center px-2 text-sky-600 underline"
-        onClick={(): void => dataCubeState.editor.openPanel()}
-      >
-        Pivot
-      </button>
-      <button className="flex w-1/2 items-center px-2 text-sky-600 underline">
-        Filter
-      </button>
+    <div className="flex h-5 w-full justify-between bg-neutral-100">
+      <div className="flex flex-1">
+        <button
+          className="pl-2 text-sky-600 hover:text-sky-700"
+          title="See Documentation"
+        >
+          <DataCubeIcon.Documentation className="text-xl" />
+        </button>
+        <button
+          className="flex items-center px-3 text-sky-600 hover:text-sky-700"
+          onClick={(): void => dataCube.editor.openPanel()}
+        >
+          <DataCubeIcon.Settings className="text-xl" />
+          <div className="pl-0.5 underline">Properties</div>
+        </button>
+        <div className="flex-1">
+          <button className="flex items-center text-sky-600 hover:text-sky-700">
+            <DataCubeIcon.TableFilter className="text-lg" />
+            <div className="pl-0.5 underline">Filter</div>
+          </button>
+        </div>
+      </div>
+      <div className="flex items-center px-2">
+        <div className="flex h-3.5 w-48 border-[0.5px] border-neutral-300">
+          {dataCube.runningTaskes.size > 0 && (
+            <ProgressBar
+              classes={{
+                root: 'h-3.5 w-full bg-transparent',
+                bar1Indeterminate: 'bg-green-500',
+                bar2Indeterminate: 'bg-green-500',
+              }}
+              variant="indeterminate"
+            />
+          )}
+        </div>
+      </div>
     </div>
   );
 });
 
 const DataCubeTitleBar = observer(() => {
   const dataCubeStore = useREPLStore();
-  const dataCubeState = dataCubeStore.dataCubeState;
+  const dataCube = dataCubeStore.dataCube;
 
   return (
     <div className="flex h-6 justify-between bg-neutral-100">
       <div className="flex select-none items-center pl-1 pr-2 text-lg font-medium">
         <DataCubeIcon.Cube className="mr-1 h-4 w-4" />
-        <div>{dataCubeState.editor.generalPropertiesPanel.name}</div>
+        <div>{dataCube.core.name}</div>
         {/* TODO: @akphi - add save icon */}
       </div>
     </div>
@@ -63,11 +86,11 @@ export const DataCube = observer(() => {
   const dataCubeStore = useREPLStore();
   const ref = useRef<HTMLDivElement>(null);
   const applicationStore = useApplicationStore();
-  const dataCubeState = dataCubeStore.dataCubeState;
+  const dataCube = dataCubeStore.dataCube;
 
   useEffect(() => {
-    dataCubeState.initialize().catch(applicationStore.logUnhandledError);
-  }, [dataCubeState, applicationStore]);
+    dataCube.initialize().catch(applicationStore.logUnhandledError);
+  }, [dataCube, applicationStore]);
 
   return (
     <div
@@ -77,9 +100,7 @@ export const DataCube = observer(() => {
       <DataCubeTitleBar />
       <DataCubeGrid />
       <DataCubeStatusBar />
-      {dataCubeState.editor.isPanelOpen && (
-        <DataCubeEditor containerRef={ref} />
-      )}
+      {dataCube.editor.isPanelOpen && <DataCubeEditor containerRef={ref} />}
     </div>
   );
 });

package/src/components/dataCube/editor/DataCubeEditor.tsx

@@ -28,6 +28,7 @@ import { DataCubeEditorFilterPanel } from './DataCubeEditorFilterPanel.js';
 import { DataCubeEditorExtendedColumnsPanel } from './DataCubeEditorExtendedColumnsPanel.js';
 import { DataCubeEditorCodePanel } from './DataCubeEditorCodePanel.js';
 import { DataCubeEditorColumnPropertiesPanel } from './DataCubeEditorColumnPropertiesPanel.js';
+import { DataCubeEditorDeveloperPanel } from './DataCubeEditorDeveloperPanel.js';
 
 const __DATA_CUBE_EDITOR_HEADER_CLASS_NAME = 'data-cube__editor__header';
 const PANEL_DEFAULT_OFFSET = 50;
@@ -46,7 +47,7 @@ export const DataCubeEditor = observer(
       height: PANEL_DEFAULT_HEIGHT,
     });
     const replStore = useREPLStore();
-    const editor = replStore.dataCubeState.editor;
+    const editor = replStore.dataCube.editor;
     const selectedTab = editor.currentTab;
     const tabs = [
       DATA_CUBE_EDITOR_TAB.COLUMNS,
@@ -58,6 +59,7 @@ export const DataCubeEditor = observer(
       DATA_CUBE_EDITOR_TAB.GENERAL_PROPERTIES,
       DATA_CUBE_EDITOR_TAB.COLUMN_PROPERTIES,
       DATA_CUBE_EDITOR_TAB.CODE,
+      DATA_CUBE_EDITOR_TAB.DEVELOPER,
     ];
 
     useEffect(() => {
@@ -204,6 +206,9 @@ export const DataCubeEditor = observer(
               {selectedTab === DATA_CUBE_EDITOR_TAB.CODE && (
                 <DataCubeEditorCodePanel />
               )}
+              {selectedTab === DATA_CUBE_EDITOR_TAB.DEVELOPER && (
+                <DataCubeEditorDeveloperPanel />
+              )}
             </div>
           </div>
           <div className="flex h-10 items-center justify-end px-2">

package/src/components/dataCube/editor/DataCubeEditorCodePanel.tsx

@@ -143,7 +143,7 @@ import { useREPLStore } from '../../REPLStoreProvider.js';
 
 export const DataCubeEditorCodePanel = observer(() => {
   const replStore = useREPLStore();
-  const panel = replStore.dataCubeState.editor.sortsPanel;
+  const panel = replStore.dataCube.editor.sortsPanel;
   // const executeLambda = (): void => {
   //   // TODO: @akphi
   //   // flowResult(dataCubeState.executeLambda()).catch(
@@ -154,7 +154,7 @@ export const DataCubeEditorCodePanel = observer(() => {
   useEffect(() => {}, [panel]); // TODO: @akphi - remove this dummy useEffect
 
   return (
-    <div className="data-cube-column-selector h-full w-full p-2">
+    <div className="h-full w-full select-none p-2">
       <div className="flex h-6">
         <div className="flex h-6 items-center text-xl font-medium">
           <DataCubeIcon.Code />