@adaptabletools/adaptable 18.0.0-canary.12 → 18.0.0-canary.14

package/src/Utilities/ExpressionFunctions/aggregatedScalarExpressionFunctions.js

@@ -113,6 +113,7 @@ export const aggregatedScalarExpressionFunctions = {
         ],
         examples: ['SUM([colA])', 'SUM([colA], GROUP_BY([colB]))'],
         category: 'aggregation',
+        inputs: ['number'],
     },
     PERCENTAGE: {
         handler(args, context) {
@@ -256,6 +257,7 @@ export const aggregatedScalarExpressionFunctions = {
         ],
         examples: ['AVG([colA])', 'AVG([colA], GROUP_BY([colB]))', 'AVG([colA], WEIGHT([colB]))'],
         category: 'aggregation',
+        inputs: ['number'],
     },
     MEDIAN: {
         handler(args, context) {
@@ -320,12 +322,13 @@ export const aggregatedScalarExpressionFunctions = {
         ],
         examples: ['MEDIAN([colA])', 'MEDIAN([colA], GROUP_BY([colB]))'],
         category: 'aggregation',
+        inputs: ['number'],
     },
     MODE: {
         handler(args, context) {
             const modeColumnParameter = extractColumnParameter('mode', args);
             const modeColumnName = modeColumnParameter.value;
-            validateColumnType(modeColumnName, ['Number'], 'mode', context.adaptableApi);
+            validateColumnType(modeColumnName, ['Number', 'String'], 'mode', context.adaptableApi);
             const groupByParameter = extractParameter('MODE', 'operand', ['GROUP_BY'], args, {
                 isOptional: true,
             });
@@ -339,7 +342,10 @@ export const aggregatedScalarExpressionFunctions = {
                             reducer: (aggregatedValue, rowValue, rowNode) => {
                                 var _a;
                                 if (typeof rowValue !== 'number' && typeof rowValue !== 'string') {
-                                    return;
+                                    return aggregatedValue;
+                                }
+                                if (!aggregatedValue) {
+                                    return new Map();
                                 }
                                 aggregatedValue.set(rowValue, ((_a = aggregatedValue.get(rowValue)) !== null && _a !== void 0 ? _a : 0) + 1);
                                 return aggregatedValue;
@@ -381,6 +387,7 @@ export const aggregatedScalarExpressionFunctions = {
         ],
         examples: ['MODE([colA])', 'MODE([colA], GROUP_BY([colB]))'],
         category: 'aggregation',
+        inputs: [['number'], ['text']],
     },
     DISTINCT: {
         handler(args, context) {
@@ -428,6 +435,7 @@ export const aggregatedScalarExpressionFunctions = {
         ],
         examples: ['DISTINCT([colA])', 'DISTINCT([colA], GROUP_BY([colB]))'],
         category: 'aggregation',
+        inputs: [['number'], ['text']],
     },
     ONLY: {
         handler(args, context) {
@@ -477,6 +485,7 @@ export const aggregatedScalarExpressionFunctions = {
         ],
         examples: ['ONLY([colA])', 'ONLY([colA], GROUP_BY([colB]))'],
         category: 'aggregation',
+        inputs: [['number'], ['text']],
     },
     STD_DEVIATION: {
         handler(args, context) {
@@ -534,6 +543,7 @@ export const aggregatedScalarExpressionFunctions = {
         ],
         examples: ['ONLY([colA])', 'ONLY([colA], GROUP_BY([colB]))'],
         category: 'aggregation',
+        inputs: ['number'],
     },
     MIN: {
         handler(args, context) {
@@ -585,6 +595,7 @@ export const aggregatedScalarExpressionFunctions = {
         ],
         examples: ['MIN([colA])', 'MIN([colA], GROUP_BY([colB]))'],
         category: 'aggregation',
+        inputs: ['number'],
     },
     MAX: {
         handler(args, context) {
@@ -636,6 +647,7 @@ export const aggregatedScalarExpressionFunctions = {
         ],
         examples: ['MIN([colA])', 'MIN([colA], GROUP_BY([colB]))'],
         category: 'aggregation',
+        inputs: ['number'],
     },
     QUANT: {
         handler(args, context) {
@@ -834,6 +846,7 @@ export const aggregatedScalarExpressionFunctions = {
         ],
         examples: ['COUNT([colA])', 'COUNT([colA], GROUP_BY([colB]))'],
         category: 'aggregation',
+        inputs: [['number'], ['text']],
     },
     OVER: {
         handler(args, context) {

package/src/Utilities/ExpressionFunctions/observableExpressionFunctions.js

@@ -275,10 +275,10 @@ const isLastElementMinValue = (values) => {
 };
 // useful for functions which do NOT have an initial change (ex. GRID_CHANGE NONE)
 const getDataChangedInfoStub = (context) => {
-    var _a;
+    var _a, _b;
     let rowNodeStub;
     if (!context.filterFn) {
-        rowNodeStub = context.adaptableApi.gridApi.getFirstRowNode();
+        rowNodeStub = (_a = context.node) !== null && _a !== void 0 ? _a : context.adaptableApi.gridApi.getFirstRowNode();
     }
     else {
         // if there is a WHERE clause defined, find the first rowNode which satisfies the condition
@@ -293,7 +293,7 @@ const getDataChangedInfoStub = (context) => {
     const rowNode = rowNodeStub;
     if (rowNode) {
         const primaryKeyValue = context.adaptableApi.gridApi.getPrimaryKeyValueForRowNode(rowNode);
-        const columnId = (_a = context.adaptableApi.columnApi.getQueryableColumns()[0]) === null || _a === void 0 ? void 0 : _a.columnId;
+        const columnId = (_b = context.adaptableApi.columnApi.getQueryableColumns()[0]) === null || _b === void 0 ? void 0 : _b.columnId;
         const oldValue = context.adaptableApi.gridApi.getCellRawValue(primaryKeyValue, columnId);
         const column = context.adaptableApi.columnApi.getColumnWithColumnId(columnId);
         const newValue = oldValue;

package/src/Utilities/ExpressionFunctions/scalarExpressionFunctions.d.ts

@@ -2,6 +2,6 @@ import { ExpressionFunction } from '../../parser/src/types';
 /**
  * List of all the Scalar Functions available in AdaptableQL
  */
-export type ScalarFunctionName = 'ADD' | 'SUB' | 'MUL' | 'DIV' | 'MOD' | 'POW' | 'ABS' | 'CEILING' | 'FLOOR' | 'ROUND' | 'MIN' | 'MAX' | 'AVG' | 'DATE' | 'NOW' | 'CURRENT_DAY' | 'DAY' | 'WEEK' | 'MONTH' | 'YEAR' | 'ADD_DAYS' | 'ADD_WEEKS' | 'ADD_MONTHS' | 'ADD_YEARS' | 'DIFF_DAYS' | 'DIFF_WEEKS' | 'DIFF_MONTHS' | 'DIFF_YEARS' | 'SUB_STRING' | 'REPLACE' | 'COALESCE' | 'NULL' | 'LEN' | 'UPPER' | 'LOWER' | 'CONCAT' | 'IF' | 'CASE' | 'COL' | 'VAR' | 'TO_ARRAY' | 'QUERY' | 'IS_BLANK' | 'IS_NOT_BLANK';
+export type ScalarFunctionName = 'ADD' | 'SUB' | 'MUL' | 'DIV' | 'MOD' | 'POW' | 'ABS' | 'CEILING' | 'FLOOR' | 'ROUND' | 'MIN' | 'MAX' | 'AVG' | 'DATE' | 'NOW' | 'CURRENT_DAY' | 'DAY' | 'WEEK' | 'MONTH' | 'YEAR' | 'ADD_DAYS' | 'ADD_WEEKS' | 'ADD_MONTHS' | 'ADD_YEARS' | 'DIFF_DAYS' | 'DIFF_WEEKS' | 'DIFF_MONTHS' | 'DIFF_YEARS' | 'SUB_STRING' | 'REPLACE' | 'COALESCE' | 'NULL' | 'LEN' | 'UPPER' | 'LOWER' | 'CONCAT' | 'IF' | 'CASE' | 'COL' | 'FIELD' | 'VAR' | 'TO_ARRAY' | 'QUERY' | 'IS_BLANK' | 'IS_NOT_BLANK';
 export declare const scalarExpressionFunctions: Record<ScalarFunctionName, ExpressionFunction>;
 export declare const scalarExpressionFunctionNames: ScalarFunctionName[];

package/src/Utilities/ExpressionFunctions/scalarExpressionFunctions.js

@@ -68,6 +68,21 @@ export const scalarExpressionFunctions = {
         category: 'special',
         returnType: 'any',
     },
+    FIELD: {
+        handler(args, context) {
+            var _a, _b;
+            const fieldName = args[0];
+            if (StringExtensions.IsNullOrEmpty(fieldName)) {
+                throw new ExpressionEvaluationError('FIELD', 'requires a field name');
+            }
+            return (_a = context.adaptableApi) === null || _a === void 0 ? void 0 : _a.internalApi.getValueUsingField((_b = context.node) === null || _b === void 0 ? void 0 : _b.data, fieldName);
+        },
+        description: 'Returns the value of a row field (not necessarily mapped to a column). If the field is nested, use dot notation (e.g. "nested.fieldName")',
+        signatures: ['FIELD(fieldName:string)'],
+        examples: ['FIELD("fieldName")', 'FIELD("nested.fieldName")'],
+        category: 'special',
+        returnType: 'any',
+    },
     QUERY: {
         handler(args, context) {
             var _a, _b;

package/src/Utilities/ObjectFactory.d.ts

@@ -21,14 +21,14 @@ import { Shortcut } from '../PredefinedConfig/ShortcutState';
 import { IPushPullReport } from '../PredefinedConfig/SystemState';
 import { NotificationsOptions } from '../AdaptableOptions/NotificationsOptions';
 import { CellSummmary } from '../PredefinedConfig/Common/CellSummary';
-import { AdaptableTheme, BaseContext, ChartDefinition, ColumnFilter, CommentThread, CustomDisplayFormatterContext, FlashingCellDefinition, GridDataChangedInfo, SystemFilterPredicateId } from '../types';
+import { AdaptableTheme, BaseContext, ChartDefinition, ColumnFilter, CommentThread, CustomDisplayFormatterContext, FlashingCellDefinition, GridDataChangedInfo, SpecialColumnSettings, SystemFilterPredicateId } from '../types';
 import { IRowNode } from '@ag-grid-community/core';
 import { AdaptableApi, AdaptableComment, BadgeStyleDefinition, CellAddress, NamedQuery } from '../../types';
 import { ToastOptions } from '../components/Toastify';
 import { StyledColumn } from '../PredefinedConfig/StyledColumnState';
 export declare function CreateEmptyCustomSort(): CustomSort;
 export declare function CreateAdaptableComment(text: string, api: AdaptableApi): AdaptableComment;
-export declare function CreateEmptyCalculatedColumn(): CalculatedColumn;
+export declare function CreateEmptyCalculatedColumn(defaultSpecialColumnSettings: Partial<SpecialColumnSettings>): CalculatedColumn;
 export declare function CreateEmptyNamedQuery(expression?: string): NamedQuery;
 export declare function CreateEmptyPlusMinusNudge(): PlusMinusNudge;
 export declare function CreateGenericAlert(alertHeader: string, alertMessage: string, alertDefinition: AlertDefinition): AdaptableGenericAlert;
@@ -51,7 +51,7 @@ export declare function CreateReportSchedule(reportName: string): ReportSchedule
 export declare function CreateEmptySchedule(): Schedule;
 export declare function CreateEmptyShortcut(): Shortcut;
 export declare function CreateEmptyFormatColumn(): FormatColumn;
-export declare function CreateEmptyFreeTextColumn(): FreeTextColumn;
+export declare function CreateEmptyFreeTextColumn(defaultSpecialColumnSettings: Partial<SpecialColumnSettings>): FreeTextColumn;
 export declare function CreateEmptyLayout(layout?: Partial<Layout> & {
     Name: string;
 }, adaptableColumns?: AdaptableColumn[]): Layout;

package/src/Utilities/ObjectFactory.js

@@ -18,7 +18,7 @@ export function CreateAdaptableComment(text, api) {
     };
     return comment;
 }
-export function CreateEmptyCalculatedColumn() {
+export function CreateEmptyCalculatedColumn(defaultSpecialColumnSettings) {
     return {
         Uuid: createUuid(),
         ColumnId: EMPTY_STRING,
@@ -26,17 +26,7 @@ export function CreateEmptyCalculatedColumn() {
             ScalarExpression: EMPTY_STRING,
         },
         // need to create some defaults - which we will change later
-        CalculatedColumnSettings: {
-            DataType: undefined,
-            Filterable: true,
-            Resizable: true,
-            Groupable: false,
-            Sortable: true,
-            Pivotable: false,
-            Aggregatable: false,
-            SuppressMenu: false,
-            SuppressMovable: false,
-        },
+        CalculatedColumnSettings: Object.assign(Object.assign({}, defaultSpecialColumnSettings), { DataType: undefined }),
     };
 }
 export function CreateEmptyNamedQuery(expression) {
@@ -245,24 +235,14 @@ export function CreateEmptyFormatColumn() {
         CellAlignment: undefined,
     };
 }
-export function CreateEmptyFreeTextColumn() {
+export function CreateEmptyFreeTextColumn(defaultSpecialColumnSettings) {
     return {
         Uuid: createUuid(),
         ColumnId: EMPTY_STRING,
         DefaultValue: EMPTY_STRING,
         FreeTextStoredValues: [],
         TextEditor: 'Inline',
-        FreeTextColumnSettings: {
-            DataType: 'String',
-            Filterable: true,
-            Resizable: true,
-            Groupable: false,
-            Sortable: true,
-            Pivotable: false,
-            Aggregatable: false,
-            SuppressMenu: false,
-            SuppressMovable: false,
-        },
+        FreeTextColumnSettings: Object.assign(Object.assign({}, defaultSpecialColumnSettings), { DataType: 'String' }),
     };
 }
 export function CreateEmptyLayout(layout, adaptableColumns) {

package/src/Utilities/Services/AggregatedScalarLiveValue.d.ts

@@ -22,5 +22,6 @@ export declare class AggregatedScalarLiveValue {
     getAllAggregationValues(): number[];
     private getAggregationValue;
     getGlobalAggregatedValue(): any;
+    private getRowNodeValueForColumnId;
     private computeAggregatedValue;
 }

package/src/Utilities/Services/AggregatedScalarLiveValue.js

@@ -60,7 +60,7 @@ export class AggregatedScalarLiveValue {
         var _a, _b;
         if ((_a = this.expressionEvaluation.aggregationParams.groupBy) === null || _a === void 0 ? void 0 : _a.length) {
             const groupColumns = this.expressionEvaluation.aggregationParams.groupBy.map((groupByParam) => groupByParam.field);
-            const groupKeys = groupColumns.map((groupColumnName) => this.adaptableApi.gridApi.getRawValueFromRowNode(rowNode, groupColumnName));
+            const groupKeys = groupColumns.map((groupColumnName) => this.getRowNodeValueForColumnId(rowNode, groupColumnName));
             return (_b = this.aggregationResult.deepMap.get(groupKeys)) === null || _b === void 0 ? void 0 : _b.reducerResults[this.aggregationReducerName];
         }
         return this.getGlobalAggregatedValue();
@@ -68,6 +68,11 @@ export class AggregatedScalarLiveValue {
     getGlobalAggregatedValue() {
         return this.aggregationResult.reducerResults[this.aggregationReducerName];
     }
+    getRowNodeValueForColumnId(rowNode, columnId) {
+        const rawValue = this.adaptableApi.gridApi.getRawValueFromRowNode(rowNode, columnId);
+        // we need to convert the Date object to a number, otherwise the grouping will not work (each Date instance is unique)
+        return rawValue instanceof Date ? rawValue.getTime() : rawValue;
+    }
     computeAggregatedValue(expressionEvaluation) {
         var _a;
         const gridRowNodes = expressionEvaluation.getRowNodes
@@ -77,18 +82,16 @@ export class AggregatedScalarLiveValue {
             });
         // we iterate over the RowNode list (we need this to handle complex column values (nested values, valueGetters etc)
         // so we will map the fieldNames to RowNode.data
-        const mapReducerValueGetter = (fieldName) => {
-            return (rowNode) => {
-                return this.adaptableApi.gridApi.getRawValueFromRowNode(rowNode, fieldName);
-            };
+        const mapReducerValueGetter = (columnId) => {
+            return (rowNode) => this.getRowNodeValueForColumnId(rowNode, columnId);
         };
         Object.values(expressionEvaluation.aggregationParams.reducers).forEach((aggregationReducer) => {
             aggregationReducer.getter = mapReducerValueGetter(aggregationReducer.field);
             // nullify the field to force the fallback on the getter fn
             aggregationReducer.field = null;
         });
-        const mapGroupByToKey = (fieldName) => {
-            return (_unusableProperty, rowNode) => this.adaptableApi.gridApi.getRawValueFromRowNode(rowNode, fieldName);
+        const mapGroupByToKey = (columnId) => {
+            return (_unusableProperty, rowNode) => this.getRowNodeValueForColumnId(rowNode, columnId);
         };
         (_a = expressionEvaluation.aggregationParams.groupBy) === null || _a === void 0 ? void 0 : _a.forEach((groupByDef) => {
             groupByDef.toKey = mapGroupByToKey(groupByDef.field);
@@ -96,11 +99,10 @@ export class AggregatedScalarLiveValue {
         let aggregatedRowNodes = gridRowNodes;
         if (expressionEvaluation.sortByColumn) {
             const sortByColumn = expressionEvaluation.sortByColumn;
-            const getRowNodeValue = (rowNode, columnId) => this.adaptableApi.gridApi.getRawValueFromRowNode(rowNode, columnId);
             // currently, we support only ascending sorting
             aggregatedRowNodes.sort((first, second) => {
-                const firstValue = getRowNodeValue(first, sortByColumn);
-                const secondValue = getRowNodeValue(second, sortByColumn);
+                const firstValue = this.getRowNodeValueForColumnId(first, sortByColumn);
+                const secondValue = this.getRowNodeValueForColumnId(second, sortByColumn);
                 if (firstValue < secondValue) {
                     return -1;
                 }

package/src/Utilities/Services/CellPopupService.js

@@ -74,7 +74,7 @@ export class CellPopupService {
             this.hidePopup();
             return;
         }
-        const cellNotes = this.adaptable.api.noteApi.getCellNotes(cellPosition);
+        const cellNotes = this.adaptable.api.noteApi.getNotesForCell(cellPosition);
         const cellComments = this.adaptable.api.commentApi.getCommentThread(cellPosition);
         const hasNotesOrComments = (cellNotes === null || cellNotes === void 0 ? void 0 : cellNotes.length) || cellComments;
         // call only if it is different
@@ -92,7 +92,7 @@ export class CellPopupService {
             return;
         }
         // if open but this has no note, close
-        const cellNotes = this.adaptable.api.noteApi.getCellNotes(cellAddress);
+        const cellNotes = this.adaptable.api.noteApi.getNotesForCell(cellAddress);
         const cellComments = this.adaptable.api.commentApi.getCommentThread(cellAddress);
         const hasNotesOrComments = (cellNotes === null || cellNotes === void 0 ? void 0 : cellNotes.length) || cellComments;
         if (openCellAddress && !hasNotesOrComments) {

package/src/Utilities/Services/Interface/ISummaryService.d.ts

@@ -0,0 +1,17 @@
+import { IAdaptableService } from './IAdaptableService';
+import { AdaptableModule } from '../../../PredefinedConfig/Common/Types';
+import { IRowNode } from '@ag-grid-community/core/dist/esm/es6/interfaces/iRowNode';
+import { AggregatedScalarLiveValue } from '../AggregatedScalarLiveValue';
+export declare const summarySupportedExpressions: readonly ["SUM", "AVG", "MIN", "MAX", "COUNT", "MEDIAN", "MODE", "DISTINCT", "ONLY", "STD_DEVIATION"];
+export type SummaryConfig = {
+    expression: {
+        function: SummarySupportedExpression;
+    };
+    columnId: string;
+    getRowNodes?: () => IRowNode[];
+};
+export type SummarySupportedExpression = (typeof summarySupportedExpressions)[number];
+export interface ISummaryService extends IAdaptableService {
+    evaluateExpressionValue(config: SummaryConfig, moduleId: AdaptableModule): any;
+    evaluateScalarLiveValue(config: SummaryConfig, moduleId: AdaptableModule): AggregatedScalarLiveValue;
+}

package/src/Utilities/Services/Interface/ISummaryService.js

@@ -0,0 +1,12 @@
+export const summarySupportedExpressions = [
+    'SUM',
+    'AVG',
+    'MIN',
+    'MAX',
+    'COUNT',
+    'MEDIAN',
+    'MODE',
+    'DISTINCT',
+    'ONLY',
+    'STD_DEVIATION',
+];

package/src/Utilities/Services/ModuleService.js

@@ -101,6 +101,8 @@ export class ModuleService {
                 return learnUrl + 'handbook-exporting';
             case 'ColumnFilter':
                 return learnUrl + 'handbook-column-filter';
+            case 'Comment':
+                return learnUrl + 'handbook-comments';
             case 'GridFilter':
                 return learnUrl + 'handbook-grid-filter';
             case 'FlashingCell':
@@ -113,6 +115,8 @@ export class ModuleService {
                 return learnUrl + 'handbook-monitoring-grid-info';
             case 'Layout':
                 return learnUrl + 'handbook-layouts';
+            case 'Note':
+                return learnUrl + 'handbook-notes';
             case 'PlusMinus':
                 return learnUrl + 'handbook-editing-plus-minus';
             case 'NamedQuery':

package/src/Utilities/Services/QueryLanguageService.js

@@ -48,7 +48,7 @@ export class QueryLanguageService {
         const moduleExpressionFunctions = this.getModuleExpressionFunctionsMap(module);
         const booleanAndScalarFunctions = this.getBooleanAndScalarFunctions(moduleExpressionFunctions);
         const reactiveExpression$ = parser.evaluate(reactiveExpression, {
-            node: reactiveExpression,
+            node: this.adaptableApi.gridApi.getFirstRowNode(),
             adaptableApi: this.adaptableApi,
             userName: this.adaptableApi.optionsApi.getUserName(),
             adaptableId: this.adaptableApi.optionsApi.getAdaptableId(),
@@ -62,7 +62,7 @@ export class QueryLanguageService {
         const moduleExpressionFunctionsMap = this.getModuleExpressionFunctionsMap(module);
         const booleanAndScalarFunctions = this.getBooleanAndScalarFunctions(moduleExpressionFunctionsMap);
         const aggregationEvaluation = parser.evaluate(aggregationExpression, {
-            node: aggregationExpression,
+            node: this.adaptableApi.gridApi.getFirstRowNode(),
             adaptableApi: this.adaptableApi,
             userName: this.adaptableApi.optionsApi.getUserName(),
             adaptableId: this.adaptableApi.optionsApi.getAdaptableId(),

package/src/Utilities/Services/SummaryService.d.ts

@@ -1,19 +1,10 @@
-import { IRowNode } from '@ag-grid-community/core';
-import { AggregatedScalarLiveValue } from './AggregatedScalarLiveValue';
 import { AdaptableApi, AdaptableModule } from '../../types';
-export declare const summarySupportedExpressions: readonly ["SUM", "AVG", "MIN", "MAX", "COUNT", "MEDIAN", "MODE", "DISTINCT", "ONLY", "STD_DEVIATION"];
-export type SummarySupportedExpression = (typeof summarySupportedExpressions)[number];
-export type SumaryConfig = {
-    expression: {
-        function: SummarySupportedExpression;
-    };
-    columnId: string;
-    getRowNodes?: () => IRowNode[];
-};
-export declare class SummaryService {
+import { AggregatedScalarLiveValue } from './AggregatedScalarLiveValue';
+import { ISummaryService, SummaryConfig } from './Interface/ISummaryService';
+export declare class SummaryService implements ISummaryService {
     private adaptableApi;
     constructor(adaptableApi: AdaptableApi);
-    evaluateExpressionValue(config: SumaryConfig, moduleId: AdaptableModule): any;
-    evaluateScalarLiveValue(config: SumaryConfig, moduleId: AdaptableModule): AggregatedScalarLiveValue;
+    evaluateExpressionValue(config: SummaryConfig, moduleId: AdaptableModule): any;
+    evaluateScalarLiveValue(config: SummaryConfig, moduleId: AdaptableModule): AggregatedScalarLiveValue;
     destroy(): void;
 }

package/src/Utilities/Services/SummaryService.js

@@ -1,16 +1,4 @@
 import { AggregatedScalarLiveValue } from './AggregatedScalarLiveValue';
-export const summarySupportedExpressions = [
-    'SUM',
-    'AVG',
-    'MIN',
-    'MAX',
-    'COUNT',
-    'MEDIAN',
-    'MODE',
-    'DISTINCT',
-    'ONLY',
-    'STD_DEVIATION',
-];
 export class SummaryService {
     constructor(adaptableApi) {
         this.adaptableApi = adaptableApi;

package/src/Utilities/adaptableQlUtils.d.ts

@@ -0,0 +1,2 @@
+import { AdaptableColumnDataType, ExpressionFunctionInputType } from '../types';
+export declare const mapColumnDataTypeToExpressionFunctionType: (dataType: AdaptableColumnDataType) => ExpressionFunctionInputType;

package/src/Utilities/adaptableQlUtils.js

@@ -0,0 +1,14 @@
+export const mapColumnDataTypeToExpressionFunctionType = (dataType) => {
+    if (dataType === 'Number') {
+        return 'number';
+    }
+    if (dataType === 'Boolean') {
+        return 'boolean';
+    }
+    if (dataType === 'String') {
+        return 'text';
+    }
+    if (dataType === 'Date') {
+        return 'date';
+    }
+};

package/src/View/AdaptableViewFactory.js

@@ -29,7 +29,7 @@ import { StatusBarPopup } from './StatusBar/StatusBarPopup';
 import { ChartingViewPanel } from './Charting/ChartingViewPanel';
 import { GridFilterPopup } from './GridFilter/GridFilterPopup';
 import { ColumnInfoPopup } from './ColumnInfo/ColumnInfoPopup';
-import { NotesPopup } from './Notes/NotesPopup';
+import { NotePopup } from './Note/NotePopup';
 import { CommentsPopup } from './Comments/CommentsPopup';
 import { DataImportPopup } from './DataImport/DataImportPopup';
 export const AdaptableViewFactory = {
@@ -46,7 +46,7 @@ export const AdaptableViewFactory = {
     ToolPanelPopup,
     SystemStatusPopup,
     DataChangeHistoryPopup,
-    NotesPopup,
+    NotePopup,
     CommentsPopup,
     DataImportPopup,
     GridFilterPopup,

package/src/View/CalculatedColumn/Wizard/CalculatedColumnWizard.d.ts

@@ -2,7 +2,7 @@
 import { CalculatedColumn } from '../../../types';
 import { AdaptableOnePageWizardProps } from '../../Wizard/Interface/IAdaptableWizard';
 export declare const calculatedColumnTypes: readonly ["ScalarExpression", "AggregatedScalarExpression", "CumulativeAggregatedExpression", "QuantileAggregatedExpression"];
-export type ExpressionType = (typeof calculatedColumnTypes)[number];
+export type ExpressionType = typeof calculatedColumnTypes[number];
 export interface CalculatedColumnWizardProps extends AdaptableOnePageWizardProps<CalculatedColumn> {
 }
 export declare const CalculatedColumnWizard: (props: CalculatedColumnWizardProps) => JSX.Element;

package/src/View/CalculatedColumn/Wizard/CalculatedColumnWizard.js

@@ -36,7 +36,7 @@ export const CalculatedColumnWizard = (props) => {
                 return cloneObject(calculatedColumn);
             }
         }
-        return ObjectFactory.CreateEmptyCalculatedColumn();
+        return ObjectFactory.CreateEmptyCalculatedColumn(adaptable.api.gridApi.internalApi.deriveSpecialColumnSettingsFromAgGridDefaultColDef());
     });
     const dispatch = useDispatch();
     const isEdit = Boolean(props.data) || ((_a = props.popupParams) === null || _a === void 0 ? void 0 : _a.action) === 'Edit';

package/src/View/Comments/CommentsEditor.js

@@ -85,7 +85,7 @@ export const CommentsEditor = (props) => {
                 }
             }, mt: 2, mb: "2", width: "100%", placeholder: "Write new comment" }),
         React.createElement(SimpleButton, { width: "100%", variant: "raised", onClick: () => {
-                adaptable.api.settingsPanelApi.openSettingsPanel('Comments');
+                adaptable.api.settingsPanelApi.openSettingsPanel('Comment');
                 adaptable.api.internalApi.getCellPopupService().hidePopup();
             } },
             React.createElement(Box, { mr: 2 },

package/src/View/Comments/CommentsPopup.js

@@ -45,14 +45,18 @@ const CellComments = (props) => {
     const columnFriendlyName = adaptable.api.columnApi.getFriendlyNameForColumnId(props.commentThread.ColumnId);
     return (React.createElement(Panel, { mb: 2, header: React.createElement(Flex, { width: "100%", alignItems: "center" },
             React.createElement(Box, { mr: 2 },
-                "Cell Value: ",
+                React.createElement("b", null, "Cell Value:"),
+                " ",
                 cellValue),
             React.createElement(Box, { mr: 2 },
-                primaryKeyHeader,
-                ": ",
+                React.createElement("b", null,
+                    primaryKeyHeader,
+                    ":"),
+                " ",
                 props.commentThread.PrimaryKeyValue),
             React.createElement(Box, null,
-                "Column: ",
+                React.createElement("b", null, "Column:"),
+                " ",
                 columnFriendlyName),
             React.createElement(Box, { flex: 1 }),
             React.createElement(AdaptableButtonComponent, { mr: 1, variant: "text", icon: "visibility-on", onClick: () => {

package/src/View/Components/Popups/GridCellPopup/GridCellPopup.js

@@ -1,15 +1,15 @@
 import * as React from 'react';
 import { useSelector } from 'react-redux';
 import { Flex } from 'rebass';
-import { GetNotesSelector } from '../../../../Redux/ActionsReducers/NotesRedux';
+import { GetNotesSelector } from '../../../../Redux/ActionsReducers/NoteRedux';
 import { SystemCommentsAndNotesEditModeSelector, SystemCommentsAndNotesFocusedEntitySelector, SystemCommentsAndNotesSelector, } from '../../../../Redux/ActionsReducers/SystemRedux';
 import { useAdaptable } from '../../../AdaptableContext';
 import { CommentsEditor } from '../../../Comments/CommentsEditor';
-import { NoteEditor } from '../../../Notes/NoteEditor';
+import { NoteEditor } from '../../../Note/NoteEditor';
 import { CellPopup } from '../../CellPopup';
 const ConnectedNoteEditor = ({ enableEditMode }) => {
     const { api } = useAdaptable();
-    const isReadonly = api.entitlementApi.isModuleReadOnlyEntitlement('Notes');
+    const isReadonly = api.entitlementApi.isModuleReadOnlyEntitlement('Note');
     const editMode = useSelector((state) => SystemCommentsAndNotesEditModeSelector(state.System));
     const cellPopupService = api.internalApi.getCellPopupService();
     const cellAddress = useSelector((state) => SystemCommentsAndNotesSelector(state.System));
@@ -17,12 +17,12 @@ const ConnectedNoteEditor = ({ enableEditMode }) => {
     // Only handle first note for now
     // Later we can handle multiple notes
     note,] = useSelector((state) => {
-        return cellAddress ? GetNotesSelector(state.Notes, cellAddress) : [];
+        return cellAddress ? GetNotesSelector(state.Note, cellAddress) : [];
     });
     const handleNoteChange = React.useCallback((value) => {
         api.noteApi.updateNoteText(value, note);
     }, [note]);
-    return (React.createElement(Flex, { onClick: () => enableEditMode(), flexDirection: "column", className: "ab-NotesPopup" },
+    return (React.createElement(Flex, { onClick: () => enableEditMode(), flexDirection: "column", className: "ab-NotePopup" },
         React.createElement(NoteEditor, { isReadonly: isReadonly, editMode: editMode, key: note === null || note === void 0 ? void 0 : note.Uuid, onClose: () => cellPopupService.hidePopup(), note: note === null || note === void 0 ? void 0 : note.Text, onNoteChange: (value) => handleNoteChange(value) })));
 };
 export const GridCellPopup = (props) => {

package/src/View/Components/ValueSelector/index.d.ts

@@ -26,6 +26,7 @@ export type ValueSelectorProps<OPTION_TYPE, ID_TYPE extends number | string> = {
     onShowSelectedOnlyChange?: (selectedOnly: boolean) => void;
     isOptionDisabled?: (option: OPTION_TYPE) => boolean;
     disabled?: boolean;
+    style?: React.CSSProperties;
 };
 export declare function ValueSelector<OPTION_TYPE, ID_TYPE extends number | string>(props: ValueSelectorProps<OPTION_TYPE, ID_TYPE>): JSX.Element;
 export declare namespace ValueSelector {

package/src/View/Components/ValueSelector/index.js

@@ -111,7 +111,7 @@ export function ValueSelector(props) {
     };
     const showOnlySelectedCheckbox = (React.createElement(CheckBox, { disabled: !value.length, checked: selectedOnly, onChange: setSelectedOnly }, showSelectedOnlyLabel !== null && showSelectedOnlyLabel !== void 0 ? showSelectedOnlyLabel : 'Show Selected Only'));
     const showSelectedOnlyPosition = (_a = props.showSelectedOnlyPosition) !== null && _a !== void 0 ? _a : 'floating';
-    return (React.createElement(Flex, { className: baseClassName, flexDirection: "column", flex: 1 },
+    return (React.createElement(Flex, { style: props.style, className: baseClassName, flexDirection: "column", flex: 1 },
         React.createElement(Flex, { mb: 1 },
             showFilterInput && filter ? (React.createElement(AdaptableFormControlTextClear, { value: searchInputValue, OnTextChange: setSearchInputValue, placeholder: "Type to search", style: { flex: 1, border: 0, margin: 3 } })) : (React.createElement(Box, { flex: 1 })),
             showSelectedOnlyPosition === 'top' && React.createElement(Box, { ml: 20 }, showOnlySelectedCheckbox)),

package/src/View/DataChangeHistory/DataChangeHistoryGrid.js

@@ -208,7 +208,6 @@ const buildGridOptions = (mainAdaptableInstance, changeHistoryLog) => {
         },
         autoGroupColumnDef: {
             sortable: true,
-            // suppressMenu: true,
         },
         columnDefs: [
             {

package/src/View/FreeTextColumn/FreeTextColumnSummary.js

@@ -45,7 +45,7 @@ export class FreeTextColumnSummaryComponent extends React.Component {
             this.state.editedAdaptableObject && (React.createElement(FreeTextColumnWizard, { moduleInfo: this.props.moduleInfo, data: this.state.editedAdaptableObject, configEntities: this.props.FreeTextColumns, onCloseWizard: () => this.onCloseWizard(), onFinishWizard: this.onFinishWizard }))));
     }
     onNew() {
-        let configEntity = ObjectFactory.CreateEmptyFreeTextColumn();
+        let configEntity = ObjectFactory.CreateEmptyFreeTextColumn(this.props.api.gridApi.internalApi.deriveSpecialColumnSettingsFromAgGridDefaultColDef());
         configEntity.ColumnId = this.props.summarisedColumn.columnId;
         this.setState({
             editedAdaptableObject: configEntity,

package/src/View/FreeTextColumn/Wizard/FreeTextColumnWizard.js

@@ -8,8 +8,10 @@ import ObjectFactory from '../../../Utilities/ObjectFactory';
 import * as FreeTextColumnRedux from '../../../Redux/ActionsReducers/FreeTextColumnRedux';
 import { useDispatch, useSelector } from 'react-redux';
 import { ObjectTagsWizardSection, renderObjectTagsSummary, } from '../../Wizard/ObjectTagsWizardSection';
+import { useAdaptable } from '../../AdaptableContext';
 export const FreeTextColumnWizard = (props) => {
     var _a;
+    const adaptable = useAdaptable();
     const allFreeTextColumns = useSelector((state) => state.FreeTextColumn.FreeTextColumns);
     const [freeTextColumn, setFreeTextColumn] = useState(() => {
         var _a, _b;
@@ -19,7 +21,7 @@ export const FreeTextColumnWizard = (props) => {
         if (((_a = props.popupParams) === null || _a === void 0 ? void 0 : _a.action) === 'Edit' && ((_b = props.popupParams) === null || _b === void 0 ? void 0 : _b.column)) {
             return allFreeTextColumns.find((column) => column.ColumnId === props.popupParams.column.columnId);
         }
-        return ObjectFactory.CreateEmptyFreeTextColumn();
+        return ObjectFactory.CreateEmptyFreeTextColumn(adaptable.api.gridApi.internalApi.deriveSpecialColumnSettingsFromAgGridDefaultColDef());
     });
     const dispatch = useDispatch();
     const isEdit = props.data || ((_a = props.popupParams) === null || _a === void 0 ? void 0 : _a.action) === 'Edit';