NAS-128846 / 24.10 / Do not execute actions when selecting results fo…

…r Top Panel (#10042)
truenas · May 13, 2024 · 7d54302 · 7d54302
1 parent 9c605a3
commit 7d54302
Show file tree

Hide file tree

Showing 93 changed files with 212 additions and 101 deletions.
diff --git a/src/app/directives/common/ui-search.directive.ts b/src/app/directives/common/ui-search.directive.ts
@@ -40,7 +40,7 @@ export class UiSearchDirective implements OnInit, OnDestroy {
 
   private tryHighlightAnchors(element: UiSearchableElement, attemptCount: number): void {
     if (this.elementRef.nativeElement) {
-      this.highlightAndClickElement(this.elementRef.nativeElement);
+      this.highlightAndClickElement(this.elementRef.nativeElement, !!element.triggerAnchor);
       if (this.elementRef.nativeElement.id !== element.anchor) {
         this.highlightElementAnchor(element.anchor);
       }
@@ -60,18 +60,21 @@ export class UiSearchDirective implements OnInit, OnDestroy {
     }, searchDelayConst * 1.5);
   }
 
-  private highlightAndClickElement(anchorRef: HTMLElement): void {
+  private highlightAndClickElement(anchorRef: HTMLElement, shouldClick = false): void {
     if (!anchorRef) return;
 
-    anchorRef.scrollIntoView({ behavior: 'smooth' });
+    anchorRef.scrollIntoView();
     anchorRef.focus();
-
     this.renderer.addClass(anchorRef, 'search-element-highlighted');
 
-    setTimeout(() => anchorRef.click(), searchDelayConst);
-    setTimeout(
-      () => this.renderer.removeClass(anchorRef, 'search-element-highlighted'),
-      searchDelayConst * 15,
-    );
+    if (shouldClick) setTimeout(() => anchorRef.click(), searchDelayConst);
+
+    setTimeout(() => {
+      this.renderer.removeClass(anchorRef, 'search-element-highlighted');
+
+      if (!shouldClick) {
+        anchorRef.focus();
+      }
+    }, searchDelayConst * 15);
   }
 }
diff --git a/src/app/modules/layout/components/topbar/power-menu/power-menu.elements.ts b/src/app/modules/layout/components/topbar/power-menu/power-menu.elements.ts
@@ -10,13 +10,16 @@ export const powerMenuElements = {
       anchor: 'power-menu',
     },
     logOut: {
-      hierarchy: [T('LogOut')],
+      hierarchy: [T('Log Out')],
+      synonyms: [T('Sign Out')],
     },
     restart: {
       hierarchy: [T('Restart')],
+      synonyms: [T('Reboot')],
     },
     shutDown: {
       hierarchy: [T('Shut Down')],
+      synonyms: [T('Power Off'), T('Turn Off')],
     },
   },
 } satisfies UiSearchableElement;
diff --git a/src/app/pages/sharing/iscsi/iscsi.component.scss b/src/app/pages/sharing/iscsi/iscsi.component.scss
@@ -2,3 +2,11 @@ nav {
   margin-bottom: 16px;
   margin-top: -32px;
 }
+
+:host ::ng-deep {
+  mat-tab-nav-panel {
+    .search-element-highlighted {
+      display: block;
+    }
+  }
+}
diff --git a/src/assets/i18n/af.json b/src/assets/i18n/af.json
@@ -2245,7 +2245,6 @@
   "Log Path": "",
   "Log VDEVs": "",
   "Log in to Gmail to set up Oauth credentials.": "",
-  "LogOut": "",
   "Logged In To Gmail": "",
   "Logged In To Jira": "",
   "Logged In To Provider": "",
@@ -3625,6 +3624,7 @@
   "Sign": "",
   "Sign CSR": "",
   "Sign In": "",
+  "Sign Out": "",
   "Signed By": "",
   "Signed Certificates": "",
   "Signin": "",
@@ -4143,6 +4143,7 @@
   "Tue": "",
   "Tuesday": "",
   "Tunables": "",
+  "Turn Off": "",
   "Turn Off Service": "",
   "Turn On Service": "",
   "Two Factor Auth": "",

diff --git a/src/assets/i18n/ar.json b/src/assets/i18n/ar.json
@@ -2245,7 +2245,6 @@
   "Log Path": "",
   "Log VDEVs": "",
   "Log in to Gmail to set up Oauth credentials.": "",
-  "LogOut": "",
   "Logged In To Gmail": "",
   "Logged In To Jira": "",
   "Logged In To Provider": "",
@@ -3625,6 +3624,7 @@
   "Sign": "",
   "Sign CSR": "",
   "Sign In": "",
+  "Sign Out": "",
   "Signed By": "",
   "Signed Certificates": "",
   "Signin": "",
@@ -4143,6 +4143,7 @@
   "Tue": "",
   "Tuesday": "",
   "Tunables": "",
