@finos/legend-application-studio 13.0.0

package/lib/components/editor/side-bar/WorkspaceReview.d.ts

@@ -0,0 +1,23 @@
+/**
+ * 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.
+ */
+/// <reference types="react" resolution-mode="require"/>
+export declare const WorkspaceReviewDiffs: (() => JSX.Element) & {
+    displayName: string;
+};
+export declare const WorkspaceReview: (() => JSX.Element) & {
+    displayName: string;
+};
+//# sourceMappingURL=WorkspaceReview.d.ts.map

package/lib/components/editor/side-bar/WorkspaceReview.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"WorkspaceReview.d.ts","sourceRoot":"","sources":["../../../../src/components/editor/side-bar/WorkspaceReview.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;;AA+BH,eAAO,MAAM,oBAAoB;;CAkD/B,CAAC;AAEH,eAAO,MAAM,eAAe;;CAmP1B,CAAC"}

package/lib/components/editor/side-bar/WorkspaceReview.js

@@ -0,0 +1,146 @@
+import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
+/**
+ * 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 { useRef, useEffect } from 'react';
+import { observer } from 'mobx-react-lite';
+import { Link } from 'react-router-dom';
+import { EntityDiffViewState } from '../../../stores/editor-state/entity-diff-editor-state/EntityDiffViewState.js';
+import { EntityDiffSideBarItem } from '../../editor/edit-panel/diff-editor/EntityDiffView.js';
+import { clsx, PanelLoadingIndicator, TruncatedGitMergeIcon, RefreshIcon, InfoCircleIcon, TimesIcon, PlusIcon, ExternalLinkSquareIcon, } from '@finos/legend-art';
+import { ACTIVITY_MODE } from '../../../stores/EditorConfig.js';
+import { formatDistanceToNow } from 'date-fns';
+import { generateReviewRoute } from '../../../stores/LegendStudioRouter.js';
+import { LEGEND_STUDIO_TEST_ID } from '../../LegendStudioTestID.js';
+import { flowResult } from 'mobx';
+import { entityDiffSorter } from '../../../stores/EditorSDLCState.js';
+import { useEditorStore } from '../EditorStoreProvider.js';
+import { ActionAlertType, ActionAlertActionType, } from '@finos/legend-application';
+import { useLegendStudioApplicationStore } from '../../LegendStudioBaseStoreProvider.js';
+export const WorkspaceReviewDiffs = observer(() => {
+    const editorStore = useEditorStore();
+    const workspaceReviewState = editorStore.workspaceReviewState;
+    const currentEditorState = editorStore.currentEditorState;
+    const changes = editorStore.changeDetectionState.aggregatedWorkspaceChanges;
+    const isSelectedDiff = (diff) => currentEditorState instanceof EntityDiffViewState &&
+        diff.oldPath === currentEditorState.fromEntityPath &&
+        diff.newPath === currentEditorState.toEntityPath;
+    const openChange = (diff) => () => workspaceReviewState.openReviewChange(diff);
+    return (_jsxs("div", { className: "panel side-bar__panel workspace-review__diffs", children: [_jsxs("div", { className: "panel__header", children: [_jsxs("div", { className: "panel__header__title", children: [_jsx("div", { className: "panel__header__title__content", children: "CHANGES" }), _jsx("div", { className: "side-bar__panel__title__info", title: "All changes made in the workspace since the revision the workspace is created", children: _jsx(InfoCircleIcon, {}) })] }), _jsx("div", { className: "side-bar__panel__header__changes-count", "data-testid": LEGEND_STUDIO_TEST_ID.SIDEBAR_PANEL_HEADER__CHANGES_COUNT, children: changes.length })] }), _jsx("div", { className: "panel__content", children: changes
+                    .slice()
+                    .sort(entityDiffSorter)
+                    .map((diff) => (_jsx(EntityDiffSideBarItem, { diff: diff, isSelected: isSelectedDiff(diff), openDiff: openChange(diff) }, diff.key))) })] }));
+});
+export const WorkspaceReview = observer(() => {
+    const editorStore = useEditorStore();
+    const applicationStore = useLegendStudioApplicationStore();
+    const workspaceReviewState = editorStore.workspaceReviewState;
+    const workspaceContainsSnapshotDependencies = editorStore.projectConfigurationEditorState.containsSnapshotDependencies;
+    const workspaceReview = workspaceReviewState.workspaceReview;
+    // Review Title
+    const reviewTitleInputRef = useRef(null);
+    const editReviewTitle = (event) => {
+        if (!workspaceReview) {
+            workspaceReviewState.setReviewTitle(event.target.value);
+        }
+    };
+    const isDispatchingAction = workspaceReviewState.isCreatingWorkspaceReview ||
+        workspaceReviewState.isFetchingCurrentWorkspaceReview ||
+        workspaceReviewState.isRefreshingWorkspaceChangesDetector ||
+        workspaceReviewState.isCommittingWorkspaceReview ||
+        workspaceReviewState.isClosingWorkspaceReview ||
+        workspaceReviewState.isRecreatingWorkspaceAfterCommittingReview;
+    const refresh = () => {
+        flowResult(workspaceReviewState.refreshWorkspaceChanges()).catch(applicationStore.alertUnhandledError);
+        flowResult(workspaceReviewState.fetchCurrentWorkspaceReview()).catch(applicationStore.alertUnhandledError);
+    };
+    const closeReview = () => {
+        workspaceReviewState.setReviewTitle('');
+        flowResult(workspaceReviewState.closeWorkspaceReview()).catch(applicationStore.alertUnhandledError);
+    };
+    const commitReview = () => {
+        if (workspaceReview && !isDispatchingAction) {
+            const commit = () => {
+                workspaceReviewState.setReviewTitle('');
+                flowResult(workspaceReviewState.commitWorkspaceReview(workspaceReview)).catch(applicationStore.alertUnhandledError);
+            };
+            if (editorStore.hasUnpushedChanges) {
+                editorStore.setActionAlertInfo({
+                    message: 'You have unpushed changes',
+                    prompt: 'This action will discard these changes and refresh the application',
+                    type: ActionAlertType.CAUTION,
+                    onEnter: () => editorStore.setBlockGlobalHotkeys(true),
+                    onClose: () => editorStore.setBlockGlobalHotkeys(false),
+                    actions: [
+                        {
+                            label: 'Proceed to commit review',
+                            type: ActionAlertActionType.PROCEED_WITH_CAUTION,
+                            handler: () => {
+                                editorStore.setIgnoreNavigationBlocking(true);
+                                commit();
+                            },
+                        },
+                        {
+                            label: 'Abort',
+                            type: ActionAlertActionType.PROCEED,
+                            default: true,
+                        },
+                    ],
+                });
+            }
+            else {
+                commit();
+            }
+        }
+    };
+    const createReview = () => {
+        if (workspaceReviewState.reviewTitle &&
+            !workspaceReview &&
+            !isDispatchingAction) {
+            flowResult(workspaceReviewState.createWorkspaceReview(workspaceReviewState.reviewTitle)).catch(applicationStore.alertUnhandledError);
+        }
+    };
+    // since the review can be changed by other people, we can refresh it more proactively
+    // the diffs are caused by the current user though, so we should handle that as part
+    // of `syncWithWorkspace` for example; in case it is bad, user can click refresh to make it right again
+    useEffect(() => {
+        flowResult(workspaceReviewState.fetchCurrentWorkspaceReview()).catch(applicationStore.alertUnhandledError);
+    }, [applicationStore, workspaceReviewState]);
+    useEffect(() => {
+        if (editorStore.activeActivity === ACTIVITY_MODE.WORKSPACE_REVIEW) {
+            reviewTitleInputRef.current?.focus();
+        }
+    }, [editorStore.activeActivity]);
+    return (_jsxs("div", { className: "panel workspace-review", children: [_jsxs("div", { className: "panel__header side-bar__header", children: [_jsx("div", { className: "panel__header__title workspace-review__header__title", children: _jsx("div", { className: "panel__header__title__content side-bar__header__title__content", children: "REVIEW" }) }), _jsxs("div", { className: "panel__header__actions side-bar__header__actions", children: [_jsx("button", { className: clsx('panel__header__action side-bar__header__action workspace-review__refresh-btn', {
+                                    'workspace-review__refresh-btn--loading': workspaceReviewState.isRefreshingWorkspaceChangesDetector,
+                                }), disabled: isDispatchingAction, onClick: refresh, tabIndex: -1, title: "Refresh", children: _jsx(RefreshIcon, {}) }), _jsx("button", { className: "panel__header__action side-bar__header__action workspace-review__close-btn", disabled: !workspaceReview || isDispatchingAction, onClick: closeReview, tabIndex: -1, title: "Close review", children: _jsx(TimesIcon, {}) })] })] }), _jsxs("div", { className: "panel__content side-bar__content", children: [_jsx(PanelLoadingIndicator, { isLoading: isDispatchingAction }), _jsxs("div", { className: "panel workspace-review", children: [!workspaceReview && (_jsx(_Fragment, { children: _jsxs("form", { className: "workspace-review__title", onSubmit: (e) => {
+                                        e.preventDefault();
+                                    }, children: [_jsx("div", { className: "workspace-review__title__content", children: _jsx("input", { className: "workspace-review__title__content__input input--dark", ref: reviewTitleInputRef, spellCheck: false, value: workspaceReviewState.reviewTitle, disabled: Boolean(workspaceReview), onChange: editReviewTitle, placeholder: 'Title' }) }), _jsx("button", { className: clsx('btn--dark btn--sm', {
+                                                'btn--error': workspaceContainsSnapshotDependencies,
+                                            }), onClick: createReview, disabled: isDispatchingAction ||
+                                                Boolean(workspaceReview) ||
+                                                !workspaceReviewState.reviewTitle ||
+                                                workspaceContainsSnapshotDependencies, title: !workspaceContainsSnapshotDependencies
+                                                ? 'Create review'
+                                                : `Can't create review: workspace has snapshot dependencies`, children: _jsx(PlusIcon, {}) })] }) })), workspaceReview && (_jsxs(_Fragment, { children: [_jsxs("div", { className: "workspace-review__title", children: [_jsx("div", { className: "workspace-review__title__content", children: _jsx("div", { className: "workspace-review__title__content__input workspace-review__title__content__input--with-link", title: 'See review detail', children: _jsxs(Link, { className: "workspace-review__title__content__input__link", rel: "noopener noreferrer", target: "_blank", to: generateReviewRoute(workspaceReview.projectId, workspaceReview.id), children: [_jsx("span", { className: "workspace-review__title__content__input__link__review-name", children: workspaceReview.title }), _jsx("div", { className: "workspace-review__title__content__input__link__btn", children: _jsx(ExternalLinkSquareIcon, {}) })] }) }) }), _jsx("button", { className: clsx('btn--dark btn--sm workspace-review__merge-review-btn', { 'btn--error': workspaceContainsSnapshotDependencies }), onClick: commitReview, disabled: isDispatchingAction ||
+                                                    Boolean(!workspaceReview) ||
+                                                    workspaceContainsSnapshotDependencies, tabIndex: -1, title: !workspaceContainsSnapshotDependencies
+                                                    ? 'Commit review'
+                                                    : `Can't commit review: workspace has snapshot dependencies`, children: _jsx(TruncatedGitMergeIcon, {}) })] }), _jsxs("div", { className: "workspace-review__title__content__review-status", children: ["created", ' ', formatDistanceToNow(workspaceReview.createdAt, {
+                                                includeSeconds: true,
+                                                addSuffix: true,
+                                            })] })] })), _jsx(WorkspaceReviewDiffs, {})] })] })] }));
+});
+//# sourceMappingURL=WorkspaceReview.js.map

package/lib/components/editor/side-bar/WorkspaceReview.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"WorkspaceReview.js","sourceRoot":"","sources":["../../../../src/components/editor/side-bar/WorkspaceReview.tsx"],"names":[],"mappings":"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"}

package/lib/components/editor/side-bar/WorkspaceSyncConflictResolver.d.ts

@@ -0,0 +1,20 @@
+/**
+ * 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.
+ */
+/// <reference types="react" resolution-mode="require"/>
+export declare const WorkspaceSyncConflictResolver: (() => JSX.Element) & {
+    displayName: string;
+};
+//# sourceMappingURL=WorkspaceSyncConflictResolver.d.ts.map

