Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

IBX-6279: Simplify actions in create and edit modes #862

Merged
merged 40 commits into from
Sep 26, 2023
Merged

IBX-6279: Simplify actions in create and edit modes #862

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
40 commits
Select commit Hold shift + click to select a range
644ee5f
IBX-6279: Simplify actions in create and edit modes
tischsoic Sep 8, 2023
b3c7168
context menu in Content Type create/edit
tischsoic Aug 17, 2023
bd45756
sections menus
tischsoic Aug 18, 2023
2619e13
obj state groups and obj state menus
tischsoic Aug 18, 2023
d7b0a64
fix cotent type menu
tischsoic Aug 24, 2023
3bf9cec
URL (Link Manager) & URL Wildcard
tischsoic Aug 28, 2023
f8d9208
Policy & Role, RoleAssignment
tischsoic Aug 28, 2023
fe35431
fix RoleController
tischsoic Aug 28, 2023
ff210e6
Language
tischsoic Aug 28, 2023
6ab5dca
ContentTypeGroup
tischsoic Aug 28, 2023
79638b7
tests fix
tischsoic Aug 30, 2023
a2708ae
Adjusting Behat - test 1
tischsoic Aug 31, 2023
a0e5dbc
fix-cs; phpstan
tischsoic Sep 5, 2023
d033917
Fixed tests
mnocon Sep 6, 2023
d684172
More fixes
mnocon Sep 7, 2023
ee6f047
TMP
mnocon Sep 7, 2023
a97cd30
Fixes
mnocon Sep 7, 2023
86f339d
Fix
mnocon Sep 7, 2023
97bffe7
Fix
mnocon Sep 7, 2023
8a8fa75
Fixes
mnocon Sep 7, 2023
56edaf8
generated translations only
tischsoic Sep 8, 2023
9ec09ff
fix missing save_and_close button in role create form
tischsoic Sep 8, 2023
9fb0c10
fix phpstan on this branch
tischsoic Sep 9, 2023
9632a1a
delete close_href
tischsoic Sep 10, 2023
897955f
Removed the close button
mnocon Sep 11, 2023
bd26d2c
fix rendering context menu items extra widgets
tischsoic Sep 12, 2023
0f41b07
Brought back Roles feature
mnocon Sep 14, 2023
c190332
after CR
tischsoic Sep 20, 2023
1ed6c87
after CR 2
tischsoic Sep 20, 2023
b6a3423
drop ezplatform. from new lang keys
tischsoic Sep 20, 2023
b9a0528
fix-cs
tischsoic Sep 20, 2023
d0f62c8
Roles fixes
mnocon Sep 21, 2023
e2056b1
Fixes for Roles
mnocon Sep 21, 2023
0ee2922
fix context menu
tischsoic Sep 25, 2023
c29f917
fix visible publishAndEdit and saveDraftAndClose buttons in COTF
tischsoic Sep 25, 2023
5635e58
Add save and close button in create view context menu
tischsoic Sep 26, 2023
a547cb8
fix translations
tischsoic Sep 26, 2023
6ec0301
[Behat] Added Autosave create Scenario
mnocon Sep 26, 2023
aef4871
Fixed executed action
mnocon Sep 26, 2023
94f914b
Fixed fields
mnocon Sep 26, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion features/personas/ChangePassword.feature
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ Feature: Verify that an User allowed to change password can change his password
And I switch to "My account settings" tab in User settings
And I click on the change password button
And I change password from "Passw0rd-42" to "Passw0rd-43"
And I click on the edit action bar button "Update"
And I perform the "Update" action
Then success notification that "Your password has been successfully changed." appears
And I should be on Dashboard page

Expand Down
8 changes: 4 additions & 4 deletions features/personas/SubtreeEditor.feature
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ Feature: Verify that an Editor with Subtree limitations can perform all his task
| label | value |
| Name | <contentName> |
| Short name | <contentName> |
When I click on the edit action bar button "Publish"
When I perform the "Publish" action
Then success notification that "Content published." appears
And I should be on Content view Page for "<newContentPath>/<contentName>"

