@adaptabletools/adaptable 20.0.0-canary.1 → 20.0.0-canary.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adaptabletools/adaptable",
-  "version": "20.0.0-canary.1",
+  "version": "20.0.0-canary.3",
   "description": "Powerful data-agnostic HTML5 AG Grid extension which provides advanced, cutting-edge functionality to meet all DataGrid requirements",
   "keywords": [
     "web-components",

package/src/AdaptableOptions/ActionColumnOptions.d.ts

@@ -84,9 +84,9 @@ export interface ActionColumnSettings {
 /**
  * Button that is displayed inside an Action Column
  */
-export interface ActionColumnButton<ActionColumnButtonContext> extends AdaptableButton<BaseContext> {
+export interface ActionColumnButton<T> extends AdaptableButton<ActionColumnContext<T>> {
     /**
-     * Command to assign to Button; will open a Row Form
+     * Command to assign to Action Column Button that displays a Row Form
      */
     command?: ActionButtonCommand;
 }

package/src/AdaptableOptions/DefaultAdaptableOptions.js

@@ -150,7 +150,7 @@ const DefaultAdaptableOptions = {
             indicateFilteredColumns: true,
             autoApplyColumnFilter: true,
             defaultNumericColumnFilter: 'Equals',
-            defaultStringColumnFilter: 'Contains',
+            defaultTextColumnFilter: 'Contains',
             defaultDateColumnFilter: 'On',
             hideQuickFilterDropdown: undefined,
             hideQuickFilterInput: undefined,

package/src/AdaptableOptions/FilterOptions.d.ts

@@ -94,12 +94,12 @@ export interface ColumnFilterOptions<TData = any> {
      */
     defaultNumericColumnFilter?: StrictExtract<SystemFilterPredicateId, 'GreaterThan' | 'LessThan' | 'Equals' | 'NotEquals' | 'In'> | ((column: AdaptableColumn) => StrictExtract<SystemFilterPredicateId, 'GreaterThan' | 'LessThan' | 'Equals' | 'NotEquals' | 'In'>);
     /**
-     * Default filter type for string Columns
+     * Default filter type for text Columns
      *
      * @defaultValue Contains
      * @gridInfoItem
      */
-    defaultStringColumnFilter?: StrictExtract<SystemFilterPredicateId, 'Is' | 'IsNot' | 'Contains' | 'NotContains' | 'StartsWith' | 'EndsWith' | 'Regex' | 'In'> | ((column: AdaptableColumn) => StrictExtract<SystemFilterPredicateId, 'Is' | 'IsNot' | 'Contains' | 'NotContains' | 'StartsWith' | 'EndsWith' | 'Regex' | 'In'>);
+    defaultTextColumnFilter?: StrictExtract<SystemFilterPredicateId, 'Is' | 'IsNot' | 'Contains' | 'NotContains' | 'StartsWith' | 'EndsWith' | 'Regex' | 'In'> | ((column: AdaptableColumn) => StrictExtract<SystemFilterPredicateId, 'Is' | 'IsNot' | 'Contains' | 'NotContains' | 'StartsWith' | 'EndsWith' | 'Regex' | 'In'>);
     /**
      * Default filter type for date Columns
      *

package/src/Api/ColumnScopeApi.d.ts

@@ -109,11 +109,11 @@ export interface ColumnScopeApi {
      */
     isColumnInNumericScope(column: AdaptableColumn, scope: ColumnScope): boolean;
     /**
-     * True if Scope has String DataType containing Column
+     * True if Scope has text DataType containing Column
      * @param column Column to check
      * @param scope Scope to check
      */
-    isColumnInStringsScope(column: AdaptableColumn, scope: ColumnScope): boolean;
+    isColumnInTextScope(column: AdaptableColumn, scope: ColumnScope): boolean;
     /**
      * True if Scope has Data DataType which contains Column
      * @param column Column to check

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

@@ -25,7 +25,7 @@ export declare class ColumnScopeApiImpl extends ApiBase implements ColumnScopeAp
     getColumnTypesInScope(scope: ColumnScope): string[] | undefined;
     getDataTypesInScope(scope: ColumnScope): ScopeDataType[] | undefined;
     isColumnInNumericScope(column: AdaptableColumn, scope: ColumnScope): boolean;
-    isColumnInStringsScope(column: AdaptableColumn, scope: ColumnScope): boolean;
+    isColumnInTextScope(column: AdaptableColumn, scope: ColumnScope): boolean;
     isColumnInDateScope(column: AdaptableColumn, scope: ColumnScope): boolean;
     isScopeInScope(a: ColumnScope, b: ColumnScope): boolean;
     createCellColorRangesForScope(scope: ColumnScope): CellColorRange[];

package/src/Api/Implementation/ColumnScopeApiImpl.js

@@ -183,7 +183,7 @@ export class ColumnScopeApiImpl extends ApiBase {
         }
         return false;
     }
-    isColumnInStringsScope(column, scope) {
+    isColumnInTextScope(column, scope) {
         // if column is not even string then return false
         if (column == null || column == undefined || column.dataType !== 'text') {
             return false;

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

@@ -4,11 +4,11 @@ export type AdaptableColumnDataType = BaseCellDataType | 'textArray' | 'numberAr
 /**
  * Column Types recognised by AdapTable; to be set in GridOptions
  */
-export type AdaptableColumnType = 'calculatedColumn' | 'freeTextColumn' | 'actionColumn' | 'fdc3Column';
-export declare const CALCULATED_COLUMN_TYPE: AdaptableColumnType;
-export declare const FREE_TEXT_COLUMN_TYPE: AdaptableColumnType;
-export declare const ACTION_COLUMN_TYPE: AdaptableColumnType;
-export declare const FDC3_COLUMN_TYPE: AdaptableColumnType;
+export type AdaptableSpecialColumnType = 'calculatedColumn' | 'freeTextColumn' | 'actionColumn' | 'fdc3Column';
+export declare const CALCULATED_COLUMN_TYPE: AdaptableSpecialColumnType;
+export declare const FREE_TEXT_COLUMN_TYPE: AdaptableSpecialColumnType;
+export declare const ACTION_COLUMN_TYPE: AdaptableSpecialColumnType;
+export declare const FDC3_COLUMN_TYPE: AdaptableSpecialColumnType;
 /**
  * Base class for AdapTable Column containing most important properties
  */

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

@@ -1,7 +1,7 @@
 import { SuspendableObject } from './SuspendableObject';
 import { TypeHint } from './Types';
 export declare const ROW_SUMMARY_ROW_ID = "__ROW_SUMMARY_ROW_ID";
-export declare const WEIGHTED_AVERAGE_AGGREATED_FUNCTION = "WEIGHTED_AVERAGE";
+export declare const WEIGHTED_AVERAGE_AGGREGATED_FUNCTION = "WEIGHTED_AVERAGE";
 export declare const summarySupportedExpressions: readonly ["MIN", "MAX", "SUM", "AVG", "COUNT", "MEDIAN", "MODE", "DISTINCT", "ONLY", "STD_DEVIATION", "WEIGHTED_AVERAGE"];
 export type SystemSummarySupportedExpression = (typeof summarySupportedExpressions)[number];
 export type SummarySupportedExpression = TypeHint<string, SystemSummarySupportedExpression>;

package/src/PredefinedConfig/Common/RowSummary.js

@@ -1,5 +1,5 @@
 export const ROW_SUMMARY_ROW_ID = '__ROW_SUMMARY_ROW_ID';
-export const WEIGHTED_AVERAGE_AGGREATED_FUNCTION = 'WEIGHTED_AVERAGE';
+export const WEIGHTED_AVERAGE_AGGREGATED_FUNCTION = 'WEIGHTED_AVERAGE';
 export const summarySupportedExpressions = [
     'MIN',
     'MAX',
@@ -11,5 +11,5 @@ export const summarySupportedExpressions = [
     'DISTINCT',
     'ONLY',
     'STD_DEVIATION',
-    WEIGHTED_AVERAGE_AGGREATED_FUNCTION,
+    WEIGHTED_AVERAGE_AGGREGATED_FUNCTION,
 ];

package/src/PredefinedConfig/LayoutState.d.ts

@@ -111,6 +111,10 @@ export interface TableLayout extends LayoutBase {
      * Pivot Expansions - can NOT be provided
      */
     PivotExpandLevel?: never;
+    /**
+     * Pivot Aggregation Columns - can NOT be provided
+     */
+    PivotAggregationColumns?: never;
 }
 /**
  * Defines a Pivot-based Layout
@@ -196,7 +200,7 @@ export interface LayoutOld extends AdaptableObject {
     GridFilter?: GridFilter;
     RowGroupedColumns?: string[];
     ExpandedRowGroupValues?: any[];
-    TableAggregationColumns?: TableAggregationColumns;
+    AggregationColumns?: Record<string, string | true | any>;
     EnablePivot?: boolean;
     PivotColumns?: string[];
     PinnedColumnsMap?: {

package/src/Utilities/Services/RowSummaryService.js

@@ -1,4 +1,4 @@
-import { ROW_SUMMARY_ROW_ID, WEIGHTED_AVERAGE_AGGREATED_FUNCTION, } from '../../PredefinedConfig/Common/RowSummary';
+import { ROW_SUMMARY_ROW_ID, WEIGHTED_AVERAGE_AGGREGATED_FUNCTION, } from '../../PredefinedConfig/Common/RowSummary';
 import { RowSummarySet } from '../../Redux/ActionsReducers/InternalRedux';
 import * as ModuleConstants from '../../Utilities/Constants/ModuleConstants';
 import Helper from '../Helpers/Helper';
@@ -124,7 +124,7 @@ export class RowSummaryService {
                     if (!expressionLiveValue) {
                         try {
                             let aggregatedScalarExpression = `${expression}([${columnId}])`;
-                            if (aggregatedScalarExpression.includes(WEIGHTED_AVERAGE_AGGREATED_FUNCTION) &&
+                            if (aggregatedScalarExpression.includes(WEIGHTED_AVERAGE_AGGREGATED_FUNCTION) &&
                                 aggColsMap[columnId] &&
                                 typeof aggColsMap[columnId] === 'object') {
                                 const weight = aggColsMap[columnId].weightedColumnId;

package/src/View/Components/ColumnFilter/utils.js

@@ -91,8 +91,8 @@ export const mapColumnFilterToQlPredicate = (columnFilter, abColumn, qlPredicate
                     : { operator: 'Equals', args: [] };
                 break;
             case 'text':
-                defaultQlPredicate = columnFilterOptions.defaultStringColumnFilter
-                    ? { operator: columnFilterOptions.defaultStringColumnFilter, args: [] }
+                defaultQlPredicate = columnFilterOptions.defaultTextColumnFilter
+                    ? { operator: columnFilterOptions.defaultTextColumnFilter, args: [] }
                     : { operator: 'Contains', args: [] };
                 break;
             case 'date':

package/src/View/Layout/Wizard/LayoutWizard.js

@@ -15,7 +15,7 @@ import { SortSection, SortSectionSummary } from './sections/SortSection';
 import { FilterSection, FilterSectionSummary, isColumnFiltersValid, } from './sections/FilterSection';
 import { GridFilterSection, GridFilterSectionSummary, isGridFiltersValid, } from './sections/GridFilterSection';
 import { areSummaryRowsValid, RowSummarySection, RowSummarySectionSummary, } from './sections/RowSummarySection';
-import { WEIGHTED_AVERAGE_AGGREATED_FUNCTION } from '../../../PredefinedConfig/Common/RowSummary';
+import { WEIGHTED_AVERAGE_AGGREGATED_FUNCTION } from '../../../PredefinedConfig/Common/RowSummary';
 import { isPivotLayout } from '../../../Utilities/isPivotLayout';
 import { PivotRowGroupingSection, PivotRowGroupingSectionSummary, } from './sections/PivotRowGroupingSection';
 import { PivotAggregationsSection, PivotAggregationsSectionSummary, } from './sections/PivotAggregationsSection';
@@ -208,7 +208,7 @@ export const LayoutWizard = (props) => {
                                         ColumnsMap: Object.entries(rowSummary.ColumnsMap).reduce((acc, [columnId, aggFunc]) => {
                                             if (
                                             // see if it is weighted avg
-                                            aggFunc === WEIGHTED_AVERAGE_AGGREATED_FUNCTION &&
+                                            aggFunc === WEIGHTED_AVERAGE_AGGREGATED_FUNCTION &&
                                                 // see if we have a weight in the agg columns
                                                 aggColsMap[columnId] &&
                                                 (typeof aggColsMap[columnId] !== 'object' ||

package/src/View/Layout/Wizard/sections/RowSummarySection.js

@@ -7,7 +7,7 @@ import { Select } from '../../../../components/Select';
 import SimpleButton from '../../../../components/SimpleButton';
 import { Tabs } from '../../../../components/Tabs';
 import { Tag } from '../../../../components/Tag';
-import { summarySupportedExpressions, WEIGHTED_AVERAGE_AGGREATED_FUNCTION, } from '../../../../PredefinedConfig/Common/RowSummary';
+import { summarySupportedExpressions, WEIGHTED_AVERAGE_AGGREGATED_FUNCTION, } from '../../../../PredefinedConfig/Common/RowSummary';
 import { mapColumnDataTypeToExpressionFunctionType } from '../../../../Utilities/adaptableQlUtils';
 import { LayoutModuleId } from '../../../../Utilities/Constants/ModuleConstants';
 import { aggregatedExpressionFunctions } from '../../../../Utilities/ExpressionFunctions/aggregatedScalarExpressionFunctions';
@@ -169,7 +169,7 @@ const RowSummaryEditor = React.memo(({ rowSummary, onChange, availableScalarExpr
                             aggregation.weightedColumnId) {
                             expressionOptions.push({
                                 label: 'WEIGHTERD_AVG',
-                                value: WEIGHTED_AVERAGE_AGGREATED_FUNCTION,
+                                value: WEIGHTED_AVERAGE_AGGREGATED_FUNCTION,
                             });
                         }
                         const expression = rowSummary.ColumnsMap[column.columnId];

package/src/agGrid/AdaptableAgGrid.js

@@ -1014,13 +1014,13 @@ You need to define at least one Layout!`);
         // this will have to go/be heavily extended with https://github.com/AdaptableTools/adaptable/issues/2230
         this.agGridOptionsService.setGridOptionsProperty(gridOptions, 'columnTypes', (original_columnTypes) => {
             const providedColumnTypes = original_columnTypes || {};
-            const adaptableColumnTypes = {
+            const adaptableSpecialColumnTypes = {
                 [CALCULATED_COLUMN_TYPE]: {},
                 [FREE_TEXT_COLUMN_TYPE]: {},
                 [ACTION_COLUMN_TYPE]: {},
                 [FDC3_COLUMN_TYPE]: {},
             };
-            const patchedColumnTypes = Object.assign({}, providedColumnTypes, adaptableColumnTypes);
+            const patchedColumnTypes = Object.assign({}, providedColumnTypes, adaptableSpecialColumnTypes);
             const customColumnTypes = this.api.columnApi.getColumnTypes() ?? [];
             for (const customColumnType of customColumnTypes) {
                 if (!patchedColumnTypes[customColumnType]) {

package/src/agGrid/AgGridColumnAdapter.js

@@ -391,7 +391,7 @@ export class AgGridColumnAdapter {
             }
             // required here for the initial layout rendering
             // Removed by JW, 3 october 2023; i don't think we need it and it overrides stuff unnecessarily
-            //  abColumn.friendlyName = resultHeaderName;
+            abColumn.friendlyName = resultHeaderName;
             return resultHeaderName;
         });
         const newColumnHeader = col?.getColDef()?.headerName;
@@ -479,7 +479,7 @@ export class AgGridColumnAdapter {
                 }
                 if (mostRelevantFormatColumn.DisplayFormat.Formatter === 'StringFormatter') {
                     // change the String format - if the scope allows it
-                    if (this.adaptableApi.columnScopeApi.isColumnInStringsScope(abColumn, mostRelevantFormatColumn.Scope)) {
+                    if (this.adaptableApi.columnScopeApi.isColumnInTextScope(abColumn, mostRelevantFormatColumn.Scope)) {
                         let cellValue = params.value;
                         if (typeof params.value?.toNumber === 'function' &&
                             typeof params.value?.toString === 'function') {

package/src/env.js

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

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

@@ -309,11 +309,6 @@ export declare const ADAPTABLE_METAMODEL: {
             isOpt: boolean;
         }[];
     };
-    AdaptableColumnType: {
-        name: string;
-        kind: string;
-        desc: string;
-    };
     AdaptableComment: {
         name: string;
         kind: string;
@@ -920,6 +915,11 @@ export declare const ADAPTABLE_METAMODEL: {
             desc: string;
         }[];
     };
+    AdaptableSpecialColumnType: {
+        name: string;
+        kind: string;
+        desc: string;
+    };
     AdaptableState: {
         name: string;
         kind: string;
@@ -3010,6 +3010,11 @@ export declare const ADAPTABLE_METAMODEL: {
             gridInfo?: undefined;
         })[];
     };
+    ExportResultData: {
+        name: string;
+        kind: string;
+        desc: string;
+    };
     ExportState: {
         name: string;
         kind: string;