@adaptabletools/adaptable 17.0.0-canary.0 → 17.0.0-canary.2

package/src/Api/Internal/FormatColumnInternalApi.js

@@ -66,12 +66,12 @@ export class FormatColumnInternalApi extends ApiBase {
         // we need to maintain the format columns order, therefore we will extract all 3 scope types in a single iteration
         return formatColumns.filter((fc) => {
             return (
-            // this.getFormatColumnsWithColumnScope(formatColumns)
-            this.adaptable.api.scopeApi.scopeHasColumns(fc.Scope) ||
-                // this.getFormatColumnsWithDataTypeScope(formatColumns)
-                this.adaptable.api.scopeApi.scopeHasDataType(fc.Scope) ||
-                // this.getFormatColumnsWithAllScope(formatColumns)
-                this.adaptable.api.scopeApi.scopeIsAll(fc.Scope));
+                // this.getFormatColumnsWithColumnScope(formatColumns)
+                (this.adaptable.api.scopeApi.scopeHasColumns(fc.Scope) ||
+                    // this.getFormatColumnsWithDataTypeScope(formatColumns)
+                    this.adaptable.api.scopeApi.scopeHasDataType(fc.Scope) || // this.getFormatColumnsWithAllScope(formatColumns)
+                this.adaptable.api.scopeApi.scopeIsAll(fc.Scope))
+            );
         });
     }
     /**

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

@@ -1,4 +1,4 @@
 import { ApiBase } from '../Implementation/ApiBase';
 export declare class GridFilterInternalApi extends ApiBase {
-    fireGridFilterApplied(): void;
+    fireGridFilterAppliedEvent(): void;
 }

package/src/Api/Internal/GridFilterInternalApi.js

@@ -1,13 +1,13 @@
 import { ApiBase } from '../Implementation/ApiBase';
 export class GridFilterInternalApi extends ApiBase {
-    fireGridFilterApplied() {
+    fireGridFilterAppliedEvent() {
         if (this.adaptable.isLive) {
-            const currentQuery = this.getGridFilterApi().getCurrentGridFilterExpression();
+            const currentGridFilter = this.getGridFilterApi().getCurrentGridFilter();
             const adaptableApi = this.getAdaptableApi();
             const gridFilterAppliedInfo = {
-                gridFilter: currentQuery,
-                gridFilterExpressionAST: currentQuery
-                    ? adaptableApi.expressionApi.getASTForExpression(currentQuery)
+                gridFilter: currentGridFilter,
+                gridFilterExpressionAST: currentGridFilter
+                    ? adaptableApi.expressionApi.getASTForExpression(currentGridFilter === null || currentGridFilter === void 0 ? void 0 : currentGridFilter.Expression)
                     : null,
                 adaptableApi: adaptableApi,
                 userName: adaptableApi.optionsApi.getUserName(),

package/src/Api/Internal/GridInternalApi.js

@@ -61,7 +61,10 @@ export class GridInternalApi extends ApiBase {
         if (abColumn == undefined) {
             return [];
         }
-        const returnValues = this.adaptable.getDistinctValuesForColumn(abColumn, false);
+        const distinctValuesParams = {
+            visibleRowsOnly: false,
+        };
+        const returnValues = this.adaptable.getDistinctValuesForColumn(abColumn, distinctValuesParams);
         return this.sortDistinctValues(returnValues, abColumn).map((cv) => {
             return cv.normalisedValue;
         });
@@ -79,9 +82,12 @@ export class GridInternalApi extends ApiBase {
                 suppressClientSideFilter: false,
             };
         }
-        const { gridCells, suppressClientSideFilter } = await this.adaptable.getDistinctFilterValuesForColumn(abColumn, showFilteredRowsOnly, filter);
+        const distinctValuesParams = {
+            visibleRowsOnly: showFilteredRowsOnly,
+        };
+        const { gridCells, suppressClientSideFilter } = await this.adaptable.getDistinctFilterListValuesForColumn(abColumn, filter, distinctValuesParams);
         let showValuesCount = false;
-        const showValuesCountFunction = this.getColumnFilterOptions().showValuesCount;
+        const showValuesCountFunction = this.getColumnFilterOptions().valuesFilterOptions.showValuesCount;
         if (showValuesCountFunction) {
             showValuesCount = showValuesCountFunction(abColumn);
         }
@@ -108,7 +114,10 @@ export class GridInternalApi extends ApiBase {
         if (abColumn == undefined) {
             return [];
         }
-        const gridCells = await this.adaptable.getDistinctCustomSortValuesForColumn(abColumn, false);
+        const distinctValuesParams = {
+            visibleRowsOnly: false,
+        };
+        const gridCells = await this.adaptable.getDistinctCustomSortValuesForColumn(abColumn, distinctValuesParams);
         return this.sortDistinctValues(gridCells, abColumn).map((cv) => {
             return cv.normalisedValue;
         });
@@ -123,7 +132,10 @@ export class GridInternalApi extends ApiBase {
         if (abColumn == undefined) {
             return [];
         }
-        const gridCells = await this.adaptable.getDistinctBulkUpdateValuesForColumn(abColumn, false, selectedGridCells);
+        const distinctValuesParams = {
+            visibleRowsOnly: false,
+        };
+        const gridCells = await this.adaptable.getDistinctBulkUpdateValuesForColumn(abColumn, selectedGridCells, distinctValuesParams);
         return this.sortDistinctValues(gridCells, abColumn).map((cv) => {
             return cv.normalisedValue;
         });
@@ -137,7 +149,10 @@ export class GridInternalApi extends ApiBase {
         if (abColumn == undefined) {
             return [];
         }
-        const returnValues = this.adaptable.getDistinctValuesForColumn(abColumn, true);
+        const distinctValuesParams = {
+            visibleRowsOnly: true,
+        };
+        const returnValues = this.adaptable.getDistinctValuesForColumn(abColumn, distinctValuesParams);
         return this.sortDistinctValues(returnValues, abColumn).map((cv) => {
             return cv.normalisedValue;
         });
@@ -166,7 +181,11 @@ export class GridInternalApi extends ApiBase {
         if (abColumn == undefined) {
             return [];
         }
-        return this.adaptable.getDistinctValuesForColumn(abColumn, false, skipRowNode);
+        const distinctValuesParams = {
+            visibleRowsOnly: false,
+            skipRowNode: skipRowNode,
+        };
+        return this.adaptable.getDistinctValuesForColumn(abColumn, distinctValuesParams);
     }
     /**
      * Gets all distinct visible raw values in the Column
@@ -177,7 +196,10 @@ export class GridInternalApi extends ApiBase {
         if (abColumn == undefined) {
             return [];
         }
-        const returnValues = this.adaptable.getDistinctValuesForColumn(abColumn, true);
+        const distinctValuesParams = {
+            visibleRowsOnly: true,
+        };
+        const returnValues = this.adaptable.getDistinctValuesForColumn(abColumn, distinctValuesParams);
         return this.sortDistinctValues(returnValues, abColumn).map((cv) => {
             return cv.rawValue;
         });
@@ -185,7 +207,7 @@ export class GridInternalApi extends ApiBase {
     sortDistinctValues(returnValues, column) {
         // this does NOT into account Custom Sort - far too hard for now...
         let sortOrder = SortOrder.Asc;
-        if (this.getColumnFilterOptions().sortColumnValuesInFilter) {
+        if (this.getColumnFilterOptions().valuesFilterOptions.sortValuesFilter) {
             let columnSort = this.adaptable.api.gridApi.getColumnSortForColumn(column.columnId);
             if (columnSort && columnSort.SortOrder == 'Desc') {
                 sortOrder = SortOrder.Desc;

package/src/Api/Internal/LayoutInternalApi.js

@@ -4,6 +4,7 @@ import { DEFAULT_LAYOUT } from '../../Utilities/Constants/GeneralConstants';
 import ObjectFactory from '../../Utilities/ObjectFactory';
 import * as GridRedux from '../../Redux/ActionsReducers/GridRedux';
 import ArrayExtensions from '../../Utilities/Extensions/ArrayExtensions';
+import { ColumnFilterModuleId, GridFilterModuleId, } from '../../Utilities/Constants/ModuleConstants';
 export class LayoutInternalApi extends ApiBase {
     /**
      * Fires the `LayoutChanged` event
@@ -122,6 +123,13 @@ export class LayoutInternalApi extends ApiBase {
             layoutSupportedFeatures.AggregationColumns = false;
             layoutSupportedFeatures.PivotColumns = false;
         }
+        if (!this.getColumnFilterOptions().useAdaptableColumnFiltering ||
+            this.getEntitlementApi().getEntitlementAccessLevelForModule(ColumnFilterModuleId) == 'Hidden') {
+            layoutSupportedFeatures.ColumnFilters = false;
+        }
+        if (this.getEntitlementApi().getEntitlementAccessLevelForModule(GridFilterModuleId) == 'Hidden') {
+            layoutSupportedFeatures.GridFilter = false;
+        }
         return layoutSupportedFeatures;
     }
     updateCurrentDraftLayout(layout) {

package/src/Api/Internal/PredicateInternalApi.js

@@ -13,7 +13,7 @@ export class PredicateInternalApi extends ApiBase {
      */
     getFilterPredicateDefs(scope) {
         var _a;
-        return this.mergeSystemAndCustomPredicates((_a = this.getSystemFilterPredicateIds(scope)) === null || _a === void 0 ? void 0 : _a.map((predicateId) => this.getPredicateApi().getPredicateDefById(predicateId)), this.getPredicateApi().getCustomPredicateDefs()).filter((predicateDef) => predicateDef.moduleScope.includes('filter'));
+        return this.mergeSystemAndCustomPredicates((_a = this.getSystemFilterPredicateIds(scope)) === null || _a === void 0 ? void 0 : _a.map((predicateId) => this.getPredicateApi().getPredicateDefById(predicateId)), this.getPredicateApi().getCustomPredicateDefs()).filter((predicateDef) => predicateDef.moduleScope.includes('columnFilter'));
     }
     getSystemFilterPredicateIds(scope) {
         const systemFilterPredicates = this.getPredicateOptions().systemFilterPredicates;
@@ -22,8 +22,8 @@ export class PredicateInternalApi extends ApiBase {
                 adaptableApi: this.adaptable.api,
                 userName: this.getOptions().userName,
                 adaptableId: this.getOptions().adaptableId,
-                systemPredicateDefs: this.getPredicateApi().getSystemPredicateDefsByModuleScope('filter'),
-                moduleScope: 'filter',
+                systemPredicateDefs: this.getPredicateApi().getSystemPredicateDefsByModuleScope('columnFilter'),
+                moduleScope: 'columnFilter',
                 columnScope: scope,
             };
             return systemFilterPredicates(systemPredicateContext);

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

@@ -59,7 +59,4 @@ export declare class StyledColumnInternalApi extends ApiBase {
     hasStyledColumnRelativeCellRange(styledColumn: StyledColumn): boolean;
     getApplicableBadge(styledColumn: StyledColumn, context: PredicateDefHandlerContext): BadgeStyleDefinition | null;
     getBadgePredicateDefsForColumn(columnId: string): import("../../types").AdaptablePredicateDef<string>[];
-    getCheckBoxStyleStyledColumn(column: AdaptableColumn): StyledColumn | undefined;
-    isCheckBoxStyleStyledColumn(column: AdaptableColumn): boolean;
-    fireCheckboxColumnClickedEvent(columnId: string, rowData: any, primaryKeyValue: any, isChecked: boolean): void;
 }

package/src/Api/Internal/StyledColumnInternalApi.js

@@ -1,6 +1,5 @@
 import { ApiBase } from '../Implementation/ApiBase';
 import ArrayExtensions from '../../Utilities/Extensions/ArrayExtensions';
-import Helper from '../../Utilities/Helpers/Helper';
 export class StyledColumnInternalApi extends ApiBase {
     getMinValueForNumericColumn(column) {
         if (column.dataType !== 'Number') {
@@ -278,30 +277,4 @@ export class StyledColumnInternalApi extends ApiBase {
             .predicateApi.internalApi.getBadgeStylePredicateDefs(scope)
             .filter((predicate) => this.adaptable.api.scopeApi.isColumnInScope(column, predicate.columnScope));
     }
-    // Deprecated Checkbox Column functions
-    getCheckBoxStyleStyledColumn(column) {
-        var _a;
-        if (column.dataType != 'Boolean') {
-            return undefined;
-        }
-        const checkBoxFormatColumns = (_a = this.getAdaptableApi().styledColumnApi.getStyledColumnState().StyledColumns) === null || _a === void 0 ? void 0 : _a.filter((sc) => sc === null || sc === void 0 ? void 0 : sc.CheckBoxStyle);
-        const styledColumn = checkBoxFormatColumns.find((sc) => sc.ColumnId == column.columnId);
-        return styledColumn;
-    }
-    isCheckBoxStyleStyledColumn(column) {
-        const styledColumn = this.getCheckBoxStyleStyledColumn(column);
-        return Helper.objectExists(styledColumn);
-    }
-    fireCheckboxColumnClickedEvent(columnId, rowData, primaryKeyValue, isChecked) {
-        let checkboxColumnClickedInfo = {
-            adaptableApi: this.adaptable.api,
-            column: this.adaptable.api.columnApi.getColumnWithColumnId(columnId),
-            rowData: rowData,
-            primaryKeyValue: primaryKeyValue,
-            isChecked: isChecked,
-            userName: this.adaptable.api.optionsApi.getUserName(),
-            adaptableId: this.adaptable.api.optionsApi.getAdaptableId(),
-        };
-        this.adaptable.api.eventApi.emit('CheckboxColumnClicked', checkboxColumnClickedInfo);
-    }
 }

package/src/Api/NamedQueryApi.d.ts

@@ -1,6 +1,6 @@
 import { NamedQuery, NamedQueryState } from '../types';
 /**
- * Provides run-time access to Named and Current Queries
+ * Provides run-time access to Named Queries
  */
 export interface NamedQueryApi {
     /**
@@ -31,10 +31,7 @@ export interface NamedQueryApi {
      * Checks if the given Named Query has a valid name
      * @param namedQueryName Named Query
      */
-    isValidNamedQueryName(namedQuery: NamedQuery): {
-        valid: boolean;
-        message: string;
-    };
+    isValidNamedQuery(namedQuery: NamedQuery): NamedQueryValidationResult;
     /**
      * Opens Settings Panel with Query section selected and visible
      */
@@ -50,3 +47,7 @@ export interface NamedQueryApi {
      */
     runQueryByName(queryName: string): void;
 }
+export interface NamedQueryValidationResult {
+    valid: boolean;
+    message: string;
+}

package/src/Api/OptionsApi.d.ts

@@ -1,7 +1,7 @@
 import { CustomSortOptions } from '../AdaptableOptions/CustomSortOptions';
 import { DataSetOptions } from '../AdaptableOptions/DataSetOptions';
 import { GroupingOptions } from '../AdaptableOptions/GroupingOptions';
-import { ActionColumnOptions, ActionRowOptions, AdaptableOptions, AlertOptions, CalendarOptions, CellSummaryOptions, ChartingOptions, ColumnFilterOptions, ColumnOptions, ContainerOptions, DashboardOptions, DataChangeHistoryOptions, EditOptions, EntitlementOptions, ExportOptions, FlashingCellOptions, FormatColumnOptions, LayoutOptions, MenuOptions, NotesOptions, NotificationsOptions, QuickSearchOptions, SettingsPanelOptions, StateOptions, TeamSharingOptions, ToolPanelOptions, UserInterfaceOptions } from '../types';
+import { ActionColumnOptions, ActionRowOptions, AdaptableOptions, AlertOptions, CalendarOptions, CellSummaryOptions, ChartingOptions, ColumnFilterOptions, ColumnOptions, ContainerOptions, DashboardOptions, DataChangeHistoryOptions, EditOptions, EntitlementOptions, ExportOptions, FlashingCellOptions, FormatColumnOptions, GridFilterOptions, LayoutOptions, MenuOptions, NotesOptions, NotificationsOptions, QuickSearchOptions, SettingsPanelOptions, StateOptions, TeamSharingOptions, ToolPanelOptions, UserInterfaceOptions } from '../types';
 import { Fdc3Options } from '../AdaptableOptions/Fdc3Options';
 import { ExpressionOptions } from '../AdaptableOptions/ExpressionOptions';
 import { DataImportOptions } from '../AdaptableOptions/DataImportOptions';
@@ -109,6 +109,10 @@ export interface OptionsApi {
      * Returns `AdaptableOptions.columnFilterOptions`
      */
     getColumnFilterOptions(): Readonly<ColumnFilterOptions>;
+    /**
+     * Returns `AdaptableOptions.gridFilterOptions`
+     */
+    getGridFilterOptions(): Readonly<GridFilterOptions>;
     /**
      * Returns `AdaptableOptions.flashingCellOptions`
      */

package/src/PredefinedConfig/AlertState.d.ts

@@ -56,7 +56,7 @@ export interface AlertDefinition extends SuspendableObject {
 /**
  * Form triggered by an Alert which contains only Buttons
  */
-export declare type AlertButtonForm = Omit<AdaptableForm<AlertFormContext>, 'title' | 'buttons' | 'description'> & {
+export type AlertButtonForm = Omit<AdaptableForm<AlertFormContext>, 'title' | 'buttons' | 'description'> & {
     Buttons?: AlertButton<AlertFormContext>[];
 };
 /**
@@ -68,17 +68,17 @@ export interface AlertDefinitionPredicate extends AdaptableColumnPredicate {
 /**
  * The Alert Rule defined by either an AdaptablePredicate or an AdaptableQuery
  */
-export declare type AlertRule = XOR<{
+export type AlertRule = XOR<{
     Predicates: AlertDefinitionPredicate[];
 }, AdaptableAlertQuery>;
 /**
  *  Alert Query which may be either a Boolean, Observable or AggregatedBoolean Expression
  */
-export declare type AdaptableAlertQuery = XOR<AdaptableBooleanQuery, XOR<AdaptableObservableQuery, AdaptableAggregatedBooleanQuery>>;
+export type AdaptableAlertQuery = XOR<AdaptableBooleanQuery, XOR<AdaptableObservableQuery, AdaptableAggregatedBooleanQuery>>;
 /**
  * Actions available in an Alert
  */
-export declare type AdaptableAlertAction = 'highlight-cell' | 'highlight-row' | 'jump-to-cell' | 'jump-to-row' | 'jump-to-column' | 'suspend' | 'undo';
+export type AdaptableAlertAction = 'highlight-cell' | 'highlight-row' | 'jump-to-cell' | 'jump-to-row' | 'jump-to-column' | 'suspend' | 'undo';
 /**
  * Defines a button that appears in an Alert Form
  */
@@ -146,8 +146,8 @@ export interface AlertProperties {
 /**
  * Array containing all System Alert Predicates
  */
-export declare type SystemAlertPredicateIds = SystemAlertPredicateId[];
+export type SystemAlertPredicateIds = SystemAlertPredicateId[];
 /**
  * List of System Predicates available for Alerts
  */
-export declare type SystemAlertPredicateId = 'Blanks' | 'NonBlanks' | 'Equals' | 'NotEquals' | 'GreaterThan' | 'LessThan' | 'Positive' | 'Negative' | 'Zero' | 'Between' | 'NotBetween' | 'Is' | 'IsNot' | 'Contains' | 'NotContains' | 'StartsWith' | 'EndsWith' | 'Regex' | 'Today' | 'Yesterday' | 'Tomorrow' | 'ThisWeek' | 'ThisMonth' | 'ThisQuarter' | 'ThisYear' | 'InPast' | 'InFuture' | 'Before' | 'After' | 'On' | 'NotOn' | 'NextWorkDay' | 'LastWorkDay' | 'WorkDay' | 'Holiday' | 'True' | 'False' | 'PercentChange' | 'PrimaryKeyDuplicate' | 'ExistingValuesOnly' | 'NoDuplicateValues' | 'IsNumeric' | 'IsNotNumeric' | 'AddedRow' | 'RemovedRow' | 'Values' | 'ExcludeValues' | 'Any';
+export type SystemAlertPredicateId = 'Blanks' | 'NonBlanks' | 'Equals' | 'NotEquals' | 'GreaterThan' | 'LessThan' | 'Positive' | 'Negative' | 'Zero' | 'Between' | 'NotBetween' | 'Is' | 'IsNot' | 'Contains' | 'NotContains' | 'StartsWith' | 'EndsWith' | 'Regex' | 'Today' | 'Yesterday' | 'Tomorrow' | 'ThisWeek' | 'ThisMonth' | 'ThisQuarter' | 'ThisYear' | 'InPast' | 'InFuture' | 'Before' | 'After' | 'On' | 'NotOn' | 'NextWorkDay' | 'LastWorkDay' | 'WorkDay' | 'Holiday' | 'True' | 'False' | 'PercentChange' | 'ExistingValuesOnly' | 'NoDuplicateValues' | 'IsNumeric' | 'IsNotNumeric' | 'AddedRow' | 'RemovedRow' | 'Values' | 'ExcludeValues' | 'AnyChange';

package/src/PredefinedConfig/CalculatedColumnState.d.ts

@@ -46,4 +46,4 @@ export interface CalculatedColumnSettings extends SpecialColumnSettings {
 /**
  * Calculated Column Query which may be a Scalar or an AggregatedScalar Expression
  */
-export declare type AdaptableCalculatedColumnQuery = XOR<AdaptableScalarQuery, AdaptableAggregatedScalarQuery>;
+export type AdaptableCalculatedColumnQuery = XOR<AdaptableScalarQuery, AdaptableAggregatedScalarQuery>;

package/src/PredefinedConfig/ChartingState.d.ts

@@ -43,9 +43,12 @@ export interface ChartingState extends ConfigState {
      * Wrappers around AG Grid Chart Models
      */
     ChartDefinitions?: ChartDefinition[];
+    /**
+     * Definitions of External Charts
+     */
     ExternalChartDefinitions?: ExternalChartDefinition<unknown>[];
 }
 /**
  * Aggregation function used in the Chart
  */
-export declare type ChartingAggFunc = 'sum' | 'min' | 'max' | 'count' | 'avg' | 'first' | 'last';
+export type ChartingAggFunc = 'sum' | 'min' | 'max' | 'count' | 'avg' | 'first' | 'last';

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

@@ -5,11 +5,11 @@ import { AlertDefinition } from '../AlertState';
 /**
  * Defines an Alert fired by AdapTable
  */
-export declare type AdaptableAlert<TData = any> = AdaptableCellChangedAlert<TData> | AdaptableRowChangedAlert<TData> | AdaptableGenericAlert;
+export type AdaptableAlert<TData = any> = AdaptableCellChangedAlert<TData> | AdaptableRowChangedAlert<TData> | AdaptableGenericAlert;
 /**
  * Type of AdapTable Alert: generic, cellChange or rowChange
  */
-export declare type AdaptableAlertType = 'generic' | 'cellChange' | 'rowChange';
+export type AdaptableAlertType = 'generic' | 'cellChange' | 'rowChange';
 /**
  * Defines a generic AdapTable Alert
  */

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

@@ -2,7 +2,7 @@ import { AdaptableObject } from './AdaptableObject';
 /**
  * Type of data stored in an AdapTable Column
  */
-export declare type AdaptableColumnDataType = 'String' | 'Number' | 'Boolean' | 'Date' | 'Object' | 'StringArray' | 'NumberArray' | 'TupleNumberArray' | 'ObjectNumberArray' | 'Unknown';
+export type AdaptableColumnDataType = 'String' | 'Number' | 'Boolean' | 'Date' | 'Object' | 'StringArray' | 'NumberArray' | 'TupleNumberArray' | 'ObjectNumberArray' | 'Unknown';
 /**
  * Base class for AdapTable Column containing most important properties
  */

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

@@ -2,7 +2,7 @@ import { InitialGroupOrderComparatorParams, IRowNode } from '@ag-grid-community/
 /**
  * Standard comparer function used to evaluate custom sorts, returns -1, 0, 1 as required
  */
-export declare type AdaptableComparerFunction<TData = any> = (
+export type AdaptableComparerFunction<TData = any> = (
 /**
  * First Cell to compare
  */
@@ -19,4 +19,4 @@ nodeA?: IRowNode<TData>,
  * Second Row Node to compare
  */
 nodeB?: IRowNode<TData>) => number;
-export declare type AdaptableNodeComparerFunction<TData = any> = (params: InitialGroupOrderComparatorParams<TData>) => number;
+export type AdaptableNodeComparerFunction<TData = any> = (params: InitialGroupOrderComparatorParams<TData>) => number;

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

@@ -3,7 +3,7 @@ import { BaseContext } from '../../types';
 /**
  * Data which appears in an AdapTable Form
  */
-export declare type AdaptableFormData = Record<string, any>;
+export type AdaptableFormData = Record<string, any>;
 /**
  * Defines a form which appears dynamically; used by Alerts & Export Custom Destinations
  */
@@ -56,5 +56,5 @@ export interface AdaptableFormField {
 /**
  * Types of Controls used in an AdapTable Form
  */
-export declare type AdaptableFormFieldType = 'text' | 'select' | 'date' | 'number' | 'checkbox' | 'textOutput';
+export type AdaptableFormFieldType = 'text' | 'select' | 'date' | 'number' | 'checkbox' | 'textOutput';
 export declare function getDefaultAdaptableFormData<T extends BaseContext = BaseContext>(formDef?: AdaptableForm<T>): AdaptableFormData;

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

@@ -1,7 +1,7 @@
 /**
  * Object containing formatting information for Numeric and Date Columns
  */
-export declare type AdaptableFormat = {
+export type AdaptableFormat = {
     Formatter: 'NumberFormatter';
     Options: NumberFormatterOptions;
 } | {

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

@@ -3,7 +3,7 @@ import { TypeHint } from './Types';
 /**
  * Defines an icon to be used in AdapTable (e.g. in Dashboard Header, Buttons, Menu, etc.)
  */
-export declare type AdaptableIcon = AdaptableSystemIcon | AdaptableCustomIcon | AdaptableElementIcon;
+export type AdaptableIcon = AdaptableSystemIcon | AdaptableCustomIcon | AdaptableElementIcon;
 /**
  * Defines an icon from the System AdapTable icon set
  */
@@ -54,4 +54,4 @@ export interface AdaptableBaseIcon {
 /**
  * All AdapTable System Icon names
  */
-export declare type AdaptableSystemIconName = 'add' | 'alert' | 'building' | 'laptop' | 'arrow-down' | 'arrow-left' | 'arrow-right' | 'arrow-up' | 'arrow-up-long' | 'arrow-down-long' | 'arrow-expand' | 'paperclip' | 'unfilled-circle' | 'boolean-list' | 'broadcast' | 'brush' | 'spanner' | 'edit-table' | 'chart-and-grid' | 'calendar' | 'call' | 'cells' | 'fdc3' | 'flag' | 'chart' | 'chat' | 'check' | 'check-circle' | 'checked' | 'clone' | 'close' | 'cloud-upload' | 'collapse' | 'column-add' | 'columns' | 'filter-list' | 'comment' | 'contains' | 'dashboard' | 'data-set' | 'date-range' | 'delete' | 'division' | 'dock' | 'dollar' | 'drag' | 'edit' | 'ends-with' | 'equals' | 'equation' | 'error' | 'expand' | 'exponent' | 'export' | 'export-data' | 'fast-backward' | 'fast-forward' | 'filter' | 'lightning' | 'folder' | 'folder-open' | 'folder-shared' | 'color-palette' | 'horizontal-lines' | 'function' | 'greater-than' | 'greater-than-or-equal' | 'history' | 'home' | 'import-export' | 'info' | 'brain' | 'download' | 'grid' | 'interactions' | 'less-than' | 'less-than-or-equal' | 'list' | 'logout' | 'mail' | 'menu' | 'minus' | 'multiplication' | 'money' | 'newpage' | 'news' | 'filled-circle' | 'not-contains' | 'not-equal' | 'open-in-new' | 'order' | 'organisation' | 'pause' | 'percent' | 'percent-tag' | 'person' | 'contact' | 'pie-chart' | 'play' | 'plus' | 'add-circle' | 'search' | 'search-table' | 'quote' | 'refresh' | 'regex' | 'reminder' | 'save' | 'schedule' | 'science' | 'settings' | 'link' | 'sort-asc' | 'sort-desc' | 'spark-line' | 'starts-with' | 'assignment' | 'statusbar' | 'stop' | 'traffic-lights' | 'tab-unselected' | 'theme' | 'clipboard' | 'target' | 'triangle-down' | 'triangle-up' | 'unchecked' | 'undo' | 'downloaded' | 'upload' | 'warning' | 'gradient' | 'badge' | 'italic' | 'bold' | 'align-left' | 'align-right' | 'align-center' | 'align-justify' | 'underline' | 'strikethrough' | 'overline' | 'case-upper' | 'case-lower' | 'case-sentence' | 'visibility-on' | 'visibility-off' | 'visibility-off-bold' | 'visibility-on-bold' | 'note' | 'import' | 'grid-filter';
+export type AdaptableSystemIconName = 'add' | 'alert' | 'building' | 'laptop' | 'arrow-down' | 'arrow-left' | 'arrow-right' | 'arrow-up' | 'arrow-up-long' | 'arrow-down-long' | 'arrow-expand' | 'paperclip' | 'unfilled-circle' | 'boolean-list' | 'broadcast' | 'brush' | 'spanner' | 'edit-table' | 'chart-and-grid' | 'calendar' | 'call' | 'cells' | 'fdc3' | 'flag' | 'chart' | 'chat' | 'check' | 'check-circle' | 'checked' | 'clone' | 'close' | 'cloud-upload' | 'collapse' | 'column-add' | 'columns' | 'filter-list' | 'comment' | 'contains' | 'dashboard' | 'data-set' | 'date-range' | 'delete' | 'division' | 'dock' | 'dollar' | 'drag' | 'edit' | 'ends-with' | 'equals' | 'equation' | 'error' | 'expand' | 'exponent' | 'export' | 'export-data' | 'fast-backward' | 'fast-forward' | 'filter' | 'lightning' | 'folder' | 'folder-open' | 'folder-shared' | 'color-palette' | 'horizontal-lines' | 'function' | 'greater-than' | 'greater-than-or-equal' | 'history' | 'home' | 'import-export' | 'info' | 'brain' | 'download' | 'grid' | 'interactions' | 'less-than' | 'less-than-or-equal' | 'list' | 'logout' | 'mail' | 'menu' | 'minus' | 'multiplication' | 'money' | 'newpage' | 'news' | 'filled-circle' | 'not-contains' | 'not-equal' | 'open-in-new' | 'order' | 'organisation' | 'pause' | 'percent' | 'percent-tag' | 'person' | 'contact' | 'pie-chart' | 'play' | 'plus' | 'add-circle' | 'search' | 'search-table' | 'quote' | 'refresh' | 'regex' | 'reminder' | 'save' | 'schedule' | 'science' | 'settings' | 'link' | 'sort-asc' | 'sort-desc' | 'spark-line' | 'resume' | 'starts-with' | 'assignment' | 'statusbar' | 'stop' | 'traffic-lights' | 'tab-unselected' | 'theme' | 'clipboard' | 'target' | 'triangle-down' | 'triangle-up' | 'unchecked' | 'undo' | 'downloaded' | 'upload' | 'warning' | 'gradient' | 'badge' | 'italic' | 'bold' | 'align-left' | 'align-right' | 'align-center' | 'align-justify' | 'underline' | 'strikethrough' | 'overline' | 'case-upper' | 'case-lower' | 'case-sentence' | 'visibility-on' | 'visibility-off' | 'visibility-off-bold' | 'visibility-on-bold' | 'note' | 'import' | 'grid-filter';

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

@@ -1,7 +1,7 @@
 /**
  * Defines a Message Types: 'Success', 'Info', 'Warning' or 'Error'
  */
-export declare type AdaptableMessageType = 
+export type AdaptableMessageType = 
 /**
  * A success message - shows in green
  */

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

@@ -24,7 +24,7 @@ export interface AdaptableObject {
 /**
  * AdaptableObjectTag Object Tag - currently supporting only plain string values, but open for future extensions, if needed
  */
-export declare type AdaptableObjectTag = string;
+export type AdaptableObjectTag = string;
 /**
  * Lookup criteria for finding specific Adaptable Objects; all given criteria will be composed with an AND operator
  */

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

@@ -42,7 +42,7 @@ export interface AdaptablePredicateDef<PREDICATE_TYPE = string> {
      */
     columnScope: AdaptableScope;
     /**
-     * Modules where the Predicate can run
+     * Modules where Predicate can run
      */
     moduleScope: PredicateModuleScope[];
     /**
@@ -112,9 +112,9 @@ export interface PredicateDefToStringParams {
     inputs: any[];
 }
 /**
- * Defines which in Modules the Predicate is available
+ * Defines which Modules use the Predicate
  */
-export declare type PredicateModuleScope = 'filter' | 'alert' | 'flashingcell' | 'formatColumn' | 'badgeStyle';
+export type PredicateModuleScope = 'columnFilter' | 'alert' | 'flashingcell' | 'formatColumn' | 'badgeStyle';
 /**
  * Array of Predicate Defs which are shipped by AdapTable
  */