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

package/dist/core/SchemaModelDefinition.js

@@ -1,3 +1,4 @@
+import { JourneyAPIAdapter } from '@journeyapps/db';
 import { SchemaModelObject } from './SchemaModelObject';
 import { BaseObserver } from '@journeyapps-labs/common-utils';
 import { queue } from 'async';
@@ -10,30 +11,44 @@ export class SchemaModelDefinition extends BaseObserver {
         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);
+                let models = await this.executeQuery(collection.where(`id = ?`, id));
+                if (models[0]) {
+                    this.cache.set(id, models[0]);
                     this.enqueued.delete(id);
-                    this.iterateListeners((cb) => { var _a; return (_a = cb.resolved) === null || _a === void 0 ? void 0 : _a.call(cb, { object }); });
+                    this.iterateListeners((cb) => { var _a; return (_a = cb.resolved) === null || _a === void 0 ? void 0 : _a.call(cb, { object: models[0] }); });
                 }
                 else {
+                    this.enqueued.delete(id);
                     this.iterateListeners((cb) => { var _a; return (_a = cb.failed) === null || _a === void 0 ? void 0 : _a.call(cb, { object_id: id }); });
                 }
             }
             catch (ex) {
+                this.enqueued.delete(id);
                 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);
-        }
+    async search(text) {
+        let collection = await this.getCollection();
+        let adapter = collection.adapter;
+        // @ts-ignore
+        let res = await adapter.apiPost(`${adapter.credentials.api4Url()}objects/${this.definition.name}/search.json`, {
+            query: text
+        });
+        return res.objects
+            .map((o) => {
+            return JourneyAPIAdapter.apiToInternalFormat(this.definition, o);
+        })
+            .map((o) => {
+            return new SchemaModelObject({
+                definition: this,
+                model: o,
+                adapter: collection.adapter
+            });
+        });
+    }
+    async load(id) {
         if (!this.enqueued.has(id)) {
             this.enqueued.add(id);
             this.queue.push(id);
@@ -55,6 +70,12 @@ export class SchemaModelDefinition extends BaseObserver {
             });
         });
     }
+    async resolve(id) {
+        if (this.cache.has(id)) {
+            return this.cache.get(id);
+        }
+        return this.load(id);
+    }
     get key() {
         return this.definition.name;
     }
