Add warning message and help icon (#652)

bitwarden · Oct 18, 2024 · e3fbc4e · e3fbc4e
1 parent 3c5bafe
commit e3fbc4e
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 15 deletions.
diff --git a/src/app/tabs/settings.component.html b/src/app/tabs/settings.component.html
@@ -487,20 +487,6 @@ <h3 class="card-header">{{ "sync" | i18n }}</h3>
             }}</label>
           </div>
         </div>
-        <div class="mb-3">
-          <div class="form-check">
-            <input
-              class="form-check-input"
-              type="checkbox"
-              id="overwriteExisting"
-              [(ngModel)]="sync.overwriteExisting"
-              name="OverwriteExisting"
-            />
-            <label class="form-check-label" for="overwriteExisting">{{
-              "overwriteExisting" | i18n
-            }}</label>
-          </div>
-        </div>
         <div class="mb-3">
           <div class="form-check">
             <input
@@ -749,6 +735,31 @@ <h3 class="card-header">{{ "sync" | i18n }}</h3>
             </div>
           </div>
         </div>
+        <div class="tw-mb-3">
+          <div class="form-check">
+            <input
+              class="form-check-input"
+              type="checkbox"
+              id="overwriteExisting"
+              [(ngModel)]="sync.overwriteExisting"
+              name="OverwriteExisting"
+            />
+            <label class="form-check-label" for="overwriteExisting"
+              >{{ "overwriteExisting" | i18n }}
+              <a
+                bitLink
+                class="tw-ml-auto"
+                href="https://bitwarden.com/help/user-group-filters/#overwriting-syncs"
+                target="_blank"
+                rel="noreferrer"
+                appA11yTitle="{{ 'overwriteExistingTooltip' | i18n }}"
+                slot="end"
+              >
+                <i class="bwi bwi-question-circle"></i>
+              </a>
+            </label>
+          </div>
+        </div>
       </div>
     </div>
   </div>

diff --git a/src/locales/en/messages.json b/src/locales/en/messages.json
@@ -647,7 +647,10 @@
         "message": "More than 2000 users or groups are expected to sync."
     },
     "overwriteExisting": {
-        "message": "Overwrite existing organization users based on current sync settings."
+	"message": "Remove and re-add organization users during the next sync (For debugging purposes)"
+    },
+    "overwriteExistingTooltip":{
+	"message": "Learn more about Sync options"
     },
     "clientId": {
         "message": "Client ID"