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

package/src/Api/Internal/ExportInternalApi.js

@@ -2,18 +2,15 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ExportInternalApi = void 0;
 const tslib_1 = require("tslib");
-const groupBy_1 = tslib_1.__importDefault(require("lodash/groupBy"));
 const ApiBase_1 = require("../Implementation/ApiBase");
+const ag_grid_enterprise_1 = require("ag-grid-enterprise");
 const Uuid_1 = require("../../PredefinedConfig/Uuid");
 const GeneralConstants_1 = require("../../Utilities/Constants/GeneralConstants");
-const ModuleConstants_1 = require("../../Utilities/Constants/ModuleConstants");
-const ArrayExtensions_1 = tslib_1.__importDefault(require("../../Utilities/Extensions/ArrayExtensions"));
 const StringExtensions_1 = tslib_1.__importDefault(require("../../Utilities/Extensions/StringExtensions"));
 const FormatHelper_1 = tslib_1.__importStar(require("../../Utilities/Helpers/FormatHelper"));
 const Helper_1 = tslib_1.__importDefault(require("../../Utilities/Helpers/Helper"));
 const PopupRedux = tslib_1.__importStar(require("../../Redux/ActionsReducers/PopupRedux"));
 const InternalRedux_1 = require("../../Redux/ActionsReducers/InternalRedux");
