fix: remove KVM from verbage for ISM system on redirection warning

nmgaston · nmgaston · commit 36f3ed124a08 · 2026-07-17T15:23:04.000-07:00
diff --git a/src/app/devices/device-detail/device-detail.component.html b/src/app/devices/device-detail/device-detail.component.html
@@ -33,10 +33,10 @@ <h3 matListItemTitle>{{ item.name | translate }}</h3>
   <mat-sidenav-content>
     @switch (currentView) {
       @default {
-        <app-general [deviceId]="deviceId"></app-general>
+        <app-general [deviceId]="deviceId" [isISM]="isISMSystem()"></app-general>
       }
       @case ('general') {
-        <app-general [deviceId]="deviceId"></app-general>
+        <app-general [deviceId]="deviceId" [isISM]="isISMSystem()"></app-general>
       }
       @case ('kvm') {
         @if (isLoading()) {
diff --git a/src/app/devices/device-detail/device-detail.component.spec.ts b/src/app/devices/device-detail/device-detail.component.spec.ts
@@ -51,6 +51,7 @@ describe('DeviceDetailComponent', () => {
     readonly isLoading = input(signal(false))
 
     public readonly deviceId = input('')
+    public readonly isISM = input(false)
   }
 
   @Component({
diff --git a/src/app/devices/general/general.component.html b/src/app/devices/general/general.component.html
@@ -72,7 +72,9 @@
             style="margin-bottom: 16px; padding: 8px 12px">
             <div class="flex items-center">
               <mat-icon color="warn" aria-hidden="true" style="margin-right: 8px; flex-shrink: 0">warning</mat-icon>
-              <span>{{ 'general.redirectionWarning.value' | translate }}</span>
+              <span>{{
+                (isISM() ? 'general.redirectionWarningISM.value' : 'general.redirectionWarning.value') | translate
+              }}</span>
             </div>
             <button mat-stroked-button (click)="setAmtFeatures()">
               {{ 'general.redirectionEnable.value' | translate }}
diff --git a/src/app/devices/general/general.component.spec.ts b/src/app/devices/general/general.component.spec.ts
@@ -135,6 +135,26 @@ describe('GeneralComponent', () => {
     expect(devicesServiceSpy.setAmtFeatures).toHaveBeenCalled()
   })
 
+  it('shows ISM redirection warning text for ISM systems', () => {
+    fixture.componentRef.setInput('isISM', true)
+    component.amtEnabledFeatures.get('enableKVM')?.setValue(true)
+    component.amtEnabledFeatures.get('redirection')?.setValue(false)
+    fixture.detectChanges()
+
+    expect(fixture.nativeElement.textContent).toContain('general.redirectionWarningISM.value')
+    expect(fixture.nativeElement.textContent).not.toContain('general.redirectionWarning.value')
+  })
+
+  it('shows standard redirection warning text for non-ISM systems', () => {
+    fixture.componentRef.setInput('isISM', false)
+    component.amtEnabledFeatures.get('enableKVM')?.setValue(true)
+    component.amtEnabledFeatures.get('redirection')?.setValue(false)
+    fixture.detectChanges()
+
+    expect(fixture.nativeElement.textContent).toContain('general.redirectionWarning.value')
+    expect(fixture.nativeElement.textContent).not.toContain('general.redirectionWarningISM.value')
+  })
+
   it('sends remoteErase from the loaded features, not the default', () => {
     devicesServiceSpy.setAmtFeatures = jasmine.createSpy().and.returnValue(of({}))
     component.setAmtFeatures()
diff --git a/src/app/devices/general/general.component.ts b/src/app/devices/general/general.component.ts
@@ -44,6 +44,7 @@ export class GeneralComponent implements OnInit, OnDestroy {
   private readonly translate = inject(TranslateService)
 
   public readonly deviceId = input('')
+  public readonly isISM = input(false)
 
   public amtFeatures: AMTFeaturesResponse = {
     KVM: false,
diff --git a/src/assets/i18n/ar.json b/src/assets/i18n/ar.json
@@ -1519,6 +1519,10 @@
     "description": "تحذير عندما يكون إعادة التوجيه معطلاً ولكن KVM/SOL/IDER مفعل",
     "value": "إعادة التوجيه معطلة. يتطلب KVM وSOL وIDER تفعيل إعادة التوجيه."
   },
+  "general.redirectionWarningISM": {
+    "description": "تحذير عندما يكون إعادة التوجيه معطلاً ولكن SOL/IDER مفعل",
+    "value": "إعادة التوجيه معطلة. يتطلب SOL وIDER تفعيل إعادة التوجيه."
+  },
   "general.serialOverLan": {
     "description": "تسمية SOL",
     "value": "Serial-Over-Lan (SOL):"
diff --git a/src/assets/i18n/de.json b/src/assets/i18n/de.json
@@ -1511,6 +1511,10 @@
     "description": "Schaltflächenbeschriftung zum Aktivieren der Umleitung",
     "value": "Aktivieren"
   },
+  "general.redirectionWarningISM": {
+    "description": "Warnung, wenn Umleitung deaktiviert ist, aber SOL/IDER aktiviert ist",
+    "value": "Umleitung ist deaktiviert. SOL und IDER erfordern eine aktivierte Umleitung."
+  },
   "general.redirectionWarning": {
     "description": "Warnung, wenn Umleitung deaktiviert ist, aber KVM/SOL/IDER aktiviert ist",
     "value": "Umleitung ist deaktiviert. KVM, SOL und IDER erfordern eine aktivierte Umleitung."
diff --git a/src/assets/i18n/en.json b/src/assets/i18n/en.json
@@ -1691,6 +1691,10 @@
     "description": "Warning shown when redirection is disabled but KVM/SOL/IDER is enabled",
     "value": "Redirection is disabled. KVM, SOL, and IDER require redirection to be enabled."
   },
+  "general.redirectionWarningISM": {
+    "description": "Warning shown when redirection is disabled but SOL/IDER is enabled",
+    "value": "Redirection is disabled. SOL and IDER require redirection to be enabled."
+  },
   "general.serialOverLan": {
     "description": "Label for SOL",
     "value": "Serial-Over-Lan (SOL):"
diff --git a/src/assets/i18n/es.json b/src/assets/i18n/es.json
@@ -1515,6 +1515,10 @@
     "description": "Advertencia cuando la redirección está deshabilitada pero KVM/SOL/IDER está habilitado",
     "value": "La redirección está deshabilitada. KVM, SOL e IDER requieren que la redirección esté habilitada."
   },
+  "general.redirectionWarningISM": {
+    "description": "Advertencia cuando la redirección está deshabilitada pero SOL/IDER está habilitado",
+    "value": "La redirección está deshabilitada. SOL e IDER requieren que la redirección esté habilitada."
+  },
   "general.serialOverLan": {
     "description": "Etiqueta para SOL",
     "value": "Serial-Over-Lan (SOL):"
diff --git a/src/assets/i18n/fi.json b/src/assets/i18n/fi.json
@@ -1515,6 +1515,10 @@
     "description": "Varoitus, kun uudelleenohjaus on poistettu käytöstä, mutta KVM/SOL/IDER on käytössä",
     "value": "Uudelleenohjaus on poistettu käytöstä. KVM, SOL ja IDER vaativat uudelleenohjauksen käyttöönottoa."
   },
+  "general.redirectionWarningISM": {
+    "description": "Varoitus, kun uudelleenohjaus on poistettu käytöstä, mutta SOL/IDER on käytössä",
+    "value": "Uudelleenohjaus on poistettu käytöstä. SOL ja IDER vaativat uudelleenohjauksen käyttöönottoa."
+  },
   "general.serialOverLan": {
     "description": "SOL-merkki",
     "value": "Serial-Over-Lan (SOL):"
diff --git a/src/assets/i18n/fr.json b/src/assets/i18n/fr.json
@@ -1519,6 +1519,10 @@
     "description": "Avertissement lorsque la redirection est désactivée mais KVM/SOL/IDER est activé",
     "value": "La redirection est désactivée. KVM, SOL et IDER nécessitent l'activation de la redirection."
   },
+  "general.redirectionWarningISM": {
+    "description": "Avertissement lorsque la redirection est désactivée mais SOL/IDER est activé",
+    "value": "La redirection est désactivée. SOL et IDER nécessitent l'activation de la redirection."
+  },
   "general.serialOverLan": {
     "description": "Étiquette pour SOL",
     "value": "Serial-Over-Lan (SOL) :"
diff --git a/src/assets/i18n/he.json b/src/assets/i18n/he.json
@@ -1511,6 +1511,10 @@
     "description": "אזהרה כאשר הפניה מושבתת אך KVM/SOL/IDER מופעל",
     "value": "הפניה מושבתת. KVM, SOL ו-IDER דורשים שהפניה תהיה מופעלת."
   },
+  "general.redirectionWarningISM": {
+    "description": "אזהרה כאשר הפניה מושבתת אך SOL/IDER מופעל",
+    "value": "הפניה מושבתת. SOL ו-IDER דורשים שהפניה תהיה מופעלת."
+  },
   "general.serialOverLan": {
     "description": "תווית לסול",
     "value": "סדרתי-אובר-לאן (סול):"
diff --git a/src/assets/i18n/it.json b/src/assets/i18n/it.json
@@ -1511,6 +1511,10 @@
     "description": "Avviso quando il reindirizzamento è disabilitato ma KVM/SOL/IDER è abilitato",
     "value": "Il reindirizzamento è disabilitato. KVM, SOL e IDER richiedono l'abilitazione del reindirizzamento."
   },
+  "general.redirectionWarningISM": {
+    "description": "Avviso quando il reindirizzamento è disabilitato ma SOL/IDER è abilitato",
+    "value": "Il reindirizzamento è disabilitato. SOL e IDER richiedono l'abilitazione del reindirizzamento."
+  },
   "general.serialOverLan": {
     "description": "Etichetta per SOL",
     "value": "Serial-Over-Lan (SOL):"
diff --git a/src/assets/i18n/ja.json b/src/assets/i18n/ja.json
@@ -1511,6 +1511,10 @@
     "description": "リダイレクトが無効でKVM/SOL/IDERが有効な場合の警告",
     "value": "リダイレクトが無効です。KVM、SOL、IDERにはリダイレクトの有効化が必要です。"
   },
+  "general.redirectionWarningISM": {
+    "description": "リダイレクトが無効でSOL/IDERが有効な場合の警告",
+    "value": "リダイレクトが無効です。SOLおよびIDERにはリダイレクトの有効化が必要です。"
+  },
   "general.serialOverLan": {
     "description": "SOL用ラベル",
     "value": "Serial-Over-Lan (SOL):"
diff --git a/src/assets/i18n/nl.json b/src/assets/i18n/nl.json
@@ -1519,6 +1519,10 @@
     "description": "Waarschuwing wanneer omleiding is uitgeschakeld maar KVM/SOL/IDER is ingeschakeld",
     "value": "Omleiding is uitgeschakeld. KVM, SOL en IDER vereisen dat omleiding is ingeschakeld."
   },
+  "general.redirectionWarningISM": {
+    "description": "Waarschuwing wanneer omleiding is uitgeschakeld maar SOL/IDER is ingeschakeld",
+    "value": "Omleiding is uitgeschakeld. SOL en IDER vereisen dat omleiding is ingeschakeld."
+  },
   "general.serialOverLan": {
     "description": "Label voor SOL",
     "value": "Serial-Over-Lan (SOL):"
diff --git a/src/assets/i18n/ru.json b/src/assets/i18n/ru.json
@@ -1519,6 +1519,10 @@
     "description": "Предупреждение, когда перенаправление отключено, но KVM/SOL/IDER включен",
     "value": "Перенаправление отключено. KVM, SOL и IDER требуют включения перенаправления."
   },
+  "general.redirectionWarningISM": {
+    "description": "Предупреждение, когда перенаправление отключено, но SOL/IDER включен",
+    "value": "Перенаправление отключено. SOL и IDER требуют включения перенаправления."
+  },
   "general.serialOverLan": {
     "description": "Метка для SOL",
     "value": "Serial-Over-Lan (SOL):"
diff --git a/src/assets/i18n/sv.json b/src/assets/i18n/sv.json
@@ -1427,6 +1427,10 @@
     "description": "Varning när omdirigering är inaktiverad men KVM/SOL/IDER är aktiverat",
     "value": "Omdirigering är inaktiverad. KVM, SOL och IDER kräver att omdirigering är aktiverad."
   },
+  "general.redirectionWarningISM": {
+    "description": "Varning när omdirigering är inaktiverad men SOL/IDER är aktiverat",
+    "value": "Omdirigering är inaktiverad. SOL och IDER kräver att omdirigering är aktiverad."
+  },
   "general.serialOverLan": {
     "description": "Etikett för SOL",
     "value": "Serial-Over-Lan (SOL):"

Original file line number	Diff line number	Diff line change
`@@ -33,10 +33,10 @@ <h3 matListItemTitle>{{ item.name \| translate }}</h3>`
`33`	`33`	`<mat-sidenav-content>`
`34`	`34`	`@switch (currentView) {`
`35`	`35`	`@default {`
`36`		`- <app-general [deviceId]="deviceId"></app-general>`
	`36`	`+ <app-general [deviceId]="deviceId" [isISM]="isISMSystem()"></app-general>`
`37`	`37`	`}`
`38`	`38`	`@case ('general') {`
`39`		`- <app-general [deviceId]="deviceId"></app-general>`
	`39`	`+ <app-general [deviceId]="deviceId" [isISM]="isISMSystem()"></app-general>`
`40`	`40`	`}`
`41`	`41`	`@case ('kvm') {`
`42`	`42`	`@if (isLoading()) {`
Original file line number	Diff line number	Diff line change
`@@ -51,6 +51,7 @@ describe('DeviceDetailComponent', () => {`
`51`	`51`	`readonly isLoading = input(signal(false))`
`52`	`52`
`53`	`53`	`public readonly deviceId = input('')`
	`54`	`+ public readonly isISM = input(false)`
`54`	`55`	`}`
`55`	`56`
`56`	`57`	`@Component({`