@finos/legend-application-studio 15.2.0 → 16.0.1

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

@@ -38,13 +38,77 @@ import {
   UpdateProjectConfigurationCommand,
 } from '@finos/legend-server-sdlc';
 import { LEGEND_STUDIO_APP_EVENT } from '../LegendStudioAppEvent.js';
-import { MASTER_SNAPSHOT_ALIAS, ProjectData } from '@finos/legend-server-depot';
+import {
+  type ProjectVersionDependencies,
+  generateGAVCoordinates,
+  MASTER_SNAPSHOT_ALIAS,
+  ProjectData,
+  ProjectDependencyInfo,
+  ProjectDependencyCoordinates,
+} from '@finos/legend-server-depot';
+import { TAB_SIZE } from '@finos/legend-application';
 
 export enum CONFIGURATION_EDITOR_TAB {
   PROJECT_STRUCTURE = 'PROJECT_STRUCTURE',
   PROJECT_DEPENDENCIES = 'PROJECT_DEPENDENCIES',
 }
 
+export enum DEPENDENCY_INFO_TYPE {
+  TREE = 'tree',
+  CONFLICTS = 'conflicts',
+}
+
+const getDependencyTreeString = (
+  dependant: ProjectVersionDependencies,
+  tab: string,
+): string => {
+  const prefix = tab + (dependant.dependencies.length ? '+-' : '\\-');
+  const gav = generateGAVCoordinates(
+    dependant.groupId,
+    dependant.artifactId,
+    dependant.versionId,
+  );
+  return `${prefix + gav}\n${dependant.dependencies
+    .map((e) => getDependencyTreeString(e, tab + ' '.repeat(TAB_SIZE)))
+    .join('')}`;
+};
+
+export const getDependencyTreeStringFromInfo = (
+  info: ProjectDependencyInfo,
+): string => info.tree.map((e) => getDependencyTreeString(e, '')).join('\n');
+
+const getConflictPathString = (path: string): string => {
+  const seperator = '>';
+  const projects = path.split(seperator);
+  let result = '';
+  let currentTab = ' '.repeat(TAB_SIZE);
+  projects.forEach((p) => {
+    result += `${currentTab + p}\n`;
+    currentTab = currentTab + ' '.repeat(TAB_SIZE);
+  });
+  return result;
+};
+
+export const getConflictsString = (info: ProjectDependencyInfo): string =>
+  info.conflicts
+    .map((c) => {
+      const base = `project:\n${
+        ' '.repeat(TAB_SIZE) +
+        generateGAVCoordinates(c.groupId, c.artifactId, undefined)
+      }`;
+      const versions = `versions:\n${c.versions
+        .map((v) => ' '.repeat(TAB_SIZE) + v)
+        .join('\n')}`;
+      const paths = `paths:\n${c.conflictPaths
+        .map(
+          (p, idx) =>
+            `${' '.repeat(TAB_SIZE) + (idx + 1)}:\n${getConflictPathString(p)}`,
+        )
+        .join('')}`;
+      return `${base}\n${versions}\n${paths}`;
+    })
+    .join('\n\n');
+
 export class ProjectConfigurationEditorState extends EditorState {
   sdlcState: EditorSDLCState;
   originalProjectConfiguration?: ProjectConfiguration | undefined; // TODO: we might want to remove this when we do change detection for project configuration
@@ -54,6 +118,8 @@ export class ProjectConfigurationEditorState extends EditorState {
   projects = new Map<string, ProjectData>();
   queryHistory = new Set<string>();
   latestProjectStructureVersion: ProjectStructureVersion | undefined;
+  dependencyInfo: ProjectDependencyInfo | undefined;
+  dependencyInfoModalType: DEPENDENCY_INFO_TYPE | undefined;
   isUpdatingConfiguration = false;
   isQueryingProjects = false;
   associatedProjectsAndVersionsFetched = false;
@@ -74,15 +140,19 @@ export class ProjectConfigurationEditorState extends EditorState {
       associatedProjectsAndVersionsFetched: observable,
       isFetchingAssociatedProjectsAndVersions: observable,
       latestProjectStructureVersion: observable,
+      dependencyInfo: observable,
+      dependencyInfoModalType: observable,
       originalConfig: computed,
       setOriginalProjectConfiguration: action,
       setProjectConfiguration: action,
+      setDependencyInfoModal: action,
       setSelectedTab: action,
       fectchAssociatedProjectsAndVersions: flow,
       updateProjectConfiguration: flow,
       updateToLatestStructure: flow,
       updateConfigs: flow,
       fetchLatestProjectStructureVersion: flow,
+      fetchDependencyInfo: flow,
     });
 
     this.selectedTab = CONFIGURATION_EDITOR_TAB.PROJECT_STRUCTURE;
@@ -104,6 +174,10 @@ export class ProjectConfigurationEditorState extends EditorState {
     this.selectedTab = tab;
   }
 
+  setDependencyInfoModal(type: DEPENDENCY_INFO_TYPE | undefined): void {
+    this.dependencyInfoModalType = type;
+  }
+
   get headerName(): string {
     return 'config';
   }
@@ -171,6 +245,35 @@ export class ProjectConfigurationEditorState extends EditorState {
     }
   }
 