+  "Turn Off": "",
   "Turn Off Service": "",
   "Turn On Service": "",
   "Two Factor Auth": "",

diff --git a/src/assets/i18n/ast.json b/src/assets/i18n/ast.json
@@ -2245,7 +2245,6 @@
   "Log Path": "",
   "Log VDEVs": "",
   "Log in to Gmail to set up Oauth credentials.": "",
-  "LogOut": "",
   "Logged In To Gmail": "",
   "Logged In To Jira": "",
   "Logged In To Provider": "",
@@ -3625,6 +3624,7 @@
   "Sign": "",
   "Sign CSR": "",
   "Sign In": "",
+  "Sign Out": "",
   "Signed By": "",
   "Signed Certificates": "",
   "Signin": "",
@@ -4143,6 +4143,7 @@
   "Tue": "",
   "Tuesday": "",
   "Tunables": "",
+  "Turn Off": "",
   "Turn Off Service": "",
   "Turn On Service": "",
   "Two Factor Auth": "",

diff --git a/src/assets/i18n/az.json b/src/assets/i18n/az.json
@@ -2245,7 +2245,6 @@
   "Log Path": "",
   "Log VDEVs": "",
   "Log in to Gmail to set up Oauth credentials.": "",
-  "LogOut": "",
   "Logged In To Gmail": "",
   "Logged In To Jira": "",
   "Logged In To Provider": "",
@@ -3625,6 +3624,7 @@
   "Sign": "",
   "Sign CSR": "",
   "Sign In": "",
+  "Sign Out": "",
   "Signed By": "",
   "Signed Certificates": "",
   "Signin": "",
@@ -4143,6 +4143,7 @@
   "Tue": "",
   "Tuesday": "",
   "Tunables": "",
+  "Turn Off": "",
   "Turn Off Service": "",
   "Turn On Service": "",
   "Two Factor Auth": "",

diff --git a/src/assets/i18n/be.json b/src/assets/i18n/be.json
@@ -2245,7 +2245,6 @@
   "Log Path": "",
   "Log VDEVs": "",
   "Log in to Gmail to set up Oauth credentials.": "",
-  "LogOut": "",
   "Logged In To Gmail": "",
   "Logged In To Jira": "",
   "Logged In To Provider": "",
@@ -3625,6 +3624,7 @@
   "Sign": "",
   "Sign CSR": "",
   "Sign In": "",
+  "Sign Out": "",
   "Signed By": "",
   "Signed Certificates": "",
   "Signin": "",
@@ -4143,6 +4143,7 @@
   "Tue": "",
   "Tuesday": "",
   "Tunables": "",
+  "Turn Off": "",
   "Turn Off Service": "",
   "Turn On Service": "",
   "Two Factor Auth": "",

diff --git a/src/assets/i18n/bg.json b/src/assets/i18n/bg.json
@@ -2245,7 +2245,6 @@
   "Log Path": "",
   "Log VDEVs": "",
   "Log in to Gmail to set up Oauth credentials.": "",
-  "LogOut": "",
   "Logged In To Gmail": "",
   "Logged In To Jira": "",
   "Logged In To Provider": "",
@@ -3625,6 +3624,7 @@
   "Sign": "",
   "Sign CSR": "",
   "Sign In": "",
+  "Sign Out": "",
   "Signed By": "",
   "Signed Certificates": "",
   "Signin": "",
@@ -4143,6 +4143,7 @@
   "Tue": "",
   "Tuesday": "",
   "Tunables": "",
+  "Turn Off": "",
   "Turn Off Service": "",
   "Turn On Service": "",
   "Two Factor Auth": "",

diff --git a/src/assets/i18n/bn.json b/src/assets/i18n/bn.json
@@ -2245,7 +2245,6 @@
   "Log Path": "",
   "Log VDEVs": "",
   "Log in to Gmail to set up Oauth credentials.": "",
-  "LogOut": "",
   "Logged In To Gmail": "",
   "Logged In To Jira": "",
   "Logged In To Provider": "",
@@ -3625,6 +3624,7 @@
   "Sign": "",
   "Sign CSR": "",
   "Sign In": "",
+  "Sign Out": "",
   "Signed By": "",
   "Signed Certificates": "",
   "Signin": "",
@@ -4143,6 +4143,7 @@
   "Tue": "",
   "Tuesday": "",
   "Tunables": "",
+  "Turn Off": "",
   "Turn Off Service": "",
   "Turn On Service": "",
   "Two Factor Auth": "",

diff --git a/src/assets/i18n/br.json b/src/assets/i18n/br.json
@@ -2245,7 +2245,6 @@
   "Log Path": "",
   "Log VDEVs": "",
   "Log in to Gmail to set up Oauth credentials.": "",
-  "LogOut": "",
   "Logged In To Gmail": "",
   "Logged In To Jira": "",
   "Logged In To Provider": "",
