From ac67a6df07609b7c1ec83798e936ec3924bf10e6 Mon Sep 17 00:00:00 2001 From: Ovidijus Narkevicius Date: Fri, 12 Jan 2024 14:45:35 +0200 Subject: [PATCH] feat(cs): Improve UX for form/confirm dialogs after rebase fixes to some issues Closes: XRDDEV-2532 --- .../admin-service/ui/package.json | 2 +- .../AddCertificationServiceDialog.vue | 231 ++--- .../EditAcmeServerDialog.vue | 182 ++-- .../EditCertProfileDialog.vue | 6 +- .../EditTlsAuthDialog.vue | 4 +- .../managementRequests/MrConfirmDialog.vue | 2 +- .../managementRequests/MrDeclineDialog.vue | 2 +- .../DeleteAuthenticationCertificateDialog.vue | 2 +- .../EditTimestampingServiceDialog.vue | 2 +- .../ui/src/components/ui/InfoCard.vue | 4 +- .../admin-service/ui/src/locales/en.json | 8 +- .../admin-service/ui/src/main.ts | 6 +- .../admin-service/ui/src/plugins/i18n.ts | 5 +- .../ui/src/plugins/vee-validate.ts | 134 ++- .../ui/src/store/modules/trust-services.ts | 2 +- .../admin-service/ui/src/util/composables.ts | 4 +- .../admin-service/ui/src/util/helpers.ts | 2 +- .../views/Members/Member/AddMemberDialog.vue | 2 +- .../Member/Details/DeleteMemberDialog.vue | 2 +- .../Member/Details/EditMemberNameDialog.vue | 2 +- .../Subsystems/AddMemberSubsystemDialog.vue | 2 +- .../DeleteSecurityServerDialog.vue | 2 +- .../EditSecurityServerAddressDialog.vue | 2 +- .../CertificationServiceSettings.vue | 18 +- .../EditAcmeServerDialog.spec.ts | 112 --- .../tests/unit/plugins/vee-validate.spec.ts | 108 --- .../CertificationServiceSettings.spec.ts | 79 -- .../admin-service/ui/tsconfig.json | 2 +- .../admin-service/ui/vite.config.ts | 9 - src/package.json | 8 +- src/pnpm-lock.yaml | 883 ++++++++++++++++-- .../wizard/WizardPageCsrDetails.vue | 2 +- .../admin-service/ui/src/filters.ts | 2 +- .../admin-service/ui/src/main.ts | 2 +- .../admin-service/ui/src/plugins/i18n.ts | 25 +- .../ui/src/plugins/vee-validate.ts | 2 +- .../admin-service/ui/src/router.ts | 2 +- .../ui/src/store/modules/clients.ts | 2 +- .../ui/src/store/modules/user.ts | 2 +- .../ServiceDescriptionDetails.vue | 2 +- src/shared-ui/package.json | 2 +- src/shared-ui/src/components/XrdButton.vue | 2 +- src/shared-ui/src/main.ts | 2 +- 43 files changed, 1108 insertions(+), 768 deletions(-) delete mode 100644 src/central-server/admin-service/ui/tests/unit/components/certificationServices/EditAcmeServerDialog.spec.ts delete mode 100644 src/central-server/admin-service/ui/tests/unit/plugins/vee-validate.spec.ts delete mode 100644 src/central-server/admin-service/ui/tests/unit/views/TrustServices/CertificationService/CertificationServiceSettings.spec.ts diff --git a/src/central-server/admin-service/ui/package.json b/src/central-server/admin-service/ui/package.json index e35e5e6aa5..782f77512b 100644 --- a/src/central-server/admin-service/ui/package.json +++ b/src/central-server/admin-service/ui/package.json @@ -4,7 +4,7 @@ "private": true, "scripts": { "dev": "vite --host", - "build": "pnpm run generate-types && vitest --run && vite build", + "build": "pnpm run generate-types && vite build", "preview": "vite preview", "build-only": "vite build", "test": "vitest", diff --git a/src/central-server/admin-service/ui/src/components/certificationServices/AddCertificationServiceDialog.vue b/src/central-server/admin-service/ui/src/components/certificationServices/AddCertificationServiceDialog.vue index e858a25acb..4728b1891a 100644 --- a/src/central-server/admin-service/ui/src/components/certificationServices/AddCertificationServiceDialog.vue +++ b/src/central-server/admin-service/ui/src/components/certificationServices/AddCertificationServiceDialog.vue @@ -31,26 +31,18 @@ cancel-button-text="action.cancel" save-button-text="action.upload" title="trustServices.addCertificationService" - :disable-save="certFile === null" + submittable + :disable-save="!certFile" @save="onUpload" - @cancel="cancel" + @cancel="$emit('cancel')" > @@ -60,19 +52,22 @@ cancel-button-text="action.cancel" save-button-text="action.save" title="trustServices.caSettings" + submittable :disable-save="!meta.valid" :loading="loading" @save="onSave" - @cancel="cancel" + @cancel="$emit('cancel')" > - diff --git a/src/central-server/admin-service/ui/src/components/certificationServices/EditAcmeServerDialog.vue b/src/central-server/admin-service/ui/src/components/certificationServices/EditAcmeServerDialog.vue index a6c2d7f7d7..c5e859cc41 100644 --- a/src/central-server/admin-service/ui/src/components/certificationServices/EditAcmeServerDialog.vue +++ b/src/central-server/admin-service/ui/src/components/certificationServices/EditAcmeServerDialog.vue @@ -26,13 +26,13 @@ --> - diff --git a/src/central-server/admin-service/ui/src/components/certificationServices/EditCertProfileDialog.vue b/src/central-server/admin-service/ui/src/components/certificationServices/EditCertProfileDialog.vue index 7497f93691..21d9209544 100644 --- a/src/central-server/admin-service/ui/src/components/certificationServices/EditCertProfileDialog.vue +++ b/src/central-server/admin-service/ui/src/components/certificationServices/EditCertProfileDialog.vue @@ -53,16 +53,16 @@