@adaptabletools/adaptable 12.1.8-canary.1 → 12.2.0-canary.0

package/src/components/DropdownButton/index.js

@@ -83,7 +83,7 @@ const DropdownButton = React.forwardRef((props, ref) => {
     const positionerRef = react_1.useRef(null);
     const { expanded, toggle, setExpanded, positionInfo } = useExpanded_1.default(props, positionerRef);
     const { maxHeight: maxListHeight, maxWidth: maxListWidth } = positionInfo;
-    listStyle = Object.assign({ minWidth: typeof maxListWidth === 'number' ? Math.min(listMinWidth, maxListWidth) : listMinWidth, maxHeight: maxListHeight, maxWidth: maxListWidth, overflow: 'auto', border: 'var(--ab-cmp-dropdownbutton-list__border)', borderRadius: 'var(--ab-cmp-dropdownbutton-list__border-radius)', zIndex: 'var(--ab-cmp-dropdownbutton-list__z-index)', background: 'var(--ab-cmp-dropdownbutton-list__background)' }, listStyle);
+    listStyle = Object.assign({ minWidth: typeof maxListWidth === 'number' ? Math.min(listMinWidth, maxListWidth) : listMinWidth, maxHeight: maxListHeight, maxWidth: maxListWidth }, listStyle);
     let icon = expanded
         ? react_1.cloneElement(exports.DROPDOWN_ICON, {
             style: Object.assign(Object.assign({}, exports.DROPDOWN_ICON.props.style), { transform: 'rotate(180deg) translate3d(0px, -2px, 0px)' }),
@@ -117,7 +117,7 @@ const DropdownButton = React.forwardRef((props, ref) => {
                 else {
                     ref.current = btn;
                 }
-            }, style: Object.assign(Object.assign({ overflow: 'visible' }, domProps.style), { outline: 'none' }), className: className, onClick: (e) => {
+            }, style: domProps.style, className: className, onClick: (e) => {
                 if (domProps.onClick) {
                     domProps.onClick(e);
                 }

package/src/components/EmptyContent/index.js

@@ -10,7 +10,7 @@ const EmptyContent = (_a) => {
     if (typeof children === 'string') {
         children = React.createElement("p", null, children);
     }
-    return (React.createElement(rebass_1.Box, { style: { position: 'relative' }, width: "100%", flex: 1, height: "100%" },
-        React.createElement(rebass_1.Flex, Object.assign({ alignItems: "center", justifyContent: "center", flexDirection: "column", padding: 4, fontSize: 'var(--ab-font-size-3)' }, flexProps, { className: join_1.default(baseClassName, className), style: Object.assign({ position: 'absolute', top: 0, left: 0, right: 0, bottom: 0 }, style) }), children)));
+    return (React.createElement(rebass_1.Box, { flex: 1, className: `${baseClassName}__wrapper` },
+        React.createElement(rebass_1.Flex, Object.assign({ alignItems: "center", justifyContent: "center", flexDirection: "column" }, flexProps, { className: join_1.default(baseClassName, className), style: style }), children)));
 };
 exports.default = EmptyContent;

package/src/components/ExpressionEditor/BaseEditorInput.js

@@ -56,6 +56,7 @@ function BaseEditorInput(props) {
                 node: testRowNode,
                 adaptableApi: props.api,
                 functions: expressionFunctions,
+                evaluateCustomQueryVariable: props.api.internalApi.getQueryLanguageService().evaluateCustomQueryVariable,
             });
         }
         catch (err) {

package/src/components/ExpressionEditor/index.js

@@ -126,20 +126,30 @@ function ExpressionEditor(props) {
                 React.createElement(rebass_1.Flex, { flexDirection: "column", alignItems: "start" }, showColumnIds ? `[${column.columnId}]` : column.friendlyName)) }, column.dataType === 'Number' ? (React.createElement(Input_1.default, { type: "number", "data-name": "column-input", "data-value": column.columnId, value: getColValue(column), onChange: (e) => setData(updateColValue(data, column, Number(e.target.value))), width: "100%", disabled: column.readOnly })) : column.dataType === 'String' ? (React.createElement(Input_1.default, { type: "text", "data-name": "column-input", "data-value": column.columnId, value: getColValue(column), onChange: (e) => setData(updateColValue(data, column, e.target.value)), width: "100%", disabled: column.readOnly })) : column.dataType === 'Date' ? (React.createElement(AdaptableInput_1.default, { type: "date", "data-name": "column-input", "data-value": column.columnId, value: getColDateValue(column), onChange: (e) => {
                 setData(updateColValue(data, column, new Date(e.target.value)));
             }, style: { width: '100%' }, disabled: column.readOnly })) : column.dataType === 'Boolean' ? (React.createElement(CheckBox_1.CheckBox, { "data-name": "column-input", "data-value": column.columnId, checked: getColValue(column), onChange: (checked) => setData(updateColValue(data, column, checked)), disabled: column.readOnly })) : null))))));
