@adaptabletools/adaptable 21.0.0-canary.8 → 21.0.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adaptabletools/adaptable",
-  "version": "21.0.0-canary.8",
+  "version": "21.0.1",
   "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/LayoutOptions.d.ts

@@ -20,7 +20,7 @@ export interface LayoutOptions {
     /**
      * Default properties to apply when creating a new Layout (Table or Pivot)
      */
-    defaultLayoutProperties?: DefaultLayoutProperties | ((context: DefaultLayoutPropertiesContext) => DefaultTableLayoutProperties | DefaultPivotLayoutProperties);
+    layoutCreationDefaultProperties?: LayoutCreationDefaultProperties | ((context: LayoutCreationDefaultPropertiesContext) => TableLayoutCreationDefaultProperties | PivotLayoutCreationDefaultProperties);
 }
 /**
  * Options for managing Tags in Layouts (used to enhance Layouts)
@@ -100,28 +100,28 @@ export interface PivotPreviewColumnsContext extends BaseContext {
 /**
  * Default properties to apply when creating a new Table Layout
  */
-export type DefaultTableLayoutProperties = Partial<Omit<TableLayout, 'Name'>>;
+export type TableLayoutCreationDefaultProperties = Partial<Omit<TableLayout, 'Name'>>;
 /**
  * Default properties to apply when creating a new Pivot Layout
  */
-export type DefaultPivotLayoutProperties = Partial<Omit<PivotLayout, 'Name'>>;
+export type PivotLayoutCreationDefaultProperties = Partial<Omit<PivotLayout, 'Name'>>;
 /**
  * Default properties to apply when creating a new Layout (Table or Pivot)
  */
