Merge pull request #790 from blesildaramirez/i10444

pkp/pkp-lib#10444 [OPS] Improve dialog component design
pkp · Nov 17, 2024 · 73a8259 · 73a8259
2 parents 7b3aa8e + e3b7cf0
commit 73a8259
Show file tree

Hide file tree

Showing 8 changed files with 10 additions and 11 deletions.
diff --git a/controllers/grid/preprintGalleys/PreprintGalleyGridHandler.php b/controllers/grid/preprintGalleys/PreprintGalleyGridHandler.php
@@ -157,7 +157,6 @@ public function initialize($request, $args = null)
                 new AjaxModal(
                     $request->getRouter()->url($request, null, null, 'addGalley', null, $this->getRequestArgs()),
                     __('common.addFile'),
-                    'modal_add_item'
                 ),
                 __('common.addFile'),
                 'add_item'

diff --git a/controllers/grid/preprintGalleys/PreprintGalleyGridRow.php b/controllers/grid/preprintGalleys/PreprintGalleyGridRow.php
@@ -80,7 +80,6 @@ public function initialize($request, $template = null)
                 new AjaxModal(
                     $router->url($request, null, null, 'editGalley', null, $actionArgs),
                     ($this->_isEditable) ? __('submission.layout.editGalley') : __('submission.layout.viewGalley'),
-                    'modal_edit'
                 ),
                 ($this->_isEditable) ? __('grid.action.edit') : __('grid.action.view'),
                 'edit'
@@ -108,7 +107,7 @@ public function initialize($request, $template = null)
                         __('common.confirmDelete'),
                         __('grid.action.delete'),
                         $router->url($request, null, null, 'deleteGalley', null, $actionArgs),
-                        'modal_delete'
+                        'negative'
                     ),
                     __('grid.action.delete'),
                     'delete'

diff --git a/controllers/grid/settings/sections/SectionGridCellProvider.php b/controllers/grid/settings/sections/SectionGridCellProvider.php
@@ -69,7 +69,8 @@ public function getCellActions($request, $row, $column, $position = GridHandler:
                                 'activateSection',
                                 null,
                                 ['sectionKey' => $row->getId()]
-                            )
+                            ),
+                            'primary'
                         )
                     )];
                 } else {
@@ -86,7 +87,8 @@ public function getCellActions($request, $row, $column, $position = GridHandler:
                                 'deactivateSection',
                                 null,
                                 ['sectionKey' => $row->getId()]
-                            )
+                            ),
+                            'negative'
                         )
                     )];
                 }

diff --git a/controllers/grid/settings/sections/SectionGridHandler.php b/controllers/grid/settings/sections/SectionGridHandler.php
@@ -105,7 +105,6 @@ public function initialize($request, $args = null)
                 new AjaxModal(
                     $router->url($request, null, null, 'addSection', null, ['gridId' => $this->getId()]),
                     __('manager.sections.create'),
-                    'modal_manage'
                 ),
                 __('manager.sections.create'),
                 'add_section'

diff --git a/controllers/grid/settings/sections/SectionGridRow.php b/controllers/grid/settings/sections/SectionGridRow.php
@@ -46,7 +46,7 @@ public function initialize($request, $template = null)
                     new AjaxModal(
                         $router->url($request, null, null, 'editSection', null, ['sectionId' => $sectionId]),
                         __('grid.action.edit'),
-                        'modal_edit',
+                        null,
                         true
                     ),
                     __('grid.action.edit'),
@@ -62,7 +62,7 @@ public function initialize($request, $template = null)
                         __('manager.sections.confirmDelete'),
                         __('grid.action.delete'),
                         $router->url($request, null, null, 'deleteSection', null, ['sectionId' => $sectionId]),
-                        'modal_delete'
+                        'negative'
                     ),
                     __('grid.action.delete'),
                     'delete'

