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
WIP Rules editor
robindekkers36d2b94d95d5
diff --git a/ui/component/or-input/.npmignore b/ui/component/or-input/.npmignorenew file mode 100644index 000000000..ca658009d--- /dev/null+++ b/ui/component/or-input/.npmignore@@ -0,0 +1,3 @@+build/+build.gradle+test/\ No newline at end of filediff --git a/ui/component/or-input/README.md b/ui/component/or-input/README.mdnew file mode 100644index 000000000..437da10d4--- /dev/null+++ b/ui/component/or-input/README.md@@ -0,0 +1,3 @@+# \<or-select\>++OpenRemote selectdiff --git a/ui/component/or-input/build.gradle b/ui/component/or-input/build.gradlenew file mode 100644index 000000000..489605e7b--- /dev/null+++ b/ui/component/or-input/build.gradle@@ -0,0 +1,9 @@+task clean() {+ doLast {+ delete "dist"+ }+}++task build() {+ dependsOn rootProject.tasks.getByName("yarnInstall"), npmBuild+}diff --git a/ui/component/or-input/package.json b/ui/component/or-input/package.jsonnew file mode 100644index 000000000..790bd1e53--- /dev/null+++ b/ui/component/or-input/package.json@@ -0,0 +1,29 @@+{+ "name": "@openremote/or-input",+ "version": "1.0.0",+ "description": "OpenRemote input",+ "main": "dist/index.js",+ "types": "src/index.ts",+ "scripts": {+ "build": "npx tsc",+ "test": "echo \"No tests\" && exit 0"+ },+ "author": "OpenRemote",+ "license": "AGPL-3.0-or-later",+ "dependencies": {+ "lit-element": "^2.0.1",+ "@material/select": "^1.0.1",+ "@material/list": "^1.0.1",+ "@material/menu": "^1.0.1",+ "@material/menu-surface": "^1.0.1"+ },+ "devDependencies": {+ "@polymer/decorators": "^3.0.0",+ "@polymer/iron-demo-helpers": "^3.0.0-pre.19",+ "@webcomponents/webcomponentsjs": "^2.0.0",+ "style-loader": "^0.23.1",+ "tslint": "^5.11.0",+ "typescript": "^3.2.2",+ "wct-browser-legacy": "^1.0.0"+ }+}diff --git a/ui/component/or-input/src/index.d.ts b/ui/component/or-input/src/index.d.tsnew file mode 100644index 000000000..cb0ff5c3b--- /dev/null+++ b/ui/component/or-input/src/index.d.ts@@ -0,0 +1 @@+export {};diff --git a/ui/component/or-input/src/index.js b/ui/component/or-input/src/index.jsnew file mode 100644index 000000000..b8e1625fb--- /dev/null+++ b/ui/component/or-input/src/index.js@@ -0,0 +1,47 @@+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {+ var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;+ if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);+ else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;+ return c > 3 && r && Object.defineProperty(target, key, r), r;+};+import { html, LitElement, property } from 'lit-element';+class OrRulesEditor extends LitElement {+ constructor() {+ super();+ // default value in minutes+ this.value = 0;+ // default value in minutes+ this.current = 0;+ // maxRange in minutes+ this.maxRange = 360;+ // minRange in minutes+ this.minRange = 0;+ // Steps in minutes+ this.step = 5;+ }+ render() {+ return html `+ <h1>hi</h1>+ `;+ }+}+__decorate([+ property({ type: Function })+], OrRulesEditor.prototype, "onChange", void 0);+__decorate([+ property({ type: Number })+], OrRulesEditor.prototype, "value", void 0);+__decorate([+ property({ type: Number })+], OrRulesEditor.prototype, "current", void 0);+__decorate([+ property({ type: Number })+], OrRulesEditor.prototype, "maxRange", void 0);+__decorate([+ property({ type: Number })+], OrRulesEditor.prototype, "minRange", void 0);+__decorate([+ property({ type: Number })+], OrRulesEditor.prototype, "step", void 0);+window.customElements.define('or-rules-editor', OrRulesEditor);+//# sourceMappingURL=index.js.map\ No newline at end of filediff --git a/ui/component/or-input/src/index.js.map b/ui/component/or-input/src/index.js.mapnew file mode 100644index 000000000..a1ed8a1f4--- /dev/null+++ b/ui/component/or-input/src/index.js.map@@ -0,0 +1 @@+{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":";;;;;;AAAA,OAAO,EAAC,IAAI,EAAE,UAAU,EAAE,QAAQ,EAAC,MAAM,aAAa,CAAC;AAIvD,MAAM,aAAc,SAAQ,UAAU;IAgClC;QACI,KAAK,EAAE,CAAC;QArBZ,2BAA2B;QAEnB,UAAK,GAAW,CAAC,CAAC;QAE1B,2BAA2B;QAEpB,YAAO,GAAW,CAAC,CAAC;QAE3B,sBAAsB;QAEd,aAAQ,GAAW,GAAG,CAAC;QAE/B,sBAAsB;QAEd,aAAQ,GAAW,CAAC,CAAC;QAE7B,mBAAmB;QAEX,SAAI,GAAW,CAAC,CAAC;IAIzB,CAAC;IAjCS,MAAM;QAEZ,OAAO,IAAI,CAAA;;SAEV,CAAC;IACN,CAAC;CA+BJ;AA3BG;IADC,QAAQ,CAAC,EAAC,IAAI,EAAE,QAAQ,EAAC,CAAC;+CACL;AAItB;IADC,QAAQ,CAAC,EAAC,IAAI,EAAE,MAAM,EAAC,CAAC;4CACC;AAI1B;IADC,QAAQ,CAAC,EAAC,IAAI,EAAE,MAAM,EAAC,CAAC;8CACE;AAI3B;IADC,QAAQ,CAAC,EAAC,IAAI,EAAE,MAAM,EAAC,CAAC;+CACM;AAI/B;IADC,QAAQ,CAAC,EAAC,IAAI,EAAE,MAAM,EAAC,CAAC;+CACI;AAI7B;IADC,QAAQ,CAAC,EAAC,IAAI,EAAE,MAAM,EAAC,CAAC;2CACA;AAS7B,MAAM,CAAC,cAAc,CAAC,MAAM,CAAC,iBAAiB,EAAE,aAAa,CAAC,CAAC"}\ No newline at end of filediff --git a/ui/component/or-input/src/index.ts b/ui/component/or-input/src/index.tsnew file mode 100644index 000000000..3235cc1de--- /dev/null+++ b/ui/component/or-input/src/index.ts@@ -0,0 +1,45 @@+import {html, LitElement, property} from 'lit-element';++class OrInput extends LitElement {++ @property({type: String})+ type: string = 'text';++ @property({type: String})+ name: string = '';++ @property({type: String})+ value: string = '';++ protected render() {++ return html`+ <input id="or-input" type="${this.type}" name="${this.name}" @change="${this.onChange}" value="${this.value}" />+ `;+ }+++ onChange() {+ if(this.shadowRoot){+ const value = (<HTMLInputElement>this.shadowRoot.getElementById('or-input')).value;++ // Launch event for all parent elements+ let event = new CustomEvent('or-input:changed', {+ detail: { value: value },+ bubbles: true,+ composed: true });++ this.dispatchEvent(event);++ }+ }+++ constructor() {+ super();+ }+++}++window.customElements.define('or-input', OrInput);diff --git a/ui/component/or-input/tsconfig.json b/ui/component/or-input/tsconfig.jsonnew file mode 100644index 000000000..aa12a532d--- /dev/null+++ b/ui/component/or-input/tsconfig.json@@ -0,0 +1,14 @@+{+ "extends": "../../tsconfig",+ "compilerOptions": {+ "outDir": "./dist/",+ "rootDir": "src"+ },+ "include": [+ "./src"+ ],+ "references": [+ { "path": "../core" },+ { "path": "../rest" }+ ]+}\ No newline at end of filediff --git a/ui/component/or-rules-editor/.npmignore b/ui/component/or-rules-editor/.npmignorenew file mode 100644index 000000000..ca658009d--- /dev/null+++ b/ui/component/or-rules-editor/.npmignore@@ -0,0 +1,3 @@+build/+build.gradle+test/\ No newline at end of filediff --git a/ui/component/or-rules-editor/README.md b/ui/component/or-rules-editor/README.mdnew file mode 100644index 000000000..6b09f9757--- /dev/null+++ b/ui/component/or-rules-editor/README.md@@ -0,0 +1,3 @@+# \<or-rules-editor\>++OpenRemote Timlinediff --git a/ui/component/or-rules-editor/build.gradle b/ui/component/or-rules-editor/build.gradlenew file mode 100644index 000000000..489605e7b--- /dev/null+++ b/ui/component/or-rules-editor/build.gradle@@ -0,0 +1,9 @@+task clean() {+ doLast {+ delete "dist"+ }+}++task build() {+ dependsOn rootProject.tasks.getByName("yarnInstall"), npmBuild+}diff --git a/ui/component/or-rules-editor/package.json b/ui/component/or-rules-editor/package.jsonnew file mode 100644index 000000000..a42c82269--- /dev/null+++ b/ui/component/or-rules-editor/package.json@@ -0,0 +1,30 @@+{+ "name": "@openremote/or-rules-editor",+ "version": "1.0.0",+ "description": "OpenRemote Rules Editor",+ "main": "dist/index.js",+ "types": "src/index.ts",+ "scripts": {+ "build": "npx tsc",+ "test": "echo \"No tests\" && exit 0"+ },+ "author": "OpenRemote",+ "license": "AGPL-3.0-or-later",+ "dependencies": {+ "@openremote/or-input": "^1.0.0",+ "@openremote/or-select": "^1.0.0",+ "@openremote/rest": "^1.0.0",+ "@openremote/core": "^1.0.0",+ "lit-element": "^2.0.1",+ "moment": "^2.24.0"+ },+ "devDependencies": {+ "@polymer/decorators": "^3.0.0",+ "@polymer/iron-demo-helpers": "^3.0.0-pre.19",+ "@webcomponents/webcomponentsjs": "^2.2.7",+ "style-loader": "^0.23.1",+ "tslint": "^5.11.0",+ "typescript": "^3.2.2",+ "wct-browser-legacy": "^1.0.0"+ }+}diff --git a/ui/component/or-rules-editor/src/index.ts b/ui/component/or-rules-editor/src/index.tsnew file mode 100644index 000000000..2ffe664b2--- /dev/null+++ b/ui/component/or-rules-editor/src/index.ts@@ -0,0 +1,168 @@+import {html, LitElement, property, customElement} from 'lit-element';++import '@openremote/or-select';+import {Rule, JsonRulesetDefinition, Ruleset} from '@openremote/model';+import openremote from "@openremote/core";+import rest from "@openremote/rest";++import './or-rule-list';+import './or-rule-when';+import './or-rule-then';+import './or-rule-header';++import {style} from "./style";++const ruleModel:Rule = {+ name: "",+ when: undefined,+ then: undefined+};+//TODO rules should be based on the type Rule+const rulesetModel:Ruleset = {+ name: "",+ type: "tenant",+ rules: ""+};++@customElement('or-rules-editor')+class OrRulesEditor extends LitElement {++ static get styles() {+ return [+ style+ ]+ }++ protected render() {++ return html`+ <div class="rule-editor-container">+ <side-menu class="bg-white shadow">+ <or-rule-list .rules="${this.rulesets}"></or-rule-list>+ <div class="bottom-toolbar">+ <icon @click="${this.createRule}">[plus]</icon>+ </div>+ </side-menu>+ ${this.ruleset && this.ruleset.rules ? html`+ <or-body>+ <or-rule-header class="bg-white shadow" .rule="${this.ruleset}"></or-rule-header>+ <div class="content">+ <or-rule-when .rule="${this.ruleset.rules}"></or-rule-when>+ <or-rule-then .rule="${this.ruleset.rules}"></or-rule-then>+ </div>+ </or-body>+ ` : html`++ `}+ </div>+ `;+ }++ @property({type: Number})+ private value: number = 0;++ @property({type: Array})+ private rulesets?: Ruleset[];++ @property({type: Object})+ private ruleset?: Ruleset;++ @property({type: Array})+ private rules?: Rule[];++ @property({type: Object})+ private rule?: Rule;+++ constructor() {+ super();+ this.readRules();+ this.addEventListener('rules:set-active-rule', this.setActiveRule);+ this.addEventListener('rules:update-rule', this.updateRule);+ this.addEventListener('rules:delete-rule', this.deleteRule);+ }+++ readRules() {+ rest.api.RulesResource.getTenantRulesets(openremote.config.realm).then((response: any) => {++ // TODO remove this when rules are in the project+ response.data = [{+ "type": "tenant",+ "id": 1001,+ "version": 6,+ "createdOn": 1551799275058,+ "lastModified": 1552321167681,+ "name": "Geofence Test",+ "enabled": true,+ "rules": "{\n \"rules\": [\n {\n \"name\": \"Rich Home\",\n \"when\": {\n \"asset\": {\n \"types\": [\n {\n \"predicateType\": \"string\",\n \"match\": \"EXACT\",\n \"value\": \"urn:openremote:asset:console\"\n }\n ],\n \"attributes\": {\n \"predicates\": [\n {\n \"name\": {\n \"predicateType\": \"string\",\n \"match\": \"EXACT\",\n \"value\": \"location\"\n },\n \"value\": {\n \"predicateType\": \"radial\",\n \"radius\": 100,\n \"lat\": 51.765106,\n \"lng\": -2.233860\n }\n }\n ]\n }\n }\n },\n \"then\": [\n {\n \"action\": \"notification\",\n \"target\": {\n \"useAssetsFromWhen\": true\n },\n \"notification\": {\n \"name\": \"Rich Home\",\n \"message\": {\n \"type\": \"push\",\n \"title\": \"Duurzaamheid\",\n \"body\": \"Samenwerken aan duurzaamheid\",\n \"action\": {\n \"url\": \"https://www.eindhoven.nl/projecten/samen-werken-aan-duurzaamheid\"\n },\n \"buttons\": [\n {\n \"title\": \"Ja, in app\",\n \"action\": {\n \"url\": \"https://www.eindhoven.nl/projecten/samen-werken-aan-duurzaamheid\"\n }\n },\n {\n \"title\": \"Ja, in browser\",\n \"action\": {\n \"url\": \"https://www.eindhoven.nl/projecten/samen-werken-aan-duurzaamheid\",\n \"openInBrowser\": true\n }\n }\n ]\n }\n }\n }\n ],\n \"reset\": {\n \"triggerNoLongerMatches\": true\n }\n },\n {\n \"name\": \"Pierre Home\",\n \"when\": {\n \"asset\": {\n \"types\": [\n {\n \"predicateType\": \"string\",\n \"match\": \"EXACT\",\n \"value\": \"urn:openremote:asset:console\"\n }\n ],\n \"attributes\": {\n \"predicates\": [\n {\n \"name\": {\n \"predicateType\": \"string\",\n \"match\": \"EXACT\",\n \"value\": \"location\"\n },\n \"value\": {\n \"predicateType\": \"radial\",\n \"radius\": 100,\n \"lat\": 51.416214,\n \"lng\": 5.483527\n }\n }\n ]\n }\n }\n },\n \"then\": [\n {\n \"action\": \"notification\",\n \"target\": {\n \"useAssetsFromWhen\": true\n },\n \"notification\": {\n \"name\": \"Pierre Home\",\n \"message\": {\n \"type\": \"push\",\n \"title\": \"Welkom thuis\",\n \"body\": \"Meer weten over de Vestdijk?\",\n \"action\": {\n \"url\": \"https://www.eindhoven.nl/projecten/beleef-de-vestdijk\"\n },\n \"buttons\": [\n {\n \"title\": \"Ja, in app\",\n \"action\": {\n \"url\": \"https://www.eindhoven.nl/projecten/beleef-de-vestdijk\"\n }\n },\n {\n \"title\": \"Ja, in browser\",\n \"action\": {\n \"url\": \"https://www.eindhoven.nl/projecten/beleef-de-vestdijk\",\n \"openInBrowser\": true\n }\n }\n ]\n }\n }\n }\n ],\n \"reset\": {\n \"triggerNoLongerMatches\": true\n }\n },\n {\n \"name\": \"Vestdijk\",\n \"when\": {\n \"asset\": {\n \"types\": [\n {\n \"predicateType\": \"string\",\n \"match\": \"EXACT\",\n \"value\": \"urn:openremote:asset:console\"\n }\n ],\n \"attributes\": {\n \"predicates\": [\n {\n \"name\": {\n \"predicateType\": \"string\",\n \"match\": \"EXACT\",\n \"value\": \"location\"\n },\n \"value\": {\n \"predicateType\": \"radial\",\n \"radius\": 100,\n \"lat\": 51.438803,\n \"lng\": 5.481697\n }\n }\n ]\n }\n }\n },\n \"then\": [\n {\n \"action\": \"notification\",\n \"target\": {\n \"useAssetsFromWhen\": true\n },\n \"notification\": {\n \"name\": \"Vestdijk\",\n \"message\": {\n \"type\": \"push\",\n \"title\": \"Beleef de Vestdijk\",\n \"body\": \"Meer weten over de Vestdijk?\",\n \"action\": {\n \"url\": \"https://www.eindhoven.nl/projecten/beleef-de-vestdijk\"\n },\n \"buttons\": [\n {\n \"title\": \"Ja, in app\",\n \"action\": {\n \"url\": \"https://www.eindhoven.nl/projecten/beleef-de-vestdijk\"\n }\n },\n {\n \"title\": \"Ja, in browser\",\n \"action\": {\n \"url\": \"https://www.eindhoven.nl/projecten/beleef-de-vestdijk\",\n \"openInBrowser\": true\n }\n }\n ]\n }\n }\n }\n ],\n \"reset\": {\n \"triggerNoLongerMatches\": true\n }\n },\n {\n \"name\": \"Boeiende Binnenstad\",\n \"when\": {\n \"asset\": {\n \"types\": [\n {\n \"predicateType\": \"string\",\n \"match\": \"EXACT\",\n \"value\": \"urn:openremote:asset:console\"\n }\n ],\n \"attributes\": {\n \"predicates\": [\n {\n \"name\": {\n \"predicateType\": \"string\",\n \"match\": \"EXACT\",\n \"value\": \"location\"\n },\n \"value\": {\n \"predicateType\": \"radial\",\n \"radius\": 100,\n \"lat\": 51.439887,\n \"lng\": 5.478430\n }\n }\n ]\n }\n }\n },\n \"then\": [\n {\n \"action\": \"notification\",\n \"target\": {\n \"useAssetsFromWhen\": true\n },\n \"notification\": {\n \"name\": \"Boeiende Binnenstad\",\n \"message\": {\n \"type\": \"push\",\n \"title\": \"Boeiende Binnenstad\",\n \"body\": \"Wat jullie vonden van de bestrating\",\n \"action\": {\n \"url\": \"https://www.eindhoven.nl/projecten/boeiende-binnenstad/stapsgewijs-naar-een-nieuwe-inrichting\"\n },\n \"buttons\": [\n {\n \"title\": \"Bekijk, in app\",\n \"action\": {\n \"url\": \"https://www.eindhoven.nl/projecten/boeiende-binnenstad/stapsgewijs-naar-een-nieuwe-inrichting\"\n }\n },\n {\n \"title\": \"Bekijk, in browser\",\n \"action\": {\n \"url\": \"https://www.eindhoven.nl/projecten/boeiende-binnenstad/stapsgewijs-naar-een-nieuwe-inrichting\",\n \"openInBrowser\": true\n }\n }\n ]\n }\n }\n }\n ],\n \"reset\": {\n \"triggerNoLongerMatches\": true\n }\n },\n{\n \"name\": \"Michael Home\",\n \"when\": {\n \"asset\": {\n \"types\": [\n {\n \"predicateType\": \"string\",\n \"match\": \"EXACT\",\n \"value\": \"urn:openremote:asset:console\"\n }\n ],\n \"attributes\": {\n \"predicates\": [\n {\n \"name\": {\n \"predicateType\": \"string\",\n \"match\": \"EXACT\",\n \"value\": \"location\"\n },\n \"value\": {\n \"predicateType\": \"radial\",\n \"radius\": 100,\n \"lat\": 51.687741,\n \"lng\": 5.286913\n }\n }\n ]\n }\n }\n },\n \"then\": [\n {\n \"action\": \"notification\",\n \"target\": {\n \"useAssetsFromWhen\": true\n },\n \"notification\": {\n \"name\": \"Rich Home\",\n \"message\": {\n \"type\": \"push\",\n \"title\": \"Michael\",\n \"body\": \"Welcome to Den Bosch\",\n \"action\": {\n \"url\": \"https://www.eindhoven.nl/projecten/samen-werken-aan-duurzaamheid\"\n },\n \"buttons\": [\n {\n \"title\": \"Ja, in app\",\n \"action\": {\n \"url\": \"https://www.eindhoven.nl/projecten/samen-werken-aan-duurzaamheid\"\n }\n },\n {\n \"title\": \"Ja, in browser\",\n \"action\": {\n \"url\": \"https://www.eindhoven.nl/projecten/samen-werken-aan-duurzaamheid\",\n \"openInBrowser\": true\n }\n }\n ]\n }\n }\n }\n ],\n \"reset\": {\n \"triggerNoLongerMatches\": true\n }\n }\n ]\n}",+ "lang": "JSON",+ "status": "DEPLOYED",+ "realm": "eindhoven",+ "accessPublicRead": true+ }, {+ "type": "tenant",+ "id": 1002,+ "version": 6,+ "createdOn": 1551799275058,+ "lastModified": 1552321167681,+ "name": "Geofence Test 2",+ "enabled": true,+ "rules": "{\n \"rules\": [\n {\n \"name\": \"Rich Home\",\n \"when\": {\n \"asset\": {\n \"types\": [\n {\n \"predicateType\": \"string\",\n \"match\": \"EXACT\",\n \"value\": \"urn:openremote:asset:console\"\n }\n ],\n \"attributes\": {\n \"predicates\": [\n {\n \"name\": {\n \"predicateType\": \"string\",\n \"match\": \"EXACT\",\n \"value\": \"location\"\n },\n \"value\": {\n \"predicateType\": \"radial\",\n \"radius\": 100,\n \"lat\": 51.765106,\n \"lng\": -2.233860\n }\n }\n ]\n }\n }\n },\n \"then\": [\n {\n \"action\": \"notification\",\n \"target\": {\n \"useAssetsFromWhen\": true\n },\n \"notification\": {\n \"name\": \"Rich Home\",\n \"message\": {\n \"type\": \"push\",\n \"title\": \"Duurzaamheid\",\n \"body\": \"Samenwerken aan duurzaamheid\",\n \"action\": {\n \"url\": \"https://www.eindhoven.nl/projecten/samen-werken-aan-duurzaamheid\"\n },\n \"buttons\": [\n {\n \"title\": \"Ja, in app\",\n \"action\": {\n \"url\": \"https://www.eindhoven.nl/projecten/samen-werken-aan-duurzaamheid\"\n }\n },\n {\n \"title\": \"Ja, in browser\",\n \"action\": {\n \"url\": \"https://www.eindhoven.nl/projecten/samen-werken-aan-duurzaamheid\",\n \"openInBrowser\": true\n }\n }\n ]\n }\n }\n }\n ],\n \"reset\": {\n \"triggerNoLongerMatches\": true\n }\n },\n {\n \"name\": \"Pierre Home\",\n \"when\": {\n \"asset\": {\n \"types\": [\n {\n \"predicateType\": \"string\",\n \"match\": \"EXACT\",\n \"value\": \"urn:openremote:asset:console\"\n }\n ],\n \"attributes\": {\n \"predicates\": [\n {\n \"name\": {\n \"predicateType\": \"string\",\n \"match\": \"EXACT\",\n \"value\": \"location\"\n },\n \"value\": {\n \"predicateType\": \"radial\",\n \"radius\": 100,\n \"lat\": 51.416214,\n \"lng\": 5.483527\n }\n }\n ]\n }\n }\n },\n \"then\": [\n {\n \"action\": \"notification\",\n \"target\": {\n \"useAssetsFromWhen\": true\n },\n \"notification\": {\n \"name\": \"Pierre Home\",\n \"message\": {\n \"type\": \"push\",\n \"title\": \"Welkom thuis\",\n \"body\": \"Meer weten over de Vestdijk?\",\n \"action\": {\n \"url\": \"https://www.eindhoven.nl/projecten/beleef-de-vestdijk\"\n },\n \"buttons\": [\n {\n \"title\": \"Ja, in app\",\n \"action\": {\n \"url\": \"https://www.eindhoven.nl/projecten/beleef-de-vestdijk\"\n }\n },\n {\n \"title\": \"Ja, in browser\",\n \"action\": {\n \"url\": \"https://www.eindhoven.nl/projecten/beleef-de-vestdijk\",\n \"openInBrowser\": true\n }\n }\n ]\n }\n }\n }\n ],\n \"reset\": {\n \"triggerNoLongerMatches\": true\n }\n },\n {\n \"name\": \"Vestdijk\",\n \"when\": {\n \"asset\": {\n \"types\": [\n {\n \"predicateType\": \"string\",\n \"match\": \"EXACT\",\n \"value\": \"urn:openremote:asset:console\"\n }\n ],\n \"attributes\": {\n \"predicates\": [\n {\n \"name\": {\n \"predicateType\": \"string\",\n \"match\": \"EXACT\",\n \"value\": \"location\"\n },\n \"value\": {\n \"predicateType\": \"radial\",\n \"radius\": 100,\n \"lat\": 51.438803,\n \"lng\": 5.481697\n }\n }\n ]\n }\n }\n },\n \"then\": [\n {\n \"action\": \"notification\",\n \"target\": {\n \"useAssetsFromWhen\": true\n },\n \"notification\": {\n \"name\": \"Vestdijk\",\n \"message\": {\n \"type\": \"push\",\n \"title\": \"Beleef de Vestdijk\",\n \"body\": \"Meer weten over de Vestdijk?\",\n \"action\": {\n \"url\": \"https://www.eindhoven.nl/projecten/beleef-de-vestdijk\"\n },\n \"buttons\": [\n {\n \"title\": \"Ja, in app\",\n \"action\": {\n \"url\": \"https://www.eindhoven.nl/projecten/beleef-de-vestdijk\"\n }\n },\n {\n \"title\": \"Ja, in browser\",\n \"action\": {\n \"url\": \"https://www.eindhoven.nl/projecten/beleef-de-vestdijk\",\n \"openInBrowser\": true\n }\n }\n ]\n }\n }\n }\n ],\n \"reset\": {\n \"triggerNoLongerMatches\": true\n }\n },\n {\n \"name\": \"Boeiende Binnenstad\",\n \"when\": {\n \"asset\": {\n \"types\": [\n {\n \"predicateType\": \"string\",\n \"match\": \"EXACT\",\n \"value\": \"urn:openremote:asset:console\"\n }\n ],\n \"attributes\": {\n \"predicates\": [\n {\n \"name\": {\n \"predicateType\": \"string\",\n \"match\": \"EXACT\",\n \"value\": \"location\"\n },\n \"value\": {\n \"predicateType\": \"radial\",\n \"radius\": 100,\n \"lat\": 51.439887,\n \"lng\": 5.478430\n }\n }\n ]\n }\n }\n },\n \"then\": [\n {\n \"action\": \"notification\",\n \"target\": {\n \"useAssetsFromWhen\": true\n },\n \"notification\": {\n \"name\": \"Boeiende Binnenstad\",\n \"message\": {\n \"type\": \"push\",\n \"title\": \"Boeiende Binnenstad\",\n \"body\": \"Wat jullie vonden van de bestrating\",\n \"action\": {\n \"url\": \"https://www.eindhoven.nl/projecten/boeiende-binnenstad/stapsgewijs-naar-een-nieuwe-inrichting\"\n },\n \"buttons\": [\n {\n \"title\": \"Bekijk, in app\",\n \"action\": {\n \"url\": \"https://www.eindhoven.nl/projecten/boeiende-binnenstad/stapsgewijs-naar-een-nieuwe-inrichting\"\n }\n },\n {\n \"title\": \"Bekijk, in browser\",\n \"action\": {\n \"url\": \"https://www.eindhoven.nl/projecten/boeiende-binnenstad/stapsgewijs-naar-een-nieuwe-inrichting\",\n \"openInBrowser\": true\n }\n }\n ]\n }\n }\n }\n ],\n \"reset\": {\n \"triggerNoLongerMatches\": true\n }\n },\n{\n \"name\": \"Michael Home\",\n \"when\": {\n \"asset\": {\n \"types\": [\n {\n \"predicateType\": \"string\",\n \"match\": \"EXACT\",\n \"value\": \"urn:openremote:asset:console\"\n }\n ],\n \"attributes\": {\n \"predicates\": [\n {\n \"name\": {\n \"predicateType\": \"string\",\n \"match\": \"EXACT\",\n \"value\": \"location\"\n },\n \"value\": {\n \"predicateType\": \"radial\",\n \"radius\": 100,\n \"lat\": 51.687741,\n \"lng\": 5.286913\n }\n }\n ]\n }\n }\n },\n \"then\": [\n {\n \"action\": \"notification\",\n \"target\": {\n \"useAssetsFromWhen\": true\n },\n \"notification\": {\n \"name\": \"Rich Home\",\n \"message\": {\n \"type\": \"push\",\n \"title\": \"Michael\",\n \"body\": \"Welcome to Den Bosch\",\n \"action\": {\n \"url\": \"https://www.eindhoven.nl/projecten/samen-werken-aan-duurzaamheid\"\n },\n \"buttons\": [\n {\n \"title\": \"Ja, in app\",\n \"action\": {\n \"url\": \"https://www.eindhoven.nl/projecten/samen-werken-aan-duurzaamheid\"\n }\n },\n {\n \"title\": \"Ja, in browser\",\n \"action\": {\n \"url\": \"https://www.eindhoven.nl/projecten/samen-werken-aan-duurzaamheid\",\n \"openInBrowser\": true\n }\n }\n ]\n }\n }\n }\n ],\n \"reset\": {\n \"triggerNoLongerMatches\": true\n }\n }\n ]\n}",+ "lang": "JSON",+ "status": "DEPLOYED",+ "realm": "eindhoven",+ "accessPublicRead": true+ }];++ if (response && response.data) {+ response.data.forEach((rulesSet: any) => {+ let parsedRules = JSON.parse(rulesSet.rules);+ // Only get first element of rules for now+ // TODO how should this work if a ruleset has multiple rules?+ rulesSet.rules = parsedRules.rules[0];+ });+ }++ this.rulesets = response.data;+ }).catch((reason: any) => {+ console.log("Error:" + reason);++ });+ }+++ createRule() {+ if(this.rulesets) {+ this.rulesets = [...this.rulesets, rulesetModel]+ }++ // rest.api.RulesResource.createTenantRuleset(this.ruleset).then((response:any)=> {+ // console.log(response);+ // });+ }++ updateRule(e:any) {+ this.ruleset = e.detail.rule;+ console.log(this.ruleset);+ // if(this.ruleset){+ // this.ruleset.rules = JSON.stringify(this.rules);+ // console.log(this.ruleset);+ // rest.api.RulesResource.updateTenantRuleset(this.ruleset.id, this.ruleset).then((response:any)=> {+ // console.log(response);+ // });+ // }++ }++ deleteRule() {++ }++ setActiveRule(e:any) {+ this.ruleset = e.detail.rule;+ console.log(this.ruleset);+ this.requestUpdate();+ }+}+diff --git a/ui/component/or-rules-editor/src/or-rule-header/index.ts b/ui/component/or-rules-editor/src/or-rule-header/index.tsnew file mode 100644index 000000000..cea19477b--- /dev/null+++ b/ui/component/or-rules-editor/src/or-rule-header/index.ts@@ -0,0 +1,73 @@+import {html, LitElement, property, customElement} from 'lit-element';+import '../selects/or-select-operator';+import '../selects/or-select-asset-attribute';++import '@openremote/or-input';+import '@openremote/or-select';+import {Rule} from '@openremote/model';++import {style} from './style';++@customElement('or-rule-header')+class OrRuleHeader extends LitElement {+ @property({type: Object})+ rule?: Rule;++ @property({type: Boolean})+ editmode: boolean = false;++ static get styles() {+ return [+ style+ ]+ }++ protected render() {++ return html`+ <div class="rule-container">+ ${this.editmode ? html`+ <div class="layout horizontal">+ <or-input type="text" value="${this.rule ? this.rule.name : null}"></or-input>+ <span @click="${this.toggleEditmode}">edit</span>+ <button @click="${this.updateRule}">opslaan</button>+ </div>+ ` : html`+ <div class="layout horizontal">+ <h1>${this.rule ? this.rule.name : ''}</h1>+ <span @click="${this.toggleEditmode}">edit</span>+ <button @click="${this.updateRule}">opslaan</button>+ </div>+ `}+ </div>+ `;+ }++ constructor() {+ super();+ this.addEventListener('or-input:changed', this.changeName);+ }++ changeName (e:any) {+ const value = e.detail.value;+ if(this.rule) {+ this.rule.name = value;+ console.log(this.rule);+ }+ }++ updateRule() {+ let event = new CustomEvent('rules:update-rule', {+ detail: {rule: this.rule},+ bubbles: true,+ composed: true+ });+ this.dispatchEvent(event);+ }++ toggleEditmode() {+ this.editmode = !this.editmode;+ }++}+diff --git a/ui/component/or-rules-editor/src/or-rule-header/style.ts b/ui/component/or-rules-editor/src/or-rule-header/style.tsnew file mode 100644index 000000000..c84a55da8--- /dev/null+++ b/ui/component/or-rules-editor/src/or-rule-header/style.ts@@ -0,0 +1,38 @@+import {css} from 'lit-element';+++export const style = css`+ :host {+ display: block;+ width: 100%;+ height: 300px;++ z-index: 1;+ }++ .rule-container {+ padding: 20px;+ }++ .layout.horizontal {+ display: flex;+ flex-direction: row;+ }++ h1 {+ margin: 0;+ }++ button {++ padding: 0 20px;+ font-size: 14px;+ height: 40px;++ border-radius: 5px;+ background-color: var(--app-primary-color);+ margin-left: auto;+ color: var(--app-white-color, #FFF);+ font-weight: bold;+ }+`;\ No newline at end of filediff --git a/ui/component/or-rules-editor/src/or-rule-list/index.ts b/ui/component/or-rules-editor/src/or-rule-list/index.tsnew file mode 100644index 000000000..0d2c3d84e--- /dev/null+++ b/ui/component/or-rules-editor/src/or-rule-list/index.ts@@ -0,0 +1,93 @@+import {html, LitElement, property, PropertyValues} from 'lit-element';+import {Rule} from '@openremote/model';++class OrRulesList extends LitElement {+ @property({type: Array})+ rules: Rule[] = [];++ protected render() {++ return html`+ <style>+ .d-flex {+ display: -webkit-box;+ display: -moz-box;+ display: -ms-flexbox;+ display: -webkit-flex;+ display: flex;+ }++ .flex {+ -webkit-box-flex: 1;+ -moz-box-flex: 1;+ -webkit-flex: 1;+ -ms-flex: 1;+ flex: 1;+ }++ .list-container {+ }++ .list-item {+ text-decoration: none;+ height: 24px;+ padding: 20px 0;+ border-bottom: 1px solid var(--app-lightgrey-color);+ border-left: 5px solid transparent;+ color: var(--app-grey-color);+ cursor: pointer;+ }++ .list-item:hover {+ border-left-color: var(--app-primary-color);+ background-color: var(--app-lightgrey-color);+ }++ .list-item > span {+ font-size: 18px;+ }++ .rule-status {+ width: 8px;+ height: 8px;+ border-radius: 8px;+ margin: 8px 10px;+ }++ .bg-green {+ background-color: green;+ }+ </style>+ <div class="list-container">+ ${this.rules && this.rules.map((rule: Rule, index:number) => {+ return html`+ <a class="d-flex list-item" @click="${()=> this.setActiveRule(this.rules[index])}">+ <span class="rule-status ${!rule.name ? '' : 'bg-green'}"></span>+ <div class="flex">+ <span>${rule.name}</span>+ </div>+ </a>+ `+ })}+ </div>+ `;+ }++ setActiveRule (rule:Rule) {+ this.requestUpdate();+ let event = new CustomEvent('rules:set-active-rule', {+ detail: {rule: rule},+ bubbles: true,+ composed: true+ });+ this.dispatchEvent(event);+ }++ constructor() {+ super();+ }+++}++window.customElements.define('or-rule-list', OrRulesList);diff --git a/ui/component/or-rules-editor/src/or-rule-then-condition/index.ts b/ui/component/or-rules-editor/src/or-rule-then-condition/index.tsnew file mode 100644index 000000000..ecc72eca2--- /dev/null+++ b/ui/component/or-rules-editor/src/or-rule-then-condition/index.ts@@ -0,0 +1,46 @@+import {html, LitElement, property, customElement} from 'lit-element';+import '../selects/or-select-operator';+import '../selects/or-select-asset-attribute';++import '@openremote/or-input';+import '@openremote/or-select';++import {style} from './style';++import {RuleActionUnion} from "@openremote/model";++@customElement('or-rule-then-condition')+class OrRuleThenCondition extends LitElement {++ static get styles() {+ return [+ style+ ]+ }++ protected render() {++ return html`+ <div class="rule-container">+ <or-select-asset-type></or-select-asset-type>+ <or-select-asset-attribute type="${this.condition}"></or-select-asset-attribute>+ <or-select-operator type="${this.condition}"></or-select-operator>+ <or-input type="text"></or-input>+ </div>+ `;+ }++ @property({type: Object})+ condition?: RuleActionUnion;++ @property({type: Number})+ private value: number = 0;+++ constructor() {+ super();+ }+++}+diff --git a/ui/component/or-rules-editor/src/or-rule-then-condition/style.ts b/ui/component/or-rules-editor/src/or-rule-then-condition/style.tsnew file mode 100644index 000000000..4d4d8e8d8--- /dev/null+++ b/ui/component/or-rules-editor/src/or-rule-then-condition/style.ts@@ -0,0 +1,16 @@+import {css} from 'lit-element';+++export const style = css`+ :host {+ display: block;+ }++ .rule-container {+ display: flex;+ padding: 20px;++ border-radius: 3px;+ border: 1px solid var(--lightgrey-color);+ }+`;\ No newline at end of filediff --git a/ui/component/or-rules-editor/src/or-rule-then/index.ts b/ui/component/or-rules-editor/src/or-rule-then/index.tsnew file mode 100644index 000000000..7b72cd460--- /dev/null+++ b/ui/component/or-rules-editor/src/or-rule-then/index.ts@@ -0,0 +1,63 @@+import {html, LitElement, property, customElement} from 'lit-element';++import {style} from './style';+import {Rule, RuleTrigger, RuleActionUnion} from "@openremote/model";++import '../or-rule-then-condition';++let defaultThen:RuleActionUnion[] = [];+let defaultThenCondition:RuleActionUnion = {+ action: "write-attribute"+};++@customElement('or-rule-then')+class OrRuleThen extends LitElement {++ static get styles() {+ return [+ style+ ]+ }++ protected render() {++ return html`+ <div class="rule-content-section">+ <h3>Dan..</h3>+ <div class="rule-then-container bg-white shadow">+ ${this.rule && this.rule.then ? this.rule.then.map((then:RuleActionUnion) => {+ return html`+ <or-rule-then-condition .condition="${then}"></or-rule-then-condition>+ <span class="rule-additional">&</span>+ `+ }) : ``}+ <a class="button-add" @click="${this.addThenRule}">+</a>+ </div>+ </div>++ `;+ }++ @property({type: Object})+ rule?: Rule;++ constructor() {+ super();+ }++ addThenRule () {+ if(this.rule && !this.rule.then) {+ this.rule.then = defaultThen;+ console.log(this.rule);++ }++ if(this.rule && this.rule.then) {+ this.rule.then.push(defaultThenCondition);+ this.requestUpdate();+ }++ }++}+diff --git a/ui/component/or-rules-editor/src/or-rule-then/style.ts b/ui/component/or-rules-editor/src/or-rule-then/style.tsnew file mode 100644index 000000000..9ed929a33--- /dev/null+++ b/ui/component/or-rules-editor/src/or-rule-then/style.ts@@ -0,0 +1,35 @@+import {css} from 'lit-element';++// language=CSS+export const style = css`++ .rule-content-section {+ flex-grow: 1;+ flex-basis: 1;+ margin: 20px 10px;+ }++ .rule-then-container {+ display: flex;+ padding: 20px;++ flex-wrap: wrap;+ background-color: var(--app-white-color, #FFF);+ }++ .button-add {+ display: block;+ cursor: pointer;+ padding: 15px 40px;+ font-size: 20px;+ font-weight: bold;+ box-sizing: border-box;+ border: 3px dashed var(--app-lightgrey-color, #e4e4e4);+ }++ .rule-additional {+ padding: 15px 20px;+ font-size: 20px;+ font-weight: bold;+ }+`;\ No newline at end of filediff --git a/ui/component/or-rules-editor/src/or-rule-when-condition/index.ts b/ui/component/or-rules-editor/src/or-rule-when-condition/index.tsnew file mode 100644index 000000000..dec31634a--- /dev/null+++ b/ui/component/or-rules-editor/src/or-rule-when-condition/index.ts@@ -0,0 +1,99 @@+import {html, LitElement, property, customElement} from 'lit-element';+import '../selects/or-select-asset-attribute';+import '../selects/or-select-operator';++import '@openremote/or-input';+import '@openremote/or-select';++import {style} from './style';+import {AttributePredicate} from "@openremote/model";++@customElement('or-rule-when-condition')+class OrRuleWhenCondition extends LitElement {++ static get styles() {+ return [+ style+ ]+ }++ protected render() {++ return html`+ <div class="rule-container">+ ${this.predicate ? html`+ <or-select-asset-type>+ <i class="material-icons">+ ${this.predicate.name ? this.predicate.name.value : 'defaultIcon'}+ </i>+ </or-select-asset-type>+ ${this.predicate.name ? html`+ <or-select-asset-attribute icon="${this.predicate}" value="${this.predicate.name.value}"></or-select-asset-attribute>+ ` : ``}++ ${this.predicate.value && this.predicate.value.predicateType === 'string' ? html`+ <or-select-operator type="${this.predicate.value.predicateType}" value="${this.predicate.value.match}"></or-select-operator>++ <or-input type="text" value="${this.predicate.value.value}"></or-input>++ ` : ``}++ ` : ``}+ </div>+ `;+ }++ @property({type: Object})+ predicate?: AttributePredicate;++ // setAssetType(value:string) {+ // const assetType = {+ // "predicateType": "string",+ // "match": "EXACT",+ // "value": value+ // };+ //+ // // TODO how does this work with multiple assetTypes?+ // if(this.predicate && this.when.asset && this.when.asset.types) {+ // this.when.asset.types.push(assetType);+ // }+ // }++ setAssetAttribute(e:any) {+ const value = e.detail.value;++ if(this.predicate && this.predicate.name) {+ this.predicate.name.value = value;+ console.log(this.predicate);+ }+ }++ setOperator(e:any){+ const value = e.detail.value;+ if(this.predicate && this.predicate.value && this.predicate.value.predicateType === 'string') {+ this.predicate.value.match = value;+ console.log(this.predicate);+ }+ }++ setValue(e:any) {+ const value = e.detail.value;++ if(this.predicate && this.predicate.value && this.predicate.value.predicateType === 'string') {+ this.predicate.value.value = value;+ console.log(this.predicate);+ }+ }++ constructor() {+ super();++ this.addEventListener('asset-attribute:changed', this.setAssetAttribute);+ this.addEventListener('operator:changed', this.setOperator);+ this.addEventListener('or-input:changed', this.setValue);++ }+++}+diff --git a/ui/component/or-rules-editor/src/or-rule-when-condition/style.ts b/ui/component/or-rules-editor/src/or-rule-when-condition/style.tsnew file mode 100644index 000000000..3643fb0ab--- /dev/null+++ b/ui/component/or-rules-editor/src/or-rule-when-condition/style.ts@@ -0,0 +1,16 @@+import {css} from 'lit-element';+++export const style = css`+ :host {+ display: block;+ }++ .rule-container {+ display: flex;+ padding: 20px;++ border-radius: 3px;+ border: 1px solid var(--grey-color);+ }+`;\ No newline at end of filediff --git a/ui/component/or-rules-editor/src/or-rule-when/index.ts b/ui/component/or-rules-editor/src/or-rule-when/index.tsnew file mode 100644index 000000000..f26644ad6--- /dev/null+++ b/ui/component/or-rules-editor/src/or-rule-when/index.ts@@ -0,0 +1,82 @@+import {html, LitElement, property, customElement} from 'lit-element';++import {style} from './style';+import {Rule, RuleTrigger, AttributePredicate, BaseAssetQueryMatch} from "@openremote/model";++import '../or-rule-when-condition';++const defaultWhenCondition:RuleTrigger = {+ "asset": {+ "types": [],+ "attributes": {+ "predicates": []+ }+ }+};++const defaultPredicate:AttributePredicate = {+ name: {+ predicateType: "string",+ match: BaseAssetQueryMatch.EXACT+ },+ value: {+ predicateType: "string",+ match: BaseAssetQueryMatch.EXACT,+ value: ""+ }++};++@customElement('or-rule-when')+class OrRuleWhen extends LitElement {++ static get styles() {+ return [+ style+ ]+ }++ protected render() {++ return html`+ <div class="rule-content-section">+ <h3>Als..</h3>+ <div class="rule-when-container bg-white shadow">+ ${this.rule && this.rule.when && this.rule.when.asset && this.rule.when.asset.attributes && this.rule.when.asset.attributes.predicates ? html`+ ${this.rule.when.asset.attributes.predicates.map((predicate:AttributePredicate) => {+ return html`+ <or-rule-when-condition .predicate="${predicate}"></or-rule-when-condition>+ <span class="rule-additional">&</span>+ `+ })}+ `: ``}+ <a class="button-add" @click="${this.addWhenRule}">+</a>+ </div>+ </div>+ `;+ }++ @property({type: Object})+ rule?: Rule;++ @property({type: Array})+ predicates?: AttributePredicate[] = [];++ constructor() {+ super();+ }++ addWhenRule () {+ if(this.rule && !this.rule.when) {+ this.rule.when = defaultWhenCondition;+ }++ if(this.rule && this.rule.when && this.rule.when.asset && this.rule.when.asset.attributes && this.rule.when.asset.attributes.predicates) {+ this.rule.when.asset.attributes.predicates.push(defaultPredicate);+ this.requestUpdate();+ }++ }++}+diff --git a/ui/component/or-rules-editor/src/or-rule-when/style.ts b/ui/component/or-rules-editor/src/or-rule-when/style.tsnew file mode 100644index 000000000..71c2da382--- /dev/null+++ b/ui/component/or-rules-editor/src/or-rule-when/style.ts@@ -0,0 +1,35 @@+import {css} from 'lit-element';++// language=CSS+export const style = css`++ .rule-content-section {+ flex-grow: 1;+ flex-basis: 1;+ margin: 20px 10px;+ }++ .rule-when-container {+ display: flex;+ padding: 20px;++ background-color: var(--app-white-color, #FFF);+ flex-wrap: wrap;+ }++ .button-add {+ display: block;+ cursor: pointer;+ padding: 15px 40px;+ font-size: 20px;+ font-weight: bold;+ box-sizing: border-box;+ border: 3px dashed var(--app-lightgrey-color, #e4e4e4);+ }++ .rule-additional {+ padding: 15px 20px;+ font-size: 20px;+ font-weight: bold;+ }+`;\ No newline at end of filediff --git a/ui/component/or-rules-editor/src/selects/or-select-asset-attribute/index.ts b/ui/component/or-rules-editor/src/selects/or-select-asset-attribute/index.tsnew file mode 100644index 000000000..ed8116270--- /dev/null+++ b/ui/component/or-rules-editor/src/selects/or-select-asset-attribute/index.ts@@ -0,0 +1,67 @@+import {html, LitElement, customElement, property} from 'lit-element';+//import "@material/mwc-icon"+import {AttributeDescriptor, AttributeValueType} from "@openremote/model"++@customElement('or-select-asset-attribute')+class OrSelectAssetAttribute extends LitElement {+ @property({type: Function})+ private changed: any;++ @property({type: String})+ icon: string = '';++ @property({type: String})+ assetType: string = '';++ @property({type: Array})+ attributeDescriptors?: AttributeDescriptor[];++ @property({type: String})+ value: any;++ protected render() {++ // TODO types should be based on rules-config+ return html`+ <select id="or-select-asset-attribute" @change="${this.onChange}">+ ${this.attributeDescriptors ? this.attributeDescriptors.map((attribute:AttributeDescriptor) => {+ return html`+ <option value="${attribute.name}">${attribute.name}</option>+ `+ }) : ``}+ </select>+ `;+ }++ onChange() {+ if(this.shadowRoot){+ const value = (<HTMLInputElement>this.shadowRoot.getElementById('or-select-asset-attribute')).value;++ let event = new CustomEvent('asset-attribute:changed', {+ detail: { value: value },+ bubbles: true,+ composed: true });++ this.dispatchEvent(event);+ }+ }++ constructor() {+ super();++ // TODO Should come from rules-config based on asset type?+ // TODO what is the attribute name of profile flights?+ this.attributeDescriptors = [+ { name: 'flightProfile', valueType: AttributeValueType.STRING },+ { name: 'airportIata', valueType: AttributeValueType.STRING },+ { name: 'airlineIata', valueType: AttributeValueType.STRING },+ { name: 'originRegion', valueType: AttributeValueType.STRING },+ { name: 'languageCodes', valueType: AttributeValueType.STRING },+ { name: 'passengerCapacity', valueType: AttributeValueType.NUMBER },+ { name: 'countryCode', valueType: AttributeValueType.STRING }+ ];+ }+++}+diff --git a/ui/component/or-rules-editor/src/selects/or-select-operator/index.ts b/ui/component/or-rules-editor/src/selects/or-select-operator/index.tsnew file mode 100644index 000000000..878fa27c2--- /dev/null+++ b/ui/component/or-rules-editor/src/selects/or-select-operator/index.ts@@ -0,0 +1,51 @@+import {html, LitElement, property, customElement} from 'lit-element';+import {AttributeValueType, BaseAssetQueryMatch} from "@openremote/model";++@customElement('or-select-operator')+class OrRuleWhen extends LitElement {++ @property({type: String})+ type?: AttributeValueType;++ @property({type: String})+ value?: BaseAssetQueryMatch;++ protected render() {++ return html`+ ${this.type ? html`+ <select id="or-select-operator" @change="${this.onChange}">+ <option ?selected="${this.value === BaseAssetQueryMatch.EXACT}" value="${BaseAssetQueryMatch.EXACT}">=</option>+ <option ?selected="${this.value === BaseAssetQueryMatch.NOT_EXACT}" value="${BaseAssetQueryMatch.NOT_EXACT}">!=</option>+ ${this.type === AttributeValueType.NUMBER ? html`+ <option value="LESS_THAN"><</option>+ <option value="GREATER_THAN">></option>+ <option value="LESS_EQUALS">=<</option>+ <option value="GREATER_EQUALS">=></option>+ ` :``}+ </select>+ ` :``}+ `;+ }+++ onChange() {+ if(this.shadowRoot){+ const value = (<HTMLInputElement>this.shadowRoot.getElementById('or-select-operator')).value;++ let event = new CustomEvent('operator:changed', {+ detail: { value: value },+ bubbles: true,+ composed: true });++ this.dispatchEvent(event);+ }+ }++ constructor() {+ super();+ }+++}+diff --git a/ui/component/or-rules-editor/src/style.ts b/ui/component/or-rules-editor/src/style.tsnew file mode 100644index 000000000..262f4d503--- /dev/null+++ b/ui/component/or-rules-editor/src/style.ts@@ -0,0 +1,86 @@+import {css} from 'lit-element';++// language=CSS+export const style = css`+ :host {+ display: block;+ height: 100%;+ width: 100%;++ --bg-white: #FFFFFF;+ --bg-grey: #F5F5F5;+ --app-lightgrey-color: #e4e4e4;+ }++ .rule-editor-container {+ display: flex;+ position: relative;+ height: 100%;+ width: 100%;+ }++ .bg-white {+ background-color: var(--bg-white);+ }++ .shadow {+ -webkit-box-shadow: 0px 1px 3px 0px rgba(0, 0, 0, 0.21);+ -moz-box-shadow: 0px 1px 3px 0px rgba(0, 0, 0, 0.21);+ box-shadow: 0px 1px 3px 0px rgba(0, 0, 0, 0.21);+ }++ side-menu {+ min-width: 300px;+ width: 300px;++ z-index: 2;+ display: flex;+ flex-direction: column;+ }++ or-rule-list {+ flex-grow: 1;+ }++ .bottom-toolbar {+ display: flex;++ border-top: 1px solid var(--app-lightgrey-color);+ }++ icon {+ cursor: pointer;+ padding: 10px;+ margin: 10px;+ border: 1px solid var(--app-lightgrey-color);+ border-radius: 3px;+ }++ icon:hover {+ background-color: var(--app-primary-color);+ color: var(--app-white-color, #FFF);+ }++ or-body,+ .content {+ display: flex;+ flex-grow: 1;+ }++ or-body {+ flex-direction: column;+ }++ .content {+ flex-direction: row;+ }++ or-rule-then,+ or-rule-when {+ display: flex;+ flex-grow: 1;+ padding: 0 10px;+ background-color: var(--app-lightgrey-color);+ max-width: 50%;+ }+`;\ No newline at end of filediff --git a/ui/component/or-rules-editor/tsconfig.json b/ui/component/or-rules-editor/tsconfig.jsonnew file mode 100644index 000000000..c2df6cda0--- /dev/null+++ b/ui/component/or-rules-editor/tsconfig.json@@ -0,0 +1,16 @@+{+ "extends": "../../tsconfig",+ "compilerOptions": {+ "outDir": "./dist/",+ "rootDir": "src"+ },+ "include": [+ "./src"+ ],+ "references": [+ { "path": "../core" },+ { "path": "../or-select" },+ { "path": "../or-input" },+ { "path": "../rest" }+ ]+}\ No newline at end of filediff --git a/ui/component/or-select/.npmignore b/ui/component/or-select/.npmignorenew file mode 100644index 000000000..ca658009d--- /dev/null+++ b/ui/component/or-select/.npmignore@@ -0,0 +1,3 @@+build/+build.gradle+test/\ No newline at end of filediff --git a/ui/component/or-select/README.md b/ui/component/or-select/README.mdnew file mode 100644index 000000000..437da10d4--- /dev/null+++ b/ui/component/or-select/README.md@@ -0,0 +1,3 @@+# \<or-select\>++OpenRemote selectdiff --git a/ui/component/or-select/build.gradle b/ui/component/or-select/build.gradlenew file mode 100644index 000000000..489605e7b--- /dev/null+++ b/ui/component/or-select/build.gradle@@ -0,0 +1,9 @@+task clean() {+ doLast {+ delete "dist"+ }+}++task build() {+ dependsOn rootProject.tasks.getByName("yarnInstall"), npmBuild+}diff --git a/ui/component/or-select/package.json b/ui/component/or-select/package.jsonnew file mode 100644index 000000000..0d1343483--- /dev/null+++ b/ui/component/or-select/package.json@@ -0,0 +1,29 @@+{+ "name": "@openremote/or-select",+ "version": "1.0.0",+ "description": "OpenRemote select",+ "main": "dist/index.js",+ "types": "src/index.ts",+ "scripts": {+ "build": "npx tsc",+ "test": "echo \"No tests\" && exit 0"+ },+ "author": "OpenRemote",+ "license": "AGPL-3.0-or-later",+ "dependencies": {+ "lit-element": "^2.0.1",+ "@material/select": "^1.0.1",+ "@material/list": "^1.0.1",+ "@material/menu": "^1.0.1",+ "@material/menu-surface": "^1.0.1"+ },+ "devDependencies": {+ "@polymer/decorators": "^3.0.0",+ "@polymer/iron-demo-helpers": "^3.0.0-pre.19",+ "@webcomponents/webcomponentsjs": "^2.0.0",+ "style-loader": "^0.23.1",+ "tslint": "^5.11.0",+ "typescript": "^3.2.2",+ "wct-browser-legacy": "^1.0.0"+ }+}diff --git a/ui/component/or-select/src/index.d.ts b/ui/component/or-select/src/index.d.tsnew file mode 100644index 000000000..cb0ff5c3b--- /dev/null+++ b/ui/component/or-select/src/index.d.ts@@ -0,0 +1 @@+export {};diff --git a/ui/component/or-select/src/index.js b/ui/component/or-select/src/index.jsnew file mode 100644index 000000000..b8e1625fb--- /dev/null+++ b/ui/component/or-select/src/index.js@@ -0,0 +1,47 @@+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {+ var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;+ if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);+ else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;+ return c > 3 && r && Object.defineProperty(target, key, r), r;+};+import { html, LitElement, property } from 'lit-element';+class OrRulesEditor extends LitElement {+ constructor() {+ super();+ // default value in minutes+ this.value = 0;+ // default value in minutes+ this.current = 0;+ // maxRange in minutes+ this.maxRange = 360;+ // minRange in minutes+ this.minRange = 0;+ // Steps in minutes+ this.step = 5;+ }+ render() {+ return html `+ <h1>hi</h1>+ `;+ }+}+__decorate([+ property({ type: Function })+], OrRulesEditor.prototype, "onChange", void 0);+__decorate([+ property({ type: Number })+], OrRulesEditor.prototype, "value", void 0);+__decorate([+ property({ type: Number })+], OrRulesEditor.prototype, "current", void 0);+__decorate([+ property({ type: Number })+], OrRulesEditor.prototype, "maxRange", void 0);+__decorate([+ property({ type: Number })+], OrRulesEditor.prototype, "minRange", void 0);+__decorate([+ property({ type: Number })+], OrRulesEditor.prototype, "step", void 0);+window.customElements.define('or-rules-editor', OrRulesEditor);+//# sourceMappingURL=index.js.map\ No newline at end of filediff --git a/ui/component/or-select/src/index.js.map b/ui/component/or-select/src/index.js.mapnew file mode 100644index 000000000..a1ed8a1f4--- /dev/null+++ b/ui/component/or-select/src/index.js.map@@ -0,0 +1 @@+{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":";;;;;;AAAA,OAAO,EAAC,IAAI,EAAE,UAAU,EAAE,QAAQ,EAAC,MAAM,aAAa,CAAC;AAIvD,MAAM,aAAc,SAAQ,UAAU;IAgClC;QACI,KAAK,EAAE,CAAC;QArBZ,2BAA2B;QAEnB,UAAK,GAAW,CAAC,CAAC;QAE1B,2BAA2B;QAEpB,YAAO,GAAW,CAAC,CAAC;QAE3B,sBAAsB;QAEd,aAAQ,GAAW,GAAG,CAAC;QAE/B,sBAAsB;QAEd,aAAQ,GAAW,CAAC,CAAC;QAE7B,mBAAmB;QAEX,SAAI,GAAW,CAAC,CAAC;IAIzB,CAAC;IAjCS,MAAM;QAEZ,OAAO,IAAI,CAAA;;SAEV,CAAC;IACN,CAAC;CA+BJ;AA3BG;IADC,QAAQ,CAAC,EAAC,IAAI,EAAE,QAAQ,EAAC,CAAC;+CACL;AAItB;IADC,QAAQ,CAAC,EAAC,IAAI,EAAE,MAAM,EAAC,CAAC;4CACC;AAI1B;IADC,QAAQ,CAAC,EAAC,IAAI,EAAE,MAAM,EAAC,CAAC;8CACE;AAI3B;IADC,QAAQ,CAAC,EAAC,IAAI,EAAE,MAAM,EAAC,CAAC;+CACM;AAI/B;IADC,QAAQ,CAAC,EAAC,IAAI,EAAE,MAAM,EAAC,CAAC;+CACI;AAI7B;IADC,QAAQ,CAAC,EAAC,IAAI,EAAE,MAAM,EAAC,CAAC;2CACA;AAS7B,MAAM,CAAC,cAAc,CAAC,MAAM,CAAC,iBAAiB,EAAE,aAAa,CAAC,CAAC"}\ No newline at end of filediff --git a/ui/component/or-select/src/index.ts b/ui/component/or-select/src/index.tsnew file mode 100644index 000000000..bae4c6d17--- /dev/null+++ b/ui/component/or-select/src/index.ts@@ -0,0 +1,31 @@+import {html, LitElement, property, PropertyValues} from 'lit-element';+import {MDCSelect} from '@material/select';++class OrSelect extends LitElement {+ @property({type: String})+ label: string = '';++ protected render() {++ return html`+ <div class="mdc-select">+ <i class="mdc-select__dropdown-icon"></i>+ <slot></slot>+ <label class="mdc-floating-label mdc-floating-label--float-above">${this.label}</label>+ <div class="mdc-line-ripple"></div>+ </div>+ `;+ }++ protected firstUpdated(_changedProperties: PropertyValues): void {+ super.firstUpdated(_changedProperties);+ }++ constructor() {+ super();+ }+++}++window.customElements.define('or-select', OrSelect);diff --git a/ui/component/or-select/tsconfig.json b/ui/component/or-select/tsconfig.jsonnew file mode 100644index 000000000..aa12a532d--- /dev/null+++ b/ui/component/or-select/tsconfig.json@@ -0,0 +1,14 @@+{+ "extends": "../../tsconfig",+ "compilerOptions": {+ "outDir": "./dist/",+ "rootDir": "src"+ },+ "include": [+ "./src"+ ],+ "references": [+ { "path": "../core" },+ { "path": "../rest" }+ ]+}\ No newline at end of filediff --git a/ui/component/or-smart-notify/src/index.js b/ui/component/or-smart-notify/src/index.jsindex 2f20effa0..bb3bbafc7 100644--- a/ui/component/or-smart-notify/src/index.js+++ b/ui/component/or-smart-notify/src/index.js@@ -217,7 +217,7 @@ let OrSmartNotify = class OrSmartNotify extends LitElement {</a></div><div class="layout horizontal">- <div style="background-color: var(--app-lightgrey-color, #dedede);" class="flex padding-10">Wachttijd berekenen</div>+ <div style="background-color: var(--app-lightgrey-color, #dedede);" class="flex padding-10">Activeren</div><div class="flex t-center"><label class="switch"><input @change="${this.setSmartNotify}" ?disabled="${this.isDisabled}" ?checked="${this.isActive}" type="checkbox">diff --git a/ui/component/or-timeline/src/index.js b/ui/component/or-timeline/src/index.jsindex c4d08e367..a5a02fa90 100644--- a/ui/component/or-timeline/src/index.js+++ b/ui/component/or-timeline/src/index.js@@ -64,6 +64,7 @@ class OrTimeline extends LitElement {transition: opacity .2s;border-radius: 6px;+ cursor: pointer;}/* The slider handle (use -webkit- (Chrome, Opera, Safari, Edge) and -moz- (Firefox) to override default look) */@@ -117,8 +118,8 @@ class OrTimeline extends LitElement {flex-basis: 100%;overflow: visible;- color: #dcdcdc;- border-left: 1px solid #dcdcdc;+ color: var(--timeline-grey, darkgrey);+ border-left: 1px solid var(--timeline-grey, darkgrey);font-size: 12px;-webkit-user-select: none;-moz-user-select: none;@@ -137,6 +138,7 @@ class OrTimeline extends LitElement {background-color: var(--timeline-accent, blue);height: 30px;width: 60px;+ margin-left: -30px;text-align: center;color: white;display: inline-block;@@ -147,10 +149,11 @@ class OrTimeline extends LitElement {}.time-value-container {- width: 100%;+ width: calc(100% - 80px);display: block;position: relative;height: 30px;+ margin: 0 50px 0 30px;}</style>@@ -201,18 +204,20 @@ class OrTimeline extends LitElement {// Figure out placement percentage between left and right of inputconst newPoint = v / this.maxRange;// Janky value to get pointer to line up better- let offset = 0;+ let offset = 30;let newPlace;// Prevent bubble from going beyond left or right (unsupported browsers)if (newPoint < 0) {newPlace = 0;}else if (newPoint > 1) {- newPlace = width;+ newPlace = width - offset;}else {- newPlace = width * newPoint + offset;- offset -= newPoint;+ newPlace = (width - offset) * newPoint;+ if (newPlace < 0) {+ newPlace = 0;+ }}// Move bubbleif (this.shadowRoot) {diff --git a/ui/component/or-timeline/src/index.js.map b/ui/component/or-timeline/src/index.js.mapindex 1672be3a4..b4f15ddf5 100644--- a/ui/component/or-timeline/src/index.js.map+++ b/ui/component/or-timeline/src/index.js.map@@ -1 +1 @@-{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":"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"}\ No newline at end of file+{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":"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"}\ No newline at end of filediff --git a/yarn.lock b/yarn.lockindex 4c807ef28..3702a8ff6 100644--- a/yarn.lock+++ b/yarn.lock@@ -691,16 +691,174 @@resolved "https://registry.yarnpkg.com/@mapbox/whoots-js/-/whoots-js-3.1.0.tgz#497c67a1cef50d1a2459ba60f315e448d2ad87fe"integrity sha512-Es6WcD0nO5l+2BOQS4uLfNPYQaNDfbot3X1XUoloz+x0mPDS3eeORZJl06HXjwBG1fOGwCRnzK88LMdxKRrd6Q==-"@polymer/app-layout@^3.0.0":- version "3.0.2"- resolved "https://registry.yarnpkg.com/@polymer/app-layout/-/app-layout-3.0.2.tgz#8a6f3c87b405635fd3547db82db8dbb6c51b6bf9"- integrity sha512-qKcQHj72uGxGoetjnNQ7pg4F6Da4U5jKBzZy0VRmDuZMUPDmtIqHaIgC5K6B4y+xUag0gkV9ce72Q3hNaK9y+g==+"@material/animation@^1.0.0":+ version "1.0.0"+ resolved "https://registry.yarnpkg.com/@material/animation/-/animation-1.0.0.tgz#dfd8575c8b031203917dc838ac0e3c0fe0f6709b"+ integrity sha512-Ed5/vggn6ZhSJ87yn3ZS1d826VJNFz73jHF2bSsgRtHDoB8KCuOwQMfdgAgDa4lKDF6CDIPCKBZPKrs2ubehdw==dependencies:- "@polymer/iron-flex-layout" "^3.0.0-pre.26"- "@polymer/iron-media-query" "^3.0.0-pre.26"- "@polymer/iron-resizable-behavior" "^3.0.0-pre.26"- "@polymer/iron-scroll-target-behavior" "^3.0.0-pre.26"- "@polymer/polymer" "^3.0.0"+ tslib "^1.9.3"++"@material/base@^1.0.0":+ version "1.0.0"+ resolved "https://registry.yarnpkg.com/@material/base/-/base-1.0.0.tgz#e4ef0b22c54aa887af94f5988fb1c0cb3245beba"+ integrity sha512-5dxFp46x5FA+Epg6YHLzN+5zRt9S2wR84UdvVAEJ1egea94m9UHUg7y9tAnNSN16aexRSywmzyLwPr+i8PGEYA==+ dependencies:+ tslib "^1.9.3"++"@material/dom@^1.0.1":+ version "1.0.1"+ resolved "https://registry.yarnpkg.com/@material/dom/-/dom-1.0.1.tgz#a0bff19e5c3d14a147dca91f55eb8410eee31739"+ integrity sha512-7gb9Tk8YBn2fLEa5fJfvDexG0QxvRGDb8c6uZEhvK4bTd2ZHCfHg9KrO+smC6Trbn5jC+FsBvdRZBbMjtS/E4g==+ dependencies:+ tslib "^1.9.3"++"@material/elevation@^1.0.0":+ version "1.0.0"+ resolved "https://registry.yarnpkg.com/@material/elevation/-/elevation-1.0.0.tgz#c993d1d59b11357198d1b38947b141e4b4ab9a2d"+ integrity sha512-TqmvEXmZDYLm2X5lEnjKCsZMDkCXpxFFxL22AfCAQB5L4d0gAS7vqDEE797y4Rp+BBKEcOP71mum1l56RI3NBQ==+ dependencies:+ "@material/animation" "^1.0.0"+ "@material/feature-targeting" "^0.44.1"+ "@material/theme" "^1.0.0"++"@material/feature-targeting@^0.44.1":+ version "0.44.1"+ resolved "https://registry.yarnpkg.com/@material/feature-targeting/-/feature-targeting-0.44.1.tgz#afafc80294e5efab94bee31a187273d43d34979a"+ integrity sha512-90cc7njn4aHbH9UxY8qgZth1W5JgOgcEdWdubH1t7sFkwqFxS5g3zgxSBt46TygFBVIXNZNq35Xmg80wgqO7Pg==++"@material/floating-label@^1.0.0":+ version "1.0.0"+ resolved "https://registry.yarnpkg.com/@material/floating-label/-/floating-label-1.0.0.tgz#9e30644abe2fe160af14f83f06dc8d15f395dc0e"+ integrity sha512-yESFi8HEUO0PmPWvaU3VW4X8+xaoFHhj2xGxLPu2hGye4ZBjTpmjOX6y1vwYqZLD5KWXj91k695UAT6J2wtWFQ==+ dependencies:+ "@material/animation" "^1.0.0"+ "@material/base" "^1.0.0"+ "@material/rtl" "^0.42.0"+ "@material/theme" "^1.0.0"+ "@material/typography" "^1.0.0"+ tslib "^1.9.3"++"@material/line-ripple@^1.0.0":+ version "1.0.0"+ resolved "https://registry.yarnpkg.com/@material/line-ripple/-/line-ripple-1.0.0.tgz#d337880d08a35a3e60c1411be32355d7723ecc65"+ integrity sha512-sFFpoFXVnqkknkac5bCrMhKGacay26AWVFfc3acaEGjQgkvF8VBV/bS41+CioACyubpc4JL69PU9Um/t7xAQVw==+ dependencies:+ "@material/animation" "^1.0.0"+ "@material/base" "^1.0.0"+ "@material/theme" "^1.0.0"+ tslib "^1.9.3"++"@material/list@^1.0.1":+ version "1.0.1"+ resolved "https://registry.yarnpkg.com/@material/list/-/list-1.0.1.tgz#772d29f8061f4e81c950c42a925a7175ca8e394e"+ integrity sha512-u9Bx+mghPy2qCHcSH2b0+0jbjTtkXNdiWjb8JDQcYmOUTfFoeQ16GqvjTybRPwoKA0UC9Hc/4U8gYvnK+bReRw==+ dependencies:+ "@material/base" "^1.0.0"+ "@material/dom" "^1.0.1"+ "@material/feature-targeting" "^0.44.1"+ "@material/ripple" "^1.0.1"+ "@material/rtl" "^0.42.0"+ "@material/shape" "^1.0.0"+ "@material/theme" "^1.0.0"+ "@material/typography" "^1.0.0"+ tslib "^1.9.3"++"@material/menu-surface@^1.0.1":+ version "1.0.1"+ resolved "https://registry.yarnpkg.com/@material/menu-surface/-/menu-surface-1.0.1.tgz#b6675771464ecf9ffa397bc2375c4fe29ff07396"+ integrity sha512-JFUa3kQ+NtpuK/mgWIcyhC1AClKmt9EQdW4SG2KQhPAGg0juWiZwyMySDIjf+V0buSUZXZ7N26bi32+Y1LvZ3w==+ dependencies:+ "@material/animation" "^1.0.0"+ "@material/base" "^1.0.0"+ "@material/elevation" "^1.0.0"+ "@material/feature-targeting" "^0.44.1"+ "@material/rtl" "^0.42.0"+ "@material/shape" "^1.0.0"+ "@material/theme" "^1.0.0"+ tslib "^1.9.3"++"@material/menu@^1.0.1":+ version "1.0.1"+ resolved "https://registry.yarnpkg.com/@material/menu/-/menu-1.0.1.tgz#379a593a82281feed9b80c40c4c5b856370a0c35"+ integrity sha512-fmBBHADc4hlp/yJSRHY+rjO0mzMYajSrTdXVycAv/pyml7VsjMa2MUf6NTSUpzpJf/snGcbfXo5RDJOGP1VbXg==+ dependencies:+ "@material/base" "^1.0.0"+ "@material/feature-targeting" "^0.44.1"+ "@material/list" "^1.0.1"+ "@material/menu-surface" "^1.0.1"+ "@material/ripple" "^1.0.1"+ "@material/rtl" "^0.42.0"+ tslib "^1.9.3"++"@material/notched-outline@^1.0.0":+ version "1.0.0"+ resolved "https://registry.yarnpkg.com/@material/notched-outline/-/notched-outline-1.0.0.tgz#50fb6fc7f6bff130da366239a40649bbccd7a4e4"+ integrity sha512-P33NGEJMoWaXfjCleEoZnW9ZUA5c4V+jatMcsx/LidYUyXpl5f70V28ZOjwten4z+yBTezdIOx1cyjYrIn8CJw==+ dependencies:+ "@material/animation" "^1.0.0"+ "@material/base" "^1.0.0"+ "@material/floating-label" "^1.0.0"+ "@material/rtl" "^0.42.0"+ "@material/shape" "^1.0.0"+ "@material/theme" "^1.0.0"+ tslib "^1.9.3"++"@material/ripple@^1.0.1":+ version "1.0.1"+ resolved "https://registry.yarnpkg.com/@material/ripple/-/ripple-1.0.1.tgz#2287f893ea4462a7f3a96d207397c6d2258e541e"+ integrity sha512-aBigRoVMjIU2lLDq7TMocI2H2YFbO1hICs5FTdSRp4Yis/QFTrgaW32q8yuHdZI56j+b2BWIWapqA2xpSmCMXQ==+ dependencies:+ "@material/animation" "^1.0.0"+ "@material/base" "^1.0.0"+ "@material/dom" "^1.0.1"+ "@material/feature-targeting" "^0.44.1"+ "@material/theme" "^1.0.0"+ tslib "^1.9.3"++"@material/rtl@^0.42.0":+ version "0.42.0"+ resolved "https://registry.yarnpkg.com/@material/rtl/-/rtl-0.42.0.tgz#1836e78186c2d8b996f6fbf97adab203535335bc"+ integrity sha512-VrnrKJzhmspsN8WXHuxxBZ69yM5IwhCUqWr1t1eNfw3ZEvEj7i1g3P31HGowKThIN1dc1Wh4LE14rCISWCtv5w==++"@material/select@^1.0.1":+ version "1.0.1"+ resolved "https://registry.yarnpkg.com/@material/select/-/select-1.0.1.tgz#896112c292a37f606733fcba8dfd14545c663193"+ integrity sha512-DG2Ud5SVO0h+rugyX3hbfVRW1UPYnMCYeUBAYtx3Vyu1eoEh2b2478IRKpGOMzGZOn6jF4cPP6l9fSLHQs5ayQ==+ dependencies:+ "@material/animation" "^1.0.0"+ "@material/base" "^1.0.0"+ "@material/floating-label" "^1.0.0"+ "@material/line-ripple" "^1.0.0"+ "@material/menu" "^1.0.1"+ "@material/menu-surface" "^1.0.1"+ "@material/notched-outline" "^1.0.0"+ "@material/ripple" "^1.0.1"+ "@material/rtl" "^0.42.0"+ "@material/shape" "^1.0.0"+ "@material/theme" "^1.0.0"+ "@material/typography" "^1.0.0"+ tslib "^1.9.3"++"@material/shape@^1.0.0":+ version "1.0.0"+ resolved "https://registry.yarnpkg.com/@material/shape/-/shape-1.0.0.tgz#bef17de1f282e5c71138338a34078d8402308f65"+ integrity sha512-zfXEacPQZmH+ujVtaFyfAsYiF46j1QCcFzJeZVouG4pznrbA7XD6614Ywg0wbyWX5iB6hD52ld/IN+R/6oxKqA==+ dependencies:+ "@material/feature-targeting" "^0.44.1"++"@material/theme@^1.0.0":+ version "1.0.0"+ resolved "https://registry.yarnpkg.com/@material/theme/-/theme-1.0.0.tgz#6fd9ee1bb7fd2a5bdc6b7465cb15fe345e435670"+ integrity sha512-Bg/BQLU5MmCwtQ3DHcSs9DodZB8PTvuItv1wXrP54S/wBVwryIB5uMDmERhnItbNnAFbkKhlAuhn1asMmMzfkQ==+ dependencies:+ "@material/feature-targeting" "^0.44.1"++"@material/typography@^1.0.0":+ version "1.0.0"+ resolved "https://registry.yarnpkg.com/@material/typography/-/typography-1.0.0.tgz#327ecfcac5ee3af8a3a102f3f125a761202f4189"+ integrity sha512-Oeqbjci1cC7jTE8/n3dwnkqKe9ZeWiaE+rgMtRYtRFw1HvAw14SpGA5EEAS/Li2Hu2KZ50FYCe3HYqShfxtChA==+ dependencies:+ "@material/feature-targeting" "^0.44.1""@polymer/decorators@^3.0.0":version "3.0.0"@@ -726,7 +884,7 @@"@polymer/polymer" "^3.0.0""@polymer/prism-element" "^3.0.0-pre.25"-"@polymer/iron-flex-layout@^3.0.0-pre.25", "@polymer/iron-flex-layout@^3.0.0-pre.26":+"@polymer/iron-flex-layout@^3.0.0-pre.25":version "3.0.1"resolved "https://registry.yarnpkg.com/@polymer/iron-flex-layout/-/iron-flex-layout-3.0.1.tgz#36f9e1a8eb792d279b2bc75d362628721ad37f0c"integrity sha512-7gB869czArF+HZcPTVSgvA7tXYFze9EKckvM95NB7SqYF+NnsQyhoXgKnpFwGyo95lUjUW9TFDLUwDXnCYFtkw==@@ -740,27 +898,6 @@dependencies:"@polymer/polymer" "^3.0.0"-"@polymer/iron-media-query@^3.0.0-pre.26":- version "3.0.1"- resolved "https://registry.yarnpkg.com/@polymer/iron-media-query/-/iron-media-query-3.0.1.tgz#5cd8a1c1e8c9b8bafd3dd5da14e0f8d2cfa76d83"- integrity sha512-czUX1pm1zfmfcZtq5J57XFkcobBv08Y50exp0/3v8Bos5VL/jv2tU0RwiTfDBxUMhjicGbgwEBFQPY2V5DMzyw==- dependencies:- "@polymer/polymer" "^3.0.0"--"@polymer/iron-resizable-behavior@^3.0.0-pre.26":- version "3.0.1"- resolved "https://registry.yarnpkg.com/@polymer/iron-resizable-behavior/-/iron-resizable-behavior-3.0.1.tgz#e284348ed7c1c7e263f7039297532fa954025ea2"- integrity sha512-FyHxRxFspVoRaeZSWpT3y0C9awomb4tXXolIJcZ7RvXhMP632V5lez+ch5G5SwK0LpnAPkg35eB0LPMFv+YMMQ==- dependencies:- "@polymer/polymer" "^3.0.0"--"@polymer/iron-scroll-target-behavior@^3.0.0-pre.26":- version "3.0.1"- resolved "https://registry.yarnpkg.com/@polymer/iron-scroll-target-behavior/-/iron-scroll-target-behavior-3.0.1.tgz#29fa644b320fb29ab6c68eb6d08a6520157764ac"- integrity sha512-xg1WanG25BIkQE8rhuReqY9zx1K5M7F+YAIYpswEp5eyDIaZ1Y3vUmVeQ3KG+hiSugzI1M752azXN7kvyhOBcQ==- dependencies:- "@polymer/polymer" "^3.0.0"-"@polymer/marked-element@^3.0.0-pre.25":version "3.0.1"resolved "https://registry.yarnpkg.com/@polymer/marked-element/-/marked-element-3.0.1.tgz#56add62080404dea142c055977807ae9ca773a89"@@ -959,17 +1096,12 @@"@webassemblyjs/wast-parser" "1.8.5""@xtuc/long" "4.2.2"-"@webcomponents/html-imports@^1.2.0":- version "1.2.0"- resolved "https://registry.yarnpkg.com/@webcomponents/html-imports/-/html-imports-1.2.0.tgz#4213aae60faf47b6c47cc145dff4dc530ae6c2c4"- integrity sha512-EIy8RqSfsoJ5Tk2wsfaSX4IKhXg8oYCq/xVEz8LEELXhv5tup/iZ/SInoz8SLtZGFP+vjUh2oRsgkUMhbrr0GQ==-"@webcomponents/shadycss@^1.5.2":version "1.9.0"resolved "https://registry.yarnpkg.com/@webcomponents/shadycss/-/shadycss-1.9.0.tgz#8450465037370d4f5c32e801bb2554a7cf2f5037"integrity sha512-g8Xa+6RSEME4g/wLJW4YII0eq15rvXp76RxPAuv7hx+Bdoi7GzZJ/EoZOUfyIbqAsQbII1TcWD4/+Xhs5NcM1w==-"@webcomponents/webcomponentsjs@^2.0.0":+"@webcomponents/webcomponentsjs@^2.0.0", "@webcomponents/webcomponentsjs@^2.2.7":version "2.2.7"resolved "https://registry.yarnpkg.com/@webcomponents/webcomponentsjs/-/webcomponentsjs-2.2.7.tgz#1f1a7a7aa083db5ae6aadaeda68caa8fd8657462"integrity sha512-kPPjzV+5kpoWpTniyvBSPcXS33f3j/C6HvNOJ3YecF3pvz3XwVeU4ammbxtVy/osF3z7hr1DYNptIf4oPEvXZA==@@ -1012,7 +1144,7 @@ acorn-es7-plugin@^1.1.7:resolved "https://registry.yarnpkg.com/acorn-es7-plugin/-/acorn-es7-plugin-1.1.7.tgz#f2ee1f3228a90eead1245f9ab1922eb2e71d336b"integrity sha1-8u4fMiipDurRJF+asZIusucdM2s=-"acorn@>= 2.5.2 <= 5.7.3", acorn@^5.0.0:+"acorn@>= 2.5.2 <= 5.7.3":version "5.7.3"resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.7.3.tgz#67aa231bf8812974b85235a96771eb6bd07ea279"integrity sha512-T/zvzYRfbVojPWahDsE5evJdHb3oJoQfFbsrKM7w5Zcs++Tr257tia3BmMP8XYVjp1S9RZXQMh7gao96BlqZOw==@@ -1310,11 +1442,6 @@ boolbase@~1.0.0:resolved "https://registry.yarnpkg.com/boolbase/-/boolbase-1.0.0.tgz#68dff5fbe60c51eb37725ea9e3ed310dcc1e776e"integrity sha1-aN/1++YMUes3cl6p4+0xDcwed24=- version "4.1.3"- resolved "https://registry.yarnpkg.com/bootstrap/-/bootstrap-4.1.3.tgz#0eb371af2c8448e8c210411d0cb824a6409a12be"- integrity sha512-rDFIzgXcof0jDyjNosjv4Sno77X4KuPeFxG2XZZv1/Kc8DRVGVADdoQyyOVDwPqL36DDmtCQbrpMCqvpPLJQ0w==-brace-expansion@^1.1.7:version "1.1.11"resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd"@@ -1339,16 +1466,6 @@ braces@^2.3.1, braces@^2.3.2:split-string "^3.0.2"to-regex "^3.0.1"-brfs@^1.4.4:- version "1.6.1"- resolved "https://registry.yarnpkg.com/brfs/-/brfs-1.6.1.tgz#b78ce2336d818e25eea04a0947cba6d4fb8849c3"- integrity sha512-OfZpABRQQf+Xsmju8XE9bDjs+uU4vLREGolP7bDgcpsI17QREyZ4Bl+2KLxxx1kCgA0fAIhKQBaBYh+PEcCqYQ==- dependencies:- quote-stream "^1.0.1"- resolve "^1.1.5"- static-module "^2.2.0"- through2 "^2.0.0"-brorand@^1.0.1:version "1.1.0"resolved "https://registry.yarnpkg.com/brorand/-/brorand-1.1.0.tgz#12c25efe40a45e3c323eb8675a0a0ce57b22371f"@@ -1427,11 +1544,6 @@ browserslist@^4.3.4:electron-to-chromium "^1.3.113"node-releases "^1.1.8"- version "0.0.1"- resolved "https://registry.yarnpkg.com/buffer-equal/-/buffer-equal-0.0.1.tgz#91bc74b11ea405bc916bc6aa908faafa5b4aac4b"- integrity sha1-kbx0sR6kBbyRa8aqkI+q+ltKrEs=-buffer-from@^1.0.0:version "1.1.1"resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.1.tgz#32713bc028f75c02fdb710d7c7bcec1f2c6070ef"@@ -1778,7 +1890,7 @@ content-type@~1.0.4:resolved "https://registry.yarnpkg.com/content-type/-/content-type-1.0.4.tgz#e138cc75e040c727b1966fe5e5f8c9aee256fe3b"integrity sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA==-convert-source-map@^1.1.0, convert-source-map@^1.5.1:+convert-source-map@^1.1.0:version "1.6.0"resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.6.0.tgz#51b537a8c43e0f04dec1993bffcdd504e758ac20"integrity sha512-eFu7XigvxdZ1ETfbgPBohgyQ/Z++C0eEhTor0qRwBw9unw+L0/6V8wkSuGgzdThkiS5lSpdptOQPD8Ak40a+7A==@@ -2017,11 +2129,6 @@ deep-extend@^0.6.0:resolved "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.6.0.tgz#c4fa7c95404a17a9c3e8ca7e1537312b736330ac"integrity sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==-deep-is@~0.1.3:- version "0.1.3"- resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.3.tgz#b369d6fb5dbc13eecf524f91b070feedc357cf34"- integrity sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ=-default-gateway@^4.0.1:version "4.2.0"resolved "https://registry.yarnpkg.com/default-gateway/-/default-gateway-4.2.0.tgz#167104c7500c2115f6dd69b0a536bb8ed720552b"@@ -2208,13 +2315,6 @@ domutils@^1.5.1:dom-serializer "0"domelementtype "1"-duplexer2@~0.1.4:- version "0.1.4"- resolved "https://registry.yarnpkg.com/duplexer2/-/duplexer2-0.1.4.tgz#8b12dab878c0d69e3e7891051662a32fc6bddcc1"- integrity sha1-ixLauHjA1p4+eJEFFmKjL8a93ME=- dependencies:- readable-stream "^2.0.2"-duplexify@^3.4.2, duplexify@^3.6.0:version "3.7.1"resolved "https://registry.yarnpkg.com/duplexify/-/duplexify-3.7.1.tgz#2a4df5317f6ccfd91f86d6fd25d8d8a103b88309"@@ -2332,30 +2432,6 @@ [email protected], escape-string-regexp@^1.0.2, escape-string-regexp@^1resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"integrity sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=-escodegen@^1.8.1:- version "1.11.1"- resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-1.11.1.tgz#c485ff8d6b4cdb89e27f4a856e91f118401ca510"- integrity sha512-JwiqFD9KdGVVpeuRa68yU3zZnBEOcPs0nKW7wZzXky8Z7tffdYUHbe11bPCV5jYlK6DVdKLWLm0f5I/QlL0Kmw==- dependencies:- esprima "^3.1.3"- estraverse "^4.2.0"- esutils "^2.0.2"- optionator "^0.8.1"- optionalDependencies:- source-map "~0.6.1"--escodegen@~1.9.0:- version "1.9.1"- resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-1.9.1.tgz#dbae17ef96c8e4bedb1356f4504fa4cc2f7cb7e2"- integrity sha512-6hTjO1NAWkHnDk3OqQ4YrCuwwmGHL9S3nPlzBOUG/R44rda3wLNrfvQ5fkSGjyhHFKM7ALPKcKGrwvCLe0lC7Q==- dependencies:- esprima "^3.1.3"- estraverse "^4.2.0"- esutils "^2.0.2"- optionator "^0.8.1"- optionalDependencies:- source-map "~0.6.1"-eslint-scope@^4.0.0:version "4.0.2"resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-4.0.2.tgz#5f10cd6cabb1965bf479fa65745673439e21cb0e"@@ -2369,11 +2445,6 @@ esm@^3.0.84:resolved "https://registry.yarnpkg.com/esm/-/esm-3.2.15.tgz#a6cf1b209c6718871cb35fd2a3733e7c3befc144"integrity sha512-GcKZRSlQ/QevC/t94FXYKbUobSTArdLfRBAV6t6HIguoUBfuFGomxSZbsRHySaTppixC9jtmzAX+0GF4tbJaJA==-esprima@^3.1.3:- version "3.1.3"- resolved "https://registry.yarnpkg.com/esprima/-/esprima-3.1.3.tgz#fdca51cee6133895e3c88d535ce49dbff62a4633"- integrity sha1-/cpRzuYTOJXjyI1TXOSdv/YqRjM=-esprima@^4.0.0:version "4.0.1"resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.1.tgz#13b04cdb3e6c5d19df91ab6987a8695619b0aa71"@@ -2391,7 +2462,7 @@ esrecurse@^4.1.0:dependencies:estraverse "^4.1.0"-estraverse@^4.1.0, estraverse@^4.1.1, estraverse@^4.2.0:+estraverse@^4.1.0, estraverse@^4.1.1:version "4.2.0"resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-4.2.0.tgz#0dee3fed31fcd469618ce7342099fc1afa0bdb13"integrity sha1-De4/7TH81GlhjOc0IJn8GvoL2xM=@@ -2534,16 +2605,6 @@ extglob@^2.0.4:snapdragon "^0.8.1"to-regex "^3.0.1"-falafel@^2.1.0:- version "2.1.0"- resolved "https://registry.yarnpkg.com/falafel/-/falafel-2.1.0.tgz#96bb17761daba94f46d001738b3cedf3a67fe06c"- integrity sha1-lrsXdh2rqU9G0AFzizzt86Z/4Gw=- dependencies:- acorn "^5.0.0"- foreach "^2.0.5"- isarray "0.0.1"- object-keys "^1.0.6"-fast-async@^6.3.8:version "6.3.8"resolved "https://registry.yarnpkg.com/fast-async/-/fast-async-6.3.8.tgz#031b9e1d5a84608b117b3e7c999ad477ed2b08a2"@@ -2562,11 +2623,6 @@ fast-json-stable-stringify@^2.0.0:resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz#d5142c0caee6b1189f87d3a76111064f86c8bbf2"integrity sha1-1RQsDK7msRifh9OnYREGT4bIu/I=-fast-levenshtein@~2.0.4:- version "2.0.6"- resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917"- integrity sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=-faye-websocket@^0.10.0:version "0.10.0"resolved "https://registry.yarnpkg.com/faye-websocket/-/faye-websocket-0.10.0.tgz#4e492f8d04dfb6f89003507f6edbf2d501e7c6f4"@@ -2679,11 +2735,6 @@ for-in@^1.0.2:resolved "https://registry.yarnpkg.com/for-in/-/for-in-1.0.2.tgz#81068d295a8142ec0ac726c6e2200c30fb6d5e80"integrity sha1-gQaNKVqBQuwKxybG4iAMMPttXoA=-foreach@^2.0.5:- version "2.0.5"- resolved "https://registry.yarnpkg.com/foreach/-/foreach-2.0.5.tgz#0bee005018aeb260d0a3af3ae658dd0136ec1b99"- integrity sha1-C+4AUBiusmDQo6865ljdATbsG5k=-version "1.1.1"resolved "https://registry.yarnpkg.com/formatio/-/formatio-1.1.1.tgz#5ed3ccd636551097383465d996199100e86161e9"@@ -2775,7 +2826,7 @@ geojson-rewind@^0.3.0:minimist "1.2.0"sharkdown "^0.1.0"-geojson-vt@^3.2.0, geojson-vt@^3.2.1:+geojson-vt@^3.2.1:version "3.2.1"resolved "https://registry.yarnpkg.com/geojson-vt/-/geojson-vt-3.2.1.tgz#f8adb614d2c1d3f6ee7c4265cad4bbf3ad60c8b7"integrity sha512-EvGQQi/zPrDA6zr6BnJD/YhwAkBP8nnJ9emh3EnHQKVMfg/MRVtPbMYdgVy/IaEmn4UfagD2a6fafPDL5hbtwg==@@ -2904,7 +2955,7 @@ grid-index@^1.0.0:resolved "https://registry.yarnpkg.com/grid-index/-/grid-index-1.1.0.tgz#97f8221edec1026c8377b86446a7c71e79522ea7"integrity sha512-HZRwumpOGUrHyxO5bqKZL0B0GlUpwtCAzZ42sgxUPniu33R1LSFH5yrIcBCHjkctCAh3mtWKcKd9J4vDDdeVHA==[email protected], growl@^1.10.5:version "1.10.5"resolved "https://registry.yarnpkg.com/growl/-/growl-1.10.5.tgz#f2735dc2283674fa67478b10181059355c369e5e"integrity sha512-qBr4OuELkhPenW6goKVXiv47US3clb3/IbuWF9KNKEijAy9oeHxU9IgzjvJhHkUzhaj7rOUD7+YGWqUjLp5oSA==@@ -3118,16 +3169,6 @@ https-browserify@^1.0.0:resolved "https://registry.yarnpkg.com/https-browserify/-/https-browserify-1.0.0.tgz#ec06c10e0a34c0f2faf199f7fd7fc78fffd03c73"integrity sha1-7AbBDgo0wPL68Zn3/X/Hj//QPHM=-i18next-xhr-backend@^1.5.1:- version "1.5.1"- resolved "https://registry.yarnpkg.com/i18next-xhr-backend/-/i18next-xhr-backend-1.5.1.tgz#50282610780c6a696d880dfa7f4ac1d01e8c3ad5"- integrity sha512-9OLdC/9YxDvTFcgsH5t2BHCODHEotHCa6h7Ly0EUlUC7Y2GS09UeoHOGj3gWKQ3HCqXz8NlH4gOrK3NNc9vPuw==--i18next@^14.1.1:- version "14.1.1"- resolved "https://registry.yarnpkg.com/i18next/-/i18next-14.1.1.tgz#d569aff68c088151f09fcb0cb6f44b36d62731d3"- integrity sha512-HItn9RHLyrDqe6pw6qXMYHGPHNc3y1FZndJfBlD6k4sRS0FAlYLvqCDVIWFc1XultBgsv348TtvL/lleG6JgBg==-version "0.4.23"resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.23.tgz#297871f63be507adcfbfca715d0cd0eed84e9a63"@@ -3534,11 +3575,6 @@ json5@^2.1.0:dependencies:minimist "^1.2.0"-kdbush@^2.0.1:- version "2.0.1"- resolved "https://registry.yarnpkg.com/kdbush/-/kdbush-2.0.1.tgz#90c6128e3001ac68c550d7c9e2f222c0269666f1"- integrity sha512-9KqSdmWCkBIisFIGclT0FRagKhI7IVbMyUjsxCFG0Ly1Dg6whlxJ7b9lrq8ifk3X/fGeJzok1R75LQfZTfA5zQ==-kdbush@^3.0.0:version "3.0.0"resolved "https://registry.yarnpkg.com/kdbush/-/kdbush-3.0.0.tgz#f8484794d47004cc2d85ed3a79353dbe0abc2bf0"@@ -3585,14 +3621,6 @@ [email protected]:resolved "https://registry.yarnpkg.com/leaflet/-/leaflet-1.4.0.tgz#d5f56eeb2aa32787c24011e8be4c77e362ae171b"integrity sha512-x9j9tGY1+PDLN9pcWTx9/y6C5nezoTMB8BLK5jTakx+H7bPlnbCHfi9Hjg+Qt36sgDz/cb9lrSpNQXmk45Tvhw==-levn@~0.3.0:- version "0.3.0"- resolved "https://registry.yarnpkg.com/levn/-/levn-0.3.0.tgz#3b09924edf9f083c0490fdd4c0bc4421e04764ee"- integrity sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4=- dependencies:- prelude-ls "~1.1.2"- type-check "~0.3.2"-lit-element@^2.0.1:version "2.0.1"resolved "https://registry.yarnpkg.com/lit-element/-/lit-element-2.0.1.tgz#9ec5871d3b64487f432c7c071df80ef031d7091b"@@ -3726,7 +3754,7 @@ [email protected]:resolved "https://registry.yarnpkg.com/lolex/-/lolex-1.3.2.tgz#7c3da62ffcb30f0f5a80a2566ca24e45d8a01f31"integrity sha1-fD2mL/yzDw9agKJWbKJORdigHzE=-loose-envify@^1.0.0, loose-envify@^1.4.0:+loose-envify@^1.0.0:version "1.4.0"resolved "https://registry.yarnpkg.com/loose-envify/-/loose-envify-1.4.0.tgz#71ee51fa7be4caec1a63839f7e682d8132d30caf"integrity sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==@@ -3753,13 +3781,6 @@ lru-cache@^5.1.1:dependencies:yallist "^3.0.2"-magic-string@^0.22.4:- version "0.22.5"- resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.22.5.tgz#8e9cf5afddf44385c1da5bc2a6a0dbd10b03657e"- integrity sha512-oreip9rJZkzvA8Qzk9HFs8fZGF/u7H/gtrE8EN6RjKJ9kh2HlC+yQ2QezifqTZfGyiuAV0dRv5a+y/8gBb1m9w==- dependencies:- vlq "^0.2.2"-make-dir@^1.0.0:version "1.3.0"resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-1.3.0.tgz#79c1033b80515bd6d24ec9933e860ca75ee27f0c"@@ -3799,36 +3820,6 @@ map-visit@^1.0.0:dependencies:object-visit "^1.0.0"-mapbox-gl@^0.50.0:- version "0.50.0"- resolved "https://registry.yarnpkg.com/mapbox-gl/-/mapbox-gl-0.50.0.tgz#49f44149f02fdd25ab64a2ec4efc7a11a5c96f55"- integrity sha512-rr/fP1mlsQBtAE3JaYenSFM5tYRzYaSU1j7KsrPtICSHMzAUMrsl1TlnC5JpMbcZu6nu8R2GFTJ8hYsoBsX9Bg==- dependencies:- "@mapbox/geojson-types" "^1.0.2"- "@mapbox/jsonlint-lines-primitives" "^2.0.2"- "@mapbox/mapbox-gl-supported" "^1.4.0"- "@mapbox/point-geometry" "^0.1.0"- "@mapbox/tiny-sdf" "^1.1.0"- "@mapbox/unitbezier" "^0.0.0"- "@mapbox/vector-tile" "^1.3.1"- "@mapbox/whoots-js" "^3.1.0"- brfs "^1.4.4"- csscolorparser "~1.0.2"- earcut "^2.1.3"- geojson-rewind "^0.3.0"- geojson-vt "^3.2.0"- gl-matrix "^2.6.1"- grid-index "^1.0.0"- minimist "0.0.8"- murmurhash-js "^1.0.0"- pbf "^3.0.5"- potpack "^1.0.1"- quickselect "^1.0.0"- rw "^1.3.3"- supercluster "^4.1.1"- tinyqueue "^1.1.0"- vt-pbf "^3.0.1"-mapbox-gl@^0.52.0-beta.1:version "0.52.0"resolved "https://registry.yarnpkg.com/mapbox-gl/-/mapbox-gl-0.52.0.tgz#a43b61caa339ae28e43c87ecfbe9ce4032795859"@@ -3910,13 +3901,6 @@ [email protected]:resolved "https://registry.yarnpkg.com/merge-descriptors/-/merge-descriptors-1.0.1.tgz#b00aaa556dd8b44568150ec9d1b953f3f90cbb61"integrity sha1-sAqqVW3YtEVoFQ7J0blT8/kMu2E=- version "1.0.4"- resolved "https://registry.yarnpkg.com/merge-source-map/-/merge-source-map-1.0.4.tgz#a5de46538dae84d4114cc5ea02b4772a6346701f"- integrity sha1-pd5GU42uhNQRTMXqArR3KmNGcB8=- dependencies:- source-map "^0.5.6"-methods@~1.1.2:version "1.1.2"resolved "https://registry.yarnpkg.com/methods/-/methods-1.1.2.tgz#5529a4d67654134edcc5266656835b0f851afcee"@@ -4003,7 +3987,7 @@ [email protected]:resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.8.tgz#857fcabfc3397d2625b8228262e86aa7a011b05d"integrity sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=[email protected], minimist@^1.1.3, minimist@^1.2.0:[email protected], minimist@^1.2.0:version "1.2.0"resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284"integrity sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=@@ -4088,14 +4072,7 @@ mocha@^3.4.2:mkdirp "0.5.1"supports-color "3.1.2"-moment-es6@^1.0.0:- version "1.0.0"- resolved "https://registry.yarnpkg.com/moment-es6/-/moment-es6-1.0.0.tgz#552fcf405d62565b0a1fe84e6c1e697ac79332df"- integrity sha1-VS/PQF1iVlsKH+hObB5peseTMt8=- dependencies:- moment "*"--moment@*, moment@^2.22.2, moment@^2.24.0:+moment@^2.24.0:version "2.24.0"resolved "https://registry.yarnpkg.com/moment/-/moment-2.24.0.tgz#0d055d53f5052aa653c9f6eb68bb5d12bf5c2b5b"integrity sha512-bV7f+6l2QigeBBZSM/6yTNq4P2fNpSWj/0e7jQcy87A8e7o2nAfP/34/2ky5Vw4B9S446EtIhodAzkFCcR4dQg==@@ -4351,12 +4328,7 @@ object-copy@^0.1.0:define-property "^0.2.5"kind-of "^3.0.3"-object-inspect@~1.4.0:- version "1.4.1"- resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.4.1.tgz#37ffb10e71adaf3748d05f713b4c9452f402cbc4"- integrity sha512-wqdhLpfCUbEsoEwl3FXwGyv8ief1k/1aUdIPCqVnupM6e8l63BEJdiF/0swtn04/8p05tG/T0FrpTlfwvljOdw==--object-keys@^1.0.12, object-keys@^1.0.6:+object-keys@^1.0.12:version "1.1.0"resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.0.tgz#11bd22348dd2e096a045ab06f6c85bcc340fa032"integrity sha512-6OO5X1+2tYkNyNEx6TsCxEqFfRWaqx6EtMiSbGrw8Ob8v9Ne+Hl8rBAgLBZn5wjEz3s/s6U1WXFUFOcxxAwUpg==@@ -4414,18 +4386,6 @@ opn@^5.1.0:dependencies:is-wsl "^1.1.0"-optionator@^0.8.1:- version "0.8.2"- resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.8.2.tgz#364c5e409d3f4d6301d6c0b4c05bba50180aeb64"- integrity sha1-NkxeQJ0/TWMB1sC0wFu6UBgK62Q=- dependencies:- deep-is "~0.1.3"- fast-levenshtein "~2.0.4"- levn "~0.3.0"- prelude-ls "~1.1.2"- type-check "~0.3.2"- wordwrap "~1.0.0"-original@^1.0.0:version "1.0.2"resolved "https://registry.yarnpkg.com/original/-/original-1.0.2.tgz#e442a61cffe1c5fd20a65f3261c26663b303f25f"@@ -4757,11 +4717,6 @@ potpack@^1.0.1:resolved "https://registry.yarnpkg.com/potpack/-/potpack-1.0.1.tgz#d1b1afd89e4c8f7762865ec30bd112ab767e2ebf"integrity sha512-15vItUAbViaYrmaB/Pbw7z6qX2xENbFSTA7Ii4tgbPtasxm5v6ryKhKtL91tpWovDJzTiZqdwzhcFBCwiMVdVw==-prelude-ls@~1.1.2:- version "1.1.2"- resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz#21932a549f5e52ffd9a827f570e04be62a97da54"- integrity sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ=-pretty-error@^2.0.2:version "2.1.1"resolved "https://registry.yarnpkg.com/pretty-error/-/pretty-error-2.1.1.tgz#5f4f87c8f91e5ae3f3ba87ab4cf5e03b1a17f1a3"@@ -4872,11 +4827,6 @@ punycode@^2.1.0:resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec"integrity sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==-pwa-helpers@^0.9.0:- version "0.9.1"- resolved "https://registry.yarnpkg.com/pwa-helpers/-/pwa-helpers-0.9.1.tgz#9ea22fa1996ab97df73b276cae962621c3fd2532"- integrity sha512-4sP/C9sSxQ3w80AATmvCEI3R+MHzCwr2RSZEbLyMkeJgV3cRk7ySZRUrQnBDSA7A0/z6dkYtjuXlkhN1ZFw3iA==-version "6.5.2"resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.2.tgz#cb3ae806e8740444584ef154ce8ee98d403f3e36"@@ -4902,15 +4852,6 @@ quickselect@^1.0.0:resolved "https://registry.yarnpkg.com/quickselect/-/quickselect-1.1.1.tgz#852e412ce418f237ad5b660d70cffac647ae94c2"integrity sha512-qN0Gqdw4c4KGPsBOQafj6yj/PA6c/L63f6CaZ/DCF/xF4Esu3jVmKLUDYxghFx8Kb/O7y9tI7x2RjTSXwdK1iQ==-quote-stream@^1.0.1, quote-stream@~1.0.2:- version "1.0.2"- resolved "https://registry.yarnpkg.com/quote-stream/-/quote-stream-1.0.2.tgz#84963f8c9c26b942e153feeb53aae74652b7e0b2"- integrity sha1-hJY/jJwmuULhU/7rU6rnRlK34LI=- dependencies:- buffer-equal "0.0.1"- minimist "^1.1.3"- through2 "^2.0.0"-randombytes@^2.0.0, randombytes@^2.0.1, randombytes@^2.0.5:version "2.1.0"resolved "https://registry.yarnpkg.com/randombytes/-/randombytes-2.1.0.tgz#df6f84372f0270dc65cdf6291349ab7a473d4f2a"@@ -4956,7 +4897,7 @@ rc@^1.2.7:minimist "^1.2.0"strip-json-comments "~2.0.1"-"readable-stream@1 || 2", readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.6, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.3.3, readable-stream@^2.3.6, readable-stream@~2.3.3, readable-stream@~2.3.6:+"readable-stream@1 || 2", readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.6, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.3.3, readable-stream@^2.3.6, readable-stream@~2.3.6:version "2.3.6"resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.6.tgz#b11c27d88b8ff1fbe070643cf94b0c79ae1b0aaf"integrity sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==@@ -5011,19 +4952,6 @@ redeyed@~0.4.0:dependencies:esprima "~1.0.4"-redux-thunk@^2.3.0:- version "2.3.0"- resolved "https://registry.yarnpkg.com/redux-thunk/-/redux-thunk-2.3.0.tgz#51c2c19a185ed5187aaa9a2d08b666d0d6467622"- integrity sha512-km6dclyFnmcvxhAcrQV2AkZmPQjzPDjgVlQtR0EQjxZPyJ0BnMf3in1ryuR8A2qU0HldVRfxYXbFSKlI3N7Slw==--redux@^4.0.0:- version "4.0.1"- resolved "https://registry.yarnpkg.com/redux/-/redux-4.0.1.tgz#436cae6cc40fbe4727689d7c8fae44808f1bfef5"- integrity sha512-R7bAtSkk7nY6O/OYMVR9RiBI+XghjF9rlbl5806HJbQph0LJVHZrU5oaO4q70eUKiqMRqm4y07KLTlMZ2BlVmg==- dependencies:- loose-envify "^1.4.0"- symbol-observable "^1.2.0"-regenerate-unicode-properties@^8.0.2:version "8.0.2"resolved "https://registry.yarnpkg.com/regenerate-unicode-properties/-/regenerate-unicode-properties-8.0.2.tgz#7b38faa296252376d363558cfbda90c9ce709662"@@ -5131,11 +5059,6 @@ requires-port@^1.0.0:resolved "https://registry.yarnpkg.com/requires-port/-/requires-port-1.0.0.tgz#925d2601d39ac485e091cf0da5c6e694dc3dcaff"integrity sha1-kl0mAdOaxIXgkc8NpcbmlNw9yv8=-reselect@^3.0.1:- version "3.0.1"- resolved "https://registry.yarnpkg.com/reselect/-/reselect-3.0.1.tgz#efdaa98ea7451324d092b2b2163a6a1d7a9a2147"- integrity sha1-79qpjqdFEyTQkrKyFjpqHXqaIUc=-resolve-cwd@^2.0.0:version "2.0.0"resolved "https://registry.yarnpkg.com/resolve-cwd/-/resolve-cwd-2.0.0.tgz#00a9f7387556e27038eae232caa372a6a59b665a"@@ -5168,7 +5091,7 @@ resolve-url@^0.2.1:resolved "https://registry.yarnpkg.com/resolve-url/-/resolve-url-0.2.1.tgz#2c637fe77c893afd2a663fe21aa9080068e2052a"integrity sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo=-resolve@^1.1.5, resolve@^1.1.6, resolve@^1.3.2, resolve@^1.8.1:+resolve@^1.1.6, resolve@^1.3.2, resolve@^1.8.1:version "1.10.0"resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.10.0.tgz#3bdaaeaf45cc07f375656dfd2e54ed0810b101ba"integrity sha512-3sUr9aq5OfSg2S9pNtPA9hL1FVEAjvfOC4leW0SNf/mpnaakz2a9femSd6LqAww2RaFctwyf1lCqnTHuF1rxDg==@@ -5365,11 +5288,6 @@ sha.js@^2.4.0, sha.js@^2.4.8:inherits "^2.0.1"safe-buffer "^5.0.1"-shallow-copy@~0.0.1:- version "0.0.1"- resolved "https://registry.yarnpkg.com/shallow-copy/-/shallow-copy-0.0.1.tgz#415f42702d73d810330292cc5ee86eae1a11a170"- integrity sha1-QV9CcC1z2BAzApLMXuhurhoRoXA=-sharkdown@^0.1.0:version "0.1.0"resolved "https://registry.yarnpkg.com/sharkdown/-/sharkdown-0.1.0.tgz#61d4fe529e75d02442127cc9234362265099214f"@@ -5598,13 +5516,6 @@ stacky@^1.3.1:chalk "^1.1.1"lodash "^3.0.0"-static-eval@^2.0.0:- version "2.0.2"- resolved "https://registry.yarnpkg.com/static-eval/-/static-eval-2.0.2.tgz#2d1759306b1befa688938454c546b7871f806a42"- integrity sha512-N/D219Hcr2bPjLxPiV+TQE++Tsmrady7TqAJugLy7Xk1EumfDWS/f5dtBbkRCGE7wKKXuYockQoj8Rm2/pVKyg==- dependencies:- escodegen "^1.8.1"-static-extend@^0.1.1:version "0.1.2"resolved "https://registry.yarnpkg.com/static-extend/-/static-extend-0.1.2.tgz#60809c39cbff55337226fd5e0b520f341f1fb5c6"@@ -5613,26 +5524,6 @@ static-extend@^0.1.1:define-property "^0.2.5"object-copy "^0.1.0"-static-module@^2.2.0:- version "2.2.5"- resolved "https://registry.yarnpkg.com/static-module/-/static-module-2.2.5.tgz#bd40abceae33da6b7afb84a0e4329ff8852bfbbf"- integrity sha512-D8vv82E/Kpmz3TXHKG8PPsCPg+RAX6cbCOyvjM6x04qZtQ47EtJFVwRsdov3n5d6/6ynrOY9XB4JkaZwB2xoRQ==- dependencies:- concat-stream "~1.6.0"- convert-source-map "^1.5.1"- duplexer2 "~0.1.4"- escodegen "~1.9.0"- falafel "^2.1.0"- has "^1.0.1"- magic-string "^0.22.4"- merge-source-map "1.0.4"- object-inspect "~1.4.0"- quote-stream "~1.0.2"- readable-stream "~2.3.3"- shallow-copy "~0.0.1"- static-eval "^2.0.0"- through2 "~2.0.3"-"statuses@>= 1.4.0 < 2":version "1.5.0"resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.5.0.tgz#161c7dac177659fd9811f43771fa99381478628c"@@ -5750,13 +5641,6 @@ style-loader@^0.23.1:loader-utils "^1.1.0"schema-utils "^1.0.0"-supercluster@^4.1.1:- version "4.1.1"- resolved "https://registry.yarnpkg.com/supercluster/-/supercluster-4.1.1.tgz#cf13c3b28a3fb3db5290bfad7f524e244bd4ce78"- integrity sha512-sF0FfUOPFp96DKzwWFLeQOEqqKu2PpcesxAFeFsknA/q7g7igVVn/p3NI2XHEghNSyDAqunKNKqAbqNO8+7NDQ==- dependencies:- kdbush "^2.0.1"-supercluster@^5.0.0:version "5.0.0"resolved "https://registry.yarnpkg.com/supercluster/-/supercluster-5.0.0.tgz#2a5a9b1ffbd0d6180dea10039d78b5d95fdb8f27"@@ -5790,11 +5674,6 @@ supports-color@^6.1.0:dependencies:has-flag "^3.0.0"-symbol-observable@^1.2.0:- version "1.2.0"- resolved "https://registry.yarnpkg.com/symbol-observable/-/symbol-observable-1.2.0.tgz#c22688aed4eab3cdc2dfeacbb561660560a00804"- integrity sha512-e900nM8RRtGhlV36KGEU9k65K3mPb1WV70OdjfxlG2EAuM1noi/E/BaW/uMhL7bPEssK8QV57vN3esixjUvcXQ==-tapable@^1.0.0, tapable@^1.1.0:version "1.1.1"resolved "https://registry.yarnpkg.com/tapable/-/tapable-1.1.1.tgz#4d297923c5a72a42360de2ab52dadfaaec00018e"@@ -5836,7 +5715,7 @@ terser@^3.16.1:source-map "~0.6.1"source-map-support "~0.5.10"-through2@^2.0.0, through2@~2.0.3:+through2@^2.0.0:version "2.0.5"resolved "https://registry.yarnpkg.com/through2/-/through2-2.0.5.tgz#01c1e39eb31d07cb7d03a96a70823260b23132cd"integrity sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==@@ -5916,7 +5795,7 @@ trim-right@^1.0.1:resolved "https://registry.yarnpkg.com/trim-right/-/trim-right-1.0.1.tgz#cb2e1203067e0c8de1f614094b9fe45704ea6003"integrity sha1-yy4SAwZ+DI3h9hQJS5/kVwTqYAM=-tslib@^1.8.0, tslib@^1.8.1, tslib@^1.9.0:+tslib@^1.8.0, tslib@^1.8.1, tslib@^1.9.0, tslib@^1.9.3:version "1.9.3"resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.9.3.tgz#d7e4dd79245d85428c4d7e4822a79917954ca286"integrity sha512-4krF8scpejhaOgqzBEcGM7yDIEfi0/8+8zDRZhNZZ2kjmHJ4hv3zCbQWxoJGz1iw5U0Jl0nma13xzHXcncMavQ==@@ -5952,13 +5831,6 @@ [email protected]:resolved "https://registry.yarnpkg.com/tty-browserify/-/tty-browserify-0.0.0.tgz#a157ba402da24e9bf957f9aa69d524eed42901a6"integrity sha1-oVe6QC2iTpv5V/mqadUk7tQpAaY=-type-check@~0.3.2:- version "0.3.2"- resolved "https://registry.yarnpkg.com/type-check/-/type-check-0.3.2.tgz#5884cab512cf1d355e3fb784f30804b2b520db72"- integrity sha1-WITKtRLPHTVeP7eE8wgEsrUg23I=- dependencies:- prelude-ls "~1.1.2"-version "0.1.1"resolved "https://registry.yarnpkg.com/type-detect/-/type-detect-0.1.1.tgz#0ba5ec2a885640e470ea4e8505971900dac58822"@@ -6169,11 +6041,6 @@ vary@~1.1.2:resolved "https://registry.yarnpkg.com/vary/-/vary-1.1.2.tgz#2299f02c6ded30d4a5961b0b9f74524a18f634fc"integrity sha1-IpnwLG3tMNSllhsLn3RSShj2NPw=-vlq@^0.2.2:- version "0.2.3"- resolved "https://registry.yarnpkg.com/vlq/-/vlq-0.2.3.tgz#8f3e4328cf63b1540c0d67e1b2778386f8975b26"- integrity sha512-DRibZL6DsNhIgYQ+wNdWDL2SL3bKPlVrRiBqV5yuMm++op8W4kGFtaQfCs4KEJn0wBZcHVHJ3eoywX8983k1ow==-version "0.0.4"resolved "https://registry.yarnpkg.com/vm-browserify/-/vm-browserify-0.0.4.tgz#5d7ea45bbef9e4a6ff65f95438e0a87c357d5a73"@@ -6370,11 +6237,6 @@ wide-align@^1.1.0:dependencies:string-width "^1.0.2 || 2"-wordwrap@~1.0.0:- version "1.0.0"- resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-1.0.0.tgz#27584810891456a4171c8d0226441ade90cbcaeb"- integrity sha1-J1hIEIkUVqQXHI0CJkQa3pDLyus=-worker-farm@^1.5.2:version "1.6.0"resolved "https://registry.yarnpkg.com/worker-farm/-/worker-farm-1.6.0.tgz#aecc405976fab5a95526180846f0dba288f3a4a0"