@adaptabletools/adaptable-cjs 20.0.0-canary.2 → 20.0.0-canary.21

package/src/PredefinedConfig/FlashingCellState.d.ts

@@ -72,4 +72,4 @@ export type SystemFlashingCellPredicateIds = SystemFlashingCellPredicateId[];
 /**
  * List of System Predicates available for Flashing Cells
  */
-export type SystemFlashingCellPredicateId = 'Blanks' | 'NonBlanks' | 'Equals' | 'NotEquals' | 'GreaterThan' | 'LessThan' | 'Positive' | 'Negative' | 'Zero' | 'Between' | 'NotBetween' | 'Is' | 'IsNot' | 'Contains' | 'NotContains' | 'StartsWith' | 'EndsWith' | 'Regex' | 'Today' | 'Yesterday' | 'Tomorrow' | 'ThisWeek' | 'ThisMonth' | 'ThisQuarter' | 'ThisYear' | 'InPast' | 'InFuture' | 'Before' | 'After' | 'On' | 'NotOn' | 'NextWorkDay' | 'LastWorkDay' | 'WorkDay' | 'Holiday' | 'True' | 'False' | 'PercentChange' | 'IsNumeric' | 'IsNotNumeric' | 'In' | 'NotIn' | 'AnyChange';
+export type SystemFlashingCellPredicateId = 'Blanks' | 'NonBlanks' | 'Equals' | 'NotEquals' | 'GreaterThan' | 'LessThan' | 'Positive' | 'Negative' | 'Zero' | 'Between' | 'NotBetween' | 'Is' | 'IsNot' | 'Contains' | 'NotContains' | 'StartsWith' | 'EndsWith' | 'Regex' | 'Today' | 'Yesterday' | 'Tomorrow' | 'ThisWeek' | 'ThisMonth' | 'ThisQuarter' | 'ThisYear' | 'InPast' | 'InFuture' | 'Before' | 'After' | 'On' | 'NotOn' | 'NextWorkDay' | 'LastWorkDay' | 'WorkDay' | 'Holiday' | 'True' | 'False' | 'PercentChange' | 'In' | 'NotIn' | 'AnyChange';

package/src/PredefinedConfig/LayoutState.d.ts

@@ -51,7 +51,7 @@ export interface LayoutBase extends AdaptableObject {
      */
     ColumnHeaders?: ColumnStringMap;
     /**
-     * Whether to include aggFunc name in the Column header: e.g. 'sum(Price)' will just be 'Price'
+     * Whether to include aggFunc name in Column header: e.g. 'sum(Price)' becomes 'Price'
      */
     SuppressAggFuncInHeader?: boolean;
     /**
@@ -88,7 +88,7 @@ export interface TableLayout extends LayoutBase {
      */
     RowSummaries?: RowSummary[];
     /**
-     * Columns showing aggregated values in Group Rows; 1st value in record is Column name, 2nd is either aggfunc (e.g. sum, avg etc.) or 'true' (to use default aggfunc)
+     * Columns showing aggregated values in Grouped Rows; a record of ColumnId and aggfunc (e.g. sum) or 'true' (to use default aggfunc)
      */
     TableAggregationColumns?: TableAggregationColumns;
     /**
@@ -100,19 +100,19 @@ export interface TableLayout extends LayoutBase {
      */
     RowGroupDisplayType?: 'single' | 'multi';
     /**
-     * Pivot Columns - can NOT be provided
+     * Pivot Columns - must NOT be provided
      */
     PivotColumns?: never;
     /**
-     * Pivot Group Columns - can NOT be provided
+     * Pivot Group Columns - must NOT be provided
      */
     PivotGroupedColumns?: never;
     /**
-     * Pivot Expansions - can NOT be provided
+     * Pivot Expansions - must NOT be provided
      */
     PivotExpandLevel?: never;
     /**
-     * Pivot Aggregation Columns - can NOT be provided
+     * Pivot Aggregation Columns - must NOT be provided
      */
     PivotAggregationColumns?: never;
 }
@@ -125,7 +125,7 @@ export interface PivotLayout extends LayoutBase {
      */
     PivotColumns: string[];
     /**
-     * How deep to expand Pivots
+     * How deep to expand Pivot Columns (0 for none, 1 for 1st level only etc, -1 to expand all)
      */
     PivotExpandLevel?: number;
     /**
@@ -137,31 +137,31 @@ export interface PivotLayout extends LayoutBase {
      */
     PivotGroupedColumns?: string[];
     /**
-     * Table Columns - can NOT be provided
+     * Table Columns - must NOT be provided
      */
     TableColumns?: never;
     /**
-     * Table Aggregation Columns - can NOT be provided
+     * Table Aggregation Columns - must NOT be provided
      */
     TableAggregationColumns?: never;
     /**
-     * Row Grouped Columns Columns - can NOT be provided
+     * Row Grouped Columns Columns - must NOT be provided
      */
     RowGroupedColumns?: never;
 }
