@journeyapps-labs/reactor-mod-data-browser 3.0.1 → 3.1.0

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

@@ -0,0 +1,44 @@
+import { BaseObserver } from '@journeyapps-labs/common-utils';
+export var SortDirection;
+(function (SortDirection) {
+    SortDirection["ASC"] = "asc";
+    SortDirection["DESC"] = "desc";
+})(SortDirection || (SortDirection = {}));
+export class SimpleQuerySort extends BaseObserver {
+    constructor(field, direction) {
+        super();
+        this.field = field;
+        this.direction = direction;
+    }
+    static deserialize(value) {
+        return new SimpleQuerySort(value.field, value.direction);
+    }
+    static create(field, direction = SortDirection.ASC) {
+        return new SimpleQuerySort(field, direction);
+    }
+    serialize() {
+        return {
+            field: this.field,
+            direction: this.direction
+        };
+    }
+    setDirection(direction) {
+        if (this.direction === direction) {
+            return false;
+        }
+        this.direction = direction;
+        this.iterateListeners((listener) => { var _a; return (_a = listener.changed) === null || _a === void 0 ? void 0 : _a.call(listener); });
+        return true;
+    }
+    toggle() {
+        if (this.direction === SortDirection.ASC) {
+            this.setDirection(SortDirection.DESC);
+            return;
+        }
+        this.remove();
+    }
+    remove() {
+        this.iterateListeners((listener) => { var _a; return (_a = listener.removeRequested) === null || _a === void 0 ? void 0 : _a.call(listener); });
+    }
+}
+//# sourceMappingURL=SimpleQueryTypes.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"SimpleQueryTypes.js","sourceRoot":"","sources":["../../../../src/core/query/query-simple/SimpleQueryTypes.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,gCAAgC,CAAC;AAE9D,MAAM,CAAN,IAAY,aAGX;AAHD,WAAY,aAAa;IACvB,4BAAW,CAAA;IACX,8BAAa,CAAA;AACf,CAAC,EAHW,aAAa,KAAb,aAAa,QAGxB;AAYD,MAAM,OAAO,eAAgB,SAAQ,YAAqC;IACxE,YACS,KAAa,EACb,SAAwB;QAE/B,KAAK,EAAE,CAAC;QAHD,UAAK,GAAL,KAAK,CAAQ;QACb,cAAS,GAAT,SAAS,CAAe;IAGjC,CAAC;IAED,MAAM,CAAC,WAAW,CAAC,KAAgC;QACjD,OAAO,IAAI,eAAe,CAAC,KAAK,CAAC,KAAK,EAAE,KAAK,CAAC,SAAS,CAAC,CAAC;IAC3D,CAAC;IAED,MAAM,CAAC,MAAM,CAAC,KAAa,EAAE,YAA2B,aAAa,CAAC,GAAG;QACvE,OAAO,IAAI,eAAe,CAAC,KAAK,EAAE,SAAS,CAAC,CAAC;IAC/C,CAAC;IAED,SAAS;QACP,OAAO;YACL,KAAK,EAAE,IAAI,CAAC,KAAK;YACjB,SAAS,EAAE,IAAI,CAAC,SAAS;SAC1B,CAAC;IACJ,CAAC;IAED,YAAY,CAAC,SAAwB;QACnC,IAAI,IAAI,CAAC,SAAS,KAAK,SAAS,EAAE,CAAC;YACjC,OAAO,KAAK,CAAC;QACf,CAAC;QACD,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;QAC3B,IAAI,CAAC,gBAAgB,CAAC,CAAC,QAAQ,EAAE,EAAE,WAAC,OAAA,MAAA,QAAQ,CAAC,OAAO,wDAAI,CAAA,EAAA,CAAC,CAAC;QAC1D,OAAO,IAAI,CAAC;IACd,CAAC;IAED,MAAM;QACJ,IAAI,IAAI,CAAC,SAAS,KAAK,aAAa,CAAC,GAAG,EAAE,CAAC;YACzC,IAAI,CAAC,YAAY,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC;YACtC,OAAO;QACT,CAAC;QACD,IAAI,CAAC,MAAM,EAAE,CAAC;IAChB,CAAC;IAED,MAAM;QACJ,IAAI,CAAC,gBAAgB,CAAC,CAAC,QAAQ,EAAE,EAAE,WAAC,OAAA,MAAA,QAAQ,CAAC,eAAe,wDAAI,CAAA,EAAA,CAAC,CAAC;IACpE,CAAC;CACF"}

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