diff --git a/lib/pkp b/lib/pkp
diff --git a/lib/ui-library b/lib/ui-library
diff --git a/plugins/generic/customBlockManager b/plugins/generic/customBlockManager
+441 −1		api/v1/reviews/PKPReviewController.php
+15 −7		classes/announcement/Announcement.php
+0 −1		classes/controllers/grid/plugins/PluginGridHandler.php
+0 −1		classes/controllers/grid/users/reviewer/PKPReviewerGridHandler.php
+30 −54		classes/core/EntityDAO.php
+21 −0		classes/core/PKPString.php
+76 −66		classes/core/SettingsBuilder.php
+127 −0		classes/core/traits/EntityUpdate.php
+2 −0		classes/form/FormBuilderVocabulary.php
+3 −3		classes/linkAction/request/AjaxModal.php
+3 −4		classes/linkAction/request/ConfirmationModal.php
+3 −4		classes/linkAction/request/JsEventConfirmationModal.php
+8 −8		classes/linkAction/request/Modal.php
+3 −4		classes/linkAction/request/RedirectConfirmationModal.php
+3 −4		classes/linkAction/request/RemoteActionConfirmationModal.php
+39 −29		classes/notification/PKPNotificationManager.php
+3 −3		classes/notification/managerDelegate/PKPApproveSubmissionNotificationManager.php
+4 −4		classes/notification/managerDelegate/SubmissionNotificationManager.php
+1 −1		classes/plugins/PKPPubIdPlugin.php
+2 −2		classes/services/PKPSchemaService.php
+2 −2		classes/submission/reviewer/form/PKPReviewerReviewStep1Form.php
+1 −0		composer.json
+547 −424		composer.lock
+0 −1		controllers/api/file/linkAction/BaseAddFileLinkAction.php
+1 −1		controllers/api/file/linkAction/DeleteFileLinkAction.php
+0 −1		controllers/api/file/linkAction/EditFileLinkAction.php
+0 −1		controllers/api/task/SendReminderLinkAction.php
+0 −1		controllers/api/task/SendThankYouLinkAction.php
+1 −1		controllers/confirmationModal/linkAction/ViewCompetingInterestGuidelinesLinkAction.php
+1 −1		controllers/confirmationModal/linkAction/ViewReviewGuidelinesLinkAction.php
+1 −1		controllers/grid/admin/context/ContextGridHandler.php
+4 −3		controllers/grid/admin/context/ContextGridRow.php
+1 −1		controllers/grid/announcements/AnnouncementTypeGridHandler.php
+2 −2		controllers/grid/announcements/AnnouncementTypeGridRow.php
+0 −1		controllers/grid/eventLog/linkAction/EmailLinkAction.php
+0 −1		controllers/grid/files/LibraryFileGridHandler.php
+1 −2		controllers/grid/files/LibraryFileGridRow.php
+0 −1		controllers/grid/files/fileList/linkAction/SelectFilesLinkAction.php
+0 −2		controllers/grid/files/submissionDocuments/SubmissionDocumentsFilesGridHandler.php
+4 −2		controllers/grid/languages/LanguageGridCellProvider.php
+4 −2		controllers/grid/languages/LanguageGridRow.php
+1 −1		controllers/grid/navigationMenus/NavigationMenuItemsGridHandler.php
+2 −2		controllers/grid/navigationMenus/NavigationMenuItemsGridRow.php
+1 −1		controllers/grid/navigationMenus/NavigationMenusGridHandler.php
+2 −2		controllers/grid/navigationMenus/NavigationMenusGridRow.php
+1 −1		controllers/grid/plugins/PluginGalleryGridCellProvider.php
+1 −1		controllers/grid/plugins/PluginGalleryGridHandler.php
+2 −1		controllers/grid/plugins/PluginGridCellProvider.php
+1 −2		controllers/grid/plugins/PluginGridRow.php
+1 −3		controllers/grid/queries/QueriesGridHandler.php
+1 −2		controllers/grid/queries/QueriesGridRow.php
+1 −1		controllers/grid/queries/QueryNotesGridRow.php
+0 −1		controllers/grid/queries/QueryTitleGridColumn.php
+0 −1		controllers/grid/settings/category/CategoryCategoryGridHandler.php
+1 −2		controllers/grid/settings/category/CategoryGridCategoryRow.php
+3 −2		controllers/grid/settings/category/CategoryGridRow.php
+2 −2		controllers/grid/settings/genre/GenreGridHandler.php
+2 −2		controllers/grid/settings/genre/GenreGridRow.php
+3 −2		controllers/grid/settings/reviewForms/ReviewFormElementGridRow.php
+1 −1		controllers/grid/settings/reviewForms/ReviewFormElementsGridHandler.php
+4 −2		controllers/grid/settings/reviewForms/ReviewFormGridCellProvider.php
+1 −1		controllers/grid/settings/reviewForms/ReviewFormGridHandler.php
+6 −4		controllers/grid/settings/reviewForms/ReviewFormGridRow.php
+0 −1		controllers/grid/settings/roles/UserGroupGridHandler.php
+2 −2		controllers/grid/settings/roles/UserGroupGridRow.php
+1 −1		controllers/grid/settings/user/UserGridHandler.php
+9 −8		controllers/grid/settings/user/UserGridRow.php
+0 −1		controllers/grid/users/author/AuthorGridHandler.php
+2 −3		controllers/grid/users/author/AuthorGridRow.php
+2 −1		controllers/grid/users/exportableUsers/ExportableUsersGridHandler.php
+2 −9		controllers/grid/users/reviewer/ReviewerGridRow.php
+0 −1		controllers/grid/users/stageParticipant/StageParticipantGridHandler.php
+3 −3		controllers/grid/users/stageParticipant/StageParticipantGridRow.php
+0 −1		controllers/grid/users/stageParticipant/linkAction/NotifyLinkAction.php
+0 −1		controllers/informationCenter/linkAction/FileInfoCenterLinkAction.php
+0 −1		controllers/modals/review/ReviewerViewMetadataLinkAction.php
+0 −1		controllers/review/linkAction/ReviewNotesLinkAction.php
+1 −1		controllers/review/linkAction/UnconsiderReviewLinkAction.php
+2 −1		controllers/wizard/fileUpload/form/PKPSubmissionFilesUploadBaseForm.php
+1 −1		cypress/support/commands.js
+1 −1		cypress/support/commands_new_workflow.js
+1 −1		cypress/tests/integration/NativeXmlImportExportSubmission.cy.js
+4 −2		js/controllers/modal/ConfirmationModalHandler.js
+3 −0		locale/en/api.po
+9 −0		locale/en/editor.po
+0 −1		templates/authorDashboard/submissionEmails.tpl
+44 −12		templates/controllers/grid/users/reviewer/readReview.tpl
+132 −0		templates/controllers/grid/users/reviewer/reviewDownload.tpl
+1 −1		templates/controllers/informationCenter/note.tpl
+3 −1		templates/form/formButtons.tpl
+3 −2		templates/linkAction/buttonConfirmationLinkAction.tpl
+1 −1		templates/reviewer/review/step3.tpl
+1 −1		templates/user/identityForm.tpl
+52 −44		xml/oai2.xsl
+1 −0		src/components/ActionPanel/ActionPanel.stories.js
+1 −0		src/components/Composer/Composer.vue
+2 −0		src/components/Container/Container.vue
+2 −0		src/components/Container/DecisionPage.vue
+4 −1		src/components/Container/ManageEmailsPage.vue
+2 −0		src/components/Container/SubmissionWizardPage.vue
+4 −2		src/components/Container/WorkflowPage.vue
+1 −0		src/components/Form/context/NotifyUsersForm.vue
+3 −2		src/components/Form/fields/FieldOrcid.vue
+2 −1		src/components/Form/fields/FieldShowEnsuringLink.vue
+2 −2		src/components/ListPanel/announcements/AnnouncementsListPanel.vue
+1 −0		src/components/ListPanel/contributors/ContributorsListPanel.vue
+2 −1		src/components/ListPanel/doi/DoiListItem.vue
+2 −1		src/components/ListPanel/doi/DoiListPanel.vue
+2 −2		src/components/ListPanel/highlights/HighlightsListPanel.vue
+2 −2		src/components/ListPanel/institutions/InstitutionsListPanel.vue
+2 −2		src/components/ListPanel/submissionFiles/SubmissionFilesListPanel.vue
+2 −2		src/components/ListPanel/submissions/SubmissionsListItem.vue
+9 −0		src/components/Modal/Dialog.mdx
+150 −0		src/components/Modal/Dialog.stories.js
+78 −25		src/components/Modal/Dialog.vue
+1 −117		src/components/Modal/Modal.vue
+1 −0		src/composables/useModal.mdx
+8 −7		src/managers/FileManager/useFileManagerActions.js
+9 −8		src/managers/GalleyManager/useGalleyManagerActions.js
+16 −14		src/managers/ParticipantManager/useParticipantManagerActions.js
+91 −0		src/managers/ReviewerManager/ReviewerManagerReadReviewModal.vue
+16 −14		src/managers/ReviewerManager/useReviewerManagerActions.js
+3 −2		src/managers/UserInvitationManager/UserInvitationManagerStore.js
+1 −0		src/mixins/ajaxError.js
+1 −0		src/mixins/autosave.js
+3 −1		src/mixins/dialog.mdx
+3 −0		src/pages/acceptInvitation/AcceptInvitationPageStore.js
+2 −0		src/pages/userInvitation/UserInvitationPageStore.js
+1 −0		src/pages/userInvitation/UserInvitationUserGroupsTable.vue
+1 −0		src/pages/workflow/components/publication/WorkflowPublicationJats.vue
+1 −0		src/pages/workflow/components/publication/WorkflowPublicationSectionJats.vue
+6 −3		src/pages/workflow/composables/useWorkflowActions.js
+1 −0		src/stores/modalStore.js
+1 −1		CustomBlockManagerPlugin.php
+0 −1		controllers/grid/CustomBlockGridHandler.php
+2 −2		controllers/grid/CustomBlockGridRow.php
+5 −6		cypress/tests/functional/CustomBlocks.cy.js