@adaptabletools/adaptable 11.2.2 → 11.2.4

package/index.css

@@ -2284,7 +2284,16 @@ template {
   --ab-cmp-adaptable-object-list-item__margin-bottom: var(--ab-space-3);
   --ab-cmp-adaptable-object-list-item-label__padding-top: var(--ab-space-3);
   --ab-cmp-adaptable-object-list-item-label__width: 130px;
-  --ab-cmp-adaptable-object-list-item-tag__padding: 6px 12px; }
+  --ab-cmp-adaptable-object-list-item-tag__padding: 6px 12px;
+  --ab-cmp-adaptable-object-compact-list__background: var(--ab-color-primarylight);
+  --ab-cmp-adaptable-object-compact-list__padding: var(--ab-space-2);
+  --ab-cmp-adaptable-object-compact-list-item__background: var(--ab-color-defaultbackground);
+  --ab-cmp-adaptable-object-compact-list-item__padding: var(--ab-space-1);
+  --ab-cmp-adaptable-object-compact-list-item__margin-bottom: var(--ab-space-2);
+  --ab-cmp-adaptable-object-compact-list-item-name__width: 80px;
+  --ab-cmp-adaptable-object-compact-list-item-name__padding: var(--ab-space-1);
+  --ab-cmp-adaptable-object-compact-list-item-name__margin-right: var(--ab-space-1);
+  --ab-cmp-adaptable-object-compact-list-item-name__font-size: var(--ab-font-size-4); }
 
 :root {
   --ab-cmp-adaptable-options__background-color: var(--ab-color-defaultbackground);
@@ -3691,6 +3700,24 @@ html.ab--theme-dark .ab-ListBoxFilterForm--aggrid-style {
 .ab-Adaptable-Object-List__Item__label:hover .ab-Adaptable-Object-List__Item__edit-property {
         visibility: visible; }
 
+.ab-Adaptable-Object-Compact-List {
+  padding: var(--ab-cmp-adaptable-object-compact-list__padding);
+  background: var(--ab-cmp-adaptable-object-compact-list__background); }
+
+.ab-Adaptable-Object-Compact-List .ab-Adaptable-Object-Compact-List__Item {
+    padding: var(--ab-cmp-adaptable-object-compact-list-item__padding);
+    margin-bottom: var(--ab-cmp-adaptable-object-compact-list-item__margin-bottom);
+    background: var(--ab-cmp-adaptable-object-compact-list-item__background); }
+
+.ab-Adaptable-Object-Compact-List .ab-Adaptable-Object-Compact-List__Item:last-child {
+      margin-bottom: 0; }
+
+.ab-Adaptable-Object-Compact-List__Item__Name {
+    width: var(--ab-cmp-adaptable-object-compact-list-item-name__width);
+    padding: var(--ab-cmp-adaptable-object-compact-list-item-name__padding);
+    margin-right: var(--ab-cmp-adaptable-object-compact-list-item-name__margin-right);
+    font-size: var(--ab-cmp-adaptable-object-compact-list-item-name__font-size); }
+
 .ab-StatusBar {
   display: flex; }
 

package/package.json

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

package/publishTimestamp.d.ts

@@ -1,2 +1,2 @@
-declare const _default: 1652713434785;
+declare const _default: 1653160464222;
 export default _default;

package/publishTimestamp.js

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

package/src/AdaptableInterfaces/IAdaptable.d.ts

@@ -174,6 +174,9 @@ export interface IAdaptable {
     forAllRowNodesDo(func: (rowNode: RowNode) => void): void;
     forAllVisibleRowNodesDo(func: (rowNode: RowNode) => void): void;
     getVisibleRowNodes(): RowNode[];
+    getAllRowNodes(config?: {
+        includeGroupRows?: boolean;
+    }): RowNode[];
     getRowsInViewport(): RowNode[];
     isGroupRowNode(rowNode: RowNode): boolean;
     isVisibleNode(rowNode: RowNode): boolean;

package/src/AdaptableOptions/AdaptableOptions.d.ts

@@ -22,6 +22,7 @@ import { GridOptions, Module } from '@ag-grid-community/all-modules';
 import { FlashingCellOptions } from './FlashingCellOptions';
 import { AlertOptions } from './AlertOptions';
 import { AdaptableQLOptions } from './AdaptableQLOptions';
+import { FormatColumnOptions } from './FormatColumnOptions';
 /**
  * Group of property options enabling developers to set up AdapTable at design time to fit precise requirements - provides AG Grid, Predefined Config and other information required to ensure a full, rich user experience
  */
@@ -141,6 +142,12 @@ export interface AdaptableOptions {
      * @gridInfoContainer
      */
     flashingCellOptions?: FlashingCellOptions;
+    /**
+     * Options for managing format columns
+     *
+     * @gridInfoContainer
+     */
+    formatColumnOptions?: FormatColumnOptions;
     /**
      * General options to manage AdapTable e.g. grouping behaviour, Primary Keys
      *

package/src/AdaptableOptions/FinancePluginOptions.d.ts

@@ -1,4 +1,5 @@
-import { ContextMenuContext } from '../../types';
+import { ContextMenuContext, GridCell } from '../../types';
+import { CustomFDC3Context } from '../PredefinedConfig/Common/FDC3Context';
 /**
  * Options required for when using the Finance plugin
  */
@@ -27,6 +28,14 @@ export interface FinancePluginOptions {
          * FDC3 Organizations
          */
         organizationColumns?: OrganizationColumn[];
+        /**
+         * Custom FDC3 Columns
+         */
+        customFDC3Columns?: CustomFDC3Column[];
+        /**
+         * Custom FDC3 Intents
+         */
+        customFDC3Intents?: CustomFDC3Intent[];
     };
     /**
      * Columns to use a Weighted Average aggregation
@@ -69,11 +78,15 @@ export interface FDC3Column {
     /**
      * FDC3 intents which the Column can raise
      */
-    intents?: any;
+    intents?: any[];
     /**
      * Label to display in Intent Context Menu Item
      */
     intentContextMenuLabel?: string | ((raiseFDC3IntentContext: RaiseFDC3IntentContext) => string);
+    /**
+     * Returns the icon to display in the Raise Intent Context Menu Item
+     */
+    getIconForIntent?: (intent: FDC3Intent | CustomFDC3Intent) => any;
 }
 /**
  * A Column which will be defined as an FDC3 Instrument
@@ -222,10 +235,27 @@ export declare type CountryIntents = CountryIntent[];
  * FDC3 Intents available to a Country Column
  */
 export declare type CountryIntent = 'ViewChart';
+/**
+ *  A Column which will be defined as Custom FDC3 (can be any datatype)
+ */
+export interface CustomFDC3Column extends FDC3Column {
+    /**
+     * Custom FDC3 Intents available to the column
+     */
+    intents: CustomFDC3Intent[];
+    /**
+     * Function which creates FDC3 context for the current column and row
+     */
+    createContext: (gridCell: GridCell) => CustomFDC3Context;
+}
 /**
  * Full list of FDC3 Intents available - each FDC3 Column can use a subset
  */
 export declare type FDC3Intent = 'StartCall' | 'StartChat' | 'ViewAnalysis' | 'ViewChart' | 'ViewContact' | 'ViewInstrument' | 'ViewNews' | 'ViewQuote';
+/**
+ * Custom FDC3 Intent - just a string value
+ */
+export declare type CustomFDC3Intent = string;
 /**
  * Context passed into Raise FDC3 Intent functions (e.g. get label)
  */
@@ -233,5 +263,5 @@ export interface RaiseFDC3IntentContext extends ContextMenuContext {
     /**
      * FDC3 Intent that was raised
      */
-    intent: FDC3Intent;
+    intent: FDC3Intent | CustomFDC3Intent;
 }

package/src/AdaptableOptions/FormatColumnOptions.d.ts

@@ -0,0 +1,9 @@
+export declare type CustomDisplayFormatter = {
+    id: string;
+    label?: string;
+    handler: (value: any) => any;
+    type: 'Date' | 'Number' | 'String';
+};
+export interface FormatColumnOptions {
+    customDisplayFormatters?: CustomDisplayFormatter[];
+}

package/src/AdaptableOptions/FormatColumnOptions.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/src/AdaptableOptions/LayoutOptions.d.ts

@@ -1,4 +1,3 @@
-import { AdaptableApi } from '../Api/AdaptableApi';
 import { AlertDefinition } from '../PredefinedConfig/AlertState';
 import { ConditionalStyle } from '../PredefinedConfig/ConditionalStyleState';
 import { CustomSort } from '../PredefinedConfig/CustomSortState';
@@ -60,43 +59,69 @@ export interface LayoutOptions {
     /**
      * Customize how Layouts are displayed in Settings Panel
      */
-    viewOptions?: LayoutViewOptions;
+    layoutViewOptions?: LayoutViewOptions;
     /**
-     * Checks if the provided AdaptableObject is available in the given Layout
+     * Options for leveraging Object Tags to extend Layouts
      */
-    isObjectAvailableInLayout?: (context: IsObjectAvailableInLayoutContext) => boolean;
+    layoutTagOptions?: LayoutTagOptions;
+}
+export interface LayoutTagOptions {
     /**
-     * Automatically generate a tag for each existing layout
+     * Automatically generate an Object Tag for each Layout
      */
     autoGenerateTagsForLayouts?: boolean | ((context: AutoGenerateTagsForLayoutsContext) => AdaptableObjectTag[]);
+    /**
+     * Checks if the provided Adaptable Object is available in the given Layout
+     */
+    isObjectAvailableInLayout?: (context: LayoutAvailableContext) => boolean;
+    /**
+     * Automatically checks if Adaptable Objects Tags are available in current Layout
+     *  @defaultValue false
+     */
+    autoCheckTagsForLayouts?: boolean;
 }
 /**
  * Customize how Layouts are displayed in Settings Panel
  */
 export interface LayoutViewOptions {
     /**
-     * How many columns to display in inline Layout preview
+     * How many Column Names to display in inline Layout preview
      *
      * @defaultValue 10
      */
     maxColumnsToDisplay?: number;
 }
 /**
- * Context for `LayoutOptions.isObjectAvailableInLayout` method
+ * Context for `LayoutOptions.isObjectAvailableInLayout` functions
  */
-export interface IsObjectAvailableInLayoutContext {
-    abObject: LayoutAssociatedObject;
+export interface LayoutAvailableContext extends BaseContext {
+    /**
+     * Object being checked
+     */
+    adaptableObject: LayoutAssociatedObject;
+    /**
+     * Current Adaptable Module
+     */
     module: AdaptableModule;
+    /**
+     * Current Layout
+     */
     layout: Layout;
-    adaptableApi: AdaptableApi;
 }
 /**
- * Types of objects that can be associated with a Layout
+ * Types of Adaptable Objects that can be associated with a Layout
  */
 export declare type LayoutAssociatedObject = AlertDefinition | ConditionalStyle | CustomSort | FlashingCellDefinition | FormatColumn | PlusMinusNudge | Shortcut | BaseSchedule;
 /**
  * Context for `LayoutOptions.autoGenerateTagsForLayouts` method
  */
 export interface AutoGenerateTagsForLayoutsContext extends BaseContext {
+    /**
+     * Layouts currently in Adaptable State
+     */
     layouts: Layout[];
+    /**
+     * Object Tags provided in User Interface Options
+     */
+    objectTags: AdaptableObjectTag[];
 }

package/src/AdaptableOptions/UserInterfaceOptions.d.ts

@@ -18,7 +18,6 @@ export interface UserInterfaceOptions {
      * @gridInfoItem
      */
     useCustomMacLikeScrollbars?: boolean;
-    testproperty?: any;
     /**
      * The application icon to appear in Dashboard and elsewhere (e.g. OpenFin notifications)
      *

package/src/Api/ColumnApi.d.ts

@@ -227,7 +227,10 @@ export interface ColumnApi {
      * @param columnFilter Current applied filter
      */
     getDistinctFilterDisplayValuesForColumn(columnId: string, filter: string): Promise<{
-        values: any[];
+        values: {
+            value: any;
+            label: string;
+        }[];
         suppressClientSideFilter: boolean;
     }>;
     /**

package/src/Api/FinanceApi.d.ts

@@ -1,5 +1,5 @@
 import { RowNode } from '@ag-grid-community/all-modules';
-import { ContactColumn, ContactIntent, CountryColumn, FDC3Intent, FinancePluginOptions, InstrumentColumn, InstrumentIntent, OrganizationColumn, PositionColumn, PositionIntent } from '../AdaptableOptions/FinancePluginOptions';
+import { ContactColumn, ContactIntent, CountryColumn, CustomFDC3Column, CustomFDC3Intent, FDC3Intent, FinancePluginOptions, InstrumentColumn, InstrumentIntent, OrganizationColumn, PositionColumn, PositionIntent } from '../AdaptableOptions/FinancePluginOptions';
 import { ContactContext, ContactListContext, CountryContext, FDC3Context, InstrumentContext, InstrumentListContext, OrganizationContext, PortfolioContext, PositionContext } from '../types';
 /**
  * Provides run-time access to the Finance Plugin
@@ -82,6 +82,7 @@ export interface FinanceApi {
      * @param instrumentColumnId Column to Look
      */
     getCountryColumnById(countryColumnId: string): CountryColumn;
+    getCustomFDC3ColumnById(customFDC3ColumnId: string): CustomFDC3Column;
     /**
      * Publishes an FDC3 Message Event of type `Broadcast`
      * @param context context for Event
@@ -92,7 +93,7 @@ export interface FinanceApi {
      * @param context context for Event
      * @param intent FDC3 Intent to Raise
      */
-    publishRaiseFDC3IntentEvent(context: FDC3Context, intent: FDC3Intent): void;
+    publishRaiseFDC3IntentEvent(context: FDC3Context, intent: FDC3Intent | CustomFDC3Intent): void;
     /**
      * Checks whether the Instrument Intent is valid for Instrument Lists
      * @param intent FDC3 Intent to check

package/src/Api/FormatColumnApi.d.ts

@@ -1,5 +1,5 @@
 import { FormatColumnState, FormatColumn, ColumnStyle, ColumnComparison } from '../PredefinedConfig/FormatColumnState';
-import { AdaptableColumn } from '../types';
+import { AdaptableColumn, AdaptableFormat } from '../types';
 import { RowNode } from '@ag-grid-community/all-modules';
 /**
  * Provides run-time access to the Format Column Module and associated state
@@ -172,4 +172,25 @@ export interface FormatColumnApi {
      * Publishes the CheckboxColumnClickedEvent - when the checkbox in an Checkbox Column is clicked
      */
     fireCheckboxColumnClickedEvent(columnId: string, rowData: any, primaryKeyValue: any, isChecked: boolean): void;
+    /**
+     * Format value according to format options.
+     *
+     * @param value value to format
+     * @param options formatter options
+     */
+    getNumberFormattedValue(value: any, options: AdaptableFormat['Options']): any;
+    /**
+     * Format value according to format options.
+     *
+     * @param value value to format
+     * @param options formatter options
+     */
+    getStringFormattedValue(value: any, options: AdaptableFormat['Options']): string;
+    /**
+     * Format value according to format options.
+     *
+     * @param value value to format
+     * @param options formatter options
+     */
+    getDateFormattedValue(value: any, options: AdaptableFormat['Options']): string;
 }

package/src/Api/GridApi.d.ts

@@ -197,9 +197,16 @@ export interface GridApi {
      */
     getFirstDisplayedRowNode(): RowNode;
     /**
-     * Retrieves all Row Nodes currently in the Grid (i.e. filtered)
+     * Retrieves all filtered Row Nodes currently in the Grid (i.e. after applying the current filter)
      */
     getVisibleRowNodes(): RowNode[];
+    /**
+     * Retrieves all Row Nodes currently in the Grid (by default excluding the group rows)
+     * @param config - configuration
+     */
+    getAllRowNodes(config?: {
+        includeGroupRows?: boolean;
+    }): RowNode[];
     /**
      * Retrieves Row Nodes that contain given Primary Keys
      * @param primaryKeyValues Primary Kev Values to look up

package/src/Api/Implementation/ColumnApiImpl.js

@@ -10,7 +10,8 @@ const GeneralConstants_1 = require("../../Utilities/Constants/GeneralConstants")
 const ArrayExtensions_1 = tslib_1.__importDefault(require("../../Utilities/Extensions/ArrayExtensions"));
 class ColumnApiImpl extends ApiBase_1.ApiBase {
     getColumns() {
-        return this.adaptable.api.gridApi.getGridState().Columns;
+        var _a;
+        return (_a = this.adaptable.api.gridApi.getGridState().Columns) !== null && _a !== void 0 ? _a : [];
     }
     getVisibleColumns() {
         const layout = this.adaptable.api.layoutApi.getCurrentLayout();
@@ -298,7 +299,10 @@ class ColumnApiImpl extends ApiBase_1.ApiBase {
         const { gridCells, suppressClientSideFilter } = await this.adaptable.getDistinctFilterValuesForColumn(abColumn, false, filter);
         return {
             values: this.sortDistinctValues(gridCells, abColumn).map((cv) => {
-                return cv.displayValue;
+                return {
+                    label: cv.displayValue,
+                    value: cv.normalisedValue,
+                };
             }),
             suppressClientSideFilter,
         };

package/src/Api/Implementation/FilterApiImpl.js

@@ -156,7 +156,7 @@ class FilterApiImpl extends ApiBase_1.ApiBase {
         return columnFilters.map((cf) => this.columnFilterToString(cf)).join(', ');
     }
     evaluateColumnFilter(columnFilter, node) {
-        var _a, _b;
+        var _a;
         if (!columnFilter.Predicate) {
             return true;
         }
@@ -172,15 +172,10 @@ class FilterApiImpl extends ApiBase_1.ApiBase {
             return true;
         }
         let value = gridCell.normalisedValue;
-        if (((_b = columnFilter.Predicate) === null || _b === void 0 ? void 0 : _b.PredicateId) === 'Contains' && column.dataType === 'Date') {
-            // although 'Contains' Predicate is NOT relevant for Date columns, we have to handle the special case of QuickSearching
-            // in that case, we have to evaluate the displayedValue of the cell, not the normalisedValue (it's a textual search after all)
-            value = gridCell.displayValue;
-        }
         return this.adaptable.api.predicateApi.handlePredicate(columnFilter.Predicate, {
             value: value,
             oldValue: null,
-            displayValue: gridCell.normalisedValue,
+            displayValue: gridCell.displayValue,
             node,
             column,
         }, true);

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

@@ -4,6 +4,7 @@ import { FormatColumnApi } from '../FormatColumnApi';
 import { FormatColumnState, FormatColumn, ColumnStyle, ColumnComparison } from '../../PredefinedConfig/FormatColumnState';
 import { AdaptableColumn } from '../../PredefinedConfig/Common/AdaptableColumn';
 import { RowNode } from '@ag-grid-community/all-modules';
+import { AdaptableFormat } from '../../types';
 export declare class FormatColumnApiImpl extends ApiBase implements FormatColumnApi {
     getFormatColumnState(): FormatColumnState;
     getAllFormatColumn(config?: {
@@ -44,4 +45,8 @@ export declare class FormatColumnApiImpl extends ApiBase implements FormatColumn
     getCheckBoxStyleFormatColumn(column: AdaptableColumn): FormatColumn | undefined;
     isCheckBoxStyleFormatColumn(column: AdaptableColumn): boolean;
     fireCheckboxColumnClickedEvent(columnId: string, rowData: any, primaryKeyValue: any, isChecked: boolean): void;
+    private applyCustomFormatters;
+    getNumberFormattedValue(value: any, options: AdaptableFormat['Options']): string;
+    getStringFormattedValue(value: any, options: AdaptableFormat['Options']): string;
+    getDateFormattedValue(value: any, options: AdaptableFormat['Options']): string;
 }

package/src/Api/Implementation/FormatColumnApiImpl.js

@@ -8,6 +8,7 @@ const ModuleConstants = tslib_1.__importStar(require("../../Utilities/Constants/
 const ArrayExtensions_1 = tslib_1.__importDefault(require("../../Utilities/Extensions/ArrayExtensions"));
 const StringExtensions_1 = tslib_1.__importDefault(require("../../Utilities/Extensions/StringExtensions"));
 const Helper_1 = tslib_1.__importDefault(require("../../Utilities/Helpers/Helper"));
+const FormatHelper_1 = tslib_1.__importDefault(require("../../Utilities/Helpers/FormatHelper"));
 class FormatColumnApiImpl extends ApiBase_1.ApiBase {
     getFormatColumnState() {
         return this.getAdaptableState().FormatColumn;
@@ -269,5 +270,33 @@ class FormatColumnApiImpl extends ApiBase_1.ApiBase {
         };
         this.adaptable.api.eventApi.emit('CheckboxColumnClicked', checkboxColumnClickedInfo);
     }
+    applyCustomFormatters(value, options) {
+        var _a, _b;
+        const columnCustomFormatters = (_a = options === null || options === void 0 ? void 0 : options.CustomDisplayFormats) !== null && _a !== void 0 ? _a : [];
+        if (!(columnCustomFormatters === null || columnCustomFormatters === void 0 ? void 0 : columnCustomFormatters.length)) {
+            return value;
+        }
+        const adaptableOptions = this.adaptable.adaptableOptions;
+        const customFormattersFromOptions = (_b = adaptableOptions === null || adaptableOptions === void 0 ? void 0 : adaptableOptions.formatColumnOptions) === null || _b === void 0 ? void 0 : _b.customDisplayFormatters;
+        const customFormatters = columnCustomFormatters.map((customFormatter) => customFormattersFromOptions === null || customFormattersFromOptions === void 0 ? void 0 : customFormattersFromOptions.find((customFormatterOption) => customFormatterOption.id === customFormatter.Id));
+        return customFormatters.reduce((acc, formatter) => {
+            if (formatter && formatter.handler) {
+                return formatter.handler(acc);
+            }
+            return acc;
+        }, value);
+    }
+    getNumberFormattedValue(value, options) {
+        let preparedValue = this.applyCustomFormatters(value, options);
+        return FormatHelper_1.default.NumberFormatter(preparedValue, options);
+    }
+    getStringFormattedValue(value, options) {
+        let preparedValue = this.applyCustomFormatters(value, options);
+        return FormatHelper_1.default.StringFormatter(preparedValue, options);
+    }
+    getDateFormattedValue(value, options) {
+        let preparedValue = this.applyCustomFormatters(value, options);
+        return FormatHelper_1.default.DateFormatter(preparedValue, options);
+    }
 }
 exports.FormatColumnApiImpl = FormatColumnApiImpl;

package/src/Api/Implementation/FreeTextColumnApiImpl.js

@@ -12,11 +12,11 @@ class FreeTextColumnApiImpl extends ApiBase_1.ApiBase {
         return this.getAdaptableState().FreeTextColumn;
     }
     getAllFreeTextColumn() {
-        return this.getFreeTextColumnState().FreeTextColumns;
+        var _a;
+        return (_a = this.getFreeTextColumnState().FreeTextColumns) !== null && _a !== void 0 ? _a : [];
     }
     getFreeTextColumnById(columnId) {
-        var _a;
-        return (_a = this.getAllFreeTextColumn()) === null || _a === void 0 ? void 0 : _a.find((ftc) => ftc.ColumnId === columnId);
+        return this.getAllFreeTextColumn().find((ftc) => ftc.ColumnId === columnId);
     }
     addFreeTextColumn(freeTextColumn) {
         this.addUidToAdaptableObject(freeTextColumn);

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

@@ -59,6 +59,9 @@ export declare class GridApiImpl extends ApiBase implements GridApi {
     getFirstRowNode(): RowNode;
     getFirstDisplayedRowNode(): RowNode;
     getVisibleRowNodes(): RowNode[];
+    getAllRowNodes(config: {
+        includeGroupRows?: boolean;
+    }): RowNode[];
     getGridCellFromRowNode(rowNode: RowNode, columnId: string): GridCell | undefined;
     getRawValueFromRowNode(rowNode: RowNode, columnId: string): any | undefined;
     getDisplayValueFromRowNode(rowNode: RowNode, columnId: string): any | undefined;

package/src/Api/Implementation/GridApiImpl.js

@@ -188,6 +188,9 @@ class GridApiImpl extends ApiBase_1.ApiBase {
     getVisibleRowNodes() {
         return this.adaptable.getVisibleRowNodes();
     }
+    getAllRowNodes(config) {
+        return this.adaptable.getAllRowNodes(config);
+    }
     getGridCellFromRowNode(rowNode, columnId) {
         return this.adaptable.getGridCellFromRowNode(rowNode, columnId);
     }

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

@@ -131,4 +131,6 @@ export declare class InternalApiImpl extends ApiBase implements InternalApi {
     private getLayoutTags;
     dispatchReduxAction(action: Action): void;
     showSettingsPanel(module: AdaptableModule, moduleParams?: ModuleParams): void;
+    getLabelForTag(adaptableObjectTag: AdaptableObjectTag): string;
+    getValueForTag(adaptableObjectTag: AdaptableObjectTag): string | number;
 }

package/src/Api/Implementation/InternalApiImpl.js

@@ -364,17 +364,17 @@ class InternalApiImpl extends ApiBase_1.ApiBase {
     getQueryPreviewData() {
         var _a;
         const firstRowNode = this.adaptable.api.gridApi.getFirstRowNode();
-        const firstRowData = (_a = firstRowNode === null || firstRowNode === void 0 ? void 0 : firstRowNode.data) !== null && _a !== void 0 ? _a : {};
-        if (firstRowNode === null || firstRowNode === void 0 ? void 0 : firstRowNode.data) {
-            // we have to add the calculated values which are not persisted in the row data
-            const firstRowPrimaryKeyValue = this.adaptable.api.gridApi.getPrimaryKeyValueForRowNode(firstRowNode);
-            this.adaptable.api.calculatedColumnApi
-                .getAllCalculatedColumn()
-                .forEach((calculatedColumn) => {
-                firstRowData[calculatedColumn.ColumnId] = this.adaptable.api.gridApi.getCellRawValue(firstRowPrimaryKeyValue, calculatedColumn.ColumnId);
-            });
-            // FIXME AFL shouldn't here be also the FreeTextColumn??
-        }
+        const firstRowData = (_a = Object.assign({}, firstRowNode === null || firstRowNode === void 0 ? void 0 : firstRowNode.data)) !== null && _a !== void 0 ? _a : {};
+        // handle CalcCols which are not persisted in the rowModel
+        this.adaptable.api.calculatedColumnApi.getAllCalculatedColumn().forEach((calculatedColumn) => {
+            const columnRawValue = this.adaptable.api.gridApi.getRawValueFromRowNode(firstRowNode, calculatedColumn.ColumnId);
+            firstRowData[calculatedColumn.ColumnId] = columnRawValue;
+        });
+        // handle FreeTextCols which are not persisted in the rowModel
+        this.adaptable.api.freeTextColumnApi.getAllFreeTextColumn().forEach((freeTextColumn) => {
+            const columnRawValue = this.adaptable.api.gridApi.getRawValueFromRowNode(firstRowNode, freeTextColumn.ColumnId);
+            firstRowData[freeTextColumn.ColumnId] = columnRawValue;
+        });
         return firstRowData;
     }
     waitForTeamSharingImportEnd() {
@@ -470,19 +470,31 @@ class InternalApiImpl extends ApiBase_1.ApiBase {
         return wordToSpell;
     }
     hasLayoutSpecificObjects() {
-        return (typeof this.adaptable.adaptableOptions.layoutOptions.isObjectAvailableInLayout === 'function');
+        const layoutTagOptions = this.getAdaptableOptions().layoutOptions.layoutTagOptions;
+        if (!layoutTagOptions) {
+            return false;
+        }
+        if (layoutTagOptions.autoCheckTagsForLayouts == true ||
+            typeof (layoutTagOptions === null || layoutTagOptions === void 0 ? void 0 : layoutTagOptions.isObjectAvailableInLayout) === 'function') {
+            return true;
+        }
+        return false;
     }
     isObjectAvailableInLayout(object, module) {
         if (!this.hasLayoutSpecificObjects()) {
             return true;
         }
+        const layoutTagOptions = this.getAdaptableOptions().layoutOptions.layoutTagOptions;
+        if ((layoutTagOptions === null || layoutTagOptions === void 0 ? void 0 : layoutTagOptions.autoCheckTagsForLayouts) == true) {
+            return this.getAdaptableApi().layoutApi.isObjectAvailableInCurrentLayout(object);
+        }
         const context = {
-            abObject: object,
+            adaptableObject: object,
             module,
-            layout: this.adaptable.api.layoutApi.getCurrentLayout(),
-            adaptableApi: this.adaptable.api,
+            layout: this.getAdaptableApi().layoutApi.getCurrentLayout(),
+            adaptableApi: this.getAdaptableApi(),
         };
-        return this.adaptable.adaptableOptions.layoutOptions.isObjectAvailableInLayout(context);
+        return layoutTagOptions === null || layoutTagOptions === void 0 ? void 0 : layoutTagOptions.isObjectAvailableInLayout(context);
     }
     showLayoutNotAssociatedObjects() {
         return this.getAdaptableState().System.ShowLayoutNotAssociatedObjects;
@@ -507,30 +519,33 @@ class InternalApiImpl extends ApiBase_1.ApiBase {
         }
         if (typeof this.adaptable.adaptableOptions.userInterfaceOptions.objectTags === 'function') {
             // sanitize the provided tags, just to be sure that the user does NOT break the UI
-            return this.adaptable.adaptableOptions.userInterfaceOptions
+            return (this.adaptable.adaptableOptions.userInterfaceOptions
                 .objectTags(this.adaptable.api)
-                .filter((tag) => (tag === null || tag === void 0 ? void 0 : tag.value) != undefined && (tag === null || tag === void 0 ? void 0 : tag.label) != undefined);
+                // jw - not sure how to check here only for when its a object and then do check
+                .filter((tag) => typeof tag == 'string' ? tag : tag.value != undefined && (tag === null || tag === void 0 ? void 0 : tag.label) != undefined));
         }
     }
     getLayoutTags() {
-        if (!this.adaptable.adaptableOptions.layoutOptions.autoGenerateTagsForLayouts) {
+        var _a;
+        if (!((_a = this.adaptable.adaptableOptions.layoutOptions.layoutTagOptions) === null || _a === void 0 ? void 0 : _a.autoGenerateTagsForLayouts)) {
             return;
         }
-        if (this.adaptable.adaptableOptions.layoutOptions.autoGenerateTagsForLayouts === true) {
+        if (this.adaptable.adaptableOptions.layoutOptions.layoutTagOptions.autoGenerateTagsForLayouts ===
+            true) {
             return this.adaptable.api.layoutApi.getAllLayout().map((layout) => {
-                return {
-                    label: layout.Name,
-                    value: layout.Name,
-                };
+                return layout.Name;
             });
         }
-        if (typeof this.adaptable.adaptableOptions.layoutOptions.autoGenerateTagsForLayouts === 'function') {
-            const customGeneratedTags = this.adaptable.adaptableOptions.layoutOptions.autoGenerateTagsForLayouts({
+        if (typeof this.adaptable.adaptableOptions.layoutOptions.layoutTagOptions
+            .autoGenerateTagsForLayouts === 'function') {
+            const autoGenerateTagsForLayoutsContext = {
                 layouts: this.adaptable.api.layoutApi.getAllLayout(),
+                objectTags: this.getAdaptableApi().userInterfaceApi.getAdaptableObjectTags(),
                 adaptableApi: this.adaptable.api,
-            });
+            };
+            const customGeneratedTags = this.adaptable.adaptableOptions.layoutOptions.layoutTagOptions.autoGenerateTagsForLayouts(autoGenerateTagsForLayoutsContext);
             // sanitize the provided tags, just to be sure that the user does NOT break the UI
-            return customGeneratedTags.filter((tag) => (tag === null || tag === void 0 ? void 0 : tag.value) != undefined && (tag === null || tag === void 0 ? void 0 : tag.label) != undefined);
+            return customGeneratedTags.filter((tag) => typeof tag == 'string' ? tag : tag.value != undefined && (tag === null || tag === void 0 ? void 0 : tag.label) != undefined);
         }
     }
     // General way to get to store from inside Adaptable...
@@ -541,5 +556,11 @@ class InternalApiImpl extends ApiBase_1.ApiBase {
     showSettingsPanel(module, moduleParams) {
         this.showModulePopup(module, moduleParams);
     }
+    getLabelForTag(adaptableObjectTag) {
+        return typeof adaptableObjectTag == 'string' ? adaptableObjectTag : adaptableObjectTag.label;
+    }
+    getValueForTag(adaptableObjectTag) {
+        return typeof adaptableObjectTag == 'string' ? adaptableObjectTag : adaptableObjectTag.value;
+    }
 }
 exports.InternalApiImpl = InternalApiImpl;