@@ -3,6 +3,8 @@ import { useEffect, useState } from 'react';
 import { IconWidget, styled, TableButtonWidget } from '@journeyapps-labs/reactor-mod';
 import { copyTextToClipboard } from '@journeyapps-labs/lib-reactor-utils';
 import { observer } from 'mobx-react';
+import { PeekRelationshipButton } from './PeekRelationshipButton';
+import { EmptyValueWidget } from '../../../widgets/EmptyValueWidget';
 export const BelongsToDisplayWidget = observer((props) => {
     const [object, setObject] = useState(null);
     const [broken, setBroken] = useState(false);
@@ -24,25 +26,24 @@ export const BelongsToDisplayWidget = observer((props) => {
             } }));
     }
     if (!props.id) {
-        return React.createElement(S.Empty, null, "Not set");
+        return React.createElement(EmptyValueWidget, null, "Not set");
     }
     if (!object) {
         return React.createElement(S.Spinner, { spin: true, icon: "spinner" });
     }
     return (React.createElement(S.Container, { className: props.className },
         object.data.display,
-        React.createElement(TableButtonWidget, { icon: "arrow-right", action: () => {
-                props.open(object);
-            } })));
+        React.createElement(S.Actions, null,
+            React.createElement(PeekRelationshipButton, { object: object, open: props.open }),
+            React.createElement(TableButtonWidget, { icon: "arrow-right", action: () => {
+                    props.open(object);
+                } }))));
 });
 var S;
 (function (S) {
     S.Warning = styled(TableButtonWidget) `
     display: flex;
     flex-direction: row;
-  `;
-    S.Empty = styled.div `
-    opacity: 0.2;
   `;
     S.Spinner = styled(IconWidget) `
     opacity: 0.2;
@@ -55,5 +56,11 @@ var S;
     justify-content: space-between;
     flex-grow: 1;
   `;
+    S.Actions = styled.div `
+    display: flex;
+    flex-direction: row;
+    column-gap: 3px;
+    align-items: center;
+  `;
 })(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;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;AAUtC,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,CAAC,CAAC,KAAK,kBAAkB,CAAC;IACpC,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,iBAAiB,IAChB,IAAI,EAAC,aAAa,EAClB,MAAM,EAAE,GAAG,EAAE;gBACX,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;YACrB,CAAC,GACD,CACU,CACf,CAAC;AACJ,CAAC,CAAC,CAAC;AAEH,IAAU,CAAC,CAsBV;AAtBD,WAAU,CAAC;IACI,SAAO,GAAG,MAAM,CAAC,iBAAiB,CAAC,CAAA;;;GAG/C,CAAC;IAEW,OAAK,GAAG,MAAM,CAAC,GAAG,CAAA;;GAE9B,CAAC;IAEW,SAAO,GAAG,MAAM,CAAC,UAAU,CAAC,CAAA;;GAExC,CAAC;IAEW,WAAS,GAAG,MAAM,CAAC,GAAG,CAAA;;;;;;;GAOlC,CAAC;AACJ,CAAC,EAtBS,CAAC,KAAD,CAAC,QAsBV"}
+{"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

@@ -1,19 +1,15 @@
-import { ioc, SmartDateDisplayWidget, styled } from '@journeyapps-labs/reactor-mod';
+import { ioc, SmartDateDisplayWidget } from '@journeyapps-labs/reactor-mod';
 import * as React from 'react';
 import { TypeEngine } from '../../../forms/TypeEngine';
-var S;
-(function (S) {
-    S.Empty = styled.div `
-    opacity: 0.2;
-  `;
-})(S || (S = {}));
+import { EmptyValueWidget } from '../../../widgets/EmptyValueWidget';
+import { StandardModelFields } from '../StandardModelFields';
 export const CellDisplayWidget = (props) => {
     var _a;
     const { row, cell, name } = props;
     if (cell == null) {
-        return React.createElement(S.Empty, null, "null");
+        return React.createElement(EmptyValueWidget, null);
     }
-    if (name === 'updated_at') {
+    if (name === StandardModelFields.UPDATED_AT) {
         return React.createElement(SmartDateDisplayWidget, { date: cell });
     }
     let display = (_a = ioc.get(TypeEngine).getHandler(row.definition.definition.attributes[name].type)) === null || _a === void 0 ? void 0 : _a.generateDisplay({

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":"AAAA,OAAO,EAAE,GAAG,EAAE,sBAAsB,EAAE,MAAM,EAAE,MAAM,+BAA+B,CAAC;AAEpF,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAE/B,OAAO,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;AAEvD,IAAU,CAAC,CAIV;AAJD,WAAU,CAAC;IACI,OAAK,GAAG,MAAM,CAAC,GAAG,CAAA;;GAE9B,CAAC;AACJ,CAAC,EAJS,CAAC,KAAD,CAAC,QAIV;AAQD,MAAM,CAAC,MAAM,iBAAiB,GAAqC,CAAC,KAAK,EAAE,EAAE;;IAC3E,MAAM,EAAE,GAAG,EAAE,IAAI,EAAE,IAAI,EAAE,GAAG,KAAK,CAAC;IAClC,IAAI,IAAI,IAAI,IAAI,EAAE,CAAC;QACjB,OAAO,oBAAC,CAAC,CAAC,KAAK,eAAe,CAAC;IACjC,CAAC;IAED,IAAI,IAAI,KAAK,YAAY,EAAE,CAAC;QAC1B,OAAO,oBAAC,sBAAsB,IAAC,IAAI,EAAE,IAAI,GAAI,CAAC;IAChD,CAAC;IAED,IAAI,OAAO,GAAG,MAAA,GAAG,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC,UAAU,CAAC,GAAG,CAAC,UAAU,CAAC,UAAU,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,0CAAE,eAAe,CAAC;QAC7G,KAAK,EAAE,GAAG,CAAC,KAAK;QAChB,KAAK,EAAE,IAAI;QACX,KAAK,EAAE,GAAG,CAAC,UAAU,CAAC,UAAU,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,KAAK;QACvD,IAAI;QACJ,IAAI,EAAE,GAAG,CAAC,UAAU,CAAC,UAAU,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,IAAI;KACtD,CAAC,CAAC;IACH,IAAI,OAAO,EAAE,CAAC;QACZ,OAAO,OAAO,CAAC;IACjB,CAAC;IAED,OAAO,CAAC,GAAG,CAAC,cAAc,EAAE,IAAI,EAAE,GAAG,CAAC,UAAU,CAAC,UAAU,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,CAAC;IACnF,OAAO,IAAI,CAAC;AACd,CAAC,CAAC"}
+{"version":3,"file":"CellDisplayWidget.js","sourceRoot":"","sources":["../../../../src/core/query/widgets/CellDisplayWidget.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,sBAAsB,EAAE,MAAM,+BAA+B,CAAC;AAC5E,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAE/B,OAAO,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;AACvD,OAAO,EAAE,gBAAgB,EAAE,MAAM,mCAAmC,CAAC;AACrE,OAAO,EAAE,mBAAmB,EAAE,MAAM,wBAAwB,CAAC;AAQ7D,MAAM,CAAC,MAAM,iBAAiB,GAAqC,CAAC,KAAK,EAAE,EAAE;;IAC3E,MAAM,EAAE,GAAG,EAAE,IAAI,EAAE,IAAI,EAAE,GAAG,KAAK,CAAC;IAClC,IAAI,IAAI,IAAI,IAAI,EAAE,CAAC;QACjB,OAAO,oBAAC,gBAAgB,OAAG,CAAC;IAC9B,CAAC;IAED,IAAI,IAAI,KAAK,mBAAmB,CAAC,UAAU,EAAE,CAAC;QAC5C,OAAO,oBAAC,sBAAsB,IAAC,IAAI,EAAE,IAAI,GAAI,CAAC;IAChD,CAAC;IAED,IAAI,OAAO,GAAG,MAAA,GAAG,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC,UAAU,CAAC,GAAG,CAAC,UAAU,CAAC,UAAU,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,0CAAE,eAAe,CAAC;QAC7G,KAAK,EAAE,GAAG,CAAC,KAAK;QAChB,KAAK,EAAE,IAAI;QACX,KAAK,EAAE,GAAG,CAAC,UAAU,CAAC,UAAU,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,KAAK;QACvD,IAAI;QACJ,IAAI,EAAE,GAAG,CAAC,UAAU,CAAC,UAAU,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,IAAI;KACtD,CAAC,CAAC;IACH,IAAI,OAAO,EAAE,CAAC;QACZ,OAAO,OAAO,CAAC;IACjB,CAAC;IAED,OAAO,CAAC,GAAG,CAAC,cAAc,EAAE,IAAI,EAAE,GAAG,CAAC,UAAU,CAAC,UAAU,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,CAAC;IACnF,OAAO,IAAI,CAAC;AACd,CAAC,CAAC"}

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

@@ -1,22 +1,23 @@
 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, { className: props.className, length: 150 }, props.label));
-    }
-    if (parts.length >= 3) {
-        return (React.createElement(S.Width, { className: props.className, length: 80 }, props.label));
-    }
-    return React.createElement(S.Span, { className: props.className }, props.label);
+    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));
 };
 var S;
 (function (S) {
-    S.Width = styled.div `
-    min-width: ${(p) => p.length}px;
+    const clickableStyle = `
+    cursor: pointer;
+    user-select: none;
+    &:hover {
+      opacity: 0.9;
+    }
   `;
-    S.Span = styled.div `
-    white-space: nowrap;
+    S.Label = styled.div `
+    ${(p) => (p.minWidth ? `min-width: ${p.minWidth}px;` : '')};
+    ${(p) => (p.nowrap ? 'white-space: nowrap;' : '')};
+    ${(p) => (p.clickable ? clickableStyle : '')};
   `;
 })(S || (S = {}));
 //# sourceMappingURL=ColumnDisplayWidget.js.map

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

@@ -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;AAOrC,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,CACL,oBAAC,CAAC,CAAC,KAAK,IAAC,SAAS,EAAE,KAAK,CAAC,SAAS,EAAE,MAAM,EAAE,GAAG,IAC7C,KAAK,CAAC,KAAK,CACJ,CACX,CAAC;IACJ,CAAC;IACD,IAAI,KAAK,CAAC,MAAM,IAAI,CAAC,EAAE,CAAC;QACtB,OAAO,CACL,oBAAC,CAAC,CAAC,KAAK,IAAC,SAAS,EAAE,KAAK,CAAC,SAAS,EAAE,MAAM,EAAE,EAAE,IAC5C,KAAK,CAAC,KAAK,CACJ,CACX,CAAC;IACJ,CAAC;IACD,OAAO,oBAAC,CAAC,CAAC,IAAI,IAAC,SAAS,EAAE,KAAK,CAAC,SAAS,IAAG,KAAK,CAAC,KAAK,CAAU,CAAC;AACpE,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"}
+{"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"}

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

@@ -0,0 +1,128 @@
+import * as React from 'react';
+import { ComboBoxStore2, NotificationStore, NotificationType, PrefsStore, SimpleComboBoxDirective, SmartDateDisplayWidget, TableButtonWidget, themed, ioc } from '@journeyapps-labs/reactor-mod';
+import { copyTextToClipboard } from '@journeyapps-labs/lib-reactor-utils';
+import { TypeEngine } from '../../../forms/TypeEngine';
+import { QueryControlPreferences } from '../../../preferences/QueryControlPreferences';
+import { EmptyValueWidget } from '../../../widgets/EmptyValueWidget';
+export const PeekRelationshipButton = (props) => {
+    const typeEngine = ioc.get(TypeEngine);
+    const notifications = ioc.get(NotificationStore);
+    const copyFieldValue = async (attribute, value) => {
+        try {
+            const handler = typeEngine.getHandler(attribute.type);
+            let scalar = value;
+            if (handler) {
+                const decoded = await handler.decode(value);
+                scalar = handler.encodeToScalar ? await handler.encodeToScalar(decoded) : decoded;
+            }
+            copyTextToClipboard(scalar == null ? 'null' : `${scalar}`);
+            notifications.showNotification({
+                title: 'Copied',
+                description: `${attribute.label || attribute.name} copied to clipboard`,
+                type: NotificationType.SUCCESS
+            });
+        }
+        catch (error) {
+            notifications.showNotification({
+                title: 'Copy failed',
+                description: `Failed to copy ${attribute.label || attribute.name}`,
+                type: NotificationType.ERROR
+            });
+        }
+    };
+    const showPeek = async (event) => {
+        const hideNullFields = ioc
+            .get(PrefsStore)
+            .getPreference(QueryControlPreferences.FILTER_NULL_FIELDS_IN_RELATIONSHIP_PEEK).checked;
+        const attributeItems = Object.values(props.object.definition.definition.attributes)
+            .map((attribute) => {
+            var _a, _b;
+            const value = (_a = props.object.model) === null || _a === void 0 ? void 0 : _a[attribute.name];
+            if (hideNullFields && value == null) {
+                return null;
+            }
+            let display = null;
+            if (value != null) {
+                display = (_b = typeEngine.getHandler(attribute.type)) === null || _b === void 0 ? void 0 : _b.generateDisplay({
+                    model: props.object,
+                    value,
+                    label: attribute.label || attribute.name,
+                    name: attribute.name,
+                    type: attribute.type
+                });
+            }
+            return {
+                key: `field-${attribute.name}`,
+                title: attribute.label || attribute.name,
+                right: React.createElement(S.FieldValue, null, display || (value == null ? React.createElement(EmptyValueWidget, null) : `${value}`)),
+                group: 'Fields',
+                action: async () => {
+                    await copyFieldValue(attribute, value);
+                }
+            };
+        })
+            .filter((item) => !!item);
+        const items = [
+            {
+                key: 'meta-id',
+                title: 'ID',
+                icon: 'copy',
+                right: React.createElement(S.FieldValue, null, props.object.id),
+                disabled: true,
+                group: 'Object'
+            },
+            {
+                key: 'meta-updated',
+                title: 'Updated at',
+                icon: 'clock',
+                right: props.object.updated_at ? (React.createElement(SmartDateDisplayWidget, { date: props.object.updated_at })) : (React.createElement(S.FieldValue, null, "Unknown")),
+                disabled: true,
+                group: 'Object'
+            },
+            ...attributeItems,
+            {
+                key: 'open',
+                title: 'Open record',
+                icon: 'arrow-right',
+                group: 'Actions',
+                action: async () => {
+                    props.open(props.object);
+                }
+            },
+            {
+                key: 'copy',
+                title: 'Copy ID',
+                icon: 'copy',
+                group: 'Actions',
+                action: async () => {
+                    copyTextToClipboard(props.object.id);
+                    notifications.showNotification({
+                        title: 'Copied',
+                        description: 'Relationship ID copied to clipboard',
+                        type: NotificationType.SUCCESS
+                    });
+                }
+            }
+        ];
+        const directive = await ioc.get(ComboBoxStore2).show(new SimpleComboBoxDirective({
+            title: props.object.data.display || props.object.id,
+            subtitle: props.object.definition.definition.label || props.object.definition.definition.name,
+            event: event,
+            items
+        }));
+        directive.getSelectedItem();
+    };
+    return (React.createElement(TableButtonWidget, { icon: "eye", tooltip: "Peek relationship", action: (event) => {
+            showPeek(event);
+        } }));
+};
+var S;
+(function (S) {
+    S.FieldValue = themed.div `
+    max-width: 360px;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+  `;
+})(S || (S = {}));
+//# sourceMappingURL=PeekRelationshipButton.js.map

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

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

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

@@ -3,19 +3,28 @@ import styled from '@emotion/styled';
 import { ColumnDisplayWidget } from './ColumnDisplayWidget';
 import { SmartFilterWidget } from './SmartFilterWidget';
 export const SmartColumnWidget = (props) => {
-    let display = React.createElement(ColumnDisplayWidget, { label: props.variable.label || props.variable.name });
+    const baseLabel = props.variable.label || props.variable.name;
+    const displayLabel = props.sortDirection ? `${baseLabel} ${props.sortDirection === 'asc' ? '↑' : '↓'}` : baseLabel;
+    let display = React.createElement(ColumnDisplayWidget, { label: displayLabel, onClick: props.onToggleSort });
     if (props.type) {
         display = (React.createElement(S.TypeGroup, null,
             display,
             React.createElement(S.Type, { label: props.type.label })));
     }
     return (React.createElement(S.Container, null,
-        display,
-        React.createElement(SmartFilterWidget, { filter: props.filter, variable: props.variable, filterChanged: props.filterChanged })));
+        React.createElement(S.TopRow, null,
+            display,
+            React.createElement(SmartFilterWidget, { filter: props.filter, variable: props.variable, filterChanged: props.filterChanged }))));
 };
 var S;
 (function (S) {
     S.Container = styled.div `
+    display: inline-flex;
+    flex-direction: column;
+    align-items: flex-start;
+    row-gap: 3px;
+  `;
+    S.TopRow = styled.div `
     display: flex;
     flex-direction: row;
     align-items: center;
@@ -25,5 +34,11 @@ var S;
     opacity: 0.5;
   `;
     S.TypeGroup = styled.div ``;
+    S.FilterMetaRow = styled.div `
+    display: flex;
+    align-items: center;
+    column-gap: 2px;
+    justify-content: flex-start;
+  `;
 })(S || (S = {}));
 //# sourceMappingURL=SmartColumnWidget.js.map

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

