Merge branch 'main' into device-discovery-UI-changes

ShradhaGupta31 · ShradhaGupta31 · commit b68d35c1d5a4 · 2026-07-21T20:30:57.000+05:30
# Conflicts:
#	CHANGELOG.md
#	package-lock.json
#	package.json
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
@@ -52,10 +52,12 @@ jobs:
 
     - name: Checkout repository
       uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
+      with:
+        persist-credentials: false
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@99df26d4f13ea111d4ec1a7dddef6063f76b97e9 # v4.37.0
+      uses: github/codeql-action/init@7188fc363630916deb702c7fdcf4e481b751f97a # v4.37.1
       with:
         languages: ${{ matrix.language }}
         # If you wish to specify custom queries, you can do so here or in a config file.
@@ -66,7 +68,7 @@ jobs:
     # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
     # If this step fails, then you should remove it and run the build manually (see below)
     - name: Autobuild
-      uses: github/codeql-action/autobuild@99df26d4f13ea111d4ec1a7dddef6063f76b97e9 # v4.37.0
+      uses: github/codeql-action/autobuild@7188fc363630916deb702c7fdcf4e481b751f97a # v4.37.1
 
     # ℹ️ Command-line programs to run using the OS shell.
     # 📚 https://git.io/JvXDl
@@ -80,7 +82,7 @@ jobs:
     #   make release
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@99df26d4f13ea111d4ec1a7dddef6063f76b97e9 # v4.37.0
+      uses: github/codeql-action/analyze@7188fc363630916deb702c7fdcf4e481b751f97a # v4.37.1
     - name: Generate Security Report
       uses: rsdmike/github-security-report-action@a149b24539044c92786ec39af8ba38c93496495d # v3.0.4
       continue-on-error: true
diff --git a/.github/workflows/cypress.yaml b/.github/workflows/cypress.yaml
@@ -33,6 +33,8 @@ jobs:
           egress-policy: audit
 
       - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
+        with:
+          persist-credentials: false
       - name: Use Node.js ${{ matrix.node-version }}
         uses: actions/setup-node@820762786026740c76f36085b0efc47a31fe5020 # v7.0.0
         with:
diff --git a/.github/workflows/dependency-review.yml b/.github/workflows/dependency-review.yml
@@ -23,5 +23,7 @@ jobs:
 
       - name: 'Checkout Repository'
         uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
+        with:
+          persist-credentials: false
       - name: 'Dependency Review'
         uses: actions/dependency-review-action@a1d282b36b6f3519aa1f3fc636f609c47dddb294 # v5.0.0
diff --git a/.github/workflows/docker.yaml b/.github/workflows/docker.yaml
@@ -25,14 +25,22 @@ jobs:
           egress-policy: audit
 
       - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
+        with:
+          persist-credentials: false
       - name: Build the Docker image
-        run: docker buildx build --platform linux/amd64,linux/arm64 . --file Dockerfile --tag ${{ github.event.inputs.docker_registry }}/${{ github.event.inputs.docker_tag_name }}
+        env:
+          DOCKER_REGISTRY: ${{ github.event.inputs.docker_registry }}
+          DOCKER_TAG_NAME: ${{ github.event.inputs.docker_tag_name }}
+        run: docker buildx build --platform linux/amd64,linux/arm64 . --file Dockerfile --tag "$DOCKER_REGISTRY/$DOCKER_TAG_NAME"
       - name: Docker Login
         uses: docker/login-action@af1e73f918a031802d376d3c8bbc3fe56130a9b0 # v4.4.0
         with:
           registry: ${{ github.event.inputs.docker_registry }}
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_PASSWORD }}
           logout: true
