简柏林 / thingskit · Commits

Commit aface0ab04c43b35fab189384650e7a410385605

Authored by Artem Babak
1 parent 501c7d19

Edge Downlinks events refactored

Inline Side-by-side
Showing 7 changed files with 100 additions and 65 deletions
@@ -1073,125 +1073,122 @@ export default angular.module('thingsboard.types', []) @@ -1073,125 +1073,122 @@ export default angular.module('thingsboard.types', [])
1073 translate: { 1073 translate: {
1074 customTranslationsPrefix: "custom." 1074 customTranslationsPrefix: "custom."
1075 }, 1075 },
1076 - edgeDownlinksActionType: { 1076 + edgeEventActionTypeTranslations: {
1077 "ADDED": { 1077 "ADDED": {
1078 - name: "audit-log.type-added" 1078 + name: "edge-event.action-type-added"
1079 }, 1079 },
1080 "DELETED": { 1080 "DELETED": {
1081 - name: "audit-log.type-deleted" 1081 + name: "edge-event.action-type-deleted"
1082 }, 1082 },
1083 "UPDATED": { 1083 "UPDATED": {
1084 - name: "audit-log.type-updated" 1084 + name: "edge-event.action-type-updated"
  1085 + },
  1086 + "POST_ATTRIBUTES": {
  1087 + name: "edge-event.action-type-post-attributes"
1085 }, 1088 },
1086 "ATTRIBUTES_UPDATED": { 1089 "ATTRIBUTES_UPDATED": {
1087 - name: "audit-log.type-attributes-updated" 1090 + name: "edge-event.action-type-attributes-updated"
1088 }, 1091 },
1089 "ATTRIBUTES_DELETED": { 1092 "ATTRIBUTES_DELETED": {
1090 - name: "audit-log.type-attributes-deleted"  
1091 - },  
1092 - "RPC_CALL": {  
1093 - name: "audit-log.type-rpc-call" 1093 + name: "edge-event.action-type-attributes-deleted"
1094 }, 1094 },
1095 "CREDENTIALS_UPDATED": { 1095 "CREDENTIALS_UPDATED": {
1096 - name: "audit-log.type-credentials-updated" 1096 + name: "edge-event.action-type-credentials-updated"
  1097 + },
  1098 + "ASSIGNED_TO_CUSTOMER": {
  1099 + name: "edge-event.action-type-assigned-to-customer"
  1100 + },
  1101 + "UNASSIGNED_TO_CUSTOMER": {
  1102 + name: "edge-event.action-type-unassigned-from-customer"
1097 }, 1103 },
1098 "RELATION_ADD_OR_UPDATE": { 1104 "RELATION_ADD_OR_UPDATE": {
1099 - name: "audit-log.type-relation-add-or-update" 1105 + name: "edge-event.action-type-relation-add-or-update"
1100 }, 1106 },
1101 "RELATION_DELETED": { 1107 "RELATION_DELETED": {
1102 - name: "audit-log.type-relation-delete" 1108 + name: "edge-event.action-type-relation-deleted"
  1109 + },
  1110 + "RPC_CALL": {
  1111 + name: "edge-event.action-type-rpc-call"
1103 }, 1112 },
1104 "ALARM_ACK": { 1113 "ALARM_ACK": {
1105 - name: "audit-log.type-alarm-ack" 1114 + name: "edge-event.action-type-alarm-ack"
1106 }, 1115 },
1107 "ALARM_CLEAR": { 1116 "ALARM_CLEAR": {
1108 - name: "audit-log.type-alarm-clear" 1117 + name: "edge-event.action-type-alarm-clear"
1109 }, 1118 },
1110 "CREDENTIALS_REQUEST": { 1119 "CREDENTIALS_REQUEST": {
1111 - name: "edge.credentials-request"  
1112 - },  
1113 - "ATTRIBUTES_REQUEST": {  
1114 - name: "edge.attributes-request" 1120 + name: "edge-event.action-type-credentials-request"
1115 }, 1121 },
1116 "TIMESERIES_UPDATED": { 1122 "TIMESERIES_UPDATED": {
1117 - name: "edge.timeseries-updated"  
1118 - },  
1119 - "RELATION_REQUEST": {  
1120 - name: "edge.relation-request"  
1121 - },  
1122 - "RULE_CHAIN_METADATA_REQUEST": {  
1123 - name: "edge.rule-chain-metadata-request"  
1124 - },  
1125 - "GROUP_ENTITIES_REQUEST": {  
1126 - name: "edge.group_entities_request"  
1127 - },  
1128 - "GROUP_PERMISSIONS_REQUEST": {  
1129 - name: "edge.group-permissions-request" 1123 + name: "edge-event.action-type-timeseries-updated"
1130 }, 1124 },
1131 "ASSIGNED_TO_EDGE": { 1125 "ASSIGNED_TO_EDGE": {
1132 - name: "audit-log.type-assigned-to-edge" 1126 + name: "edge-event.action-type-assigned-to-edge"
1133 }, 1127 },
1134 "UNASSIGNED_FROM_EDGE": { 1128 "UNASSIGNED_FROM_EDGE": {
1135 - name: "audit-log.type-unassigned-from-edge" 1129 + name: "edge-event.action-type-unassigned-from-edge"
1136 } 1130 }
1137 }, 1131 },
1138 - edgeDownlinksTypeTranslations:{ 1132 + edgeEventTypeTranslations:{
1139 "DASHBOARD": { 1133 "DASHBOARD": {
1140 - name: "entity.type-dashboard" 1134 + name: "edge-event.type-dashboard"
1141 }, 1135 },
1142 "ASSET": { 1136 "ASSET": {
1143 - name: "entity.type-asset" 1137 + name: "edge-event.type-asset"
1144 }, 1138 },
1145 "DEVICE": { 1139 "DEVICE": {
1146 - name: "entity.type-device" 1140 + name: "edge-event.type-device"
1147 }, 1141 },
1148 "ENTITY_VIEW": { 1142 "ENTITY_VIEW": {
1149 - name: "entity.type-entity_view" 1143 + name: "edge-event.type-entity-view"
1150 }, 1144 },
1151 "ALARM": { 1145 "ALARM": {
1152 - name: "entity.type-alarm" 1146 + name: "edge-event.type-alarm"
1153 }, 1147 },
1154 "RULE_CHAIN": { 1148 "RULE_CHAIN": {
1155 - name: "entity.type-rulechain" 1149 + name: "edge-event.type-rule-chain"
1156 }, 1150 },
1157 - "RULE_CHAIN_META_DATA": {  
1158 - name: "entity.type-rule-chain-metadata" 1151 + "RULE_CHAIN_METADATA": {
  1152 + name: "edge-event.type-rule-chain-metadata"
1159 }, 1153 },
1160 "EDGE": { 1154 "EDGE": {
1161 - name: "entity.type-edge" 1155 + name: "edge-event.type-edge"
1162 }, 1156 },
1163 "USER": { 1157 "USER": {
1164 - name: "entity.type-user" 1158 + name: "edge-event.type-user"
  1159 + },
  1160 + "TENANT": {
  1161 + name: "edge-event.type-tenant"
1165 }, 1162 },
1166 "CUSTOMER": { 1163 "CUSTOMER": {
1167 - name: "entity.type-customer" 1164 + name: "edge-event.type-customer"
1168 }, 1165 },
1169 "RELATION": { 1166 "RELATION": {
1170 - name: "entity.type-relation" 1167 + name: "edge-event.type-relation"
1171 }, 1168 },
1172 "ENTITY_GROUP": { 1169 "ENTITY_GROUP": {
1173 - name: "entity.type-entity-group" 1170 + name: "edge-event.type-entity-group"
1174 }, 1171 },
1175 "SCHEDULER_EVENT": { 1172 "SCHEDULER_EVENT": {
1176 - name: "entity.type-scheduler-event" 1173 + name: "edge-event.type-scheduler-event"
1177 }, 1174 },
1178 "WHITE_LABELING": { 1175 "WHITE_LABELING": {
1179 - name: "white-labeling.white-labeling" 1176 + name: "edge-event.type-white-labeling"
1180 }, 1177 },
1181 "LOGIN_WHITE_LABELING": { 1178 "LOGIN_WHITE_LABELING": {
1182 - name: "white-labeling.login-white-labeling" 1179 + name: "edge-event.type-login-white-labeling"
1183 }, 1180 },
1184 "CUSTOM_TRANSLATION": { 1181 "CUSTOM_TRANSLATION": {
1185 - name: "custom-translation.custom-translation", 1182 + name: "edge-event.custom-translation",
1186 }, 1183 },
1187 "WIDGETS_BUNDLE": { 1184 "WIDGETS_BUNDLE": {
1188 - name: "widget.widget-bundle" 1185 + name: "edge-event.type-widgets-bundle"
1189 }, 1186 },
1190 "WIDGET_TYPE": { 1187 "WIDGET_TYPE": {
1191 - name: "widget.type" 1188 + name: "edge-event.type-widgets-type"
1192 }, 1189 },
1193 "ADMIN_SETTINGS": { 1190 "ADMIN_SETTINGS": {
1194 - name: "permission.resource.display-type.ADMIN_SETTINGS" 1191 + name: "edge-event.type-admin-settings"
1195 } 1192 }
1196 } 1193 }
1197 } 1194 }
@@ -16,8 +16,8 @@ @@ -16,8 +16,8 @@
16 16
17 --> 17 -->
18 <div translate class="tb-cell" flex="20">event.event-time</div> 18 <div translate class="tb-cell" flex="20">event.event-time</div>
19 -<div translate class="tb-cell" flex="10">event.event-type</div> 19 +<div translate class="tb-cell" flex="15">event.type</div>
20 <div translate class="tb-cell" flex="15">edge.event-action</div> 20 <div translate class="tb-cell" flex="15">edge.event-action</div>
21 <div translate class="tb-cell" flex="30">edge.entity-id</div> 21 <div translate class="tb-cell" flex="30">edge.entity-id</div>
22 -<div translate class="tb-cell" flex="15">edge.status</div>  
23 -<div translate class="tb-cell" flex="10">edge.entity-info</div> 22 +<div translate class="tb-cell" flex="10">event.status</div>
  23 +<div translate class="tb-cell" flex="10">event.data</div>
