@openremote/manager 1.7.0-snapshot.20250604112400 → 1.7.0-snapshot.20250605081830

package/dist/index.html

@@ -12,7 +12,7 @@
         document.addEventListener('WebComponentsReady', function componentsReady() {
             document.removeEventListener('WebComponentsReady', componentsReady, false);
             var script = document.createElement('script');
-            script.src = './bundle.ce8742383067917b0337.js';
+            script.src = './bundle.2516b7f930f5647aea65.js';
             var refScript = document.getElementsByTagName('script')[0];
             refScript.parentNode.insertBefore(script, refScript);
         }, false);

package/lib/components/configuration/or-conf-json.d.ts

@@ -2,11 +2,12 @@ import { LitElement } from "lit";
 import "@openremote/or-components/or-ace-editor";
 import { Ref } from "lit/directives/ref.js";
 import { OrAceEditor } from "@openremote/or-components/or-ace-editor";
-import { ManagerAppConfig } from "@openremote/model";
+import { ManagerAppConfig, MapConfig } from "@openremote/model";
 export declare class OrConfJson extends LitElement {
-    managerConfig: ManagerAppConfig;
+    config: ManagerAppConfig | MapConfig;
+    heading: string;
     protected _aceEditor: Ref<OrAceEditor>;
     beforeSave(): false | string | undefined;
-    protected _showManagerConfigDialog(): void;
+    protected _showConfigDialog(): void;
     render(): import("lit-html").TemplateResult<1>;
 }

package/lib/components/configuration/or-conf-json.js

