NAS-132484: Add stop options to containers

truenas · Nov 14, 2024 · 0541317 · 0541317
1 parent 4e14c21
commit 0541317
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 11 deletions.
diff --git a/...zation/components/all-instances/instance-list/instance-row/instance-row.component.spec.ts b/...zation/components/all-instances/instance-list/instance-row/instance-row.component.spec.ts
@@ -5,8 +5,8 @@ import { createComponentFactory, mockProvider, Spectator } from '@ngneat/spectat
 import { MockComponent } from 'ng-mocks';
 import { of } from 'rxjs';
 import { fakeSuccessfulJob } from 'app/core/testing/utils/fake-job.utils';
+import { mockApi, mockJob } from 'app/core/testing/utils/mock-api.utils';
 import { mockAuth } from 'app/core/testing/utils/mock-auth.utils';
-import { mockJob, mockWebSocket } from 'app/core/testing/utils/mock-websocket.utils';
 import { VirtualizationStatus, VirtualizationType } from 'app/enums/virtualization.enum';
 import { VirtualizationInstance } from 'app/interfaces/virtualization.interface';
 import { DialogService } from 'app/modules/dialog/dialog.service';
@@ -18,7 +18,7 @@ import {
   StopOptionsDialogComponent,
   StopOptionsOperation,
 } from 'app/pages/virtualization/components/all-instances/instance-list/stop-options-dialog/stop-options-dialog.component';
-import { WebSocketService } from 'app/services/ws.service';
+import { ApiService } from 'app/services/api.service';
 
 const instance = {
   id: 'my-instance',
@@ -41,7 +41,7 @@ describe('InstanceRowComponent', () => {
     ],
     providers: [
       mockAuth(),
-      mockWebSocket([
+      mockApi([
         mockJob('virt.instance.restart', fakeSuccessfulJob()),
         mockJob('virt.instance.start', fakeSuccessfulJob()),
         mockJob('virt.instance.stop', fakeSuccessfulJob()),
@@ -126,7 +126,7 @@ describe('InstanceRowComponent', () => {
         .toHaveBeenCalledWith(StopOptionsDialogComponent, { data: StopOptionsOperation.Stop });
 
       expect(spectator.inject(DialogService).jobDialog).toHaveBeenCalled();
-      expect(spectator.inject(WebSocketService).job).toHaveBeenCalledWith(
+      expect(spectator.inject(ApiService).job).toHaveBeenCalledWith(
         'virt.instance.stop',
         ['my-instance', { force: true, timeout: -1 }],
       );
@@ -141,7 +141,7 @@ describe('InstanceRowComponent', () => {
         .toHaveBeenCalledWith(StopOptionsDialogComponent, { data: StopOptionsOperation.Restart });
 
       expect(spectator.inject(DialogService).jobDialog).toHaveBeenCalled();
-      expect(spectator.inject(WebSocketService).job).toHaveBeenCalledWith(
+      expect(spectator.inject(ApiService).job).toHaveBeenCalledWith(
         'virt.instance.restart',
         ['my-instance', { force: true, timeout: -1 }],
       );
@@ -158,7 +158,7 @@ describe('InstanceRowComponent', () => {
       await startIcon.click();
 
       expect(spectator.inject(DialogService).jobDialog).toHaveBeenCalled();
-      expect(spectator.inject(WebSocketService).job).toHaveBeenCalledWith('virt.instance.start', ['my-instance']);
+      expect(spectator.inject(ApiService).job).toHaveBeenCalledWith('virt.instance.start', ['my-instance']);
       expect(spectator.inject(SnackbarService).success).toHaveBeenCalledWith('Instance started');
     });
   });

diff --git a/...tualization/components/all-instances/instance-list/instance-row/instance-row.component.ts b/...tualization/components/all-instances/instance-list/instance-row/instance-row.component.ts
@@ -23,8 +23,8 @@ import { TestDirective } from 'app/modules/test-id/test.directive';
 import {
   StopOptionsDialogComponent, StopOptionsOperation,
 } from 'app/pages/virtualization/components/all-instances/instance-list/stop-options-dialog/stop-options-dialog.component';
+import { ApiService } from 'app/services/api.service';
 import { ErrorHandlerService } from 'app/services/error-handler.service';
-import { WebSocketService } from 'app/services/ws.service';
 
 @UntilDestroy()
 @Component({
@@ -60,7 +60,7 @@ export class InstanceRowComponent {
   constructor(
     private dialog: DialogService,
     private translate: TranslateService,
-    private ws: WebSocketService,
+    private api: ApiService,
     private errorHandler: ErrorHandlerService,
     private matDialog: MatDialog,
     private snackbar: SnackbarService,
@@ -70,7 +70,7 @@ export class InstanceRowComponent {
     const instanceId = this.instance().id;
 
     this.dialog.jobDialog(
-      this.ws.job('virt.instance.start', [instanceId]),
+      this.api.job('virt.instance.start', [instanceId]),
       { title: this.translate.instant('Starting...') },
     )
       .afterClosed()
@@ -90,7 +90,7 @@ export class InstanceRowComponent {
         filter(Boolean),
         switchMap((options: VirtualizationStopParams) => {
           return this.dialog.jobDialog(
-            this.ws.job('virt.instance.stop', [instanceId, options]),
+            this.api.job('virt.instance.stop', [instanceId, options]),
             { title: this.translate.instant('Stopping...') },
           )
             .afterClosed()
@@ -113,7 +113,7 @@ export class InstanceRowComponent {
         filter(Boolean),
         switchMap((options: VirtualizationStopParams) => {
           return this.dialog.jobDialog(
-            this.ws.job('virt.instance.restart', [instanceId, options]),
+            this.api.job('virt.instance.restart', [instanceId, options]),
             { title: this.translate.instant('Restarting...') },
           )
             .afterClosed()