@finos/legend-application-repl 0.0.56 → 0.0.57

package/src/stores/dataCube/grid/DataCubeGridQuerySnapshotBuilder.ts

@@ -43,7 +43,7 @@ export function buildQuerySnapshot(
   // --------------------------------- GROUP BY ---------------------------------
 
   if (request.rowGroupCols.length) {
-    const availableCols = baseSnapshot.stageCols('aggregation');
+    const availableCols = baseSnapshot.stageCols('group-by');
     const newGroupByColumns = request.rowGroupCols.map((col) => ({
       name: col.id,
       type: _getCol(availableCols, col.id).type,
@@ -74,5 +74,5 @@ export function buildQuerySnapshot(
 
   // --------------------------------- FINALIZE ---------------------------------
 
-  return snapshot.finalize();
+  return snapshot;
 }

package/src/stores/dataCube/grid/DataCubeGridState.ts

@@ -14,15 +14,16 @@
  * limitations under the License.
  */
 
-import { guaranteeNonNullable, hashArray } from '@finos/legend-shared';
-import { action, makeObservable, observable, runInAction } from 'mobx';
+import { guaranteeNonNullable } from '@finos/legend-shared';
+import { action, makeObservable, observable } from 'mobx';
 import type { GridApi } from '@ag-grid-community/core';
 import type { DataCubeState } from '../DataCubeState.js';
 import {
   DataCubeGridClientServerSideDataSource,
   INTERNAL__GRID_CLIENT_DEFAULT_CACHE_BLOCK_SIZE,
-  INTERNAL__GRID_CLIENT_FILTER_TRIGGER_COLUMN_ID,
+  INTERNAL__GRID_CLIENT_DATA_FETCH_MANUAL_TRIGGER_COLUMN_ID,
   INTERNAL__GRID_CLIENT_MAX_CACHE_BLOCK_SIZE,
+  computeHashCodeForDataFetchManualTrigger,
 } from './DataCubeGridClientEngine.js';
 import { DataCubeQuerySnapshotController } from '../core/DataCubeQuerySnapshotManager.js';
 import type { DataCubeQuerySnapshot } from '../core/DataCubeQuerySnapshot.js';
@@ -31,22 +32,6 @@ import { DataCubeConfiguration } from '../core/DataCubeConfiguration.js';
 import { DataCubeGridControllerState } from './DataCubeGridControllerState.js';
 import { DataCubeGridClientExportEngine } from './DataCubeGridClientExportEngine.js';
 
-class DataCubeGridDatasourceConfiguration {
-  readonly limit?: number | undefined;
-
-  constructor(input: {
-    snapshot?: DataCubeQuerySnapshot | undefined;
-    queryConfiguration?: DataCubeConfiguration | undefined;
-  }) {
-    const { snapshot } = input;
-    this.limit = snapshot?.data.limit;
-  }
-
-  get hashCode() {
-    return hashArray([`limit: ${this.limit ?? ''}`]);
-  }
-}
-
 /**
  * This query editor state is responsible for syncing the internal state of ag-grid
  * server-side row model data source with the data cube query state. When new snapshot
@@ -69,29 +54,32 @@ export class DataCubeGridState extends DataCubeQuerySnapshotController {
 
   clientDataSource: DataCubeGridClientServerSideDataSource;
 
+  queryConfiguration: DataCubeConfiguration;
+  rowLimit?: number | undefined;
   isPaginationEnabled = false;
   scrollHintText?: string | undefined;
-  datasourceConfiguration: DataCubeGridDatasourceConfiguration;
-  queryConfiguration: DataCubeConfiguration;
 
   constructor(dataCube: DataCubeState) {
     super(dataCube);
 
     makeObservable(this, {
       clientDataSource: observable,
-      datasourceConfiguration: observable,
+
       queryConfiguration: observable,
 
+      rowLimit: observable,
+
       isPaginationEnabled: observable,
       setPaginationEnabled: action,
 
       scrollHintText: observable,
       setScrollHintText: action,
+
+      applySnapshot: action,
     });
 
     this.controller = new DataCubeGridControllerState(this.dataCube);
     this.exportEngine = new DataCubeGridClientExportEngine(this);
-    this.datasourceConfiguration = new DataCubeGridDatasourceConfiguration({});
     this.queryConfiguration = new DataCubeConfiguration();
     this.clientDataSource = new DataCubeGridClientServerSideDataSource(this);
   }
@@ -129,28 +117,11 @@ export class DataCubeGridState extends DataCubeQuerySnapshotController {
     snapshot: DataCubeQuerySnapshot,
     previousSnapshot: DataCubeQuerySnapshot | undefined,
   ) {
-    const existingExtraConfiguration = this.datasourceConfiguration;
     const queryConfiguration = DataCubeConfiguration.serialization.fromJson(
       snapshot.data.configuration,
     );
-
-    // NOTE: if one of the change affects the structure of the data cube but cannot be captured
-    // in the grid client options, we will need to manually reset the grid by resetting the
-    // datasource to ensure we don't fetch the result twice while forcing the data to be refreshed
-    runInAction(() => {
-      this.datasourceConfiguration = new DataCubeGridDatasourceConfiguration({
-        snapshot,
-        queryConfiguration,
-      });
-      this.queryConfiguration = queryConfiguration;
-    });
-    if (
-      existingExtraConfiguration.hashCode !==
-      this.datasourceConfiguration.hashCode
-    ) {
-      // reset the entire grid
-      this.clientDataSource = new DataCubeGridClientServerSideDataSource(this);
-    }
+    this.queryConfiguration = queryConfiguration;
+    this.rowLimit = snapshot.data.limit;
 
     const gridOptions = generateGridOptionsFromSnapshot(
       snapshot,
@@ -165,11 +136,18 @@ export class DataCubeGridState extends DataCubeQuerySnapshotController {
         ? INTERNAL__GRID_CLIENT_DEFAULT_CACHE_BLOCK_SIZE
         : INTERNAL__GRID_CLIENT_MAX_CACHE_BLOCK_SIZE,
     });
-    // NOTE: change the value to the hashcode of the filter to trigger data fetch when filter is modified
+
+    // NOTE: when there are changes that affect the data query specification but cannot be captured
+    // in the grid client options, we will need to manually trigger data fetching by updating the
+    // following hash code which is computed from those parts of the new snapshot then making use of
+    // the filter configuration mechanism to trigger getRows() method of server-side row model data source
     this.client.setFilterModel({
-      [INTERNAL__GRID_CLIENT_FILTER_TRIGGER_COLUMN_ID]: {
+      [INTERNAL__GRID_CLIENT_DATA_FETCH_MANUAL_TRIGGER_COLUMN_ID]: {
         type: 'equals',
-        filter: snapshot.hashCode,
+        filter: computeHashCodeForDataFetchManualTrigger(
+          snapshot,
+          queryConfiguration,
+        ),
       },
     });
   }

package/tsconfig.json

@@ -75,7 +75,6 @@
     "./src/stores/dataCube/core/aggregation/DataCubeQueryAggregateOperation.ts",
     "./src/stores/dataCube/core/filter/DataCubeQueryFilterEditorState.ts",
     "./src/stores/dataCube/core/filter/DataCubeQueryFilterOperation.ts",
-    "./src/stores/dataCube/editor/DataCubeEditorCodePanelState.ts",
     "./src/stores/dataCube/editor/DataCubeEditorColumnPropertiesPanelState.ts",
     "./src/stores/dataCube/editor/DataCubeEditorColumnsPanelState.ts",
     "./src/stores/dataCube/editor/DataCubeEditorColumnsSelectorState.ts",
@@ -99,7 +98,6 @@
     "./src/components/REPLStoreProvider.tsx",
     "./src/components/dataCube/DataCube.tsx",
     "./src/components/dataCube/editor/DataCubeEditor.tsx",
-    "./src/components/dataCube/editor/DataCubeEditorCodePanel.tsx",
     "./src/components/dataCube/editor/DataCubeEditorColumnPropertiesPanel.tsx",
     "./src/components/dataCube/editor/DataCubeEditorColumnsPanel.tsx",
     "./src/components/dataCube/editor/DataCubeEditorColumnsSelector.tsx",

package/lib/components/dataCube/editor/DataCubeEditorCodePanel.d.ts

@@ -1,22 +0,0 @@
-/**
- * Copyright (c) 2020-present, Goldman Sachs
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-import type { DataCubeState } from '../../../stores/dataCube/DataCubeState.js';
-export declare const DataCubeEditorCodePanel: ((props: {
-    dataCube: DataCubeState;
-}) => import("react/jsx-runtime").JSX.Element) & {
-    displayName: string;
-};
-//# sourceMappingURL=DataCubeEditorCodePanel.d.ts.map

package/lib/components/dataCube/editor/DataCubeEditorCodePanel.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"DataCubeEditorCodePanel.d.ts","sourceRoot":"","sources":["../../../../src/components/dataCube/editor/DataCubeEditorCodePanel.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAMH,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,2CAA2C,CAAC;AAE/E,eAAO,MAAM,uBAAuB,WAC1B;IAAE,QAAQ,EAAE,aAAa,CAAA;CAAE;;CAmBpC,CAAC"}

package/lib/components/dataCube/editor/DataCubeEditorCodePanel.js

@@ -1,26 +0,0 @@
-import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
-/**
- * Copyright (c) 2020-present, Goldman Sachs
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-import { observer } from 'mobx-react-lite';
-import { DataCubeIcon } from '@finos/legend-art';
-import { useEffect } from 'react';
-import { FormBadge_WIP } from '../../repl/Form.js';
-export const DataCubeEditorCodePanel = observer((props) => {
-    /** TODO: @datacube cleanup - this dummy useEffect */
-    useEffect(() => { }, []);
-    return (_jsxs("div", { className: "h-full w-full select-none p-2", children: [_jsxs("div", { className: "flex h-6", children: [_jsx("div", { className: "flex h-6 items-center text-xl font-medium", children: _jsx(DataCubeIcon.Code, {}) }), _jsxs("div", { className: "ml-1 flex h-6 items-center text-xl font-medium", children: ["Code", _jsx(FormBadge_WIP, {})] })] }), _jsx("div", { className: "flex h-[calc(100%_-_24px)] w-full" })] }));
-});
-//# sourceMappingURL=DataCubeEditorCodePanel.js.map

package/lib/components/dataCube/editor/DataCubeEditorCodePanel.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"DataCubeEditorCodePanel.js","sourceRoot":"","sources":["../../../../src/components/dataCube/editor/DataCubeEditorCodePanel.tsx"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAC3C,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AACjD,OAAO,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;AAClC,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAGnD,MAAM,CAAC,MAAM,uBAAuB,GAAG,QAAQ,CAC7C,CAAC,KAAkC,EAAE,EAAE;IACrC,qDAAqD;IACrD,SAAS,CAAC,GAAG,EAAE,GAAE,CAAC,EAAE,EAAE,CAAC,CAAC;IAExB,OAAO,CACL,eAAK,SAAS,EAAC,+BAA+B,aAC5C,eAAK,SAAS,EAAC,UAAU,aACvB,cAAK,SAAS,EAAC,2CAA2C,YACxD,KAAC,YAAY,CAAC,IAAI,KAAG,GACjB,EACN,eAAK,SAAS,EAAC,gDAAgD,qBAE7D,KAAC,aAAa,KAAG,IACb,IACF,EACN,cAAK,SAAS,EAAC,mCAAmC,GAAO,IACrD,CACP,CAAC;AACJ,CAAC,CACF,CAAC"}

package/lib/stores/dataCube/editor/DataCubeEditorCodePanelState.d.ts

@@ -1,39 +0,0 @@
-/**
- * Copyright (c) 2020-present, Goldman Sachs
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-import type { DataCubeState } from '../DataCubeState.js';
-import { type GeneratorFn } from '@finos/legend-shared';
-import { ParserError, SourceInformation } from '@finos/legend-graph';
-import type { DataCubeEditorState } from './DataCubeEditorState.js';
-declare class DataCubeQueryEditorState {
-    uuid: string;
-    query: string;
-    parserError?: ParserError | undefined;
-    constructor(query: string);
-    setQuery(val: string): void;
-    setParserError(parserError: ParserError | undefined): void;
-    processSourceInformation(sourceInformation: SourceInformation): SourceInformation;
-}
-export declare class DataCubeEditorCodePanelState {
-    readonly dataCube: DataCubeState;
-    readonly editor: DataCubeEditorState;
-    queryEditorState: DataCubeQueryEditorState;
-    currentSubQuery?: string | undefined;
-    constructor(editor: DataCubeEditorState);
-    setCurrentSubQuery(val: string | undefined): void;
-    parseQuery(): GeneratorFn<void>;
-}
-export {};
-//# sourceMappingURL=DataCubeEditorCodePanelState.d.ts.map

package/lib/stores/dataCube/editor/DataCubeEditorCodePanelState.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"DataCubeEditorCodePanelState.d.ts","sourceRoot":"","sources":["../../../../src/stores/dataCube/editor/DataCubeEditorCodePanelState.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAGH,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AACzD,OAAO,EAKL,KAAK,WAAW,EAEjB,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EACL,WAAW,EACX,iBAAiB,EAElB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AAEpE,cAAM,wBAAwB;IAC5B,IAAI,SAAU;IACd,KAAK,EAAE,MAAM,CAAC;IACd,WAAW,CAAC,EAAE,WAAW,GAAG,SAAS,CAAC;gBAE1B,KAAK,EAAE,MAAM;IAWzB,QAAQ,CAAC,GAAG,EAAE,MAAM;IAIpB,cAAc,CAAC,WAAW,EAAE,WAAW,GAAG,SAAS;IAUnD,wBAAwB,CAAC,iBAAiB,EAAE,iBAAiB;CAa9D;AAED,qBAAa,4BAA4B;IACvC,QAAQ,CAAC,QAAQ,EAAG,aAAa,CAAC;IAClC,QAAQ,CAAC,MAAM,EAAE,mBAAmB,CAAC;IAErC,gBAAgB,EAAG,wBAAwB,CAAC;IAC5C,eAAe,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;gBAEzB,MAAM,EAAE,mBAAmB;IAavC,kBAAkB,CAAC,GAAG,EAAE,MAAM,GAAG,SAAS;IAIzC,UAAU,IAAI,WAAW,CAAC,IAAI,CAAC;CAgEjC"}

package/lib/stores/dataCube/editor/DataCubeEditorCodePanelState.js

@@ -1,89 +0,0 @@
-/**
- * Copyright (c) 2020-present, Goldman Sachs
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-import { action, flow, flowResult, makeObservable, observable } from 'mobx';
-import { HttpStatus, NetworkClientError, assertErrorThrown, uuid, } from '@finos/legend-shared';
-import { ParserError, SourceInformation, V1_ParserError, } from '@finos/legend-graph';
-class DataCubeQueryEditorState {
-    uuid = uuid();
-    query;
-    parserError;
-    constructor(query) {
-        makeObservable(this, {
-            query: observable,
-            parserError: observable,
-            setQuery: action,
-            setParserError: action,
-        });
-        this.query = query;
-    }
-    setQuery(val) {
-        this.query = val;
-    }
-    setParserError(parserError) {
-        // account for the lambda prefix offset in source information
-        if (parserError?.sourceInformation) {
-            parserError.sourceInformation = this.processSourceInformation(parserError.sourceInformation);
-        }
-        this.parserError = parserError;
-    }
-    processSourceInformation(sourceInformation) {
-        const { sourceId, startLine, startColumn, endLine, endColumn } = sourceInformation;
-        const lineOffset = 0;
-        const columnOffset = 0;
-        return new SourceInformation(sourceId, startLine + lineOffset, startColumn - (startLine === 1 ? columnOffset : 0), endLine + lineOffset, endColumn - (endLine === 1 ? columnOffset : 0));
-    }
-}
-export class DataCubeEditorCodePanelState {
-    dataCube;
-    editor;
-    queryEditorState;
-    currentSubQuery;
-    constructor(editor) {
-        makeObservable(this, {
-            currentSubQuery: observable,
-            queryEditorState: observable,
-            setCurrentSubQuery: action,
-            parseQuery: flow,
-        });
-        this.editor = editor;
-        this.dataCube = editor.dataCube;
-        this.queryEditorState = new DataCubeQueryEditorState('');
-    }
-    setCurrentSubQuery(val) {
-        this.currentSubQuery = val;
-    }
-    *parseQuery() {
-        try {
-            this.queryEditorState.setParserError(undefined);
-            yield flowResult(this.dataCube.repl.client.parseQuery({
-                code: `|${this.queryEditorState.query}`,
-            }));
-        }
-        catch (error) {
-            assertErrorThrown(error);
-            if (error instanceof NetworkClientError &&
-                error.response.status === HttpStatus.BAD_REQUEST) {
-                const protocol = V1_ParserError.serialization.fromJson(error.payload);
-                const parserError = new ParserError(protocol.message);
-                if (protocol.sourceInformation) {
-                    parserError.sourceInformation = new SourceInformation(protocol.sourceInformation.sourceId, protocol.sourceInformation.startLine, protocol.sourceInformation.startColumn, protocol.sourceInformation.endLine, protocol.sourceInformation.endColumn);
-                }
-                this.queryEditorState.setParserError(parserError);
-            }
-        }
-    }
-}
-//# sourceMappingURL=DataCubeEditorCodePanelState.js.map

package/lib/stores/dataCube/editor/DataCubeEditorCodePanelState.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"DataCubeEditorCodePanelState.js","sourceRoot":"","sources":["../../../../src/stores/dataCube/editor/DataCubeEditorCodePanelState.ts"],"names":[],"mappings":"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"}

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

@@ -1,43 +0,0 @@
-/**
- * Copyright (c) 2020-present, Goldman Sachs
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import { observer } from 'mobx-react-lite';
-import { DataCubeIcon } from '@finos/legend-art';
-import { useEffect } from 'react';
-import { FormBadge_WIP } from '../../repl/Form.js';
-import type { DataCubeState } from '../../../stores/dataCube/DataCubeState.js';
-
-export const DataCubeEditorCodePanel = observer(
-  (props: { dataCube: DataCubeState }) => {
-    /** TODO: @datacube cleanup - this dummy useEffect */
-    useEffect(() => {}, []);
-
-    return (
-      <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 />
-          </div>
-          <div className="ml-1 flex h-6 items-center text-xl font-medium">
-            Code
-            <FormBadge_WIP />
-          </div>
-        </div>
-        <div className="flex h-[calc(100%_-_24px)] w-full"></div>
-      </div>
-    );
-  },
-);

package/src/stores/dataCube/editor/DataCubeEditorCodePanelState.ts

@@ -1,167 +0,0 @@
-/**
- * Copyright (c) 2020-present, Goldman Sachs
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import { action, flow, flowResult, makeObservable, observable } from 'mobx';
-import type { DataCubeState } from '../DataCubeState.js';
-import {
-  HttpStatus,
-  NetworkClientError,
-  assertErrorThrown,
-  uuid,
-  type GeneratorFn,
-  type PlainObject,
-} from '@finos/legend-shared';
-import {
-  ParserError,
-  SourceInformation,
-  V1_ParserError,
-} from '@finos/legend-graph';
-import type { DataCubeEditorState } from './DataCubeEditorState.js';
-
-class DataCubeQueryEditorState {
-  uuid = uuid();
-  query: string;
-  parserError?: ParserError | undefined;
-
-  constructor(query: string) {
-    makeObservable(this, {
-      query: observable,
-      parserError: observable,
-      setQuery: action,
-      setParserError: action,
-    });
-
-    this.query = query;
-  }
-
-  setQuery(val: string) {
-    this.query = val;
-  }
-
-  setParserError(parserError: ParserError | undefined) {
-    // account for the lambda prefix offset in source information
-    if (parserError?.sourceInformation) {
-      parserError.sourceInformation = this.processSourceInformation(
-        parserError.sourceInformation,
-      );
-    }
-    this.parserError = parserError;
-  }
-
-  processSourceInformation(sourceInformation: SourceInformation) {
-    const { sourceId, startLine, startColumn, endLine, endColumn } =
-      sourceInformation;
-    const lineOffset = 0;
-    const columnOffset = 0;
-    return new SourceInformation(
-      sourceId,
-      startLine + lineOffset,
-      startColumn - (startLine === 1 ? columnOffset : 0),
-      endLine + lineOffset,
-      endColumn - (endLine === 1 ? columnOffset : 0),
-    );
-  }
-}
-
-export class DataCubeEditorCodePanelState {
-  readonly dataCube!: DataCubeState;
-  readonly editor: DataCubeEditorState;
-
-  queryEditorState!: DataCubeQueryEditorState;
-  currentSubQuery?: string | undefined;
-
-  constructor(editor: DataCubeEditorState) {
-    makeObservable(this, {
-      currentSubQuery: observable,
-      queryEditorState: observable,
-      setCurrentSubQuery: action,
-      parseQuery: flow,
-    });
-
-    this.editor = editor;
-    this.dataCube = editor.dataCube;
-    this.queryEditorState = new DataCubeQueryEditorState('');
-  }
-
-  setCurrentSubQuery(val: string | undefined) {
-    this.currentSubQuery = val;
-  }
-
-  *parseQuery(): GeneratorFn<void> {
-    try {
-      this.queryEditorState.setParserError(undefined);
-      yield flowResult(
-        this.dataCube.repl.client.parseQuery({
-          code: `|${this.queryEditorState.query}`,
-        }),
-      );
-    } catch (error) {
-      assertErrorThrown(error);
-      if (
-        error instanceof NetworkClientError &&
-        error.response.status === HttpStatus.BAD_REQUEST
-      ) {
-        const protocol = V1_ParserError.serialization.fromJson(
-          error.payload as PlainObject<V1_ParserError>,
-        );
-        const parserError = new ParserError(protocol.message);
-        if (protocol.sourceInformation) {
-          parserError.sourceInformation = new SourceInformation(
-            protocol.sourceInformation.sourceId,
-            protocol.sourceInformation.startLine,
-            protocol.sourceInformation.startColumn,
-            protocol.sourceInformation.endLine,
-            protocol.sourceInformation.endColumn,
-          );
-        }
-        this.queryEditorState.setParserError(parserError);
-      }
-    }
-  }
-
-  // async getTypeaheadResults(
-  //   position: IPosition,
-  //   model: monacoEditorAPI.ITextModel,
-  // ): Promise<monacoLanguagesAPI.CompletionItem[]> {
-  //   try {
-  //     const textUntilPosition = model.getValueInRange({
-  //       startLineNumber: 1,
-  //       startColumn: 1,
-  //       endLineNumber: position.lineNumber,
-  //       endColumn: position.column,
-  //     });
-  //     const resultObj =
-  //       await this.editorStore.client.getTypeaheadResults(textUntilPosition);
-  //     const result = resultObj.map((res) =>
-  //       CompletionItem.serialization.fromJson(res),
-  //     );
-  //     const currentWord = model.getWordUntilPosition(position);
-  //     return result.map((res) => ({
-  //       label: res.display,
-  //       kind: monacoLanguagesAPI.CompletionItemKind.Text,
-  //       range: {
-  //         startLineNumber: position.lineNumber,
-  //         startColumn: currentWord.startColumn + 1,
-  //         endLineNumber: position.lineNumber,
-  //         endColumn: currentWord.endColumn + 1,
-  //       },
-  //       insertText: res.completion,
-  //     })) as monacoLanguagesAPI.CompletionItem[];
-  //   } catch (e) {
-  //     return [];
-  //   }
-  // }
-}