@finos/legend-application-studio 20.1.2 → 21.0.0

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

@@ -15,9 +15,12 @@
  */
 
 import { observable, makeObservable, action, flow } from 'mobx';
-import { type GeneratorFn, uuid } from '@finos/legend-shared';
+import type { GeneratorFn } from '@finos/legend-shared';
 import type { EditorStore } from '../../../EditorStore.js';
-import type { MappingElement } from './MappingEditorState.js';
+import {
+  getMappingElementLabel,
+  type MappingElement,
+} from './MappingEditorState.js';
 import type {
   PropertyMapping,
   InstanceSetImplementation,
@@ -25,13 +28,15 @@ import type {
   Type,
 } from '@finos/legend-graph';
 import { LambdaEditorState } from '@finos/legend-query-builder';
+import { MappingEditorTabState } from './MappingTabManagerState.js';
 
-export class MappingElementState {
-  readonly uuid = uuid();
-  editorStore: EditorStore;
-  mappingElement: MappingElement;
+export class MappingElementState extends MappingEditorTabState {
+  readonly editorStore: EditorStore;
+  readonly mappingElement: MappingElement;
 
   constructor(editorStore: EditorStore, mappingElement: MappingElement) {
+    super();
+
     makeObservable(this, {
       mappingElement: observable,
     });
@@ -39,6 +44,10 @@ export class MappingElementState {
     this.editorStore = editorStore;
     this.mappingElement = mappingElement;
   }
+
+  get label(): string {
+    return getMappingElementLabel(this.mappingElement, this.editorStore).value;
+  }
 }
 
 export abstract class SetImplementationState extends MappingElementState {

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

@@ -68,7 +68,6 @@ import {
   extractExecutionResultValues,
   LAMBDA_PIPE,
   GRAPH_MANAGER_EVENT,
-  MappingTest,
   Class,
   ObjectInputData,
   ObjectInputType,
@@ -98,6 +97,7 @@ import {
   TestData,
   ConnectionTestData,
   DEFAULT_TEST_SUITE_PREFIX,
+  DEPRECATED__MappingTest,
   ModelStore,
 } from '@finos/legend-graph';
 import {
@@ -128,6 +128,7 @@ import {
 } from '../../../shared/testable/TestableUtils.js';
 import { SERIALIZATION_FORMAT } from '../service/testable/ServiceTestEditorState.js';
 import { LambdaEditorState } from '@finos/legend-query-builder';
+import { MappingEditorTabState } from './MappingTabManagerState.js';
 
 export class MappingExecutionQueryState extends LambdaEditorState {
   editorStore: EditorStore;
@@ -477,8 +478,7 @@ export class MappingExecutionRelationalInputDataState extends MappingExecutionIn
   }
 }
 
-export class MappingExecutionState {
-  readonly uuid = uuid();
+export class MappingExecutionState extends MappingEditorTabState {
   readonly editorStore: EditorStore;
   readonly mappingEditorState: MappingEditorState;
 
@@ -498,6 +498,8 @@ export class MappingExecutionState {
     mappingEditorState: MappingEditorState,
     name: string,
   ) {
+    super();
+
     makeObservable(this, {
       name: observable,
       queryState: observable,
@@ -539,6 +541,9 @@ export class MappingExecutionState {
     );
   }
 
+  get label(): string {
+    return this.name;
+  }
   setQueryState(val: MappingExecutionQueryState): void {
     this.queryState = val;
   }
@@ -646,7 +651,7 @@ export class MappingExecutionState {
         const assert = new ExpectedOutputMappingTestAssert(
           toGrammarString(this.executionResultText),
         );
-        const mappingTest = new MappingTest(
+        const mappingTest = new DEPRECATED__MappingTest(
           generateMappingTestName(this.mappingEditorState.mapping),
           query,
           [inputData],

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

@@ -0,0 +1,19 @@
+/**
+ * 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 { TabState } from '@finos/legend-application';
+
+export abstract class MappingEditorTabState extends TabState {}

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

@@ -42,7 +42,6 @@ import type { EditorStore } from '../../../EditorStore.js';
 import { observable, flow, action, makeObservable, flowResult } from 'mobx';
 import { createMockDataForMappingElementSource } from '../../../shared/MockDataUtils.js';
 import {
-  type MappingTest,
   type RawLambda,
   type Runtime,
   type InputData,
@@ -76,6 +75,7 @@ import {
   stub_Class,
   generateIdentifiedConnectionId,
   DEPRECATED__validate_MappingTest,
+  type DEPRECATED__MappingTest,
   ModelStore,
 } from '@finos/legend-graph';
 import { ExecutionPlanState, TAB_SIZE } from '@finos/legend-application';
@@ -94,6 +94,7 @@ import {
   relationalInputData_setData,
 } from '../../../shared/modifier/STO_Relational_GraphModifierHelper.js';
 import { LambdaEditorState } from '@finos/legend-query-builder';
+import { MappingEditorTabState } from './MappingTabManagerState.js';
 
 export enum TEST_RESULT {
   NONE = 'NONE', // test has not run yet
@@ -104,11 +105,15 @@ export enum TEST_RESULT {
 
 export class MappingTestQueryState extends LambdaEditorState {
   editorStore: EditorStore;
-  test: MappingTest;
+  test: DEPRECATED__MappingTest;
   isInitializingLambda = false;
   query: RawLambda;
 
-  constructor(editorStore: EditorStore, test: MappingTest, query: RawLambda) {
+  constructor(
+    editorStore: EditorStore,
+    test: DEPRECATED__MappingTest,
+    query: RawLambda,
+  ) {
     super('', LAMBDA_PIPE);
 
     makeObservable(this, {
@@ -383,14 +388,13 @@ export enum MAPPING_TEST_EDITOR_TAB_TYPE {
   RESULT = 'Test Result',
 }
 
-export class MappingTestState {
-  readonly uuid = uuid();
+export class MappingTestState extends MappingEditorTabState {
   readonly editorStore: EditorStore;
   readonly mappingEditorState: MappingEditorState;
 
   selectedTab = MAPPING_TEST_EDITOR_TAB_TYPE.SETUP;
   result: TEST_RESULT = TEST_RESULT.NONE;
-  test: MappingTest;
+  test: DEPRECATED__MappingTest;
   runTime = 0;
   isSkipped = false;
   errorRunningTest?: Error | undefined;
@@ -406,9 +410,11 @@ export class MappingTestState {
 
   constructor(
     editorStore: EditorStore,
-    test: MappingTest,
+    test: DEPRECATED__MappingTest,
     mappingEditorState: MappingEditorState,
   ) {
+    super();
+
     makeObservable(this, {
       selectedTab: observable,
       result: observable,
@@ -454,6 +460,9 @@ export class MappingTestState {
     );
   }
 
+  get label(): string {
+    return this.test.name;
+  }
   setIsRunningTest(val: boolean): void {
     this.isRunningTest = val;
   }

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

@@ -23,11 +23,13 @@ import {
   ParameterValue,
   buildLambdaVariableExpressions,
   VariableExpression,
+  PureMultiExecution,
 } from '@finos/legend-graph';
 import { action, flow, makeObservable, observable } from 'mobx';
 import { TestableTestEditorState } from '../../testable/TestableEditorState.js';
 import type { ServiceTestSuiteState } from './ServiceTestableState.js';
 import {
+  service_addAssertKeyForTest,
   service_addParameterValue,
   service_deleteParameterValue,
   service_setParameterName,
@@ -77,6 +79,11 @@ export type SerializationFormatOption = {
   label: string;
 };
 
+export type KeyOption = {
+  value: string;
+  label: string;
+};
+
 export class ServiceTestParameterState {
   readonly uuid = uuid();
   readonly editorStore: EditorStore;
@@ -167,6 +174,7 @@ export class ServiceTestSetupState {
       setShowNewParameterModal: action,
       openNewParamModal: action,
       addParameterValue: action,
+      addServiceTestAssertKeys: action,
       syncWithQuery: action,
       removeParamValueState: action,
     });
@@ -193,6 +201,30 @@ export class ServiceTestSetupState {
     }));
   }
 
+  get keyOptions(): KeyOption[] {
+    const keys =
+      this.testState.testable.execution instanceof PureMultiExecution
+        ? this.testState.testable.execution.executionParameters.map(
+            (p) => p.key,
+          )
+        : [];
+    return keys.map((k) => ({
+      value: k,
+      label: k,
+    }));
+  }
+
+  getSelectedKeyOptions(): KeyOption[] {
+    return this.testState.test.keys.map((k) => ({
+      value: k,
+      label: k,
+    }));
+  }
+
+  addServiceTestAssertKeys(val: string[]): void {
+    service_addAssertKeyForTest(this.testState.test, val);
+  }
+
   get newParamOptions(): { value: string; label: string }[] {
     const queryVarExpressions = this.queryVariableExpressions;
     const currentParams = this.testState.test.parameters;

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

@@ -25,7 +25,7 @@ import {
 import type { EditorStore } from '../../EditorStore.js';
 import {
   type SPECIAL_REVISION_ALIAS,
-  EntityDiffEditorState,
+  EntityDiffViewerState,
 } from './EntityDiffEditorState.js';
 import {
   type GeneratorFn,
@@ -37,6 +37,7 @@ import { type Entity, extractEntityNameFromPath } from '@finos/legend-storage';
 import { EntityChangeConflictResolution } from '@finos/legend-server-sdlc';
 import { ParserError } from '@finos/legend-graph';
 import type { AbstractConflictResolutionState } from '../../AbstractConflictResolutionState.js';
+import type { EditorState } from '../EditorState.js';
 
 const START_HEADER_MARKER = '<<<<<<<';
 const COMMON_BASE_MARKER = '|||||||';
@@ -127,7 +128,7 @@ export enum ENTITY_CHANGE_CONFLICT_EDITOR_VIEW_MODE {
   CURRENT_INCOMING = 'CURRENT_INCOMING',
 }
 
-export class EntityChangeConflictEditorState extends EntityDiffEditorState {
+export class EntityChangeConflictEditorState extends EntityDiffViewerState {
   entityPath: string;
   // revision
   baseRevision: SPECIAL_REVISION_ALIAS | string;
@@ -207,7 +208,7 @@ export class EntityChangeConflictEditorState extends EntityDiffEditorState {
       currentMergeEditorLine: observable,
       mergeEditorParserError: observable,
       currentMode: observable,
-      headerName: computed,
+      label: computed,
       sortedMergedConflicts: computed,
       canUseTheirs: computed,
       canUseYours: computed,
@@ -253,18 +254,23 @@ export class EntityChangeConflictEditorState extends EntityDiffEditorState {
   setReadOnly(val: boolean): void {
     this.isReadOnly = val;
   }
+
   setMergedText(val: string): void {
     this.mergedText = val;
   }
+
   setCurrentMode(mode: ENTITY_CHANGE_CONFLICT_EDITOR_VIEW_MODE): void {
     this.currentMode = mode;
   }
+
   setCurrentMergeEditorLine(val: number | undefined): void {
     this.currentMergeEditorLine = val;
   }
+
   setCurrentMergeEditorConflict(conflict: MergeConflict | undefined): void {
     this.currentMergeEditorConflict = conflict;
   }
+
   clearMergeEditorError(): void {
     this.mergeEditorParserError = undefined;
   }
@@ -275,24 +281,28 @@ export class EntityChangeConflictEditorState extends EntityDiffEditorState {
     }
   }
 
-  get headerName(): string {
+  get label(): string {
     return extractEntityNameFromPath(this.entityPath);
   }
+
   private get sortedMergedConflicts(): MergeConflict[] {
     return this.mergeConflicts
       .slice()
       .sort((a, b) => a.startHeader - b.startHeader);
   }
+
   get canUseTheirs(): boolean {
     return (
       this.currentMode !== ENTITY_CHANGE_CONFLICT_EDITOR_VIEW_MODE.BASE_CURRENT
     );
   }
+
   get canUseYours(): boolean {
     return (
       this.currentMode !== ENTITY_CHANGE_CONFLICT_EDITOR_VIEW_MODE.BASE_INCOMING
     );
   }
+
   get canMarkAsResolved(): boolean {
     return Boolean(
       !this.mergeConflicts.length &&
@@ -318,6 +328,13 @@ export class EntityChangeConflictEditorState extends EntityDiffEditorState {
     );
   }
 
+  match(tab: EditorState): boolean {
+    return (
+      tab instanceof EntityChangeConflictEditorState &&
+      tab.entityPath === this.entityPath
+    );
+  }
+
   getModeComparisonViewInfo(
     mode: ENTITY_CHANGE_CONFLICT_EDITOR_VIEW_MODE,
   ): MergeEditorComparisonViewInfo {

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

@@ -43,6 +43,6 @@ export const getPrettyLabelForRevision = (
   }
 };
 
-export abstract class EntityDiffEditorState extends EditorState {
+export abstract class EntityDiffViewerState extends EditorState {
   abstract refresh(): void;
 }

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

@@ -26,11 +26,12 @@ import {
 import type { EditorStore } from '../../EditorStore.js';
 import {
   type SPECIAL_REVISION_ALIAS,
-  EntityDiffEditorState,
+  EntityDiffViewerState,
 } from './EntityDiffEditorState.js';
 import { type Entity, extractEntityNameFromPath } from '@finos/legend-storage';
 import { LEGEND_STUDIO_APP_EVENT } from '../../LegendStudioAppEvent.js';
 import type { PackageableElement } from '@finos/legend-graph';
+import type { EditorState } from '../EditorState.js';
 
 /**
  * NOTE: when we support comparison between entities, we should create a new editor state
@@ -44,7 +45,7 @@ export enum DIFF_VIEW_MODE {
   GRAMMAR = 'Grammar',
 }
 
-export class EntityDiffViewState extends EntityDiffEditorState {
+export class EntityDiffViewState extends EntityDiffViewerState {
   diffMode = DIFF_VIEW_MODE.GRAMMAR;
   fromEntityPath?: string | undefined;
   toEntityPath?: string | undefined;
@@ -93,8 +94,8 @@ export class EntityDiffViewState extends EntityDiffEditorState {
       toEntityGetter: observable,
       effectiveEntityPath: computed,
       element: computed,
-      headerName: computed,
-      headerTooltip: computed,
+      label: computed,
+      description: computed,
       summaryText: computed,
       setDiffMode: action,
       setToGrammarText: action,
@@ -133,15 +134,18 @@ export class EntityDiffViewState extends EntityDiffEditorState {
       'Neither from nor to entity paths can be missing',
     );
   }
+
   get element(): PackageableElement | undefined {
     return this.editorStore.graphManagerState.graph.getNullableElement(
       this.effectiveEntityPath,
     );
   }
-  get headerName(): string {
+
+  get label(): string {
     return extractEntityNameFromPath(this.effectiveEntityPath);
   }
-  get headerTooltip(): string {
+
+  override get description(): string {
     return this.effectiveEntityPath;
   }
 
@@ -161,15 +165,27 @@ export class EntityDiffViewState extends EntityDiffEditorState {
     return `Entity '${this.toEntityPath}' is modified`;
   }
 
-  setDiffMode = (diffMode: DIFF_VIEW_MODE): void => {
+  setDiffMode(diffMode: DIFF_VIEW_MODE): void {
     this.diffMode = diffMode;
-  };
-  private setToGrammarText = (text: string): void => {
+  }
+
+  private setToGrammarText(text: string): void {
     this.toGrammarText = text;
-  };
-  private setFromGrammarText = (text: string): void => {
+  }
+
+  private setFromGrammarText(text: string): void {
     this.fromGrammarText = text;
-  };
+  }
+
+  match(tab: EditorState): boolean {
+    return (
+      tab instanceof EntityDiffViewState &&
+      tab.fromEntityPath === this.fromEntityPath &&
+      tab.toEntityPath === this.toEntityPath &&
+      tab.fromRevision === this.fromRevision &&
+      tab.toRevision === this.toRevision
+    );
+  }
 
   refresh(): void {
     this.fromEntity = this.fromEntityGetter

package/src/stores/project-viewer/ProjectViewerStore.ts

@@ -560,7 +560,7 @@ export class ProjectViewerStore {
         this.initialEntityPath
       ) {
         try {
-          this.editorStore.openElement(
+          this.editorStore.tabManagerState.openElementEditor(
             this.editorStore.graphManagerState.graph.getElement(
               this.initialEntityPath,
             ),

package/src/stores/shared/DnDUtils.ts

@@ -58,7 +58,7 @@ export enum CORE_DND_TYPE {
 // See https://github.com/react-dnd/react-dnd/issues/1094
 // See https://github.com/react-dnd/react-dnd/pull/1079
 export class TypeDragSource {
-  data: TypeTreeNodeData;
+  data: TypeTreeNodeData | undefined;
 
   constructor(data: TypeTreeNodeData) {
     this.data = data;

package/src/stores/shared/modifier/DSL_Mapping_GraphModifierHelper.ts

@@ -21,7 +21,7 @@ import {
   type InputData,
   type InstanceSetImplementation,
   type Mapping,
-  type MappingTest,
+  type DEPRECATED__MappingTest,
   type MappingTestAssert,
   type PropertyMapping,
   type RawLambda,
@@ -54,7 +54,7 @@ import {
   observe_SetImplementation,
   observe_EnumerationMapping,
   observe_AssociationImplementation,
-  observe_MappingTest,
+  observe_MappingTest_Legacy,
   observe_SourceValue,
   observe_MappingTestAssert,
   observe_SetImplementationContainer,
@@ -158,17 +158,20 @@ export const mapping_deleteAssociationMapping = action(
   },
 );
 export const mapping_deleteTest = action(
-  (mapping: Mapping, val: MappingTest): void => {
-    deleteEntry(mapping.tests, val);
+  (mapping: Mapping, val: DEPRECATED__MappingTest): void => {
+    deleteEntry(mapping.test, val);
   },
 );
 export const mapping_addTest = action(
   (
     mapping: Mapping,
-    val: MappingTest,
+    val: DEPRECATED__MappingTest,
     observerContext: ObserverContext,
   ): void => {
-    addUniqueEntry(mapping.tests, observe_MappingTest(val, observerContext));
+    addUniqueEntry(
+      mapping.test,
+      observe_MappingTest_Legacy(val, observerContext),
+    );
   },
 );
 
@@ -266,14 +269,14 @@ export const enumValueMapping_updateSourceValue = action(
 // --------------------------------------------- Mapping Test -------------------------------------
 
 export const mappingTest_setName = action(
-  (test: MappingTest, value: string): void => {
+  (test: DEPRECATED__MappingTest, value: string): void => {
     test.name = value;
   },
 );
 
 export const mappingTest_setInputData = action(
   (
-    test: MappingTest,
+    test: DEPRECATED__MappingTest,
     value: InputData[],
     observeContext: ObserverContext,
   ): void => {
@@ -282,14 +285,14 @@ export const mappingTest_setInputData = action(
 );
 
 export const mappingTest_setQuery = action(
-  (test: MappingTest, value: RawLambda): void => {
+  (test: DEPRECATED__MappingTest, value: RawLambda): void => {
     test.query = observe_RawLambda(value);
   },
 );
 
 export const mappingTest_setAssert = action(
   (
-    test: MappingTest,
+    test: DEPRECATED__MappingTest,
     value: MappingTestAssert,
     observerContext: ObserverContext,
   ): void => {

package/src/stores/shared/modifier/DSL_Service_GraphModifierHelper.ts

@@ -87,6 +87,12 @@ export const service_setSerializationFormat = action(
   },
 );
 
+export const service_addAssertKeyForTest = action(
+  (test: ServiceTest, keys: string[]) => {
+    test.keys = keys;
+  },
+);
+
 export const service_addTestSuite = action(
   (
     service: Service,

package/src/stores/sidebar-state/LocalChangesState.ts

@@ -288,7 +288,7 @@ export class LocalChangesState {
           `Can't find entity with path  '${diff.newPath}'`,
         )
       : undefined;
-    this.editorStore.openEntityDiff(
+    this.editorStore.tabManagerState.openTab(
       new EntityDiffViewState(
         this.editorStore,
         SPECIAL_REVISION_ALIAS.WORKSPACE_HEAD,
@@ -336,7 +336,7 @@ export class LocalChangesState {
           `Can't find entity with path  '${diff.newPath}'`,
         )
       : undefined;
-    this.editorStore.openEntityDiff(
+    this.editorStore.tabManagerState.openTab(
       new EntityDiffViewState(
         this.editorStore,
         SPECIAL_REVISION_ALIAS.LOCAL,
@@ -395,7 +395,7 @@ export class LocalChangesState {
       incomingChangeEntityGetter,
     );
     conflictEditorState.setReadOnly(true);
-    this.editorStore.openEntityChangeConflict(conflictEditorState);
+    this.editorStore.tabManagerState.openTab(conflictEditorState);
   }
 
   *refreshLocalChanges(): GeneratorFn<void> {
@@ -636,7 +636,7 @@ export class LocalChangesState {
             ),
           ),
         );
-        this.editorStore.refreshCurrentEntityDiffEditorState();
+        this.editorStore.tabManagerState.refreshCurrentEntityDiffViewer();
       } catch (error) {
         assertErrorThrown(error);
         /**

package/src/stores/sidebar-state/WorkspaceReviewState.ts

@@ -117,7 +117,7 @@ export class WorkspaceReviewState {
           `Can't find entity with path  '${diff.newPath}'`,
         )
       : undefined;
-    this.editorStore.openEntityDiff(
+    this.editorStore.tabManagerState.openTab(
       new EntityDiffViewState(
         this.editorStore,
         SPECIAL_REVISION_ALIAS.WORKSPACE_BASE,

package/src/stores/sidebar-state/WorkspaceSyncState.ts

@@ -33,7 +33,7 @@ import {
 import { CHANGE_DETECTION_EVENT } from '../ChangeDetectionEvent.js';
 import { EntityChangeConflictEditorState } from '../editor-state/entity-diff-editor-state/EntityChangeConflictEditorState.js';
 import {
-  type EntityDiffEditorState,
+  type EntityDiffViewerState,
   SPECIAL_REVISION_ALIAS,
 } from '../editor-state/entity-diff-editor-state/EntityDiffEditorState.js';
 import { EntityDiffViewState } from '../editor-state/entity-diff-editor-state/EntityDiffViewState.js';
@@ -55,8 +55,8 @@ import { AbstractConflictResolutionState } from '../AbstractConflictResolutionSt
 class WorkspaceSyncConflictResolutionState extends AbstractConflictResolutionState {
   showModal = false;
   conflicts: EntityChangeConflict[] = [];
-  openMergedEditorStates: EntityDiffEditorState[] = [];
-  currentDiffEditorState: EntityDiffEditorState | undefined;
+  openMergedEditorStates: EntityDiffViewerState[] = [];
+  currentDiffEditorState: EntityDiffViewerState | undefined;
   resolutions: EntityChangeConflictResolution[] = [];
   baseToLocalChanges: EntityDiff[] = [];
 
@@ -154,7 +154,7 @@ class WorkspaceSyncConflictResolutionState extends AbstractConflictResolutionSta
       .concat(this.resolvedChanges);
   }
 
-  openState(entityDiffEditorState: EntityDiffEditorState): void {
+  openState(entityDiffEditorState: EntityDiffViewerState): void {
     if (entityDiffEditorState instanceof EntityChangeConflictEditorState) {
       this.openConflictState(entityDiffEditorState);
     }
@@ -207,7 +207,7 @@ class WorkspaceSyncConflictResolutionState extends AbstractConflictResolutionSta
     this.openEntityChangeConflict(mergeEditorState);
   }
 
-  closeConflict(conflictState: EntityDiffEditorState): void {
+  closeConflict(conflictState: EntityDiffViewerState): void {
     const conflictIndex = this.openMergedEditorStates.findIndex(
       (e) => e === conflictState,
     );
@@ -328,7 +328,7 @@ class WorkspaceSyncConflictResolutionState extends AbstractConflictResolutionSta
     this.showModal = val;
   }
 
-  setCurrentMergeEditorState(val: EntityDiffEditorState | undefined): void {
+  setCurrentMergeEditorState(val: EntityDiffViewerState | undefined): void {
     this.currentDiffEditorState = val;
   }