style: UI changes from review

nmgaston · nmgaston · commit 9b6efa330a60 · 2026-07-01T16:01:41.000-07:00
diff --git a/src/app/devices/devices.service.ts b/src/app/devices/devices.service.ts
@@ -526,11 +526,6 @@ export class DevicesService {
     )
   }
 
-  markRpeDisabledAfterErase(deviceId: string): void {
-    this.rpeDisabledAfterErase.add(deviceId)
-    this.updateAmtFeaturesCache(deviceId, { rpe: false })
-  }
-
   private applyRpeOverride(deviceId: string, features: AMTFeaturesResponse): AMTFeaturesResponse {
     if (!this.rpeDisabledAfterErase.has(deviceId)) {
       return features
diff --git a/src/app/devices/remote-platform-erase/remote-platform-erase.component.html b/src/app/devices/remote-platform-erase/remote-platform-erase.component.html
@@ -27,6 +27,7 @@
 
       <div style="padding: 8px 0">
         <mat-slide-toggle
+          color="primary"
           data-cy="remoteEraseCheckbox"
           [checked]="platformEraseEnabled()"
           [disabled]="isLoading()"
@@ -50,48 +51,51 @@ <h3>
         <p>{{ 'remotePlatformErase.caps.description.value' | translate }}</p>
 
         @for (cap of eraseCaps(); track cap.key; let i = $index) {
-          <div data-cy="eraseCapItem" style="padding: 4px 0">
-            <mat-checkbox
-              [formControl]="eraseCapControl(i)"
-              (change)="onCapChange()"
-              [attr.aria-describedby]="'rpe-cap-desc-' + cap.key"
-              data-cy="eraseCapCheckbox">
-              <div>
-                <div>{{ 'remotePlatformErase.cap.' + cap.key + '.label.value' | translate }}</div>
-                <small [id]="'rpe-cap-desc-' + cap.key">
-                  {{ 'remotePlatformErase.cap.' + cap.key + '.desc.value' | translate }}
-                </small>
-                @if (!cap.supported) {
-                  <div>
-                    <small
-                      ><em>{{ 'remotePlatformErase.capUnsupported.value' | translate }}</em></small
-                    >
-                  </div>
-                }
-              </div>
-            </mat-checkbox>
-            @if (cap.key === 'secureEraseSsds' && isSsdSelected()) {
-              <div style="padding-left: 40px; padding-top: 8px">
-                <mat-checkbox
-                  [formControl]="ssdEncryptedControl"
-                  (change)="onSsdEncryptedChange($event.checked)"
-                  data-cy="ssdEncryptedCheckbox">
-                  {{ 'remotePlatformErase.ssdEncrypted.label.value' | translate }}
-                </mat-checkbox>
-                @if (isSsdEncrypted()) {
-                  <mat-form-field style="display: block; padding-top: 8px">
-                    <mat-label>{{ 'remotePlatformErase.ssdPassword.label.value' | translate }}</mat-label>
-                    <input
-                      matInput
-                      type="password"
-                      [formControl]="ssdPasswordControl"
-                      data-cy="ssdPasswordInput"
-                      autocomplete="off" />
-                  </mat-form-field>
-                }
-              </div>
-            }
-          </div>
+          <!-- Hide the CSME unconfigure option for now until we have a better way to control the power of this option. -->
+          @if (cap.key !== 'csmeUnconfigure') {
+            <div data-cy="eraseCapItem" style="padding: 4px 0">
+              <mat-checkbox
+                [formControl]="eraseCapControl(i)"
+                (change)="onCapChange()"
+                [attr.aria-describedby]="'rpe-cap-desc-' + cap.key"
+                data-cy="eraseCapCheckbox">
+                <div>
+                  <div>{{ 'remotePlatformErase.cap.' + cap.key + '.label.value' | translate }}</div>
+                  <small [id]="'rpe-cap-desc-' + cap.key">
+                    {{ 'remotePlatformErase.cap.' + cap.key + '.desc.value' | translate }}
+                  </small>
+                  @if (!cap.supported) {
+                    <div>
+                      <small
+                        ><em>{{ 'remotePlatformErase.capUnsupported.value' | translate }}</em></small
+                      >
+                    </div>
+                  }
+                </div>
+              </mat-checkbox>
+              @if (cap.key === 'secureEraseSsds' && isSsdSelected()) {
+                <div style="padding-left: 40px; padding-top: 8px">
+                  <mat-checkbox
+                    [formControl]="ssdEncryptedControl"
+                    (change)="onSsdEncryptedChange($event.checked)"
+                    data-cy="ssdEncryptedCheckbox">
+                    {{ 'remotePlatformErase.ssdEncrypted.label.value' | translate }}
+                  </mat-checkbox>
+                  @if (isSsdEncrypted()) {
+                    <mat-form-field style="display: block; padding-top: 8px">
+                      <mat-label>{{ 'remotePlatformErase.ssdPassword.label.value' | translate }}</mat-label>
+                      <input
+                        matInput
+                        type="password"
+                        [formControl]="ssdPasswordControl"
+                        data-cy="ssdPasswordInput"
+                        autocomplete="off" />
+                    </mat-form-field>
+                  }
+                </div>
+              }
+            </div>
+          }
         }
 
         @if (isCsmeExclusiveSelected()) {
diff --git a/src/app/devices/remote-platform-erase/remote-platform-erase.component.spec.ts b/src/app/devices/remote-platform-erase/remote-platform-erase.component.spec.ts
@@ -17,6 +17,8 @@ import { HttpErrorResponse } from '@angular/common/http'
 import { Router } from '@angular/router'
 import { UserConsentService } from '../user-consent.service'
 
+const VISIBLE_PLATFORM_ERASE_CAPABILITIES = PLATFORM_ERASE_CAPABILITIES.filter((cap) => cap.key !== 'csmeUnconfigure')
+
 const mockAMTFeatures: AMTFeaturesResponse = {
   userConsent: 'none',
   KVM: true,
@@ -404,7 +406,7 @@ describe('RemotePlatformEraseComponent', () => {
     component.toggleFeature(true)
     fixture.detectChanges()
     const capItems = fixture.nativeElement.querySelectorAll('[data-cy="eraseCapItem"]')
-    expect(capItems.length).toBe(PLATFORM_ERASE_CAPABILITIES.length)
+    expect(capItems.length).toBe(VISIBLE_PLATFORM_ERASE_CAPABILITIES.length)
   })
 
   it('should show a checkbox for each capability, disabled for unsupported ones', () => {
@@ -413,7 +415,7 @@ describe('RemotePlatformEraseComponent', () => {
     component.toggleFeature(true)
     fixture.detectChanges()
     const checkboxes = fixture.nativeElement.querySelectorAll('[data-cy="eraseCapCheckbox"]')
-    expect(checkboxes.length).toBe(PLATFORM_ERASE_CAPABILITIES.length)
+    expect(checkboxes.length).toBe(VISIBLE_PLATFORM_ERASE_CAPABILITIES.length)
     // tpmClear (index 1) and csmeUnconfigure (index 3) not supported — always disabled
     expect(component.eraseCapControl(1).disabled).toBeTrue()
     expect(component.eraseCapControl(3).disabled).toBeTrue()
@@ -518,43 +520,6 @@ describe('RemotePlatformEraseComponent', () => {
     })
   })
 
-  describe('after successful erase', () => {
-    beforeEach(() => {
-      devicesServiceSpy.getAMTFeatures.and.returnValue(of({ ...mockAMTFeatures, rpe: true }))
-      component.ngOnInit()
-      component.toggleFeature(true)
-      component.eraseCapControl(0).setValue(true)
-      component.onCapChange()
-      matDialogSpy.open.and.returnValue({ afterClosed: () => of(true) } as any)
-    })
-
-    it('should reset platformEraseEnabled to false', () => {
-      component.initiateErase()
-      expect(component.platformEraseEnabled()).toBeFalse()
-    })
-
-    it('should reset amtFeatures.rpe to false', () => {
-      component.initiateErase()
-      expect(component.amtFeatures()?.rpe).toBeFalse()
-    })
-
-    it('should reset selectedCapsCount to 0', () => {
-      component.initiateErase()
-      expect(component.selectedCapsCount()).toBe(0)
-    })
-
-    it('should uncheck all cap form controls', () => {
-      component.initiateErase()
-      expect(component.eraseCapControl(0).value).toBeFalse()
-    })
-
-    it('should disable capability checkboxes after successful erase', () => {
-      component.initiateErase()
-      expect(component.eraseCapControl(0).disabled).toBeTrue()
-      expect(component.eraseCapControl(2).disabled).toBeTrue()
-    })
-  })
-
   describe('CSME exclusivity', () => {
     beforeEach(() => {
       devicesServiceSpy.getAMTFeatures.and.returnValue(
@@ -709,18 +674,6 @@ describe('RemotePlatformEraseComponent', () => {
       expect(component.ssdPasswordControl.value).toBe('')
     })
 
-    it('should reset SSD controls after successful erase', () => {
-      component.eraseCapControl(0).setValue(true)
-      component.onCapChange()
-      component.onSsdEncryptedChange(true)
-      component.ssdPasswordControl.setValue('secret')
-      matDialogSpy.open.and.returnValue({ afterClosed: () => of(true) } as any)
-      component.initiateErase()
-      expect(component.isSsdSelected()).toBeFalse()
-      expect(component.isSsdEncrypted()).toBeFalse()
-      expect(component.ssdPasswordControl.value).toBe('')
-    })
-
     it('should reset SSD controls when CSME is selected', () => {
       devicesServiceSpy.getRemoteEraseCapabilities.and.returnValue(
         of({ secureEraseAllSSDs: true, tpmClear: false, restoreBIOSToEOM: true, unconfigureCSME: true })
diff --git a/src/app/devices/remote-platform-erase/remote-platform-erase.component.ts b/src/app/devices/remote-platform-erase/remote-platform-erase.component.ts
@@ -252,6 +252,7 @@ export class RemotePlatformEraseComponent implements OnInit {
       )
       .subscribe()
   }
+
   postUserConsentDecision(result: any, operations: string): Observable<any> {
     if (result === false) {
       return of(null)
@@ -344,21 +345,15 @@ export class RemotePlatformEraseComponent implements OnInit {
               enableSOL: this.amtFeatures()?.SOL ?? false,
               enableIDER: this.amtFeatures()?.IDER ?? false,
               ocr: this.amtFeatures()?.ocr ?? false,
-              rpe: false
+              rpe: true
             }
-            this.devicesService.markRpeDisabledAfterErase(this.deviceId())
             this.devicesService
               .setAmtFeatures(this.deviceId(), payload)
               .pipe(catchError(() => EMPTY))
               .subscribe()
-            this.amtFeatures.update((f) => (f ? { ...f, rpe: false } : f))
-            this.platformEraseEnabled.set(false)
 
-            this.eraseCapsArray.controls.forEach((c) => c.setValue(false, { emitEvent: false }))
-            this.selectedCapsCount.set(0)
-            this.isCsmeExclusiveSelected.set(false)
-            this.resetSsdControls()
-            this.updateCapControlStates()
+            // Preserve selected operations after completion and refresh computed UI state.
+            this.onCapChange()
           }
         }
       })
diff --git a/src/assets/i18n/ar.json b/src/assets/i18n/ar.json
@@ -2851,7 +2851,8 @@
   },
   "remotePlatformErase.description": {
     "description": "عنوان فرعي لبطاقة ميزة مسح المنصة عن بُعد",
-    "value": "تشغيل محو آمن عن بُعد للأقراص و TPM و BIOS أو Intel CSME على هذا الجهاز. لا يمكن استرداد البيانات الممحوة."
+    "value": "تشغيل محو آمن عن بُعد للأقراص و TPM و BIOS على هذا الجهاز. لا يمكن استرداد البيانات الممحوة.",
+    "_value_old": "تشغيل محو آمن عن بُعد للأقراص و TPM و BIOS أو Intel CSME على هذا الجهاز. لا يمكن استرداد البيانات الممحوة."
   },
   "remotePlatformErase.warning": {
     "description": "رسالة تحذير حول تمكين مسح المنصة عن بُعد",
@@ -2983,7 +2984,8 @@
   },
   "remotePlatformErase.selectionCount": {
     "description": "تسمية توضح عدد عمليات المحو المحددة حاليًا",
-    "value": "تم تحديد {{selected}} من أصل {{total}} عمليات"
+    "value": "تم تحديد {{selected}} من أصل 3 عمليات",
+    "_value_old": "تم تحديد {{selected}} من أصل {{total}} عمليات"
   },
   "remotePlatformErase.capUnsupported": {
     "description": "تسمية تظهر في صف القدرة عندما لا يدعمها الجهاز",
diff --git a/src/assets/i18n/de.json b/src/assets/i18n/de.json
@@ -2851,7 +2851,8 @@
   },
   "remotePlatformErase.description": {
     "description": "Untertitel der Funktionskarte für Remote-Plattformlöschung",
-    "value": "Löst aus der Ferne ein sicheres Löschen von Laufwerken, TPM, BIOS oder Intel CSME auf diesem Gerät aus. Gelöschte Daten können nicht wiederhergestellt werden."
+    "value": "Löst aus der Ferne ein sicheres Löschen von Laufwerken, TPM und BIOS auf diesem Gerät aus. Gelöschte Daten können nicht wiederhergestellt werden.",
+    "_value_old": "Löst aus der Ferne ein sicheres Löschen von Laufwerken, TPM, BIOS oder Intel CSME auf diesem Gerät aus. Gelöschte Daten können nicht wiederhergestellt werden."
   },
   "remotePlatformErase.warning": {
     "description": "Warnmeldung zur Aktivierung der Remote-Plattformlöschung",
@@ -2983,7 +2984,8 @@
   },
   "remotePlatformErase.selectionCount": {
     "description": "Beschriftung, die anzeigt, wie viele Löschvorgänge derzeit ausgewählt sind",
-    "value": "{{selected}} von {{total}} Vorgängen ausgewählt"
+    "value": "{{selected}} von 3 Vorgängen ausgewählt",
+    "_value_old": "{{selected}} von {{total}} Vorgängen ausgewählt"
   },
   "remotePlatformErase.capUnsupported": {
     "description": "Beschriftung in einer Fähigkeitszeile, wenn das Gerät diese nicht unterstützt",
diff --git a/src/assets/i18n/en.json b/src/assets/i18n/en.json
@@ -1063,7 +1063,8 @@
   },
   "remotePlatformErase.description": {
     "description": "Subtitle for the Remote Platform Erase feature card",
-    "value": "Remotely trigger a secure erase of drives, TPM, BIOS, or Intel CSME on this device. Erased data cannot be recovered."
+    "value": "Remotely trigger a secure erase of drives, TPM, or BIOS on this device. Erased data cannot be recovered.",
+    "_value_old": "Remotely trigger a secure erase of drives, TPM, BIOS, or Intel CSME on this device. Erased data cannot be recovered."
   },
   "remotePlatformErase.warning": {
     "description": "Warning message about enabling Remote Platform Erase",
@@ -1079,7 +1080,8 @@
   },
   "remotePlatformErase.selectionCount": {
     "description": "Caption showing how many erase capabilities are currently selected",
-    "value": "{{selected}} of {{total}} operations selected"
+    "value": "{{selected}} of 3 operations selected",
+    "_value_old": "{{selected}} of {{total}} operations selected"
   },
   "remotePlatformErase.capUnsupported": {
     "description": "Caption shown on a capability row when the device does not support it",
diff --git a/src/assets/i18n/es.json b/src/assets/i18n/es.json
@@ -2851,7 +2851,8 @@
   },
   "remotePlatformErase.description": {
     "description": "Subtítulo para la tarjeta de función de borrado remoto de plataforma",
-    "value": "Activa de forma remota un borrado seguro de unidades, TPM, BIOS o Intel CSME en este dispositivo. Los datos borrados no se pueden recuperar."
+    "value": "Activa de forma remota un borrado seguro de unidades, TPM y BIOS en este dispositivo. Los datos borrados no se pueden recuperar.",
+    "_value_old": "Activa de forma remota un borrado seguro de unidades, TPM, BIOS o Intel CSME en este dispositivo. Los datos borrados no se pueden recuperar."
   },
   "remotePlatformErase.warning": {
     "description": "Mensaje de advertencia sobre la habilitación del borrado remoto de plataforma",
@@ -2983,7 +2984,8 @@
   },
   "remotePlatformErase.selectionCount": {
     "description": "Indicador que muestra cuántas operaciones de borrado están seleccionadas actualmente",
-    "value": "{{selected}} de {{total}} operaciones seleccionadas"
+    "value": "{{selected}} de 3 operaciones seleccionadas",
+    "_value_old": "{{selected}} de {{total}} operaciones seleccionadas"
   },
   "remotePlatformErase.capUnsupported": {
     "description": "Indicador mostrado en una fila de capacidad cuando el dispositivo no la admite",
diff --git a/src/assets/i18n/fi.json b/src/assets/i18n/fi.json
@@ -2851,7 +2851,8 @@
   },
   "remotePlatformErase.description": {
     "description": "Etäalustan pyyhintäominaisuuden kortin alaotsikko",
-    "value": "Käynnistää etänä suojatun poiston tämän laitteen asemille, TPM:lle, BIOSille tai Intel CSME:lle. Poistettuja tietoja ei voi palauttaa."
+    "value": "Käynnistää etänä suojatun poiston tämän laitteen asemille, TPM:lle ja BIOSille. Poistettuja tietoja ei voi palauttaa.",
+    "_value_old": "Käynnistää etänä suojatun poiston tämän laitteen asemille, TPM:lle, BIOSille tai Intel CSME:lle. Poistettuja tietoja ei voi palauttaa."
   },
   "remotePlatformErase.warning": {
     "description": "Varoitusviesti etäalustan pyyhinnän käyttöönotosta",
@@ -2983,7 +2984,8 @@
   },
   "remotePlatformErase.selectionCount": {
     "description": "Teksti, joka näyttää kuinka monta pyyhintätoimintoa on valittu",
-    "value": "{{selected}} / {{total}} toimintoa valittu"
+    "value": "{{selected}} / 3 toimintoa valittu",
+    "_value_old": "{{selected}} / {{total}} toimintoa valittu"
   },
   "remotePlatformErase.capUnsupported": {
     "description": "Teksti, joka näytetään ominaisuusrivillä, kun laite ei tue sitä",
diff --git a/src/assets/i18n/fr.json b/src/assets/i18n/fr.json
@@ -2851,7 +2851,8 @@
   },
   "remotePlatformErase.description": {
     "description": "Sous-titre de la carte de fonctionnalité d'effacement distant de la plateforme",
-    "value": "Déclenche à distance un effacement sécurisé des disques, TPM, BIOS ou Intel CSME sur cet appareil. Les données effacées ne peuvent pas être récupérées."
+    "value": "Déclenche à distance un effacement sécurisé des disques, TPM et BIOS sur cet appareil. Les données effacées ne peuvent pas être récupérées.",
+    "_value_old": "Déclenche à distance un effacement sécurisé des disques, TPM, BIOS ou Intel CSME sur cet appareil. Les données effacées ne peuvent pas être récupérées."
   },
   "remotePlatformErase.warning": {
     "description": "Message d'avertissement concernant l'activation de l'effacement distant de la plateforme",
@@ -2983,7 +2984,8 @@
   },
   "remotePlatformErase.selectionCount": {
     "description": "Légende indiquant combien d'opérations d'effacement sont actuellement sélectionnées",
-    "value": "{{selected}} opération(s) sélectionnée(s) sur {{total}}"
+    "value": "{{selected}} opération(s) sélectionnée(s) sur 3",
+    "_value_old": "{{selected}} opération(s) sélectionnée(s) sur {{total}}"
   },
   "remotePlatformErase.capUnsupported": {
     "description": "Légende affichée sur une ligne de capacité lorsque l'appareil ne la prend pas en charge",
diff --git a/src/assets/i18n/he.json b/src/assets/i18n/he.json
@@ -2851,7 +2851,8 @@
   },
   "remotePlatformErase.description": {
     "description": "כותרת משנה לכרטיס תכונת מחיקת פלטפורמה מרחוק",
-    "value": "הפעלה מרחוק של מחיקה מאובטחת של כוננים, TPM, BIOS או Intel CSME במכשיר זה. לא ניתן לשחזר נתונים שנמחקו."
+    "value": "הפעלה מרחוק של מחיקה מאובטחת של כוננים, TPM ו-BIOS במכשיר זה. לא ניתן לשחזר נתונים שנמחקו.",
+    "_value_old": "הפעלה מרחוק של מחיקה מאובטחת של כוננים, TPM, BIOS או Intel CSME במכשיר זה. לא ניתן לשחזר נתונים שנמחקו."
   },
   "remotePlatformErase.warning": {
     "description": "הודעת אזהרה על הפעלת מחיקת פלטפורמה מרחוק",
@@ -2983,7 +2984,8 @@
   },
   "remotePlatformErase.selectionCount": {
     "description": "תווית המציגה כמה פעולות מחיקה נבחרו כעת",
-    "value": "נבחרו {{selected}} מתוך {{total}} פעולות"
+    "value": "נבחרו {{selected}} מתוך 3 פעולות",
+    "_value_old": "נבחרו {{selected}} מתוך {{total}} פעולות"
   },
   "remotePlatformErase.capUnsupported": {
     "description": "תווית המוצגת בשורת יכולת כאשר המכשיר אינו תומך בה",
diff --git a/src/assets/i18n/it.json b/src/assets/i18n/it.json
diff --git a/src/assets/i18n/ja.json b/src/assets/i18n/ja.json
diff --git a/src/assets/i18n/nl.json b/src/assets/i18n/nl.json
diff --git a/src/assets/i18n/ru.json b/src/assets/i18n/ru.json
diff --git a/src/assets/i18n/sv.json b/src/assets/i18n/sv.json

Original file line number	Diff line number	Diff line change
`@@ -526,11 +526,6 @@ export class DevicesService {`
`526`	`526`	`)`
`527`	`527`	`}`
`528`	`528`
`529`		`- markRpeDisabledAfterErase(deviceId: string): void {`
`530`		`- this.rpeDisabledAfterErase.add(deviceId)`
`531`		`- this.updateAmtFeaturesCache(deviceId, { rpe: false })`
`532`		`- }`
`533`		`-`
`534`	`529`	`private applyRpeOverride(deviceId: string, features: AMTFeaturesResponse): AMTFeaturesResponse {`
`535`	`530`	`if (!this.rpeDisabledAfterErase.has(deviceId)) {`
`536`	`531`	`return features`