From ebb1544177859571f6a1fad08056b038aae69a53 Mon Sep 17 00:00:00 2001
From: varjolintu <sami.vanttinen@ahmala.org>
Date: Sun, 9 Jun 2024 09:44:28 +0300
Subject: [PATCH] Show group name in Credential Banner's menu when updating a
 credential

---
 .../content/keepassxc-browser.js              | 20 +++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/keepassxc-browser/content/keepassxc-browser.js b/keepassxc-browser/content/keepassxc-browser.js
index 2d7d42c..64b51f3 100755
--- a/keepassxc-browser/content/keepassxc-browser.js
+++ b/keepassxc-browser/content/keepassxc-browser.js
@@ -146,6 +146,12 @@ kpxc.getDocumentLocation = function() {
     return kpxc.settings.saveDomainOnly ? document.location.origin : document.location.href;
 };
 
+kpxc.getUniqueGroupCount = function(creds) {
+    const groups = creds.map(c => c.group || '');
+    const uniqueGroups = new Set(groups);
+    return uniqueGroups.size;
+};
+
 // Returns the form that includes the inputField
 kpxc.getForm = function(inputField) {
     if (inputField.form) {
@@ -391,13 +397,8 @@ kpxc.initLoginPopup = function() {
             : first.localeCompare(second);
     };
 
-    const getUniqueGroupCount = function(creds) {
-        const groups = creds.map(c => c.group || '');
-        const uniqueGroups = new Set(groups);
-        return uniqueGroups.size;
-    };
-
-    const showGroupNameInAutocomplete = kpxc.settings.showGroupNameInAutocomplete && (getUniqueGroupCount(kpxc.credentials) > 1);
+    const showGroupNameInAutocomplete =
+        kpxc.settings.showGroupNameInAutocomplete && kpxc.getUniqueGroupCount(kpxc.credentials) > 1;
 
     // Initialize login items
     const loginItems = [];
@@ -506,10 +507,13 @@ kpxc.rememberCredentials = async function(usernameValue, passwordValue, urlValue
         }
     }
 
+    const showGroupNameInAutocomplete =
+        kpxc.settings.showGroupNameInAutocomplete && kpxc.getUniqueGroupCount(credentials) > 1;
+
     const credentialsList = [];
     for (const c of credentials) {
         credentialsList.push({
-            login: c.login,
+            login: showGroupNameInAutocomplete ? `[${c.group}] ${c.login}` : c.login,
             name: c.name,
             uuid: c.uuid
         });