diff --git a/packages/neos-ui-redux-store/src/CR/Workspaces/selectors.ts b/packages/neos-ui-redux-store/src/CR/Workspaces/selectors.ts index 260e4ea68e..29c0767ba8 100644 --- a/packages/neos-ui-redux-store/src/CR/Workspaces/selectors.ts +++ b/packages/neos-ui-redux-store/src/CR/Workspaces/selectors.ts @@ -1,7 +1,7 @@ import {createSelector} from 'reselect'; import {documentNodeContextPathSelector} from '../Nodes/selectors'; import {GlobalState} from '../../System'; -import {NodeContextPath} from '@neos-project/neos-ts-interfaces'; +import {NodeContextPath, WorkspaceStatus} from '@neos-project/neos-ts-interfaces'; export const personalWorkspaceNameSelector = (state: GlobalState) => state?.cr?.workspaces?.personalWorkspace?.name; @@ -9,7 +9,12 @@ export const personalWorkspaceRebaseStatusSelector = (state: GlobalState) => sta export const baseWorkspaceSelector = (state: GlobalState) => state?.cr?.workspaces?.personalWorkspace?.baseWorkspace; -export const isWorkspaceReadOnlySelector = (state: GlobalState) => state?.cr?.workspaces?.personalWorkspace?.readOnly || false; +export const isWorkspaceReadOnlySelector = (state: GlobalState) => { + if (state?.cr?.workspaces?.personalWorkspace?.status === WorkspaceStatus.OUTDATED_CONFLICT) { + return true; + } + return state?.cr?.workspaces?.personalWorkspace?.readOnly || false +}; export const publishableNodesSelector = (state: GlobalState) => state?.cr?.workspaces?.personalWorkspace?.publishableNodes;