-const AdaptableLogger_1 = require("../../agGrid/AdaptableLogger");
 class ExportInternalApi extends ApiBase_1.ApiBase {
     /**
      * Value Items for Report Name Selection
@@ -117,7 +114,7 @@ class ExportInternalApi extends ApiBase_1.ApiBase {
             // format is customized based on column data type
             switch (columnDataType) {
                 case 'text':
-                    return dataFormatDataType.string;
+                    return dataFormatDataType.text;
                 case 'number':
                     return dataFormatDataType.number;
                 case 'date':
@@ -215,7 +212,6 @@ class ExportInternalApi extends ApiBase_1.ApiBase {
             return `[${report.Name}]`;
         }
         else {
-            // FIXME AFL: maybe fihnd a better description?
             switch (report.ReportRowScope) {
                 case 'AllRows':
                     return '[All Rows]';
@@ -228,138 +224,12 @@ class ExportInternalApi extends ApiBase_1.ApiBase {
             }
         }
     }
-    getReportDataColumns(report, includePrimaryKey = false) {
-        let reportColumns = [];
-        let gridColumns = this.getAdaptableApi().columnApi.getExportableColumns();
-        if (this.getAdaptableApi().exportApi.isExternalReport(report)) {
-            return reportColumns;
-        }
-        // first get the cols depending on the Column Scope
-        switch (report.ReportColumnScope) {
-            case 'AllColumns':
-                reportColumns = gridColumns;
-                break;
-            case 'VisibleColumns':
-                reportColumns = gridColumns.filter((c) => c.visible);
-                break;
-            case 'SelectedColumns':
-                // we extract the selected columns from the grid columns to preserve the grid column order
-                const selectedColumnIds = this.getAdaptableApi()
-                    .gridApi.getSelectedCellInfo()
-                    .columns.map((column) => column.columnId);
-                reportColumns = gridColumns.filter((gridColumn) => selectedColumnIds.includes(gridColumn.columnId));
-                break;
-            case 'ScopeColumns':
-                if ('ColumnIds' in report.Scope) {
-                    reportColumns = report.Scope.ColumnIds.map((columnId) => this.getAdaptableApi().columnApi.getColumnWithColumnId(columnId)).filter((c) => c);
-                }
-                else {
-                    reportColumns = this.getAdaptableApi().columnScopeApi.getColumnsInScope(report.Scope);
-                }
-                break;
-        }
-        if (includePrimaryKey) {
-            const pkColumn = reportColumns.find((column) => column.columnId === this.getAdaptableApi().optionsApi.getPrimaryKey());
-            // TODO simplify after we fix the IsPrimaryKey bug
-            // const pkColumn = reportColumns.find(column => column.IsPrimaryKey);
-            if (!pkColumn && !!this.getAdaptableApi().columnApi.getPrimaryKeyColumn()) {
-                reportColumns.push(this.getAdaptableApi().columnApi.getPrimaryKeyColumn());
-            }
-        }
-        return reportColumns;
-    }
-    getReportDataRows(report, columns, includePrimaryKey) {
-        if (ArrayExtensions_1.default.IsNullOrEmpty(columns)) {
-            return [];
-        }
-        const columnIds = columns.map((column) => column.columnId);
-        const resultRowData = [];
-        switch (report.ReportRowScope) {
-            case 'AllRows':
-                this.getAdaptableInternalApi().forAllRowNodesDo((rowNode) => {
-                    resultRowData.push(this.getRowObjectForColumnIds(rowNode, columnIds, report.Name));
-                });
-                break;
-            case 'VisibleRows':
-                this.getAdaptableInternalApi().forAllVisibleRowNodesDo((rowNode) => {
-                    resultRowData.push(this.getRowObjectForColumnIds(rowNode, columnIds, report.Name));
-                });
-                break;
-            case 'ExpressionRows':
-                this.getAdaptableInternalApi().forAllRowNodesDo((rowNode) => {
-                    try {
-                        if (this.getAdaptableApi()
-                            .internalApi.getQueryLanguageService()
-                            .evaluateBooleanExpression(report.Query?.BooleanExpression, ModuleConstants_1.ExportModuleId, rowNode)) {
-                            resultRowData.push(this.getRowObjectForColumnIds(rowNode, columnIds, report.Name));
-                        }
-                    }
-                    catch (error) {
-                        (0, AdaptableLogger_1.errorOnce)(error.message);
-                    }
-                });
-                break;
-            case 'SelectedRows':
-                // CellSelection
-                const selectedCellInfo = this.getAdaptableApi().gridApi.getSelectedCellInfo();
-                const { gridCells: GridCells } = selectedCellInfo;
-                let selectedCellsByPrimaryKey = (0, groupBy_1.default)(GridCells, 'primaryKeyValue');
-                // we iterate over all visibleRowNodes to preserve the current order
-                this.getAdaptableInternalApi().forAllVisibleRowNodesDo((rowNode) => {
-                    const rowPrimaryKeyValue = this.getAdaptableApi().gridApi.getPrimaryKeyValueForRowNode(rowNode);
-                    const selectedRowCells = selectedCellsByPrimaryKey[rowPrimaryKeyValue];
-                    if (selectedRowCells) {
-                        const selectedRowColumnIds = selectedRowCells.map((rowCell) => rowCell.column.columnId);
-                        const selectedColumnIds = columnIds.filter((columnId) => selectedRowColumnIds.includes(columnId));
-                        const row = this.getRowObjectForColumnIds(rowNode, selectedColumnIds, report.Name);
-                        if (includePrimaryKey) {
-                            row[this.getAdaptableApi().optionsApi.getPrimaryKey()] = rowPrimaryKeyValue;
-                        }
-                        resultRowData.push(row);
-                    }
-                });
-                // Row Selection
-                const selectedRowInfo = this.getAdaptableApi().gridApi.getSelectedRowInfo();
-                const selectedGridRowPrimaryKeys = selectedRowInfo?.gridRows
-                    ?.filter((gr) => gr.rowInfo.isGroup == false)
-                    .map((gridRow) => gridRow.primaryKeyValue) ?? [];
-                if (selectedGridRowPrimaryKeys.length) {
-                    this.getAdaptableInternalApi().forAllRowNodesDo((rowNode) => {
-                        const rowPrimaryKeyValue = this.getAdaptableApi().gridApi.getPrimaryKeyValueForRowNode(rowNode);
-                        if (selectedGridRowPrimaryKeys.includes(rowPrimaryKeyValue)) {
-                            resultRowData.push(this.getRowObjectForColumnIds(rowNode, columnIds, report.Name));
-                        }
-                    });
-                }
-                break;
-        }
-        return resultRowData;
-    }
-    getReportData(report, includePrimaryKey = false) {
-        if (this.getAdaptableApi().exportApi.isExternalReport(report)) {
-            return this.getAdaptableApi().exportApi.runExternalReport(report.Name);
-        }
-        const columns = this.getReportDataColumns(report, includePrimaryKey);
-        const rows = this.getReportDataRows(report, columns, includePrimaryKey);
-        return { columns, rows };
-    }
-    getReportDataAsArray(report, includePrimaryKey = false) {
-        const reportData = this.getReportData(report, includePrimaryKey);
-        return this.convertReportDataToArray(reportData);
-    }
     convertReportDataToArray(reportData) {
         return [
             reportData.columns.map((column) => column.friendlyName),
-            ...reportData.rows.map((row) => reportData.columns.map((column) => row[column.columnId])),
+            ...reportData.rows.map((row) => reportData.columns.map((column) => row[column.field ?? column.columnId])),
         ];
     }
-    getRowObjectForColumnIds(rowNode, columnIds, reportName) {
-        return columnIds.reduce((result, columnId) => {
-            // FIXME AFL if this method remains, 'false' should be replaced with dynamic value
-            result[columnId] = this.getCellExportValueFromRowNode(rowNode, columnId, false);
-            return result;
-        }, {});
-    }
     publishLiveLiveDataChangedEvent(reportDestination, liveDataTrigger, liveReport) {
         const liveDataChangedInfo = {
             ...this.getAdaptableInternalApi().buildBaseContext(),
@@ -433,9 +303,8 @@ class ExportInternalApi extends ApiBase_1.ApiBase {
             this.sendReportToCustomDestination(reportResult, report, format, destination);
         }
         if (destination === 'Download') {
-            if (format === 'Excel' || format === 'VisualExcel') {
-                this.logWarn(`Download of Excel files should already be handed by internal APIs, something went wrong`);
-                return;
+            if (reportResult.type === 'excel') {
+                Helper_1.default.createDownloadedFile(reportResult.data, this.getReportFileName(report.Name, format, destination), 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet');
             }
             if (reportResult.type === 'csv') {
                 Helper_1.default.createDownloadedFile(reportResult.data, this.getReportFileName(report.Name, format, destination), 'text/csv;encoding:utf-8');
@@ -494,5 +363,105 @@ class ExportInternalApi extends ApiBase_1.ApiBase {
             exportDestination,
         };
     }
+    createCellCsv(cellContent) {
+        return {
+            data: {
+                value: cellContent != undefined ? String(cellContent) : null,
+            },
+        };
+    }
+    createCellExcel(cellContent, cellType) {
+        return {
+            data: {
+                value: cellContent != undefined ? String(cellContent) : null,
+                type: cellType,
+            },
+        };
+    }
+    createCellHeader(cellContent) {
+        return {
+            data: {
+                value: cellContent != undefined ? String(cellContent) : null,
+                type: 'String',
+            },
+        };
+    }
+    getExternalReportData(externalReportName, reportFormat, exportDestination) {
+        const externalReport = this.getExportApi()
+            .getExternalReports()
+            ?.find((cr) => cr.name == externalReportName);
+        if (!externalReport) {
+            this.logWarn(`External Report '${externalReportName}' not found!`);
+            return undefined;
+        }
+        return externalReport.onExport({
+            ...this.buildBaseExportContext(externalReportName, reportFormat, exportDestination),
+            convertToExcel: this.buildExcelConverter(externalReportName, reportFormat, exportDestination),
+            convertToCsv: this.buildCsvConverter(externalReportName, reportFormat, exportDestination),
+            getGridReportColumns: this.buildGridReportColumns(),
+        });
+    }
+    buildGridReportColumns() {
+        return () => this.getAdaptableApi().columnApi.getColumns();
+    }
+    buildExcelConverter(externalReportName, reportFormat, exportDestination) {
+        return (reportData) => {
+            return this.executeGridExport(reportData, externalReportName, reportFormat, exportDestination, (gridApi, exportParams) => gridApi.getDataAsExcel({ ...exportParams }));
+        };
+    }
+    buildCsvConverter(externalReportName, reportFormat, exportDestination) {
+        return (reportData) => {
+            const csvParams = this.buildCsvExportParams(externalReportName, reportFormat, exportDestination);
+            return this.executeGridExport(reportData, externalReportName, reportFormat, exportDestination, (gridApi, exportParams) => gridApi.getDataAsCsv({ ...exportParams, ...csvParams }));
+        };
+    }
+    executeGridExport(reportData, externalReportName, reportFormat, exportDestination, exportFn) {
+        const htmlDivElement = document.createElement('div');
+        let ephemeralGridApi = null;
+        try {
+            const columnDefs = reportData.columns.map((col) => ({
+                colId: col.columnId,
+                field: col.field ?? col.columnId,
+                headerName: col.friendlyName ?? col.columnId,
+                type: col.dataType ?? 'text',
+            }));
+            const gridOptions = { columnDefs, rowData: reportData.rows };
+            const gridParams = {
+                modules: this.getAdaptableApi()
+                    .internalApi.getAdaptableInstance()
+                    .getAgGridRegisteredModules(),
+            };
+            htmlDivElement.style.display = 'none';
+            document.body.appendChild(htmlDivElement);
+            ephemeralGridApi = (0, ag_grid_enterprise_1.createGrid)(htmlDivElement, gridOptions, gridParams);
+            const exportParams = {
+                fileName: this.getReportFileName(externalReportName, reportFormat, exportDestination),
+                allColumns: true,
+                exportedRows: 'all',
+            };
+            return exportFn(ephemeralGridApi, exportParams);
+        }
+        catch (error) {
+            this.logWarn('Failed to export data:', error);
+            return null;
+        }
+        finally {
+            if (ephemeralGridApi) {
+                ephemeralGridApi.destroy();
+            }
+            if (htmlDivElement?.parentNode) {
+                document.body.removeChild(htmlDivElement);
+            }
+        }
+    }
+    buildCsvExportParams(externalReportName, reportFormat, exportDestination) {
+        const exportOptions = this.getAdaptableApi().optionsApi.getExportOptions();
+        const csvSeparator = typeof exportOptions.csvSeparator === 'function'
+            ? exportOptions.csvSeparator(this.buildBaseExportContext(externalReportName, reportFormat, exportDestination))
+            : exportOptions.csvSeparator;
+        return {
+            columnSeparator: csvSeparator,
+        };
+    }
 }
 exports.ExportInternalApi = ExportInternalApi;

package/src/Api/Internal/RowFormInternalApi.js

@@ -190,7 +190,7 @@ class RowFormInternalApi extends ApiBase_1.ApiBase {
         }
         const returnValues = this.getGridApi().internalApi.getDistinctDisplayValuesForColumnOld(column.columnId);
         // FIXME add support for asynchronous custom select cell editor values
-        // it involves refactoring the AdaptableForm & AdapatableFormComponent
+        // it involves refactoring the AdaptableForm & adaptableFormComponent
         // await this.getSelectCellEditorValuesForColumn(
         //   column,
         //   gridCell

package/src/Api/LayoutApi.d.ts

@@ -176,7 +176,7 @@ export interface LayoutApi {
      */
     addColumnToTableLayout(columnId: string, layoutName: string): void;
     /**
-     * Adds a Column to Current Layout
+     * Adds a Column to Current (Table) Layout
      * @param columnId Column to add
      */
     addColumnToCurrentTableLayout(columnId: string): void;

package/src/Api/ThemeApi.d.ts

@@ -81,6 +81,8 @@ export interface ThemeApi {
     openThemeSettingsPanel(): void;
     /**
      * Get the name of the current AG Grid theme
+     *
+     * @deprecated required only for legacy AG Grid themes, see https://www.ag-grid.com/javascript-data-grid/theming-v32/
      */
     getAgGridCurrentThemeName(): string;
 }

package/src/PredefinedConfig/AlertState.d.ts

@@ -150,4 +150,4 @@ export type SystemAlertPredicateIds = SystemAlertPredicateId[];
 /**
  * List of System Predicates available for Alerts
  */
-export type SystemAlertPredicateId = '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 SystemAlertPredicateId = '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/Common/AdaptableColumnContext.d.ts

@@ -5,7 +5,7 @@ import { BaseContext } from './BaseContext';
  */
 export interface AdaptableColumnContext<TData = any> extends BaseContext {
     /**
-     * Column being filtered
+     * The current Column
      */
     column: AdaptableColumn<TData>;
 }

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

@@ -104,7 +104,7 @@ export interface PredicateDefHandlerContext extends BaseContext {
      * Any (optional) inputs required to perform evaluation
      */
     inputs?: any[];
-    predicatesLogic?: ColumnFilter['PredicatesLogic'];
+    predicatesOperator?: ColumnFilter['PredicatesOperator'];
 }
 /**
  * Inputs required for a Predicate

package/src/PredefinedConfig/Common/AdaptablePredicate.js

@@ -2,19 +2,19 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SystemBadgeStylePredicateIds = exports.SystemFlashingCellPredicateIds = exports.SystemFormatColumnPredicateIds = exports.SystemAlertPredicateIds = exports.SystemFilterPredicateIds = exports.SystemPredicateDefs = 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 isFuture_1 = tslib_1.__importDefault(require("date-fns/isFuture"));
-const isPast_1 = tslib_1.__importDefault(require("date-fns/isPast"));
-const isSameDay_1 = tslib_1.__importDefault(require("date-fns/isSameDay"));
-const isThisMonth_1 = tslib_1.__importDefault(require("date-fns/isThisMonth"));
-const isThisQuarter_1 = tslib_1.__importDefault(require("date-fns/isThisQuarter"));
-const isThisWeek_1 = tslib_1.__importDefault(require("date-fns/isThisWeek"));
-const isThisYear_1 = tslib_1.__importDefault(require("date-fns/isThisYear"));
-const isToday_1 = tslib_1.__importDefault(require("date-fns/isToday"));
-const isTomorrow_1 = tslib_1.__importDefault(require("date-fns/isTomorrow"));
-const isYesterday_1 = tslib_1.__importDefault(require("date-fns/isYesterday"));
+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 StringExtensions_1 = tslib_1.__importDefault(require("../../Utilities/Extensions/StringExtensions"));
 const DateHelper_1 = require("../../Utilities/Helpers/DateHelper");
 const Helper_1 = tslib_1.__importDefault(require("../../Utilities/Helpers/Helper"));
@@ -56,10 +56,10 @@ exports.SystemPredicateDefs = [
             if (column.dataType === 'date') {
                 return inputs.some((input) => {
                     if (adaptableApi.optionsApi.getPredicateOptions().evaluateValuesPredicateUsingTime) {
-                        return (0, isEqual_1.default)(input, value);
+                        return (0, date_fns_3.isEqual)(input, value);
                     }
                     else {
-                        return (0, isSameDay_1.default)((0, DateHelper_1.parseDateValue)(input), (0, DateHelper_1.parseDateValue)(value));
+                        return (0, date_fns_6.isSameDay)((0, DateHelper_1.parseDateValue)(input), (0, DateHelper_1.parseDateValue)(value));
                     }
                 });
             }
@@ -116,12 +116,12 @@ exports.SystemPredicateDefs = [
             if (column.dataType === 'date') {
                 if (adaptableApi.optionsApi.getPredicateOptions().evaluateValuesPredicateUsingTime) {
                     return inputs.every((input) => {
-                        return !(0, isEqual_1.default)(input, value);
+                        return !(0, date_fns_3.isEqual)(input, value);
                     });
                 }
                 else {
                     return inputs.every((input) => {
-                        return !(0, isSameDay_1.default)((0, DateHelper_1.parseDateValue)(input), (0, DateHelper_1.parseDateValue)(value));
+                        return !(0, date_fns_6.isSameDay)((0, DateHelper_1.parseDateValue)(input), (0, DateHelper_1.parseDateValue)(value));
                     });
                 }
             }
@@ -270,22 +270,6 @@ exports.SystemPredicateDefs = [
         toString: ({ inputs }) => `Not Between ${inputs[0] ?? ''}:${inputs[1]}`,
         shortcuts: ['!:'],
     },
-    {
-        id: 'IsNumeric',
-        label: 'Is Numeric',
-        icon: { text: '1' },
-        columnScope: { DataTypes: ['number'] },
-        moduleScope: ['alert', 'flashingcell'],
-        handler: ({ value }) => !isNaN(Number(value)),
-    },
-    {
-        id: 'IsNotNumeric',
-        label: 'Is Not Numeric',
-        icon: { text: '1' },
-        columnScope: { DataTypes: ['number'] },
-        moduleScope: ['alert', 'flashingcell'],
-        handler: ({ value }) => isNaN(Number(value)),
-    },
     // String System Filters
     {
         id: 'Is',
@@ -414,7 +398,7 @@ exports.SystemPredicateDefs = [
         icon: { name: 'calendar' },
         columnScope: { DataTypes: ['date'] },
         moduleScope: ['columnFilter', 'alert', 'flashingcell', 'formatColumn'],
-        handler: ({ value }) => (0, isToday_1.default)((0, DateHelper_1.parseDateValue)(value)),
+        handler: ({ value }) => (0, date_fns_11.isToday)((0, DateHelper_1.parseDateValue)(value)),
     },
     {
         id: 'Yesterday',
@@ -422,7 +406,7 @@ exports.SystemPredicateDefs = [
         icon: { name: 'calendar' },
         columnScope: { DataTypes: ['date'] },
         moduleScope: ['columnFilter', 'alert', 'flashingcell', 'formatColumn'],
-        handler: ({ value }) => (0, isYesterday_1.default)((0, DateHelper_1.parseDateValue)(value)),
+        handler: ({ value }) => (0, date_fns_13.isYesterday)((0, DateHelper_1.parseDateValue)(value)),
     },
     {
         id: 'Tomorrow',
@@ -430,7 +414,7 @@ exports.SystemPredicateDefs = [
         icon: { name: 'calendar' },
         columnScope: { DataTypes: ['date'] },
         moduleScope: ['columnFilter', 'alert', 'flashingcell', 'formatColumn'],
-        handler: ({ value }) => (0, isTomorrow_1.default)((0, DateHelper_1.parseDateValue)(value)),
+        handler: ({ value }) => (0, date_fns_12.isTomorrow)((0, DateHelper_1.parseDateValue)(value)),
     },
     {
         id: 'ThisWeek',
@@ -438,7 +422,7 @@ exports.SystemPredicateDefs = [
         icon: { name: 'calendar' },
         columnScope: { DataTypes: ['date'] },
         moduleScope: ['columnFilter', 'alert', 'flashingcell', 'formatColumn'],
-        handler: ({ value }) => (0, isThisWeek_1.default)((0, DateHelper_1.parseDateValue)(value)),
+        handler: ({ value }) => (0, date_fns_9.isThisWeek)((0, DateHelper_1.parseDateValue)(value)),
     },
     {
         id: 'ThisMonth',
@@ -446,7 +430,7 @@ exports.SystemPredicateDefs = [
         icon: { name: 'calendar' },
         columnScope: { DataTypes: ['date'] },
         moduleScope: ['columnFilter', 'alert', 'flashingcell', 'formatColumn'],
-        handler: ({ value }) => (0, isThisMonth_1.default)((0, DateHelper_1.parseDateValue)(value)),
+        handler: ({ value }) => (0, date_fns_7.isThisMonth)((0, DateHelper_1.parseDateValue)(value)),
     },
     {
         id: 'ThisQuarter',
@@ -454,7 +438,7 @@ exports.SystemPredicateDefs = [
         icon: { name: 'calendar' },
         columnScope: { DataTypes: ['date'] },
         moduleScope: ['columnFilter', 'alert', 'flashingcell', 'formatColumn'],
-        handler: ({ value }) => (0, isThisQuarter_1.default)((0, DateHelper_1.parseDateValue)(value)),
+        handler: ({ value }) => (0, date_fns_8.isThisQuarter)((0, DateHelper_1.parseDateValue)(value)),
     },
     {
         id: 'ThisYear',
@@ -462,7 +446,7 @@ exports.SystemPredicateDefs = [
         icon: { name: 'calendar' },
         columnScope: { DataTypes: ['date'] },
         moduleScope: ['columnFilter', 'alert', 'flashingcell', 'formatColumn'],
-        handler: ({ value }) => (0, isThisYear_1.default)((0, DateHelper_1.parseDateValue)(value)),
+        handler: ({ value }) => (0, date_fns_10.isThisYear)((0, DateHelper_1.parseDateValue)(value)),
     },
     {
         id: 'InPast',
@@ -470,7 +454,7 @@ exports.SystemPredicateDefs = [
         icon: { name: 'calendar' },
         columnScope: { DataTypes: ['date'] },
         moduleScope: ['columnFilter', 'alert', 'flashingcell', 'formatColumn'],
-        handler: ({ value }) => (0, isPast_1.default)((0, DateHelper_1.parseDateValue)(value)),
+        handler: ({ value }) => (0, date_fns_5.isPast)((0, DateHelper_1.parseDateValue)(value)),
     },
     {
         id: 'InFuture',
@@ -478,7 +462,7 @@ exports.SystemPredicateDefs = [
         icon: { name: 'calendar' },
         columnScope: { DataTypes: ['date'] },
         moduleScope: ['columnFilter', 'alert', 'flashingcell', 'formatColumn'],
-        handler: ({ value }) => (0, isFuture_1.default)((0, DateHelper_1.parseDateValue)(value)),
+        handler: ({ value }) => (0, date_fns_4.isFuture)((0, DateHelper_1.parseDateValue)(value)),
     },
     {
         id: 'After',
@@ -487,7 +471,7 @@ exports.SystemPredicateDefs = [
         columnScope: { DataTypes: ['date'] },
         moduleScope: ['columnFilter', 'alert', 'flashingcell', 'formatColumn'],
         inputs: [{ type: 'date' }],
-        handler: ({ value, inputs }) => (0, isAfter_1.default)((0, DateHelper_1.parseDateValue)(value), (0, DateHelper_1.parseDateValue)(inputs[0])),
+        handler: ({ value, inputs }) => (0, date_fns_1.isAfter)((0, DateHelper_1.parseDateValue)(value), (0, DateHelper_1.parseDateValue)(inputs[0])),
         toString: ({ inputs }) => `> ${inputs[0] ?? ''}`,
     },
     {
@@ -497,7 +481,7 @@ exports.SystemPredicateDefs = [
         columnScope: { DataTypes: ['date'] },
         moduleScope: ['columnFilter', 'alert', 'flashingcell', 'formatColumn'],
         inputs: [{ type: 'date' }],
-        handler: ({ value, inputs }) => (0, isBefore_1.default)((0, DateHelper_1.parseDateValue)(value), (0, DateHelper_1.parseDateValue)(inputs[0])),
+        handler: ({ value, inputs }) => (0, date_fns_2.isBefore)((0, DateHelper_1.parseDateValue)(value), (0, DateHelper_1.parseDateValue)(inputs[0])),
         toString: ({ inputs }) => `< ${inputs[0] ?? ''}`,
     },
     {
@@ -507,7 +491,7 @@ exports.SystemPredicateDefs = [
         columnScope: { DataTypes: ['date'] },
         moduleScope: ['columnFilter', 'alert', 'flashingcell', 'formatColumn'],
         inputs: [{ type: 'date' }],
-        handler: ({ value, inputs }) => (0, isSameDay_1.default)((0, DateHelper_1.parseDateValue)(value), (0, DateHelper_1.parseDateValue)(inputs[0])),
+        handler: ({ value, inputs }) => (0, date_fns_6.isSameDay)((0, DateHelper_1.parseDateValue)(value), (0, DateHelper_1.parseDateValue)(inputs[0])),
         toString: ({ inputs }) => `= ${inputs[0] ?? ''}`,
     },
     {
@@ -517,7 +501,7 @@ exports.SystemPredicateDefs = [
         columnScope: { DataTypes: ['date'] },
         moduleScope: ['columnFilter', 'alert', 'flashingcell', 'formatColumn'],
         inputs: [{ type: 'date' }],
-        handler: ({ value, inputs }) => !(0, isSameDay_1.default)((0, DateHelper_1.parseDateValue)(value), (0, DateHelper_1.parseDateValue)(inputs[0])),
+        handler: ({ value, inputs }) => !(0, date_fns_6.isSameDay)((0, DateHelper_1.parseDateValue)(value), (0, DateHelper_1.parseDateValue)(inputs[0])),
         toString: ({ inputs }) => `!= ${inputs[0] ?? ''}`,
     },
     {
@@ -526,7 +510,7 @@ exports.SystemPredicateDefs = [
         icon: { name: 'calendar' },
         columnScope: { DataTypes: ['date'] },
         moduleScope: ['columnFilter', 'alert', 'flashingcell', 'formatColumn'],
-        handler: ({ value, adaptableApi }) => (0, isSameDay_1.default)((0, DateHelper_1.parseDateValue)(value), adaptableApi.calendarApi.getNextWorkingDay()),
+        handler: ({ value, adaptableApi }) => (0, date_fns_6.isSameDay)((0, DateHelper_1.parseDateValue)(value), adaptableApi.calendarApi.getNextWorkingDay()),
     },
     {
         id: 'LastWorkDay',
@@ -534,7 +518,7 @@ exports.SystemPredicateDefs = [
         icon: { name: 'calendar' },
         columnScope: { DataTypes: ['date'] },
         moduleScope: ['columnFilter', 'alert', 'flashingcell', 'formatColumn'],
-        handler: ({ value, adaptableApi }) => (0, isSameDay_1.default)((0, DateHelper_1.parseDateValue)(value), adaptableApi.calendarApi.getPreviousWorkingDay()),
+        handler: ({ value, adaptableApi }) => (0, date_fns_6.isSameDay)((0, DateHelper_1.parseDateValue)(value), adaptableApi.calendarApi.getPreviousWorkingDay()),
     },
     {
         id: 'WorkDay',

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

@@ -13,10 +13,10 @@ export interface ColumnFilter extends SuspendableObject {
      */
     Predicates: ColumnFilterPredicate[];
     /**
-     * The Logic to use when combining multiple Predicates
+     * Logic used when combining multiple Predicates ('AND'|'OR')
      * @defaultValue 'AND'
      */
-    PredicatesLogic?: 'AND' | 'OR';
+    PredicatesOperator?: PredicatesOperator;
 }
 /**
  * A Predicate used in Column Filtering
@@ -24,6 +24,10 @@ export interface ColumnFilter extends SuspendableObject {
 export interface ColumnFilterPredicate extends AdaptablePredicate {
     PredicateId: TypeHint<string, SystemFilterPredicateId>;
 }
+/**
+ * Logic used to join multiple Predicates
+ */
+export type PredicatesOperator = 'AND' | 'OR';
 /**
  * Array containing all System Filter Predicates
  */

