@journeyapps-labs/reactor-mod-data-browser 2.2.0 → 2.4.0

package/dist/core/query/{SimpleQuery.js → query-simple/SimpleQuery.js}

@@ -1,18 +1,18 @@
 import { __classPrivateFieldGet, __classPrivateFieldSet, __esDecorate, __runInitializers } from "tslib";
-import { AbstractQuery } from './AbstractQuery';
-import { ActionSource, inject } from '@journeyapps-labs/reactor-mod';
-import { ConnectionStore } from '../../stores/ConnectionStore';
-import { Page } from './Page';
+import { inject } from '@journeyapps-labs/reactor-mod';
+import { ConnectionStore } from '../../../stores/ConnectionStore';
 import * as _ from 'lodash';
 import * as React from 'react';
 import { action, observable } from 'mobx';
-import { CellDisplayWidget } from './widgets/CellDisplayWidget';
-import { BelongsToDisplayWidget } from './widgets/BelongsToDisplayWidget';
-import { EditSchemaModelAction } from '../../actions/schema-model/EditSchemaModelAction';
-import { SmartColumnWidget } from './widgets/SmartColumnWidget';
+import { CellDisplayWidget } from '../widgets/CellDisplayWidget';
+import { SmartColumnWidget } from '../widgets/SmartColumnWidget';
+import { SmartCellDisplayWidget } from '../widgets/SmartCellDisplayWidget';
+import { SimplePage } from './SimplePage';
+import { AbstractSerializableQuery } from '../AbstractSerializableQuery';
+import { SmartBelongsToDisplayWidget } from '../widgets/SmartBelongsToDisplayWidget';
 let SimpleQuery = (() => {
     var _a, _SimpleQuery_connStore_accessor_storage, _SimpleQuery__totalPages_accessor_storage, _SimpleQuery__pages_accessor_storage;
-    let _classSuper = AbstractQuery;
+    let _classSuper = AbstractSerializableQuery;
     let _instanceExtraInitializers = [];
     let _connStore_decorators;
     let _connStore_initializers = [];
@@ -43,13 +43,9 @@ let SimpleQuery = (() => {
                 this._pages = [];
                 this.simple_filters = new Map();
             }
-            async getCollection() {
-                let connection = await this.connection.getConnection();
-                return connection[this.options.definition.definition.name];
-            }
             async load() {
                 this._pages = [];
-                let collection = await this.getCollection();
+                let collection = await this.options.definition.getCollection();
                 let query = collection.all();
                 this.simple_filters.forEach((f) => {
                     query = f.augment(query);
@@ -59,10 +55,9 @@ let SimpleQuery = (() => {
             }
             getPage(number) {
                 if (!this._pages[number]) {
-                    let page = new Page({
+                    let page = new SimplePage({
                         offset: number * this.options.limit,
                         limit: this.options.limit,
-                        collection: () => this.getCollection(),
                         definition: this.options.definition,
                         index: number,
                         filters: Array.from(this.simple_filters.values())
@@ -91,24 +86,27 @@ let SimpleQuery = (() => {
                         noWrap: true,
                         shrink: true
                     },
+                    {
+                        key: 'updated_at',
+                        display: 'Updated at',
+                        noWrap: true,
+                        shrink: true,
+                        accessor: (cell, row) => {
+                            return React.createElement(CellDisplayWidget, { name: "updated_at", cell: row.model.updated_at, row: row });
+                        }
+                    },
                     ..._.map(this.options.definition.definition.belongsToIdVars, (a) => {
                         return {
                             key: a.name,
-                            display: a.name,
+                            display: (React.createElement(SmartColumnWidget, { variable: this.options.definition.definition.belongsToVars[a.relationship], type: this.options.definition.definition.belongsTo[a.relationship].foreignType, filterChanged: (filter) => { } })),
                             noWrap: true,
                             shrink: true,
                             accessor: (cell, row) => {
-                                return (React.createElement(BelongsToDisplayWidget, { open: (object) => {
-                                        EditSchemaModelAction.get().fireAction({
-                                            source: ActionSource.BUTTON,
-                                            targetEntity: object
-                                        });
-                                    }, relationship: row.model.definition.definition.belongsTo[a.relationship], connection: this.connection, id: row.model.model[a.name] }));
+                                return React.createElement(SmartBelongsToDisplayWidget, { variable_id: a, row: row, connection: this.connection });
                             }
                         };
                     }),
                     ..._.map(this.options.definition.definition.attributes, (a) => {
-                        // @ts-ignore FIXME, remove when `display` supports JSX.Element as a type
                         return {
                             key: a.name,
                             display: (React.createElement(SmartColumnWidget, { variable: a, filter: this.simple_filters.get(a), filterChanged: (filter) => {
@@ -124,7 +122,7 @@ let SimpleQuery = (() => {
                             noWrap: true,
                             shrink: true,
                             accessor: (cell, row) => {
-                                return React.createElement(CellDisplayWidget, { variable: a, cell: cell, row: row });
+                                return React.createElement(SmartCellDisplayWidget, { name: a.name, row: row });
                             }
                         };
                     })
@@ -133,6 +131,9 @@ let SimpleQuery = (() => {
             getSimpleName() {
                 return `Query: ${this.options.definition.definition.label}`;
             }
+            getDirtyObjects() {
+                return _.flatMap(this._pages.filter((p) => !!p), (page) => page.getDirtyObjects());
+            }
         },
         _SimpleQuery_connStore_accessor_storage = new WeakMap(),
         _SimpleQuery__totalPages_accessor_storage = new WeakMap(),

package/dist/core/query/query-simple/SimpleQuery.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"SimpleQuery.js","sourceRoot":"","sources":["../../../../src/core/query/query-simple/SimpleQuery.tsx"],"names":[],"mappings":"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"}

package/dist/core/query/widgets/BelongsToDisplayWidget.js

@@ -2,7 +2,8 @@ import * as React from 'react';
 import { useEffect, useState } from 'react';
 import { IconWidget, styled, TableButtonWidget } from '@journeyapps-labs/reactor-mod';
 import { copyTextToClipboard } from '@journeyapps-labs/lib-reactor-utils';
-export const BelongsToDisplayWidget = (props) => {
+import { observer } from 'mobx-react';
+export const BelongsToDisplayWidget = observer((props) => {
     const [object, setObject] = useState(null);
     const [broken, setBroken] = useState(false);
     useEffect(() => {
@@ -28,24 +29,12 @@ export const BelongsToDisplayWidget = (props) => {
     if (!object) {
         return React.createElement(S.Spinner, { spin: true, icon: "spinner" });
     }
-    return (React.createElement(S.Container, null,
-        React.createElement(BelongsToStringWidget, { model: object }),
+    return (React.createElement(S.Container, { className: props.className },
+        object.data.display,
         React.createElement(TableButtonWidget, { icon: "arrow-right", action: () => {
                 props.open(object);
             } })));
-};
-export const BelongsToStringWidget = ({ model }) => {
-    const [display, setDisplay] = useState();
-    useEffect(() => {
-        model.displayValue().then((value) => {
-            setDisplay(value);
-        });
-    }, []);
-    if (!display) {
-        return React.createElement(S.Spinner, { spin: true, icon: "spinner" });
-    }
-    return React.createElement("span", null, display);
-};
+});
 var S;
 (function (S) {
     S.Warning = styled(TableButtonWidget) `

package/dist/core/query/widgets/BelongsToDisplayWidget.js.map

@@ -1 +1 @@
-{"version":3,"file":"BelongsToDisplayWidget.js","sourceRoot":"","sources":["../../../../src/core/query/widgets/BelongsToDisplayWidget.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"BelongsToDisplayWidget.js","sourceRoot":"","sources":["../../../../src/core/query/widgets/BelongsToDisplayWidget.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAC/B,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AAG5C,OAAO,EAAE,UAAU,EAAE,MAAM,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AACtF,OAAO,EAAE,mBAAmB,EAAE,MAAM,qCAAqC,CAAC;AAE1E,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAUtC,MAAM,CAAC,MAAM,sBAAsB,GAA0C,QAAQ,CAAC,CAAC,KAAK,EAAE,EAAE;IAC9F,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,GAAG,QAAQ,CAAoB,IAAI,CAAC,CAAC;IAC9D,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC;IAE5C,SAAS,CAAC,GAAG,EAAE;QACb,IAAI,CAAC,KAAK,CAAC,EAAE,EAAE,CAAC;YACd,OAAO;QACT,CAAC;QAED,KAAK,CAAC,UAAU,CAAC,kCAAkC,CAAC,KAAK,CAAC,YAAY,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CACrG,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE;YAClC,IAAI,CAAC,GAAG,EAAE,CAAC;gBACT,SAAS,CAAC,IAAI,CAAC,CAAC;gBAChB,OAAO;YACT,CAAC;YACD,SAAS,CAAC,GAAG,CAAC,CAAC;QACjB,CAAC,CAAC,CACH,CAAC;IACJ,CAAC,EAAE,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,CAAC;IAEf,IAAI,MAAM,EAAE,CAAC;QACX,OAAO,CACL,oBAAC,CAAC,CAAC,OAAO,IACR,OAAO,EAAC,SAAS,EACjB,KAAK,EAAE,GAAG,KAAK,CAAC,EAAE,YAAY,EAC9B,IAAI,EAAC,SAAS,EACd,MAAM,EAAE,GAAG,EAAE;gBACX,mBAAmB,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;YAChC,CAAC,GACD,CACH,CAAC;IACJ,CAAC;IAED,IAAI,CAAC,KAAK,CAAC,EAAE,EAAE,CAAC;QACd,OAAO,oBAAC,CAAC,CAAC,KAAK,kBAAkB,CAAC;IACpC,CAAC;IAED,IAAI,CAAC,MAAM,EAAE,CAAC;QACZ,OAAO,oBAAC,CAAC,CAAC,OAAO,IAAC,IAAI,EAAE,IAAI,EAAE,IAAI,EAAC,SAAS,GAAG,CAAC;IAClD,CAAC;IAED,OAAO,CACL,oBAAC,CAAC,CAAC,SAAS,IAAC,SAAS,EAAE,KAAK,CAAC,SAAS;QACpC,MAAM,CAAC,IAAI,CAAC,OAAO;QACpB,oBAAC,iBAAiB,IAChB,IAAI,EAAC,aAAa,EAClB,MAAM,EAAE,GAAG,EAAE;gBACX,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;YACrB,CAAC,GACD,CACU,CACf,CAAC;AACJ,CAAC,CAAC,CAAC;AAEH,IAAU,CAAC,CAsBV;AAtBD,WAAU,CAAC;IACI,SAAO,GAAG,MAAM,CAAC,iBAAiB,CAAC,CAAA;;;GAG/C,CAAC;IAEW,OAAK,GAAG,MAAM,CAAC,GAAG,CAAA;;GAE9B,CAAC;IAEW,SAAO,GAAG,MAAM,CAAC,UAAU,CAAC,CAAA;;GAExC,CAAC;IAEW,WAAS,GAAG,MAAM,CAAC,GAAG,CAAA;;;;;;;GAOlC,CAAC;AACJ,CAAC,EAtBS,CAAC,KAAD,CAAC,QAsBV"}

package/dist/core/query/widgets/CellDisplayWidget.js

@@ -1,92 +1,32 @@
-import { CheckboxWidget, ImageMedia, MetadataWidget, SmartDateDisplayWidget, styled } from '@journeyapps-labs/reactor-mod';
-import { Attachment, Day, Location } from '@journeyapps/db';
-import * as _ from 'lodash';
+import { ioc, SmartDateDisplayWidget, styled } from '@journeyapps-labs/reactor-mod';
 import * as React from 'react';
+import { TypeEngine } from '../../../forms/TypeEngine';
 var S;
 (function (S) {
     S.Empty = styled.div `
     opacity: 0.2;
   `;
-    S.Preview = styled.img `
-    max-height: 40px;
-    max-width: 40px;
-    cursor: pointer;
-  `;
-    S.pill = styled.div `
-    padding: 2px 4px;
-    background: ${(p) => p.theme.table.pills};
-    border-radius: 3px;
-    font-size: 12px;
-  `;
-    S.Pills = styled.div `
-    display: flex;
-    column-gap: 2px;
-    row-gap: 2px;
-  `;
-    S.Max = styled.div `
-    max-width: 500px;
-    white-space: pre;
-    display: inline;
-    overflow: hidden;
-    text-overflow: ellipsis;
-  `;
 })(S || (S = {}));
-const MAX_NUMBER_OF_ARR_ITEMS_TO_DISPLAY = 3;
 export const CellDisplayWidget = (props) => {
-    const { row, cell, variable } = props;
+    var _a;
+    const { row, cell, name } = props;
     if (cell == null) {
         return React.createElement(S.Empty, null, "null");
     }
-    if (_.isString(cell)) {
-        if (cell.trim() === '') {
-            return React.createElement(S.Empty, null, "empty");
-        }
-        return React.createElement(S.Max, null, cell);
-    }
-    if (_.isNumber(cell)) {
-        return cell;
-    }
-    if (_.isArray(cell)) {
-        if (cell.length === 0) {
-            return React.createElement(S.Empty, null, "empty array");
-        }
-        let items = _.slice(cell, 0, MAX_NUMBER_OF_ARR_ITEMS_TO_DISPLAY);
-        return (React.createElement(S.Pills, null,
-            items.map((c) => {
-                return React.createElement(S.pill, { key: c }, c);
-            }),
-            items.length !== cell.length ? '...' : null));
-    }
-    if (cell instanceof Date) {
+    if (name === 'updated_at') {
         return React.createElement(SmartDateDisplayWidget, { date: cell });
     }
-    if (cell instanceof Day) {
-        return React.createElement(SmartDateDisplayWidget, { date: cell.toDate() });
-    }
-    if (_.isBoolean(cell)) {
-        return React.createElement(CheckboxWidget, { checked: cell, onChange: () => { } });
-    }
-    if (cell instanceof Location) {
-        return (React.createElement(React.Fragment, null,
-            React.createElement(MetadataWidget, { label: 'Lat', value: `${cell.latitude}` }),
-            React.createElement(MetadataWidget, { label: 'Long', value: `${cell.longitude}` })));
-    }
-    if (cell instanceof Attachment) {
-        if (cell.uploaded()) {
-            return (React.createElement(S.Preview, { onClick: () => {
-                    row.model.getMedia(variable.name).then((media) => {
-                        if (media instanceof ImageMedia) {
-                            media.open();
-                        }
-                        else {
-                            window.open(cell.url(), '_blank');
-                        }
-                    });
-                }, src: cell.urls['thumbnail'] }));
-        }
-        return React.createElement(S.Empty, null, "Not uploaded");
-    }
-    console.log('unknown type', cell);
+    let display = (_a = ioc.get(TypeEngine).getHandler(row.definition.definition.attributes[name].type)) === null || _a === void 0 ? void 0 : _a.generateDisplay({
+        model: row.model,
+        value: cell,
+        label: row.definition.definition.attributes[name].label,
+        name,
+        type: row.definition.definition.attributes[name].type
+    });
+    if (display) {
+        return display;
+    }
+    console.log('unknown type', cell, row.definition.definition.attributes[name].type);
     return null;
 };
 //# sourceMappingURL=CellDisplayWidget.js.map

package/dist/core/query/widgets/CellDisplayWidget.js.map

@@ -1 +1 @@
-{"version":3,"file":"CellDisplayWidget.js","sourceRoot":"","sources":["../../../../src/core/query/widgets/CellDisplayWidget.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"CellDisplayWidget.js","sourceRoot":"","sources":["../../../../src/core/query/widgets/CellDisplayWidget.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,sBAAsB,EAAE,MAAM,EAAE,MAAM,+BAA+B,CAAC;AAEpF,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAE/B,OAAO,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;AAEvD,IAAU,CAAC,CAIV;AAJD,WAAU,CAAC;IACI,OAAK,GAAG,MAAM,CAAC,GAAG,CAAA;;GAE9B,CAAC;AACJ,CAAC,EAJS,CAAC,KAAD,CAAC,QAIV;AAQD,MAAM,CAAC,MAAM,iBAAiB,GAAqC,CAAC,KAAK,EAAE,EAAE;;IAC3E,MAAM,EAAE,GAAG,EAAE,IAAI,EAAE,IAAI,EAAE,GAAG,KAAK,CAAC;IAClC,IAAI,IAAI,IAAI,IAAI,EAAE,CAAC;QACjB,OAAO,oBAAC,CAAC,CAAC,KAAK,eAAe,CAAC;IACjC,CAAC;IAED,IAAI,IAAI,KAAK,YAAY,EAAE,CAAC;QAC1B,OAAO,oBAAC,sBAAsB,IAAC,IAAI,EAAE,IAAI,GAAI,CAAC;IAChD,CAAC;IAED,IAAI,OAAO,GAAG,MAAA,GAAG,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC,UAAU,CAAC,GAAG,CAAC,UAAU,CAAC,UAAU,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,0CAAE,eAAe,CAAC;QAC7G,KAAK,EAAE,GAAG,CAAC,KAAK;QAChB,KAAK,EAAE,IAAI;QACX,KAAK,EAAE,GAAG,CAAC,UAAU,CAAC,UAAU,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,KAAK;QACvD,IAAI;QACJ,IAAI,EAAE,GAAG,CAAC,UAAU,CAAC,UAAU,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,IAAI;KACtD,CAAC,CAAC;IACH,IAAI,OAAO,EAAE,CAAC;QACZ,OAAO,OAAO,CAAC;IACjB,CAAC;IAED,OAAO,CAAC,GAAG,CAAC,cAAc,EAAE,IAAI,EAAE,GAAG,CAAC,UAAU,CAAC,UAAU,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,CAAC;IACnF,OAAO,IAAI,CAAC;AACd,CAAC,CAAC"}

package/dist/core/query/widgets/ColumnDisplayWidget.js

@@ -3,12 +3,12 @@ import styled from '@emotion/styled';
 export const ColumnDisplayWidget = (props) => {
     let parts = (props.label || '').split(' ');
     if (parts.length >= 5) {
-        return React.createElement(S.Width, { length: 150 }, props.label);
+        return (React.createElement(S.Width, { className: props.className, length: 150 }, props.label));
     }
     if (parts.length >= 3) {
-        return React.createElement(S.Width, { length: 80 }, props.label);
+        return (React.createElement(S.Width, { className: props.className, length: 80 }, props.label));
     }
-    return React.createElement(S.Span, null, props.label);
+    return React.createElement(S.Span, { className: props.className }, props.label);
 };
 var S;
 (function (S) {

package/dist/core/query/widgets/ColumnDisplayWidget.js.map

@@ -1 +1 @@
-{"version":3,"file":"ColumnDisplayWidget.js","sourceRoot":"","sources":["../../../../src/core/query/widgets/ColumnDisplayWidget.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAC/B,OAAO,MAAM,MAAM,iBAAiB,CAAC;AAMrC,MAAM,CAAC,MAAM,mBAAmB,GAAuC,CAAC,KAAK,EAAE,EAAE;IAC/E,IAAI,KAAK,GAAG,CAAC,KAAK,CAAC,KAAK,IAAI,EAAE,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IAC3C,IAAI,KAAK,CAAC,MAAM,IAAI,CAAC,EAAE,CAAC;QACtB,OAAO,oBAAC,CAAC,CAAC,KAAK,IAAC,MAAM,EAAE,GAAG,IAAG,KAAK,CAAC,KAAK,CAAW,CAAC;IACvD,CAAC;IACD,IAAI,KAAK,CAAC,MAAM,IAAI,CAAC,EAAE,CAAC;QACtB,OAAO,oBAAC,CAAC,CAAC,KAAK,IAAC,MAAM,EAAE,EAAE,IAAG,KAAK,CAAC,KAAK,CAAW,CAAC;IACtD,CAAC;IACD,OAAO,oBAAC,CAAC,CAAC,IAAI,QAAE,KAAK,CAAC,KAAK,CAAU,CAAC;AACxC,CAAC,CAAC;AAEF,IAAU,CAAC,CAQV;AARD,WAAU,CAAC;IACI,OAAK,GAAG,MAAM,CAAC,GAAG,CAAoB;iBACpC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM;GAC7B,CAAC;IAEW,MAAI,GAAG,MAAM,CAAC,GAAG,CAAA;;GAE7B,CAAC;AACJ,CAAC,EARS,CAAC,KAAD,CAAC,QAQV"}
+{"version":3,"file":"ColumnDisplayWidget.js","sourceRoot":"","sources":["../../../../src/core/query/widgets/ColumnDisplayWidget.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAC/B,OAAO,MAAM,MAAM,iBAAiB,CAAC;AAOrC,MAAM,CAAC,MAAM,mBAAmB,GAAuC,CAAC,KAAK,EAAE,EAAE;IAC/E,IAAI,KAAK,GAAG,CAAC,KAAK,CAAC,KAAK,IAAI,EAAE,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IAC3C,IAAI,KAAK,CAAC,MAAM,IAAI,CAAC,EAAE,CAAC;QACtB,OAAO,CACL,oBAAC,CAAC,CAAC,KAAK,IAAC,SAAS,EAAE,KAAK,CAAC,SAAS,EAAE,MAAM,EAAE,GAAG,IAC7C,KAAK,CAAC,KAAK,CACJ,CACX,CAAC;IACJ,CAAC;IACD,IAAI,KAAK,CAAC,MAAM,IAAI,CAAC,EAAE,CAAC;QACtB,OAAO,CACL,oBAAC,CAAC,CAAC,KAAK,IAAC,SAAS,EAAE,KAAK,CAAC,SAAS,EAAE,MAAM,EAAE,EAAE,IAC5C,KAAK,CAAC,KAAK,CACJ,CACX,CAAC;IACJ,CAAC;IACD,OAAO,oBAAC,CAAC,CAAC,IAAI,IAAC,SAAS,EAAE,KAAK,CAAC,SAAS,IAAG,KAAK,CAAC,KAAK,CAAU,CAAC;AACpE,CAAC,CAAC;AAEF,IAAU,CAAC,CAQV;AARD,WAAU,CAAC;IACI,OAAK,GAAG,MAAM,CAAC,GAAG,CAAoB;iBACpC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM;GAC7B,CAAC;IAEW,MAAI,GAAG,MAAM,CAAC,GAAG,CAAA;;GAE7B,CAAC;AACJ,CAAC,EARS,CAAC,KAAD,CAAC,QAQV"}

package/dist/core/query/widgets/SmartBelongsToDisplayWidget.js

@@ -0,0 +1,29 @@
+import * as React from 'react';
+import { EditSchemaModelAction } from '../../../actions/schema-model/EditSchemaModelAction';
+import { BelongsToDisplayWidget } from './BelongsToDisplayWidget';
+import { ActionSource, styled } from '@journeyapps-labs/reactor-mod';
+import { observer } from 'mobx-react';
+export const SmartBelongsToDisplayWidget = observer((props) => {
+    var _a;
+    const { row, connection, variable_id } = props;
+    let dirty = false;
+    let value = row.model.model[variable_id.name];
+    if (row.model.patch.has(variable_id.relationship)) {
+        value = (_a = row.model.patch.get(variable_id.relationship)) === null || _a === void 0 ? void 0 : _a.id;
+        dirty = true;
+    }
+    return (React.createElement(S.Container, { dirty: dirty, open: (object) => {
+            EditSchemaModelAction.get().fireAction({
+                source: ActionSource.BUTTON,
+                targetEntity: object
+            });
+        }, relationship: row.model.definition.definition.belongsTo[variable_id.relationship], connection: connection, id: value }));
+});
+var S;
+(function (S) {
+    S.Container = styled(BelongsToDisplayWidget) `
+    border-left: solid 4px ${(p) => (p.dirty ? p.theme.status.success : 'transparent')};
+    padding-left: 2px;
+  `;
+})(S || (S = {}));
+//# sourceMappingURL=SmartBelongsToDisplayWidget.js.map

package/dist/core/query/widgets/SmartBelongsToDisplayWidget.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"SmartBelongsToDisplayWidget.js","sourceRoot":"","sources":["../../../../src/core/query/widgets/SmartBelongsToDisplayWidget.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAC/B,OAAO,EAAE,qBAAqB,EAAE,MAAM,qDAAqD,CAAC;AAC5F,OAAO,EAAE,sBAAsB,EAAE,MAAM,0BAA0B,CAAC;AAElE,OAAO,EAAE,YAAY,EAAE,MAAM,EAAE,MAAM,+BAA+B,CAAC;AAGrE,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAQtC,MAAM,CAAC,MAAM,2BAA2B,GAA+C,QAAQ,CAAC,CAAC,KAAK,EAAE,EAAE;;IACxG,MAAM,EAAE,GAAG,EAAE,UAAU,EAAE,WAAW,EAAE,GAAG,KAAK,CAAC;IAE/C,IAAI,KAAK,GAAG,KAAK,CAAC;IAClB,IAAI,KAAK,GAAG,GAAG,CAAC,KAAK,CAAC,KAAK,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;IAC9C,IAAI,GAAG,CAAC,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,WAAW,CAAC,YAAY,CAAC,EAAE,CAAC;QAClD,KAAK,GAAG,MAAA,GAAG,CAAC,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,WAAW,CAAC,YAAY,CAAC,0CAAE,EAAE,CAAC;QAC1D,KAAK,GAAG,IAAI,CAAC;IACf,CAAC;IAED,OAAO,CACL,oBAAC,CAAC,CAAC,SAAS,IACV,KAAK,EAAE,KAAK,EACZ,IAAI,EAAE,CAAC,MAAM,EAAE,EAAE;YACf,qBAAqB,CAAC,GAAG,EAAE,CAAC,UAAU,CAAC;gBACrC,MAAM,EAAE,YAAY,CAAC,MAAM;gBAC3B,YAAY,EAAE,MAAM;aACrB,CAAC,CAAC;QACL,CAAC,EACD,YAAY,EAAE,GAAG,CAAC,KAAK,CAAC,UAAU,CAAC,UAAU,CAAC,SAAS,CAAC,WAAW,CAAC,YAAY,CAAC,EACjF,UAAU,EAAE,UAAU,EACtB,EAAE,EAAE,KAAK,GACT,CACH,CAAC;AACJ,CAAC,CAAC,CAAC;AACH,IAAU,CAAC,CAKV;AALD,WAAU,CAAC;IACI,WAAS,GAAG,MAAM,CAAC,sBAAsB,CAAC,CAAoB;6BAChD,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,aAAa,CAAC;;GAEnF,CAAC;AACJ,CAAC,EALS,CAAC,KAAD,CAAC,QAKV"}

package/dist/core/query/widgets/SmartCellDisplayWidget.js

@@ -0,0 +1,20 @@
+import * as React from 'react';
+import { observer } from 'mobx-react';
+import { CellDisplayWidget } from './CellDisplayWidget';
+import { styled } from '@journeyapps-labs/reactor-mod';
+export const SmartCellDisplayWidget = observer((props) => {
+    let value = props.row.model.model[props.name];
+    if (props.row.model.patch.has(props.name)) {
+        value = props.row.model.patch.get(props.name);
+    }
+    return (React.createElement(S.Container, { dirty: props.row.model.patch.has(props.name) },
+        React.createElement(CellDisplayWidget, Object.assign({}, props, { cell: value }))));
+});
+var S;
+(function (S) {
+    S.Container = styled.div `
+    border-left: solid 4px ${(p) => (p.dirty ? p.theme.status.success : 'transparent')};
+    padding-left: 2px;
+  `;
+})(S || (S = {}));
+//# sourceMappingURL=SmartCellDisplayWidget.js.map

package/dist/core/query/widgets/SmartCellDisplayWidget.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"SmartCellDisplayWidget.js","sourceRoot":"","sources":["../../../../src/core/query/widgets/SmartCellDisplayWidget.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAC/B,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAEtC,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AACxD,OAAO,EAAE,MAAM,EAAE,MAAM,+BAA+B,CAAC;AAOvD,MAAM,CAAC,MAAM,sBAAsB,GAA0C,QAAQ,CAAC,CAAC,KAAK,EAAE,EAAE;IAC9F,IAAI,KAAK,GAAG,KAAK,CAAC,GAAG,CAAC,KAAK,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IAC9C,IAAI,KAAK,CAAC,GAAG,CAAC,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC;QAC1C,KAAK,GAAG,KAAK,CAAC,GAAG,CAAC,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IAChD,CAAC;IAED,OAAO,CACL,oBAAC,CAAC,CAAC,SAAS,IAAC,KAAK,EAAE,KAAK,CAAC,GAAG,CAAC,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC;QACvD,oBAAC,iBAAiB,oBAAK,KAAK,IAAE,IAAI,EAAE,KAAK,IAAI,CACjC,CACf,CAAC;AACJ,CAAC,CAAC,CAAC;AACH,IAAU,CAAC,CAKV;AALD,WAAU,CAAC;IACI,WAAS,GAAG,MAAM,CAAC,GAAG,CAAoB;6BAC5B,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,aAAa,CAAC;;GAEnF,CAAC;AACJ,CAAC,EALS,CAAC,KAAD,CAAC,QAKV"}

package/dist/core/query/widgets/SmartColumnWidget.js

@@ -3,8 +3,14 @@ import styled from '@emotion/styled';
 import { ColumnDisplayWidget } from './ColumnDisplayWidget';
 import { SmartFilterWidget } from './SmartFilterWidget';
 export const SmartColumnWidget = (props) => {
+    let display = React.createElement(ColumnDisplayWidget, { label: props.variable.label || props.variable.name });
+    if (props.type) {
+        display = (React.createElement(S.TypeGroup, null,
+            display,
+            React.createElement(S.Type, { label: props.type.label })));
+    }
     return (React.createElement(S.Container, null,
-        React.createElement(ColumnDisplayWidget, { label: props.variable.label }),
+        display,
         React.createElement(SmartFilterWidget, { filter: props.filter, variable: props.variable, filterChanged: props.filterChanged })));
 };
 var S;
@@ -15,5 +21,9 @@ var S;
     align-items: center;
     column-gap: 5px;
   `;
+    S.Type = styled(ColumnDisplayWidget) `
+    opacity: 0.5;
+  `;
+    S.TypeGroup = styled.div ``;
 })(S || (S = {}));
 //# sourceMappingURL=SmartColumnWidget.js.map

package/dist/core/query/widgets/SmartColumnWidget.js.map

@@ -1 +1 @@
-{"version":3,"file":"SmartColumnWidget.js","sourceRoot":"","sources":["../../../../src/core/query/widgets/SmartColumnWidget.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAC/B,OAAO,MAAM,MAAM,iBAAiB,CAAC;AAErC,OAAO,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AAC5D,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AASxD,MAAM,CAAC,MAAM,iBAAiB,GAAqC,CAAC,KAAK,EAAE,EAAE;IAC3E,OAAO,CACL,oBAAC,CAAC,CAAC,SAAS;QACV,oBAAC,mBAAmB,IAAC,KAAK,EAAE,KAAK,CAAC,QAAQ,CAAC,KAAK,GAAI;QACpD,oBAAC,iBAAiB,IAAC,MAAM,EAAE,KAAK,CAAC,MAAM,EAAE,QAAQ,EAAE,KAAK,CAAC,QAAQ,EAAE,aAAa,EAAE,KAAK,CAAC,aAAa,GAAI,CAC7F,CACf,CAAC;AACJ,CAAC,CAAC;AAEF,IAAU,CAAC,CAOV;AAPD,WAAU,CAAC;IACI,WAAS,GAAG,MAAM,CAAC,GAAG,CAAA;;;;;GAKlC,CAAC;AACJ,CAAC,EAPS,CAAC,KAAD,CAAC,QAOV"}
+{"version":3,"file":"SmartColumnWidget.js","sourceRoot":"","sources":["../../../../src/core/query/widgets/SmartColumnWidget.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAC/B,OAAO,MAAM,MAAM,iBAAiB,CAAC;AAErC,OAAO,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AAC5D,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AAUxD,MAAM,CAAC,MAAM,iBAAiB,GAAqC,CAAC,KAAK,EAAE,EAAE;IAC3E,IAAI,OAAO,GAAG,oBAAC,mBAAmB,IAAC,KAAK,EAAE,KAAK,CAAC,QAAQ,CAAC,KAAK,IAAI,KAAK,CAAC,QAAQ,CAAC,IAAI,GAAI,CAAC;IAC1F,IAAI,KAAK,CAAC,IAAI,EAAE,CAAC;QACf,OAAO,GAAG,CACR,oBAAC,CAAC,CAAC,SAAS;YACT,OAAO;YACR,oBAAC,CAAC,CAAC,IAAI,IAAC,KAAK,EAAE,KAAK,CAAC,IAAI,CAAC,KAAK,GAAI,CACvB,CACf,CAAC;IACJ,CAAC;IACD,OAAO,CACL,oBAAC,CAAC,CAAC,SAAS;QACT,OAAO;QACR,oBAAC,iBAAiB,IAAC,MAAM,EAAE,KAAK,CAAC,MAAM,EAAE,QAAQ,EAAE,KAAK,CAAC,QAAQ,EAAE,aAAa,EAAE,KAAK,CAAC,aAAa,GAAI,CAC7F,CACf,CAAC;AACJ,CAAC,CAAC;AAEF,IAAU,CAAC,CAaV;AAbD,WAAU,CAAC;IACI,WAAS,GAAG,MAAM,CAAC,GAAG,CAAA;;;;;GAKlC,CAAC;IAEW,MAAI,GAAG,MAAM,CAAC,mBAAmB,CAAC,CAAA;;GAE9C,CAAC;IAEW,WAAS,GAAG,MAAM,CAAC,GAAG,CAAA,EAAE,CAAC;AACxC,CAAC,EAbS,CAAC,KAAD,CAAC,QAaV"}

package/dist/entities/ConnectionEntityDefinition.js

@@ -40,6 +40,11 @@ let ConnectionEntityDefinition = (() => {
                     descendantType: DataBrowserEntities.SCHEMA_MODEL_DEFINITION,
                     generateOptions: (parent) => {
                         return {
+                            category: {
+                                label: 'Models',
+                                icon: 'cube',
+                                openDefault: true
+                            },
                             descendants: parent.schema_models.items
                         };
                     }

package/dist/entities/ConnectionEntityDefinition.js.map

@@ -1 +1 @@
-{"version":3,"file":"ConnectionEntityDefinition.js","sourceRoot":"","sources":["../../src/entities/ConnectionEntityDefinition.tsx"],"names":[],"mappings":";AAAA,OAAO,EACL,iCAAiC,EACjC,gBAAgB,EAChB,wBAAwB,EACxB,oBAAoB,EACpB,MAAM,EACN,4BAA4B,EAC5B,iCAAiC,EAClC,MAAM,+BAA+B,CAAC;AACvC,OAAO,EAAE,mBAAmB,EAAE,MAAM,aAAa,CAAC;AAClD,OAAO,EAAE,eAAe,EAAE,MAAM,2BAA2B,CAAC;AAC5D,OAAO,EAAE,kBAAkB,EAAE,MAAM,4BAA4B,CAAC;AAChE,OAAO,EAAE,mBAAmB,EAAE,MAAM,4CAA4C,CAAC;IAEpE,0BAA0B;;sBAAS,gBAAgB;;;;sBAAnD,0BAA2B,SAAQ,WAAoC;YAElF,IAAS,eAAe,8GAAkB;YAA1C,IAAS,eAAe,mHAAkB;YAE1C;gBACE,KAAK,CAAC;oBACJ,IAAI,EAAE,mBAAmB,CAAC,UAAU;oBACpC,QAAQ,EAAE,aAAa;oBACvB,KAAK,EAAE,YAAY;oBACnB,IAAI,EAAE,UAAU;oBAChB,SAAS,EAAE,MAAM;iBAClB,CAAC,CAAC;gBATI,uIAAiC;;gBAWxC,IAAI,CAAC,iBAAiB,CACpB,IAAI,wBAAwB,CAAqB;oBAC/C,KAAK,EAAE,QAAQ;oBACf,QAAQ,EAAE,CAAC,MAA0B,EAAE,EAAE;wBACvC,OAAO,MAAM,CAAC,IAAI,CAAC;oBACrB,CAAC;iBACF,CAAC,CACH,CAAC;gBAEF,IAAI,CAAC,iBAAiB,CACpB,IAAI,iCAAiC,CAAqB;oBACxD,KAAK,EAAE,QAAQ;oBACf,WAAW,EAAE,KAAK,IAAI,EAAE;wBACtB,OAAO,IAAI,CAAC,eAAe,CAAC,WAAW,CAAC;oBAC1C,CAAC;iBACF,CAAC,CACH,CAAC;gBAEF,IAAI,CAAC,iBAAiB,CAAC,IAAI,4BAA4B,EAAsB,CAAC,CAAC;gBAE/E,IAAI,CAAC,iBAAiB,CACpB,IAAI,iCAAiC,CAAqB;oBACxD,cAAc,EAAE,mBAAmB,CAAC,uBAAuB;oBAC3D,eAAe,EAAE,CAAC,MAAM,EAAE,EAAE;wBAC1B,OAAO;4BACL,WAAW,EAAE,MAAM,CAAC,aAAa,CAAC,KAAK;yBACxC,CAAC;oBACJ,CAAC;iBACF,CAAC,CACH,CAAC;gBAEF,IAAI,CAAC,iBAAiB,CACpB,IAAI,oBAAoB,CAAqB;oBAC3C,KAAK,EAAE,aAAa;oBACpB,WAAW,EAAE,GAAG,EAAE;wBAChB,OAAO,IAAI,CAAC,eAAe,CAAC,WAAW,CAAC;oBAC1C,CAAC;oBACD,iBAAiB,EAAE,CAAC,mBAAmB,CAAC,EAAE,CAAC;iBAC5C,CAAC,CACH,CAAC;aACH;YAED,WAAW,CAAC,CAAM;gBAChB,IAAI,CAAC,YAAY,kBAAkB,EAAE,CAAC;oBACpC,OAAO,IAAI,CAAC;gBACd,CAAC;YACH,CAAC;YAED,YAAY,CAAC,CAAqB;gBAChC,OAAO,CAAC,CAAC,EAAE,CAAC;YACd,CAAC;;;;;;2CA9DA,MAAM,CAAC,eAAe,CAAC;YACxB,gMAAS,eAAe,6BAAf,eAAe,yGAAkB;;;;;SAF/B,0BAA0B"}
+{"version":3,"file":"ConnectionEntityDefinition.js","sourceRoot":"","sources":["../../src/entities/ConnectionEntityDefinition.tsx"],"names":[],"mappings":";AAAA,OAAO,EACL,iCAAiC,EACjC,gBAAgB,EAChB,wBAAwB,EACxB,oBAAoB,EACpB,MAAM,EACN,4BAA4B,EAC5B,iCAAiC,EAClC,MAAM,+BAA+B,CAAC;AACvC,OAAO,EAAE,mBAAmB,EAAE,MAAM,aAAa,CAAC;AAClD,OAAO,EAAE,eAAe,EAAE,MAAM,2BAA2B,CAAC;AAC5D,OAAO,EAAE,kBAAkB,EAAE,MAAM,4BAA4B,CAAC;AAChE,OAAO,EAAE,mBAAmB,EAAE,MAAM,4CAA4C,CAAC;IAEpE,0BAA0B;;sBAAS,gBAAgB;;;;sBAAnD,0BAA2B,SAAQ,WAAoC;YAElF,IAAS,eAAe,8GAAkB;YAA1C,IAAS,eAAe,mHAAkB;YAE1C;gBACE,KAAK,CAAC;oBACJ,IAAI,EAAE,mBAAmB,CAAC,UAAU;oBACpC,QAAQ,EAAE,aAAa;oBACvB,KAAK,EAAE,YAAY;oBACnB,IAAI,EAAE,UAAU;oBAChB,SAAS,EAAE,MAAM;iBAClB,CAAC,CAAC;gBATI,uIAAiC;;gBAWxC,IAAI,CAAC,iBAAiB,CACpB,IAAI,wBAAwB,CAAqB;oBAC/C,KAAK,EAAE,QAAQ;oBACf,QAAQ,EAAE,CAAC,MAA0B,EAAE,EAAE;wBACvC,OAAO,MAAM,CAAC,IAAI,CAAC;oBACrB,CAAC;iBACF,CAAC,CACH,CAAC;gBAEF,IAAI,CAAC,iBAAiB,CACpB,IAAI,iCAAiC,CAAqB;oBACxD,KAAK,EAAE,QAAQ;oBACf,WAAW,EAAE,KAAK,IAAI,EAAE;wBACtB,OAAO,IAAI,CAAC,eAAe,CAAC,WAAW,CAAC;oBAC1C,CAAC;iBACF,CAAC,CACH,CAAC;gBAEF,IAAI,CAAC,iBAAiB,CAAC,IAAI,4BAA4B,EAAsB,CAAC,CAAC;gBAE/E,IAAI,CAAC,iBAAiB,CACpB,IAAI,iCAAiC,CAAqB;oBACxD,cAAc,EAAE,mBAAmB,CAAC,uBAAuB;oBAC3D,eAAe,EAAE,CAAC,MAAM,EAAE,EAAE;wBAC1B,OAAO;4BACL,QAAQ,EAAE;gCACR,KAAK,EAAE,QAAQ;gCACf,IAAI,EAAE,MAAM;gCACZ,WAAW,EAAE,IAAI;6BAClB;4BACD,WAAW,EAAE,MAAM,CAAC,aAAa,CAAC,KAAK;yBACxC,CAAC;oBACJ,CAAC;iBACF,CAAC,CACH,CAAC;gBAEF,IAAI,CAAC,iBAAiB,CACpB,IAAI,oBAAoB,CAAqB;oBAC3C,KAAK,EAAE,aAAa;oBACpB,WAAW,EAAE,GAAG,EAAE;wBAChB,OAAO,IAAI,CAAC,eAAe,CAAC,WAAW,CAAC;oBAC1C,CAAC;oBACD,iBAAiB,EAAE,CAAC,mBAAmB,CAAC,EAAE,CAAC;iBAC5C,CAAC,CACH,CAAC;aACH;YAED,WAAW,CAAC,CAAM;gBAChB,IAAI,CAAC,YAAY,kBAAkB,EAAE,CAAC;oBACpC,OAAO,IAAI,CAAC;gBACd,CAAC;YACH,CAAC;YAED,YAAY,CAAC,CAAqB;gBAChC,OAAO,CAAC,CAAC,EAAE,CAAC;YACd,CAAC;;;;;;2CAnEA,MAAM,CAAC,eAAe,CAAC;YACxB,gMAAS,eAAe,6BAAf,eAAe,yGAAkB;;;;;SAF/B,0BAA0B"}

package/dist/entities/QueryEntityDefinition.js

@@ -2,8 +2,8 @@ import { __classPrivateFieldGet, __classPrivateFieldSet, __esDecorate, __runInit
 import { EntityDefinition, inject, InlineEntityEncoderComponent } from '@journeyapps-labs/reactor-mod';
 import { DataBrowserEntities } from '../entities';
 import { ConnectionStore } from '../stores/ConnectionStore';
-import { AbstractQuery } from '../core/query/AbstractQuery';
-import { SimpleQuery } from '../core/query/SimpleQuery';
+import { SimpleQuery } from '../core/query/query-simple/SimpleQuery';
+import { AbstractSerializableQuery } from '../core/query/AbstractSerializableQuery';
 let QueryEntityDefinition = (() => {
     var _a, _QueryEntityDefinition_connectionStore_accessor_storage;
     let _classSuper = EntityDefinition;
@@ -38,7 +38,7 @@ let QueryEntityDefinition = (() => {
                 }));
             }
             matchEntity(t) {
-                if (t instanceof AbstractQuery) {
+                if (t instanceof AbstractSerializableQuery) {
                     return true;
                 }
             }

package/dist/entities/QueryEntityDefinition.js.map

@@ -1 +1 @@
-{"version":3,"file":"QueryEntityDefinition.js","sourceRoot":"","sources":["../../src/entities/QueryEntityDefinition.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,EAAE,4BAA4B,EAAE,MAAM,+BAA+B,CAAC;AACvG,OAAO,EAAE,mBAAmB,EAAE,MAAM,aAAa,CAAC;AAClD,OAAO,EAAE,eAAe,EAAE,MAAM,2BAA2B,CAAC;AAC5D,OAAO,EAAE,aAAa,EAAwB,MAAM,6BAA6B,CAAC;AAClF,OAAO,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAC;IAE3C,qBAAqB;;sBAAS,gBAAgB;;;;sBAA9C,qBAAsB,SAAQ,WAA+B;YAExE,IAAS,eAAe,yGAAkB;YAA1C,IAAS,eAAe,8GAAkB;YAE1C;gBACE,KAAK,CAAC;oBACJ,IAAI,EAAE,mBAAmB,CAAC,KAAK;oBAC/B,QAAQ,EAAE,aAAa;oBACvB,KAAK,EAAE,OAAO;oBACd,IAAI,EAAE,QAAQ;oBACd,SAAS,EAAE,KAAK;iBACjB,CAAC,CAAC;gBATI,kIAAiC;;gBAWxC,IAAI,CAAC,iBAAiB,CACpB,IAAI,4BAA4B,CAAsC;oBACpE,OAAO,EAAE,CAAC;oBACV,MAAM,EAAE,CAAC,CAAC,EAAE,EAAE;wBACZ,OAAO,CAAC,CAAC,SAAS,EAAE,CAAC;oBACvB,CAAC;oBACD,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,EAAE;wBACvB,IAAI,MAAM,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;4BAC7B,IAAI,KAAK,GAAG,IAAI,WAAW,EAAE,CAAC;4BAC9B,MAAM,KAAK,CAAC,WAAW,CAAC,IAAI,CAAC,eAAe,EAAE,MAAa,CAAC,CAAC;4BAC7D,OAAO,KAAK,CAAC;wBACf,CAAC;oBACH,CAAC;iBACF,CAAC,CACH,CAAC;aACH;YAED,WAAW,CAAC,CAAM;gBAChB,IAAI,CAAC,YAAY,aAAa,EAAE,CAAC;oBAC/B,OAAO,IAAI,CAAC;gBACd,CAAC;YACH,CAAC;YAED,YAAY,CAAC,CAAgB;gBAC3B,OAAO,CAAC,CAAC,EAAE,CAAC;YACd,CAAC;;;;;;2CArCA,MAAM,CAAC,eAAe,CAAC;YACxB,gMAAS,eAAe,6BAAf,eAAe,yGAAkB;;;;;SAF/B,qBAAqB"}
+{"version":3,"file":"QueryEntityDefinition.js","sourceRoot":"","sources":["../../src/entities/QueryEntityDefinition.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,EAAE,4BAA4B,EAAE,MAAM,+BAA+B,CAAC;AACvG,OAAO,EAAE,mBAAmB,EAAE,MAAM,aAAa,CAAC;AAClD,OAAO,EAAE,eAAe,EAAE,MAAM,2BAA2B,CAAC;AAC5D,OAAO,EAAE,WAAW,EAAE,MAAM,wCAAwC,CAAC;AACrE,OAAO,EAAwB,yBAAyB,EAAE,MAAM,yCAAyC,CAAC;IAE7F,qBAAqB;;sBAAS,gBAAgB;;;;sBAA9C,qBAAsB,SAAQ,WAA2C;YAEpF,IAAS,eAAe,yGAAkB;YAA1C,IAAS,eAAe,8GAAkB;YAE1C;gBACE,KAAK,CAAC;oBACJ,IAAI,EAAE,mBAAmB,CAAC,KAAK;oBAC/B,QAAQ,EAAE,aAAa;oBACvB,KAAK,EAAE,OAAO;oBACd,IAAI,EAAE,QAAQ;oBACd,SAAS,EAAE,KAAK;iBACjB,CAAC,CAAC;gBATI,kIAAiC;;gBAWxC,IAAI,CAAC,iBAAiB,CACpB,IAAI,4BAA4B,CAAkD;oBAChF,OAAO,EAAE,CAAC;oBACV,MAAM,EAAE,CAAC,CAAC,EAAE,EAAE;wBACZ,OAAO,CAAC,CAAC,SAAS,EAAE,CAAC;oBACvB,CAAC;oBACD,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,EAAE;wBACvB,IAAI,MAAM,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;4BAC7B,IAAI,KAAK,GAAG,IAAI,WAAW,EAAE,CAAC;4BAC9B,MAAM,KAAK,CAAC,WAAW,CAAC,IAAI,CAAC,eAAe,EAAE,MAAa,CAAC,CAAC;4BAC7D,OAAO,KAAK,CAAC;wBACf,CAAC;oBACH,CAAC;iBACF,CAAC,CACH,CAAC;aACH;YAED,WAAW,CAAC,CAAM;gBAChB,IAAI,CAAC,YAAY,yBAAyB,EAAE,CAAC;oBAC3C,OAAO,IAAI,CAAC;gBACd,CAAC;YACH,CAAC;YAED,YAAY,CAAC,CAA4B;gBACvC,OAAO,CAAC,CAAC,EAAE,CAAC;YACd,CAAC;;;;;;2CArCA,MAAM,CAAC,eAAe,CAAC;YACxB,gMAAS,eAAe,6BAAf,eAAe,yGAAkB;;;;;SAF/B,qBAAqB"}

package/dist/entities/SchemaModelDefinitionEntityDefinition.js

@@ -1,8 +1,9 @@
 import { __classPrivateFieldGet, __classPrivateFieldSet, __esDecorate, __runInitializers } from "tslib";
-import { EntityDefinition, EntityDescriberComponent, inject, InlineEntityEncoderComponent, InlineTreePresenterComponent, SimpleParentEntitySearchEngine } from '@journeyapps-labs/reactor-mod';
+import { EntityActionHandlerComponent, EntityDefinition, EntityDescriberComponent, inject, InlineEntityEncoderComponent, InlineTreePresenterComponent, SimpleParentEntitySearchEngine } from '@journeyapps-labs/reactor-mod';
 import { DataBrowserEntities } from '../entities';
 import { ConnectionStore } from '../stores/ConnectionStore';
 import { SchemaModelDefinition } from '../core/SchemaModelDefinition';
+import { QuerySchemaModelAction } from '../actions/schema-definitions/QuerySchemaModelAction';
 let SchemaModelDefinitionEntityDefinition = (() => {
     var _a, _SchemaModelDefinitionEntityDefinition_connectionStore_accessor_storage;
     let _classSuper = EntityDefinition;
@@ -52,6 +53,7 @@ let SchemaModelDefinitionEntityDefinition = (() => {
                         return event.parameters.parent.schema_models.items;
                     }
                 }));
+                this.registerComponent(new EntityActionHandlerComponent(QuerySchemaModelAction.ID));
             }
             matchEntity(t) {
                 if (t instanceof SchemaModelDefinition) {

package/dist/entities/SchemaModelDefinitionEntityDefinition.js.map

@@ -1 +1 @@
-{"version":3,"file":"SchemaModelDefinitionEntityDefinition.js","sourceRoot":"","sources":["../../src/entities/SchemaModelDefinitionEntityDefinition.ts"],"names":[],"mappings":";AAAA,OAAO,EACL,gBAAgB,EAChB,wBAAwB,EACxB,MAAM,EACN,4BAA4B,EAC5B,4BAA4B,EAC5B,8BAA8B,EAC/B,MAAM,+BAA+B,CAAC;AACvC,OAAO,EAAE,mBAAmB,EAAE,MAAM,aAAa,CAAC;AAClD,OAAO,EAAE,eAAe,EAAE,MAAM,2BAA2B,CAAC;AAE5D,OAAO,EAAE,qBAAqB,EAAE,MAAM,+BAA+B,CAAC;IAOzD,qCAAqC;;sBAAS,gBAAgB;;;;sBAA9D,qCAAsC,SAAQ,WAAuC;YAEhG,IAAS,eAAe,yHAAkB;YAA1C,IAAS,eAAe,8HAAkB;YAE1C;gBACE,KAAK,CAAC;oBACJ,IAAI,EAAE,mBAAmB,CAAC,uBAAuB;oBACjD,QAAQ,EAAE,aAAa;oBACvB,KAAK,EAAE,yBAAyB;oBAChC,IAAI,EAAE,MAAM;oBACZ,SAAS,EAAE,cAAc;iBAC1B,CAAC,CAAC;gBATI,kJAAiC;;gBAWxC,IAAI,CAAC,iBAAiB,CACpB,IAAI,wBAAwB,CAAwB;oBAClD,KAAK,EAAE,QAAQ;oBACf,QAAQ,EAAE,CAAC,MAA6B,EAAE,EAAE;wBAC1C,OAAO;4BACL,UAAU,EAAE,MAAM,CAAC,UAAU,CAAC,KAAK;4BACnC,WAAW,EAAE,MAAM,CAAC,UAAU,CAAC,IAAI;yBACpC,CAAC;oBACJ,CAAC;iBACF,CAAC,CACH,CAAC;gBAEF,IAAI,CAAC,iBAAiB,CACpB,IAAI,4BAA4B,CAAsE;oBACpG,OAAO,EAAE,CAAC;oBACV,MAAM,EAAE,CAAC,CAAC,EAAE,EAAE;wBACZ,OAAO;4BACL,aAAa,EAAE,CAAC,CAAC,UAAU,CAAC,EAAE;4BAC9B,IAAI,EAAE,CAAC,CAAC,UAAU,CAAC,IAAI;yBACxB,CAAC;oBACJ,CAAC;oBACD,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,EAAE;wBACvB,IAAI,UAAU,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,yBAAyB,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC;wBAC5F,OAAO,UAAU,CAAC,kCAAkC,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;oBACpE,CAAC;iBACF,CAAC,CACH,CAAC;gBAEF,IAAI,CAAC,iBAAiB,CAAC,IAAI,4BAA4B,EAAE,CAAC,CAAC;gBAE3D,IAAI,CAAC,iBAAiB,CACpB,IAAI,8BAA8B,CAA4C;oBAC5E,KAAK,EAAE,QAAQ;oBACf,IAAI,EAAE,mBAAmB,CAAC,UAAU;oBACpC,WAAW,EAAE,KAAK,EAAE,KAAK,EAAE,EAAE;wBAC3B,OAAO,KAAK,CAAC,UAAU,CAAC,MAAM,CAAC,aAAa,CAAC,KAAK,CAAC;oBACrD,CAAC;iBACF,CAAC,CACH,CAAC;aACH;YAED,WAAW,CAAC,CAAM;gBAChB,IAAI,CAAC,YAAY,qBAAqB,EAAE,CAAC;oBACvC,OAAO,IAAI,CAAC;gBACd,CAAC;YACH,CAAC;YAED,YAAY,CAAC,CAAwB;gBACnC,OAAO,CAAC,CAAC,UAAU,CAAC,IAAI,CAAC;YAC3B,CAAC;;;;;;2CA7DA,MAAM,CAAC,eAAe,CAAC;YACxB,gMAAS,eAAe,6BAAf,eAAe,yGAAkB;;;;;SAF/B,qCAAqC"}
+{"version":3,"file":"SchemaModelDefinitionEntityDefinition.js","sourceRoot":"","sources":["../../src/entities/SchemaModelDefinitionEntityDefinition.ts"],"names":[],"mappings":";AAAA,OAAO,EACL,4BAA4B,EAC5B,gBAAgB,EAChB,wBAAwB,EACxB,MAAM,EACN,4BAA4B,EAC5B,4BAA4B,EAC5B,8BAA8B,EAC/B,MAAM,+BAA+B,CAAC;AACvC,OAAO,EAAE,mBAAmB,EAAE,MAAM,aAAa,CAAC;AAClD,OAAO,EAAE,eAAe,EAAE,MAAM,2BAA2B,CAAC;AAE5D,OAAO,EAAE,qBAAqB,EAAE,MAAM,+BAA+B,CAAC;AACtE,OAAO,EAAE,sBAAsB,EAAE,MAAM,sDAAsD,CAAC;IAOjF,qCAAqC;;sBAAS,gBAAgB;;;;sBAA9D,qCAAsC,SAAQ,WAAuC;YAEhG,IAAS,eAAe,yHAAkB;YAA1C,IAAS,eAAe,8HAAkB;YAE1C;gBACE,KAAK,CAAC;oBACJ,IAAI,EAAE,mBAAmB,CAAC,uBAAuB;oBACjD,QAAQ,EAAE,aAAa;oBACvB,KAAK,EAAE,yBAAyB;oBAChC,IAAI,EAAE,MAAM;oBACZ,SAAS,EAAE,cAAc;iBAC1B,CAAC,CAAC;gBATI,kJAAiC;;gBAWxC,IAAI,CAAC,iBAAiB,CACpB,IAAI,wBAAwB,CAAwB;oBAClD,KAAK,EAAE,QAAQ;oBACf,QAAQ,EAAE,CAAC,MAA6B,EAAE,EAAE;wBAC1C,OAAO;4BACL,UAAU,EAAE,MAAM,CAAC,UAAU,CAAC,KAAK;4BACnC,WAAW,EAAE,MAAM,CAAC,UAAU,CAAC,IAAI;yBACpC,CAAC;oBACJ,CAAC;iBACF,CAAC,CACH,CAAC;gBAEF,IAAI,CAAC,iBAAiB,CACpB,IAAI,4BAA4B,CAAsE;oBACpG,OAAO,EAAE,CAAC;oBACV,MAAM,EAAE,CAAC,CAAC,EAAE,EAAE;wBACZ,OAAO;4BACL,aAAa,EAAE,CAAC,CAAC,UAAU,CAAC,EAAE;4BAC9B,IAAI,EAAE,CAAC,CAAC,UAAU,CAAC,IAAI;yBACxB,CAAC;oBACJ,CAAC;oBACD,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,EAAE;wBACvB,IAAI,UAAU,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,yBAAyB,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC;wBAC5F,OAAO,UAAU,CAAC,kCAAkC,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;oBACpE,CAAC;iBACF,CAAC,CACH,CAAC;gBAEF,IAAI,CAAC,iBAAiB,CAAC,IAAI,4BAA4B,EAAE,CAAC,CAAC;gBAE3D,IAAI,CAAC,iBAAiB,CACpB,IAAI,8BAA8B,CAA4C;oBAC5E,KAAK,EAAE,QAAQ;oBACf,IAAI,EAAE,mBAAmB,CAAC,UAAU;oBACpC,WAAW,EAAE,KAAK,EAAE,KAAK,EAAE,EAAE;wBAC3B,OAAO,KAAK,CAAC,UAAU,CAAC,MAAM,CAAC,aAAa,CAAC,KAAK,CAAC;oBACrD,CAAC;iBACF,CAAC,CACH,CAAC;gBAEF,IAAI,CAAC,iBAAiB,CAAC,IAAI,4BAA4B,CAAC,sBAAsB,CAAC,EAAE,CAAC,CAAC,CAAC;aACrF;YAED,WAAW,CAAC,CAAM;gBAChB,IAAI,CAAC,YAAY,qBAAqB,EAAE,CAAC;oBACvC,OAAO,IAAI,CAAC;gBACd,CAAC;YACH,CAAC;YAED,YAAY,CAAC,CAAwB;gBACnC,OAAO,CAAC,CAAC,UAAU,CAAC,IAAI,CAAC;YAC3B,CAAC;;;;;;2CA/DA,MAAM,CAAC,eAAe,CAAC;YACxB,gMAAS,eAAe,6BAAf,eAAe,yGAAkB;;;;;SAF/B,qCAAqC"}

package/dist/entities/SchemaModelObjectEntityDefinition.js

@@ -1,5 +1,5 @@
 import { __classPrivateFieldGet, __classPrivateFieldSet, __esDecorate, __runInitializers } from "tslib";
-import { EntityDefinition, EntityDescriberComponent, inject, InlineEntityEncoderComponent, InlineTreePresenterComponent } from '@journeyapps-labs/reactor-mod';
+import { EntityDefinition, EntityDescriberComponent, inject, InlineEntityEncoderComponent, InlineTreePresenterComponent, SimpleParentEntitySearchEngine } from '@journeyapps-labs/reactor-mod';
 import { DataBrowserEntities } from '../entities';
 import { ConnectionStore } from '../stores/ConnectionStore';
 import { SchemaModelObject } from '../core/SchemaModelObject';
@@ -26,11 +26,36 @@ let SchemaModelObjectEntityDefinition = (() => {
                     label: 'Simple',
                     describe: (entity) => {
                         return {
-                            simpleName: entity.model.id,
+                            simpleName: entity.data.display,
                             complexName: entity.definition.definition.label
                         };
                     }
                 }));
+                // this.registerComponent(
+                //   new SimpleParentEntitySearchEngine<SchemaModelDefinition,SchemaModelObject>({
+                //     label: 'ID',
+                //     filterResultsWithMatcher: false,
+                //     type: DataBrowserEntities.SCHEMA_MODEL_DEFINITION,
+                //     getEntities: async (event) => {
+                //       let object = await event.parameters.parent.resolve(event.value);
+                //       if(object){
+                //         return [object]
+                //       }
+                //       return []
+                //     }
+                //   })
+                // );
+                this.registerComponent(new SimpleParentEntitySearchEngine({
+                    label: 'Label',
+                    type: DataBrowserEntities.SCHEMA_MODEL_DEFINITION,
+                    filterResultsWithMatcher: false,
+                    getEntities: async (event) => {
+                        if (!event.value) {
+                            return [];
+                        }
+                        return await event.parameters.parent.search(event.value);
+                    }
+                }));
                 this.registerComponent(new InlineEntityEncoderComponent({
                     version: 1,
                     encode: (e) => {
@@ -43,12 +68,7 @@ let SchemaModelObjectEntityDefinition = (() => {
                     decode: async (entity) => {
                         let connection = await this.connectionStore.waitForReadyForConnection(entity.connection_id);
                         let definition = await connection.waitForSchemaModelDefinitionByName(entity.type);
-                        let db = await definition.getCollection();
-                        let model = await db.first(entity.id);
-                        return new SchemaModelObject({
-                            model,
-                            definition
-                        });
+                        return await definition.resolve(entity.id);
                     }
                 }));
                 this.registerComponent(new InlineTreePresenterComponent());

package/dist/entities/SchemaModelObjectEntityDefinition.js.map

@@ -1 +1 @@
-{"version":3,"file":"SchemaModelObjectEntityDefinition.js","sourceRoot":"","sources":["../../src/entities/SchemaModelObjectEntityDefinition.ts"],"names":[],"mappings":";AAAA,OAAO,EACL,gBAAgB,EAChB,wBAAwB,EACxB,MAAM,EACN,4BAA4B,EAC5B,4BAA4B,EAC7B,MAAM,+BAA+B,CAAC;AACvC,OAAO,EAAE,mBAAmB,EAAE,MAAM,aAAa,CAAC;AAClD,OAAO,EAAE,eAAe,EAAE,MAAM,2BAA2B,CAAC;AAC5D,OAAO,EAAE,iBAAiB,EAAE,MAAM,2BAA2B,CAAC;IAQjD,iCAAiC;;sBAAS,gBAAgB;;;;sBAA1D,iCAAkC,SAAQ,WAAmC;YAExF,IAAS,eAAe,qHAAkB;YAA1C,IAAS,eAAe,0HAAkB;YAE1C;gBACE,KAAK,CAAC;oBACJ,IAAI,EAAE,mBAAmB,CAAC,mBAAmB;oBAC7C,QAAQ,EAAE,aAAa;oBACvB,KAAK,EAAE,cAAc;oBACrB,IAAI,EAAE,MAAM;oBACZ,SAAS,EAAE,cAAc;iBAC1B,CAAC,CAAC;gBATI,8IAAiC;;gBAWxC,IAAI,CAAC,iBAAiB,CACpB,IAAI,wBAAwB,CAAoB;oBAC9C,KAAK,EAAE,QAAQ;oBACf,QAAQ,EAAE,CAAC,MAAyB,EAAE,EAAE;wBACtC,OAAO;4BACL,UAAU,EAAE,MAAM,CAAC,KAAK,CAAC,EAAE;4BAC3B,WAAW,EAAE,MAAM,CAAC,UAAU,CAAC,UAAU,CAAC,KAAK;yBAChD,CAAC;oBACJ,CAAC;iBACF,CAAC,CACH,CAAC;gBAEF,IAAI,CAAC,iBAAiB,CACpB,IAAI,4BAA4B,CAA8D;oBAC5F,OAAO,EAAE,CAAC;oBACV,MAAM,EAAE,CAAC,CAAC,EAAE,EAAE;wBACZ,OAAO;4BACL,aAAa,EAAE,CAAC,CAAC,UAAU,CAAC,UAAU,CAAC,EAAE;4BACzC,IAAI,EAAE,CAAC,CAAC,UAAU,CAAC,UAAU,CAAC,IAAI;4BAClC,EAAE,EAAE,CAAC,CAAC,KAAK,CAAC,EAAE;yBACf,CAAC;oBACJ,CAAC;oBACD,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,EAAE;wBACvB,IAAI,UAAU,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,yBAAyB,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC;wBAC5F,IAAI,UAAU,GAAG,MAAM,UAAU,CAAC,kCAAkC,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;wBAClF,IAAI,EAAE,GAAG,MAAM,UAAU,CAAC,aAAa,EAAE,CAAC;wBAC1C,IAAI,KAAK,GAAG,MAAM,EAAE,CAAC,KAAK,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;wBACtC,OAAO,IAAI,iBAAiB,CAAC;4BAC3B,KAAK;4BACL,UAAU;yBACX,CAAC,CAAC;oBACL,CAAC;iBACF,CAAC,CACH,CAAC;gBAEF,IAAI,CAAC,iBAAiB,CAAC,IAAI,4BAA4B,EAAqB,CAAC,CAAC;aAC/E;YAED,WAAW,CAAC,CAAM;gBAChB,IAAI,CAAC,YAAY,iBAAiB,EAAE,CAAC;oBACnC,OAAO,IAAI,CAAC;gBACd,CAAC;YACH,CAAC;YAED,YAAY,CAAC,CAAoB;gBAC/B,OAAO,CAAC,CAAC,KAAK,CAAC,EAAE,CAAC;YACpB,CAAC;;;;;;2CA1DA,MAAM,CAAC,eAAe,CAAC;YACxB,gMAAS,eAAe,6BAAf,eAAe,yGAAkB;;;;;SAF/B,iCAAiC"}
+{"version":3,"file":"SchemaModelObjectEntityDefinition.js","sourceRoot":"","sources":["../../src/entities/SchemaModelObjectEntityDefinition.ts"],"names":[],"mappings":"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"}