Expand All @@ -25,12 +25,12 @@ Feature: Verify that an Editor with Subtree limitations can perform all his task

Scenario Outline: I can edit Content in locations I'm allowed
Given I navigate to content "<contentName>" of type "DedicatedFolder" in "<contentPath>"
When I click on the edit action bar button "Edit"
When I perform the "Edit" action
And I set content fields
| label | value |
| Name | <newFieldValue> |
| Short name | <newFieldValue> |
And I click on the edit action bar button "Publish"
And I perform the "Publish" action
Then success notification that "Content published." appears
And I should be on Content view Page for "<parentContentPath>/<newFieldValue>"
And content attributes equal
Expand All @@ -50,7 +50,7 @@ Feature: Verify that an Editor with Subtree limitations can perform all his task

Scenario: I can move Content in locations I'm allowed
Given I navigate to content "ContentToMove" of type "DedicatedFolder" in "root/FolderGrandParent/FolderParent/FolderChild1"
When I click on the edit action bar button "Move"
When I perform the "Move" action
And I select content "root/FolderGrandParent/FolderParent" through UDW
And I confirm the selection in UDW
Then success notification that "'ContentToMove' moved to 'FolderParent'" appears
Expand Down
19 changes: 16 additions & 3 deletions features/standard/Autosave.feature
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ Feature: Content Items creation
| Title | Test Article Autosave draft |
| Short title | Test Article Autosave draft |
And I wait for Content Item to be autosaved
And I click on the close button
And I open the "Dashboard" page in admin SiteAccess
Then there's draft "Test Article Autosave draft" on Dashboard list

Expand All @@ -39,14 +38,28 @@ Feature: Content Items creation
And I'm on Content view Page for root
And I go to user settings
And I disable autosave
And I click on the edit action bar button "Save"
And I perform the "Save" action
And I'm on Content view Page for root
When I start creating a new content "Article"
And I set content fields
| label | value |
| Title | Test Article Autosave Off draft |
| Short title | Test Article Autosave Off draft |
And I check if "Autosave is off" notification is displayed
And I click on the close button
And I open the "Dashboard" page in admin SiteAccess
Then there's no draft "Test Article Autosave Off draft" on Dashboard list

@javascript
Scenario: Content item can be created when autosave is off
Given I open Login page in admin SiteAccess
And I log in as "AutosaveDisabledTestUser" with password "Passw0rd-42"
And I'm on Content view Page for root
When I start creating a new content "Article"
And I set content fields
| label | value |
| Title | TestAutosaveCreate |
| Short title | TestAutosaveCreate |
| Intro | TestAutosaveCreate |
And I perform the "Publish" action
Then success notification that "Content published." appears
And I should be on Content view Page for "TestAutosaveCreate"
20 changes: 10 additions & 10 deletions features/standard/ContentDraft.feature
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ Feature: Content items creation
| label | value |
| Title | Test Article draft |
| Short title | Test Article draft |
And I click on the edit action bar button "Save"
And I perform the "Save" action from the "Save and close" group
Then success notification that "Content draft saved." appears
And I should be on Content update page for "Test Article draft"
And I open the "Dashboard" page in admin SiteAccess
Expand All @@ -29,7 +29,7 @@ Feature: Content items creation
And I open the "Dashboard" page in admin SiteAccess
And there's draft "TestDraft" on Dashboard list
When I start editing content draft "TestDraft"
And I click on the edit action bar button "Delete draft"
And I perform the "Delete draft" action
Then I should be on Content view Page for root
And I open the "Dashboard" page in admin SiteAccess
And there's no draft "TestDraft" on Dashboard list
Expand All @@ -43,9 +43,9 @@ Feature: Content items creation
| Title | TestArticleSavePublish |
| Short title | TestArticleSavePublish |
| Intro | TestArticleIntro |
When I click on the edit action bar button "Save"
When I perform the "Save" action from the "Save and close" group
And I should be on Content update page for "TestArticleSavePublish"
And I click on the edit action bar button "Publish"
And I perform the "Publish" action
Then success notification that "Content published." appears
And I should be on Content view Page for "TestArticleSavePublish"

