@adaptabletools/adaptable 12.1.6 → 12.1.7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adaptabletools/adaptable",
-  "version": "12.1.6",
+  "version": "12.1.7",
   "description": "Powerful data-agnostic HTML5 datagrid add-on that sits on top of an underlying grid component and provides all the rich functionality that advanced users expect from their DataGrids and Data Tables",
   "keywords": [
     "web-components",

package/publishTimestamp.d.ts

@@ -1,2 +1,2 @@
-declare const _default: 1659973452141;
+declare const _default: 1660658453580;
 export default _default;

package/publishTimestamp.js

@@ -1,3 +1,3 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.default = 1659973452141;
+exports.default = 1660658453580;

package/src/AdaptableInterfaces/IAdaptable.d.ts

@@ -119,6 +119,7 @@ export interface IAdaptable {
     _emitSync(eventName: 'CreateAdaptableContextMenuItems', data?: any): Promise<any>;
     prepareGrid(): void;
     redrawBody(): void;
+    redrawRenderedRows(): void;
     redrawHeader(): void;
     redrawRow(rowNode: RowNode): void;
     redrawRows(rowNodes: RowNode[]): void;

package/src/AdaptableOptions/ColumnOptions.d.ts

@@ -5,14 +5,12 @@ import { Column } from '@ag-grid-community/all-modules';
 export interface ColumnOptions {
     /**
      * Provide an alternative Friendly Name for a Column
-     *
      * @defaultValue  undefined
      */
     columnFriendlyName?: (columnFriendlyNameContext: ColumnFriendlyNameContext) => string | undefined;
     /**
-     * Optional list of Column Types - used primarily for Special Columns
-     *
-     * @defaultValue  []
+     * Optional list of Column Types - used primarily for Calculated and FreeText Columns
+     * @defaultValue undefined
      */
     columnTypes?: string[];
     /**

package/src/Api/FlashingCellApi.d.ts

@@ -60,6 +60,10 @@ export interface FlashingCellApi {
      * @param flashingCellDefinitions Flashing Cell Definitions to Add to State
      */
     setFlashingCellDefinitions(flashingCellDefinitions: FlashingCellDefinition[]): void;
+    /**
+     * Merges a Flashing Cell Definition with default values
+     * @param flashingCellDefinition Flashing Cell Definition to Merge
+     */
     mergeFlashingCellDefinitionWithDefaults(flashingCellDefinition: FlashingCellDefinition): FlashingCellDefinition;
     /**
      * Adds provided Flashing cell Definitions
@@ -88,4 +92,8 @@ export interface FlashingCellApi {
      * @param scope the Scope to check
      */
     getFlashingCellPredicateDefsForScope(scope: AdaptableScope): AdaptablePredicateDef[];
+    /**
+     * Clears all Cells and Rows which have been flashed (primarily used if duration is 'Always')
+     */
+    clearGridFlashing(): void;
 }

package/src/Api/Implementation/ColumnApiImpl.js

@@ -291,7 +291,6 @@ class ColumnApiImpl extends ApiBase_1.ApiBase {
     }
     async getDistinctFilterDisplayValuesForColumn(columnId, filter, showFilteredRowsOnly) {
         const abColumn = this.getColumnFromId(columnId);
-        console.log('getting for ', columnId);
         if (abColumn == undefined) {
             return {
                 values: [],

package/src/Api/Implementation/FilterApiImpl.js

@@ -176,7 +176,16 @@ class FilterApiImpl extends ApiBase_1.ApiBase {
         if (!columnFilter.Predicate) {
             return true;
         }
-        if ((_a = columnFilter.Predicate.Inputs) === null || _a === void 0 ? void 0 : _a.some((input) => StringExtensions_1.default.IsNullOrEmpty(input))) {
+        const someInputsAreEmpty = (_a = columnFilter.Predicate.Inputs) === null || _a === void 0 ? void 0 : _a.some((input) => {
+            if (typeof input === 'string') {
+                return StringExtensions_1.default.IsNullOrEmpty(input);
+            }
+            if (typeof input === 'number') {
+                return isNaN(input);
+            }
+            return !input;
+        });
+        if (someInputsAreEmpty) {
             return true;
         }
         const column = this.adaptable.api.columnApi.getColumnFromId(columnFilter.ColumnId);

package/src/Api/Implementation/FlashingCellApiImpl.d.ts

@@ -21,4 +21,5 @@ export declare class FlashingCellApiImpl extends ApiBase implements FlashingCell
     editFlashingCellDefinitions(flashingCellDefinitions: FlashingCellDefinition[]): FlashingCellDefinition[];
     getFlashingCellPredicateDefs(): AdaptablePredicateDef[];
     getFlashingCellPredicateDefsForScope(scope: AdaptableScope): AdaptablePredicateDef[];
+    clearGridFlashing(): void;
 }

package/src/Api/Implementation/FlashingCellApiImpl.js

@@ -106,5 +106,9 @@ class FlashingCellApiImpl extends ApiBase_1.ApiBase {
     getFlashingCellPredicateDefsForScope(scope) {
         return this.getFlashingCellPredicateDefs().filter((predicateDef) => this.adaptable.api.scopeApi.isScopeInScope(scope, predicateDef.columnScope));
     }
+    clearGridFlashing() {
+        const currentFlashingCells = this.getAdaptableState().System.AdaptableFlashingCells;
+        this.dispatchAction(SystemRedux.SystemFlashingCellDeleteAll());
+    }
 }
 exports.FlashingCellApiImpl = FlashingCellApiImpl;

package/src/Api/SystemStatusApi.d.ts

@@ -24,7 +24,7 @@ export interface SystemStatusApi {
      */
     setInfoSystemStatus(statusMessage: string, furtherInformation?: string): void;
     /**
-     * Opens System Status popup
+     * Opens Settings Panel with System Status section selected and visible
      */
     showSystemStatusPopup(): void;
     /**

package/src/Api/ToolPanelApi.d.ts

@@ -11,7 +11,7 @@ export interface ToolPanelApi {
      */
     getToolPanelState(): ToolPanelState;
     /**
-     * Opens the Tool Panel popup
+     * Opens Settings Panel with Tool Panel section selected and visible
      */
     showToolPanelPopup(): void;
     /**

package/src/PredefinedConfig/Common/AdaptablePredicate.js

@@ -16,6 +16,7 @@ const isAfter_1 = tslib_1.__importDefault(require("date-fns/isAfter"));
 const isBefore_1 = tslib_1.__importDefault(require("date-fns/isBefore"));
 const isSameDay_1 = tslib_1.__importDefault(require("date-fns/isSameDay"));
 const CalendarHelper_1 = tslib_1.__importDefault(require("../../Utilities/Helpers/CalendarHelper"));
+const StringExtensions_1 = tslib_1.__importDefault(require("../../Utilities/Extensions/StringExtensions"));
 const DateHelper_1 = require("../../Utilities/Helpers/DateHelper");
 /**
  * Array of Predicate Defs which are shipped by AdapTable
@@ -143,7 +144,14 @@ exports.SystemPredicateDefs = [
         columnScope: { DataTypes: ['Number'] },
         moduleScope: ['filter', 'alert', 'flashingcell', 'conditionalstyle'],
         inputs: [{ type: 'number' }],
-        handler: ({ value, inputs }) => Number(value) === Number(inputs[0]),
+        handler: ({ value, inputs }) => {
+            const input = inputs[0];
+            if ((typeof value === 'string' && !StringExtensions_1.default.IsNumeric(value)) ||
+                (typeof input === 'string' && !StringExtensions_1.default.IsNumeric(input))) {
+                return false;
+            }
+            return Number(value) === Number(inputs[0]);
+        },
         toString: ({ inputs }) => `= ${inputs[0]}`,
         shortcuts: ['='],
     },
@@ -397,7 +405,7 @@ exports.SystemPredicateDefs = [
         columnScope: { DataTypes: ['Date'] },
         moduleScope: ['filter', 'alert', 'flashingcell', 'conditionalstyle'],
         inputs: [{ type: 'date' }],
-        handler: ({ value, inputs }) => isAfter_1.default(DateHelper_1.parseFilterValueDate(value), DateHelper_1.parseFilterInputDate(inputs[0])),
+        handler: ({ value, inputs }) => isAfter_1.default(DateHelper_1.parseDateValue(value), DateHelper_1.parseDateValue(inputs[0])),
         toString: ({ inputs }) => `> ${inputs[0]}`,
     },
     {
@@ -407,7 +415,7 @@ exports.SystemPredicateDefs = [
         columnScope: { DataTypes: ['Date'] },
         moduleScope: ['filter', 'alert', 'flashingcell', 'conditionalstyle'],
         inputs: [{ type: 'date' }],
-        handler: ({ value, inputs }) => isBefore_1.default(DateHelper_1.parseFilterValueDate(value), DateHelper_1.parseFilterInputDate(inputs[0])),
+        handler: ({ value, inputs }) => isBefore_1.default(DateHelper_1.parseDateValue(value), DateHelper_1.parseDateValue(inputs[0])),
         toString: ({ inputs }) => `< ${inputs[0]}`,
     },
     {
@@ -417,7 +425,7 @@ exports.SystemPredicateDefs = [
         columnScope: { DataTypes: ['Date'] },
         moduleScope: ['filter', 'alert', 'flashingcell', 'conditionalstyle'],
         inputs: [{ type: 'date' }],
-        handler: ({ value, inputs }) => isSameDay_1.default(DateHelper_1.parseFilterValueDate(value), DateHelper_1.parseFilterInputDate(inputs[0])),
+        handler: ({ value, inputs }) => isSameDay_1.default(DateHelper_1.parseDateValue(value), DateHelper_1.parseDateValue(inputs[0])),
         toString: ({ inputs }) => `= ${inputs[0]}`,
     },
     {
@@ -427,7 +435,7 @@ exports.SystemPredicateDefs = [
         columnScope: { DataTypes: ['Date'] },
         moduleScope: ['filter', 'alert', 'flashingcell', 'conditionalstyle'],
         inputs: [{ type: 'date' }],
-        handler: ({ value, inputs }) => !isSameDay_1.default(DateHelper_1.parseFilterValueDate(value), DateHelper_1.parseFilterInputDate(inputs[0])),
+        handler: ({ value, inputs }) => !isSameDay_1.default(DateHelper_1.parseDateValue(value), DateHelper_1.parseDateValue(inputs[0])),
         toString: ({ inputs }) => `!= ${inputs[0]}`,
     },
     {
@@ -436,7 +444,7 @@ exports.SystemPredicateDefs = [
         icon: { name: 'calendar' },
         columnScope: { DataTypes: ['Date'] },
         moduleScope: ['filter', 'alert', 'flashingcell', 'conditionalstyle'],
-        handler: ({ value, api }) => isSameDay_1.default(DateHelper_1.parseFilterValueDate(value), CalendarHelper_1.default.getNextWorkingDay()),
+        handler: ({ value, api }) => isSameDay_1.default(DateHelper_1.parseDateValue(value), CalendarHelper_1.default.getNextWorkingDay()),
     },
     {
         id: 'LastWorkDay',

package/src/PredefinedConfig/Common/SpecialColumnSettings.d.ts

@@ -8,32 +8,32 @@ export interface SpecialColumnSettings {
     Width?: number;
     /**
      * Whether Column is filterable
-     * @defaultValue true
+     * @defaultValue false
      */
     Filterable?: boolean;
     /**
      * Whether Column can be resized (by dragging column header edges)
-     * @defaultValue true
+     * @defaultValue false
      */
     Resizable?: boolean;
     /**
      * Whether Column can be grouped
-     * @defaultValue true
+     * @defaultValue false
      */
     Groupable?: boolean;
     /**
      * Whether Column is sortable
-     * @defaultValue true
+     * @defaultValue false
      */
     Sortable?: boolean;
     /**
      * Whether Column can be used when grid is in pivot mode
-     * @defaultValue true
+     * @defaultValue false
      */
     Pivotable?: boolean;
     /**
      * Whether Column can be used in an aggregation when grouping
-     * @defaultValue true
+     * @defaultValue false
      */
     Aggregatable?: boolean;
     /**

package/src/Redux/ActionsReducers/SystemRedux.d.ts

@@ -112,7 +112,6 @@ export interface SystemFlashingCellDeleteAction extends Redux.Action {
     flashingCell: AdaptableFlashingCell;
 }
 export interface SystemFlashingCellDeleteAllAction extends Redux.Action {
-    flashingCells: AdaptableFlashingCell[];
 }
 export interface SystemStatusMessageInfoAddAction extends Redux.Action {
     systemStatusMessageInfo: SystemStatusMessageInfo;
@@ -241,7 +240,7 @@ export declare const SystemAlertRemoveCellHighlight: (alert: AdaptableAlert) =>
 export declare const SystemAlertRemoveRowHighlight: (alert: AdaptableAlert) => SystemAlertRemoveRowHighlightAction;
 export declare const SystemFlashingCellAdd: (flashingCell: AdaptableFlashingCell) => SystemFlashingCellAddAction;
 export declare const SystemFlashingCellDelete: (flashingCell: AdaptableFlashingCell) => SystemFlashingCellDeleteAction;
-export declare const SystemFlashingCellDeleteAll: (flashingCells: AdaptableFlashingCell[]) => SystemFlashingCellDeleteAllAction;
+export declare const SystemFlashingCellDeleteAll: () => SystemFlashingCellDeleteAllAction;
 export declare const SystemStatusMessageInfoAdd: (SystemStatusMessageInfo: SystemStatusMessageInfo, MaxSystemStatusMessagesInStore: number) => SystemStatusMessageInfoAddAction;
 export declare const SystemStatusMessageInfoDelete: (SystemStatusMessageInfo: SystemStatusMessageInfo) => SystemStatusMessageInfoDeleteAction;
 export declare const SystemStatusMessageInfoDeleteAll: () => SystemStatusMessageInfoDeleteAllAction;

package/src/Redux/ActionsReducers/SystemRedux.js

@@ -154,9 +154,8 @@ const SystemFlashingCellDelete = (flashingCell) => ({
     flashingCell: flashingCell,
 });
 exports.SystemFlashingCellDelete = SystemFlashingCellDelete;
-const SystemFlashingCellDeleteAll = (flashingCells) => ({
+const SystemFlashingCellDeleteAll = () => ({
     type: exports.SYSTEM_FLASHING_CELL_DELETE_ALL,
-    flashingCells: flashingCells,
 });
 exports.SystemFlashingCellDeleteAll = SystemFlashingCellDeleteAll;
 const SystemStatusMessageInfoAdd = (SystemStatusMessageInfo, MaxSystemStatusMessagesInStore) => ({

package/src/Redux/Store/AdaptableStore.js

@@ -354,6 +354,11 @@ const adaptableMiddleware = (adaptable) => function (middlewareAPI) {
                     }
                     return ret;
                 }
+                case SystemRedux.SYSTEM_FLASHING_CELL_DELETE_ALL: {
+                    let ret = next(action);
+                    adaptable.redrawRenderedRows();
+                    return ret;
+                }
                 /*******************
                  * ALERT ACTIONS
                  *******************/

package/src/Strategy/FlashingCellModule.js

@@ -95,10 +95,10 @@ class FlashingCellModule extends AdaptableModuleBase_1.AdaptableModuleBase {
                 const flashingCellForRow = this.api.internalApi.getAdaptableFlashingCellFor(menuContext.primaryKeyValue);
                 const flashingCellForCell = this.api.internalApi.getAdaptableFlashingCellFor(menuContext.primaryKeyValue, menuContext.adaptableColumn.columnId);
                 if (flashingCellForRow && flashingCellForRow.flashTarget === 'row') {
-                    items.push(this.createColumnMenuItemReduxAction('Clear Flashing Cell for Row', this.moduleInfo.Glyph, SystemRedux.SystemFlashingCellDelete(flashingCellForRow)));
+                    items.push(this.createColumnMenuItemReduxAction('Clear Flashing Row', this.moduleInfo.Glyph, SystemRedux.SystemFlashingCellDelete(flashingCellForRow)));
                 }
                 else if (flashingCellForCell && flashingCellForCell.flashTarget === 'cell') {
-                    items.push(this.createColumnMenuItemReduxAction('Clear Flashing Cell for Cell', this.moduleInfo.Glyph, SystemRedux.SystemFlashingCellDelete(flashingCellForCell)));
+                    items.push(this.createColumnMenuItemReduxAction('Clear Flashing Cell', this.moduleInfo.Glyph, SystemRedux.SystemFlashingCellDelete(flashingCellForCell)));
                 }
             }
         }

package/src/Utilities/Helpers/CalendarHelper.js

@@ -298,7 +298,7 @@ function getNextWorkingDay(days = 1) {
     let counterDate = new Date();
     while (count < days) {
         counterDate.setDate(counterDate.getDate() + 1);
-        if (this.isNotWorkingDay(counterDate)) {
+        if (isNotWorkingDay(counterDate)) {
             count++;
         }
     }
@@ -310,7 +310,7 @@ function getPreviousWorkingDay(days = 1) {
     let counterDate = new Date();
     while (count < days) {
         counterDate.setDate(counterDate.getDate() - 1);
-        if (this.isNotWorkingDay(counterDate)) {
+        if (isNotWorkingDay(counterDate)) {
             count++;
         }
     }
@@ -319,14 +319,17 @@ function getPreviousWorkingDay(days = 1) {
 exports.getPreviousWorkingDay = getPreviousWorkingDay;
 // pretty sure this can be improved as pretty expensive - though rarely used to be honest
 function isNotWorkingDay(dateToCheck) {
-    let currentCalendar = this.getGeneralOptions().currentCalendar;
+    /*
+    // Removing lookups to current calendar until we decide what to do
+    let currentCalendar: string = this.getGeneralOptions().currentCalendar;
     let currentHoliday = getAvailableCalendars().find((c) => c.Name == currentCalendar);
     for (let holiday of currentHoliday.CalendarEntries) {
-        let holidayDate = new Date(holiday.HolidayDate);
-        if (holidayDate.setHours(0, 0, 0, 0) == dateToCheck.setHours(0, 0, 0, 0)) {
-            return false;
-        }
+      let holidayDate = new Date(holiday.HolidayDate);
+      if (holidayDate.setHours(0, 0, 0, 0) == dateToCheck.setHours(0, 0, 0, 0)) {
+        return false;
+      }
     }
+    */
     return dateToCheck.getDay() != 0 && dateToCheck.getDay() != 6;
 }
 exports.isNotWorkingDay = isNotWorkingDay;

package/src/Utilities/Helpers/DateHelper.d.ts

@@ -8,30 +8,4 @@ export declare const isValueValidDate: (data: any) => boolean;
 export declare const dateToISO: (date: Date | number | string) => string;
 export declare const parseToISO: (date: string | Date | number, dateFormat?: string) => string;
 export declare const parseDateValue: (dateValue: string | Date | number, dateFormat?: string) => Date | undefined;
-/**
- * Creates a date with the same day/month/year/hour with the current timezone.
- * '2022-06-01T17:00:00.000Z' => '2022-06-01T17:00:00.000+03:00' // RO time
- *
- * new Date() always creates the date using the current timezone.
- * To compare two dates, they need to be in the same timezone.
- *
- * @param date Date
- */
-export declare const utcDateToSameDateInLocale: (date: Date) => Date;
-/**
- * To make sure selected/input date is correct and in the current time-zone.
- 
- *
- * '2022-06-14' is considered to be '2022-06-13 00:00:00.
- * And when date object is created it uses the current timezone.
- *
- * '2022-06-14' => Mon Jun 13 2022 20:00:00 GMT-0400 (Eastern Daylight Time)
- *
- * @param stringDate date string
- */
 export declare const parseFilterInputDate: (stringDate: string) => Date;
-/**
- * Used to parse the date from rowDate inside date predicates.
- * The date is parsed in moved to local timezone.
- */
-export declare const parseFilterValueDate: (value: any) => Date;

package/src/Utilities/Helpers/DateHelper.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.parseFilterValueDate = exports.parseFilterInputDate = exports.utcDateToSameDateInLocale = exports.parseDateValue = exports.parseToISO = exports.dateToISO = exports.isValueValidDate = exports.isValidDate = void 0;
+exports.parseFilterInputDate = exports.parseDateValue = exports.parseToISO = exports.dateToISO = exports.isValueValidDate = exports.isValidDate = void 0;
 const tslib_1 = require("tslib");
 const parseISO_1 = tslib_1.__importDefault(require("date-fns/parseISO"));
 const parse_1 = tslib_1.__importDefault(require("date-fns/parse"));
@@ -63,35 +63,5 @@ const parseDateValue = (dateValue, dateFormat) => {
     return dateInstance;
 };
 exports.parseDateValue = parseDateValue;
-/**
- * Creates a date with the same day/month/year/hour with the current timezone.
- * '2022-06-01T17:00:00.000Z' => '2022-06-01T17:00:00.000+03:00' // RO time
- *
- * new Date() always creates the date using the current timezone.
- * To compare two dates, they need to be in the same timezone.
- *
- * @param date Date
- */
-const utcDateToSameDateInLocale = (date) => {
-    return new Date(date.getTime() + date.getTimezoneOffset() * 60 * 1000);
-};
-exports.utcDateToSameDateInLocale = utcDateToSameDateInLocale;
-/**
- * To make sure selected/input date is correct and in the current time-zone.
- 
- *
- * '2022-06-14' is considered to be '2022-06-13 00:00:00.
- * And when date object is created it uses the current timezone.
- *
- * '2022-06-14' => Mon Jun 13 2022 20:00:00 GMT-0400 (Eastern Daylight Time)
- *
- * @param stringDate date string
- */
-const parseFilterInputDate = (stringDate) => exports.utcDateToSameDateInLocale(new Date(stringDate));
+const parseFilterInputDate = (stringDate) => new Date(stringDate);
 exports.parseFilterInputDate = parseFilterInputDate;
-/**
- * Used to parse the date from rowDate inside date predicates.
- * The date is parsed in moved to local timezone.
- */
-const parseFilterValueDate = (value) => exports.utcDateToSameDateInLocale(exports.parseDateValue(value));
-exports.parseFilterValueDate = parseFilterValueDate;

package/src/Utilities/ObjectFactory.d.ts

@@ -29,7 +29,7 @@ import { RowNode } from '@ag-grid-community/all-modules';
 import { AdaptableApi } from '../../types';
 import { ToastOptions } from '../components/Toastify';
 export declare function CreateEmptyCustomSort(): CustomSort;
-export declare function CreateEmptyCalculatedColumn(isFilterable: boolean): CalculatedColumn;
+export declare function CreateEmptyCalculatedColumn(): CalculatedColumn;
 export declare function CreateEmptyNamedQuery(expression?: string): NamedQuery;
 export declare function CreateEmptyPlusMinusNudge(): PlusMinusNudge;
 export declare function CreateGenericAlert(alertHeader: string, alertMessage: string, alertDefinition: AlertDefinition): AdaptableGenericAlert;
@@ -55,7 +55,7 @@ export declare function CreateEmptySchedule(): Schedule;
 export declare function CreateEmptyShortcut(): Shortcut;
 export declare function CreateEmptyConditionalStyle(): ConditionalStyle;
 export declare function CreateEmptyFormatColumn(): FormatColumn;
-export declare function CreateEmptyFreeTextColumn(isFilterable: boolean): FreeTextColumn;
+export declare function CreateEmptyFreeTextColumn(): FreeTextColumn;
 export declare function CreateEmptyLayout(layout?: Partial<Layout> & {
     Name: string;
 }, adaptableColumns?: AdaptableColumn[]): Layout;

package/src/Utilities/ObjectFactory.js

@@ -9,7 +9,7 @@ function CreateEmptyCustomSort() {
     return { Uuid: Uuid_1.createUuid(), ColumnId: GeneralConstants_1.EMPTY_STRING, SortedValues: [] };
 }
 exports.CreateEmptyCustomSort = CreateEmptyCustomSort;
-function CreateEmptyCalculatedColumn(isFilterable) {
+function CreateEmptyCalculatedColumn() {
     return {
         Uuid: Uuid_1.createUuid(),
         ColumnId: GeneralConstants_1.EMPTY_STRING,
@@ -18,12 +18,12 @@ function CreateEmptyCalculatedColumn(isFilterable) {
         },
         // need to create some defaults - which we will change later
         CalculatedColumnSettings: {
-            Filterable: isFilterable,
-            Resizable: true,
-            Groupable: true,
-            Sortable: true,
-            Pivotable: true,
-            Aggregatable: true,
+            Filterable: false,
+            Resizable: false,
+            Groupable: false,
+            Sortable: false,
+            Pivotable: false,
+            Aggregatable: false,
             SuppressMenu: false,
             SuppressMovable: false,
         },
@@ -283,7 +283,7 @@ function CreateEmptyFormatColumn() {
     };
 }
 exports.CreateEmptyFormatColumn = CreateEmptyFormatColumn;
-function CreateEmptyFreeTextColumn(isFilterable) {
+function CreateEmptyFreeTextColumn() {
     return {
         Uuid: Uuid_1.createUuid(),
         ColumnId: GeneralConstants_1.EMPTY_STRING,
@@ -292,12 +292,12 @@ function CreateEmptyFreeTextColumn(isFilterable) {
         TextEditor: 'Inline',
         DataType: 'String',
         FreeTextColumnSettings: {
-            Filterable: isFilterable,
-            Resizable: true,
-            Groupable: true,
-            Sortable: true,
-            Pivotable: true,
-            Aggregatable: true,
+            Filterable: false,
+            Resizable: false,
+            Groupable: false,
+            Sortable: false,
+            Pivotable: false,
+            Aggregatable: false,
             SuppressMenu: false,
             SuppressMovable: false,
         },

package/src/View/CalculatedColumn/Utilities/getCalculatedColumnSettingTags.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getCalculatedColumnSettingTags = void 0;
 const getCalculatedColumnSettingTags = (settings) => {
     const { DataType, Width, Filterable, Resizable, Groupable, Sortable, Pivotable, Aggregatable } = settings !== null && settings !== void 0 ? settings : {};
+    const colTypes = (settings === null || settings === void 0 ? void 0 : settings.ColumnTypes) ? settings.ColumnTypes.join(', ') : '';
     return [
         DataType ? `DataType: ${DataType}` : null,
         Width ? `Width: ${Width}px` : null,
@@ -12,6 +13,7 @@ const getCalculatedColumnSettingTags = (settings) => {
         Groupable ? 'Groupable' : null,
         Sortable ? 'Sortable' : null,
         Aggregatable ? 'Aggregatable' : null,
+        colTypes ? `Column Types: ${colTypes}` : null,
     ].filter(Boolean);
 };
 exports.getCalculatedColumnSettingTags = getCalculatedColumnSettingTags;

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

@@ -66,10 +66,7 @@ const CalculatedColumnExpressionWizardSection = (props) => {
     const setCalculatedColumnExpression = (calculatedColumnQuery) => {
         const calculatedColumnExpressionService = api.internalApi.getCalculatedColumnExpressionService();
         const dataType = calculatedColumnExpressionService.getCalculatedColumnDataType(calculatedColumnQuery);
-        const Pivotable = dataType == 'String';
-        const Aggregatable = dataType == 'Number';
-        props.onChange(Object.assign(Object.assign({}, data), { Query: calculatedColumnQuery, CalculatedColumnSettings: Object.assign(Object.assign({}, data.CalculatedColumnSettings), { DataType: dataType, Pivotable,
-                Aggregatable }) }));
+        props.onChange(Object.assign(Object.assign({}, data), { Query: calculatedColumnQuery, CalculatedColumnSettings: Object.assign(Object.assign({}, data.CalculatedColumnSettings), { DataType: dataType }) }));
     };
     return (React.createElement(Tabs_1.Tabs, { onValueChange: setType, value: selectedTab, p: 2, style: { height: '100%', flex: 1, overflow: 'auto' } },
         React.createElement(QueryTab, { value: "ScalarExpression", type: type, label: "Scalar" }),

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

@@ -37,7 +37,7 @@ const isValidCalculatedColumnSettings = (data, api) => {
         return 'Column Id cannot be empty';
     }
     if (!((_a = data.CalculatedColumnSettings) === null || _a === void 0 ? void 0 : _a.DataType)) {
-        return 'No data type specified for column';
+        return 'No data type is specified and it could not be inferred from the defined expression';
     }
     const columnsWithSameIdCount = columns.filter((c) => c.columnId === data.ColumnId).length;
     const hasAlreadyExistingId = data.Uuid ? columnsWithSameIdCount > 1 : columnsWithSameIdCount > 0;

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

@@ -29,7 +29,7 @@ const CalculatedColumnWizard = (props) => {
                 return calculatedColumn;
             }
         }
-        return ObjectFactory_1.default.CreateEmptyCalculatedColumn(adaptable.api.internalApi.getAdaptableOptions().filterOptions.enableFilterOnSpecialColumns);
+        return ObjectFactory_1.default.CreateEmptyCalculatedColumn();
     });
     const dispatch = react_redux_1.useDispatch();
     const isEdit = Boolean(props.data) || ((_a = props.popupParams) === null || _a === void 0 ? void 0 : _a.action) === 'Edit';
@@ -43,15 +43,6 @@ const CalculatedColumnWizard = (props) => {
         props.onCloseWizard();
     };
     return (React.createElement(OnePageAdaptableWizard_1.OnePageAdaptableWizard, { defaultCurrentSectionName: props.defaultCurrentSectionName, moduleInfo: props.moduleInfo, data: calculatedColumn, onHide: props.onCloseWizard, onFinish: handleFinish, sections: [
-            {
-                title: 'Expression',
-                details: 'Specify the Calculated Column Expression',
-                isValid: CalculatedColumnExpressionWizardSection_1.isValidCalculatedColumnExpression,
-                renderSummary: CalculatedColumnExpressionWizardSection_1.renderCalculatedColumnExpressionSummary,
-                render: () => {
-                    return React.createElement(CalculatedColumnExpressionWizardSection_1.CalculatedColumnExpressionWizardSection, { onChange: setCalculatedColumn });
-                },
-            },
             {
                 title: 'Settings',
                 details: 'Specify Column details and properties',
@@ -62,6 +53,15 @@ const CalculatedColumnWizard = (props) => {
                         React.createElement(CalculatedColumnSettingsWizardSection_1.CalculatedColumnSettingsWizardSection, { isEdit: isEdit, onChange: setCalculatedColumn })));
                 },
             },
+            {
+                title: 'Expression',
+                details: 'Specify the Calculated Column Expression',
+                isValid: CalculatedColumnExpressionWizardSection_1.isValidCalculatedColumnExpression,
+                renderSummary: CalculatedColumnExpressionWizardSection_1.renderCalculatedColumnExpressionSummary,
+                render: () => {
+                    return React.createElement(CalculatedColumnExpressionWizardSection_1.CalculatedColumnExpressionWizardSection, { onChange: setCalculatedColumn });
+                },
+            },
             {
                 details: 'Select Calculated Column tags',
                 title: 'Tags',

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

@@ -21,7 +21,7 @@ const AdaptableDateInput = React.forwardRef((props, ref) => {
             });
         },
     });
-    const dateValue = DateHelper_1.parseFilterInputDate(value);
+    const dateValue = value ? DateHelper_1.parseDateValue(value) : null;
     const datepickerProps = Object.assign({ 
         // this is OK as long as we do not support range datepicker
         value: dateValue, onChange: (dateValue) => { var _a; 

package/src/View/FreeTextColumn/FreeTextColumnSummary.js

@@ -49,8 +49,7 @@ class FreeTextColumnSummaryComponent extends React.Component {
             this.state.editedAdaptableObject && (React.createElement(FreeTextColumnWizard_1.FreeTextColumnWizard, { moduleInfo: this.props.moduleInfo, data: this.state.editedAdaptableObject, configEntities: this.props.FreeTextColumns, onCloseWizard: () => this.onCloseWizard(), onFinishWizard: this.onFinishWizard }))));
     }
     onNew() {
-        const specialColumnsAreFilterable = this.props.api.internalApi.getAdaptableOptions().filterOptions.enableFilterOnSpecialColumns;
-        let configEntity = ObjectFactory_1.ObjectFactory.CreateEmptyFreeTextColumn(specialColumnsAreFilterable);
+        let configEntity = ObjectFactory_1.ObjectFactory.CreateEmptyFreeTextColumn();
         configEntity.ColumnId = this.props.summarisedColumn.columnId;
         this.setState({
             editedAdaptableObject: configEntity,

package/src/View/FreeTextColumn/Wizard/FreeTextColumnSettingsWizardSection.d.ts

@@ -2,7 +2,7 @@
 import { FreeTextColumn } from '../../../PredefinedConfig/FreeTextColumnState';
 import { AdaptableApi } from '../../../Api/AdaptableApi';
 export declare const renderFreeTextColumnSummary: (data: FreeTextColumn) => JSX.Element;
-export declare const isValidFreeTextColumn: (data: FreeTextColumn, api: AdaptableApi) => true | "Column Id cannot be empty" | "No data type specified for column" | "A Column already exists with that id";
+export declare const isValidFreeTextColumn: (data: FreeTextColumn, api: AdaptableApi) => true | "Column Id cannot be empty" | "A Column already exists with that id" | "No data type specified for column";
 export declare type FreeTextColumnSettingsWizardSectionProps = {
     onChange: (data: FreeTextColumn) => void;
     isEdit: boolean;

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

@@ -23,7 +23,7 @@ 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_1.default.CreateEmptyFreeTextColumn(false);
+        return ObjectFactory_1.default.CreateEmptyFreeTextColumn();
     });
     const dispatch = react_redux_1.useDispatch();
     const isEdit = props.data || ((_a = props.popupParams) === null || _a === void 0 ? void 0 : _a.action) === 'Edit';

package/src/agGrid/Adaptable.d.ts

@@ -210,6 +210,7 @@ export declare class Adaptable implements IAdaptable {
     selectCells(columnIds: string[], startNode: RowNode, endNode: RowNode): void;
     isRowNodeVisible(rowNode: RowNode): boolean;
     redrawBody(): void;
+    redrawRenderedRows(): void;
     redrawHeader(): void;
     redrawRow(rowNode: RowNode): void;
     redrawRows(rowNodes: RowNode[]): void;