@adaptabletools/adaptable-cjs 18.0.17 → 18.1.0-canary.1

package/src/components/ExpressionEditor/QueryBuilder/QueryBuilder.js

@@ -59,7 +59,8 @@ const QueryBuilder = (props) => {
     }, []);
     const context = React.useMemo(() => {
         return {
-            getFields: props.getColumns,
+            getColumns: props.getColumns,
+            getFields: props.getFields,
             getExpressions: (columnType) => {
                 return booleanExpressions
                     ? (0, utils_1.getFunctionsForColumnType)(columnType, Object.keys(booleanExpressions))
@@ -71,10 +72,12 @@ const QueryBuilder = (props) => {
     const clearExpressionButton = (React.createElement(SimpleButton_1.default, { onClick: () => {
             clearExpression();
         } }, "Clear Expression"));
-    const unsupportedExpressionFunction = (0, utils_1.getUnsuportedExpressionFromQlPredicate)(qlPredicate);
+    const unsupportedExpressionFunction = (0, utils_1.getUnsuportedExpressionFromQlPredicate)(qlPredicate, {
+        supportedFields: props.getFields(),
+    });
     let errorOrEditor = null;
     if (qlPredicate && 'errorMessage' in qlPredicate) {
-        errorOrEditor = ((_b = (_a = props.query) === null || _a === void 0 ? void 0 : _a.includes) === null || _b === void 0 ? void 0 : _b.call(_a, 'QUERY')) ? (React.createElement(WarningBox_1.WarningBox, null,
+        errorOrEditor = ((_b = (_a = props.query) === null || _a === void 0 ? void 0 : _a.includes) === null || _b === void 0 ? void 0 : _b.call(_a, 'QUERY')) ? (React.createElement(WarningBox_1.WarningBox, { "data-name": "unsupported-query-warning" },
             React.createElement(rebass_1.Flex, { alignItems: "center" },
                 "Named Queries are not supported in the Query Builder",
                 React.createElement(rebass_1.Box, { flex: 1 }),
@@ -85,7 +88,7 @@ const QueryBuilder = (props) => {
                 clearExpressionButton)));
     }
     else if (unsupportedExpressionFunction) {
-        errorOrEditor = React.createElement(WarningBox_1.WarningBox, null, unsupportedExpressionFunction);
+        errorOrEditor = (React.createElement(WarningBox_1.WarningBox, { "data-name": "unsupported-expression-warning" }, unsupportedExpressionFunction));
     }
     else if (qlPredicate && !('errorMessage' in qlPredicate)) {
         errorOrEditor = (React.createElement(QueryPredicateBuilder_1.QueryPredicateBuilder, { isRoot: true, index: 0, id: "0", predicate: qlPredicate, onNewPredicate: (type) => {

package/src/components/ExpressionEditor/QueryBuilder/QueryBuilderInputs.d.ts

@@ -2,10 +2,11 @@
 import { QlLogicalOperator } from '../../../parser/src/predicate';
 import { ExpressionFunctionInputType } from '../../../parser/src/types';
 import { AdaptableColumn, AdaptableColumnDataType, BooleanFunctionName } from '../../../types';
-export declare const PrimitiveColumnSelector: (props: {
-    columnId: string;
+export declare const PrimitiveColumnOrFieldSelector: (props: {
+    fieldOrColumn: string;
     type?: AdaptableColumnDataType;
     onChange: (colId: string) => void;
+    hideFields?: boolean;
 }) => JSX.Element;
 export declare const PrimiteValueInput: (props: {
     inputType: ExpressionFunctionInputType;

package/src/components/ExpressionEditor/QueryBuilder/QueryBuilderInputs.js

@@ -1,12 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.CombinatorSelector = exports.ExpressionSelector = exports.PrimitiveMultiValueInput = exports.PrimiteValueInput = exports.PrimitiveColumnSelector = void 0;
+exports.CombinatorSelector = exports.ExpressionSelector = exports.PrimitiveMultiValueInput = exports.PrimiteValueInput = exports.PrimitiveColumnOrFieldSelector = void 0;
 const tslib_1 = require("tslib");
 const react_1 = tslib_1.__importDefault(require("react"));
 const rebass_1 = require("rebass");
 const mapQlPredicateToExpression_1 = require("../../../parser/src/predicate/mapQlPredicateToExpression");
+const AdaptableContext_1 = require("../../../View/AdaptableContext");
 const AdaptableInput_1 = tslib_1.__importDefault(require("../../../View/Components/AdaptableInput"));
 const ColumnSelector_1 = require("../../../View/Components/Selectors/ColumnSelector");
+const FieldSelector_1 = require("../../../View/Components/Selectors/FieldSelector");
 const PermittedValuesSelector_1 = require("../../../View/Components/Selectors/PermittedValuesSelector");
 const CheckBox_1 = require("../../CheckBox");
 const DropdownButton_1 = tslib_1.__importDefault(require("../../DropdownButton"));
@@ -15,20 +17,61 @@ const InputGroup_1 = require("../../InputGroup");
 const Select_1 = require("../../Select");
 const QueryBuilder_1 = require("./QueryBuilder");
 const utils_1 = require("./utils");
-const PrimitiveColumnSelector = (props) => {
-    return (react_1.default.createElement(rebass_1.Box, null,
-        react_1.default.createElement(ColumnSelector_1.ColumnSelector, { value: props.columnId, type: props.type, onChange: (columnId) => {
+const PrimitiveColumnOrFieldSelector = (props) => {
+    const adaptable = (0, AdaptableContext_1.useAdaptable)();
+    const [type, setType] = react_1.default.useState(() => {
+        return (
+            // default to column
+            (!props.fieldOrColumn || props.fieldOrColumn.includes('[') ? 'column' : 'field')
+        );
+    });
+    const hasFields = react_1.default.useMemo(() => {
+        var _a;
+        return ((_a = adaptable.api.expressionApi.internalApi.getAvailableFields()) === null || _a === void 0 ? void 0 : _a.length) > 0;
+    }, []);
+    const hasFieldsOrValueIsField = hasFields || (0, utils_1.isFieldValue)(props.fieldOrColumn);
+    let input = null;
+    if (type === 'column') {
+        const columnId = (0, utils_1.mapColumnExpressionToColumnId)(props.fieldOrColumn);
+        input = (react_1.default.createElement(ColumnSelector_1.ColumnSelector, { value: columnId, type: props.type, onChange: (columnId) => {
                 props.onChange(`[${columnId}]`);
-            } })));
+            } }));
+    }
+    else {
+        input = (react_1.default.createElement(FieldSelector_1.FieldSelector, { value: (0, utils_1.mapExpressionToFieldValue)(props.fieldOrColumn), type: props.type, onChange: (fieldValue) => {
+                props.onChange((0, utils_1.mapFieldValueToExpression)(fieldValue));
+            } }));
+    }
+    const typeOptions = [
+        { label: 'Column', value: 'column', icon: 'grid' },
+        { label: 'Field', value: 'field', icon: 'column-outline' },
+    ];
+    return !hasFieldsOrValueIsField || props.hideFields ? (react_1.default.createElement(rebass_1.Box, null, input)) : (react_1.default.createElement(InputGroup_1.InputGroup, { Component: rebass_1.Flex, "data-id": "query-first-arg-wrapper" },
+        react_1.default.createElement(Select_1.Select, { renderSingleValue: (value) => {
+                return react_1.default.createElement(react_1.default.Fragment, null, type === 'column' ? react_1.default.createElement(icons_1.Icon, { name: "grid" }) : react_1.default.createElement(icons_1.Icon, { name: "column-outline" }));
+            }, value: type, options: typeOptions, onChange: (value) => {
+                props.onChange(null);
+                setType(value);
+            } }),
+        input));
 };
-exports.PrimitiveColumnSelector = PrimitiveColumnSelector;
+exports.PrimitiveColumnOrFieldSelector = PrimitiveColumnOrFieldSelector;
 const PrimiteValueInput = (props) => {
-    var _a, _b;
-    const [type, setType] = react_1.default.useState(() => {
+    const adaptable = (0, AdaptableContext_1.useAdaptable)();
+    const hasFields = react_1.default.useMemo(() => {
         var _a;
-        return typeof (props === null || props === void 0 ? void 0 : props.value) === 'string' && ((_a = props === null || props === void 0 ? void 0 : props.value) === null || _a === void 0 ? void 0 : _a.includes('['))
-            ? 'column-name'
-            : 'input-value';
+        return ((_a = adaptable.api.expressionApi.internalApi.getAvailableFields()) === null || _a === void 0 ? void 0 : _a.length) > 0;
+    }, []);
+    const hasFieldsOrValueIsField = hasFields || (0, utils_1.isFieldValue)(props.value);
+    const [type, setType] = react_1.default.useState(() => {
+        var _a, _b;
+        if (typeof (props === null || props === void 0 ? void 0 : props.value) === 'string' && ((_a = props === null || props === void 0 ? void 0 : props.value) === null || _a === void 0 ? void 0 : _a.includes('['))) {
+            return 'column-name';
+        }
+        if (typeof (props === null || props === void 0 ? void 0 : props.value) === 'string' && ((_b = props === null || props === void 0 ? void 0 : props.value) === null || _b === void 0 ? void 0 : _b.includes('FIELD'))) {
+            return 'field';
+        }
+        return 'input-value';
     });
     const handleTypeChange = (newType) => {
         if (type !== newType) {
@@ -72,12 +115,18 @@ const PrimiteValueInput = (props) => {
     };
     let editor = null;
     if (type === 'column-name') {
-        const columnId = props.value ? (_b = (_a = props === null || props === void 0 ? void 0 : props.value) === null || _a === void 0 ? void 0 : _a.replace) === null || _b === void 0 ? void 0 : _b.call(_a, '[', '').replace(']', '') : undefined;
         const abColType = (0, utils_1.mapExpressionFunctionTypeToColumnDataType)(props.inputType);
-        editor = (react_1.default.createElement(exports.PrimitiveColumnSelector, { columnId: columnId, onChange: (col) => props.onChange(col), type: abColType }));
+        editor = (react_1.default.createElement(exports.PrimitiveColumnOrFieldSelector, { hideFields: true, fieldOrColumn: props.value, type: abColType, onChange: (columnId) => {
+                props.onChange(columnId);
+            } }));
+    }
+    else if (type === 'field') {
+        editor = (react_1.default.createElement(FieldSelector_1.FieldSelector, { value: (0, utils_1.mapExpressionToFieldValue)(props.value), onChange: (fieldValue) => {
+                props.onChange((0, utils_1.mapFieldValueToExpression)(fieldValue));
+            } }));
     }
     else if (!['date', 'boolean'].includes(props.inputType)) {
-        editor = (react_1.default.createElement(PermittedValuesSelector_1.PermittedValuesSelector, { allowNewValues: true, value: props.value, columnId: props.lefthandColumnIdParam, onChange: (value) => {
+        editor = (react_1.default.createElement(PermittedValuesSelector_1.PermittedValuesSelector, { allowNewValues: true, value: props.value, columnId: (0, utils_1.mapColumnExpressionToColumnId)(props.lefthandColumnIdParam), onChange: (value) => {
                 props.onChange(value);
             } }));
     }
@@ -100,6 +149,15 @@ const PrimiteValueInput = (props) => {
             value: 'input-value',
         },
     ];
+    if (hasFieldsOrValueIsField || type === 'field') {
+        options.push({
+            label: (react_1.default.createElement(rebass_1.Flex, null,
+                react_1.default.createElement(icons_1.Icon, { name: "column-outline" }),
+                react_1.default.createElement(rebass_1.Text, { ml: 2 }, "Field"))),
+            icon: 'column-outline',
+            value: 'field',
+        });
+    }
     const typeOption = options.find((option) => option.value === type);
     return (react_1.default.createElement(InputGroup_1.InputGroup, { Component: rebass_1.Flex, "data-id": "query-input-wrapper", mr: 2 },
         react_1.default.createElement(Select_1.Select, { renderSingleValue: (value) => {

package/src/components/ExpressionEditor/QueryBuilder/QueryPredicateBuilder.js

@@ -22,8 +22,8 @@ const Handle = (props) => (react_1.default.createElement(rebass_1.Flex, Object.a
 const QueryPredicateButtons = (props) => {
     return (react_1.default.createElement(react_1.default.Fragment, null,
         !props.hideAdd && (react_1.default.createElement(DropdownButton_1.default, { listMinWidth: 150, columns: ['label'], items: [
-                { label: 'Add Column Condition', onClick: () => props.onNewPredicate('filter') },
-                { label: 'Add AND / OR Group', onClick: () => props.onNewPredicate('group') },
+                { label: 'Condition', onClick: () => props.onNewPredicate('filter') },
+                { label: 'AND / OR Group', onClick: () => props.onNewPredicate('group') },
             ], variant: "text" },
             react_1.default.createElement(icons_1.Icon, { name: "plus" }))),
         !props.hideDelete && (react_1.default.createElement(SimpleButton_1.default, { icon: "delete", variant: "text", onClick: () => {
@@ -100,22 +100,31 @@ const PrimitiveFunctionEditor = (props) => {
     var _a;
     // [handle] [column] [operator-dropdown] [...args] [delete-button] [plus-button]
     const adaptable = (0, AdaptableContext_1.useAdaptable)();
-    const [columnExpression, ...restOfArgs] = props.predicate.args;
-    const col = columnExpression;
-    let columnId = null;
-    let columnDataType = null;
+    const [columnOrFieldExpression, ...restOfArgs] = props.predicate.args;
+    const columnOrField = columnOrFieldExpression;
+    let columnOrFieldId = null;
+    let columnOrFieldDataType = null;
     let columnInputDataType = null;
     let functionInputInputDataTypes = null;
     // Thsese are the type of inputs ommiting the column
     // [[column-data-type], number, number]
     let restOfFunctionInputDataTypes = [];
-    if (col) {
-        if (typeof col !== 'string' || !col.includes('[')) {
-            return react_1.default.createElement(ErrorBox_1.default, null, "Expression must start with a column!");
+    if (columnOrField) {
+        if (!(0, predicate_1.isArgumentColumnOrField)(columnOrField)) {
+            return react_1.default.createElement(ErrorBox_1.default, null, "Expression must start with a column or a filed!");
         }
-        columnId = col.replace(/[\[\]]/g, '');
-        columnDataType = adaptable.api.columnApi.getColumnDataTypeForColumnId(columnId);
-        columnInputDataType = (0, adaptableQlUtils_1.mapColumnDataTypeToExpressionFunctionType)(columnDataType);
+        if (columnOrField.includes('FIELD')) {
+            // we let the full expression so we can difirienciate between column and field
+            columnOrFieldId = columnOrField;
+            const fieldValue = (0, utils_1.mapExpressionToFieldValue)(columnOrField);
+            columnOrFieldDataType = adaptable.api.expressionApi.internalApi.getFieldType(fieldValue);
+        }
+        else if (columnOrField.includes('[')) {
+            columnOrFieldId = columnOrField;
+            const columnId = columnOrField.replace(/[\[\]]/g, '');
+            columnOrFieldDataType = adaptable.api.columnApi.getColumnDataTypeForColumnId(columnId);
+        }
+        columnInputDataType = (0, adaptableQlUtils_1.mapColumnDataTypeToExpressionFunctionType)(columnOrFieldDataType);
         functionInputInputDataTypes = (_a = booleanExpressionFunctions_1.booleanExpressionFunctions[props.predicate.operator]) === null || _a === void 0 ? void 0 : _a.inputs;
         restOfFunctionInputDataTypes = functionInputInputDataTypes
             ? (0, utils_1.getOperatorMatchingInputs)(columnInputDataType, functionInputInputDataTypes)
@@ -132,12 +141,12 @@ const PrimitiveFunctionEditor = (props) => {
             react_1.default.createElement(Handle, Object.assign({}, provided.dragHandleProps)),
             react_1.default.createElement(rebass_1.Flex, { alignItems: "center", height: ITEM_HEIGHT },
                 react_1.default.createElement(rebass_1.Box, { mr: 2 },
-                    react_1.default.createElement(QueryBuilderInputs_1.PrimitiveColumnSelector, { onChange: (colId) => {
-                            props.onChange(Object.assign(Object.assign({}, props.predicate), { args: [colId], operator: null }));
-                        }, columnId: columnId })),
-                columnId && columnDataType && (react_1.default.createElement(QueryBuilderInputs_1.ExpressionSelector, { dataType: columnDataType, onExpressionChange: (operator) => {
+                    react_1.default.createElement(QueryBuilderInputs_1.PrimitiveColumnOrFieldSelector, { onChange: (colOrField) => {
+                            props.onChange(Object.assign(Object.assign({}, props.predicate), { args: [colOrField], operator: null }));
+                        }, fieldOrColumn: columnOrFieldId })),
+                columnOrFieldId && columnOrFieldDataType && (react_1.default.createElement(QueryBuilderInputs_1.ExpressionSelector, { dataType: columnOrFieldDataType, onExpressionChange: (operator) => {
                         let args = [props.predicate.args[0]];
-                        if (columnDataType === 'Boolean' && operator !== 'NOT') {
+                        if (columnOrFieldDataType === 'Boolean' && operator !== 'NOT') {
                             args = [props.predicate.args[0], 'TRUE'];
                         }
                         props.onChange(Object.assign(Object.assign({}, props.predicate), { operator,
@@ -146,10 +155,9 @@ const PrimitiveFunctionEditor = (props) => {
                     }, value: props.predicate.operator })),
                 react_1.default.createElement(rebass_1.Flex, { flex: 1, ml: 2 }, restOfFunctionInputDataTypes.map((type, index) => {
                     var _a;
-                    let value = restOfArgs[index];
                     const commonProps = {
                         key: type + index,
-                        lefthandColumnIdParam: columnId,
+                        lefthandColumnIdParam: columnOrFieldId,
                         inputType: type,
                     };
                     if (type.includes('[]')) {

package/src/components/ExpressionEditor/QueryBuilder/utils.d.ts

@@ -5,4 +5,12 @@ export declare const reorder: (predicate: QlPredicate, from: string, to: string)
 export declare const mapExpressionFunctionTypeToColumnDataType: (type: ExpressionFunctionInputType) => AdaptableColumnDataType;
 export declare const getOperatorMatchingInputs: (columnType: ExpressionFunctionInputType, inputs: ExpressionFunctionInputType[] | Array<ExpressionFunctionInputType>[]) => ExpressionFunctionInputType[];
 export declare const getFunctionsForColumnType: (dataType: AdaptableColumnDataType, availableBooleanFunctions: BooleanFunctionName[]) => BooleanFunctionName[];
-export declare const getUnsuportedExpressionFromQlPredicate: (predicate: QlPredicate | QlPredicateError) => string;
+export declare const getUnsuportedExpressionFromQlPredicate: (predicate: QlPredicate | QlPredicateError, context: {
+    supportedFields: {
+        value: string;
+    }[];
+}) => string;
+export declare const mapFieldValueToExpression: (field: string) => string;
+export declare const mapExpressionToFieldValue: (expression: string) => string;
+export declare const mapColumnExpressionToColumnId: (expression: string) => string;
+export declare const isFieldValue: (expression: string) => boolean;

package/src/components/ExpressionEditor/QueryBuilder/utils.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getUnsuportedExpressionFromQlPredicate = exports.getFunctionsForColumnType = exports.getOperatorMatchingInputs = exports.mapExpressionFunctionTypeToColumnDataType = exports.reorder = void 0;
+exports.isFieldValue = exports.mapColumnExpressionToColumnId = exports.mapExpressionToFieldValue = exports.mapFieldValueToExpression = exports.getUnsuportedExpressionFromQlPredicate = exports.getFunctionsForColumnType = exports.getOperatorMatchingInputs = exports.mapExpressionFunctionTypeToColumnDataType = exports.reorder = void 0;
 const adaptableQlUtils_1 = require("../../../Utilities/adaptableQlUtils");
 const predicate_1 = require("../../../parser/src/predicate");
 const booleanExpressionFunctions_1 = require("../../../Utilities/ExpressionFunctions/booleanExpressionFunctions");
@@ -50,7 +50,7 @@ exports.mapExpressionFunctionTypeToColumnDataType = mapExpressionFunctionTypeToC
 const getOperatorMatchingInputs = (columnType, inputs) => {
     if (Array.isArray(inputs[0])) {
         const matchingInput = inputs.find((input) => input[0] === columnType);
-        const [_, ...restOfArgs] = matchingInput;
+        const [_, ...restOfArgs] = matchingInput !== null && matchingInput !== void 0 ? matchingInput : [];
         return restOfArgs;
     }
     const [_, ...restOfArgs] = inputs;
@@ -76,10 +76,20 @@ const getFunctionsForColumnType = (dataType, availableBooleanFunctions) => {
     });
 };
 exports.getFunctionsForColumnType = getFunctionsForColumnType;
-const getUnsuportedExpressionFromQlPredicate = (predicate) => {
+const getUnsuportedExpressionFromQlPredicate = (predicate, context) => {
+    var _a;
     if (!predicate) {
         return null;
     }
+    if (typeof predicate === 'string' && (0, exports.isFieldValue)(predicate)) {
+        const field = (0, exports.mapExpressionToFieldValue)(predicate);
+        if (!((_a = context.supportedFields) === null || _a === void 0 ? void 0 : _a.some((field) => (field === null || field === void 0 ? void 0 : field.value) === (0, exports.mapExpressionToFieldValue)(predicate)))) {
+            return `Expression uses an unregistered field: "${field}"`;
+        }
+        else {
+            return null;
+        }
+    }
     if (typeof predicate === 'object' && 'errorMessage' in predicate) {
         return null;
     }
@@ -95,7 +105,7 @@ const getUnsuportedExpressionFromQlPredicate = (predicate) => {
     }
     let firstInvalidArg = null;
     for (let arg of predicate.args) {
-        firstInvalidArg = (0, exports.getUnsuportedExpressionFromQlPredicate)(arg);
+        firstInvalidArg = (0, exports.getUnsuportedExpressionFromQlPredicate)(arg, context);
         if (firstInvalidArg) {
             break;
         }
@@ -106,3 +116,35 @@ const getUnsuportedExpressionFromQlPredicate = (predicate) => {
     return null;
 };
 exports.getUnsuportedExpressionFromQlPredicate = getUnsuportedExpressionFromQlPredicate;
+const mapFieldValueToExpression = (field) => `FIELD('${field}')`;
+exports.mapFieldValueToExpression = mapFieldValueToExpression;
+const mapExpressionToFieldValue = (expression) => {
+    var _a;
+    if (!expression) {
+        return '';
+    }
+    try {
+        return (_a = expression.match(/FIELD\(['"](.+)['"]\)/)) === null || _a === void 0 ? void 0 : _a[1];
+    }
+    catch (e) {
+        return '';
+    }
+};
+exports.mapExpressionToFieldValue = mapExpressionToFieldValue;
+const mapColumnExpressionToColumnId = (expression) => {
+    var _a;
+    if (!expression) {
+        return null;
+    }
+    try {
+        return (_a = expression.match(/\[(.+)\]/)) === null || _a === void 0 ? void 0 : _a[1];
+    }
+    catch (e) {
+        return expression;
+    }
+};
+exports.mapColumnExpressionToColumnId = mapColumnExpressionToColumnId;
+const isFieldValue = (expression) => {
+    return typeof expression === 'string' && expression.includes('FIELD');
+};
+exports.isFieldValue = isFieldValue;

package/src/components/ExpressionEditor/index.d.ts

@@ -1,5 +1,5 @@
 import * as React from 'react';
-import { AdaptableApi, AdaptableColumn, AdaptableModule, NamedQuery } from '../../types';
+import { AdaptableApi, AdaptableColumn, AdaptableField, AdaptableModule, NamedQuery } from '../../types';
 export type ExpressionEditorType = 'boolean' | 'scalar' | 'observable' | 'aggregatedBoolean' | 'aggregatedScalar' | 'cumulativeAggregatedScalar' | 'quantileAggregatedScalar';
 interface ExpressionEditorProps {
     value: string;
@@ -10,6 +10,7 @@ interface ExpressionEditorProps {
         [key: string]: any;
     };
     columns: AdaptableColumn[];
+    fields?: AdaptableField[];
     namedQueries: NamedQuery[];
     allowSaveNamedQuery?: boolean;
     style?: React.CSSProperties;
@@ -18,5 +19,6 @@ interface ExpressionEditorProps {
     showQueryBuilder?: boolean;
     showExpressionEditor?: boolean;
 }
+export declare const baseClassName = "ab-ExpressionEditor";
 export declare function ExpressionEditor(props: ExpressionEditorProps): JSX.Element;
 export {};

package/src/components/ExpressionEditor/index.js

@@ -1,40 +1,33 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ExpressionEditor = void 0;
+exports.ExpressionEditor = exports.baseClassName = void 0;
 const tslib_1 = require("tslib");
 const React = tslib_1.__importStar(require("react"));
 const react_1 = require("react");
 const rebass_1 = require("rebass");
-const CheckBox_1 = require("../CheckBox");
-const FormLayout_1 = tslib_1.__importStar(require("../FormLayout"));
-const HelpBlock_1 = tslib_1.__importDefault(require("../HelpBlock"));
-const Input_1 = tslib_1.__importDefault(require("../Input"));
-const EditorButton_1 = tslib_1.__importDefault(require("./EditorButton"));
-const AdaptableInput_1 = tslib_1.__importDefault(require("../../View/Components/AdaptableInput"));
-const Radio_1 = tslib_1.__importDefault(require("../Radio"));
-const ArrayExtensions_1 = tslib_1.__importDefault(require("../../Utilities/Extensions/ArrayExtensions"));
-const EditorInputWithWhereClause_1 = tslib_1.__importDefault(require("./EditorInputWithWhereClause"));
-const EditorInput_1 = tslib_1.__importDefault(require("./EditorInput"));
-const EditorContext_1 = require("./EditorContext");
-const ExpressionFunctionDocumentation_1 = require("./ExpressionFunctionDocumentation");
 const DocumentationLinkConstants_1 = require("../../Utilities/Constants/DocumentationLinkConstants");
+const ModuleConstants_1 = require("../../Utilities/Constants/ModuleConstants");
+const ArrayExtensions_1 = tslib_1.__importDefault(require("../../Utilities/Extensions/ArrayExtensions"));
 const StringExtensions_1 = tslib_1.__importDefault(require("../../Utilities/Extensions/StringExtensions"));
+const AdaptableInput_1 = tslib_1.__importDefault(require("../../View/Components/AdaptableInput"));
 const ButtonInfo_1 = require("../../View/Components/Buttons/ButtonInfo");
+const CheckBox_1 = require("../CheckBox");
 const CodeBlock_1 = require("../CodeBlock");
-const NamedQueryContext_1 = require("./NamedQueryContext");
-const ModuleConstants_1 = require("../../Utilities/Constants/ModuleConstants");
-const DateHelper_1 = require("../../Utilities/Helpers/DateHelper");
-const AdaptableFormControlTextClear_1 = require("../../View/Components/Forms/AdaptableFormControlTextClear");
+const HelpBlock_1 = tslib_1.__importDefault(require("../HelpBlock"));
+const Panel_1 = tslib_1.__importDefault(require("../Panel"));
 const Tabs_1 = require("../Tabs");
+const DataTableEditor_1 = require("./DataTableEditor");
+const EditorContext_1 = require("./EditorContext");
+const EditorInput_1 = tslib_1.__importDefault(require("./EditorInput"));
+const EditorInputWithWhereClause_1 = tslib_1.__importDefault(require("./EditorInputWithWhereClause"));
+const ExpressionFunctionDocumentation_1 = require("./ExpressionFunctionDocumentation");
+const NamedQueryContext_1 = require("./NamedQueryContext");
+const NamedQueryEditor_1 = require("./NamedQueryEditor");
 const QueryBuilder_1 = require("./QueryBuilder");
+exports.baseClassName = `ab-ExpressionEditor`;
 function ExpressionEditor(props) {
     var _a, _b, _c;
     const { type, module } = props;
-    const [data, setData] = (0, react_1.useState)(props.initialData);
-    const [showColumnIds, setShowColumnIds] = (0, react_1.useState)(false);
-    const [inlineQuery, setInlineQuery] = (0, react_1.useState)(false);
-    const [showNamedQueries, setShowNamedQueries] = (0, react_1.useState)(false);
-    const baseClassName = `ab-ExpressionEditor`;
     const [selectedFunction, setSelectedFunction] = (0, react_1.useState)(null);
     const [expressionText, setExpressionText] = (0, react_1.useState)(props.value);
     const { namedQuery, setNamedQuery } = (0, NamedQueryContext_1.useNamedQueryContext)();
@@ -43,80 +36,20 @@ function ExpressionEditor(props) {
     const editorInput = type === 'observable' || type === 'aggregatedBoolean' ? (React.createElement(EditorInputWithWhereClause_1.default, { type: type, module: module, value: props.value, onChange: (value) => {
             setExpressionText(value);
             props.onChange(value);
-        }, testData: data, api: props.api })) : (
+        }, testData: props.initialData, api: props.api })) : (
     // 'boolean','scalar','aggregatedScalar'/'cumulativeAggregatedScalar'/'quantileAggregatedScalar'
     (React.createElement(
         EditorInput_1.default,
         { type: type, module: module, value: props.value, onChange: (value) => {
                 setExpressionText(value);
                 props.onChange(value);
-            }, testData: data, isFullExpression: props.isFullExpression, api: props.api }
+            }, testData: props.initialData, isFullExpression: props.isFullExpression, api: props.api }
     )));
+    const adaptableFields = props.api.expressionApi.internalApi.getAvailableFields();
     // currently only boolean and scalar expressions support nested calculated columns (calc cols which reference other calc cols)
     const queryableColumns = type === 'scalar' || type === 'boolean' || type === 'aggregatedScalar'
         ? props.columns
         : props.columns.filter((c) => !props.api.columnApi.isCalculatedColumn(c.columnId));
-    const getColValue = (column) => {
-        var _a;
-        return props.api.internalApi.getValueUsingField(data, (_a = column.field) !== null && _a !== void 0 ? _a : column.columnId);
-    };
-    const updateColValue = (rowData, column, newValue) => {
-        var _a;
-        const updatedRowData = props.api.internalApi.setValueUsingField(rowData, (_a = column.field) !== null && _a !== void 0 ? _a : column.columnId, newValue);
-        return Object.assign({}, updatedRowData);
-    };
-    const getColDateValue = (column) => {
-        const colValue = getColValue(column);
-        return colValue && (0, DateHelper_1.isValueValidDate)(colValue)
-            ? new Date(colValue).toISOString().substr(0, 10)
-            : '';
-    };
-    const [searchInputValue, setSearchInputValue] = React.useState('');
-    const dataTableEditor = (React.createElement(React.Fragment, null,
-        React.createElement(rebass_1.Flex, { className: `${baseClassName}__columns-list`, 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'),
-            React.createElement(AdaptableFormControlTextClear_1.AdaptableFormControlTextClear, { value: searchInputValue, OnTextChange: setSearchInputValue, placeholder: "Filter columns...", style: { flex: 1, marginBottom: 3 } })),
-        React.createElement(FormLayout_1.default, { className: "ab-ExpressionEditor__columns", gridColumnGap: "var(--ab-space-1)", gridRowGap: "var(--ab-space-1)", sizes: ['auto', '100px'], style: { alignItems: 'stretch' } }, queryableColumns
-            .filter((column) => {
-            if (!searchInputValue) {
-                return true;
-            }
-            return (column.columnId.includes(searchInputValue) ||
-                column.friendlyName.includes(searchInputValue));
-        })
-            .map((column) => (React.createElement(FormLayout_1.FormRow, { key: column.columnId, label: React.createElement(EditorButton_1.default, { width: "100%", height: "100%", style: {
-                    background: 'var(--ab-color-primary)',
-                    cursor: 'grab',
-                    marginRight: 'var(--ab-space-1)',
-                }, data: `[${column.columnId}]`, "data-name": "column", icon: "drag" },
-                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(rebass_1.Flex, { flexDirection: "column", alignItems: "start", style: { marginTop: 2 } },
-        React.createElement(CheckBox_1.CheckBox, { checked: showColumnIds, onChange: (checked) => setShowColumnIds(checked) }, "Show Column IDs"),
-        React.createElement(CheckBox_1.CheckBox, { checked: inlineQuery, onChange: (checked) => setInlineQuery(checked) }, "Inline Query"),
-        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: inlineQuery ? namedQuery.BooleanExpression : `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.expressionApi.getAdaptableQueryExpressionWithColumnFriendlyNames(namedQuery)))))));
     const showDocumentationLinks = props.api.internalApi.isDocumentationLinksDisplayed();
     // @Bogdan i did this to be sure but i think we can get rid of this as the button does the same (and better IMO)
     const showNamedQueryStuff = false;
@@ -144,7 +77,7 @@ function ExpressionEditor(props) {
                     BooleanExpression: expressionText,
                 });
             } })) : null));
-    const editorElement = (React.createElement(rebass_1.Flex, { className: baseClassName, flex: 1, "data-name": "expression-editor-wrapper", pl: 2, style: props.style },
+    const editorElement = (React.createElement(rebass_1.Flex, { className: exports.baseClassName, flex: 1, "data-name": "expression-editor-wrapper", pl: 2, style: props.style },
         React.createElement(rebass_1.Flex, { flex: 1, style: { minHeight: 0 }, flexDirection: "column", onFocus: (event) => {
                 if (event.target.tagName === 'TEXTAREA') {
                     textAreaRef.current = event.target;
@@ -158,19 +91,59 @@ function ExpressionEditor(props) {
                     StringExtensions_1.default.IsNullOrEmpty(expressionText === null || expressionText === void 0 ? void 0 : expressionText.trim()) && renderQueryHints(type),
                     showDocumentationLinks && (React.createElement(HelpBlock_1.default, { "data-name": "query-documentation", mt: 2, mb: 2, fontSize: 3 },
                         React.createElement(ButtonInfo_1.ButtonInfo, { mr: 2, onClick: () => window.open(queryDocumentationLink, '_blank') }),
-                        "See ",
-                        StringExtensions_1.default.CapitaliseFirstLetter(type),
-                        " Query documentation for more details and examples")),
+                        "See documentation for more details and examples")),
                     React.createElement(rebass_1.Box, { flex: 1 }),
                     showNamedQueryStuff && saveAsNamedQueryElement),
-                React.createElement(rebass_1.Box, { className: `${baseClassName}__column-picker`, "data-name": "expression-column-picker", pb: 2, paddingLeft: 2, pr: 2 },
-                    ArrayExtensions_1.default.IsNotNullOrEmpty(props.namedQueries) && (React.createElement(rebass_1.Flex, { flexDirection: "row", alignItems: "start", p: 1, mt: 2, backgroundColor: "primarylight" },
-                        React.createElement(Radio_1.default, { checked: !showNamedQueries, onChange: (checked) => setShowNamedQueries(!checked), style: { marginRight: 10 } }, "Columns"),
-                        React.createElement(Radio_1.default, { checked: showNamedQueries, onChange: (checked) => setShowNamedQueries(checked), style: { marginLeft: 10, whiteSpace: 'nowrap' } }, "Named Queries"))),
-                    showNamedQueries ? React.createElement("div", null, namedQueries) : React.createElement("div", null, dataTableEditor))))));
+                React.createElement(rebass_1.Box, { className: `${exports.baseClassName}__sidebar`, "data-name": "expression-sidebar", pb: 2, paddingLeft: 2, pr: 2 },
+                    React.createElement(Panel_1.default, { bodyProps: { style: { height: '100%' } }, style: { height: '100%' } },
+                        React.createElement(Tabs_1.Tabs, { style: { height: '100%' }, variant: "" },
+                            React.createElement(Tabs_1.Tabs.Tab, { value: "column" }, "Columns"),
+                            React.createElement(Tabs_1.Tabs.Tab, { value: "field" }, "Fields"),
+                            React.createElement(Tabs_1.Tabs.Tab, { value: "named-query" }, "Named Queries"),
+                            React.createElement(Tabs_1.Tabs.Content, { flex: 1, style: { height: '100%' } },
+                                React.createElement(DataTableEditor_1.DataTableEditor, { type: "column", dataFormatter: (value) => `[${value}]`, fields: queryableColumns.map((column) => ({
+                                        label: column.friendlyName,
+                                        value: column.columnId,
+                                        dataType: column.dataType,
+                                        readOnly: column.readOnly,
+                                    })), data: props.initialData })),
+                            React.createElement(Tabs_1.Tabs.Content, null, adaptableFields && adaptableFields.length > 0 ? (React.createElement(DataTableEditor_1.DataTableEditor, { type: "field", labels: {
+                                    showIds: 'Show Field path',
+                                    filterPlaceholder: 'Filter fields...',
+                                }, dataFormatter: (value) => `FIELD("${value}")`, data: props.initialData, fields: adaptableFields === null || adaptableFields === void 0 ? void 0 : adaptableFields.map((field) => ({
+                                    label: field.label,
+                                    value: field.name,
+                                    dataType: field.dataType,
+                                    readOnly: true,
+                                })) })) : (React.createElement(rebass_1.Text, { p: 2 }, "No Data Fields provided"))),
+                            React.createElement(Tabs_1.Tabs.Content, null, ArrayExtensions_1.default.IsNullOrEmpty(props.namedQueries) ? (React.createElement("div", null,
+                                React.createElement(rebass_1.Text, { p: 2 }, "No Named Queries defined"),
+                                React.createElement(rebass_1.Text, { fontSize: 2, padding: 2, p: 2 },
+                                    "Named Queries are saved Expressions which can be referenced in other Expressions using the ",
+                                    React.createElement("i", null, "QUERY"),
+                                    " keyword",
+                                    ' '))) : (React.createElement(NamedQueryEditor_1.NamedQueryEditor, { namedQueries: props.namedQueries }))))))))));
     const queryBuilderElement = (React.createElement(QueryBuilder_1.QueryBuilder, { module: module, query: expressionText, onChange: (query) => {
             setExpressionText(query);
             props.onChange(query);
+        }, getFields: (type) => {
+            return props.fields
+                .filter((field) => {
+                if (!type) {
+                    return (field.dataType === 'String' ||
+                        field.dataType === 'Number' ||
+                        field.dataType === 'Boolean' ||
+                        field.dataType === 'Date');
+                }
+                else {
+                    return field.dataType === type;
+                }
+            })
+                .map((field) => ({
+                value: field.name,
+                label: field.label,
+                type: field.dataType,
+            }));
         }, getColumns: (type) => {
             return props.columns
                 .filter((column) => {
@@ -202,7 +175,7 @@ function ExpressionEditor(props) {
         } }, (() => {
         switch (true) {
             case showQueryBuilder && showExpressionEditor:
-                return (React.createElement(Tabs_1.Tabs, { mb: 2, p: 2, minHeight: 0, flex: 1 },
+                return (React.createElement(Tabs_1.Tabs, { "data-name": "editor-selector-tabs", mb: 2, p: 2, minHeight: 0, flex: 1 },
                     React.createElement(Tabs_1.Tabs.Tab, { value: "editor" }, "Expression Editor"),
                     React.createElement(Tabs_1.Tabs.Tab, { value: "ui" }, "Query Builder"),
                     React.createElement(Tabs_1.Tabs.Content, null, editorElement),