NAS-131113: PR update

truenas · Sep 11, 2024 · 8c9249f · 8c9249f
1 parent 43fa508
commit 8c9249f
Show file tree

Hide file tree

Showing 93 changed files with 197 additions and 7 deletions.
diff --git a/src/app/pages/apps/components/installed-apps/app-row/app-row.component.html b/src/app/pages/apps/components/installed-apps/app-row/app-row.component.html
@@ -24,21 +24,30 @@
   ></ix-app-status-cell>
 </div>
 <div class="cell cell-cpu" [matTooltip]="'Percentage of total core utilization' | translate">
-  @if (stats()?.cpu_usage) {
+  @if (hasStats()) {
     <span>{{ stats().cpu_usage.toFixed(0) }}%</span>
   } @else {
     {{ 'N/A' | translate }}
   }
 </div>
 <div class="cell cell-ram" [matTooltip]="'Memory usage of app' | translate">
-  @if (stats()?.memory) {
+  @if (hasStats()) {
     <span>{{ stats().memory | ixFileSize }}</span>
   } @else {
     {{ 'N/A' | translate }}
   }
 </div>
+<div class="cell cell-io" [matTooltip]="'Block I/O read and writes' | translate">
+  @if (hasStats()) {
+    <span>
+      {{ stats().blkio.read | ixFileSize }} - {{ stats().blkio.write | ixFileSize }}
+    </span>
+  } @else {
+    {{ 'N/A' | translate }}
+  }
+</div>
 <div class="cell cell-network" [matTooltip]="'Incoming / Outgoing network traffic' | translate">
-  @if (stats()?.networks?.length) {
+  @if (hasStats() && stats()?.networks?.length) {
     <span>
       {{ incomingTraffic() | ixNetworkSpeed }}
       -

diff --git a/src/app/pages/apps/components/installed-apps/app-row/app-row.component.spec.ts b/src/app/pages/apps/components/installed-apps/app-row/app-row.component.spec.ts
@@ -91,6 +91,7 @@ describe('AppRowComponent', () => {
   it('shows app usages stats', () => {
     expect(spectator.query('.cell-cpu')).toHaveText('90%');
     expect(spectator.query('.cell-ram')).toHaveText('80 MiB');
+    expect(spectator.query('.cell-io')).toHaveText('1 KiB - 2 KiB');
     expect(spectator.query('.cell-network')).toHaveText('768 b/s - 1.02 kb/s');
   });
 

diff --git a/src/app/pages/apps/components/installed-apps/app-row/app-row.component.ts b/src/app/pages/apps/components/installed-apps/app-row/app-row.component.ts
@@ -3,6 +3,7 @@ import {
   Component, computed, input, output,
 } from '@angular/core';
 import { appImagePlaceholder } from 'app/constants/catalog.constants';
+import { CatalogAppState } from 'app/enums/catalog-app-state.enum';
 import { Role } from 'app/enums/role.enum';
 import { App, AppStartQueryParams, AppStats } from 'app/interfaces/app.interface';
 import { Job } from 'app/interfaces/job.interface';
@@ -30,7 +31,10 @@ export class AppRowComponent {
   protected readonly requiredRoles = [Role.AppsWrite];
 
   readonly hasUpdates = computed(() => this.app().upgrade_available);
-  readonly isAppStopped = computed(() => this.status() === AppStatus.Stopped);
+  readonly isAppStopped = computed(() => this.app().state === CatalogAppState.Stopped);
+  readonly hasStats = computed(() => {
+    return this.app().state === CatalogAppState.Running && this.stats();
+  });
 
   readonly inProgress = computed(() => {
     return [AppStatus.Deploying].includes(this.status()) || this.isStartingOrStopping();

diff --git a/src/app/pages/apps/components/installed-apps/installed-apps.component.html b/src/app/pages/apps/components/installed-apps/installed-apps.component.html
@@ -148,6 +148,7 @@ <h2>{{ 'Applications' | translate }}</h2>
         </div>
         <div>{{ 'CPU' | translate }}</div>
         <div>{{ 'RAM' | translate }}</div>
+        <div>{{ 'Block I/O' | translate }}</div>
         <div>{{ 'Network' | translate }}</div>
         <div
           class="app-update-header"

diff --git a/src/app/pages/apps/components/installed-apps/installed-apps.component.scss b/src/app/pages/apps/components/installed-apps/installed-apps.component.scss
@@ -59,7 +59,7 @@
 
 ix-app-row,
 .app-header-row {
-  grid-template-columns: 45px minmax(160px, auto) minmax(100px, 120px) 50px 55px 85px 85px 40px;
+  grid-template-columns: 45px minmax(160px, auto) minmax(100px, 120px) 50px 55px 85px 85px 85px 40px;
 
   @media (max-width: $breakpoint-tablet) {
     grid-template-columns: 45px auto 0 0 0 0 0 0;

diff --git a/src/assets/i18n/af.json b/src/assets/i18n/af.json
@@ -595,6 +595,8 @@
   "Bind Interfaces": "",
   "Bind Password": "",
   "Block (iSCSI) Shares Targets": "",
+  "Block I/O": "",
+  "Block I/O read and writes": "",
   "Block Size": "",
   "Block size": "",
   "Boot": "",

diff --git a/src/assets/i18n/ar.json b/src/assets/i18n/ar.json
@@ -595,6 +595,8 @@
   "Bind Interfaces": "",
   "Bind Password": "",
   "Block (iSCSI) Shares Targets": "",
+  "Block I/O": "",
+  "Block I/O read and writes": "",
   "Block Size": "",
   "Block size": "",
   "Boot": "",

diff --git a/src/assets/i18n/ast.json b/src/assets/i18n/ast.json
@@ -595,6 +595,8 @@
   "Bind Interfaces": "",
   "Bind Password": "",
   "Block (iSCSI) Shares Targets": "",
+  "Block I/O": "",
+  "Block I/O read and writes": "",
   "Block Size": "",
   "Block size": "",
   "Boot": "",

diff --git a/src/assets/i18n/az.json b/src/assets/i18n/az.json
@@ -595,6 +595,8 @@
   "Bind Interfaces": "",
   "Bind Password": "",
   "Block (iSCSI) Shares Targets": "",
+  "Block I/O": "",
+  "Block I/O read and writes": "",
   "Block Size": "",
   "Block size": "",
   "Boot": "",

diff --git a/src/assets/i18n/be.json b/src/assets/i18n/be.json
@@ -595,6 +595,8 @@
   "Bind Interfaces": "",
   "Bind Password": "",
   "Block (iSCSI) Shares Targets": "",
+  "Block I/O": "",
+  "Block I/O read and writes": "",
   "Block Size": "",
   "Block size": "",
   "Boot": "",

diff --git a/src/assets/i18n/bg.json b/src/assets/i18n/bg.json
@@ -595,6 +595,8 @@
   "Bind Interfaces": "",
   "Bind Password": "",
   "Block (iSCSI) Shares Targets": "",
+  "Block I/O": "",
+  "Block I/O read and writes": "",
   "Block Size": "",
   "Block size": "",
   "Boot": "",

diff --git a/src/assets/i18n/bn.json b/src/assets/i18n/bn.json
@@ -595,6 +595,8 @@
   "Bind Interfaces": "",
   "Bind Password": "",
   "Block (iSCSI) Shares Targets": "",
+  "Block I/O": "",
+  "Block I/O read and writes": "",
   "Block Size": "",
   "Block size": "",
   "Boot": "",

diff --git a/src/assets/i18n/br.json b/src/assets/i18n/br.json
@@ -595,6 +595,8 @@
   "Bind Interfaces": "",
   "Bind Password": "",
   "Block (iSCSI) Shares Targets": "",
+  "Block I/O": "",
+  "Block I/O read and writes": "",
   "Block Size": "",
   "Block size": "",
   "Boot": "",

diff --git a/src/assets/i18n/bs.json b/src/assets/i18n/bs.json
@@ -595,6 +595,8 @@
   "Bind Interfaces": "",
   "Bind Password": "",
   "Block (iSCSI) Shares Targets": "",
+  "Block I/O": "",
+  "Block I/O read and writes": "",
   "Block Size": "",
   "Block size": "",
   "Boot": "",

diff --git a/src/assets/i18n/ca.json b/src/assets/i18n/ca.json
@@ -595,6 +595,8 @@
   "Bind Interfaces": "",
   "Bind Password": "",
   "Block (iSCSI) Shares Targets": "",
+  "Block I/O": "",
+  "Block I/O read and writes": "",
   "Block Size": "",
   "Block size": "",
   "Boot": "",

diff --git a/src/assets/i18n/cs.json b/src/assets/i18n/cs.json
@@ -562,6 +562,8 @@
   "Bind Interfaces": "",
   "Bind Password": "",
   "Block (iSCSI) Shares Targets": "",
+  "Block I/O": "",
+  "Block I/O read and writes": "",
   "Block Size": "",
   "Block size": "",
   "Boot": "",

diff --git a/src/assets/i18n/cy.json b/src/assets/i18n/cy.json
@@ -595,6 +595,8 @@
   "Bind Interfaces": "",
   "Bind Password": "",
   "Block (iSCSI) Shares Targets": "",
+  "Block I/O": "",
+  "Block I/O read and writes": "",
   "Block Size": "",
   "Block size": "",
   "Boot": "",

diff --git a/src/assets/i18n/da.json b/src/assets/i18n/da.json
@@ -595,6 +595,8 @@
   "Bind Interfaces": "",
   "Bind Password": "",
   "Block (iSCSI) Shares Targets": "",
+  "Block I/O": "",
+  "Block I/O read and writes": "",
   "Block Size": "",
   "Block size": "",
   "Boot": "",

diff --git a/src/assets/i18n/de.json b/src/assets/i18n/de.json
@@ -423,6 +423,8 @@
   "Bind Interfaces": "",
   "Bind Password": "",
   "Block (iSCSI) Shares Targets": "",
+  "Block I/O": "",
+  "Block I/O read and writes": "",
   "Boot": "",
   "Boot Environment": "",
   "Boot Pool Condition": "",

diff --git a/src/assets/i18n/dsb.json b/src/assets/i18n/dsb.json
@@ -595,6 +595,8 @@
   "Bind Interfaces": "",
   "Bind Password": "",
   "Block (iSCSI) Shares Targets": "",
+  "Block I/O": "",
+  "Block I/O read and writes": "",
   "Block Size": "",
   "Block size": "",
   "Boot": "",

diff --git a/src/assets/i18n/el.json b/src/assets/i18n/el.json
@@ -595,6 +595,8 @@
   "Bind Interfaces": "",
   "Bind Password": "",
   "Block (iSCSI) Shares Targets": "",
+  "Block I/O": "",
+  "Block I/O read and writes": "",
   "Block Size": "",
   "Block size": "",
   "Boot": "",

diff --git a/src/assets/i18n/en-au.json b/src/assets/i18n/en-au.json
@@ -595,6 +595,8 @@
   "Bind Interfaces": "",
   "Bind Password": "",
   "Block (iSCSI) Shares Targets": "",
+  "Block I/O": "",
+  "Block I/O read and writes": "",
   "Block Size": "",
   "Block size": "",
   "Boot": "",

diff --git a/src/assets/i18n/en-gb.json b/src/assets/i18n/en-gb.json
@@ -595,6 +595,8 @@
   "Bind Interfaces": "",
   "Bind Password": "",
   "Block (iSCSI) Shares Targets": "",
+  "Block I/O": "",
+  "Block I/O read and writes": "",
   "Block Size": "",
   "Block size": "",
   "Boot": "",

diff --git a/src/assets/i18n/en.json b/src/assets/i18n/en.json
@@ -595,6 +595,8 @@
   "Bind Interfaces": "",
   "Bind Password": "",
   "Block (iSCSI) Shares Targets": "",
+  "Block I/O": "",
+  "Block I/O read and writes": "",
   "Block Size": "",
   "Block size": "",
   "Boot": "",

diff --git a/src/assets/i18n/eo.json b/src/assets/i18n/eo.json
@@ -595,6 +595,8 @@
   "Bind Interfaces": "",
   "Bind Password": "",
   "Block (iSCSI) Shares Targets": "",
+  "Block I/O": "",
+  "Block I/O read and writes": "",
   "Block Size": "",
   "Block size": "",
   "Boot": "",

diff --git a/src/assets/i18n/es-ar.json b/src/assets/i18n/es-ar.json
@@ -314,6 +314,8 @@
   "Bind": "",
   "Bind Interfaces": "",
   "Block (iSCSI) Shares Targets": "",
+  "Block I/O": "",
+  "Block I/O read and writes": "",
   "Boot Environment": "",
   "Boot Pool Condition": "",
   "Boot Pool Disk Replaced": "",

diff --git a/src/assets/i18n/es-co.json b/src/assets/i18n/es-co.json
@@ -595,6 +595,8 @@
   "Bind Interfaces": "",
   "Bind Password": "",
   "Block (iSCSI) Shares Targets": "",
+  "Block I/O": "",
+  "Block I/O read and writes": "",
   "Block Size": "",
   "Block size": "",
   "Boot": "",

diff --git a/src/assets/i18n/es-mx.json b/src/assets/i18n/es-mx.json
@@ -595,6 +595,8 @@
   "Bind Interfaces": "",
   "Bind Password": "",
   "Block (iSCSI) Shares Targets": "",
+  "Block I/O": "",
+  "Block I/O read and writes": "",
   "Block Size": "",
   "Block size": "",
   "Boot": "",

diff --git a/src/assets/i18n/es-ni.json b/src/assets/i18n/es-ni.json
@@ -595,6 +595,8 @@
   "Bind Interfaces": "",
   "Bind Password": "",
   "Block (iSCSI) Shares Targets": "",
+  "Block I/O": "",
+  "Block I/O read and writes": "",
   "Block Size": "",
   "Block size": "",
   "Boot": "",

diff --git a/src/assets/i18n/es-ve.json b/src/assets/i18n/es-ve.json
@@ -595,6 +595,8 @@
   "Bind Interfaces": "",
   "Bind Password": "",
   "Block (iSCSI) Shares Targets": "",
+  "Block I/O": "",
+  "Block I/O read and writes": "",
   "Block Size": "",
   "Block size": "",
   "Boot": "",

diff --git a/src/assets/i18n/es.json b/src/assets/i18n/es.json
@@ -551,6 +551,8 @@
   "Bind Interfaces": "",
   "Bind Password": "",
   "Block (iSCSI) Shares Targets": "",
+  "Block I/O": "",
+  "Block I/O read and writes": "",
   "Block Size": "",
   "Block size": "",
   "Boot Loader Type": "",

diff --git a/src/assets/i18n/et.json b/src/assets/i18n/et.json
@@ -595,6 +595,8 @@
   "Bind Interfaces": "",
   "Bind Password": "",
   "Block (iSCSI) Shares Targets": "",
+  "Block I/O": "",
+  "Block I/O read and writes": "",
   "Block Size": "",
   "Block size": "",
   "Boot": "",

diff --git a/src/assets/i18n/eu.json b/src/assets/i18n/eu.json
@@ -595,6 +595,8 @@
   "Bind Interfaces": "",
   "Bind Password": "",
   "Block (iSCSI) Shares Targets": "",
+  "Block I/O": "",
+  "Block I/O read and writes": "",
   "Block Size": "",
   "Block size": "",
   "Boot": "",

diff --git a/src/assets/i18n/fa.json b/src/assets/i18n/fa.json
@@ -595,6 +595,8 @@
   "Bind Interfaces": "",
   "Bind Password": "",
   "Block (iSCSI) Shares Targets": "",
+  "Block I/O": "",
+  "Block I/O read and writes": "",
   "Block Size": "",
   "Block size": "",
   "Boot": "",

diff --git a/src/assets/i18n/fi.json b/src/assets/i18n/fi.json
@@ -595,6 +595,8 @@
   "Bind Interfaces": "",
   "Bind Password": "",
   "Block (iSCSI) Shares Targets": "",
+  "Block I/O": "",
+  "Block I/O read and writes": "",
   "Block Size": "",
   "Block size": "",
   "Boot": "",

diff --git a/src/assets/i18n/fr.json b/src/assets/i18n/fr.json
@@ -58,6 +58,8 @@
   "Bind DN": "",
   "Bind Interfaces": "",
   "Bind Password": "",
+  "Block I/O": "",
+  "Block I/O read and writes": "",
   "Boot Environment": "",
   "Boot Pool Condition": "",
   "Box": "",

diff --git a/src/assets/i18n/fy.json b/src/assets/i18n/fy.json
@@ -595,6 +595,8 @@
   "Bind Interfaces": "",
   "Bind Password": "",
   "Block (iSCSI) Shares Targets": "",
+  "Block I/O": "",
+  "Block I/O read and writes": "",
   "Block Size": "",
   "Block size": "",
   "Boot": "",

diff --git a/src/assets/i18n/ga.json b/src/assets/i18n/ga.json
@@ -9,7 +9,8 @@
   "Application Information": "",
   "Application Memory": "",
   "Application Network": "",
-  "CONNECT": "",
+  "Block I/O": "",
+  "Block I/O read and writes": "",
   "CPU Overview": "",
   "CPU Temperature Per Core": "",
   "CPU Usage Per Core": "",
@@ -5086,4 +5087,4 @@
   "{used} of {total} ({used_pct})": "{used} de {total} ({used_pct})",
   "{version} is available!": "Tá {version} ar fáil!",
   "{view} on {enclosure}": "{view} ar {enclosure}"
-}
+}
diff --git a/src/assets/i18n/gd.json b/src/assets/i18n/gd.json
@@ -595,6 +595,8 @@
   "Bind Interfaces": "",
   "Bind Password": "",
   "Block (iSCSI) Shares Targets": "",
+  "Block I/O": "",
+  "Block I/O read and writes": "",
   "Block Size": "",
   "Block size": "",
   "Boot": "",