dendi-wang/thingsboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:thingsboard/thingsboard

Browse Source
This commit is contained in:
Andrii Shvaika 2022-08-03 19:20:14 +03:00
commit 13e7897d75
2 changed files with 39 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
ui-ngx/src/app/modules/home/components/event/event-table-config.ts
View File

@ -15,6 +15,7 @@
/// ///
import { import {
CellActionDescriptorType,
DateEntityTableColumn, DateEntityTableColumn,
EntityActionTableColumn, EntityActionTableColumn,
EntityTableColumn, EntityTableColumn,
@ -225,7 +226,9 @@ export class EventTableConfig extends EntityTableConfig<Event, TimePageLink> {
); );
break; break;
case DebugEventType.DEBUG_RULE_NODE: case DebugEventType.DEBUG_RULE_NODE:
this.columns[0].width = '100px'; this.columns[0].width = '80px';
(this.columns[1] as EntityTableColumn<Event>).headerCellStyleFunction = () => ({padding: '0 12px 0 0'});
(this.columns[1] as EntityTableColumn<Event>).cellStyleFunction = () => ({padding: '0 12px 0 0'});
this.columns.push( this.columns.push(
new EntityTableColumn<Event>('type', 'event.type', '40px', new EntityTableColumn<Event>('type', 'event.type', '40px',
(entity) => entity.body.type, entity => ({ (entity) => entity.body.type, entity => ({
@ -233,20 +236,45 @@ export class EventTableConfig extends EntityTableConfig<Event, TimePageLink> {
}), false, key => ({ }), false, key => ({
padding: '0 12px 0 0' padding: '0 12px 0 0'
})), })),
new EntityTableColumn<Event>('entityType', 'event.entity-type', '100px', new EntityTableColumn<Event>('entityType', 'event.entity-type', '75px',
(entity) => entity.body.entityType, entity => ({ (entity) => entity.body.entityType, entity => ({
padding: '0 12px 0 0', padding: '0 12px 0 0',
}), false, key => ({ }), false, key => ({
padding: '0 12px 0 0' padding: '0 12px 0 0'
})), })),
new EntityTableColumn<Event>('msgId', 'event.message-id', '100px', new EntityTableColumn<Event>('entityId', 'event.entity-id', '85px',
(entity) => entity.body.msgId, entity => ({ (entity) => `${entity.body.entityId.substring(0, 6)}…`, () => ({
whiteSpace: 'nowrap',
padding: '0 12px 0 0' padding: '0 12px 0 0'
}), false, key => ({ }), false, () => ({
padding: '0 12px 0 0' padding: '0 12px 0 0'
}), }),
entity => entity.body.msgId), () => undefined, false, {
name: this.translate.instant('event.copy-entity-id'),
icon: 'content_paste',
style: {
'font-size': '16px',
color: 'rgba(0,0,0,.87)'
},
isEnabled: () => true,
onAction: ($event, entity) => entity.body.entityId,
type: CellActionDescriptorType.COPY_BUTTON
}),
new EntityTableColumn<Event>('msgId', 'event.message-id', '85px',
(entity) => `${entity.body.msgId.substring(0, 6)}…`, () => ({
padding: '0 12px 0 0'
}), false, () => ({
padding: '0 12px 0 0'
}), () => undefined, false, {
name: this.translate.instant('event.copy-message-id'),
icon: 'content_paste',
style: {
'font-size': '16px',
color: 'rgba(0,0,0,.87)'
},
isEnabled: () => true,
onAction: ($event, entity) => entity.body.msgId,
type: CellActionDescriptorType.COPY_BUTTON
}),
new EntityTableColumn<Event>('msgType', 'event.message-type', '100px', new EntityTableColumn<Event>('msgType', 'event.message-type', '100px',
(entity) => entity.body.msgType, entity => ({ (entity) => entity.body.msgType, entity => ({
whiteSpace: 'nowrap', whiteSpace: 'nowrap',
@ -255,8 +283,8 @@ export class EventTableConfig extends EntityTableConfig<Event, TimePageLink> {
padding: '0 12px 0 0' padding: '0 12px 0 0'
}), }),
entity => entity.body.msgType), entity => entity.body.msgType),
new EntityTableColumn<Event>('relationType', 'event.relation-type', '100px', new EntityTableColumn<Event>('relationType', 'event.relation-type', '70px',
(entity) => entity.body.relationType, entity => ({padding: '0 12px 0 0', }), false, key => ({ (entity) => entity.body.relationType, () => ({padding: '0 12px 0 0'}), false, () => ({
padding: '0 12px 0 0' padding: '0 12px 0 0'
})), })),
new EntityActionTableColumn<Event>('data', 'event.data', new EntityActionTableColumn<Event>('data', 'event.data',

2
ui-ngx/src/assets/locale/locale.constant-en_US.json
View File

@ -2014,6 +2014,7 @@
"type": "Type", "type": "Type",
"message": "Message", "message": "Message",
"message-id": "Message Id", "message-id": "Message Id",
"copy-message-id": "Copy message Id",
"message-type": "Message Type", "message-type": "Message Type",
"data-type": "Data Type", "data-type": "Data Type",
"relation-type": "Relation Type", "relation-type": "Relation Type",
@ -2033,6 +2034,7 @@
"all-events": "All", "all-events": "All",
"has-error": "Has error", "has-error": "Has error",
"entity-id": "Entity Id", "entity-id": "Entity Id",
"copy-entity-id": "Copy entity Id",
"entity-type": "Entity type", "entity-type": "Entity type",
"clear-filter": "Clear Filter", "clear-filter": "Clear Filter",
"clear-request-title": "Clear all events", "clear-request-title": "Clear all events",