Browse Source

refactor(iot-hub): centralise item-type icons and chip colors

- Add itemTypeIcons + getItemTypeIcon helper to
  iot-hub-item.models, mirroring mp-item.models in the iot-hub
  project: widgets / dashboard / apps / mdi:function-variant /
  settings_ethernet / mdi:bell-cog / devices_other with `category`
  as the fallback.
- Replace every hand-rolled item-type → icon switch with calls to
  getItemTypeIcon: item detail dialog (getTypeIcon / getCompactIcon
  fallback path), installed-items table (getItemTypeIcon),
  iot-hub-home (getCompactIcon / getItemTypeIcon), item-card
  (getPlaceholderIcon default + per-type fallbacks), item-link-card
  (getCompactIcon / getTypeIcon).
- Swap the remaining mat-icon placeholders that render an item-type
  icon to tb-icon (installed-items table chip, home search popup
  thumb placeholder, item-link-card thumb fallback). Generic
  status / action icons stay on mat-icon.
- Refresh the colored item-type chip palette in the installed
  items table to match itemTypeChipColors from mp-item.models, and
  add the previously-missing tb-type-alarm-rule rule so that chip
  picks up the new orange palette instead of falling through to no
  background.
pull/15772/head
Igor Kulikov 4 months ago
parent
commit
da86dcc234
  1. 2
      ui-ngx/src/app/modules/home/components/iot-hub/iot-hub-installed-items-table.component.html
  2. 14
      ui-ngx/src/app/modules/home/components/iot-hub/iot-hub-installed-items-table.component.scss
  3. 13
      ui-ngx/src/app/modules/home/components/iot-hub/iot-hub-installed-items-table.component.ts
  4. 22
      ui-ngx/src/app/modules/home/components/iot-hub/iot-hub-item-card.component.ts
  5. 19
      ui-ngx/src/app/modules/home/components/iot-hub/iot-hub-item-detail-dialog.component.ts
  6. 2
      ui-ngx/src/app/modules/home/components/iot-hub/iot-hub-item-link-card/iot-hub-item-link-card.component.html
  7. 24
      ui-ngx/src/app/modules/home/components/iot-hub/iot-hub-item-link-card/iot-hub-item-link-card.component.ts
  8. 2
      ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-home.component.html
  9. 21
      ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-home.component.ts
  10. 17
      ui-ngx/src/app/shared/models/iot-hub/iot-hub-item.models.ts

2
ui-ngx/src/app/modules/home/components/iot-hub/iot-hub-installed-items-table.component.html

@ -29,7 +29,7 @@
<th mat-header-cell *matHeaderCellDef>{{ 'iot-hub.item-type' | translate }}</th> <th mat-header-cell *matHeaderCellDef>{{ 'iot-hub.item-type' | translate }}</th>
<td mat-cell *matCellDef="let item"> <td mat-cell *matCellDef="let item">
<span class="tb-installed-type" [ngClass]="getItemTypeChipClass(item.itemType)"> <span class="tb-installed-type" [ngClass]="getItemTypeChipClass(item.itemType)">
<mat-icon class="tb-installed-type-icon">{{ getItemTypeIcon(item.itemType) }}</mat-icon> <tb-icon class="tb-installed-type-icon">{{ getItemTypeIcon(item.itemType) }}</tb-icon>
{{ getItemTypeLabel(item.itemType) }} {{ getItemTypeLabel(item.itemType) }}
</span> </span>
</td> </td>

14
ui-ngx/src/app/modules/home/components/iot-hub/iot-hub-installed-items-table.component.scss

