@adaptabletools/adaptable 11.2.4 → 12.0.0-canary.1

package/src/Api/Implementation/TeamSharingApiImpl.js

@@ -8,20 +8,31 @@ const TeamSharingRedux_1 = require("../../Redux/ActionsReducers/TeamSharingRedux
 const TeamSharingRedux = tslib_1.__importStar(require("../../Redux/ActionsReducers/TeamSharingRedux"));
 const LoggingHelper_1 = require("../../Utilities/Helpers/LoggingHelper");
 class TeamSharingApiImpl extends ApiBase_1.ApiBase {
-    getTeamSharingState() {
-        return this.getAdaptableState().TeamSharing;
+    async getSharedEntities() {
+        if (!this.isTeamSharingActivated()) {
+            LoggingHelper_1.ConsoleLogWarning('Team Sharing is not Activated so Entities cannot be loaded');
+            return [];
+        }
+        return this.adaptable.adaptableOptions.teamSharingOptions.getSharedEntities(this.adaptable.adaptableOptions.adaptableId);
     }
-    getSharedEntities() {
-        return this.getAdaptableState().TeamSharing.SharedEntities;
+    async setSharedEntities(sharedEntities) {
+        if (!this.isTeamSharingActivated()) {
+            LoggingHelper_1.ConsoleLogWarning('Team Sharing is not Activated so Entities cannot be shared');
+            return false;
+        }
+        await this.adaptable.adaptableOptions.teamSharingOptions.setSharedEntities(this.adaptable.adaptableOptions.adaptableId, sharedEntities);
+        return true;
     }
-    isTeamSharingActivated() {
+    isTeamSharingAvailable() {
+        var _a, _b, _c;
         return (!this.getAdaptableApi()
             .internalApi.getEntitlementService()
-            .isModuleHiddenEntitlement(ModuleConstants.TeamSharingModuleId) &&
-            this.adaptable.adaptableOptions.teamSharingOptions &&
-            this.adaptable.adaptableOptions.teamSharingOptions.enableTeamSharing &&
-            !!this.adaptable.adaptableOptions.teamSharingOptions.getSharedEntities &&
-            !!this.adaptable.adaptableOptions.teamSharingOptions.setSharedEntities);
+            .isModuleHiddenEntitlement(ModuleConstants.TeamSharingModuleId) && ((_a = this.adaptable.adaptableOptions.teamSharingOptions) === null || _a === void 0 ? void 0 : _a.enableTeamSharing) &&
+            !!((_b = this.adaptable.adaptableOptions.teamSharingOptions) === null || _b === void 0 ? void 0 : _b.getSharedEntities) &&
+            !!((_c = this.adaptable.adaptableOptions.teamSharingOptions) === null || _c === void 0 ? void 0 : _c.setSharedEntities));
+    }
+    isTeamSharingActivated() {
+        return this.isTeamSharingAvailable();
     }
     hasTeamSharingFullRights() {
         return this.adaptable.api.internalApi
@@ -50,5 +61,12 @@ class TeamSharingApiImpl extends ApiBase_1.ApiBase {
         }
         this.dispatchAction(TeamSharingRedux.TeamSharingShare(entity, module, sharedEntityConfig));
     }
+    unshareEntity(entityId) {
+        if (!this.isTeamSharingActivated()) {
+            LoggingHelper_1.ConsoleLogWarning('Team Sharing is not Activated so Entities cannot be unshared');
+            return;
+        }
+        this.dispatchAction(TeamSharingRedux.TeamSharingRemoveItem(entityId));
+    }
 }
 exports.TeamSharingApiImpl = TeamSharingApiImpl;

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

@@ -24,6 +24,6 @@ export declare class UserInterfaceApiImpl extends ApiBase implements UserInterfa
     addContextMenuItem(userMenuItem: UserMenuItem<ContextMenuContext>): void;
     getEditableCellStyle(): AdaptableStyle | undefined;
     getReadOnlyCellStyle(): AdaptableStyle | undefined;
-    getAllActionColumn(): ActionColumn[];
     getAdaptableObjectTags(): AdaptableObjectTag[] | undefined;
+    getAllActionColumn(): ActionColumn[];
 }

package/src/Api/Implementation/UserInterfaceApiImpl.js

@@ -134,25 +134,7 @@ class UserInterfaceApiImpl extends ApiBase_1.ApiBase {
         if (!editLookUpItem || !gridCell || !gridCell.column) {
             return undefined;
         }
-        let editLookUpValues = editLookUpItem.values;
-        // first do the function then get hardcoded items
-        if (editLookUpValues != null && typeof editLookUpValues === 'function') {
-            const editLookUpContext = {
-                adaptableApi: this.adaptable.api,
-                column: gridCell.column,
-                gridCell: gridCell,
-            };
-            return editLookUpValues(editLookUpContext);
-        }
-        else {
-            let arr = editLookUpValues;
-            if (arr && ArrayExtensions_1.ArrayExtensions.IsNotNullOrEmpty(arr)) {
-                return arr;
-            }
-        }
-        // if no hard-coded values or function provided then just get the distinct values for the column
-        // this will use the columnapi method that first looks for permitted values and then distinct values
-        return this.adaptable.api.columnApi.getDistinctDisplayValuesForColumn(gridCell.column.columnId);
+        return this.adaptable.api.internalApi.getEditLookUpValuesForColumn(editLookUpItem, gridCell.column, gridCell);
     }
     addColumnMenuItem(userMenuItem) {
         var _a;
@@ -168,14 +150,10 @@ class UserInterfaceApiImpl extends ApiBase_1.ApiBase {
     getReadOnlyCellStyle() {
         return this.getUserInterfaceOptions().readOnlyCellStyle;
     }
-    getAllActionColumn() {
-        var _a;
-        return (_a = this.getUserInterfaceOptions().actionColumns) !== null && _a !== void 0 ? _a : [];
-    }
     getAdaptableObjectTags() {
-        let objectTags = this.getUserInterfaceOptions().objectTags;
+        const objectTags = this.getUserInterfaceOptions().objectTags;
         if (objectTags != null && typeof objectTags === 'function') {
-            return objectTags(this.getAdaptableApi());
+            return objectTags({ adaptableApi: this.adaptable.api });
         }
         else {
             let arr = objectTags;
@@ -184,5 +162,9 @@ class UserInterfaceApiImpl extends ApiBase_1.ApiBase {
             }
         }
     }
+    getAllActionColumn() {
+        var _a, _b;
+        return (_b = (_a = this.getUserInterfaceOptions().actionOptions) === null || _a === void 0 ? void 0 : _a.actionColumns) !== null && _b !== void 0 ? _b : [];
+    }
 }
 exports.UserInterfaceApiImpl = UserInterfaceApiImpl;

package/src/Api/InternalApi.d.ts

@@ -17,7 +17,7 @@ import { AdaptableOptions } from '../AdaptableOptions/AdaptableOptions';
 import { Layout } from '../PredefinedConfig/LayoutState';
 import { AdaptableAlert, AdaptableCellChangedAlert, AdaptableRowChangedAlert } from '../PredefinedConfig/Common/AdaptableAlert';
 import { IDataService } from '../Utilities/Services/Interface/IDataService';
-import { AdaptableMessageType, AlertDefinition, BaseContext, CellDataChangedInfo, LayoutAssociatedObject, SystemStatusMessageInfo } from '../types';
+import { AdaptableIcon, AdaptableMessageType, AlertDefinition, BaseContext, CellDataChangedInfo, EditLookUpPermittedValues, LayoutAssociatedObject, SharedEntity, SystemStatusMessageInfo } from '../types';
 import { IEntitlementService } from '../Utilities/Services/Interface/IEntitlementService';
 import { AdaptableFlashingCell } from '../PredefinedConfig/Common/AdaptableFlashingCell';
 import { IQueryLanguageService } from '../Utilities/Services/Interface/IQueryLanguageService';
@@ -34,6 +34,7 @@ import { IMetamodelService } from '../Utilities/Services/Interface/IMetamodelSer
 import { RowNode } from '@ag-grid-community/all-modules';
 import { IModuleCollection } from '../Strategy/Interface/IModule';
 import { AdaptableObjectTag } from '../PredefinedConfig/Common/AdaptableObject';
+import { IRowEditService } from '../Utilities/Services/Interface/IRowEditService';
 /**
  * This set of api methods is designed for **internal use of Adaptable** only.
  *
@@ -101,6 +102,7 @@ export interface InternalApi {
     getAlertService(): IAlertService;
     getTeamSharingService(): ITeamSharingService;
     getMetamodelService(): IMetamodelService;
+    getRowEditService(): IRowEditService;
     getModules(): IModuleCollection;
     getModuleFriendlyName(adaptableModule: AdaptableModule): string;
     runModuleInAdaptableQL(adaptableQLModule: AdaptableQLModule): boolean;
@@ -115,9 +117,10 @@ export interface InternalApi {
     getLabelForButton(button: AdaptableButton<BaseContext>, context: BaseContext): string | undefined;
     getTooltipForButton(button: AdaptableButton<BaseContext>, context: BaseContext): string | undefined;
     getStyleForButton(button: AdaptableButton<BaseContext>, context: BaseContext): ButtonStyle | undefined;
+    getIconForButton(button: AdaptableButton<BaseContext>, context: BaseContext): AdaptableIcon | undefined;
     dispatchReduxAction(action: Action): void;
     waitForTeamSharingImportEnd(): Promise<boolean>;
-    getUserDefinedHeaderName(columnId: string): string;
+    getLocalTeamSharingEntities(): SharedEntity[];
     createFrameworkComponent(containerDomNode: HTMLElement, frameworkComponent: AdaptableFrameworkComponent, componentType: 'toolPanel' | 'toolbar' | string): void;
     destroyFrameworkComponent(containerDomNode: HTMLElement, frameworkComponent: AdaptableFrameworkComponent, componentType: 'toolPanel' | 'toolbar' | string): void;
     initializeDataChangeHistory(): void;
@@ -133,4 +136,5 @@ export interface InternalApi {
     showSettingsPanel(module: AdaptableModule, moduleParams?: ModuleParams): void;
     getLabelForTag(adaptableObjectTag: AdaptableObjectTag): string;
     getValueForTag(adaptableObjectTag: AdaptableObjectTag): string | number;
+    getEditLookUpValuesForColumn(editLookUpItem: EditLookUpPermittedValues, column: AdaptableColumn, gridCell?: GridCell): any[] | undefined;
 }

package/src/Api/LayoutApi.d.ts

@@ -187,4 +187,20 @@ export interface LayoutApi {
      * @param adaptableObject object to check
      */
     isObjectAvailableInCurrentLayout(adaptableObject: LayoutAssociatedObject): boolean;
+    /**
+     * Removes a Column from the Current Layout
+     * @param columnId Column to remove
+     */
+    removeColumnFromCurrentLayout(columnId: string): void;
+    /**
+     * Removes a Column from all Layouts
+     * @param columnId Column to remove
+     */
+    removeColumnFromAllLayouts(columnId: string): void;
+    /**
+     * Removes a Column from a given Layout
+     * @param columnId Column to remove
+     * @param layoutName layout from which to remove Column
+     */
+    removeColumnFromLayout(columnId: string, layoutName: string): void;
 }

package/src/Api/PredicateApi.d.ts

@@ -1,4 +1,6 @@
+import { AdaptableColumnDataType } from '../../types';
 import { AdaptablePredicateDef, AdaptablePredicate, PredicateDefHandlerParams, ModuleScope } from '../PredefinedConfig/Common/AdaptablePredicate';
+import { SystemFilterPredicateId } from '../types';
 /**
  * Functions which manage the Predicate object in AdapTable
  */
@@ -52,4 +54,9 @@ export interface PredicateApi {
      * @param defaultReturn Whether to return the default
      */
     handlePredicate(predicate: AdaptablePredicate | undefined, params: Omit<PredicateDefHandlerParams, 'api' | 'inputs'>, defaultReturn: boolean): boolean;
+    /**
+     * Gets the correct Equality-type System Predicate for a particular DataType
+     * @param dataType DataType of Column
+     */
+    getEqualityPredicateForDataType(dataType: AdaptableColumnDataType): SystemFilterPredicateId;
 }

package/src/Api/SmartEditApi.d.ts

@@ -1,14 +1,21 @@
-import { SmartEditOperation } from '../AdaptableOptions/SmartEdit';
+import { SmartEditOperation } from '../AdaptableOptions/EditOptions';
+import { MathOperation } from '../PredefinedConfig/Common/Enums';
 import { GridCell } from '../PredefinedConfig/Selection/GridCell';
+import { SmartEditCustomOperation } from '../types';
 /**
  * Provides run-time access to the Smart Edit Module
  **/
 export interface SmartEditApi {
     /**
-     * Sets Smart Edit operation: ('Add','Subtract','Multiply','Divide'
+     * Sets (shipped) Smart Edit Operation: 'Add','Subtract','Multiply','Divide'
      * @param operation operation to run
      */
-    setSmartEditOperation(operation: SmartEditOperation): void;
+    setSmartEditOperation(operation: MathOperation): void;
+    /**
+     * Sets current Smart Edit Operation to a Custom Operation
+     * @param customOperationName name of Custom Smart Edit Operation
+     */
+    setCustomSmartEditOperation(customOperationName: string): void;
     /**
      * Gets current Smart Edit Operation
      */
@@ -31,4 +38,8 @@ export interface SmartEditApi {
      * @param gridCells Cells to apply the Smart Edit
      */
     applySmartEdit(gridCells: GridCell[]): void;
+    /**
+     * Retrieves an Smart Edit Custom Operations (provided in Edit Options)
+     */
+    getSmartEditCustomOperations(): SmartEditCustomOperation[] | undefined;
 }

package/src/Api/TeamSharingApi.d.ts

@@ -1,22 +1,30 @@
 import { AdaptableObject } from '../PredefinedConfig/Common/AdaptableObject';
 import { SharedEntity } from '../PredefinedConfig/TeamSharingState';
-import { AdaptableModule, SharedEntityConfig, TeamSharingState } from '../types';
+import { AdaptableModule, SharedEntityConfig } from '../types';
 /**
  * Provides run-time access to Team Sharing Module and associated state
  */
 export interface TeamSharingApi {
     /**
-     * Retrieves Team Sharing section of State
+     * Retrieves all shared entities which are currently shared. It is an asynchronous operation as it leverages the `TeamSharingOptions.getSharedEntities(...)` method.
      */
-    getTeamSharingState(): TeamSharingState;
+    getSharedEntities(): Promise<SharedEntity[]>;
     /**
-     * Retrieves all Shared Entities in Team Sharing State
+     * Sets the shared entities which are currently shared. It is an asynchronous operation as it leverages the `TeamSharingOptions.setSharedEntities(...)` method.
+     * @param sharedEntities the shared entities
+     * @return either TRUE if the shared entities were successfully set or FALSE if the shared entities were not set
      */
-    getSharedEntities(): SharedEntity[];
+    setSharedEntities(sharedEntities: SharedEntity[]): Promise<boolean>;
     /**
      * Whether Team Sharing is Activated
+     *
+     * @deprecated use `Adaptable.isTeamSharingAvailable()` instead
      */
     isTeamSharingActivated(): boolean;
+    /**
+     * Whether Team Sharing is Available to use
+     */
+    isTeamSharingAvailable(): boolean;
     /**
      * Whether current user has full Team Sharing rights (for creating & updating shared items)
      */
@@ -41,4 +49,9 @@ export interface TeamSharingApi {
      * @param sharedEntityConfig Config info about the Sharing Actions
      */
     shareEntity(entity: AdaptableObject, module: AdaptableModule, sharedEntityConfig: SharedEntityConfig): void;
+    /**
+     * Removes an Adaptable Object from the Team Share.
+     * @param entityId the ID of the AdaptableObject to be removed from Team Share
+     */
+    unshareEntity(entityId: string): void;
 }

package/src/Api/UserInterfaceApi.d.ts

@@ -70,12 +70,12 @@ export interface UserInterfaceApi {
      * Returns Style set for ReadOnly cells
      */
     getReadOnlyCellStyle(): AdaptableStyle | undefined;
-    /**
-     * Retrieves any Action Columns (provided in User Interface Options)
-     */
-    getAllActionColumn(): ActionColumn[];
     /**
      * Retrieves any Object Tags (provided in User Interface Options)
      */
     getAdaptableObjectTags(): AdaptableObjectTag[] | undefined;
+    /**
+     * Retrieves any Action Columns (provided in User Interface Options)
+     */
+    getAllActionColumn(): ActionColumn[];
 }

package/src/PredefinedConfig/AdaptableState.d.ts

@@ -6,7 +6,6 @@ import { CalculatedColumnState } from './CalculatedColumnState';
 import { ConditionalStyleState } from './ConditionalStyleState';
 import { CustomSortState } from './CustomSortState';
 import { DashboardState } from './DashboardState';
-import { DataSourceState } from './DataSourceState';
 import { ExportState } from './ExportState';
 import { FormatColumnState } from './FormatColumnState';
 import { FreeTextColumnState } from './FreeTextColumnState';
@@ -18,7 +17,6 @@ import { ShortcutState } from './ShortcutState';
 import { TeamSharingState } from './TeamSharingState';
 import { ThemeState } from './ThemeState';
 import { ConfigState } from './ConfigState';
-import { FilterState } from './FilterState';
 import { ApplicationState } from './ApplicationState';
 import { ToolPanelState } from './ToolPanelState';
 import { QueryState } from './QueryState';
@@ -41,9 +39,7 @@ export interface AdaptablePersistentState {
     ConditionalStyle: ConditionalStyleState;
     CustomSort: CustomSortState;
     Dashboard: DashboardState;
-    DataSource: DataSourceState;
     Export: ExportState;
-    Filter: FilterState;
     FormatColumn: FormatColumnState;
     FreeTextColumn: FreeTextColumnState;
     Layout: LayoutState;

package/src/PredefinedConfig/CalculatedColumnState.d.ts

@@ -46,6 +46,11 @@ export interface CalculatedColumnSettings extends SpecialColumnSettings {
      * @defaultValue false
      */
     ShowToolTip?: boolean;
+    /**
+     * If true, the Calculated Column Expression will NOT be evaluated and the value is loaded from the row data property with the same name as the ColumnId
+     * @defaultValue false
+     */
+    ExternallyEvaluatedExpression?: boolean;
 }
 /**
  * Calculated Column Query which may be a Scalar or an AggregatedScalar Expression

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

@@ -11,13 +11,13 @@ export interface AdaptableButton<CONTEXT_TYPE extends BaseContext> extends Adapt
      */
     label?: string | ((button: AdaptableButton<CONTEXT_TYPE>, context: CONTEXT_TYPE) => string);
     /**
-     * Style for Button - can be object or function thats provides a `Style` object
+     * Style for Button - can be object or function that provides a `ButtonStyle` object
      */
     buttonStyle?: ButtonStyle | ((button: AdaptableButton<CONTEXT_TYPE>, context: CONTEXT_TYPE) => ButtonStyle);
     /**
-     * Icon to display, requires string for URL, other props are optional
+     * Icon for Button - can be object or function that provides a `AdaptableIcon` object
      */
-    icon?: AdaptableIcon;
+    icon?: AdaptableIcon | ((button: AdaptableButton<CONTEXT_TYPE>, context: CONTEXT_TYPE) => AdaptableIcon);
     /**
      * Tooltip for Button - can be string or function that provides string
      */

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

@@ -1,4 +1,8 @@
 import { AdaptableObject } from './AdaptableObject';
+/**
+ * Type of data stored in an Adaptable Column
+ */
+export declare type AdaptableColumnDataType = 'String' | 'Number' | 'Boolean' | 'Date' | 'Object' | 'Unknown';
 /**
  * Base class for Adaptable Column containing most important properties
  */
@@ -14,7 +18,7 @@ export interface AdaptableColumnBase extends AdaptableObject {
     /**
      * DataType of the column
      */
-    dataType: 'String' | 'Number' | 'NumberArray' | 'Boolean' | 'Date' | 'Object' | 'Unknown';
+    dataType: AdaptableColumnDataType;
 }
 export declare const isValidOrderForColumnGroups: ({ oldColumns, newColumns, }: {
     oldColumns: AdaptableColumn[];

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

@@ -36,13 +36,13 @@ export interface AdaptableFormField {
      */
     name: string;
     /**
-     * Label to display in in the Field
+     * Label to display in the Field
      */
     label: string;
     /**
      * Field Type: text, date, number, checkbox, select, textOutput
      */
-    fieldType: 'text' | 'select' | 'date' | 'number' | 'checkbox' | 'textOutput';
+    fieldType: AdaptableFormFieldType;
     /**
      * Field Default Value - can be of type string, boolean, number
      */
@@ -55,4 +55,5 @@ export interface AdaptableFormField {
         label: string;
     }[];
 }
+export declare type AdaptableFormFieldType = 'text' | 'select' | 'date' | 'number' | 'checkbox' | 'textOutput';
 export declare function getDefaultAdaptableFormData<T extends BaseContext = BaseContext>(formDef?: AdaptableForm<T>): Record<string, any>;

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

@@ -12,9 +12,7 @@ export declare type AdaptableFormat = {
     Options: StringFormatterOptions;
 };
 export interface BaseFormatterOptions {
-    CustomDisplayFormats?: {
-        Id: string;
-    }[];
+    CustomDisplayFormats?: string[];
 }
 /**
  * Formatter Options for Numeric Columns

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

@@ -21,15 +21,6 @@ export interface AdaptableObject {
     Tags?: AdaptableObjectTag[];
 }
 /**
- * Object Tag - defined as a label and a value
+ * AdaptableObjectTag Object Tague - currently supporting only plain string values, but open for future extensions, if ever needed.
  */
-export declare type AdaptableObjectTag = string | {
-    /**
-     * Label for the Tag
-     */
-    label: string;
-    /**
-     * Value for the Tag - string or number
-     */
-    value: string | number;
-};
+export declare type AdaptableObjectTag = string;

package/src/PredefinedConfig/Common/AdaptablePredicate.js

@@ -53,7 +53,24 @@ exports.SystemPredicateDefs = [
         icon: { text: '!IN' },
         columnScope: { DataTypes: ['String', 'Number', 'Date'] },
         moduleScope: ['filter'],
-        handler: ({ displayValue, inputs }) => inputs.length === 0 || !inputs.includes(displayValue),
+        handler: ({ inputs, column, value }) => {
+            // basically negation of IN
+            if (inputs.length === 0) {
+                return true;
+            }
+            if (column.dataType === 'Date') {
+                return inputs.some((input) => {
+                    return !isSameDay_1.default(input, value);
+                });
+            }
+            if (column.dataType === 'Number') {
+                return !inputs.includes(value);
+            }
+            if (column.dataType === 'String') {
+                return !inputs.includes(value);
+            }
+            return true;
+        },
         toString: ({ inputs }) => `Exclude (${inputs.join(', ')})`,
     },
     {

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

@@ -1,6 +1,6 @@
 import { AdaptableApi } from '../../types';
 /**
- * Base Context object used in many functions provided by AdapTable
+ * Base Context used in many functions provided by developers and invoked as needed by AdapTable
  */
 export interface BaseContext {
     /**

package/src/PredefinedConfig/{FilterState.d.ts → Common/ColumnFilter.d.ts}

@@ -1,36 +1,5 @@
-import { ConfigState } from './ConfigState';
-import { AdaptableApi, AdaptableColumn } from '../types';
-import { AdaptableObject } from './Common/AdaptableObject';
-import { AdaptablePredicate } from './Common/AdaptablePredicate';
-import { TypeHint } from './Common/Types';
-/**
- * Predefined Configuration for Filters
- */
-export interface FilterState extends ConfigState {
-    /**
-     * Collection of Column Filters
-     */
-    ColumnFilters?: ColumnFilter[];
-    /**
-     * Whether to display Quick Filter Bar between Column Header and the Grid
-     * @defaultValue  true
-     */
-    IsQuickFilterVisible?: boolean;
-}
-export interface FilterPredicateInput {
-    type: 'number' | 'text' | 'date';
-    defaultValue?: any;
-}
-export interface FilterPredicateHandler {
-    (params: FilterPredicateParams): boolean;
-}
-export interface FilterPredicateParams {
-    value: any;
-    displayValue: string;
-    inputs: any[];
-    column: AdaptableColumn;
-    api: AdaptableApi;
-}
+import { AdaptableObject, AdaptablePredicate } from '../../types';
+import { TypeHint } from './Types';
 /**
  * Defines a Filter applied on a Column using a Predicate
  */

package/src/PredefinedConfig/Common/ColumnFilter.js

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

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

@@ -4,8 +4,8 @@ export declare enum DataType {
     Boolean = "Boolean",
     Date = "Date",
     Object = "Object",
-    All = "All",
-    Unknown = "Unknown"
+    Unknown = "Unknown",
+    All = "All"
 }
 export declare enum MathOperation {
     Add = "Add",

package/src/PredefinedConfig/Common/Enums.js

@@ -9,8 +9,8 @@ var DataType;
     DataType["Boolean"] = "Boolean";
     DataType["Date"] = "Date";
     DataType["Object"] = "Object";
-    DataType["All"] = "All";
     DataType["Unknown"] = "Unknown";
+    DataType["All"] = "All";
 })(DataType = exports.DataType || (exports.DataType = {}));
 var MathOperation;
 (function (MathOperation) {

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

@@ -0,0 +1,8 @@
+import { AdaptableFormData } from '../../types';
+import { BaseContext } from './BaseContext';
+export interface FormContext extends BaseContext {
+    /**
+     * Adaptable Form Data
+     */
+    formData: AdaptableFormData;
+}

package/src/PredefinedConfig/Common/FormContext.js

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

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

@@ -6,9 +6,9 @@ export declare type AdaptableDashboardToolbars = AdaptableDashboardToolbar[];
 /**
  * List of all the Toolbars that Adaptable provides
  */
-export declare type AdaptableDashboardToolbar = 'Alert' | 'BulkUpdate' | 'CellSummary' | 'DataChangeHistory' | 'DataSource' | 'Export' | 'Filter' | 'Glue42' | 'IPushPull' | 'Layout' | 'OpenFin' | 'Query' | 'QuickSearch' | 'SmartEdit' | 'StateManagement' | 'SystemStatus' | 'Theme';
+export declare type AdaptableDashboardToolbar = 'Alert' | 'BulkUpdate' | 'CellSummary' | 'DataChangeHistory' | 'DataSet' | 'Export' | 'Filter' | 'Glue42' | 'IPushPull' | 'Layout' | 'OpenFin' | 'Query' | 'QuickSearch' | 'SmartEdit' | 'StateManagement' | 'SystemStatus' | 'Theme';
 export declare const ALL_TOOLBARS: AdaptableDashboardToolbar[];
-export declare type AdaptableStatusBarPanel = 'CellSummary' | 'Alert' | 'GridInfo' | 'Dashboard' | 'ToolPanel' | 'StatusBar' | 'StateManagement' | 'Alert' | 'CalculatedColumn' | 'ConditionalStyle' | 'CustomSort' | 'DataSource' | 'Export' | 'Filter' | 'FlashingCell' | 'FormatColumn' | 'FreeTextColumn' | 'Layout' | 'PlusMinus' | 'Query' | 'QuickSearch' | 'Schedule' | 'Shortcut' | 'SystemStatus' | 'DataChangeHistory' | 'TeamSharing' | 'Theme' | 'BulkUpdate' | 'SettingsPanel' | 'SmartEdit';
+export declare type AdaptableStatusBarPanel = 'CellSummary' | 'Alert' | 'GridInfo' | 'Dashboard' | 'ToolPanel' | 'StatusBar' | 'StateManagement' | 'Alert' | 'CalculatedColumn' | 'ConditionalStyle' | 'CustomSort' | 'DataSet' | 'Export' | 'Filter' | 'FlashingCell' | 'FormatColumn' | 'FreeTextColumn' | 'Layout' | 'PlusMinus' | 'Query' | 'QuickSearch' | 'Schedule' | 'Shortcut' | 'SystemStatus' | 'DataChangeHistory' | 'TeamSharing' | 'Theme' | 'BulkUpdate' | 'SettingsPanel' | 'SmartEdit';
 export declare const ALL_STATUS_SUB_PANELS: AdaptableStatusBarPanel[];
 export declare type AdaptableToolPanels = AdaptableToolPanel[];
 export declare type AdaptableToolPanel = 'Alert' | 'BulkUpdate' | 'CellSummary' | 'Dashboard' | 'DataChangeHistory' | 'Export' | 'Filter' | 'IPushPull' | 'Layout' | 'OpenFin' | 'Query' | 'QuickSearch' | 'SmartEdit' | 'StateManagement' | 'SystemStatus' | 'Theme';
@@ -22,16 +22,17 @@ export declare type AdaptableModuleButtons = AdaptableModuleButton[];
 /**
  * List of all the Module buttons Adaptable provides - each Module has a popup for which this is a shortcut button
  */
-export declare type AdaptableModuleButton = 'Alert' | 'FlashingCell' | 'BulkUpdate' | 'CalculatedColumn' | 'CellSummary' | 'ConditionalStyle' | 'CustomSort' | 'Dashboard' | 'DataChangeHistory' | 'DataSource' | 'Export' | 'Filter' | 'FormatColumn' | 'FreeTextColumn' | 'Glue42' | 'GridInfo' | 'Layout' | 'OpenFin' | 'PlusMinus' | 'Query' | 'QuickSearch' | 'Schedule' | 'SettingsPanel' | 'Shortcut' | 'SmartEdit' | 'StateManagement' | 'SystemStatus' | 'TeamSharing' | 'Theme';
+export declare type AdaptableModuleButton = 'Alert' | 'FlashingCell' | 'BulkUpdate' | 'CalculatedColumn' | 'CellSummary' | 'ConditionalStyle' | 'CustomSort' | 'Dashboard' | 'DataChangeHistory' | 'DataSet' | 'Export' | 'Filter' | 'FormatColumn' | 'FreeTextColumn' | 'Glue42' | 'GridInfo' | 'Layout' | 'OpenFin' | 'PlusMinus' | 'Query' | 'QuickSearch' | 'Schedule' | 'SettingsPanel' | 'Shortcut' | 'SmartEdit' | 'StateManagement' | 'SystemStatus' | 'TeamSharing' | 'Theme';
 export declare type AdaptableStateKeys = AdaptableStateKey[];
 export declare type AdaptableStateKey = keyof AdaptablePersistentState | 'OpenFin' | 'Glue42' | 'IPushPull';
 /**
  * Modules provided by AdapTable, subject to Entitlements and usually have Predefined Config
  */
-export declare type AdaptableModule = 'Alert' | 'BulkUpdate' | 'CalculatedColumn' | 'CellSummary' | 'Charting' | 'ConditionalStyle' | 'CustomSort' | 'Dashboard' | 'DataChangeHistory' | 'DataSource' | 'Export' | 'Filter' | 'FlashingCell' | 'FormatColumn' | 'FreeTextColumn' | 'Glue42' | 'GridInfo' | 'IPushPull' | 'Layout' | 'OpenFin' | 'PlusMinus' | 'Query' | 'QuickSearch' | 'Schedule' | 'SettingsPanel' | 'Shortcut' | 'SmartEdit' | 'StateManagement' | 'StatusBar' | 'SystemStatus' | 'TeamSharing' | 'Theme' | 'ToolPanel';
-export declare type AdaptableSettingsPanel = 'Alert' | 'CalculatedColumn' | 'ConditionalStyle' | 'CustomSort' | 'Dashboard' | 'DataChangeHistory' | 'DataSource' | 'Export' | 'Filter' | 'FlashingCell' | 'FormatColumn' | 'FreeTextColumn' | 'GridInfo' | 'Layout' | 'PlusMinus' | 'Query' | 'QuickSearch' | 'Schedule' | 'Shortcut' | 'StateManagement' | 'StatusBar' | 'SystemStatus' | 'TeamSharing' | 'Theme' | 'ToolPanel';
+export declare type AdaptableModule = 'Alert' | 'BulkUpdate' | 'CalculatedColumn' | 'CellSummary' | 'Charting' | 'ConditionalStyle' | 'CustomSort' | 'Dashboard' | 'DataChangeHistory' | 'DataSet' | 'Export' | 'Filter' | 'FlashingCell' | 'FormatColumn' | 'FreeTextColumn' | 'Glue42' | 'GridInfo' | 'IPushPull' | 'Layout' | 'OpenFin' | 'PlusMinus' | 'Query' | 'QuickSearch' | 'Schedule' | 'SettingsPanel' | 'Shortcut' | 'SmartEdit' | 'StateManagement' | 'StatusBar' | 'SystemStatus' | 'TeamSharing' | 'Theme' | 'ToolPanel';
+export declare type AdaptableSettingsPanel = 'Alert' | 'CalculatedColumn' | 'ConditionalStyle' | 'CustomSort' | 'Dashboard' | 'DataChangeHistory' | 'DataSet' | 'Export' | 'Filter' | 'FlashingCell' | 'FormatColumn' | 'FreeTextColumn' | 'GridInfo' | 'Layout' | 'PlusMinus' | 'Query' | 'QuickSearch' | 'Schedule' | 'Shortcut' | 'StateManagement' | 'StatusBar' | 'SystemStatus' | 'TeamSharing' | 'Theme' | 'ToolPanel';
 export declare type TypeHint<Base, Literals> = (Base & {
     __subType?: true;
 }) | Literals;
 export declare type AdaptableQLModules = AdaptableQLModule[];
 export declare type AdaptableQLModule = 'Filter' | 'Query';
+export declare type AdaptableColumnType = 'abColDefBoolean' | 'abColDefDate' | 'abColDefNumber' | 'abColDefString' | 'abColDefObject' | 'abColDefCustom' | 'abSpecialColumn';

package/src/PredefinedConfig/Common/Types.js

@@ -9,7 +9,7 @@ exports.ALL_TOOLBARS = [
     'BulkUpdate',
     'CellSummary',
     'DataChangeHistory',
-    'DataSource',
+    'DataSet',
     'Export',
     'Filter',
     'Glue42',
@@ -32,7 +32,7 @@ exports.ALL_STATUS_SUB_PANELS = [
     'CustomSort',
     'Dashboard',
     'DataChangeHistory',
-    'DataSource',
+    'DataSet',
     'Export',
     'Filter',
     'FlashingCell',
@@ -72,4 +72,3 @@ exports.ALL_TOOL_PANELS = [
     'SystemStatus',
     'Theme',
 ];
-//  | 'QuickSearch'

package/src/PredefinedConfig/LayoutState.d.ts

@@ -1,6 +1,7 @@
 import { ConfigState } from './ConfigState';
 import { AdaptableObject } from './Common/AdaptableObject';
 import { ColumnSort } from './Common/ColumnSort';
+import { ColumnFilter } from '../types';
 /**
  * Predefined Configuration for the Layout Module
  */
@@ -36,6 +37,10 @@ export interface Layout extends AdaptableObject {
      * Sorting to apply in the Layout
      */
     ColumnSorts?: ColumnSort[];
+    /**
+     * Collection of Column Filters.
+     */
+    ColumnFilters?: ColumnFilter[];
     /**
      * Columns which are row-grouped when the Layout is applied
      */