@finos/legend-application-studio 26.1.6 → 26.1.7

package/src/components/editor/ActivityBar.tsx

@@ -117,7 +117,7 @@ export const ActivityBarMenu: React.FC = () => {
                 disabled={!appDocUrl}
                 onClick={goToDocumentation}
               >
-                See Documentation
+                Documentation
               </MenuContentItem>
               {docLinks?.map((entry) => (
                 <MenuContentItem

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

@@ -33,6 +33,9 @@ import {
   ExclamationTriangleIcon,
   PanelFormSection,
   PanelListItem,
+  Button,
+  PencilEditIcon,
+  PanelDivider,
 } from '@finos/legend-art';
 import { flowResult } from 'mobx';
 import {
@@ -246,10 +249,36 @@ const PlatformDependencyViewer = observer(
   },
 );
 
+const PlatformDependencyEditor = observer(
+  (props: { platform: PlatformConfiguration }) => {
+    const { platform } = props;
+
+    return (
+      <div className="platform-configurations-editor__dependency">
+        <div className="platform-configurations-editor__dependency__label">
+          <div className="platform-configurations-editor__dependency__label__status"></div>
+          <div className="platform-configurations-editor__dependency__label__text">
+            {platform.name}
+          </div>
+          <input
+            className="input input--dark"
+            onChange={(event) => {
+              platform.setVersion(event.target.value);
+            }}
+            value={platform.version}
+            spellCheck={false}
+          />
+        </div>
+      </div>
+    );
+  },
+);
+
 const ProjectPlatformVersionEditor = observer(
   (props: { projectConfig: ProjectConfiguration; isReadOnly: boolean }) => {
     const { projectConfig, isReadOnly } = props;
     const editorStore = useEditorStore();
+    const applicationStore = useApplicationStore();
 
     const convertPlatformtoPlatformConfiguration = (
       platforms: Platform[] | undefined,
@@ -297,6 +326,34 @@ const ProjectPlatformVersionEditor = observer(
       }
     };
 
+    const toggleManualOverwrite = (): void => {
+      if (!editorStore.projectConfigurationEditorState.manualOverwrite) {
+        applicationStore.alertService.setActionAlertInfo({
+          message:
+            'Clicking this will allow you to not just override and freeze platform versions but to input custom platform versions you would like manually and is not usually recommended except to temporarily unblock your project',
+          prompt: 'Do you want to proceed?',
+          type: ActionAlertType.CAUTION,
+          actions: [
+            {
+              label: 'Continue',
+              type: ActionAlertActionType.PROCEED_WITH_CAUTION,
+              handler: (): void =>
+                editorStore.projectConfigurationEditorState.setManualOverwrite(
+                  true,
+                ),
+            },
+            {
+              label: 'Cancel',
+              type: ActionAlertActionType.PROCEED,
+              default: true,
+            },
+          ],
+        });
+      } else {
+        editorStore.projectConfigurationEditorState.setManualOverwrite(false);
+      }
+    };
+
     return (
       <Panel>
         <PanelForm>
@@ -339,35 +396,108 @@ const ProjectPlatformVersionEditor = observer(
                   </div>
                 </div>
               </div>
-              {platformConfigurations && !isUpToDate && (
-                <div className="platform-configurations-editor__dependencies__header__right">
-                  <button
-                    className="btn btn--dark"
-                    tabIndex={-1}
-                    onClick={updateLatestToLatestVersion}
+
+              <div className="platform-configurations-editor__dependencies__header__right">
+                <PanelListItem>
+                  {platformConfigurations &&
+                    !isUpToDate &&
+                    !editorStore.projectConfigurationEditorState
+                      .manualOverwrite && (
+                      <div>
+                        <button
+                          className="btn btn--dark"
+                          tabIndex={-1}
+                          onClick={updateLatestToLatestVersion}
+                        >
+                          Update to the current latest platform version
+                        </button>
+                      </div>
+                    )}
+                  <Button
+                    className={clsx(
+                      'project-configuration-editor__manual-btn',
+                      {
+                        'project-configuration-editor__manual-btn--active':
+                          editorStore.projectConfigurationEditorState
+                            .manualOverwrite,
+                      },
+                    )}
+                    title="Manually overwrite platform configurations"
+                    disabled={isReadOnly}
+                    onClick={toggleManualOverwrite}
                   >
-                    Update to the current latest platform version
-                  </button>
-                </div>
-              )}
+                    <PencilEditIcon />
+                  </Button>
+                </PanelListItem>
+              </div>
             </div>
             <div className="platform-configurations-editor__dependencies__content">
-              {!platformConfigurations &&
-                defaultPlatforms?.map((p) => (
-                  <PlatformDependencyViewer
-                    key={p.name}
-                    isDefault={true}
-                    platform={p}
-                  />
-                ))}
-              {platformConfigurations?.map((p) => (
-                <PlatformDependencyViewer
-                  key={p.name}
-                  platform={p}
-                  isDefault={false}
-                  isLatestVersion={isUpToDate}
-                />
-              ))}
+              {editorStore.projectConfigurationEditorState.manualOverwrite ? (
+                <>
+                  {!platformConfigurations &&
+                    defaultPlatforms?.map((p) => (
+                      <PlatformDependencyEditor key={p.name} platform={p} />
+                    ))}
+                  {platformConfigurations?.map((p) => (
+                    <PlatformDependencyEditor key={p.name} platform={p} />
+                  ))}
+
+                  <PanelDivider />
+                  <PanelListItem>
+                    <Button
+                      className="project-configuration-editor__manual-overwrite-btn"
+                      disabled={isReadOnly}
+                      onClick={() => {
+                        editorStore.projectConfigurationEditorState.setManualOverwrite(
+                          false,
+                        );
+                      }}
+                      title="Cancel manual override"
+                      text="Cancel"
+                    />
+
+                    <Button
+                      className="project-configuration-editor__manual-overwrite-btn"
+                      disabled={isReadOnly}
+                      onClick={() => {
+                        if (!platformConfigurations) {
+                          projectConfig.setPlatformConfigurations(
+                            defaultPlatforms,
+                          );
+                        } else {
+                          projectConfig.setPlatformConfigurations(
+                            platformConfigurations,
+                          );
+                        }
+
+                        editorStore.projectConfigurationEditorState.setManualOverwrite(
+                          false,
+                        );
+                      }}
+                      text="Manual override"
+                    />
+                  </PanelListItem>
+                </>
+              ) : (
+                <>
+                  {!platformConfigurations &&
+                    defaultPlatforms?.map((p) => (
+                      <PlatformDependencyViewer
+                        key={p.name}
+                        isDefault={true}
+                        platform={p}
+                      />
+                    ))}
+                  {platformConfigurations?.map((p) => (
+                    <PlatformDependencyViewer
+                      key={p.name}
+                      platform={p}
+                      isDefault={false}
+                      isLatestVersion={isUpToDate}
+                    />
+                  ))}
+                </>
+              )}
             </div>
           </div>
         </PanelForm>

package/src/components/editor/editor-group/service-editor/testable/ServiceTestsEditor.tsx

@@ -87,6 +87,7 @@ import {
   CODE_EDITOR_LANGUAGE,
   CodeEditor,
 } from '@finos/legend-lego/code-editor';
+import { LEGEND_STUDIO_TEST_ID } from '../../../../../__lib__/LegendStudioTesting.js';
 
 export const NewParameterModal = observer(
   (props: { setupState: ServiceTestSetupState; isReadOnly: boolean }) => {
@@ -391,7 +392,10 @@ const ServiceTestSetupEditor = observer(
     }, [setupState]);
 
     return (
-      <div className="panel service-test-editor">
+      <div
+        data-testid={LEGEND_STUDIO_TEST_ID.SERVICE_TEST_EDITOR__SETUP}
+        className="panel service-test-editor"
+      >
         <div className="panel__header">
           <div className="service-test-suite-editor__header__title">
             <div className="service-test-suite-editor__header__title__label">
@@ -460,7 +464,12 @@ const ServiceTestSetupEditor = observer(
               <ResizablePanelSplitterLine color="var(--color-dark-grey-200)" />
             </ResizablePanelSplitter>
             <ResizablePanel minSize={56}>
-              <div className="service-test-data-editor panel">
+              <div
+                data-testid={
+                  LEGEND_STUDIO_TEST_ID.SERVICE_TEST_EDITOR__SETUP__PARAMETERS
+                }
+                className="service-test-data-editor panel"
+              >
                 <div className="service-test-suite-editor__header">
                   <div className="service-test-suite-editor__header__title">
                     <div className="service-test-suite-editor__header__title__label">
@@ -783,7 +792,10 @@ export const ServiceTestsEditor = observer(
     const renameTest = (val: string): void =>
       atomicTest_setId(guaranteeNonNullable(suiteState.testToRename), val);
     return (
-      <div className="panel service-test-editor">
+      <div
+        data-testid={LEGEND_STUDIO_TEST_ID.SERVICE_TEST_EDITOR}
+        className="panel service-test-editor"
+      >
         <div className="service-test-suite-editor__header">
           <div className="service-test-suite-editor__header__title">
             <div className="service-test-suite-editor__header__title__label service-test-suite-editor__header__title__label--tests">

package/src/components/editor/side-bar/Explorer.tsx

@@ -101,6 +101,7 @@ import {
   PackageableConnection,
   RelationalDatabaseConnection,
   guaranteeRelationalDatabaseConnection,
+  extractDependencyGACoordinateFromRootPackageName,
 } from '@finos/legend-graph';
 import { useApplicationStore } from '@finos/legend-application';
 import {
@@ -895,7 +896,8 @@ const PackageTreeNodeContainer = observer(
             tabIndex={-1}
             title={node.packageableElement.path}
           >
-            {node.label}
+            {extractDependencyGACoordinateFromRootPackageName(node.label) ??
+              node.label}
           </button>
         </div>
       </ContextMenu>

package/src/stores/editor/editor-state/element-editor-state/service/testable/ServiceTestEditorState.ts

@@ -260,9 +260,7 @@ export class ServiceTestSetupState {
         }
       } catch (error) {
         this.editorStore.applicationStore.logService.error(
-          LogEvent.create(
-            LEGEND_STUDIO_APP_EVENT.TEST_DATA_GENERATION__SETUP__FAILURE,
-          ),
+          LogEvent.create(LEGEND_STUDIO_APP_EVENT.SERVICE_TEST_SETUP_FAILURE),
           error,
         );
       }

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

@@ -63,7 +63,7 @@ export class ProjectConfigurationEditorState extends EditorState {
   projects = new Map<string, StoreProjectData>();
   versions = new Map<string, string[]>();
   latestProjectStructureVersion: ProjectStructureVersion | undefined;
-
+  manualOverwrite = false;
   associatedProjectsAndVersionsFetched = false;
 
   constructor(editorStore: EditorStore, sdlcState: EditorSDLCState) {
@@ -75,6 +75,7 @@ export class ProjectConfigurationEditorState extends EditorState {
       projectConfiguration: observable,
       selectedTab: observable,
       isReadOnly: observable,
+      manualOverwrite: observable,
       projects: observable,
       versions: observable,
       associatedProjectsAndVersionsFetched: observable,
@@ -88,6 +89,7 @@ export class ProjectConfigurationEditorState extends EditorState {
       setOriginalProjectConfiguration: action,
       setProjectConfiguration: action,
       setSelectedTab: action,
+      setManualOverwrite: action,
       fectchAssociatedProjectsAndVersions: flow,
       updateProjectConfiguration: flow,
       updateToLatestStructure: flow,
@@ -118,6 +120,10 @@ export class ProjectConfigurationEditorState extends EditorState {
     this.selectedTab = tab;
   }
 
+  setManualOverwrite(value: boolean): void {
+    this.manualOverwrite = value;
+  }
+
   get label(): string {
     return 'config';
   }

package/src/stores/editor/utils/PackageTreeUtils.ts

@@ -47,6 +47,7 @@ import {
   generateFunctionPrettyName,
   getElementRootPackage,
   extractDependencyGACoordinateFromRootPackageName,
+  generateDependencyRootPackageName,
 } from '@finos/legend-graph';
 import { ExplorerTreeRootPackageLabel } from '../ExplorerTreeState.js';
 
@@ -229,8 +230,12 @@ export const getDependenciesPackableElementTreeData = (
     const dependencyGACoordinates =
       extractDependencyGACoordinateFromRootPackageName(_package.name) ??
       _package.name;
-    childRootNode.label = dependencyGACoordinates;
-    childRootNode.id = dependencyGACoordinates;
+    childRootNode.label = generateDependencyRootPackageName(
+      dependencyGACoordinates,
+    );
+    childRootNode.id = generateDependencyRootPackageName(
+      dependencyGACoordinates,
+    );
     addUniqueEntry(rootIds, childRootNode.id);
     nodes.set(childRootNode.id, childRootNode);
     root.children.push(_package);