@finos/legend-query-builder 4.19.21 → 4.19.23

package/src/components/shared/LambdaEditor.tsx

@@ -42,8 +42,8 @@ import {
   clearMarkers,
   setErrorMarkers,
   CODE_EDITOR_LANGUAGE,
-  CODE_EDITOR_THEME,
   PURE_CODE_EDITOR_WORD_SEPARATORS,
+  getCodeEditorThemeForAppTheme,
   type CompletionItem,
 } from '@finos/legend-code-editor';
 import { disposeCodeEditor } from '@finos/legend-lego/code-editor';
@@ -273,10 +273,9 @@ const LambdaEditor_Inner = observer(
         const _editor = monacoEditorAPI.create(element, {
           ...getBaseCodeEditorOptions(),
           language: CODE_EDITOR_LANGUAGE.PURE,
-          theme: applicationStore.layoutService
-            .TEMPORARY__isLightColorThemeEnabled
-            ? CODE_EDITOR_THEME.BUILT_IN__VSCODE_LIGHT
-            : CODE_EDITOR_THEME.DEFAULT_DARK,
+          theme: getCodeEditorThemeForAppTheme(
+            applicationStore.layoutService.TEMPORARY__isLightColorThemeEnabled,
+          ),
           ...lambdaEditorOptions,
         });
         setEditor(_editor);
@@ -311,10 +310,9 @@ const LambdaEditor_Inner = observer(
     useEffect(() => {
       if (editor) {
         editor.updateOptions({
-          theme: applicationStore.layoutService
-            .TEMPORARY__isLightColorThemeEnabled
-            ? CODE_EDITOR_THEME.BUILT_IN__VSCODE_LIGHT
-            : CODE_EDITOR_THEME.DEFAULT_DARK,
+          theme: getCodeEditorThemeForAppTheme(
+            applicationStore.layoutService.TEMPORARY__isLightColorThemeEnabled,
+          ),
         });
       }
     }, [
@@ -608,10 +606,9 @@ const LambdaEditor_PopUp = observer(
         const _editor = monacoEditorAPI.create(element, {
           ...getBaseCodeEditorOptions(),
           language: CODE_EDITOR_LANGUAGE.PURE,
-          theme: applicationStore.layoutService
-            .TEMPORARY__isLightColorThemeEnabled
-            ? CODE_EDITOR_THEME.BUILT_IN__VSCODE_LIGHT
-            : CODE_EDITOR_THEME.DEFAULT_DARK,
+          theme: getCodeEditorThemeForAppTheme(
+            applicationStore.layoutService.TEMPORARY__isLightColorThemeEnabled,
+          ),
         });
         setEditor(_editor);
       }

package/src/components/sql-playground/SQLPlaygroundEditor.tsx

@@ -20,8 +20,8 @@ import { useCallback, useEffect, useRef, useState } from 'react';
 import { useCommands } from '@finos/legend-application';
 import {
   CODE_EDITOR_LANGUAGE,
-  CODE_EDITOR_THEME,
   getBaseCodeEditorOptions,
+  getCodeEditorThemeForAppTheme,
 } from '@finos/legend-code-editor';
 import {
   editor as monacoEditorAPI,
@@ -79,10 +79,11 @@ export const PlaygroundSQLCodeEditor = observer(
         playgroundState.setTheme(enableDarkMode ? 'dark' : 'light');
         const newEditor = monacoEditorAPI.create(element, {
           ...getBaseCodeEditorOptions(),
-          theme:
-            playgroundState.theme === 'light'
-              ? CODE_EDITOR_THEME.GITHUB_LIGHT
-              : CODE_EDITOR_THEME.DEFAULT_DARK,
+          // NOTE: Monaco themes are global, so this theme applies to every
+          // editor on the page and must match the application's theme
+          theme: getCodeEditorThemeForAppTheme(
+            playgroundState.theme === 'light',
+          ),
           language: CODE_EDITOR_LANGUAGE.SQL,
           padding: {
             top: 10,

package/src/index.ts

@@ -53,6 +53,7 @@ export {
   getTDSColumnDerivedProperyFromType,
   buildTDSSortTypeExpression,
 } from './stores/fetch-structure/tds/QueryBuilderTDSHelper.js';
+export { QueryBuilderTDSState } from './stores/fetch-structure/tds/QueryBuilderTDSState.js';
 export { type ExportDataInfo } from './stores/QueryBuilderResultState.js';
 export { QueryBuilderPropertySearchState } from './stores/explorer/QueryBuilderPropertySearchState.js';
 export {

package/src/stores/query-workflow/QueryBuilderWorkFlowState.ts

@@ -34,6 +34,25 @@ export abstract class QueryBuilderWorkflowState {
     state: QueryBuilderState,
   ): FetchStructureLayoutConfig;
 
+  /**
+   * Whether the header shows its Advanced and Help menus; a workflow that
+   * embeds the query builder for a part of a query, e.g. a Legend Cube data
+   * space source, hides them
+   */
+  get showHeaderMenus(): boolean {
+    return true;
+  }
+
+  /** Whether a projection column can be given an aggregate operator */
+  get showProjectionAggregation(): boolean {
+    return true;
+  }
+
+  /** Whether the projection shows its query options: sort, distinct, limit and dates */
+  get showQueryOptions(): boolean {
+    return true;
+  }
+
   updateActionConfig(actionConfig: QueryBuilderActionConfig): void {
     this.actionConfig = actionConfig;
   }