@peter.prib/renderengine 0.0.0-stage → 0.2.0

package/src/workspace/parts/DiagramEditorPart.js

@@ -0,0 +1,135 @@
+import { render } from '../dom.js';
+import { EditorShell } from '../EditorShell.js';
+import { EditorPart } from './EditorPart.js';
+import { DiagramEditor } from '../../charting/DiagramEditor.js';
+import { MenuBar } from '../../charting/MenuBar.js';
+import { DiagramModel } from '../../charting/diagramModel/index.js';
+import { ViewTabStrip } from '../../charting/ViewTabStrip.js';
+import { LocalJsonStore } from '../../charting/storage/LocalJsonStore.js';
+import { EdgeStyleCascade } from '../../charting/edgeStyle/index.js';
+import { DiagramViewPropertiesDialog } from '../../charting/DiagramViewPropertiesDialog.js';
+
+const SVG_NS = 'http://www.w3.org/2000/svg';
+
+/**
+ * DiagramEditorPart — a complete diagram editor as a workspace part: menu bar,
+ * palette, one tab per diagram and the canvas, over a DiagramModel.
+ *
+ * Spec (JSON): `templateType` (palette category), `tabOrientation`
+ * ('horizontal'|'vertical'), `diagramTitle` (first diagram), `toolStyleKey`
+ * (localStorage key for the tool-level line style; `null` keeps it in memory).
+ *
+ * Line styles cascade line → diagram (`view.edgeStyle`) → model
+ * (`model.edgeStyle`) → tool. Each diagram keeps its own undo history, so undo
+ * survives switching tabs. The diagrams' menu (new, duplicate, rename, delete)
+ * comes from EditorPart. Like ChartPart it needs the engine, so it is not in
+ * BUILTIN_PARTS: register it explicitly.
+ */
+export class DiagramEditorPart extends EditorPart {
+    static type = 'diagram-editor';
+    static viewNoun = 'diagram';
+
+    constructor(spec = {}) {
+        super(spec);
+        this.tabOrientation = spec.tabOrientation ?? 'horizontal';
+        // The editor is rebuilt with the canvas on every render, which follows every model change.
+        this._unsubscribe = this.model.onChange(() => { if (this.mounted) this.render(); });
+    }
+
+    createModel(spec) {
+        const store = spec.toolStyleKey === null ? null
+            : new LocalJsonStore(spec.toolStyleKey ?? 'renderengine.diagramEditor.toolEdgeStyle');
+        this.toolEdgeStyle = store?.load({}) ?? {};
+        const model = new DiagramModel({
+            name: spec.name ?? '',
+            templateType: spec.templateType ?? 'generic',
+            // Tool-level style edits go through the diagram's undo history; persist whenever it moves.
+            historyOptions: { onChange: () => store?.save(this.toolEdgeStyle) },
+        });
+        model.createView(spec.diagramTitle ?? 'Diagram 1');
+        return model;
+    }
+
+    render() {
+        const model = this.model;
+        const view = model.currentView;
+        const doc = this.document;
+        const canvasId = `diagram-canvas-${this.id}`;
+
+        const canvas = doc.createElementNS(SVG_NS, 'svg');
+        canvas.id = canvasId;
+        canvas.setAttribute('viewBox', '0 0 800 600');
+        canvas.style.cssText = 'flex: 1; width: 100%; height: 100%; display: block; background: #fff; border: 2px solid #333; box-sizing: border-box;';
+        const elements = doc.createElementNS(SVG_NS, 'g');
+        elements.id = 'elements';
+        canvas.appendChild(elements);
+
+        const tabs = new ViewTabStrip({
+            orientation: this.tabOrientation,
+            document: doc,
+            onSelect: (id) => model.switchTo(id),
+            menuItems: (id) => this.viewMenu.items(id),
+        }).render(model.views(), model.currentViewId);
+
+        // The shared workbench layout: toolbar, palette at the side, tabs + canvas in the main area.
+        const { toolbar: menuBarEl, side: palette, main } = new EditorShell({ document: doc, sideWidth: '200px' }).mount(this.container);
+        palette.classList.add('ws-diagram-palette');
+        Object.assign(palette.style, { padding: '8px', fontSize: '12px', display: 'flex', flexDirection: 'column', overflowY: 'hidden' });
+        main.style.flexDirection = this.tabOrientation === 'vertical' ? 'row' : 'column';
+        render(main, [tabs, { style: { flex: '1', display: 'flex', flexDirection: 'column', minHeight: '0' }, children: [canvas] }], doc);
+
+        // The editor is bound to the view's own maps and history: nothing to save back on switch.
+        const previous = this.editor;
+        previous?.dispose();
+        this.editor = new DiagramEditor({
+            diagramContainerId: canvasId,
+            model,
+            templateType: model.templateType,
+            onTemplateTypeChange: (type) => model.setTemplateType(type),
+            templates: view.templates,
+            edges: view.edges,
+            history: view.history,
+            arrangement: view.arrangement,
+            edgeStyleLevels: this.edgeStyleLevels(view),
+        });
+        if (previous) {
+            this.editor.showGrid = previous.showGrid;
+            this.editor.gridSize = previous.gridSize;
+        }
+        this.editor.initPaletteForDiagramType(palette, model.templateType);
+        this.menuBar?.dispose();
+        this.menuBar = new MenuBar({
+            container: menuBarEl,
+            editor: this.editor,
+            items: [this.fileMenu(), this.editMenu(), ...this.editor.menuBarItems()],
+        }).render();
+        this.editor.render();
+    }
+
+    /** A diagram's line-style levels, most specific first: the diagram, the model, the tool. */
+    edgeStyleLevels(view) {
+        return [
+            { key: 'view', label: 'Diagram', style: view.edgeStyle },
+            { key: 'model', label: 'Model', style: this.model.edgeStyle },
+            { key: 'tool', label: 'Tool', style: this.toolEdgeStyle },
+        ];
+    }
+
+    /** A diagram's properties: name, documentation and its line-style defaults. */
+    showViewProperties(view) {
+        return new DiagramViewPropertiesDialog({
+            model: this.model,
+            view,
+            document: this.document,
+            cascade: new EdgeStyleCascade(this.edgeStyleLevels(view)),
+            // The editor shows the current diagram; a style change there needs a redraw.
+            onStyleChange: () => { if (view === this.model.currentView) this.editor?.render(); },
+        }).open();
+    }
+
+    dispose() {
+        this.menuBar?.dispose();
+        this._unsubscribe();
+        super.dispose();
+    }
+}