package/lib/components/editor/side-bar/WorkspaceSyncConflictResolver.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"WorkspaceSyncConflictResolver.d.ts","sourceRoot":"","sources":["../../../../src/components/editor/side-bar/WorkspaceSyncConflictResolver.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;;AAkCH,eAAO,MAAM,6BAA6B;;CAmOxC,CAAC"}

package/lib/components/editor/side-bar/WorkspaceSyncConflictResolver.js

@@ -0,0 +1,79 @@
+import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
+/**
+ * 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 { observer } from 'mobx-react-lite';
+import { useEditorStore } from '../EditorStoreProvider.js';
+import { noop } from '@finos/legend-shared';
+import { clsx, ResizablePanel, ResizablePanelGroup, ResizablePanelSplitter, ResizablePanelSplitterLine, InfoCircleIcon, TimesIcon, Dialog, } from '@finos/legend-art';
+import { EntityChangeConflictEditor, EntityChangeConflictSideBarItem, } from '../edit-panel/diff-editor/EntityChangeConflictEditor.js';
+import { EntityChangeConflictEditorState } from '../../../stores/editor-state/entity-diff-editor-state/EntityChangeConflictEditorState.js';
+import { EntityDiffSideBarItem, EntityDiffView, } from '../edit-panel/diff-editor/EntityDiffView.js';
+import { EntityDiffViewState } from '../../../stores/editor-state/entity-diff-editor-state/EntityDiffViewState.js';
+import { entityDiffSorter } from '../../../stores/EditorSDLCState.js';
+import { flowResult } from 'mobx';
+import { useApplicationStore } from '@finos/legend-application';
+export const WorkspaceSyncConflictResolver = observer(() => {
+    const editorStore = useEditorStore();
+    const applicationStore = useApplicationStore();
+    const updateState = editorStore.localChangesState.workspaceSyncState;
+    const updateConflictState = updateState.workspaceSyncConflictResolutionState;
+    const currentDiffEditorState = updateConflictState.currentDiffEditorState;
+    const openMergedEditorStates = updateConflictState.openMergedEditorStates;
+    const conflicts = updateConflictState.pendingConflicts;
+    const hadResolvedAllConflicts = !conflicts.length;
+    const changes = updateConflictState.changes;
+    const openConflict = (conflict) => () => {
+        updateConflictState.openConflict(conflict);
+    };
+    const isSelectedConflict = (conflict) => currentDiffEditorState instanceof EntityChangeConflictEditorState &&
+        conflict.entityPath === currentDiffEditorState.entityPath;
+    const closeTabOnMiddleClick = (conflictState) => (event) => {
+        if (event.nativeEvent.button === 1) {
+            updateConflictState.closeConflict(conflictState);
+        }
+    };
+    const closeTab = (conflictState) => (event) => updateConflictState.closeConflict(conflictState);
+    const openTab = (conflictState) => () => updateConflictState.openState(conflictState);
+    const isSelectedDiff = (diff) => currentDiffEditorState instanceof EntityDiffViewState &&
+        diff.oldPath === currentDiffEditorState.fromEntityPath &&
+        diff.newPath === currentDiffEditorState.toEntityPath;
+    const openChange = (diff) => () => {
+        updateConflictState.openConflictResolutionChange(diff);
+    };
+    const applyResolutions = () => {
+        if (!conflicts.length) {
+            flowResult(updateState.applyResolutionChanges()).catch(applicationStore.alertUnhandledError);
+        }
+    };
+    const abort = () => updateState.resetConflictState();
+    return (_jsx(Dialog, { open: updateConflictState.showModal, onClose: noop, classes: { container: 'search-modal__container' }, PaperProps: { classes: { root: 'search-modal__inner-container' } }, children: _jsxs("div", { className: "modal modal--dark editor-modal query-builder__dialog", children: [_jsx("div", { className: "modal__header", children: _jsx("div", { className: "modal__title", children: "Resolve Merge Conflicts" }) }), _jsx("div", { className: "modal__body", children: _jsxs(ResizablePanelGroup, { orientation: "vertical", children: [_jsx(ResizablePanel, { size: 350, minSize: 350, children: _jsxs("div", { className: "panel explorer", children: [_jsx("div", { className: "panel__header workspace-sync-conflict-resolver__changes__header", children: _jsx("div", { className: "panel__header__title", children: _jsx("div", { className: "panel__header__title__content workspace-sync-conflict-resolver__changes__header__title__content", children: "All Changes" }) }) }), _jsx("div", { className: "panel__content explorer__content__container", children: _jsx(ResizablePanelGroup, { orientation: "horizontal", children: _jsxs("div", { className: "panel workspace-sync-conflict-resolver__changes__panel", children: [_jsxs("div", { className: "panel__header", children: [_jsxs("div", { className: "panel__header__title", children: [_jsx("div", { className: "panel__header__title__content", children: "CHANGES" }), _jsx("div", { className: "workspace-sync-conflict-resolver__changes__panel__title__info", title: "All local changes that have not been yet pushed with the server", children: _jsx(InfoCircleIcon, {}) })] }), _jsx("div", { className: "workspace-sync-conflict-resolver__changes__panel__header__changes-count", children: changes.length + conflicts.length })] }), _jsxs("div", { className: "panel__content", children: [!hadResolvedAllConflicts && (_jsxs(_Fragment, { children: [conflicts
+                                                                            .slice()
+                                                                            .sort((a, b) => a.entityName.localeCompare(b.entityName))
+                                                                            .map((conflict) => (_jsx(EntityChangeConflictSideBarItem, { conflict: conflict, isSelected: isSelectedConflict(conflict), openConflict: openConflict(conflict) }, `conflict-${conflict.entityPath}`))), Boolean(conflicts.length) &&
+                                                                            Boolean(changes.length) && (_jsx("div", { className: "diff-panel__item-section-separator" })), changes
+                                                                            .slice()
+                                                                            .sort(entityDiffSorter)
+                                                                            .map((diff) => (_jsx(EntityDiffSideBarItem, { diff: diff, isSelected: isSelectedDiff(diff), openDiff: openChange(diff) }, diff.key)))] })), hadResolvedAllConflicts &&
+                                                                    changes
+                                                                        .slice()
+                                                                        .sort(entityDiffSorter)
+                                                                        .map((diff) => (_jsx(EntityDiffSideBarItem, { diff: diff, isSelected: isSelectedDiff(diff), openDiff: openChange(diff) }, diff.key)))] })] }) }) })] }) }), _jsx(ResizablePanelSplitter, { children: _jsx(ResizablePanelSplitterLine, { color: "var(--color-dark-grey-200)" }) }), _jsx(ResizablePanel, { children: _jsxs("div", { className: "workspace-sync-conflict-resolver", children: [_jsx("div", { className: "workspace-sync-conflict-resolver__header", children: _jsx("div", { className: "workspace-sync-conflict-resolver__header__tabs", children: openMergedEditorStates.map((mergedState) => (_jsx("div", { className: clsx('workspace-sync-conflict-resolver__header__tab', {
+                                                        'workspace-sync-conflict-resolver__header__tab--active': mergedState === currentDiffEditorState,
+                                                    }), onMouseUp: closeTabOnMiddleClick(mergedState), children: _jsxs("div", { className: "edit-panel__header__tab__content", children: [_jsx("button", { className: "workspace-sync-conflict-resolver__header__tab__label", tabIndex: -1, onClick: openTab(mergedState), title: mergedState.headerName, children: mergedState.headerName }), _jsx("button", { className: "workspace-sync-conflict-resolver__header__tab__close-btn", onClick: closeTab(mergedState), tabIndex: -1, title: 'Close', children: _jsx(TimesIcon, {}) })] }) }, mergedState.uuid))) }) }), _jsxs("div", { className: "panel__content", children: [updateConflictState.currentDiffEditorState instanceof
+                                                    EntityChangeConflictEditorState && (_jsx(EntityChangeConflictEditor, { conflictEditorState: updateConflictState.currentDiffEditorState })), updateConflictState.currentDiffEditorState instanceof
+                                                    EntityDiffViewState && (_jsx(EntityDiffView, { entityDiffViewState: updateConflictState.currentDiffEditorState }))] })] }) })] }) }), _jsxs("div", { className: "modal__footer", children: [_jsx("button", { type: "button", className: "btn btn--primary btn--dark", disabled: Boolean(conflicts.length), title: "Apply Resolutions", onClick: applyResolutions, children: "Apply Resolutions" }), _jsx("button", { type: "button", title: "Aborts", className: "btn btn--dark", onClick: abort, children: "Abort" })] })] }) }));
+});
+//# sourceMappingURL=WorkspaceSyncConflictResolver.js.map

package/lib/components/editor/side-bar/WorkspaceSyncConflictResolver.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"WorkspaceSyncConflictResolver.js","sourceRoot":"","sources":["../../../../src/components/editor/side-bar/WorkspaceSyncConflictResolver.tsx"],"names":[],"mappings":"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"}

package/lib/components/editor/side-bar/WorkspaceUpdateConflictResolver.d.ts

@@ -0,0 +1,20 @@
+/**
+ * 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.
+ */
+/// <reference types="react" resolution-mode="require"/>
+export declare const WorkspaceUpdateConflictResolver: (() => JSX.Element) & {
+    displayName: string;
+};
+//# sourceMappingURL=WorkspaceUpdateConflictResolver.d.ts.map