@@ -70,6 +91,24 @@ export class SchemaModelDefinition extends BaseObserver {
     get definition() {
         return this.options.definition;
     }
+    async executeQuery(query) {
+        let collection = await this.getCollection();
+        let results = await collection.adapter.executeQuery(query);
+        return results.map((m) => {
+            if (!this.cache.has(m.id)) {
+                const model = new SchemaModelObject({
+                    definition: this,
+                    model: m,
+                    adapter: collection.adapter
+                });
+                this.cache.set(m.id, model);
+                return model;
+            }
+            let model = this.cache.get(m.id);
+            model.setData(m);
+            return model;
+        });
+    }
     async getCollection() {
         const conn = await this.connection.getConnection();
         return conn[this.definition.name];
@@ -78,7 +117,7 @@ export class SchemaModelDefinition extends BaseObserver {
         const collection = await this.getCollection();
         return new SchemaModelObject({
             definition: this,
-            model: collection.create()
+            adapter: collection.adapter
         });
     }
 }

package/dist/core/SchemaModelDefinition.js.map

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

package/dist/core/SchemaModelObject.js

@@ -1,70 +1,110 @@
 import { __classPrivateFieldGet, __classPrivateFieldSet, __esDecorate, __runInitializers } from "tslib";
-import { inject, MediaEngine } from '@journeyapps-labs/reactor-mod';
+import { DatabaseObject } from '@journeyapps/db';
+import { action, observable } from 'mobx';
 let SchemaModelObject = (() => {
-    var _a, _SchemaModelObject_mediaEngine_accessor_storage;
-    let _mediaEngine_decorators;
-    let _mediaEngine_initializers = [];
-    let _mediaEngine_extraInitializers = [];
+    var _a, _SchemaModelObject_data_accessor_storage, _SchemaModelObject_model_accessor_storage, _SchemaModelObject_updated_at_accessor_storage, _SchemaModelObject_patch_accessor_storage;
+    let _instanceExtraInitializers = [];
+    let _data_decorators;
+    let _data_initializers = [];
+    let _data_extraInitializers = [];
+    let _model_decorators;
+    let _model_initializers = [];
+    let _model_extraInitializers = [];
+    let _updated_at_decorators;
+    let _updated_at_initializers = [];
+    let _updated_at_extraInitializers = [];
+    let _patch_decorators;
+    let _patch_initializers = [];
+    let _patch_extraInitializers = [];
+    let _setData_decorators;
     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"); }
+            get data() { return __classPrivateFieldGet(this, _SchemaModelObject_data_accessor_storage, "f"); }
+            set data(value) { __classPrivateFieldSet(this, _SchemaModelObject_data_accessor_storage, value, "f"); }
+            get model() { return __classPrivateFieldGet(this, _SchemaModelObject_model_accessor_storage, "f"); }
+            set model(value) { __classPrivateFieldSet(this, _SchemaModelObject_model_accessor_storage, value, "f"); }
+            get updated_at() { return __classPrivateFieldGet(this, _SchemaModelObject_updated_at_accessor_storage, "f"); }
+            set updated_at(value) { __classPrivateFieldSet(this, _SchemaModelObject_updated_at_accessor_storage, value, "f"); }
+            get patch() { return __classPrivateFieldGet(this, _SchemaModelObject_patch_accessor_storage, "f"); }
+            set patch(value) { __classPrivateFieldSet(this, _SchemaModelObject_patch_accessor_storage, value, "f"); }
             constructor(options) {
+                this.options = (__runInitializers(this, _instanceExtraInitializers), options);
+                _SchemaModelObject_data_accessor_storage.set(this, __runInitializers(this, _data_initializers, void 0));
+                _SchemaModelObject_model_accessor_storage.set(this, (__runInitializers(this, _data_extraInitializers), __runInitializers(this, _model_initializers, void 0)));
+                _SchemaModelObject_updated_at_accessor_storage.set(this, (__runInitializers(this, _model_extraInitializers), __runInitializers(this, _updated_at_initializers, void 0)));
+                _SchemaModelObject_patch_accessor_storage.set(this, (__runInitializers(this, _updated_at_extraInitializers), __runInitializers(this, _patch_initializers, void 0)));
+                __runInitializers(this, _patch_extraInitializers);
                 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;
+                if (options.model) {
+                    this.setData(options.model);
+                }
+                this.patch = new Map();
             }
-            async displayValue() {
+            async applyPatches() {
                 if (!this.model) {
-                    return null;
-                }
-                let val = this.model.toString();
-                if (val) {
-                    return val;
+                    const collection = await this.definition.getCollection();
+                    this.model = collection.create();
                 }
-                /*
-                  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;
+                for (let entry of this.patch.entries()) {
+                    if (this.definition.definition.belongsTo[entry[0]]) {
+                        this.model[entry[0]](entry[1].model);
+                    }
+                    else {
+                        this.model[entry[0]] = entry[1];
                     }
                 }
-                return null;
+                this.patch.clear();
+            }
+            async save() {
+                await this.definition.connection.batchSave([this]);
             }
-            async getMedia(field) {
-                if (this._mediaCache.has(field)) {
-                    return this._mediaCache.get(field);
+            clearEdits() {
+                this.patch.clear();
+            }
+            revert(field) {
+                this.patch.delete(field);
+            }
+            set(field, value) {
+                var _b;
+                if (((_b = this.model) === null || _b === void 0 ? void 0 : _b[field]) === value) {
+                    this.patch.delete(field);
                 }
-                let media = this.model[field];
-                if (!(media === null || media === void 0 ? void 0 : media.uploaded())) {
-                    return null;
+                else {
+                    this.patch.set(field, value);
                 }
-                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;
+            }
+            setData(data) {
+                this.data = data;
+                this.model = new DatabaseObject(this.options.adapter, this.definition.definition, data.id);
+                // @ts-ignore
+                this.model.resolve(data);
+                this.updated_at = new Date(data._updated_at);
+            }
+            async reload() {
+                await this.definition.load(this.id);
+            }
+            get definition() {
+                return this.options.definition;
+            }
+            get id() {
+                return this.data.id;
             }
         },
-        _SchemaModelObject_mediaEngine_accessor_storage = new WeakMap(),
+        _SchemaModelObject_data_accessor_storage = new WeakMap(),
+        _SchemaModelObject_model_accessor_storage = new WeakMap(),
+        _SchemaModelObject_updated_at_accessor_storage = new WeakMap(),
+        _SchemaModelObject_patch_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);
+            _data_decorators = [observable];
+            _model_decorators = [observable];
+            _updated_at_decorators = [observable];
+            _patch_decorators = [observable];
+            _setData_decorators = [action];
+            __esDecorate(_a, null, _data_decorators, { kind: "accessor", name: "data", static: false, private: false, access: { has: obj => "data" in obj, get: obj => obj.data, set: (obj, value) => { obj.data = value; } }, metadata: _metadata }, _data_initializers, _data_extraInitializers);
+            __esDecorate(_a, null, _model_decorators, { kind: "accessor", name: "model", static: false, private: false, access: { has: obj => "model" in obj, get: obj => obj.model, set: (obj, value) => { obj.model = value; } }, metadata: _metadata }, _model_initializers, _model_extraInitializers);
+            __esDecorate(_a, null, _updated_at_decorators, { kind: "accessor", name: "updated_at", static: false, private: false, access: { has: obj => "updated_at" in obj, get: obj => obj.updated_at, set: (obj, value) => { obj.updated_at = value; } }, metadata: _metadata }, _updated_at_initializers, _updated_at_extraInitializers);
+            __esDecorate(_a, null, _patch_decorators, { kind: "accessor", name: "patch", static: false, private: false, access: { has: obj => "patch" in obj, get: obj => obj.patch, set: (obj, value) => { obj.patch = value; } }, metadata: _metadata }, _patch_initializers, _patch_extraInitializers);
+            __esDecorate(_a, null, _setData_decorators, { kind: "method", name: "setData", static: false, private: false, access: { has: obj => "setData" in obj, get: obj => obj.setData }, metadata: _metadata }, null, _instanceExtraInitializers);
             if (_metadata) Object.defineProperty(_a, Symbol.metadata, { enumerable: true, configurable: true, writable: true, value: _metadata });
         })(),
         _a;

package/dist/core/SchemaModelObject.js.map

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

package/dist/core/query/AbstractQuery.js

@@ -5,14 +5,8 @@ export class AbstractQuery {
         this.connection = connection;
         this.id = v4();
     }
-    serialize() {
-        return {
-            type: this.type,
-            connection_id: this.connection.id
-        };
-    }
-    async deserialize(connectionStore, data) {
-        this.connection = await connectionStore.waitForReadyForConnection(data.connection_id);
+    async batchSave() {
+        await this.connection.batchSave(this.getDirtyObjects());
     }
 }
 //# sourceMappingURL=AbstractQuery.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"AbstractQuery.js","sourceRoot":"","sources":["../../../src/core/query/AbstractQuery.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,EAAE,EAAE,MAAM,MAAM,CAAC;AAS1B,MAAM,OAAgB,aAAa;IAGjC,YACY,IAAY,EACZ,UAA8B;QAD9B,SAAI,GAAJ,IAAI,CAAQ;QACZ,eAAU,GAAV,UAAU,CAAoB;QAExC,IAAI,CAAC,EAAE,GAAG,EAAE,EAAE,CAAC;IACjB,CAAC;IAYD,SAAS;QACP,OAAO;YACL,IAAI,EAAE,IAAI,CAAC,IAAI;YACf,aAAa,EAAE,IAAI,CAAC,UAAU,CAAC,EAAE;SAC7B,CAAC;IACT,CAAC;IAED,KAAK,CAAC,WAAW,CAAC,eAAgC,EAAE,IAAO;QACzD,IAAI,CAAC,UAAU,GAAG,MAAM,eAAe,CAAC,yBAAyB,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;IACxF,CAAC;CACF"}
+{"version":3,"file":"AbstractQuery.js","sourceRoot":"","sources":["../../../src/core/query/AbstractQuery.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,EAAE,EAAE,MAAM,MAAM,CAAC;AAI1B,MAAM,OAAgB,aAAa;IAGjC,YACS,IAAY,EACZ,UAA8B;QAD9B,SAAI,GAAJ,IAAI,CAAQ;QACZ,eAAU,GAAV,UAAU,CAAoB;QAErC,IAAI,CAAC,EAAE,GAAG,EAAE,EAAE,CAAC;IACjB,CAAC;IAED,KAAK,CAAC,SAAS;QACb,MAAM,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,IAAI,CAAC,eAAe,EAAE,CAAC,CAAC;IAC1D,CAAC;CAaF"}

package/dist/core/query/AbstractSerializableQuery.js

@@ -0,0 +1,13 @@
+import { AbstractQuery } from './AbstractQuery';
+export class AbstractSerializableQuery extends AbstractQuery {
+    serialize() {
+        return {
+            type: this.type,
+            connection_id: this.connection.id
+        };
+    }
+    async deserialize(connectionStore, data) {
+        this.connection = await connectionStore.waitForReadyForConnection(data.connection_id);
+    }
+}
+//# sourceMappingURL=AbstractSerializableQuery.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"AbstractSerializableQuery.js","sourceRoot":"","sources":["../../../src/core/query/AbstractSerializableQuery.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAQhD,MAAM,OAAgB,yBAEpB,SAAQ,aAAa;IACrB,SAAS;QACP,OAAO;YACL,IAAI,EAAE,IAAI,CAAC,IAAI;YACf,aAAa,EAAE,IAAI,CAAC,UAAU,CAAC,EAAE;SAC7B,CAAC;IACT,CAAC;IAED,KAAK,CAAC,WAAW,CAAC,eAAgC,EAAE,IAAO;QACzD,IAAI,CAAC,UAAU,GAAG,MAAM,eAAe,CAAC,yBAAyB,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;IACxF,CAAC;CACF"}

package/dist/core/query/Page.js

@@ -1,5 +1,4 @@
 import { __classPrivateFieldGet, __classPrivateFieldSet, __esDecorate, __runInitializers } from "tslib";
-import { SchemaModelObject } from '../SchemaModelObject';
 import { observable } from 'mobx';
 let Page = (() => {
     var _a, _Page_models_accessor_storage, _Page_loading_accessor_storage;
@@ -26,21 +25,13 @@ let Page = (() => {
             get index() {
                 return this.options.index;
             }
-            async load() {
-                this.loading = true;
-                let collection = await this.options.collection();
-                let query = collection.all();
-                this.options.filters.forEach((f) => {
-                    query = f.augment(query);
+            reset() {
+                this.models.forEach((m) => {
+                    m.patch.clear();
                 });
-                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,
-                        model: m
-                    });
-                });
-                this.loading = false;
+            }
+            getDirtyObjects() {
+                return this.models.filter((m) => m.patch.size > 0);
             }
             asRows() {
                 return this.models.map((m) => {

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;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"}
+{"version":3,"file":"Page.js","sourceRoot":"","sources":["../../../src/core/query/Page.ts"],"names":[],"mappings":";AAEA,OAAO,EAAE,UAAU,EAAE,MAAM,MAAM,CAAC;IAarB,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;gBACH,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE;oBACxB,CAAC,CAAC,KAAK,CAAC,KAAK,EAAE,CAAC;gBAClB,CAAC,CAAC,CAAC;YACL,CAAC;YAED,eAAe;gBACb,OAAO,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,GAAG,CAAC,CAAC,CAAC;YACrD,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;;;;;;kCAlCA,UAAU;mCAGV,UAAU;YAFX,qKAAS,MAAM,6BAAN,MAAM,uFAAsB;YAGrC,wKAAS,OAAO,6BAAP,OAAO,yFAAU;;;;;SALf,IAAI"}

package/dist/core/query/query-changed/ChangedModelQuery.js

@@ -0,0 +1,31 @@
+import { AbstractQuery } from '../AbstractQuery';
+import { Page } from '../Page';
+export class ChangedModelQuery extends AbstractQuery {
+    constructor(query) {
+        super(query.type, query.connection);
+        this.query = query;
+    }
+    getDirtyObjects() {
+        return this.query.getDirtyObjects();
+    }
+    getSimpleName() {
+        return `Changed models`;
+    }
+    async load() { }
+    getColumns() {
+        return this.query.getColumns();
+    }
+    get totalPages() {
+        return 1;
+    }
+    getPage(number) {
+        let page = new Page({
+            definition: this.query.options.definition,
+            index: 0
+        });
+        page.loading = false;
+        page.models = this.query.getDirtyObjects();
+        return page;
+    }
+}
+//# sourceMappingURL=ChangedModelQuery.js.map

package/dist/core/query/query-changed/ChangedModelQuery.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"ChangedModelQuery.js","sourceRoot":"","sources":["../../../../src/core/query/query-changed/ChangedModelQuery.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AACjD,OAAO,EAAE,IAAI,EAAE,MAAM,SAAS,CAAC;AAG/B,MAAM,OAAO,iBAAkB,SAAQ,aAAa;IAClD,YAAsB,KAAkB;QACtC,KAAK,CAAC,KAAK,CAAC,IAAI,EAAE,KAAK,CAAC,UAAU,CAAC,CAAC;QADhB,UAAK,GAAL,KAAK,CAAa;IAExC,CAAC;IAED,eAAe;QACb,OAAO,IAAI,CAAC,KAAK,CAAC,eAAe,EAAE,CAAC;IACtC,CAAC;IACD,aAAa;QACX,OAAO,gBAAgB,CAAC;IAC1B,CAAC;IACD,KAAK,CAAC,IAAI,KAAkB,CAAC;IAE7B,UAAU;QACR,OAAO,IAAI,CAAC,KAAK,CAAC,UAAU,EAAE,CAAC;IACjC,CAAC;IACD,IAAI,UAAU;QACZ,OAAO,CAAC,CAAC;IACX,CAAC;IACD,OAAO,CAAC,MAAc;QACpB,IAAI,IAAI,GAAG,IAAI,IAAI,CAAC;YAClB,UAAU,EAAE,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,UAAU;YACzC,KAAK,EAAE,CAAC;SACT,CAAC,CAAC;QACH,IAAI,CAAC,OAAO,GAAG,KAAK,CAAC;QACrB,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,eAAe,EAAE,CAAC;QAC3C,OAAO,IAAI,CAAC;IACd,CAAC;CACF"}

package/dist/core/query/query-simple/SimplePage.js

@@ -0,0 +1,18 @@
+import { Page } from '../Page';
+export class SimplePage extends Page {
+    constructor(options2) {
+        super(options2);
+        this.options2 = options2;
+    }
+    async load() {
+        this.loading = true;
+        let collection = await this.options.definition.getCollection();
+        let query = collection.all();
+        this.options2.filters.forEach((f) => {
+            query = f.augment(query);
+        });
+        this.models = await this.options.definition.executeQuery(query.limit(this.options2.limit).skip(this.options2.offset));
+        this.loading = false;
+    }
+}
+//# sourceMappingURL=SimplePage.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"SimplePage.js","sourceRoot":"","sources":["../../../../src/core/query/query-simple/SimplePage.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAe,MAAM,SAAS,CAAC;AAS5C,MAAM,OAAO,UAAW,SAAQ,IAAI;IAClC,YAAsB,QAA2B;QAC/C,KAAK,CAAC,QAAQ,CAAC,CAAC;QADI,aAAQ,GAAR,QAAQ,CAAmB;IAEjD,CAAC;IAED,KAAK,CAAC,IAAI;QACR,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC;QACpB,IAAI,UAAU,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,aAAa,EAAE,CAAC;QAC/D,IAAI,KAAK,GAAG,UAAU,CAAC,GAAG,EAAE,CAAC;QAE7B,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE;YAClC,KAAK,GAAG,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;QAC3B,CAAC,CAAC,CAAC;QAEH,IAAI,CAAC,MAAM,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,YAAY,CACtD,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,CAC5D,CAAC;QACF,IAAI,CAAC,OAAO,GAAG,KAAK,CAAC;IACvB,CAAC;CACF"}

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) `