@ -122,12 +122,14 @@
--mat-icon-color: currentColor; --mat-icon-color: currentColor;
} }
.tb-type-widget { color: rgb(32, 115, 61); background: rgba(46, 166, 88, 0.06); } // Colors mirror itemTypeChipColors from the iot-hub mp-item.models.
.tb-type-dashboard { color: rgb(61, 76, 166); background: rgba(61, 76, 166, 0.06); } .tb-type-device { color: #3d4ca6; background: rgba(61, 76, 166, 0.06); }
.tb-type-solution-template { color: rgb(0, 137, 186); background: rgba(0, 137, 186, 0.06); } .tb-type-solution-template { color: #2c6cb4; background: rgba(44, 108, 180, 0.06); }
.tb-type-calc-field { color: rgb(40, 120, 148); background: rgba(40, 120, 148, 0.06); } .tb-type-widget { color: #20733d; background: rgba(46, 166, 88, 0.06); }
.tb-type-rule-chain { color: rgb(178, 121, 29); background: rgba(179, 121, 29, 0.06); } .tb-type-calc-field { color: #3db5e0; background: rgba(61, 181, 224, 0.06); }
.tb-type-device { color: rgb(24, 146, 110); background: rgba(24, 146, 110, 0.06); } .tb-type-alarm-rule { color: #d7702f; background: rgba(215, 112, 47, 0.06); }
.tb-type-rule-chain { color: #aa5be3; background: rgba(170, 91, 227, 0.06); }
.tb-type-dashboard { color: #607d8b; background: rgba(96, 125, 139, 0.06); }
// "vX.X.X Available" button — Design: border rgba(0,0,0,0.12), rounded-4, px-12 py-6, gap-8 // "vX.X.X Available" button — Design: border rgba(0,0,0,0.12), rounded-4, px-12 py-6, gap-8
.tb-installed-version-btn { .tb-installed-version-btn {

13
ui-ngx/src/app/modules/home/components/iot-hub/iot-hub-installed-items-table.component.ts

@ -44,7 +44,7 @@ import {
ItemPublishedVersionInfo ItemPublishedVersionInfo
} from '@shared/models/iot-hub/iot-hub-installed-item.models'; } from '@shared/models/iot-hub/iot-hub-installed-item.models';
import { MpItemVersionView } from '@shared/models/iot-hub/iot-hub-version.models'; import { MpItemVersionView } from '@shared/models/iot-hub/iot-hub-version.models';
import { ItemType, itemTypeTranslations } from '@shared/models/iot-hub/iot-hub-item.models'; import { getItemTypeIcon, ItemType, itemTypeTranslations } from '@shared/models/iot-hub/iot-hub-item.models';
import { EntityType } from '@shared/models/entity-type.models'; import { EntityType } from '@shared/models/entity-type.models';
import { getEntityDetailsPageURL } from '@core/utils'; import { getEntityDetailsPageURL } from '@core/utils';
import { IotHubActionsService } from '@home/components/iot-hub/iot-hub-actions.service'; import { IotHubActionsService } from '@home/components/iot-hub/iot-hub-actions.service';
@ -153,16 +153,7 @@ export class TbIotHubInstalledItemsTableComponent implements OnInit, OnChanges,
} }
getItemTypeIcon(itemType: string): string { getItemTypeIcon(itemType: string): string {
switch (itemType) { return getItemTypeIcon(itemType);
case 'WIDGET': return 'widgets';
case 'DASHBOARD': return 'dashboard';
case 'SOLUTION_TEMPLATE': return 'integration_instructions';
case 'CALCULATED_FIELD': return 'functions';
case 'ALARM_RULE': return 'notification_important';
case 'RULE_CHAIN': return 'settings_ethernet';
case 'DEVICE': return 'memory';
default: return 'category';
}
} }
deleteItem(item: IotHubInstalledItem): void { deleteItem(item: IotHubInstalledItem): void {

22
ui-ngx/src/app/modules/home/components/iot-hub/iot-hub-item-card.component.ts

@ -16,7 +16,7 @@
import { Component, EventEmitter, Input, Output } from '@angular/core'; import { Component, EventEmitter, Input, Output } from '@angular/core';
import { MpItemVersionView, cfTypeTranslations, cfTypeIcons, ruleChainTypeTranslations, widgetTypeTranslations } from '@shared/models/iot-hub/iot-hub-version.models'; import { MpItemVersionView, cfTypeTranslations, cfTypeIcons, ruleChainTypeTranslations, widgetTypeTranslations } from '@shared/models/iot-hub/iot-hub-version.models';
import { ItemType } from '@shared/models/iot-hub/iot-hub-item.models'; import { getItemTypeIcon, ItemType } from '@shared/models/iot-hub/iot-hub-item.models';
import { IotHubInstalledItem } from '@shared/models/iot-hub/iot-hub-installed-item.models'; import { IotHubInstalledItem } from '@shared/models/iot-hub/iot-hub-installed-item.models';
import { TranslateService } from '@ngx-translate/core'; import { TranslateService } from '@ngx-translate/core';
import { IotHubApiService } from '@core/http/iot-hub-api.service'; import { IotHubApiService } from '@core/http/iot-hub-api.service';
@ -69,17 +69,21 @@ export class TbIotHubItemCardComponent {
getPlaceholderIcon(): string { getPlaceholderIcon(): string {
switch (this.item.type) { switch (this.item.type) {
case ItemType.WIDGET: return 'widgets';
case ItemType.DASHBOARD: return 'dashboard';
case ItemType.SOLUTION_TEMPLATE: return 'integration_instructions';
case ItemType.CALCULATED_FIELD: case ItemType.CALCULATED_FIELD:
return this.item.icon || cfTypeIcons.get(this.item.dataDescriptor?.cfType) || 'functions'; return this.item.icon
|| cfTypeIcons.get(this.item.dataDescriptor?.cfType)
|| getItemTypeIcon(ItemType.CALCULATED_FIELD);
case ItemType.ALARM_RULE: case ItemType.ALARM_RULE:
return this.item.icon || 'notification_important'; return this.item.icon || getItemTypeIcon(ItemType.ALARM_RULE);
case ItemType.RULE_CHAIN: case ItemType.RULE_CHAIN:
return this.item.icon || (this.item.dataDescriptor?.ruleChainType === 'EDGE' ? 'router' : 'device_hub'); return this.item.icon
case ItemType.DEVICE: return 'memory'; || (this.item.dataDescriptor?.ruleChainType === 'EDGE'
default: return 'extension'; ? 'router'
: (this.item.dataDescriptor?.ruleChainType === 'CORE'
? 'device_hub'
: getItemTypeIcon(ItemType.RULE_CHAIN)));
default:
return getItemTypeIcon(this.item.type);
} }
} }

19
ui-ngx/src/app/modules/home/components/iot-hub/iot-hub-item-detail-dialog.component.ts

@ -21,7 +21,7 @@ import { Store } from '@ngrx/store';
import { AppState } from '@core/core.state'; import { AppState } from '@core/core.state';
import { DialogComponent } from '@shared/components/dialog.component'; import { DialogComponent } from '@shared/components/dialog.component';
import { MpItemVersionView, cfTypeTranslations, cfTypeIcons, ruleChainTypeTranslations, widgetTypeTranslations, NodeInfo } from '@shared/models/iot-hub/iot-hub-version.models'; import { MpItemVersionView, cfTypeTranslations, cfTypeIcons, ruleChainTypeTranslations, widgetTypeTranslations, NodeInfo } from '@shared/models/iot-hub/iot-hub-version.models';
import { ItemType, itemTypeTranslations } from '@shared/models/iot-hub/iot-hub-item.models'; import { getItemTypeIcon, ItemType, itemTypeTranslations } from '@shared/models/iot-hub/iot-hub-item.models';
import { IotHubInstalledItem } from '@shared/models/iot-hub/iot-hub-installed-item.models'; import { IotHubInstalledItem } from '@shared/models/iot-hub/iot-hub-installed-item.models';
import { IotHubApiService } from '@core/http/iot-hub-api.service'; import { IotHubApiService } from '@core/http/iot-hub-api.service';
import { TranslateService } from '@ngx-translate/core'; import { TranslateService } from '@ngx-translate/core';
@ -103,16 +103,7 @@ export class TbIotHubItemDetailDialogComponent extends DialogComponent<TbIotHubI
} }
getTypeIcon(): string { getTypeIcon(): string {
switch (this.item.type) { return getItemTypeIcon(this.item.type);
case ItemType.WIDGET: return 'widgets';
case ItemType.DASHBOARD: return 'dashboard';
case ItemType.SOLUTION_TEMPLATE: return 'integration_instructions';
case ItemType.CALCULATED_FIELD: return 'functions';
case ItemType.ALARM_RULE: return 'notification_important';
case ItemType.RULE_CHAIN: return 'account_tree';
case ItemType.DEVICE: return 'memory';
default: return 'category';
}
} }
getCompactIcon(): string { getCompactIcon(): string {
@ -121,15 +112,15 @@ export class TbIotHubItemDetailDialogComponent extends DialogComponent<TbIotHubI
} }
if (this.item.type === ItemType.CALCULATED_FIELD) { if (this.item.type === ItemType.CALCULATED_FIELD) {
const cfType = this.item.dataDescriptor?.cfType; const cfType = this.item.dataDescriptor?.cfType;
return cfTypeIcons.get(cfType) || 'functions'; return cfTypeIcons.get(cfType) || getItemTypeIcon(ItemType.CALCULATED_FIELD);
} }
if (this.item.type === ItemType.ALARM_RULE) { if (this.item.type === ItemType.ALARM_RULE) {
return 'notification_important'; return getItemTypeIcon(ItemType.ALARM_RULE);
} }
switch (this.item.dataDescriptor?.ruleChainType) { switch (this.item.dataDescriptor?.ruleChainType) {
case 'CORE': return 'device_hub'; case 'CORE': return 'device_hub';
case 'EDGE': return 'router'; case 'EDGE': return 'router';
default: return 'account_tree'; default: return getItemTypeIcon(ItemType.RULE_CHAIN);
} }
} }

2
ui-ngx/src/app/modules/home/components/iot-hub/iot-hub-item-link-card/iot-hub-item-link-card.component.html

@ -40,7 +40,7 @@
@if (getImageUrl(); as imgUrl) { @if (getImageUrl(); as imgUrl) {
<img [src]="imgUrl" alt=""> <img [src]="imgUrl" alt="">
} @else { } @else {
<mat-icon class="tb-iot-hub-item-link-thumb-fallback">{{ getTypeIcon() }}</mat-icon> <tb-icon class="tb-iot-hub-item-link-thumb-fallback">{{ getTypeIcon() }}</tb-icon>
} }
</div> </div>
} }

24
ui-ngx/src/app/modules/home/components/iot-hub/iot-hub-item-link-card/iot-hub-item-link-card.component.ts

@ -17,7 +17,7 @@
import { Component, Input, OnInit } from '@angular/core'; import { Component, Input, OnInit } from '@angular/core';
import { IotHubApiService } from '@core/http/iot-hub-api.service'; import { IotHubApiService } from '@core/http/iot-hub-api.service';
import { MpItemVersionView } from '@shared/models/iot-hub/iot-hub-version.models'; import { MpItemVersionView } from '@shared/models/iot-hub/iot-hub-version.models';
import { ItemType } from '@shared/models/iot-hub/iot-hub-item.models'; import { getItemTypeIcon, ItemType } from '@shared/models/iot-hub/iot-hub-item.models';
type CardState = 'loading' | 'loaded' | 'unavailable'; type CardState = 'loading' | 'loaded' | 'unavailable';
@ -71,29 +71,11 @@ export class TbIotHubItemLinkCardComponent implements OnInit {
getCompactIcon(): string { getCompactIcon(): string {
const item = this.item!; const item = this.item!;
if (item.icon) { return item.icon || getItemTypeIcon(item.type);
return item.icon;
}
switch (item.type) {
case ItemType.CALCULATED_FIELD: return 'functions';
case ItemType.ALARM_RULE: return 'notification_important';
case ItemType.RULE_CHAIN: return 'account_tree';
default: return 'category';
}
} }
getTypeIcon(): string { getTypeIcon(): string {
const item = this.item!; return getItemTypeIcon(this.item!.type);
switch (item.type) {
case ItemType.WIDGET: return 'widgets';
case ItemType.DASHBOARD: return 'dashboard';
case ItemType.SOLUTION_TEMPLATE: return 'integration_instructions';
case ItemType.CALCULATED_FIELD: return 'functions';
case ItemType.ALARM_RULE: return 'notification_important';
case ItemType.RULE_CHAIN: return 'account_tree';
case ItemType.DEVICE: return 'memory';
default: return 'category';
}
} }
getCompactColor(): string { getCompactColor(): string {

2
ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-home.component.html

@ -109,7 +109,7 @@
@if (getItemImage(item); as imgUrl) { @if (getItemImage(item); as imgUrl) {
<img [src]="imgUrl" alt=""> <img [src]="imgUrl" alt="">
} @else { } @else {
<mat-icon class="tb-search-popup-thumb-placeholder">{{ getItemTypeIcon(item.type) }}</mat-icon> <tb-icon class="tb-search-popup-thumb-placeholder">{{ getItemTypeIcon(item.type) }}</tb-icon>
} }
</div> </div>
} }

21
ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-home.component.ts

@ -25,7 +25,7 @@ import { MediaBreakpoints } from '@shared/models/constants';
import { PageLink } from '@shared/models/page/page-link'; import { PageLink } from '@shared/models/page/page-link';
import { Direction, SortOrder } from '@shared/models/page/sort-order'; import { Direction, SortOrder } from '@shared/models/page/sort-order';
import { MpItemVersionQuery, MpItemVersionView } from '@shared/models/iot-hub/iot-hub-version.models'; import { MpItemVersionQuery, MpItemVersionView } from '@shared/models/iot-hub/iot-hub-version.models';
import { ItemType, itemTypeTranslations } from '@shared/models/iot-hub/iot-hub-item.models'; import { getItemTypeIcon, ItemType, itemTypeTranslations } from '@shared/models/iot-hub/iot-hub-item.models';
import { IotHubInstalledItem } from '@shared/models/iot-hub/iot-hub-installed-item.models'; import { IotHubInstalledItem } from '@shared/models/iot-hub/iot-hub-installed-item.models';
import { IotHubApiService } from '@core/http/iot-hub-api.service'; import { IotHubApiService } from '@core/http/iot-hub-api.service';
import { TranslateService } from '@ngx-translate/core'; import { TranslateService } from '@ngx-translate/core';
@ -266,15 +266,7 @@ export class TbIotHubHomeComponent implements OnInit, OnDestroy {
} }
getCompactIcon(item: MpItemVersionView): string { getCompactIcon(item: MpItemVersionView): string {
if (item.icon) { return item.icon || getItemTypeIcon(item.type);
return item.icon;
}
switch (item.type) {
case ItemType.CALCULATED_FIELD: return 'functions';
case ItemType.ALARM_RULE: return 'notification_important';
case ItemType.RULE_CHAIN: return 'settings_ethernet';
default: return 'category';
}
} }
getItemImage(item: MpItemVersionView): string | null { getItemImage(item: MpItemVersionView): string | null {
@ -282,14 +274,7 @@ export class TbIotHubHomeComponent implements OnInit, OnDestroy {
} }
getItemTypeIcon(type: ItemType): string { getItemTypeIcon(type: ItemType): string {
switch (type) { return getItemTypeIcon(type);
case ItemType.WIDGET: return 'widgets';
case ItemType.DASHBOARD: return 'dashboard';
case ItemType.SOLUTION_TEMPLATE: return 'integration_instructions';
case ItemType.ALARM_RULE: return 'notification_important';
case ItemType.DEVICE: return 'memory';
default: return 'category';
}
} }
getSearchGroupLabel(type: ItemType): string { getSearchGroupLabel(type: ItemType): string {

17
ui-ngx/src/app/shared/models/iot-hub/iot-hub-item.models.ts

@ -36,6 +36,23 @@ export const itemTypeTranslations = new Map<ItemType, string>(
] ]
); );
// Canonical icon lookup per item type. Values are tb-icon
// identifiers (Material symbol names or `mdi:*` strings) and should
// be used everywhere an icon is rendered for an item type so the
// mapping stays consistent across the app.
export const itemTypeIcons: Record<string, string> = {
[ItemType.WIDGET]: 'widgets',
[ItemType.DASHBOARD]: 'dashboard',
[ItemType.SOLUTION_TEMPLATE]: 'apps',
[ItemType.CALCULATED_FIELD]: 'mdi:function-variant',
[ItemType.RULE_CHAIN]: 'settings_ethernet',
[ItemType.ALARM_RULE]: 'mdi:bell-cog',
[ItemType.DEVICE]: 'devices_other'
};
export const getItemTypeIcon = (type?: string | null): string =>
type && itemTypeIcons[type] ? itemTypeIcons[type] : 'category';
/** /**
* Item types discoverable to creators in the marketplace UI. * Item types discoverable to creators in the marketplace UI.
* DASHBOARD is intentionally absent (IoT Hub no longer accepts Dashboard contributions). * DASHBOARD is intentionally absent (IoT Hub no longer accepts Dashboard contributions).

Loading…
Cancel
Save