NAS-113219: Add model and rotationrate to disk details

455aa9ee · Damian Szidiropulosz · a9381d65 · 455aa9ee · 455aa9ee · 455aa9ee
Commit 455aa9ee authored 3 years ago by Damian Szidiropulosz
Hide whitespace changes
Inline Side-by-side

Showing

with 35 additions and 2 deletions
+35 -2
--- a/src/app/pages/system/view-enclosure/enclosure-disks/enclosure-disks-mini.component.html
+++ b/src/app/pages/system/view-enclosure/enclosure-disks/enclosure-disks-mini.component.html
@@ -101,8 +101,10 @@
                <span *ngIf="selectedVdev.topology"> {{ $any(selectedVdev.topology) == 'None' ? '' : '(' + selectedVdev.topology.toUpperCase() + ')'}}</span>
              </li>
+              <li><strong>{{ 'Model' | translate }}:</strong>  &nbsp;&nbsp;&nbsp;{{selectedDisk.model}}</li>
              <li><strong>{{ 'Serial' | translate }}:</strong>  &nbsp;&nbsp;&nbsp;{{selectedDisk.serial}}</li>
              <li><strong>{{ 'Status' | translate }}:</strong>  &nbsp;&nbsp;&nbsp;{{selectedDisk.status}}</li>
+              <li><strong>{{ 'Rotation Rate' | translate }}:</strong>  &nbsp;&nbsp;&nbsp;{{selectedDisk.rotationrate}}</li>
              <li><strong>{{ 'Advanced Power Management' | translate }}:</strong>  &nbsp;&nbsp;&nbsp;{{selectedDisk.advpowermgmt}}</li>
              <li><strong>{{ 'S.M.A.R.T. Enabled' | translate }}:</strong>  &nbsp;&nbsp;&nbsp;{{selectedDisk.togglesmart ? 'Yes' : 'No'}}</li>
              <li><strong>{{ 'S.M.A.R.T. Options' | translate }}:</strong>  &nbsp;&nbsp;&nbsp;{{selectedDisk.smartoptions ? selectedDisk.smartoptions : 'None'}}</li>

--- a/src/app/pages/system/view-enclosure/enclosure-disks/enclosure-disks.component.html
+++ b/src/app/pages/system/view-enclosure/enclosure-disks/enclosure-disks.component.html
@@ -185,7 +185,6 @@
          <div *ngIf="system && system.pools && enclosurePools; else loading" fxFlex class="tiles" [class.active]="currentView == 'pools' " fxLayout="column" fxLayoutAlign="center center">
            <div class="primary-number" >{{ enclosurePools.length }}</div>
            <div class="title"> {{ 'Pools in Enclosure' | translate }}</div>
-            <!--<div class="subtitle">{{system.profile.length > 1 ? system.profile.length - 1 : 'No' }} other enclosures detected</div>-->
            <div *ngIf="unhealthyPools && unhealthyPools.length == 1" class="subtitle">Pool "{{unhealthyPools[0].name}}" is {{unhealthyPools[0].status}}.</div>
            <div *ngIf="unhealthyPools && unhealthyPools.length > 1" class="subtitle">{{unhealthyPools[0]}} and {{unhealthyPools.length - 1}} other pools are not healthy.</div>
            <div *ngIf="unhealthyPools && unhealthyPools.length < 1" class="subtitle">{{ 'All pools are online.' | translate }}</div>
@@ -241,6 +240,13 @@
                </div>
              </div>
+              <div fxFlex="calc(25% - 16px)" class="detail" fxLayout="column" fxLayoutAlign="start start">
+                <div>
+                  <div class="label">{{ 'Model' | translate }}</div>
+                  <div class="value">{{selectedDisk.model}}</div>
+                </div>
+              </div>
              <div fxFlex="calc(25% - 16px)" class="detail" fxLayout="column" fxLayoutAlign="start start">
                <div>
                  <div class="label">{{ 'Serial' | translate }}</div>
@@ -290,13 +296,20 @@
                </div>
              </div>
-              <div fxFlex="calc(75% - 16px)" class="detail" fxLayout="column" fxLayoutAlign="start start">
+              <div fxFlex="calc(25% - 16px)" class="detail" fxLayout="column" fxLayoutAlign="start start">
                <div>
                  <div class="label">{{ 'Description' | translate }}</div>
                  <div class="value">{{selectedDisk.description ? selectedDisk.description : 'None'}}</div>
                </div>
              </div>
+              <div fxFlex="calc(50% - 16px)" class="detail" fxLayout="column" fxLayoutAlign="start start">
+                <div>
+                  <div class="label">{{ 'Rotation Rate' | translate }}</div>
+                  <div class="value">{{selectedDisk.rotationrate}}{{'RPM' | translate}}</div>
+                </div>
+              </div>
            </div>
          </div>

--- a/src/assets/i18n/af.json
+++ b/src/assets/i18n/af.json
@@ -2593,6 +2593,7 @@
  "REQUIRE": "",
  "RFC2307": "",
  "RID": "",
+  "RPM": "",
  "RSYNC Modules": "",
  "Raid-z": "",
  "Raid-z2": "",

--- a/src/assets/i18n/ar.json
+++ b/src/assets/i18n/ar.json
@@ -2593,6 +2593,7 @@
  "REQUIRE": "",
  "RFC2307": "",
  "RID": "",
