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

package/CHANGELOG.md

@@ -1,5 +1,30 @@
 # @journeyapps-labs/reactor-mod-data-browser
 
+## 2.2.0
+
+### Minor Changes
+
+- 12e5f6a: - Add support for filters
+  - Fix relationship belongs_to loading
+  - Display column headings with width based on heurestics
+
+### Patch Changes
+
+- 687468b: - Improve relationship loading
+  - Dont block kernel init with connection store
+
+## 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,27 @@ 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;
+    failed: (event: {
+        object_id: string;
+    }) => 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 | null>;
     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/Page.d.ts

@@ -2,6 +2,7 @@ import { SchemaModelObject } from '../SchemaModelObject';
 import { TableRow } from '@journeyapps-labs/reactor-mod';
 import { Collection, DatabaseObject } from '@journeyapps/db';
 import { SchemaModelDefinition } from '../SchemaModelDefinition';
+import { AbstractFilter } from './filters';
 export interface PageRow extends TableRow {
     model: SchemaModelObject;
     definition: SchemaModelDefinition;
@@ -12,6 +13,7 @@ export interface PageOptions {
     limit: number;
     definition: SchemaModelDefinition;
     index: number;
+    filters: AbstractFilter[];
 }
 export declare class Page {
     protected options: PageOptions;

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

@@ -2,10 +2,10 @@ import { AbstractQuery, AbstractQueryEncoded } from './AbstractQuery';
 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 { Promise, Variable } from '@journeyapps/db';
+import { Page } from './Page';
 import { SchemaModelDefinition } from '../SchemaModelDefinition';
-import * as React from 'react';
+import { SimpleFilter } from './filters';
 export interface SimpleQueryOptions {
     definition?: SchemaModelDefinition;
     limit?: number;
@@ -19,6 +19,7 @@ export declare class SimpleQuery extends AbstractQuery<SimpleQueryEncoded> {
     accessor connStore: ConnectionStore;
     accessor _totalPages: number;
     accessor _pages: Page[];
+    simple_filters: Map<Variable, SimpleFilter>;
     constructor(options?: SimpleQueryOptions);
     getCollection(): globalThis.Promise<db.database.Collection<db.database.DatabaseObject>>;
     load(): globalThis.Promise<void>;
@@ -29,8 +30,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/filters.d.ts

@@ -0,0 +1,17 @@
+import { Query, Variable } from '@journeyapps/db';
+export declare abstract class AbstractFilter {
+    abstract augment(query: Query): any;
+}
+export declare enum Condition {
+    EQUALS = "="
+}
+export interface Statement {
+    condition: Condition;
+    arg: any;
+}
+export declare class SimpleFilter extends AbstractFilter {
+    variable: Variable;
+    statements: Statement[];
+    constructor(variable: Variable, statements: Statement[]);
+    augment(query: Query): Query<import("@journeyapps/db").DatabaseObject>;
+}

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

@@ -0,0 +1,14 @@
+import * as React from 'react';
+import { SchemaModelObject } from '../../SchemaModelObject';
+import { AbstractConnection } from '../../AbstractConnection';
+import { Relationship } from '@journeyapps/parser-schema';
+export interface BelongsToDisplayWidgetProps {
+    relationship: Relationship;
+    id: string;
+    connection: AbstractConnection;
+    open: (object: SchemaModelObject) => any;
+}
+export declare const BelongsToDisplayWidget: React.FC<BelongsToDisplayWidgetProps>;
+export declare const BelongsToStringWidget: React.FC<{
+    model: SchemaModelObject;
+}>;

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/core/query/widgets/ColumnDisplayWidget.d.ts

@@ -0,0 +1,5 @@
+import * as React from 'react';
+export interface ColumnDisplayWidgetProps {
+    label: string;
+}
+export declare const ColumnDisplayWidget: React.FC<ColumnDisplayWidgetProps>;

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

@@ -0,0 +1,9 @@
+import * as React from 'react';
+import { Variable } from '@journeyapps/db';
+import { SimpleFilter } from '../filters';
+export interface SmartColumnWidgetProps {
+    variable: Variable;
+    filter?: SimpleFilter;
+    filterChanged: (filter: SimpleFilter | null) => any;
+}
+export declare const SmartColumnWidget: React.FC<SmartColumnWidgetProps>;

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

@@ -0,0 +1,9 @@
+import * as React from 'react';
+import { Variable } from '@journeyapps/db';
+import { SimpleFilter } from '../filters';
+export interface SmartFilterWidgetProps {
+    variable: Variable;
+    filter?: SimpleFilter;
+    filterChanged: (filter: SimpleFilter | null) => any;
+}
+export declare const SmartFilterWidget: React.FC<SmartFilterWidgetProps>;

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/DataBrowserModule.js

@@ -39,7 +39,7 @@ export class DataBrowserModule extends AbstractReactorModule {
         workspaceStore.registerFactory(new ModelPanelFactory());
     }
     async init(ioc) {
-        await ioc.get(ConnectionStore).init();
+        ioc.get(ConnectionStore).init();
     }
 }
 //# sourceMappingURL=DataBrowserModule.js.map

package/dist/DataBrowserModule.js.map

@@ -1 +1 @@
-{"version":3,"file":"DataBrowserModule.js","sourceRoot":"","sources":["../src/DataBrowserModule.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,qBAAqB,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,+BAA+B,CAAC;AAE9F,OAAO,EAAE,eAAe,EAAE,MAAM,0BAA0B,CAAC;AAC3D,OAAO,EAAE,0BAA0B,EAAE,MAAM,uCAAuC,CAAC;AACnF,OAAO,EAAE,uBAAuB,EAAE,MAAM,sCAAsC,CAAC;AAC/E,OAAO,EAAE,iCAAiC,EAAE,MAAM,8CAA8C,CAAC;AACjG,OAAO,EAAE,mBAAmB,EAAE,MAAM,2CAA2C,CAAC;AAChF,OAAO,EAAE,sBAAsB,EAAE,MAAM,8CAA8C,CAAC;AACtF,OAAO,EAAE,qCAAqC,EAAE,MAAM,kDAAkD,CAAC;AACzG,OAAO,EAAE,iBAAiB,EAAE,MAAM,kCAAkC,CAAC;AACrE,OAAO,EAAE,sBAAsB,EAAE,MAAM,qDAAqD,CAAC;AAC7F,OAAO,EAAE,qBAAqB,EAAE,MAAM,kCAAkC,CAAC;AACzE,OAAO,EAAE,iBAAiB,EAAE,MAAM,kCAAkC,CAAC;AACrE,OAAO,EAAE,iBAAiB,EAAE,MAAM,gDAAgD,CAAC;AACnF,OAAO,EAAE,iCAAiC,EAAE,MAAM,8CAA8C,CAAC;AACjG,OAAO,EAAE,qBAAqB,EAAE,MAAM,8CAA8C,CAAC;AAErF,MAAM,OAAO,iBAAkB,SAAQ,qBAAqB;IAC1D;QACE,KAAK,CAAC;YACJ,IAAI,EAAE,cAAc;SACrB,CAAC,CAAC;IACL,CAAC;IAED,QAAQ,CAAC,GAAc;QACrB,MAAM,MAAM,GAAG,GAAG,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;QAC/B,MAAM,cAAc,GAAG,GAAG,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC;QAE/C,IAAI,eAAe,GAAG,IAAI,eAAe,EAAE,CAAC;QAE5C,eAAe,CAAC,yBAAyB,CAAC,IAAI,uBAAuB,EAAE,CAAC,CAAC;QAEzE,MAAM,CAAC,cAAc,CAAC,IAAI,mBAAmB,EAAE,CAAC,CAAC;QACjD,MAAM,CAAC,cAAc,CAAC,IAAI,sBAAsB,EAAE,CAAC,CAAC;QACpD,MAAM,CAAC,cAAc,CAAC,IAAI,sBAAsB,EAAE,CAAC,CAAC;QACpD,MAAM,CAAC,cAAc,CAAC,IAAI,iBAAiB,EAAE,CAAC,CAAC;QAC/C,MAAM,CAAC,cAAc,CAAC,IAAI,qBAAqB,EAAE,CAAC,CAAC;QAEnD,MAAM,CAAC,QAAQ,CAAC,eAAe,EAAE,eAAe,CAAC,CAAC;QAElD,MAAM,CAAC,kBAAkB,CAAC,IAAI,0BAA0B,EAAE,CAAC,CAAC;QAC5D,MAAM,CAAC,kBAAkB,CAAC,IAAI,iCAAiC,EAAE,CAAC,CAAC;QACnE,MAAM,CAAC,kBAAkB,CAAC,IAAI,qCAAqC,EAAE,CAAC,CAAC;QACvE,MAAM,CAAC,kBAAkB,CAAC,IAAI,iCAAiC,EAAE,CAAC,CAAC;QACnE,MAAM,CAAC,kBAAkB,CAAC,IAAI,qBAAqB,EAAE,CAAC,CAAC;QAEvD,cAAc,CAAC,eAAe,CAAC,IAAI,iBAAiB,EAAE,CAAC,CAAC;QACxD,cAAc,CAAC,eAAe,CAAC,IAAI,iBAAiB,EAAE,CAAC,CAAC;IAC1D,CAAC;IAED,KAAK,CAAC,IAAI,CAAC,GAAc;QACvB,MAAM,GAAG,CAAC,GAAG,CAAC,eAAe,CAAC,CAAC,IAAI,EAAE,CAAC;IACxC,CAAC;CACF"}
+{"version":3,"file":"DataBrowserModule.js","sourceRoot":"","sources":["../src/DataBrowserModule.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,qBAAqB,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,+BAA+B,CAAC;AAE9F,OAAO,EAAE,eAAe,EAAE,MAAM,0BAA0B,CAAC;AAC3D,OAAO,EAAE,0BAA0B,EAAE,MAAM,uCAAuC,CAAC;AACnF,OAAO,EAAE,uBAAuB,EAAE,MAAM,sCAAsC,CAAC;AAC/E,OAAO,EAAE,iCAAiC,EAAE,MAAM,8CAA8C,CAAC;AACjG,OAAO,EAAE,mBAAmB,EAAE,MAAM,2CAA2C,CAAC;AAChF,OAAO,EAAE,sBAAsB,EAAE,MAAM,8CAA8C,CAAC;AACtF,OAAO,EAAE,qCAAqC,EAAE,MAAM,kDAAkD,CAAC;AACzG,OAAO,EAAE,iBAAiB,EAAE,MAAM,kCAAkC,CAAC;AACrE,OAAO,EAAE,sBAAsB,EAAE,MAAM,qDAAqD,CAAC;AAC7F,OAAO,EAAE,qBAAqB,EAAE,MAAM,kCAAkC,CAAC;AACzE,OAAO,EAAE,iBAAiB,EAAE,MAAM,kCAAkC,CAAC;AACrE,OAAO,EAAE,iBAAiB,EAAE,MAAM,gDAAgD,CAAC;AACnF,OAAO,EAAE,iCAAiC,EAAE,MAAM,8CAA8C,CAAC;AACjG,OAAO,EAAE,qBAAqB,EAAE,MAAM,8CAA8C,CAAC;AAErF,MAAM,OAAO,iBAAkB,SAAQ,qBAAqB;IAC1D;QACE,KAAK,CAAC;YACJ,IAAI,EAAE,cAAc;SACrB,CAAC,CAAC;IACL,CAAC;IAED,QAAQ,CAAC,GAAc;QACrB,MAAM,MAAM,GAAG,GAAG,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;QAC/B,MAAM,cAAc,GAAG,GAAG,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC;QAE/C,IAAI,eAAe,GAAG,IAAI,eAAe,EAAE,CAAC;QAE5C,eAAe,CAAC,yBAAyB,CAAC,IAAI,uBAAuB,EAAE,CAAC,CAAC;QAEzE,MAAM,CAAC,cAAc,CAAC,IAAI,mBAAmB,EAAE,CAAC,CAAC;QACjD,MAAM,CAAC,cAAc,CAAC,IAAI,sBAAsB,EAAE,CAAC,CAAC;QACpD,MAAM,CAAC,cAAc,CAAC,IAAI,sBAAsB,EAAE,CAAC,CAAC;QACpD,MAAM,CAAC,cAAc,CAAC,IAAI,iBAAiB,EAAE,CAAC,CAAC;QAC/C,MAAM,CAAC,cAAc,CAAC,IAAI,qBAAqB,EAAE,CAAC,CAAC;QAEnD,MAAM,CAAC,QAAQ,CAAC,eAAe,EAAE,eAAe,CAAC,CAAC;QAElD,MAAM,CAAC,kBAAkB,CAAC,IAAI,0BAA0B,EAAE,CAAC,CAAC;QAC5D,MAAM,CAAC,kBAAkB,CAAC,IAAI,iCAAiC,EAAE,CAAC,CAAC;QACnE,MAAM,CAAC,kBAAkB,CAAC,IAAI,qCAAqC,EAAE,CAAC,CAAC;QACvE,MAAM,CAAC,kBAAkB,CAAC,IAAI,iCAAiC,EAAE,CAAC,CAAC;QACnE,MAAM,CAAC,kBAAkB,CAAC,IAAI,qBAAqB,EAAE,CAAC,CAAC;QAEvD,cAAc,CAAC,eAAe,CAAC,IAAI,iBAAiB,EAAE,CAAC,CAAC;QACxD,cAAc,CAAC,eAAe,CAAC,IAAI,iBAAiB,EAAE,CAAC,CAAC;IAC1D,CAAC;IAED,KAAK,CAAC,IAAI,CAAC,GAAc;QACvB,GAAG,CAAC,GAAG,CAAC,eAAe,CAAC,CAAC,IAAI,EAAE,CAAC;IAClC,CAAC;CACF"}

package/dist/core/SchemaModelDefinition.js

@@ -1,12 +1,66 @@
 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();
+            try {
+                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 }); });
+                }
+                else {
+                    this.iterateListeners((cb) => { var _a; return (_a = cb.failed) === null || _a === void 0 ? void 0 : _a.call(cb, { object_id: id }); });
+                }
+            }
+            catch (ex) {
+                this.iterateListeners((cb) => { var _a; return (_a = cb.failed) === null || _a === void 0 ? void 0 : _a.call(cb, { object_id: id }); });
+                throw ex;
+            }
+        }, 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);
+                    }
+                },
+                failed: ({ object_id }) => {
+                    if (object_id === id) {
+                        l1();
+                        resolve(null);
+                    }
+                }
+            });
+        });
     }
     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/Page.js

