FEATURE: Add workspace Sync button #3665
Conversation
crydotsnake
changed the title
crydotsnake
changed the title
markusguenther
force-pushed
the
feature/workspaceSync
branch
from
da8091f
to
9862564
Compare
|
I replaced the custom Icons with default Up-to-date: Outdated but can be rebased: Conflict: Also, the dialog looks a bit different now. Outdated but can be rebased: Conflict: |
|
I also taking care of the end to end tests. |
|
Is it OK that I additionally mark the workspace as read only, so that users cannot edit content when the workspace is falling in a conflicting state? It makes no sense to be able to edit content when it cannot be used anyway. |
| /** | ||
| * Rebase the user workspace | ||
| */ | ||
| const rebaseWorkspace = (name: string) => createAction(actionTypes.REBASE_WORKSPACE, name); |
There was a problem hiding this comment.
is there no reducer needed for REBASE_WORKSPACE? i guess because its handled via saga?
There was a problem hiding this comment.
The code looks good so far and i also like the icon and gui ❤️
But i noticed some things while testing:
- if changes were made to the currently viewed page and a rebase is excecuted the document must be reloaded (and maybe also the page tree generally?)
- when rebasing there are two spinners which seems odd?
- one can only rebase the user workspace and detect conflicts there. But if the base workspace is a custom workspace and not live and it is outdated or in conflict the ui doesnt tell
| } | ||
|
|
||
| $success = new Success(); | ||
| $success->setMessage(sprintf('Successfully synced User workspace')); |
There was a problem hiding this comment.
Is that something that needs to be localized?
There was a problem hiding this comment.
Indeed will take care later!
There was a problem hiding this comment.
It might be that those messages are not a flashmessage but just show up in the console as debug info in which case translation is irrelevant
There was a problem hiding this comment.
We should probably then also localize all of the other $success->setMessage calls in the Controller to be consistent
|
@mhsdesign the spinner is a known issue but as it reacts on the same states we would need a new state then for the rebase in process 🤷♂️ |
Replaces custom SVG icons with font=awesome icons.
When the workspace has conflicts that cannot be resolved, it does not make sense to be able to edit the content. Therefore, we mark the workspace as read only in this case.
markusguenther
force-pushed
the
feature/workspaceSync
branch
from
bc5ae1d
to
5c590c3
Compare
|
@bwaidelich @mhsdesign Hope that I could fulfil your wishes :), we have now translator labels and an extra remote state and therefore also a reducer, so now the indicator is just for the rebase. |
This will add a rebase button to the UI for rebasing the personal workspace of a user
What I did
I added a button to the Neos UI that shows up if the personal workspace of a user is outdated or in error state.
How I did it
Neos UI when personal workspace is outdated:
Clicking on the button shows popup:
Clicking on "Synchronize now" will rebase the workspace
Neos UI when personal workspace is outdated and in error mode:
Clicking on the button shows popup:
Related: #3803