NAS-132259 / 25.04 / virt.instance.image_choices has changed output (#…

…11002) * NAS-132259: virt.instance.image_choices has changed output * NAS-132259: PR update
truenas · Nov 9, 2024 · 9b9b69e · 9b9b69e
1 parent daaea8e
commit 9b9b69e
Show file tree

Hide file tree

Showing 92 changed files with 96 additions and 98 deletions.
diff --git a/src/app/interfaces/virtualization.interface.ts b/src/app/interfaces/virtualization.interface.ts
@@ -117,13 +117,11 @@ export interface VirtualizationUsb {
 }
 
 export interface VirtualizationImage {
-  architecture: string;
+  archs: string[];
   description: string;
   label: string;
   os: string;
   release: string;
-  serial: string;
-  type: string;
   variant: string;
 }
 

diff --git a/...on/components/create-instance-form/select-image-dialog/select-image-dialog.component.html b/...on/components/create-instance-form/select-image-dialog/select-image-dialog.component.html
@@ -56,9 +56,9 @@ <h1 mat-dialog-title>{{ 'Select Image' | translate }}</h1>
           <td *matCellDef="let image" mat-cell>{{ image.release }}</td>
         </ng-container>
 
-        <ng-container matColumnDef="arch">
-          <th *matHeaderCellDef mat-header-cell>{{ 'Arch' | translate }}</th>
-          <td *matCellDef="let image" mat-cell>{{ image.arch }}</td>
+        <ng-container matColumnDef="archs">
+          <th *matHeaderCellDef mat-header-cell>{{ 'Archs' | translate }}</th>
+          <td *matCellDef="let image" mat-cell>{{ image.archs }}</td>
         </ng-container>
 
         <ng-container matColumnDef="variant">

diff --git a/...components/create-instance-form/select-image-dialog/select-image-dialog.component.spec.ts b/...components/create-instance-form/select-image-dialog/select-image-dialog.component.spec.ts
@@ -23,14 +23,14 @@ const imageChoices: Record<string, VirtualizationImage> = {
     label: 'Almalinux 8 (arm64, cloud)',
     os: 'Almalinux',
     release: '8',
-    arch: 'arm64',
+    archs: ['arm64'],
     variant: 'cloud',
   },
   'alpine/3.18/default': {
     label: 'Alpine 3.18 (armhf, default)',
     os: 'Alpine',
     release: '3.18',
-    arch: 'armhf',
+    archs: ['armhf'],
     variant: 'default',
   },
 } as unknown as Record<string, VirtualizationImage>;
@@ -74,7 +74,7 @@ describe('SelectImageDialogComponent', () => {
         'Label',
         'OS',
         'Release',
-        'Arch',
+        'Archs',
         'Variant',
         '',
       ]);

