NAS-129364 / 24.10 / "There are unapplied network interface changes" …

…window is displayed incorrectly (#10396) * NAS-129364: "There are unapplied network interface changes" window is displayed incorrectly * NAS-129364: PR Update
truenas · Aug 6, 2024 · c7b5350 · c7b5350
1 parent f9d3c8f
commit c7b5350
Show file tree

Hide file tree

Showing 91 changed files with 191 additions and 3 deletions.
diff --git a/src/app/helptext/network/interfaces/interfaces-list.ts b/src/app/helptext/network/interfaces/interfaces-list.ts
@@ -22,6 +22,10 @@ export const helptextInterfaces = {
   rollback_changes_title: T('Revert Network Interface Changes'),
   rollback_changes_warning: T('Revert interface changes? All changes that are being tested will be lost.'),
   changes_rolled_back: T('Interface changes reverted.'),
+  network_reconnection_issue: T('Network Reconnection Issue'),
+  network_reconnection_issue_text: T('We encountered an issue while applying the new network changes. \
+ Unfortunately, we were unable to reconnect to the system after the changes were implemented. \
+ As a result, we have restored the previous network configuration to ensure continued connectivity.'),
 
   services_restarted: {
     title: T('Attention'),

diff --git a/src/app/modules/global-search/components/global-search/global-search.component.ts b/src/app/modules/global-search/components/global-search/global-search.component.ts
@@ -216,7 +216,7 @@ export class GlobalSearchComponent implements OnInit, AfterViewInit, OnDestroy {
 
   private handleFocusOut(event: FocusEvent): void {
     const relatedTarget = event.relatedTarget as HTMLElement;
-    if (!relatedTarget || !this.searchBoxWrapper.nativeElement.contains(relatedTarget)) {
+    if (relatedTarget && !this.searchBoxWrapper.nativeElement.contains(relatedTarget)) {
       this.detachOverlay();
     }
   }

diff --git a/src/app/pages/network/network.component.ts b/src/app/pages/network/network.component.ts
@@ -165,7 +165,7 @@ export class NetworkComponent implements OnInit {
     );
   }
 
-  private handleWaitingCheckIn(seconds: number): void {
+  private handleWaitingCheckIn(seconds: number, isAfterInterfaceCommit = false): void {
     if (seconds !== null) {
       if (seconds > 0 && this.checkinRemaining === null) {
         this.checkinRemaining = Math.round(seconds);
@@ -189,6 +189,14 @@ export class NetworkComponent implements OnInit {
       if (this.checkinInterval) {
         clearInterval(this.checkinInterval);
       }
+      // Inform user that we have restored the previous network configuration to ensure continued connectivity.
+      if (isAfterInterfaceCommit) {
+        this.hasPendingChanges = false;
+        this.dialogService.warn(
+          this.translate.instant(this.helptext.network_reconnection_issue),
+          this.translate.instant(this.helptext.network_reconnection_issue_text),
+        );
+      }
     }
   }
 
@@ -243,7 +251,7 @@ export class NetworkComponent implements OnInit {
               .subscribe((checkInSeconds) => {
                 this.store$.dispatch(networkInterfacesChanged({ commit: true, checkIn: false }));
                 this.interfacesStore.loadInterfaces();
-                this.handleWaitingCheckIn(checkInSeconds);
+                this.handleWaitingCheckIn(checkInSeconds, true);
                 this.cdr.markForCheck();
               });
           });

diff --git a/src/assets/i18n/af.json b/src/assets/i18n/af.json
@@ -2721,6 +2721,7 @@
   "Network Interface Card": "",
   "Network Interface Read": "",
   "Network Interface Write": "",
+  "Network Reconnection Issue": "",
   "Network Reports": "",
   "Network Settings": "",
   "Network Stats": "",
@@ -4850,6 +4851,7 @@
   "Warning: {n} of {total} snapshots could not be deleted.": "",
   "Warnings": "",
   "Watch List": "",
+  "We encountered an issue while applying the new network changes.  Unfortunately, we were unable to reconnect to the system after the changes were implemented.  As a result, we have restored the previous network configuration to ensure continued connectivity.": "",
   "We've generated a Netdata password and attempted to automatically log you in in a new tab.": "",
   "Weak Ciphers": "",
   "Web Interface": "",

diff --git a/src/assets/i18n/ar.json b/src/assets/i18n/ar.json
@@ -2721,6 +2721,7 @@
   "Network Interface Card": "",
   "Network Interface Read": "",
   "Network Interface Write": "",
+  "Network Reconnection Issue": "",
   "Network Reports": "",
   "Network Settings": "",
   "Network Stats": "",
@@ -4850,6 +4851,7 @@
   "Warning: {n} of {total} snapshots could not be deleted.": "",
   "Warnings": "",
   "Watch List": "",
+  "We encountered an issue while applying the new network changes.  Unfortunately, we were unable to reconnect to the system after the changes were implemented.  As a result, we have restored the previous network configuration to ensure continued connectivity.": "",
   "We've generated a Netdata password and attempted to automatically log you in in a new tab.": "",
   "Weak Ciphers": "",
   "Web Interface": "",

diff --git a/src/assets/i18n/ast.json b/src/assets/i18n/ast.json
@@ -2721,6 +2721,7 @@
   "Network Interface Card": "",
   "Network Interface Read": "",
   "Network Interface Write": "",
+  "Network Reconnection Issue": "",
   "Network Reports": "",
   "Network Settings": "",
   "Network Stats": "",
@@ -4850,6 +4851,7 @@
   "Warning: {n} of {total} snapshots could not be deleted.": "",
   "Warnings": "",
   "Watch List": "",
+  "We encountered an issue while applying the new network changes.  Unfortunately, we were unable to reconnect to the system after the changes were implemented.  As a result, we have restored the previous network configuration to ensure continued connectivity.": "",
   "We've generated a Netdata password and attempted to automatically log you in in a new tab.": "",
   "Weak Ciphers": "",
   "Web Interface": "",

diff --git a/src/assets/i18n/az.json b/src/assets/i18n/az.json
@@ -2721,6 +2721,7 @@
   "Network Interface Card": "",
   "Network Interface Read": "",
   "Network Interface Write": "",
+  "Network Reconnection Issue": "",
   "Network Reports": "",
   "Network Settings": "",
   "Network Stats": "",
@@ -4850,6 +4851,7 @@
   "Warning: {n} of {total} snapshots could not be deleted.": "",
   "Warnings": "",
   "Watch List": "",
+  "We encountered an issue while applying the new network changes.  Unfortunately, we were unable to reconnect to the system after the changes were implemented.  As a result, we have restored the previous network configuration to ensure continued connectivity.": "",
   "We've generated a Netdata password and attempted to automatically log you in in a new tab.": "",
   "Weak Ciphers": "",
   "Web Interface": "",

diff --git a/src/assets/i18n/be.json b/src/assets/i18n/be.json
@@ -2721,6 +2721,7 @@
   "Network Interface Card": "",
   "Network Interface Read": "",
   "Network Interface Write": "",
+  "Network Reconnection Issue": "",
   "Network Reports": "",
   "Network Settings": "",
   "Network Stats": "",
@@ -4850,6 +4851,7 @@
   "Warning: {n} of {total} snapshots could not be deleted.": "",
   "Warnings": "",
   "Watch List": "",
+  "We encountered an issue while applying the new network changes.  Unfortunately, we were unable to reconnect to the system after the changes were implemented.  As a result, we have restored the previous network configuration to ensure continued connectivity.": "",
   "We've generated a Netdata password and attempted to automatically log you in in a new tab.": "",
   "Weak Ciphers": "",
   "Web Interface": "",

diff --git a/src/assets/i18n/bg.json b/src/assets/i18n/bg.json
@@ -2721,6 +2721,7 @@
   "Network Interface Card": "",
   "Network Interface Read": "",
   "Network Interface Write": "",
+  "Network Reconnection Issue": "",
   "Network Reports": "",
   "Network Settings": "",
   "Network Stats": "",
@@ -4850,6 +4851,7 @@
   "Warning: {n} of {total} snapshots could not be deleted.": "",
   "Warnings": "",
   "Watch List": "",
+  "We encountered an issue while applying the new network changes.  Unfortunately, we were unable to reconnect to the system after the changes were implemented.  As a result, we have restored the previous network configuration to ensure continued connectivity.": "",
   "We've generated a Netdata password and attempted to automatically log you in in a new tab.": "",
   "Weak Ciphers": "",
   "Web Interface": "",

diff --git a/src/assets/i18n/bn.json b/src/assets/i18n/bn.json
@@ -2721,6 +2721,7 @@
   "Network Interface Card": "",
   "Network Interface Read": "",
   "Network Interface Write": "",
+  "Network Reconnection Issue": "",
   "Network Reports": "",
   "Network Settings": "",
   "Network Stats": "",
@@ -4850,6 +4851,7 @@
   "Warning: {n} of {total} snapshots could not be deleted.": "",
   "Warnings": "",
   "Watch List": "",
+  "We encountered an issue while applying the new network changes.  Unfortunately, we were unable to reconnect to the system after the changes were implemented.  As a result, we have restored the previous network configuration to ensure continued connectivity.": "",
   "We've generated a Netdata password and attempted to automatically log you in in a new tab.": "",
   "Weak Ciphers": "",
   "Web Interface": "",

diff --git a/src/assets/i18n/br.json b/src/assets/i18n/br.json
@@ -2721,6 +2721,7 @@
   "Network Interface Card": "",
   "Network Interface Read": "",
   "Network Interface Write": "",
+  "Network Reconnection Issue": "",
   "Network Reports": "",
   "Network Settings": "",
   "Network Stats": "",
@@ -4850,6 +4851,7 @@
   "Warning: {n} of {total} snapshots could not be deleted.": "",
   "Warnings": "",
   "Watch List": "",
+  "We encountered an issue while applying the new network changes.  Unfortunately, we were unable to reconnect to the system after the changes were implemented.  As a result, we have restored the previous network configuration to ensure continued connectivity.": "",
   "We've generated a Netdata password and attempted to automatically log you in in a new tab.": "",
   "Weak Ciphers": "",
   "Web Interface": "",

diff --git a/src/assets/i18n/bs.json b/src/assets/i18n/bs.json
@@ -2721,6 +2721,7 @@
   "Network Interface Card": "",
   "Network Interface Read": "",
   "Network Interface Write": "",
+  "Network Reconnection Issue": "",
   "Network Reports": "",
   "Network Settings": "",
   "Network Stats": "",
@@ -4850,6 +4851,7 @@
   "Warning: {n} of {total} snapshots could not be deleted.": "",
   "Warnings": "",
   "Watch List": "",
+  "We encountered an issue while applying the new network changes.  Unfortunately, we were unable to reconnect to the system after the changes were implemented.  As a result, we have restored the previous network configuration to ensure continued connectivity.": "",
   "We've generated a Netdata password and attempted to automatically log you in in a new tab.": "",
   "Weak Ciphers": "",
   "Web Interface": "",

diff --git a/src/assets/i18n/ca.json b/src/assets/i18n/ca.json
@@ -2721,6 +2721,7 @@
   "Network Interface Card": "",
   "Network Interface Read": "",
   "Network Interface Write": "",
+  "Network Reconnection Issue": "",
   "Network Reports": "",
   "Network Settings": "",
   "Network Stats": "",
@@ -4850,6 +4851,7 @@
   "Warning: {n} of {total} snapshots could not be deleted.": "",
   "Warnings": "",
   "Watch List": "",
+  "We encountered an issue while applying the new network changes.  Unfortunately, we were unable to reconnect to the system after the changes were implemented.  As a result, we have restored the previous network configuration to ensure continued connectivity.": "",
   "We've generated a Netdata password and attempted to automatically log you in in a new tab.": "",
   "Weak Ciphers": "",
   "Web Interface": "",

diff --git a/src/assets/i18n/cs.json b/src/assets/i18n/cs.json
@@ -2454,6 +2454,7 @@
   "Network Interface Card": "",
   "Network Interface Read": "",
   "Network Interface Write": "",
+  "Network Reconnection Issue": "",
   "Network Reports": "",
   "Network Settings": "",
   "Network Stats": "",
@@ -4436,6 +4437,7 @@
   "Warning: {n} of {total} snapshots could not be deleted.": "",
   "Warnings": "",
   "Watch List": "",
+  "We encountered an issue while applying the new network changes.  Unfortunately, we were unable to reconnect to the system after the changes were implemented.  As a result, we have restored the previous network configuration to ensure continued connectivity.": "",
   "We've generated a Netdata password and attempted to automatically log you in in a new tab.": "",
   "Weak Ciphers": "",
   "Web Interface": "",

diff --git a/src/assets/i18n/cy.json b/src/assets/i18n/cy.json
@@ -2721,6 +2721,7 @@
   "Network Interface Card": "",
   "Network Interface Read": "",
   "Network Interface Write": "",
+  "Network Reconnection Issue": "",
   "Network Reports": "",
   "Network Settings": "",
   "Network Stats": "",
@@ -4850,6 +4851,7 @@
   "Warning: {n} of {total} snapshots could not be deleted.": "",
   "Warnings": "",
   "Watch List": "",
+  "We encountered an issue while applying the new network changes.  Unfortunately, we were unable to reconnect to the system after the changes were implemented.  As a result, we have restored the previous network configuration to ensure continued connectivity.": "",
   "We've generated a Netdata password and attempted to automatically log you in in a new tab.": "",
   "Weak Ciphers": "",
   "Web Interface": "",

diff --git a/src/assets/i18n/da.json b/src/assets/i18n/da.json
@@ -2721,6 +2721,7 @@
   "Network Interface Card": "",
   "Network Interface Read": "",
   "Network Interface Write": "",
+  "Network Reconnection Issue": "",
   "Network Reports": "",
   "Network Settings": "",
   "Network Stats": "",
@@ -4850,6 +4851,7 @@
   "Warning: {n} of {total} snapshots could not be deleted.": "",
   "Warnings": "",
   "Watch List": "",
+  "We encountered an issue while applying the new network changes.  Unfortunately, we were unable to reconnect to the system after the changes were implemented.  As a result, we have restored the previous network configuration to ensure continued connectivity.": "",
   "We've generated a Netdata password and attempted to automatically log you in in a new tab.": "",
   "Weak Ciphers": "",
   "Web Interface": "",

diff --git a/src/assets/i18n/de.json b/src/assets/i18n/de.json
@@ -1916,6 +1916,7 @@
   "Network Interface Card": "",
   "Network Interface Read": "",
   "Network Interface Write": "",
+  "Network Reconnection Issue": "",
   "Network Stats": "",
   "Network Timeout Before Initiating Failover": "",
   "Network Usage": "",
@@ -3507,6 +3508,7 @@
   "Warning: {n} of {total} snapshots could not be deleted.": "",
   "Warnings": "",
   "Watch List": "",
+  "We encountered an issue while applying the new network changes.  Unfortunately, we were unable to reconnect to the system after the changes were implemented.  As a result, we have restored the previous network configuration to ensure continued connectivity.": "",
   "We've generated a Netdata password and attempted to automatically log you in in a new tab.": "",
   "Weak Ciphers": "",
   "Web Interface": "",

diff --git a/src/assets/i18n/dsb.json b/src/assets/i18n/dsb.json
@@ -2721,6 +2721,7 @@
   "Network Interface Card": "",
   "Network Interface Read": "",
   "Network Interface Write": "",
+  "Network Reconnection Issue": "",
   "Network Reports": "",
   "Network Settings": "",
   "Network Stats": "",
@@ -4850,6 +4851,7 @@
   "Warning: {n} of {total} snapshots could not be deleted.": "",
   "Warnings": "",
   "Watch List": "",
+  "We encountered an issue while applying the new network changes.  Unfortunately, we were unable to reconnect to the system after the changes were implemented.  As a result, we have restored the previous network configuration to ensure continued connectivity.": "",
   "We've generated a Netdata password and attempted to automatically log you in in a new tab.": "",
   "Weak Ciphers": "",
   "Web Interface": "",

diff --git a/src/assets/i18n/el.json b/src/assets/i18n/el.json
@@ -2721,6 +2721,7 @@
   "Network Interface Card": "",
   "Network Interface Read": "",
   "Network Interface Write": "",
+  "Network Reconnection Issue": "",
   "Network Reports": "",
   "Network Settings": "",
   "Network Stats": "",
@@ -4850,6 +4851,7 @@
   "Warning: {n} of {total} snapshots could not be deleted.": "",
   "Warnings": "",
   "Watch List": "",
+  "We encountered an issue while applying the new network changes.  Unfortunately, we were unable to reconnect to the system after the changes were implemented.  As a result, we have restored the previous network configuration to ensure continued connectivity.": "",
   "We've generated a Netdata password and attempted to automatically log you in in a new tab.": "",
   "Weak Ciphers": "",
   "Web Interface": "",

diff --git a/src/assets/i18n/en-au.json b/src/assets/i18n/en-au.json
@@ -2721,6 +2721,7 @@
   "Network Interface Card": "",
   "Network Interface Read": "",
   "Network Interface Write": "",
+  "Network Reconnection Issue": "",
   "Network Reports": "",
   "Network Settings": "",
   "Network Stats": "",
@@ -4850,6 +4851,7 @@
   "Warning: {n} of {total} snapshots could not be deleted.": "",
   "Warnings": "",
   "Watch List": "",
+  "We encountered an issue while applying the new network changes.  Unfortunately, we were unable to reconnect to the system after the changes were implemented.  As a result, we have restored the previous network configuration to ensure continued connectivity.": "",
   "We've generated a Netdata password and attempted to automatically log you in in a new tab.": "",
   "Weak Ciphers": "",
   "Web Interface": "",

diff --git a/src/assets/i18n/en-gb.json b/src/assets/i18n/en-gb.json
@@ -2721,6 +2721,7 @@
   "Network Interface Card": "",
   "Network Interface Read": "",
   "Network Interface Write": "",
+  "Network Reconnection Issue": "",
   "Network Reports": "",
   "Network Settings": "",
   "Network Stats": "",
@@ -4850,6 +4851,7 @@
   "Warning: {n} of {total} snapshots could not be deleted.": "",
   "Warnings": "",
   "Watch List": "",
+  "We encountered an issue while applying the new network changes.  Unfortunately, we were unable to reconnect to the system after the changes were implemented.  As a result, we have restored the previous network configuration to ensure continued connectivity.": "",
   "We've generated a Netdata password and attempted to automatically log you in in a new tab.": "",
   "Weak Ciphers": "",
   "Web Interface": "",

diff --git a/src/assets/i18n/en.json b/src/assets/i18n/en.json
@@ -2721,6 +2721,7 @@
   "Network Interface Card": "",
   "Network Interface Read": "",
   "Network Interface Write": "",
+  "Network Reconnection Issue": "",
   "Network Reports": "",
   "Network Settings": "",
   "Network Stats": "",
@@ -4850,6 +4851,7 @@
   "Warning: {n} of {total} snapshots could not be deleted.": "",
   "Warnings": "",
   "Watch List": "",
+  "We encountered an issue while applying the new network changes.  Unfortunately, we were unable to reconnect to the system after the changes were implemented.  As a result, we have restored the previous network configuration to ensure continued connectivity.": "",
   "We've generated a Netdata password and attempted to automatically log you in in a new tab.": "",
   "Weak Ciphers": "",
   "Web Interface": "",

diff --git a/src/assets/i18n/eo.json b/src/assets/i18n/eo.json
@@ -2721,6 +2721,7 @@
   "Network Interface Card": "",
   "Network Interface Read": "",
   "Network Interface Write": "",
+  "Network Reconnection Issue": "",
   "Network Reports": "",
   "Network Settings": "",
   "Network Stats": "",
@@ -4850,6 +4851,7 @@
   "Warning: {n} of {total} snapshots could not be deleted.": "",
   "Warnings": "",
   "Watch List": "",
+  "We encountered an issue while applying the new network changes.  Unfortunately, we were unable to reconnect to the system after the changes were implemented.  As a result, we have restored the previous network configuration to ensure continued connectivity.": "",
   "We've generated a Netdata password and attempted to automatically log you in in a new tab.": "",
   "Weak Ciphers": "",
   "Web Interface": "",

diff --git a/src/assets/i18n/es-ar.json b/src/assets/i18n/es-ar.json
@@ -1427,6 +1427,7 @@
   "Network Interface Card": "",
   "Network Interface Read": "",
   "Network Interface Write": "",
+  "Network Reconnection Issue": "",
   "Network Settings": "",
   "Network Stats": "",
   "Network Traffic": "",
@@ -2702,6 +2703,7 @@
   "Warning: {n} of {total} snapshots could not be deleted.": "",
   "Warnings": "",
   "Watch List": "",
+  "We encountered an issue while applying the new network changes.  Unfortunately, we were unable to reconnect to the system after the changes were implemented.  As a result, we have restored the previous network configuration to ensure continued connectivity.": "",
   "We've generated a Netdata password and attempted to automatically log you in in a new tab.": "",
   "Weak Ciphers": "",
   "Web Interface": "",