NAS-131326 / 25.04 / Simplify HA upgrade logic + NAS-131325: system.reboot.info and failover.reboot.info methods and events

src/app/helptext/topbar.ts

@@ -17,7 +17,7 @@ export const helptextTopbar = {
     tc_connect: T('Connecting to TrueCommand'),
     tc_status: T('Status of TrueCommand'),
     update: T('Update in Progress'),
-    upgrade_waiting: T('Upgrade Waiting to Finish'),
+    reboot_info: T('Reboot Info'),
     pending_network_changes: T('Pending Network Changes'),
     directory_services_monitor: T('Directory Services Monitor'),
     resilvering: T('Resilvering'),

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

@@ -191,6 +191,7 @@ import {
 import { Privilege, PrivilegeRole, PrivilegeUpdate } from 'app/interfaces/privilege.interface';
 import { Process } from 'app/interfaces/process.interface';
 import { QueryParams } from 'app/interfaces/query-api.interface';
+import { FailoverRebootInfo, SystemRebootInfo } from 'app/interfaces/reboot-info.interface';
 import { ReplicationConfigUpdate } from 'app/interfaces/replication-config-update.interface';
 import { ReplicationConfig } from 'app/interfaces/replication-config.interface';
 import {
@@ -460,11 +461,11 @@ export interface ApiCallDirectory {
   'failover.get_ips': { params: void; response: string[] };
   'failover.licensed': { params: void; response: boolean };
   'failover.node': { params: void; response: string };
+  'failover.reboot.info': { params: void; response: FailoverRebootInfo };
   'failover.status': { params: void; response: FailoverStatus };
   'failover.sync_from_peer': { params: void; response: void };
   'failover.sync_to_peer': { params: [{ reboot?: boolean }]; response: void };
   'failover.update': { params: [FailoverUpdate]; response: FailoverConfig };
-  'failover.upgrade_pending': { params: void; response: boolean };
 
   // Filesystem
   'filesystem.acl_is_trivial': {
@@ -815,6 +816,7 @@ export interface ApiCallDirectory {
   'system.security.info.fips_available': { params: void; response: boolean };
   'system.set_time': { params: [number]; response: void };
   'system.ready': { params: void; response: boolean };
+  'system.reboot.info': { params: void; response: SystemRebootInfo };
   'system.state': { params: void; response: SystemState };
   'system.version': { params: void; response: string };
   'system.version_short': { params: void; response: string };

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

@@ -9,6 +9,7 @@ import { FailoverDisabledReasonEvent } from 'app/interfaces/failover-disabled-re
 import { Group } from 'app/interfaces/group.interface';
 import { Job } from 'app/interfaces/job.interface';
 import { Pool } from 'app/interfaces/pool.interface';
+import { FailoverRebootInfo, SystemRebootInfo } from 'app/interfaces/reboot-info.interface';
 import { ReportingRealtimeUpdate } from 'app/interfaces/reporting.interface';
 import { PoolScan } from 'app/interfaces/resilver-job.interface';
 import { Service } from 'app/interfaces/service.interface';
@@ -28,12 +29,14 @@ export interface ApiEventDirectory {
   'disk.query': { response: Disk };
   'docker.state': { response: DockerStatusData };
   'failover.disabled.reasons': { response: FailoverDisabledReasonEvent };
+  'failover.reboot.info': { response: FailoverRebootInfo };
   'failover.status': { response: { status: FailoverStatus } };
   'group.query': { response: Group };
   'pool.query': { response: Pool };
   'reporting.realtime': { response: ReportingRealtimeUpdate };
   'service.query': { response: Service };
   'smart.test.progress': { response: SmartTestProgressUpdate };
+  'system.reboot.info': { response: SystemRebootInfo };
   'truecommand.config': { response: TrueCommandConfig };
   'user.query': { response: User };
   'vm.query': { response: VirtualMachine };

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

@@ -110,7 +110,6 @@ export interface ApiJobDirectory {
   // Failover
   'failover.reboot.other_node': { params: void; response: void };
   'failover.upgrade': { params: [FailoverUpgradeParams]; response: boolean };
-  'failover.upgrade_finish': { params: void; response: boolean };
 
   // Filesystem
   'filesystem.put': { params: FilesystemPutParams; response: boolean };

src/app/interfaces/reboot-info.interface.ts

@@ -0,0 +1,14 @@
+export interface SystemRebootInfo {
+  boot_id: string;
+  reboot_required_reasons: RebootRequiredReasons[];
+}
+
+export interface FailoverRebootInfo {
+  this_node: SystemRebootInfo;
+  other_node: SystemRebootInfo | null;
+}
+
+export interface RebootRequiredReasons {
+  code: string;
+  reason: string;
+}

src/app/modules/alerts/components/alerts-panel/alerts-panel.component.spec.ts

@@ -71,7 +71,6 @@ describe('AlertsPanelComponent', () => {
               reasons: [],
             },
             isHaLicensed: true,
-            isUpgradePending: false,
           },
         },
       }),

src/app/modules/dialog/components/reboot-dialog/reboot-dialog.component.html

@@ -0,0 +1,42 @@
+<div class="dialog-content" mat-dialog-content>
+  <h3 mat-dialog-title class="dialog-title">
+    {{ 'Reboot Info' | translate }}
+  </h3>
+
+  <ng-container
+    *appLet="thisNodeInfo$ | async as nodeInfo"
+    [ngTemplateOutlet]="reasonsTemplate"
+    [ngTemplateOutletContext]="{
+      $implicit: {
+        reasons: nodeInfo?.reboot_required_reasons,
+        message: 'The local node must be rebooted because' | translate,
+      }
+    }"
+  ></ng-container>
+
+  <ng-container
+    *appLet="otherNodeInfo$ | async as nodeInfo"
+    [ngTemplateOutlet]="reasonsTemplate"
+    [ngTemplateOutletContext]="{
+      $implicit: {
+        reasons: nodeInfo?.reboot_required_reasons,
+        message: 'The remote node must be rebooted because' | translate,
+      }
+    }"
+  ></ng-container>
+</div>
+
+<ng-template #reasonsTemplate let-props>
+  @if (typeReasons(props.reasons); as reasons) {
+    <div class="reasons">
+      <p class="dialog-message">
+        <span>{{ props.message }}:</span>
+      </p>
+      @for (reason of reasons; track reason) {
+        <li>
+          {{ reason.reason }}
+        </li>
+      }
+    </div>
+  }
+</ng-template>

src/app/modules/dialog/components/reboot-dialog/reboot-dialog.component.scss

@@ -0,0 +1,14 @@
+.dialog-content {
+  padding-bottom: 5px;
+}
+
+.dialog-message,
+.dialog-title {
+  margin-bottom: 5px;
+  margin-top: 0;
+  padding: 0;
+}
+
+.reasons {
+  padding: 0 12px 12px;
+}

src/app/modules/dialog/components/reboot-dialog/reboot-dialog.component.spec.ts

@@ -0,0 +1,60 @@
+import { createComponentFactory, Spectator } from '@ngneat/spectator/jest';
+import { provideMockStore } from '@ngrx/store/testing';
+import { SystemRebootInfo } from 'app/interfaces/reboot-info.interface';
+import { RebootDialogComponent } from 'app/modules/dialog/components/reboot-dialog/reboot-dialog.component';
+import {
+  selectOtherNodeInfo,
+  selectThisNodeInfo,
+} from 'app/store/reboot-info/reboot-info.selectors';
+
+const fakeThisNodeInfo: SystemRebootInfo = {
+  boot_id: 'this-boot-id',
+  reboot_required_reasons: [
+    { code: 'FIPS', reason: 'Test Reason 1' },
+    { code: 'FIPS', reason: 'Test Reason 2' },
+  ],
+};
+
+const fakeOtherNodeInfo: SystemRebootInfo = {
+  boot_id: 'other-boot-id',
+  reboot_required_reasons: [
+    { code: 'FIPS', reason: 'Test Reason 3' },
+    { code: 'FIPS', reason: 'Test Reason 4' },
+  ],
+};
+
+describe('RebootDialogComponent', () => {
+  let spectator: Spectator<RebootDialogComponent>;
+  const createComponent = createComponentFactory({
+    component: RebootDialogComponent,
+    providers: [
+      provideMockStore({
+        selectors: [
+          {
+            selector: selectThisNodeInfo,
+            value: fakeThisNodeInfo,
+          },
+          {
+            selector: selectOtherNodeInfo,
+            value: fakeOtherNodeInfo,
+          },
+        ],
+      }),
+    ],
+  });
+
+  beforeEach(() => {
+    spectator = createComponent();
+  });
+
+  it('shows reasons', () => {
+    expect(
+      spectator.queryAll('.reasons li').map((item) => item.textContent.trim()),
+    ).toEqual([
+      'Test Reason 1',
+      'Test Reason 2',
+      'Test Reason 3',
+      'Test Reason 4',
+    ]);
+  });
+});

src/app/modules/dialog/components/reboot-dialog/reboot-dialog.component.ts

@@ -0,0 +1,39 @@
+import { CdkScrollable } from '@angular/cdk/scrolling';
+import { AsyncPipe, NgTemplateOutlet } from '@angular/common';
+import { ChangeDetectionStrategy, Component } from '@angular/core';
+import { MatDialogContent, MatDialogTitle } from '@angular/material/dialog';
+import { UntilDestroy } from '@ngneat/until-destroy';
+import { Store } from '@ngrx/store';
+import { TranslateModule } from '@ngx-translate/core';
+import { LetDirective } from 'app/directives/app-let.directive';
+import { RebootRequiredReasons } from 'app/interfaces/reboot-info.interface';
+import { AppsState } from 'app/store';
+import { selectOtherNodeInfo, selectThisNodeInfo } from 'app/store/reboot-info/reboot-info.selectors';
+
+@UntilDestroy()
+@Component({
+  selector: 'ix-reboot-dialog',
+  templateUrl: './reboot-dialog.component.html',
+  styleUrls: ['./reboot-dialog.component.scss'],
+  changeDetection: ChangeDetectionStrategy.OnPush,
+  standalone: true,
+  imports: [
+    CdkScrollable,
+    MatDialogContent,
+    MatDialogTitle,
+    TranslateModule,
+    AsyncPipe,
+    LetDirective,
+    NgTemplateOutlet,
+  ],
+})
+export class RebootDialogComponent {
+  thisNodeInfo$ = this.store$.select(selectThisNodeInfo);
+  otherNodeInfo$ = this.store$.select(selectOtherNodeInfo);
+
+  constructor(private store$: Store<AppsState>) {}
+
+  typeReasons(reasons: unknown): RebootRequiredReasons[] {
+    return reasons as RebootRequiredReasons[];
+  }
+}

src/app/modules/layout/topbar/topbar.component.html

@@ -39,8 +39,19 @@
 
         <ix-truecommand-button></ix-truecommand-button>
 
+        @if (hasRebootRequiredReasons) {
+          <button
+            mat-icon-button
+            class="topbar-button-right"
+            ixTest="reboot-info"
+            [matTooltip]="tooltips.reboot_info | translate"
+            (click)="showRebootInfoDialog()"
+          >
+            <ix-icon class="movement" name="update"></ix-icon>
+          </button>
+        }
+
         <!-- finish update -->
-        <ix-failover-upgrade-indicator></ix-failover-upgrade-indicator>
         @if (updateIsRunning) {
           <button
             mat-icon-button