@finos/legend-application-query 13.4.12 → 13.4.13

package/src/components/data-space/DataSpaceQuerySetup.tsx

@@ -21,10 +21,10 @@ import { flowResult } from 'mobx';
 import { QueryBuilderClassSelector } from '@finos/legend-query-builder';
 import {
   CustomSelectorInput,
+  PanelHeader,
   SearchIcon,
   type SelectComponent,
 } from '@finos/legend-art';
-import { DataSpaceIcon } from '@finos/legend-extension-dsl-data-space/application';
 import {
   useLegendQueryApplicationStore,
   useLegendQueryBaseStore,
@@ -82,8 +82,9 @@ const DataSpaceQuerySetupSetupPanelContent = observer(
     const applicationStore = useApplicationStore();
     const dataSpaceSearchRef = useRef<SelectComponent>(null);
     // data space
-    const dataSpaceOptions =
-      queryBuilderState.dataSpaces.map(buildDataSpaceOption);
+    const dataSpaceOptions = queryBuilderState.dataSpaces
+      .map(buildDataSpaceOption)
+      .sort((a, b) => a.label.localeCompare(b.label));
     const selectedDataSpaceOption = null;
     const onDataSpaceOptionChange = (option: DataSpaceOption): void => {
       queryBuilderState.onDataSpaceChange(option.value);
@@ -101,59 +102,57 @@ const DataSpaceQuerySetupSetupPanelContent = observer(
     useEffect(() => dataSpaceSearchRef.current?.focus());
 
     return (
-      <>
-        <div className="query-builder__setup__config-group">
-          <div className="query-builder__setup__config-group__header">
-            <div className="query-builder__setup__config-group__header__title">
-              data space execution context
-            </div>
-          </div>
-          <div className="query-builder__setup__config-group__content">
-            <div className="query-builder__setup__config-group__item">
-              <div
-                className="btn--sm query-builder__setup__config-group__item__label"
-                title="data space"
-              >
-                <DataSpaceIcon />
-              </div>
-              <CustomSelectorInput
-                ref={dataSpaceSearchRef}
-                className="panel__content__form__section__dropdown query-builder__setup__config-group__item__selector"
-                options={dataSpaceOptions}
-                isLoading={queryBuilderState.loadDataSpacesState.isInProgress}
-                onChange={onDataSpaceOptionChange}
-                value={selectedDataSpaceOption}
-                placeholder="Search for data space..."
-                escapeClearsValue={true}
-                darkMode={
-                  !applicationStore.layoutService
-                    .TEMPORARY__isLightColorThemeEnabled
-                }
-                formatOptionLabel={formatDataSpaceOptionLabel}
+      <div className="query-builder__setup__config-group">
+        <PanelHeader title="properties" />
+        <div className="query-builder__setup__config-group__content">
+          <div className="query-builder__setup__config-group__item">
+            <label
+              className="btn--sm query-builder__setup__config-group__item__label"
+              title="data space"
+              htmlFor="query-builder__setup__data-space-selector"
+            >
+              Data Space
+            </label>
+            <CustomSelectorInput
+              inputId="query-builder__setup__data-space-selector"
+              ref={dataSpaceSearchRef}
+              className="panel__content__form__section__dropdown query-builder__setup__config-group__item__selector"
+              options={dataSpaceOptions}
+              isLoading={queryBuilderState.loadDataSpacesState.isInProgress}
+              onChange={onDataSpaceOptionChange}
+              value={selectedDataSpaceOption}
+              placeholder="Search for data space..."
+              escapeClearsValue={true}
+              darkMode={
+                !applicationStore.layoutService
+                  .TEMPORARY__isLightColorThemeEnabled
+              }
+              formatOptionLabel={formatDataSpaceOptionLabel}
+            />
+            <button
+              tabIndex={-1}
+              className="query-builder__setup__data-space-searcher__btn btn--dark"
+              onClick={openDataSpaceAdvancedSearch}
+              title="Open advanced search for data space..."
+            >
+              <SearchIcon />
+            </button>
+            {queryBuilderState.advancedSearchState && (
+              <DataSpaceAdvancedSearchModal
+                searchState={queryBuilderState.advancedSearchState}
+                onClose={() => queryBuilderState.hideAdvancedSearchPanel()}
               />
-              <button
-                tabIndex={-1}
-                className="query-builder__setup__data-space-searcher__btn btn--dark"
-                onClick={openDataSpaceAdvancedSearch}
-                title="Open advanced search for data space..."
-              >
-                <SearchIcon />
-              </button>
-              {queryBuilderState.advancedSearchState && (
-                <DataSpaceAdvancedSearchModal
-                  searchState={queryBuilderState.advancedSearchState}
-                  onClose={() => queryBuilderState.hideAdvancedSearchPanel()}
-                />
-              )}
-            </div>
+            )}
+          </div>
+          <div className="query-builder__setup__config-group__item">
+            <QueryBuilderClassSelector
+              queryBuilderState={queryBuilderState}
+              classes={[]}
+              noMatchMessage="No compatible entity found"
+            />
           </div>
         </div>
-        <QueryBuilderClassSelector
-          queryBuilderState={queryBuilderState}
-          classes={[]}
-          noMatchMessage="No compatible class found"
-        />
-      </>
+      </div>
     );
   },
 );

package/src/index.ts

@@ -36,11 +36,12 @@ export type { LegendQueryApplicationStore } from './stores/LegendQueryBaseStore.
 export * from './stores/LegendQueryApplicationPlugin.js';
 export { BaseQuerySetupStore } from './stores/QuerySetupStore.js';
 export {
+  type QueryPersistConfiguration,
   createViewProjectHandler,
   createViewSDLCProjectHandler,
   QueryEditorStore,
   ExistingQueryEditorStore,
-  type QueryPersistConfiguration,
+  QueryBuilderActionConfig_QueryApplication,
 } from './stores/QueryEditorStore.js';
 export { QUERY_EDITOR_TEST_ID } from './__lib__/LegendQueryTesting.js';
 // components

package/src/stores/{LegendQueryApplicationPlugin.ts → LegendQueryApplicationPlugin.tsx}

@@ -16,12 +16,14 @@
 
 import { LegendApplicationPlugin } from '@finos/legend-application';
 import type { Query } from '@finos/legend-graph';
-import type { QueryBuilderState } from '@finos/legend-query-builder';
-import type React from 'react';
-import type { LegendQueryPluginManager } from '../application/LegendQueryPluginManager.js';
 import type {
-  ExistingQueryEditorStore,
-  QueryEditorStore,
+  QueryBuilderState,
+  QueryBuilder_LegendApplicationPlugin_Extension,
+} from '@finos/legend-query-builder';
+import type { LegendQueryPluginManager } from '../application/LegendQueryPluginManager.js';
+import {
+  type ExistingQueryEditorStore,
+  type QueryEditorStore,
 } from './QueryEditorStore.js';
 import type { QuerySetupLandingPageStore } from './QuerySetupStore.js';
 
@@ -77,7 +79,10 @@ export type QueryEditorHelpMenuActionConfiguration = {
   icon?: React.ReactNode;
 };
 
-export abstract class LegendQueryApplicationPlugin extends LegendApplicationPlugin {
+export class LegendQueryApplicationPlugin
+  extends LegendApplicationPlugin
+  implements QueryBuilder_LegendApplicationPlugin_Extension
+{
   /**
    * This helps to better type-check for this empty abtract type
    * See https://github.com/finos/legend-studio/blob/master/docs/technical/typescript-usage.md#understand-typescript-structual-type-system

package/src/stores/QueryEditorStore.ts

@@ -106,6 +106,7 @@ import {
   ServiceQueryBuilderState,
   QueryLoaderState,
   QueryBuilderDataBrowserWorkflow,
+  QueryBuilderActionConfig,
 } from '@finos/legend-query-builder';
 import { LegendQueryUserDataHelper } from '../__lib__/LegendQueryUserDataHelper.js';
 import { LegendQueryTelemetryHelper } from '../__lib__/LegendQueryTelemetryHelper.js';
@@ -654,6 +655,15 @@ export abstract class QueryEditorStore {
   }
 }
 
+export class QueryBuilderActionConfig_QueryApplication extends QueryBuilderActionConfig {
+  editorStore: QueryEditorStore;
+
+  constructor(editorStore: QueryEditorStore) {
+    super();
+    this.editorStore = editorStore;
+  }
+}
+
 export class MappingQueryCreatorStore extends QueryEditorStore {
   readonly groupId: string;
   readonly artifactId: string;
@@ -698,6 +708,7 @@ export class MappingQueryCreatorStore extends QueryEditorStore {
       this.applicationStore,
       this.graphManagerState,
       QueryBuilderDataBrowserWorkflow.INSTANCE,
+      new QueryBuilderActionConfig_QueryApplication(this),
       (val: Mapping) => {
         this.applicationStore.navigationService.navigator.updateCurrentLocation(
           generateMappingQueryCreatorRoute(
@@ -807,6 +818,7 @@ export class ServiceQueryCreatorStore extends QueryEditorStore {
       this.applicationStore,
       this.graphManagerState,
       QueryBuilderDataBrowserWorkflow.INSTANCE,
+      new QueryBuilderActionConfig_QueryApplication(this),
       service,
       this.graphManagerState.usableServices,
       this.executionKey,
@@ -1220,6 +1232,7 @@ export class ExistingQueryEditorStore extends QueryEditorStore {
           this.graphManagerState,
           this.depotServerClient,
           QueryBuilderDataBrowserWorkflow.INSTANCE,
+          new QueryBuilderActionConfig_QueryApplication(this),
           dataSpace,
           matchingExecutionContext,
           (dataSpaceInfo: DataSpaceInfo) => {
@@ -1332,6 +1345,9 @@ export class ExistingQueryEditorStore extends QueryEditorStore {
         this.applicationStore.config.options.queryBuilderConfig,
         sourceInfo,
       );
+      classQueryBuilderState.workflowState.updateActionConfig(
+        new QueryBuilderActionConfig_QueryApplication(this),
+      );
       classQueryBuilderState.executionContextState.setMapping(
         exec.mapping.value,
       );

package/src/stores/__test-utils__/LegendQueryApplicationTestUtils.ts

@@ -18,7 +18,7 @@ import { TEST__getApplicationVersionData } from '@finos/legend-application/test'
 import { LegendQueryApplicationConfig } from '../../application/LegendQueryApplicationConfig.js';
 
 const TEST_DATA__appConfig = {
-  appName: 'test-query-app',
+  appName: 'query',
   env: 'test-env',
   engine: {
     url: 'https://testEngineUrl',

package/src/stores/data-space/DataSpaceQueryCreatorStore.ts

@@ -45,6 +45,7 @@ import {
   retrieveAnalyticsResultCache,
 } from '@finos/legend-extension-dsl-data-space/graph';
 import {
+  QueryBuilderActionConfig_QueryApplication,
   QueryEditorStore,
   createViewProjectHandler,
   createViewSDLCProjectHandler,
@@ -148,6 +149,7 @@ export class DataSpaceQueryCreatorStore extends QueryEditorStore {
       this.graphManagerState,
       this.depotServerClient,
       QueryBuilderDataBrowserWorkflow.INSTANCE,
+      new QueryBuilderActionConfig_QueryApplication(this),
       dataSpace,
       executionContext,
       (dataSpaceInfo: DataSpaceInfo) => {

package/src/stores/data-space/DataSpaceQuerySetupState.ts

@@ -42,6 +42,7 @@ import {
 } from '@finos/legend-extension-dsl-data-space/application';
 import { DATA_SPACE_ELEMENT_CLASSIFIER_PATH } from '@finos/legend-extension-dsl-data-space/graph';
 import {
+  QueryBuilderActionConfig_QueryApplication,
   QueryEditorStore,
   createViewProjectHandler,
   createViewSDLCProjectHandler,
@@ -52,6 +53,7 @@ import { renderDataSpaceQuerySetupSetupPanelContent } from '../../components/dat
 import { DataSpaceAdvancedSearchState } from '@finos/legend-extension-dsl-data-space/application-query';
 
 export class DataSpaceQuerySetupState extends QueryBuilderState {
+  editorStore: QueryEditorStore;
   readonly depotServerClient: DepotServerClient;
   readonly loadDataSpacesState = ActionState.create();
   readonly onDataSpaceChange: (val: DataSpaceInfo) => void;
@@ -75,6 +77,7 @@ export class DataSpaceQuerySetupState extends QueryBuilderState {
   advancedSearchState?: DataSpaceAdvancedSearchState | undefined;
 
   constructor(
+    editorStore: QueryEditorStore,
     applicationStore: GenericLegendApplicationStore,
     graphManagerState: GraphManagerState,
     depotServerClient: DepotServerClient,
@@ -107,6 +110,10 @@ export class DataSpaceQuerySetupState extends QueryBuilderState {
       loadDataSpaces: flow,
     });
 
+    this.editorStore = editorStore;
+    this.workflowState.updateActionConfig(
+      new QueryBuilderActionConfig_QueryApplication(editorStore),
+    );
     this.depotServerClient = depotServerClient;
     this.onDataSpaceChange = onDataSpaceChange;
     this.viewProject = viewProject;
@@ -175,6 +182,7 @@ export class DataSpaceQuerySetupStore extends QueryEditorStore {
 
   async initializeQueryBuilderState(): Promise<QueryBuilderState> {
     const queryBuilderState = new DataSpaceQuerySetupState(
+      this,
       this.applicationStore,
       this.graphManagerState,
       this.depotServerClient,

package/src/stores/data-space/DataSpaceTemplateQueryCreatorStore.ts

@@ -30,6 +30,7 @@ import {
 } from '@finos/legend-query-builder';
 import type { ProjectGAVCoordinates } from '@finos/legend-storage';
 import {
+  QueryBuilderActionConfig_QueryApplication,
   QueryEditorStore,
   createViewProjectHandler,
   createViewSDLCProjectHandler,
@@ -142,6 +143,7 @@ export class DataSpaceTemplateQueryCreatorStore extends QueryEditorStore {
       this.graphManagerState,
       this.depotServerClient,
       QueryBuilderDataBrowserWorkflow.INSTANCE,
+      new QueryBuilderActionConfig_QueryApplication(this),
       dataSpace,
       executionContext,
       (dataSpaceInfo: DataSpaceInfo) => {

package/tsconfig.json

@@ -66,7 +66,6 @@
     "./src/stores/CloneServiceQuerySetupStore.ts",
     "./src/stores/CreateMappingQuerySetupStore.ts",
     "./src/stores/EditExistingQuerySetupStore.ts",
-    "./src/stores/LegendQueryApplicationPlugin.ts",
     "./src/stores/LegendQueryBaseStore.ts",
     "./src/stores/LoadProjectServiceQuerySetupStore.ts",
     "./src/stores/QueryEditorStore.ts",
@@ -94,7 +93,8 @@
     "./src/components/__test-utils__/QueryEditorComponentTestUtils.tsx",
     "./src/components/data-space/DataSpaceQueryCreator.tsx",
     "./src/components/data-space/DataSpaceQuerySetup.tsx",
-    "./src/components/data-space/DataSpaceTemplateQueryCreator.tsx"
+    "./src/components/data-space/DataSpaceTemplateQueryCreator.tsx",
+    "./src/stores/LegendQueryApplicationPlugin.tsx"
   ],
   "include": [
     "src/**/*.ts",