@@ -1 +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;AAUxD,MAAM,CAAC,MAAM,iBAAiB,GAAqC,CAAC,KAAK,EAAE,EAAE;IAC3E,IAAI,OAAO,GAAG,oBAAC,mBAAmB,IAAC,KAAK,EAAE,KAAK,CAAC,QAAQ,CAAC,KAAK,IAAI,KAAK,CAAC,QAAQ,CAAC,IAAI,GAAI,CAAC;IAC1F,IAAI,KAAK,CAAC,IAAI,EAAE,CAAC;QACf,OAAO,GAAG,CACR,oBAAC,CAAC,CAAC,SAAS;YACT,OAAO;YACR,oBAAC,CAAC,CAAC,IAAI,IAAC,KAAK,EAAE,KAAK,CAAC,IAAI,CAAC,KAAK,GAAI,CACvB,CACf,CAAC;IACJ,CAAC;IACD,OAAO,CACL,oBAAC,CAAC,CAAC,SAAS;QACT,OAAO;QACR,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,CAaV;AAbD,WAAU,CAAC;IACI,WAAS,GAAG,MAAM,CAAC,GAAG,CAAA;;;;;GAKlC,CAAC;IAEW,MAAI,GAAG,MAAM,CAAC,mBAAmB,CAAC,CAAA;;GAE9C,CAAC;IAEW,WAAS,GAAG,MAAM,CAAC,GAAG,CAAA,EAAE,CAAC;AACxC,CAAC,EAbS,CAAC,KAAD,CAAC,QAaV"}
+{"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,EAA6B,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AAcnF,MAAM,CAAC,MAAM,iBAAiB,GAAqC,CAAC,KAAK,EAAE,EAAE;IAC3E,MAAM,SAAS,GAAG,KAAK,CAAC,QAAQ,CAAC,KAAK,IAAI,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC;IAC9D,MAAM,YAAY,GAAG,KAAK,CAAC,aAAa,CAAC,CAAC,CAAC,GAAG,SAAS,IAAI,KAAK,CAAC,aAAa,KAAK,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC;IACnH,IAAI,OAAO,GAAG,oBAAC,mBAAmB,IAAC,KAAK,EAAE,YAAY,EAAE,OAAO,EAAE,KAAK,CAAC,YAAY,GAAI,CAAC;IACxF,IAAI,KAAK,CAAC,IAAI,EAAE,CAAC;QACf,OAAO,GAAG,CACR,oBAAC,CAAC,CAAC,SAAS;YACT,OAAO;YACR,oBAAC,CAAC,CAAC,IAAI,IAAC,KAAK,EAAE,KAAK,CAAC,IAAI,CAAC,KAAK,GAAI,CACvB,CACf,CAAC;IACJ,CAAC;IACD,OAAO,CACL,oBAAC,CAAC,CAAC,SAAS;QACV,oBAAC,CAAC,CAAC,MAAM;YACN,OAAO;YACR,oBAAC,iBAAiB,IAAC,MAAM,EAAE,KAAK,CAAC,MAAM,EAAE,QAAQ,EAAE,KAAK,CAAC,QAAQ,EAAE,aAAa,EAAE,KAAK,CAAC,aAAa,GAAI,CAChG,CACC,CACf,CAAC;AACJ,CAAC,CAAC;AAEF,IAAU,CAAC,CA2BV;AA3BD,WAAU,CAAC;IACI,WAAS,GAAG,MAAM,CAAC,GAAG,CAAA;;;;;GAKlC,CAAC;IAEW,QAAM,GAAG,MAAM,CAAC,GAAG,CAAA;;;;;GAK/B,CAAC;IAEW,MAAI,GAAG,MAAM,CAAC,mBAAmB,CAAC,CAAA;;GAE9C,CAAC;IAEW,WAAS,GAAG,MAAM,CAAC,GAAG,CAAA,EAAE,CAAC;IAEzB,eAAa,GAAG,MAAM,CAAC,GAAG,CAAA;;;;;GAKtC,CAAC;AACJ,CAAC,EA3BS,CAAC,KAAD,CAAC,QA2BV"}

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

