@adaptabletools/adaptable 18.0.0-canary.11 → 18.0.0-canary.13

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

@@ -2,6 +2,7 @@ import React from 'react';
 import { Draggable, Droppable } from 'react-beautiful-dnd';
 import { Box, Flex } from 'rebass';
 import { isQlLogicalOperator } from '../../../parser/src/predicate';
+import { mapColumnDataTypeToExpressionFunctionType } from '../../../Utilities/adaptableQlUtils';
 import { booleanExpressionFunctions } from '../../../Utilities/ExpressionFunctions/booleanExpressionFunctions';
 import { useAdaptable } from '../../../View/AdaptableContext';
 import DropdownButton from '../../DropdownButton';
@@ -9,7 +10,7 @@ import ErrorBox from '../../ErrorBox';
 import { Icon } from '../../icons';
 import SimpleButton from '../../SimpleButton';
 import { CombinatorSelector, ExpressionSelector, PrimiteValueInput, PrimitiveColumnSelector, PrimitiveMultiValueInput, } from './QueryBuilderInputs';
-import { getOperatorMatchingInputs as getFunctionMatchingInputTypes, mapColumnDataTypeToExpressionFunctionType, } from './utils';
+import { getOperatorMatchingInputs as getFunctionMatchingInputTypes } from './utils';
 const ITEM_HEIGHT = 40;
 const BASE_CLASS_NAME = 'ab-QueryBuilder-predicate-editor';
 const Handle = (props) => (React.createElement(Flex, Object.assign({ className: `${BASE_CLASS_NAME}__handle`, height: ITEM_HEIGHT, alignItems: "center", mr: 1 }, props),

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

@@ -2,7 +2,6 @@ import { QlPredicate, QlPredicateError } from '../../../parser/src/predicate';
 import { ExpressionFunctionInputType } from '../../../parser/src/types';
 import { AdaptableColumnDataType, BooleanFunctionName } from '../../../types';
 export declare const reorder: (predicate: QlPredicate, from: string, to: string) => any;
-export declare const mapColumnDataTypeToExpressionFunctionType: (dataType: AdaptableColumnDataType) => ExpressionFunctionInputType;
 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[];

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

@@ -1,3 +1,4 @@
+import { mapColumnDataTypeToExpressionFunctionType } from '../../../Utilities/adaptableQlUtils';
 import { isQlLogicalOperator } from '../../../parser/src/predicate';
 import { booleanExpressionFunctions } from '../../../Utilities/ExpressionFunctions/booleanExpressionFunctions';
 import { deepClone } from '../../../Utilities/Extensions/ObjectExtensions';
@@ -26,20 +27,6 @@ export const reorder = (predicate, from, to) => {
     parent.args.splice(parseInt(toPath[toPath.length - 1]), 0, itemToMove);
     return predicateCopy;
 };
-export const mapColumnDataTypeToExpressionFunctionType = (dataType) => {
-    if (dataType === 'Number') {
-        return 'number';
-    }
-    if (dataType === 'Boolean') {
-        return 'boolean';
-    }
-    if (dataType === 'String') {
-        return 'text';
-    }
-    if (dataType === 'Date') {
-        return 'date';
-    }
-};
 export const mapExpressionFunctionTypeToColumnDataType = (type) => {
     if (type === 'number') {
         return 'Number';

package/src/components/icons/note.js

@@ -1,4 +1,4 @@
 import * as React from 'react';
 import DefaultIcon from './DefaultIcon';
-export default (props) => (React.createElement(DefaultIcon, Object.assign({}, props, { viewBox: "0 -960 960 960" }),
-    React.createElement("path", { d: "M440-240h80v-120h120v-80H520v-120h-80v120H320v80h120v120ZM240-80q-33 0-56.5-23.5T160-160v-640q0-33 23.5-56.5T240-880h320l240 240v480q0 33-23.5 56.5T720-80H240Zm280-520v-200H240v640h480v-440H520ZM240-800v200-200 640-640Z" })));
+export default (props) => (React.createElement(DefaultIcon, Object.assign({}, props),
+    React.createElement("path", { d: "M20 2H4c-1.1 0-1.99.9-1.99 2L2 22l4-4h14c1.1 0 2-.9 2-2V4c0-1.1-.9-2-2-2zM8 14H6v-2h2v2zm0-3H6V9h2v2zm0-3H6V6h2v2zm7 6h-5v-2h5v2zm3-3h-8V9h8v2zm0-3h-8V6h8v2z" })));

package/src/env.js

@@ -1,5 +1,5 @@
 export default {
     INFINITE_TABLE_LICENSE_KEY: "StartDate=2021-06-29|EndDate=2030-01-01|Owner=Adaptable|Type=distribution|TS=1624971462479|C=137829811,1004007071,2756196225,1839832928,3994409405,636616862" || '',
-    PUBLISH_TIMESTAMP: 1710949344156 || Date.now(),
-    VERSION: "18.0.0-canary.11" || '--current-version--',
+    PUBLISH_TIMESTAMP: 1711118620968 || Date.now(),
+    VERSION: "18.0.0-canary.13" || '--current-version--',
 };

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

@@ -382,11 +382,19 @@ export declare const ADAPTABLE_METAMODEL: {
             kind: string;
             desc: string;
             isOpt: boolean;
+            ref?: undefined;
         } | {
             name: string;
             kind: string;
             desc: string;
             isOpt?: undefined;
+            ref?: undefined;
+        } | {
+            name: string;
+            kind: string;
+            desc: string;
+            isOpt: boolean;
+            ref: string;
         })[];
     };
     AdaptableComparerFunction: {
@@ -1919,6 +1927,11 @@ export declare const ADAPTABLE_METAMODEL: {
             desc: string;
         }[];
     };
+    ColumnTypesContext: {
+        name: string;
+        kind: string;
+        desc: string;
+    };
     ColumnValuesComparer: {
         name: string;
         kind: string;
@@ -1939,8 +1952,25 @@ export declare const ADAPTABLE_METAMODEL: {
         name: string;
         kind: string;
         desc: string;
+        props: {
+            name: string;
+            kind: string;
+            desc: string;
+            ref: string;
+        }[];
+    };
+    CommentOptions: {
+        name: string;
+        kind: string;
+        desc: string;
+        props: {
+            name: string;
+            kind: string;
+            desc: string;
+            isOpt: boolean;
+        }[];
     };
-    CommentsOptions: {
+    CommentState: {
         name: string;
         kind: string;
         desc: string;
@@ -1951,6 +1981,24 @@ export declare const ADAPTABLE_METAMODEL: {
             isOpt: boolean;
         }[];
     };
+    CommentThread: {
+        name: string;
+        kind: string;
+        desc: string;
+        props: ({
+            name: string;
+            kind: string;
+            desc: string;
+            isOpt?: undefined;
+            ref?: undefined;
+        } | {
+            name: string;
+            kind: string;
+            desc: string;
+            isOpt: boolean;
+            ref: string;
+        })[];
+    };
     CompatibleContext: {
         name: string;
         kind: string;
@@ -2872,10 +2920,18 @@ export declare const ADAPTABLE_METAMODEL: {
             kind: string;
             desc: string;
             isOpt: boolean;
+            ref?: undefined;
+        } | {
+            name: string;
+            kind: string;
+            desc: string;
+            isOpt?: undefined;
+            ref?: undefined;
         } | {
             name: string;
             kind: string;
             desc: string;
+            ref: string;
             isOpt?: undefined;
         })[];
     };
@@ -3893,21 +3949,12 @@ export declare const ADAPTABLE_METAMODEL: {
         name: string;
         kind: string;
         desc: string;
-        props: ({
-            name: string;
-            kind: string;
-            desc: string;
-            isOpt: boolean;
-            gridInfo?: undefined;
-            defVal?: undefined;
-        } | {
+        props: {
             name: string;
             kind: string;
             desc: string;
             isOpt: boolean;
-            gridInfo: string;
-            defVal: string;
-        })[];
+        }[];
     };
     MenuOrderContext: {
         name: string;
@@ -3979,8 +4026,14 @@ export declare const ADAPTABLE_METAMODEL: {
         name: string;
         kind: string;
         desc: string;
+        props: {
+            name: string;
+            kind: string;
+            desc: string;
+            ref: string;
+        }[];
     };
-    NotesOptions: {
+    NoteOptions: {
         name: string;
         kind: string;
         desc: string;
@@ -3991,7 +4044,7 @@ export declare const ADAPTABLE_METAMODEL: {
             isOpt: boolean;
         }[];
     };
-    NotesState: {
+    NoteState: {
         name: string;
         kind: string;
         desc: string;
@@ -4714,6 +4767,16 @@ export declare const ADAPTABLE_METAMODEL: {
             ref?: undefined;
         })[];
     };
+    RowSummary: {
+        name: string;
+        kind: string;
+        desc: string;
+    };
+    RowSummaryPosition: {
+        name: string;
+        kind: string;
+        desc: string;
+    };
     Schedule: {
         name: string;
         kind: string;