Skip to content

armgit / core

Public Imported from GitHub
0

100% open-source IoT Platform - Integrate your devices, add intelligence, build custom apps

UI updates: minor build related changes

Rich Turner145c21a7150a
diff --git a/ui/app/smart-building/package.json b/ui/app/smart-building/package.json
index b4e45c0ad..7b0a33ff2 100644
--- a/ui/app/smart-building/package.json
+++ b/ui/app/smart-building/package.json
@@ -18,9 +18,9 @@
"@fortawesome/fontawesome-svg-core": "^1.2.12",
"@fortawesome/free-regular-svg-icons": "^5.6.3",
"@fortawesome/free-solid-svg-icons": "^5.6.3",
- "@openremote/core": "^1.0.0",
- "@openremote/or-bottom-navigation": "^1.0.0",
- "@openremote/or-header": "^1.0.0",
+ "@openremote/core": "^1.1.0",
+ "@openremote/or-bottom-navigation": "^1.1.0",
+ "@openremote/or-header": "^1.1.0",
"@polymer/app-layout": "^3.0.0",
"@polymer/iron-demo-helpers": "^3.0.0-pre.19",
"@polymer/polymer": "^3.0.0",
diff --git a/ui/component/or-asset-tree/tsconfig.json b/ui/component/or-asset-tree/tsconfig.json
index 900009fe7..86f86b217 100644
--- a/ui/component/or-asset-tree/tsconfig.json
+++ b/ui/component/or-asset-tree/tsconfig.json
@@ -10,6 +10,7 @@
],
"references": [
{ "path": "../core" },
+ { "path": "../model" },
{ "path": "../or-select" },
{ "path": "../or-translate" },
{ "path": "../or-icon" }
diff --git a/ui/component/or-asset-viewer/package.json b/ui/component/or-asset-viewer/package.json
index 6f81bca4d..a0bb724e6 100644
--- a/ui/component/or-asset-viewer/package.json
+++ b/ui/component/or-asset-viewer/package.json
@@ -16,6 +16,7 @@
"@openremote/core": "^1.1.0",
"@openremote/model": "^1.1.0",
"@openremote/or-icon": "^1.1.0",
+ "@openremote/or-input": "^1.1.0",
"@openremote/or-attribute-input": "^1.1.0",
"@openremote/or-attribute-history": "^1.1.0",
"@openremote/or-translate": "^1.1.0",
diff --git a/ui/component/or-asset-viewer/src/components/or-asset-info.ts b/ui/component/or-asset-viewer/src/components/or-asset-info.ts
index 252e02972..cfe32b1b0 100644
--- a/ui/component/or-asset-viewer/src/components/or-asset-info.ts
+++ b/ui/component/or-asset-viewer/src/components/or-asset-info.ts
@@ -4,7 +4,6 @@ import "@openremote/or-icon";
import "@openremote/or-translate";
import "@openremote/or-icon";
-
@customElement("or-asset-info")
export class OrAssetInfo extends LitElement {
diff --git a/ui/component/or-asset-viewer/src/index.ts b/ui/component/or-asset-viewer/src/index.ts
index 151f6f359..64d3333ac 100644
--- a/ui/component/or-asset-viewer/src/index.ts
+++ b/ui/component/or-asset-viewer/src/index.ts
@@ -1,13 +1,16 @@
import {customElement, html, LitElement, property, PropertyValues, TemplateResult} from "lit-element";
-import "@openremote/or-select";
import "@openremote/or-icon";
import "@openremote/or-input";
import "@openremote/or-attribute-input";
import "@openremote/or-attribute-history";
-import {getAttributeLabel} from "@openremote/or-attribute-input";
import "@openremote/or-translate";
import {translate} from "@openremote/or-translate";
import {InputType, OrInput, OrInputChangedEvent} from "@openremote/or-input";
+import "@openremote/or-map";
+import manager, {subscribe, Util, AssetModelUtil} from "@openremote/core";
+import "@openremote/or-panel";
+import {HistoryConfig, OrAttributeHistory} from "@openremote/or-attribute-history";
+import {Type as MapType, Util as MapUtil} from "@openremote/or-map";
import {
Asset,
AssetAttribute,
@@ -15,19 +18,12 @@ import {
Attribute,
AttributeEvent,
AttributeType,
- MetaItemType
+ MetaItemType,
+ AttributeDescriptor
} from "@openremote/model";
import {style} from "./style";
-import "@openremote/or-panel";
-import manager from "@openremote/core";
-import {subscribe} from "@openremote/core";
-import {Util} from "@openremote/core";
import i18next from "i18next";
import {styleMap} from "lit-html/directives/style-map";
-import "@openremote/or-map";
-import {Type as MapType} from "@openremote/or-map";
-import {Util as MapUtil} from "@openremote/or-map";
-import {HistoryConfig, OrAttributeHistory} from "@openremote/or-attribute-history";
export type PanelType = "property" | "location" | "attribute" | "history";
@@ -62,6 +58,16 @@ export interface ViewerConfig {
historyConfig?: HistoryConfig;
}
+function getAttributeLabel(attribute: Attribute | undefined, descriptor: AttributeDescriptor | undefined, fallback?: string): string {
+ if (!attribute && !descriptor) {
+ return fallback || "";
+ }
+
+ const labelMetaValue = AssetModelUtil.getMetaValue(MetaItemType.LABEL, attribute, descriptor);
+ const name = attribute ? attribute.name : descriptor!.attributeName;
+ return i18next.t([name, fallback || labelMetaValue || name]);
+}
+
@customElement("or-asset-viewer")
export class OrAssetViewer extends subscribe(manager)(translate(i18next)(LitElement)) {
diff --git a/ui/component/or-asset-viewer/tsconfig.json b/ui/component/or-asset-viewer/tsconfig.json
index e685ed805..0eebdf8da 100644
--- a/ui/component/or-asset-viewer/tsconfig.json
+++ b/ui/component/or-asset-viewer/tsconfig.json
@@ -12,7 +12,6 @@
"references": [
{ "path": "../core" },
{ "path": "../rest" },
- { "path": "../or-select" },
{ "path": "../or-panel" },
{ "path": "../or-translate" },
{ "path": "../or-icon" },
diff --git a/ui/component/or-attribute-history/package.json b/ui/component/or-attribute-history/package.json
index 10760aea8..4f341a4bc 100644
--- a/ui/component/or-attribute-history/package.json
+++ b/ui/component/or-attribute-history/package.json
@@ -14,6 +14,8 @@
"license": "AGPL-3.0-or-later",
"dependencies": {
"@openremote/core": "^1.1.0",
+ "@openremote/or-input": "^1.1.0",
+ "@openremote/or-panel": "^1.1.0",
"@openremote/or-translate": "^1.1.0",
"@material/data-table": "^3.2.0",
"chart.js": "^2.8.0",
diff --git a/ui/component/or-attribute-input/src/index.ts b/ui/component/or-attribute-input/src/index.ts
index 86690a382..6b85ea907 100644
--- a/ui/component/or-attribute-input/src/index.ts
+++ b/ui/component/or-attribute-input/src/index.ts
@@ -1,19 +1,17 @@
import {css, customElement, html, LitElement, property, PropertyValues, query, TemplateResult} from "lit-element";
-import i18next from "i18next";
-import {translate} from "@openremote/or-translate";
+import {translate, i18next} from "@openremote/or-translate";
import {
AssetAttribute,
- Attribute,
AttributeDescriptor,
AttributeEvent,
AttributeRef,
AttributeValueDescriptor,
AttributeValueType,
MetaItemType,
- ValueType
+ ValueType,
+ Attribute
} from "@openremote/model";
-import manager, {AssetModelUtil} from "@openremote/core";
-import {subscribe} from "@openremote/core";
+import manager, {AssetModelUtil, subscribe} from "@openremote/core";
import "@openremote/or-input";
import {InputType, OrInput, OrInputChangedEvent} from "@openremote/or-input";
diff --git a/ui/component/or-attribute-input/tsconfig.json b/ui/component/or-attribute-input/tsconfig.json
index acb1a2837..405ac3761 100644
--- a/ui/component/or-attribute-input/tsconfig.json
+++ b/ui/component/or-attribute-input/tsconfig.json
@@ -10,6 +10,7 @@
],
"references": [
{ "path": "../core" },
- { "path": "../or-select" }
+ { "path": "../or-translate" },
+ { "path": "../or-input" }
]
}
\ No newline at end of file
diff --git a/ui/component/or-bottom-navigation/package.json b/ui/component/or-bottom-navigation/package.json
index 2c06ec88e..5d32fba84 100644
--- a/ui/component/or-bottom-navigation/package.json
+++ b/ui/component/or-bottom-navigation/package.json
@@ -1,6 +1,6 @@
{
"name": "@openremote/or-bottom-navigation",
- "version": "1.0.0",
+ "version": "1.1.0",
"description": "Temporary bottom navigation component",
"main": "dist/or-bottom-navigation.js",
"types": "src/or-bottom-navigation.ts",
diff --git a/ui/component/or-rules-editor/tsconfig.json b/ui/component/or-rules-editor/tsconfig.json
index 3c35cfd2b..5a6fe0d8f 100644
--- a/ui/component/or-rules-editor/tsconfig.json
+++ b/ui/component/or-rules-editor/tsconfig.json
@@ -10,7 +10,6 @@
],
"references": [
{ "path": "../core" },
- { "path": "../or-select" },
{ "path": "../or-translate" },
{ "path": "../or-input" },
{ "path": "../rest" }
diff --git a/ui/component/or-translate/package.json b/ui/component/or-translate/package.json
index 93e4b5cc5..195485ec8 100644
--- a/ui/component/or-translate/package.json
+++ b/ui/component/or-translate/package.json
@@ -3,7 +3,7 @@
"version": "1.1.0",
"description": "Provides a web component for translations using i18next",
"main": "dist/index.js",
- "types": "src/index.ts",
+ "types": "dist/index.d.ts",
"scripts": {
"build": "npx tsc -b",
"test": "echo \"No tests\" && exit 0",
diff --git a/ui/demo/demo-core/package.json b/ui/demo/demo-core/package.json
index f0e6ec0ee..50771f7fa 100644
--- a/ui/demo/demo-core/package.json
+++ b/ui/demo/demo-core/package.json
@@ -1,6 +1,6 @@
{
"name": "@openremote/demo-core",
- "version": "1.0.0",
+ "version": "1.1.0",
"description": "Demo",
"private": true,
"scripts": {
@@ -15,9 +15,9 @@
"author": "OpenRemote",
"license": "AGPL-3.0-or-later",
"dependencies": {
- "@openremote/core": "^1.0.1",
- "@openremote/or-icon": "^1.0.0",
- "@openremote/or-translate": "^1.0.0",
+ "@openremote/core": "^1.1.0",
+ "@openremote/or-icon": "^1.1.0",
+ "@openremote/or-translate": "^1.1.0",
"i18next": "^15.0.9",
"lit-element": "^2.2.1"
},
diff --git a/ui/demo/demo-or-asset-tree/package.json b/ui/demo/demo-or-asset-tree/package.json
index ec63848e7..c93e5c3b3 100644
--- a/ui/demo/demo-or-asset-tree/package.json
+++ b/ui/demo/demo-or-asset-tree/package.json
@@ -1,6 +1,6 @@
{
"name": "@openremote/demo-or-asset-tree",
- "version": "1.0.0",
+ "version": "1.1.0",
"description": "Component Demo",
"scripts": {
"clean": "npx shx rm -rf dist",
diff --git a/ui/demo/demo-or-map/package.json b/ui/demo/demo-or-map/package.json
index 1da577d10..9bc78b6ea 100644
--- a/ui/demo/demo-or-map/package.json
+++ b/ui/demo/demo-or-map/package.json
@@ -1,6 +1,6 @@
{
"name": "@openremote/demo-or-map",
- "version": "1.0.0",
+ "version": "1.1.0",
"description": "Component Demo",
"scripts": {
"clean": "npx shx rm -rf dist",
@@ -14,8 +14,8 @@
"author": "OpenRemote",
"license": "AGPL-3.0-or-later",
"dependencies": {
- "@openremote/demo-core": "^1.0.0",
- "@openremote/or-map": "^1.0.2-alpha"
+ "@openremote/demo-core": "^1.1.0",
+ "@openremote/or-map": "^1.1.0"
},
"devDependencies": {
"@babel/core": "^7.2.2",
diff --git a/ui/demo/demo-or-thermostat/package.json b/ui/demo/demo-or-thermostat/package.json
index fdf9311bc..98e35c51c 100644
--- a/ui/demo/demo-or-thermostat/package.json
+++ b/ui/demo/demo-or-thermostat/package.json
@@ -1,6 +1,6 @@
{
"name": "@openremote/demo-or-thermostat",
- "version": "1.0.0",
+ "version": "1.1.0",
"description": "Component Demo",
"scripts": {
"clean": "npx shx rm -rf dist",
@@ -14,7 +14,7 @@
"author": "OpenRemote",
"license": "AGPL-3.0-or-later",
"dependencies": {
- "@openremote/or-thermostat": "^1.0.0",
+ "@openremote/or-thermostat": "^1.1.0",
"source-map-loader": "^0.2.4"
},
"devDependencies": {
diff --git a/ui/demo/demo-rest/package.json b/ui/demo/demo-rest/package.json
index 4cedc30a4..1395c7907 100644
--- a/ui/demo/demo-rest/package.json
+++ b/ui/demo/demo-rest/package.json
@@ -1,6 +1,6 @@
{
"name": "@openremote/demo-rest",
- "version": "1.0.0",
+ "version": "1.1.0",
"description": "Demo",
"private": true,
"scripts": {
@@ -15,7 +15,7 @@
"author": "OpenRemote",
"license": "AGPL-3.0-or-later",
"dependencies": {
- "@openremote/rest": "^1.0.1",
+ "@openremote/rest": "^1.1.0",
"lit-element": "^2.2.1"
},
"devDependencies": {