package/src/workspace/parts/EditorPart.js

@@ -0,0 +1,388 @@
+import { Part } from '../Part.js';
+import { ViewMenu } from '../../charting/ViewMenu.js';
+import { ToolbarMenu } from '../../charting/toolbar/index.js';
+import { modelFileMenuItems } from '../../charting/ModelFileFormat.js';
+import { ModelFile } from './ModelFile.js';
+import { reportHtml, reportFileName } from '../../charting/report/reportHtml.js';
+import { downloadBlob } from '../../exportImage.js';
+import { FindReplaceDialog } from '../../charting/FindReplaceDialog.js';
+import { FormDialog } from '../../charting/FormDialog.js';
+import { NAME_TRANSFORMS } from '../../charting/diagramModel/nameTransforms.js';
+
+/**
+ * EditorPart — base for workbench parts that edit a model of several views
+ * (a ViewSetModel): the template editor's DiagramEditorPart and
+ * ArchimateEditorPart.
+ *
+ * Owns what they share: the model (made by the subclass from the part's JSON
+ * spec), the view menu (new, duplicate, rename, delete) over it, a File menu
+ * that starts with those items and offers the part's file formats (export,
+ * and import, which replaces the model), and disposing the editor with the
+ * part. Subclasses build their editor in render() and supply
+ * `createModel(spec)`, and `fileFormats()` when they read and write files.
+ *
+ * With file formats the part also opens and saves a file (ModelFile): Open…,
+ * Save and Save As… (Ctrl+O, Ctrl+S, Ctrl+Shift+S), writing back to the file
+ * it opened or last saved where the browser allows; it knows when the model
+ * has changed since (`model.isDirty()`), shows it (`fileLabel`, the page
+ * title) and asks before the page is left with changes unsaved.
+ *
+ * Hosted by a ModelsPart (`ctx.models`: several models open at once, a tab
+ * each), its File menu also offers New model, Open… in a new tab and Close
+ * model, and its tab follows its file's name and saved state.
+ */
+export class EditorPart extends Part {
+    /** What a view is called in this part's menus ('view', 'diagram'). */
+    static viewNoun = 'view';
+
+    constructor(spec = {}) {
+        super(spec);
+        if (new.target === EditorPart) throw new TypeError('EditorPart is abstract — subclass it');
+        this._model = this.createModel(spec);
+        /** The editor this part hosts; set by render(). */
+        this.editor = null;
+        /** The file the model is open from, and saved to (ModelFile). */
+        this.file = new ModelFile(this);
+        this._followEdits(this._model);
+    }
+
+    /** Install the file keys and the leave-page guard once mounted. */
+    mount(host, ctx) {
+        const first = !this.mounted;
+        super.mount(host, ctx);
+        if (!first || !this.fileFormats().length) return;
+        const win = this.document.defaultView;
+        this.listen(this.document, 'keydown', (e) => this.file.onKey(e));
+        this.listen(win, 'beforeunload', (e) => {
+            if (!this.model.isDirty?.()) return;
+            e.preventDefault();
+            e.returnValue = '';
+        });
+        this.file.showState();
+    }
+
+    /** What the part's title shows: the file's name, and • when there are unsaved changes. */
+    get fileLabel() {
+        return this.file.label;
+    }
+
+    /**
+     * Show the saved state on every edit of `model`, from now on as saved and
+     * with nothing to undo (making it, or opening it, is no edit). @private
+     */
+    _followEdits(model) {
+        this._unsubscribeEdits?.();
+        model.history?.clear?.();
+        model.markSaved?.();
+        this._unsubscribeEdits = model.onEdit?.(() => this.file.showState()) ?? null;
+    }
+
+    /** The model this part edits, built from its spec. @abstract */
+    createModel(spec) {
+        throw new Error(`${this.constructor.name} must implement createModel()`);
+    }
+
+    /** The model being edited (a subclass whose editor can replace it reads it from there). */
+    get model() {
+        return this._model;
+    }
+
+    /** The page this part is mounted in. */
+    get document() {
+        return this.container?.ownerDocument ?? globalThis.document;
+    }
+
+    /**
+     * View menu items over the current model. A subclass that can show a
+     * view's properties (`showViewProperties(view)`, the name included) gets
+     * "Properties…" in place of "Rename…".
+     */
+    get viewMenu() {
+        if (this._viewMenu?.model !== this.model) {
+            this._viewMenu = new ViewMenu(this.model, {
+                document: () => this.document,
+                noun: this.constructor.viewNoun,
+                editProperties: typeof this.showViewProperties === 'function' ? (view) => this.showViewProperties(view) : null,
+            });
+        }
+        return this._viewMenu;
+    }
+
+    /** File menu (fileMenuItems). */
+    fileMenu() {
+        return new ToolbarMenu('File', () => this.fileMenuItems());
+    }
+
+    /** Edit menu: undo and redo (the editor's), then Find and replace… over the whole model. */
+    editMenu() {
+        return new ToolbarMenu('Edit', () => this.editMenuItems());
+    }
+
+    editMenuItems() {
+        const history = this.editor?.history;
+        return [
+            { label: 'Undo', disabled: !history?.canUndo || undefined, action: () => this.editor.undo() },
+            { label: 'Redo', disabled: !history?.canRedo || undefined, action: () => this.editor.redo() },
+            ...(typeof this.model.search === 'function' ? [
+                { separator: true },
+                { label: 'Find and replace…', action: () => this.findAndReplace() },
+                { label: 'Transform names…', action: () => this.askTransformNames() },
+                ...(this.model.search().propertyNames().length ? [{ label: 'Rename property…', action: () => this.askRenameProperty() }] : []),
+            ] : []),
+        ];
+    }
+
+    /** Run a model-wide edit (null: nothing to do) as one undo step, then redraw. @protected */
+    _runModelEdit(command) {
+        if (!command) return null;
+        (this.editor?.history ?? this.model.history).execute(command);
+        if (this.mounted) this.render();
+        return command;
+    }
+
+    /**
+     * Transform names…: Title Case, Sentence case, split camelCase and the
+     * rest (nameTransforms.js) on every name, or on those containing some
+     * text. One undo step.
+     */
+    askTransformNames() {
+        return new FormDialog({
+            title: 'Transform names',
+            fields: [
+                { key: 'transform', label: 'Make them', type: 'select', value: 'title', choices: NAME_TRANSFORMS.map(([k, label]) => [k, label]) },
+                { key: 'text', label: 'Only names containing', type: 'text', value: '', placeholder: 'every name' },
+            ],
+            submitLabel: 'Transform',
+            idPrefix: 'transform-names-',
+            document: this.document,
+            validate: ({ transform, text }) => (this.model.search().transformCommand(transform, text) ? null : 'No name would change'),
+            onApply: ({ transform, text }) => this.transformNames(transform, text),
+        }).open();
+    }
+
+    /** Transform names (ModelSearch#transformCommand), one undo step. */
+    transformNames(transform, text = '') {
+        return this._runModelEdit(this.model.search().transformCommand(transform, text));
+    }
+
+    /** Rename property…: a property's name, everywhere in the model. One undo step. */
+    askRenameProperty() {
+        const names = this.model.search().propertyNames();
+        return new FormDialog({
+            title: 'Rename property',
+            fields: [
+                { key: 'from', label: 'Property', type: 'select', value: names[0], choices: names.map(n => [n, n]) },
+                { key: 'to', label: 'New name', type: 'text', value: '' },
+            ],
+            submitLabel: 'Rename',
+            idPrefix: 'rename-property-',
+            document: this.document,
+            validate: ({ from, to }) => (to?.trim() ? (to.trim() === from ? 'That is its name' : null) : 'Give its new name'),
+            onApply: ({ from, to }) => this.renameProperty(from, to.trim()),
+        }).open();
+    }
+
+    /** Rename a property everywhere (ModelSearch#renamePropertyCommand), one undo step. */
+    renameProperty(from, to) {
+        return this._runModelEdit(this.model.search().renamePropertyCommand(from, to));
+    }
+
+    /**
+     * Find and replace over the model (FindReplaceDialog on `model.search()`):
+     * a replace is one undo step on the model's history, and choosing a
+     * match shows it (revealMatch). The last search is kept between opens.
+     */
+    findAndReplace() {
+        this._findReplace ??= new FindReplaceDialog({
+            model: () => this.model,
+            history: () => this.editor?.history ?? this.model.currentView.history,
+            onReveal: (match) => this.revealMatch(match),
+            onReplaced: () => { if (this.mounted) this.render(); },
+            document: () => this.document,
+        });
+        return this._findReplace.open();
+    }
+
+    /** Show a match: its view, and on it the item (the editor's revealFinding). */
+    revealMatch(match) {
+        if (match.viewId && match.viewId !== this.model.currentViewId) this.model.switchTo(match.viewId);   // the part redraws for it
+        if (match.kind === 'model' || match.kind === 'view') return;
+        this.editor?.revealFinding?.({ kind: match.kind, ids: [match.id] });
+    }
+
+    /** What File offers to make: a new view here; a subclass adds its own kinds (a canvas, ...). */
+    newItems() {
+        return [this.viewMenu.newViewItem()];
+    }
+
+    /** The ModelsPart this part is a tab of (several models open at once), or null. */
+    get modelsHost() {
+        return this.ctx?.models ?? null;
+    }
+
+    /** With a ModelsPart: New model, Open… in a new tab (when it opens files) and Close model. */
+    modelItems() {
+        const host = this.modelsHost;
+        if (!host) return [];
+        return [
+            { label: 'New model', action: () => host.newModel() },
+            ...(this.fileFormats().length ? [{ label: 'Open… in a new tab', action: () => host.openInNewTab(this) }] : []),
+            { label: 'Close model', action: () => host.closeModel(this.id) },
+        ];
+    }
+
+    /** The file or its saved state changed: a ModelsPart's tab follows it. */
+    onFileState() {
+        this.modelsHost?.fileStateChanged?.(this);
+    }
+
+    /**
+     * The File menu, grouped: **New** ▸ (a view, a subclass's kinds, a model),
+     * Open…, Save, Save As… (and, with a ModelsPart, Open… in a new tab, Close
+     * model), **Import** ▸ and **Export** ▸ (each file format, a subclass's own,
+     * the HTML report and the pictures), a subclass's own groups, and **This
+     * view** ▸ (its properties, duplicate, delete). A group of one is that item.
+     */
+    fileMenuItems() {
+        const models = Object.fromEntries(this.modelItems().map(i => [i.label, i]));
+        const [open, ...saving] = this.fileFormats().length ? this.file.menuItems() : [];
+        const some = (...items) => items.filter(Boolean);
+        return EditorPart.tidyMenu([
+            ...EditorPart.menuGroup('New', some(...this.newItems(), models['New model'])),
+            { separator: true },
+            ...some(open, models['Open… in a new tab'], ...saving, models['Close model']),
+            { separator: true },
+            ...EditorPart.menuGroup('Import', this.importItems(), { prefix: true }),
+            ...EditorPart.menuGroup('Export', this.exportItems(), { prefix: true }),
+            ...this.ownFileItems(),
+            { separator: true },
+            ...EditorPart.menuGroup(`This ${this.constructor.viewNoun}`, this.viewMenu.items(this.model.currentViewId)),
+        ]);
+    }
+
+    /** File > Import's items: each format that imports (it replaces the model), then the subclass's own (ownImportItems). */
+    importItems() {
+        return EditorPart.tidyMenu([
+            ...modelFileMenuItems(this.fileFormats(), {
+                model: () => this.model, only: 'import',
+                onImport: (model) => { this.replaceModel(model); this.file.forget(); },
+                document: () => this.document,
+            }),
+            ...this.ownImportItems(),
+        ]);
+    }
+
+    /** File > Export's items: each format, the subclass's own (ownExportItems), then the HTML report and the pictures. */
+    exportItems() {
+        return EditorPart.tidyMenu([
+            ...modelFileMenuItems(this.fileFormats(), { model: () => this.model, only: 'export', document: () => this.document }),
+            ...this.ownExportItems(),
+            { separator: true },
+            // In Export, "Export HTML report" is "HTML report", "Export image (PNG)" "Image (PNG)".
+            ...[...this.reportItems(), ...(this.editor?.imageMenuItems?.() ?? [])]
+                .map(i => ({ ...i, label: i.label.replace(/^Export (.)/, (_, c) => c.toUpperCase()) })),
+        ]);
+    }
+
+    /** A subclass's own File > Import items. None here. */
+    ownImportItems() {
+        return [];
+    }
+
+    /** A subclass's own File > Export items. None here. */
+    ownExportItems() {
+        return [];
+    }
+
+    /**
+     * Items as a submenu named `label`; none is nothing, and one is that item
+     * itself (with `prefix`, named as the group says it: "Export HTML report").
+     */
+    static menuGroup(label, items, { prefix = false } = {}) {
+        const real = EditorPart.tidyMenu(items);
+        if (!real.length) return [];
+        if (real.length > 1) return [{ label, items: real }];
+        const [only] = real;
+        if (!prefix) return [only];
+        // "Image (PNG)" reads "Export image (PNG)"; an acronym (HTML, CSV) or ".archimate" stays as it is.
+        const word = /^[A-Z][a-z]/.test(only.label) ? only.label.charAt(0).toLowerCase() + only.label.slice(1) : only.label;
+        return [{ ...only, label: `${label} ${word}` }];
+    }
+
+    /** Separators only between items: none first, last or twice in a row. */
+    static tidyMenu(items) {
+        const out = [];
+        for (const item of items) {
+            if (item.separator && (!out.length || out.at(-1).separator)) continue;
+            out.push(item);
+        }
+        while (out.at(-1)?.separator) out.pop();
+        return out;
+    }
+
+    /** Export HTML report, when the model has a report (ViewSetModel#report). */
+    reportItems() {
+        return typeof this.model.report === 'function' ? [{ label: 'Export HTML report', action: () => this.exportReport() }] : [];
+    }
+
+    /**
+     * The model's report as one HTML file (reportHtml), each view's picture
+     * in it: downloaded as `<model>-report.html`. Returns the HTML.
+     */
+    exportReport() {
+        const report = this.model.report({ pictures: this.viewPictures() });
+        const html = reportHtml(report.data());
+        downloadBlob(new (this.document.defaultView ?? globalThis).Blob([html], { type: 'text/html' }), reportFileName(report.title));
+        return html;
+    }
+
+    /**
+     * Every view's picture (DiagramEditor#viewPicture), by view id: each view
+     * is shown in turn, then the one that was. None when the editor draws no pictures.
+     */
+    viewPictures() {
+        const model = this.model;
+        if (typeof this.editor?.viewPicture !== 'function') return {};
+        const start = model.currentViewId;
+        const pictures = {};
+        try {
+            for (const view of model.views()) {
+                if (model.currentViewId !== view.id) model.switchTo(view.id);   // the part redraws for it
+                const picture = this.editor?.viewPicture?.();
+                if (picture) pictures[view.id] = picture;
+            }
+        } finally {
+            if (model.currentViewId !== start) model.switchTo(start);
+        }
+        return pictures;
+    }
+
+    /** A subclass's own File items or groups, after Import and Export (templates, ...). None here. */
+    ownFileItems() {
+        return [];
+    }
+
+    /** The file formats (ModelFileFormat) this part's model is exported to and imported from: none here. */
+    fileFormats() {
+        return [];
+    }
+
+    /** Edit another model (an imported one) in place of this one, and show it. */
+    replaceModel(model) {
+        this._model = model;
+        this._followEdits(model);
+        this.modelReplaced(model);
+        if (this.mounted) this.render();
+    }
+
+    /** After `replaceModel`: a subclass moves what follows the model (change listeners, ...) onto the new one. */
+    modelReplaced(model) {}
+
+    dispose() {
+        this._unsubscribeEdits?.();
+        this.file.restoreTitle();
+        this.editor?.dispose?.();
+        this.editor = null;
+        super.dispose();
+    }
+}