Expand All @@ -58,8 +58,8 @@ Feature: Content items creation
And there's draft "TestDraftDashboardEdit" on Dashboard list
And I start editing content draft "TestDraftDashboardEdit"
And I should be on Content update page for "TestDraftDashboardEdit"
When I click on the close button
And I should be on Content view Page for root
When I perform the "Delete draft" action
Then I should be on Content view Page for root

@javascript @APIUser:admin
Scenario: Content draft can be created and published through draft list modal
Expand All @@ -70,13 +70,13 @@ Feature: Content items creation
| title | short_title |
| ContentDraftConflictVersion1 | ContentDraftConflictVersion2 |
And I'm on Content view Page for "ContentDraftConflict"
When I click on the edit action bar button "Edit"
When I perform the "Edit" action
And I start creating new draft from draft conflict modal
And I set content fields
| label | value |
| Title | ContentDraftConflictVersion2 |
| Short title | ContentDraftConflictVersion2 |
And I click on the edit action bar button "Publish"
And I perform the "Publish" action
Then success notification that "Content published." appears
And I should be on Content view Page for ContentDraftConflictVersion2
And content attributes equal
Expand All @@ -93,12 +93,12 @@ Feature: Content items creation
| title | short_title |
| ContentDraftConflictFromTheListVersion2 | ContentDraftConflictFromTheListVersion2 |
And I'm on Content view Page for "ContentDraftConflictFromTheList"
When I click on the edit action bar button "Edit"
When I perform the "Edit" action
And I start editing draft with version number "2" from draft conflict modal
And I set content fields
| label | value |
| Intro | ContentDraftConflictFromTheListVersion2Edited |
And I click on the edit action bar button "Publish"
And I perform the "Publish" action
Then success notification that "Content published." appears
And I should be on Content view Page for ContentDraftConflictFromTheListVersion2
And content attributes equal
Expand Down
12 changes: 6 additions & 6 deletions features/standard/ContentManagement.feature
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ Scenario: Content moving can be cancelled
| ContentManagement | ContentManagement | root | eng-GB |
| FolderToCancelMove | FolderToCancelMove | ContentManagement | eng-GB |
And I'm on Content view Page for "ContentManagement/FolderToCancelMove"
When I click on the edit action bar button "Move"
When I perform the "Move" action
And I select content "Media" through UDW
And I close the UDW window
Then I should be on Content view Page for "ContentManagement/FolderToCancelMove"
Expand All @@ -26,7 +26,7 @@ Scenario: Content can be moved
| ContentManagement | ContentManagement | root | eng-GB |
| FolderToMove | FolderToMove | ContentManagement | eng-GB |
And I'm on Content view Page for "ContentManagement/FolderToMove"
When I click on the edit action bar button "Move"
When I perform the "Move" action
And I select content "Media/Files" through UDW
And I confirm the selection in UDW
Then success notification that "'FolderToMove' moved to 'Files'" appears
Expand All @@ -41,7 +41,7 @@ Scenario: Content copying can be cancelled
| ContentManagement | ContentManagement | root | eng-GB |
| FolderToCopyCancel | FolderToCopyCancel | ContentManagement | eng-GB |
And I'm on Content view Page for "ContentManagement/FolderToCopyCancel"
When I click on the edit action bar button "Copy"
When I perform the "Copy" action
And I select content "Media" through UDW
And I close the UDW window
Then I should be on Content view Page for "ContentManagement/FolderToCopyCancel"
Expand All @@ -53,7 +53,7 @@ Scenario: Content can be copied
| ContentManagement | ContentManagement | root | eng-GB |
| FolderToCopy | FolderToCopy | ContentManagement | eng-GB |
And I'm on Content view Page for "ContentManagement/FolderToCopy"
When I click on the edit action bar button "Copy"
When I perform the "Copy" action
And I select content "Media/Files" through UDW
And I confirm the selection in UDW
Then success notification that "'FolderToCopy' copied to 'Files'" appears
Expand All @@ -68,7 +68,7 @@ Scenario: Content can be copied
| ContentManagement | ContentManagement | root | eng-GB |
| FolderToSubtreeCopyCancel | FolderToSubtreeCopyCancel | ContentManagement | eng-GB |
And I'm on Content view Page for "ContentManagement/FolderToSubtreeCopyCancel"
When I click on the edit action bar button "Copy Subtree"
When I perform the "Copy Subtree" action
And I select content "Media" through UDW
And I close the UDW window
Then I should be on Content view Page for "ContentManagement/FolderToSubtreeCopyCancel"
Expand All @@ -80,7 +80,7 @@ Scenario: Content can be copied
| ContentManagement | ContentManagement | root | eng-GB |
| FolderToSubtreeCopy | FolderToSubtreeCopy | ContentManagement | eng-GB |
And I'm on Content view Page for "ContentManagement/FolderToSubtreeCopy"
When I click on the edit action bar button "Copy Subtree"
When I perform the "Copy Subtree" action
And I select content "Media" through UDW
And I confirm the selection in UDW
Then success notification that "Subtree 'FolderToSubtreeCopy' copied to Location 'Media'" appears
Expand Down
2 changes: 1 addition & 1 deletion features/standard/ContentPreview.feature
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ Feature: Content Item preview
And I set content fields
| label | value |
| Name | Test Name |
And I click on the edit action bar button "Preview"
And I perform the "Preview" action
And I go to "tablet" preview
And I go to "mobile" preview
And I go to "desktop" preview
Expand Down
4 changes: 2 additions & 2 deletions features/standard/ContentTranslation.feature
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ Feature: Content item transation
| label | value |
| Name | FrenchPublished |
| Short name | FrenchPublished |
And I click on the edit action bar button "Publish"
And I perform the "Publish" action
Then success notification that "Content published." appears
And content attributes equal
| label | value |
Expand All @@ -39,7 +39,7 @@ Feature: Content item transation
And I'm on Content view Page for "NoBasePublished"
When I switch to "Translations" tab in Content structure
And I add new translation "French" without base translation
And I click on the edit action bar button "Publish"
And I perform the "Publish" action
Then success notification that "Content published." appears
And content attributes equal
| label | value |
Expand Down
8 changes: 4 additions & 4 deletions features/standard/ContentType.feature
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ Feature: Content types management
| label | value |
| Name | Test Content Type |
| Identifier | TestContentTypeIdentifier |
And I click on the edit action bar button "Cancel"
And I perform the "Discard" action
Then I should be on Content Type group page for "Content" group
And there's no "Test Content Type" on Content Types list

