NAS-131317: Addressed requested changes

truenas · Oct 11, 2024 · f770d5d · f770d5d
1 parent 44a1b27
commit f770d5d
Show file tree

Hide file tree

Showing 94 changed files with 109 additions and 14 deletions.
diff --git a/src/app/interfaces/smart-test.interface.ts b/src/app/interfaces/smart-test.interface.ts
@@ -52,7 +52,7 @@ export interface SmartTestResult {
   status: SmartTestResultStatus;
   status_verbose: string;
   segment_number: number;
-  poh_ago: number;
+  power_on_hours_ago: number;
 }
 
 export interface ManualSmartTest {

diff --git a/src/app/modules/ix-table/components/ix-table-head/ix-table-head.component.html b/src/app/modules/ix-table/components/ix-table-head/ix-table-head.component.html
@@ -2,7 +2,6 @@
   @for (column of displayedColumns; track column; let idx = $index) {
     <th
       [ngClass]="column.cssClass || ''"
-      [matTooltip]="column.toolTip ? column.toolTip : column.title"
       (click)="onSort(idx)"
     >
       <div class="title-container" [ngStyle]="{ cursor: !column.disableSorting ? 'pointer' : 'auto' }">
@@ -12,6 +11,12 @@
             [dataProvider]="dataProvider"
             [column]="column"
           ></ng-template>
+          @if (column.headerTooltip) {
+            <ix-tooltip
+                class="tooltip"
+                [message]="column.headerTooltip | translate">
+            </ix-tooltip>
+          }
         </div>
         @if (!column.disableSorting) {
           <div>

diff --git a/src/app/modules/ix-table/components/ix-table-head/ix-table-head.component.ts b/src/app/modules/ix-table/components/ix-table-head/ix-table-head.component.ts
@@ -2,14 +2,15 @@ import { NgClass, NgStyle } from '@angular/common';
 import {
   AfterViewInit, ChangeDetectorRef, ChangeDetectionStrategy, Component, Input,
 } from '@angular/core';
-import { MatTooltip } from '@angular/material/tooltip';
 import { UntilDestroy, untilDestroyed } from '@ngneat/until-destroy';
+import { TranslateModule } from '@ngx-translate/core';
 import { IxIconComponent } from 'app/modules/ix-icon/ix-icon.component';
 import { IxTableHeaderCellDirective } from 'app/modules/ix-table/directives/ix-header-cell.directive';
 import { SortDirection } from 'app/modules/ix-table/enums/sort-direction.enum';
 import { Column, ColumnComponent } from 'app/modules/ix-table/interfaces/column-component.class';
 import { DataProvider } from 'app/modules/ix-table/interfaces/data-provider.interface';
 import { TestDirective } from 'app/modules/test-id/test.directive';
+import { TooltipComponent } from 'app/modules/tooltip/tooltip.component';
 
 @UntilDestroy()
 @Component({
@@ -20,11 +21,12 @@ import { TestDirective } from 'app/modules/test-id/test.directive';
   standalone: true,
   imports: [
     NgClass,
-    MatTooltip,
     NgStyle,
     IxTableHeaderCellDirective,
     IxIconComponent,
     TestDirective,
+    TooltipComponent,
+    TranslateModule,
   ],
 })
 export class IxTableHeadComponent<T> implements AfterViewInit {

diff --git a/src/app/modules/ix-table/interfaces/column-component.class.ts b/src/app/modules/ix-table/interfaces/column-component.class.ts
@@ -5,7 +5,7 @@ import { DataProvider } from 'app/modules/ix-table/interfaces/data-provider.inte
 export abstract class ColumnComponent<T> {
   propertyName?: keyof T;
   title?: string;
-  toolTip?: string;
+  headerTooltip?: string;
   cssClass?: string;
   uniqueRowTag: (row: T) => string;
   ariaLabels: (row: T) => string[];

diff --git a/.../modules/disks/components/smart-test-result-list/smart-test-result-list.component.spec.ts b/.../modules/disks/components/smart-test-result-list/smart-test-result-list.component.spec.ts
@@ -32,7 +32,7 @@ describe('SmartTestResultListComponent', () => {
       lba_of_first_error: null,
       status: SmartTestResultStatus.Success,
       remaining: null,
-      poh_ago: 0,
+      power_on_hours_ago: 1,
     },
     {
       num: 2,
@@ -43,7 +43,7 @@ describe('SmartTestResultListComponent', () => {
       lba_of_first_error: null,
       status: SmartTestResultStatus.Success,
       remaining: 50,
-      poh_ago: 0,
+      power_on_hours_ago: 25,
     },
     {
       num: 3,
@@ -54,7 +54,7 @@ describe('SmartTestResultListComponent', () => {
       lba_of_first_error: null,
       status: SmartTestResultStatus.Success,
       remaining: null,
-      poh_ago: 0,
+      power_on_hours_ago: 49,
     }],
   }, {
     disk: 'sdb',
@@ -67,7 +67,7 @@ describe('SmartTestResultListComponent', () => {
       lba_of_first_error: null,
       status: SmartTestResultStatus.Success,
       remaining: null,
-      poh_ago: 0,
+      power_on_hours_ago: 1,
     },
     {
       num: 2,
@@ -78,7 +78,7 @@ describe('SmartTestResultListComponent', () => {
       lba_of_first_error: null,
       status: SmartTestResultStatus.Success,
       remaining: 0.5,
-      poh_ago: 0,
+      power_on_hours_ago: 25,
     },
     {
       num: 3,
@@ -89,7 +89,7 @@ describe('SmartTestResultListComponent', () => {
       lba_of_first_error: null,
       status: SmartTestResultStatus.Success,
       remaining: 0,
-      poh_ago: 0,
+      power_on_hours_ago: 49,
     }],
   }];
 

diff --git a/...orage/modules/disks/components/smart-test-result-list/smart-test-result-list.component.ts b/...orage/modules/disks/components/smart-test-result-list/smart-test-result-list.component.ts
@@ -83,10 +83,10 @@ export class SmartTestResultListComponent implements OnInit {
     }),
     textColumn({
       title: this.translate.instant('Power On Hours Ago'),
-      propertyName: 'poh_ago',
-      toolTip: '"Power On Hours" are how many hours have passed while the disk has been powered on. "Power On Hours Ago" is how many power on hours have passed since each test.',
+      propertyName: 'power_on_hours_ago',
+      headerTooltip: this.translate.instant('"Power On Hours" are how many hours have passed while the disk has been powered on. "Power On Hours Ago" is how many power on hours have passed since each test.'),
       getValue: (row) => {
-        return row.poh_ago || this.translate.instant('N/A');
+        return row.power_on_hours_ago || this.translate.instant('N/A');
       },
     }),
     textColumn({

diff --git a/src/assets/i18n/af.json b/src/assets/i18n/af.json
@@ -6,6 +6,7 @@
   " as of {dateTime}": "",
   " bytes.": "",
   " seconds.": "",
+  "\"Power On Hours\" are how many hours have passed while the disk has been powered on. \"Power On Hours Ago\" is how many power on hours have passed since each test.": "",
   "% of all cores": "",
   "'Hosts Allow' or 'Hosts Deny' has been set": "",
   "'Hosts Allow' or 'Hosts Deny' has been updated": "",

diff --git a/src/assets/i18n/ar.json b/src/assets/i18n/ar.json
@@ -6,6 +6,7 @@
   " as of {dateTime}": "",
   " bytes.": "",
   " seconds.": "",
+  "\"Power On Hours\" are how many hours have passed while the disk has been powered on. \"Power On Hours Ago\" is how many power on hours have passed since each test.": "",
   "% of all cores": "",
   "'Hosts Allow' or 'Hosts Deny' has been set": "",
   "'Hosts Allow' or 'Hosts Deny' has been updated": "",

diff --git a/src/assets/i18n/ast.json b/src/assets/i18n/ast.json
@@ -6,6 +6,7 @@
   " as of {dateTime}": "",
   " bytes.": "",
   " seconds.": "",
+  "\"Power On Hours\" are how many hours have passed while the disk has been powered on. \"Power On Hours Ago\" is how many power on hours have passed since each test.": "",
   "% of all cores": "",
   "'Hosts Allow' or 'Hosts Deny' has been set": "",
   "'Hosts Allow' or 'Hosts Deny' has been updated": "",

diff --git a/src/assets/i18n/az.json b/src/assets/i18n/az.json
@@ -6,6 +6,7 @@
   " as of {dateTime}": "",
   " bytes.": "",
   " seconds.": "",
+  "\"Power On Hours\" are how many hours have passed while the disk has been powered on. \"Power On Hours Ago\" is how many power on hours have passed since each test.": "",
   "% of all cores": "",
   "'Hosts Allow' or 'Hosts Deny' has been set": "",
   "'Hosts Allow' or 'Hosts Deny' has been updated": "",

diff --git a/src/assets/i18n/be.json b/src/assets/i18n/be.json
@@ -6,6 +6,7 @@
   " as of {dateTime}": "",
   " bytes.": "",
   " seconds.": "",
+  "\"Power On Hours\" are how many hours have passed while the disk has been powered on. \"Power On Hours Ago\" is how many power on hours have passed since each test.": "",
   "% of all cores": "",
   "'Hosts Allow' or 'Hosts Deny' has been set": "",
   "'Hosts Allow' or 'Hosts Deny' has been updated": "",

diff --git a/src/assets/i18n/bg.json b/src/assets/i18n/bg.json
@@ -6,6 +6,7 @@
   " as of {dateTime}": "",
   " bytes.": "",
   " seconds.": "",
+  "\"Power On Hours\" are how many hours have passed while the disk has been powered on. \"Power On Hours Ago\" is how many power on hours have passed since each test.": "",
   "% of all cores": "",
   "'Hosts Allow' or 'Hosts Deny' has been set": "",
   "'Hosts Allow' or 'Hosts Deny' has been updated": "",

diff --git a/src/assets/i18n/bn.json b/src/assets/i18n/bn.json
@@ -6,6 +6,7 @@
   " as of {dateTime}": "",
   " bytes.": "",
   " seconds.": "",
+  "\"Power On Hours\" are how many hours have passed while the disk has been powered on. \"Power On Hours Ago\" is how many power on hours have passed since each test.": "",
   "% of all cores": "",
   "'Hosts Allow' or 'Hosts Deny' has been set": "",
   "'Hosts Allow' or 'Hosts Deny' has been updated": "",

diff --git a/src/assets/i18n/br.json b/src/assets/i18n/br.json
@@ -6,6 +6,7 @@
   " as of {dateTime}": "",
   " bytes.": "",
   " seconds.": "",
+  "\"Power On Hours\" are how many hours have passed while the disk has been powered on. \"Power On Hours Ago\" is how many power on hours have passed since each test.": "",
   "% of all cores": "",
   "'Hosts Allow' or 'Hosts Deny' has been set": "",
   "'Hosts Allow' or 'Hosts Deny' has been updated": "",

diff --git a/src/assets/i18n/bs.json b/src/assets/i18n/bs.json
@@ -6,6 +6,7 @@
   " as of {dateTime}": "",
   " bytes.": "",
   " seconds.": "",
+  "\"Power On Hours\" are how many hours have passed while the disk has been powered on. \"Power On Hours Ago\" is how many power on hours have passed since each test.": "",
   "% of all cores": "",
   "'Hosts Allow' or 'Hosts Deny' has been set": "",
   "'Hosts Allow' or 'Hosts Deny' has been updated": "",

diff --git a/src/assets/i18n/ca.json b/src/assets/i18n/ca.json
@@ -6,6 +6,7 @@
   " as of {dateTime}": "",
   " bytes.": "",
   " seconds.": "",
+  "\"Power On Hours\" are how many hours have passed while the disk has been powered on. \"Power On Hours Ago\" is how many power on hours have passed since each test.": "",
   "% of all cores": "",
   "'Hosts Allow' or 'Hosts Deny' has been set": "",
   "'Hosts Allow' or 'Hosts Deny' has been updated": "",

diff --git a/src/assets/i18n/cs.json b/src/assets/i18n/cs.json
@@ -1,5 +1,6 @@
 {
   "": "",
+  "\"Power On Hours\" are how many hours have passed while the disk has been powered on. \"Power On Hours Ago\" is how many power on hours have passed since each test.": "",
   "<a href=\"https://forums.truenas.com/\" target=\"_blank\"> TrueNAS Forums</a> - Find answers from other users in the forums.": "",
   "<a href=\"https://tools.ietf.org/html/rfc8095\" target=\"_blank\">Transport Protocol</a> for the remote system log server connection. Choosing Transport Layer Security (TLS) also requires selecting a preconfigured system Certificate.": "",
   "<a href=\"https://www.ixsystems.com/support/truenas-arrays/\" target=\"_blank\"> TrueNAS Licensing</a> - Learn more about enterprise-grade support.": "",

diff --git a/src/assets/i18n/cy.json b/src/assets/i18n/cy.json
@@ -6,6 +6,7 @@
   " as of {dateTime}": "",
   " bytes.": "",
   " seconds.": "",
+  "\"Power On Hours\" are how many hours have passed while the disk has been powered on. \"Power On Hours Ago\" is how many power on hours have passed since each test.": "",
   "% of all cores": "",
   "'Hosts Allow' or 'Hosts Deny' has been set": "",
   "'Hosts Allow' or 'Hosts Deny' has been updated": "",

diff --git a/src/assets/i18n/da.json b/src/assets/i18n/da.json
@@ -6,6 +6,7 @@
   " as of {dateTime}": "",
   " bytes.": "",
   " seconds.": "",
+  "\"Power On Hours\" are how many hours have passed while the disk has been powered on. \"Power On Hours Ago\" is how many power on hours have passed since each test.": "",
   "% of all cores": "",
   "'Hosts Allow' or 'Hosts Deny' has been set": "",
   "'Hosts Allow' or 'Hosts Deny' has been updated": "",

diff --git a/src/assets/i18n/de.json b/src/assets/i18n/de.json
@@ -4,6 +4,7 @@
   " Est. Usable Raw Capacity": "",
   " as of {dateTime}": "",
   " bytes.": "",
+  "\"Power On Hours\" are how many hours have passed while the disk has been powered on. \"Power On Hours Ago\" is how many power on hours have passed since each test.": "",
   "'Hosts Allow' or 'Hosts Deny' has been set": "",
   "'Hosts Allow' or 'Hosts Deny' has been updated": "",
   "(No description)": "",

diff --git a/src/assets/i18n/dsb.json b/src/assets/i18n/dsb.json
@@ -6,6 +6,7 @@
   " as of {dateTime}": "",
   " bytes.": "",
   " seconds.": "",
+  "\"Power On Hours\" are how many hours have passed while the disk has been powered on. \"Power On Hours Ago\" is how many power on hours have passed since each test.": "",
   "% of all cores": "",
   "'Hosts Allow' or 'Hosts Deny' has been set": "",
   "'Hosts Allow' or 'Hosts Deny' has been updated": "",

diff --git a/src/assets/i18n/el.json b/src/assets/i18n/el.json
@@ -6,6 +6,7 @@
   " as of {dateTime}": "",
   " bytes.": "",
   " seconds.": "",
+  "\"Power On Hours\" are how many hours have passed while the disk has been powered on. \"Power On Hours Ago\" is how many power on hours have passed since each test.": "",
   "% of all cores": "",
   "'Hosts Allow' or 'Hosts Deny' has been set": "",
   "'Hosts Allow' or 'Hosts Deny' has been updated": "",

diff --git a/src/assets/i18n/en-au.json b/src/assets/i18n/en-au.json
@@ -6,6 +6,7 @@
   " as of {dateTime}": "",
   " bytes.": "",
   " seconds.": "",
+  "\"Power On Hours\" are how many hours have passed while the disk has been powered on. \"Power On Hours Ago\" is how many power on hours have passed since each test.": "",
   "% of all cores": "",
   "'Hosts Allow' or 'Hosts Deny' has been set": "",
   "'Hosts Allow' or 'Hosts Deny' has been updated": "",

diff --git a/src/assets/i18n/en-gb.json b/src/assets/i18n/en-gb.json
@@ -6,6 +6,7 @@
   " as of {dateTime}": "",
   " bytes.": "",
   " seconds.": "",
+  "\"Power On Hours\" are how many hours have passed while the disk has been powered on. \"Power On Hours Ago\" is how many power on hours have passed since each test.": "",
   "% of all cores": "",
   "'Hosts Allow' or 'Hosts Deny' has been set": "",
   "'Hosts Allow' or 'Hosts Deny' has been updated": "",

diff --git a/src/assets/i18n/en.json b/src/assets/i18n/en.json
@@ -6,6 +6,7 @@
   " as of {dateTime}": "",
   " bytes.": "",
   " seconds.": "",
+  "\"Power On Hours\" are how many hours have passed while the disk has been powered on. \"Power On Hours Ago\" is how many power on hours have passed since each test.": "",
   "% of all cores": "",
   "'Hosts Allow' or 'Hosts Deny' has been set": "",
   "'Hosts Allow' or 'Hosts Deny' has been updated": "",

diff --git a/src/assets/i18n/eo.json b/src/assets/i18n/eo.json
@@ -6,6 +6,7 @@
   " as of {dateTime}": "",
   " bytes.": "",
   " seconds.": "",
+  "\"Power On Hours\" are how many hours have passed while the disk has been powered on. \"Power On Hours Ago\" is how many power on hours have passed since each test.": "",
   "% of all cores": "",
   "'Hosts Allow' or 'Hosts Deny' has been set": "",
   "'Hosts Allow' or 'Hosts Deny' has been updated": "",

diff --git a/src/assets/i18n/es-ar.json b/src/assets/i18n/es-ar.json
@@ -4,6 +4,7 @@
   " Est. Usable Raw Capacity": "",
   " as of {dateTime}": "",
   " bytes.": "",
+  "\"Power On Hours\" are how many hours have passed while the disk has been powered on. \"Power On Hours Ago\" is how many power on hours have passed since each test.": "",
   "'Hosts Allow' or 'Hosts Deny' has been set": "",
   "'Hosts Allow' or 'Hosts Deny' has been updated": "",
   "(No description)": "",

diff --git a/src/assets/i18n/es-co.json b/src/assets/i18n/es-co.json
@@ -6,6 +6,7 @@
   " as of {dateTime}": "",
   " bytes.": "",
   " seconds.": "",
+  "\"Power On Hours\" are how many hours have passed while the disk has been powered on. \"Power On Hours Ago\" is how many power on hours have passed since each test.": "",
   "% of all cores": "",
   "'Hosts Allow' or 'Hosts Deny' has been set": "",
   "'Hosts Allow' or 'Hosts Deny' has been updated": "",

diff --git a/src/assets/i18n/es-mx.json b/src/assets/i18n/es-mx.json
@@ -6,6 +6,7 @@
   " as of {dateTime}": "",
   " bytes.": "",
   " seconds.": "",
+  "\"Power On Hours\" are how many hours have passed while the disk has been powered on. \"Power On Hours Ago\" is how many power on hours have passed since each test.": "",
   "% of all cores": "",
   "'Hosts Allow' or 'Hosts Deny' has been set": "",
   "'Hosts Allow' or 'Hosts Deny' has been updated": "",

diff --git a/src/assets/i18n/es-ni.json b/src/assets/i18n/es-ni.json
@@ -6,6 +6,7 @@
   " as of {dateTime}": "",
   " bytes.": "",
   " seconds.": "",
+  "\"Power On Hours\" are how many hours have passed while the disk has been powered on. \"Power On Hours Ago\" is how many power on hours have passed since each test.": "",
   "% of all cores": "",
   "'Hosts Allow' or 'Hosts Deny' has been set": "",
   "'Hosts Allow' or 'Hosts Deny' has been updated": "",

diff --git a/src/assets/i18n/es-ve.json b/src/assets/i18n/es-ve.json
@@ -6,6 +6,7 @@
   " as of {dateTime}": "",
   " bytes.": "",
   " seconds.": "",
+  "\"Power On Hours\" are how many hours have passed while the disk has been powered on. \"Power On Hours Ago\" is how many power on hours have passed since each test.": "",
   "% of all cores": "",
   "'Hosts Allow' or 'Hosts Deny' has been set": "",
   "'Hosts Allow' or 'Hosts Deny' has been updated": "",

diff --git a/src/assets/i18n/es.json b/src/assets/i18n/es.json
@@ -6,6 +6,7 @@
   " as of {dateTime}": "",
   " bytes.": "",
   " seconds.": "",
+  "\"Power On Hours\" are how many hours have passed while the disk has been powered on. \"Power On Hours Ago\" is how many power on hours have passed since each test.": "",
   "'Hosts Allow' or 'Hosts Deny' has been set": "",
   "'Hosts Allow' or 'Hosts Deny' has been updated": "",
   "(No description)": "",

diff --git a/src/assets/i18n/et.json b/src/assets/i18n/et.json
@@ -6,6 +6,7 @@
   " as of {dateTime}": "",
   " bytes.": "",
   " seconds.": "",
+  "\"Power On Hours\" are how many hours have passed while the disk has been powered on. \"Power On Hours Ago\" is how many power on hours have passed since each test.": "",
   "% of all cores": "",
   "'Hosts Allow' or 'Hosts Deny' has been set": "",
   "'Hosts Allow' or 'Hosts Deny' has been updated": "",

diff --git a/src/assets/i18n/eu.json b/src/assets/i18n/eu.json
@@ -6,6 +6,7 @@
   " as of {dateTime}": "",
   " bytes.": "",
   " seconds.": "",
+  "\"Power On Hours\" are how many hours have passed while the disk has been powered on. \"Power On Hours Ago\" is how many power on hours have passed since each test.": "",
   "% of all cores": "",
   "'Hosts Allow' or 'Hosts Deny' has been set": "",
   "'Hosts Allow' or 'Hosts Deny' has been updated": "",

diff --git a/src/assets/i18n/fa.json b/src/assets/i18n/fa.json
@@ -6,6 +6,7 @@
   " as of {dateTime}": "",
   " bytes.": "",
   " seconds.": "",
+  "\"Power On Hours\" are how many hours have passed while the disk has been powered on. \"Power On Hours Ago\" is how many power on hours have passed since each test.": "",
   "% of all cores": "",
   "'Hosts Allow' or 'Hosts Deny' has been set": "",
   "'Hosts Allow' or 'Hosts Deny' has been updated": "",

diff --git a/src/assets/i18n/fi.json b/src/assets/i18n/fi.json
@@ -6,6 +6,7 @@
   " as of {dateTime}": "",
   " bytes.": "",
   " seconds.": "",
+  "\"Power On Hours\" are how many hours have passed while the disk has been powered on. \"Power On Hours Ago\" is how many power on hours have passed since each test.": "",
   "% of all cores": "",
   "'Hosts Allow' or 'Hosts Deny' has been set": "",
   "'Hosts Allow' or 'Hosts Deny' has been updated": "",

diff --git a/src/assets/i18n/fr.json b/src/assets/i18n/fr.json
@@ -1,5 +1,6 @@
 {
   "": "",
+  "\"Power On Hours\" are how many hours have passed while the disk has been powered on. \"Power On Hours Ago\" is how many power on hours have passed since each test.": "",
   "({n, plural, =1 {# widget} other {# widgets}})": "",
   "...": "",
   "1m Average": "",

diff --git a/src/assets/i18n/fy.json b/src/assets/i18n/fy.json
@@ -6,6 +6,7 @@
   " as of {dateTime}": "",
   " bytes.": "",
   " seconds.": "",
+  "\"Power On Hours\" are how many hours have passed while the disk has been powered on. \"Power On Hours Ago\" is how many power on hours have passed since each test.": "",
   "% of all cores": "",
   "'Hosts Allow' or 'Hosts Deny' has been set": "",
   "'Hosts Allow' or 'Hosts Deny' has been updated": "",

diff --git a/src/assets/i18n/ga.json b/src/assets/i18n/ga.json
@@ -1,5 +1,6 @@
 {
   "": "",
+  "\"Power On Hours\" are how many hours have passed while the disk has been powered on. \"Power On Hours Ago\" is how many power on hours have passed since each test.": "",
   "1m Average": "",
   "Add Custom App": "",
   "Add to trusted store": "",