Skip to content

feat: add tabs, product type column, and discovered field - #3417

Open
ShradhaGupta31 wants to merge 2 commits into
mainfrom
device-discovery-UI-changes
Open

feat: add tabs, product type column, and discovered field#3417
ShradhaGupta31 wants to merge 2 commits into
mainfrom
device-discovery-UI-changes

Conversation

@ShradhaGupta31

@ShradhaGupta31 ShradhaGupta31 commented Jul 7, 2026

Copy link
Copy Markdown
Contributor
  • Add three tabs to the devices page: All, Activated and Discovered with live counts in each tab label
  • Add 'Product Type' column (ISM / vPro) derived from fwSku bitmask

Addresses: #3432

UI after this change:
image

@ShradhaGupta31
ShradhaGupta31 force-pushed the device-discovery-UI-changes branch 6 times, most recently from 2daa143 to a98454e Compare July 13, 2026 14:57
@ShradhaGupta31
ShradhaGupta31 force-pushed the device-discovery-UI-changes branch from a98454e to e1fdf15 Compare July 14, 2026 06:33
@ShradhaGupta31
ShradhaGupta31 requested a review from Copilot July 14, 2026 06:40

Copilot AI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

Adds UI affordances on the Devices page to segment devices by status and expose additional device metadata, extending the device model to support a “discovered” flag and deriving a “Product Type” column from fwSku.

Changes:

  • Adds discovered?: boolean to DeviceInfo.
  • Introduces a mat-tab-group with All / Activated / Discovered tabs and client-side tab filtering with per-tab counts.
  • Adds a “Product Type” table column computed from the firmware SKU bitmask.

Reviewed changes

Copilot reviewed 3 out of 3 changed files in this pull request and generated 6 comments.

File Description
src/models/models.ts Extends DeviceInfo with an optional discovered flag used by the new UI filtering.
src/app/devices/devices.component.ts Adds tab state + filtering, stores server total count, and introduces getProductType() for the new column.
src/app/devices/devices.component.html Adds the tabs UI and renders the new Product Type column in the device table.
Comments suppressed due to low confidence (1)

src/app/devices/devices.component.ts:193

  • The Product Type column is marked sortable (mat-sort-header), but MatTableDataSource will sort by a 'productType' property that doesn't exist on Device. As a result, sorting by this column will not work unless a sortingDataAccessor is provided.
  constructor() {
    this.selectedDevices = new SelectionModel<Device>(true, [])
    this.powerStates = this.devicesService.PowerStates
    if (!this.isCloudMode) {
      this.displayedColumns = [
        'select',
        'hostname',
        'productType',
        'tags',
        'actions',
        'notification'
      ]
    }
  }

Comment thread src/app/devices/devices.component.ts
Comment thread src/app/devices/devices.component.html Outdated
Comment thread src/app/devices/devices.component.html
Comment thread src/app/devices/devices.component.html
Comment thread src/app/devices/devices.component.ts
Comment thread src/app/devices/devices.component.html Outdated
@ShradhaGupta31
ShradhaGupta31 force-pushed the device-discovery-UI-changes branch 3 times, most recently from c6bc8b9 to c922b08 Compare July 20, 2026 12:11
@ShradhaGupta31
ShradhaGupta31 requested a review from Copilot July 20, 2026 12:18

Copilot AI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

Copilot reviewed 16 out of 17 changed files in this pull request and generated 1 comment.

Comments suppressed due to low confidence (1)

src/app/devices/devices.component.ts:168

  • applyTabFilter() currently sets totalCount to the locally filtered page size for tabs 1/2, while the data itself is still coming from a server-paginated request ($top/$skip). This makes the paginator length inconsistent and (combined with the template gating) prevents users from navigating to other pages while on Activated/Discovered tabs. Also, the new Product Type column is marked sortable in the template, but MatTableDataSource sorting will not work for a computed value unless a sortingDataAccessor is provided.
  private applyTabFilter(): void {
    let filtered: Device[]
    switch (this.activeTab()) {
      case 1:
        filtered = this.allDevicesData.filter(
          (d) => d.deviceInfo?.currentMode != null && d.deviceInfo.currentMode !== 'not activated'
        )
        this.totalCount.set(filtered.length)
        break
      case 2:
        filtered = this.allDevicesData.filter((d) => d.deviceInfo?.discovered === true)
        this.totalCount.set(filtered.length)
        break
      default:
        filtered = this.allDevicesData
        this.totalCount.set(this.serverTotalCount)
        break
    }
    this.devices.data = filtered
  }

Comment thread src/app/devices/devices.component.html Outdated
@ShradhaGupta31
ShradhaGupta31 force-pushed the device-discovery-UI-changes branch from c922b08 to 4158eee Compare July 21, 2026 07:36
ShradhaGupta31 added a commit that referenced this pull request Jul 21, 2026
- Add All/Activated/Discovered tab group to devices list
- Add Product Type column derived from fwSku bitmask (ISM/vPro)
- Add discovered field to DeviceInfo model
- Show paginator on all tabs using server total count
- Add i18n keys for tab labels and Product Type header in all 12 locales
- Add unit tests for getProductType and tab filter logic
- Fix cdk-overlay-backdrop leak in device.spec.ts cypress test