+  "RPM": "",
  "RSYNC Modules": "",
  "Raid-z": "",
  "Raid-z2": "",

--- a/src/assets/i18n/ast.json
+++ b/src/assets/i18n/ast.json
@@ -2593,6 +2593,7 @@
  "REQUIRE": "",
  "RFC2307": "",
  "RID": "",
+  "RPM": "",
  "RSYNC Modules": "",
  "Raid-z": "",
  "Raid-z2": "",

--- a/src/assets/i18n/az.json
+++ b/src/assets/i18n/az.json
@@ -2593,6 +2593,7 @@
  "REQUIRE": "",
  "RFC2307": "",
  "RID": "",
+  "RPM": "",
  "RSYNC Modules": "",
  "Raid-z": "",
  "Raid-z2": "",

--- a/src/assets/i18n/be.json
+++ b/src/assets/i18n/be.json
@@ -2593,6 +2593,7 @@
  "REQUIRE": "",
  "RFC2307": "",
  "RID": "",
+  "RPM": "",
  "RSYNC Modules": "",
  "Raid-z": "",
  "Raid-z2": "",

--- a/src/assets/i18n/bg.json
+++ b/src/assets/i18n/bg.json
@@ -2593,6 +2593,7 @@
  "REQUIRE": "",
  "RFC2307": "",
  "RID": "",
+  "RPM": "",
  "RSYNC Modules": "",
  "Raid-z": "",
  "Raid-z2": "",

--- a/src/assets/i18n/bn.json
+++ b/src/assets/i18n/bn.json
@@ -2593,6 +2593,7 @@
  "REQUIRE": "",
  "RFC2307": "",
  "RID": "",
+  "RPM": "",
  "RSYNC Modules": "",
  "Raid-z": "",
  "Raid-z2": "",

--- a/src/assets/i18n/br.json
+++ b/src/assets/i18n/br.json
@@ -2593,6 +2593,7 @@
  "REQUIRE": "",
  "RFC2307": "",
  "RID": "",
+  "RPM": "",
  "RSYNC Modules": "",
  "Raid-z": "",
  "Raid-z2": "",

--- a/src/assets/i18n/bs.json
+++ b/src/assets/i18n/bs.json
@@ -2593,6 +2593,7 @@
  "REQUIRE": "",
  "RFC2307": "",
  "RID": "",
+  "RPM": "",
  "RSYNC Modules": "",
  "Raid-z": "",
  "Raid-z2": "",

--- a/src/assets/i18n/ca.json
+++ b/src/assets/i18n/ca.json
@@ -2593,6 +2593,7 @@
  "REQUIRE": "",
  "RFC2307": "",
  "RID": "",
+  "RPM": "",
  "RSYNC Modules": "",
  "Raid-z": "",
  "Raid-z2": "",

--- a/src/assets/i18n/cs.json
+++ b/src/assets/i18n/cs.json
@@ -2143,6 +2143,7 @@
  "REQUIRE": "",
  "RFC2307": "",
  "RID": "",
+  "RPM": "",
  "RSYNC Modules": "",
  "Raid-z": "",
  "Raid-z2": "",

--- a/src/assets/i18n/cy.json
+++ b/src/assets/i18n/cy.json
@@ -2593,6 +2593,7 @@
  "REQUIRE": "",
  "RFC2307": "",
  "RID": "",
+  "RPM": "",
  "RSYNC Modules": "",
  "Raid-z": "",
  "Raid-z2": "",

--- a/src/assets/i18n/da.json
+++ b/src/assets/i18n/da.json
@@ -2593,6 +2593,7 @@
  "REQUIRE": "",
  "RFC2307": "",
  "RID": "",
+  "RPM": "",
  "RSYNC Modules": "",
  "Raid-z": "",
  "Raid-z2": "",

--- a/src/assets/i18n/de.json
+++ b/src/assets/i18n/de.json
@@ -1538,6 +1538,7 @@
  "REQUIRE": "",
  "RFC2307": "",
  "RID": "",
+  "RPM": "",
  "RSYNC Modules": "",
  "Raid-z": "",
  "Raid-z2": "",

--- a/src/assets/i18n/dsb.json
+++ b/src/assets/i18n/dsb.json
@@ -2593,6 +2593,7 @@
  "REQUIRE": "",
  "RFC2307": "",
  "RID": "",
+  "RPM": "",
  "RSYNC Modules": "",
  "Raid-z": "",
  "Raid-z2": "",

--- a/src/assets/i18n/el.json
+++ b/src/assets/i18n/el.json
@@ -2593,6 +2593,7 @@
  "REQUIRE": "",
  "RFC2307": "",
  "RID": "",
+  "RPM": "",
  "RSYNC Modules": "",
  "Raid-z": "",
  "Raid-z2": "",

--- a/src/assets/i18n/en-au.json
+++ b/src/assets/i18n/en-au.json
@@ -2593,6 +2593,7 @@
  "REQUIRE": "",
  "RFC2307": "",
  "RID": "",
+  "RPM": "",
  "RSYNC Modules": "",
  "Raid-z": "",
  "Raid-z2": "",

--- a/src/assets/i18n/en-gb.json
+++ b/src/assets/i18n/en-gb.json
@@ -2593,6 +2593,7 @@
  "REQUIRE": "",
  "RFC2307": "",
  "RID": "",
+  "RPM": "",
  "RSYNC Modules": "",
  "Raid-z": "",
  "Raid-z2": "",