@journeyapps-labs/reactor-mod-data-browser 2.0.2 → 2.1.0

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @journeyapps-labs/reactor-mod-data-browser
 
+## 2.1.0
+
+### Minor Changes
+
+- 8cc96ec: - displays media directly inside Sector
+  - add media input fields to form editing
+  - status bar for schema model editing
+  - make query reload button show load status
+  - Add support for Locations
+  - Pull in Reactor changes: Version Packages reactor#36
+- bf70874: Add support for loading relationships with smart paralell limits
+
 ## 2.0.2
 
 ### Patch Changes

package/dist/@types/core/SchemaModelDefinition.d.ts

@@ -3,13 +3,24 @@ import { ObjectType } from '@journeyapps/parser-schema';
 import { Collection } from '@journeyapps/db';
 import { SchemaModelObject } from './SchemaModelObject';
 import { LifecycleModel } from '@journeyapps-labs/lib-reactor-data-layer';
+import { BaseObserver } from '@journeyapps-labs/common-utils';
+import { QueueObject } from 'async';
+export interface SchemaModelDefinitionListener {
+    resolved: (event: {
+        object: SchemaModelObject;
+    }) => any;
+}
 export interface SchemaModelDefinitionOptions {
     connection: AbstractConnection;
     definition: ObjectType;
 }
