npm - @journeyapps-labs/reactor-mod-data-browser - Versions diffs - 3.3.0 → 3.5.0 - Mend

@journeyapps-labs/reactor-mod-data-browser 3.3.0 → 3.5.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (133) hide show

package/dist/core/SchemaModelDefinition.js CHANGED Viewed

@@ -1,10 +1,18 @@
 import { __classPrivateFieldGet, __classPrivateFieldSet, __esDecorate, __runInitializers } from "tslib";
 import { JourneyAPIAdapter } from '@journeyapps/db';
+import * as _ from 'lodash';
 import { SchemaModelObject } from './SchemaModelObject';
 import { BaseObserver } from '@journeyapps-labs/common-utils';
 import { queue } from 'async';
 import { observable } from 'mobx';
 import { IndexModel } from './IndexModel';
+import { STANDARD_MODEL_FIELD_LABELS, StandardModelFields, idVariable } from './query/StandardModelFields';
+import { SchemaFieldOrderValue, SchemaFieldOrderingPreference } from '../preferences/SchemaOrderingPreferences';
+export var OrderedSchemaFieldType;
+(function (OrderedSchemaFieldType) {
+    OrderedSchemaFieldType["FIELD"] = "FIELD";
+    OrderedSchemaFieldType["BELONGS_TO"] = "BELONGS_TO";
+})(OrderedSchemaFieldType || (OrderedSchemaFieldType = {}));
 let SchemaModelDefinition = (() => {
     var _a, _SchemaModelDefinition_indexes_accessor_storage;
     let _classSuper = BaseObserver;
@@ -143,20 +151,126 @@ let SchemaModelDefinition = (() => {
                     adapter: collection.adapter
                 });
             }
-            getFilterableFields(typeEngine) {
-                return Object.values(this.definition.attributes)
-                    .map((attribute) => {
-                    const handler = typeEngine.getHandler(attribute.type);
-                    if (!(handler === null || handler === void 0 ? void 0 : handler.setupFilter)) {
+            getBelongsToIdVariableForRelationship(relationshipName) {
+                const variable = _.find(_.values(this.definition.belongsToIdVars), (entry) => {
+                    return entry.relationship === relationshipName;
+                });
+                if (!variable) {
+                    return undefined;
+                }
+                const relationship = this.definition.belongsTo[relationshipName];
+                if (relationship) {
+                    variable.label = relationship.name;
+                }
+                return variable;
+            }
+            getBelongsToRelationshipForField(field) {
+                const variable = _.find(_.values(this.definition.belongsToIdVars), (entry) => {
+                    return entry.name === field;
+                });
+                if (!(variable === null || variable === void 0 ? void 0 : variable.relationship)) {
+                    return undefined;
+                }
+                const relationship = this.definition.belongsTo[variable.relationship];
+                if (!relationship) {
+                    return undefined;
+                }
+                variable.label = relationship.name;
+                return {
+                    variable,
+                    relationship
+                };
+            }
+            getSchemaOrderedFields() {
+                return Object.keys(this.definition.attributes).map((key) => this.definition.attributes[key]);
+            }
+            getSchemaOrderedBelongsToFields() {
+                return Object.keys(this.definition.belongsTo)
+                    .map((relationshipName) => {
+                    const relationship = this.definition.belongsTo[relationshipName];
+                    const variable = this.getBelongsToIdVariableForRelationship(relationshipName);
+                    if (!relationship || !variable) {
                         return null;
                     }
                     return {
-                        key: attribute.name,
-                        label: attribute.label || attribute.name
+                        type: OrderedSchemaFieldType.BELONGS_TO,
+                        object: relationship,
+                        key: variable.name,
+                        label: relationship.name || variable.label || variable.name,
+                        variable
                     };
                 })
                     .filter((value) => !!value);
             }
+            getAlphabeticalOrderedFields() {
+                return _.sortBy(this.getSchemaOrderedFields().map((attribute) => {
+                    return {
+                        type: OrderedSchemaFieldType.FIELD,
+                        object: attribute,
+                        key: attribute.name,
+                        label: attribute.label || attribute.name
+                    };
+                }), (item) => item.label.toLowerCase());
+            }
+            getOrderedFieldsAndRelationships() {
+                const orderedFields = this.getAlphabeticalOrderedFields();
+                const orderedBelongsTo = _.sortBy(this.getSchemaOrderedBelongsToFields(), (item) => item.label.toLowerCase());
+                switch (SchemaFieldOrderingPreference.getValue()) {
+                    case SchemaFieldOrderValue.ALPHABETICAL:
+                        return _.sortBy([...orderedFields, ...orderedBelongsTo], (item) => item.label.toLowerCase());
+                    case SchemaFieldOrderValue.BELONGS_TO_FIRST:
+                        return [...orderedBelongsTo, ...orderedFields];
+                    case SchemaFieldOrderValue.BELONGS_TO_LAST:
+                        return [...orderedFields, ...orderedBelongsTo];
+                    case SchemaFieldOrderValue.AS_DEFINED_IN_SCHEMA:
+                    default:
+                        return [
+                            ...this.getSchemaOrderedFields().map((attribute) => {
+                                return {
+                                    type: OrderedSchemaFieldType.FIELD,
+                                    object: attribute,
+                                    key: attribute.name,
+                                    label: attribute.label || attribute.name
+                                };
+                            }),
+                            ...this.getSchemaOrderedBelongsToFields()
+                        ];
+                }
+            }
+            getFilterableFields(typeEngine) {
+                var _b;
+                return [
+                    ...(((_b = typeEngine.getHandler(idVariable.type)) === null || _b === void 0 ? void 0 : _b.setupFilter)
+                        ? [
+                            {
+                                key: StandardModelFields.ID,
+                                label: STANDARD_MODEL_FIELD_LABELS[StandardModelFields.ID],
+                                group: 'Fields'
+                            }
+                        ]
+                        : []),
+                    ...this.getOrderedFieldsAndRelationships()
+                        .map((entry) => {
+                        if (entry.type === OrderedSchemaFieldType.BELONGS_TO) {
+                            return {
+                                key: entry.key,
+                                label: entry.label,
+                                group: 'Belongs to'
+                            };
+                        }
+                        const handler = typeEngine.getHandler(entry.object.type);
+                        if (!(handler === null || handler === void 0 ? void 0 : handler.setupFilter)) {
+                            return null;
+                        }
+                        return {
+                            key: entry.key,
+                            label: entry.label,
+                            group: 'Fields'
+                        };
+                    })
+                        .filter((value) => !!value)
+                ];
+            }
         },
         _SchemaModelDefinition_indexes_accessor_storage = new WeakMap(),
         (() => {

package/dist/core/SchemaModelDefinition.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"SchemaModelDefinition.js","sourceRoot":"","sources":["../../src/core/SchemaModelDefinition.ts"],"names":[],"mappings":";AAEA,OAAO,EAAc,iBAAiB,~~EAAS~~,MAAM,iBAAiB,CAAC;~~AACvE~~,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AAExD,OAAO,EAAE,YAAY,EAAE,MAAM,gCAAgC,CAAC;AAC9D,OAAO,EAAE,KAAK,EAAe,MAAM,OAAO,CAAC;AAG3C,OAAO,EAAU,UAAU,EAAE,MAAM,MAAM,CAAC;AAC1C,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;~~IAY7B~~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~~mBAAmB~~,CAAC,~~UAAsB~~;~~gBACxC~~,~~OAAO,~~MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,~~UAAU~~,CAAC;~~qBAC7C~~,GAAG,CAAC,CAAC,SAAS,EAAE,~~EAAE~~;oBACjB,~~MAAM~~,OAAO,GAAG,~~UAAU~~,CAAC,UAAU,CAAC,~~SAAS~~,CAAC,IAAI,CAAC,CAAC;~~oBACtD~~,IAAI,CAAC,CAAA,OAAO,~~aAAP~~,OAAO,~~uBAAP~~,OAAO,~~CAAE~~,~~WAAW~~,~~CAAA~~,EAAE,CAAC;~~wBAC1B~~,OAAO,IAAI,CAAC;oBACd,CAAC;oBACD,OAAO;wBACL,GAAG,EAAE,SAAS,CAAC,IAAI;wBACnB,KAAK,EAAE,SAAS,CAAC,KAAK,IAAI,SAAS,CAAC,IAAI;~~qBACzC~~,CAAC;~~gBACJ~~,CAAC,CAAC;~~qBACD~~,MAAM,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC;~~YAChC~~,CAAC;;;;;;~~mCA5JA~~,UAAU;YACX,wKAAS,OAAO,6BAAP,OAAO,yFAAe;;;;;SATpB,qBAAqB"}
1	+ {"version":3,"file":"SchemaModelDefinition.js","sourceRoot":"","sources":["../../src/core/SchemaModelDefinition.ts"],"names":[],"mappings":";AAEA,OAAO,EAAc,iBAAiB,EAAmB,MAAM,iBAAiB,CAAC;AACjF,OAAO,KAAK,CAAC,MAAM,QAAQ,CAAC;AAC5B,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AAExD,OAAO,EAAE,YAAY,EAAE,MAAM,gCAAgC,CAAC;AAC9D,OAAO,EAAE,KAAK,EAAe,MAAM,OAAO,CAAC;AAG3C,OAAO,EAAU,UAAU,EAAE,MAAM,MAAM,CAAC;AAC1C,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAE1C,OAAO,EAAE,2BAA2B,EAAE,mBAAmB,EAAE,UAAU,EAAE,MAAM,6BAA6B,CAAC;AAC3G,OAAO,EAAE,qBAAqB,EAAE,6BAA6B,EAAE,MAAM,0CAA0C,CAAC;AAkBhH,MAAM,CAAN,IAAY,sBAGX;AAHD,WAAY,sBAAsB;IAChC,yCAAe,CAAA;IACf,mDAAyB,CAAA;AAC3B,CAAC,EAHW,sBAAsB,KAAtB,sBAAsB,QAGjC;IAiBY,qBAAqB;;sBACxB,YAAY;;;;sBADT,qBACX,SAAQ,WAA2C;YAQnD,IAAS,OAAO,iGAAe;YAA/B,IAAS,OAAO,sGAAe;YAE/B,YAAsB,OAAqC;gBACzD,KAAK,EAAE,CAAC;gBADY,YAAO,GAAP,OAAO,CAA8B;gBAFlD,kHAAsB;;gBAET,YAAO,GAAP,OAAO,CAA8B;gBAEzD,IAAI,CAAC,KAAK,GAAG,IAAI,GAAG,EAA6B,CAAC;gBAClD,IAAI,CAAC,QAAQ,GAAG,IAAI,GAAG,EAAU,CAAC;gBAClC,IAAI,CAAC,OAAO,GAAG,EAAE,CAAC;gBAClB,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC,KAAK,EAAE,EAAE,EAAE,EAAE;oBAC9B,IAAI,UAAU,GAAG,MAAM,IAAI,CAAC,aAAa,EAAE,CAAC;oBAC5C,IAAI,CAAC;wBACH,IAAI,MAAM,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,UAAU,CAAC,KAAK,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;wBAC9E,IAAI,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC;4BACd,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC;4BAC9B,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;4BACzB,IAAI,CAAC,gBAAgB,CAAC,CAAC,EAAE,EAAE,EAAE,WAAC,OAAA,MAAA,EAAE,CAAC,QAAQ,mDAAG,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAA,EAAA,CAAC,CAAC;wBACtE,CAAC;6BAAM,CAAC;4BACN,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;4BACzB,IAAI,CAAC,gBAAgB,CAAC,CAAC,EAAE,EAAE,EAAE,WAAC,OAAA,MAAA,EAAE,CAAC,MAAM,mDAAG,EAAE,SAAS,EAAE,EAAE,EAAE,CAAC,CAAA,EAAA,CAAC,CAAC;wBAChE,CAAC;oBACH,CAAC;oBAAC,OAAO,EAAE,EAAE,CAAC;wBACZ,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;wBACzB,IAAI,CAAC,gBAAgB,CAAC,CAAC,EAAE,EAAE,EAAE,WAAC,OAAA,MAAA,EAAE,CAAC,MAAM,mDAAG,EAAE,SAAS,EAAE,EAAE,EAAE,CAAC,CAAA,EAAA,CAAC,CAAC;wBAC9D,MAAM,EAAE,CAAC;oBACX,CAAC;gBACH,CAAC,EAAE,CAAC,CAAC,CAAC;aACP;YAED,KAAK,CAAC,WAAW;;gBACf,IAAI,OAAO,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,UAAU,EAAE,CAAC;gBACjD,IAAI,CAAC,OAAO,GAAG,CAAC,CAAA,MAAA,OAAO,CAAC,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,0CAAE,OAAO,KAAI,EAAE,CAAC,CAAC,GAAG,CAC/D,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,UAAU,CAAC,EAAE,UAAU,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC,EAAE,CAAC,CACtD,CAAC;YACJ,CAAC;YAED,KAAK,CAAC,IAAI;gBACR,MAAM,IAAI,CAAC,WAAW,EAAE,CAAC;YAC3B,CAAC;YAED,KAAK,CAAC,MAAM,CAAC,IAAY;gBACvB,IAAI,UAAU,GAAG,MAAM,IAAI,CAAC,aAAa,EAAE,CAAC;gBAC5C,IAAI,OAAO,GAAG,UAAU,CAAC,OAA4B,CAAC;gBACtD,aAAa;gBACb,IAAI,GAAG,GAAG,MAAM,OAAO,CAAC,OAAO,CAAC,GAAG,OAAO,CAAC,WAAW,CAAC,OAAO,EAAE,WAAW,IAAI,CAAC,UAAU,CAAC,IAAI,cAAc,EAAE;oBAC7G,KAAK,EAAE,IAAI;iBACZ,CAAC,CAAC;gBACH,OAAO,GAAG,CAAC,OAAO;qBACf,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE;oBACT,OAAO,iBAAiB,CAAC,mBAAmB,CAAC,IAAI,CAAC,UAAU,EAAE,CAAC,CAAC,CAAC;gBACnE,CAAC,CAAC;qBACD,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE;oBACT,OAAO,IAAI,iBAAiB,CAAC;wBAC3B,UAAU,EAAE,IAAI;wBAChB,KAAK,EAAE,CAAC;wBACR,OAAO,EAAE,UAAU,CAAC,OAAO;qBAC5B,CAAC,CAAC;gBACL,CAAC,CAAC,CAAC;YACP,CAAC;YAED,KAAK,CAAC,IAAI,CAAC,EAAU;gBACnB,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,CAAC;oBAC3B,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;oBACtB,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;gBACtB,CAAC;gBAED,OAAO,MAAM,IAAI,OAAO,CAAoB,CAAC,OAAO,EAAE,EAAE;oBACtD,IAAI,EAAE,GAAG,IAAI,CAAC,gBAAgB,CAAC;wBAC7B,QAAQ,EAAE,CAAC,EAAE,MAAM,EAAE,EAAE,EAAE;4BACvB,IAAI,MAAM,CAAC,KAAK,CAAC,EAAE,KAAK,EAAE,EAAE,CAAC;gCAC3B,EAAE,EAAE,CAAC;gCACL,OAAO,CAAC,MAAM,CAAC,CAAC;4BAClB,CAAC;wBACH,CAAC;wBACD,MAAM,EAAE,CAAC,EAAE,SAAS,EAAE,EAAE,EAAE;4BACxB,IAAI,SAAS,KAAK,EAAE,EAAE,CAAC;gCACrB,EAAE,EAAE,CAAC;gCACL,OAAO,CAAC,IAAI,CAAC,CAAC;4BAChB,CAAC;wBACH,CAAC;qBACF,CAAC,CAAC;gBACL,CAAC,CAAC,CAAC;YACL,CAAC;YAED,KAAK,CAAC,OAAO,CAAC,EAAU;gBACtB,IAAI,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,CAAC;oBACvB,OAAO,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;gBAC5B,CAAC;gBACD,OAAO,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;YACvB,CAAC;YAED,IAAI,GAAG;gBACL,OAAO,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC;YAC9B,CAAC;YAED,OAAO;gBACL,IAAI,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC;YACpB,CAAC;YAED,KAAK,CAAC,IAAgB;gBACpB,IAAI,CAAC,OAAO,CAAC,UAAU,GAAG,IAAI,CAAC;YACjC,CAAC;YAED,IAAI,UAAU;gBACZ,OAAO,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC;YACjC,CAAC;YAED,IAAI,UAAU;gBACZ,OAAO,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC;YACjC,CAAC;YAED,KAAK,CAAC,YAAY,CAAC,KAAY;gBAC7B,IAAI,UAAU,GAAG,MAAM,IAAI,CAAC,aAAa,EAAE,CAAC;gBAC5C,IAAI,OAAO,GAAG,MAAM,UAAU,CAAC,OAAO,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC;gBAC3D,OAAO,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE;oBACvB,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC;wBAC1B,MAAM,KAAK,GAAG,IAAI,iBAAiB,CAAC;4BAClC,UAAU,EAAE,IAAI;4BAChB,KAAK,EAAE,CAAC;4BACR,OAAO,EAAE,UAAU,CAAC,OAAO;yBAC5B,CAAC,CAAC;wBACH,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,KAAK,CAAC,CAAC;wBAC5B,OAAO,KAAK,CAAC;oBACf,CAAC;oBAED,IAAI,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;oBACjC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;oBACjB,OAAO,KAAK,CAAC;gBACf,CAAC,CAAC,CAAC;YACL,CAAC;YAED,KAAK,CAAC,aAAa;gBACjB,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,aAAa,EAAE,CAAC;gBACnD,OAAO,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,IAAI,CAAe,CAAC;YAClD,CAAC;YAED,KAAK,CAAC,sBAAsB;gBAC1B,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,aAAa,EAAE,CAAC;gBAC9C,OAAO,IAAI,iBAAiB,CAAC;oBAC3B,UAAU,EAAE,IAAI;oBAChB,OAAO,EAAE,UAAU,CAAC,OAAO;iBAC5B,CAAC,CAAC;YACL,CAAC;YAED,qCAAqC,CAAC,gBAAwB;gBAC5D,MAAM,QAAQ,GAAG,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,eAAe,CAAC,EAAE,CAAC,KAAK,EAAE,EAAE;oBAC3E,OAAO,KAAK,CAAC,YAAY,KAAK,gBAAgB,CAAC;gBACjD,CAAC,CAAC,CAAC;gBAEH,IAAI,CAAC,QAAQ,EAAE,CAAC;oBACd,OAAO,SAAS,CAAC;gBACnB,CAAC;gBAED,MAAM,YAAY,GAAG,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,gBAAgB,CAAC,CAAC;gBACjE,IAAI,YAAY,EAAE,CAAC;oBACjB,QAAQ,CAAC,KAAK,GAAG,YAAY,CAAC,IAAI,CAAC;gBACrC,CAAC;gBAED,OAAO,QAAQ,CAAC;YAClB,CAAC;YAED,gCAAgC,CAAC,KAAa;gBAM5C,MAAM,QAAQ,GAAG,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,eAAe,CAAC,EAAE,CAAC,KAAK,EAAE,EAAE;oBAC3E,OAAO,KAAK,CAAC,IAAI,KAAK,KAAK,CAAC;gBAC9B,CAAC,CAAC,CAAC;gBACH,IAAI,CAAC,CAAA,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,YAAY,CAAA,EAAE,CAAC;oBAC5B,OAAO,SAAS,CAAC;gBACnB,CAAC;gBAED,MAAM,YAAY,GAAG,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,QAAQ,CAAC,YAAY,CAAC,CAAC;gBACtE,IAAI,CAAC,YAAY,EAAE,CAAC;oBAClB,OAAO,SAAS,CAAC;gBACnB,CAAC;gBAED,QAAQ,CAAC,KAAK,GAAG,YAAY,CAAC,IAAI,CAAC;gBACnC,OAAO;oBACL,QAAQ;oBACR,YAAY;iBACb,CAAC;YACJ,CAAC;YAEO,sBAAsB;gBAC5B,OAAO,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,IAAI,CAAC,UAAU,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC;YAC/F,CAAC;YAEO,+BAA+B;gBACrC,OAAO,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC;qBAC1C,GAAG,CAAC,CAAC,gBAAgB,EAAE,EAAE;oBACxB,MAAM,YAAY,GAAG,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,gBAAgB,CAAC,CAAC;oBACjE,MAAM,QAAQ,GAAG,IAAI,CAAC,qCAAqC,CAAC,gBAAgB,CAAC,CAAC;oBAC9E,IAAI,CAAC,YAAY,IAAI,CAAC,QAAQ,EAAE,CAAC;wBAC/B,OAAO,IAAI,CAAC;oBACd,CAAC;oBACD,OAAO;wBACL,IAAI,EAAE,sBAAsB,CAAC,UAAU;wBACvC,MAAM,EAAE,YAAY;wBACpB,GAAG,EAAE,QAAQ,CAAC,IAAI;wBAClB,KAAK,EAAE,YAAY,CAAC,IAAI,IAAI,QAAQ,CAAC,KAAK,IAAI,QAAQ,CAAC,IAAI;wBAC3D,QAAQ;qBAC2B,CAAC;gBACxC,CAAC,CAAC;qBACD,MAAM,CAAC,CAAC,KAAK,EAA6C,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC;YAC3E,CAAC;YAEO,4BAA4B;gBAClC,OAAO,CAAC,CAAC,MAAM,CACb,IAAI,CAAC,sBAAsB,EAAE,CAAC,GAAG,CAAC,CAAC,SAAS,EAAE,EAAE;oBAC9C,OAAO;wBACL,IAAI,EAAE,sBAAsB,CAAC,KAAK;wBAClC,MAAM,EAAE,SAAS;wBACjB,GAAG,EAAE,SAAS,CAAC,IAAI;wBACnB,KAAK,EAAE,SAAS,CAAC,KAAK,IAAI,SAAS,CAAC,IAAI;qBACL,CAAC;gBACxC,CAAC,CAAC,EACF,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,WAAW,EAAE,CACnC,CAAC;YACJ,CAAC;YAED,gCAAgC;gBAC9B,MAAM,aAAa,GAAG,IAAI,CAAC,4BAA4B,EAAE,CAAC;gBAC1D,MAAM,gBAAgB,GAAG,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,+BAA+B,EAAE,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,WAAW,EAAE,CAAC,CAAC;gBAE9G,QAAQ,6BAA6B,CAAC,QAAQ,EAAE,EAAE,CAAC;oBACjD,KAAK,qBAAqB,CAAC,YAAY;wBACrC,OAAO,CAAC,CAAC,MAAM,CAAC,CAAC,GAAG,aAAa,EAAE,GAAG,gBAAgB,CAAC,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,WAAW,EAAE,CAAC,CAAC;oBAC/F,KAAK,qBAAqB,CAAC,gBAAgB;wBACzC,OAAO,CAAC,GAAG,gBAAgB,EAAE,GAAG,aAAa,CAAC,CAAC;oBACjD,KAAK,qBAAqB,CAAC,eAAe;wBACxC,OAAO,CAAC,GAAG,aAAa,EAAE,GAAG,gBAAgB,CAAC,CAAC;oBACjD,KAAK,qBAAqB,CAAC,oBAAoB,CAAC;oBAChD;wBACE,OAAO;4BACL,GAAG,IAAI,CAAC,sBAAsB,EAAE,CAAC,GAAG,CAAC,CAAC,SAAS,EAAE,EAAE;gCACjD,OAAO;oCACL,IAAI,EAAE,sBAAsB,CAAC,KAAK;oCAClC,MAAM,EAAE,SAAS;oCACjB,GAAG,EAAE,SAAS,CAAC,IAAI;oCACnB,KAAK,EAAE,SAAS,CAAC,KAAK,IAAI,SAAS,CAAC,IAAI;iCACL,CAAC;4BACxC,CAAC,CAAC;4BACF,GAAG,IAAI,CAAC,+BAA+B,EAAE;yBAC1C,CAAC;gBACN,CAAC;YACH,CAAC;YAED,mBAAmB,CAAC,UAAsB;;gBACxC,OAAO;oBACL,GAAG,CAAC,CAAA,MAAA,UAAU,CAAC,UAAU,CAAC,UAAU,CAAC,IAAI,CAAC,0CAAE,WAAW;wBACrD,CAAC,CAAC;4BACE;gCACE,GAAG,EAAE,mBAAmB,CAAC,EAAE;gCAC3B,KAAK,EAAE,2BAA2B,CAAC,mBAAmB,CAAC,EAAE,CAAC;gCAC1D,KAAK,EAAE,QAAiB;6BACzB;yBACF;wBACH,CAAC,CAAC,EAAE,CAAC;oBACP,GAAG,IAAI,CAAC,gCAAgC,EAAE;yBACvC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE;wBACb,IAAI,KAAK,CAAC,IAAI,KAAK,sBAAsB,CAAC,UAAU,EAAE,CAAC;4BACrD,OAAO;gCACL,GAAG,EAAE,KAAK,CAAC,GAAG;gCACd,KAAK,EAAE,KAAK,CAAC,KAAK;gCAClB,KAAK,EAAE,YAAqB;6BAC7B,CAAC;wBACJ,CAAC;wBAED,MAAM,OAAO,GAAG,UAAU,CAAC,UAAU,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;wBACzD,IAAI,CAAC,CAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,WAAW,CAAA,EAAE,CAAC;4BAC1B,OAAO,IAAI,CAAC;wBACd,CAAC;wBACD,OAAO;4BACL,GAAG,EAAE,KAAK,CAAC,GAAG;4BACd,KAAK,EAAE,KAAK,CAAC,KAAK;4BAClB,KAAK,EAAE,QAAiB;yBACzB,CAAC;oBACJ,CAAC,CAAC;yBACD,MAAM,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC;iBAC9B,CAAC;YACJ,CAAC;;;;;;mCA1RA,UAAU;YACX,wKAAS,OAAO,6BAAP,OAAO,yFAAe;;;;;SATpB,qBAAqB"}

package/dist/core/query/StandardModelFields.js CHANGED Viewed

@@ -1,3 +1,4 @@
+import { TextType, Variable } from '@journeyapps/db';
 export var StandardModelFields;
 (function (StandardModelFields) {
     StandardModelFields["ID"] = "id";
@@ -7,4 +8,6 @@ export const STANDARD_MODEL_FIELD_LABELS = {
     [StandardModelFields.ID]: 'ID',
     [StandardModelFields.UPDATED_AT]: 'Updated at'
 };
+export const idVariable = new Variable(StandardModelFields.ID, new TextType());
+idVariable.label = STANDARD_MODEL_FIELD_LABELS[StandardModelFields.ID];
 //# sourceMappingURL=StandardModelFields.js.map

package/dist/core/query/StandardModelFields.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"StandardModelFields.js","sourceRoot":"","sources":["../../../src/core/query/StandardModelFields.ts"],"names":[],"mappings":"AAAA,MAAM,CAAN,IAAY,mBAGX;AAHD,WAAY,mBAAmB;IAC7B,gCAAS,CAAA;IACT,gDAAyB,CAAA;AAC3B,CAAC,EAHW,mBAAmB,KAAnB,mBAAmB,QAG9B;AAED,MAAM,CAAC,MAAM,2BAA2B,GAAwC;IAC9E,CAAC,mBAAmB,CAAC,EAAE,CAAC,EAAE,IAAI;IAC9B,CAAC,mBAAmB,CAAC,UAAU,CAAC,EAAE,YAAY;CAC/C,CAAC"}
1	+ {"version":3,"file":"StandardModelFields.js","sourceRoot":"","sources":["../../../src/core/query/StandardModelFields.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAErD,MAAM,CAAN,IAAY,mBAGX;AAHD,WAAY,mBAAmB;IAC7B,gCAAS,CAAA;IACT,gDAAyB,CAAA;AAC3B,CAAC,EAHW,mBAAmB,KAAnB,mBAAmB,QAG9B;AAED,MAAM,CAAC,MAAM,2BAA2B,GAAwC;IAC9E,CAAC,mBAAmB,CAAC,EAAE,CAAC,EAAE,IAAI;IAC9B,CAAC,mBAAmB,CAAC,UAAU,CAAC,EAAE,YAAY;CAC/C,CAAC;AAEF,MAAM,CAAC,MAAM,UAAU,GAAG,IAAI,QAAQ,CAAC,mBAAmB,CAAC,EAAE,EAAE,IAAI,QAAQ,EAAE,CAE5E,CAAC;AAEF,UAAU,CAAC,KAAK,GAAG,2BAA2B,CAAC,mBAAmB,CAAC,EAAE,CAAC,CAAC"}

package/dist/core/query/query-simple/SimpleQueryColumns.js CHANGED Viewed

@@ -1,13 +1,19 @@
 import * as React from 'react';
-import * as _ from 'lodash';
+import { ioc } from '@journeyapps-labs/reactor-mod';
 import { CellDisplayWidget } from '../widgets/CellDisplayWidget';
 import { SmartColumnWidget } from '../widgets/SmartColumnWidget';
 import { SmartCellDisplayWidget } from '../widgets/SmartCellDisplayWidget';
 import { SmartBelongsToDisplayWidget } from '../widgets/SmartBelongsToDisplayWidget';
 import { ColumnDisplayWidget } from '../widgets/ColumnDisplayWidget';
+import { IDCellDisplayWidget } from '../widgets/IDCellDisplayWidget';
 import { SimpleQuerySort, SortDirection } from './SimpleQueryTypes';
-import { STANDARD_MODEL_FIELD_LABELS, StandardModelFields } from '../StandardModelFields';
+import { STANDARD_MODEL_FIELD_LABELS, StandardModelFields, idVariable } from '../StandardModelFields';
+import { TypeEngine } from '../../../forms/TypeEngine';
+import { setupBelongsToFilter } from '../../../forms/types/belongs-to-filter';
+import { Condition, SimpleFilter, Statement } from '../filters';
+import { OrderedSchemaFieldType } from '../../SchemaModelDefinition';
 export const buildSimpleQueryColumns = (options) => {
+    var _a, _b;
     const getSortLabel = (field, label) => {
         var _a;
         const direction = (_a = options.sortState.getSort(field)) === null || _a === void 0 ? void 0 : _a.direction;
@@ -19,16 +25,19 @@ export const buildSimpleQueryColumns = (options) => {
     return [
         {
             key: StandardModelFields.ID,
-            display: (React.createElement(ColumnDisplayWidget, { label: getSortLabel(StandardModelFields.ID, STANDARD_MODEL_FIELD_LABELS[StandardModelFields.ID]), onClick: async () => {
-                    const sort = options.sortState.getSort(StandardModelFields.ID);
-                    if (!sort) {
-                        options.sortState.addSort(SimpleQuerySort.create(StandardModelFields.ID));
+            display: (React.createElement(SmartColumnWidget, { variable: idVariable, typeLabel: (_b = (_a = ioc.get(TypeEngine).getHandler(idVariable.type)) === null || _a === void 0 ? void 0 : _a.getTypeLabel) === null || _b === void 0 ? void 0 : _b.call(_a, idVariable.type), filter: options.filterState.getFilter(StandardModelFields.ID), filterChanged: async (filter) => {
+                    var _a;
+                    if (!filter) {
+                        (_a = options.filterState.getFilter(StandardModelFields.ID)) === null || _a === void 0 ? void 0 : _a.delete();
                         return;
                     }
-                    sort.toggle();
+                    options.filterState.setFilter(StandardModelFields.ID, filter);
                 } })),
             noWrap: true,
-            shrink: true
+            shrink: true,
+            accessor: (cell, row) => {
+                return React.createElement(IDCellDisplayWidget, { id: row.model.id });
+            }
         },
         {
             key: StandardModelFields.UPDATED_AT,
@@ -46,42 +55,65 @@ export const buildSimpleQueryColumns = (options) => {
                 return React.createElement(CellDisplayWidget, { name: StandardModelFields.UPDATED_AT, cell: row.model.updated_at, row: row });
             }
         },
-        ..._.map(options.definition.definition.belongsToIdVars, (a) => {
-            return {
-                key: a.name,
-                display: (React.createElement(SmartColumnWidget, { variable: options.definition.definition.belongsToVars[a.relationship], type: options.definition.definition.belongsTo[a.relationship].foreignType, filterChanged: (filter) => { } })),
-                noWrap: true,
-                shrink: true,
-                accessor: (cell, row) => {
-                    return React.createElement(SmartBelongsToDisplayWidget, { variable_id: a, row: row, connection: options.connection });
-                }
-            };
-        }),
-        ..._.map(options.definition.definition.attributes, (a) => {
-            var _a;
-            return {
-                key: a.name,
-                display: (React.createElement(SmartColumnWidget, { variable: a, filter: options.filterState.getFilter(a.name), sortDirection: (_a = options.sortState.getSort(a.name)) === null || _a === void 0 ? void 0 : _a.direction, onToggleSort: async () => {
-                        const sort = options.sortState.getSort(a.name);
-                        if (!sort) {
-                            options.sortState.addSort(SimpleQuerySort.create(a.name));
-                            return;
-                        }
-                        sort.toggle();
-                    }, filterChanged: async (filter) => {
-                        var _a;
-                        if (!filter) {
-                            (_a = options.filterState.getFilter(a.name)) === null || _a === void 0 ? void 0 : _a.delete();
-                            return;
+        ...options.definition.getOrderedFieldsAndRelationships().flatMap((entry) => {
+            var _a, _b, _c;
+            if (entry.type === OrderedSchemaFieldType.BELONGS_TO) {
+                const variable = entry.variable;
+                const relationship = entry.object;
+                return [
+                    {
+                        key: variable.name,
+                        display: (React.createElement(SmartColumnWidget, { variable: options.definition.definition.belongsToVars[variable.relationship], typeLabel: `Belongs To: ${relationship.foreignType.label}`, filter: options.filterState.getFilter(variable.name), setupFilter: async ({ filter }) => {
+                                return await setupBelongsToFilter({
+                                    definition: options.definition,
+                                    relationship,
+                                    variable,
+                                    filter
+                                });
+                            }, filterChanged: async (filter) => {
+                                var _a;
+                                if (!filter) {
+                                    (_a = options.filterState.getFilter(variable.name)) === null || _a === void 0 ? void 0 : _a.delete();
+                                    return;
+                                }
+                                options.filterState.setFilter(variable.name, filter);
+                            } })),
+                        noWrap: true,
+                        shrink: true,
+                        accessor: (cell, row) => {
+                            return (React.createElement(SmartBelongsToDisplayWidget, { variable_id: variable, row: row, connection: options.connection, filterBelongsTo: async (object) => {
+                                    options.filterState.setFilter(variable.name, new SimpleFilter(variable, [new Statement(Condition.EQUALS, object.id)]));
+                                } }));
                         }
-                        options.filterState.setFilter(a.name, filter);
-                    } })),
-                noWrap: true,
-                shrink: true,
-                accessor: (cell, row) => {
-                    return React.createElement(SmartCellDisplayWidget, { name: a.name, row: row });
+                    }
+                ];
+            }
+            const attribute = entry.object;
+            return [
+                {
+                    key: attribute.name,
+                    display: (React.createElement(SmartColumnWidget, { variable: attribute, typeLabel: (_b = (_a = ioc.get(TypeEngine).getHandler(attribute.type)) === null || _a === void 0 ? void 0 : _a.getTypeLabel) === null || _b === void 0 ? void 0 : _b.call(_a, attribute.type), filter: options.filterState.getFilter(attribute.name), sortDirection: (_c = options.sortState.getSort(attribute.name)) === null || _c === void 0 ? void 0 : _c.direction, onToggleSort: async () => {
+                            const sort = options.sortState.getSort(attribute.name);
+                            if (!sort) {
+                                options.sortState.addSort(SimpleQuerySort.create(attribute.name));
+                                return;
+                            }
+                            sort.toggle();
+                        }, filterChanged: async (filter) => {
+                            var _a;
+                            if (!filter) {
+                                (_a = options.filterState.getFilter(attribute.name)) === null || _a === void 0 ? void 0 : _a.delete();
+                                return;
+                            }
+                            options.filterState.setFilter(attribute.name, filter);
+                        } })),
+                    noWrap: true,
+                    shrink: true,
+                    accessor: (cell, row) => {
+                        return React.createElement(SmartCellDisplayWidget, { name: attribute.name, row: row });
+                    }
                 }
-            };
+            ];
         })
     ];
 };

package/dist/core/query/query-simple/SimpleQueryColumns.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"SimpleQueryColumns.js","sourceRoot":"","sources":["../../../../src/core/query/query-simple/SimpleQueryColumns.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;~~AAE~~/B,OAAO,~~KAAK~~,~~CAAC~~,MAAM,~~QAAQ,~~CAAC;~~AAE5B~~,OAAO,EAAE,iBAAiB,EAAE,MAAM,8BAA8B,CAAC;AACjE,OAAO,EAAE,iBAAiB,EAAE,MAAM,8BAA8B,CAAC;AACjE,OAAO,EAAE,sBAAsB,EAAE,MAAM,mCAAmC,CAAC;AAC3E,OAAO,EAAE,2BAA2B,EAAE,MAAM,wCAAwC,CAAC;AACrF,OAAO,EAAE,mBAAmB,EAAE,MAAM,gCAAgC,CAAC;AAGrE,OAAO,EAAE,eAAe,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAGpE,OAAO,EAAE,2BAA2B,EAAE,mBAAmB,EAAE,MAAM,wBAAwB,CAAC;~~AAS1F~~,MAAM,CAAC,MAAM,uBAAuB,GAAG,CAAC,OAAuC,EAAiB,EAAE;IAChG,MAAM,YAAY,GAAG,CAAC,KAAa,EAAE,KAAa,EAAE,EAAE;;QACpD,MAAM,SAAS,GAAG,MAAA,OAAO,CAAC,SAAS,CAAC,OAAO,CAAC,KAAK,CAAC,0CAAE,SAAS,CAAC;QAC9D,IAAI,CAAC,SAAS,EAAE,CAAC;YACf,OAAO,KAAK,CAAC;QACf,CAAC;QACD,OAAO,GAAG,KAAK,IAAI,SAAS,KAAK,aAAa,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC;IACnE,CAAC,CAAC;IAEF,OAAO;QACL;YACE,GAAG,EAAE,mBAAmB,CAAC,EAAE;YAC3B,OAAO,EAAE,CACP,oBAAC,~~mBAAmB~~,~~IAClB~~,~~KAAK~~,EAAE,~~YAAY~~,~~CAAC~~,~~mBAAmB~~,CAAC,~~EAAE~~,~~EAAE~~,~~2BAA2B~~,CAAC,~~mBAAmB~~,CAAC,~~EAAE~~,CAAC,CAAC,~~EAChG~~,~~OAAO~~,~~EAAE~~,~~KAAK~~,IAAI,~~EAAE;oBAClB~~,MAAM,~~IAAI~~,~~GAAG,~~OAAO,CAAC,~~SAAS~~,CAAC,~~OAAO~~,CAAC,mBAAmB,CAAC,EAAE,CAAC,~~CAAC;oBAC/D~~,~~IAAI~~,~~CAAC~~,~~IAAI~~,EAAE,~~CAAC;wBACV~~,~~OAAO~~,CAAC,~~SAAS~~,CAAC,OAAO,CAAC,~~eAAe~~,CAAC,~~MAAM~~,CAAC,mBAAmB,CAAC,EAAE,CAAC,~~CAAC~~,CAAC;~~wBAC1E~~,OAAO;oBACT,CAAC;oBACD,~~IAAI~~,CAAC,~~MAAM~~,EAAE,CAAC;~~gBAChB~~,CAAC,GACD,CACH;YACD,MAAM,EAAE,IAAI;YACZ,MAAM,EAAE,IAAI;~~SACb~~;QACD;YACE,GAAG,EAAE,mBAAmB,CAAC,UAAU;YACnC,OAAO,EAAE,CACP,oBAAC,mBAAmB,IAClB,KAAK,EAAE,YAAY,CACjB,mBAAmB,CAAC,UAAU,EAC9B,2BAA2B,CAAC,mBAAmB,CAAC,UAAU,CAAC,CAC5D,EACD,OAAO,EAAE,KAAK,IAAI,EAAE;oBAClB,MAAM,IAAI,GAAG,OAAO,CAAC,SAAS,CAAC,OAAO,CAAC,mBAAmB,CAAC,UAAU,CAAC,CAAC;oBACvE,IAAI,CAAC,IAAI,EAAE,CAAC;wBACV,OAAO,CAAC,SAAS,CAAC,OAAO,CAAC,eAAe,CAAC,MAAM,CAAC,mBAAmB,CAAC,UAAU,CAAC,CAAC,CAAC;wBAClF,OAAO;oBACT,CAAC;oBACD,IAAI,CAAC,MAAM,EAAE,CAAC;gBAChB,CAAC,GACD,CACH;YACD,MAAM,EAAE,IAAI;YACZ,MAAM,EAAE,IAAI;YACZ,QAAQ,EAAE,CAAC,IAAI,EAAE,GAAY,EAAE,EAAE;gBAC/B,OAAO,oBAAC,iBAAiB,IAAC,IAAI,EAAE,mBAAmB,CAAC,UAAU,EAAE,IAAI,EAAE,GAAG,CAAC,KAAK,CAAC,UAAU,EAAE,GAAG,EAAE,GAAG,GAAI,CAAC;YAC3G,CAAC;SACF;QACD,GAAG,CAAC,CAAC,~~GAAG~~,CAAC,OAAO,CAAC,~~UAAU~~,CAAC,~~UAAU~~,CAAC,~~eAAe~~,EAAE,CAAC,CAAC,~~EAAE~~,~~EAAE~~;~~YAC5D~~,OAAO;~~gBACL~~,GAAG,EAAE,~~CAAC~~,CAAC,IAAI;~~gBACX~~,OAAO,EAAE,CACP,oBAAC,iBAAiB,IAChB,QAAQ,EAAE,OAAO,CAAC,UAAU,CAAC,UAAU,CAAC,aAAa,CAAC,CAAC,CAAC,YAAY,CAAC,~~EACrE~~,~~IAAI~~,EAAE,OAAO,CAAC,~~UAAU~~,CAAC,~~UAAU~~,CAAC,~~SAAS~~,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,~~WAAW~~,~~EACzE~~,aAAa,EAAE,CAAC,MAAM,EAAE,EAAE,~~GAAE~~,CAAC,~~GAC7B~~,CACH;~~gBACD~~,MAAM,EAAE,IAAI;~~gBACZ~~,MAAM,EAAE,IAAI;~~gBACZ~~,QAAQ,EAAE,CAAC,IAAI,EAAE,GAAY,EAAE,EAAE;~~oBAC~~/B,OAAO,oBAAC,2BAA2B,~~IAAC~~,WAAW,EAAE,~~CAAC~~,~~EAAE~~,GAAG,EAAE,GAAG,~~EAAE~~,UAAU,EAAE,OAAO,CAAC,UAAU,~~GAAI~~,~~CAAC~~;~~gBACnG~~,CAAC~~;aACa~~,CAAC~~;QACnB~~,CAAC,CAAC~~;QACF~~,~~GAAG~~,CAAC,CAAC,~~GAAG~~,CAAC,~~OAAO~~,CAAC,~~UAAU~~,CAAC,~~UAAU~~,CAAC,~~UAAU~~,~~EAAE~~,CAAC,CAAC,~~EAAE~~,~~EAAE;;YACvD~~,OAAO;gBACL,GAAG,EAAE,~~CAAC~~,CAAC,IAAI;~~gBACX~~,OAAO,EAAE,CACP,oBAAC,iBAAiB,IAChB,QAAQ,EAAE,CAAC,~~EACX~~,MAAM,EAAE,OAAO,CAAC,WAAW,CAAC,SAAS,CAAC,~~CAAC~~,CAAC,IAAI,CAAC,~~EAC7C~~,aAAa,EAAE,MAAA,OAAO,CAAC,SAAS,CAAC,OAAO,CAAC,~~CAAC~~,CAAC,IAAI,CAAC,0CAAE,SAAS,~~EAC3D~~,YAAY,EAAE,KAAK,IAAI,EAAE;~~wBACvB~~,MAAM,IAAI,GAAG,OAAO,CAAC,SAAS,CAAC,OAAO,CAAC,~~CAAC~~,CAAC,IAAI,CAAC,CAAC;~~wBAC/C~~,IAAI,CAAC,IAAI,EAAE,CAAC;~~4BACV~~,OAAO,CAAC,SAAS,CAAC,OAAO,CAAC,eAAe,CAAC,MAAM,CAAC,~~CAAC~~,CAAC,IAAI,CAAC,CAAC,CAAC;~~4BAC1D~~,OAAO;~~wBACT~~,CAAC;~~wBACD~~,IAAI,CAAC,MAAM,EAAE,CAAC;~~oBAChB~~,CAAC,EACD,aAAa,EAAE,KAAK,EAAE,MAAM,EAAE,EAAE;;~~wBAC9B~~,IAAI,CAAC,MAAM,EAAE,CAAC;~~4BACZ~~,MAAA,OAAO,CAAC,WAAW,CAAC,SAAS,CAAC,~~CAAC~~,CAAC,IAAI,CAAC,0CAAE,MAAM,EAAE,CAAC;~~4BAChD~~,OAAO;~~wBACT~~,CAAC;~~wBACD~~,OAAO,CAAC,WAAW,CAAC,SAAS,CAAC,~~CAAC~~,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;~~oBAChD~~,CAAC,GACD,CACH;~~gBACD~~,MAAM,EAAE,IAAI;~~gBACZ~~,MAAM,EAAE,IAAI;~~gBACZ~~,QAAQ,EAAE,CAAC,IAAI,EAAE,GAAY,EAAE,EAAE;~~oBAC~~/B,OAAO,oBAAC,sBAAsB,IAAC,IAAI,EAAE,~~CAAC~~,CAAC,IAAI,EAAE,GAAG,EAAE,GAAG,GAAI,CAAC;~~gBAC5D~~,CAAC;~~aACa~~,CAAC;~~QACnB~~,CAAC,CAAC;KACH,CAAC;AACJ,CAAC,CAAC"}
1	+ {"version":3,"file":"SimpleQueryColumns.js","sourceRoot":"","sources":["../../../../src/core/query/query-simple/SimpleQueryColumns.tsx"],"names":[],"mappings":"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"}

package/dist/core/query/query-simple/SimpleQueryFilterState.js CHANGED Viewed

@@ -3,6 +3,8 @@ import { __classPrivateFieldGet, __classPrivateFieldSet } from "tslib";
 import * as _ from 'lodash';
 import { BaseObserver } from '@journeyapps-labs/common-utils';
 import { SimpleFilter } from '../filters';
+import { setupBelongsToFilter } from '../../../forms/types/belongs-to-filter';
+import { idVariable, StandardModelFields } from '../StandardModelFields';
 export class SimpleQueryFilterState extends BaseObserver {
     get definition() { return __classPrivateFieldGet(this, _SimpleQueryFilterState_definition_accessor_storage, "f"); }
     set definition(value) { __classPrivateFieldSet(this, _SimpleQueryFilterState_definition_accessor_storage, value, "f"); }
@@ -48,7 +50,7 @@ export class SimpleQueryFilterState extends BaseObserver {
         });
     }
     getFilter(field) {
-        const variable = this.resolveAttribute(field);
+        const variable = this.resolveField(field);
         return variable ? this.simpleFilters.get(variable) : undefined;
     }
     getSerializedFilters() {
@@ -64,9 +66,7 @@ export class SimpleQueryFilterState extends BaseObserver {
             if (!SimpleFilter.canDeserialize(filter)) {
                 return;
             }
-            const variable = _.find(_.values(definition.definition.attributes), (attribute) => {
-                return attribute.name === filter.variable;
-            });
+            const variable = this.resolveField(filter.variable);
             if (!variable) {
                 return;
             }
@@ -74,14 +74,28 @@ export class SimpleQueryFilterState extends BaseObserver {
         });
     }
     setFilter(field, filter) {
-        const variable = this.resolveAttribute(field);
+        const variable = this.resolveField(field);
         if (!variable) {
             return false;
         }
         return this.addFilter(variable, filter);
     }
     async setupFilterForField(field, position) {
-        const variable = this.resolveAttribute(field);
+        const relationship = this.resolveBelongsToField(field);
+        if (relationship) {
+            const existing = this.simpleFilters.get(relationship.variable);
+            const nextFilter = await setupBelongsToFilter({
+                definition: this.definition,
+                relationship: relationship.relationship,
+                variable: relationship.variable,
+                filter: existing
+            });
+            if (!nextFilter) {
+                return false;
+            }
+            return this.addFilter(relationship.variable, nextFilter);
+        }
+        const variable = this.resolveField(field);
         if (!variable) {
             return false;
         }
@@ -122,15 +136,29 @@ export class SimpleQueryFilterState extends BaseObserver {
         this.iterateListeners((cb) => { var _a; return (_a = cb.changed) === null || _a === void 0 ? void 0 : _a.call(cb); });
         return true;
     }
-    resolveAttribute(field) {
+    resolveField(field) {
         var _a;
         if (!((_a = this.definition) === null || _a === void 0 ? void 0 : _a.definition)) {
             return undefined;
         }
+        if (field === StandardModelFields.ID) {
+            return idVariable;
+        }
+        const relationship = this.resolveBelongsToField(field);
+        if (relationship) {
+            return relationship.variable;
+        }
         return _.find(_.values(this.definition.definition.attributes), (attribute) => {
             return attribute.name === field;
         });
     }
+    resolveBelongsToField(field) {
+        var _a;
+        if (!((_a = this.definition) === null || _a === void 0 ? void 0 : _a.definition)) {
+            return undefined;
+        }
+        return this.definition.getBelongsToRelationshipForField(field);
+    }
 }
 _SimpleQueryFilterState_definition_accessor_storage = new WeakMap();
 //# sourceMappingURL=SimpleQueryFilterState.js.map

package/dist/core/query/query-simple/SimpleQueryFilterState.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"SimpleQueryFilterState.js","sourceRoot":"","sources":["../../../../src/core/query/query-simple/SimpleQueryFilterState.ts"],"names":[],"mappings":";;AACA,OAAO,KAAK,CAAC,MAAM,QAAQ,CAAC;AAC5B,OAAO,EAAE,YAAY,EAAE,MAAM,gCAAgC,CAAC;AAE9D,OAAO,EAA0B,YAAY,EAAE,MAAM,YAAY,CAAC;~~AAiBlE~~,MAAM,OAAO,sBAAuB,SAAQ,YAA4C;IAEtF,IAAS,UAAU,qGAAoC;IAAvD,IAAS,UAAU,0GAAoC;IAGvD,YAAY,OAAsC;QAChD,KAAK,EAAE,CAAC;QAJD,sEAA8C;QAKrD,IAAI,CAAC,aAAa,GAAG,IAAI,GAAG,EAAE,CAAC;QAC/B,IAAI,CAAC,UAAU,GAAG,OAAO,CAAC,UAAU,CAAC;QACrC,IAAI,CAAC,UAAU,GAAG,OAAO,CAAC,UAAU,CAAC;IACvC,CAAC;IAED,IAAI,OAAO;QACT,OAAO,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,aAAa,CAAC,MAAM,EAAE,CAAC,CAAC;IACjD,CAAC;IAED,KAAK;QACH,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC;IACpD,CAAC;IAED,aAAa,CAAC,UAA6C;;QACzD,MAAM,iBAAiB,GAAG,CAAA,MAAA,MAAA,IAAI,CAAC,UAAU,0CAAE,UAAU,0CAAE,IAAI,OAAK,MAAA,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,UAAU,0CAAE,IAAI,CAAA,CAAC;QAC7F,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC;QAC7B,MAAM,UAAU,GAAG,IAAI,CAAC,aAAa,CAAC,IAAI,GAAG,CAAC,CAAC;QAC/C,IAAI,iBAAiB,EAAE,CAAC;YACtB,IAAI,CAAC,KAAK,EAAE,CAAC;QACf,CAAC;QACD,IAAI,iBAAiB,IAAI,CAAC,UAAU,EAAE,CAAC;YACrC,IAAI,CAAC,gBAAgB,CAAC,CAAC,EAAE,EAAE,EAAE,WAAC,OAAA,MAAA,EAAE,CAAC,OAAO,kDAAI,CAAA,EAAA,CAAC,CAAC;QAChD,CAAC;QACD,OAAO,iBAAiB,IAAI,UAAU,CAAC;IACzC,CAAC;IAED,mBAAmB;;QACjB,IAAI,CAAC,CAAA,MAAA,IAAI,CAAC,UAAU,0CAAE,UAAU,CAAA,EAAE,CAAC;YACjC,OAAO,EAAE,CAAC;QACZ,CAAC;QACD,OAAO,IAAI,CAAC,UAAU,CAAC,mBAAmB,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;IAC9D,CAAC;IAED,gBAAgB;QACd,OAAO,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,aAAa,CAAC,OAAO,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,QAAQ,EAAE,MAAM,CAAC,EAAE,EAAE;YACzE,OAAO;gBACL,QAAQ;gBACR,MAAM;aACP,CAAC;QACJ,CAAC,CAAC,CAAC;IACL,CAAC;IAED,SAAS,CAAC,KAAa;QACrB,MAAM,QAAQ,GAAG,IAAI,CAAC,~~gBAAgB~~,CAAC,KAAK,CAAC,CAAC;~~QAC9C~~,OAAO,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;IACjE,CAAC;IAED,oBAAoB;QAClB,OAAO,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,SAAS,EAAE,CAAC,CAAC;IAC1D,CAAC;IAED,cAAc,CAAC,OAAiC;QAC9C,IAAI,CAAC,KAAK,EAAE,CAAC;QACb,MAAM,UAAU,GAAG,IAAI,CAAC,UAAU,CAAC;QACnC,IAAI,CAAC,CAAA,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,UAAU,CAAA,EAAE,CAAC;YAC5B,OAAO;QACT,CAAC;QACD,CAAC,OAAO,IAAI,EAAE,CAAC,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,EAAE;YACjC,IAAI,CAAC,YAAY,CAAC,cAAc,CAAC,MAAM,CAAC,EAAE,CAAC;gBACzC,OAAO;YACT,CAAC;YACD,MAAM,QAAQ,GAAG,~~CAAC,CAAC,~~IAAI,CAAC,~~CAAC~~,CAAC,MAAM,CAAC,~~UAAU,CAAC,UAAU,CAAC,UAAU,CAAC,EAAE,CAAC,SAAS,EAAE,EAAE;gBAChF,OAAO,SAAS,CAAC,IAAI,KAAK,MAAM,CAAC,~~QAAQ,CAAC~~;YAC5C~~,CAAC~~,CAAC,CAAC~~;~~YACH~~,IAAI,CAAC,QAAQ,EAAE,CAAC;gBACd,OAAO;YACT,CAAC;YACD,IAAI,CAAC,SAAS,CAAC,QAAQ,EAAE,YAAY,CAAC,WAAW,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC,CAAC;QACvE,CAAC,CAAC,CAAC;IACL,CAAC;IAED,SAAS,CAAC,KAAa,EAAE,MAAoB;QAC3C,MAAM,QAAQ,GAAG,IAAI,CAAC,~~gBAAgB~~,CAAC,KAAK,CAAC,CAAC;~~QAC9C~~,IAAI,CAAC,QAAQ,EAAE,CAAC;YACd,OAAO,KAAK,CAAC;QACf,CAAC;QACD,OAAO,IAAI,CAAC,SAAS,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;IAC1C,CAAC;IAED,KAAK,CAAC,mBAAmB,CAAC,KAAa,EAAE,QAAqB;QAC5D,MAAM,QAAQ,GAAG,IAAI,CAAC,~~gBAAgB~~,CAAC,KAAK,CAAC,CAAC;~~QAC9C~~,IAAI,CAAC,QAAQ,EAAE,CAAC;YACd,OAAO,KAAK,CAAC;QACf,CAAC;QACD,MAAM,OAAO,GAAG,IAAI,CAAC,UAAU,CAAC,UAAU,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;QAC1D,IAAI,CAAC,CAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,WAAW,CAAA,EAAE,CAAC;YAC1B,OAAO,KAAK,CAAC;QACf,CAAC;QACD,MAAM,QAAQ,GAAG,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;QAClD,MAAM,UAAU,GAAG,MAAM,OAAO,CAAC,WAAW,CAAC;YAC3C,QAAQ;YACR,MAAM,EAAE,QAAQ;YAChB,QAAQ;SACT,CAAC,CAAC;QACH,IAAI,CAAC,UAAU,EAAE,CAAC;YAChB,OAAO,KAAK,CAAC;QACf,CAAC;QACD,OAAO,IAAI,CAAC,SAAS,CAAC,QAAQ,EAAE,UAAU,CAAC,CAAC;IAC9C,CAAC;IAEO,SAAS,CAAC,QAAkB,EAAE,MAAoB;QACxD,MAAM,QAAQ,GAAG,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;QAClD,IAAI,QAAQ,IAAI,QAAQ,KAAK,MAAM,EAAE,CAAC;YACpC,QAAQ,CAAC,MAAM,EAAE,CAAC;QACpB,CAAC;QACD,IAAI,QAAQ,KAAK,MAAM,EAAE,CAAC;YACxB,IAAI,CAAC,gBAAgB,CAAC,CAAC,EAAE,EAAE,EAAE,WAAC,OAAA,MAAA,EAAE,CAAC,OAAO,kDAAI,CAAA,EAAA,CAAC,CAAC;YAC9C,OAAO,IAAI,CAAC;QACd,CAAC;QACD,IAAI,WAAW,GAAG,MAAM,CAAC,gBAAgB,CAAC;YACxC,eAAe,EAAE,GAAG,EAAE;gBACpB,WAAW,EAAE,CAAC;gBACd,IAAI,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,QAAQ,CAAC,KAAK,MAAM,EAAE,CAAC;oBAChD,IAAI,CAAC,aAAa,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;oBACpC,IAAI,CAAC,gBAAgB,CAAC,CAAC,EAAE,EAAE,EAAE,WAAC,OAAA,MAAA,EAAE,CAAC,OAAO,kDAAI,CAAA,EAAA,CAAC,CAAC;gBAChD,CAAC;YACH,CAAC;SACF,CAAC,CAAC;QACH,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;QACzC,IAAI,CAAC,gBAAgB,CAAC,CAAC,EAAE,EAAE,EAAE,WAAC,OAAA,MAAA,EAAE,CAAC,OAAO,kDAAI,CAAA,EAAA,CAAC,CAAC;QAC9C,OAAO,IAAI,CAAC;IACd,CAAC;IAEO,~~gBAAgB~~,CAAC,KAAa;;~~QACpC~~,IAAI,CAAC,CAAA,MAAA,IAAI,CAAC,UAAU,0CAAE,UAAU,CAAA,EAAE,CAAC;YACjC,OAAO,SAAS,CAAC;QACnB,CAAC;QACD,OAAO,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,UAAU,CAAC,UAAU,CAAC,EAAE,CAAC,SAAS,EAAE,EAAE;YAC3E,OAAO,SAAS,CAAC,IAAI,KAAK,KAAK,CAAC;QAClC,CAAC,CAAC,CAAC;IACL,CAAC;CACF"}
1	+ {"version":3,"file":"SimpleQueryFilterState.js","sourceRoot":"","sources":["../../../../src/core/query/query-simple/SimpleQueryFilterState.ts"],"names":[],"mappings":"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"}

package/dist/core/query/query-simple/SimpleQuerySortState.js CHANGED Viewed

@@ -100,7 +100,6 @@ let SimpleQuerySortState = (() => {
                     };
                 });
                 return [
-                    { key: StandardModelFields.ID, label: STANDARD_MODEL_FIELD_LABELS[StandardModelFields.ID] },
                     {
                         key: StandardModelFields.UPDATED_AT,
                         label: STANDARD_MODEL_FIELD_LABELS[StandardModelFields.UPDATED_AT]

package/dist/core/query/query-simple/SimpleQuerySortState.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"SimpleQuerySortState.js","sourceRoot":"","sources":["../../../../src/core/query/query-simple/SimpleQuerySortState.ts"],"names":[],"mappings":"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~~,EAAE,GAAG,EAAE,mBAAmB,CAAC,EAAE,EAAE,KAAK,EAAE,2BAA2B,CAAC,mBAAmB,CAAC,EAAE,CAAC,EAAE~~;~~oBAC3F;~~wBACE,GAAG,EAAE,mBAAmB,CAAC,UAAU;wBACnC,KAAK,EAAE,2BAA2B,CAAC,mBAAmB,CAAC,UAAU,CAAC;qBACnE;oBACD,GAAG,OAAO;iBACX,CAAC;YACJ,CAAC;YAEO,cAAc,CAAC,KAAwB;gBAC7C,MAAM,IAAI,GAAG,IAAI,GAAG,EAAU,CAAC;gBAC/B,OAAO,CAAC,KAAK,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE;oBACnC,IAAI,CAAC,CAAA,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,KAAK,CAAA,EAAE,CAAC;wBACjB,OAAO,KAAK,CAAC;oBACf,CAAC;oBACD,IAAI,CAAC,CAAC,IAAI,CAAC,SAAS,KAAK,aAAa,CAAC,GAAG,IAAI,IAAI,CAAC,SAAS,KAAK,aAAa,CAAC,IAAI,CAAC,EAAE,CAAC;wBACrF,OAAO,KAAK,CAAC;oBACf,CAAC;oBACD,IAAI,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC;wBACzB,OAAO,KAAK,CAAC;oBACf,CAAC;oBACD,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;oBACrB,OAAO,IAAI,CAAC;gBACd,CAAC,CAAC,CAAC;YACL,CAAC;;;;;;;~~iCAvHA~~,UAAU;YACX,kKAAS,KAAK,6BAAL,KAAK,qFAAoB;;;;;SAFvB,oBAAoB"}
1	+ {"version":3,"file":"SimpleQuerySortState.js","sourceRoot":"","sources":["../../../../src/core/query/query-simple/SimpleQuerySortState.ts"],"names":[],"mappings":"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"}

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

@@ -34,7 +34,7 @@ export const BelongsToDisplayWidget = observer((props) => {
     return (React.createElement(S.Container, { className: props.className },
         object.data.display,
         React.createElement(S.Actions, null,
-            React.createElement(PeekRelationshipButton, { object: object, open: props.open }),
+            React.createElement(PeekRelationshipButton, { object: object, open: props.open, filterBelongsTo: props.filterBelongsTo }),
             React.createElement(TableButtonWidget, { icon: "arrow-right", action: () => {
                     props.open(object);
                 } }))));

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

	@@ -1 +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;AAG5C,OAAO,EAAE,UAAU,EAAE,MAAM,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AACtF,OAAO,EAAE,mBAAmB,EAAE,MAAM,qCAAqC,CAAC;AAE1E,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AACtC,OAAO,EAAE,sBAAsB,EAAE,MAAM,0BAA0B,CAAC;AAClE,OAAO,EAAE,gBAAgB,EAAE,MAAM,mCAAmC,CAAC;~~AAUrE~~,MAAM,CAAC,MAAM,sBAAsB,GAA0C,QAAQ,CAAC,CAAC,KAAK,EAAE,EAAE;IAC9F,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,GAAG,QAAQ,CAAoB,IAAI,CAAC,CAAC;IAC9D,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC;IAE5C,SAAS,CAAC,GAAG,EAAE;QACb,IAAI,CAAC,KAAK,CAAC,EAAE,EAAE,CAAC;YACd,OAAO;QACT,CAAC;QAED,KAAK,CAAC,UAAU,CAAC,kCAAkC,CAAC,KAAK,CAAC,YAAY,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CACrG,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE;YAClC,IAAI,CAAC,GAAG,EAAE,CAAC;gBACT,SAAS,CAAC,IAAI,CAAC,CAAC;gBAChB,OAAO;YACT,CAAC;YACD,SAAS,CAAC,GAAG,CAAC,CAAC;QACjB,CAAC,CAAC,CACH,CAAC;IACJ,CAAC,EAAE,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,CAAC;IAEf,IAAI,MAAM,EAAE,CAAC;QACX,OAAO,CACL,oBAAC,CAAC,CAAC,OAAO,IACR,OAAO,EAAC,SAAS,EACjB,KAAK,EAAE,GAAG,KAAK,CAAC,EAAE,YAAY,EAC9B,IAAI,EAAC,SAAS,EACd,MAAM,EAAE,GAAG,EAAE;gBACX,mBAAmB,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;YAChC,CAAC,GACD,CACH,CAAC;IACJ,CAAC;IAED,IAAI,CAAC,KAAK,CAAC,EAAE,EAAE,CAAC;QACd,OAAO,oBAAC,gBAAgB,kBAA2B,CAAC;IACtD,CAAC;IAED,IAAI,CAAC,MAAM,EAAE,CAAC;QACZ,OAAO,oBAAC,CAAC,CAAC,OAAO,IAAC,IAAI,EAAE,IAAI,EAAE,IAAI,EAAC,SAAS,GAAG,CAAC;IAClD,CAAC;IAED,OAAO,CACL,oBAAC,CAAC,CAAC,SAAS,IAAC,SAAS,EAAE,KAAK,CAAC,SAAS;QACpC,MAAM,CAAC,IAAI,CAAC,OAAO;QACpB,oBAAC,CAAC,CAAC,OAAO;YACR,oBAAC,sBAAsB,IAAC,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,KAAK,CAAC,IAAI,GAAI;~~YAC5D~~,oBAAC,iBAAiB,IAChB,IAAI,EAAC,aAAa,EAClB,MAAM,EAAE,GAAG,EAAE;oBACX,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;gBACrB,CAAC,GACD,CACQ,CACA,CACf,CAAC;AACJ,CAAC,CAAC,CAAC;AAEH,IAAU,CAAC,CAyBV;AAzBD,WAAU,CAAC;IACI,SAAO,GAAG,MAAM,CAAC,iBAAiB,CAAC,CAAA;;;GAG/C,CAAC;IAEW,SAAO,GAAG,MAAM,CAAC,UAAU,CAAC,CAAA;;GAExC,CAAC;IAEW,WAAS,GAAG,MAAM,CAAC,GAAG,CAAA;;;;;;;GAOlC,CAAC;IAEW,SAAO,GAAG,MAAM,CAAC,GAAG,CAAA;;;;;GAKhC,CAAC;AACJ,CAAC,EAzBS,CAAC,KAAD,CAAC,QAyBV"}
1	+ {"version":3,"file":"BelongsToDisplayWidget.js","sourceRoot":"","sources":["../../../../src/core/query/widgets/BelongsToDisplayWidget.tsx"],"names":[],"mappings":"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"}

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

@@ -3,7 +3,9 @@ import styled from '@emotion/styled';
 export const ColumnDisplayWidget = (props) => {
     const parts = (props.label || '').split(' ');
     const minWidth = parts.length >= 5 ? 150 : parts.length >= 3 ? 80 : undefined;
-    return (React.createElement(S.Label, { className: props.className, minWidth: minWidth, clickable: !!props.onClick, nowrap: !minWidth, onClick: props.onClick }, props.label));
+    return (React.createElement(S.Container, { className: props.className, minWidth: minWidth, clickable: !!props.onClick, nowrap: !minWidth, onClick: props.onClick },
+        React.createElement(S.Label, null, props.label),
+        props.secondaryLabel ? React.createElement(S.SecondaryLabel, null, props.secondaryLabel) : null));
 };
 var S;
 (function (S) {
@@ -14,10 +16,19 @@ var S;
       opacity: 0.9;
     }
   `;
-    S.Label = styled.div `
+    S.Container = styled.div `
     ${(p) => (p.minWidth ? `min-width: ${p.minWidth}px;` : '')};
     ${(p) => (p.nowrap ? 'white-space: nowrap;' : '')};
     ${(p) => (p.clickable ? clickableStyle : '')};
+    display: inline-flex;
+    flex-direction: column;
+    align-items: flex-start;
+    row-gap: 2px;
+  `;
+    S.Label = styled.div ``;
+    S.SecondaryLabel = styled.div `
+    opacity: 0.4;
+    font-size: 12px;
   `;
 })(S || (S = {}));
 //# sourceMappingURL=ColumnDisplayWidget.js.map

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

	@@ -1 +1 @@
1	- {"version":3,"file":"ColumnDisplayWidget.js","sourceRoot":"","sources":["../../../../src/core/query/widgets/ColumnDisplayWidget.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAC/B,OAAO,MAAM,MAAM,iBAAiB,CAAC;~~AAQrC~~,MAAM,CAAC,MAAM,mBAAmB,GAAuC,CAAC,KAAK,EAAE,EAAE;IAC/E,MAAM,KAAK,GAAG,CAAC,KAAK,CAAC,KAAK,IAAI,EAAE,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IAC7C,MAAM,QAAQ,GAAG,KAAK,CAAC,MAAM,IAAI,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,KAAK,CAAC,MAAM,IAAI,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC;IAC9E,OAAO,CACL,oBAAC,CAAC,CAAC,~~KAAK~~,~~IACN~~,SAAS,EAAE,KAAK,CAAC,SAAS,EAC1B,QAAQ,EAAE,QAAQ,EAClB,SAAS,EAAE,CAAC,CAAC,KAAK,CAAC,OAAO,EAC1B,MAAM,EAAE,CAAC,QAAQ,EACjB,OAAO,EAAE,KAAK,CAAC,OAAO,~~IAErB~~,KAAK,CAAC,KAAK,~~CACJ~~,~~CACX~~,CAAC;AACJ,CAAC,CAAC;AAEF,IAAU,CAAC,~~CAcV~~;~~AAdD~~,WAAU,CAAC;IACT,MAAM,cAAc,GAAG;;;;;;GAMtB,CAAC;IAEW,~~OAAK~~,GAAG,MAAM,CAAC,GAAG,CAA4D;~~MACvF~~,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,QAAQ,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC;MACxD,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,sBAAsB,CAAC,CAAC,CAAC,EAAE,CAAC;MAC/C,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,EAAE,CAAC;~~GAC7C~~,CAAC;AACJ,CAAC,~~EAdS~~,CAAC,KAAD,CAAC,~~QAcV~~"}
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;AASrC,MAAM,CAAC,MAAM,mBAAmB,GAAuC,CAAC,KAAK,EAAE,EAAE;IAC/E,MAAM,KAAK,GAAG,CAAC,KAAK,CAAC,KAAK,IAAI,EAAE,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IAC7C,MAAM,QAAQ,GAAG,KAAK,CAAC,MAAM,IAAI,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,KAAK,CAAC,MAAM,IAAI,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC;IAC9E,OAAO,CACL,oBAAC,CAAC,CAAC,SAAS,IACV,SAAS,EAAE,KAAK,CAAC,SAAS,EAC1B,QAAQ,EAAE,QAAQ,EAClB,SAAS,EAAE,CAAC,CAAC,KAAK,CAAC,OAAO,EAC1B,MAAM,EAAE,CAAC,QAAQ,EACjB,OAAO,EAAE,KAAK,CAAC,OAAO;QAEtB,oBAAC,CAAC,CAAC,KAAK,QAAE,KAAK,CAAC,KAAK,CAAW;QAC/B,KAAK,CAAC,cAAc,CAAC,CAAC,CAAC,oBAAC,CAAC,CAAC,cAAc,QAAE,KAAK,CAAC,cAAc,CAAoB,CAAC,CAAC,CAAC,IAAI,CAC9E,CACf,CAAC;AACJ,CAAC,CAAC;AAEF,IAAU,CAAC,CAyBV;AAzBD,WAAU,CAAC;IACT,MAAM,cAAc,GAAG;;;;;;GAMtB,CAAC;IAEW,WAAS,GAAG,MAAM,CAAC,GAAG,CAA4D;MAC3F,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,QAAQ,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC;MACxD,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,sBAAsB,CAAC,CAAC,CAAC,EAAE,CAAC;MAC/C,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,EAAE,CAAC;;;;;GAK7C,CAAC;IAEW,OAAK,GAAG,MAAM,CAAC,GAAG,CAAA,EAAE,CAAC;IAErB,gBAAc,GAAG,MAAM,CAAC,GAAG,CAAA;;;GAGvC,CAAC;AACJ,CAAC,EAzBS,CAAC,KAAD,CAAC,QAyBV"}