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
Update to get agent import functioning (verified with VelbusTcpAgent)
Rich Turner250bbcf0855d
diff --git a/ui/app/manager/src/pages/page-assets.ts b/ui/app/manager/src/pages/page-assets.tsindex 1eb4b16ef..c6bddf9b0 100644--- a/ui/app/manager/src/pages/page-assets.ts+++ b/ui/app/manager/src/pages/page-assets.ts@@ -61,7 +61,6 @@ export const PAGE_ASSETS_CONFIG_DEFAULT: PageAssetsConfig = {WellknownAssets.TRADFRILIGHTASSET,WellknownAssets.TRADFRIAGENT,WellknownAssets.TRADFRIPLUGASSET,- WellknownAssets.VELBUSTCPAGENT,WellknownAssets.ARTNETLIGHTASSET,WellknownAssets.TIMERAGENT,WellknownAssets.CONSOLEASSETdiff --git a/ui/component/or-asset-viewer/src/index.ts b/ui/component/or-asset-viewer/src/index.tsindex e7a8f3c71..7a884bcd3 100644--- a/ui/component/or-asset-viewer/src/index.ts+++ b/ui/component/or-asset-viewer/src/index.ts@@ -360,14 +360,10 @@ export function getPanelContent(panelName: string, asset: Asset, attributes: { [}if (panelConfig && panelConfig.type === "setup") {- if (asset.type !== WellknownAssets.KNXAGENT && asset.type !== WellknownAssets.ZWAGENT && asset.type !== WellknownAssets.VELBUSSERIALAGENT) {- return;- }-+const descriptor = AssetModelUtil.getAssetDescriptor(asset.type) as AgentDescriptor;- if (!descriptor || !asset.id) {- showSnackbar(undefined, "Error finding agent information", i18next.t("dismiss"));+ if (!descriptor || !asset.id || descriptor.descriptorType !== "agent" || !descriptor.assetDiscovery && !descriptor.assetImport) {return;}@@ -383,13 +379,21 @@ export function getPanelContent(panelName: string, asset: Asset, attributes: { [reader.readAsDataURL(file.files[0]); //convert to base64reader.onload = () => {- const fileInfo = {- name: 'filename',- contents: reader.result,- binary: false- } as FileInfo- manager.rest.api.AgentResource.doProtocolAssetImport(asset.id!, fileInfo) //todo: this doesn't work yet- .then(response => console.log(response.data, response)); //todo: do something with this response+ if (!reader.result) {+ // TODO: DO SOMETHING HERE+ } else {+ let encoded = reader.result.toString().replace(/^data:(.*,)?/, '');+ if ((encoded.length % 4) > 0) {+ encoded += '='.repeat(4 - (encoded.length % 4));+ }+ const fileInfo = {+ name: 'filename',+ contents: encoded,+ binary: true+ } as FileInfo+ manager.rest.api.AgentResource.doProtocolAssetImport(asset.id!, fileInfo) //todo: this doesn't work yet+ .then(response => console.log(response.data, response)); //todo: do something with this response+ }}}}