FEATURE: Workspace UI - Add second confirmation window for rebasing #5454
Conversation
pKallert
changed the title
|
Thank you so much that was faaaaaast :D And i think i found a solution for the (too technical) json blob: 
you only see it when you fold it: 
ill push my patch as well ok? |
|
I am going to say that nothing we do here will make this a useful message... |
|
Btw. were does that text blurb come from, because "currently does not exist" implies that it might at another time, or if somehting else happens, but that is not the case? |
and friends come from the constraint checks - the wording currently comes from a time where the cr was more async and when creating a node and child node was not possible without blocking. But yeah nowadays misleading can be done nicer. |
|
|
||
| renderer = afx` | ||
| <Neos.Workspace.Ui:Component.Modal.Rebase | ||
| workspaceName={props.workspaceName} | ||
| workspaceTitle={props.workspaceTitle} | ||
| baseWorkspaceTitle={props.baseWorkspaceTitle} | ||
| conflictInformation={conflictInformation} |
There was a problem hiding this comment.
| conflictInformation={conflictInformation} | |
| conflictInformation={props.conflictInformation} |
| workspaceTitle={workspaceTitle} | ||
| conflictCount={conflictCount} | ||
| /> |
There was a problem hiding this comment.
| workspaceTitle={workspaceTitle} | |
| conflictCount={conflictCount} | |
| /> | |
| workspaceTitle={props.workspaceTitle} | |
| conflictCount={props.conflictCount} | |
| /> |
| format = 'htmx' | ||
| arguments { | ||
| workspaceName = ${workspaceName} | ||
| force = true | ||
| conflictCount = ${Array.length(conflictInformation)} |
There was a problem hiding this comment.
| conflictCount = ${Array.length(conflictInformation)} | |
| conflictCount = ${Array.length(props.conflictInformation)} |
| action = 'rebase' | ||
| format = 'htmx' | ||
| arguments { | ||
| workspaceName = ${workspaceName} |
There was a problem hiding this comment.
| workspaceName = ${workspaceName} | |
| workspaceName = ${props.workspaceName} |
| workspaceTitle = ${workspaceTitle} | ||
| /// string | ||
| baseWorkspaceTitle = ${baseWorkspaceTitle} | ||
| /// array |
There was a problem hiding this comment.
| /// array | |
| /// array{error: string, affectedNode: string, event: string, eventPayload: string} |
As discussed in #5450 the "force rebase" journey is a little bit too harmless for dropping changes.
We discussed restricting the force rebase to editors but that was also not ideal since perhaps editors should not have to have admin permissions.
Changes in this PR:
Checklist
FEATURE|TASK|BUGFIX!!!and have upgrade-instructions