-export interface DefaultLayoutProperties {
+export interface LayoutCreationDefaultProperties {
     /**
      * Default properties to apply when creating a new Table Layout
      */
-    tableLayout?: DefaultTableLayoutProperties;
+    tableLayout?: TableLayoutCreationDefaultProperties;
     /**
      * Default properties to apply when creating a new Pivot Layout
      */
-    pivotLayout?: DefaultPivotLayoutProperties;
+    pivotLayout?: PivotLayoutCreationDefaultProperties;
 }
 /**
- * Context for `LayoutOptions.defaultLayoutProperties` function
+ * Context for `LayoutOptions.layoutCreationDefaultProperties` function
  */
-export interface DefaultLayoutPropertiesContext extends BaseContext {
+export interface LayoutCreationDefaultPropertiesContext extends BaseContext {
     /**
      * Type of Layout ('table' | 'pivot')
      */

package/src/AdaptableState/Common/AdaptablePredicate.js

@@ -26,13 +26,21 @@ export const SystemPredicateDefs = [
         moduleScope: ['columnFilter', 'flashingcell', 'formatColumn', 'alert', 'badgeStyle'],
         handler: (context) => {
             const { inputs = [], column, value, adaptableApi } = context;
-            const predicateInputs = (context.inputs || []).reduce((acc, input) => {
-                const predicate = adaptableApi.predicateApi.getPredicateDefById(input);
-                if (predicate) {
-                    acc.push(predicate);
+            const predicateInputs = (context.inputs || [])
+                .map((input) => {
+                const predicateInput = adaptableApi.predicateApi.getPredicateDefById(input);
+                if (!predicateInput) {
+                    return;
                 }
-                return acc;
-            }, []);
+                if (adaptableApi.columnScopeApi.isScopeInScope(predicateInput.columnScope, 
+                // 'In' ColumnScope
+                {
+                    DataTypes: ['text', 'number', 'date', 'textArray', 'numberArray'],
+                })) {
+                    return predicateInput;
+                }
+            })
+                .filter(Boolean);
             if (predicateInputs.length) {
                 const nestedContext = { ...context };
                 delete nestedContext.inputs;
@@ -99,13 +107,21 @@ export const SystemPredicateDefs = [
         moduleScope: ['columnFilter', 'flashingcell', 'formatColumn', 'alert', 'badgeStyle'],
         handler: (context) => {
             const { inputs, column, value, adaptableApi } = context;
-            const predicateInputs = context.inputs.reduce((acc, input) => {
-                const predicate = adaptableApi.predicateApi.getPredicateDefById(input);
-                if (predicate) {
-                    acc.push(predicate);
+            const predicateInputs = (context.inputs || [])
+                .map((input) => {
+                const predicateInput = adaptableApi.predicateApi.getPredicateDefById(input);
+                if (!predicateInput) {
+                    return;
+                }
+                if (adaptableApi.columnScopeApi.isScopeInScope(predicateInput.columnScope, 
+                // 'NotIn' ColumnScope
+                {
+                    DataTypes: ['text', 'number', 'date', 'textArray', 'numberArray'],
+                })) {
+                    return predicateInput;
                 }
-                return acc;
-            }, []);
+            })
+                .filter(Boolean);
             if (predicateInputs.length) {
                 const nestedContext = { ...context };
                 delete nestedContext.inputs;

package/src/AdaptableState/LayoutState.d.ts

@@ -89,7 +89,7 @@ export interface LayoutBase extends AdaptableObject {
  */
 export interface TableLayout extends LayoutBase {
     /**
-     * Names of Columns to include in the Table Layout
+     * List of Column Ids to include in Table Layout
      */
     TableColumns: string[];
     /**
@@ -97,7 +97,7 @@ export interface TableLayout extends LayoutBase {
      */
     ColumnVisibility?: ColumnBooleanFalseMap;
     /**
-     * Row Summaries - Pinned Rows that display Aggregation Info for a whole column
+     * Pinned Rows that display Aggregation Info for a whole Column
      */
     RowSummaries?: RowSummary[];
     /**

package/src/Api/Implementation/PredicateApiImpl.js

@@ -133,7 +133,7 @@ export class PredicateApiImpl extends ApiBase {
             });
         }
         catch (error) {
-            console.error(`Error in predicate ${predicateDef.label}`, error);
+            this.logError(`Error in predicate ${predicateDef.label}`, error);
             return false;
         }
     }

package/src/Api/Internal/LayoutInternalApi.d.ts

@@ -1,10 +1,7 @@
-import { Layout, LayoutBase, PivotLayout, TableLayout } from '../../AdaptableState/LayoutState';
+import { Layout, LayoutBase } from '../../AdaptableState/LayoutState';
 import { ApiBase } from '../Implementation/ApiBase';
-import { ColDef, ColGroupDef } from 'ag-grid-enterprise';
 import { LayoutExtensionObject, LayoutExtensionModule } from '../../types';
 export declare class LayoutInternalApi extends ApiBase {
-    getNormalizedLayout(layout: TableLayout | PivotLayout): TableLayout | PivotLayout;
-    sortColumnDefsByPivotAggregationOrder(columnDefs: (ColDef | ColGroupDef)[], pivotAggregationColumns: PivotLayout['PivotAggregationColumns']): (ColDef | ColGroupDef)[];
     /**
      * Compares 2 Layouts for equality
      * @param layout1 First Layout
@@ -35,6 +32,6 @@ export declare class LayoutInternalApi extends ApiBase {
     buildInitialLayout(providedLayout: Partial<Layout> & {
         Name: string;
     }, type?: 'table' | 'pivot'): Layout;
-    private getDefaultLayoutProperties;
+    private getLayoutCreationDefaultProperties;
     cloneLayout(layoutToClone: Layout): Omit<Layout, 'Name'>;
 }

package/src/Api/Internal/LayoutInternalApi.js

@@ -1,74 +1,11 @@
 import { ColumnFilterModuleId, GridFilterModuleId, } from '../../Utilities/Constants/ModuleConstants';
 import ArrayExtensions from '../../Utilities/Extensions/ArrayExtensions';
 import { ApiBase } from '../Implementation/ApiBase';
-import { areLayoutsEqual, isPivotLayout, normalizeLayout } from '../Implementation/LayoutHelpers';
+import { areLayoutsEqual, isPivotLayout } from '../Implementation/LayoutHelpers';
 import ObjectFactory from '../../Utilities/ObjectFactory';
 import Helper from '../../Utilities/Helpers/Helper';
 import AdaptableHelper from '../../Utilities/Helpers/AdaptableHelper';
 export class LayoutInternalApi extends ApiBase {
-    getNormalizedLayout(layout) {
-        return normalizeLayout(layout);
-    }
-    sortColumnDefsByPivotAggregationOrder(columnDefs, pivotAggregationColumns) {
-        if (!pivotAggregationColumns.length) {
-            return columnDefs;
-        }
-        let sortPivotAggColsToIndexes = null;
-        let sortPivotAggColsIndexToColId = null;
-        // because aggrid does not respect the aggregation order provided by the layout
-        // we have to sort the coldefs
-        // see the test at #keep-initial-aggregation-order
-        sortPivotAggColsIndexToColId = {};
-        sortPivotAggColsToIndexes = pivotAggregationColumns.reduce((acc, colDef, index) => {
-            acc[colDef.ColumnId] = index;
-            sortPivotAggColsIndexToColId[index] = colDef.ColumnId;
-            return acc;
-        }, {});
-        let currentColIndex = 0;
-        const colIdsToIndexes = {};
-        function colIdToIndex(colDef) {
-            if (colDef.children) {
-                colDef.children.forEach(colIdToIndex);
-            }
-            else {
-                colIdsToIndexes[colDef.colId] = currentColIndex;
-                currentColIndex++;
-            }
-        }
-        columnDefs.forEach(colIdToIndex);
-        const initialColIdsToIndexes = { ...colIdsToIndexes };
-        let currentAggIndex = 0;
-        Object.keys(colIdsToIndexes).forEach((colId) => {
-            if (sortPivotAggColsToIndexes[colId] !== undefined) {
-                // this column is used in aggregation
-                // assume we have cols: a,b,X,c,Y - X and Y are used in the pivot aggregation - but the agg order is Y,X
-                // so the current indexes are 0 1 2 3 4 - but we should have
-                // 0 1 4 2 3 - because we want to swap X and Y so they are in the order in which they are used in the pivot aggregation
-                const columnAtCurrentAggIndex = sortPivotAggColsIndexToColId[currentAggIndex];
-                const newIndex = initialColIdsToIndexes[columnAtCurrentAggIndex];
-                colIdsToIndexes[colId] = newIndex;
-                currentAggIndex++;
-            }
-        });
-        const sortFn = (colDefA, colDefB) => {
-            if (colDefA.children || colDefB.children) {
-                if (colDefA.children) {
-                    colDefA.children.sort(sortFn);
-                }
-                if (colDefB.children) {
-                    colDefB.children.sort(sortFn);
-                }
-                return 0;
-            }
-            const defA = colDefA;
-            const defB = colDefB;
-            const indexA = colIdsToIndexes[defA.colId];
-            const indexB = colIdsToIndexes[defB.colId];
-            return indexA - indexB;
-        };
-        columnDefs.sort(sortFn);
-        return columnDefs;
-    }
     /**
      * Compares 2 Layouts for equality
      * @param layout1 First Layout
@@ -216,27 +153,27 @@ export class LayoutInternalApi extends ApiBase {
         const initialEmptyLayout = layoutType === 'pivot'
             ? ObjectFactory.CreateEmptyPivotLayout({ ...providedPivotLayout })
             : ObjectFactory.CreateEmptyTableLayout({ ...providedTableLayout });
-        const defaultLayoutProperties = this.getDefaultLayoutProperties(layoutType);
+        const defaultLayoutProperties = this.getLayoutCreationDefaultProperties(layoutType);
         const initialLayout = {
             ...initialEmptyLayout,
             ...defaultLayoutProperties,
         };
         return initialLayout;
     }
-    getDefaultLayoutProperties(layoutType) {
-        const defaultLayoutPropertiesOption = this.getLayoutOptions().defaultLayoutProperties;
-        if (typeof defaultLayoutPropertiesOption === 'object') {
+    getLayoutCreationDefaultProperties(layoutType) {
+        const layoutCreationDefPropsOption = this.getLayoutOptions().layoutCreationDefaultProperties;
+        if (typeof layoutCreationDefPropsOption === 'object') {
             const initialProps = layoutType === 'table'
-                ? defaultLayoutPropertiesOption.tableLayout
-                : defaultLayoutPropertiesOption.pivotLayout;
+                ? layoutCreationDefPropsOption.tableLayout
+                : layoutCreationDefPropsOption.pivotLayout;
             return initialProps;
         }
-        if (typeof defaultLayoutPropertiesOption === 'function') {
+        if (typeof layoutCreationDefPropsOption === 'function') {
             const context = {
                 layoutType,
                 ...this.getAdaptableInternalApi().buildBaseContext(),
             };
-            return defaultLayoutPropertiesOption(context);
+            return layoutCreationDefPropsOption(context);
         }
         return {};
     }

package/src/Api/PredicateApi.d.ts

@@ -46,6 +46,11 @@ export interface PredicateApi {
      * @param predicate Predicate Definition to stringify
      */
     predicateToString(predicate: AdaptablePredicate): string;
+    /**
+     * Stringifies a list of Predicate Definitions, using the given logical operator (AND/OR)
+     * @param predicates List of Predicate Definitions to stringify
+     * @param logicalOperator Logical operator to use to join the stringified Predicates (default AND)
+     */
     predicatesToString(predicates: AdaptablePredicate[], logicalOperator?: string): string;
     /**
      * Checks whether a given Predicate Definition is valid

package/src/Utilities/Helpers/FormatHelper.js

@@ -97,9 +97,10 @@ export function DateFormatter(input, options, strictFormatting = false) {
         return undefined;
     }
     try {
-        // not sure if this is right if using a custom formatter...
         if (typeof input === 'string') {
-            input = new Date(input);
+            // Remove timezone info (e.g., Z or +02:00) using regex
+            const cleanDateString = input.replace(/([+-]\d{2}:\d{2}|Z)$/, '');
+            input = new Date(cleanDateString);
         }
         return dateFnsFormat(input, options?.Pattern || DEFAULT_DATE_FORMAT_PATTERN);
     }

package/src/Utilities/Services/ModuleService.js

@@ -22,6 +22,11 @@ export class ModuleService {
     logMissingAgGridDepsInfos() {
         // log missing core (required) AG Grid dependencies
         const agGridModulesAdapter = this.adaptableApi.internalApi.getAgGridModulesAdapter();
+        if (agGridModulesAdapter.isAgGridModuleRegistered('AllEnterpriseModule')) {
+            // no need to check further if AllEnterprise is registered
+            // it may even trigger false positives (e.g. when using SSRM)
+            return;
+        }
         const mandatoryAgGridModuleNames = agGridModulesAdapter.getMandatoryAgGridModuleNames();
         const registeredAgGridModuleNames = agGridModulesAdapter.getAgGridRegisteredModuleNames();
         const missingAgGridModuleNames = mandatoryAgGridModuleNames.filter((moduleName) => !registeredAgGridModuleNames.includes(moduleName));

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: 1757350937288 || Date.now(),
-    VERSION: "21.0.0-canary.8" || '--current-version--',
+    PUBLISH_TIMESTAMP: 1758028360767 || Date.now(),
+    VERSION: "21.0.1" || '--current-version--',
 };

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

@@ -3021,33 +3021,6 @@ export declare const ADAPTABLE_METAMODEL: {
         kind: string;
         desc: string;
     };
-    DefaultLayoutProperties: {
-        name: string;
-        kind: string;
-        desc: string;
-        props: {
-            name: string;
-            kind: string;
-            desc: string;
-            isOpt: boolean;
-            ref: string;
-        }[];
-    };
-    DefaultLayoutPropertiesContext: {
-        name: string;
-        kind: string;
-        desc: string;
-        props: {
-            name: string;
-            kind: string;
-            desc: string;
-        }[];
-    };
-    DefaultPivotLayoutProperties: {
-        name: string;
-        kind: string;
-        desc: string;
-    };
     DefaultPredicateFilterContext: {
         name: string;
         kind: string;
@@ -3064,11 +3037,6 @@ export declare const ADAPTABLE_METAMODEL: {
             ref: string;
         })[];
     };
-    DefaultTableLayoutProperties: {
-        name: string;
-        kind: string;
-        desc: string;
-    };
     DetailInitContext: {
         name: string;
         kind: string;
@@ -4249,6 +4217,28 @@ export declare const ADAPTABLE_METAMODEL: {
             ref?: undefined;
         })[];
     };
+    LayoutCreationDefaultProperties: {
+        name: string;
+        kind: string;
+        desc: string;
+        props: {
+            name: string;
+            kind: string;
+            desc: string;
+            isOpt: boolean;
+            ref: string;
+        }[];
+    };
+    LayoutCreationDefaultPropertiesContext: {
+        name: string;
+        kind: string;
+        desc: string;
+        props: {
+            name: string;
+            kind: string;
+            desc: string;
+        }[];
+    };
     LayoutExtendedConfig: {
         name: string;
         kind: string;
@@ -4707,6 +4697,11 @@ export declare const ADAPTABLE_METAMODEL: {
             ref?: undefined;
         })[];
     };
+    PivotLayoutCreationDefaultProperties: {
+        name: string;
+        kind: string;
+        desc: string;
+    };
     PivotPreviewColumnsContext: {
         name: string;
         kind: string;
@@ -5895,6 +5890,11 @@ export declare const ADAPTABLE_METAMODEL: {
             ref?: undefined;
         })[];
     };
+    TableLayoutCreationDefaultProperties: {
+        name: string;
+        kind: string;
+        desc: string;
+    };
     TeamSharingOptions: {
         name: string;
         kind: string;