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

Author: ShradhaGupta31

.github/workflows/cypress.yaml

@@ -34,7 +34,7 @@ jobs:
 
       - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
       - name: Use Node.js ${{ matrix.node-version }}
-        uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0
+        uses: actions/setup-node@820762786026740c76f36085b0efc47a31fe5020 # v7.0.0
         with:
           node-version: ${{ matrix.node-version }}
       - run: npm install cypress

.github/workflows/nodejs.yaml

@@ -28,7 +28,7 @@ jobs:
 
       - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
       - name: Use Node.js ${{ matrix.node-version }}
-        uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0
+        uses: actions/setup-node@820762786026740c76f36085b0efc47a31fe5020 # v7.0.0
         with:
           node-version: ${{ matrix.node-version }}
       - run: npm install

.github/workflows/release.yml

@@ -31,7 +31,7 @@ jobs:
         with:
           persist-credentials: false
       - name: Use Node.js 20.x
-        uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0
+        uses: actions/setup-node@820762786026740c76f36085b0efc47a31fe5020 # v7.0.0
         with:
           node-version: '20.x'
       - name: Docker Setup Buildx

.github/workflows/zizmor.yml

@@ -32,7 +32,7 @@ jobs:
           egress-policy: audit
 
       - name: Checkout code
-        uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
+        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
         with:
           persist-credentials: false
 
@@ -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@8aad20d150bbac5944a9f9d289da16a4b0d87c1e # v4.36.2
+        uses: github/codeql-action/upload-sarif@99df26d4f13ea111d4ec1a7dddef6063f76b97e9 # v4.37.0
         with:
           sarif_file: zizmor_scan_report.sarif
 

CHANGELOG.md

@@ -1,3 +1,17 @@
+# [3.60.0](https://github.com/device-management-toolkit/sample-web-ui/compare/v3.59.0...v3.60.0) (2026-07-16)
+
+
+### Features
+
+* **devices:** enable device network settings in cloud mode ([#3396](https://github.com/device-management-toolkit/sample-web-ui/issues/3396)) ([b48c200](https://github.com/device-management-toolkit/sample-web-ui/commit/b48c20067898c501bdfce092e015b534b28c1fa6)), closes [#3376](https://github.com/device-management-toolkit/sample-web-ui/issues/3376)
+
+# [3.59.0](https://github.com/device-management-toolkit/sample-web-ui/compare/v3.58.2...v3.59.0) (2026-07-16)
+
+
+### Features
+
+* **devices:** add network settings management for AMT devices ([#3370](https://github.com/device-management-toolkit/sample-web-ui/issues/3370)) ([d7b3829](https://github.com/device-management-toolkit/sample-web-ui/commit/d7b382911bc4bbf8e4e4ddabf8d83b06bdd1fac8)), closes [#3353](https://github.com/device-management-toolkit/sample-web-ui/issues/3353)
+
 ## [3.58.2](https://github.com/device-management-toolkit/sample-web-ui/compare/v3.58.1...v3.58.2) (2026-07-06)
 
 

Dockerfile

@@ -3,7 +3,7 @@
 # SPDX-License-Identifier: Apache-2.0
 #*********************************************************************/
 ### STAGE 1: Build ###
-FROM node:26-bullseye-slim@sha256:9461926c9bcd133657fe678447ba1282e2ec1e647178b51a827676ca48cb06ce AS build
+FROM node:26-bullseye-slim@sha256:1b1f313a1606186f4fc3415ddf9c249f937aff1f9739834b9cfddba460f0b16b AS build
 ARG BUILD_CONFIGURATION=production
 
 WORKDIR /usr/src/app
@@ -20,7 +20,7 @@ RUN npm run build -- --configuration=${BUILD_CONFIGURATION} \
     fi
 
 ### STAGE 2: Run ###
-FROM nginx:mainline-alpine-slim@sha256:dd722b8ee8794f3c273bfaf8b5351b0652a68ccd73c17e5f0d029857a58f25ef
+FROM nginx:mainline-alpine-slim@sha256:8763397d71453fccb4a2613ccfd89aa62e1d731d618b1eaa8e14631539a3a65b
 
 LABEL license='SPDX-License-Identifier: Apache-2.0' \
   copyright='Copyright (c) 2021: Intel'

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "@device-management-toolkit/sample-web-ui",
-  "version": "3.58.2",
+  "version": "3.60.0",
   "scripts": {
     "ng": "ng",
     "start": "ng serve",

package.json

@@ -117,6 +117,12 @@ export class DeviceDetailComponent implements OnInit, OnDestroy {
       description: 'deviceDetail.certificatesDescription.value',
       component: 'certificates',
       icon: 'verified'
+    },
+    {
+      name: 'deviceDetail.networkSettings.value',
+      description: 'deviceDetail.networkSettingsDescription.value',
+      component: 'network-settings',
+      icon: 'lan'
     }
   ]
 
@@ -129,12 +135,6 @@ export class DeviceDetailComponent implements OnInit, OnDestroy {
           component: 'explorer',
           icon: 'search'
         },
-        {
-          name: 'deviceDetail.networkSettings.value',
-          description: 'deviceDetail.networkSettingsDescription.value',
-          component: 'network-settings',
-          icon: 'lan'
-        },
         {
           name: 'deviceDetail.tlsSettings.value',
           description: 'deviceDetail.tlsSettingsDescription.value',

src/app/devices/device-detail/device-detail.component.ts

@@ -127,7 +127,9 @@ <h3 class="flex justify-center">
         </ng-container>
         <!-- productType Column -->
         <ng-container matColumnDef="productType">
-          <mat-header-cell *matHeaderCellDef mat-sort-header>{{ 'devices.table.productType.value' | translate }}</mat-header-cell>
+          <mat-header-cell *matHeaderCellDef mat-sort-header>{{
+            'devices.table.productType.value' | translate
+          }}</mat-header-cell>
           <mat-cell *matCellDef="let element" (click)="navigateTo(element.guid)">
             {{ getProductType(element) }}
           </mat-cell>
@@ -210,12 +212,12 @@ <h3 class="flex justify-center">
       </mat-table>
     }
 
-    @if (activeTab() === 0 && totalCount() !== 0) {
+    @if (totalCount() !== 0) {
       <div>
         <mat-paginator
           [pageSizeOptions]="[25, 50, 100]"
           [pageSize]="pageEvent.pageSize"
-          [length]="totalCount()"
+          [length]="allCount"
           (page)="pageChanged($event)"
           showFirstLastButtons>
         </mat-paginator>