From 5d2f4746ea5da977a6532db90c624ded1520ec3e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E0=A4=95=E0=A4=BE=E0=A4=B0=E0=A4=A4=E0=A5=8B=E0=A4=AB?= =?UTF-8?q?=E0=A5=8D=E0=A4=AB=E0=A5=87=E0=A4=B2=E0=A4=B8=E0=A5=8D=E0=A4=95?= =?UTF-8?q?=E0=A5=8D=E0=A4=B0=E0=A4=BF=E0=A4=AA=E0=A5=8D=E0=A4=9F=E2=84=A2?= Date: Tue, 23 May 2023 17:09:25 +0000 Subject: [PATCH] fix(editor): Fix inverted checks on modal confirmation results (#6285) * fix(editor): Fix inverted checks on modal confirmation results * test(editor): fix confirm modal buttons * test(editor): fix confirm modal buttons --------- Co-authored-by: Csaba Tuncsik --- .../src/components/CredentialEdit/CredentialEdit.vue | 2 +- packages/editor-ui/src/plugins/i18n/locales/en.json | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/packages/editor-ui/src/components/CredentialEdit/CredentialEdit.vue b/packages/editor-ui/src/components/CredentialEdit/CredentialEdit.vue index 13ab9d6125..28e7c2ea3d 100644 --- a/packages/editor-ui/src/components/CredentialEdit/CredentialEdit.vue +++ b/packages/editor-ui/src/components/CredentialEdit/CredentialEdit.vue @@ -529,7 +529,7 @@ export default defineComponent({ ), }, ); - keepEditing = confirmAction !== MODAL_CONFIRM; + keepEditing = confirmAction === MODAL_CONFIRM; } if (!keepEditing) { diff --git a/packages/editor-ui/src/plugins/i18n/locales/en.json b/packages/editor-ui/src/plugins/i18n/locales/en.json index 5ee88b6760..0e9829ac59 100644 --- a/packages/editor-ui/src/plugins/i18n/locales/en.json +++ b/packages/editor-ui/src/plugins/i18n/locales/en.json @@ -299,12 +299,12 @@ "credentialEdit.credentialConfig.authTypeSelectorLabel": "Connect using", "credentialEdit.credentialConfig.authTypeSelectorTooltip": "The authentication method to use for the connection", "credentialEdit.credentialConfig.recommendedAuthTypeSuffix": "(recommended)", - "credentialEdit.credentialEdit.confirmMessage.beforeClose1.cancelButtonText": "Keep Editing", - "credentialEdit.credentialEdit.confirmMessage.beforeClose1.confirmButtonText": "Close", + "credentialEdit.credentialEdit.confirmMessage.beforeClose1.cancelButtonText": "Close", + "credentialEdit.credentialEdit.confirmMessage.beforeClose1.confirmButtonText": "Keep Editing", "credentialEdit.credentialEdit.confirmMessage.beforeClose1.headline": "Close without saving?", "credentialEdit.credentialEdit.confirmMessage.beforeClose1.message": "Are you sure you want to throw away the changes you made to the {credentialDisplayName} credential?", - "credentialEdit.credentialEdit.confirmMessage.beforeClose2.cancelButtonText": "Keep Editing", - "credentialEdit.credentialEdit.confirmMessage.beforeClose2.confirmButtonText": "Close", + "credentialEdit.credentialEdit.confirmMessage.beforeClose2.cancelButtonText": "Close", + "credentialEdit.credentialEdit.confirmMessage.beforeClose2.confirmButtonText": "Keep Editing", "credentialEdit.credentialEdit.confirmMessage.beforeClose2.headline": "Close without connecting?", "credentialEdit.credentialEdit.confirmMessage.beforeClose2.message": "You need to connect your credential for it to work", "credentialEdit.credentialEdit.confirmMessage.deleteCredential.cancelButtonText": "", @@ -1735,8 +1735,8 @@ "settings.ldap.synchronizationError": "LDAP Synchronization Error", "settings.ldap.configurationError": "LDAP Configuration Error", "settings.ldap.usersScanned": "Users scanned {scanned}", - "settings.ldap.confirmMessage.beforeSaveForm.cancelButtonText": "Yes, disable it", - "settings.ldap.confirmMessage.beforeSaveForm.confirmButtonText": "No", + "settings.ldap.confirmMessage.beforeSaveForm.cancelButtonText": "No", + "settings.ldap.confirmMessage.beforeSaveForm.confirmButtonText": "Yes, disable it", "settings.ldap.confirmMessage.beforeSaveForm.headline": "Are you sure you want to disable LDAP login?", "settings.ldap.confirmMessage.beforeSaveForm.message": "If you do so, all LDAP users will be converted to email users.", "settings.ldap.disabled.title": "Available on Enterprise plan",