Expand All @@ -31,7 +31,7 @@ Feature: Content types management
And I select "Content" category to Content Type definition
And I add field "Country" to Content Type definition
And I set "Name" to "Country field" for "Country" field
And I click on the edit action bar button "Create"
And I perform the "Save and close" action
Then notification that "Content Type" "New Content Type" is updated appears
Then I should be on Content Type page for "Test Content Type"
And Content Type has proper Global properties
Expand All @@ -54,7 +54,7 @@ Feature: Content types management
And I set fields
| label | value |
| Name | Test Content Type edited |
And I click on the edit action bar button "Cancel"
And I perform the "Delete draft" action
Then I should be on Content Type group page for "Content" group
And there's a "TestDiscard CT" on Content Types list
And there's no "Test Content Type edited" on Content Types list
Expand All @@ -71,7 +71,7 @@ Feature: Content types management
| Name | Test Content Type edited |
And I add field "Date" to Content Type definition
And I set "Name" to "DateField" for "Date" field
And I click on the edit action bar button "Save"
And I perform the "Save and close" action
Then success notification that "Content Type 'TestEdit CT' updated." appears
Then I should be on Content Type page for "Test Content Type edited"
And Content Type has proper Global properties
Expand Down
8 changes: 4 additions & 4 deletions features/standard/ContentTypeGroup.feature
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ Feature: Content type groups management
And I set fields
| label | value |
| Name | Test Content Type Group |
And I click on the edit action bar button "Discard changes"
And I perform the "Discard" action
Then I should be on "Content Type groups" page
And there's no "Test Content Type Group" Content Type group on Content Type groups list