package/lib/components/editor/side-bar/WorkspaceUpdateConflictResolver.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"WorkspaceUpdateConflictResolver.d.ts","sourceRoot":"","sources":["../../../../src/components/editor/side-bar/WorkspaceUpdateConflictResolver.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;;AAyBH,eAAO,MAAM,+BAA+B;;CAsK1C,CAAC"}

package/lib/components/editor/side-bar/WorkspaceUpdateConflictResolver.js

@@ -0,0 +1,70 @@
+import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
+/**
+ * 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 { observer } from 'mobx-react-lite';
+import { EntityDiffViewState } from '../../../stores/editor-state/entity-diff-editor-state/EntityDiffViewState.js';
+import { EntityDiffSideBarItem } from '../edit-panel/diff-editor/EntityDiffView.js';
+import { PanelLoadingIndicator, CloudDownloadIcon, CheckIcon, TimesIcon, InfoCircleIcon, BanIcon, } from '@finos/legend-art';
+import { EntityChangeConflictSideBarItem } from '../edit-panel/diff-editor/EntityChangeConflictEditor.js';
+import { EntityChangeConflictEditorState } from '../../../stores/editor-state/entity-diff-editor-state/EntityChangeConflictEditorState.js';
+import { LEGEND_STUDIO_TEST_ID } from '../../LegendStudioTestID.js';
+import { flowResult } from 'mobx';
+import { entityDiffSorter } from '../../../stores/EditorSDLCState.js';
+import { useEditorStore } from '../EditorStoreProvider.js';
+import { useApplicationStore } from '@finos/legend-application';
+export const WorkspaceUpdateConflictResolver = observer(() => {
+    const editorStore = useEditorStore();
+    const applicationStore = useApplicationStore();
+    const sdlcState = editorStore.sdlcState;
+    const currentEditorState = editorStore.currentEditorState;
+    const conflictResolutionState = editorStore.conflictResolutionState;
+    // Actions
+    const isRunningTask = editorStore.workspaceUpdaterState.isUpdatingWorkspace ||
+        conflictResolutionState.isInitializingConflictResolution ||
+        conflictResolutionState.isAcceptingConflictResolution ||
+        conflictResolutionState.isDiscardingConflictResolutionChanges ||
+        conflictResolutionState.isAbortingConflictResolution;
+    const updateWorkspace = applicationStore.guardUnhandledError(() => flowResult(editorStore.workspaceUpdaterState.updateWorkspace()));
+    const accept = applicationStore.guardUnhandledError(() => flowResult(conflictResolutionState.acceptConflictResolution()));
+    const discardChanges = applicationStore.guardUnhandledError(() => flowResult(conflictResolutionState.discardConflictResolutionChanges()));
+    const abort = applicationStore.guardUnhandledError(() => flowResult(conflictResolutionState.abortConflictResolution()));
+    // Conflicts
+    const conflicts = conflictResolutionState.conflicts;
+    const isSelectedConflict = (conflict) => currentEditorState instanceof EntityChangeConflictEditorState &&
+        conflict.entityPath === currentEditorState.entityPath;
+    const openConflict = (conflict) => () => conflictResolutionState.openConflict(conflict);
+    // Changes
+    const changes = conflictResolutionState.changes;
+    const openChange = (diff) => () => conflictResolutionState.openConflictResolutionChange(diff);
+    const isSelectedDiff = (diff) => currentEditorState instanceof EntityDiffViewState &&
+        diff.oldPath === currentEditorState.fromEntityPath &&
+        diff.newPath === currentEditorState.toEntityPath;
+    return (_jsxs("div", { className: "panel conflict-resolution", children: [_jsxs("div", { className: "panel__header side-bar__header", children: [_jsx("div", { className: "panel__header__title conflict-resolution__header__title", children: _jsx("div", { className: "panel__header__title__content side-bar__header__title__content", children: "CONFLICT RESOLUTION" }) }), _jsxs("div", { className: "panel__header__actions side-bar__header__actions", children: [_jsx("button", { className: "panel__header__action side-bar__header__action conflict-resolution__update-btn", onClick: updateWorkspace, disabled: !sdlcState.isWorkspaceOutdated || isRunningTask, tabIndex: -1, title: "Update workspace", children: _jsx(CloudDownloadIcon, {}) }), _jsx("button", { className: "panel__header__action side-bar__header__action", onClick: accept, disabled: !conflictResolutionState.hasResolvedAllConflicts || isRunningTask, tabIndex: -1, title: "Accept resolution", children: _jsx(CheckIcon, {}) }), _jsx("button", { className: "panel__header__action side-bar__header__action", onClick: discardChanges, disabled: isRunningTask, tabIndex: -1, title: "Discard all changes made in the workspace", children: _jsx(TimesIcon, {}) }), _jsx("button", { className: "panel__header__action side-bar__header__action", onClick: abort, disabled: isRunningTask, tabIndex: -1, title: "Abort conflict resolution", children: _jsx(BanIcon, {}) })] })] }), _jsxs("div", { className: "panel__content side-bar__content", children: [_jsx(PanelLoadingIndicator, { isLoading: isRunningTask }), _jsxs("div", { className: "panel side-bar__panel", children: [_jsxs("div", { className: "panel__header", children: [_jsxs("div", { className: "panel__header__title", children: [_jsx("div", { className: "panel__header__title__content", children: "CHANGES" }), _jsx("div", { className: "side-bar__panel__title__info", title: "All changes made in the workspace applied on top of the project revision the workspace is updated to", children: _jsx(InfoCircleIcon, {}) })] }), _jsx("div", { className: "side-bar__panel__header__changes-count", "data-testid": LEGEND_STUDIO_TEST_ID.SIDEBAR_PANEL_HEADER__CHANGES_COUNT, children: changes.length +
+                                            (conflictResolutionState.hasResolvedAllConflicts
+                                                ? 0
+                                                : conflicts.length) })] }), _jsxs("div", { className: "panel__content", children: [!conflictResolutionState.hasResolvedAllConflicts && (_jsxs(_Fragment, { children: [conflicts
+                                                .slice()
+                                                .sort((a, b) => a.entityName.localeCompare(b.entityName))
+                                                .map((conflict) => (_jsx(EntityChangeConflictSideBarItem, { conflict: conflict, isSelected: isSelectedConflict(conflict), openConflict: openConflict(conflict) }, `conflict-${conflict.entityPath}`))), Boolean(conflicts.length) && Boolean(changes.length) && (_jsx("div", { className: "diff-panel__item-section-separator" })), changes
+                                                .slice()
+                                                .sort(entityDiffSorter)
+                                                .map((diff) => (_jsx(EntityDiffSideBarItem, { diff: diff, isSelected: isSelectedDiff(diff), openDiff: openChange(diff) }, diff.key)))] })), conflictResolutionState.hasResolvedAllConflicts &&
+                                        changes
+                                            .slice()
+                                            .sort(entityDiffSorter)
+                                            .map((diff) => (_jsx(EntityDiffSideBarItem, { diff: diff, isSelected: isSelectedDiff(diff), openDiff: openChange(diff) }, diff.key)))] })] })] })] }));
+});
+//# sourceMappingURL=WorkspaceUpdateConflictResolver.js.map

package/lib/components/editor/side-bar/WorkspaceUpdateConflictResolver.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"WorkspaceUpdateConflictResolver.js","sourceRoot":"","sources":["../../../../src/components/editor/side-bar/WorkspaceUpdateConflictResolver.tsx"],"names":[],"mappings":"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"}

package/lib/components/editor/side-bar/WorkspaceUpdater.d.ts

@@ -0,0 +1,20 @@
+/**
+ * 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.
+ */
+/// <reference types="react" resolution-mode="require"/>
+export declare const WorkspaceUpdater: (() => JSX.Element) & {
+    displayName: string;
+};
+//# sourceMappingURL=WorkspaceUpdater.d.ts.map