-/**
- * Object used for defining which Row Group Values are Expanded or Collapsed
- */
-export type RowGroupValuesWithExceptionKeys = {
-    RowGroupDefaultBehavior: 'expanded' | 'collapsed';
-    ExceptionGroupKeys?: any[][];
-};
 /**
  * Manages how (and which) Row Group values are stored
  */
 export type RowGroupValues = {
     RowGroupDefaultBehavior: 'always-expanded' | 'always-collapsed';
 } | RowGroupValuesWithExceptionKeys;
+/**
+ * Defines which Row Group Values are expanded or collapsed
+ */
+export type RowGroupValuesWithExceptionKeys = {
+    RowGroupDefaultBehavior: 'expanded' | 'collapsed';
+    ExceptionGroupKeys?: any[][];
+};
 /**
  * Defines a map of Columns with a String value
  */

package/src/PredefinedConfig/StyledColumnState.d.ts

@@ -32,7 +32,7 @@ export interface StyledColumn extends SuspendableObject {
     /**
      * Displays a Sparkline Chart in an array column
      */
-    SparkLineStyle?: SparklineStyle;
+    SparklineStyle?: SparklineStyle;
     /**
      * Displays cell values in Column as a Badge
      */

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

@@ -99,7 +99,8 @@ export interface LayoutColumnFilterEditAction extends LayoutColumnFilterAction {
 }
 export interface LayoutColumnFilterSetAction extends LayoutColumnFilterAction {
 }
-export interface LayoutColumnFilterClearAction extends LayoutColumnFilterAction {
+export interface LayoutColumnFilterClearAction extends Redux.Action {
+    columnId: string;
 }
 export interface LayoutColumnFilterClearAllAction extends Redux.Action {
 }
@@ -121,7 +122,7 @@ export declare const LayoutColumnFilterAdd: (columnFilter: ColumnFilter) => Layo
 export declare const LayoutColumnFilterEdit: (columnFilter: ColumnFilter) => LayoutColumnFilterEditAction;
 export declare const LayoutColumnFilterSet: (columnFilter: ColumnFilter) => LayoutColumnFilterSetAction;
 export declare const LayoutColumnFilterClearAll: () => LayoutColumnFilterClearAllAction;
-export declare const LayoutColumnFilterClear: (columnFilter: ColumnFilter) => LayoutColumnFilterClearAction;
+export declare const LayoutColumnFilterClear: (columnId: string) => LayoutColumnFilterClearAction;
 export declare const LayoutColumnFilterSuspend: (columnFilter: ColumnFilter) => LayoutColumnFilterSuspendAction;
 export declare const LayoutColumnFilterUnSuspend: (columnFilter: ColumnFilter) => LayoutColumnFilterUnSuspendAction;
 export declare const LayoutColumnFilterSuspendAll: () => LayoutColumnFilterSuspendAllAction;
@@ -180,7 +181,7 @@ export declare const getCurrentLayoutSelector: (state: AdaptableState) => Layout
 export declare const getColumnFilterSelector: (state: AdaptableState, columnId: string) => {
     ColumnId: string;
     Predicates: import("../../types").ColumnFilterPredicate[];
-    PredicatesLogic?: "AND" | "OR";
+    PredicatesOperator?: import("../../types").PredicatesOperator;
     IsSuspended?: boolean;
     Uuid?: string;
     Source?: "Config" | "User";

package/src/Redux/ActionsReducers/LayoutRedux.js

@@ -113,9 +113,9 @@ const LayoutColumnFilterClearAll = () => ({
     type: exports.LAYOUT_COLUMN_FILTER_CLEAR_ALL,
 });
 exports.LayoutColumnFilterClearAll = LayoutColumnFilterClearAll;
-const LayoutColumnFilterClear = (columnFilter) => ({
+const LayoutColumnFilterClear = (columnId) => ({
     type: exports.LAYOUT_COLUMN_FILTER_CLEAR,
-    columnFilter,
+    columnId,
 });
 exports.LayoutColumnFilterClear = LayoutColumnFilterClear;
 const LayoutColumnFilterSuspend = (columnFilter) => ({
@@ -366,7 +366,7 @@ const LayoutReducer = (state = initialState, action) => {
             const actionTypedDelete = action;
             const columnFilters = (currentLayout.ColumnFilters ?? []).filter((cf) => {
                 // make sure we are deleting all filters on the same column
-                return cf.ColumnId !== actionTypedDelete.columnFilter.ColumnId;
+                return cf.ColumnId !== actionTypedDelete.columnId;
             });
             const Layouts = state.Layouts.map((layout) => {
                 if (layout.Name === currentLayout.Name) {

package/src/Redux/Store/AdaptableStore.js

@@ -507,7 +507,7 @@ const adaptableMiddleware = (adaptable) => (function(middlewareAPI) {
                     let returnAction = next(action);
                     adaptable.api.gridApi.refreshAllCells(true);
                     // if set then return a query on the text
-                    if (adaptable.adaptableOptions.quickSearchOptions.filterResultsAfterQuickSearch) {
+                    if (adaptable.adaptableOptions.quickSearchOptions.filterGridAfterQuickSearch) {
                         const actionTyped = action;
                         const searchText = actionTyped.quickSearchText;
                         if (StringExtensions_1.StringExtensions.IsNotNullOrEmpty(searchText)) {
@@ -667,7 +667,7 @@ const adaptableMiddleware = (adaptable) => (function(middlewareAPI) {
                     }
                     return ret;
                 }
-                case InternalRedux.HIGHLIGHT_CELL_DELETE_ALL: {
+                case InternalRedux.HIGHLIGHT_ROW_DELETE_ALL: {
                     const rowHighlightInfos = middlewareAPI.getState().Internal.RowHighlightInfo;
                     const ret = next(action);
                     rowHighlightInfos.forEach((rowHighlightInfo) => {

package/src/Strategy/ColumnFilterModule.js

@@ -59,7 +59,7 @@ class ColumnFilterModule extends AdaptableModuleBase_1.AdaptableModuleBase {
             }
             const existingColumnFilter = this.api.filterApi.columnFilterApi.getColumnFilterForColumn(column.columnId);
             if (existingColumnFilter) {
-                columnFilterMenuItems.push(this.createMenuItemReduxAction('column-filter-clear', 'Clear Filter', 'close', LayoutRedux.LayoutColumnFilterClear(existingColumnFilter)));
+                columnFilterMenuItems.push(this.createMenuItemReduxAction('column-filter-clear', 'Clear Filter', 'close', LayoutRedux.LayoutColumnFilterClear(existingColumnFilter.ColumnId)));
                 columnFilterMenuItems.push(this.createMenuItemReduxAction(existingColumnFilter.IsSuspended ? 'column-filter-unsuspend' : 'column-filter-suspend', existingColumnFilter.IsSuspended ? 'Unsuspend Filter' : 'Suspend Filter', existingColumnFilter.IsSuspended ? 'resume' : 'pause', existingColumnFilter.IsSuspended
                     ? LayoutRedux.LayoutColumnFilterUnSuspend(existingColumnFilter)
                     : LayoutRedux.LayoutColumnFilterSuspend(existingColumnFilter)));
@@ -92,7 +92,7 @@ class ColumnFilterModule extends AdaptableModuleBase_1.AdaptableModuleBase {
                 }
                 else {
                     return [
-                        this.createMenuItemReduxAction('column-filter-clear', 'Clear Filter', 'close', LayoutRedux.LayoutColumnFilterClear(existingColumnFilter)),
+                        this.createMenuItemReduxAction('column-filter-clear', 'Clear Filter', 'close', LayoutRedux.LayoutColumnFilterClear(existingColumnFilter.ColumnId)),
                         this.createMenuItemClickFunction(existingColumnFilter.IsSuspended
                             ? 'column-filter-unsuspend'
                             : 'column-filter-suspend', existingColumnFilter.IsSuspended ? 'Unsuspend Filter' : 'Suspend Filter', existingColumnFilter.IsSuspended ? 'resume' : 'pause', existingColumnFilter.IsSuspended
@@ -149,8 +149,8 @@ class ColumnFilterModule extends AdaptableModuleBase_1.AdaptableModuleBase {
             getCompactUnSuspendAction: (columnFilter) => LayoutRedux.LayoutColumnFilterUnSuspend(columnFilter),
             getSuspendAllAction: () => LayoutRedux.LayoutColumnFilterSuspendAll(),
             getUnSuspendAllAction: () => LayoutRedux.LayoutColumnFilterUnSuspendAll(),
-            getDeleteAction: LayoutRedux.LayoutColumnFilterClear,
-            getCompactDeleteAction: LayoutRedux.LayoutColumnFilterClear,
+            getDeleteAction: (columnFilter) => LayoutRedux.LayoutColumnFilterClear(columnFilter.ColumnId),
+            getCompactDeleteAction: (columnFilter) => LayoutRedux.LayoutColumnFilterClear(columnFilter.ColumnId),
             getDeleteAllAction: LayoutRedux.LayoutColumnFilterClearAll,
             emptyView: `
         There are no Column Filters applied. \n

package/src/Strategy/StyledColumnModule.js

@@ -39,12 +39,12 @@ class StyledColumnModule extends AdaptableModuleBase_1.AdaptableModuleBase {
                     // because if just one then it was created in AG Grid and we dont want to edit it
                 }
                 else {
-                    const hasSparklineStyle = styledColumn != null && styledColumn.SparkLineStyle != null;
+                    const hasSparklineStyle = styledColumn != null && styledColumn.SparklineStyle != null;
                     if (!hasSparklineStyle) {
                         styledColumn = {
                             ...ObjectFactory_1.default.CreateEmptyStyledColumn(),
                             ColumnId: column.columnId,
-                            SparkLineStyle: {},
+                            SparklineStyle: {},
                         };
                     }
                     let label = hasSparklineStyle ? 'Edit ' : 'Create ';
@@ -52,7 +52,7 @@ class StyledColumnModule extends AdaptableModuleBase_1.AdaptableModuleBase {
                         ? 'styled-column-sparkline-edit'
                         : 'styled-column-sparkline-add';
                     let popupParam = {
-                        action: sparklineColumnExists ? 'Edit' : 'New',
+                        action: hasSparklineStyle ? 'Edit' : 'New',
                         source: 'ColumnMenu',
                         value: styledColumn,
                         config: {
@@ -165,7 +165,7 @@ class StyledColumnModule extends AdaptableModuleBase_1.AdaptableModuleBase {
         else if (styledColumn.PercentBarStyle) {
             return 'percent';
         }
-        else if (styledColumn.SparkLineStyle) {
+        else if (styledColumn.SparklineStyle) {
             return 'spark-line';
         }
         else if (styledColumn.BadgeStyle) {
@@ -252,7 +252,7 @@ class StyledColumnModule extends AdaptableModuleBase_1.AdaptableModuleBase {
         else if (styledColumn.PercentBarStyle) {
             type = 'Percent Bar';
         }
-        else if (styledColumn.SparkLineStyle) {
+        else if (styledColumn.SparklineStyle) {
             type = 'Spark Line';
         }
         else if (styledColumn.BadgeStyle) {
@@ -268,7 +268,7 @@ class StyledColumnModule extends AdaptableModuleBase_1.AdaptableModuleBase {
         else if (styledColumn.PercentBarStyle) {
             type = 'styled-column-percent-bar-edit';
         }
-        else if (styledColumn.SparkLineStyle) {
+        else if (styledColumn.SparklineStyle) {
             type = 'styled-column-sparkline-edit';
         }
         else if (styledColumn.BadgeStyle) {

package/src/Utilities/ExpressionFunctions/aggregatedScalarExpressionFunctions.js

@@ -1,12 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.addGroupByParams = exports.aggregatedScalarExpressionFunctionNames = exports.aggregatedScalarExpressionFunctions = exports.quantileAggregatedExpressionFunctions = exports.cumulativeAggregatedExpressionFunctions = exports.aggregatedExpressionFunctions = void 0;
-const tslib_1 = require("tslib");
 const ExpressionEvaluationError_1 = require("../../parser/src/ExpressionEvaluationError");
 const ArrayExtensions_1 = require("../Extensions/ArrayExtensions");
 const TypeExtensions_1 = require("../Extensions/TypeExtensions");
 const expressionFunctionUtils_1 = require("./expressionFunctionUtils");
-const isAfter_1 = tslib_1.__importDefault(require("date-fns/isAfter"));
+const date_fns_1 = require("date-fns");
 const DateHelper_1 = require("../Helpers/DateHelper");
 exports.aggregatedExpressionFunctions = [
     'SUM',
@@ -589,7 +588,7 @@ exports.aggregatedScalarExpressionFunctions = {
                                 }
                                 else {
                                     // Date
-                                    return (0, isAfter_1.default)((0, DateHelper_1.parseDateValue)(rowValue), (0, DateHelper_1.parseDateValue)(minValue))
+                                    return (0, date_fns_1.isAfter)((0, DateHelper_1.parseDateValue)(rowValue), (0, DateHelper_1.parseDateValue)(minValue))
                                         ? minValue
                                         : rowValue;
                                 }
@@ -653,7 +652,7 @@ exports.aggregatedScalarExpressionFunctions = {
                                 }
                                 else {
                                     // Date
-                                    return (0, isAfter_1.default)((0, DateHelper_1.parseDateValue)(rowValue), (0, DateHelper_1.parseDateValue)(maxValue))
+                                    return (0, date_fns_1.isAfter)((0, DateHelper_1.parseDateValue)(rowValue), (0, DateHelper_1.parseDateValue)(maxValue))
                                         ? rowValue
                                         : maxValue;
                                 }
@@ -1245,7 +1244,7 @@ const mapAggregationToCumulation = (aggregationParameter, overColumnParameter, c
                     if (isDefinedValue(rowValue)) {
                         if (aggregationEvaluation.columnType === 'date') {
                             if (cumulationBag.currentValue === aggregationReducer.initialValue ||
-                                (0, isAfter_1.default)((0, DateHelper_1.parseDateValue)(cumulationBag.currentValue), (0, DateHelper_1.parseDateValue)(rowValue))) {
+                                (0, date_fns_1.isAfter)((0, DateHelper_1.parseDateValue)(cumulationBag.currentValue), (0, DateHelper_1.parseDateValue)(rowValue))) {
                                 cumulationBag.currentValue = rowValue;
                             }
                         }
@@ -1271,7 +1270,7 @@ const mapAggregationToCumulation = (aggregationParameter, overColumnParameter, c
                         if (isDefinedValue(rowValue)) {
                             if (aggregationEvaluation.columnType === 'date') {
                                 if (cumulationBag.currentValue === aggregationReducer.initialValue ||
-                                    (0, isAfter_1.default)((0, DateHelper_1.parseDateValue)(rowValue), (0, DateHelper_1.parseDateValue)(cumulationBag.currentValue))) {
+                                    (0, date_fns_1.isAfter)((0, DateHelper_1.parseDateValue)(rowValue), (0, DateHelper_1.parseDateValue)(cumulationBag.currentValue))) {
                                     cumulationBag.currentValue = rowValue;
                                 }
                             }

package/src/Utilities/ExpressionFunctions/booleanExpressionFunctions.js

@@ -1,10 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.isBooleanAdaptableQlFunction = exports.booleanExpressionFunctionsNames = exports.booleanExpressionFunctions = void 0;
-const tslib_1 = require("tslib");
-const isAfter_1 = tslib_1.__importDefault(require("date-fns/isAfter"));
-const isBefore_1 = tslib_1.__importDefault(require("date-fns/isBefore"));
-const isEqual_1 = tslib_1.__importDefault(require("date-fns/isEqual"));
+const date_fns_1 = require("date-fns");
+const date_fns_2 = require("date-fns");
+const date_fns_3 = require("date-fns");
 const ExpressionEvaluationError_1 = require("../../parser/src/ExpressionEvaluationError");
 const expressionFunctionUtils_1 = require("./expressionFunctionUtils");
 const TypeExtensions_1 = require("../Extensions/TypeExtensions");
@@ -69,7 +68,7 @@ exports.booleanExpressionFunctions = {
     EQ: {
         handler(args, context) {
             if (args[0] instanceof Date && args[1] instanceof Date) {
-                return (0, isEqual_1.default)(args[0], args[1]);
+                return (0, date_fns_3.isEqual)(args[0], args[1]);
             }
             if (typeof args[0] === 'string' || typeof args[1] === 'string') {
                 const [first, second] = (0, expressionFunctionUtils_1.getStringValues)(context, String(args[0]), String(args[1]));
@@ -93,7 +92,7 @@ exports.booleanExpressionFunctions = {
     NEQ: {
         handler(args, context) {
             if (args[0] instanceof Date && args[1] instanceof Date) {
-                return !(0, isEqual_1.default)(args[0], args[1]);
+                return !(0, date_fns_3.isEqual)(args[0], args[1]);
             }
             if (typeof args[0] === 'string' || typeof args[1] === 'string') {
                 const [first, second] = (0, expressionFunctionUtils_1.getStringValues)(context, String(args[0]), String(args[1]));
@@ -117,7 +116,7 @@ exports.booleanExpressionFunctions = {
     LT: {
         handler(args, context) {
             if (args[0] instanceof Date && args[1] instanceof Date) {
-                return (0, isBefore_1.default)(args[0], args[1]);
+                return (0, date_fns_2.isBefore)(args[0], args[1]);
             }
             if (typeof args[0] === 'string' || typeof args[1] === 'string') {
                 const [first, second] = (0, expressionFunctionUtils_1.getStringValues)(context, String(args[0]), String(args[1]));
@@ -144,7 +143,7 @@ exports.booleanExpressionFunctions = {
     LTE: {
         handler(args, context) {
             if (args[0] instanceof Date && args[1] instanceof Date) {
-                return (0, isBefore_1.default)(args[0], args[1]) || (0, isEqual_1.default)(args[0], args[1]);
+                return (0, date_fns_2.isBefore)(args[0], args[1]) || (0, date_fns_3.isEqual)(args[0], args[1]);
             }
             if (typeof args[0] === 'string' || typeof args[1] === 'string') {
                 const [first, second] = (0, expressionFunctionUtils_1.getStringValues)(context, String(args[0]), String(args[1]));
@@ -171,7 +170,7 @@ exports.booleanExpressionFunctions = {
     GT: {
         handler(args, context) {
             if (args[0] instanceof Date && args[1] instanceof Date) {
-                return (0, isAfter_1.default)(args[0], args[1]);
+                return (0, date_fns_1.isAfter)(args[0], args[1]);
             }
             if (typeof args[0] === 'string' || typeof args[1] === 'string') {
                 const [first, second] = (0, expressionFunctionUtils_1.getStringValues)(context, String(args[0]), String(args[1]));
@@ -198,7 +197,7 @@ exports.booleanExpressionFunctions = {
     GTE: {
         handler(args, context) {
             if (args[0] instanceof Date && args[1] instanceof Date) {
-                return (0, isAfter_1.default)(args[0], args[1]) || (0, isEqual_1.default)(args[0], args[1]);
+                return (0, date_fns_1.isAfter)(args[0], args[1]) || (0, date_fns_3.isEqual)(args[0], args[1]);
             }
             if (typeof args[0] === 'string' || typeof args[1] === 'string') {
                 const [first, second] = (0, expressionFunctionUtils_1.getStringValues)(context, String(args[0]), String(args[1]));

package/src/Utilities/ExpressionFunctions/scalarExpressionFunctions.js

@@ -3,19 +3,19 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.scalarExpressionFunctionNames = exports.scalarExpressionFunctions = void 0;
 const tslib_1 = require("tslib");
 const ExpressionEvaluationError_1 = require("../../parser/src/ExpressionEvaluationError");
-const parseISO_1 = tslib_1.__importDefault(require("date-fns/parseISO"));
-const startOfDay_1 = tslib_1.__importDefault(require("date-fns/startOfDay"));
-const startOfWeek_1 = tslib_1.__importDefault(require("date-fns/startOfWeek"));
-const startOfMonth_1 = tslib_1.__importDefault(require("date-fns/startOfMonth"));
-const startOfYear_1 = tslib_1.__importDefault(require("date-fns/startOfYear"));
-const addDays_1 = tslib_1.__importDefault(require("date-fns/addDays"));
-const addWeeks_1 = tslib_1.__importDefault(require("date-fns/addWeeks"));
-const addMonths_1 = tslib_1.__importDefault(require("date-fns/addMonths"));
-const addYears_1 = tslib_1.__importDefault(require("date-fns/addYears"));
-const differenceInDays_1 = tslib_1.__importDefault(require("date-fns/differenceInDays"));
-const differenceInWeeks_1 = tslib_1.__importDefault(require("date-fns/differenceInWeeks"));
-const differenceInMonths_1 = tslib_1.__importDefault(require("date-fns/differenceInMonths"));
-const differenceInYears_1 = tslib_1.__importDefault(require("date-fns/differenceInYears"));
+const date_fns_1 = require("date-fns");
+const date_fns_2 = require("date-fns");
+const date_fns_3 = require("date-fns");
+const date_fns_4 = require("date-fns");
+const date_fns_5 = require("date-fns");
+const date_fns_6 = require("date-fns");
+const date_fns_7 = require("date-fns");
+const date_fns_8 = require("date-fns");
+const date_fns_9 = require("date-fns");
+const date_fns_10 = require("date-fns");
+const date_fns_11 = require("date-fns");
+const date_fns_12 = require("date-fns");
+const date_fns_13 = require("date-fns");
 const expressionFunctionUtils_1 = require("./expressionFunctionUtils");
 const dateUtils_1 = require("./dateUtils");
 const StringExtensions_1 = tslib_1.__importDefault(require("../Extensions/StringExtensions"));
@@ -377,7 +377,7 @@ exports.scalarExpressionFunctions = {
     },
     DATE: {
         handler(args) {
-            return (0, parseISO_1.default)(args[0]);
+            return (0, date_fns_1.parseISO)(args[0]);
         },
         description: 'Returns a new date by parsing the given string in ISO 8601 format',
         signatures: [
@@ -402,7 +402,7 @@ exports.scalarExpressionFunctions = {
     },
     CURRENT_DAY: {
         handler() {
-            return (0, startOfDay_1.default)(new Date());
+            return (0, date_fns_2.startOfDay)(new Date());
         },
         description: 'Returns the current day',
         signatures: ['CURRENT_DAY()'],
@@ -412,7 +412,7 @@ exports.scalarExpressionFunctions = {
     },
     DAY: {
         handler(args) {
-            return (0, startOfDay_1.default)(args[0]);
+            return (0, date_fns_2.startOfDay)(args[0]);
         },
         description: 'Returns the day from a date',
         signatures: ['DAY(input: date)'],
@@ -422,7 +422,7 @@ exports.scalarExpressionFunctions = {
     },
     WEEK: {
         handler(args) {
-            return (0, startOfWeek_1.default)(args[0]);
+            return (0, date_fns_3.startOfWeek)(args[0]);
         },
         description: 'Returns the week from a date',
         signatures: ['WEEK(input: date)'],
@@ -432,7 +432,7 @@ exports.scalarExpressionFunctions = {
     },
     MONTH: {
         handler(args) {
-            return (0, startOfMonth_1.default)(args[0]);
+            return (0, date_fns_4.startOfMonth)(args[0]);
         },
         description: 'Returns the month from a date',
         signatures: ['MONTH(input: date)'],
@@ -442,7 +442,7 @@ exports.scalarExpressionFunctions = {
     },
     YEAR: {
         handler(args) {
-            return (0, startOfYear_1.default)(args[0]);
+            return (0, date_fns_5.startOfYear)(args[0]);
         },
         description: 'Returns the year from a date',
         signatures: ['YEAR(input: date)'],
@@ -452,7 +452,7 @@ exports.scalarExpressionFunctions = {
     },
     ADD_DAYS: {
         handler(args) {
-            return (0, addDays_1.default)(args[0], args[1]);
+            return (0, date_fns_6.addDays)(args[0], args[1]);
         },
         description: 'Returns a date based on input data and days to add',
         signatures: ['ADD_DAYS(input: date, days: number)'],
@@ -462,7 +462,7 @@ exports.scalarExpressionFunctions = {
     },
     ADD_WEEKS: {
         handler(args) {
-            return (0, addWeeks_1.default)(args[0], args[1]);
+            return (0, date_fns_7.addWeeks)(args[0], args[1]);
         },
         description: 'Returns a date based on input data and weeks to add',
         signatures: ['ADD_WEEKS(input: date, weeks: number)'],
@@ -472,7 +472,7 @@ exports.scalarExpressionFunctions = {
     },
     ADD_MONTHS: {
         handler(args) {
-            return (0, addMonths_1.default)(args[0], args[1]);
+            return (0, date_fns_8.addMonths)(args[0], args[1]);
         },
         description: 'Returns a date based on input data and months to add',
         signatures: ['ADD_MONTHS(input: date, months: number)'],
@@ -482,7 +482,7 @@ exports.scalarExpressionFunctions = {
     },
     ADD_YEARS: {
         handler(args) {
-            return (0, addYears_1.default)(args[0], args[1]);
+            return (0, date_fns_9.addYears)(args[0], args[1]);
         },
         description: 'Returns a date based on input data and years to add',
         signatures: ['ADD_YEARS(input: date, years: number)'],
@@ -493,7 +493,7 @@ exports.scalarExpressionFunctions = {
     DIFF_DAYS: {
         handler(args) {
             const [first, second] = (0, dateUtils_1.normalizeDateParams)(args);
-            const result = (0, differenceInDays_1.default)(first, second);
+            const result = (0, date_fns_10.differenceInDays)(first, second);
             return sanitizeNumericResult(result);
         },
         description: 'Returns the difference in days between 2 dates',
@@ -505,7 +505,7 @@ exports.scalarExpressionFunctions = {
     DIFF_WEEKS: {
         handler(args) {
             const [first, second] = (0, dateUtils_1.normalizeDateParams)(args);
-            const result = (0, differenceInWeeks_1.default)(first, second);
+            const result = (0, date_fns_11.differenceInWeeks)(first, second);
             return sanitizeNumericResult(result);
         },
         description: 'Returns the difference in weeks between 2 dates',
@@ -517,7 +517,7 @@ exports.scalarExpressionFunctions = {
     DIFF_MONTHS: {
         handler(args) {
             const [first, second] = (0, dateUtils_1.normalizeDateParams)(args);
-            const result = (0, differenceInMonths_1.default)(first, second);
+            const result = (0, date_fns_12.differenceInMonths)(first, second);
             return sanitizeNumericResult(result);
         },
         description: 'Returns the difference in months between 2 dates',
@@ -529,7 +529,7 @@ exports.scalarExpressionFunctions = {
     DIFF_YEARS: {
         handler(args) {
             const [first, second] = (0, dateUtils_1.normalizeDateParams)(args);
-            const result = (0, differenceInYears_1.default)(first, second);
+            const result = (0, date_fns_13.differenceInYears)(first, second);
             return sanitizeNumericResult(result);
         },
         description: 'Returns the difference in years between 2 dates',

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

@@ -4,6 +4,7 @@ import { AccessLevel } from '../../PredefinedConfig/Common/Entitlement';
 export declare function initPredefinedConfigWithUuids(predefinedConfig: PredefinedConfig): PredefinedConfig;
 export declare function getAccessLevelForObject(adaptableObject: AdaptableObject, moduleAccessLevel: AccessLevel): AccessLevel;
 export declare function addAdaptableObjectPrimitives<T extends AdaptableObject>(adaptableObject: T): T;
+export declare function removeAdaptableObjectPrimitivesInline(target: any): any;
 export declare function removeAdaptableObjectPrimitives<T extends AdaptableObject>(adaptableObject: T): T;
 export declare function isAdaptableObject(object: unknown): object is AdaptableObject;
 export declare const AdaptableHelper: {
@@ -11,6 +12,7 @@ export declare const AdaptableHelper: {
     getAccessLevelForObject: typeof getAccessLevelForObject;
     addAdaptableObjectPrimitives: typeof addAdaptableObjectPrimitives;
     removeAdaptableObjectPrimitives: typeof removeAdaptableObjectPrimitives;
+    removeAdaptableObjectPrimitivesInline: typeof removeAdaptableObjectPrimitivesInline;
     isAdaptableObject: typeof isAdaptableObject;
 };
 export default AdaptableHelper;

package/src/Utilities/Helpers/AdaptableHelper.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.AdaptableHelper = exports.isAdaptableObject = exports.removeAdaptableObjectPrimitives = exports.addAdaptableObjectPrimitives = exports.getAccessLevelForObject = exports.initPredefinedConfigWithUuids = void 0;
+exports.AdaptableHelper = exports.isAdaptableObject = exports.removeAdaptableObjectPrimitives = exports.removeAdaptableObjectPrimitivesInline = exports.addAdaptableObjectPrimitives = exports.getAccessLevelForObject = exports.initPredefinedConfigWithUuids = void 0;
 const tslib_1 = require("tslib");
 const cloneDeepWith_1 = tslib_1.__importDefault(require("lodash/cloneDeepWith"));
 const isPlainObject_1 = tslib_1.__importDefault(require("lodash/isPlainObject"));
@@ -50,6 +50,16 @@ function addAdaptableObjectPrimitives(adaptableObject) {
     return adaptableObject;
 }
 exports.addAdaptableObjectPrimitives = addAdaptableObjectPrimitives;
+function removeAdaptableObjectPrimitivesInline(target) {
+    if (!target || typeof target !== 'object') {
+        return target;
+    }
+    delete target.Source;
+    delete target.Uuid;
+    delete target.AdaptableVersion;
+    return target;
+}
+exports.removeAdaptableObjectPrimitivesInline = removeAdaptableObjectPrimitivesInline;
 function removeAdaptableObjectPrimitives(adaptableObject) {
     const clonedObject = structuredClone(adaptableObject);
     const sanitiseObject = (object) => {
@@ -79,6 +89,7 @@ exports.AdaptableHelper = {
     getAccessLevelForObject,
     addAdaptableObjectPrimitives,
     removeAdaptableObjectPrimitives,
+    removeAdaptableObjectPrimitivesInline,
     isAdaptableObject,
 };
 exports.default = exports.AdaptableHelper;

package/src/Utilities/Helpers/DateHelper.js

@@ -1,9 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 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"));
+const date_fns_1 = require("date-fns");
 const FormatHelper_1 = require("./FormatHelper");
 const AdaptableLogger_1 = require("../../agGrid/AdaptableLogger");
 const isValidDate = (date) => {
@@ -46,10 +44,10 @@ const parseDateValue = (dateValue, dateFormat) => {
     else {
         // typeof dateValue === 'string'
         if (dateFormat) {
-            dateInstance = (0, parse_1.default)(dateValue, dateFormat, new Date());
+            dateInstance = (0, date_fns_1.parse)(dateValue, dateFormat, new Date());
         }
         else {
-            dateInstance = (0, parseISO_1.default)(dateValue);
+            dateInstance = (0, date_fns_1.parseISO)(dateValue);
         }
         if (!(0, exports.isValidDate)(dateInstance)) {
             // last chance: try to use the native Date.parse(), https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Date/parse