NAS-134595: Fix instances in ui search

truenas · Mar 5, 2025 · 4afb574 · 4afb574
1 parent d677c5a
commit 4afb574
Show file tree

Hide file tree

Showing 95 changed files with 236 additions and 57 deletions.
diff --git a/src/app/pages/datasets/components/roles-card/roles-card.component.html b/src/app/pages/datasets/components/roles-card/roles-card.component.html
@@ -49,7 +49,7 @@ <h3 mat-card-title>{{ 'Roles' | translate }}</h3>
         <div class="vms value">
           {{ 'This dataset is used by: {vms}' | translate: { vms: vmNames() } }}
         </div>
-        <a class="action" ixTest="manage-vm-settings" [routerLink]="['/virtualization']">
+        <a class="action" ixTest="manage-vm-settings" [routerLink]="['/instances']">
           {{ 'Manage VM Settings' | translate }}
         </a>
       </div>

diff --git a/.../instances/components/all-instances/all-instances-header/all-instances-header.elements.ts b/.../instances/components/all-instances/all-instances-header/all-instances-header.elements.ts
@@ -2,9 +2,9 @@ import { marker as T } from '@biesbjerg/ngx-translate-extract-marker';
 import { UiSearchableElement } from 'app/modules/global-search/interfaces/ui-searchable-element.interface';
 
 export const allInstancesHeaderElements = {
-  hierarchy: [T('Virtualization'), T('Containers')],
-  synonyms: [T('VMs'), T('Virtual Machines')],
-  anchorRouterLink: ['/virtualization'],
+  hierarchy: [T('Instances')],
+  synonyms: [T('VMs'), T('Virtual Machines'), T('Virtualization'), T('Containers')],
+  anchorRouterLink: ['/instances'],
   elements: {
     globalSettings: {
       hierarchy: [T('Global Settings')],

diff --git a/src/app/pages/instances/components/all-instances/all-instances.elements.ts b/src/app/pages/instances/components/all-instances/all-instances.elements.ts
@@ -2,13 +2,13 @@ import { marker as T } from '@biesbjerg/ngx-translate-extract-marker';
 import { UiSearchableElement } from 'app/modules/global-search/interfaces/ui-searchable-element.interface';
 
 export const allInstancesElements = {
-  hierarchy: [T('Virtualization'), T('Containers')],
-  synonyms: [T('VM'), T('Virtual Machines')],
-  anchorRouterLink: ['/virtualization/view/def'],
+  hierarchy: [T('Instances')],
+  synonyms: [T('VM'), T('Virtual Machines'), T('Instances'), T('Incus'), T('Containers')],
+  anchorRouterLink: ['/instances/view/def'],
   elements: {
     list: {
-      hierarchy: [T('Instances')],
-      synonyms: [T('Containers')],
+      hierarchy: [T('List')],
+      synonyms: [T('Containers'), T('Instances'), T('Incus')],
       anchor: 'containers-list',
     },
   },

diff --git a/...pp/pages/instances/components/all-instances/instance-details/instance-details.elements.ts b/...pp/pages/instances/components/all-instances/instance-details/instance-details.elements.ts
@@ -2,9 +2,9 @@ import { marker as T } from '@biesbjerg/ngx-translate-extract-marker';
 import { UiSearchableElement } from 'app/modules/global-search/interfaces/ui-searchable-element.interface';
 
 export const instanceDetailsElements = {
-  hierarchy: [T('Virtualization'), T('Containers')],
-  synonyms: [T('VM'), T('Virtual Machines'), T('Instances')],
-  anchorRouterLink: ['/virtualization/view/def'],
+  hierarchy: [T('Instances')],
+  synonyms: [T('VM'), T('Virtual Machines'), T('Instances'), T('Virtualization'), T('Containers')],
+  anchorRouterLink: ['/instances/view/def'],
   elements: {
     generalInfo: {
       hierarchy: [T('General Info')],

diff --git a/...-instances/instance-details/instance-general-info/instance-general-info.component.spec.ts b/...-instances/instance-details/instance-general-info/instance-general-info.component.spec.ts
@@ -145,7 +145,7 @@ describe('InstanceGeneralInfoComponent', () => {
     expect(spectator.inject(DialogService).jobDialog).toHaveBeenCalled();
     expect(spectator.inject(ApiService).job).toHaveBeenLastCalledWith('virt.instance.delete', ['demo']);
 
-    expect(spectator.inject(Router).navigate).toHaveBeenCalledWith(['/virtualization'], { state: { hideMobileDetails: true } });
+    expect(spectator.inject(Router).navigate).toHaveBeenCalledWith(['/instaces'], { state: { hideMobileDetails: true } });
   });
 
   it('opens edit instance form when Edit is pressed', async () => {

diff --git a/...s/all-instances/instance-details/instance-general-info/instance-general-info.component.ts b/...s/all-instances/instance-details/instance-general-info/instance-general-info.component.ts
@@ -98,7 +98,7 @@ export class InstanceGeneralInfoComponent {
       this.errorHandler.catchError(),
       untilDestroyed(this),
     ).subscribe(() => {
-      this.router.navigate(['/virtualization'], { state: { hideMobileDetails: true } });
+      this.router.navigate(['/instances'], { state: { hideMobileDetails: true } });
     });
   }
 }
diff --git a/src/assets/i18n/af.json b/src/assets/i18n/af.json
@@ -2295,6 +2295,7 @@
   "Increase Root Disk Size": "",
   "Increase logging verbosity related to the active directory service in /var/log/middlewared.log": "",
   "Increasing disk size": "",
+  "Incus": "",
   "InfluxDB time series name for collected points.": "",
   "Info": "",
   "Informational": "",
@@ -2541,6 +2542,7 @@
   "Link aggregation interface": "",
   "Linked Service": "",
   "Linux Only": "",
+  "List": "",
   "List any existing dataset properties to remove from the replicated files.": "",
   "List of chat IDs": "",
   "List of files and directories to exclude from backup.<br>  Separate entries by pressing <code>Enter</code>. See  <a href=\"https://restic.readthedocs.io/en/latest/040_backup.html#excluding-files\" target=\"_blank\">restic exclude patterns</a>  for more details about the <code>--exclude</code> option.": "",

diff --git a/src/assets/i18n/ar.json b/src/assets/i18n/ar.json
@@ -2295,6 +2295,7 @@
   "Increase Root Disk Size": "",
   "Increase logging verbosity related to the active directory service in /var/log/middlewared.log": "",
   "Increasing disk size": "",
+  "Incus": "",
   "InfluxDB time series name for collected points.": "",
   "Info": "",
   "Informational": "",
@@ -2541,6 +2542,7 @@
   "Link aggregation interface": "",
   "Linked Service": "",
   "Linux Only": "",
+  "List": "",
   "List any existing dataset properties to remove from the replicated files.": "",
   "List of chat IDs": "",
   "List of files and directories to exclude from backup.<br>  Separate entries by pressing <code>Enter</code>. See  <a href=\"https://restic.readthedocs.io/en/latest/040_backup.html#excluding-files\" target=\"_blank\">restic exclude patterns</a>  for more details about the <code>--exclude</code> option.": "",

diff --git a/src/assets/i18n/ast.json b/src/assets/i18n/ast.json
@@ -2295,6 +2295,7 @@
   "Increase Root Disk Size": "",
   "Increase logging verbosity related to the active directory service in /var/log/middlewared.log": "",
   "Increasing disk size": "",
+  "Incus": "",
   "InfluxDB time series name for collected points.": "",
   "Info": "",
   "Informational": "",
@@ -2541,6 +2542,7 @@
   "Link aggregation interface": "",
   "Linked Service": "",
   "Linux Only": "",
+  "List": "",
   "List any existing dataset properties to remove from the replicated files.": "",
   "List of chat IDs": "",
   "List of files and directories to exclude from backup.<br>  Separate entries by pressing <code>Enter</code>. See  <a href=\"https://restic.readthedocs.io/en/latest/040_backup.html#excluding-files\" target=\"_blank\">restic exclude patterns</a>  for more details about the <code>--exclude</code> option.": "",

diff --git a/src/assets/i18n/az.json b/src/assets/i18n/az.json
@@ -2295,6 +2295,7 @@
   "Increase Root Disk Size": "",
   "Increase logging verbosity related to the active directory service in /var/log/middlewared.log": "",
   "Increasing disk size": "",
+  "Incus": "",
   "InfluxDB time series name for collected points.": "",
   "Info": "",
   "Informational": "",
@@ -2541,6 +2542,7 @@
   "Link aggregation interface": "",
   "Linked Service": "",
   "Linux Only": "",
+  "List": "",
   "List any existing dataset properties to remove from the replicated files.": "",
   "List of chat IDs": "",
   "List of files and directories to exclude from backup.<br>  Separate entries by pressing <code>Enter</code>. See  <a href=\"https://restic.readthedocs.io/en/latest/040_backup.html#excluding-files\" target=\"_blank\">restic exclude patterns</a>  for more details about the <code>--exclude</code> option.": "",

diff --git a/src/assets/i18n/be.json b/src/assets/i18n/be.json
@@ -2295,6 +2295,7 @@
   "Increase Root Disk Size": "",
   "Increase logging verbosity related to the active directory service in /var/log/middlewared.log": "",
   "Increasing disk size": "",
+  "Incus": "",
   "InfluxDB time series name for collected points.": "",
   "Info": "",
   "Informational": "",
@@ -2541,6 +2542,7 @@
   "Link aggregation interface": "",
   "Linked Service": "",
   "Linux Only": "",
+  "List": "",
   "List any existing dataset properties to remove from the replicated files.": "",
   "List of chat IDs": "",
   "List of files and directories to exclude from backup.<br>  Separate entries by pressing <code>Enter</code>. See  <a href=\"https://restic.readthedocs.io/en/latest/040_backup.html#excluding-files\" target=\"_blank\">restic exclude patterns</a>  for more details about the <code>--exclude</code> option.": "",

diff --git a/src/assets/i18n/bg.json b/src/assets/i18n/bg.json
@@ -2295,6 +2295,7 @@
   "Increase Root Disk Size": "",
   "Increase logging verbosity related to the active directory service in /var/log/middlewared.log": "",
   "Increasing disk size": "",
+  "Incus": "",
   "InfluxDB time series name for collected points.": "",
   "Info": "",
   "Informational": "",
@@ -2541,6 +2542,7 @@
   "Link aggregation interface": "",
   "Linked Service": "",
   "Linux Only": "",
+  "List": "",
   "List any existing dataset properties to remove from the replicated files.": "",
   "List of chat IDs": "",
   "List of files and directories to exclude from backup.<br>  Separate entries by pressing <code>Enter</code>. See  <a href=\"https://restic.readthedocs.io/en/latest/040_backup.html#excluding-files\" target=\"_blank\">restic exclude patterns</a>  for more details about the <code>--exclude</code> option.": "",

diff --git a/src/assets/i18n/bn.json b/src/assets/i18n/bn.json
@@ -2295,6 +2295,7 @@
   "Increase Root Disk Size": "",
   "Increase logging verbosity related to the active directory service in /var/log/middlewared.log": "",
   "Increasing disk size": "",
+  "Incus": "",
   "InfluxDB time series name for collected points.": "",
   "Info": "",
   "Informational": "",
@@ -2541,6 +2542,7 @@
   "Link aggregation interface": "",
   "Linked Service": "",
   "Linux Only": "",
+  "List": "",
   "List any existing dataset properties to remove from the replicated files.": "",
   "List of chat IDs": "",
   "List of files and directories to exclude from backup.<br>  Separate entries by pressing <code>Enter</code>. See  <a href=\"https://restic.readthedocs.io/en/latest/040_backup.html#excluding-files\" target=\"_blank\">restic exclude patterns</a>  for more details about the <code>--exclude</code> option.": "",

diff --git a/src/assets/i18n/br.json b/src/assets/i18n/br.json
@@ -2295,6 +2295,7 @@
   "Increase Root Disk Size": "",
   "Increase logging verbosity related to the active directory service in /var/log/middlewared.log": "",
   "Increasing disk size": "",
+  "Incus": "",
   "InfluxDB time series name for collected points.": "",
   "Info": "",
   "Informational": "",
@@ -2541,6 +2542,7 @@
   "Link aggregation interface": "",
   "Linked Service": "",
   "Linux Only": "",
+  "List": "",
   "List any existing dataset properties to remove from the replicated files.": "",
   "List of chat IDs": "",
   "List of files and directories to exclude from backup.<br>  Separate entries by pressing <code>Enter</code>. See  <a href=\"https://restic.readthedocs.io/en/latest/040_backup.html#excluding-files\" target=\"_blank\">restic exclude patterns</a>  for more details about the <code>--exclude</code> option.": "",

diff --git a/src/assets/i18n/bs.json b/src/assets/i18n/bs.json
@@ -2295,6 +2295,7 @@
   "Increase Root Disk Size": "",
   "Increase logging verbosity related to the active directory service in /var/log/middlewared.log": "",
   "Increasing disk size": "",
+  "Incus": "",
   "InfluxDB time series name for collected points.": "",
   "Info": "",
   "Informational": "",
@@ -2541,6 +2542,7 @@
   "Link aggregation interface": "",
   "Linked Service": "",
   "Linux Only": "",
+  "List": "",
   "List any existing dataset properties to remove from the replicated files.": "",
   "List of chat IDs": "",
   "List of files and directories to exclude from backup.<br>  Separate entries by pressing <code>Enter</code>. See  <a href=\"https://restic.readthedocs.io/en/latest/040_backup.html#excluding-files\" target=\"_blank\">restic exclude patterns</a>  for more details about the <code>--exclude</code> option.": "",

diff --git a/src/assets/i18n/ca.json b/src/assets/i18n/ca.json
@@ -2295,6 +2295,7 @@
   "Increase Root Disk Size": "",
   "Increase logging verbosity related to the active directory service in /var/log/middlewared.log": "",
   "Increasing disk size": "",
+  "Incus": "",
   "InfluxDB time series name for collected points.": "",
   "Info": "",
   "Informational": "",
@@ -2541,6 +2542,7 @@
   "Link aggregation interface": "",
   "Linked Service": "",
   "Linux Only": "",
+  "List": "",
   "List any existing dataset properties to remove from the replicated files.": "",
   "List of chat IDs": "",
   "List of files and directories to exclude from backup.<br>  Separate entries by pressing <code>Enter</code>. See  <a href=\"https://restic.readthedocs.io/en/latest/040_backup.html#excluding-files\" target=\"_blank\">restic exclude patterns</a>  for more details about the <code>--exclude</code> option.": "",

diff --git a/src/assets/i18n/cs.json b/src/assets/i18n/cs.json
@@ -1823,6 +1823,7 @@
   "Increase Root Disk Size": "",
   "Increase logging verbosity related to the active directory service in /var/log/middlewared.log": "",
   "Increasing disk size": "",
+  "Incus": "",
   "InfluxDB time series name for collected points.": "",
   "Info": "",
   "Inherit": "",
@@ -2050,6 +2051,7 @@
   "Link aggregation interface": "",
   "Linked Service": "",
   "Linux Only": "",
+  "List": "",
   "List any existing dataset properties to remove from the replicated files.": "",
   "List of chat IDs": "",
   "List of files and directories to exclude from backup.<br>  Separate entries by pressing <code>Enter</code>. See  <a href=\"https://restic.readthedocs.io/en/latest/040_backup.html#excluding-files\" target=\"_blank\">restic exclude patterns</a>  for more details about the <code>--exclude</code> option.": "",

diff --git a/src/assets/i18n/cy.json b/src/assets/i18n/cy.json
@@ -2295,6 +2295,7 @@
   "Increase Root Disk Size": "",
   "Increase logging verbosity related to the active directory service in /var/log/middlewared.log": "",
   "Increasing disk size": "",
+  "Incus": "",
   "InfluxDB time series name for collected points.": "",
   "Info": "",
   "Informational": "",
@@ -2541,6 +2542,7 @@
   "Link aggregation interface": "",
   "Linked Service": "",
   "Linux Only": "",
+  "List": "",
   "List any existing dataset properties to remove from the replicated files.": "",
   "List of chat IDs": "",
   "List of files and directories to exclude from backup.<br>  Separate entries by pressing <code>Enter</code>. See  <a href=\"https://restic.readthedocs.io/en/latest/040_backup.html#excluding-files\" target=\"_blank\">restic exclude patterns</a>  for more details about the <code>--exclude</code> option.": "",

diff --git a/src/assets/i18n/da.json b/src/assets/i18n/da.json
@@ -2295,6 +2295,7 @@
   "Increase Root Disk Size": "",
   "Increase logging verbosity related to the active directory service in /var/log/middlewared.log": "",
   "Increasing disk size": "",
+  "Incus": "",
   "InfluxDB time series name for collected points.": "",
   "Info": "",
   "Informational": "",
@@ -2541,6 +2542,7 @@
   "Link aggregation interface": "",
   "Linked Service": "",
   "Linux Only": "",
+  "List": "",
   "List any existing dataset properties to remove from the replicated files.": "",
   "List of chat IDs": "",
   "List of files and directories to exclude from backup.<br>  Separate entries by pressing <code>Enter</code>. See  <a href=\"https://restic.readthedocs.io/en/latest/040_backup.html#excluding-files\" target=\"_blank\">restic exclude patterns</a>  for more details about the <code>--exclude</code> option.": "",

diff --git a/src/assets/i18n/de.json b/src/assets/i18n/de.json
@@ -1671,6 +1671,7 @@
   "Increase Root Disk Size": "",
   "Increase logging verbosity related to the active directory service in /var/log/middlewared.log": "",
   "Increasing disk size": "",
+  "Incus": "",
   "InfluxDB time series name for collected points.": "",
   "Informational": "",
   "Inherit": "",
@@ -1874,6 +1875,7 @@
   "Link aggregation interface": "",
   "Linked Service": "",
   "Linux Only": "",
+  "List": "",
   "List any existing dataset properties to remove from the replicated files.": "",
   "List of chat IDs": "",
   "List of files and directories to exclude from backup.<br>  Separate entries by pressing <code>Enter</code>. See  <a href=\"https://restic.readthedocs.io/en/latest/040_backup.html#excluding-files\" target=\"_blank\">restic exclude patterns</a>  for more details about the <code>--exclude</code> option.": "",

diff --git a/src/assets/i18n/dsb.json b/src/assets/i18n/dsb.json
@@ -2295,6 +2295,7 @@
   "Increase Root Disk Size": "",
   "Increase logging verbosity related to the active directory service in /var/log/middlewared.log": "",
   "Increasing disk size": "",
+  "Incus": "",
   "InfluxDB time series name for collected points.": "",
   "Info": "",
   "Informational": "",
@@ -2541,6 +2542,7 @@
   "Link aggregation interface": "",
   "Linked Service": "",
   "Linux Only": "",
+  "List": "",
   "List any existing dataset properties to remove from the replicated files.": "",
   "List of chat IDs": "",
   "List of files and directories to exclude from backup.<br>  Separate entries by pressing <code>Enter</code>. See  <a href=\"https://restic.readthedocs.io/en/latest/040_backup.html#excluding-files\" target=\"_blank\">restic exclude patterns</a>  for more details about the <code>--exclude</code> option.": "",

diff --git a/src/assets/i18n/el.json b/src/assets/i18n/el.json
@@ -2295,6 +2295,7 @@
   "Increase Root Disk Size": "",
   "Increase logging verbosity related to the active directory service in /var/log/middlewared.log": "",
   "Increasing disk size": "",
+  "Incus": "",
   "InfluxDB time series name for collected points.": "",
   "Info": "",
   "Informational": "",
@@ -2541,6 +2542,7 @@
   "Link aggregation interface": "",
   "Linked Service": "",
   "Linux Only": "",
+  "List": "",
   "List any existing dataset properties to remove from the replicated files.": "",
   "List of chat IDs": "",
   "List of files and directories to exclude from backup.<br>  Separate entries by pressing <code>Enter</code>. See  <a href=\"https://restic.readthedocs.io/en/latest/040_backup.html#excluding-files\" target=\"_blank\">restic exclude patterns</a>  for more details about the <code>--exclude</code> option.": "",

diff --git a/src/assets/i18n/en-au.json b/src/assets/i18n/en-au.json
@@ -2295,6 +2295,7 @@
   "Increase Root Disk Size": "",
   "Increase logging verbosity related to the active directory service in /var/log/middlewared.log": "",
   "Increasing disk size": "",
+  "Incus": "",
   "InfluxDB time series name for collected points.": "",
   "Info": "",
   "Informational": "",
@@ -2541,6 +2542,7 @@
   "Link aggregation interface": "",
   "Linked Service": "",
   "Linux Only": "",
+  "List": "",
   "List any existing dataset properties to remove from the replicated files.": "",
   "List of chat IDs": "",
   "List of files and directories to exclude from backup.<br>  Separate entries by pressing <code>Enter</code>. See  <a href=\"https://restic.readthedocs.io/en/latest/040_backup.html#excluding-files\" target=\"_blank\">restic exclude patterns</a>  for more details about the <code>--exclude</code> option.": "",

diff --git a/src/assets/i18n/en-gb.json b/src/assets/i18n/en-gb.json
@@ -2295,6 +2295,7 @@
   "Increase Root Disk Size": "",
   "Increase logging verbosity related to the active directory service in /var/log/middlewared.log": "",
   "Increasing disk size": "",
+  "Incus": "",
   "InfluxDB time series name for collected points.": "",
   "Info": "",
   "Informational": "",
@@ -2541,6 +2542,7 @@
   "Link aggregation interface": "",
   "Linked Service": "",
   "Linux Only": "",
+  "List": "",
   "List any existing dataset properties to remove from the replicated files.": "",
   "List of chat IDs": "",
   "List of files and directories to exclude from backup.<br>  Separate entries by pressing <code>Enter</code>. See  <a href=\"https://restic.readthedocs.io/en/latest/040_backup.html#excluding-files\" target=\"_blank\">restic exclude patterns</a>  for more details about the <code>--exclude</code> option.": "",

diff --git a/src/assets/i18n/en.json b/src/assets/i18n/en.json
@@ -2295,6 +2295,7 @@
   "Increase Root Disk Size": "",
   "Increase logging verbosity related to the active directory service in /var/log/middlewared.log": "",
   "Increasing disk size": "",
+  "Incus": "",
   "InfluxDB time series name for collected points.": "",
   "Info": "",
   "Informational": "",
@@ -2541,6 +2542,7 @@
   "Link aggregation interface": "",
   "Linked Service": "",
   "Linux Only": "",
+  "List": "",
   "List any existing dataset properties to remove from the replicated files.": "",
   "List of chat IDs": "",
   "List of files and directories to exclude from backup.<br>  Separate entries by pressing <code>Enter</code>. See  <a href=\"https://restic.readthedocs.io/en/latest/040_backup.html#excluding-files\" target=\"_blank\">restic exclude patterns</a>  for more details about the <code>--exclude</code> option.": "",

diff --git a/src/assets/i18n/eo.json b/src/assets/i18n/eo.json
@@ -2295,6 +2295,7 @@
   "Increase Root Disk Size": "",
   "Increase logging verbosity related to the active directory service in /var/log/middlewared.log": "",
   "Increasing disk size": "",
+  "Incus": "",
   "InfluxDB time series name for collected points.": "",
   "Info": "",
   "Informational": "",
@@ -2541,6 +2542,7 @@
   "Link aggregation interface": "",
   "Linked Service": "",
   "Linux Only": "",
+  "List": "",
   "List any existing dataset properties to remove from the replicated files.": "",
   "List of chat IDs": "",
   "List of files and directories to exclude from backup.<br>  Separate entries by pressing <code>Enter</code>. See  <a href=\"https://restic.readthedocs.io/en/latest/040_backup.html#excluding-files\" target=\"_blank\">restic exclude patterns</a>  for more details about the <code>--exclude</code> option.": "",