diff --git a/...tion/components/create-instance-form/select-image-dialog/select-image-dialog.component.ts b/...tion/components/create-instance-form/select-image-dialog/select-image-dialog.component.ts
@@ -54,7 +54,7 @@ export type VirtualizationImageWithId = VirtualizationImage & {
   changeDetection: ChangeDetectionStrategy.OnPush,
 })
 export class SelectImageDialogComponent implements OnInit {
-  protected readonly columns = ['label', 'os', 'release', 'arch', 'variant', 'actions'];
+  protected readonly columns = ['label', 'os', 'release', 'archs', 'variant', 'actions'];
   protected filterForm = this.fb.group({
     os: [''],
     variant: [''],

diff --git a/src/assets/i18n/af.json b/src/assets/i18n/af.json
@@ -459,8 +459,8 @@
   "Apps Write": "",
   "Apr": "",
   "Arbitrary Text": "",
-  "Arch": "",
   "Archive": "",
+  "Archs": "",
   "Are you sure you want to abort the <b>{task}</b> task?": "",
   "Are you sure you want to delete \"{name}\"?": "",
   "Are you sure you want to delete <b>{name}</b> Reporting Exporter?": "",

diff --git a/src/assets/i18n/ar.json b/src/assets/i18n/ar.json
@@ -459,8 +459,8 @@
   "Apps Write": "",
   "Apr": "",
   "Arbitrary Text": "",
-  "Arch": "",
   "Archive": "",
+  "Archs": "",
   "Are you sure you want to abort the <b>{task}</b> task?": "",
   "Are you sure you want to delete \"{name}\"?": "",
   "Are you sure you want to delete <b>{name}</b> Reporting Exporter?": "",

diff --git a/src/assets/i18n/ast.json b/src/assets/i18n/ast.json
@@ -459,8 +459,8 @@
   "Apps Write": "",
   "Apr": "",
   "Arbitrary Text": "",
-  "Arch": "",
   "Archive": "",
+  "Archs": "",
   "Are you sure you want to abort the <b>{task}</b> task?": "",
   "Are you sure you want to delete \"{name}\"?": "",
   "Are you sure you want to delete <b>{name}</b> Reporting Exporter?": "",

diff --git a/src/assets/i18n/az.json b/src/assets/i18n/az.json
@@ -459,8 +459,8 @@
   "Apps Write": "",
   "Apr": "",
   "Arbitrary Text": "",
-  "Arch": "",
   "Archive": "",
+  "Archs": "",
   "Are you sure you want to abort the <b>{task}</b> task?": "",
   "Are you sure you want to delete \"{name}\"?": "",
   "Are you sure you want to delete <b>{name}</b> Reporting Exporter?": "",

diff --git a/src/assets/i18n/be.json b/src/assets/i18n/be.json
@@ -459,8 +459,8 @@
   "Apps Write": "",
   "Apr": "",
   "Arbitrary Text": "",
-  "Arch": "",
   "Archive": "",
+  "Archs": "",
   "Are you sure you want to abort the <b>{task}</b> task?": "",
   "Are you sure you want to delete \"{name}\"?": "",
   "Are you sure you want to delete <b>{name}</b> Reporting Exporter?": "",

diff --git a/src/assets/i18n/bg.json b/src/assets/i18n/bg.json
@@ -459,8 +459,8 @@
   "Apps Write": "",
   "Apr": "",
   "Arbitrary Text": "",
-  "Arch": "",
   "Archive": "",
+  "Archs": "",
   "Are you sure you want to abort the <b>{task}</b> task?": "",
   "Are you sure you want to delete \"{name}\"?": "",
   "Are you sure you want to delete <b>{name}</b> Reporting Exporter?": "",

diff --git a/src/assets/i18n/bn.json b/src/assets/i18n/bn.json
@@ -459,8 +459,8 @@
   "Apps Write": "",
   "Apr": "",
   "Arbitrary Text": "",
-  "Arch": "",
   "Archive": "",
+  "Archs": "",
   "Are you sure you want to abort the <b>{task}</b> task?": "",
   "Are you sure you want to delete \"{name}\"?": "",
   "Are you sure you want to delete <b>{name}</b> Reporting Exporter?": "",

diff --git a/src/assets/i18n/br.json b/src/assets/i18n/br.json
@@ -459,8 +459,8 @@
   "Apps Write": "",
   "Apr": "",
   "Arbitrary Text": "",
-  "Arch": "",
   "Archive": "",
+  "Archs": "",
   "Are you sure you want to abort the <b>{task}</b> task?": "",
   "Are you sure you want to delete \"{name}\"?": "",
   "Are you sure you want to delete <b>{name}</b> Reporting Exporter?": "",

diff --git a/src/assets/i18n/bs.json b/src/assets/i18n/bs.json
@@ -459,8 +459,8 @@
   "Apps Write": "",
   "Apr": "",
   "Arbitrary Text": "",
-  "Arch": "",
   "Archive": "",
+  "Archs": "",
   "Are you sure you want to abort the <b>{task}</b> task?": "",
   "Are you sure you want to delete \"{name}\"?": "",
   "Are you sure you want to delete <b>{name}</b> Reporting Exporter?": "",

diff --git a/src/assets/i18n/ca.json b/src/assets/i18n/ca.json
@@ -459,8 +459,8 @@
   "Apps Write": "",
   "Apr": "",
   "Arbitrary Text": "",
-  "Arch": "",
   "Archive": "",
+  "Archs": "",
   "Are you sure you want to abort the <b>{task}</b> task?": "",
   "Are you sure you want to delete \"{name}\"?": "",
   "Are you sure you want to delete <b>{name}</b> Reporting Exporter?": "",

diff --git a/src/assets/i18n/cs.json b/src/assets/i18n/cs.json
@@ -162,8 +162,8 @@
   "Apps Write": "",
   "Apr": "",
   "Arbitrary Text": "",
-  "Arch": "",
   "Archive": "",
+  "Archs": "",
   "Are you sure you want to abort the <b>{task}</b> task?": "",
   "Are you sure you want to delete \"{name}\"?": "",
   "Are you sure you want to delete <b>{name}</b> Reporting Exporter?": "",

diff --git a/src/assets/i18n/cy.json b/src/assets/i18n/cy.json
@@ -459,8 +459,8 @@
   "Apps Write": "",
   "Apr": "",
   "Arbitrary Text": "",
-  "Arch": "",
   "Archive": "",
+  "Archs": "",
   "Are you sure you want to abort the <b>{task}</b> task?": "",
   "Are you sure you want to delete \"{name}\"?": "",
   "Are you sure you want to delete <b>{name}</b> Reporting Exporter?": "",

diff --git a/src/assets/i18n/da.json b/src/assets/i18n/da.json
@@ -459,8 +459,8 @@
   "Apps Write": "",
   "Apr": "",
   "Arbitrary Text": "",
-  "Arch": "",
   "Archive": "",
+  "Archs": "",
   "Are you sure you want to abort the <b>{task}</b> task?": "",
   "Are you sure you want to delete \"{name}\"?": "",
   "Are you sure you want to delete <b>{name}</b> Reporting Exporter?": "",

diff --git a/src/assets/i18n/de.json b/src/assets/i18n/de.json
@@ -322,7 +322,7 @@
   "Apps Write": "",
   "Apr": "",
   "Arbitrary Text": "",
-  "Arch": "",
+  "Archs": "",
   "Are you sure you want to abort the <b>{task}</b> task?": "",
   "Are you sure you want to delete \"{name}\"?": "",
   "Are you sure you want to delete <b>{name}</b> Reporting Exporter?": "",

diff --git a/src/assets/i18n/dsb.json b/src/assets/i18n/dsb.json
@@ -459,8 +459,8 @@
   "Apps Write": "",
   "Apr": "",
   "Arbitrary Text": "",
-  "Arch": "",
   "Archive": "",
+  "Archs": "",
   "Are you sure you want to abort the <b>{task}</b> task?": "",
   "Are you sure you want to delete \"{name}\"?": "",
   "Are you sure you want to delete <b>{name}</b> Reporting Exporter?": "",

diff --git a/src/assets/i18n/el.json b/src/assets/i18n/el.json
@@ -459,8 +459,8 @@
   "Apps Write": "",
   "Apr": "",
   "Arbitrary Text": "",
-  "Arch": "",
   "Archive": "",
+  "Archs": "",
   "Are you sure you want to abort the <b>{task}</b> task?": "",
   "Are you sure you want to delete \"{name}\"?": "",
   "Are you sure you want to delete <b>{name}</b> Reporting Exporter?": "",

diff --git a/src/assets/i18n/en-au.json b/src/assets/i18n/en-au.json
@@ -459,8 +459,8 @@
   "Apps Write": "",
   "Apr": "",
   "Arbitrary Text": "",
-  "Arch": "",
   "Archive": "",
+  "Archs": "",
   "Are you sure you want to abort the <b>{task}</b> task?": "",
   "Are you sure you want to delete \"{name}\"?": "",
   "Are you sure you want to delete <b>{name}</b> Reporting Exporter?": "",

diff --git a/src/assets/i18n/en-gb.json b/src/assets/i18n/en-gb.json
@@ -459,8 +459,8 @@
   "Apps Write": "",
   "Apr": "",
   "Arbitrary Text": "",
-  "Arch": "",
   "Archive": "",
+  "Archs": "",
   "Are you sure you want to abort the <b>{task}</b> task?": "",
   "Are you sure you want to delete \"{name}\"?": "",
   "Are you sure you want to delete <b>{name}</b> Reporting Exporter?": "",

diff --git a/src/assets/i18n/en.json b/src/assets/i18n/en.json
@@ -459,8 +459,8 @@
   "Apps Write": "",
   "Apr": "",
   "Arbitrary Text": "",
-  "Arch": "",
   "Archive": "",
+  "Archs": "",
   "Are you sure you want to abort the <b>{task}</b> task?": "",
   "Are you sure you want to delete \"{name}\"?": "",
   "Are you sure you want to delete <b>{name}</b> Reporting Exporter?": "",

diff --git a/src/assets/i18n/eo.json b/src/assets/i18n/eo.json
@@ -459,8 +459,8 @@
   "Apps Write": "",
   "Apr": "",
   "Arbitrary Text": "",
-  "Arch": "",
   "Archive": "",
+  "Archs": "",
   "Are you sure you want to abort the <b>{task}</b> task?": "",
   "Are you sure you want to delete \"{name}\"?": "",
   "Are you sure you want to delete <b>{name}</b> Reporting Exporter?": "",

diff --git a/src/assets/i18n/es-ar.json b/src/assets/i18n/es-ar.json
@@ -78,7 +78,7 @@
   "Application name must have the following:  1) Lowercase alphanumeric characters can be specified  2) Name must start with an alphabetic character and can end with alphanumeric character  3) Hyphen '-' is allowed but not as the first or last character e.g abc123, abc, abcd-1232": "",
   "Apps Read": "",
   "Apps Write": "",
-  "Arch": "",
+  "Archs": "",
   "Are you sure you want to delete NFS Share <b>\"{path}\"</b>?": "",
   "Are you sure you want to delete SMB Share <b>\"{name}\"</b>?": "",
   "Are you sure you want to delete address {ip}?": "",

diff --git a/src/assets/i18n/es-co.json b/src/assets/i18n/es-co.json
@@ -459,8 +459,8 @@
   "Apps Write": "",
   "Apr": "",
   "Arbitrary Text": "",
-  "Arch": "",
   "Archive": "",
+  "Archs": "",
   "Are you sure you want to abort the <b>{task}</b> task?": "",
   "Are you sure you want to delete \"{name}\"?": "",
   "Are you sure you want to delete <b>{name}</b> Reporting Exporter?": "",

diff --git a/src/assets/i18n/es-mx.json b/src/assets/i18n/es-mx.json
@@ -459,8 +459,8 @@
   "Apps Write": "",
   "Apr": "",
   "Arbitrary Text": "",
-  "Arch": "",
   "Archive": "",
+  "Archs": "",
   "Are you sure you want to abort the <b>{task}</b> task?": "",
   "Are you sure you want to delete \"{name}\"?": "",
   "Are you sure you want to delete <b>{name}</b> Reporting Exporter?": "",

diff --git a/src/assets/i18n/es-ni.json b/src/assets/i18n/es-ni.json
@@ -459,8 +459,8 @@
   "Apps Write": "",
   "Apr": "",
   "Arbitrary Text": "",
-  "Arch": "",
   "Archive": "",
+  "Archs": "",
   "Are you sure you want to abort the <b>{task}</b> task?": "",
   "Are you sure you want to delete \"{name}\"?": "",
   "Are you sure you want to delete <b>{name}</b> Reporting Exporter?": "",

diff --git a/src/assets/i18n/es-ve.json b/src/assets/i18n/es-ve.json
@@ -459,8 +459,8 @@
   "Apps Write": "",
   "Apr": "",
   "Arbitrary Text": "",
-  "Arch": "",
   "Archive": "",
+  "Archs": "",
   "Are you sure you want to abort the <b>{task}</b> task?": "",
   "Are you sure you want to delete \"{name}\"?": "",
   "Are you sure you want to delete <b>{name}</b> Reporting Exporter?": "",

diff --git a/src/assets/i18n/es.json b/src/assets/i18n/es.json
@@ -431,7 +431,7 @@
   "Apps Write": "",
   "Apr": "",
   "Arbitrary Text": "",
-  "Arch": "",
+  "Archs": "",
   "Are you sure you want to abort the <b>{task}</b> task?": "",
   "Are you sure you want to delete \"{name}\"?": "",
   "Are you sure you want to delete <b>{name}</b> Reporting Exporter?": "",

diff --git a/src/assets/i18n/et.json b/src/assets/i18n/et.json
@@ -459,8 +459,8 @@
   "Apps Write": "",
   "Apr": "",
   "Arbitrary Text": "",
-  "Arch": "",
   "Archive": "",
+  "Archs": "",
   "Are you sure you want to abort the <b>{task}</b> task?": "",
   "Are you sure you want to delete \"{name}\"?": "",
   "Are you sure you want to delete <b>{name}</b> Reporting Exporter?": "",

diff --git a/src/assets/i18n/eu.json b/src/assets/i18n/eu.json
@@ -459,8 +459,8 @@
   "Apps Write": "",
   "Apr": "",
   "Arbitrary Text": "",
-  "Arch": "",
   "Archive": "",
+  "Archs": "",
   "Are you sure you want to abort the <b>{task}</b> task?": "",
   "Are you sure you want to delete \"{name}\"?": "",
   "Are you sure you want to delete <b>{name}</b> Reporting Exporter?": "",

diff --git a/src/assets/i18n/fa.json b/src/assets/i18n/fa.json
@@ -459,8 +459,8 @@
   "Apps Write": "",
   "Apr": "",
   "Arbitrary Text": "",
-  "Arch": "",
   "Archive": "",
+  "Archs": "",
   "Are you sure you want to abort the <b>{task}</b> task?": "",
   "Are you sure you want to delete \"{name}\"?": "",
   "Are you sure you want to delete <b>{name}</b> Reporting Exporter?": "",

diff --git a/src/assets/i18n/fi.json b/src/assets/i18n/fi.json
@@ -459,8 +459,8 @@
   "Apps Write": "",
   "Apr": "",
   "Arbitrary Text": "",
-  "Arch": "",
   "Archive": "",
+  "Archs": "",
   "Are you sure you want to abort the <b>{task}</b> task?": "",
   "Are you sure you want to delete \"{name}\"?": "",
   "Are you sure you want to delete <b>{name}</b> Reporting Exporter?": "",

diff --git a/src/assets/i18n/fr.json b/src/assets/i18n/fr.json
@@ -39,7 +39,7 @@
   "Apps Read": "",
   "Apps Write": "",
   "Arbitrary Text": "",
-  "Arch": "",
+  "Archs": "",
   "Audit": "",
   "Audit Entry": "",
   "Audit ID": "",

diff --git a/src/assets/i18n/fy.json b/src/assets/i18n/fy.json
@@ -459,8 +459,8 @@
   "Apps Write": "",
   "Apr": "",
   "Arbitrary Text": "",
-  "Arch": "",
   "Archive": "",
+  "Archs": "",
   "Are you sure you want to abort the <b>{task}</b> task?": "",
   "Are you sure you want to delete \"{name}\"?": "",
   "Are you sure you want to delete <b>{name}</b> Reporting Exporter?": "",

diff --git a/src/assets/i18n/ga.json b/src/assets/i18n/ga.json
@@ -23,7 +23,7 @@
   "Application Network": "",
   "Apply updates and restart system after downloading.": "",
   "Applying important system or security updates.": "",
-  "Arch": "",
+  "Archs": "",
   "Are you sure you want to restore the default set of widgets?": "",
   "Automatically restart the system after the update is applied.": "",
   "Autostart": "",

diff --git a/src/assets/i18n/gd.json b/src/assets/i18n/gd.json
@@ -459,8 +459,8 @@
   "Apps Write": "",
   "Apr": "",
   "Arbitrary Text": "",
-  "Arch": "",
   "Archive": "",
+  "Archs": "",
   "Are you sure you want to abort the <b>{task}</b> task?": "",
   "Are you sure you want to delete \"{name}\"?": "",
   "Are you sure you want to delete <b>{name}</b> Reporting Exporter?": "",