Merge branch 'master' into NAS-131245

.github/workflows/main.yml

@@ -67,16 +67,25 @@ jobs:
       - name: Run tests
         run: yarn test:pr --shard=${{ matrix.shard }}/${{ strategy.job-total }}
       - name: Save shard coverage
-        run: mv coverage/webui/coverage-final.json coverage/${{matrix.shard}}.json && rm -rf coverage/webui
+        run: |
+          mv coverage/webui/coverage-final.json coverage/coverage-${{matrix.shard}}.json
+          mv coverage/webui/junit.xml coverage/junit-${{matrix.shard}}.xml
+          rm -rf coverage/webui
       - name: Upload coverage
         uses: actions/upload-artifact@v4
         with:
          name: coverage-${{ matrix.shard }}
-         path: coverage/${{matrix.shard}}.json
+         path: coverage/coverage-${{matrix.shard}}.json
+      - name: Upload test data
+        uses: actions/upload-artifact@v4
+        with:
+         name: coverage-junit-${{ matrix.shard }}
+         path: coverage/junit-${{matrix.shard}}.xml
 
   report-coverage:
     name: Collect coverage
     runs-on: ubuntu-latest
+    if: ${{ !cancelled() }}
     needs: [test]
     env:
       CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
@@ -87,12 +96,26 @@ jobs:
           pattern: 'coverage-*'
           path: coverage
           merge-multiple: true
+      - name: Collect test data from shards
+        uses: actions/download-artifact@v4
+        with:
+          pattern: 'junit-*'
+          path: coverage
+          merge-multiple: true
       - name: Merge Code Coverage
         run: npx -y nyc merge coverage/ coverage/merged-coverage.json
-      - name: Upload to Codecov
+      - name: Merge Test Data
+        run: npx -y junit-report-merger coverage/merged-junit.xml "coverage/junit-*.xml"
+      - name: Upload coverage to Codecov
         uses: codecov/codecov-action@v4
         with:
           name: webui
           token: ${{ env.CODECOV_TOKEN }}
           file: coverage/merged-coverage.json
           fail_ci_if_error: true
+      - name: Upload extra test data to Codecov
+        if: ${{ !cancelled() }}
+        uses: codecov/test-results-action@v1
+        with:
+          token: ${{ secrets.CODECOV_TOKEN }}
+          file: coverage/merged-junit.xml

jest.config.cjs

@@ -31,5 +31,15 @@ module.exports = {
   transformIgnorePatterns: [
     `node_modules/(?!(${esmPatterns.join('|')}))`
   ],
+  reporters: [
+    "default",
+    [
+      "jest-junit",
+      {
+        classNameTemplate: "{filepath}",
+        outputDirectory: "<rootDir>/coverage/webui"
+      },
+    ]
+  ],
   clearMocks: true,
 };

package.json

@@ -164,6 +164,7 @@
     "jest": "~29.7.0",
     "jest-canvas-mock": "^2.5.0",
     "jest-fail-on-console": "~3.3.0",
+    "jest-junit": "~16.0.0",
     "jest-preset-angular": "~14.2.4",
     "jest-when": "~3.6.0",
     "jira-prepare-commit-msg": "^1.6.1",

src/app/enums/dns-authenticator-type.enum.ts

@@ -1,4 +1,6 @@
 export enum DnsAuthenticatorType {
   Route53 = 'route53',
   Cloudflare = 'cloudflare',
+  Ovh = 'OVH',
+  Shell = 'shell',
 }

src/app/enums/virtualization.enum.ts

@@ -5,7 +5,7 @@ export enum VirtualizationType {
   Vm = 'VM',
 }
 