@@ -3625,6 +3624,7 @@
   "Sign": "",
   "Sign CSR": "",
   "Sign In": "",
+  "Sign Out": "",
   "Signed By": "",
   "Signed Certificates": "",
   "Signin": "",
@@ -4143,6 +4143,7 @@
   "Tue": "",
   "Tuesday": "",
   "Tunables": "",
+  "Turn Off": "",
   "Turn Off Service": "",
   "Turn On Service": "",
   "Two Factor Auth": "",

diff --git a/src/assets/i18n/bs.json b/src/assets/i18n/bs.json
@@ -2245,7 +2245,6 @@
   "Log Path": "",
   "Log VDEVs": "",
   "Log in to Gmail to set up Oauth credentials.": "",
-  "LogOut": "",
   "Logged In To Gmail": "",
   "Logged In To Jira": "",
   "Logged In To Provider": "",
@@ -3625,6 +3624,7 @@
   "Sign": "",
   "Sign CSR": "",
   "Sign In": "",
+  "Sign Out": "",
   "Signed By": "",
   "Signed Certificates": "",
   "Signin": "",
@@ -4143,6 +4143,7 @@
   "Tue": "",
   "Tuesday": "",
   "Tunables": "",
+  "Turn Off": "",
   "Turn Off Service": "",
   "Turn On Service": "",
   "Two Factor Auth": "",

diff --git a/src/assets/i18n/ca.json b/src/assets/i18n/ca.json
@@ -2245,7 +2245,6 @@
   "Log Path": "",
   "Log VDEVs": "",
   "Log in to Gmail to set up Oauth credentials.": "",
-  "LogOut": "",
   "Logged In To Gmail": "",
   "Logged In To Jira": "",
   "Logged In To Provider": "",
@@ -3625,6 +3624,7 @@
   "Sign": "",
   "Sign CSR": "",
   "Sign In": "",
+  "Sign Out": "",
   "Signed By": "",
   "Signed Certificates": "",
   "Signin": "",
@@ -4143,6 +4143,7 @@
   "Tue": "",
   "Tuesday": "",
   "Tunables": "",
+  "Turn Off": "",
   "Turn Off Service": "",
   "Turn On Service": "",
   "Two Factor Auth": "",

diff --git a/src/assets/i18n/cs.json b/src/assets/i18n/cs.json
@@ -1978,7 +1978,6 @@
   "Log Path": "",
   "Log VDEVs": "",
   "Log in to Gmail to set up Oauth credentials.": "",
-  "LogOut": "",
   "Logged In To Gmail": "",
   "Logged In To Jira": "",
   "Logged In To Provider": "",
@@ -3221,6 +3220,7 @@
   "Sign": "",
   "Sign CSR": "",
   "Sign In": "",
+  "Sign Out": "",
   "Signed By": "",
   "Signed Certificates": "",
   "Signin": "",
@@ -3712,6 +3712,7 @@
   "Tue": "",
   "Tuesday": "",
   "Tunables": "",
+  "Turn Off": "",
   "Turn Off Service": "",
   "Turn On Service": "",
   "Two Factor Auth": "",

diff --git a/src/assets/i18n/cy.json b/src/assets/i18n/cy.json
@@ -2245,7 +2245,6 @@
   "Log Path": "",
   "Log VDEVs": "",
   "Log in to Gmail to set up Oauth credentials.": "",
-  "LogOut": "",
   "Logged In To Gmail": "",
   "Logged In To Jira": "",
   "Logged In To Provider": "",
@@ -3625,6 +3624,7 @@
   "Sign": "",
   "Sign CSR": "",
   "Sign In": "",
+  "Sign Out": "",
   "Signed By": "",
   "Signed Certificates": "",
   "Signin": "",
@@ -4143,6 +4143,7 @@
   "Tue": "",
   "Tuesday": "",
   "Tunables": "",
+  "Turn Off": "",
   "Turn Off Service": "",
   "Turn On Service": "",
   "Two Factor Auth": "",

diff --git a/src/assets/i18n/da.json b/src/assets/i18n/da.json
@@ -2245,7 +2245,6 @@
   "Log Path": "",
   "Log VDEVs": "",
   "Log in to Gmail to set up Oauth credentials.": "",
-  "LogOut": "",
   "Logged In To Gmail": "",
   "Logged In To Jira": "",
   "Logged In To Provider": "",
@@ -3625,6 +3624,7 @@
   "Sign": "",
   "Sign CSR": "",
   "Sign In": "",
+  "Sign Out": "",
   "Signed By": "",
   "Signed Certificates": "",
   "Signin": "",
@@ -4143,6 +4143,7 @@
   "Tue": "",
   "Tuesday": "",
   "Tunables": "",
+  "Turn Off": "",
   "Turn Off Service": "",
   "Turn On Service": "",
   "Two Factor Auth": "",