@adaptabletools/adaptable 14.0.0-canary.3 → 14.0.1-canary.0

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

@@ -40,7 +40,7 @@ export declare class AlertApiImpl extends ApiBase implements AlertApi {
     editAlertDefinition(alertDefinition: AlertDefinition): AlertDefinition;
     suspendAlertDefinition(alertDefinition: AlertDefinition): AlertDefinition;
     unSuspendAlertDefinition(alertDefinition: AlertDefinition): AlertDefinition;
-    evaluateAlerts(alertDefinitions: AlertDefinition[]): void;
+    evaluateAlertDefinitions(alertDefinitions: AlertDefinition[]): void;
     findAlertDefinitions(criteria: AdaptableObjectLookupCriteria): AlertDefinition[];
     private getRelevantColumnIdsForAlertDefinition;
     private createCellDataChangeInfoStubs;

package/src/Api/Implementation/AlertApiImpl.js

@@ -181,7 +181,7 @@ class AlertApiImpl extends ApiBase_1.ApiBase {
         this.dispatchAction(AlertRedux.AlertDefinitionUnSuspend(alertDefinition));
         return this.getAlertDefinitionById(alertDefinition.Uuid);
     }
-    evaluateAlerts(alertDefinitions) {
+    evaluateAlertDefinitions(alertDefinitions) {
         const filterScopeAllDefinitions = (alertDefinition) => {
             if (this.getAdaptableApi().scopeApi.scopeIsAll(alertDefinition.Scope) &&
                 !this.getAdaptableApi().queryLanguageApi.getAdaptableQueryExpression(alertDefinition.Rule)) {

package/src/Api/Implementation/GridApiImpl.js

@@ -240,7 +240,7 @@ class GridApiImpl extends ApiBase_1.ApiBase {
         }, [{}]);
         let preparedClearSelection = clearSelection;
         rowRanges.forEach((range) => {
-            // clear only on fisrt range selection
+            // clear only on first range selection
             this.adaptable.selectCells(preapredGridCellRange.columnIds, range.startNode, range.endNode, preparedClearSelection);
             preparedClearSelection = false;
         });

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

@@ -22,6 +22,7 @@ export declare class StyledColumnApiImpl extends ApiBase implements StyledColumn
     deleteStyledColumn(styledColumn: StyledColumn): void;
     addStyledColumn(styledColumn: StyledColumn): void;
     getCheckBoxStyleStyledColumn(column: AdaptableColumn): StyledColumn | undefined;
+    isSparklineStyleStyledColumn(column: AdaptableColumn): boolean;
     isCheckBoxStyleStyledColumn(column: AdaptableColumn): boolean;
     fireCheckboxColumnClickedEvent(columnId: string, rowData: any, primaryKeyValue: any, isChecked: boolean): void;
     getActiveStyledColumnForColumn(column: AdaptableColumn): StyledColumn | undefined;

package/src/Api/Implementation/StyledColumnApiImpl.js

@@ -62,6 +62,12 @@ class StyledColumnApiImpl extends ApiBase_1.ApiBase {
         const styledColumn = checkBoxFormatColumns.find((sc) => sc.ColumnId == column.columnId);
         return styledColumn;
     }
+    isSparklineStyleStyledColumn(column) {
+        if (!column) {
+            return false;
+        }
+        return !!this.getStyledColumns().find((styledColumn) => !!styledColumn.SparkLineStyle && styledColumn.ColumnId === column.columnId);
+    }
     isCheckBoxStyleStyledColumn(column) {
         const styledColumn = this.getCheckBoxStyleStyledColumn(column);
         return Helper_1.default.objectExists(styledColumn);

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

@@ -18,4 +18,6 @@ export declare class TeamSharingApiImpl extends ApiBase implements TeamSharingAp
     importSharedEntry(sharedEntity: SharedEntity): void;
     private getTeamSharingState;
     getLoadedSharedEntities(): SharedEntity[];
+    refreshTeamSharing(): void;
+    triggerLoadingTeamSharingEntries(): void;
 }

package/src/Api/Implementation/TeamSharingApiImpl.js

@@ -76,5 +76,12 @@ class TeamSharingApiImpl extends ApiBase_1.ApiBase {
     getLoadedSharedEntities() {
         return this.getTeamSharingState().SharedEntities;
     }
+    refreshTeamSharing() {
+        this.dispatchAction(TeamSharingRedux.TeamSharingGet());
+    }
+    triggerLoadingTeamSharingEntries() {
+        (0, logDeprecation_1.logDeprecation)('TeamSharingApi', 'triggerLoadingTeamSharingEntries', 'refreshTeamSharing');
+        this.refreshTeamSharing();
+    }
 }
 exports.TeamSharingApiImpl = TeamSharingApiImpl;

package/src/Api/Internal/AdaptableInternalApi.js

@@ -231,7 +231,7 @@ class AdaptableInternalApi extends ApiBase_1.ApiBase {
     createFrameworkComponent(containerDomNode, frameworkComponent, componentType) {
         const createComponentFn = () => 
         // delegate the logic to framework wrapper
-        this.adaptable._emit('FrameworkComponentChange', {
+        this.adaptable._emitSync('FrameworkComponentChange', {
             command: 'create',
             containerDomNode,
             frameworkComponent,
@@ -249,7 +249,7 @@ class AdaptableInternalApi extends ApiBase_1.ApiBase {
         }
     }
     destroyFrameworkComponent(containerDomNode, frameworkComponent, componentType) {
-        this.adaptable._emit('FrameworkComponentChange', {
+        this.adaptable._emitSync('FrameworkComponentChange', {
             command: 'destroy',
             containerDomNode,
             frameworkComponent,

package/src/Api/Internal/LayoutInternalApi.js

@@ -93,8 +93,7 @@ class LayoutInternalApi extends ApiBase_1.ApiBase {
      * Returns true if Layouts will contain Expanded Row Groups information
      */
     areExpandedRowGroupsSavedInLayouts() {
-        return (this.getLayoutOptions().includeExpandedRowGroups ||
-            this.getLayoutOptions().displayRowGroups === 'dynamic');
+        return this.getLayoutOptions().displayRowGroups === 'dynamic';
     }
     /**
      * Checks if the draft layout and the current layout are the same.

package/src/Api/Internal/PredicateInternalApi.js

@@ -22,13 +22,6 @@ class PredicateInternalApi extends ApiBase_1.ApiBase {
         ].filter((predicateDef) => predicateDef.moduleScope.includes('filter'));
     }
     getSystemFilterPredicateIds() {
-        // for now we still need to get the old ones in case they have been provided
-        // however they have been deprectated and they are not populated by AdapTable
-        const oldSystemFilterPredicates = this.getFilterOptions().systemFilters;
-        if (oldSystemFilterPredicates) {
-            return oldSystemFilterPredicates;
-        }
-        // if old list not provided use the new property in Predicate Options
         const systemFilterPredicates = this.getAdaptableQLOptions().predicateOptions.systemFilterPredicates;
         if (typeof systemFilterPredicates === 'function') {
             const systemPredicateContext = {

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

@@ -6,11 +6,6 @@ export declare class TeamSharingInternalApi extends ApiBase {
      * @param sharedEntity Entity that has been changed
      */
     fireTeamSharingEntityChangedEvent(sharedEntity: SharedEntity): void;
-    /**
-     * Trigger loading of shared entries.
-     * By default shared entries are loaded when the Team Sharing popup is visible.
-     */
-    triggerLoadingTeamSharingEntries(): void;
     /**
      * Retrieves shared entry dependencies.
      */

package/src/Api/Internal/TeamSharingInternalApi.js

@@ -1,9 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.TeamSharingInternalApi = void 0;
-const tslib_1 = require("tslib");
 const ApiBase_1 = require("../Implementation/ApiBase");
-const TeamSharingRedux = tslib_1.__importStar(require("../../Redux/ActionsReducers/TeamSharingRedux"));
 class TeamSharingInternalApi extends ApiBase_1.ApiBase {
     /**
      * Fires the Team Sharing Entity Changed Event
@@ -18,13 +16,6 @@ class TeamSharingInternalApi extends ApiBase_1.ApiBase {
             this.getAdaptableApi().eventApi.emit('TeamSharingEntityChanged', teamSharingEntityChangedInfo);
         }
     }
-    /**
-     * Trigger loading of shared entries.
-     * By default shared entries are loaded when the Team Sharing popup is visible.
-     */
-    triggerLoadingTeamSharingEntries() {
-        this.dispatchAction(TeamSharingRedux.TeamSharingGet());
-    }
     /**
      * Retrieves shared entry dependencies.
      */

package/src/Api/StyledColumnApi.d.ts

@@ -53,15 +53,20 @@ export interface StyledColumnApi {
      */
     getCheckBoxStyleStyledColumn(column: AdaptableColumn): StyledColumn | undefined;
     /**
-     * Checks whether Column with given `columnId` has a PercentBar Style applied.
+     * Checks whether Column with given `columnId` has a PercentBar Style applied
      * @param columnId column ID
      */
     hasPercentBarStyle(columnId: string): boolean;
     /**
-     * Checks whether Column with given `columnId` has a Gradient Style applied.
+     * Checks whether Column with given `columnId` has a Gradient Style applied
      * @param columnId column ID
      */
     hasGradientStyle(columnId: string): boolean;
+    /**
+     * Checks whether Column is a Sparkline Column
+     * @param columnId column ID
+     */
+    isSparklineStyleStyledColumn(column: AdaptableColumn): boolean;
     /**
      * Whether given column is a (boolean) checkbox column
      * @param columnId column to check

package/src/Api/TeamSharingApi.d.ts

@@ -53,6 +53,10 @@ export interface TeamSharingApi {
      * Retrieves already loaded shared entries.
      */
     getLoadedSharedEntities(): SharedEntity[];
+    /**
+     * Refreshes the local TeamSharing state by (re)loading the remote state.
+     */
+    refreshTeamSharing(): void;
     /**
      * TO BE REMOVED
      */
@@ -60,4 +64,8 @@ export interface TeamSharingApi {
      *@deprecated use `openTeamSharingSettingsPanel()` instead
      */
     showTeamSharingPopup(): void;
+    /**
+     * @deprecated use `refreshTeamSharing()` instead
+     */
+    triggerLoadingTeamSharingEntries(): void;
 }

package/src/PredefinedConfig/AlertState.d.ts

@@ -141,4 +141,4 @@ export declare 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' | 'Any';
+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';

package/src/PredefinedConfig/CalculatedColumnState.d.ts

@@ -27,20 +27,16 @@ export interface CalculatedColumn extends AdaptableObject {
     /**
      * Additional optional properties for Column (e.g. filterable, resizable)
      */
-    CalculatedColumnSettings?: CalculatedColumnSettings;
+    CalculatedColumnSettings: CalculatedColumnSettings;
     /**
      * Scalar/AggregatedScalar Query used by AdapTableQL to evaluate Column's value
      */
     Query: AdaptableCalculatedColumnQuery;
 }
 /**
- * Set of optional properties that define a Calculated Column's behaviour
+ * Set properties that define Calculated Column's behaviour (all optional except DataType)
  */
 export interface CalculatedColumnSettings extends SpecialColumnSettings {
-    /**
-     *  Expression's return value DataType; inferred by AdapTable but settable by User
-     */
-    DataType: 'String' | 'Number' | 'Boolean' | 'Date';
     /**
      * Show underlying Expression as ToolTip when hovering over a cell
      * @defaultValue false

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

@@ -40,23 +40,23 @@ export interface AdaptableMenuItem {
     subItems?: AdaptableMenuItem[];
 }
 /**
- * Menu Item which is added to Column Header or Context Menu, and can contain sub items
+ * Menu Item which is added to Column or Context Menu - can contain sub items
  */
 export interface UserMenuItem<CONTEXT_TYPE extends BaseContext> {
     /**
-     * Text that will appear in the Menu Item
+     * Text to appear in the Menu Item
      */
     label: string | ((context: CONTEXT_TYPE) => string);
     /**
-     * Function to invoke when the Menu Item is clicked
+     * Function invoked when the Menu Item is clicked
      */
     onClick?: (menuContext: CONTEXT_TYPE) => void;
     /**
-     * Function to evaluate whether Menu Item is visible
+     * Function evaluating whether Menu Item is visible
      */
     hidden?: (menuContext: CONTEXT_TYPE) => boolean;
     /**
-     * Function to evaluate whether Menu Item is enabled
+     * Function evaluating whether Menu Item is enabled
      */
     disabled?: (menuContext: CONTEXT_TYPE) => boolean;
     /**

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

@@ -1,7 +1,11 @@
 /**
- * Base Settings for Calculated Columns and FreeText Columns
+ * Base Settings for both Calculated and FreeText Columns
  */
 export interface SpecialColumnSettings {
+    /**
+     *  Expression's return value DataType; inferred by AdapTable but settable by User
+     */
+    DataType: 'String' | 'Number' | 'Boolean' | 'Date';
     /**
      * Preferred (pixel) Column Width; if unset, calculated dynamically by AG Grid
      */
@@ -47,7 +51,7 @@ export interface SpecialColumnSettings {
      */
     SuppressMovable?: boolean;
     /**
-     * Custom column types to be added to AG Grid Column Types when object is created
+     * Custom column types added to AG Grid Column Types when object is created
      */
     ColumnTypes?: string[];
     /**

package/src/PredefinedConfig/FormatColumnState.d.ts

@@ -24,8 +24,7 @@ export interface FormatColumn extends SuspendableObject {
      */
     Scope: AdaptableScope;
     /**
-     * Predicate-based Rule to use for deciding if a format column needs to be applied.
-     * When not defined the format column is always applied.
+     * Rule used to decide whether to apply the Format; if undefined Format is always applied
      */
     Rule?: FormatColumnRule;
     /**
@@ -66,7 +65,7 @@ export declare type SystemFormatColumnPredicateIds = SystemFormatColumnPredicate
 /**
  * List of System Predicates available for Format Columns
  */
-export declare type SystemFormatColumnPredicateId = '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';
+export declare type SystemFormatColumnPredicateId = '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' | 'Values' | 'ExcludeValues';
 /**
  * Special Style used when Formatting Columns: Gradient, PercentBar or CheckBox
  *

package/src/PredefinedConfig/FreeTextColumnState.d.ts

@@ -35,15 +35,10 @@ export interface FreeTextColumn extends AdaptableObject {
      * * @defaultValue 'Inline'
      */
     TextEditor?: 'Inline' | 'Large';
-    /**
-     * Whether Column is String, Number, Boolean or Date
-     * @defaultValue 'String'
-     */
-    DataType: 'String' | 'Number' | 'Boolean' | 'Date';
     /**
      * Additional optional properties for Column (e.g. filterable, resizable)
      */
-    FreeTextColumnSettings?: FreeTextColumnSettings;
+    FreeTextColumnSettings: FreeTextColumnSettings;
 }
 /**
  * Defines a cell value stored in a Free Text Column

package/src/Strategy/FreeTextColumnModule.js

@@ -25,10 +25,29 @@ class FreeTextColumnModule extends AdaptableModuleBase_1.AdaptableModuleBase {
         // make sure all default to type string
         const allFreeTextColumns = this.getModuleAdaptableObjects();
         for (const freeTextColumn of allFreeTextColumns) {
-            if (!freeTextColumn.DataType) {
-                const updatedFreeTextColumn = Object.assign(Object.assign({}, freeTextColumn), { DataType: 'String' });
-                // FIXME AFL add api method to edit multiple columns in one run
-                this.api.freeTextColumnApi.editFreeTextColumn(updatedFreeTextColumn);
+            const unTypedCol = freeTextColumn;
+            if (unTypedCol.DataType) {
+                const dataType = unTypedCol.DataType;
+                delete unTypedCol['DataType'];
+                if (!freeTextColumn.FreeTextColumnSettings) {
+                    freeTextColumn.FreeTextColumnSettings = {
+                        DataType: dataType,
+                    };
+                }
+                else {
+                    freeTextColumn.FreeTextColumnSettings.DataType = dataType;
+                }
+                this.api.freeTextColumnApi.editFreeTextColumn(freeTextColumn);
+            }
+            if (!freeTextColumn.FreeTextColumnSettings) {
+                freeTextColumn.FreeTextColumnSettings = {
+                    DataType: 'String',
+                };
+                this.api.freeTextColumnApi.editFreeTextColumn(freeTextColumn);
+            }
+            if (!freeTextColumn.FreeTextColumnSettings.DataType) {
+                freeTextColumn.FreeTextColumnSettings.DataType = 'String';
+                this.api.freeTextColumnApi.editFreeTextColumn(freeTextColumn);
             }
         }
     }
@@ -73,7 +92,7 @@ class FreeTextColumnModule extends AdaptableModuleBase_1.AdaptableModuleBase {
                 {
                     name: 'Settings',
                     label: 'Data Type',
-                    values: [(_a = freeTextColumn.DataType) !== null && _a !== void 0 ? _a : 'Not specified'],
+                    values: [(_a = freeTextColumn.FreeTextColumnSettings.DataType) !== null && _a !== void 0 ? _a : 'Not specified'],
                 },
                 Boolean(freeTextColumn.DefaultValue) && {
                     name: 'Settings',

package/src/Strategy/StyledColumnModule.js

@@ -73,39 +73,71 @@ class StyledColumnModule extends AdaptableModuleBase_1.AdaptableModuleBase {
     }
     addColumnMenuItems(column) {
         let returnColumnMenuItems = [];
-        if (column && this.isModuleEditable() && !column.isSparkline) {
-            if (column.dataType === 'Number') {
+        // Need a Column and an editable Module
+        if (column && this.isModuleEditable()) {
+            // First look at Sparkline Columns - needs to be editable array type
+            if (this.api.columnApi.hasArrayDataType(column.columnId) && column.IsReadOnly !== true) {
                 let styledColumn = this.api.styledColumnApi.getStyledColumnForColumnId(column.columnId);
-                let styledColumnExists = Boolean(styledColumn);
-                if (!styledColumn) {
-                    styledColumn = Object.assign(Object.assign({}, ObjectFactory_1.default.CreateEmptyStyledColumn()), { ColumnId: column.columnId, 
-                        // numbers default to gradient
-                        GradientStyle: {} });
+                let sparklineColumnExists = column.isSparkline && Boolean(styledColumn);
+                if (column.isSparkline && !sparklineColumnExists) {
+                    // do nothing as we only want to continue if there is no sparkline column or if its in state
+                    // because if just one then it was created in AG Grid and we dont want to edit it
                 }
-                if (styledColumn && styledColumn.IsReadOnly && styledColumn.IsReadOnly == true) {
-                    styledColumnExists = false;
+                else {
+                    if (!sparklineColumnExists) {
+                        styledColumn = Object.assign(Object.assign({}, ObjectFactory_1.default.CreateEmptyStyledColumn()), { ColumnId: column.columnId, 
+                            // set sparkline style
+                            SparkLineStyle: {} });
+                    }
+                    else {
+                        styledColumn = this.api.styledColumnApi.getStyledColumnForColumnId(column.columnId);
+                    }
+                    let label = sparklineColumnExists ? 'Edit ' : 'Create ';
+                    let popupParam = {
+                        action: sparklineColumnExists ? 'Edit' : 'New',
+                        source: 'ColumnMenu',
+                        value: styledColumn,
+                    };
+                    returnColumnMenuItems.push(this.createColumnMenuItemShowPopup(label + 'Sparkline Column', this.moduleInfo.Popup, this.moduleInfo.Glyph, popupParam));
                 }
-                let label = styledColumnExists ? 'Edit ' : 'Create ';
-                let popupParam = {
-                    action: styledColumnExists ? 'Edit' : 'New',
-                    source: 'ColumnMenu',
-                    value: styledColumn,
-                };
-                returnColumnMenuItems.push(this.createColumnMenuItemShowPopup(label + 'Styled Column', this.moduleInfo.Popup, this.moduleInfo.Glyph, popupParam));
             }
-            if (column.dataType == 'Boolean' && !this.api.columnApi.isFreeTextColumn(column.columnId)) {
-                let styledColumn = this.api.styledColumnApi.getStyledColumnForColumnId(column.columnId);
-                const hasCheckBox = styledColumn && (styledColumn === null || styledColumn === void 0 ? void 0 : styledColumn.CheckBoxStyle);
-                if (hasCheckBox) {
-                    returnColumnMenuItems.push(this.createColumnMenuItemClickFunction('Remove Checkbox', 'unchecked', () => {
-                        this.api.styledColumnApi.deleteStyledColumn(styledColumn);
-                    }));
+            // Next do non sparkline
+            if (!column.isSparkline) {
+                // First do numeric (Gradient and Percent Bar)
+                if (column.dataType === 'Number') {
+                    let styledColumn = this.api.styledColumnApi.getStyledColumnForColumnId(column.columnId);
+                    let styledColumnExists = Boolean(styledColumn);
+                    if (!styledColumn) {
+                        styledColumn = Object.assign(Object.assign({}, ObjectFactory_1.default.CreateEmptyStyledColumn()), { ColumnId: column.columnId, 
+                            // numbers default to gradient
+                            GradientStyle: {} });
+                    }
+                    if (styledColumn && styledColumn.IsReadOnly && styledColumn.IsReadOnly == true) {
+                        styledColumnExists = false;
+                    }
+                    let label = styledColumnExists ? 'Edit ' : 'Create ';
+                    let popupParam = {
+                        action: styledColumnExists ? 'Edit' : 'New',
+                        source: 'ColumnMenu',
+                        value: styledColumn,
+                    };
+                    returnColumnMenuItems.push(this.createColumnMenuItemShowPopup(label + 'Styled Column', this.moduleInfo.Popup, this.moduleInfo.Glyph, popupParam));
                 }
-                else {
-                    returnColumnMenuItems.push(this.createColumnMenuItemClickFunction('Show as Checkbox', 'checked', () => {
-                        const styledColumn = ObjectFactory_1.default.CreateEmptyStyledColumn();
-                        this.api.styledColumnApi.addStyledColumn(Object.assign(Object.assign({}, styledColumn), { ColumnId: column.columnId, CheckBoxStyle: true }));
-                    }));
+                // Then do Checkbox
+                if (column.dataType == 'Boolean' && !this.api.columnApi.isFreeTextColumn(column.columnId)) {
+                    let styledColumn = this.api.styledColumnApi.getStyledColumnForColumnId(column.columnId);
+                    const hasCheckBox = styledColumn && (styledColumn === null || styledColumn === void 0 ? void 0 : styledColumn.CheckBoxStyle);
+                    if (hasCheckBox) {
+                        returnColumnMenuItems.push(this.createColumnMenuItemClickFunction('Remove Checkbox', 'unchecked', () => {
+                            this.api.styledColumnApi.deleteStyledColumn(styledColumn);
+                        }));
+                    }
+                    else {
+                        returnColumnMenuItems.push(this.createColumnMenuItemClickFunction('Show as Checkbox', 'checked', () => {
+                            const styledColumn = ObjectFactory_1.default.CreateEmptyStyledColumn();
+                            this.api.styledColumnApi.addStyledColumn(Object.assign(Object.assign({}, styledColumn), { ColumnId: column.columnId, CheckBoxStyle: true }));
+                        }));
+                    }
                 }
             }
         }

package/src/Strategy/TeamSharingModule.js

@@ -33,7 +33,7 @@ class TeamSharingModule extends AdaptableModuleBase_1.AdaptableModuleBase {
             this.api.internalApi.dispatchReduxAction(TeamSharingRedux.TeamSharingCommitImport());
         });
         if (this.api.teamSharingApi.isTeamSharingAvailable()) {
-            this.api.teamSharingApi.internalApi.triggerLoadingTeamSharingEntries();
+            this.api.teamSharingApi.refreshTeamSharing();
         }
     }
     isModuleAvailable() {
@@ -167,7 +167,7 @@ class TeamSharingModule extends AdaptableModuleBase_1.AdaptableModuleBase {
         return {
             actions: [TeamSharingApplyButton_1.TeamSharingApplyButton],
             onMount: () => {
-                this.api.teamSharingApi.internalApi.triggerLoadingTeamSharingEntries();
+                this.api.teamSharingApi.refreshTeamSharing();
             },
             getDeleteAction: (sharedEntity) => {
                 return TeamSharingRedux.TeamSharingRemoveItem(sharedEntity.Uuid);

package/src/Utilities/Defaults/DefaultAdaptableOptions.js

@@ -145,7 +145,6 @@ exports.DefaultAdaptableOptions = {
         ],
     },
     generalOptions: {
-        hideEmptyGroupRows: false,
         showMissingPrimaryKeyAlert: false,
         dataSets: GeneralConstants_1.EMPTY_ARRAY,
         showGroupingTotalsAsHeader: false,
@@ -158,7 +157,6 @@ exports.DefaultAdaptableOptions = {
         disableDeleteConfirmation: false,
     },
     layoutOptions: {
-        includeExpandedRowGroups: false,
         displayRowGroups: 'closed',
         autoSaveLayouts: true,
         autoSizeColumnsInLayout: false,
@@ -209,7 +207,6 @@ exports.DefaultAdaptableOptions = {
         defaultFilterFormTab: 'Values',
         enableFilterOnSpecialColumns: true,
         maxFilterValuesToDisplay: 2000,
-        systemFilters: undefined,
         showQuickFilter: true,
         showDistinctFilteredValuesOnly: false,
         showClearFilterButton: false,

package/src/Utilities/ExpressionFunctions/aggregatedBooleanExpressionFunctions.d.ts

@@ -4,7 +4,7 @@ import { AggregatedScalarExpressionEvaluation } from './aggregatedScalarExpressi
 /**
  * List of all the Aggregation Functions available in AdaptableQL
  */
-export declare type AggregatedBooleanFunctionName = 'WHERE' | 'COL' | 'GROUP_BY' | AggregationFunction | ComparisonFunction;
+export declare type AggregatedBooleanFunctionName = 'WHERE' | 'COL' | 'GROUP_BY' | 'WEIGHT' | AggregationFunction | ComparisonFunction;
 declare type AggregationFunction = 'SUM' | 'MIN' | 'MAX' | 'AVG';
 declare type ComparisonFunction = 'EQ' | 'NEQ' | 'LT' | 'GT' | 'LTE' | 'GTE';
 export interface BooleanAggregationParameter extends BaseParameter<'aggregationBoolean', AggregationFunction> {

package/src/Utilities/ExpressionFunctions/aggregatedBooleanExpressionFunctions.js

@@ -28,22 +28,14 @@ exports.aggregatedBooleanExpressionFunctions = {
         signatures: ['<main_query> WHERE <boolean_query>'],
         examples: ['<main_query> WHERE <boolean_query>', '<main_query> WHERE QUERY("abc")'],
         hasEagerEvaluation: true,
-        category: 'operator',
+        category: 'conditional',
     },
     SUM: aggregatedScalarExpressionFunctions_1.aggregatedScalarExpressionFunctions['SUM'],
     MIN: aggregatedScalarExpressionFunctions_1.aggregatedScalarExpressionFunctions['MIN'],
     MAX: aggregatedScalarExpressionFunctions_1.aggregatedScalarExpressionFunctions['MAX'],
     AVG: aggregatedScalarExpressionFunctions_1.aggregatedScalarExpressionFunctions['AVG'],
+    WEIGHT: aggregatedScalarExpressionFunctions_1.aggregatedScalarExpressionFunctions['WEIGHT'],
     GROUP_BY: aggregatedScalarExpressionFunctions_1.aggregatedScalarExpressionFunctions['GROUP_BY'],
-    COL: {
-        handler(args, context) {
-            return (0, expressionFunctionUtils_1.handleColumnFunction)(args, context);
-        },
-        description: 'References a column by its unique identifier',
-        signatures: ['[colName]', 'COL(name: string)'],
-        examples: ['[col1]', "COL('col1')"],
-        category: 'advanced',
-    },
     EQ: {
         handler(args, context) {
             return buildBooleanAggregationParameter(args, context, '=', (aggregatedValue, conditionValue) => aggregatedValue === conditionValue);
@@ -134,6 +126,15 @@ exports.aggregatedBooleanExpressionFunctions = {
         examples: [`SUM([col1]) >= '5M'`, 'GTE( SUM([col1]), 250000)'],
         category: 'comparison',
     },
+    COL: {
+        handler(args, context) {
+            return (0, expressionFunctionUtils_1.handleColumnFunction)(args, context);
+        },
+        description: 'References a column by its unique identifier',
+        signatures: ['[colName]', 'COL(name: string)'],
+        examples: ['[col1]', "COL('col1')"],
+        category: 'special',
+    },
 };
 const buildBooleanAggregationParameter = (args, context, comparisonOperator, conditionFn) => {
     // LHS

package/src/Utilities/ExpressionFunctions/aggregatedScalarExpressionFunctions.js

@@ -232,14 +232,14 @@ exports.aggregatedScalarExpressionFunctions = {
             };
             return result;
         },
-        description: 'Aggregates a column over multiple rows by computing the average value (arithmetic mean) of the column values\nOptionally the aggregation may be computed within provided individual groups',
+        description: 'Aggregates a column over multiple rows by computing the average value (arithmetic mean) of the column values\nOptionally the aggregation may be weighted and/or grouped.',
         signatures: [
             'AVG( [colName] )',
             'AVG( COL(name: string))',
             'AVG( [colNameA], GROUP_BY( [colNameB] ))',
             'AVG( COL(nameA: string), GROUP_BY( COL(nameB: string)))',
         ],
-        examples: ['AVG([colA])', 'AVG([colA], GROUP_BY([colB]))'],
+        examples: ['AVG([colA])', 'AVG([colA], GROUP_BY([colB]))', 'AVG([colA], WEIGHT([colB]))'],
         category: 'aggregation',
     },
     MIN: {
@@ -487,7 +487,7 @@ exports.aggregatedScalarExpressionFunctions = {
         },
         description: 'Defines an accumulative dimension (order) for the enclosing cumulative aggregation',
         signatures: ['OVER( [colName] )', 'OVER( COL(name: string))'],
-        examples: ['OVER( [colName] )', `OVER( COL('colName'))`],
+        examples: ['OVER( [colName] )', `OVER( COL('colName'))`, `CUMUL( SUM([colA]), OVER([colB]))`],
         category: 'cumulative',
     },
     WEIGHT: {
@@ -503,8 +503,12 @@ exports.aggregatedScalarExpressionFunctions = {
         },
         description: 'Defines a weight for the enclosing AVG(Average) aggregation',
         signatures: ['WEIGHT( [colName] )', 'WEIGHT( COL(name: string))'],
-        examples: ['WEIGHT( [colName] )', `WEIGHT( COL('colName'))`],
-        category: 'aggregation',
+        examples: [
+            'WEIGHT( [colName] )',
+            `WEIGHT( COL('colName'))`,
+            `AVG( [colName1], WEIGHT([colName2]))`,
+        ],
+        category: 'operand',
     },
     GROUP_BY: {
         handler(args, context) {
@@ -519,7 +523,7 @@ exports.aggregatedScalarExpressionFunctions = {
         description: 'Groups an aggregation operation within the rows that have the same value in the specified column',
         signatures: ['GROUP_BY( [colName] )', 'GROUP_BY( COL(name: string))'],
         examples: ['GROUP_BY( [colName] )', `GROUP_BY( COL('colName'))`],
-        category: 'advanced',
+        category: 'grouping',
     },
     COL: {
         handler(args, context) {
@@ -528,7 +532,7 @@ exports.aggregatedScalarExpressionFunctions = {
         description: 'References a column by its unique identifier',
         signatures: ['[colName]', 'COL(name: string)'],
         examples: ['[col1]', 'COL("col1")'],
-        category: 'advanced',
+        category: 'special',
     },
 };
 const mapAggregationToCumulation = (aggregationParameter, overColumnParameter, context) => {