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 <[email protected]>
n8n-io · May 23, 2023 · 5d2f474 · 5d2f474
1 parent eabecef
commit 5d2f474
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git 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
@@ -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",
-Original file line number
+Diff line change
@@ Expand Up / @@ -529,7 +529,7 @@ export default defineComponent({ @@
     						),
     					},
     				);
-    				keepEditing = confirmAction !== MODAL_CONFIRM;
+    				keepEditing = confirmAction === MODAL_CONFIRM;
     			}
     			if (!keepEditing) {
@@ Expand Down @@