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
UI updates: minor
Rich Turnerdb3b116d90a7
diff --git a/ui/app/smart-building/build.gradle b/ui/app/smart-building/build.gradleindex 958ee7a35..947b112e3 100644--- a/ui/app/smart-building/build.gradle+++ b/ui/app/smart-building/build.gradle@@ -1,5 +1,5 @@//buildDir = "dist"-//npmBuild.dependsOn(resolveTask(":ui:component:model:build"), resolveTask(":ui:component:rest:build"))+//npmBuild.dependsOn(resolveTask(":ui:component:core:build"))////task build {// dependsOn npmBuilddiff --git a/ui/component/core/build.gradle b/ui/component/core/build.gradleindex c08de8a80..39ffc9608 100644--- a/ui/component/core/build.gradle+++ b/ui/component/core/build.gradle@@ -1,5 +1,7 @@buildDir = "dist"+npmBuild.dependsOn(resolveTask(":ui:component:model:build"), resolveTask(":ui:component:rest:build"), resolveTask(":ui:component:or-icon:generate"))+task clean() {doLast {delete "dist"diff --git a/ui/component/core/test/index.html b/ui/component/core/test/index.htmldeleted file mode 100644index 61a8ed064..000000000--- a/ui/component/core/test/index.html+++ /dev/null@@ -1,17 +0,0 @@-<!doctype html>-<html>- <head>- <meta charset="utf-8">- <meta name="viewport" content="width=device-width, minimum-scale=1.0, initial-scale=1.0, user-scalable=yes">-- <script src="../node_modules/wct-browser-legacy/browser.js"></script>- </head>- <body>- <script>- // Load and run all tests (.html, .js):- WCT.loadSuites([- 'test-element_test.html'- ]);- </script>- </body>-</html>diff --git a/ui/component/core/test/test-element_test.html b/ui/component/core/test/test-element_test.htmldeleted file mode 100644index 5e0964088..000000000--- a/ui/component/core/test/test-element_test.html+++ /dev/null@@ -1,52 +0,0 @@-<!doctype html>-<html lang="en">- <head>- <meta charset="utf-8">- <meta name="viewport" content="width=device-width, minimum-scale=1, initial-scale=1, user-scalable=yes">-- <title>test-element test</title>-- <script src="../node_modules/@webcomponents/webcomponentsjs/webcomponents-loader.js"></script>- <script src="../node_modules/wct-browser-legacy/browser.js"></script>-- <script type="module" src="../test-element.js"></script>- </head>- <body>-- <test-fixture id="BasicTestFixture">- <template>- <test-element></test-element>- </template>- </test-fixture>-- <test-fixture id="ChangedPropertyTestFixture">- <template>- <test-element prop1="new-prop1"></test-element>- </template>- </test-fixture>-- <script type="module">- suite('test-element', () => {-- test('instantiating the element with default properties works', () => {- const element = fixture('BasicTestFixture');- assert.equal(element.prop1, 'test-element');- const elementShadowRoot = element.shadowRoot;- const elementHeader = elementShadowRoot.querySelector('h2');- assert.equal(elementHeader.innerHTML, 'Hello test-element!');- });-- test('setting a property on the element works', () => {- // Create a test fixture- const element = fixture('ChangedPropertyTestFixture');- assert.equal(element.prop1, 'new-prop1');- const elementShadowRoot = element.shadowRoot;- const elementHeader = elementShadowRoot.querySelector('h2');- assert.equal(elementHeader.innerHTML, 'Hello new-prop1!');- });-- });- </script>-- </body>-</html>diff --git a/ui/component/or-icon/build.gradle b/ui/component/or-icon/build.gradleindex c08de8a80..9d43a10f7 100644--- a/ui/component/or-icon/build.gradle+++ b/ui/component/or-icon/build.gradle@@ -6,6 +6,10 @@ task clean() {}}+task generate(type: Exec){+ commandLine npmCommand("npm"), "run-script", "generate"+}+task build() {dependsOn npmBuild}\ No newline at end of filediff --git a/ui/component/or-icon/package.json b/ui/component/or-icon/package.jsonindex 3f6346203..ce5efd855 100644--- a/ui/component/or-icon/package.json+++ b/ui/component/or-icon/package.json@@ -5,6 +5,7 @@"main": "dist/index.js","types": "src/index.ts","scripts": {+ "generate": "node mdi-iconset-generator.js","build": "node mdi-iconset-generator.js && npx tsc -b","test": "echo \"No tests\" && exit 0"},