@finos/legend-application-studio 28.19.74 → 28.19.76

package/src/stores/editor/__test-utils__/EditorStoreTestUtils.ts

@@ -20,6 +20,7 @@ import { SDLCServerClient } from '@finos/legend-server-sdlc';
 import { DepotServerClient } from '@finos/legend-server-depot';
 import { ApplicationStore } from '@finos/legend-application';
 import { TEST__getLegendStudioApplicationConfig } from '../../__test-utils__/LegendStudioApplicationTestUtils.js';
+import { MockedMonacoEditorAPI } from '@finos/legend-lego/code-editor/test';
 
 export const TEST__getTestEditorStore = (
   pluginManager = LegendStudioPluginManager.create(),
@@ -28,7 +29,9 @@ export const TEST__getTestEditorStore = (
     TEST__getLegendStudioApplicationConfig(),
     pluginManager,
   );
-
+  MockedMonacoEditorAPI.createModel.mockReturnValue({
+    setValue(): void {},
+  });
   return new EditorStore(
     applicationStore,
     new SDLCServerClient({

package/src/stores/editor/panel-group/{SQLPlaygroundPanelState.ts → StudioSQLPlaygroundPanelState.ts}

@@ -19,9 +19,10 @@ 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 {
   type Database,
   type PackageableConnection,
@@ -29,14 +30,12 @@ import {
   GRAPH_MANAGER_EVENT,
 } from '@finos/legend-graph';
 import type { EditorStore } from '../EditorStore.js';
-import {
-  CODE_EDITOR_LANGUAGE,
-  moveCursorToPosition,
-} from '@finos/legend-code-editor';
+
 import type { CommandRegistrar } from '@finos/legend-application';
 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`;
 
@@ -45,50 +44,33 @@ export interface SQL_ExecutionResult {
   sqlDuration: number;
 }
 
-export class SQLPlaygroundPanelState implements CommandRegistrar {
+export class StudioSQLPlaygroundPanelState
+  extends AbstractSQLPlaygroundState
+  implements CommandRegistrar
+{
   readonly editorStore: EditorStore;
 
   isFetchingSchema = ActionState.create();
-  executeRawSQLState = ActionState.create();
-
   connection?: PackageableConnection | undefined;
   database?: Database | undefined;
   schemaExplorerState?: DatabaseSchemaExplorerState | undefined;
-
-  readonly sqlEditorTextModel: monacoEditorAPI.ITextModel;
-  sqlEditor?: monacoEditorAPI.IStandaloneCodeEditor | undefined;
-  sqlEditorViewState?: monacoEditorAPI.ICodeEditorViewState | undefined;
-  sqlText = DEFAULT_SQL_TEXT;
-  sqlExecutionResult?: SQL_ExecutionResult | undefined;
-
-  isLocalModeEnabled = false;
+  databaseSchema: monacoLanguagesAPI.CompletionItem[];
 
   constructor(editorStore: 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: PackageableConnection | undefined): void {
@@ -107,32 +89,42 @@ export class SQLPlaygroundPanelState implements CommandRegistrar {
     this.sqlEditorTextModel.setValue(DEFAULT_SQL_TEXT);
   }
 
-  setSQLText(val: string): void {
-    this.sqlText = val;
-  }
-
-  setSQLEditor(val: monacoEditorAPI.IStandaloneCodeEditor | undefined): void {
-    this.sqlEditor = val;
-    if (val) {
-      const lines = this.sqlText.split('\n');
-      moveCursorToPosition(val, {
-        lineNumber: lines.length,
-        column: lines.at(-1)?.length ?? 0,
-      });
-    }
+  setDataBaseSchema(val: monacoLanguagesAPI.CompletionItem[]): void {
+    this.databaseSchema = val;
   }
 
-  stopExecuteSQL(): void {
-    this.sqlExecutionResult = undefined;
+  fetchSchemaMetaData(): GeneratorFn<void> | undefined {
+    return this.schemaExplorerState?.fetchDatabaseMetadata();
   }
-
-  setSQLEditorViewState(
-    val: monacoEditorAPI.ICodeEditorViewState | undefined,
-  ): void {
-    this.sqlEditorViewState = val;
+  override getCodeCompletionSuggestions(): string[] {
+    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} `,
+            }) as monacoLanguagesAPI.CompletionItem,
+        ),
+        (val) => val.label,
+      );
+      this.setDataBaseSchema(dbLabelsCompletionItem);
+      return base.concat(dbLabelText);
+    }
+    return base;
   }
 