Resolves: #3417
@ShradhaGupta31
ShradhaGupta31 force-pushed the device-discovery-UI-changes branch 2 times, most recently from b68d35c to 0681000 Compare July 22, 2026 06:11
ShradhaGupta31 added a commit that referenced this pull request Jul 22, 2026
- Add All/Activated/Discovered tab group to devices list
- Add Product Type column derived from fwSku bitmask (ISM/vPro)
- Add discovered field to DeviceInfo model
- Show paginator on all tabs using server total count
- Add i18n keys for tab labels and Product Type header in all 12 locales
- Add unit tests for getProductType and tab filter logic
- Fix cdk-overlay-backdrop leak in device.spec.ts cypress test

Resolves: #3417
@ShradhaGupta31
ShradhaGupta31 force-pushed the device-discovery-UI-changes branch from 3783c79 to 90be1cd Compare July 22, 2026 06:28
ShradhaGupta31 added a commit that referenced this pull request Jul 22, 2026
- Add All/Activated/Discovered tab group to devices list
- Add Product Type column derived from fwSku bitmask (ISM/vPro)
- Add discovered field to DeviceInfo model
- Show paginator on all tabs using server total count
- Add i18n keys for tab labels and Product Type header in all 12 locales
- Add unit tests for getProductType and tab filter logic
- Fix cdk-overlay-backdrop leak in device.spec.ts cypress test

Resolves: #3417
@ShradhaGupta31
ShradhaGupta31 force-pushed the device-discovery-UI-changes branch from 90be1cd to 3dba353 Compare July 22, 2026 11:26
@ShradhaGupta31
ShradhaGupta31 marked this pull request as ready for review July 24, 2026 04:54
ShradhaGupta31 added a commit that referenced this pull request Jul 24, 2026
- Add All/Activated/Discovered tab group to devices list
- Add Product Type column derived from fwSku bitmask (ISM/vPro)
- Add discovered field to DeviceInfo model
- Show paginator on all tabs using server total count
- Add i18n keys for tab labels and Product Type header in all 12 locales
- Add unit tests for getProductType and tab filter logic
- Fix cdk-overlay-backdrop leak in device.spec.ts cypress test

Resolves: #3417
@ShradhaGupta31
ShradhaGupta31 force-pushed the device-discovery-UI-changes branch from 3dba353 to d9a1126 Compare July 24, 2026 04:55
@sudhir-intc

Copy link
Copy Markdown
Contributor

@ShradhaGupta31 : Tried out this PR, the UI seems to be working fine as expected. How about the following column where Type shows - Activated/Discovered and Tags - showcase CCM/ACM
image

Here's what I see with your PR:

image

@ShradhaGupta31

ShradhaGupta31 commented Jul 24, 2026

Copy link
Copy Markdown
Contributor Author

@ShradhaGupta31 : Tried out this PR, the UI seems to be working fine as expected. How about the following column where Type shows - Activated/Discovered and Tags - showcase CCM/ACM image

Here's what I see with your PR:

image

@sudhir-intc - This PR covers the Product Type and Tabs-related changes only. Since the associated keywords were still under discussion at the time, this PR was limited to the Tabs and Product Type updates only. Now that the keyword changes are finalized, I will raise a separate PR for the Type-related updates.

For Tags, the appropriate tag needs to be populated through the API. Once the API provides values such as CCM or ACM as input, the corresponding tag will be displayed accordingly.
image

- Add All/Activated/Discovered tab group to devices list
- Add Product Type column derived from fwSku bitmask (ISM/vPro)
- Add discovered field to DeviceInfo model
- Show paginator on all tabs using server total count
- Add i18n keys for tab labels and Product Type header in all 12 locales
- Add unit tests for getProductType and tab filter logic
- Fix cdk-overlay-backdrop leak in device.spec.ts cypress test

Resolves: #3417
@ShradhaGupta31
ShradhaGupta31 force-pushed the device-discovery-UI-changes branch from d9a1126 to c3beaea Compare July 29, 2026 03:49
@ShradhaGupta31
ShradhaGupta31 force-pushed the device-discovery-UI-changes branch from 70db43c to 96b817d Compare August 6, 2026 06:33
@ShradhaGupta31
ShradhaGupta31 requested a review from rsdmike August 6, 2026 15:02
Comment thread src/assets/i18n/en.json
"description": "Power tooltip for Off",
"value": "Power: Off"
},
"deviceToolbar.power.refreshAriaLabel": {

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It is is still referenced by device-toolbar.component.html page. Is it accidental?

}
</h3>
} @else {
<mat-tab-group (selectedTabChange)="onTabChange($event.index)">

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

All count is coming from the server, while Activated and Discovered are calculated only from the current page at the client. Can we make this consistent and move the rest to the server as well?

This would also be useful for headless/API consumers, instead of keeping this logic only in the UI.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Add tabs for devices include product type column, and discovered field

4 participants