package/src/workspace/parts/HtmlPart.js

@@ -0,0 +1,25 @@
+import { Part } from '../Part.js';
+
+/**
+ * HtmlPart — raw markup injection. **The escape hatch, not the default.**
+ *
+ * Reach for this only when the HTML genuinely comes from outside — a server
+ * response, a stored document, a third-party embed. For content you are
+ * authoring, use `ContentPart`, which declares the same structure as a JSON
+ * element tree: storable, serializable, composable, and incapable of injecting
+ * markup through its text.
+ *
+ * `spec.html` is injected verbatim and is therefore a trust boundary — never
+ * pass user-supplied strings through it. `spec.text` is escaped and safe.
+ */
+export class HtmlPart extends Part {
+    static type = 'html';
+
+    render() {
+        if (this.spec.html != null) {
+            this.container.innerHTML = this.spec.html;
+        } else {
+            this.container.textContent = this.spec.text ?? '';
+        }
+    }
+}

package/src/workspace/parts/ListPart.js

@@ -0,0 +1,57 @@
+import { Part } from '../Part.js';
+import { el } from '../dom.js';
+
+/**
+ * ListPart — a selectable list that publishes the selected item.
+ *
+ * The canonical *producer* in a mashup: it knows nothing about who consumes its
+ * selection. `spec.channel` names the channel (default `selection:item`);
+ * `spec.items` is an array of strings or `{id, label, ...}` objects, and the
+ * whole item object is what gets published so consumers can read extra fields.
+ */
+export class ListPart extends Part {
+    static type = 'list';
+    static publishes = ['selection:item'];
+
+    constructor(spec = {}) {
+        super(spec);
+        this.channel = spec.channel ?? 'selection:item';
+        this.items = (spec.items ?? []).map(it => (typeof it === 'string' ? { id: it, label: it } : it));
+        this.selectedId = spec.selectedId ?? null;
+    }
+
+    render() {
+        this._buttons = new Map();
+        this.container.appendChild(el({
+            tag: 'ul',
+            cls: 'ws-list',
+            children: this.items.map(item => ({
+                tag: 'li',
+                children: [{
+                    tag: 'button',
+                    cls: 'ws-list-item',
+                    text: item.label ?? item.id,
+                    attrs: { type: 'button' },
+                    on: { click: () => this.select(item.id) },
+                    ref: n => this._buttons.set(item.id, n),
+                }],
+            })),
+        }));
+
+        if (this.selectedId != null) this.select(this.selectedId);
+    }
+
+    select(id) {
+        const item = this.items.find(i => i.id === id);
+        if (!item) return;
+        this.selectedId = id;
+        for (const [key, btn] of this._buttons) {
+            btn.classList.toggle('ws-list-item-active', key === id);
+        }
+        this.publish(this.channel, item);
+    }
+
+    serialize() {
+        return { ...super.serialize(), selectedId: this.selectedId };
+    }
+}