package/lib/components/editor/side-bar/WorkspaceUpdater.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"WorkspaceUpdater.d.ts","sourceRoot":"","sources":["../../../../src/components/editor/side-bar/WorkspaceUpdater.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;;AAmCH,eAAO,MAAM,gBAAgB;;CAqO3B,CAAC"}

package/lib/components/editor/side-bar/WorkspaceUpdater.js

@@ -0,0 +1,103 @@
+import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+/**
+ * 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 { useEffect } from 'react';
+import { observer } from 'mobx-react-lite';
+import { EntityDiffViewState } from '../../../stores/editor-state/entity-diff-editor-state/EntityDiffViewState.js';
+import { EntityDiffSideBarItem } from '../../editor/edit-panel/diff-editor/EntityDiffView.js';
+import { clsx, PanelLoadingIndicator, ResizablePanel, ResizablePanelGroup, ResizablePanelSplitter, ResizablePanelSplitterLine, CloudDownloadIcon, RefreshIcon, InfoCircleIcon, } from '@finos/legend-art';
+import { Link } from 'react-router-dom';
+import { EntityChangeConflictSideBarItem } from '../../editor/edit-panel/diff-editor/EntityChangeConflictEditor.js';
+import { EntityChangeConflictEditorState } from '../../../stores/editor-state/entity-diff-editor-state/EntityChangeConflictEditorState.js';
+import { generateReviewRoute } from '../../../stores/LegendStudioRouter.js';
+import { LEGEND_STUDIO_TEST_ID } from '../../LegendStudioTestID.js';
+import { flowResult } from 'mobx';
+import { entityDiffSorter } from '../../../stores/EditorSDLCState.js';
+import { useEditorStore } from '../EditorStoreProvider.js';
+import { ActionAlertType, ActionAlertActionType, } from '@finos/legend-application';
+import { useLegendStudioApplicationStore } from '../../LegendStudioBaseStoreProvider.js';
+export const WorkspaceUpdater = observer(() => {
+    const editorStore = useEditorStore();
+    const applicationStore = useLegendStudioApplicationStore();
+    const sdlcState = editorStore.sdlcState;
+    const currentEditorState = editorStore.currentEditorState;
+    const workspaceUpdaterState = editorStore.workspaceUpdaterState;
+    // Actions
+    const updateWorkspace = () => {
+        if (editorStore.hasUnpushedChanges) {
+            editorStore.setActionAlertInfo({
+                message: 'You have unpushed changes',
+                prompt: 'This action will discard these changes and refresh the application',
+                type: ActionAlertType.CAUTION,
+                onEnter: () => editorStore.setBlockGlobalHotkeys(true),
+                onClose: () => editorStore.setBlockGlobalHotkeys(false),
+                actions: [
+                    {
+                        label: 'Proceed to update workspace',
+                        type: ActionAlertActionType.PROCEED_WITH_CAUTION,
+                        handler: () => {
+                            editorStore.setIgnoreNavigationBlocking(true);
+                            flowResult(workspaceUpdaterState.updateWorkspace()).catch(applicationStore.alertUnhandledError);
+                        },
+                    },
+                    {
+                        label: 'Abort',
+                        type: ActionAlertActionType.PROCEED,
+                        default: true,
+                    },
+                ],
+            });
+        }
+        else {
+            flowResult(workspaceUpdaterState.updateWorkspace()).catch(applicationStore.alertUnhandledError);
+        }
+    };
+    const refreshWorkspaceUpdater = applicationStore.guardUnhandledError(() => flowResult(workspaceUpdaterState.refreshWorkspaceUpdater()));
+    const isDispatchingAction = workspaceUpdaterState.isUpdatingWorkspace ||
+        sdlcState.isCheckingIfWorkspaceIsOutdated ||
+        workspaceUpdaterState.isRefreshingWorkspaceUpdater;
+    // Conflicts
+    const conflicts = editorStore.changeDetectionState.potentialWorkspaceUpdateConflicts;
+    const isSelectedConflict = (conflict) => currentEditorState instanceof EntityChangeConflictEditorState &&
+        conflict.entityPath === currentEditorState.entityPath;
+    const openPotentialConflict = (conflict) => () => workspaceUpdaterState.openPotentialWorkspaceUpdateConflict(conflict);
+    // Changes
+    const changes = editorStore.changeDetectionState.aggregatedProjectLatestChanges;
+    const changesWithoutConflicts = changes.filter((change) => !conflicts
+        .map((conflict) => conflict.entityPath)
+        .includes(change.entityPath));
+    const isSelectedDiff = (diff) => currentEditorState instanceof EntityDiffViewState &&
+        diff.oldPath === currentEditorState.fromEntityPath &&
+        diff.newPath === currentEditorState.toEntityPath;
+    const openChange = (diff) => () => workspaceUpdaterState.openProjectLatestChange(diff);
+    // Committed Reviews
+    const commitedReviews = workspaceUpdaterState.committedReviewsBetweenWorkspaceBaseAndProjectLatest;
+    // since the project latest changes can be affected by other users, we refresh it more proactively
+    useEffect(() => {
+        flowResult(workspaceUpdaterState.refreshWorkspaceUpdater()).catch(applicationStore.alertUnhandledError);
+    }, [applicationStore, workspaceUpdaterState]);
+    return (_jsxs("div", { className: "panel workspace-updater", children: [_jsxs("div", { className: "panel__header side-bar__header", children: [_jsx("div", { className: "panel__header__title workspace-updater__header__title", children: _jsx("div", { className: "panel__header__title__content side-bar__header__title__content", children: "WORKSPACE UPDATER" }) }), _jsxs("div", { className: "panel__header__actions side-bar__header__actions", children: [_jsx("button", { className: clsx('panel__header__action side-bar__header__action workspace-updater__refresh-btn', {
+                                    'workspace-updater__refresh-btn--loading': workspaceUpdaterState.isRefreshingWorkspaceUpdater,
+                                }), onClick: refreshWorkspaceUpdater, disabled: isDispatchingAction, tabIndex: -1, title: "Refresh", children: _jsx(RefreshIcon, {}) }), _jsx("button", { className: "panel__header__action side-bar__header__action workspace-updater__update-btn", onClick: updateWorkspace, disabled: !sdlcState.isWorkspaceOutdated || isDispatchingAction, tabIndex: -1, title: "Update workspace", children: _jsx(CloudDownloadIcon, {}) })] })] }), _jsxs("div", { className: "panel__content side-bar__content", children: [_jsx(PanelLoadingIndicator, { isLoading: isDispatchingAction }), _jsxs(ResizablePanelGroup, { orientation: "horizontal", children: [_jsx(ResizablePanel, { size: 400, minSize: 28, children: _jsxs("div", { className: "panel side-bar__panel", children: [_jsxs("div", { className: "panel__header", children: [_jsxs("div", { className: "panel__header__title", children: [_jsx("div", { className: "panel__header__title__content", children: "CHANGES" }), _jsx("div", { className: "side-bar__panel__title__info", title: 'All changes made to project since the revision the workspace is created.\nPotential workspace update conflicts are also shown if they exist', children: _jsx(InfoCircleIcon, {}) })] }), _jsx("div", { className: "side-bar__panel__header__changes-count", "data-testid": LEGEND_STUDIO_TEST_ID.SIDEBAR_PANEL_HEADER__CHANGES_COUNT, children: changes.length })] }), _jsxs("div", { className: "panel__content", children: [conflicts
+                                                    .slice()
+                                                    .sort((a, b) => a.entityName.localeCompare(b.entityName))
+                                                    .map((conflict) => (_jsx(EntityChangeConflictSideBarItem, { conflict: conflict, isSelected: isSelectedConflict(conflict), openConflict: openPotentialConflict(conflict) }, `conflict-${conflict.entityPath}`))), Boolean(conflicts.length) &&
+                                                    Boolean(changesWithoutConflicts.length) && (_jsx("div", { className: "diff-panel__item-section-separator" })), changesWithoutConflicts
+                                                    .slice()
+                                                    .sort(entityDiffSorter)
+                                                    .map((diff) => (_jsx(EntityDiffSideBarItem, { diff: diff, isSelected: isSelectedDiff(diff), openDiff: openChange(diff) }, diff.key)))] })] }) }), _jsx(ResizablePanelSplitter, { children: _jsx(ResizablePanelSplitterLine, { color: "var(--color-dark-grey-100)" }) }), _jsx(ResizablePanel, { minSize: 28, children: _jsxs("div", { className: "panel side-bar__panel", children: [_jsxs("div", { className: "panel__header", children: [_jsxs("div", { className: "panel__header__title", children: [_jsx("div", { className: "panel__header__title__content", children: "COMMITTED REVIEWS" }), _jsx("div", { className: "side-bar__panel__title__info", title: "All committed reviews in the project since the revision the workspace is created", children: _jsx(InfoCircleIcon, {}) })] }), _jsx("div", { className: "side-bar__panel__header__changes-count", "data-testid": LEGEND_STUDIO_TEST_ID.SIDEBAR_PANEL_HEADER__CHANGES_COUNT, children: commitedReviews.length })] }), _jsx("div", { className: "panel__content", children: commitedReviews.map((review) => (_jsx(Link, { className: "side-bar__panel__item workspace-updater__review__link", rel: "noopener noreferrer", target: "_blank", to: generateReviewRoute(review.projectId, review.id), title: 'See review detail', children: _jsxs("div", { className: "workspace-updater__review", children: [_jsx("span", { className: "workspace-updater__review__name", children: review.title }), _jsx("span", { className: "workspace-updater__review__info", children: review.author.name })] }) }, review.id))) })] }) })] })] })] }));
+});
+//# sourceMappingURL=WorkspaceUpdater.js.map

package/lib/components/editor/side-bar/WorkspaceUpdater.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"WorkspaceUpdater.js","sourceRoot":"","sources":["../../../../src/components/editor/side-bar/WorkspaceUpdater.tsx"],"names":[],"mappings":"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"}

package/lib/components/editor/side-bar/testable/GlobalTestRunner.d.ts

@@ -0,0 +1,24 @@
+/**
+ * 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.
+ */
+/// <reference types="react" resolution-mode="require"/>
+import { type GlobalTestRunnerState, TESTABLE_RESULT } from '../../../../stores/sidebar-state/testable/GlobalTestRunnerState.js';
+export declare const getTestableResultIcon: (testableResult: TESTABLE_RESULT) => React.ReactNode;
+export declare const GlobalTestRunner: ((props: {
+    globalTestRunnerState: GlobalTestRunnerState;
+}) => JSX.Element) & {
+    displayName: string;
+};
+//# sourceMappingURL=GlobalTestRunner.d.ts.map