@@ -29,7 +29,11 @@ let Page = (() => {
             async load() {
                 this.loading = true;
                 let collection = await this.options.collection();
-                let models = await collection.all().limit(this.options.limit).skip(this.options.offset).toArray();
+                let query = collection.all();
+                this.options.filters.forEach((f) => {
+                    query = f.augment(query);
+                });
+                let models = await query.limit(this.options.limit).skip(this.options.offset).toArray();
                 this.models = models.map((m) => {
                     return new SchemaModelObject({
                         definition: this.options.definition,

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

@@ -1 +1 @@
-{"version":3,"file":"Page.js","sourceRoot":"","sources":["../../../src/core/query/Page.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AAGzD,OAAO,EAAE,UAAU,EAAE,MAAM,MAAM,CAAC;IAgBrB,IAAI;;;;;;;;sBAAJ,IAAI;YAEf,IAAS,MAAM,+EAAsB;YAArC,IAAS,MAAM,oFAAsB;YAGrC,IAAS,OAAO,gFAAU;YAA1B,IAAS,OAAO,qFAAU;YAE1B,YAAsB,OAAoB;gBAApB,YAAO,GAAP,OAAO,CAAa;gBALjC,+FAA4B;gBAG5B,uJAAiB;;gBAEJ,YAAO,GAAP,OAAO,CAAa;gBACxC,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC;gBACpB,IAAI,CAAC,MAAM,GAAG,EAAE,CAAC;aAClB;YAED,IAAI,KAAK;gBACP,OAAO,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC;YAC5B,CAAC;YAED,KAAK,CAAC,IAAI;gBACR,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC;gBACpB,IAAI,UAAU,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE,CAAC;gBACjD,IAAI,MAAM,GAAG,MAAM,UAAU,CAAC,GAAG,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,OAAO,EAAE,CAAC;gBAClG,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE;oBAC7B,OAAO,IAAI,iBAAiB,CAAC;wBAC3B,UAAU,EAAE,IAAI,CAAC,OAAO,CAAC,UAAU;wBACnC,KAAK,EAAE,CAAC;qBACT,CAAC,CAAC;gBACL,CAAC,CAAC,CAAC;gBACH,IAAI,CAAC,OAAO,GAAG,KAAK,CAAC;YACvB,CAAC;YAED,MAAM;gBACJ,OAAO,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE;oBAC3B,OAAO;wBACL,GAAG,EAAE,CAAC,CAAC,KAAK,CAAC,EAAE;wBACf,KAAK,EAAE,CAAC,CAAC,KAAK;wBACd,UAAU,EAAE,IAAI,CAAC,OAAO,CAAC,UAAU;wBACnC,KAAK,EAAE,CAAC;qBACT,CAAC;gBACJ,CAAC,CAAC,CAAC;YACL,CAAC;;;;;;kCArCA,UAAU;mCAGV,UAAU;YAFX,qKAAS,MAAM,6BAAN,MAAM,uFAAsB;YAGrC,wKAAS,OAAO,6BAAP,OAAO,yFAAU;;;;;SALf,IAAI"}
+{"version":3,"file":"Page.js","sourceRoot":"","sources":["../../../src/core/query/Page.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AAGzD,OAAO,EAAE,UAAU,EAAE,MAAM,MAAM,CAAC;IAkBrB,IAAI;;;;;;;;sBAAJ,IAAI;YAEf,IAAS,MAAM,+EAAsB;YAArC,IAAS,MAAM,oFAAsB;YAGrC,IAAS,OAAO,gFAAU;YAA1B,IAAS,OAAO,qFAAU;YAE1B,YAAsB,OAAoB;gBAApB,YAAO,GAAP,OAAO,CAAa;gBALjC,+FAA4B;gBAG5B,uJAAiB;;gBAEJ,YAAO,GAAP,OAAO,CAAa;gBACxC,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC;gBACpB,IAAI,CAAC,MAAM,GAAG,EAAE,CAAC;aAClB;YAED,IAAI,KAAK;gBACP,OAAO,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC;YAC5B,CAAC;YAED,KAAK,CAAC,IAAI;gBACR,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC;gBACpB,IAAI,UAAU,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE,CAAC;gBACjD,IAAI,KAAK,GAAG,UAAU,CAAC,GAAG,EAAE,CAAC;gBAE7B,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE;oBACjC,KAAK,GAAG,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;gBAC3B,CAAC,CAAC,CAAC;gBAEH,IAAI,MAAM,GAAG,MAAM,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,OAAO,EAAE,CAAC;gBACvF,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE;oBAC7B,OAAO,IAAI,iBAAiB,CAAC;wBAC3B,UAAU,EAAE,IAAI,CAAC,OAAO,CAAC,UAAU;wBACnC,KAAK,EAAE,CAAC;qBACT,CAAC,CAAC;gBACL,CAAC,CAAC,CAAC;gBACH,IAAI,CAAC,OAAO,GAAG,KAAK,CAAC;YACvB,CAAC;YAED,MAAM;gBACJ,OAAO,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE;oBAC3B,OAAO;wBACL,GAAG,EAAE,CAAC,CAAC,KAAK,CAAC,EAAE;wBACf,KAAK,EAAE,CAAC,CAAC,KAAK;wBACd,UAAU,EAAE,IAAI,CAAC,OAAO,CAAC,UAAU;wBACnC,KAAK,EAAE,CAAC;qBACT,CAAC;gBACJ,CAAC,CAAC,CAAC;YACL,CAAC;;;;;;kCA3CA,UAAU;mCAGV,UAAU;YAFX,qKAAS,MAAM,6BAAN,MAAM,uFAAsB;YAGrC,wKAAS,OAAO,6BAAP,OAAO,yFAAU;;;;;SALf,IAAI"}

package/dist/core/query/SimpleQuery.js

@@ -1,15 +1,19 @@
 import { __classPrivateFieldGet, __classPrivateFieldSet, __esDecorate, __runInitializers } from "tslib";
 import { AbstractQuery } from './AbstractQuery';
-import { CheckboxWidget, inject, MetadataWidget, SmartDateDisplayWidget, styled } from '@journeyapps-labs/reactor-mod';
+import { ActionSource, 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 { 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';
 let SimpleQuery = (() => {
     var _a, _SimpleQuery_connStore_accessor_storage, _SimpleQuery__totalPages_accessor_storage, _SimpleQuery__pages_accessor_storage;
     let _classSuper = AbstractQuery;
+    let _instanceExtraInitializers = [];
     let _connStore_decorators;
     let _connStore_initializers = [];
     let _connStore_extraInitializers = [];
@@ -19,6 +23,7 @@ let SimpleQuery = (() => {
     let __pages_decorators;
     let __pages_initializers = [];
     let __pages_extraInitializers = [];
+    let _load_decorators;
     return _a = class SimpleQuery extends _classSuper {
             get connStore() { return __classPrivateFieldGet(this, _SimpleQuery_connStore_accessor_storage, "f"); }
             set connStore(value) { __classPrivateFieldSet(this, _SimpleQuery_connStore_accessor_storage, value, "f"); }
@@ -29,22 +34,27 @@ let SimpleQuery = (() => {
             constructor(options = {}) {
                 var _b;
                 super('simple', (_b = options.definition) === null || _b === void 0 ? void 0 : _b.connection);
-                this.options = options;
+                this.options = (__runInitializers(this, _instanceExtraInitializers), options);
                 _SimpleQuery_connStore_accessor_storage.set(this, __runInitializers(this, _connStore_initializers, void 0));
                 _SimpleQuery__totalPages_accessor_storage.set(this, (__runInitializers(this, _connStore_extraInitializers), __runInitializers(this, __totalPages_initializers, void 0)));
                 _SimpleQuery__pages_accessor_storage.set(this, (__runInitializers(this, __totalPages_extraInitializers), __runInitializers(this, __pages_initializers, void 0)));
-                __runInitializers(this, __pages_extraInitializers);
-                this.options = options;
+                this.simple_filters = __runInitializers(this, __pages_extraInitializers);
                 this._totalPages = 0;
                 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 results = await collection.adapter.doApiQuery(collection.all());
+                let query = collection.all();
+                this.simple_filters.forEach((f) => {
+                    query = f.augment(query);
+                });
+                let results = await collection.adapter.doApiQuery(query);
                 this._totalPages = Math.ceil(results.total / this.options.limit);
             }
             getPage(number) {
@@ -54,7 +64,8 @@ let SimpleQuery = (() => {
                         limit: this.options.limit,
                         collection: () => this.getCollection(),
                         definition: this.options.definition,
-                        index: number
+                        index: number,
+                        filters: Array.from(this.simple_filters.values())
                     });
                     page.load();
                     this._pages[number] = page;
@@ -80,14 +91,40 @@ 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, { 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] }));
+                            }
+                        };
+                    }),
                     ..._.map(this.options.definition.definition.attributes, (a) => {
+                        // @ts-ignore FIXME, remove when `display` supports JSX.Element as a type
                         return {
                             key: a.name,
-                            display: a.label,
+                            display: (React.createElement(SmartColumnWidget, { variable: a, filter: this.simple_filters.get(a), filterChanged: (filter) => {
+                                    if (!filter) {
+                                        this.simple_filters.delete(a);
+                                        this.load();
+                                    }
+                                    else {
+                                        this.simple_filters.set(a, filter);
+                                        this.load();
+                                    }
+                                } })),
                             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 });
                             }
                         };
                     })
@@ -106,85 +143,14 @@ let SimpleQuery = (() => {
             _connStore_decorators = [inject(ConnectionStore)];
             __totalPages_decorators = [observable];
             __pages_decorators = [observable];
+            _load_decorators = [action];
             __esDecorate(_a, null, _connStore_decorators, { kind: "accessor", name: "connStore", static: false, private: false, access: { has: obj => "connStore" in obj, get: obj => obj.connStore, set: (obj, value) => { obj.connStore = value; } }, metadata: _metadata }, _connStore_initializers, _connStore_extraInitializers);
             __esDecorate(_a, null, __totalPages_decorators, { kind: "accessor", name: "_totalPages", static: false, private: false, access: { has: obj => "_totalPages" in obj, get: obj => obj._totalPages, set: (obj, value) => { obj._totalPages = value; } }, metadata: _metadata }, __totalPages_initializers, __totalPages_extraInitializers);
             __esDecorate(_a, null, __pages_decorators, { kind: "accessor", name: "_pages", static: false, private: false, access: { has: obj => "_pages" in obj, get: obj => obj._pages, set: (obj, value) => { obj._pages = value; } }, metadata: _metadata }, __pages_initializers, __pages_extraInitializers);
+            __esDecorate(_a, null, _load_decorators, { kind: "method", name: "load", static: false, private: false, access: { has: obj => "load" in obj, get: obj => obj.load }, metadata: _metadata }, null, _instanceExtraInitializers);
             if (_metadata) Object.defineProperty(_a, Symbol.metadata, { enumerable: true, configurable: true, writable: true, value: _metadata });
         })(),
         _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