-  registerCommands(): void {
+  override registerCommands(): void {
     this.editorStore.applicationStore.commandService.registerCommand({
       key: STO_RELATIONAL_LEGEND_STUDIO_COMMAND_KEY.SQL_PLAYGROUND_EXECUTE,
       trigger: () =>
@@ -148,19 +140,14 @@ export class SQLPlaygroundPanelState implements CommandRegistrar {
     });
   }
 
-  deregisterCommands(): void {
+  override deregisterCommands(): void {
     [STO_RELATIONAL_LEGEND_STUDIO_COMMAND_KEY.SQL_PLAYGROUND_EXECUTE].forEach(
       (key) =>
         this.editorStore.applicationStore.commandService.deregisterCommand(key),
     );
   }
 
-  toggleIsLocalModeEnabled(): void {
-    this.isLocalModeEnabled = !this.isLocalModeEnabled;
-    this.sqlExecutionResult = undefined;
-  }
-
-  *executeRawSQL(): GeneratorFn<void> {
+  override *executeRawSQL(): GeneratorFn<void> {
     if (!this.connection || this.executeRawSQLState.isInProgress) {
       return;
     }

package/tsconfig.json

@@ -172,7 +172,7 @@
     "./src/stores/editor/editor-state/project-configuration-editor-state/ProjectConfigurationEditorState.ts",
     "./src/stores/editor/editor-state/project-configuration-editor-state/ProjectDependencyEditorState.ts",
     "./src/stores/editor/panel-group/DevToolPanelState.ts",
-    "./src/stores/editor/panel-group/SQLPlaygroundPanelState.ts",
+    "./src/stores/editor/panel-group/StudioSQLPlaygroundPanelState.ts",
     "./src/stores/editor/sidebar-state/BulkServiceRegistrationState.ts",
     "./src/stores/editor/sidebar-state/LocalChangesState.ts",
     "./src/stores/editor/sidebar-state/ProjectOverviewState.ts",

package/lib/stores/editor/panel-group/SQLPlaygroundPanelState.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"SQLPlaygroundPanelState.d.ts","sourceRoot":"","sources":["../../../../src/stores/editor/panel-group/SQLPlaygroundPanelState.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EACL,KAAK,WAAW,EAGhB,WAAW,EACZ,MAAM,sBAAsB,CAAC;AAE9B,OAAO,EAAE,MAAM,IAAI,eAAe,EAAE,MAAM,eAAe,CAAC;AAC1D,OAAO,EACL,KAAK,QAAQ,EACb,KAAK,qBAAqB,EAG3B,MAAM,qBAAqB,CAAC;AAC7B,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAKrD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,2BAA2B,CAAC;AAGlE,OAAO,EAAE,2BAA2B,EAAE,MAAM,yEAAyE,CAAC;AAItH,MAAM,WAAW,mBAAmB;IAClC,KAAK,EAAE,MAAM,CAAC;IACd,WAAW,EAAE,MAAM,CAAC;CACrB;AAED,qBAAa,uBAAwB,YAAW,gBAAgB;IAC9D,QAAQ,CAAC,WAAW,EAAE,WAAW,CAAC;IAElC,gBAAgB,cAAwB;IACxC,kBAAkB,cAAwB;IAE1C,UAAU,CAAC,EAAE,qBAAqB,GAAG,SAAS,CAAC;IAC/C,QAAQ,CAAC,EAAE,QAAQ,GAAG,SAAS,CAAC;IAChC,mBAAmB,CAAC,EAAE,2BAA2B,GAAG,SAAS,CAAC;IAE9D,QAAQ,CAAC,kBAAkB,EAAE,eAAe,CAAC,UAAU,CAAC;IACxD,SAAS,CAAC,EAAE,eAAe,CAAC,qBAAqB,GAAG,SAAS,CAAC;IAC9D,kBAAkB,CAAC,EAAE,eAAe,CAAC,oBAAoB,GAAG,SAAS,CAAC;IACtE,OAAO,SAAoB;IAC3B,kBAAkB,CAAC,EAAE,mBAAmB,GAAG,SAAS,CAAC;IAErD,kBAAkB,UAAS;gBAEf,WAAW,EAAE,WAAW;IA4BpC,aAAa,CAAC,GAAG,EAAE,qBAAqB,GAAG,SAAS,GAAG,IAAI;IAgB3D,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI;IAI7B,YAAY,CAAC,GAAG,EAAE,eAAe,CAAC,qBAAqB,GAAG,SAAS,GAAG,IAAI;IAW1E,cAAc,IAAI,IAAI;IAItB,qBAAqB,CACnB,GAAG,EAAE,eAAe,CAAC,oBAAoB,GAAG,SAAS,GACpD,IAAI;IAIP,gBAAgB,IAAI,IAAI;IAgBxB,kBAAkB,IAAI,IAAI;IAO1B,wBAAwB,IAAI,IAAI;IAK/B,aAAa,IAAI,WAAW,CAAC,IAAI,CAAC;CAsCpC"}

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

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