@@ -31,7 +31,7 @@ import { createRef, ref } from "lit/directives/ref.js";
 let OrConfJson = class OrConfJson extends LitElement {
     constructor() {
         super(...arguments);
-        this.managerConfig = {};
+        this.config = {};
         this._aceEditor = createRef();
     }
     beforeSave() {
@@ -46,13 +46,13 @@ let OrConfJson = class OrConfJson extends LitElement {
             return false;
         }
     }
-    _showManagerConfigDialog() {
+    _showConfigDialog() {
         let dialog;
         const _saveConfig = () => {
             const config = this.beforeSave();
             if (config) {
-                this.managerConfig = config;
-                this.dispatchEvent(new CustomEvent('saveLocalManagerConfig', { detail: { value: this.managerConfig } }));
+                this.config = config;
+                this.dispatchEvent(new CustomEvent('saveLocalConfig', { detail: { value: this.config } }));
                 return true;
             }
             return false;
@@ -70,11 +70,11 @@ let OrConfJson = class OrConfJson extends LitElement {
         ];
         dialog = new OrMwcDialog()
             .setActions(dialogActions)
-            .setHeading("manager_config.json")
+            .setHeading(this.heading)
             .setContent(html `
                 <or-ace-editor 
                     ${ref(this._aceEditor)} 
-                    .value="${this.managerConfig}"
+                    .value="${this.config}"
                     @or-ace-editor-changed="${(ev) => {
             var _a;
             const okButton = (_a = dialog.actions) === null || _a === void 0 ? void 0 : _a.find(action => action.actionName === "ok");
@@ -108,13 +108,13 @@ let OrConfJson = class OrConfJson extends LitElement {
     }
     render() {
         return html `
-            <or-mwc-input type="button" label="JSON" outlined icon="pencil" @click="${() => { this._showManagerConfigDialog(); }}"></or-mwc-input>
+            <or-mwc-input type="button" label="JSON" outlined icon="pencil" @click="${() => { this._showConfigDialog(); }}"></or-mwc-input>
         `;
     }
 };
 __decorate([
     property({ attribute: false })
-], OrConfJson.prototype, "managerConfig", void 0);
+], OrConfJson.prototype, "config", void 0);
 OrConfJson = __decorate([
     customElement("or-conf-json")
 ], OrConfJson);

package/lib/components/configuration/or-conf-json.js.map

@@ -1 +1 @@
-{"version":3,"file":"or-conf-json.js","sourceRoot":"","sources":["../../../src/components/configuration/or-conf-json.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"or-conf-json.js","sourceRoot":"","sources":["../../../src/components/configuration/or-conf-json.ts"],"names":[],"mappings":"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"}

package/lib/components/configuration/or-conf-map/or-conf-map-global.d.ts

@@ -0,0 +1,15 @@
+import { MapConfig } from "@openremote/model";
+import { OrInputChangedEvent } from "@openremote/or-mwc-components/or-mwc-input";
+import { LitElement } from "lit";
+export declare class OrConfMapGlobal extends LitElement {
+    static styles: import("lit").CSSResult;
+    config?: MapConfig;
+    protected filename: string;
+    protected limit: number;
+    protected render(): import("lit-html").TemplateResult<1>;
+    protected notifyConfigChange(config: MapConfig): void;
+    protected notifyMapFileChange(e: OrInputChangedEvent): void;
+    protected resetMapSettings(): void;
+    protected importMapSettings(): Promise<void>;
+    private humanReadableBytes;
+}

package/lib/components/configuration/or-conf-map/or-conf-map-global.js

@@ -0,0 +1,298 @@
+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;
+};
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __rest = (this && this.__rest) || function (s, e) {
+    var t = {};
+    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
+        t[p] = s[p];
+    if (s != null && typeof Object.getOwnPropertySymbols === "function")
+        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
+            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
+                t[p[i]] = s[p[i]];
+        }
+    return t;
+};
+import { InputType } from "@openremote/or-mwc-components/or-mwc-input";
+import { css, html, LitElement } from "lit";
+import { customElement, property } from "lit/decorators.js";
+import { when } from "lit/directives/when.js";
+import { showSnackbar } from "@openremote/or-mwc-components/or-mwc-snackbar";
+import { i18next } from "@openremote/or-translate";
+let OrConfMapGlobal = class OrConfMapGlobal extends LitElement {
+    constructor() {
+        super(...arguments);
+        this.config = {};
+        this.limit = 30e+6;
+    }
+    /* -------------- */
+    render() {
+        var _a, _b, _c, _d, _e;
+        const isCustom = (_b = (_a = this.config.sources) === null || _a === void 0 ? void 0 : _a.vector_tiles) === null || _b === void 0 ? void 0 : _b.custom;
+        const hasExternalSource = Object.keys(this.config.sources).length > 1;
+        return html `
+            <div class="map-tile-settings">
+                <div class="map-tile-server-group">
+                    <div class="subheader"><or-translate value="configuration.global.mapTileServer"></or-translate></div>
+                    <span>
+                        <or-translate value="configuration.global.mapTileServerDescription"></or-translate><br>
+                        <or-translate class="note" value="configuration.global.mapTileServerNote"></or-translate>
+                    </span>
+                    <or-mwc-input class="input"
+                        .value="${isCustom ? (_e = (_d = (_c = this.config.sources) === null || _c === void 0 ? void 0 : _c.vector_tiles) === null || _d === void 0 ? void 0 : _d.tiles) === null || _e === void 0 ? void 0 : _e[0] : undefined}"
+                        .type="${InputType.URL}"
+                        .label="${i18next.t("configuration.global.mapTileServerPlaceholder")}"
+                        placeholder="https://api.example.com/tileset/{z}/{x}/{y}"
+                        @or-mwc-input-changed="${(e) => {
+            this.config.sources.vector_tiles.tiles = e.detail.value ? [e.detail.value] : undefined;
+            this.config.sources.vector_tiles.custom = !!e.detail.value;
+            this.notifyConfigChange(this.config);
+        }}"
+                    ></or-mwc-input>
+                </div>
+                <div class="map-tile-upload-group">
+                    <div class="subheader"><or-translate value="configuration.global.mapTiles"></or-translate></div>
+                    <span>
+                        <or-translate value="configuration.global.uploadMapTiles"></or-translate><br>
+                        <or-translate class="note" value="configuration.global.uploadMapTilesNote"
+                            .options=${{ limit: this.humanReadableBytes(this.limit) }}
+                        ></or-translate>
+                    </span>
+                    <div class="input d-inline-flex" style="height: 56px">
+                        <div id="fileupload" style="display: flex; align-items: center">
+                            <or-mwc-input outlined label="selectFile" style="width: fit-content; padding-right: 12px;" .type="${InputType.BUTTON}" @or-mwc-input-changed="${() => this.shadowRoot.getElementById('fileupload-elem').click()}">
+                                <input id="fileupload-elem" name="configfile" type="file" accept=".mbtiles" @change="${this.notifyMapFileChange}"/>
+                            </or-mwc-input>
+                            <or-mwc-input id="filename-elem" style="width: unset" .value="${this.filename}" .label="${i18next.t("file")}" .type="${InputType.TEXT}" disabled>
+                            </or-mwc-input>
+                            ${when(this.filename, () => html `<or-mwc-input type="${InputType.BUTTON}" iconColor="black" icon="delete"
+                                @or-mwc-input-changed="${this.notifyMapFileChange}"
+                            ></or-mwc-input>`)}
+                        </div>
+                    </div>
+                </div>
+            </div>
+            <div class="map-style-settings">
+                <div class="map-style-server-group">
+                    <span>
+                        <div class="subheader"><or-translate value="configuration.global.mapStyleJsonUrl"></or-translate></div>
+                        <or-translate value="configuration.global.mapStyleJsonUrlDescription"></or-translate><br>
+                        <or-translate class="note" value="configuration.global.mapStyleJsonUrlNote"></or-translate>
+                    </span>
+                    <div style="display: flex; height: 56px; align-items: center">
+                        <or-mwc-input class="input"
+                            .value="${this.config.override}"
+                            .type="${InputType.URL}"
+                            .label="${i18next.t("configuration.global.mapStyleJsonUrlPlaceholder")}"
+                            placeholder="https://api.example.com/tileset/style.json"
+                            @or-mwc-input-changed="${(e) => {
+            this.config.override = e.detail.value || undefined;
+            this.notifyConfigChange(this.config);
+            this.requestUpdate();
+        }}"
+                        ></or-mwc-input>
+                    </div>
+                </div>
+                <div class="map-style-layers-group">
+                    <span>
+                        <div class="subheader"><or-translate value="configuration.global.mapLayers"></or-translate></div>
+                        <or-translate value="configuration.global.mapImportStyle"></or-translate>
+                        <or-translate class="note" value="configuration.global.mapImportStyleNote"></or-translate>
+                    </span>
+                    <div style="display: flex; gap: 12px; align-items: center">
+                        <or-mwc-input class="input fit-content" type="button" outlined icon="import" 
+                            .label="${i18next.t("configuration.global.import")}"
+                            .disabled="${!this.config.override}" @or-mwc-input-changed="${this.importMapSettings}"
+                        ></or-mwc-input>
+                        <or-conf-json class="input fit-content hide-mobile" .heading="${i18next.t("configuration.global.mapLayers")}"
+                            .config="${hasExternalSource ? this.config.layers.filter(({ id }) => !id.startsWith("or:")) : this.config.layers}"
+                            @saveLocalConfig="${(ev) => {
+            if (Array.isArray(ev.detail.value)) {
+                if (hasExternalSource) {
+                    // Set default layers
+                    this.config.layers = this.config.layers.filter(({ id }) => id.startsWith("or:"));
+                    // Push changed layers
+                    this.config.layers.push(...ev.detail.value);
+                }
+                else {
+                    this.config.layers = ev.detail.value;
+                }
+                this.notifyConfigChange(this.config);
+                this.requestUpdate();
+            }
+        }}"
+                        ></or-conf-json>
+                        ${when(hasExternalSource, () => html `
+                            <or-mwc-input class="input fit-content" outlined type="button" icon="undo"
+                                .label="${i18next.t("configuration.global.reset")}"
+                                @or-mwc-input-changed="${this.resetMapSettings}"
+                            ></or-mwc-input>
+                        `)}
+                        </div>
+                </div>
+            </div>
+        `;
+    }
+    notifyConfigChange(config) {
+        this.dispatchEvent(new CustomEvent("change", { detail: config }));
+    }
+    notifyMapFileChange(e) {
+        var _a, _b;
+        const file = (_b = (_a = e.target) === null || _a === void 0 ? void 0 : _a.files) === null || _b === void 0 ? void 0 : _b[0];
+        if (file) {
+            if (file.size > this.limit) {
+                showSnackbar(undefined, "configuration.global.uploadMapTilesError");
+                return;
+            }
+            const filenameEl = this.shadowRoot.getElementById('filename-elem');
+            if (filenameEl) {
+                filenameEl.value = file.name;
+            }
+        }
+        this.dispatchEvent(new CustomEvent("map-file-changed", { detail: file }));
+    }
+    resetMapSettings() {
+        this.config.glyphs = undefined;
+        this.config.sprite = undefined;
+        this.config.sources = { vector_tiles: this.config.sources.vector_tiles };
+        this.config.layers = this.config.layers
+            .filter(({ id }) => id.startsWith("or:"))
+            .map((_a) => {
+            var { id } = _a, layer = __rest(_a, ["id"]);
+            return (Object.assign(Object.assign({}, layer), { id: id.replace("or:", "") }));
+        });
+        this.notifyConfigChange(this.config);
+        this.requestUpdate();
+    }
+    importMapSettings() {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this.config.override) {
+                const data = yield (yield fetch(this.config.override)).json();
+                if (Object.keys(this.config.sources).length > 1) {
+                    // Set default layers
+                    this.config.layers = this.config.layers.filter(({ id }) => id.startsWith("or:"));
+                    // Push new layers
+                    this.config.layers.push(...data.layers);
+                }
+                else {
+                    this.config.layers = this.config.layers.map((_a) => {
+                        var { id } = _a, layer = __rest(_a, ["id"]);
+                        return (Object.assign(Object.assign({}, layer), { id: "or:" + id }));
+                    });
+                    this.config.layers.push(...data.layers);
+                }
+                Object.assign(this.config.sources, data.sources);
+                this.config.sprite = data.sprite;
+                this.config.glyphs = data.glyphs;
+                delete this.config.override;
+                this.notifyConfigChange(this.config);
+                this.requestUpdate();
+            }
+        });
+    }
+    humanReadableBytes(bytes) {
+        const unit = ['bytes', 'kB', 'MB', 'GB', 'TB', 'PB'];
+        const exponent = Math.floor(Math.log(bytes) / Math.log(1000));
+        return (bytes / Math.pow(1000, exponent)).toFixed(2) + " " + unit[exponent];
+    }
+};
+OrConfMapGlobal.styles = css `
+        .subheader {
+            padding: 10px 0 4px;
+            font-weight: bolder;
+        }
+
+        .map-tile-settings {
+            display: flex;
+        }
+
+        .map-tile-server-group {
+            flex-direction: column;
+            width: 50%;
+        }
+
+        .map-tile-upload-group {
+            flex-direction: column;
+            padding-left: 12px;
+            width: 50%;
+        }
+
+        .map-style-settings {
+            display: flex;
+        }
+
+        .map-style-server-group {
+            flex-direction: column;
+            width: 50%;
+        }
+
+        .map-style-layers-group {
+            flex-direction: column;
+            padding-left: 12px;
+            width: 50%;
+        }
+
+        @media screen and (max-width: 768px) {
+            .map-tile-server-group, .map-tile-upload-group,
+            .map-style-server-group, .map-style-layers-group  {
+                width: 100%;
+                padding: unset;
+            }
+            .map-tile-settings, .map-style-settings {
+                display: block;
+            }
+        }
+
+        .input {
+            width: 100%;
+            max-width: 800px;
+            padding: 10px 0;
+        }
+
+        .input or-mwc-input:not([icon]) {
+            width: 80%;
+        }
+
+        .note {
+            font-style: italic;
+            color: rgba(0, 0, 0, 0.6);
+        }
+
+        or-file-uploader {
+            width: 108px;
+            height: 108px;
+        }
+
+        .d-inline-flex {
+            display: inline-flex;
+        }
+        
+        .fit-content {
+            width: fit-content;
+        }
+    `;
+__decorate([
+    property()
+], OrConfMapGlobal.prototype, "config", void 0);
+__decorate([
+    property()
+], OrConfMapGlobal.prototype, "filename", void 0);
+__decorate([
+    property()
+], OrConfMapGlobal.prototype, "limit", void 0);
+OrConfMapGlobal = __decorate([
+    customElement("or-conf-map-global")
+], OrConfMapGlobal);
+export { OrConfMapGlobal };
+//# sourceMappingURL=or-conf-map-global.js.map

package/lib/components/configuration/or-conf-map/or-conf-map-global.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"or-conf-map-global.js","sourceRoot":"","sources":["../../../../src/components/configuration/or-conf-map/or-conf-map-global.ts"],"names":[],"mappings":"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"}

package/lib/pages/page-configuration.d.ts

@@ -4,13 +4,12 @@ import "@openremote/or-translate";
 import { Store } from "@reduxjs/toolkit";
 import { AppStateKeyed, Page, PageProvider } from "@openremote/or-app";
 import "@openremote/or-components/or-collapsible-panel";
-import "@openremote/or-mwc-components/or-mwc-input";
 import "../components/configuration/or-conf-json";
 import "../components/configuration/or-conf-panel";
+import "../components/configuration/or-conf-map/or-conf-map-global";
 import { ManagerAppConfig, MapConfig, Realm } from "@openremote/model";
 import "@openremote/or-components/or-loading-indicator";
 import { OrConfPanel } from "../components/configuration/or-conf-panel";
-import { OrInputChangedEvent } from "@openremote/or-mwc-components/or-mwc-input";
 export declare function pageConfigurationProvider(store: Store<AppStateKeyed>): PageProvider<AppStateKeyed>;
 export declare class PageConfiguration extends Page<AppStateKeyed> {
     static get styles(): import("lit").CSSResult;
@@ -28,12 +27,8 @@ export declare class PageConfiguration extends Page<AppStateKeyed> {
     protected realmConfigPanel?: OrConfPanel;
     stateChanged(state: AppStateKeyed): void;
     firstUpdated(): Promise<void>;
-    humanReadableBytes(bytes: number): string;
     willUpdate(changedProps: PropertyValues<this>): void;
     protected render(): TemplateResult | void;
-    protected setCustomVectorTilesUrl(e: OrInputChangedEvent): Promise<void>;
-    protected uploadCustomMap(e: CustomEvent): Promise<void>;
-    protected deleteCustomMap(): Promise<void>;
     protected getManagerConfig(): Promise<ManagerAppConfig | undefined>;
     protected getMapConfig(): Promise<MapConfig>;
     protected getAccessibleRealms(): Promise<Realm[]>;