Edge Downlinks events refactored

6 years ago · aface0ab04
7 changed files with 100 additions and 65 deletions
--- a/ui/src/app/common/types.constant.js
+++ b/ui/src/app/common/types.constant.js
@ -1073,125 +1073,122 @@ export default angular.module('thingsboard.types', [])
            translate: {
                customTranslationsPrefix: "custom."
            },
-            edgeDownlinksActionType: {
+            edgeEventActionTypeTranslations: {
                "ADDED": {
-                    name: "audit-log.type-added"
+                    name: "edge-event.action-type-added"
                },
                "DELETED": {
-                    name: "audit-log.type-deleted"
+                    name: "edge-event.action-type-deleted"
                },
                "UPDATED": {
-                    name: "audit-log.type-updated"
+                    name: "edge-event.action-type-updated"
+                },
+                "POST_ATTRIBUTES": {
+                    name: "edge-event.action-type-post-attributes"
                },
                "ATTRIBUTES_UPDATED": {
-                    name: "audit-log.type-attributes-updated"
+                    name: "edge-event.action-type-attributes-updated"
                },
                "ATTRIBUTES_DELETED": {
-                    name: "audit-log.type-attributes-deleted"
-                },
-                "RPC_CALL": {
-                    name: "audit-log.type-rpc-call"
+                    name: "edge-event.action-type-attributes-deleted"
                },
                "CREDENTIALS_UPDATED": {
-                    name: "audit-log.type-credentials-updated"
+                    name: "edge-event.action-type-credentials-updated"
+                },
+                "ASSIGNED_TO_CUSTOMER": {
+                  name: "edge-event.action-type-assigned-to-customer"
+                },
+                "UNASSIGNED_TO_CUSTOMER": {
+                    name: "edge-event.action-type-unassigned-from-customer"
                },
                "RELATION_ADD_OR_UPDATE": {
-                    name: "audit-log.type-relation-add-or-update"
+                    name: "edge-event.action-type-relation-add-or-update"
                },
                "RELATION_DELETED": {
-                    name: "audit-log.type-relation-delete"
+                    name: "edge-event.action-type-relation-deleted"
+                },
+                "RPC_CALL": {
+                    name: "edge-event.action-type-rpc-call"
                },
                "ALARM_ACK": {
-                    name: "audit-log.type-alarm-ack"
+                    name: "edge-event.action-type-alarm-ack"
                },
                "ALARM_CLEAR": {
-                    name: "audit-log.type-alarm-clear"
+                    name: "edge-event.action-type-alarm-clear"
                },
                "CREDENTIALS_REQUEST": {
-                    name: "edge.credentials-request"
-                },
-                "ATTRIBUTES_REQUEST": {
-                    name: "edge.attributes-request"
+                    name: "edge-event.action-type-credentials-request"
                },
                "TIMESERIES_UPDATED": {
-                    name: "edge.timeseries-updated"
-                },
-                "RELATION_REQUEST": {
-                    name: "edge.relation-request"
-                },
-                "RULE_CHAIN_METADATA_REQUEST": {
-                    name: "edge.rule-chain-metadata-request"
-                },
-                "GROUP_ENTITIES_REQUEST": {
-                    name: "edge.group_entities_request"
-                },
-                "GROUP_PERMISSIONS_REQUEST": {
-                    name: "edge.group-permissions-request"
+                    name: "edge-event.action-type-timeseries-updated"
                },
                "ASSIGNED_TO_EDGE": {
-                    name: "audit-log.type-assigned-to-edge"
+                    name: "edge-event.action-type-assigned-to-edge"
                },
                "UNASSIGNED_FROM_EDGE": {
-                    name: "audit-log.type-unassigned-from-edge"
+                    name: "edge-event.action-type-unassigned-from-edge"
                }
            },
-            edgeDownlinksTypeTranslations:{
+            edgeEventTypeTranslations:{
                "DASHBOARD": {
-                    name: "entity.type-dashboard"
+                    name: "edge-event.type-dashboard"
                },
                "ASSET": {
-                    name: "entity.type-asset"
+                    name: "edge-event.type-asset"
                },
                "DEVICE": {
-                    name: "entity.type-device"
+                    name: "edge-event.type-device"
                },
                "ENTITY_VIEW": {
-                    name: "entity.type-entity_view"
+                    name: "edge-event.type-entity-view"
                },
                "ALARM": {
-                    name: "entity.type-alarm"
+                    name: "edge-event.type-alarm"
                },
                "RULE_CHAIN": {
-                    name: "entity.type-rulechain"
+                    name: "edge-event.type-rule-chain"
                },
-                "RULE_CHAIN_META_DATA": {
-                    name: "entity.type-rule-chain-metadata"
+                "RULE_CHAIN_METADATA": {
+                    name: "edge-event.type-rule-chain-metadata"
                },
                "EDGE": {
-                    name: "entity.type-edge"
+                    name: "edge-event.type-edge"
                },
                "USER": {
-                    name: "entity.type-user"
+                    name: "edge-event.type-user"
+                },
+                "TENANT": {
+                    name: "edge-event.type-tenant"
                },
                "CUSTOMER": {
-                    name: "entity.type-customer"
+                    name: "edge-event.type-customer"
                },
                "RELATION": {
-                    name: "entity.type-relation"
+                    name: "edge-event.type-relation"
                },
                "ENTITY_GROUP": {
-                    name: "entity.type-entity-group"
+                    name: "edge-event.type-entity-group"
                },
                "SCHEDULER_EVENT": {
-                    name: "entity.type-scheduler-event"
+                    name: "edge-event.type-scheduler-event"
                },
                "WHITE_LABELING": {
-                    name: "white-labeling.white-labeling"
+                    name: "edge-event.type-white-labeling"
                },
                "LOGIN_WHITE_LABELING": {
-                    name: "white-labeling.login-white-labeling"
+                    name: "edge-event.type-login-white-labeling"
                },
                "CUSTOM_TRANSLATION": {
-                    name: "custom-translation.custom-translation",
+                    name: "edge-event.custom-translation",
                },
                "WIDGETS_BUNDLE": {
-                    name: "widget.widget-bundle"
+                    name: "edge-event.type-widgets-bundle"
                },
                "WIDGET_TYPE": {
-                    name: "widget.type"
+                    name: "edge-event.type-widgets-type"
                },
                "ADMIN_SETTINGS": {
-                    name: "permission.resource.display-type.ADMIN_SETTINGS"
+                    name: "edge-event.type-admin-settings"
                }
            }
        }
--- a/ui/src/app/edge/downlinks/edge-downlinks-header.tpl.html
+++ b/ui/src/app/edge/downlinks/edge-downlinks-header.tpl.html
@ -16,8 +16,8 @@

 -->
 <div translate class="tb-cell" flex="20">event.event-time</div>
-<div translate class="tb-cell" flex="10">event.event-type</div>
+<div translate class="tb-cell" flex="15">event.type</div>
 <div translate class="tb-cell" flex="15">edge.event-action</div>
 <div translate class="tb-cell" flex="30">edge.entity-id</div>
-<div translate class="tb-cell" flex="15">edge.status</div>
-<div translate class="tb-cell" flex="10">edge.entity-info</div>
+<div translate class="tb-cell" flex="10">event.status</div>
+<div translate class="tb-cell" flex="10">event.data</div>
--- a/ui/src/app/edge/downlinks/edge-downlinks-row.tpl.html
+++ b/ui/src/app/edge/downlinks/edge-downlinks-row.tpl.html
@ -16,10 +16,10 @@

 -->
 <div class="tb-cell" flex="20">{{ downlink.createdTime | date :  'yyyy-MM-dd HH:mm:ss' }}</div>
-<div class="tb-cell" flex="10">{{ downlink.edgeDownlinksTypeText }}</div>
+<div class="tb-cell" flex="15">{{ downlink.edgeDownlinksTypeText }}</div>
 <div class="tb-cell" flex="15">{{ downlink.edgeDownlinksActionText }}</div>
 <div class="tb-cell" flex="30">{{ downlink.entityId }}</div>
-<div class="tb-cell" flex="15" ng-style="{'color': statusColor}">{{ updateStatus(downlink.createdTime) }}</div>
+<div class="tb-cell" flex="10" ng-style="{'color': statusColor}">{{ updateStatus(downlink.createdTime) }}</div>
 <div class="tb-cell" flex="10">
    <md-button ng-if="checkEdgeDownlinksType(downlink.type)" class="md-icon-button md-primary"
               ng-click="showEdgeEntityContent($event, 'edge.entity-info', 'JSON')"
--- a/ui/src/app/edge/downlinks/edge-downlinks-table.directive.js
+++ b/ui/src/app/edge/downlinks/edge-downlinks-table.directive.js
@ -211,8 +211,8 @@ export default function EdgeDownlinksDirective($compile, $templateCache, $rootSc

        data.forEach(
            edgeDownlink => {
-                edgeDownlink.edgeDownlinksActionText = $translate.instant(types.edgeDownlinksActionType[edgeDownlink.action].name);
-                edgeDownlink.edgeDownlinksTypeText = $translate.instant(types.edgeDownlinksTypeTranslations[edgeDownlink.edgeId.entityType].name);
+                edgeDownlink.edgeDownlinksActionText = $translate.instant(types.edgeEventActionTypeTranslations[edgeDownlink.action].name);
+                edgeDownlink.edgeDownlinksTypeText = $translate.instant(types.edgeEventTypeTranslations[edgeDownlink.type].name);
            }
        );
        return data;
--- a/ui/src/app/locale/locale.constant-de_DE.json
+++ b/ui/src/app/locale/locale.constant-de_DE.json
@ -808,7 +808,6 @@
    "deployed": "Bereitgestellt",
    "pending": "Steht aus",
    "entity-id": "Entität ID",
-    "entity-info": "Entitätsinfo",
    "event-action": "Ereignisaktion",
    "load-entity-error": "Entität nicht gefunden. Fehler beim Laden der Informationen",
    "unassign-edges-text": "Nach der Bestätigung werden alle ausgewählten Kanten nicht zugewiesen und sind für den Kunden nicht zugänglich.",
--- a/ui/src/app/locale/locale.constant-en_US.json
+++ b/ui/src/app/locale/locale.constant-en_US.json
@ -788,7 +788,6 @@
        "cloud-endpoint": "Cloud Endpoint",
        "cloud-endpoint-required": "Cloud Endpoint is required.",
        "description": "Description",
-        "entity-info": "Entity info",
        "details": "Details",
        "events": "Events",
        "copy-id": "Copy Edge Id",
@ -845,7 +844,6 @@
        "set-root-rule-chain-text": "Please select root rule chain for edge(s)",
        "set-root-rule-chain-to-edges": "Set root rule chain for Edge(s)",
        "set-root-rule-chain-to-edges-text": "Set root rule chain for { count, plural, 1 {1 edge} other {# edges} }",
-        "status": "Received by edge",
        "deployed": "Deployed",
        "pending": "Pending",
        "unassign-edges-action-title": "Unassign { count, plural, 1 {1 edge} other {# edges} } from customer",
@ -860,6 +858,48 @@
        "downlinks": "Downlinks",
        "no-downlinks-prompt": "No downlinks found"
    },
+    "edge-event": {
+      "type-dashboard": "Dashboard",
+      "type-asset": "Asset",
+      "type-device": "Device",
+      "type-device-profile": "Device Profile",
+      "type-entity-view": "Entity View",
+      "type-alarm": "Alar",
+      "type-rule-chain": "Rule Chain",
+      "type-rule-chain-metadata": "Rule Chain Metadata",
+      "type-edge": "Edge",
+      "type-entity-group": "Entity Group",
+      "type-scheduler-event": "Scheduler Event",
+      "type-white-labeling": "White Labeling",
+      "type-login-white-labeling": "White Labeling Login",
+      "type-user": "User",
+      "type-tenant": "Tenant",
+      "type-customer": "Customer",
+      "type-custom-translation": "Custom Translation",
+      "type-relation": "Relation",
+      "type-widgets-bundle": "Widgets Bundle",
+      "type-widgets-type": "Widgets Type",
+      "type-admin-settings": "Admin Settings",
+      "action-type-added": "Added",
+      "action-type-deleted": "Deleted",
+      "action-type-updated": "Updated",
+      "action-type-post-attributes": "Post Attributes",
+      "action-type-attributes-updated": "Attributes Updated",
+      "action-type-attributes-deleted": "Attributes Deleted",
+      "action-type-timeseries-updated": "Timeseries Updated",
+      "action-type-credentials-updated": "Credentials Updated",
+      "action-type-assigned-to-customer": "Assigned to Customer",
+      "action-type-unassigned-from-customer": "Unassigned from Customer",
+      "action-type-relation-add-or-update": "Relation Add or Update",
+      "action-type-relation-deleted": "Relation Deleted",
+      "action-type-rpc-call": "RPC Call",
+      "action-type-alarm-ack": "Alarm Ack",
+      "action-type-alarm-clear": "Alarm Clear",
+      "action-type-assigned-to-edge": "Assigned to Edge",
+      "action-type-unassigned-from-edge": "Unassigned from Edge",
+      "action-type-credentials-request": "Credentials Request",
+      "action-type-entity-merge-request": "Entity Merge Request"
+    },
    "error": {
        "unable-to-connect": "Unable to connect to the server! Please check your internet connection.",
        "unhandled-error-code": "Unhandled error code: {{errorCode}}",
--- a/ui/src/app/locale/locale.constant-es_ES.json
+++ b/ui/src/app/locale/locale.constant-es_ES.json
@ -821,7 +821,6 @@
        "deployed": "Desplegada",
        "pending": "Pendiente",
        "entity-id": "ID de entidad",
-        "entity-info": "Entity info",
        "event-action": "Información de la entidad",
        "load-entity-error": "Entidad no encontrada. No se pudo cargar la información",
        "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.",