@@ -16,10 +16,10 @@ @@ -16,10 +16,10 @@
16 16
17 --> 17 -->
18 <div class="tb-cell" flex="20">{{ downlink.createdTime | date : 'yyyy-MM-dd HH:mm:ss' }}</div> 18 <div class="tb-cell" flex="20">{{ downlink.createdTime | date : 'yyyy-MM-dd HH:mm:ss' }}</div>
19 -<div class="tb-cell" flex="10">{{ downlink.edgeDownlinksTypeText }}</div> 19 +<div class="tb-cell" flex="15">{{ downlink.edgeDownlinksTypeText }}</div>
20 <div class="tb-cell" flex="15">{{ downlink.edgeDownlinksActionText }}</div> 20 <div class="tb-cell" flex="15">{{ downlink.edgeDownlinksActionText }}</div>
21 <div class="tb-cell" flex="30">{{ downlink.entityId }}</div> 21 <div class="tb-cell" flex="30">{{ downlink.entityId }}</div>
22 -<div class="tb-cell" flex="15" ng-style="{'color': statusColor}">{{ updateStatus(downlink.createdTime) }}</div> 22 +<div class="tb-cell" flex="10" ng-style="{'color': statusColor}">{{ updateStatus(downlink.createdTime) }}</div>
23 <div class="tb-cell" flex="10"> 23 <div class="tb-cell" flex="10">
24 <md-button ng-if="checkEdgeDownlinksType(downlink.type)" class="md-icon-button md-primary" 24 <md-button ng-if="checkEdgeDownlinksType(downlink.type)" class="md-icon-button md-primary"
25 ng-click="showEdgeEntityContent($event, 'edge.entity-info', 'JSON')" 25 ng-click="showEdgeEntityContent($event, 'edge.entity-info', 'JSON')"
@@ -211,8 +211,8 @@ export default function EdgeDownlinksDirective($compile, $templateCache, $rootSc @@ -211,8 +211,8 @@ export default function EdgeDownlinksDirective($compile, $templateCache, $rootSc
211 211
212 data.forEach( 212 data.forEach(
213 edgeDownlink => { 213 edgeDownlink => {
214 - edgeDownlink.edgeDownlinksActionText = $translate.instant(types.edgeDownlinksActionType[edgeDownlink.action].name);  
215 - edgeDownlink.edgeDownlinksTypeText = $translate.instant(types.edgeDownlinksTypeTranslations[edgeDownlink.edgeId.entityType].name); 214 + edgeDownlink.edgeDownlinksActionText = $translate.instant(types.edgeEventActionTypeTranslations[edgeDownlink.action].name);
  215 + edgeDownlink.edgeDownlinksTypeText = $translate.instant(types.edgeEventTypeTranslations[edgeDownlink.type].name);
216 } 216 }
217 ); 217 );
218 return data; 218 return data;
@@ -808,7 +808,6 @@ @@ -808,7 +808,6 @@
808 "deployed": "Bereitgestellt", 808 "deployed": "Bereitgestellt",
809 "pending": "Steht aus", 809 "pending": "Steht aus",
810 "entity-id": "Entität ID", 810 "entity-id": "Entität ID",
811 - "entity-info": "Entitätsinfo",  
812 "event-action": "Ereignisaktion", 811 "event-action": "Ereignisaktion",
813 "load-entity-error": "Entität nicht gefunden. Fehler beim Laden der Informationen", 812 "load-entity-error": "Entität nicht gefunden. Fehler beim Laden der Informationen",
814 "unassign-edges-text": "Nach der Bestätigung werden alle ausgewählten Kanten nicht zugewiesen und sind für den Kunden nicht zugänglich.", 813 "unassign-edges-text": "Nach der Bestätigung werden alle ausgewählten Kanten nicht zugewiesen und sind für den Kunden nicht zugänglich.",
@@ -788,7 +788,6 @@ @@ -788,7 +788,6 @@
788 "cloud-endpoint": "Cloud Endpoint", 788 "cloud-endpoint": "Cloud Endpoint",
789 "cloud-endpoint-required": "Cloud Endpoint is required.", 789 "cloud-endpoint-required": "Cloud Endpoint is required.",
790 "description": "Description", 790 "description": "Description",
791 - "entity-info": "Entity info",  
792 "details": "Details", 791 "details": "Details",
793 "events": "Events", 792 "events": "Events",
794 "copy-id": "Copy Edge Id", 793 "copy-id": "Copy Edge Id",
@@ -845,7 +844,6 @@ @@ -845,7 +844,6 @@
845 "set-root-rule-chain-text": "Please select root rule chain for edge(s)", 844 "set-root-rule-chain-text": "Please select root rule chain for edge(s)",
846 "set-root-rule-chain-to-edges": "Set root rule chain for Edge(s)", 845 "set-root-rule-chain-to-edges": "Set root rule chain for Edge(s)",
847 "set-root-rule-chain-to-edges-text": "Set root rule chain for { count, plural, 1 {1 edge} other {# edges} }", 846 "set-root-rule-chain-to-edges-text": "Set root rule chain for { count, plural, 1 {1 edge} other {# edges} }",
848 - "status": "Received by edge",  
849 "deployed": "Deployed", 847 "deployed": "Deployed",
850 "pending": "Pending", 848 "pending": "Pending",
851 "unassign-edges-action-title": "Unassign { count, plural, 1 {1 edge} other {# edges} } from customer", 849 "unassign-edges-action-title": "Unassign { count, plural, 1 {1 edge} other {# edges} } from customer",
@@ -860,6 +858,48 @@ @@ -860,6 +858,48 @@
860 "downlinks": "Downlinks", 858 "downlinks": "Downlinks",
861 "no-downlinks-prompt": "No downlinks found" 859 "no-downlinks-prompt": "No downlinks found"
862 }, 860 },
  861 + "edge-event": {
  862 + "type-dashboard": "Dashboard",
  863 + "type-asset": "Asset",
  864 + "type-device": "Device",
  865 + "type-device-profile": "Device Profile",
  866 + "type-entity-view": "Entity View",
  867 + "type-alarm": "Alar",
  868 + "type-rule-chain": "Rule Chain",
  869 + "type-rule-chain-metadata": "Rule Chain Metadata",
  870 + "type-edge": "Edge",
  871 + "type-entity-group": "Entity Group",
  872 + "type-scheduler-event": "Scheduler Event",
  873 + "type-white-labeling": "White Labeling",
  874 + "type-login-white-labeling": "White Labeling Login",
  875 + "type-user": "User",
  876 + "type-tenant": "Tenant",
  877 + "type-customer": "Customer",
  878 + "type-custom-translation": "Custom Translation",
  879 + "type-relation": "Relation",
  880 + "type-widgets-bundle": "Widgets Bundle",
  881 + "type-widgets-type": "Widgets Type",
  882 + "type-admin-settings": "Admin Settings",
  883 + "action-type-added": "Added",
  884 + "action-type-deleted": "Deleted",
  885 + "action-type-updated": "Updated",
  886 + "action-type-post-attributes": "Post Attributes",
  887 + "action-type-attributes-updated": "Attributes Updated",
  888 + "action-type-attributes-deleted": "Attributes Deleted",
  889 + "action-type-timeseries-updated": "Timeseries Updated",
  890 + "action-type-credentials-updated": "Credentials Updated",
  891 + "action-type-assigned-to-customer": "Assigned to Customer",
  892 + "action-type-unassigned-from-customer": "Unassigned from Customer",
  893 + "action-type-relation-add-or-update": "Relation Add or Update",
  894 + "action-type-relation-deleted": "Relation Deleted",
  895 + "action-type-rpc-call": "RPC Call",
  896 + "action-type-alarm-ack": "Alarm Ack",
  897 + "action-type-alarm-clear": "Alarm Clear",
  898 + "action-type-assigned-to-edge": "Assigned to Edge",
  899 + "action-type-unassigned-from-edge": "Unassigned from Edge",
  900 + "action-type-credentials-request": "Credentials Request",
  901 + "action-type-entity-merge-request": "Entity Merge Request"
  902 + },
863 "error": { 903 "error": {
864 "unable-to-connect": "Unable to connect to the server! Please check your internet connection.", 904 "unable-to-connect": "Unable to connect to the server! Please check your internet connection.",
865 "unhandled-error-code": "Unhandled error code: {{errorCode}}", 905 "unhandled-error-code": "Unhandled error code: {{errorCode}}",
@@ -821,7 +821,6 @@ @@ -821,7 +821,6 @@
821 "deployed": "Desplegada", 821 "deployed": "Desplegada",
822 "pending": "Pendiente", 822 "pending": "Pendiente",
823 "entity-id": "ID de entidad", 823 "entity-id": "ID de entidad",
824 - "entity-info": "Entity info",  
825 "event-action": "Información de la entidad", 824 "event-action": "Información de la entidad",
826 "load-entity-error": "Entidad no encontrada. No se pudo cargar la información", 825 "load-entity-error": "Entidad no encontrada. No se pudo cargar la información",
827 "unassign-edges-text": "Después de la confirmación de todos los bordes seleccionados, se anulará la asignación y el cliente no podrá acceder a ellos.", 826 "unassign-edges-text": "Después de la confirmación de todos los bordes seleccionados, se anulará la asignación y el cliente no podrá acceder a ellos.",