TASK: Remove legacy WorkspaceStatus.OUTDATED_CONFLICT from ts-inter…

…faces
neos · Apr 12, 2024 · eb813c7 · eb813c7
1 parent 007cc35
commit eb813c7
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 9 deletions.
diff --git a/packages/neos-ts-interfaces/src/index.ts b/packages/neos-ts-interfaces/src/index.ts
@@ -103,8 +103,7 @@ export enum SelectionModeTypes {
 
 export enum WorkspaceStatus {
     UP_TO_DATE = 'UP_TO_DATE',
-    OUTDATED = 'OUTDATED',
-    OUTDATED_CONFLICT = 'OUTDATED_CONFLICT'
+    OUTDATED = 'OUTDATED'
 }
 
 export interface ValidatorConfiguration {

diff --git 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, WorkspaceStatus} from '@neos-project/neos-ts-interfaces';
+import {NodeContextPath} from '@neos-project/neos-ts-interfaces';
 
 export const personalWorkspaceNameSelector = (state: GlobalState) => state?.cr?.workspaces?.personalWorkspace?.name;
 
@@ -10,9 +10,6 @@ export const personalWorkspaceRebaseStatusSelector = (state: GlobalState) => sta
 export const baseWorkspaceSelector = (state: GlobalState) => state?.cr?.workspaces?.personalWorkspace?.baseWorkspace;
 
 export const isWorkspaceReadOnlySelector = (state: GlobalState) => {
-    if (state?.cr?.workspaces?.personalWorkspace?.status === WorkspaceStatus.OUTDATED_CONFLICT) {
-        return true;
-    }
     return state?.cr?.workspaces?.personalWorkspace?.readOnly || false
 };
 

diff --git a/packages/neos-ui/src/Containers/PrimaryToolbar/WorkspaceSync/WorkspaceSync.tsx b/packages/neos-ui/src/Containers/PrimaryToolbar/WorkspaceSync/WorkspaceSync.tsx
@@ -70,9 +70,7 @@ const WorkspaceSync: React.FC<WorkspaceSyncProps> = (props) => {
                 hoverStyle={props.personalWorkspaceStatus === WorkspaceStatus.OUTDATED ? 'warn' : 'error'}
                 title={buttonTitle}
             >
-                <WorkspaceSyncIcon
-                    hasProblem={props.personalWorkspaceStatus === WorkspaceStatus.OUTDATED_CONFLICT}
-                    />
+                <WorkspaceSyncIcon />
             </Button>
         </div>
     );