-      - name: Push the Docker image to ${{ github.event.inputs.docker_registry }}
-        run: docker push ${{ github.event.inputs.docker_registry }}/${{ github.event.inputs.docker_tag_name }}
+      - name: Push the Docker image
+        env:
+          DOCKER_REGISTRY: ${{ github.event.inputs.docker_registry }}
+          DOCKER_TAG_NAME: ${{ github.event.inputs.docker_tag_name }}
+        run: docker push "$DOCKER_REGISTRY/$DOCKER_TAG_NAME"
diff --git a/.github/workflows/nodejs.yaml b/.github/workflows/nodejs.yaml
@@ -27,6 +27,8 @@ jobs:
           egress-policy: audit
 
       - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
+        with:
+          persist-credentials: false
       - name: Use Node.js ${{ matrix.node-version }}
         uses: actions/setup-node@820762786026740c76f36085b0efc47a31fe5020 # v7.0.0
         with:
diff --git a/.github/workflows/scorecard.yml b/.github/workflows/scorecard.yml
@@ -72,6 +72,6 @@ jobs:
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@99df26d4f13ea111d4ec1a7dddef6063f76b97e9 # v2.1.27
+        uses: github/codeql-action/upload-sarif@7188fc363630916deb702c7fdcf4e481b751f97a # v2.1.27
         with:
           sarif_file: results.sarif
diff --git a/.github/workflows/semantic.yml b/.github/workflows/semantic.yml
@@ -20,6 +20,7 @@ jobs:
       - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
         with:
           fetch-depth: 0
+          persist-credentials: false
       - uses: wagoid/commitlint-github-action@b948419dd99f3fd78a6548d48f94e3df7f6bf3ed # v6.2.1
         with:
           configFile: .github/commitlint.config.cjs
diff --git a/.github/workflows/trivy-scan.yaml b/.github/workflows/trivy-scan.yaml
@@ -20,6 +20,8 @@ jobs:
           egress-policy: audit
 
       - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
+        with:
+          persist-credentials: false
       - name: Build the Docker image
 
         run: docker build . --file Dockerfile --tag vprodemo.azurecr.io/webui:${{ github.sha }} --tag vprodemo.azurecr.io/webui:latest
@@ -34,7 +36,7 @@ jobs:
           vuln-type: 'os,library'
           severity: 'UNKNOWN,LOW,MEDIUM,HIGH,CRITICAL'
       - name: Upload Trivy scan results to GitHub Security tab
-        uses: github/codeql-action/upload-sarif@99df26d4f13ea111d4ec1a7dddef6063f76b97e9 # v3.29.5
+        uses: github/codeql-action/upload-sarif@7188fc363630916deb702c7fdcf4e481b751f97a # v3.29.5
         if: always()
         with:
           sarif_file: 'webui-trivy-results.sarif'
diff --git a/.github/workflows/zizmor.yml b/.github/workflows/zizmor.yml
@@ -50,7 +50,7 @@ jobs:
 
       - name: Upload SARIF to GitHub Security
         if: always() && (github.event_name != 'pull_request' || github.event.pull_request.head.repo.fork == false)
-        uses: github/codeql-action/upload-sarif@99df26d4f13ea111d4ec1a7dddef6063f76b97e9 # v4.37.0
+        uses: github/codeql-action/upload-sarif@7188fc363630916deb702c7fdcf4e481b751f97a # v4.37.1
         with:
           sarif_file: zizmor_scan_report.sarif
 
