diff --git a/ui-ngx/src/app/modules/home/components/event/event-table-config.ts b/ui-ngx/src/app/modules/home/components/event/event-table-config.ts index c3d0f98740..4b7a2c8ade 100644 --- a/ui-ngx/src/app/modules/home/components/event/event-table-config.ts +++ b/ui-ngx/src/app/modules/home/components/event/event-table-config.ts @@ -25,7 +25,7 @@ import { Event, EventType, EdgeEventType, - EdgeEventStatusColor, + EdgeEventStatus, edgeEventStatusColor } from '@shared/models/event.models'; import {TimePageLink} from '@shared/models/page/page-link'; @@ -197,7 +197,7 @@ export class EventTableConfig extends EntityTableConfig { new EntityTableColumn('status', 'event.status', '100%', (entity) => this.updateEdgeEventStatus(entity.createdTime), entity => ({ - color: this.isPending(entity.createdTime) ? edgeEventStatusColor.get(EdgeEventStatusColor.PENDING) : edgeEventStatusColor.get(EdgeEventStatusColor.DEPLOYED) + color: this.isPending(entity.createdTime) ? edgeEventStatusColor.get(EdgeEventStatus.PENDING) : edgeEventStatusColor.get(EdgeEventStatus.DEPLOYED) }), false), new EntityActionTableColumn('data', 'event.data', { diff --git a/ui-ngx/src/app/shared/models/asset.models.ts b/ui-ngx/src/app/shared/models/asset.models.ts index d1e64c06d7..ab952d26a5 100644 --- a/ui-ngx/src/app/shared/models/asset.models.ts +++ b/ui-ngx/src/app/shared/models/asset.models.ts @@ -19,7 +19,6 @@ import { AssetId } from './id/asset-id'; import { TenantId } from '@shared/models/id/tenant-id'; import { CustomerId } from '@shared/models/id/customer-id'; import { EntitySearchQuery } from '@shared/models/relation.models'; -import { EdgeId } from "@shared/models/id/edge-id"; export interface Asset extends BaseData { tenantId?: TenantId; diff --git a/ui-ngx/src/app/shared/models/event.models.ts b/ui-ngx/src/app/shared/models/event.models.ts index 3f101f4e24..82163b5463 100644 --- a/ui-ngx/src/app/shared/models/event.models.ts +++ b/ui-ngx/src/app/shared/models/event.models.ts @@ -54,15 +54,15 @@ export enum EdgeEventType { ADMIN_SETTINGS = "ADMIN_SETTINGS" } -export enum EdgeEventStatusColor { +export enum EdgeEventStatus { DEPLOYED = "DEPLOYED", PENDING = "PENDING" } -export const edgeEventStatusColor = new Map ( +export const edgeEventStatusColor = new Map ( [ - [EdgeEventStatusColor.DEPLOYED, '#000000'], - [EdgeEventStatusColor.PENDING, '#9e9e9e'] + [EdgeEventStatus.DEPLOYED, '#000000'], + [EdgeEventStatus.PENDING, '#9e9e9e'] ] );