Expand All @@ -25,7 +25,7 @@ Feature: Content type groups management
And I set fields
| label | value |
| Name | Test Content Type Group |
And I click on the edit action bar button "Create"
And I perform the "Save and close" action
Then I should be on Content Type group page for "Test Content Type Group" group
And there're no Content Types for that group

Expand All @@ -37,7 +37,7 @@ Feature: Content type groups management
And I set fields
| label | value |
| Name | Test Content Type Group edited |
And I click on the edit action bar button "Discard changes"
And I perform the "Discard changes" action
Then I should be on "Content Type groups" page
And there's a "Test Content Type Group" Content Type group on Content Type groups list
And there's no "Test Content Type Group edited" Content Type group on Content Type groups list
Expand All @@ -50,7 +50,7 @@ Feature: Content type groups management
And I set fields
| label | value |
| Name | Test Content Type Group edited |
And I click on the edit action bar button "Save"
And I perform the "Save and close" action
Then I should be on Content Type group page for "Test Content Type Group edited" group
And success notification that "Updated Content Type group 'Test Content Type Group'." appears

Expand Down
18 changes: 9 additions & 9 deletions features/standard/Languages.feature
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,36 +10,36 @@ Feature: Languages management

@javascript
Scenario: Changes can be discarded while creating new Language
When I click on the edit action bar button "Add language"
When I perform the "Add language" action
And I set fields
| label | value |
| Name | Deutsch |
| Language code | de-DE |
And I click on the edit action bar button "Cancel"
And I perform the "Discard" action
Then I should be on "Languages" page
And there's no "Deutsch" Language on Languages list

@javascript
Scenario: New Language can be added
When I click on the edit action bar button "Add language"
When I perform the "Add language" action
And I set fields
| label | value |
| Name | Deutsch |
| Language code | de-DE |
And I click on the edit action bar button "Add"
And I perform the "Save and close" action
Then I should be on "Deutsch" Language page
And Language has proper attributes
| Name | Language code | Enabled |
| Deutsch | de-DE | true |

@javascript
Scenario: New Language with existing language code cannot be added
When I click on the edit action bar button "Add language"
When I perform the "Add language" action
And I set fields
| label | value |
| Name | Deutsch Second |
| Language code | de-DE |
And I click on the edit action bar button "Add"
And I perform the "Save and close" action
Then error notification that "language with the specified language code already exists" appears

@javascript
Expand All @@ -49,7 +49,7 @@ Feature: Languages management
And I set fields
| label | value |
| Name | Edited Deutsch |
And I click on the edit action bar button "Discard changes"
And I perform the "Discard changes" action
Then I should be on "Languages" page
And there's a "Deutsch" Language on Languages list
And there's no "Edited Deutsch" Language on Languages list
Expand All @@ -62,7 +62,7 @@ Feature: Languages management
| label | value |
| Name | Edited Deutsch |
| Enabled | false |
And I click on the edit action bar button "Save"
And I perform the "Save and close" action
Then I should be on "Edited Deutsch" Language page
And notification that "Language" "Deutsch" is updated appears
And Language has proper attributes
Expand All @@ -79,7 +79,7 @@ Feature: Languages management
And I set fields
| label | value |
| Enabled | true |
And I click on the edit action bar button "Save"
And I perform the "Save and close" action
Then I should be on "Edited Deutsch" Language page
And notification that "Language" "Edited Deutsch" is updated appears
And Language has proper attributes
Expand Down
2 changes: 1 addition & 1 deletion features/standard/MyDrafts.feature
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,5 +22,5 @@ Feature: My Drafts
| Title | TestMyDraftSavePublish |
| Short title | TestMyDraftSavePublish |
| Intro | TestMyDraftIntro |
And I click on the edit action bar button "Save"
And I perform the "Save" action from the "Save and close" group
Then I should be on Content update page for "TestMyDraftSavePublish"
Loading
Loading