diff --git a/.github/zizmor.yml b/.github/zizmor.yml
@@ -0,0 +1,12 @@
+# SPDX-FileCopyrightText: (C) 2026 Intel Corporation
+# SPDX-License-Identifier: Apache-2.0
+---
+# Zizmor configuration. See https://docs.zizmor.sh/configuration/
+rules:
+  # Daily updates with no cooldown are intentional here. A version compromised
+  # at publish time can reach CI before it is yanked, but the blast radius is
+  # small: the PR workflows reference no secrets, and Dependabot PRs get a
+  # read-only GITHUB_TOKEN.
+  dependabot-cooldown:
+    ignore:
+      - dependabot.yml
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,17 @@
+# [3.61.0](https://github.com/device-management-toolkit/sample-web-ui/compare/v3.60.1...v3.61.0) (2026-07-20)
+
+
+### Features
+
+* avoid reloading AMT Summary when updating AMT Features ([#3427](https://github.com/device-management-toolkit/sample-web-ui/issues/3427)) ([2703ec1](https://github.com/device-management-toolkit/sample-web-ui/commit/2703ec1281c86d3c1664e4857ed3631900b28f7c))
+
+## [3.60.1](https://github.com/device-management-toolkit/sample-web-ui/compare/v3.60.0...v3.60.1) (2026-07-20)
+
+
+### Bug Fixes
+
+* fix refresh power button issue ([#3441](https://github.com/device-management-toolkit/sample-web-ui/issues/3441)) ([98210d2](https://github.com/device-management-toolkit/sample-web-ui/commit/98210d29feeb823ef62df84b4b2300a37d49d9a9))
+
 # [3.60.0](https://github.com/device-management-toolkit/sample-web-ui/compare/v3.59.0...v3.60.0) (2026-07-16)
 
 
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,10 @@
 {
   "name": "@device-management-toolkit/sample-web-ui",
+<<<<<<< HEAD
   "version": "3.60.0",
+=======
+  "version": "3.61.0",
+>>>>>>> main
   "scripts": {
     "ng": "ng",
     "start": "ng serve",
diff --git a/src/app/devices/general/general.component.html b/src/app/devices/general/general.component.html
@@ -63,6 +63,9 @@
       <mat-card-title>{{ 'general.amtEnabledFeatures.value' | translate }}</mat-card-title>
       <mat-card-subtitle>{{ 'general.amtEnabledFeaturesDescription.value' | translate }}</mat-card-subtitle>
     </mat-card-header>
+    @if (isUpdatingFeatures()) {
+      <mat-progress-bar mode="indeterminate"></mat-progress-bar>
+    }
     <mat-card-content class="amt-features" [formGroup]="amtEnabledFeatures">
       <div class="flex-row flex-wrap">
         @if (isRedirectionRequired && !amtEnabledFeatures.get('redirection')?.value) {
diff --git a/src/app/devices/general/general.component.spec.ts b/src/app/devices/general/general.component.spec.ts
@@ -7,7 +7,7 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'
 
 import { GeneralComponent } from './general.component'
 import { ActivatedRoute } from '@angular/router'
-import { of } from 'rxjs'
+import { of, Subject } from 'rxjs'
 import { DevicesService } from '../devices.service'
 import { provideTranslateService } from '@ngx-translate/core'
 import { By } from '@angular/platform-browser'
@@ -32,7 +32,8 @@ describe('GeneralComponent', () => {
       'bulkPowerAction',
       'sendDeactivate',
       'sendBulkDeactivate',
-      'getWsmanOperations'
+      'getWsmanOperations',
+      'setAmtFeatures'
     ])
     const amtFeaturesResponse = {
       userConsent: 'ALL',
@@ -143,4 +144,77 @@ describe('GeneralComponent', () => {
       jasmine.objectContaining({ remoteErase: true })
     )
   })
+
+  it('should update only feature loading state while setAmtFeatures is in flight', () => {
+    const response$ = new Subject<any>()
+    devicesServiceSpy.setAmtFeatures.and.returnValue(response$)
+    const loadingBefore = component.isLoading()
+
+    component.setAmtFeatures()
+
+    expect(component.isUpdatingFeatures()).toBeTrue()
+    expect(component.isLoading()).toBe(loadingBefore)
+
+    response$.next({ redirection: true, status: 'ok' })
+    response$.complete()
+
+    expect(component.isUpdatingFeatures()).toBeFalse()
+    expect(component.isLoading()).toBe(loadingBefore)
+  })
+
+  it('keeps summary loading state independent from feature update state', () => {
+    const response$ = new Subject<any>()
+    devicesServiceSpy.setAmtFeatures.and.returnValue(response$)
+
+    component.isLoading.set(false)
+    component.setAmtFeatures()
+
+    expect(component.isLoading()).toBeFalse()
+    expect(component.isUpdatingFeatures()).toBeTrue()
+
+    response$.next({ redirection: true, status: 'ok' })
+    response$.complete()
+
+    expect(component.isLoading()).toBeFalse()
+    expect(component.isUpdatingFeatures()).toBeFalse()
+  })
+
+  it('keeps feature loading state true until the last overlapping update completes', () => {
+    const firstResponse$ = new Subject<any>()
+    const secondResponse$ = new Subject<any>()
+    devicesServiceSpy.setAmtFeatures.and.returnValues(firstResponse$, secondResponse$)
+
+    component.setAmtFeatures()
+    component.setAmtFeatures()
+
+    expect(component.isUpdatingFeatures()).toBeTrue()
+
+    firstResponse$.next({ redirection: true, status: 'ok' })
+    firstResponse$.complete()
+
+    expect(component.isUpdatingFeatures()).toBeTrue()
+
+    secondResponse$.next({ redirection: true, status: 'ok' })
+    secondResponse$.complete()
+
+    expect(component.isUpdatingFeatures()).toBeFalse()
+  })
+
+  it('keeps tracking an in-flight feature update after destroy until it completes', () => {
+    const response$ = new Subject<any>()
+    devicesServiceSpy.setAmtFeatures.and.returnValue(response$)
+
+    component.setAmtFeatures()
+
+    expect(component.isUpdatingFeatures()).toBeTrue()
+
+    component.ngOnDestroy()
+
+    expect(component.isUpdatingFeatures()).toBeTrue()
+
+    response$.next({ redirection: true, status: 'ok' })
+    response$.complete()
+
+    expect(component.isUpdatingFeatures()).toBeFalse()
+  })
 })
diff --git a/src/app/devices/general/general.component.ts b/src/app/devices/general/general.component.ts
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  **********************************************************************/
 
-import { Component, OnDestroy, OnInit, inject, signal, input } from '@angular/core'
+import { Component, OnDestroy, OnInit, computed, inject, signal, input } from '@angular/core'
 import { MatCardModule } from '@angular/material/card'
 import { MatCheckboxModule } from '@angular/material/checkbox'
 import { MatSelectModule } from '@angular/material/select'
@@ -78,6 +78,7 @@ export class GeneralComponent implements OnInit, OnDestroy {
   })
 
   public isLoading = signal(true)
+  public readonly isUpdatingFeatures = computed(() => this.pendingFeatureUpdates() > 0)
   public amtDHCPDNSSuffix: string | null = null
   public amtTrustedDNSSuffix: string | null = null
   public amtVersion: string | null = null
@@ -95,6 +96,7 @@ export class GeneralComponent implements OnInit, OnDestroy {
   public isCloudMode: boolean = environment.cloud
 
   private readonly destroy$ = new Subject<void>()
+  private readonly pendingFeatureUpdates = signal(0)
 
   ngOnInit(): void {
     forkJoin({
@@ -180,15 +182,15 @@ export class GeneralComponent implements OnInit, OnDestroy {
   }
 
   setAmtFeatures(): void {
-    this.isLoading.set(true)
+    this.pendingFeatureUpdates.update((count) => count + 1)
     this.devicesService
       .setAmtFeatures(this.deviceId(), {
         ...this.amtEnabledFeatures.getRawValue(),
         remoteErase: this.amtFeatures.remoteErase
       } as AMTFeaturesRequest)
       .pipe(
         finalize(() => {
-          this.isLoading.set(false)
+          this.pendingFeatureUpdates.update((count) => count - 1)
         })
       )
       .subscribe({
diff --git a/src/assets/i18n/ar.json b/src/assets/i18n/ar.json
@@ -1097,6 +1097,10 @@
     "description": "تلميح الطاقة للحالة إيقاف",
     "value": "الطاقة: إيقاف"
   },
+  "deviceToolbar.power.refreshAriaLabel": {
+    "description": "تسمية aria للزر تحديث حالة الطاقة",
+    "value": "تحديث حالة الطاقة"
+  },
   "deviceUserConsent.description": {
     "description": "وصف موافقة المستخدم للأجهزة",
     "value": "يلزم وجود رمز موافقة المستخدم الذي تم إنشاؤه بواسطة Intel AMT للوصول إلى النظام."
diff --git a/src/assets/i18n/de.json b/src/assets/i18n/de.json
@@ -1097,6 +1097,10 @@
     "description": "Energie-Tooltip für Ausgeschaltet",
     "value": "Strom: Aus"
   },
+  "deviceToolbar.power.refreshAriaLabel": {
+    "description": "Aria-Label für die Schaltfläche zum Aktualisieren des Energiestatus",
+    "value": "Energiestatus aktualisieren"
+  },
   "deviceUserConsent.description": {
     "description": "Beschreibung der Einwilligung des Benutzers für Geräte",
     "value": "Für den Zugriff auf das System ist ein von Intel AMT generierter Benutzerzustimmungscode erforderlich."
diff --git a/src/assets/i18n/es.json b/src/assets/i18n/es.json
@@ -1097,6 +1097,10 @@
     "description": "Información de energía para Apagado",
     "value": "Energía: Apagado"
   },
+  "deviceToolbar.power.refreshAriaLabel": {
+    "description": "Etiqueta aria para el botón de actualización del estado de energía",
+    "value": "Actualizar estado de energía"
+  },
   "deviceUserConsent.description": {
     "description": "Descripción del consentimiento del usuario para los dispositivos.",
     "value": "Se requiere un código de consentimiento del usuario generado por Intel AMT para acceder al sistema."
diff --git a/src/assets/i18n/fi.json b/src/assets/i18n/fi.json
@@ -1097,6 +1097,10 @@
     "description": "Virtatilan vihjeteksti tilalle pois päältä",
     "value": "Virta: Pois päältä"
   },
+  "deviceToolbar.power.refreshAriaLabel": {
+    "description": "Aria-nimike virtatilan päivityspainikkeen osalta",
+    "value": "Päivitä virran tila"
+  },
   "deviceUserConsent.description": {
     "description": "Kuvaus laitteiden käyttäjän suostumuksesta",
     "value": "Järjestelmään pääsemiseksi tarvitaan Intel AMT:n luoma käyttäjän suostumus koodi."
diff --git a/src/assets/i18n/fr.json b/src/assets/i18n/fr.json
@@ -1097,6 +1097,10 @@
     "description": "Info-bulle d'alimentation pour l'état éteint",
     "value": "Alimentation : Éteint"
   },
+  "deviceToolbar.power.refreshAriaLabel": {
+    "description": "Libellé aria pour le bouton d'actualisation de l'état d'alimentation",
+    "value": "Actualiser l'état d'alimentation"
+  },
   "deviceUserConsent.description": {
     "description": "Description du consentement de l'utilisateur pour les appareils",
     "value": "Un code de consentement utilisateur généré par Intel AMT est nécessaire pour accéder au système."
diff --git a/src/assets/i18n/he.json b/src/assets/i18n/he.json
@@ -1097,6 +1097,10 @@
     "description": "רמז מצב צריכת חשמל עבור כבוי",
     "value": "חשמל: כבוי"
   },
+  "deviceToolbar.power.refreshAriaLabel": {
+    "description": "Aria label עבור כפתור עדכון מצב חשמל",
+    "value": "עדכן מצב חשמל"
+  },
   "deviceUserConsent.description": {
     "description": "תיאור להסכמת משתמש למכשירים",
     "value": "קוד הסכמת משתמש שנוצר על ידי Intel AMT נדרש כדי לגשת למערכת."
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
