@adaptabletools/adaptable 16.0.5-canary.0 → 16.0.5

package/src/Utilities/ExpressionFunctions/observableExpressionFunctions.js

@@ -428,7 +428,7 @@ const getSlidingTimeframe$ = (source$, timeframeDuration, onTimeframeEnter, onTi
     }));
 };
 const getMaxTimeframeSize = (expressionValue, context) => {
-    let maxTimeframeSize = context.adaptableApi.optionsApi.getAdaptableQLOptions().expressionOptions.maxTimeframeSize;
+    let maxTimeframeSize = context.adaptableApi.optionsApi.getExpressionOptions().maxTimeframeSize;
     if (maxTimeframeSize > SYSTEM_MAX_TIMEFRAME_SIZE) {
         maxTimeframeSize = SYSTEM_MAX_TIMEFRAME_SIZE;
     }

package/src/Utilities/Helpers/AdaptableHelper.js

@@ -11,14 +11,13 @@ function assignAdaptableOptions(adaptableOptions) {
     const returnedAdaptableOptions = Object.assign({}, DefaultAdaptableOptions_1.DefaultAdaptableOptions, adaptableOptions);
     returnedAdaptableOptions.adaptableStateKey =
         (_a = returnedAdaptableOptions.adaptableStateKey) !== null && _a !== void 0 ? _a : returnedAdaptableOptions.adaptableId;
-    returnedAdaptableOptions.adaptableQLOptions = Object.assign({}, DefaultAdaptableOptions_1.DefaultAdaptableOptions.adaptableQLOptions, adaptableOptions.adaptableQLOptions);
+    returnedAdaptableOptions.expressionOptions = Object.assign({}, DefaultAdaptableOptions_1.DefaultAdaptableOptions.expressionOptions, adaptableOptions.expressionOptions);
     returnedAdaptableOptions.calendarOptions = Object.assign({}, DefaultAdaptableOptions_1.DefaultAdaptableOptions.calendarOptions, adaptableOptions.calendarOptions);
     returnedAdaptableOptions.columnOptions = Object.assign({}, DefaultAdaptableOptions_1.DefaultAdaptableOptions.columnOptions, adaptableOptions.columnOptions);
     returnedAdaptableOptions.customSortOptions = Object.assign({}, DefaultAdaptableOptions_1.DefaultAdaptableOptions.customSortOptions, adaptableOptions.customSortOptions);
     returnedAdaptableOptions.dataSetOptions = Object.assign({}, DefaultAdaptableOptions_1.DefaultAdaptableOptions.dataSetOptions, adaptableOptions.dataSetOptions);
     returnedAdaptableOptions.cellSummaryOptions = Object.assign({}, DefaultAdaptableOptions_1.DefaultAdaptableOptions.cellSummaryOptions, adaptableOptions.cellSummaryOptions);
-    returnedAdaptableOptions.adaptableQLOptions.expressionOptions = Object.assign({}, DefaultAdaptableOptions_1.DefaultAdaptableOptions.adaptableQLOptions.expressionOptions, returnedAdaptableOptions.adaptableQLOptions.expressionOptions);
-    returnedAdaptableOptions.adaptableQLOptions.predicateOptions = Object.assign({}, DefaultAdaptableOptions_1.DefaultAdaptableOptions.adaptableQLOptions.predicateOptions, returnedAdaptableOptions.adaptableQLOptions.predicateOptions);
+    returnedAdaptableOptions.predicateOptions = Object.assign({}, DefaultAdaptableOptions_1.DefaultAdaptableOptions.predicateOptions, returnedAdaptableOptions.predicateOptions);
     returnedAdaptableOptions.layoutOptions = Object.assign({}, DefaultAdaptableOptions_1.DefaultAdaptableOptions.layoutOptions, adaptableOptions.layoutOptions);
     returnedAdaptableOptions.notificationsOptions = Object.assign({}, DefaultAdaptableOptions_1.DefaultAdaptableOptions.notificationsOptions, adaptableOptions.notificationsOptions);
     returnedAdaptableOptions.alertOptions = Object.assign({}, DefaultAdaptableOptions_1.DefaultAdaptableOptions.alertOptions, adaptableOptions.alertOptions);

package/src/Utilities/Services/QueryLanguageService.js

@@ -93,7 +93,7 @@ class QueryLanguageService {
             }
             const force = (_a = config === null || config === void 0 ? void 0 : config.force) !== null && _a !== void 0 ? _a : false;
             // see if validation should be performed
-            if (!this.adaptableApi.optionsApi.getAdaptableQLOptions().expressionOptions
+            if (!this.adaptableApi.optionsApi.getExpressionOptions()
                 .performExpressionValidation &&
                 !force) {
                 const result = { isValid: true, errorMessage: '' };
@@ -283,7 +283,7 @@ class QueryLanguageService {
     // if there are no specific functions defined, it falls back to the default values
     getModuleExpressionFunctionsMap(module) {
         var _a, _b, _c;
-        const expressionOptions = this.adaptableApi.optionsApi.getAdaptableQLOptions().expressionOptions;
+        const expressionOptions = this.adaptableApi.optionsApi.getExpressionOptions();
         if (module) {
             let cachedResult = this.cacheModuleSpecificExpressionFunctions.get(module);
             if (cachedResult) {
@@ -369,14 +369,14 @@ class QueryLanguageService {
         return generalExpressionFunctions;
     }
     evaluateCustomQueryVariable(functionName, args) {
-        var _a, _b, _c;
+        var _a, _b;
         const context = {
             adaptableApi: this.adaptableApi,
             userName: this.adaptableApi.optionsApi.getUserName(),
             adaptableId: this.adaptableApi.optionsApi.getAdaptableId(),
             args,
         };
-        const customQueryVariableDefinition = (_c = (_b = (_a = this.adaptableApi.optionsApi.getAdaptableQLOptions()) === null || _a === void 0 ? void 0 : _a.expressionOptions) === null || _b === void 0 ? void 0 : _b.customQueryVariables) === null || _c === void 0 ? void 0 : _c[functionName];
+        const customQueryVariableDefinition = (_b = (_a = this.adaptableApi.optionsApi.getExpressionOptions()) === null || _a === void 0 ? void 0 : _a.customQueryVariables) === null || _b === void 0 ? void 0 : _b[functionName];
         return typeof customQueryVariableDefinition === 'function'
             ? customQueryVariableDefinition(context)
             : customQueryVariableDefinition;

package/src/agGrid/Adaptable.js

@@ -1284,7 +1284,7 @@ class Adaptable {
             return false;
         }
         const displayValue = (_a = this.api.gridApi.getDisplayValueFromRowNode(params.node, abColumn.columnId)) !== null && _a !== void 0 ? _a : '';
-        const ignoreCase = !this.api.internalApi.isTextComparisonCaseSensitive();
+        const ignoreCase = !this.adaptableOptions.quickSearchOptions.runQuickSearchWithCaseSensitivity;
         const v = ignoreCase ? String(displayValue).toLocaleLowerCase() : String(displayValue);
         const i = ignoreCase ? String(quickSearchValue).toLocaleLowerCase() : String(quickSearchValue);
         return v.indexOf(i) !== -1;
@@ -1926,7 +1926,7 @@ class Adaptable {
             }
             return value;
         });
-        if (column.dataType == 'String' && this.api.internalApi.isTextComparisonCaseSensitive()) {
+        if (column.dataType == 'String' && this.api.predicateApi.useCaseSensitivity()) {
             uniqueVals = (0, uniqBy_1.default)(uniqueVals, (d) => d.displayValue.toLowerCase());
         }
         return uniqueVals.slice(0, this.adaptableOptions.filterOptions.maxFilterValuesToDisplay);

package/src/components/ExpressionEditor/BaseEditorInput.js

@@ -46,13 +46,13 @@ const getCategoryOrder = (category) => {
     return predefinedOrder[category] || 0;
 };
 const VarEditorButton = () => {
-    var _a, _b;
+    var _a;
     const adaptable = (0, AdaptableContext_1.useAdaptable)();
-    const expressionOptions = (_b = (_a = adaptable.api.optionsApi.getAdaptableQLOptions()) === null || _a === void 0 ? void 0 : _a.expressionOptions) === null || _b === void 0 ? void 0 : _b.customQueryVariables;
-    if (!expressionOptions || Object.keys(expressionOptions).length === 0) {
+    const customQueryVariables = (_a = adaptable.api.optionsApi.getExpressionOptions()) === null || _a === void 0 ? void 0 : _a.customQueryVariables;
+    if (!customQueryVariables || Object.keys(customQueryVariables).length === 0) {
         return React.createElement(React.Fragment, null);
     }
-    return (React.createElement(React.Fragment, null, Object.keys(expressionOptions).map((varOption) => {
+    return (React.createElement(React.Fragment, null, Object.keys(customQueryVariables).map((varOption) => {
         const varString = `VAR('${varOption}')`;
         return (React.createElement(EditorButton_1.default, { data: varString, key: varOption }, varString));
     })));

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

@@ -601,15 +601,6 @@ export declare const ADAPTABLE_METAMODEL: {
             noCode: string;
             defVal: string;
             ref?: undefined;
-        } | {
-            name: string;
-            kind: string;
-            desc: string;
-            isOpt: boolean;
-            noCode: string;
-            gridInfo?: undefined;
-            defVal?: undefined;
-            ref?: undefined;
         } | {
             name: string;
             kind: string;
@@ -673,6 +664,15 @@ export declare const ADAPTABLE_METAMODEL: {
             ref: string;
             noCode?: undefined;
             defVal?: undefined;
+        } | {
+            name: string;
+            kind: string;
+            desc: string;
+            isOpt: boolean;
+            noCode: string;
+            gridInfo?: undefined;
+            defVal?: undefined;
+            ref?: undefined;
         } | {
             name: string;
             kind: string;
@@ -753,39 +753,6 @@ export declare const ADAPTABLE_METAMODEL: {
         kind: string;
         desc: string;
     };
-    AdaptableQLOptions: {
-        name: string;
-        kind: string;
-        desc: string;
-        props: ({
-            name: string;
-            kind: string;
-            desc: string;
-            isOpt: boolean;
-            gridInfo: string;
-            noCode: string;
-            defVal: string;
-            ref?: undefined;
-        } | {
-            name: string;
-            kind: string;
-            desc: string;
-            isOpt: boolean;
-            defVal: string;
-            gridInfo?: undefined;
-            noCode?: undefined;
-            ref?: undefined;
-        } | {
-            name: string;
-            kind: string;
-            desc: string;
-            isOpt: boolean;
-            ref: string;
-            gridInfo?: undefined;
-            noCode?: undefined;
-            defVal?: undefined;
-        })[];
-    };
     AdaptableQuery: {
         name: string;
         kind: string;
@@ -2613,6 +2580,14 @@ export declare const ADAPTABLE_METAMODEL: {
         kind: string;
         desc: string;
         props: ({
+            name: string;
+            kind: string;
+            desc: string;
+            isOpt: boolean;
+            gridInfo: string;
+            noCode: string;
+            defVal: string;
+        } | {
             name: string;
             kind: string;
             desc: string;
@@ -2626,8 +2601,8 @@ export declare const ADAPTABLE_METAMODEL: {
             desc: string;
             isOpt: boolean;
             gridInfo?: undefined;
-            defVal?: undefined;
             noCode?: undefined;
+            defVal?: undefined;
         } | {
             name: string;
             kind: string;
@@ -2636,6 +2611,14 @@ export declare const ADAPTABLE_METAMODEL: {
             noCode: string;
             defVal: string;
             gridInfo?: undefined;
+        } | {
+            name: string;
+            kind: string;
+            desc: string;
+            isOpt: boolean;
+            defVal: string;
+            gridInfo?: undefined;
+            noCode?: undefined;
         })[];
     };
     ExternalReport: {
@@ -3914,12 +3897,23 @@ export declare const ADAPTABLE_METAMODEL: {
         name: string;
         kind: string;
         desc: string;
-        props: {
+        props: ({
             name: string;
             kind: string;
             desc: string;
             isOpt: boolean;
-        }[];
+            gridInfo: string;
+            noCode: string;
+            defVal: string;
+        } | {
+            name: string;
+            kind: string;
+            desc: string;
+            isOpt: boolean;
+            gridInfo?: undefined;
+            noCode?: undefined;
+            defVal?: undefined;
+        })[];
     };
     PreProcessExportContext: {
         name: string;