@finos/legend-application-studio 28.19.74 → 28.19.75

package/lib/stores/editor/panel-group/{SQLPlaygroundPanelState.js → StudioSQLPlaygroundPanelState.js}

@@ -13,50 +13,37 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { assertErrorThrown, LogEvent, ActionState, } from '@finos/legend-shared';
+import { assertErrorThrown, LogEvent, ActionState, uniqBy, } from '@finos/legend-shared';
 import { observable, makeObservable, flow, flowResult, action } from 'mobx';
-import { editor as monacoEditorAPI } from 'monaco-editor';
+import { languages as monacoLanguagesAPI } from 'monaco-editor';
 import { guaranteeRelationalDatabaseConnection, GRAPH_MANAGER_EVENT, } from '@finos/legend-graph';
-import { CODE_EDITOR_LANGUAGE, moveCursorToPosition, } from '@finos/legend-code-editor';
 import { STO_RELATIONAL_LEGEND_STUDIO_COMMAND_KEY } from '../../../__lib__/STO_Relational_LegendStudioCommand.js';
 import { PANEL_MODE } from '../EditorConfig.js';
 import { DatabaseSchemaExplorerState } from '../editor-state/element-editor-state/connection/DatabaseBuilderState.js';
+import { AbstractSQLPlaygroundState } from '@finos/legend-lego/sql-playground';
 const DEFAULT_SQL_TEXT = `--Start building your SQL. Note that you can also drag-and-drop nodes from schema explorer\n`;