@@ -1,56 +1,93 @@
 import * as React from 'react';
-import { SingleChoiceIntegerType, SingleChoiceType, TextType } from '@journeyapps/db';
-import { ComboBoxStore, DialogStore, ioc, PanelButtonWidget } from '@journeyapps-labs/reactor-mod';
-import * as _ from 'lodash';
-import { Condition, SimpleFilter } from '../filters';
-export const SmartFilterWidget = (props) => {
-    if (props.variable.type instanceof SingleChoiceIntegerType || props.variable.type instanceof SingleChoiceType) {
-        return (React.createElement(PanelButtonWidget, { icon: 'filter',
-            highlight: !!props.filter,
-            action: async (position) => {
-                let results = await ioc.get(ComboBoxStore).showMultiSelectComboBox(_.map(props.variable.type.options, (option) => {
-                    var _a, _b;
-                    return {
-                        title: `${option.value}`,
-                        key: `${option.value}`,
-                        checked: !!((_b = (_a = props.filter) === null || _a === void 0 ? void 0 : _a.statements) === null || _b === void 0 ? void 0 : _b.find((s) => s.arg === `${option.value}`))
-                    };
-                }), position);
-                if (results.length > 0) {
-                    props.filterChanged(new SimpleFilter(props.variable, results.map((r) => {
-                        return {
-                            arg: r.key,
-                            condition: Condition.EQUALS
-                        };
-                    })));
-                }
-                else {
-                    props.filterChanged(null);
-                }
-            } }));
+import { DualIconWidget, IconWidget, MetadataWidget, ioc, setupTooltipProps, styled, TooltipPosition } from '@journeyapps-labs/reactor-mod';
+import { TypeEngine } from '../../../forms/TypeEngine';
+import { StatementMatch } from '../filters';
+const getFilterSummary = (filter) => {
+    const metadata = (filter === null || filter === void 0 ? void 0 : filter.getMetadata()) || [];
+    if (metadata.length === 0) {
+        return 'No filter applied';
+    }
+    const match = (filter === null || filter === void 0 ? void 0 : filter.match) === StatementMatch.ALL ? 'AND' : 'OR';
+    const joined = metadata.map((entry) => `${entry.label} ${entry.value}`).join(` ${match} `);
+    return `Filtered by: ${joined}`.trim();
+};
+const getFilterTooltip = (filter) => {
+    if (!filter || !filter.statements || filter.statements.length === 0) {
+        return 'Click to add a filter';
+    }
+    return `${getFilterSummary(filter)}. Click to edit filter`;
+};
+export const SmartFilterMetadataWidget = (props) => {
+    var _a, _b;
+    const metadata = ((_a = props.filter) === null || _a === void 0 ? void 0 : _a.getMetadata()) || [];
+    if (metadata.length === 0) {
+        return null;
     }
-    if (props.variable.type instanceof TextType) {
-        return (React.createElement(PanelButtonWidget, { icon: 'filter',
-            highlight: !!props.filter,
-            action: async () => {
-                var _a, _b;
-                let value = await ioc.get(DialogStore).showInputDialog({
-                    title: `${props.variable.label}`,
-                    initialValue: (_b = (_a = props.filter) === null || _a === void 0 ? void 0 : _a.statements[0]) === null || _b === void 0 ? void 0 : _b.arg
-                });
-                if (value) {
-                    props.filterChanged(new SimpleFilter(props.variable, [
-                        {
-                            arg: value,
-                            condition: Condition.EQUALS
-                        }
-                    ]));
-                }
-                else {
-                    props.filterChanged(null);
-                }
-            } }));
+    const matchLabel = ((_b = props.filter) === null || _b === void 0 ? void 0 : _b.match) === StatementMatch.ALL ? 'AND' : 'OR';
+    return (React.createElement(S.MetaList, { className: props.className }, metadata.map((entry, index) => {
+        var _a;
+        return (React.createElement(React.Fragment, { key: `${entry.label}-${entry.value}-${index}` },
+            index > 0 ? React.createElement(S.MetaJoiner, null, matchLabel) : null,
+            React.createElement(MetadataWidget, Object.assign({}, entry, { active: (_a = entry.active) !== null && _a !== void 0 ? _a : true }))));
+    })));
+};
+export const SmartFilterWidget = (props) => {
+    var _a, _b;
+    const isActive = (((_b = (_a = props.filter) === null || _a === void 0 ? void 0 : _a.statements) === null || _b === void 0 ? void 0 : _b.length) || 0) > 0;
+    const handler = ioc.get(TypeEngine).getHandler(props.variable.type);
+    if (!(handler === null || handler === void 0 ? void 0 : handler.setupFilter)) {
+        return null;
     }
-    return null;
+    return (React.createElement(S.FilterButton, Object.assign({ active: isActive }, setupTooltipProps({
+        tooltip: getFilterTooltip(props.filter),
+        tooltipPos: TooltipPosition.BOTTOM
+    }), { onClick: async (event) => {
+            var _a;
+            const filter = await ((_a = handler.setupFilter) === null || _a === void 0 ? void 0 : _a.call(handler, {
+                variable: props.variable,
+                filter: props.filter,
+                position: event.nativeEvent
+            }));
+            if (filter == null) {
+                return;
+            }
+            props.filterChanged(filter);
+        } }), isActive ? React.createElement(DualIconWidget, { icon1: "filter", icon2: "check" }) : React.createElement(IconWidget, { icon: "filter" })));
 };
+var S;
+(function (S) {
+    S.MetaList = styled.div `
+    display: flex;
+    flex-wrap: wrap;
+    align-items: center;
+    gap: 4px;
+  `;
+    S.MetaJoiner = styled.div `
+    font-size: 10px;
+    font-weight: 700;
+    letter-spacing: 0.04em;
+    color: ${(p) => p.theme.text.secondary};
+    padding: 0 2px;
+  `;
+    S.FilterButton = styled.button `
+    position: relative;
+    width: 24px;
+    height: 24px;
+    min-width: 24px;
+    border-radius: 6px;
+    border: 1px solid ${(p) => (p.active ? p.theme.guide.accent : p.theme.button.border)};
+    background: ${(p) => (p.active ? p.theme.buttonPrimary.background : p.theme.button.background)};
+    color: ${(p) => (p.active ? p.theme.buttonPrimary.color : p.theme.button.color)};
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    cursor: pointer;
+    padding: 0;
+    line-height: 1;
+
+    &:hover {
+      color: ${(p) => (p.active ? p.theme.buttonPrimary.colorHover : p.theme.button.colorHover)};
+    }
+  `;
+})(S || (S = {}));
 //# sourceMappingURL=SmartFilterWidget.js.map

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

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