Edge widget implementation with initial simulated data
This commit is contained in:
deaflynx
parent
206c570abb
commit
6d83477fe6
@ -1160,23 +1160,23 @@ export class EntityService {
|
||||
}
|
||||
|
||||
public getAssignedToEdgeEntitiesByType(node: NavTreeNode, pageLink: PageLink): Observable<PageData<any>> {
|
||||
let edgeId = node.data.edge.id.id;
|
||||
let edgeId = node.data.entity.id.id;
|
||||
let entitiesObservable: Observable<PageData<any>>;
|
||||
switch (node.data.entityType) {
|
||||
case (EntityType.ASSET):
|
||||
entitiesObservable = this.assetService.getEdgeAssets(edgeId, pageLink, null);
|
||||
entitiesObservable = this.assetService.getEdgeAssets(edgeId, pageLink);
|
||||
break;
|
||||
case (EntityType.DEVICE):
|
||||
entitiesObservable = this.deviceService.getEdgeDevices(edgeId, pageLink, null);
|
||||
entitiesObservable = this.deviceService.getEdgeDevices(edgeId, pageLink);
|
||||
break;
|
||||
case (EntityType.ENTITY_VIEW):
|
||||
entitiesObservable = this.entityViewService.getEdgeEntityViews(edgeId, pageLink, null);
|
||||
entitiesObservable = this.entityViewService.getEdgeEntityViews(edgeId, pageLink);
|
||||
break;
|
||||
case (EntityType.DASHBOARD):
|
||||
entitiesObservable = this.dashboardService.getEdgeDashboards(edgeId, pageLink, null);
|
||||
entitiesObservable = this.dashboardService.getEdgeDashboards(edgeId, pageLink);
|
||||
break;
|
||||
case (EntityType.RULE_CHAIN):
|
||||
entitiesObservable = this.ruleChainService.getEdgeRuleChains(edgeId, pageLink, null);
|
||||
entitiesObservable = this.ruleChainService.getEdgeRuleChains(edgeId, pageLink);
|
||||
break;
|
||||
}
|
||||
return entitiesObservable;
|
||||
|
||||
@ -28,7 +28,7 @@ import {
|
||||
EdgeGroupNodeData,
|
||||
edgeGroupsNodeText,
|
||||
edgeGroupsTypes,
|
||||
edgeNodeText,
|
||||
entityNodeText,
|
||||
EdgeOverviewNode,
|
||||
EntityNodeData,
|
||||
EntityNodeDatasource
|
||||
@ -37,11 +37,11 @@ import { EdgeService } from "@core/http/edge.service";
|
||||
import { EntityService } from "@core/http/entity.service";
|
||||
import { TranslateService } from "@ngx-translate/core";
|
||||
import { PageLink } from "@shared/models/page/page-link";
|
||||
import { Edge } from "@shared/models/edge.models";
|
||||
import { BaseData } from "@shared/models/base-data";
|
||||
import { BaseData, HasId } from "@shared/models/base-data";
|
||||
import { EntityId } from "@shared/models/id/entity-id";
|
||||
import { getCurrentAuthUser } from "@core/auth/auth.selectors";
|
||||
import { Authority } from "@shared/models/authority.enum";
|
||||
import { Direction } from "@shared/models/page/sort-order";
|
||||
|
||||
@Component({
|
||||
selector: 'tb-edges-overview-widget',
|
||||
@ -62,8 +62,8 @@ export class EdgesOverviewWidgetComponent extends PageComponent implements OnIni
|
||||
|
||||
private nodeIdCounter = 0;
|
||||
|
||||
private edgeNodesMap: {[parentNodeId: string]: {[edgeId: string]: string}} = {};
|
||||
private edgeGroupsNodesMap: {[edgeNodeId: string]: {[groupType: string]: string}} = {};
|
||||
private entityNodesMap: {[parentNodeId: string]: {[edgeId: string]: string}} = {};
|
||||
private entityGroupsNodesMap: {[edgeNodeId: string]: {[groupType: string]: string}} = {};
|
||||
|
||||
constructor(protected store: Store<AppState>,
|
||||
private edgeService: EdgeService,
|
||||
@ -87,18 +87,23 @@ export class EdgesOverviewWidgetComponent extends PageComponent implements OnIni
|
||||
}
|
||||
|
||||
public loadNodes: LoadNodesCallback = (node, cb) => {
|
||||
if (node.id === '#' && this.datasources.length > 0) {
|
||||
var selectedEdge: BaseData<EntityId> = null;
|
||||
if (this.datasources.length > 0 && this.datasources[0].entity && this.datasources[0].entity.id.entityType === EntityType.EDGE) {
|
||||
if (this.datasources[0].entity.id.entityType === EntityType.EDGE) {
|
||||
selectedEdge = this.datasources[0].entity;
|
||||
}
|
||||
if (node.id === '#' && selectedEdge) {
|
||||
if (selectedEdge) {
|
||||
cb(this.loadNodesForEdge(selectedEdge.id.id, selectedEdge));
|
||||
} else if (node.data && node.data.type === 'edgeGroup') {
|
||||
const pageLink = new PageLink(100);
|
||||
} else {
|
||||
cb(this.loadNodesForEdge(this.datasources[0].entityId, this.datasources[0].entity));
|
||||
}
|
||||
} else if (node.data && node.data.entity.id.entityType === EntityType.EDGE) {
|
||||
const sortOrder = { property: 'createdTime', direction: Direction.DESC };
|
||||
const pageLink = new PageLink(10, 0, null, sortOrder);
|
||||
this.entityService.getAssignedToEdgeEntitiesByType(node, pageLink).subscribe(
|
||||
(entities) => {
|
||||
if (entities.data.length > 0) {
|
||||
cb(this.edgesToNodes(node.id, entities.data));
|
||||
cb(this.entitiesToNodes(node.id, entities.data));
|
||||
} else {
|
||||
cb([]);
|
||||
}
|
||||
@ -109,10 +114,10 @@ export class EdgesOverviewWidgetComponent extends PageComponent implements OnIni
|
||||
}
|
||||
}
|
||||
|
||||
private loadNodesForEdge(parentNodeId: string, edge: any): EdgeOverviewNode[] {
|
||||
private loadNodesForEdge(parentNodeId: string, entity: BaseData<HasId>): EdgeOverviewNode[] {
|
||||
const nodes: EdgeOverviewNode[] = [];
|
||||
const nodesMap = {};
|
||||
this.edgeGroupsNodesMap[parentNodeId] = nodesMap;
|
||||
this.entityGroupsNodesMap[parentNodeId] = nodesMap;
|
||||
const authUser = getCurrentAuthUser(this.store);
|
||||
var allowedGroupTypes: EntityType[] = edgeGroupsTypes;
|
||||
if (authUser.authority === Authority.CUSTOMER_USER) {
|
||||
@ -125,10 +130,9 @@ export class EdgesOverviewWidgetComponent extends PageComponent implements OnIni
|
||||
text: edgeGroupsNodeText(this.translateService, entityType),
|
||||
children: true,
|
||||
data: {
|
||||
type: 'edgeGroup',
|
||||
entityType,
|
||||
edge,
|
||||
internalId: edge.id.id + '_' + entityType
|
||||
entity,
|
||||
internalId: entity.id.id + '_' + entityType
|
||||
} as EdgeGroupNodeData
|
||||
};
|
||||
nodes.push(node);
|
||||
@ -137,43 +141,42 @@ export class EdgesOverviewWidgetComponent extends PageComponent implements OnIni
|
||||
return nodes;
|
||||
}
|
||||
|
||||
private createEdgeNode(parentNodeId: string, edge: Edge): EdgeOverviewNode {
|
||||
let nodesMap = this.edgeNodesMap[parentNodeId];
|
||||
private createEntityNode(parentNodeId: string, entity: BaseData<HasId>): EdgeOverviewNode {
|
||||
let nodesMap = this.entityNodesMap[parentNodeId];
|
||||
if (!nodesMap) {
|
||||
nodesMap = {};
|
||||
this.edgeNodesMap[parentNodeId] = nodesMap;
|
||||
this.entityNodesMap[parentNodeId] = nodesMap;
|
||||
}
|
||||
const node: EdgeOverviewNode = {
|
||||
id: (++this.nodeIdCounter)+'',
|
||||
icon: false,
|
||||
text: edgeNodeText(edge),
|
||||
children: parentNodeId === '#',
|
||||
text: entityNodeText(entity),
|
||||
children: false,
|
||||
state: {
|
||||
disabled: false
|
||||
},
|
||||
data: {
|
||||
type: 'entity',
|
||||
entity: edge,
|
||||
internalId: edge.id.id
|
||||
entity: entity,
|
||||
internalId: entity.id.id
|
||||
} as EntityNodeData
|
||||
};
|
||||
nodesMap[edge.id.id] = node.id;
|
||||
nodesMap[entity.id.id] = node.id;
|
||||
return node;
|
||||
}
|
||||
|
||||
private edgesToNodes(parentNodeId: string, edges: Array<Edge>): EdgeOverviewNode[] {
|
||||
private entitiesToNodes(parentNodeId: string, entities: BaseData<HasId>[]): EdgeOverviewNode[] {
|
||||
const nodes: EdgeOverviewNode[] = [];
|
||||
this.edgeNodesMap[parentNodeId] = {};
|
||||
if (edges) {
|
||||
edges.forEach((edge) => {
|
||||
const node = this.createEdgeNode(parentNodeId, edge);
|
||||
this.entityNodesMap[parentNodeId] = {};
|
||||
if (entities) {
|
||||
entities.forEach((entity) => {
|
||||
const node = this.createEntityNode(parentNodeId, entity);
|
||||
nodes.push(node);
|
||||
});
|
||||
}
|
||||
return nodes;
|
||||
}
|
||||
|
||||
private getCustomerTitle(edgeId) {
|
||||
private getCustomerTitle(edgeId: string) {
|
||||
this.edgeService.getEdgeInfo(edgeId).subscribe(
|
||||
(edge) => {
|
||||
if (edge.customerTitle) {
|
||||
|
||||
@ -17,8 +17,8 @@
|
||||
import { NavTreeNode } from '@shared/components/nav-tree.component';
|
||||
import { Datasource } from '@shared/models/widget.models';
|
||||
import { EntityType } from '@shared/models/entity-type.models';
|
||||
import { Edge } from "@shared/models/edge.models";
|
||||
import { TranslateService } from "@ngx-translate/core";
|
||||
import { BaseData, HasId } from "@shared/models/base-data";
|
||||
|
||||
export interface EntityNodeDatasource extends Datasource {
|
||||
nodeId: string;
|
||||
@ -30,9 +30,9 @@ export function edgeGroupsNodeText(translate: TranslateService, entityType: Enti
|
||||
return nodeIcon + nodeText;
|
||||
}
|
||||
|
||||
export function edgeNodeText(edge: Edge): string {
|
||||
const nodeIcon = materialIconByEntityType(edge.id.entityType);
|
||||
const nodeText = edge.name;
|
||||
export function entityNodeText(entity: any): string {
|
||||
const nodeIcon = materialIconByEntityType(entity.id.entityType);
|
||||
const nodeText = entity.name;
|
||||
return nodeIcon + nodeText;
|
||||
}
|
||||
|
||||
@ -95,19 +95,14 @@ export interface EdgeOverviewNode extends NavTreeNode {
|
||||
export type EdgeOverviewNodeData = EdgeGroupNodeData | EntityNodeData;
|
||||
|
||||
export interface EdgeGroupNodeData extends BaseEdgeOverviewNodeData {
|
||||
type: 'edgeGroup';
|
||||
entityType: EntityType;
|
||||
edge: Edge;
|
||||
entity: BaseData<HasId>;
|
||||
}
|
||||
|
||||
export interface EntityNodeData extends BaseEdgeOverviewNodeData {
|
||||
type: 'entity';
|
||||
entity: Edge;
|
||||
entity: BaseData<HasId>;
|
||||
}
|
||||
|
||||
export interface BaseEdgeOverviewNodeData {
|
||||
type: EdgeOverviewNodeType;
|
||||
internalId: string;
|
||||
}
|
||||
|
||||
export type EdgeOverviewNodeType = 'entity' | 'edgeGroup';
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user