@finos/legend-application-studio 22.1.5 → 22.2.0

package/lib/stores/editor-state/project-configuration-editor-state/ProjectDependencyEditorState.js

@@ -14,38 +14,95 @@
  * limitations under the License.
  */
 import { flow, observable, makeObservable, flowResult, action } from 'mobx';
-import { ActionState, assertErrorThrown, LogEvent, } from '@finos/legend-shared';
-import { buildConflictsPaths, buildDependencyReport, ProjectDependencyCoordinates, RawProjectDependencyReport, } from '@finos/legend-server-depot';
+import { ActionState, assertErrorThrown, LogEvent, isNonNullable, uuid, } from '@finos/legend-shared';
+import { ProjectDependencyCoordinates, buildConflictsPaths, buildDependencyReport, RawProjectDependencyReport, } from '@finos/legend-server-depot';
 import { LEGEND_STUDIO_APP_EVENT } from '../../LegendStudioAppEvent.js';
-export class DependencyTreeNodeData {
-    value;
+export class ProjectDependencyConflictTreeNodeData {
     id;
     label;
     childrenIds;
-    constructor(id, value) {
+    isSelected;
+    isOpen;
+    constructor(id) {
         this.id = id;
+        this.label = id;
+    }
+}
+export class ConflictTreeNodeData extends ProjectDependencyConflictTreeNodeData {
+    conflict;
+    constructor(conflict) {
+        super(`${conflict.groupId}:${conflict.artifactId}`);
+        this.conflict = conflict;
+    }
+    get description() {
+        return this.id;
+    }
+}
+export class ConflictVersionNodeData extends ProjectDependencyConflictTreeNodeData {
+    versionConflict;
+    constructor(conflict) {
+        super(`${conflict.version.groupId}:${conflict.version.artifactId}.${conflict.version.versionId}`);
+        this.versionConflict = conflict;
+        this.label = this.versionConflict.version.versionId;
+    }
+    get description() {
+        return this.id;
+    }
+}
+export class ProjectDependencyTreeNodeData extends ProjectDependencyConflictTreeNodeData {
+    value;
+    constructor(id, value) {
+        super(id);
         this.value = value;
-        this.label = value.id;
+        this.label = value.artifactId;
+    }
+    get description() {
+        return `${this.value.groupId}:${this.value.artifactId}:${this.value.versionId}`;
     }
-    isSelected;
-    isOpen;
 }
 export const buildDependencyNodeChildren = (parentNode, treeNodes) => {
     if (!parentNode.childrenIds) {
         const value = parentNode.value;
         const childrenNodes = value.dependencies.map((projectVersion) => {
             const childId = `${parentNode.id}.${projectVersion.id}`;
-            const childNode = new DependencyTreeNodeData(childId, projectVersion);
+            const childNode = new ProjectDependencyTreeNodeData(childId, projectVersion);
             treeNodes.set(childId, childNode);
             return childNode;
         });
         parentNode.childrenIds = childrenNodes.map((c) => c.id);
     }
 };
+const findRootNode = (versionNode, treeData) => {
+    if (!treeData.rootIds.includes(versionNode.id)) {
+        return undefined;
+    }
+    return Array.from(treeData.nodes.values()).find((node) => node.id === versionNode.id && node.value === versionNode);
+};
+const walkNode = (node, visited, treeData) => {
+    if (!visited.has(node.value)) {
+        node.isOpen = true;
+        buildDependencyNodeChildren(node, treeData.nodes);
+        visited.add(node.value);
+        node.childrenIds
+            ?.map((nodeId) => treeData.nodes.get(nodeId))
+            .filter(isNonNullable)
+            .forEach((n) => walkNode(n, visited, treeData));
+    }
+    else {
+        buildDependencyNodeChildren(node, treeData.nodes);
+    }
+};
+export const openAllDependencyNodesInTree = (treeData, graph) => {
+    const visited = new Set();
+    graph.rootNodes
+        .map((node) => findRootNode(node, treeData))
+        .filter(isNonNullable)
+        .forEach((node) => walkNode(node, visited, treeData));
+};
 const buildDependencyTreeData = (report) => {
     const nodes = new Map();
     const rootNodes = report.graph.rootNodes.map((versionNode) => {
-        const node = new DependencyTreeNodeData(versionNode.id, versionNode);
+        const node = new ProjectDependencyTreeNodeData(versionNode.id, versionNode);
         nodes.set(node.id, node);
         buildDependencyNodeChildren(node, nodes);
         return node;
@@ -58,49 +115,142 @@ const buildFlattenDependencyTreeData = (report) => {
     const rootIds = [];
     Array.from(report.graph.nodes.entries()).forEach(([key, value]) => {
         const id = value.id;
-        const node = new DependencyTreeNodeData(id, value);
+        const node = new ProjectDependencyTreeNodeData(id, value);
         nodes.set(id, node);
         rootIds.push(id);
         buildDependencyNodeChildren(node, nodes);
     });
     return { rootIds, nodes };
 };
+export var DEPENDENCY_REPORT_TAB;
+(function (DEPENDENCY_REPORT_TAB) {
+    DEPENDENCY_REPORT_TAB["EXPLORER"] = "EXPLORER";
+    DEPENDENCY_REPORT_TAB["CONFLICTS"] = "CONFLICTS";
+})(DEPENDENCY_REPORT_TAB = DEPENDENCY_REPORT_TAB || (DEPENDENCY_REPORT_TAB = {}));
+const buildTreeDataFromConflictVersion = (conflictVersionNode, nodes) => conflictVersionNode.versionConflict.pathsToVersion
+    .map((path, idx) => {
+    if (!path.length) {
+        return undefined;
+    }
+    const pathIterator = path.values();
+    let rootNode;
+    let parentNode;
+    let currentVersion;
+    while ((currentVersion = pathIterator.next().value)) {
+        const id = parentNode
+            ? `${parentNode.id}.${currentVersion.id}`
+            : `path${idx}_${currentVersion.id}`;
+        const node = new ProjectDependencyTreeNodeData(id, currentVersion);
+        node.childrenIds = [];
+        nodes.set(id, node);
+        if (parentNode) {
+            parentNode.childrenIds = [node.id];
+        }
+        else {
+            rootNode = node;
+        }
+        parentNode = node;
+    }
+    return rootNode;
+})
+    .filter(isNonNullable);
+const buildTreeDataFromConflict = (conflict, paths) => {
+    const rootNode = new ConflictTreeNodeData(conflict);
+    const rootIds = [rootNode.id];
+    const nodes = new Map();
+    nodes.set(rootNode.id, rootNode);
+    const versionConflictNodes = paths.map((versionConflict) => {
+        const projectVersionNode = new ConflictVersionNodeData(versionConflict);
+        nodes.set(projectVersionNode.id, projectVersionNode);
+        const pathNodes = buildTreeDataFromConflictVersion(projectVersionNode, nodes);
+        projectVersionNode.childrenIds = pathNodes.map((n) => n.id);
+        return projectVersionNode;
+    });
+    rootNode.childrenIds = versionConflictNodes.map((n) => n.id);
+    return { rootIds, nodes };
+};
+export class ProjectDependencyConflictState {
+    uuid = uuid();
+    report;
+    conflict;
+    paths;
+    treeData;
+    constructor(report, conflict, paths) {
+        makeObservable(this, {
+            treeData: observable.ref,
+        });
+        this.report = report;
+        this.conflict = conflict;
+        this.paths = paths;
+        this.treeData = buildTreeDataFromConflict(conflict, paths);
+    }
+    setTreeData(treeData) {
+        this.treeData = treeData;
+    }
+    get versionNodes() {
+        return this.paths.map((e) => e.version);
+    }
+}
 export class ProjectDependencyEditorState {
     configState;
     editorStore;
     isReadOnly;
-    dependencyTreeReportModal = false;
-    dependencyConflictModal = false;
+    reportTab;
     fetchingDependencyInfoState = ActionState.create();
     dependencyReport;
     dependencyTreeData;
     flattenDependencyTreeData;
+    conflictStates = [];
+    expandConflictsState = ActionState.create();
     constructor(configState, editorStore) {
         makeObservable(this, {
             dependencyReport: observable,
-            dependencyTreeReportModal: observable,
             fetchingDependencyInfoState: observable,
-            dependencyConflictModal: observable,
             dependencyTreeData: observable.ref,
             flattenDependencyTreeData: observable.ref,
-            setDependencyConflictModal: action,
+            conflictStates: observable,
+            reportTab: observable,
+            expandConflictsState: observable,
+            setDependencyReport: action,
+            expandAllConflicts: action,
+            setFlattenDependencyTreeData: action,
             clearTrees: action,
-            setDependencyTreeReportModal: action,
+            setTreeData: action,
             setDependencyTreeData: action,
+            setConflictStates: action,
             fetchDependencyReport: flow,
         });
         this.configState = configState;
         this.editorStore = editorStore;
         this.isReadOnly = editorStore.isInViewerMode;
     }
+    expandAllConflicts() {
+        this.expandConflictsState.inProgress();
+        this.conflictStates.forEach((c) => {
+            const treeData = c.treeData;
+            Array.from(treeData.nodes.values()).forEach((n) => (n.isOpen = true));
+        });
+        this.conflictStates.forEach((c) => {
+            c.setTreeData({ ...c.treeData });
+        });
+        this.expandConflictsState.complete();
+    }
+    setTreeData(treeData, flattenView) {
+        if (flattenView) {
+            this.setFlattenDependencyTreeData(treeData);
+        }
+        else {
+            this.setDependencyTreeData(treeData);
+        }
+    }
+    setDependencyReport(tab) {
+        this.reportTab = tab;
+    }
     setDependencyTreeData(tree) {
         this.dependencyTreeData = tree;
     }
-    setDependencyConflictModal(showModal) {
-        this.dependencyConflictModal = showModal;
-    }
-    setDependencyTreeReportModal(showModal) {
-        this.dependencyTreeReportModal = showModal;
+    setConflictStates(val) {
+        this.conflictStates = val;
     }
     setFlattenDependencyTreeData(tree) {
         this.flattenDependencyTreeData = tree;
@@ -133,8 +283,11 @@ export class ProjectDependencyEditorState {
     processReport(report) {
         this.setDependencyTreeData(buildDependencyTreeData(report));
         this.setFlattenDependencyTreeData(buildFlattenDependencyTreeData(report));
+        this.setConflictStates([]);
         try {
-            report.conflictPaths = buildConflictsPaths(report);
+            report.conflictInfo = buildConflictsPaths(report);
+            const conflictStates = Array.from(report.conflictInfo.entries()).map(([conflict, paths]) => new ProjectDependencyConflictState(report, conflict, paths));
+            this.setConflictStates(conflictStates);
         }
         catch (error) {
             assertErrorThrown(error);

package/lib/stores/editor-state/project-configuration-editor-state/ProjectDependencyEditorState.js.map

@@ -1 +1 @@
-{"version":3,"file":"ProjectDependencyEditorState.js","sourceRoot":"","sources":["../../../../src/stores/editor-state/project-configuration-editor-state/ProjectDependencyEditorState.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"ProjectDependencyEditorState.js","sourceRoot":"","sources":["../../../../src/stores/editor-state/project-configuration-editor-state/ProjectDependencyEditorState.ts"],"names":[],"mappings":"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"}

package/lib/stores/sidebar-state/LocalChangesState.d.ts

@@ -36,7 +36,7 @@ declare class PatchLoaderState {
     loadPatchFile(file: File): GeneratorFn<void>;
     applyChanges(): GeneratorFn<void>;
 }
-export declare class LocalChangesState {
+export declare abstract class LocalChangesState {
     readonly editorStore: EditorStore;
     readonly sdlcState: EditorSDLCState;
     readonly workspaceSyncState: WorkspaceSyncState;
@@ -48,11 +48,23 @@ export declare class LocalChangesState {
     get hasUnpushedChanges(): boolean;
     downloadLocalChanges(): void;
     alertUnsavedChanges(onProceed: () => void): void;
+    refreshWorkspaceSyncStatus(): GeneratorFn<void>;
+    abstract refreshLocalChanges(): GeneratorFn<void>;
+    abstract pushLocalChanges(pushMessage?: string): GeneratorFn<void>;
+}
+export declare class FormLocalChangesState extends LocalChangesState {
+    constructor(editorStore: EditorStore, sdlcState: EditorSDLCState);
     openLocalChange(diff: EntityDiff): void;
     openWorkspacePullChange(diff: EntityDiff): void;
     openPotentialWorkspacePullConflict(conflict: EntityChangeConflict): void;
     refreshLocalChanges(): GeneratorFn<void>;
-    refreshWorkspaceSyncStatus(): GeneratorFn<void>;
+    pushLocalChanges(pushMessage?: string): GeneratorFn<void>;
+}
+export declare class TextLocalChangesState extends LocalChangesState {
+    localChanges: EntityChange[];
+    constructor(editorStore: EditorStore, sdlcState: EditorSDLCState);
+    setLocalChanges(val: EntityChange[]): void;
+    refreshLocalChanges(): GeneratorFn<void>;
     pushLocalChanges(pushMessage?: string): GeneratorFn<void>;
 }
 export {};

package/lib/stores/sidebar-state/LocalChangesState.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"LocalChangesState.d.ts","sourceRoot":"","sources":["../../../src/stores/sidebar-state/LocalChangesState.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAUH,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AACrD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAE7D,OAAO,EACL,KAAK,WAAW,EAYhB,WAAW,EAEZ,MAAM,sBAAsB,CAAC;AAS9B,OAAO,EACL,KAAK,oBAAoB,EACzB,UAAU,EACV,YAAY,EAEb,MAAM,2BAA2B,CAAC;AAEnC,OAAO,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAK7D,cAAM,gBAAgB;IACpB,QAAQ,CAAC,WAAW,EAAE,WAAW,CAAC;IAClC,QAAQ,CAAC,SAAS,EAAE,eAAe,CAAC;IAEpC,OAAO,EAAE,YAAY,EAAE,GAAG,SAAS,CAAC;IACpC,cAAc,EAAE,YAAY,EAAE,CAAM;IACpC,gBAAgB,UAAS;IACzB,SAAS,UAAS;IAClB,YAAY,UAAS;gBAET,WAAW,EAAE,WAAW,EAAE,SAAS,EAAE,eAAe;IAqBhE,IAAI,iBAAiB,IAAI,YAAY,EAAE,CAStC;IAED,SAAS,CAAC,YAAY,EAAE,YAAY,EAAE,GAAG,IAAI;IAK7C,UAAU,IAAI,IAAI;IAMlB,eAAe,CAAC,GAAG,EAAE,OAAO,GAAG,IAAI;IAInC,eAAe,CAAC,OAAO,EAAE,YAAY,EAAE,GAAG,SAAS,GAAG,IAAI;IAI1D,YAAY,CAAC,MAAM,EAAE,YAAY,GAAG,IAAI;IAMvC,aAAa,CAAC,IAAI,EAAE,IAAI,GAAG,WAAW,CAAC,IAAI,CAAC;IAyB5C,YAAY,IAAI,WAAW,CAAC,IAAI,CAAC;CAmBnC;AAED,qBAAa,iBAAiB;IAC5B,QAAQ,CAAC,WAAW,EAAE,WAAW,CAAC;IAClC,QAAQ,CAAC,SAAS,EAAE,eAAe,CAAC;IACpC,QAAQ,CAAC,kBAAkB,EAAE,kBAAkB,CAAC;IAChD,QAAQ,CAAC,gBAAgB,cAAwB;IACjD,QAAQ,CAAC,gCAAgC,cAAwB;IACjE,QAAQ,CAAC,+BAA+B,cAAwB;IAChE,QAAQ,CAAC,gBAAgB,EAAE,gBAAgB,CAAC;gBAEhC,WAAW,EAAE,WAAW,EAAE,SAAS,EAAE,eAAe;IAehE,IAAI,kBAAkB,IAAI,OAAO,CAKhC;IAED,oBAAoB,IAAI,IAAI;IAgB5B,mBAAmB,CAAC,SAAS,EAAE,MAAM,IAAI,GAAG,IAAI;IAwBhD,eAAe,CAAC,IAAI,EAAE,UAAU,GAAG,IAAI;IA0DvC,uBAAuB,CAAC,IAAI,EAAE,UAAU,GAAG,IAAI;IAgD/C,kCAAkC,CAAC,QAAQ,EAAE,oBAAoB,GAAG,IAAI;IA+CvE,mBAAmB,IAAI,WAAW,CAAC,IAAI,CAAC;IA8BxC,0BAA0B,IAAI,WAAW,CAAC,IAAI,CAAC;IA4D/C,gBAAgB,CAAC,WAAW,CAAC,EAAE,MAAM,GAAG,WAAW,CAAC,IAAI,CAAC;CA0O3D"}
+{"version":3,"file":"LocalChangesState.d.ts","sourceRoot":"","sources":["../../../src/stores/sidebar-state/LocalChangesState.ts"],"names":[],"mappings":"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"}

package/lib/stores/sidebar-state/LocalChangesState.js

@@ -119,7 +119,6 @@ export class LocalChangesState {
     constructor(editorStore, sdlcState) {
         makeObservable(this, {
             hasUnpushedChanges: computed,
-            openPotentialWorkspacePullConflict: action,
             refreshWorkspaceSyncStatus: flow,
             refreshLocalChanges: flow,
             pushLocalChanges: flow,
@@ -165,6 +164,43 @@ export class LocalChangesState {
             onProceed();
         }
     }
+    *refreshWorkspaceSyncStatus() {
+        try {
+            this.refreshWorkspaceSyncStatusState.inProgress();
+            const currentRemoteRevision = this.sdlcState.activeRemoteWorkspaceRevision;
+            yield flowResult(this.sdlcState.fetchRemoteWorkspaceRevision(this.sdlcState.activeProject.projectId, this.sdlcState.activeWorkspace));
+            if (currentRemoteRevision.id !==
+                this.sdlcState.activeRemoteWorkspaceRevision.id) {
+                if (this.sdlcState.isWorkspaceOutOfSync) {
+                    this.editorStore.localChangesState.workspaceSyncState.fetchIncomingRevisions();
+                    const remoteWorkspaceEntities = (yield this.editorStore.sdlcServerClient.getEntitiesByRevision(this.sdlcState.activeProject.projectId, this.sdlcState.activeWorkspace, this.sdlcState.activeRemoteWorkspaceRevision.id));
+                    this.editorStore.changeDetectionState.workspaceRemoteLatestRevisionState.setEntities(remoteWorkspaceEntities);
+                    yield flowResult(this.editorStore.changeDetectionState.workspaceRemoteLatestRevisionState.buildEntityHashesIndex(remoteWorkspaceEntities, LogEvent.create(CHANGE_DETECTION_EVENT.CHANGE_DETECTION_LOCAL_HASHES_INDEX_BUILT)));
+                    yield flowResult(this.editorStore.changeDetectionState.computeAggregatedWorkspaceRemoteChanges());
+                }
+                else {
+                    this.editorStore.changeDetectionState.workspaceRemoteLatestRevisionState.setEntities([]);
+                    this.editorStore.changeDetectionState.setPotentialWorkspacePullConflicts([]);
+                    this.editorStore.changeDetectionState.setAggregatedWorkspaceRemoteChanges([]);
+                }
+            }
+        }
+        catch (error) {
+            assertErrorThrown(error);
+            this.editorStore.applicationStore.log.error(LogEvent.create(LEGEND_STUDIO_APP_EVENT.SDLC_MANAGER_FAILURE), error);
+        }
+        finally {
+            this.refreshWorkspaceSyncStatusState.complete();
+        }
+    }
+}
+export class FormLocalChangesState extends LocalChangesState {
+    constructor(editorStore, sdlcState) {
+        super(editorStore, sdlcState);
+        makeObservable(this, {
+            openPotentialWorkspacePullConflict: action,
+        });
+    }
     openLocalChange(diff) {
         const fromEntityGetter = (entityPath) => {
             if (entityPath) {
@@ -254,35 +290,6 @@ export class LocalChangesState {
             this.refreshLocalChangesDetectorState.complete();
         }
     }
-    *refreshWorkspaceSyncStatus() {
-        try {
-            this.refreshWorkspaceSyncStatusState.inProgress();
-            const currentRemoteRevision = this.sdlcState.activeRemoteWorkspaceRevision;
-            yield flowResult(this.sdlcState.fetchRemoteWorkspaceRevision(this.sdlcState.activeProject.projectId, this.sdlcState.activeWorkspace));
-            if (currentRemoteRevision.id !==
-                this.sdlcState.activeRemoteWorkspaceRevision.id) {
-                if (this.sdlcState.isWorkspaceOutOfSync) {
-                    this.editorStore.localChangesState.workspaceSyncState.fetchIncomingRevisions();
-                    const remoteWorkspaceEntities = (yield this.editorStore.sdlcServerClient.getEntitiesByRevision(this.sdlcState.activeProject.projectId, this.sdlcState.activeWorkspace, this.sdlcState.activeRemoteWorkspaceRevision.id));
-                    this.editorStore.changeDetectionState.workspaceRemoteLatestRevisionState.setEntities(remoteWorkspaceEntities);
-                    yield flowResult(this.editorStore.changeDetectionState.workspaceRemoteLatestRevisionState.buildEntityHashesIndex(remoteWorkspaceEntities, LogEvent.create(CHANGE_DETECTION_EVENT.CHANGE_DETECTION_LOCAL_HASHES_INDEX_BUILT)));
-                    yield flowResult(this.editorStore.changeDetectionState.computeAggregatedWorkspaceRemoteChanges());
-                }
-                else {
-                    this.editorStore.changeDetectionState.workspaceRemoteLatestRevisionState.setEntities([]);
-                    this.editorStore.changeDetectionState.setPotentialWorkspacePullConflicts([]);
-                    this.editorStore.changeDetectionState.setAggregatedWorkspaceRemoteChanges([]);
-                }
-            }
-        }
-        catch (error) {
-            assertErrorThrown(error);
-            this.editorStore.applicationStore.log.error(LogEvent.create(LEGEND_STUDIO_APP_EVENT.SDLC_MANAGER_FAILURE), error);
-        }
-        finally {
-            this.refreshWorkspaceSyncStatusState.complete();
-        }
-    }
     *pushLocalChanges(pushMessage) {
         if (this.pushChangesState.isInProgress ||
             this.editorStore.workspaceUpdaterState.isUpdatingWorkspace) {
@@ -435,4 +442,173 @@ export class LocalChangesState {
         }
     }
 }
+export class TextLocalChangesState extends LocalChangesState {
+    localChanges = [];
+    constructor(editorStore, sdlcState) {
+        super(editorStore, sdlcState);
+        makeObservable(this, {
+            setLocalChanges: action,
+        });
+    }
+    setLocalChanges(val) {
+        this.localChanges = val;
+    }
+    *refreshLocalChanges() {
+        const startTime = Date.now();
+        this.refreshLocalChangesDetectorState.inProgress();
+        try {
+            // ======= (RE)START CHANGE DETECTION =======
+            yield Promise.all([
+                this.sdlcState.buildWorkspaceLatestRevisionEntityHashesIndex(),
+                this.editorStore.changeDetectionState.preComputeGraphElementHashes(),
+            ]);
+            this.editorStore.changeDetectionState.computeLocalChangesInTextMode(this.editorStore.changeDetectionState.workspaceLocalLatestRevisionState
+                .entities);
+            this.editorStore.applicationStore.log.info(LogEvent.create(CHANGE_DETECTION_EVENT.CHANGE_DETECTION_RESTARTED), Date.now() - startTime, 'ms');
+            // ======= FINISHED (RE)START CHANGE DETECTION =======
+        }
+        catch (error) {
+            assertErrorThrown(error);
+            this.editorStore.applicationStore.log.error(LogEvent.create(LEGEND_STUDIO_APP_EVENT.SDLC_MANAGER_FAILURE), error);
+            this.editorStore.applicationStore.notifyError(error);
+            this.sdlcState.handleChangeDetectionRefreshIssue(error);
+        }
+        finally {
+            this.refreshLocalChangesDetectorState.complete();
+        }
+    }
+    *pushLocalChanges(pushMessage) {
+        if (this.pushChangesState.isInProgress ||
+            this.editorStore.workspaceUpdaterState.isUpdatingWorkspace) {
+            return;
+        }
+        this.pushChangesState.inProgress();
+        const startTime = Date.now();
+        if (!this.localChanges.length) {
+            this.pushChangesState.complete();
+            return;
+        }
+        yield flowResult(this.sdlcState.fetchRemoteWorkspaceRevision(this.sdlcState.activeProject.projectId, this.sdlcState.activeWorkspace));
+        if (this.sdlcState.isWorkspaceOutOfSync) {
+            // ensure changes have been computed for latest remote version
+            const remoteWorkspaceEntities = (yield this.editorStore.sdlcServerClient.getEntitiesByRevision(this.sdlcState.activeProject.projectId, this.sdlcState.activeWorkspace, this.sdlcState.activeRemoteWorkspaceRevision.id));
+            this.editorStore.changeDetectionState.workspaceRemoteLatestRevisionState.setEntities(remoteWorkspaceEntities);
+            yield flowResult(this.editorStore.changeDetectionState.workspaceRemoteLatestRevisionState.buildEntityHashesIndex(remoteWorkspaceEntities, LogEvent.create(CHANGE_DETECTION_EVENT.CHANGE_DETECTION_LOCAL_HASHES_INDEX_BUILT)));
+            yield flowResult(this.editorStore.changeDetectionState.computeAggregatedWorkspaceRemoteChanges());
+            this.editorStore.applicationStore.setActionAlertInfo({
+                message: 'Local workspace is out-of-sync',
+                prompt: 'Please pull remote changes before pushing your local changes',
+                type: ActionAlertType.CAUTION,
+                actions: [
+                    {
+                        label: 'Pull remote changes',
+                        type: ActionAlertActionType.STANDARD,
+                        default: true,
+                        handler: () => {
+                            this.editorStore.setActiveActivity(ACTIVITY_MODE.LOCAL_CHANGES);
+                            flowResult(this.editorStore.localChangesState.workspaceSyncState.pullChanges()).catch(this.editorStore.applicationStore.alertUnhandledError);
+                        },
+                    },
+                    {
+                        label: 'Cancel',
+                        type: ActionAlertActionType.PROCEED_WITH_CAUTION,
+                    },
+                ],
+            });
+            this.pushChangesState.complete();
+            return;
+        }
+        const currentHashesIndex = this.editorStore.changeDetectionState.workspaceLocalLatestRevisionState
+            .currentEntityHashesIndex;
+        try {
+            const nullableRevisionChange = (yield this.editorStore.sdlcServerClient.performEntityChanges(this.sdlcState.activeProject.projectId, this.sdlcState.activeWorkspace, {
+                message: pushMessage ??
+                    `pushed new changes from ${this.editorStore.applicationStore.config.appName} [potentially affected ${this.localChanges.length === 1
+                        ? '1 entity'
+                        : `${this.localChanges.length} entities`}]`,
+                entityChanges: this.localChanges,
+                revisionId: this.sdlcState.activeRevision.id,
+            }));
+            const revisionChange = guaranteeNonNullable(nullableRevisionChange, `Can't push an empty change set. This may be due to an error with change detection`);
+            const latestRevision = Revision.serialization.fromJson(revisionChange);
+            this.sdlcState.setCurrentRevision(latestRevision); // update current revision to the latest
+            this.sdlcState.setWorkspaceLatestRevision(latestRevision);
+            const syncFinishedTime = Date.now();
+            this.editorStore.applicationStore.log.info(LogEvent.create(LEGEND_STUDIO_APP_EVENT.WORKSPACE_LOCAL_CHANGES_PUSHED), syncFinishedTime - startTime, 'ms');
+            this.localChanges = [];
+            // ======= (RE)START CHANGE DETECTION =======
+            try {
+                /**
+                 * Here we try to rebuild local hash index. If failed, we will use local hash index, but for veracity, it's best to use entities
+                 * coming from the server.
+                 */
+                const entities = (yield this.editorStore.sdlcServerClient.getEntitiesByRevision(this.sdlcState.activeProject.projectId, this.sdlcState.activeWorkspace, latestRevision.id));
+                this.editorStore.changeDetectionState.workspaceLocalLatestRevisionState.setEntities(entities);
+                yield flowResult(this.editorStore.changeDetectionState.workspaceLocalLatestRevisionState.buildEntityHashesIndex(entities, LogEvent.create(CHANGE_DETECTION_EVENT.CHANGE_DETECTION_LOCAL_HASHES_INDEX_BUILT)));
+                this.editorStore.tabManagerState.refreshCurrentEntityDiffViewer();
+            }
+            catch (error) {
+                assertErrorThrown(error);
+                /**
+                 * NOTE: there is a known problem with the SDLC server where if we try to fetch the entities right after syncing, there is a chance
+                 * that we get entities from the older commit (i.e. potentially some caching issue). As such, to account for this case, we will
+                 * not try to get entities for the workspace HEAD, but for the revision returned from the syncing call (i.e. this must be the latest revision)
+                 * if we get a 404, we will do a refresh and warn user about this. Otherwise, if we get other types of error, we will assume this is a network
+                 * failure and use local workspace hashes index
+                 */
+                if (error instanceof NetworkClientError) {
+                    if (error.response.status === HttpStatus.NOT_FOUND) {
+                        this.editorStore.applicationStore.log.error(LogEvent.create(LEGEND_STUDIO_APP_EVENT.SDLC_MANAGER_FAILURE), `Can't fetch entities for the latest workspace revision immediately after syncing`, error);
+                    }
+                    this.editorStore.applicationStore.setActionAlertInfo({
+                        message: `Change detection engine failed to build hashes index for workspace after syncing`,
+                        prompt: 'To fix this, you can either try to keep refreshing local changes until success or trust and reuse current workspace hashes index',
+                        type: ActionAlertType.CAUTION,
+                        actions: [
+                            {
+                                label: 'Use local hashes index',
+                                type: ActionAlertActionType.PROCEED_WITH_CAUTION,
+                                handler: () => {
+                                    this.editorStore.changeDetectionState.workspaceLocalLatestRevisionState.setEntityHashesIndex(currentHashesIndex);
+                                    this.editorStore.changeDetectionState.workspaceLocalLatestRevisionState.setIsBuildingEntityHashesIndex(false);
+                                },
+                            },
+                            {
+                                label: 'Refresh changes',
+                                type: ActionAlertActionType.STANDARD,
+                                default: true,
+                                handler: this.editorStore.applicationStore.guardUnhandledError(() => flowResult(this.refreshLocalChanges())),
+                            },
+                        ],
+                    });
+                }
+                else {
+                    throw error;
+                }
+            }
+            // compute the changes in text mode
+            this.editorStore.changeDetectionState.computeLocalChangesInTextMode(this.editorStore.changeDetectionState.workspaceLocalLatestRevisionState
+                .entities);
+            this.editorStore.applicationStore.log.info(LogEvent.create(CHANGE_DETECTION_EVENT.CHANGE_DETECTION_RESTARTED), Date.now() - syncFinishedTime, 'ms');
+            // ======= FINISHED (RE)START CHANGE DETECTION =======
+        }
+        catch (error) {
+            assertErrorThrown(error);
+            this.editorStore.applicationStore.log.error(LogEvent.create(LEGEND_STUDIO_APP_EVENT.SDLC_MANAGER_FAILURE), error);
+            if (error instanceof NetworkClientError &&
+                error.response.status === HttpStatus.CONFLICT) {
+                // NOTE: a confict here indicates that the reference revision ID sent along with update call
+                // does not match the HEAD of the workspace, therefore, we need to prompt user to refresh the application
+                this.editorStore.applicationStore.notifyWarning('Syncing failed. Current workspace revision is not the latest. Please backup your work and refresh the application');
+                // TODO: maybe we should do more here, e.g. prompt the user to download the patch, but that is for later
+            }
+            else {
+                this.editorStore.applicationStore.notifyError(error);
+            }
+        }
+        finally {
+            this.pushChangesState.complete();
+        }
+    }
+}
 //# sourceMappingURL=LocalChangesState.js.map