FEATURE: Workspace UI - Add second confirmation window for rebasing #5454
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
| @@ -1,10 +1,20 @@ | ||||||
| Neos.Workspace.Ui.WorkspaceController.rebase = Neos.Fusion:Component { | ||||||
| /// string | ||||||
| workspaceName = ${workspaceName} | ||||||
| /// string | ||||||
| workspaceTitle = ${workspaceTitle} | ||||||
| /// string | ||||||
| baseWorkspaceTitle = ${baseWorkspaceTitle} | ||||||
| /// array | ||||||
| conflictInformation = ${conflictInformation} | ||||||
|
|
||||||
|
|
||||||
| 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.
Suggested change
|
||||||
| /> | ||||||
| ` | ||||||
| } | ||||||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
| @@ -0,0 +1,16 @@ | ||||||||||||||
| Neos.Workspace.Ui.WorkspaceController.rebaseConfirm = Neos.Fusion:Component { | ||||||||||||||
| /// string | ||||||||||||||
| workspaceName = ${workspaceName} | ||||||||||||||
| /// string | ||||||||||||||
| workspaceTitle = ${workspaceTitle} | ||||||||||||||
| /// int | ||||||||||||||
| conflictCount = ${conflictCount} | ||||||||||||||
|
|
||||||||||||||
| renderer = afx` | ||||||||||||||
| <Neos.Workspace.Ui:Component.Modal.RebaseConfirm | ||||||||||||||
| workspaceName={props.workspaceName} | ||||||||||||||
| workspaceTitle={workspaceTitle} | ||||||||||||||
| conflictCount={conflictCount} | ||||||||||||||
| /> | ||||||||||||||
|
Comment on lines
+12
to
+14
There was a problem hiding this comment.
Suggested change
|
||||||||||||||
| ` | ||||||||||||||
| } | ||||||||||||||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
| @@ -0,0 +1,63 @@ | ||||||
| prototype(Neos.Workspace.Ui:Component.Modal.RebaseConfirm) < prototype(Neos.Fusion:Component) { | ||||||
| /// string | ||||||
| workspaceName = '' | ||||||
| /// string | ||||||
| workspaceTitle = '' | ||||||
| /// int | ||||||
| conflictCount = 0 | ||||||
|
|
||||||
| @private { | ||||||
| i18n = ${I18n.id('').source('Main').package('Neos.Workspace.Ui')} | ||||||
| popoverId = 'workspace-rebase-confirm-modal' | ||||||
| popoverRebaseId = 'workspace-rebase-modal' | ||||||
|
|
||||||
| forceRebaseWorkspaceUri = Neos.Fusion:ActionUri { | ||||||
| action = 'rebase' | ||||||
| format = 'htmx' | ||||||
| arguments { | ||||||
| workspaceName = ${workspaceName} | ||||||
|
There was a problem hiding this comment.
Suggested change
|
||||||
| force = true | ||||||
| } | ||||||
| } | ||||||
| } | ||||||
|
|
||||||
| renderer = afx` | ||||||
| <div popover class="error" id={private.popoverId}> | ||||||
| <header> | ||||||
| <button | ||||||
| type="button" | ||||||
| class="neos-close neos-button" | ||||||
| popovertarget={private.popoverId} | ||||||
| popovertargetaction="close" | ||||||
| > | ||||||
| <Neos.Workspace.Ui:Component.Icon icon="times"/> | ||||||
| </button> | ||||||
| <div class="neos-header"> | ||||||
| <i class="fas fa-exclamation-triangle"></i> {private.i18n.id('workspaces.dialog.ConfirmationDropConflictingChanges').arguments([props.workspaceTitle])} | ||||||
| </div> | ||||||
| </header> | ||||||
| <section> | ||||||
| <p>{private.i18n.id('workspaces.dialog.ConfirmationDropConflictingChangesCount').arguments([props.conflictCount])}</p> | ||||||
| <p>{private.i18n.id('workspaces.dialog.ConfirmationDropConflictingChangesText')}</p> | ||||||
| </section> | ||||||
| <footer> | ||||||
| <button | ||||||
| type="button" | ||||||
| class="neos-button" | ||||||
| popovertarget={private.popoverRebaseId} | ||||||
| popovertargetaction="close" | ||||||
| > | ||||||
| {private.i18n.id('cancel')} | ||||||
| </button> | ||||||
| <Neos.Workspace.Ui:Component.Button | ||||||
| isDanger | ||||||
| label={private.i18n.id('workspaces.modal.yesRebaseWorkspace')} | ||||||
| attributes.hx-get={private.forceRebaseWorkspaceUri} | ||||||
| attributes.hx-target="#workspace-module-content" | ||||||
| attributes.hx-swap="outerHTML" | ||||||
| attributes.hx-on--after-request={'document.getElementById("' + private.popoverRebaseId + '").hidePopover()'} | ||||||
| /> | ||||||
| </footer> | ||||||
| </div> | ||||||
| ` | ||||||
| } | ||||||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -175,10 +175,37 @@ | |
| <source>This will delete the workspace including all unpublished content. This operation cannot be undone.</source> | ||
| </trans-unit> | ||
| <trans-unit id="workspaces.dialog.forceSyncWorkspace" xml:space="preserve"> | ||
| <source>Conflicts between workspace "{0}" and "{1}"</source> | ||
| </trans-unit> | ||
| <trans-unit id="workspaces.dialog.ShowInformationAboutConflict" xml:space="preserve"> | ||
| <source>Show information about {0} conflict(s)</source> | ||
| </trans-unit> | ||
| <trans-unit id="workspaces.dialog.thisCanLeadToLostChanges" xml:space="preserve"> | ||
| <source>Workspace "{0}" contains modifications that are in conflict with the changes in workspace "{1}".</source> | ||
| </trans-unit> | ||
| <trans-unit id="workspaces.dialog.thisCanLeadToLostChangesConfirmation" xml:space="preserve"> | ||
| <source>Do you want to drop {0} conflicting change(s)?</source> | ||
| </trans-unit> | ||
| <trans-unit id="workspaces.dialog.ConfirmationDropConflictingChanges" xml:space="preserve"> | ||
| <source>Do you really want to drop all conflicting changes from workspace "{0}"?</source> | ||
| </trans-unit> | ||
| <trans-unit id="workspaces.dialog.ConfirmationDropConflictingChangesCount" xml:space="preserve"> | ||
| <source>This will remove {0} change(s) from the workspace.</source> | ||
| </trans-unit> | ||
| <trans-unit id="workspaces.dialog.ConfirmationDropConflictingChangesText" xml:space="preserve"> | ||
| <source>This can not be undone! Do you wish to proceed?</source> | ||
| </trans-unit> | ||
| <trans-unit id="workspaces.dialog.rebase.error" xml:space="preserve"> | ||
| <source>Error</source> | ||
| </trans-unit> | ||
| <trans-unit id="workspaces.dialog.rebase.node" xml:space="preserve"> | ||
| <source>Node</source> | ||
| </trans-unit> | ||
| <trans-unit id="workspaces.dialog.rebase.event" xml:space="preserve"> | ||
| <source>Event</source> | ||
| </trans-unit> | ||
| <trans-unit id="workspaces.dialog.rebase.eventDetails" xml:space="preserve"> | ||
| <source>Event details</source> | ||
| </trans-unit> | ||
| <trans-unit id="workspaces.modal.yesRebaseWorkspace" xml:space="preserve"> | ||
| <source>Yes, drop changes</source> | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -193,6 +193,25 @@ button .icon:not(:last-child) { | |
| justify-content: flex-end; | ||
| } | ||
|
|
||
| [popover].error { | ||
| border: 1px solid var(--warning); | ||
| } | ||
|
|
||
| [popover].error .neos-header i { | ||
| color: var(--orange); | ||
| } | ||
| [popover].error p { | ||
| margin: var(--defaultMargin) 0; | ||
| } | ||
| [popover]#workspace-rebase-modal{ | ||
| width: 50vw; | ||
| } | ||
| [popover] details[open] { | ||
| max-height: 50vh; | ||
| overflow: auto; | ||
| max-width: max-content; | ||
| } | ||
|
|
||
| /** | ||
| * Form styles | ||
| */ | ||
|
|
||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.