TASK: Add on remote state for synchronization

Author: markusguenther

packages/neos-ui-redux-store/src/UI/Remote/index.ts

@@ -7,13 +7,15 @@ import {NodeContextPath} from '@neos-project/neos-ts-interfaces';
 export interface State extends Readonly<{
     isSaving: boolean,
     isPublishing: boolean,
-    isDiscarding: boolean
+    isDiscarding: boolean,
+    isSyncing: boolean
 }> {}
 
 export const defaultState: State = {
     isSaving: false,
     isPublishing: false,
-    isDiscarding: false
+    isDiscarding: false,
+    isSyncing: false
 };
 
 //
@@ -28,6 +30,8 @@ export enum actionTypes {
     FINISH_PUBLISHING = '@neos/neos-ui/UI/Remote/FINISH_PUBLISHING',
     START_DISCARDING = '@neos/neos-ui/UI/Remote/START_DISCARDING',
     FINISH_DISCARDING = '@neos/neos-ui/UI/Remote/FINISH_DISCARDING',
+    START_SYNCHRONIZATION = '@neos/neos-ui/UI/Remote/START_SYNCHRONIZATION',
+    FINISH_SYNCHRONIZATION = '@neos/neos-ui/UI/Remote/FINISH_SYNCHRONIZATION',
     DOCUMENT_NODE_CREATED = '@neos/neos-ui/UI/Remote/DOCUMENT_NODE_CREATED'
 }
 
@@ -61,6 +65,16 @@ const startDiscarding = () => createAction(actionTypes.START_DISCARDING);
  */
 const finishDiscarding = () => createAction(actionTypes.FINISH_DISCARDING);
 
+/**
+ * Marks an ongoing synchronization process.
+ */
+const startSynchronization = () => createAction(actionTypes.START_SYNCHRONIZATION);
+
+/**
+ * Marks that an ongoing synchronization process has finished.
+ */
+const finishSynchronization = () => createAction(actionTypes.FINISH_SYNCHRONIZATION);
+
 /**
  * Marks that an publishing process has been locked.
  */
@@ -88,6 +102,8 @@ export const actions = {
     finishPublishing,
     startDiscarding,
     finishDiscarding,
+    startSynchronization,
+    finishSynchronization,
     documentNodeCreated
 };
 
@@ -130,6 +146,14 @@ export const reducer = (state: State = defaultState, action: InitAction | Action
             draft.isDiscarding = false;
             break;
         }
+        case actionTypes.START_SYNCHRONIZATION: {
+            draft.isSyncing = true;
+            break;
+        }
+        case actionTypes.FINISH_SYNCHRONIZATION: {
+            draft.isSyncing = false;
+            break;
+        }
     }
 });
 

packages/neos-ui-sagas/src/Publish/index.js

@@ -45,7 +45,7 @@ export function * watchChangeBaseWorkspace() {
 export function * watchRebaseWorkspace() {
     const {rebaseWorkspace, getWorkspaceInfo} = backend.get().endpoints;
     yield takeEvery(actionTypes.CR.Workspaces.REBASE_WORKSPACE, function * change(action) {
-        yield put(actions.UI.Remote.startSaving());
+        yield put(actions.UI.Remote.startSynchronization());
 
         try {
             const feedback = yield call(rebaseWorkspace, action.payload);
@@ -55,7 +55,7 @@ export function * watchRebaseWorkspace() {
         } finally {
             const workspaceInfo = yield call(getWorkspaceInfo);
             yield put(actions.CR.Workspaces.update(workspaceInfo));
-            yield put(actions.UI.Remote.finishSaving());
+            yield put(actions.UI.Remote.finishSynchronization());
         }
     });
 }

packages/neos-ui/src/Containers/PrimaryToolbar/WorkspaceSync/index.js

@@ -16,9 +16,7 @@ import style from './style.module.css';
 
 @connect(state => ({
     isOpen: state?.ui?.SyncWorkspaceModal?.isOpen,
-    isSaving: state?.ui?.remote?.isSaving,
-    isPublishing: state?.ui?.remote?.isPublishing,
-    isDiscarding: state?.ui?.remote?.isDiscarding,
+    isSyncing: state?.ui?.remote?.isSyncing,
     personalWorkspaceStatus: personalWorkspaceRebaseStatusSelector(state)
 }), {
     openModal: actions.UI.SyncWorkspaceModal.open
@@ -30,9 +28,7 @@ import style from './style.module.css';
 export default class WorkspaceSync extends PureComponent {
     static propTypes = {
         isOpen: PropTypes.bool.isRequired,
-        isSaving: PropTypes.bool.isRequired,
-        isPublishing: PropTypes.bool.isRequired,
-        isDiscarding: PropTypes.bool.isRequired,
+        isSyncing: PropTypes.bool.isRequired,
         openModal: PropTypes.func.isRequired,
         personalWorkspaceStatus: PropTypes.string.isRequired,
         i18nRegistry: PropTypes.object.isRequired
@@ -42,10 +38,8 @@ export default class WorkspaceSync extends PureComponent {
         const {
             personalWorkspaceStatus,
             openModal,
-            isSaving,
             isOpen,
-            isPublishing,
-            isDiscarding,
+            isSyncing,
             i18nRegistry
         } = this.props;
 
@@ -62,12 +56,12 @@ export default class WorkspaceSync extends PureComponent {
                     id="neos-workspace-rebase"
                     className={style.rebaseButton}
                     onClick={openModal}
-                    disabled={isSaving || isOpen || isPublishing || isDiscarding}
+                    disabled={isSyncing || isOpen}
                     style={personalWorkspaceStatus === WorkspaceStatus.OUTDATED ? 'warn' : 'error'}
                     hoverStyle={personalWorkspaceStatus === WorkspaceStatus.OUTDATED ? 'warn' : 'error'}
                     label={buttonLabel}
                 >
-                    {(isSaving || isPublishing || isDiscarding) ? (
+                    {isSyncing ? (
                         <Icon icon="spinner" spin={true}/>
                     ) : (
                         <WorkspaceSyncIcon personalWorkspaceStatus={personalWorkspaceStatus}/>