-export class SQLPlaygroundPanelState {
+export class StudioSQLPlaygroundPanelState extends AbstractSQLPlaygroundState {
     editorStore;
     isFetchingSchema = ActionState.create();
-    executeRawSQLState = ActionState.create();
     connection;
     database;
     schemaExplorerState;
-    sqlEditorTextModel;
-    sqlEditor;
-    sqlEditorViewState;
-    sqlText = DEFAULT_SQL_TEXT;
-    sqlExecutionResult;
-    isLocalModeEnabled = false;
+    databaseSchema;
     constructor(editorStore) {
+        super();
         makeObservable(this, {
             isFetchingSchema: observable,
-            executeRawSQLState: observable,
             connection: observable,
             database: observable,
             schemaExplorerState: observable,
-            sqlText: observable,
-            isLocalModeEnabled: observable,
-            sqlExecutionResult: observable,
-            sqlEditor: observable.ref,
-            sqlEditorViewState: observable.ref,
-            stopExecuteSQL: action,
-            toggleIsLocalModeEnabled: action,
+            databaseSchema: observable,
             setConnection: action,
-            setSQLEditor: action,
-            setSQLEditorViewState: action,
-            setSQLText: action,
+            setDataBaseSchema: action,
             executeRawSQL: flow,
         });
+        this.sqlEditorTextModel.setValue(DEFAULT_SQL_TEXT);
         this.editorStore = editorStore;
-        this.sqlEditorTextModel = monacoEditorAPI.createModel(this.sqlText, CODE_EDITOR_LANGUAGE.SQL);
+        this.databaseSchema = [];
     }
     setConnection(val) {
         this.connection = val;
@@ -71,24 +58,26 @@ export class SQLPlaygroundPanelState {
         }
         this.sqlEditorTextModel.setValue(DEFAULT_SQL_TEXT);
     }
-    setSQLText(val) {
-        this.sqlText = val;
-    }
-    setSQLEditor(val) {
-        this.sqlEditor = val;
-        if (val) {
-            const lines = this.sqlText.split('\n');
-            moveCursorToPosition(val, {
-                lineNumber: lines.length,
-                column: lines.at(-1)?.length ?? 0,
-            });
-        }
+    setDataBaseSchema(val) {
+        this.databaseSchema = val;
     }
-    stopExecuteSQL() {
-        this.sqlExecutionResult = undefined;
+    fetchSchemaMetaData() {
+        return this.schemaExplorerState?.fetchDatabaseMetadata();
     }
-    setSQLEditorViewState(val) {
-        this.sqlEditorViewState = val;
+    getCodeCompletionSuggestions() {
+        const base = super.getCodeCompletionSuggestions();
+        if (this.schemaExplorerState?.treeData) {
+            const dbLabelText = uniqBy(Array.from(this.schemaExplorerState.treeData.nodes.values()).map((value) => value.label), (label) => label);
+            const dbLabelsCompletionItem = uniqBy(dbLabelText.map((value) => ({
+                label: value,
+                kind: monacoLanguagesAPI.CompletionItemKind.Field,
+                insertTextRules: monacoLanguagesAPI.CompletionItemInsertTextRule.InsertAsSnippet,
+                insertText: `${value} `,
+            })), (val) => val.label);
+            this.setDataBaseSchema(dbLabelsCompletionItem);
+            return base.concat(dbLabelText);
+        }
+        return base;
     }
     registerCommands() {
         this.editorStore.applicationStore.commandService.registerCommand({
@@ -105,10 +94,6 @@ export class SQLPlaygroundPanelState {
     deregisterCommands() {
         [STO_RELATIONAL_LEGEND_STUDIO_COMMAND_KEY.SQL_PLAYGROUND_EXECUTE].forEach((key) => this.editorStore.applicationStore.commandService.deregisterCommand(key));
     }
-    toggleIsLocalModeEnabled() {
-        this.isLocalModeEnabled = !this.isLocalModeEnabled;
-        this.sqlExecutionResult = undefined;
-    }
     *executeRawSQL() {
         if (!this.connection || this.executeRawSQLState.isInProgress) {
             return;
@@ -140,4 +125,4 @@ export class SQLPlaygroundPanelState {
         }
     }
 }
-//# sourceMappingURL=SQLPlaygroundPanelState.js.map
+//# sourceMappingURL=StudioSQLPlaygroundPanelState.js.map

package/lib/stores/editor/panel-group/StudioSQLPlaygroundPanelState.js.map

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@finos/legend-application-studio",
-  "version": "28.19.74",
+  "version": "28.19.75",
   "description": "Legend Studio application core",
   "keywords": [
     "legend",
@@ -45,17 +45,17 @@
     "test:watch": "jest --watch"
   },
   "dependencies": {
-    "@finos/legend-application": "16.0.83",
-    "@finos/legend-art": "7.1.133",
-    "@finos/legend-code-editor": "2.0.138",
-    "@finos/legend-data-cube": "0.3.50",
-    "@finos/legend-extension-dsl-data-product": "0.0.32",
-    "@finos/legend-extension-dsl-diagram": "8.1.197",
-    "@finos/legend-graph": "32.3.18",
-    "@finos/legend-lego": "2.0.151",
-    "@finos/legend-query-builder": "4.17.67",
+    "@finos/legend-application": "16.0.84",
+    "@finos/legend-art": "7.1.134",
+    "@finos/legend-code-editor": "2.0.139",
+    "@finos/legend-data-cube": "0.3.51",
+    "@finos/legend-extension-dsl-data-product": "0.0.33",
+    "@finos/legend-extension-dsl-diagram": "8.1.198",
+    "@finos/legend-graph": "32.3.19",
+    "@finos/legend-lego": "2.0.152",
+    "@finos/legend-query-builder": "4.17.68",
     "@finos/legend-server-depot": "6.1.5",
-    "@finos/legend-server-lakehouse": "0.3.18",
+    "@finos/legend-server-lakehouse": "0.3.19",
     "@finos/legend-server-sdlc": "5.3.68",
     "@finos/legend-server-showcase": "0.2.62",
     "@finos/legend-shared": "11.0.21",

package/src/components/editor/__test-utils__/EditorComponentTestUtils.tsx

@@ -67,6 +67,7 @@ import { type LegendStudioApplicationStore } from '../../../stores/LegendStudioB
 import { TEST__getLegendStudioApplicationConfig } from '../../../stores/__test-utils__/LegendStudioApplicationTestUtils.js';
 import { Route, Routes } from '@finos/legend-application/browser';
 import { ProjectViewer } from '../../project-view/ProjectViewer.js';
+import { MockedMonacoEditorAPI } from '@finos/legend-lego/code-editor/test';
 
 export const TEST_DATA__DefaultSDLCInfo = {
   project: {
@@ -145,6 +146,9 @@ export const TEST__provideMockedEditorStore = (customization?: {
       TEST__getLegendStudioApplicationConfig(),
       pluginManager,
     );
+  MockedMonacoEditorAPI.createModel.mockReturnValue({
+    setValue(): void {},
+  });
   const value =
     customization?.mock ??
     new EditorStore(