-export const virtualizationTypeMap = new Map<VirtualizationType, string>([
+export const virtualizationTypeLabels = new Map<VirtualizationType, string>([
   [VirtualizationType.Container, T('Container')],
   [VirtualizationType.Vm, T('VM')],
 ]);

src/app/helpers/get-dynamic-form-schema-node.ts

@@ -2,9 +2,9 @@ import { DynamicFormSchemaType } from 'app/enums/dynamic-form-schema-type.enum';
 import { SchemaType } from 'app/enums/schema.enum';
 import { toHumanReadableKey } from 'app/helpers/object-keys-to-human-readable.helper';
 import { DynamicFormSchemaCheckbox, DynamicFormSchemaInput, DynamicFormSchemaNode } from 'app/interfaces/dynamic-form-schema.interface';
-import { Schema } from 'app/interfaces/schema.interface';
+import { Schema, SchemaProperties } from 'app/interfaces/schema.interface';
 
-export function getDynamicFormSchemaNode(schema: Schema): DynamicFormSchemaNode {
+export function getDynamicFormSchemaNode(schema: SchemaProperties | Schema): DynamicFormSchemaNode {
   const baseSchema = {
     controlName: schema._name_,
     type: DynamicFormSchemaType.Input,

src/app/helpers/operators/to-loading-state.helper.ts

@@ -12,7 +12,7 @@ export interface LoadingState<T> {
 
 /**
  * Usage:
- * myData$ = this.ws.call('my.method').pipe(toLoadingState());
+ * myData$ = this.api.call('my.method').pipe(toLoadingState());
  *
  * <ng-container *ngIf="myData$ | async as data">
  *   <my-loading-spinner *ngIf="data.isLoading"></my-loading-spinner>

src/app/interfaces/api/api-call-directory.interface.ts

@@ -244,9 +244,9 @@ import {
   VmDisplayWebUriParams, VmPortWizardResult,
 } from 'app/interfaces/virtual-machine.interface';
 import {
-  VirtualizationDevice, VirtualizationGlobalConfig, AvailableGpu,
+  VirtualizationDevice, VirtualizationGlobalConfig,
   VirtualizationImage, VirtualizationImageParams,
-  VirtualizationInstance, VirtualizationNetwork, AvailableUsb,
+  VirtualizationInstance, VirtualizationNetwork, AvailableUsb, AvailableGpus,
 } from 'app/interfaces/virtualization.interface';
 import {
   VmDevice, VmDeviceDelete, VmDeviceUpdate, VmDisplayDevice, VmPassthroughDeviceChoice, VmUsbPassthroughDeviceChoice,
@@ -832,15 +832,16 @@ export interface ApiCallDirectory {
 
   // Virt
   'virt.instance.query': { params: QueryParams<VirtualizationInstance>; response: VirtualizationInstance[] };
-  'virt.instance.device_add': { params: [instanceId: string, device: VirtualizationDevice]; response: void }; // TODO
-  'virt.instance.device_delete': { params: [instanceId: string, name: string]; response: unknown }; // TODO:
+  'virt.instance.device_add': { params: [instanceId: string, device: VirtualizationDevice]; response: true };
+  'virt.instance.device_update': { params: [instanceId: string, device: VirtualizationDevice]; response: true };
+  'virt.instance.device_delete': { params: [instanceId: string, name: string]; response: true };
   'virt.instance.device_list': { params: [instanceId: string]; response: VirtualizationDevice[] };
   'virt.instance.image_choices': { params: [VirtualizationImageParams]; response: Record<string, VirtualizationImage> };
 
   'virt.device.disk_choices': { params: []; response: Choices };
   'virt.device.gpu_choices': {
     params: [instanceType: VirtualizationType, gpuType: VirtualizationGpuType];
-    response: Record<string, AvailableGpu>;
+    response: AvailableGpus;
   };
   'virt.device.usb_choices': { params: []; response: Record<string, AvailableUsb> };
 

src/app/interfaces/api/api-event-directory.interface.ts

@@ -18,7 +18,7 @@ import { SmartTestProgressUpdate } from 'app/interfaces/smart-test-progress.inte
 import { TrueCommandConfig } from 'app/interfaces/true-command-config.interface';
 import { User } from 'app/interfaces/user.interface';
 import { VirtualMachine } from 'app/interfaces/virtual-machine.interface';
-import { VirtualizationGlobalConfig, VirtualizationInstance } from 'app/interfaces/virtualization.interface';
+import { VirtualizationGlobalConfig, VirtualizationInstance, VirtualizationInstanceMetrics } from 'app/interfaces/virtualization.interface';
 import { ZfsSnapshot } from 'app/interfaces/zfs-snapshot.interface';
 
 export interface ApiEventDirectory {
@@ -43,6 +43,7 @@ export interface ApiEventDirectory {
   'truecommand.config': { response: TrueCommandConfig };
   'user.query': { response: User };
   'virt.instance.query': { response: VirtualizationInstance };
+  'virt.instance.metrics': { response: VirtualizationInstanceMetrics };
   'virt.instance.agent_running': { response: unknown }; // TODO: Fix type
   'vm.query': { response: VirtualMachine };
   'zfs.pool.scan': { response: PoolScan };

src/app/interfaces/api/api-job-directory.interface.ts

@@ -200,9 +200,9 @@ export interface ApiJobDirectory {
   // Virt
   'virt.instance.create': { params: [CreateVirtualizationInstance]; response: VirtualizationInstance };
   'virt.instance.delete': { params: [instanceId: string]; response: boolean };
-  'virt.instance.restart': { params: VirtualizationStopParams; response: boolean };
+  'virt.instance.restart': { params: [instanceId: string, params: VirtualizationStopParams]; response: boolean };
   'virt.instance.start': { params: [instanceId: string]; response: boolean };
-  'virt.instance.stop': { params: VirtualizationStopParams; response: boolean };
+  'virt.instance.stop': { params: [instanceId: string, params: VirtualizationStopParams]; response: boolean };
   'virt.instance.update': {
     params: [instanceId: string, update: UpdateVirtualizationInstance];
     response: VirtualizationInstance;

src/app/interfaces/dns-authenticator.interface.ts

@@ -1,36 +1,16 @@
 import { DnsAuthenticatorType } from 'app/enums/dns-authenticator-type.enum';
 import { Schema } from 'app/interfaces/schema.interface';
 
-export type DnsAuthenticator = CloudflareDnsAuthenticator | Route53DnsAuthenticator;
-
-export interface CloudflareDnsAuthenticator {
-  id: number;
-  name: string;
-  authenticator: DnsAuthenticatorType.Cloudflare;
-  attributes: {
-    // Either
-    api_token?: string;
-
-    // Or
-    cloudflare_email?: string;
-    api_key?: string;
-  };
-}
-
-export interface Route53DnsAuthenticator {
+export interface DnsAuthenticator {
   id: number;
   name: string;
-  authenticator: DnsAuthenticatorType.Route53;
-  attributes: {
-    access_key_id: string;
-    secret_access_key: string;
-  };
+  attributes: Record<string, string>;
 }
 
 export interface AuthenticatorSchema {
   key: DnsAuthenticatorType;
-  schema: Schema[];
+  schema: Schema;
 }
 
 export type CreateDnsAuthenticator = Omit<DnsAuthenticator, 'id'>;
-export type UpdateDnsAuthenticator = Omit<DnsAuthenticator, 'id' | 'authenticator'>;
+export type UpdateDnsAuthenticator = Omit<DnsAuthenticator, 'id'>;

src/app/interfaces/schema.interface.ts

@@ -1,7 +1,23 @@
 import { SchemaType } from 'app/enums/schema.enum';
 
-export interface Schema {
+export type Schema = {
+  properties: Record<string, SchemaProperties>;
+} & OldSchema;
+
+/**
+ * @deprecated Remove after "reporting.exporters.exporter_schemas" refactoring.
+ */
+export interface OldSchema {
+  title: string;
+  type: SchemaType | SchemaType[];
+  _name_: string;
+  _required_: boolean;
+
+}
+
+export interface SchemaProperties {
   title: string;
+  description?: string;
   type: SchemaType | SchemaType[];
   _name_: string;
   _required_: boolean;

src/app/interfaces/terminal.interface.ts

@@ -3,7 +3,6 @@ import { Observable, Subject } from 'rxjs';
 export interface TerminalConfiguration {
   reconnectShell$?: Subject<void>;
   preInit?(): Observable<void>;
-  customReconnectAction?(): void;
   connectionData: TerminalConnectionData;
 }
 

src/app/interfaces/virtualization.interface.ts

@@ -11,6 +11,18 @@ import {
   VirtualizationType,
 } from 'app/enums/virtualization.enum';
 
+export interface VirtualizationInstanceMetrics {
+  cpu: {
+    cpu_user_percentage: number;
+  };
+  mem_usage: {
+    mem_usage_ram_mib: number;
+  };
+  io_full_pressure: {
+    io_full_pressure_full_60_percentage: number;
+  };
+}
+
 export interface VirtualizationInstance {
   id: string;
   name: string;
@@ -135,13 +147,10 @@ export interface VirtualizationImage {
   variant: string;
 }
 
-export type VirtualizationStopParams = [
-  instanceId: string,
-  {
-    timeout?: number;
-    force?: boolean;
-  },
-];
+export interface VirtualizationStopParams {
+  timeout?: number;
+  force?: boolean;
+}
 
 export interface VirtualizationGlobalConfigUpdate {
   pool: string;
@@ -180,6 +189,11 @@ export interface AvailableGpu {
   vendor: string | null;
 }
 
+// eslint-disable-next-line @typescript-eslint/consistent-indexed-object-style
+export interface AvailableGpus {
+  [pci: string]: AvailableGpu;
+}
+
 export interface AvailableUsb {
   vendor_id: string;
   product_id: string;

src/app/modules/alerts/components/alert/alert.component.spec.ts

@@ -32,7 +32,7 @@ const dummyAlert = {
 
 describe('AlertComponent', () => {
   let spectator: Spectator<AlertComponent>;
-  let websocket: ApiService;
+  let api: ApiService;
   let alert: AlertPageObject;
   const createComponent = createComponentFactory({
     component: AlertComponent,
@@ -71,7 +71,7 @@ describe('AlertComponent', () => {
       },
     });
 
-    websocket = spectator.inject(ApiService);
+    api = spectator.inject(ApiService);
     alert = new AlertPageObject(spectator);
   });
 
@@ -103,7 +103,7 @@ describe('AlertComponent', () => {
   it('dismisses an open alert when Dismiss link is pressed', async () => {
     alert.clickDismissLink();
 
-    expect(websocket.call).toHaveBeenCalledWith('alert.dismiss', ['79']);
+    expect(api.call).toHaveBeenCalledWith('alert.dismiss', ['79']);
 
     const state = await firstValueFrom(spectator.inject(Store).pipe(map(selectAlerts)));
     expect(state).toEqual([
@@ -122,7 +122,7 @@ describe('AlertComponent', () => {
 
     alert.clickReopenLink();
 
-    expect(websocket.call).toHaveBeenCalledWith('alert.restore', ['79']);
+    expect(api.call).toHaveBeenCalledWith('alert.restore', ['79']);
 
     const state = await firstValueFrom(spectator.inject(Store).pipe(map(selectAlerts)));
     expect(state).toEqual([dummyAlert]);