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

package/CHANGELOG.md

@@ -1,5 +1,18 @@
 # @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

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

@@ -9,6 +9,9 @@ export interface SchemaModelDefinitionListener {
     resolved: (event: {
         object: SchemaModelObject;
     }) => any;
+    failed: (event: {
+        object_id: string;
+    }) => any;
 }
 export interface SchemaModelDefinitionOptions {
     connection: AbstractConnection;
@@ -20,7 +23,7 @@ export declare class SchemaModelDefinition extends BaseObserver<SchemaModelDefin
     queue: QueueObject<string>;
     enqueued: Set<string>;
     constructor(options: SchemaModelDefinitionOptions);
-    resolve(id: string): Promise<SchemaModelObject>;
+    resolve(id: string): Promise<SchemaModelObject | null>;
     get key(): string;
     dispose(): void;
     patch(data: ObjectType): void;

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,9 +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 { Promise, Variable } from '@journeyapps/db';
 import { Page } from './Page';
 import { SchemaModelDefinition } from '../SchemaModelDefinition';
+import { SimpleFilter } from './filters';
 export interface SimpleQueryOptions {
     definition?: SchemaModelDefinition;
     limit?: number;
@@ -18,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>;

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

@@ -1,9 +1,14 @@
 import * as React from 'react';
-import { Variable } from '@journeyapps/db';
+import { SchemaModelObject } from '../../SchemaModelObject';
 import { AbstractConnection } from '../../AbstractConnection';
+import { Relationship } from '@journeyapps/parser-schema';
 export interface BelongsToDisplayWidgetProps {
-    variable: Variable;
+    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/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/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

@@ -9,15 +9,24 @@ export class SchemaModelDefinition extends BaseObserver {
         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 }); });
+            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);
     }
@@ -36,6 +45,12 @@ export class SchemaModelDefinition extends BaseObserver {
                         l1();
                         resolve(object);
                     }
+                },
+                failed: ({ object_id }) => {
+                    if (object_id === id) {
+                        l1();
+                        resolve(null);
+                    }
                 }
             });
         });

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/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,16 +1,19 @@
 import { __classPrivateFieldGet, __classPrivateFieldSet, __esDecorate, __runInitializers } from "tslib";
 import { AbstractQuery } from './AbstractQuery';
-import { inject } from '@journeyapps-labs/reactor-mod';
+import { ActionSource, inject } from '@journeyapps-labs/reactor-mod';
 import { ConnectionStore } from '../../stores/ConnectionStore';
 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 = [];