package/src/PredefinedConfig/ExportState.d.ts

@@ -3,9 +3,9 @@ import { BaseSchedule } from './Common/Schedule';
 import { ColumnScope } from './Common/ColumnScope';
 import { AdaptableColumnBase } from './Common/AdaptableColumn';
 import { AdaptableObject } from './Common/AdaptableObject';
-import { AdaptableFormData } from './Common/AdaptableForm';
 import { AdaptableBooleanQuery } from './Common/AdaptableQuery';
 import { TypeHint } from './Common/Types';
+import { ExportDestinationType } from '../AdaptableOptions/ExportOptions';
 /**
  * Predefined Configuration for Export Module
  */
@@ -61,9 +61,15 @@ export interface ReportSchedule extends BaseSchedule {
      */
     ReportFormat: ReportFormatType;
     /**
-     * Additional data for a Custom Destination produced by a Dynamic Form
+     * Destination of Report to run on Schedule
      */
-    ExportDestinationData?: AdaptableFormData;
+    ExportDestination?: ExportDestinationType;
+}
+export interface ReportColumn extends AdaptableColumnBase {
+    /**
+     * Field in the row to get cell data from; defaults to `columnId`
+     */
+    field?: string;
 }
 /**
  * Defines the data in a Report run by AdapTable
@@ -76,7 +82,7 @@ export interface ReportData {
     /**
      * Columns in the Report
      */
-    columns: AdaptableColumnBase[];
+    columns: ReportColumn[];
     /**
      * Group columns IDs in the Report
      */
@@ -86,19 +92,6 @@ export interface ReportData {
      */
     pivotColumnIds?: string[];
 }
-/**
- * Row Data in the Report
- */
-export interface ReportRow {
-    /**
-     * Data for the row
-     */
-    data: Record<string, any>;
-    /**
-     * Optional children rows for grouped data
-     */
-    children?: ReportRow[];
-}
 /**
  * System report names provided by AdapTable
  */