Skip to content

armgit / core

Public Imported from GitHub
0

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

Add hash listener to header, translations

Robin Dekkers2afc5b6cd83e
diff --git a/deployment/manager/shared/locales/de/or.json b/deployment/manager/shared/locales/de/or.json
index 7616fee72..aa10f7c99 100644
--- a/deployment/manager/shared/locales/de/or.json
+++ b/deployment/manager/shared/locales/de/or.json
@@ -3,8 +3,10 @@
"map_plural": "Karten",
"rule": "Regel",
"rule_plural": "Regeln",
+ "rules": "Regeln",
"asset": "Asset",
"asset_plural": "Assets",
+ "assets": "Assets",
"insights": "Insights",
"attribute": "Attribut",
"scenes": "Szenen",
diff --git a/deployment/manager/shared/locales/en/or.json b/deployment/manager/shared/locales/en/or.json
index 0904c06a1..ad582a5b9 100644
--- a/deployment/manager/shared/locales/en/or.json
+++ b/deployment/manager/shared/locales/en/or.json
@@ -3,8 +3,10 @@
"map_plural": "Maps",
"rule": "Rule",
"rule_plural": "Rules",
+ "rules": "Rules",
"asset": "Asset",
"asset_plural": "Assets",
+ "assets": "Assets",
"attribute": "Attribute",
"insights": "Insights",
"scenes": "Scenes",
diff --git a/deployment/manager/shared/locales/es/or.json b/deployment/manager/shared/locales/es/or.json
index c2c4a96df..421c8fb71 100644
--- a/deployment/manager/shared/locales/es/or.json
+++ b/deployment/manager/shared/locales/es/or.json
@@ -3,8 +3,10 @@
"map_plural": "Mapas",
"rule": "Regla",
"rule_plural": "Reglas",
+ "rules": "Reglas",
"asset": "Activo",
"asset_plural": "Activos",
+ "assets": "Activos",
"attribute": "Atributo",
"insights": "Insights",
"scenes": "Escenas",
diff --git a/deployment/manager/shared/locales/fr/or.json b/deployment/manager/shared/locales/fr/or.json
index 64e4f8386..44efbc0da 100644
--- a/deployment/manager/shared/locales/fr/or.json
+++ b/deployment/manager/shared/locales/fr/or.json
@@ -3,8 +3,10 @@
"map_plural": "Cartes",
"rule": "Règle",
"rule_plural": "Règles",
+ "rules": "Règles",
"asset": "Ressource",
"asset_plural": "Ressources",
+ "assets": "Ressources",
"attribute": "Attribut",
"insights": "Insights",
"scenes": "Scènes",
diff --git a/deployment/manager/shared/locales/nl/or.json b/deployment/manager/shared/locales/nl/or.json
index 37133022a..df4b53230 100644
--- a/deployment/manager/shared/locales/nl/or.json
+++ b/deployment/manager/shared/locales/nl/or.json
@@ -3,8 +3,10 @@
"map_plural": "Kaarten",
"rule": "Regel",
"rule_plural": "Regels",
+ "rules": "Regels",
"asset": "Asset",
"asset_plural": "Assets",
+ "assets": "Assets",
"attribute": "Attribuut",
"insights": "Inzicht",
"scenes": "Scenes",
diff --git a/ui/app/main/src/components/pages/style.ts b/ui/app/main/src/components/pages/style.ts
index dda826bac..6a289f279 100644
--- a/ui/app/main/src/components/pages/style.ts
+++ b/ui/app/main/src/components/pages/style.ts
@@ -2,7 +2,7 @@ import {css, CSSResult} from "lit-element";
// language=CSS
export const MapStyle: CSSResult = css`
- or-asset-summary-card {
+ or-map-asset-card {
height: 166px;
position: absolute;
bottom: 0px;
@@ -19,7 +19,7 @@ export const MapStyle: CSSResult = css`
}
@media only screen and (min-width: 415px){
- or-asset-summary-card {
+ or-map-asset-card {
position: absolute;
top: 20px;
right: 20px;
diff --git a/ui/app/main/src/index.ts b/ui/app/main/src/index.ts
index 09e9e6b32..e020bb2dd 100644
--- a/ui/app/main/src/index.ts
+++ b/ui/app/main/src/index.ts
@@ -19,14 +19,6 @@ router.on({
store.dispatch(setActiveAsset(params.id));
store.dispatch(updatePage("map"));
},
- "assets": (params, query) => {
- store.dispatch(setActiveAsset(null));
- store.dispatch(updatePage("assets"));
- },
- "assets/:id": (params, query) => {
- store.dispatch(setActiveAsset(params.id));
- store.dispatch(updatePage("assets", params.id));
- },
"insights": (params, query) => {
store.dispatch(setActiveAsset(null));
store.dispatch(updatePage("insights"));
@@ -35,6 +27,14 @@ router.on({
store.dispatch(setActiveAsset(params.id));
store.dispatch(updatePage("insights", params.id));
},
+ "assets": (params, query) => {
+ store.dispatch(setActiveAsset(null));
+ store.dispatch(updatePage("assets"));
+ },
+ "assets/:id": (params, query) => {
+ store.dispatch(setActiveAsset(params.id));
+ store.dispatch(updatePage("assets", params.id));
+ },
"rules": (params, query) => {
store.dispatch(updatePage("rules"));
},
@@ -42,6 +42,9 @@ router.on({
store.dispatch(updateRule(params.id));
store.dispatch(updatePage("rules"));
},
+ "logs": (params, query) => {
+ store.dispatch(updatePage("logs"));
+ },
"*": (params, query) => {
store.dispatch(updatePage("map"));
}
diff --git a/ui/component/core/src/util.ts b/ui/component/core/src/util.ts
index b4969452a..bc602b348 100644
--- a/ui/component/core/src/util.ts
+++ b/ui/component/core/src/util.ts
@@ -274,8 +274,11 @@ export function getAttributeValue(attribute: Attribute, descriptor: AttributeDes
}
const format = getMetaValue(MetaItemType.FORMAT, attribute , undefined);
const valueType = attribute.type;
- if(attribute.value) {
- return i18next.t([format || "attributeValueType."+valueType, fallbackFormat || "%s"], { postProcess: 'sprintf', sprintf: [attribute.value] });
+ if(format){
+ return i18next.t(format, { postProcess: 'sprintf', sprintf: [attribute.value] });
+ }
+ else if(attribute.value) {
+ return i18next.t(["attributeValueType."+valueType, fallbackFormat || "%s"], { postProcess: 'sprintf', sprintf: [attribute.value] });
} else {
return attribute.value;
}
diff --git a/ui/component/or-header/src/index.ts b/ui/component/or-header/src/index.ts
index fa2068ec6..e6afc5d04 100644
--- a/ui/component/or-header/src/index.ts
+++ b/ui/component/or-header/src/index.ts
@@ -94,7 +94,17 @@ function getHeaderMenu(items: menuOption[]): MenuItem[] {
};
});
}
+export class OrHeaderMenuChangedEvent extends CustomEvent<boolean> {
+ public static readonly NAME = "or-header-menu-changed";
+
+ constructor() {
+ super(OrHeaderMenuChangedEvent.NAME, {
+ bubbles: true,
+ composed: true
+ });
+ }
+}
@customElement("or-header")
class OrHeader extends LitElement {
@@ -129,6 +139,20 @@ class OrHeader extends LitElement {
];
}
+ constructor() {
+ super();
+
+ this.addEventListener(OrHeaderMenuChangedEvent.NAME, this._hashChanged);
+ window.addEventListener("hashchange", () => {
+ this.dispatchEvent(new OrHeaderMenuChangedEvent());
+ }, false);
+ }
+
+ _hashChanged(e: Event) {
+ const menu = window.location.hash.split('/')[0];
+ this.activeMenu = menu;
+ }
+
protected render() {
return html`
<!-- Header -->