@@ -20,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"); }
@@ -30,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) {
@@ -55,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;
@@ -88,14 +98,29 @@ let SimpleQuery = (() => {
                             noWrap: true,
                             shrink: true,
                             accessor: (cell, row) => {
-                                return React.createElement(BelongsToDisplayWidget, { variable: a, connection: this.connection, id: row.model.model[a.name] });
+                                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) => {
@@ -118,9 +143,11 @@ 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;

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

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

package/dist/core/query/filters.js

@@ -0,0 +1,17 @@
+export class AbstractFilter {
+}
+export var Condition;
+(function (Condition) {
+    Condition["EQUALS"] = "=";
+})(Condition || (Condition = {}));
+export class SimpleFilter extends AbstractFilter {
+    constructor(variable, statements) {
+        super();
+        this.variable = variable;
+        this.statements = statements;
+    }
+    augment(query) {
+        return query.where(this.statements.map((s) => `${this.variable.name} ${s.condition} ?`).join(' or '), ...this.statements.map((s) => s.arg));
+    }
+}
+//# sourceMappingURL=filters.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"filters.js","sourceRoot":"","sources":["../../../src/core/query/filters.ts"],"names":[],"mappings":"AAEA,MAAM,OAAgB,cAAc;CAEnC;AAED,MAAM,CAAN,IAAY,SAEX;AAFD,WAAY,SAAS;IACnB,yBAAY,CAAA;AACd,CAAC,EAFW,SAAS,KAAT,SAAS,QAEpB;AAOD,MAAM,OAAO,YAAa,SAAQ,cAAc;IAC9C,YACS,QAAkB,EAClB,UAAuB;QAE9B,KAAK,EAAE,CAAC;QAHD,aAAQ,GAAR,QAAQ,CAAU;QAClB,eAAU,GAAV,UAAU,CAAa;IAGhC,CAAC;IAED,OAAO,CAAC,KAAY;QAClB,OAAO,KAAK,CAAC,KAAK,CAChB,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,GAAG,IAAI,CAAC,QAAQ,CAAC,IAAI,IAAI,CAAC,CAAC,SAAS,IAAI,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,EACjF,GAAG,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,CACrC,CAAC;IACJ,CAAC;CACF"}

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

@@ -1,33 +1,70 @@
 import * as React from 'react';
 import { useEffect, useState } from 'react';
-import styled from '@emotion/styled';
+import { IconWidget, styled, TableButtonWidget } from '@journeyapps-labs/reactor-mod';
+import { copyTextToClipboard } from '@journeyapps-labs/lib-reactor-utils';
 export const BelongsToDisplayWidget = (props) => {
     const [object, setObject] = useState(null);
-    const [display, setDisplay] = useState();
+    const [broken, setBroken] = useState(false);
     useEffect(() => {
         if (!props.id) {
             return;
         }
-        props.connection.waitForSchemaModelDefinitionByName(props.variable.relationship).then((conn) => conn
-            .resolve(props.id)
-            .then((obj) => {
+        props.connection.waitForSchemaModelDefinitionByName(props.relationship.foreignType.name).then((conn) => conn.resolve(props.id).then((obj) => {
+            if (!obj) {
+                setBroken(true);
+                return;
+            }
             setObject(obj);
-            return obj.displayValue();
-        })
-            .then((value) => {
-            setDisplay(value);
         }));
     }, [props.id]);
+    if (broken) {
+        return (React.createElement(S.Warning, { tooltip: "Copy ID", label: `${props.id} not found`, icon: "warning", action: () => {
+                copyTextToClipboard(props.id);
+            } }));
+    }
     if (!props.id) {
         return React.createElement(S.Empty, null, "Not set");
     }
-    return display;
+    if (!object) {
+        return React.createElement(S.Spinner, { spin: true, icon: "spinner" });
+    }
+    return (React.createElement(S.Container, null,
+        React.createElement(BelongsToStringWidget, { model: object }),
+        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) `
+    display: flex;
+    flex-direction: row;
+  `;
     S.Empty = styled.div `
     opacity: 0.2;
   `;
-    S.Container = styled.div ``;
+    S.Spinner = styled(IconWidget) `
+    opacity: 0.2;
+  `;
+    S.Container = styled.div `
+    display: flex;
+    flex-direction: row;
+    column-gap: 5px;
+    align-items: center;
+    justify-content: space-between;
+    flex-grow: 1;
+  `;
 })(S || (S = {}));
 //# sourceMappingURL=BelongsToDisplayWidget.js.map

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

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

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

@@ -23,6 +23,13 @@ var S;
     column-gap: 2px;
     row-gap: 2px;
   `;
+    S.Max = styled.div `
+    max-width: 500px;
+    white-space: pre;
+    display: inline;
+    overflow: hidden;
+    text-overflow: ellipsis;
+  `;
 })(S || (S = {}));
 const MAX_NUMBER_OF_ARR_ITEMS_TO_DISPLAY = 3;
 export const CellDisplayWidget = (props) => {
@@ -34,7 +41,7 @@ export const CellDisplayWidget = (props) => {
         if (cell.trim() === '') {
             return React.createElement(S.Empty, null, "empty");
         }
-        return cell;
+        return React.createElement(S.Max, null, cell);
     }
     if (_.isNumber(cell)) {
         return cell;

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

@@ -1 +1 @@
-{"version":3,"file":"CellDisplayWidget.js","sourceRoot":"","sources":["../../../../src/core/query/widgets/CellDisplayWidget.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"CellDisplayWidget.js","sourceRoot":"","sources":["../../../../src/core/query/widgets/CellDisplayWidget.tsx"],"names":[],"mappings":"AAAA,OAAO,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,CA+BV;AA/BD,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;IAEW,KAAG,GAAG,MAAM,CAAC,GAAG,CAAA;;;;;;GAM5B,CAAC;AACJ,CAAC,EA/BS,CAAC,KAAD,CAAC,QA+BV;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,oBAAC,CAAC,CAAC,GAAG,QAAE,IAAI,CAAS,CAAC;IAC/B,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/core/query/widgets/ColumnDisplayWidget.js

@@ -0,0 +1,22 @@
+import * as React from 'react';
+import styled from '@emotion/styled';
+export const ColumnDisplayWidget = (props) => {
+    let parts = (props.label || '').split(' ');
+    if (parts.length >= 5) {
+        return React.createElement(S.Width, { length: 150 }, props.label);
+    }
+    if (parts.length >= 3) {
+        return React.createElement(S.Width, { length: 80 }, props.label);
+    }
+    return React.createElement(S.Span, null, props.label);
+};
+var S;
+(function (S) {
+    S.Width = styled.div `
+    min-width: ${(p) => p.length}px;
+  `;
+    S.Span = styled.div `
+    white-space: nowrap;
+  `;
+})(S || (S = {}));
+//# sourceMappingURL=ColumnDisplayWidget.js.map

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

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

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

@@ -0,0 +1,19 @@
+import * as React from 'react';
+import styled from '@emotion/styled';
+import { ColumnDisplayWidget } from './ColumnDisplayWidget';
+import { SmartFilterWidget } from './SmartFilterWidget';
+export const SmartColumnWidget = (props) => {
+    return (React.createElement(S.Container, null,
+        React.createElement(ColumnDisplayWidget, { label: props.variable.label }),
+        React.createElement(SmartFilterWidget, { filter: props.filter, variable: props.variable, filterChanged: props.filterChanged })));
+};
+var S;
+(function (S) {
+    S.Container = styled.div `
+    display: flex;
+    flex-direction: row;
+    align-items: center;
+    column-gap: 5px;
+  `;
+})(S || (S = {}));
+//# sourceMappingURL=SmartColumnWidget.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"SmartColumnWidget.js","sourceRoot":"","sources":["../../../../src/core/query/widgets/SmartColumnWidget.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAC/B,OAAO,MAAM,MAAM,iBAAiB,CAAC;AAErC,OAAO,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AAC5D,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AASxD,MAAM,CAAC,MAAM,iBAAiB,GAAqC,CAAC,KAAK,EAAE,EAAE;IAC3E,OAAO,CACL,oBAAC,CAAC,CAAC,SAAS;QACV,oBAAC,mBAAmB,IAAC,KAAK,EAAE,KAAK,CAAC,QAAQ,CAAC,KAAK,GAAI;QACpD,oBAAC,iBAAiB,IAAC,MAAM,EAAE,KAAK,CAAC,MAAM,EAAE,QAAQ,EAAE,KAAK,CAAC,QAAQ,EAAE,aAAa,EAAE,KAAK,CAAC,aAAa,GAAI,CAC7F,CACf,CAAC;AACJ,CAAC,CAAC;AAEF,IAAU,CAAC,CAOV;AAPD,WAAU,CAAC;IACI,WAAS,GAAG,MAAM,CAAC,GAAG,CAAA;;;;;GAKlC,CAAC;AACJ,CAAC,EAPS,CAAC,KAAD,CAAC,QAOV"}