@finos/legend-application-studio 28.2.5 → 28.2.7

package/src/components/editor/editor-group/mapping-editor/MappingTestableEditor.tsx

@@ -872,9 +872,12 @@ const MappingTestEditor = observer(
                       <textarea
                         className="panel__content__form__section__textarea mapping-testable-editor__doc__textarea"
                         spellCheck={false}
-                        value={mappingTest.doc}
+                        value={mappingTest.doc ?? ''}
                         onChange={(event) => {
-                          atomicTest_setDoc(mappingTest, event.target.value);
+                          atomicTest_setDoc(
+                            mappingTest,
+                            event.target.value ? event.target.value : undefined,
+                          );
                         }}
                       />
                     </div>

package/src/components/editor/editor-group/testable/TestableSharedComponents.tsx

@@ -255,6 +255,9 @@ const EqualToJsonAssertFailViewer = observer(
     const { equalToJsonAssertFailState } = props;
     const open = (): void => equalToJsonAssertFailState.setDiffModal(true);
     const close = (): void => equalToJsonAssertFailState.setDiffModal(false);
+    const expected = equalToJsonAssertFailState.status.expected;
+    const actual = equalToJsonAssertFailState.status.actual;
+
     return (
       <>
         <div className="equal-to-json-editor__message" onClick={open}>
@@ -285,10 +288,7 @@ const EqualToJsonAssertFailViewer = observer(
                 </div>
               </ModalHeader>
               <ModalBody>
-                <JSONDiffView
-                  from={equalToJsonAssertFailState.status.expected}
-                  to={equalToJsonAssertFailState.status.actual}
-                />
+                <JSONDiffView from={expected} to={actual} lossless={true} />
               </ModalBody>
               <ModalFooter>
                 <ModalFooterButton text="Close" onClick={close} />

package/src/components/editor/panel-group/DevToolPanel.tsx

@@ -20,10 +20,19 @@ import {
   Panel,
   PanelFormTextField,
   PanelForm,
+  CloudDownloadIcon,
+  PanelFormListItems,
 } from '@finos/legend-art';
-import { isValidUrl } from '@finos/legend-shared';
+import {
+  ContentType,
+  downloadFileUsingDataURI,
+  getContentTypeFileExtension,
+  isValidUrl,
+} from '@finos/legend-shared';
 import { useEditorStore } from '../EditorStoreProvider.js';
 import { LEGEND_STUDIO_SETTING_KEY } from '../../../__lib__/LegendStudioSetting.js';
+import { flowResult } from 'mobx';
+import type { PureModel } from '@finos/legend-graph';
 
 export const DevToolPanel = observer(() => {
   const editorStore = useEditorStore();
@@ -58,6 +67,52 @@ export const DevToolPanel = observer(() => {
     );
   };
 
+  const downloadDependencyProjectGrammars = async (): Promise<string> => {
+    const dependencyGrammars = await Promise.all(
+      Array.from(
+        editorStore.graphManagerState.graph.dependencyManager
+          .projectDependencyModelsIndex,
+      ).map(
+        (graph) =>
+          flowResult(
+            editorStore.graphManagerState.graphManager.graphToPureCode(
+              graph[1] as PureModel,
+              {
+                pretty: true,
+              },
+            ),
+          ) as string,
+      ),
+    );
+    return dependencyGrammars.join('\n');
+  };
+
+  const downloadProjectGrammar = async (
+    withDependency: boolean,
+  ): Promise<void> => {
+    const graphGrammar = (await Promise.all([
+      flowResult(
+        editorStore.graphManagerState.graphManager.graphToPureCode(
+          editorStore.graphManagerState.graph,
+          { pretty: true },
+        ),
+      ),
+    ])) as unknown as string;
+    const dependencyGrammars = withDependency
+      ? ((await Promise.all([
+          flowResult(downloadDependencyProjectGrammars()),
+        ])) as unknown as string)
+      : '';
+    const fileName = `grammar.${getContentTypeFileExtension(
+      ContentType.TEXT_PLAIN,
+    )}`;
+    downloadFileUsingDataURI(
+      fileName,
+      `${graphGrammar}\n${dependencyGrammars}`,
+      ContentType.TEXT_PLAIN,
+    );
+  };
+
   return (
     <Panel>
       <PanelForm>
@@ -130,6 +185,44 @@ export const DevToolPanel = observer(() => {
           isReadOnly={false}
           update={toggleArtifactGeneration}
         />
+        <PanelFormListItems title="Download Project Grammar">
+          <div className="developer-tools__action-groups">
+            <div className="developer-tools__action-group">
+              <button
+                className="developer-tools__action-group__btn"
+                onClick={() => {
+                  downloadProjectGrammar(false).catch(
+                    editorStore.applicationStore.alertUnhandledError,
+                  );
+                }}
+                tabIndex={-1}
+                title="Download Project Grammar"
+              >
+                <CloudDownloadIcon />
+              </button>
+              <div className="developer-tools__action-group__prompt">
+                download grammar without dependency
+              </div>
+            </div>
+            <div className="developer-tools__action-group">
+              <button
+                className="developer-tools__action-group__btn"
+                onClick={() => {
+                  downloadProjectGrammar(true).catch(
+                    editorStore.applicationStore.alertUnhandledError,
+                  );
+                }}
+                tabIndex={-1}
+                title="Download Project Grammar with Dependency"
+              >
+                <CloudDownloadIcon />
+              </button>
+              <div className="developer-tools__action-group__prompt">
+                download grammar with dependency
+              </div>
+            </div>
+          </div>
+        </PanelFormListItems>
       </PanelForm>
     </Panel>
   );

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

@@ -112,6 +112,7 @@ import {
   extractDependencyGACoordinateFromRootPackageName,
   type FunctionActivatorConfiguration,
   Database,
+  DEPENDENCY_ROOT_PACKAGE_PREFIX,
 } from '@finos/legend-graph';
 import {
   ActionAlertActionType,
@@ -617,7 +618,7 @@ const ExplorerContextMenu = observer(
         const dependency =
           editorStore.projectConfigurationEditorState.projectConfiguration?.projectDependencies.find(
             (dep) =>
-              dep.projectId ===
+              DEPENDENCY_ROOT_PACKAGE_PREFIX + dep.projectId ===
               getElementRootPackage(node.packageableElement).name,
           );
         if (dependency) {
@@ -659,7 +660,7 @@ const ExplorerContextMenu = observer(
         const dependency =
           editorStore.projectConfigurationEditorState.projectConfiguration?.projectDependencies.find(
             (dep) =>
-              dep.projectId ===
+              DEPENDENCY_ROOT_PACKAGE_PREFIX + dep.projectId ===
               getElementRootPackage(node.packageableElement).name,
           );
         if (dependency) {
@@ -696,7 +697,9 @@ const ExplorerContextMenu = observer(
     const viewProject = (): void => {
       const projectDependency =
         editorStore.projectConfigurationEditorState.projectConfiguration?.projectDependencies.find(
-          (dep) => dep.projectId === node?.packageableElement.name,
+          (dep) =>
+            DEPENDENCY_ROOT_PACKAGE_PREFIX + dep.projectId ===
+            node?.packageableElement.name,
         );
       if (projectDependency) {
         applicationStore.navigationService.navigator.visitAddress(
@@ -715,7 +718,9 @@ const ExplorerContextMenu = observer(
     const viewSDLCProject = (): void => {
       const dependency =
         editorStore.projectConfigurationEditorState.projectConfiguration?.projectDependencies.find(
-          (dep) => dep.projectId === node?.packageableElement.name,
+          (dep) =>
+            DEPENDENCY_ROOT_PACKAGE_PREFIX + dep.projectId ===
+            node?.packageableElement.name,
         );
       if (dependency) {
         createViewSDLCProjectHandler(

package/src/stores/editor/editor-state/element-editor-state/mapping/testable/MappingTestableState.ts

@@ -428,6 +428,7 @@ export class MappingTestSuiteState extends TestableTestSuiteEditorState {
     const test = createBareMappingTest(
       id,
       this.createStoreTestData(_class),
+      this.editorStore.changeDetectionState.observerContext,
       this.suite,
     );
     testSuite_addTest(
@@ -521,7 +522,13 @@ export class CreateSuiteState {
         ? generateStoreTestDataFromSetImpl(rootSetImpl, this.editorStore)
         : undefined;
 
-      createBareMappingTest(testName, storeTestData, mappingTestSuite);
+      createBareMappingTest(
+        testName,
+        storeTestData,
+
+        this.editorStore.changeDetectionState.observerContext,
+        mappingTestSuite,
+      );
       // set test suite
       mapping_addTestSuite(
         this.mappingTestableState.mapping,

package/src/stores/editor/editor-state/element-editor-state/mapping/testable/MappingTestingHelper.ts

@@ -44,6 +44,7 @@ import {
   getAllClassDerivedProperties,
   PropertyGraphFetchTree,
   PropertyExplicitReference,
+  type ObserverContext,
 } from '@finos/legend-graph';
 import {
   buildGetAllFunction,
@@ -63,6 +64,7 @@ import {
   guaranteeNonNullable,
 } from '@finos/legend-shared';
 import type { DSL_Data_LegendStudioApplicationPlugin_Extension } from '../../../../../extensions/DSL_Data_LegendStudioApplicationPlugin_Extension.js';
+import { testSuite_addTest } from '../../../../../graph-modifier/Testable_GraphModifierHelper.js';
 
 export const createGraphFetchRawLambda = (
   mainClass: Class,
@@ -158,6 +160,7 @@ export const generateStoreTestDataFromSetImpl = (
 export const createBareMappingTest = (
   id: string,
   storeTestData: StoreTestData | undefined,
+  observerContext: ObserverContext,
   suite?: MappingTestSuite | undefined,
 ): MappingTest => {
   const mappingTest = new MappingTest();
@@ -168,7 +171,7 @@ export const createBareMappingTest = (
   ];
   if (suite) {
     mappingTest.__parent = suite;
-    suite.tests.push(mappingTest);
+    testSuite_addTest(suite, mappingTest, observerContext);
   }
   const assertion = createDefaultEqualToJSONTestAssertion(`expectedAssertion`);
   mappingTest.assertions = [assertion];

package/src/stores/editor/editor-state/element-editor-state/testable/TestAssertionState.ts

@@ -369,7 +369,6 @@ export class TestAssertionEditorState {
       if (generated) {
         this.setSelectedTab(TEST_ASSERTION_TAB.EXPECTED);
       }
-      this.generatingExpectedAction.complete();
       this.editorStore.applicationStore.notificationService.notifySuccess(
         `Expected results generated!`,
       );
@@ -380,6 +379,8 @@ export class TestAssertionEditorState {
       );
       this.setSelectedTab(TEST_ASSERTION_TAB.EXPECTED);
       this.generatingExpectedAction.fail();
+    } finally {
+      this.generatingExpectedAction.complete();
     }
   }