-export declare class SchemaModelDefinition implements LifecycleModel<ObjectType> {
+export declare class SchemaModelDefinition extends BaseObserver<SchemaModelDefinitionListener> implements LifecycleModel<ObjectType> {
     protected options: SchemaModelDefinitionOptions;
+    cache: Map<string, SchemaModelObject>;
+    queue: QueueObject<string>;
+    enqueued: Set<string>;
     constructor(options: SchemaModelDefinitionOptions);
+    resolve(id: string): Promise<SchemaModelObject>;
     get key(): string;
     dispose(): void;
     patch(data: ObjectType): void;

package/dist/@types/core/SchemaModelObject.d.ts

@@ -1,12 +1,17 @@
 import { DatabaseObject } from '@journeyapps/db';
 import { SchemaModelDefinition } from './SchemaModelDefinition';
+import { AbstractMedia, MediaEngine } from '@journeyapps-labs/reactor-mod';
 export interface SchemaModelObjectOptions {
     definition: SchemaModelDefinition;
     model?: DatabaseObject;
 }
 export declare class SchemaModelObject {
     options: SchemaModelObjectOptions;
+    accessor mediaEngine: MediaEngine;
+    private _mediaCache;
     constructor(options: SchemaModelObjectOptions);
     get definition(): SchemaModelDefinition;
     get model(): DatabaseObject;
+    displayValue(): Promise<string>;
+    getMedia(field: string): Promise<AbstractMedia<import("@journeyapps-labs/reactor-mod").AbstractMediaOptions>>;
 }

package/dist/@types/core/query/SimpleQuery.d.ts

@@ -3,9 +3,8 @@ import { TableColumn } from '@journeyapps-labs/reactor-mod';
 import { ConnectionStore } from '../../stores/ConnectionStore';
 import * as db from '@journeyapps/db';
 import { Promise } from '@journeyapps/db';
-import { Page, PageRow } from './Page';
+import { Page } from './Page';
 import { SchemaModelDefinition } from '../SchemaModelDefinition';
-import * as React from 'react';
 export interface SimpleQueryOptions {
     definition?: SchemaModelDefinition;
     limit?: number;
@@ -29,8 +28,3 @@ export declare class SimpleQuery extends AbstractQuery<SimpleQueryEncoded> {
     getColumns(): TableColumn[];
     getSimpleName(): string;
 }
-export interface CellDisplayWidgetProps {
-    row: PageRow;
-    cell: any;
-}
-export declare const CellDisplayWidget: React.FC<CellDisplayWidgetProps>;

package/dist/@types/core/query/widgets/BelongsToDisplayWidget.d.ts

@@ -0,0 +1,9 @@
+import * as React from 'react';
+import { Variable } from '@journeyapps/db';
+import { AbstractConnection } from '../../AbstractConnection';
+export interface BelongsToDisplayWidgetProps {
+    variable: Variable;
+    id: string;
+    connection: AbstractConnection;
+}
+export declare const BelongsToDisplayWidget: React.FC<BelongsToDisplayWidgetProps>;

package/dist/@types/core/query/widgets/CellDisplayWidget.d.ts

@@ -0,0 +1,9 @@
+import { Variable } from '@journeyapps/db';
+import * as React from 'react';
+import { PageRow } from '../Page';
+export interface CellDisplayWidgetProps {
+    row: PageRow;
+    cell: any;
+    variable: Variable;
+}
+export declare const CellDisplayWidget: React.FC<CellDisplayWidgetProps>;

package/dist/@types/forms/inputs/LocationInput.d.ts

@@ -0,0 +1,13 @@
+import { FormInput, FormInputGenerics, FormInputOptions, FormInputRenderOptions, NumberInput } from '@journeyapps-labs/reactor-mod';
+import * as React from 'react';
+import { Location } from '@journeyapps/db';
+export declare class LocationInput extends FormInput<FormInputGenerics & {
+    VALUE: Location;
+}> {
+    latitude: NumberInput;
+    longitude: NumberInput;
+    constructor(options: FormInputOptions<Location>);
+    setValue(value: Location): void;
+    update(): void;
+    renderControl(options: FormInputRenderOptions): React.JSX.Element;
+}

package/dist/core/SchemaModelDefinition.js

@@ -1,12 +1,51 @@
 import { SchemaModelObject } from './SchemaModelObject';
-export class SchemaModelDefinition {
+import { BaseObserver } from '@journeyapps-labs/common-utils';
+import { queue } from 'async';
+export class SchemaModelDefinition extends BaseObserver {
     constructor(options) {
+        super();
         this.options = options;
+        this.cache = new Map();
+        this.enqueued = new Set();
+        this.queue = queue(async (id) => {
+            let collection = await this.getCollection();
+            let model = await collection.first(id);
+            if (model) {
+                let object = new SchemaModelObject({
+                    model,
+                    definition: this
+                });
+                this.cache.set(id, object);
+                this.enqueued.delete(id);
+                this.iterateListeners((cb) => { var _a; return (_a = cb.resolved) === null || _a === void 0 ? void 0 : _a.call(cb, { object }); });
+            }
+        }, 6);
+    }
+    async resolve(id) {
+        if (this.cache.has(id)) {
+            return this.cache.get(id);
+        }
+        if (!this.enqueued.has(id)) {
+            this.enqueued.add(id);
+            this.queue.push(id);
+        }
+        return await new Promise((resolve) => {
+            let l1 = this.registerListener({
+                resolved: ({ object }) => {
+                    if (object.model.id === id) {
+                        l1();
+                        resolve(object);
+                    }
+                }
+            });
+        });
     }
     get key() {
         return this.definition.name;
     }
-    dispose() { }
+    dispose() {
+        this.queue.kill();
+    }
     patch(data) {
         this.options.definition = data;
     }

package/dist/core/SchemaModelDefinition.js.map

@@ -1 +1 @@
-{"version":3,"file":"SchemaModelDefinition.js","sourceRoot":"","sources":["../../src/core/SchemaModelDefinition.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AAOxD,MAAM,OAAO,qBAAqB;IAChC,YAAsB,OAAqC;QAArC,YAAO,GAAP,OAAO,CAA8B;IAAG,CAAC;IAE/D,IAAI,GAAG;QACL,OAAO,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC;IAC9B,CAAC;IAED,OAAO,KAAI,CAAC;IAEZ,KAAK,CAAC,IAAgB;QACpB,IAAI,CAAC,OAAO,CAAC,UAAU,GAAG,IAAI,CAAC;IACjC,CAAC;IAED,IAAI,UAAU;QACZ,OAAO,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC;IACjC,CAAC;IAED,IAAI,UAAU;QACZ,OAAO,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC;IACjC,CAAC;IAED,KAAK,CAAC,aAAa;QACjB,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,aAAa,EAAE,CAAC;QACnD,OAAO,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,IAAI,CAAe,CAAC;IAClD,CAAC;IAED,KAAK,CAAC,sBAAsB;QAC1B,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,aAAa,EAAE,CAAC;QAC9C,OAAO,IAAI,iBAAiB,CAAC;YAC3B,UAAU,EAAE,IAAI;YAChB,KAAK,EAAE,UAAU,CAAC,MAAM,EAAE;SAC3B,CAAC,CAAC;IACL,CAAC;CACF"}
+{"version":3,"file":"SchemaModelDefinition.js","sourceRoot":"","sources":["../../src/core/SchemaModelDefinition.ts"],"names":[],"mappings":"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"}

package/dist/core/SchemaModelObject.js

@@ -1,12 +1,73 @@
-export class SchemaModelObject {
-    constructor(options) {
-        this.options = options;
-    }
-    get definition() {
-        return this.options.definition;
-    }
-    get model() {
-        return this.options.model;
-    }
-}
+import { __classPrivateFieldGet, __classPrivateFieldSet, __esDecorate, __runInitializers } from "tslib";
+import { inject, MediaEngine } from '@journeyapps-labs/reactor-mod';
+let SchemaModelObject = (() => {
+    var _a, _SchemaModelObject_mediaEngine_accessor_storage;
+    let _mediaEngine_decorators;
+    let _mediaEngine_initializers = [];
+    let _mediaEngine_extraInitializers = [];
+    return _a = class SchemaModelObject {
+            get mediaEngine() { return __classPrivateFieldGet(this, _SchemaModelObject_mediaEngine_accessor_storage, "f"); }
+            set mediaEngine(value) { __classPrivateFieldSet(this, _SchemaModelObject_mediaEngine_accessor_storage, value, "f"); }
+            constructor(options) {
+                this.options = options;
+                _SchemaModelObject_mediaEngine_accessor_storage.set(this, __runInitializers(this, _mediaEngine_initializers, void 0));
+                this._mediaCache = __runInitializers(this, _mediaEngine_extraInitializers);
+                this._mediaCache = new Map();
+            }
+            get definition() {
+                return this.options.definition;
+            }
+            get model() {
+                return this.options.model;
+            }
+            async displayValue() {
+                if (!this.model) {
+                    return null;
+                }
+                let val = this.model.toString();
+                if (val) {
+                    return val;
+                }
+                /*
+                  there are scenarios where the FormatStringScope has not yet completed setting up its state +
+                  parsing the format string directive. We therefore poll for a bit until we get the value. Ideally
+                  we need a better way to determine when the scope is ready, but could not find one yet.
+                 */
+                for (let i = 0; i < 10; i++) {
+                    await new Promise((resolve) => setTimeout(resolve, 40));
+                    let val = this.model.toString();
+                    if (val) {
+                        return val;
+                    }
+                }
+                return null;
+            }
+            async getMedia(field) {
+                if (this._mediaCache.has(field)) {
+                    return this._mediaCache.get(field);
+                }
+                let media = this.model[field];
+                if (!(media === null || media === void 0 ? void 0 : media.uploaded())) {
+                    return null;
+                }
+                let url = new URL(media.url());
+                let mediaObject = this.mediaEngine.getMediaTypeForPath(url.pathname).generateMedia({
+                    content: await media.toArrayBuffer(),
+                    name: media.id,
+                    uid: media.id
+                });
+                this._mediaCache.set(field, mediaObject);
+                return mediaObject;
+            }
+        },
+        _SchemaModelObject_mediaEngine_accessor_storage = new WeakMap(),
+        (() => {
+            const _metadata = typeof Symbol === "function" && Symbol.metadata ? Object.create(null) : void 0;
+            _mediaEngine_decorators = [inject(MediaEngine)];
+            __esDecorate(_a, null, _mediaEngine_decorators, { kind: "accessor", name: "mediaEngine", static: false, private: false, access: { has: obj => "mediaEngine" in obj, get: obj => obj.mediaEngine, set: (obj, value) => { obj.mediaEngine = value; } }, metadata: _metadata }, _mediaEngine_initializers, _mediaEngine_extraInitializers);
+            if (_metadata) Object.defineProperty(_a, Symbol.metadata, { enumerable: true, configurable: true, writable: true, value: _metadata });
+        })(),
+        _a;
+})();
+export { SchemaModelObject };
 //# sourceMappingURL=SchemaModelObject.js.map

package/dist/core/SchemaModelObject.js.map

@@ -1 +1 @@
-{"version":3,"file":"SchemaModelObject.js","sourceRoot":"","sources":["../../src/core/SchemaModelObject.ts"],"names":[],"mappings":"AAQA,MAAM,OAAO,iBAAiB;IAC5B,YAAmB,OAAiC;QAAjC,YAAO,GAAP,OAAO,CAA0B;IAAG,CAAC;IAExD,IAAI,UAAU;QACZ,OAAO,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC;IACjC,CAAC;IAED,IAAI,KAAK;QACP,OAAO,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC;IAC5B,CAAC;CACF"}
+{"version":3,"file":"SchemaModelObject.js","sourceRoot":"","sources":["../../src/core/SchemaModelObject.ts"],"names":[],"mappings":";AAEA,OAAO,EAAiB,MAAM,EAAE,WAAW,EAAE,MAAM,+BAA+B,CAAC;IAOtE,iBAAiB;;;;;sBAAjB,iBAAiB;YAE5B,IAAS,WAAW,iGAAc;YAAlC,IAAS,WAAW,sGAAc;YAIlC,YAAmB,OAAiC;gBAAjC,YAAO,GAAP,OAAO,CAA0B;gBAJ3C,sHAAyB;gBAE1B,gBAAW,2DAA6B;gBAG9C,IAAI,CAAC,WAAW,GAAG,IAAI,GAAG,EAAE,CAAC;YAC/B,CAAC;YAED,IAAI,UAAU;gBACZ,OAAO,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC;YACjC,CAAC;YAED,IAAI,KAAK;gBACP,OAAO,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC;YAC5B,CAAC;YAED,KAAK,CAAC,YAAY;gBAChB,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC;oBAChB,OAAO,IAAI,CAAC;gBACd,CAAC;gBACD,IAAI,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAC;gBAChC,IAAI,GAAG,EAAE,CAAC;oBACR,OAAO,GAAG,CAAC;gBACb,CAAC;gBACD;;;;mBAIG;gBACH,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC;oBAC5B,MAAM,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,UAAU,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,CAAC;oBACxD,IAAI,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAC;oBAChC,IAAI,GAAG,EAAE,CAAC;wBACR,OAAO,GAAG,CAAC;oBACb,CAAC;gBACH,CAAC;gBACD,OAAO,IAAI,CAAC;YACd,CAAC;YAED,KAAK,CAAC,QAAQ,CAAC,KAAa;gBAC1B,IAAI,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC;oBAChC,OAAO,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;gBACrC,CAAC;gBACD,IAAI,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,KAAK,CAAgB,CAAC;gBAC7C,IAAI,CAAC,CAAA,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,QAAQ,EAAE,CAAA,EAAE,CAAC;oBACvB,OAAO,IAAI,CAAC;gBACd,CAAC;gBACD,IAAI,GAAG,GAAG,IAAI,GAAG,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,CAAC;gBAC/B,IAAI,WAAW,GAAG,IAAI,CAAC,WAAW,CAAC,mBAAmB,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,aAAa,CAAC;oBACjF,OAAO,EAAE,MAAM,KAAK,CAAC,aAAa,EAAE;oBACpC,IAAI,EAAE,KAAK,CAAC,EAAE;oBACd,GAAG,EAAE,KAAK,CAAC,EAAE;iBACd,CAAC,CAAC;gBAEH,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,KAAK,EAAE,WAAW,CAAC,CAAC;gBACzC,OAAO,WAAW,CAAC;YACrB,CAAC;;;;;uCAzDA,MAAM,CAAC,WAAW,CAAC;YACpB,oLAAS,WAAW,6BAAX,WAAW,iGAAc;;;;;SAFvB,iBAAiB"}

package/dist/core/query/SimpleQuery.js

@@ -1,12 +1,13 @@
 import { __classPrivateFieldGet, __classPrivateFieldSet, __esDecorate, __runInitializers } from "tslib";
 import { AbstractQuery } from './AbstractQuery';
-import { CheckboxWidget, inject, MetadataWidget, SmartDateDisplayWidget, styled } from '@journeyapps-labs/reactor-mod';
+import { inject } from '@journeyapps-labs/reactor-mod';
 import { ConnectionStore } from '../../stores/ConnectionStore';
-import { Attachment, Day, Location } from '@journeyapps/db';
 import { Page } from './Page';
 import * as _ from 'lodash';
 import * as React from 'react';
 import { observable } from 'mobx';
+import { CellDisplayWidget } from './widgets/CellDisplayWidget';
+import { BelongsToDisplayWidget } from './widgets/BelongsToDisplayWidget';
 let SimpleQuery = (() => {
     var _a, _SimpleQuery_connStore_accessor_storage, _SimpleQuery__totalPages_accessor_storage, _SimpleQuery__pages_accessor_storage;
     let _classSuper = AbstractQuery;
@@ -80,6 +81,17 @@ let SimpleQuery = (() => {
                         noWrap: true,
                         shrink: true
                     },
+                    ..._.map(this.options.definition.definition.belongsToIdVars, (a) => {
+                        return {
+                            key: a.name,
+                            display: a.name,
+                            noWrap: true,
+                            shrink: true,
+                            accessor: (cell, row) => {
+                                return React.createElement(BelongsToDisplayWidget, { variable: a, connection: this.connection, id: row.model.model[a.name] });
+                            }
+                        };
+                    }),
                     ..._.map(this.options.definition.definition.attributes, (a) => {
                         return {
                             key: a.name,
@@ -87,7 +99,7 @@ let SimpleQuery = (() => {
                             noWrap: true,
                             shrink: true,
                             accessor: (cell, row) => {
-                                return React.createElement(CellDisplayWidget, { cell: cell, row: row });
+                                return React.createElement(CellDisplayWidget, { variable: a, cell: cell, row: row });
                             }
                         };
                     })
@@ -114,77 +126,4 @@ let SimpleQuery = (() => {
         _a;
 })();
 export { SimpleQuery };
-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 || (S = {}));
-const MAX_NUMBER_OF_ARR_ITEMS_TO_DISPLAY = 3;
-export const CellDisplayWidget = (props) => {
-    const { row, cell } = 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 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) {
-        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: () => {
-                    window.open(cell.url(), '_blank');
-                }, src: cell.urls['thumbnail'] }));
-        }
-        return React.createElement(S.Empty, null, "Not uploaded");
-    }
-    console.log('unknown type', cell);
-    return null;
-};
 //# sourceMappingURL=SimpleQuery.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"SimpleQuery.js","sourceRoot":"","sources":["../../../src/core/query/SimpleQuery.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,aAAa,EAAwB,MAAM,iBAAiB,CAAC;AACtE,OAAO,EACL,cAAc,EACd,MAAM,EACN,cAAc,EACd,sBAAsB,EACtB,MAAM,EAEP,MAAM,+BAA+B,CAAC;AACvC,OAAO,EAAE,eAAe,EAAE,MAAM,8BAA8B,CAAC;AAE/D,OAAO,EAAE,UAAU,EAAE,GAAG,EAAE,QAAQ,EAAW,MAAM,iBAAiB,CAAC;AACrE,OAAO,EAAE,IAAI,EAAW,MAAM,QAAQ,CAAC;AAEvC,OAAO,KAAK,CAAC,MAAM,QAAQ,CAAC;AAC5B,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAC/B,OAAO,EAAE,UAAU,EAAE,MAAM,MAAM,CAAC;IAYrB,WAAW;;sBAAS,aAAa;;;;;;;;;;sBAAjC,WAAY,SAAQ,WAAiC;YAEhE,IAAS,SAAS,yFAAkB;YAApC,IAAS,SAAS,8FAAkB;YAGpC,IAAS,WAAW,2FAAS;YAA7B,IAAS,WAAW,gGAAS;YAG7B,IAAS,MAAM,sFAAS;YAAxB,IAAS,MAAM,2FAAS;YAExB,YAAmB,UAA8B,EAAE;;gBACjD,KAAK,CAAC,QAAQ,EAAE,MAAA,OAAO,CAAC,UAAU,0CAAE,UAAU,CAAC,CAAC;gBAD/B,YAAO,GAAP,OAAO,CAAyB;gBAR1C,4GAA2B;gBAG3B,yKAAoB;gBAGpB,iKAAe;;gBAEL,YAAO,GAAP,OAAO,CAAyB;gBAEjD,IAAI,CAAC,WAAW,GAAG,CAAC,CAAC;gBACrB,IAAI,CAAC,MAAM,GAAG,EAAE,CAAC;aAClB;YAED,KAAK,CAAC,aAAa;gBACjB,IAAI,UAAU,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,aAAa,EAAE,CAAC;gBACvD,OAAO,UAAU,CAAC,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,UAAU,CAAC,IAAI,CAAkB,CAAC;YAC9E,CAAC;YAED,KAAK,CAAC,IAAI;gBACR,IAAI,UAAU,GAAG,MAAM,IAAI,CAAC,aAAa,EAAE,CAAC;gBAC5C,IAAI,OAAO,GAAG,MAAO,UAAU,CAAC,OAAe,CAAC,UAAU,CAAC,UAAU,CAAC,GAAG,EAAE,CAAC,CAAC;gBAC7E,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,KAAK,GAAG,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;YACnE,CAAC;YAED,OAAO,CAAC,MAAc;gBACpB,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC;oBACzB,IAAI,IAAI,GAAG,IAAI,IAAI,CAAC;wBAClB,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC,OAAO,CAAC,KAAK;wBACnC,KAAK,EAAE,IAAI,CAAC,OAAO,CAAC,KAAK;wBACzB,UAAU,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,aAAa,EAAE;wBACtC,UAAU,EAAE,IAAI,CAAC,OAAO,CAAC,UAAU;wBACnC,KAAK,EAAE,MAAM;qBACd,CAAC,CAAC;oBACH,IAAI,CAAC,IAAI,EAAE,CAAC;oBACZ,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,GAAG,IAAI,CAAC;gBAC7B,CAAC;gBACD,OAAO,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;YAC7B,CAAC;YAED,IAAI,UAAU;gBACZ,OAAO,IAAI,CAAC,WAAW,CAAC;YAC1B,CAAC;YAED,SAAS;gBACP,uCACK,KAAK,CAAC,SAAS,EAAE,KACpB,UAAU,EAAE,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,UAAU,CAAC,IAAI,EACnD,KAAK,EAAE,IAAI,CAAC,OAAO,CAAC,KAAK,IACzB;YACJ,CAAC;YAED,KAAK,CAAC,WAAW,CAAC,eAAgC,EAAE,IAAwB;gBAC1E,MAAM,KAAK,CAAC,WAAW,CAAC,eAAe,EAAE,IAAI,CAAC,CAAC;gBAC/C,IAAI,CAAC,OAAO,CAAC,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC;gBAChC,IAAI,CAAC,OAAO,CAAC,UAAU,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,kCAAkC,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;YACtG,CAAC;YAED,UAAU;gBACR,OAAO;oBACL;wBACE,GAAG,EAAE,IAAI;wBACT,OAAO,EAAE,IAAI;wBACb,MAAM,EAAE,IAAI;wBACZ,MAAM,EAAE,IAAI;qBACb;oBACD,GAAG,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,UAAU,CAAC,UAAU,EAAE,CAAC,CAAC,EAAE,EAAE;wBAC5D,OAAO;4BACL,GAAG,EAAE,CAAC,CAAC,IAAI;4BACX,OAAO,EAAE,CAAC,CAAC,KAAK;4BAChB,MAAM,EAAE,IAAI;4BACZ,MAAM,EAAE,IAAI;4BACZ,QAAQ,EAAE,CAAC,IAAI,EAAE,GAAY,EAAE,EAAE;gCAC/B,OAAO,oBAAC,iBAAiB,IAAC,IAAI,EAAE,IAAI,EAAE,GAAG,EAAE,GAAG,GAAI,CAAC;4BACrD,CAAC;yBACa,CAAC;oBACnB,CAAC,CAAC;iBACH,CAAC;YACJ,CAAC;YAED,aAAa;gBACX,OAAO,UAAU,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,UAAU,CAAC,KAAK,EAAE,CAAC;YAC9D,CAAC;;;;;;;;qCAnFA,MAAM,CAAC,eAAe,CAAC;uCAGvB,UAAU;kCAGV,UAAU;YALX,8KAAS,SAAS,6BAAT,SAAS,6FAAkB;YAGpC,oLAAS,WAAW,6BAAX,WAAW,iGAAS;YAG7B,qKAAS,MAAM,6BAAN,MAAM,uFAAS;;;;;SARb,WAAW;AAuFxB,IAAU,CAAC,CAuBV;AAvBD,WAAU,CAAC;IACI,OAAK,GAAG,MAAM,CAAC,GAAG,CAAA;;GAE9B,CAAC;IAEW,SAAO,GAAG,MAAM,CAAC,GAAG,CAAA;;;;GAIhC,CAAC;IAEW,MAAI,GAAG,MAAM,CAAC,GAAG,CAAA;;kBAEd,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,KAAK;;;GAGzC,CAAC;IAEW,OAAK,GAAG,MAAM,CAAC,GAAG,CAAA;;;;GAI9B,CAAC;AACJ,CAAC,EAvBS,CAAC,KAAD,CAAC,QAuBV;AAOD,MAAM,kCAAkC,GAAG,CAAC,CAAC;AAE7C,MAAM,CAAC,MAAM,iBAAiB,GAAqC,CAAC,KAAK,EAAE,EAAE;IAC3E,MAAM,EAAE,GAAG,EAAE,IAAI,EAAE,GAAG,KAAK,CAAC;IAC5B,IAAI,IAAI,IAAI,IAAI,EAAE,CAAC;QACjB,OAAO,oBAAC,CAAC,CAAC,KAAK,eAAe,CAAC;IACjC,CAAC;IACD,IAAI,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC;QACrB,IAAI,IAAI,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE,CAAC;YACvB,OAAO,oBAAC,CAAC,CAAC,KAAK,gBAAgB,CAAC;QAClC,CAAC;QACD,OAAO,IAAI,CAAC;IACd,CAAC;IACD,IAAI,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC;QACrB,OAAO,IAAI,CAAC;IACd,CAAC;IACD,IAAI,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC;QACpB,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACtB,OAAO,oBAAC,CAAC,CAAC,KAAK,sBAAsB,CAAC;QACxC,CAAC;QAED,IAAI,KAAK,GAAG,CAAC,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC,EAAE,kCAAkC,CAAC,CAAC;QAEjE,OAAO,CACL,oBAAC,CAAC,CAAC,KAAK;YACL,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE;gBACf,OAAO,oBAAC,CAAC,CAAC,IAAI,IAAC,GAAG,EAAE,CAAC,IAAG,CAAC,CAAU,CAAC;YACtC,CAAC,CAAC;YACD,KAAK,CAAC,MAAM,KAAK,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CACpC,CACX,CAAC;IACJ,CAAC;IACD,IAAI,IAAI,YAAY,IAAI,EAAE,CAAC;QACzB,OAAO,oBAAC,sBAAsB,IAAC,IAAI,EAAE,IAAI,GAAI,CAAC;IAChD,CAAC;IACD,IAAI,IAAI,YAAY,GAAG,EAAE,CAAC;QACxB,OAAO,oBAAC,sBAAsB,IAAC,IAAI,EAAE,IAAI,CAAC,MAAM,EAAE,GAAI,CAAC;IACzD,CAAC;IACD,IAAI,CAAC,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE,CAAC;QACtB,OAAO,oBAAC,cAAc,IAAC,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAE,GAAG,EAAE,GAAE,CAAC,GAAI,CAAC;IAC/D,CAAC;IACD,IAAI,IAAI,YAAY,QAAQ,EAAE,CAAC;QAC7B,OAAO,CACL;YACE,oBAAC,cAAc,IAAC,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,GAAG,IAAI,CAAC,QAAQ,EAAE,GAAI;YAC3D,oBAAC,cAAc,IAAC,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,GAAG,IAAI,CAAC,SAAS,EAAE,GAAI,CAC5D,CACJ,CAAC;IACJ,CAAC;IACD,IAAI,IAAI,YAAY,UAAU,EAAE,CAAC;QAC/B,IAAI,IAAI,CAAC,QAAQ,EAAE,EAAE,CAAC;YACpB,OAAO,CACL,oBAAC,CAAC,CAAC,OAAO,IACR,OAAO,EAAE,GAAG,EAAE;oBACZ,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,EAAE,QAAQ,CAAC,CAAC;gBACpC,CAAC,EACD,GAAG,EAAE,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,GAC3B,CACH,CAAC;QACJ,CAAC;QACD,OAAO,oBAAC,CAAC,CAAC,KAAK,uBAAuB,CAAC;IACzC,CAAC;IACD,OAAO,CAAC,GAAG,CAAC,cAAc,EAAE,IAAI,CAAC,CAAC;IAClC,OAAO,IAAI,CAAC;AACd,CAAC,CAAC"}
+{"version":3,"file":"SimpleQuery.js","sourceRoot":"","sources":["../../../src/core/query/SimpleQuery.tsx"],"names":[],"mappings":"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"}

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

@@ -0,0 +1,33 @@
+import * as React from 'react';
+import { useEffect, useState } from 'react';
+import styled from '@emotion/styled';
+export const BelongsToDisplayWidget = (props) => {
+    const [object, setObject] = useState(null);
+    const [display, setDisplay] = useState();
+    useEffect(() => {
+        if (!props.id) {
+            return;
+        }
+        props.connection.waitForSchemaModelDefinitionByName(props.variable.relationship).then((conn) => conn
+            .resolve(props.id)
+            .then((obj) => {
+            setObject(obj);
+            return obj.displayValue();
+        })
+            .then((value) => {
+            setDisplay(value);
+        }));
+    }, [props.id]);
+    if (!props.id) {
+        return React.createElement(S.Empty, null, "Not set");
+    }
+    return display;
+};
+var S;
+(function (S) {
+    S.Empty = styled.div `
+    opacity: 0.2;
+  `;
+    S.Container = styled.div ``;
+})(S || (S = {}));
+//# sourceMappingURL=BelongsToDisplayWidget.js.map

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

@@ -0,0 +1 @@
+{"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;AAC5C,OAAO,MAAM,MAAM,iBAAiB,CAAC;AAWrC,MAAM,CAAC,MAAM,sBAAsB,GAA0C,CAAC,KAAK,EAAE,EAAE;IACrF,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,GAAG,QAAQ,CAAoB,IAAI,CAAC,CAAC;IAC9D,MAAM,CAAC,OAAO,EAAE,UAAU,CAAC,GAAG,QAAQ,EAAU,CAAC;IAEjD,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,QAAQ,CAAC,YAAY,CAAC,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAC7F,IAAI;aACD,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC;aACjB,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE;YACZ,SAAS,CAAC,GAAG,CAAC,CAAC;YACf,OAAO,GAAG,CAAC,YAAY,EAAE,CAAC;QAC5B,CAAC,CAAC;aACD,IAAI,CAAC,CAAC,KAAK,EAAE,EAAE;YACd,UAAU,CAAC,KAAK,CAAC,CAAC;QACpB,CAAC,CAAC,CACL,CAAC;IACJ,CAAC,EAAE,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,CAAC;IAEf,IAAI,CAAC,KAAK,CAAC,EAAE,EAAE,CAAC;QACd,OAAO,oBAAC,CAAC,CAAC,KAAK,kBAAkB,CAAC;IACpC,CAAC;IAED,OAAO,OAAO,CAAC;AACjB,CAAC,CAAC;AACF,IAAU,CAAC,CAMV;AAND,WAAU,CAAC;IACI,OAAK,GAAG,MAAM,CAAC,GAAG,CAAA;;GAE9B,CAAC;IAEW,WAAS,GAAG,MAAM,CAAC,GAAG,CAAA,EAAE,CAAC;AACxC,CAAC,EANS,CAAC,KAAD,CAAC,QAMV"}

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

@@ -0,0 +1,85 @@
+import { CheckboxWidget, ImageMedia, MetadataWidget, SmartDateDisplayWidget, styled } from '@journeyapps-labs/reactor-mod';
+import { Attachment, Day, Location } from '@journeyapps/db';
+import * as _ from 'lodash';
+import * as React from 'react';
+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 || (S = {}));
+const MAX_NUMBER_OF_ARR_ITEMS_TO_DISPLAY = 3;
+export const CellDisplayWidget = (props) => {
+    const { row, cell, variable } = 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 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) {
+        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);
+    return null;
+};
+//# sourceMappingURL=CellDisplayWidget.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"CellDisplayWidget.js","sourceRoot":"","sources":["../../../../src/core/query/widgets/CellDisplayWidget.tsx"],"names":[],"mappings":"AAAA,OAAO,EACL,cAAc,EACd,UAAU,EACV,cAAc,EACd,sBAAsB,EACtB,MAAM,EACP,MAAM,+BAA+B,CAAC;AACvC,OAAO,EAAE,UAAU,EAAE,GAAG,EAAE,QAAQ,EAAY,MAAM,iBAAiB,CAAC;AACtE,OAAO,KAAK,CAAC,MAAM,QAAQ,CAAC;AAC5B,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAG/B,IAAU,CAAC,CAuBV;AAvBD,WAAU,CAAC;IACI,OAAK,GAAG,MAAM,CAAC,GAAG,CAAA;;GAE9B,CAAC;IAEW,SAAO,GAAG,MAAM,CAAC,GAAG,CAAA;;;;GAIhC,CAAC;IAEW,MAAI,GAAG,MAAM,CAAC,GAAG,CAAA;;kBAEd,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,KAAK;;;GAGzC,CAAC;IAEW,OAAK,GAAG,MAAM,CAAC,GAAG,CAAA;;;;GAI9B,CAAC;AACJ,CAAC,EAvBS,CAAC,KAAD,CAAC,QAuBV;AAQD,MAAM,kCAAkC,GAAG,CAAC,CAAC;AAE7C,MAAM,CAAC,MAAM,iBAAiB,GAAqC,CAAC,KAAK,EAAE,EAAE;IAC3E,MAAM,EAAE,GAAG,EAAE,IAAI,EAAE,QAAQ,EAAE,GAAG,KAAK,CAAC;IACtC,IAAI,IAAI,IAAI,IAAI,EAAE,CAAC;QACjB,OAAO,oBAAC,CAAC,CAAC,KAAK,eAAe,CAAC;IACjC,CAAC;IACD,IAAI,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC;QACrB,IAAI,IAAI,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE,CAAC;YACvB,OAAO,oBAAC,CAAC,CAAC,KAAK,gBAAgB,CAAC;QAClC,CAAC;QACD,OAAO,IAAI,CAAC;IACd,CAAC;IACD,IAAI,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC;QACrB,OAAO,IAAI,CAAC;IACd,CAAC;IACD,IAAI,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC;QACpB,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACtB,OAAO,oBAAC,CAAC,CAAC,KAAK,sBAAsB,CAAC;QACxC,CAAC;QAED,IAAI,KAAK,GAAG,CAAC,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC,EAAE,kCAAkC,CAAC,CAAC;QAEjE,OAAO,CACL,oBAAC,CAAC,CAAC,KAAK;YACL,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE;gBACf,OAAO,oBAAC,CAAC,CAAC,IAAI,IAAC,GAAG,EAAE,CAAC,IAAG,CAAC,CAAU,CAAC;YACtC,CAAC,CAAC;YACD,KAAK,CAAC,MAAM,KAAK,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CACpC,CACX,CAAC;IACJ,CAAC;IACD,IAAI,IAAI,YAAY,IAAI,EAAE,CAAC;QACzB,OAAO,oBAAC,sBAAsB,IAAC,IAAI,EAAE,IAAI,GAAI,CAAC;IAChD,CAAC;IACD,IAAI,IAAI,YAAY,GAAG,EAAE,CAAC;QACxB,OAAO,oBAAC,sBAAsB,IAAC,IAAI,EAAE,IAAI,CAAC,MAAM,EAAE,GAAI,CAAC;IACzD,CAAC;IACD,IAAI,CAAC,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE,CAAC;QACtB,OAAO,oBAAC,cAAc,IAAC,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAE,GAAG,EAAE,GAAE,CAAC,GAAI,CAAC;IAC/D,CAAC;IACD,IAAI,IAAI,YAAY,QAAQ,EAAE,CAAC;QAC7B,OAAO,CACL;YACE,oBAAC,cAAc,IAAC,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,GAAG,IAAI,CAAC,QAAQ,EAAE,GAAI;YAC3D,oBAAC,cAAc,IAAC,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,GAAG,IAAI,CAAC,SAAS,EAAE,GAAI,CAC5D,CACJ,CAAC;IACJ,CAAC;IACD,IAAI,IAAI,YAAY,UAAU,EAAE,CAAC;QAC/B,IAAI,IAAI,CAAC,QAAQ,EAAE,EAAE,CAAC;YACpB,OAAO,CACL,oBAAC,CAAC,CAAC,OAAO,IACR,OAAO,EAAE,GAAG,EAAE;oBACZ,GAAG,CAAC,KAAK,CAAC,QAAQ,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,CAAC,KAAK,EAAE,EAAE;wBAC/C,IAAI,KAAK,YAAY,UAAU,EAAE,CAAC;4BAChC,KAAK,CAAC,IAAI,EAAE,CAAC;wBACf,CAAC;6BAAM,CAAC;4BACN,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,EAAE,QAAQ,CAAC,CAAC;wBACpC,CAAC;oBACH,CAAC,CAAC,CAAC;gBACL,CAAC,EACD,GAAG,EAAE,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,GAC3B,CACH,CAAC;QACJ,CAAC;QACD,OAAO,oBAAC,CAAC,CAAC,KAAK,uBAAuB,CAAC;IACzC,CAAC;IACD,OAAO,CAAC,GAAG,CAAC,cAAc,EAAE,IAAI,CAAC,CAAC;IAClC,OAAO,IAAI,CAAC;AACd,CAAC,CAAC"}

package/dist/forms/SchemaModelForm.js

@@ -1,6 +1,7 @@
-import { BooleanInput, DateInput, DateTimePickerType, FormModel, SelectInput, TextInput } from '@journeyapps-labs/reactor-mod';
+import { BooleanInput, DateInput, DateTimePickerType, FileInput, FormModel, ImageInput, SelectInput, TextInput } from '@journeyapps-labs/reactor-mod';
 import * as _ from 'lodash';
 import { AttachmentType, BooleanType, DatetimeType, DateType, LocationType, MultipleChoiceType, PhotoType, SignatureType, SingleChoiceIntegerType, SingleChoiceType, TextType } from '@journeyapps/db';
+import { LocationInput } from './inputs/LocationInput';
 export class SchemaModelForm extends FormModel {
     constructor(options) {
         super();
@@ -23,26 +24,40 @@ export class SchemaModelForm extends FormModel {
                     type: DateTimePickerType.DATE
                 });
             }
-            if (attribute.type instanceof AttachmentType) {
-            }
-            if (attribute.type instanceof SignatureType) {
-                console.log((_c = options.object) === null || _c === void 0 ? void 0 : _c.model[attribute.name]);
+            if (attribute.type instanceof SignatureType || attribute.type instanceof PhotoType) {
+                let media = new ImageInput({
+                    name: attribute.name,
+                    label: attribute.label
+                });
+                if (options.object) {
+                    options.object.getMedia(attribute.name).then((m) => {
+                        media.setValue(m);
+                    });
+                }
+                return media;
             }
-            if (attribute.type instanceof PhotoType) {
-                console.log((_d = options.object) === null || _d === void 0 ? void 0 : _d.model[attribute.name]);
+            if (attribute.type instanceof AttachmentType) {
+                return new FileInput({
+                    name: attribute.name,
+                    label: attribute.label,
+                    value: ((_c = options.object) === null || _c === void 0 ? void 0 : _c.model[attribute.name]) || null
+                });
             }
             if (attribute.type instanceof BooleanType) {
                 return new BooleanInput({
                     name: attribute.name,
                     label: attribute.label,
-                    value: (_e = options.object) === null || _e === void 0 ? void 0 : _e.model[attribute.name]
+                    value: (_d = options.object) === null || _d === void 0 ? void 0 : _d.model[attribute.name]
                 });
             }
             if (attribute.type instanceof LocationType) {
+                return new LocationInput({
+                    name: attribute.name,
+                    label: attribute.label,
+                    value: (_e = options.object) === null || _e === void 0 ? void 0 : _e.model[attribute.name]
+                });
             }
-            if (attribute.type instanceof SingleChoiceIntegerType) {
-            }
-            if (attribute.type instanceof SingleChoiceType) {
+            if (attribute.type instanceof SingleChoiceIntegerType || attribute.type instanceof SingleChoiceType) {
                 return new SelectInput({
                     name: attribute.name,
                     label: attribute.label,

package/dist/forms/SchemaModelForm.js.map

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