@finos/legend-application-studio 28.10.2 → 28.11.1

package/src/components/editor/editor-group/project-configuration-editor/ProjectConfigurationEditor.tsx

@@ -540,8 +540,12 @@ const ProjectPlatformVersionEditor = observer(
 );
 
 const ProjectAdvancedEditor = observer(
-  (props: { projectConfig: ProjectConfiguration; isReadOnly: boolean }) => {
-    const { projectConfig } = props;
+  (props: {
+    projectConfig: ProjectConfiguration;
+    isReadOnly: boolean;
+    configState: ProjectConfigurationEditorState;
+  }) => {
+    const { projectConfig, isReadOnly, configState } = props;
     const editorStore = useEditorStore();
     const applicationStore = useApplicationStore();
     const currentProjectType = projectConfig.projectType ?? ProjectType.MANAGED;
@@ -554,6 +558,18 @@ const ProjectAdvancedEditor = observer(
       'You are about to change from managed to embedded project type. This will cause your build files (pom, ci etc) to no longer be managed by our SDLC process. Your element folder structure will remain managed by us but your build will become your responsibility. Please ensure you understand the risks of changing over before continuing.';
     const embeddedToManaged =
       'You are about to change from embedded to managed project type. Your build will now be managed by our SDLC sever in addition to your element folder structure. Your current build files will all be deleted and replaces with our own. Please ensure you understand the risks of changing over before continuing.';
+    const runDependencyMessage = `In addition to running your own tests, you can also configure to run all tests in your dependency projects.  This should be rarely used and mostly helped mitigate when you have override your dependencies. You should aim to have most of your tests in your current project.`;
+    const toggleRunDependency = (): void => {
+      const newVal = !projectConfig.runDependencyTests;
+      if (
+        !newVal &&
+        configState.originalConfig.runDependencyTests === undefined
+      ) {
+        projectConfig.setRunDependencyTests(undefined);
+      } else {
+        projectConfig.setRunDependencyTests(newVal);
+      }
+    };
     const changeProjectType = (): void => {
       applicationStore.alertService.setActionAlertInfo({
         message: `${isEmbeddedMode ? embeddedToManaged : managedToEmbedded}`,
@@ -580,6 +596,49 @@ const ProjectAdvancedEditor = observer(
 
     return (
       <Panel>
+        <PanelForm>
+          <div className="panel__content__form__section__header__label">
+            {`Dependency Tests`}
+          </div>
+          <div className="documentation-preview">
+            <div className="documentation-preview__text">
+              <div className="project-configuration-editor__advanced__project-type__info">
+                {runDependencyMessage}
+              </div>
+            </div>
+          </div>
+          <div className="platform-configurations-editor__dependencies">
+            <div className="platform-configurations-editor__dependencies__header">
+              <div className="platform-configurations-editor__dependencies__header__left">
+                <div
+                  className="platform-configurations-editor__toggler"
+                  onClick={toggleRunDependency}
+                >
+                  <button
+                    className={clsx(
+                      'platform-configurations-editor__toggler__btn',
+                      {
+                        'platform-configurations-editor__toggler__btn--toggled':
+                          Boolean(projectConfig.runDependencyTests),
+                      },
+                    )}
+                    disabled={isReadOnly}
+                    tabIndex={-1}
+                  >
+                    {projectConfig.runDependencyTests ? (
+                      <CheckSquareIcon />
+                    ) : (
+                      <SquareIcon />
+                    )}
+                  </button>
+                  <div className="platform-configurations-editor__toggler__prompt">
+                    {`Run Dependency Tests`}
+                  </div>
+                </div>
+              </div>
+            </div>
+          </div>
+        </PanelForm>
         <PanelForm>
           <div className="panel__content__form__section__header__label">
             {`Project Type: ${prettyCONSTName(currentProjectType)} `}
@@ -628,7 +687,7 @@ export const ProjectConfigurationEditor = observer(() => {
     ProjectConfigurationEditorState,
   );
   const projectType =
-    configState.originalConfig.projectType ?? ProjectType.MANAGED;
+    configState.currentProjectConfiguration.projectType ?? ProjectType.MANAGED;
   const sdlcState = editorStore.sdlcState;
   const isReadOnly = editorStore.isInViewerMode;
   const selectedTab = configState.selectedTab;
@@ -852,6 +911,7 @@ export const ProjectConfigurationEditor = observer(() => {
           {selectedTab === CONFIGURATION_EDITOR_TAB.ADVANCED && (
             <ProjectAdvancedEditor
               projectConfig={currentProjectConfiguration}
+              configState={configState}
               isReadOnly={isReadOnly}
             />
           )}

package/src/components/editor/editor-group/service-editor/ServiceExecutionQueryEditor.tsx

@@ -126,6 +126,10 @@ export const ServiceExecutionQueryEditor = observer(
         await flowResult(
           embeddedQueryBuilderState.setEmbeddedQueryBuilderConfiguration({
             setupQueryBuilderState: (): QueryBuilderState => {
+              const sourceInfo = {
+                service: service.path,
+                ...editorStore.editorMode.getSourceInfo(),
+              };
               const queryBuilderState = new ServiceQueryBuilderState(
                 embeddedQueryBuilderState.editorStore.applicationStore,
                 embeddedQueryBuilderState.editorStore.graphManagerState,
@@ -138,6 +142,7 @@ export const ServiceExecutionQueryEditor = observer(
                 undefined,
                 undefined,
                 embeddedQueryBuilderState.editorStore.applicationStore.config.options.queryBuilderConfig,
+                sourceInfo,
               );
               queryBuilderState.initializeWithQuery(
                 executionState.execution.func,
@@ -457,6 +462,10 @@ export const queryService = async (
     execution instanceof MultiExecutionParameters
       ? execution.singleExecutionParameters[0]?.key
       : undefined;
+  const sourceInfo = {
+    service: service.path,
+    ...editorStore.editorMode.getSourceInfo(),
+  };
   await flowResult(
     embeddedQueryBuilderState.setEmbeddedQueryBuilderConfiguration({
       setupQueryBuilderState: (): QueryBuilderState => {
@@ -469,6 +478,7 @@ export const queryService = async (
           undefined,
           undefined,
           embeddedQueryBuilderState.editorStore.applicationStore.config.options.queryBuilderConfig,
+          sourceInfo,
         );
         if (execution) {
           queryBuilderState.initializeWithQuery(execution.func);

package/src/components/editor/editor-group/uml-editor/ClassQueryBuilder.tsx

@@ -380,6 +380,7 @@ export const queryClass = async (
           embeddedQueryBuilderState.editorStore.applicationStore,
           embeddedQueryBuilderState.editorStore.graphManagerState,
           editorStore.applicationStore.config.options.queryBuilderConfig,
+          editorStore.editorMode.getSourceInfo(),
         );
         queryBuilderState.changeClass(_class);
         queryBuilderState.propagateClassChange(_class);

package/src/stores/editor/EditorMode.ts

@@ -14,6 +14,7 @@
  * limitations under the License.
  */
 
+import type { QuerySDLC } from '@finos/legend-query-builder';
 import type { ProjectDependency } from '@finos/legend-server-sdlc';
 
 export abstract class EditorMode {
@@ -32,6 +33,11 @@ export abstract class EditorMode {
 
   abstract get isInitialized(): boolean;
 
+  /**
+   * Using information about the current project to generate source information
+   */
+  abstract getSourceInfo(): QuerySDLC | undefined;
+
   get supportSdlcOperations(): boolean {
     return true;
   }

package/src/stores/editor/StandardEditorMode.ts

@@ -26,6 +26,15 @@ import {
   generateViewProjectByGAVRoute,
 } from '../../__lib__/LegendStudioNavigation.js';
 import { EditorMode } from './EditorMode.js';
+import type { QuerySDLC } from '@finos/legend-query-builder';
+
+export interface WorkspaceProjectQuerySDLC extends QuerySDLC {
+  projectId: string;
+  workspaceId: string;
+  WorkspaceType: string;
+  userId?: string;
+  source?: string;
+}
 
 export class StandardEditorMode extends EditorMode {
   editorStore: EditorStore;
@@ -65,4 +74,21 @@ export class StandardEditorMode extends EditorMode {
         this.editorStore.sdlcState.currentWorkspace,
     );
   }
+
+  getSourceInfo(): QuerySDLC | undefined {
+    if (this.isInitialized) {
+      const workspace = guaranteeNonNullable(
+        this.editorStore.sdlcState.currentWorkspace,
+      );
+      return {
+        projectId: this.editorStore.sdlcState.activeProject.projectId,
+        workspaceId: workspace.workspaceId,
+        WorkspaceType: workspace.workspaceType,
+        userId: workspace.userId,
+        source: workspace.source,
+      } as WorkspaceProjectQuerySDLC;
+    } else {
+      return undefined;
+    }
+  }
 }

package/src/stores/editor/editor-state/element-editor-state/mapping/MappingExecutionQueryBuilderState.ts

@@ -33,8 +33,9 @@ export class MappingExecutionQueryBuilderState extends QueryBuilderState {
     graphManagerState: GraphManagerState,
     mapping: Mapping,
     config: QueryBuilderConfig | undefined,
+    sourceInfo?: object | undefined,
   ) {
-    super(applicationStore, graphManagerState, config);
+    super(applicationStore, graphManagerState, config, sourceInfo);
     this.executionMapping = mapping;
     this.executionContextState.mapping = mapping;
   }

package/src/stores/editor/editor-state/project-configuration-editor-state/ProjectConfigurationEditorState.ts

@@ -357,7 +357,13 @@ export class ProjectConfigurationEditorState extends EditorState {
             this.currentProjectConfiguration.platformConfigurations,
           );
       }
-
+      if (
+        this.originalConfig.runDependencyTests !==
+        this.currentProjectConfiguration.runDependencyTests
+      ) {
+        updateProjectConfigurationCommand.runDependencyTests =
+          this.currentProjectConfiguration.runDependencyTests;
+      }
       updateProjectConfigurationCommand.projectDependenciesToAdd =
         this.currentProjectConfiguration.projectDependencies.filter(
           (dep) =>

package/src/stores/project-view/ProjectViewerEditorMode.ts

@@ -28,6 +28,17 @@ import {
   SNAPSHOT_VERSION_ALIAS,
 } from '@finos/legend-server-depot';
 import { guaranteeNonNullable } from '@finos/legend-shared';
+import type { QuerySDLC } from '@finos/legend-query-builder';
+
+export interface ProjectQuerySDLC extends QuerySDLC {
+  projectId: string;
+}
+
+export interface ProjectGAVQuerySDLC extends QuerySDLC {
+  groupId: string;
+  artifactId: string;
+  versionId: string;
+}
 
 export class ProjectViewerEditorMode extends EditorMode {
   viewerStore: ProjectViewerStore;
@@ -93,4 +104,21 @@ export class ProjectViewerEditorMode extends EditorMode {
   override get supportSdlcOperations(): boolean {
     return !this.viewerStore.projectGAVCoordinates;
   }
+
+  getSourceInfo(): QuerySDLC | undefined {
+    if (this.viewerStore.editorStore.sdlcState.currentProject) {
+      return {
+        projectId:
+          this.viewerStore.editorStore.sdlcState.currentProject.projectId,
+      } as ProjectQuerySDLC;
+    } else if (this.viewerStore.projectGAVCoordinates) {
+      return {
+        groupId: this.viewerStore.projectGAVCoordinates.groupId,
+        artifactId: this.viewerStore.projectGAVCoordinates.artifactId,
+        versionId: this.viewerStore.projectGAVCoordinates.versionId,
+      } as ProjectGAVQuerySDLC;
+    } else {
+      return undefined;
+    }
+  }
 }

package/src/stores/showcase/ShowcaseViewerEditorMode.ts

@@ -18,6 +18,12 @@ import type { ProjectDependency } from '@finos/legend-server-sdlc';
 import { EditorMode } from '../editor/EditorMode.js';
 import type { ShowcaseViewerStore } from './ShowcaseViewerStore.js';
 import { generateShowcasePath } from '../../__lib__/LegendStudioNavigation.js';
+import type { QuerySDLC } from '@finos/legend-query-builder';
+import { returnUndefOnError } from '@finos/legend-shared';
+
+export interface ShowcaseViewerQuerySDLC extends QuerySDLC {
+  showcasePath: string;
+}
 
 export class ShowcaseViewerEditorMode extends EditorMode {
   readonly showcaseViewerStore: ShowcaseViewerStore;
@@ -48,4 +54,13 @@ export class ShowcaseViewerEditorMode extends EditorMode {
   override get label(): string {
     return 'Showcase View';
   }
+
+  getSourceInfo(): ShowcaseViewerQuerySDLC | undefined {
+    return returnUndefOnError(
+      () =>
+        ({
+          showcasePath: this.showcaseViewerStore.showcase.path,
+        }) as ShowcaseViewerQuerySDLC,
+    );
+  }
 }