100% open-source IoT Platform - Integrate your devices, add intelligence, build custom apps
Java asset-managementbuildingdashboarddataplatformdevice-managementedge-computingenergyenergy-managementenergy-monitorfleet-managementfleet-telematicsiotiot-applicationiot-platformmodbusmqttmqtt-brokerota-updaterules-enginesmartcity
Added protocol device discovery functionality to manager UI
Rich Turnerc386cedd8a61
diff --git a/client/src/main/java/org/openremote/app/client/assets/asset/AssetEditActivity.java b/client/src/main/java/org/openremote/app/client/assets/asset/AssetEditActivity.javaindex dcd3f0ac6..c2b98e891 100644--- a/client/src/main/java/org/openremote/app/client/assets/asset/AssetEditActivity.java+++ b/client/src/main/java/org/openremote/app/client/assets/asset/AssetEditActivity.java@@ -674,7 +674,14 @@ public class AssetEditActivity}protected void doProtocolDiscovery(ProtocolDiscoveryView.DiscoveryRequest request, Runnable callback) {- showInfo(environment.getMessages().protocolLinkDiscoveryStarted());++ final boolean isImport = request.getFileInfo() != null;++ if (isImport) {+ showInfo(environment.getMessages().protocolLinkImportStarted());+ } else {+ showInfo(environment.getMessages().protocolLinkDiscoveryStarted());+ }environment.getApp().getRequests().sendWithAndReturn(assetArrayMapper,@@ -702,7 +709,11 @@ public class AssetEditActivityupdateMetaItemDescriptors();view.setFormBusy(false);view.setAvailableAttributeTypes(attributeTypesToList());- showSuccess(environment.getMessages().protocolLinkDiscoverySuccess(discoveredAssets.length));+ if (isImport) {+ showSuccess(environment.getMessages().protocolLinkImportSuccess(discoveredAssets.length));+ } else {+ showSuccess(environment.getMessages().protocolLinkDiscoverySuccess(discoveredAssets.length));+ }callback.run();});diff --git a/client/src/main/java/org/openremote/app/client/assets/attributes/ProtocolDiscoveryView.java b/client/src/main/java/org/openremote/app/client/assets/attributes/ProtocolDiscoveryView.javaindex 7aa149084..cc478d624 100644--- a/client/src/main/java/org/openremote/app/client/assets/attributes/ProtocolDiscoveryView.java+++ b/client/src/main/java/org/openremote/app/client/assets/attributes/ProtocolDiscoveryView.java@@ -1,4 +1,4 @@-/*+ /** Copyright 2017, OpenRemote Inc.** See the CONTRIBUTORS.txt file in the distribution for a@@ -24,6 +24,7 @@ import elemental.client.Browser;import elemental.html.Blob;import elemental.html.FileReader;import org.openremote.app.client.widget.FileUploadLabelled;+import org.openremote.app.client.widget.FormButton;import org.openremote.app.client.widget.FormGroupActions;import org.openremote.app.client.Environment;import org.openremote.app.client.assets.browser.AssetBrowser;@@ -127,7 +128,6 @@ public class ProtocolDiscoveryView extends AbstractAttributeViewExtension {add(assetSelector);if (protocolDescriptor.isDeviceImport()) {- FormGroupActions actions = new FormGroupActions();fileUpload = new FileUploadLabelled();fileUpload.setIcon("upload");fileUpload.getElement().addClassName(environment.getWidgetStyle().FormControl());@@ -141,18 +141,29 @@ public class ProtocolDiscoveryView extends AbstractAttributeViewExtension {}Blob file = (Blob) files.get(0);final FileReader reader = Browser.getWindow().newFileReader();+ onDeviceDiscoveryImportStart();if (file.getType().matches("text.*")) {- reader.setOnloadend(evt -> doDiscoveryImport(fileUpload.getFileUpload().getFilename(), reader.getResult().toString(), false));+ reader.setOnloadend(evt -> doDeviceImport(fileUpload.getFileUpload().getFilename(), reader.getResult().toString(), false, this::onDeviceDiscoveryImportEnd));reader.readAsText(file, "UTF-8");} else {- reader.setOnloadend(evt -> doDiscoveryImport(fileUpload.getFileUpload().getFilename(), reader.getResult().toString(), true));+ reader.setOnloadend(evt -> doDeviceImport(fileUpload.getFileUpload().getFilename(), reader.getResult().toString(), true, this::onDeviceDiscoveryImportEnd));reader.readAsDataURL(file);}});-- actions.add(fileUpload);assetSelector.getFormGroupActions().add(fileUpload);}++ if (protocolDescriptor.isDeviceDiscovery()) {+ FormGroupActions actions = new FormGroupActions();+ FormButton btn = new FormButton(environment.getMessages().discoverDevices());+ btn.setIcon("search");+ btn.addClickHandler(event -> {+ onDeviceDiscoveryImportStart();+ doDeviceDiscovery(this::onDeviceDiscoveryImportEnd);+ });+ actions.add(btn);+ assetSelector.getFormGroupActions().add(btn);+ }}@Override@@ -170,18 +181,28 @@ public class ProtocolDiscoveryView extends AbstractAttributeViewExtension {}- protected void doDiscoveryImport(String name, String data, boolean binary) {- fileUpload.clearInput();- setDisabled(true);- fileUpload.setText(environment.getMessages().importInProgress());-+ protected void doDeviceImport(String name, String data, boolean binary, Runnable callback) {FileInfo fileInfo = new FileInfo(name, data, binary);DiscoveryRequest discoveryRequest = new DiscoveryRequest(attribute.getName().orElse(""), importParentId, importRealm, fileInfo);if (discoveryRequestConsumer != null) {- discoveryRequestConsumer.accept(discoveryRequest, () -> {- fileUpload.setText(environment.getMessages().uploadProtocolFile());- setDisabled(false);- });+ discoveryRequestConsumer.accept(discoveryRequest, callback);}}++ protected void doDeviceDiscovery(Runnable callback) {+ DiscoveryRequest discoveryRequest = new DiscoveryRequest(attribute.getName().orElse(""), importParentId, importRealm, null);+ if (discoveryRequestConsumer != null) {+ discoveryRequestConsumer.accept(discoveryRequest, callback);+ }+ }+++ protected void onDeviceDiscoveryImportStart() {+ fileUpload.clearInput();+ this.setDisabled(true);+ }++ protected void onDeviceDiscoveryImportEnd() {+ this.setDisabled(false);+ }}diff --git a/client/src/main/java/org/openremote/app/client/i18n/ManagerMessages.java b/client/src/main/java/org/openremote/app/client/i18n/ManagerMessages.javaindex 78d7568ea..f849c23ea 100644--- a/client/src/main/java/org/openremote/app/client/i18n/ManagerMessages.java+++ b/client/src/main/java/org/openremote/app/client/i18n/ManagerMessages.java@@ -232,8 +232,12 @@ public interface ManagerMessages extends Messages {String uploadProtocolFile();+ String discoverDevices();+String importInProgress();+ String discoveryInProgress();+String or();String and();@@ -424,6 +428,12 @@ public interface ManagerMessages extends Messages {String protocolLinkDiscoveryFailure(int failureCode);+ String protocolLinkImportStarted();++ String protocolLinkImportSuccess(int assetCount);++ String protocolLinkImportFailure(int failureCode);+String attributeLinkConverterValues();String attributeLinkNewConverterValue();diff --git a/client/src/main/resources/org/openremote/app/client/i18n/ManagerMessages.properties b/client/src/main/resources/org/openremote/app/client/i18n/ManagerMessages.propertiesindex 1aa9b522e..006f96adb 100644--- a/client/src/main/resources/org/openremote/app/client/i18n/ManagerMessages.properties+++ b/client/src/main/resources/org/openremote/app/client/i18n/ManagerMessages.properties@@ -119,13 +119,18 @@ type=Typevalue=ValuemetaItems=Attribute configurationprotocolLinks=Protocol links-protocolLinkDiscovery=Protocol link discovery-protocolLinkDiscoveryParent=Parent of imported assets+protocolLinkDiscovery=Protocol link import/discovery+protocolLinkDiscoveryParent=Parent of imported/discovered assetsuploadProtocolFile=Upload & import links from file-importInProgress=Import in progress+discoverDevices=Discover devices+discoveryInProgress=Discovery in progressprotocolLinkDiscoveryStarted=Protocol link discovery has startedprotocolLinkDiscoverySuccess=Protocol link discovery has finished {0} asset(s) importedprotocolLinkDiscoveryFailure=Protocol link discovery failed: server response: {0}+importInProgress=Import in progress+protocolLinkImportStarted=Protocol link import has started+protocolLinkImportSuccess=Protocol link import has finished {0} asset(s) imported+protocolLinkImportFailure=Protocol link import failed: server response: {0}or=orand=andcustomItem=Custom item