-    const namedQueries = (React.createElement("div", null, props.namedQueries.map((namedQuery) => (React.createElement(rebass_1.Flex, { key: namedQuery.Uuid, flexDirection: "column", alignItems: "start", style: {
-            padding: 3,
-            marginTop: 'var(--ab-space-2)',
-            marginBottom: 'var(--ab-space-2)',
-        }, backgroundColor: "primarylight" },
-        ' ',
-        React.createElement(EditorButton_1.default, { width: "100%", height: "100%", style: {
-                background: 'var(--ab-color-primary)',
-                cursor: 'grab',
-            }, data: `QUERY("${namedQuery.Name}")`, "data-name": "column", icon: "drag" },
-            React.createElement(rebass_1.Flex, { flexDirection: "column", alignItems: "start" }, namedQuery.Name)),
-        React.createElement(rebass_1.Flex, { alignItems: "start", style: {
-                padding: 5,
-            } }, namedQuery.BooleanExpression))))));
+    const namedQueries = (React.createElement(rebass_1.Flex, { flexDirection: "column", alignItems: "start", style: { marginTop: 2 } },
+        React.createElement(CheckBox_1.CheckBox, { checked: showColumnIds, onChange: (checked) => setShowColumnIds(checked), style: {
+                float: 'right',
+                margin: 0,
+                paddingTop: 'var(--ab-space-1)',
+                paddingBottom: 'var(--ab-space-1)',
+            } }, 'Show Column IDs'),
+        props.namedQueries.map((namedQuery) => (React.createElement(rebass_1.Flex, { key: namedQuery.Uuid, flexDirection: "column", alignItems: "start", style: {
+                padding: 3,
+                marginTop: 'var(--ab-space-2)',
+                marginBottom: 'var(--ab-space-2)',
+                width: '100%',
+            }, backgroundColor: "primarylight" },
+            ' ',
+            React.createElement(EditorButton_1.default, { width: "100%", height: "100%", style: {
+                    background: 'var(--ab-color-primary)',
+                    cursor: 'grab',
+                }, data: `QUERY("${namedQuery.Name}")`, "data-name": "column", icon: "drag" },
+                React.createElement(rebass_1.Flex, { flexDirection: "column", alignItems: "start" }, namedQuery.Name)),
+            React.createElement(rebass_1.Flex, { alignItems: "start", style: {
+                    padding: 5,
+                } }, showColumnIds
+                ? namedQuery.BooleanExpression
+                : props.api.queryLanguageApi.getAdaptableQueryExpressionWithColumnFriendlyNames(namedQuery)))))));
     const showDocumentationLinks = props.api.internalApi.isDocumentationLinksDisplayed();
     const queryDocumentationLink = queryDocumentationLinks[type];
     return (React.createElement(EditorContext_1.ExpressionEditorContext.Provider, { value: {

package/src/metamodel/adaptable.metamodel.d.ts

@@ -689,6 +689,15 @@ export declare const ADAPTABLE_METAMODEL: {
             gridInfo?: undefined;
             defaultValue?: undefined;
             reference?: undefined;
+        } | {
+            name: string;
+            kind: string;
+            description: string;
+            uiLabel: string;
+            isOptional: boolean;
+            defaultValue: string;
+            gridInfo?: undefined;
+            reference?: undefined;
         } | {
             name: string;
             kind: string;
@@ -2617,22 +2626,22 @@ export declare const ADAPTABLE_METAMODEL: {
             kind: string;
             description: string;
             uiLabel: string;
-            isOptional: boolean;
+            isOptional?: undefined;
             reference?: undefined;
         } | {
             name: string;
             kind: string;
             description: string;
             uiLabel: string;
-            reference: string;
-            isOptional?: undefined;
+            isOptional: boolean;
+            reference?: undefined;
         } | {
             name: string;
             kind: string;
             description: string;
             uiLabel: string;
+            reference: string;
             isOptional?: undefined;
-            reference?: undefined;
         } | {
             name: string;
             kind: string;
@@ -2677,6 +2686,15 @@ export declare const ADAPTABLE_METAMODEL: {
         kind: string;
         description: string;
         properties: ({
+            name: string;
+            kind: string;
+            description: string;
+            uiLabel: string;
+            isOptional: boolean;
+            gridInfo?: undefined;
+            defaultValue?: undefined;
+            reference?: undefined;
+        } | {
             name: string;
             kind: string;
             description: string;
@@ -3591,6 +3609,15 @@ export declare const ADAPTABLE_METAMODEL: {
             gridInfo: string;
             defaultValue: string;
             reference?: undefined;
+        } | {
+            name: string;
+            kind: string;
+            description: string;
+            uiLabel: string;
+            isOptional: boolean;
+            gridInfo?: undefined;
+            defaultValue?: undefined;
+            reference?: undefined;
         } | {
             name: string;
             kind: string;