+  *fetchDependencyInfo(): GeneratorFn<void> {
+    try {
+      if (this.projectConfiguration?.projectDependencies) {
+        const dependencyCoordinates = (yield flowResult(
+          this.editorStore.graphState.buildProjectDependencyCoordinates(
+            this.projectConfiguration.projectDependencies,
+          ),
+        )) as ProjectDependencyCoordinates[];
+        const dependencyInfoRaw =
+          (yield this.editorStore.depotServerClient.analyzeDependencyTree(
+            dependencyCoordinates.map((e) =>
+              ProjectDependencyCoordinates.serialization.toJson(e),
+            ),
+          )) as PlainObject<ProjectDependencyInfo>;
+        this.dependencyInfo =
+          ProjectDependencyInfo.serialization.fromJson(dependencyInfoRaw);
+      } else {
+        this.dependencyInfo = new ProjectDependencyInfo();
+      }
+    } catch (error) {
+      assertErrorThrown(error);
+      this.dependencyInfo = undefined;
+      this.editorStore.applicationStore.log.error(
+        LogEvent.create(LEGEND_STUDIO_APP_EVENT.DEPOT_MANAGER_FAILURE),
+        error,
+      );
+    }
+  }
+
   *updateProjectConfiguration(
     updateConfigurationCommand: UpdateProjectConfigurationCommand,
   ): GeneratorFn<void> {

package/src/stores/editor-state/element-editor-state/connection/ConnectionEditorState.ts

@@ -137,7 +137,7 @@ export class RelationalDatabaseConnectionValueState extends ConnectionValueState
   }
 
   selectPostProcessor = (postProcessor: PostProcessor | undefined): void => {
-    if (!this.postProcessorState && postProcessor) {
+    if (postProcessor) {
       if (postProcessor instanceof MapperPostProcessor) {
         this.postProcessorState = new MapperPostProcessorEditorState(
           postProcessor,
@@ -196,17 +196,17 @@ export class RelationalDatabaseConnectionValueState extends ConnectionValueState
     } else if (spec instanceof RedshiftDatasourceSpecification) {
       return CORE_DATASOURCE_SPEC_TYPE.REDSHIFT;
     }
-    const extraDatasourceSpecificationTypeGetters =
+    const extraDatasourceSpecificationClassifiers =
       this.editorStore.pluginManager
         .getApplicationPlugins()
         .flatMap(
           (plugin) =>
             (
               plugin as StoreRelational_LegendStudioApplicationPlugin_Extension
-            ).getExtraDatasourceSpecificationTypeGetters?.() ?? [],
+            ).getExtraDatasourceSpecificationClassifiers?.() ?? [],
         );
-    for (const typeGetter of extraDatasourceSpecificationTypeGetters) {
-      const type = typeGetter(spec);
+    for (const classifier of extraDatasourceSpecificationClassifiers) {
+      const type = classifier(spec);
       if (type) {
         return type;
       }
@@ -315,17 +315,17 @@ export class RelationalDatabaseConnectionValueState extends ConnectionValueState
       return CORE_AUTHENTICATION_STRATEGY_TYPE.MIDDLE_TIER_USERNAME_PASSWORD;
     }
 
-    const extraAuthenticationStrategyTypeGetters =
+    const extraAuthenticationStrategyClassifiers =
       this.editorStore.pluginManager
         .getApplicationPlugins()
         .flatMap(
           (plugin) =>
             (
               plugin as StoreRelational_LegendStudioApplicationPlugin_Extension
-            ).getExtraAuthenticationStrategyTypeGetters?.() ?? [],
+            ).getExtraAuthenticationStrategyClassifiers?.() ?? [],
         );
-    for (const typeGetter of extraAuthenticationStrategyTypeGetters) {
-      const type = typeGetter(auth);
+    for (const classifier of extraAuthenticationStrategyClassifiers) {
+      const type = classifier(auth);
       if (type) {
         return type;
       }

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

@@ -0,0 +1,58 @@
+/**
+ * Copyright (c) 2020-present, Goldman Sachs
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import type { GenericLegendApplicationStore } from '@finos/legend-application';
+import { QueryBuilderState } from '@finos/legend-query-builder';
+import type { GraphManagerState, Mapping } from '@finos/legend-graph';
+import { renderMappingExecutionQueryBuilderSetupPanelContent } from '../../../../components/editor/edit-panel/mapping-editor/MappingExecutionQueryBuilder.js';
+
+export class MappingExecutionQueryBuilderState extends QueryBuilderState {
+  readonly executionMapping: Mapping;
+
+  override TEMPORARY__setupPanelContentRenderer = (): React.ReactNode =>
+    renderMappingExecutionQueryBuilderSetupPanelContent(this);
+
+  constructor(
+    mapping: Mapping,
+    applicationStore: GenericLegendApplicationStore,
+    graphManagerState: GraphManagerState,
+  ) {
+    super(applicationStore, graphManagerState);
+
+    this.executionMapping = mapping;
+    this.mapping = mapping;
+  }
+
+  override get isMappingReadOnly(): boolean {
+    return true;
+  }
+
+  override get isRuntimeReadOnly(): boolean {
+    return true;
+  }
+
+  override get isParameterSupportDisabled(): boolean {
+    return true;
+  }
+
+  override get isResultPanelHidden(): boolean {
+    return true;
+  }
+
+  override get sideBarClassName(): string | undefined {
+    return 'query-builder__setup__mapping-execution';
+  }
+}

package/src/stores/shared/DnDUtil.ts

@@ -51,7 +51,7 @@ export enum CORE_DND_TYPE {
   MAPPING_EXPLORER_ASSOCIATION_MAPPING = 'MAPPING_EXPLORER_ASSOCIATION_MAPPING',
 }
 
-// React DnD uses Redux under the hood and also it champions the use of plain object over class instance
+// react-dnd uses Redux under the hood and also it champions the use of plain object over class instance
 // There is some practical reason for that (due to the potential need to serialize the item object), but as for now
 // this way of creating the drag itm is still very convenient for us since we can do direct type comparison rather than having
 // to use element full path, we might need follow the following threads if there are any breaking changes

package/src/stores/shared/PackageTreeUtil.ts

@@ -79,18 +79,18 @@ const getElementProjectExplorerDnDType = (
   } else if (element instanceof DataElement) {
     return CORE_DND_TYPE.PROJECT_EXPLORER_DATA;
   }
-  const extraElementProjectExplorerDnDTypeGetters = editorStore.pluginManager
+  const extraDragElementClassifiers = editorStore.pluginManager
     .getApplicationPlugins()
     .flatMap(
       (plugin) =>
         (
           plugin as DSL_LegendStudioApplicationPlugin_Extension
-        ).getExtraElementProjectExplorerDnDTypeGetters?.() ?? [],
+        ).getExtraDragElementClassifiers?.() ?? [],
     );
-  for (const dndTypeGetter of extraElementProjectExplorerDnDTypeGetters) {
-    const dndType = dndTypeGetter(element);
-    if (dndType) {
-      return dndType;
+  for (const classifier of extraDragElementClassifiers) {
+    const dragType = classifier(element);
+    if (dragType) {
+      return dragType;
     }
   }
   return CORE_DND_TYPE.NONE;

package/tsconfig.json

@@ -51,6 +51,7 @@
     "./src/stores/EditorSDLCState.ts",
     "./src/stores/EditorStore.ts",
     "./src/stores/EditorStoreTestUtils.ts",
+    "./src/stores/EmbeddedQueryBuilderState.ts",
     "./src/stores/ExplorerTreeState.ts",
     "./src/stores/LegendStudioAppEvent.ts",
     "./src/stores/LegendStudioApplicationNavigationContext.ts",
@@ -94,6 +95,7 @@
     "./src/stores/editor-state/element-editor-state/mapping/MappingEditorState.ts",
     "./src/stores/editor-state/element-editor-state/mapping/MappingElementDecorator.ts",
     "./src/stores/editor-state/element-editor-state/mapping/MappingElementState.ts",
+    "./src/stores/editor-state/element-editor-state/mapping/MappingExecutionQueryBuilderState.ts",
     "./src/stores/editor-state/element-editor-state/mapping/MappingExecutionState.ts",
     "./src/stores/editor-state/element-editor-state/mapping/MappingTestState.ts",
     "./src/stores/editor-state/element-editor-state/mapping/PureInstanceSetImplementationState.ts",
@@ -145,6 +147,7 @@
     "./src/components/Core_LegendStudioApplicationPlugin.tsx",
     "./src/components/DSLExternalFormat_LegendStudioApplicationPlugin.tsx",
     "./src/components/EditorComponentTestUtils.tsx",
+    "./src/components/EmbeddedQueryBuilder.tsx",
     "./src/components/LegendStudioAppInfo.tsx",
     "./src/components/LegendStudioApplication.tsx",
     "./src/components/LegendStudioBaseStoreProvider.tsx",
@@ -191,6 +194,7 @@
     "./src/components/editor/edit-panel/mapping-editor/InstanceSetImplementationSourceSelectorModal.tsx",
     "./src/components/editor/edit-panel/mapping-editor/MappingEditor.tsx",
     "./src/components/editor/edit-panel/mapping-editor/MappingExecutionBuilder.tsx",
+    "./src/components/editor/edit-panel/mapping-editor/MappingExecutionQueryBuilder.tsx",
     "./src/components/editor/edit-panel/mapping-editor/MappingExplorer.tsx",
     "./src/components/editor/edit-panel/mapping-editor/MappingTestEditor.tsx",
     "./src/components/editor/edit-panel/mapping-editor/MappingTestsExplorer.tsx",
@@ -212,6 +216,7 @@
     "./src/components/editor/edit-panel/testable/TestAssertionEditor.tsx",
     "./src/components/editor/edit-panel/uml-editor/AssociationEditor.tsx",
     "./src/components/editor/edit-panel/uml-editor/ClassEditor.tsx",
+    "./src/components/editor/edit-panel/uml-editor/ClassQueryBuilder.tsx",
     "./src/components/editor/edit-panel/uml-editor/EnumerationEditor.tsx",
     "./src/components/editor/edit-panel/uml-editor/ProfileEditor.tsx",
     "./src/components/editor/edit-panel/uml-editor/PropertyEditor.tsx",