diff --git a/application/build.gradle b/application/build.gradle index ce8b10f994..75a0e52f69 100644 --- a/application/build.gradle +++ b/application/build.gradle @@ -1,5 +1,5 @@ /** - * Copyright © 2016 The Thingsboard Authors + * Copyright © 2016-2017 The Thingsboard Authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -13,7 +13,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - buildscript { ext { osPackageVersion = "3.8.0" diff --git a/application/pom.xml b/application/pom.xml index a5559eefa8..d06fbfa718 100644 --- a/application/pom.xml +++ b/application/pom.xml @@ -1,6 +1,6 @@ {{ 'dashboard.assign-to-customer' | translate }} {{ 'dashboard.unassign-from-customer' | translate }} +{{ 'dashboard.export' | translate }} {{ 'dashboard.delete' | translate }} diff --git a/ui/src/app/dashboard/dashboard-settings.controller.js b/ui/src/app/dashboard/dashboard-settings.controller.js index 3a46566c45..30dee61c57 100644 --- a/ui/src/app/dashboard/dashboard-settings.controller.js +++ b/ui/src/app/dashboard/dashboard-settings.controller.js @@ -1,5 +1,5 @@ /* - * Copyright © 2016 The Thingsboard Authors + * Copyright © 2016-2017 The Thingsboard Authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -13,7 +13,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - import './dashboard-settings.scss'; /*@ngInject*/ diff --git a/ui/src/app/dashboard/dashboard-settings.scss b/ui/src/app/dashboard/dashboard-settings.scss index 2231372075..a66e60e7c7 100644 --- a/ui/src/app/dashboard/dashboard-settings.scss +++ b/ui/src/app/dashboard/dashboard-settings.scss @@ -1,5 +1,5 @@ /** - * Copyright © 2016 The Thingsboard Authors + * Copyright © 2016-2017 The Thingsboard Authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/ui/src/app/dashboard/dashboard-settings.tpl.html b/ui/src/app/dashboard/dashboard-settings.tpl.html index e28798dfb0..edac2689fd 100644 --- a/ui/src/app/dashboard/dashboard-settings.tpl.html +++ b/ui/src/app/dashboard/dashboard-settings.tpl.html @@ -1,6 +1,6 @@ -
- - - {{ 'dashboard.add-widget' | translate }} - - - +
+ + + + + {{ 'dashboard.add-widget' | translate }} + + + + + + + + {{ 'dashboard.create-new-widget' | translate }} + + + + + + {{ 'dashboard.import-widget' | translate }} + + + + + diff --git a/ui/src/app/dashboard/device-aliases.controller.js b/ui/src/app/dashboard/device-aliases.controller.js index ab2b6f4ec4..18b3180d58 100644 --- a/ui/src/app/dashboard/device-aliases.controller.js +++ b/ui/src/app/dashboard/device-aliases.controller.js @@ -1,5 +1,5 @@ /* - * Copyright © 2016 The Thingsboard Authors + * Copyright © 2016-2017 The Thingsboard Authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -17,16 +17,18 @@ import './device-aliases.scss'; /*@ngInject*/ export default function DeviceAliasesController(deviceService, toast, $scope, $mdDialog, $document, $q, $translate, - deviceAliases, aliasToWidgetsMap, isSingleDevice, singleDeviceAlias) { + types, config) { var vm = this; - vm.isSingleDevice = isSingleDevice; - vm.singleDeviceAlias = singleDeviceAlias; + vm.isSingleDevice = config.isSingleDevice; + vm.singleDeviceAlias = config.singleDeviceAlias; vm.deviceAliases = []; - vm.aliasToWidgetsMap = aliasToWidgetsMap; vm.singleDevice = null; vm.singleDeviceSearchText = ''; + vm.title = config.customTitle ? config.customTitle : 'device.aliases'; + vm.disableAdd = config.disableAdd; + vm.aliasToWidgetsMap = {}; vm.addAlias = addAlias; vm.cancel = cancel; @@ -39,9 +41,48 @@ export default function DeviceAliasesController(deviceService, toast, $scope, $m initController(); function initController() { - for (var aliasId in deviceAliases) { - var alias = deviceAliases[aliasId].alias; - var deviceId = deviceAliases[aliasId].deviceId; + var aliasId; + if (config.widgets) { + var widgetsTitleList, widget; + if (config.isSingleWidget && config.widgets.length == 1) { + widget = config.widgets[0]; + widgetsTitleList = [widget.config.title]; + for (aliasId in config.deviceAliases) { + vm.aliasToWidgetsMap[aliasId] = widgetsTitleList; + } + } else { + for (var w in config.widgets) { + widget = config.widgets[w]; + if (widget.type === types.widgetType.rpc.value) { + if (widget.config.targetDeviceAliasIds && widget.config.targetDeviceAliasIds.length > 0) { + var targetDeviceAliasId = widget.config.targetDeviceAliasIds[0]; + widgetsTitleList = vm.aliasToWidgetsMap[targetDeviceAliasId]; + if (!widgetsTitleList) { + widgetsTitleList = []; + vm.aliasToWidgetsMap[targetDeviceAliasId] = widgetsTitleList; + } + widgetsTitleList.push(widget.config.title); + } + } else { + for (var i in widget.config.datasources) { + var datasource = widget.config.datasources[i]; + if (datasource.type === types.datasourceType.device && datasource.deviceAliasId) { + widgetsTitleList = vm.aliasToWidgetsMap[datasource.deviceAliasId]; + if (!widgetsTitleList) { + widgetsTitleList = []; + vm.aliasToWidgetsMap[datasource.deviceAliasId] = widgetsTitleList; + } + widgetsTitleList.push(widget.config.title); + } + } + } + } + } + } + + for (aliasId in config.deviceAliases) { + var alias = config.deviceAliases[aliasId].alias; + var deviceId = config.deviceAliases[aliasId].deviceId; var deviceAlias = {id: aliasId, alias: alias, device: null, changed: false, searchText: ''}; if (deviceId) { fetchAliasDevice(deviceAlias, deviceId); diff --git a/ui/src/app/dashboard/device-aliases.scss b/ui/src/app/dashboard/device-aliases.scss index d0bd4fbe5e..0f5e6da097 100644 --- a/ui/src/app/dashboard/device-aliases.scss +++ b/ui/src/app/dashboard/device-aliases.scss @@ -1,5 +1,5 @@ /** - * Copyright © 2016 The Thingsboard Authors + * Copyright © 2016-2017 The Thingsboard Authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/ui/src/app/dashboard/device-aliases.tpl.html b/ui/src/app/dashboard/device-aliases.tpl.html index bf5bb61a69..627ed9468f 100644 --- a/ui/src/app/dashboard/device-aliases.tpl.html +++ b/ui/src/app/dashboard/device-aliases.tpl.html @@ -1,6 +1,6 @@ - +
-

{{ vm.isSingleDevice ? ('device.select-device-for-alias' | translate:vm.singleDeviceAlias ) : ('device.aliases' | translate) }}

+

{{ vm.isSingleDevice ? ('device.select-device-for-alias' | translate:vm.singleDeviceAlias ) : (vm.title | translate) }}

@@ -109,7 +109,7 @@
-
+
{{ 'device.add-alias' | translate }} diff --git a/ui/src/app/dashboard/edit-widget.directive.js b/ui/src/app/dashboard/edit-widget.directive.js index 34b11f7055..84dc2cb575 100644 --- a/ui/src/app/dashboard/edit-widget.directive.js +++ b/ui/src/app/dashboard/edit-widget.directive.js @@ -1,5 +1,5 @@ /* - * Copyright © 2016 The Thingsboard Authors + * Copyright © 2016-2017 The Thingsboard Authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -76,10 +76,12 @@ export default function EditWidgetDirective($compile, $templateCache, widgetServ controllerAs: 'vm', templateUrl: deviceAliasesTemplate, locals: { - deviceAliases: angular.copy(scope.dashboard.configuration.deviceAliases), - aliasToWidgetsMap: null, - isSingleDevice: true, - singleDeviceAlias: singleDeviceAlias + config: { + deviceAliases: angular.copy(scope.dashboard.configuration.deviceAliases), + widgets: null, + isSingleDevice: true, + singleDeviceAlias: singleDeviceAlias + } }, parent: angular.element($document[0].body), fullscreen: true, diff --git a/ui/src/app/dashboard/edit-widget.tpl.html b/ui/src/app/dashboard/edit-widget.tpl.html index 5f03daf4dc..a2cd40909e 100644 --- a/ui/src/app/dashboard/edit-widget.tpl.html +++ b/ui/src/app/dashboard/edit-widget.tpl.html @@ -1,6 +1,6 @@ + + + +
+

{{ vm.importTitle }}

+ + + + +
+ + + + +
+
+
+
+ +
+
+ + + {{ 'action.remove' | translate }} + + + close + + +
+
+ + +
+
+
+
+
import.no-file
+
{{ vm.fileName }}
+
+
+
+
+ + + + + {{ 'action.import' | translate }} + + {{ 'action.cancel' | translate }} + + + diff --git a/ui/src/app/import-export/import-export.service.js b/ui/src/app/import-export/import-export.service.js new file mode 100644 index 0000000000..2a681a2f6a --- /dev/null +++ b/ui/src/app/import-export/import-export.service.js @@ -0,0 +1,372 @@ +/* + * Copyright © 2016-2017 The Thingsboard Authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +/* eslint-disable import/no-unresolved, import/default */ + +import importDialogTemplate from './import-dialog.tpl.html'; +import deviceAliasesTemplate from '../dashboard/device-aliases.tpl.html'; + +/* eslint-enable import/no-unresolved, import/default */ + + +/* eslint-disable no-undef, angular/window-service, angular/document-service */ + +/*@ngInject*/ +export default function ImportExport($log, $translate, $q, $mdDialog, $document, itembuffer, deviceService, dashboardService, toast) { + + + var service = { + exportDashboard: exportDashboard, + importDashboard: importDashboard, + exportWidget: exportWidget, + importWidget: importWidget + } + + return service; + + // Widget functions + + function exportWidget(dashboard, widget) { + var widgetItem = itembuffer.prepareWidgetItem(dashboard, widget); + var name = widgetItem.widget.config.title; + name = name.toLowerCase().replace(/\W/g,"_"); + exportToPc(prepareExport(widgetItem), name + '.json'); + } + + function importWidget($event, dashboard) { + openImportDialog($event, 'dashboard.import-widget', 'dashboard.widget-file').then( + function success(widgetItem) { + if (!validateImportedWidget(widgetItem)) { + toast.showError($translate.instant('dashboard.invalid-widget-file-error')); + } else { + var widget = widgetItem.widget; + var aliasesInfo = widgetItem.aliasesInfo; + var originalColumns = widgetItem.originalColumns; + + var datasourceAliases = aliasesInfo.datasourceAliases; + var targetDeviceAliases = aliasesInfo.targetDeviceAliases; + if (datasourceAliases || targetDeviceAliases) { + var deviceAliases = {}; + var datasourceAliasesMap = {}; + var targetDeviceAliasesMap = {}; + var aliasId = 1; + var datasourceIndex; + if (datasourceAliases) { + for (datasourceIndex in datasourceAliases) { + datasourceAliasesMap[aliasId] = datasourceIndex; + deviceAliases[aliasId] = { + alias: datasourceAliases[datasourceIndex].aliasName, + deviceId: datasourceAliases[datasourceIndex].deviceId + }; + aliasId++; + } + } + if (targetDeviceAliases) { + for (datasourceIndex in targetDeviceAliases) { + targetDeviceAliasesMap[aliasId] = datasourceIndex; + deviceAliases[aliasId] = { + alias: targetDeviceAliases[datasourceIndex].aliasName, + deviceId: targetDeviceAliases[datasourceIndex].deviceId + }; + aliasId++; + } + } + + var aliasIds = Object.keys(deviceAliases); + if (aliasIds.length > 0) { + processDeviceAliases(deviceAliases, aliasIds).then( + function(missingDeviceAliases) { + if (Object.keys(missingDeviceAliases).length > 0) { + editMissingAliases($event, [ widget ], + true, 'dashboard.widget-import-missing-aliases-title', missingDeviceAliases).then( + function success(updatedDeviceAliases) { + for (var aliasId in updatedDeviceAliases) { + var deviceAlias = updatedDeviceAliases[aliasId]; + var datasourceIndex; + if (datasourceAliasesMap[aliasId]) { + datasourceIndex = datasourceAliasesMap[aliasId]; + datasourceAliases[datasourceIndex].deviceId = deviceAlias.deviceId; + } else if (targetDeviceAliasesMap[aliasId]) { + datasourceIndex = targetDeviceAliasesMap[aliasId]; + targetDeviceAliases[datasourceIndex].deviceId = deviceAlias.deviceId; + } + } + addImportedWidget(dashboard, widget, aliasesInfo, originalColumns); + }, + function fail() {} + ); + } else { + addImportedWidget(dashboard, widget, aliasesInfo, originalColumns); + } + } + ); + } else { + addImportedWidget(dashboard, widget, aliasesInfo, originalColumns); + } + } else { + addImportedWidget(dashboard, widget, aliasesInfo, originalColumns); + } + } + }, + function fail() {} + ); + } + + function validateImportedWidget(widgetItem) { + if (angular.isUndefined(widgetItem.widget) + || angular.isUndefined(widgetItem.aliasesInfo) + || angular.isUndefined(widgetItem.originalColumns)) { + return false; + } + var widget = widgetItem.widget; + if (angular.isUndefined(widget.isSystemType) || + angular.isUndefined(widget.bundleAlias) || + angular.isUndefined(widget.typeAlias) || + angular.isUndefined(widget.type)) { + return false; + } + return true; + } + + function addImportedWidget(dashboard, widget, aliasesInfo, originalColumns) { + itembuffer.addWidgetToDashboard(dashboard, widget, aliasesInfo, originalColumns, -1, -1); + } + + // Dashboard functions + + function exportDashboard(dashboardId) { + dashboardService.getDashboard(dashboardId).then( + function success(dashboard) { + var name = dashboard.title; + name = name.toLowerCase().replace(/\W/g,"_"); + exportToPc(prepareExport(dashboard), name + '.json'); + }, + function fail(rejection) { + var message = rejection; + if (!message) { + message = $translate.instant('error.unknown-error'); + } + toast.showError($translate.instant('dashboard.export-failed-error', {error: message})); + } + ); + } + + function importDashboard($event) { + var deferred = $q.defer(); + openImportDialog($event, 'dashboard.import', 'dashboard.dashboard-file').then( + function success(dashboard) { + if (!validateImportedDashboard(dashboard)) { + toast.showError($translate.instant('dashboard.invalid-dashboard-file-error')); + deferred.reject(); + } else { + var deviceAliases = dashboard.configuration.deviceAliases; + if (deviceAliases) { + var aliasIds = Object.keys( deviceAliases ); + if (aliasIds.length > 0) { + processDeviceAliases(deviceAliases, aliasIds).then( + function(missingDeviceAliases) { + if (Object.keys( missingDeviceAliases ).length > 0) { + editMissingAliases($event, dashboard.configuration.widgets, + false, 'dashboard.dashboard-import-missing-aliases-title', missingDeviceAliases).then( + function success(updatedDeviceAliases) { + for (var aliasId in updatedDeviceAliases) { + deviceAliases[aliasId] = updatedDeviceAliases[aliasId]; + } + saveImportedDashboard(dashboard, deferred); + }, + function fail() { + deferred.reject(); + } + ); + } else { + saveImportedDashboard(dashboard, deferred); + } + } + ) + } else { + saveImportedDashboard(dashboard, deferred); + } + } else { + saveImportedDashboard(dashboard, deferred); + } + } + }, + function fail() { + deferred.reject(); + } + ); + return deferred.promise; + } + + function saveImportedDashboard(dashboard, deferred) { + dashboardService.saveDashboard(dashboard).then( + function success() { + deferred.resolve(); + }, + function fail() { + deferred.reject(); + } + ) + } + + function validateImportedDashboard(dashboard) { + if (angular.isUndefined(dashboard.title) || angular.isUndefined(dashboard.configuration)) { + return false; + } + return true; + } + + function processDeviceAliases(deviceAliases, aliasIds) { + var deferred = $q.defer(); + var missingDeviceAliases = {}; + var index = -1; + checkNextDeviceAliasOrComplete(index, aliasIds, deviceAliases, missingDeviceAliases, deferred); + return deferred.promise; + } + + function checkNextDeviceAliasOrComplete(index, aliasIds, deviceAliases, missingDeviceAliases, deferred) { + index++; + if (index == aliasIds.length) { + deferred.resolve(missingDeviceAliases); + } else { + checkDeviceAlias(index, aliasIds, deviceAliases, missingDeviceAliases, deferred); + } + } + + function checkDeviceAlias(index, aliasIds, deviceAliases, missingDeviceAliases, deferred) { + var aliasId = aliasIds[index]; + var deviceAlias = deviceAliases[aliasId]; + if (deviceAlias.deviceId) { + deviceService.getDevice(deviceAlias.deviceId, true).then( + function success() { + checkNextDeviceAliasOrComplete(index, aliasIds, deviceAliases, missingDeviceAliases, deferred); + }, + function fail() { + var missingDeviceAlias = angular.copy(deviceAlias); + missingDeviceAlias.deviceId = null; + missingDeviceAliases[aliasId] = missingDeviceAlias; + checkNextDeviceAliasOrComplete(index, aliasIds, deviceAliases, missingDeviceAliases, deferred); + } + ); + } + } + + function editMissingAliases($event, widgets, isSingleWidget, customTitle, missingDeviceAliases) { + var deferred = $q.defer(); + $mdDialog.show({ + controller: 'DeviceAliasesController', + controllerAs: 'vm', + templateUrl: deviceAliasesTemplate, + locals: { + config: { + deviceAliases: missingDeviceAliases, + widgets: widgets, + isSingleWidget: isSingleWidget, + isSingleDevice: false, + singleDeviceAlias: null, + customTitle: customTitle, + disableAdd: true + } + }, + parent: angular.element($document[0].body), + skipHide: true, + fullscreen: true, + targetEvent: $event + }).then(function (updatedDeviceAliases) { + deferred.resolve(updatedDeviceAliases); + }, function () { + deferred.reject(); + }); + return deferred.promise; + } + + // Common functions + + function prepareExport(data) { + var exportedData = angular.copy(data); + if (angular.isDefined(exportedData.id)) { + delete exportedData.id; + } + if (angular.isDefined(exportedData.createdTime)) { + delete exportedData.createdTime; + } + if (angular.isDefined(exportedData.tenantId)) { + delete exportedData.tenantId; + } + if (angular.isDefined(exportedData.customerId)) { + delete exportedData.customerId; + } + return exportedData; + } + + function exportToPc(data, filename) { + if (!data) { + $log.error('No data'); + return; + } + + if (!filename) { + filename = 'download.json'; + } + + if (angular.isObject(data)) { + data = angular.toJson(data, 2); + } + + var blob = new Blob([data], {type: 'text/json'}); + + // FOR IE: + + if (window.navigator && window.navigator.msSaveOrOpenBlob) { + window.navigator.msSaveOrOpenBlob(blob, filename); + } + else{ + var e = document.createEvent('MouseEvents'), + a = document.createElement('a'); + + a.download = filename; + a.href = window.URL.createObjectURL(blob); + a.dataset.downloadurl = ['text/json', a.download, a.href].join(':'); + e.initEvent('click', true, false, window, + 0, 0, 0, 0, 0, false, false, false, false, 0, null); + a.dispatchEvent(e); + } + } + + function openImportDialog($event, importTitle, importFileLabel) { + var deferred = $q.defer(); + $mdDialog.show({ + controller: 'ImportDialogController', + controllerAs: 'vm', + templateUrl: importDialogTemplate, + locals: { + importTitle: importTitle, + importFileLabel: importFileLabel + }, + parent: angular.element($document[0].body), + skipHide: true, + fullscreen: true, + targetEvent: $event + }).then(function (importData) { + deferred.resolve(importData); + }, function () { + deferred.reject(); + }); + return deferred.promise; + } + +} + +/* eslint-enable no-undef, angular/window-service, angular/document-service */ diff --git a/ui/src/app/import-export/index.js b/ui/src/app/import-export/index.js new file mode 100644 index 0000000000..20cbf734c8 --- /dev/null +++ b/ui/src/app/import-export/index.js @@ -0,0 +1,23 @@ +/* + * Copyright © 2016-2017 The Thingsboard Authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +import ImportExport from './import-export.service'; +import ImportDialogController from './import-dialog.controller'; + + +export default angular.module('thingsboard.importexport', []) + .factory('importExport', ImportExport) + .controller('ImportDialogController', ImportDialogController) + .name; diff --git a/ui/src/app/jsonform/index.js b/ui/src/app/jsonform/index.js index 9666961ae9..24d7582c88 100644 --- a/ui/src/app/jsonform/index.js +++ b/ui/src/app/jsonform/index.js @@ -1,5 +1,5 @@ /* - * Copyright © 2016 The Thingsboard Authors + * Copyright © 2016-2017 The Thingsboard Authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/ui/src/app/jsonform/jsonform.controller.js b/ui/src/app/jsonform/jsonform.controller.js index 5861b6476e..f8ff7e09e0 100644 --- a/ui/src/app/jsonform/jsonform.controller.js +++ b/ui/src/app/jsonform/jsonform.controller.js @@ -1,5 +1,5 @@ /* - * Copyright © 2016 The Thingsboard Authors + * Copyright © 2016-2017 The Thingsboard Authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/ui/src/app/jsonform/jsonform.routes.js b/ui/src/app/jsonform/jsonform.routes.js index 323b4e0323..d493cd0744 100644 --- a/ui/src/app/jsonform/jsonform.routes.js +++ b/ui/src/app/jsonform/jsonform.routes.js @@ -1,5 +1,5 @@ /* - * Copyright © 2016 The Thingsboard Authors + * Copyright © 2016-2017 The Thingsboard Authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/ui/src/app/jsonform/jsonform.scss b/ui/src/app/jsonform/jsonform.scss index fd1513ee1d..825acd69e3 100644 --- a/ui/src/app/jsonform/jsonform.scss +++ b/ui/src/app/jsonform/jsonform.scss @@ -1,5 +1,5 @@ /** - * Copyright © 2016 The Thingsboard Authors + * Copyright © 2016-2017 The Thingsboard Authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/ui/src/app/jsonform/jsonform.tpl.html b/ui/src/app/jsonform/jsonform.tpl.html index 7f28c8d563..6861f3375a 100644 --- a/ui/src/app/jsonform/jsonform.tpl.html +++ b/ui/src/app/jsonform/jsonform.tpl.html @@ -1,6 +1,6 @@