@finos/legend-application-studio 28.15.3 → 28.15.5

package/src/components/{workspace-review/WorkspaceReviewPanel.tsx → project-reviewer/ProjectReviewerPanel.tsx}

@@ -32,12 +32,15 @@ import { EntityDiffView } from '../editor/editor-group/diff-editor/EntityDiffVie
 import type { EditorState } from '../../stores/editor/editor-state/EditorState.js';
 import { useEditorStore } from '../editor/EditorStoreProvider.js';
 import { forwardRef } from 'react';
+import { EditorDiffViewerState } from '../../stores/editor/editor-state/diff-viewer-state/EditorDiffViewerState.js';
+import { ProjectConfigDiffView } from '../editor/editor-group/diff-editor/ProjectConfigDiffView.js';
+import { ProjectConfigurationDiffEditorState } from '../../stores/editor/editor-state/diff-viewer-state/ProjectConfigurationDiffEditorState.js';
 
-const WorkspaceReviewPanelSplashScreen: React.FC = () => (
+const ProjectReviewerPanelSplashScreen: React.FC = () => (
   <div className="workspace-review-panel__splash-screen"></div>
 );
 
-const WorkspaceReviewPanelHeaderTabContextMenu = observer(
+const ProjectReviewerPanelHeaderTabContextMenu = observer(
   forwardRef<
     HTMLDivElement,
     {
@@ -65,14 +68,14 @@ const WorkspaceReviewPanelHeaderTabContextMenu = observer(
   }),
 );
 
-export const WorkspaceReviewPanel = observer(() => {
+export const ProjectReviewerPanel = observer(() => {
   const editorStore = useEditorStore();
   const currentTabState =
-    editorStore.tabManagerState.currentTab instanceof EntityDiffViewState
+    editorStore.tabManagerState.currentTab instanceof EditorDiffViewerState
       ? editorStore.tabManagerState.currentTab
       : undefined;
   const openedTabStates = editorStore.tabManagerState.tabs.filter(
-    filterByType(EntityDiffViewState),
+    filterByType(EditorDiffViewerState),
   );
   const closeTab =
     (diffState: EditorState): React.MouseEventHandler =>
@@ -91,12 +94,25 @@ export const WorkspaceReviewPanel = observer(() => {
       editorStore.tabManagerState.openTab(editorState);
   const switchViewMode =
     (mode: DIFF_VIEW_MODE): (() => void) =>
-    (): void =>
-      currentTabState?.setDiffMode(mode);
+    (): void => {
+      if (currentTabState instanceof EntityDiffViewState) {
+        currentTabState.setDiffMode(mode);
+      }
+    };
 
   if (!currentTabState) {
-    return <WorkspaceReviewPanelSplashScreen />;
+    return <ProjectReviewerPanelSplashScreen />;
   }
+  const renderActiveTabState = (
+    tab: EditorDiffViewerState,
+  ): React.ReactNode => {
+    if (tab instanceof EntityDiffViewState) {
+      return <EntityDiffView entityDiffViewState={tab} />;
+    } else if (tab instanceof ProjectConfigurationDiffEditorState) {
+      return <ProjectConfigDiffView configDiffState={tab} />;
+    }
+    return null;
+  };
   return (
     <div className="panel workspace-review-panel">
       <div className="panel__header workspace-review-panel__header">
@@ -113,7 +129,7 @@ export const WorkspaceReviewPanel = observer(() => {
               <ContextMenu
                 className="workspace-review-panel__header__tab__content"
                 content={
-                  <WorkspaceReviewPanelHeaderTabContextMenu
+                  <ProjectReviewerPanelHeaderTabContextMenu
                     editorState={editorState}
                   />
                 }
@@ -137,38 +153,40 @@ export const WorkspaceReviewPanel = observer(() => {
           ))}
         </div>
         <div className="workspace-review-panel__header__actions">
-          <DropdownMenu
-            className="workspace-review-panel__element-view__type"
-            title="View as..."
-            content={
-              <div className="workspace-review-panel__element-view__options">
-                <div
-                  className="workspace-review-panel__element-view__option"
-                  onClick={switchViewMode(DIFF_VIEW_MODE.GRAMMAR)}
-                >
-                  {DIFF_VIEW_MODE.GRAMMAR}
-                </div>
-                <div
-                  className="workspace-review-panel__element-view__option"
-                  onClick={switchViewMode(DIFF_VIEW_MODE.JSON)}
-                >
-                  {DIFF_VIEW_MODE.JSON}
+          {currentTabState instanceof EntityDiffViewState && (
+            <DropdownMenu
+              className="workspace-review-panel__element-view__type"
+              title="View as..."
+              content={
+                <div className="workspace-review-panel__element-view__options">
+                  <div
+                    className="workspace-review-panel__element-view__option"
+                    onClick={switchViewMode(DIFF_VIEW_MODE.GRAMMAR)}
+                  >
+                    {DIFF_VIEW_MODE.GRAMMAR}
+                  </div>
+                  <div
+                    className="workspace-review-panel__element-view__option"
+                    onClick={switchViewMode(DIFF_VIEW_MODE.JSON)}
+                  >
+                    {DIFF_VIEW_MODE.JSON}
+                  </div>
                 </div>
+              }
+              menuProps={{
+                anchorOrigin: { vertical: 'bottom', horizontal: 'right' },
+                transformOrigin: { vertical: 'top', horizontal: 'right' },
+              }}
+            >
+              <div className="workspace-review-panel__element-view__type__label">
+                {currentTabState.diffMode}
               </div>
-            }
-            menuProps={{
-              anchorOrigin: { vertical: 'bottom', horizontal: 'right' },
-              transformOrigin: { vertical: 'top', horizontal: 'right' },
-            }}
-          >
-            <div className="workspace-review-panel__element-view__type__label">
-              {currentTabState.diffMode}
-            </div>
-          </DropdownMenu>
+            </DropdownMenu>
+          )}
         </div>
       </div>
       <div className="panel__content workspace-review-panel__content">
-        <EntityDiffView entityDiffViewState={currentTabState} />
+        {renderActiveTabState(currentTabState)}
       </div>
     </div>
   );

package/src/stores/editor/editor-state/diff-viewer-state/EditorDiffViewerState.ts

@@ -0,0 +1,34 @@
+/**
+ * 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 { EditorStore } from '../../EditorStore.js';
+import { EditorState } from '../EditorState.js';
+import type { SPECIAL_REVISION_ALIAS } from '../entity-diff-editor-state/EntityDiffEditorState.js';
+
+export abstract class EditorDiffViewerState extends EditorState {
+  fromRevision: SPECIAL_REVISION_ALIAS | string;
+  toRevision: SPECIAL_REVISION_ALIAS | string;
+
+  constructor(
+    fromRevision: SPECIAL_REVISION_ALIAS | string,
+    toRevision: SPECIAL_REVISION_ALIAS | string,
+    editorStore: EditorStore,
+  ) {
+    super(editorStore);
+    this.fromRevision = fromRevision;
+    this.toRevision = toRevision;
+  }
+}

package/src/stores/editor/editor-state/diff-viewer-state/ProjectConfigurationDiffEditorState.ts

@@ -0,0 +1,56 @@
+/**
+ * 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 { prettyCONSTName, type PlainObject } from '@finos/legend-shared';
+import type { ProjectConfiguration } from '@finos/legend-server-sdlc';
+import type { EditorStore } from '../../EditorStore.js';
+import { EditorDiffViewerState } from './EditorDiffViewerState.js';
+import type { SPECIAL_REVISION_ALIAS } from '../entity-diff-editor-state/EntityDiffEditorState.js';
+import type { EditorState } from '../EditorState.js';
+
+export const PROJECT_CONFIGURATION = 'PROJECT_CONFIGURATION';
+
+export class ProjectConfigurationDiffEditorState extends EditorDiffViewerState {
+  fromConfig: PlainObject<ProjectConfiguration>;
+  toConfig: PlainObject<ProjectConfiguration>;
+  constructor(
+    fromConfig: PlainObject<ProjectConfiguration>,
+    toConfig: PlainObject<ProjectConfiguration>,
+    editorStore: EditorStore,
+    fromRevision: SPECIAL_REVISION_ALIAS | string,
+    toRevision: SPECIAL_REVISION_ALIAS | string,
+  ) {
+    super(fromRevision, toRevision, editorStore);
+    this.fromConfig = fromConfig;
+    this.toConfig = toConfig;
+  }
+
+  override get label(): string {
+    return prettyCONSTName(PROJECT_CONFIGURATION);
+  }
+
+  override match(tab: EditorState): boolean {
+    return (
+      tab instanceof ProjectConfigurationDiffEditorState &&
+      tab.fromRevision === this.fromRevision &&
+      tab.toRevision === this.toRevision
+    );
+  }
+
+  override get description(): string {
+    return prettyCONSTName(PROJECT_CONFIGURATION);
+  }
+}

package/src/stores/editor/editor-state/element-editor-state/ElementEditorState.ts

@@ -23,12 +23,15 @@ import {
   LogEvent,
   assertErrorThrown,
   guaranteeNonNullable,
+  guaranteeType,
+  isType,
 } from '@finos/legend-shared';
 import {
   type CompilationError,
   type PackageableElement,
   GRAPH_MANAGER_EVENT,
   isElementReadOnly,
+  INTERNAL__UnknownPackageableElement,
 } from '@finos/legend-graph';
 import { DEFAULT_TAB_SIZE } from '@finos/legend-application';
 import type { ElementFileGenerationState } from './ElementFileGenerationState.js';
@@ -198,12 +201,26 @@ export abstract class ElementEditorState extends EditorState {
       );
     } catch (error) {
       assertErrorThrown(error);
-      this.setTextContent(
-        generateMultiLineCommentForError(
-          `Can't generate protocol JSON for element`,
-          error,
-        ),
+      const isUnknownEntity = isType(
+        this.element,
+        INTERNAL__UnknownPackageableElement,
       );
+      if (isUnknownEntity) {
+        const unknownEntity = guaranteeType(
+          this.element,
+          INTERNAL__UnknownPackageableElement,
+        );
+        this.setTextContent(
+          JSON.stringify(unknownEntity.content, undefined, DEFAULT_TAB_SIZE),
+        );
+      } else {
+        this.setTextContent(
+          generateMultiLineCommentForError(
+            `Can't generate protocol JSON for element`,
+            error,
+          ),
+        );
+      }
       this.editorStore.applicationStore.logService.error(
         LogEvent.create(GRAPH_MANAGER_EVENT.PARSING_FAILURE),
         error,

package/src/stores/editor/editor-state/element-editor-state/FunctionActivatorState.ts

@@ -24,6 +24,7 @@ import {
   extractElementNameFromPath,
   extractPackagePathFromPath,
   SnowflakeAppDeploymentConfiguration,
+  DeploymentOwner,
 } from '@finos/legend-graph';
 import { type GeneratorFn } from '@finos/legend-shared';
 import { FUNCTION_ACTIVATE_TYPE } from '../../../../components/editor/editor-group/function-activator/FunctionEditor.js';
@@ -92,7 +93,7 @@ export class FunctionActivatorState {
         const snowflakeApp = new SnowflakeApp(activatorName);
         snowflakeApp.applicationName = '';
         snowflakeApp.description = '';
-        snowflakeApp.owner = undefined;
+        snowflakeApp.ownership = new DeploymentOwner('', snowflakeApp);
         snowflakeApp.function =
           PackageableElementExplicitReference.create(functionElement);
         snowflakeApp.activationConfiguration =

package/src/stores/editor/editor-state/element-editor-state/function-activator/SnowflakeAppFunctionActivatorEditorState.ts

@@ -22,6 +22,8 @@ import {
   PackageableElementExplicitReference,
   observe_SnowflakeAppDeploymentConfiguration,
   observe_SnowflakeApp,
+  DeploymentOwner,
+  observe_DeploymentOwnership,
 } from '@finos/legend-graph';
 import {
   type GeneratorFn,
@@ -43,7 +45,7 @@ export class SnowflakeAppFunctionActivatorEdtiorState extends ElementEditorState
     makeObservable(this, {
       activator: computed,
       reprocess: action,
-      updateOwner: action,
+      updateOwnership: action,
       updateAppDescription: action,
       updateApplicationName: action,
       updateConnection: action,
@@ -70,8 +72,9 @@ export class SnowflakeAppFunctionActivatorEdtiorState extends ElementEditorState
     );
   }
 
-  updateOwner(val: string): void {
-    this.activator.owner = val;
+  updateOwnership(val: string): void {
+    this.activator.ownership = new DeploymentOwner(val, this.activator);
+    observe_DeploymentOwnership(this.activator.ownership);
   }
 
   updateApplicationName(val: string): void {

package/src/stores/editor/editor-state/entity-diff-editor-state/EntityChangeConflictEditorState.ts

@@ -181,7 +181,7 @@ export class EntityChangeConflictEditorState extends EntityDiffViewerState {
       entityPath: string | undefined,
     ) => Entity | undefined,
   ) {
-    super(editorStore);
+    super(baseRevision, currentChangeRevision, editorStore);
 
     makeObservable<
       EntityChangeConflictEditorState,

package/src/stores/editor/editor-state/entity-diff-editor-state/EntityDiffEditorState.ts

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import { EditorState } from '../../editor-state/EditorState.js';
+import { EditorDiffViewerState } from '../diff-viewer-state/EditorDiffViewerState.js';
 
 export enum SPECIAL_REVISION_ALIAS {
   LOCAL = 'LOCAL_REVISION',
@@ -43,6 +43,6 @@ export const getPrettyLabelForRevision = (
   }
 };
 
-export abstract class EntityDiffViewerState extends EditorState {
+export abstract class EntityDiffViewerState extends EditorDiffViewerState {
   abstract refresh(): void;
 }

package/src/stores/editor/editor-state/entity-diff-editor-state/EntityDiffViewState.ts

@@ -49,8 +49,6 @@ export class EntityDiffViewState extends EntityDiffViewerState {
   diffMode = DIFF_VIEW_MODE.GRAMMAR;
   fromEntityPath?: string | undefined;
   toEntityPath?: string | undefined;
-  fromRevision: SPECIAL_REVISION_ALIAS | string;
-  toRevision: SPECIAL_REVISION_ALIAS | string;
   // to and from entities
   fromEntity?: Entity | undefined;
   toEntity?: Entity | undefined;
@@ -75,7 +73,7 @@ export class EntityDiffViewState extends EntityDiffViewerState {
     fromEntityGetter?: (entityPath: string | undefined) => Entity | undefined,
     toEntityGetter?: (entityPath: string | undefined) => Entity | undefined,
   ) {
-    super(editorStore);
+    super(fromRevision, toRevision, editorStore);
 
     makeObservable<
       EntityDiffViewState,