ag-grid-enterprise - npm Package Compare versions

Comparing version 5.0.0-alpha.6 to 5.0.0

bower.json

 {
   "name": "ag-grid-enterprise",
-  "version": "5.0.0-alpha.6",
+  "version": "5.0.0",
   "homepage": "http://www.ag-grid.com/",
@@ -5,0 +5,0 @@ "authors": [

dist/lib/aggregation/aggFuncService.d.ts

@@ -1,2 +0,2 @@
-// ag-grid-enterprise v5.0.0-alpha.6
+// ag-grid-enterprise v5.0.0
 import { IAggFuncService, IAggFunc, GridOptionsWrapper } from "ag-grid/main";
@@ -3,0 +3,0 @@ export declare class AggFuncService implements IAggFuncService {

dist/lib/aggregation/aggFuncService.js

@@ -1,2 +0,2 @@
-// ag-grid-enterprise v5.0.0-alpha.6
+// ag-grid-enterprise v5.0.0
 var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
@@ -3,0 +3,0 @@ var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;

dist/lib/clientExports.d.ts

@@ -1,2 +0,2 @@
-// ag-grid-enterprise v5.0.0-alpha.6
+// ag-grid-enterprise v5.0.0
 export declare function populateClientExports(exports: any): void;

dist/lib/clientExports.js

@@ -1,2 +0,2 @@
-// ag-grid-enterprise v5.0.0-alpha.6
+// ag-grid-enterprise v5.0.0
 var columnSelectPanel_1 = require("./toolPanel/columnsSelect/columnSelectPanel");
@@ -29,4 +29,11 @@ var renderedColumn_1 = require("./toolPanel/columnsSelect/renderedColumn");
 var aggFuncService_1 = require("./aggregation/aggFuncService");
+var md5_1 = require("./license/md5");
+var setFilterListItem_1 = require("./setFilter/setFilterListItem");
+var columnComponent_1 = require("./toolPanel/columnDrop/columnComponent");
+var valueColumnsPanel_1 = require("./toolPanel/columnDrop/valueColumnsPanel");
+var pivotCompFactory_1 = require("./pivotCompFactory");
+var rowGroupCompFactory_1 = require("./rowGroupCompFactory");
 function populateClientExports(exports) {
     exports.AggFuncService = aggFuncService_1.AggFuncService;
+    exports.MD5 = md5_1.MD5;
     exports.RichSelectCellEditor = richSelectCellEditor_1.RichSelectCellEditor;
@@ -40,2 +47,3 @@ exports.RichSelectRow = richSelectRow_1.RichSelectRow;
     exports.SetFilter = setFilter_1.SetFilter;
+    exports.SetFilter = setFilterListItem_1.SetFilterListItem;
     exports.SetFilterModel = setFilterModel_1.SetFilterModel;
@@ -45,6 +53,8 @@ exports.StatusBar = statusBar_1.StatusBar;
     exports.AbstractColumnDropPanel = abstractColumnDropPanel_1.AbstractColumnDropPanel;
+    exports.ColumnComponent = columnComponent_1.ColumnComponent;
+    exports.PivotColumnsPanel = pivotColumnsPanel_1.PivotColumnsPanel;
+    exports.PivotModePanel = pivotModePanel_1.PivotModePanel;
     exports.RowGroupColumnsPanel = rowGroupColumnsPanel_1.RowGroupColumnsPanel;
-    exports.PivotColumnsPanel = pivotColumnsPanel_1.PivotColumnsPanel;
+    exports.ValuesColumnPanel = valueColumnsPanel_1.ValuesColumnPanel;
     exports.ToolPanelComp = toolPanelComp_1.ToolPanelComp;
-    exports.PivotModePanel = pivotModePanel_1.PivotModePanel;
     exports.ColumnSelectPanel = columnSelectPanel_1.ColumnSelectPanel;
@@ -54,9 +64,11 @@ exports.RenderedColumn = renderedColumn_1.RenderedColumn;
     exports.ViewportRowModel = viewportRowModel_1.ViewportRowModel;
+    exports.ClipboardService = clipboardService_1.ClipboardService;
     exports.ContextMenuFactory = contextMenu_1.ContextMenuFactory;
-    exports.ClipboardService = clipboardService_1.ClipboardService;
     exports.EnterpriseBoot = enterpriseBoot_1.EnterpriseBoot;
     exports.EnterpriseMenu = enterpriseMenu_1.EnterpriseMenu;
+    exports.LicenseManager = licenseManager_1.LicenseManager;
+    exports.PivotCompFactory = pivotCompFactory_1.PivotCompFactory;
     exports.RangeController = rangeController_1.RangeController;
-    exports.LicenseManager = licenseManager_1.LicenseManager;
+    exports.RowGroupCompFactory = rowGroupCompFactory_1.RowGroupCompFactory;
 }
 exports.populateClientExports = populateClientExports;

dist/lib/clipboardService.d.ts

@@ -1,2 +0,2 @@
-// ag-grid-enterprise v5.0.0-alpha.6
+// ag-grid-enterprise v5.0.0
 import { IClipboardService } from "ag-grid/main";
@@ -3,0 +3,0 @@ export declare class ClipboardService implements IClipboardService {

dist/lib/clipboardService.js

@@ -1,2 +0,2 @@
-// ag-grid-enterprise v5.0.0-alpha.6
+// ag-grid-enterprise v5.0.0
 var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
@@ -3,0 +3,0 @@ var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;

dist/lib/contextMenu.d.ts

@@ -1,2 +0,2 @@
-// ag-grid-enterprise v5.0.0-alpha.6
+// ag-grid-enterprise v5.0.0
 import { IContextMenuFactory, RowNode, Column } from "ag-grid/main";
@@ -3,0 +3,0 @@ export declare class ContextMenuFactory implements IContextMenuFactory {

dist/lib/contextMenu.js

@@ -1,2 +0,2 @@
-// ag-grid-enterprise v5.0.0-alpha.6
+// ag-grid-enterprise v5.0.0
 var __extends = (this && this.__extends) || function (d, b) {
@@ -3,0 +3,0 @@ for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p];

dist/lib/enterpriseBoot.d.ts

@@ -1,2 +0,2 @@
-// ag-grid-enterprise v5.0.0-alpha.6
+// ag-grid-enterprise v5.0.0
 export declare class EnterpriseBoot {
@@ -3,0 +3,0 @@ private static RICH_SELECT;

dist/lib/enterpriseBoot.js

@@ -1,2 +0,2 @@
-// ag-grid-enterprise v5.0.0-alpha.6
+// ag-grid-enterprise v5.0.0
 var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
@@ -3,0 +3,0 @@ var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;

dist/lib/enterpriseMenu.d.ts

@@ -1,2 +0,2 @@
-// ag-grid-enterprise v5.0.0-alpha.6
+// ag-grid-enterprise v5.0.0
 import { IMenuFactory, Column } from "ag-grid/main";
@@ -3,0 +3,0 @@ export declare class EnterpriseMenuFactory implements IMenuFactory {

dist/lib/enterpriseMenu.js

@@ -1,2 +0,2 @@
-// ag-grid-enterprise v5.0.0-alpha.6
+// ag-grid-enterprise v5.0.0
 var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
@@ -3,0 +3,0 @@ var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;

dist/lib/license/md5.d.ts

@@ -1,2 +0,2 @@
-// ag-grid-enterprise v5.0.0-alpha.6
+// ag-grid-enterprise v5.0.0
 export declare class MD5 {
@@ -3,0 +3,0 @@ private ieCompatibility;

dist/lib/license/md5.js

@@ -1,2 +0,2 @@
-// ag-grid-enterprise v5.0.0-alpha.6
+// ag-grid-enterprise v5.0.0
 var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
@@ -3,0 +3,0 @@ var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;

dist/lib/licenseManager.d.ts

@@ -1,2 +0,2 @@
-// ag-grid-enterprise v5.0.0-alpha.6
+// ag-grid-enterprise v5.0.0
 export declare class LicenseManager {
@@ -3,0 +3,0 @@ private static RELEASE_INFORMATION;

dist/lib/licenseManager.js

@@ -1,2 +0,2 @@
-// ag-grid-enterprise v5.0.0-alpha.6
+// ag-grid-enterprise v5.0.0
 var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
@@ -3,0 +3,0 @@ var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;

dist/lib/main.d.ts

@@ -1,1 +0,1 @@
-// ag-grid-enterprise v5.0.0-alpha.6
+// ag-grid-enterprise v5.0.0

dist/lib/main.js

@@ -1,2 +0,2 @@
-// ag-grid-enterprise v5.0.0-alpha.6
+// ag-grid-enterprise v5.0.0
 var main_1 = require("ag-grid/main");
@@ -3,0 +3,0 @@ var enterpriseMenu_1 = require("./enterpriseMenu");

dist/lib/pivotCompFactory.d.ts

@@ -1,2 +0,2 @@
-// ag-grid-enterprise v5.0.0-alpha.6
+// ag-grid-enterprise v5.0.0
 import { ICompFactory, Component } from "ag-grid/main";
@@ -3,0 +3,0 @@ export declare class PivotCompFactory implements ICompFactory {

dist/lib/pivotCompFactory.js

@@ -1,2 +0,2 @@
-// ag-grid-enterprise v5.0.0-alpha.6
+// ag-grid-enterprise v5.0.0
 var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
@@ -3,0 +3,0 @@ var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;

dist/lib/rangeController.d.ts

@@ -1,2 +0,2 @@
-// ag-grid-enterprise v5.0.0-alpha.6
+// ag-grid-enterprise v5.0.0
 import { IRangeController, RangeSelection, GridCell, AddRangeSelectionParams } from "ag-grid/main";
@@ -3,0 +3,0 @@ export declare class RangeController implements IRangeController {

dist/lib/rangeController.js

@@ -1,2 +0,2 @@
-// ag-grid-enterprise v5.0.0-alpha.6
+// ag-grid-enterprise v5.0.0
 var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
@@ -3,0 +3,0 @@ var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;

dist/lib/rendering/richSelect/richSelectCellEditor.d.ts

@@ -1,2 +0,2 @@
-// ag-grid-enterprise v5.0.0-alpha.6
+// ag-grid-enterprise v5.0.0
 import { ICellEditor, ICellEditorParams, Component, Context, ICellRenderer, ICellRendererFunc, CellRendererService } from "ag-grid/main";
@@ -3,0 +3,0 @@ export interface IRichCellEditorParams extends ICellEditorParams {

dist/lib/rendering/richSelect/richSelectCellEditor.js

@@ -1,2 +0,2 @@
-// ag-grid-enterprise v5.0.0-alpha.6
+// ag-grid-enterprise v5.0.0
 var __extends = (this && this.__extends) || function (d, b) {
@@ -3,0 +3,0 @@ for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p];

dist/lib/rendering/richSelect/richSelectRow.d.ts

@@ -1,2 +0,2 @@
-// ag-grid-enterprise v5.0.0-alpha.6
+// ag-grid-enterprise v5.0.0
 import { Component, CellRendererService, ICellRendererFunc, ICellRenderer } from "ag-grid/main";
@@ -3,0 +3,0 @@ export declare class RichSelectRow extends Component {

dist/lib/rendering/richSelect/richSelectRow.js

@@ -1,2 +0,2 @@
-// ag-grid-enterprise v5.0.0-alpha.6
+// ag-grid-enterprise v5.0.0
 var __extends = (this && this.__extends) || function (d, b) {
@@ -3,0 +3,0 @@ for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p];

dist/lib/rendering/virtualList.d.ts

@@ -1,2 +0,2 @@
-// ag-grid-enterprise v5.0.0-alpha.6
+// ag-grid-enterprise v5.0.0
 import { Component } from "ag-grid/main";
@@ -3,0 +3,0 @@ export interface VirtualListModel {

dist/lib/rendering/virtualList.js

@@ -1,2 +0,2 @@
-// ag-grid-enterprise v5.0.0-alpha.6
+// ag-grid-enterprise v5.0.0
 var __extends = (this && this.__extends) || function (d, b) {
@@ -3,0 +3,0 @@ for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p];

dist/lib/rowGroupCompFactory.d.ts

@@ -1,2 +0,2 @@
-// ag-grid-enterprise v5.0.0-alpha.6
+// ag-grid-enterprise v5.0.0
 import { ICompFactory, Component } from "ag-grid/main";
@@ -3,0 +3,0 @@ export declare class RowGroupCompFactory implements ICompFactory {

dist/lib/rowGroupCompFactory.js

@@ -1,2 +0,2 @@
-// ag-grid-enterprise v5.0.0-alpha.6
+// ag-grid-enterprise v5.0.0
 var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
@@ -3,0 +3,0 @@ var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;

dist/lib/rowStages/aggregationStage.d.ts

@@ -1,2 +0,2 @@
-// ag-grid-enterprise v5.0.0-alpha.6
+// ag-grid-enterprise v5.0.0
 import { IRowNodeStage, RowNode } from "ag-grid/main";
@@ -3,0 +3,0 @@ export declare class AggregationStage implements IRowNodeStage {

dist/lib/rowStages/aggregationStage.js

@@ -1,2 +0,2 @@
-// ag-grid-enterprise v5.0.0-alpha.6
+// ag-grid-enterprise v5.0.0
 var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
@@ -3,0 +3,0 @@ var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;

dist/lib/rowStages/groupStage.d.ts

@@ -1,2 +0,2 @@
-// ag-grid-enterprise v5.0.0-alpha.6
+// ag-grid-enterprise v5.0.0
 import { IRowNodeStage, RowNode } from "ag-grid/main";
@@ -3,0 +3,0 @@ export declare class GroupStage implements IRowNodeStage {

dist/lib/rowStages/groupStage.js

@@ -1,2 +0,2 @@
-// ag-grid-enterprise v5.0.0-alpha.6
+// ag-grid-enterprise v5.0.0
 var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
@@ -3,0 +3,0 @@ var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;

dist/lib/rowStages/pivotColDefService.d.ts

@@ -1,2 +0,2 @@
-// ag-grid-enterprise v5.0.0-alpha.6
+// ag-grid-enterprise v5.0.0
 import { ColDef, ColGroupDef } from "ag-grid/main";
@@ -3,0 +3,0 @@ export interface PivotColDefServiceResult {

dist/lib/rowStages/pivotColDefService.js

@@ -1,2 +0,2 @@
-// ag-grid-enterprise v5.0.0-alpha.6
+// ag-grid-enterprise v5.0.0
 var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
@@ -67,2 +67,5 @@ var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
             main_1.Utils.assign(colDef, colDefToCopy);
+            // even if original column was hidden, we always show the pivot value column, otherwise it would be
+            // very confusing for people thinking the pivot is broken
+            colDef.hide = false;
         }
@@ -69,0 +72,0 @@ colDef.valueGetter = null;

dist/lib/rowStages/pivotStage.d.ts

@@ -1,2 +0,2 @@
-// ag-grid-enterprise v5.0.0-alpha.6
+// ag-grid-enterprise v5.0.0
 import { IRowNodeStage, RowNode, ColDef } from "ag-grid/main";
@@ -3,0 +3,0 @@ export declare class PivotStage implements IRowNodeStage {

dist/lib/rowStages/pivotStage.js

@@ -1,2 +0,2 @@
-// ag-grid-enterprise v5.0.0-alpha.6
+// ag-grid-enterprise v5.0.0
 var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
@@ -3,0 +3,0 @@ var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;

dist/lib/setFilter/setFilter.d.ts

@@ -1,2 +0,2 @@
-// ag-grid-enterprise v5.0.0-alpha.6
+// ag-grid-enterprise v5.0.0
 import { Component } from "ag-grid/main";
@@ -3,0 +3,0 @@ import { Filter } from "ag-grid/main";

dist/lib/setFilter/setFilter.js

@@ -1,2 +0,2 @@
-// ag-grid-enterprise v5.0.0-alpha.6
+// ag-grid-enterprise v5.0.0
 var __extends = (this && this.__extends) || function (d, b) {
@@ -3,0 +3,0 @@ for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p];

dist/lib/setFilter/setFilterListItem.d.ts

@@ -1,2 +0,2 @@
-// ag-grid-enterprise v5.0.0-alpha.6
+// ag-grid-enterprise v5.0.0
 import { Component, ICellRenderer, ICellRendererFunc } from "ag-grid/main";
@@ -3,0 +3,0 @@ export declare class SetFilterListItem extends Component {

dist/lib/setFilter/setFilterListItem.js

@@ -1,2 +0,2 @@
-// ag-grid-enterprise v5.0.0-alpha.6
+// ag-grid-enterprise v5.0.0
 var __extends = (this && this.__extends) || function (d, b) {
@@ -3,0 +3,0 @@ for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p];

dist/lib/setFilter/setFilterModel.d.ts

@@ -1,2 +0,2 @@
-// ag-grid-enterprise v5.0.0-alpha.6
+// ag-grid-enterprise v5.0.0
 import { ColDef } from "ag-grid/main";
@@ -3,0 +3,0 @@ export declare class SetFilterModel {

dist/lib/setFilter/setFilterModel.js

@@ -1,2 +0,2 @@
-// ag-grid-enterprise v5.0.0-alpha.6
+// ag-grid-enterprise v5.0.0
 var main_1 = require("ag-grid/main");
@@ -3,0 +3,0 @@ var SetFilterModel = (function () {

dist/lib/statusBar/statusBar.d.ts

@@ -1,2 +0,2 @@
-// ag-grid-enterprise v5.0.0-alpha.6
+// ag-grid-enterprise v5.0.0
 import { Component } from 'ag-grid/main';
@@ -3,0 +3,0 @@ export declare class StatusBar extends Component {

dist/lib/statusBar/statusBar.js

@@ -1,2 +0,2 @@
-// ag-grid-enterprise v5.0.0-alpha.6
+// ag-grid-enterprise v5.0.0
 var __extends = (this && this.__extends) || function (d, b) {
@@ -3,0 +3,0 @@ for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p];

dist/lib/statusBar/statusItem.d.ts

@@ -1,2 +0,2 @@
-// ag-grid-enterprise v5.0.0-alpha.6
+// ag-grid-enterprise v5.0.0
 import { Component } from 'ag-grid/main';
@@ -3,0 +3,0 @@ export declare class StatusItem extends Component {

dist/lib/statusBar/statusItem.js

@@ -1,2 +0,2 @@
-// ag-grid-enterprise v5.0.0-alpha.6
+// ag-grid-enterprise v5.0.0
 var __extends = (this && this.__extends) || function (d, b) {
@@ -3,0 +3,0 @@ for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p];

dist/lib/toolPanel/columnDrop/abstractColumnDropPanel.d.ts

@@ -1,3 +0,3 @@
-// ag-grid-enterprise v5.0.0-alpha.6
-import { Component, EventService, Context, LoggerFactory, DragAndDropService, Column } from "ag-grid/main";
+// ag-grid-enterprise v5.0.0
+import { Component, EventService, GridOptionsWrapper, Context, LoggerFactory, DragAndDropService, Column } from "ag-grid/main";
 export interface AbstractColumnDropPanelParams {
@@ -10,2 +10,3 @@ dragAndDropIcon: string;
 export interface AbstractColumnDropPanelBeans {
+    gridOptionsWrapper: GridOptionsWrapper;
     eventService: EventService;
@@ -29,2 +30,3 @@ context: Context;
     protected abstract getExistingColumns(): Column[];
+    protected abstract getIconName(): string;
     constructor(horizontal: boolean, valueColumn: boolean);
@@ -39,2 +41,3 @@ isHorizontal(): boolean;
     private onDragEnter(draggingEvent);
+    protected isPotentialDndColumns(): boolean;
     private onDragLeave(draggingEvent);
@@ -41,0 +44,0 @@ private onDragStop();

dist/lib/toolPanel/columnDrop/abstractColumnDropPanel.js

@@ -1,2 +0,2 @@
-// ag-grid-enterprise v5.0.0-alpha.6
+// ag-grid-enterprise v5.0.0
 var __extends = (this && this.__extends) || function (d, b) {
@@ -36,2 +36,3 @@ for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p];
         this.beans.eventService.addEventListener(main_1.Events.EVENT_COLUMN_EVERYTHING_CHANGED, this.refreshGui.bind(this));
+        this.addDestroyableEventListener(this.beans.gridOptionsWrapper, 'functionsReadOnly', this.refreshGui.bind(this));
         this.setupDropTarget();
@@ -46,2 +47,3 @@ // we don't know if this bean will be initialised before columnController.
             getContainer: this.getGui.bind(this),
+            getIconName: this.getIconName.bind(this),
             onDragging: this.onDragging.bind(this),
@@ -64,9 +66,8 @@ onDragEnter: this.onDragEnter.bind(this),
             this.potentialDndColumns = goodDragColumns;
-            this.beans.dragAndDropService.setGhostIcon(this.params.dragAndDropIcon);
             this.refreshGui();
         }
-        else {
-            this.beans.dragAndDropService.setGhostIcon(null);
-        }
     };
+    AbstractColumnDropPanel.prototype.isPotentialDndColumns = function () {
+        return main_1.Utils.existsAndNotEmpty(this.potentialDndColumns);
+    };
     AbstractColumnDropPanel.prototype.onDragLeave = function (draggingEvent) {
@@ -73,0 +74,0 @@ // if the dragging started from us, we remove the group, however if it started

dist/lib/toolPanel/columnDrop/columnComponent.d.ts

@@ -1,3 +0,3 @@
-// ag-grid-enterprise v5.0.0-alpha.6
-import { PopupService, Component, ColumnController, Context, DragAndDropService, GridPanel, DropTarget, Column } from "ag-grid/main";
+// ag-grid-enterprise v5.0.0
+import { PopupService, Component, ColumnController, Context, EventService, DragAndDropService, GridPanel, GridOptionsWrapper, DropTarget, Column } from "ag-grid/main";
 import { AggFuncService } from "../../aggregation/aggFuncService";
@@ -13,2 +13,4 @@ export declare class ColumnComponent extends Component {
     aggFuncService: AggFuncService;
+    gridOptionsWrapper: GridOptionsWrapper;
+    eventService: EventService;
     private eText;
@@ -15,0 +17,0 @@ private btRemove;

dist/lib/toolPanel/columnDrop/columnComponent.js

@@ -1,2 +0,2 @@
-// ag-grid-enterprise v5.0.0-alpha.6
+// ag-grid-enterprise v5.0.0
 var __extends = (this && this.__extends) || function (d, b) {
@@ -32,3 +32,3 @@ for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p];
         this.setupComponents();
-        if (!this.ghost) {
+        if (!this.ghost && !this.gridOptionsWrapper.isFunctionsReadOnly()) {
             this.addDragSource();
@@ -49,7 +49,11 @@ }
         this.setTextValue();
-        this.addDestroyableEventListener(this.btRemove, 'click', function () { return _this.dispatchEvent(ColumnComponent.EVENT_COLUMN_REMOVE); });
+        this.addDestroyableEventListener(this.btRemove, 'click', function (event) {
+            _this.dispatchEvent(ColumnComponent.EVENT_COLUMN_REMOVE);
+            event.stopPropagation();
+        });
+        main_1.Utils.setVisible(this.btRemove, !this.gridOptionsWrapper.isFunctionsReadOnly());
         if (this.ghost) {
             main_1.Utils.addCssClass(this.getGui(), 'ag-column-drop-cell-ghost');
         }
-        if (this.valueColumn) {
+        if (this.valueColumn && !this.gridOptionsWrapper.isFunctionsReadOnly()) {
             this.addGuiEventListener('click', this.onShowAggFuncSelection.bind(this));
@@ -107,3 +111,12 @@ }
             hidePopup();
-            _this.columnController.setColumnAggFunc(_this.column, value);
+            if (_this.gridOptionsWrapper.isFunctionsPassive()) {
+                var event = {
+                    columns: [_this.column],
+                    aggFunc: value
+                };
+                _this.eventService.dispatchEvent(main_1.Events.EVENT_COLUMN_AGG_FUNC_CHANGE_REQUEST, event);
+            }
+            else {
+                _this.columnController.setColumnAggFunc(_this.column, value);
+            }
         };
@@ -140,2 +153,10 @@ var comp = new AggItemComp(itemSelected, value.toString());
     __decorate([
+        main_1.Autowired('gridOptionsWrapper'), 
+        __metadata('design:type', main_1.GridOptionsWrapper)
+    ], ColumnComponent.prototype, "gridOptionsWrapper", void 0);
+    __decorate([
+        main_1.Autowired('eventService'), 
+        __metadata('design:type', main_1.EventService)
+    ], ColumnComponent.prototype, "eventService", void 0);
+    __decorate([
         main_1.QuerySelector('.ag-column-drop-cell-text'), 
@@ -142,0 +163,0 @@ __metadata('design:type', HTMLElement)

dist/lib/toolPanel/columnDrop/pivotColumnsPanel.d.ts

@@ -1,2 +0,2 @@
-// ag-grid-enterprise v5.0.0-alpha.6
+// ag-grid-enterprise v5.0.0
 import { Column } from "ag-grid/main";
@@ -17,4 +17,5 @@ import { AbstractColumnDropPanel } from "./abstractColumnDropPanel";
     protected removeColumns(columns: Column[]): void;
+    protected getIconName(): string;
     protected addColumns(columns: Column[]): void;
     protected getExistingColumns(): Column[];
 }

dist/lib/toolPanel/columnDrop/pivotColumnsPanel.js

@@ -1,2 +0,2 @@
-// ag-grid-enterprise v5.0.0-alpha.6
+// ag-grid-enterprise v5.0.0
 var __extends = (this && this.__extends) || function (d, b) {
@@ -26,2 +26,3 @@ for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p];
         _super.prototype.setBeans.call(this, {
+            gridOptionsWrapper: this.gridOptionsWrapper,
             eventService: this.eventService,
@@ -75,2 +76,5 @@ context: this.context,
     PivotColumnsPanel.prototype.isColumnDroppable = function (column) {
+        if (this.gridOptionsWrapper.isFunctionsReadOnly()) {
+            return false;
+        }
         // we never allow grouping of secondary columns
@@ -85,3 +89,3 @@ if (!column.isPrimary()) {
     PivotColumnsPanel.prototype.removeColumns = function (columns) {
-        if (this.gridOptionsWrapper.isRowGroupPassive()) {
+        if (this.gridOptionsWrapper.isFunctionsPassive()) {
             this.eventService.dispatchEvent(main_1.Events.EVENT_COLUMN_PIVOT_REMOVE_REQUEST, { columns: columns });
@@ -94,4 +98,7 @@ }
     };
+    PivotColumnsPanel.prototype.getIconName = function () {
+        return this.isPotentialDndColumns() ? main_1.DragAndDropService.ICON_PIVOT : main_1.DragAndDropService.ICON_NOT_ALLOWED;
+    };
     PivotColumnsPanel.prototype.addColumns = function (columns) {
-        if (this.gridOptionsWrapper.isRowGroupPassive()) {
+        if (this.gridOptionsWrapper.isFunctionsPassive()) {
             this.eventService.dispatchEvent(main_1.Events.EVENT_COLUMN_PIVOT_ADD_REQUEST, { columns: columns });
@@ -98,0 +105,0 @@ }

dist/lib/toolPanel/columnDrop/pivotModePanel.d.ts

@@ -1,2 +0,2 @@
-// ag-grid-enterprise v5.0.0-alpha.6
+// ag-grid-enterprise v5.0.0
 import { Component } from "ag-grid/main";
@@ -7,2 +7,3 @@ export declare class PivotModePanel extends Component {
     private context;
+    private gridOptionsWrapper;
     private cbPivotMode;
@@ -9,0 +10,0 @@ constructor();

dist/lib/toolPanel/columnDrop/pivotModePanel.js

@@ -1,2 +0,2 @@
-// ag-grid-enterprise v5.0.0-alpha.6
+// ag-grid-enterprise v5.0.0
 var __extends = (this && this.__extends) || function (d, b) {
@@ -20,9 +20,12 @@ for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p];
     function PivotModePanel() {
-        _super.call(this, this.createTemplate());
+        _super.call(this);
     }
     PivotModePanel.prototype.createTemplate = function () {
-        return "<div class=\"ag-pivot-mode\">\n                <ag-checkbox class=\"ag-pivot-mode-select\" label=\"Pivot Mode\"></ag-checkbox>\n            </div>";
+        var localeTextFunc = this.gridOptionsWrapper.getLocaleTextFunc();
+        return "<div class=\"ag-pivot-mode\">\n                <ag-checkbox class=\"ag-pivot-mode-select\" label=\"" + localeTextFunc('pivotMode', 'Pivot Mode') + "\"></ag-checkbox>\n            </div>";
     };
     PivotModePanel.prototype.init = function () {
+        this.setTemplate(this.createTemplate());
         this.instantiate(this.context);
+        this.cbPivotMode.setSelected(this.columnController.isPivotMode());
         this.addDestroyableEventListener(this.cbPivotMode, main_1.AgCheckbox.EVENT_CHANGED, this.onBtPivotMode.bind(this));
@@ -55,2 +58,6 @@ this.addDestroyableEventListener(this.eventService, main_1.Events.EVENT_COLUMN_EVERYTHING_CHANGED, this.onPivotModeChanged.bind(this));
     __decorate([
+        main_1.Autowired('gridOptionsWrapper'), 
+        __metadata('design:type', main_1.GridOptionsWrapper)
+    ], PivotModePanel.prototype, "gridOptionsWrapper", void 0);
+    __decorate([
         main_1.QuerySelector('.ag-pivot-mode-select'), 
@@ -57,0 +64,0 @@ __metadata('design:type', main_1.AgCheckbox)

dist/lib/toolPanel/columnDrop/rowGroupColumnsPanel.d.ts

@@ -1,2 +0,2 @@
-// ag-grid-enterprise v5.0.0-alpha.6
+// ag-grid-enterprise v5.0.0
 import { Column } from "ag-grid/main";
@@ -15,4 +15,5 @@ import { AbstractColumnDropPanel } from "./abstractColumnDropPanel";
     protected removeColumns(columns: Column[]): void;
+    protected getIconName(): string;
     protected addColumns(columns: Column[]): void;
     protected getExistingColumns(): Column[];
 }

dist/lib/toolPanel/columnDrop/rowGroupColumnsPanel.js

@@ -1,2 +0,2 @@
-// ag-grid-enterprise v5.0.0-alpha.6
+// ag-grid-enterprise v5.0.0
 var __extends = (this && this.__extends) || function (d, b) {
@@ -26,2 +26,3 @@ for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p];
         _super.prototype.setBeans.call(this, {
+            gridOptionsWrapper: this.gridOptionsWrapper,
             eventService: this.eventService,
@@ -44,2 +45,5 @@ context: this.context,
     RowGroupColumnsPanel.prototype.isColumnDroppable = function (column) {
+        if (this.gridOptionsWrapper.isFunctionsReadOnly()) {
+            return false;
+        }
         // we never allow grouping of secondary columns
@@ -55,3 +59,3 @@ if (!column.isPrimary()) {
         var _this = this;
-        if (this.gridOptionsWrapper.isRowGroupPassive()) {
+        if (this.gridOptionsWrapper.isFunctionsPassive()) {
             this.eventService.dispatchEvent(main_1.Events.EVENT_COLUMN_ROW_GROUP_REMOVE_REQUEST, { columns: columns });
@@ -72,4 +76,7 @@ }
     };
+    RowGroupColumnsPanel.prototype.getIconName = function () {
+        return this.isPotentialDndColumns() ? main_1.DragAndDropService.ICON_GROUP : main_1.DragAndDropService.ICON_NOT_ALLOWED;
+    };
     RowGroupColumnsPanel.prototype.addColumns = function (columns) {
-        if (this.gridOptionsWrapper.isRowGroupPassive()) {
+        if (this.gridOptionsWrapper.isFunctionsPassive()) {
             this.eventService.dispatchEvent(main_1.Events.EVENT_COLUMN_ROW_GROUP_ADD_REQUEST, { columns: columns });
@@ -76,0 +83,0 @@ }

dist/lib/toolPanel/columnDrop/valueColumnsPanel.d.ts

@@ -1,2 +0,2 @@
-// ag-grid-enterprise v5.0.0-alpha.6
+// ag-grid-enterprise v5.0.0
 import { Column } from "ag-grid/main";
@@ -13,2 +13,3 @@ import { AbstractColumnDropPanel } from "./abstractColumnDropPanel";
     private passBeansUp();
+    protected getIconName(): string;
     protected isColumnDroppable(column: Column): boolean;
@@ -15,0 +16,0 @@ protected removeColumns(columns: Column[]): void;

dist/lib/toolPanel/columnDrop/valueColumnsPanel.js

@@ -1,2 +0,2 @@
-// ag-grid-enterprise v5.0.0-alpha.6
+// ag-grid-enterprise v5.0.0
 var __extends = (this && this.__extends) || function (d, b) {
@@ -26,2 +26,3 @@ for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p];
         _super.prototype.setBeans.call(this, {
+            gridOptionsWrapper: this.gridOptionsWrapper,
             eventService: this.eventService,
@@ -43,3 +44,9 @@ context: this.context,
     };
+    ValuesColumnPanel.prototype.getIconName = function () {
+        return this.isPotentialDndColumns() ? main_1.DragAndDropService.ICON_AGGREGATE : main_1.DragAndDropService.ICON_NOT_ALLOWED;
+    };
     ValuesColumnPanel.prototype.isColumnDroppable = function (column) {
+        if (this.gridOptionsWrapper.isFunctionsReadOnly()) {
+            return false;
+        }
         // we never allow grouping of secondary columns
@@ -54,7 +61,17 @@ if (!column.isPrimary()) {
     ValuesColumnPanel.prototype.removeColumns = function (columns) {
-        var columnsCurrentlyValueColumns = main_1.Utils.filter(columns, function (column) { return column.isValueActive(); });
-        this.columnController.removeValueColumns(columnsCurrentlyValueColumns);
+        if (this.gridOptionsWrapper.isFunctionsPassive()) {
+            this.eventService.dispatchEvent(main_1.Events.EVENT_COLUMN_VALUE_REMOVE_REQUEST, { columns: columns });
+        }
+        else {
+            var columnsCurrentlyValueColumns = main_1.Utils.filter(columns, function (column) { return column.isValueActive(); });
+            this.columnController.removeValueColumns(columnsCurrentlyValueColumns);
+        }
     };
     ValuesColumnPanel.prototype.addColumns = function (columns) {
-        this.columnController.addValueColumns(columns);
+        if (this.gridOptionsWrapper.isFunctionsPassive()) {
+            this.eventService.dispatchEvent(main_1.Events.EVENT_COLUMN_VALUE_ADD_REQUEST, { columns: columns });
+        }
+        else {
+            this.columnController.addValueColumns(columns);
+        }
     };
@@ -61,0 +78,0 @@ ValuesColumnPanel.prototype.getExistingColumns = function () {

dist/lib/toolPanel/columnsSelect/columnSelectPanel.d.ts

@@ -1,2 +0,2 @@
-// ag-grid-enterprise v5.0.0-alpha.6
+// ag-grid-enterprise v5.0.0
 import { Component } from "ag-grid/main";
@@ -3,0 +3,0 @@ export declare class ColumnSelectPanel extends Component {

dist/lib/toolPanel/columnsSelect/columnSelectPanel.js

@@ -1,2 +0,2 @@
-// ag-grid-enterprise v5.0.0-alpha.6
+// ag-grid-enterprise v5.0.0
 var __extends = (this && this.__extends) || function (d, b) {
@@ -3,0 +3,0 @@ for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p];

dist/lib/toolPanel/columnsSelect/renderedColumn.d.ts

@@ -1,2 +0,2 @@
-// ag-grid-enterprise v5.0.0-alpha.6
+// ag-grid-enterprise v5.0.0
 import { Component, Column } from "ag-grid/main";
@@ -14,3 +14,2 @@ export declare class RenderedColumn extends Component {
     private cbSelect;
-    private eIcon;
     private column;
@@ -23,9 +22,8 @@ private columnDept;
     init(): void;
-    private loadIcon();
     private onClick();
-    private onChange();
-    private actionUnChecked();
-    private actionChecked();
+    private onChange(event);
+    private actionUnCheckedPivotMode();
+    private actionCheckedPivotMode();
     private addDragSource();
     private onColumnStateChanged();
 }

dist/lib/toolPanel/columnsSelect/renderedColumn.js

@@ -1,2 +0,2 @@
-// ag-grid-enterprise v5.0.0-alpha.6
+// ag-grid-enterprise v5.0.0
 var __extends = (this && this.__extends) || function (d, b) {
@@ -31,3 +31,2 @@ for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p];
         this.eIndent.style.width = (this.columnDept * 10) + 'px';
-        // this.loadIcon();
         if (this.allowDragging) {
@@ -41,2 +40,3 @@ this.addDragSource();
         this.addDestroyableEventListener(this.column, main_1.Column.EVENT_VISIBLE_CHANGED, this.onColumnStateChanged.bind(this));
+        this.addDestroyableEventListener(this.gridOptionsWrapper, 'functionsReadOnly', this.onColumnStateChanged.bind(this));
         this.instantiate(this.context);
@@ -47,26 +47,9 @@ this.onColumnStateChanged();
     };
-    RenderedColumn.prototype.loadIcon = function () {
-        // if (this.column.isAllowRowGroup()) {
-        //     this.eIcon.appendChild(Utils.createIconNoSpan('columnRowGroup', this.gridOptionsWrapper, null, svgFactory.createGroupIcon));
-        // } else if (this.column.isAllowPivot()) {
-        //     this.eIcon.appendChild(Utils.createIconNoSpan('columnPivot', this.gridOptionsWrapper, null, svgFactory.createPivotIcon));
-        // } else if (this.column.isAllowValue()) {
-        //     this.eIcon.appendChild(Utils.createIconNoSpan('columnValue', this.gridOptionsWrapper, null, svgFactory.createAggregationIcon));
-        // } else {
-        //     this.eIcon.appendChild(Utils.createIconNoSpan('columns', this.gridOptionsWrapper, null, svgFactory.createColumnIcon));
-        // }
-        // if (this.column.isAllowRowGroup()) {
-        //     this.eIcon.innerHTML = 'G';
-        // } else if (this.column.isAllowPivot()) {
-        //     this.eIcon.innerHTML = 'P';
-        // } else if (this.column.isAllowValue()) {
-        //     this.eIcon.innerHTML = 'V';
-        // } else {
-        //     this.eIcon.innerHTML = '-';
-        // }
-    };
     RenderedColumn.prototype.onClick = function () {
+        if (this.cbSelect.isReadOnly()) {
+            return;
+        }
         this.cbSelect.toggle();
     };
-    RenderedColumn.prototype.onChange = function () {
+    RenderedColumn.prototype.onChange = function (event) {
         // only want to action if the user clicked the checkbox, not is we are setting the checkbox because
@@ -80,49 +63,78 @@ // of a change in the model
         // user would think the checkboxes were clunky
-        if (this.cbSelect.isSelected()) {
-            // setTimeout(this.actionChecked.bind(this), 0);
-            this.actionChecked();
+        if (this.columnController.isPivotMode()) {
+            if (event.selected) {
+                this.actionCheckedPivotMode();
+            }
+            else {
+                this.actionUnCheckedPivotMode();
+            }
         }
         else {
-            // setTimeout(this.actionUnChecked.bind(this), 0);
-            this.actionUnChecked();
+            this.columnController.setColumnVisible(this.column, event.selected);
         }
     };
-    RenderedColumn.prototype.actionUnChecked = function () {
-        // what we do depends on the reduce state
-        if (this.columnController.isPivotMode()) {
-            // remove pivot if column is pivoted
-            if (this.column.isPivotActive()) {
-                this.columnController.removePivotColumn(this.column);
+    RenderedColumn.prototype.actionUnCheckedPivotMode = function () {
+        var functionPassive = this.gridOptionsWrapper.isFunctionsPassive();
+        var column = this.column;
+        var columnController = this.columnController;
+        // remove pivot if column is pivoted
+        if (column.isPivotActive()) {
+            if (functionPassive) {
+                this.eventService.dispatchEvent(main_1.Events.EVENT_COLUMN_PIVOT_REMOVE_REQUEST, { columns: [column] });
             }
-            // remove value if column is value
-            if (this.column.isValueActive()) {
-                this.columnController.removeValueColumn(this.column);
+            else {
+                columnController.removePivotColumn(column);
             }
-            // remove group if column is grouped
-            if (this.column.isRowGroupActive()) {
-                this.columnController.removeRowGroupColumn(this.column);
+        }
+        // remove value if column is value
+        if (column.isValueActive()) {
+            if (functionPassive) {
+                this.eventService.dispatchEvent(main_1.Events.EVENT_COLUMN_VALUE_REMOVE_REQUEST, { columns: [column] });
             }
+            else {
+                columnController.removeValueColumn(column);
+            }
         }
-        else {
-            // if not reducing, then it's just column visibility
-            this.columnController.setColumnVisible(this.column, false);
+        // remove group if column is grouped
+        if (column.isRowGroupActive()) {
+            if (functionPassive) {
+                this.eventService.dispatchEvent(main_1.Events.EVENT_COLUMN_ROW_GROUP_REMOVE_REQUEST, { columns: [column] });
+            }
+            else {
+                columnController.removeRowGroupColumn(column);
+            }
         }
     };
-    RenderedColumn.prototype.actionChecked = function () {
-        // what we do depends on the reduce state
-        if (this.columnController.isPivotMode()) {
-            if (this.column.isAllowValue()) {
-                if (!this.column.isValueActive()) {
-                    this.columnController.addValueColumn(this.column);
-                }
+    RenderedColumn.prototype.actionCheckedPivotMode = function () {
+        var column = this.column;
+        var columnController = this.columnController;
+        // function already active, so do nothing
+        if (column.isValueActive() || column.isPivotActive() || column.isRowGroupActive()) {
+            return;
+        }
+        var functionPassive = this.gridOptionsWrapper.isFunctionsPassive();
+        if (column.isAllowValue()) {
+            if (functionPassive) {
+                this.eventService.dispatchEvent(main_1.Events.EVENT_COLUMN_VALUE_ADD_REQUEST, { columns: [column] });
             }
             else {
-                if (!this.column.isPivotActive() && !this.column.isRowGroupActive()) {
-                    this.columnController.addRowGroupColumn(this.column);
-                }
+                columnController.addValueColumn(column);
             }
         }
-        else {
-            this.columnController.setColumnVisible(this.column, true);
+        else if (column.isAllowRowGroup()) {
+            if (functionPassive) {
+                this.eventService.dispatchEvent(main_1.Events.EVENT_COLUMN_ROW_GROUP_ADD_REQUEST, { columns: [column] });
+            }
+            else {
+                columnController.addRowGroupColumn(column);
+            }
         }
+        else if (column.isAllowPivot()) {
+            if (functionPassive) {
+                this.eventService.dispatchEvent(main_1.Events.EVENT_COLUMN_PIVOT_ADD_REQUEST, { columns: [column] });
+            }
+            else {
+                columnController.addPivotColumn(column);
+            }
+        }
     };
@@ -139,8 +151,7 @@ RenderedColumn.prototype.addDragSource = function () {
         this.processingColumnStateChange = true;
-        if (this.columnController.isPivotMode()) {
+        var isPivotMode = this.columnController.isPivotMode();
+        if (isPivotMode) {
             // if reducing, checkbox means column is one of pivot, value or group
-            var isPivot = this.column.isPivotActive();
-            var isRowGroup = this.column.isRowGroupActive();
-            var isAggregation = this.column.isValueActive();
-            this.cbSelect.setSelected(isPivot || isRowGroup || isAggregation);
+            var anyFunctionActive = this.column.isAnyFunctionActive();
+            this.cbSelect.setSelected(anyFunctionActive);
         }
@@ -151,2 +162,9 @@ else {
         }
+        // read only in pivot mode if:
+        var checkboxReadOnly = isPivotMode
+            && (this.gridOptionsWrapper.isFunctionsReadOnly()
+                || !this.column.isAnyFunctionAllowed());
+        this.cbSelect.setReadOnly(checkboxReadOnly);
+        var checkboxPassive = isPivotMode && this.gridOptionsWrapper.isFunctionsPassive();
+        this.cbSelect.setPassive(checkboxPassive);
         this.processingColumnStateChange = false;
@@ -156,3 +174,2 @@ };
         '  <span class="ag-column-select-indent"></span>' +
-        '  <span class="ag-column-select-icon"></span>' +
         '  <ag-checkbox class="ag-column-select-checkbox"></ag-checkbox>' +
@@ -198,6 +215,2 @@ '  <span class="ag-column-select-label"></span>' +
     __decorate([
-        main_1.QuerySelector('.ag-column-select-icon'), 
-        __metadata('design:type', HTMLElement)
-    ], RenderedColumn.prototype, "eIcon", void 0);
-    __decorate([
         main_1.PostConstruct, 
@@ -204,0 +217,0 @@ __metadata('design:type', Function),

dist/lib/toolPanel/columnsSelect/renderedGroup.d.ts

@@ -1,2 +0,2 @@
-// ag-grid-enterprise v5.0.0-alpha.6
+// ag-grid-enterprise v5.0.0
 import { Component, OriginalColumnGroup } from "ag-grid/main";
@@ -3,0 +3,0 @@ export declare class RenderedGroup extends Component {

dist/lib/toolPanel/columnsSelect/renderedGroup.js

@@ -1,2 +0,2 @@
-// ag-grid-enterprise v5.0.0-alpha.6
+// ag-grid-enterprise v5.0.0
 var __extends = (this && this.__extends) || function (d, b) {
@@ -122,13 +122,17 @@ for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p];
         var columnsToGroup = [];
+        var columnsToPivot = [];
         columns.forEach(function (column) {
+            // don't change any column that's already got a function active
+            if (column.isAnyFunctionActive()) {
+                return;
+            }
             if (column.isAllowValue()) {
-                if (!column.isValueActive()) {
-                    columnsToAggregate.push(column);
-                }
+                columnsToAggregate.push(column);
             }
-            else {
-                if (!column.isPivotActive() && !column.isRowGroupActive()) {
-                    columnsToGroup.push(column);
-                }
+            else if (column.isAllowRowGroup()) {
+                columnsToGroup.push(column);
             }
+            else if (column.isAllowRowGroup()) {
+                columnsToPivot.push(column);
+            }
         });
@@ -141,2 +145,5 @@ if (columnsToAggregate.length > 0) {
         }
+        if (columnsToPivot.length > 0) {
+            this.columnController.addPivotColumns(columnsToPivot);
+        }
     };
@@ -143,0 +150,0 @@ RenderedGroup.prototype.onColumnStateChanged = function () {

dist/lib/toolPanel/toolPanelComp.d.ts

@@ -1,2 +0,2 @@
-// ag-grid-enterprise v5.0.0-alpha.6
+// ag-grid-enterprise v5.0.0
 import { Component } from "ag-grid/main";
@@ -3,0 +3,0 @@ export declare class ToolPanelComp extends Component {

dist/lib/toolPanel/toolPanelComp.js

@@ -1,2 +0,2 @@
-// ag-grid-enterprise v5.0.0-alpha.6
+// ag-grid-enterprise v5.0.0
 var __extends = (this && this.__extends) || function (d, b) {
@@ -3,0 +3,0 @@ for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p];

dist/lib/viewport/viewportRowModel.d.ts

@@ -1,2 +0,2 @@
-// ag-grid-enterprise v5.0.0-alpha.6
+// ag-grid-enterprise v5.0.0
 import { IRowModel, RowNode, IViewportDatasource } from "ag-grid/main";
@@ -3,0 +3,0 @@ export declare class ViewportRowModel implements IRowModel {

dist/lib/viewport/viewportRowModel.js

@@ -1,2 +0,2 @@
-// ag-grid-enterprise v5.0.0-alpha.6
+// ag-grid-enterprise v5.0.0
 var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
@@ -3,0 +3,0 @@ var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;

main.d.ts

 export * from './dist/lib/aggregation/aggFuncService';
 
+export * from './dist/lib/license/md5';
+
 export * from './dist/lib/rendering/richSelect/richSelectCellEditor';
@@ -13,2 +15,3 @@ export * from './dist/lib/rendering/richSelect/richSelectRow';
 export * from './dist/lib/setFilter/setFilter';
+export * from './dist/lib/setFilter/setFilterListItem';
 export * from './dist/lib/setFilter/setFilterModel';
@@ -22,5 +25,7 @@
 export * from './dist/lib/toolPanel/columnDrop/abstractColumnDropPanel';
-export * from './dist/lib/toolPanel/columnDrop/rowGroupColumnsPanel';
+export * from './dist/lib/toolPanel/columnDrop/columnComponent';
 export * from './dist/lib/toolPanel/columnDrop/pivotColumnsPanel';
 export * from './dist/lib/toolPanel/columnDrop/pivotModePanel';
+export * from './dist/lib/toolPanel/columnDrop/rowGroupColumnsPanel';
+export * from './dist/lib/toolPanel/columnDrop/valueColumnsPanel';
 
@@ -31,2 +36,4 @@ export * from './dist/lib/toolPanel/columnsSelect/columnSelectPanel';
 
+export * from './dist/lib/viewport/viewportRowModel';
+
 export * from './dist/lib/clipboardService';
@@ -36,3 +43,5 @@ export * from './dist/lib/contextMenu';
 export * from './dist/lib/enterpriseMenu';
+export * from './dist/lib/licenseManager';
+export * from './dist/lib/pivotCompFactory';
 export * from './dist/lib/rangeController';
-export * from './dist/lib/licenseManager';
+export * from './dist/lib/rowGroupCompFactory';

package.json

 {
   "name": "ag-grid-enterprise",
-  "version": "5.0.0-alpha.6",
+  "version": "5.0.0",
   "description": "ag-Grid Enterprise Features",
@@ -38,3 +38,3 @@ "main": "main.js",
   "peerDependencies": {
-    "ag-grid": "~5.0.0-alpha.6"
+    "ag-grid": "5.0.x"
   },
@@ -41,0 +41,0 @@ "dependencies": {

src/clientExports.ts

@@ -28,2 +28,8 @@ import {ColumnSelectPanel} from "./toolPanel/columnsSelect/columnSelectPanel";
 import {AggFuncService} from "./aggregation/aggFuncService";
+import {MD5} from "./license/md5";
+import {SetFilterListItem} from "./setFilter/setFilterListItem";
+import {ColumnComponent} from "./toolPanel/columnDrop/columnComponent";
+import {ValuesColumnPanel} from "./toolPanel/columnDrop/valueColumnsPanel";
+import {PivotCompFactory} from "./pivotCompFactory";
+import {RowGroupCompFactory} from "./rowGroupCompFactory";
 
@@ -35,2 +41,4 @@
 
+    exports.MD5 = MD5;
+
     exports.RichSelectCellEditor = RichSelectCellEditor;
@@ -46,2 +54,3 @@ exports.RichSelectRow = RichSelectRow;
     exports.SetFilter = SetFilter;
+    exports.SetFilter = SetFilterListItem;
     exports.SetFilterModel = SetFilterModel;
@@ -53,7 +62,10 @@
     exports.AbstractColumnDropPanel = AbstractColumnDropPanel;
-    exports.RowGroupColumnsPanel = RowGroupColumnsPanel;
+    exports.ColumnComponent = ColumnComponent;
     exports.PivotColumnsPanel = PivotColumnsPanel;
-    exports.ToolPanelComp = ToolPanelComp;
     exports.PivotModePanel = PivotModePanel;
+    exports.RowGroupColumnsPanel = RowGroupColumnsPanel;
+    exports.ValuesColumnPanel = ValuesColumnPanel;
 
+    exports.ToolPanelComp = ToolPanelComp;
+
     exports.ColumnSelectPanel = ColumnSelectPanel;
@@ -65,9 +77,12 @@ exports.RenderedColumn = RenderedColumn;
 
+    exports.ClipboardService = ClipboardService;
     exports.ContextMenuFactory = ContextMenuFactory;
-    exports.ClipboardService = ClipboardService;
     exports.EnterpriseBoot = EnterpriseBoot;
     exports.EnterpriseMenu = EnterpriseMenu;
+    exports.LicenseManager = LicenseManager;
+
+    exports.PivotCompFactory = PivotCompFactory;
     exports.RangeController = RangeController;
+    exports.RowGroupCompFactory = RowGroupCompFactory;
 
-    exports.LicenseManager = LicenseManager;
 }

src/licenseManager.ts

 import {Bean, Autowired, PostConstruct} from 'ag-grid/main';
-import {Utils as _} from 'ag-grid/main';
+import {Utils} from 'ag-grid/main';
 import {MD5} from './license/md5';
@@ -17,3 +17,3 @@
 
-        if (!_.missingOrEmpty(LicenseManager.licenseKey) && LicenseManager.licenseKey.length > 32) {
+        if (!Utils.missingOrEmpty(LicenseManager.licenseKey) && LicenseManager.licenseKey.length > 32) {
             var hashStart = LicenseManager.licenseKey.length - 32;
@@ -20,0 +20,0 @@ var md5 = LicenseManager.licenseKey.substring(hashStart);

src/rowStages/pivotColDefService.ts

@@ -77,2 +77,5 @@ import {NumberSequence, Bean, Autowired, ColumnController, ColDef, ColGroupDef, Utils, Column} from "ag-grid/main";
             Utils.assign(colDef, colDefToCopy);
+            // even if original column was hidden, we always show the pivot value column, otherwise it would be
+            // very confusing for people thinking the pivot is broken
+            colDef.hide = false;
         }
@@ -79,0 +82,0 @@

src/toolPanel/columnDrop/abstractColumnDropPanel.ts

@@ -5,2 +5,3 @@ import {
     EventService,
+    GridOptionsWrapper,
     Context,
@@ -25,2 +26,3 @@ LoggerFactory,
 export interface AbstractColumnDropPanelBeans {
+    gridOptionsWrapper: GridOptionsWrapper;
     eventService: EventService;
@@ -53,2 +55,3 @@ context: Context;
     protected abstract getExistingColumns(): Column[];
+    protected abstract getIconName(): string;
 
@@ -85,2 +88,5 @@ constructor(horizontal: boolean, valueColumn: boolean) {
         this.beans.eventService.addEventListener(Events.EVENT_COLUMN_EVERYTHING_CHANGED, this.refreshGui.bind(this));
+
+        this.addDestroyableEventListener(this.beans.gridOptionsWrapper, 'functionsReadOnly', this.refreshGui.bind(this));
+
         this.setupDropTarget();
@@ -96,2 +102,3 @@ // we don't know if this bean will be initialised before columnController.
             getContainer: this.getGui.bind(this),
+            getIconName: this.getIconName.bind(this),
             onDragging: this.onDragging.bind(this),
@@ -118,9 +125,10 @@ onDragEnter: this.onDragEnter.bind(this),
             this.potentialDndColumns = goodDragColumns;
-            this.beans.dragAndDropService.setGhostIcon(this.params.dragAndDropIcon);
             this.refreshGui();
-        } else {
-            this.beans.dragAndDropService.setGhostIcon(null);
         }
     }
 
+    protected isPotentialDndColumns(): boolean {
+        return Utils.existsAndNotEmpty(this.potentialDndColumns);
+    }
+    
     private onDragLeave(draggingEvent: DraggingEvent): void {
@@ -127,0 +135,0 @@ // if the dragging started from us, we remove the group, however if it started

src/toolPanel/columnDrop/columnComponent.ts

@@ -7,5 +7,8 @@ import {
     ColumnController,
+    Events,
     Context,
+    EventService,
     DragAndDropService,
     GridPanel,
+    GridOptionsWrapper,
     DropTarget,
@@ -36,2 +39,4 @@ PostConstruct,
     @Autowired('aggFuncService') aggFuncService: AggFuncService;
+    @Autowired('gridOptionsWrapper') gridOptionsWrapper: GridOptionsWrapper;
+    @Autowired('eventService') eventService: EventService;
 
@@ -61,3 +66,3 @@ @QuerySelector('.ag-column-drop-cell-text') private eText: HTMLElement;
         this.setupComponents();
-        if (!this.ghost) {
+        if (!this.ghost && !this.gridOptionsWrapper.isFunctionsReadOnly()) {
             this.addDragSource();
@@ -80,4 +85,9 @@ }
         this.setTextValue();
-        this.addDestroyableEventListener(this.btRemove, 'click', ()=> this.dispatchEvent(ColumnComponent.EVENT_COLUMN_REMOVE));
+        this.addDestroyableEventListener(this.btRemove, 'click', (event: MouseEvent)=> {
+            this.dispatchEvent(ColumnComponent.EVENT_COLUMN_REMOVE);
+            event.stopPropagation();
+        });
 
+        Utils.setVisible(this.btRemove, !this.gridOptionsWrapper.isFunctionsReadOnly());
+
         if (this.ghost) {
@@ -87,3 +97,3 @@ Utils.addCssClass(this.getGui(), 'ag-column-drop-cell-ghost');
 
-        if (this.valueColumn) {
+        if (this.valueColumn && !this.gridOptionsWrapper.isFunctionsReadOnly()) {
             this.addGuiEventListener('click', this.onShowAggFuncSelection.bind(this) );
@@ -159,3 +169,11 @@ }
             hidePopup();
-            this.columnController.setColumnAggFunc(this.column, value);
+            if (this.gridOptionsWrapper.isFunctionsPassive()) {
+                var event = {
+                    columns: [this.column],
+                    aggFunc: value
+                };
+                this.eventService.dispatchEvent(Events.EVENT_COLUMN_AGG_FUNC_CHANGE_REQUEST, event);
+            } else {
+                this.columnController.setColumnAggFunc(this.column, value);
+            }
         };
@@ -162,0 +180,0 @@

src/toolPanel/columnDrop/pivotColumnsPanel.ts

@@ -36,2 +36,3 @@ import {
         super.setBeans({
+            gridOptionsWrapper: this.gridOptionsWrapper,
             eventService: this.eventService,
@@ -92,2 +93,4 @@ context: this.context,
     protected isColumnDroppable(column: Column): boolean {
+        if (this.gridOptionsWrapper.isFunctionsReadOnly()) { return false; }
+
         // we never allow grouping of secondary columns
@@ -102,3 +105,3 @@ if (!column.isPrimary()) { return false; }
     protected removeColumns(columns: Column[]): void {
-        if (this.gridOptionsWrapper.isRowGroupPassive()) {
+        if (this.gridOptionsWrapper.isFunctionsPassive()) {
             this.eventService.dispatchEvent(Events.EVENT_COLUMN_PIVOT_REMOVE_REQUEST, {columns: columns} );
@@ -111,4 +114,8 @@ } else {
 
+    protected getIconName(): string {
+        return this.isPotentialDndColumns() ? DragAndDropService.ICON_PIVOT : DragAndDropService.ICON_NOT_ALLOWED;
+    }
+
     protected addColumns(columns: Column[]) {
-        if (this.gridOptionsWrapper.isRowGroupPassive()) {
+        if (this.gridOptionsWrapper.isFunctionsPassive()) {
             this.eventService.dispatchEvent(Events.EVENT_COLUMN_PIVOT_ADD_REQUEST, {columns: columns} );
@@ -115,0 +122,0 @@ } else {

src/toolPanel/columnDrop/pivotModePanel.ts

@@ -1,2 +0,13 @@
-import {QuerySelector, Component, Autowired, ColumnController, PostConstruct, EventService, Events, Context, AgCheckbox} from "ag-grid/main";
+import {
+    QuerySelector,
+    Component,
+    Autowired,
+    ColumnController,
+    GridOptionsWrapper,
+    PostConstruct,
+    EventService,
+    Events,
+    Context,
+    AgCheckbox
+} from "ag-grid/main";
 
@@ -8,2 +19,3 @@ export class PivotModePanel extends Component {
     @Autowired('context') private context: Context;
+    @Autowired('gridOptionsWrapper') private gridOptionsWrapper: GridOptionsWrapper;
 
@@ -13,8 +25,9 @@ @QuerySelector('.ag-pivot-mode-select') private cbPivotMode: AgCheckbox;
     constructor() {
-        super(this.createTemplate());
+        super();
     }
 
     private createTemplate(): string {
+        var localeTextFunc = this.gridOptionsWrapper.getLocaleTextFunc();
         return `<div class="ag-pivot-mode">
-                <ag-checkbox class="ag-pivot-mode-select" label="Pivot Mode"></ag-checkbox>
+                <ag-checkbox class="ag-pivot-mode-select" label="${localeTextFunc('pivotMode', 'Pivot Mode')}"></ag-checkbox>
             </div>`;
@@ -25,4 +38,7 @@ }
     private init(): void {
+        this.setTemplate(this.createTemplate());
         this.instantiate(this.context);
 
+        this.cbPivotMode.setSelected(this.columnController.isPivotMode());
+
         this.addDestroyableEventListener(this.cbPivotMode, AgCheckbox.EVENT_CHANGED, this.onBtPivotMode.bind(this) );
@@ -29,0 +45,0 @@ this.addDestroyableEventListener(this.eventService, Events.EVENT_COLUMN_EVERYTHING_CHANGED, this.onPivotModeChanged.bind(this));

src/toolPanel/columnDrop/rowGroupColumnsPanel.ts

@@ -20,11 +20,11 @@ import {
 
-    @Autowired('columnController') private columnController: ColumnController;
-    @Autowired('eventService') private eventService: EventService;
+    @Autowired('columnController') private columnController:ColumnController;
+    @Autowired('eventService') private eventService:EventService;
 
-    @Autowired('gridOptionsWrapper') private gridOptionsWrapper: GridOptionsWrapper;
-    @Autowired('context') private context: Context;
-    @Autowired('loggerFactory') private loggerFactory: LoggerFactory;
-    @Autowired('dragAndDropService') private dragAndDropService: DragAndDropService;
+    @Autowired('gridOptionsWrapper') private gridOptionsWrapper:GridOptionsWrapper;
+    @Autowired('context') private context:Context;
+    @Autowired('loggerFactory') private loggerFactory:LoggerFactory;
+    @Autowired('dragAndDropService') private dragAndDropService:DragAndDropService;
 
-    constructor(horizontal: boolean) {
+    constructor(horizontal:boolean) {
         super(horizontal, false);
@@ -34,4 +34,5 @@ }
     @PostConstruct
-    private passBeansUp(): void {
+    private passBeansUp():void {
         super.setBeans({
+            gridOptionsWrapper: this.gridOptionsWrapper,
             eventService: this.eventService,
@@ -58,2 +59,4 @@ context: this.context,
     protected isColumnDroppable(column:Column):boolean {
+        if (this.gridOptionsWrapper.isFunctionsReadOnly()) { return false; }
+
         // we never allow grouping of secondary columns
@@ -67,5 +70,5 @@ if (!column.isPrimary()) { return false; }
 
-    protected removeColumns(columns: Column[]) {
-        if (this.gridOptionsWrapper.isRowGroupPassive()) {
-            this.eventService.dispatchEvent(Events.EVENT_COLUMN_ROW_GROUP_REMOVE_REQUEST, {columns: columns} );
+    protected removeColumns(columns:Column[]) {
+        if (this.gridOptionsWrapper.isFunctionsPassive()) {
+            this.eventService.dispatchEvent(Events.EVENT_COLUMN_ROW_GROUP_REMOVE_REQUEST, {columns: columns});
         } else {
@@ -75,3 +78,3 @@ // this panel only allows dragging columns (not column groups) so we are guaranteed
             var rowGroupColumns = this.columnController.getRowGroupColumns();
-            columns.forEach( column => {
+            columns.forEach(column => {
                 var columnIsGrouped = rowGroupColumns.indexOf(column) >= 0;
@@ -86,4 +89,8 @@ if (columnIsGrouped) {
 
+    protected getIconName(): string {
+        return this.isPotentialDndColumns() ? DragAndDropService.ICON_GROUP : DragAndDropService.ICON_NOT_ALLOWED;
+    }
+
     protected addColumns(columns: Column[]) {
-        if (this.gridOptionsWrapper.isRowGroupPassive()) {
+        if (this.gridOptionsWrapper.isFunctionsPassive()) {
             this.eventService.dispatchEvent(Events.EVENT_COLUMN_ROW_GROUP_ADD_REQUEST, {columns: columns} );
@@ -90,0 +97,0 @@ } else {

src/toolPanel/columnDrop/valueColumnsPanel.ts

@@ -36,2 +36,3 @@ import {
         super.setBeans({
+            gridOptionsWrapper: this.gridOptionsWrapper,
             eventService: this.eventService,
@@ -57,3 +58,9 @@ context: this.context,
 
+    protected getIconName(): string {
+        return this.isPotentialDndColumns() ? DragAndDropService.ICON_AGGREGATE : DragAndDropService.ICON_NOT_ALLOWED;
+    }
+
     protected isColumnDroppable(column: Column): boolean {
+        if (this.gridOptionsWrapper.isFunctionsReadOnly()) { return false; }
+
         // we never allow grouping of secondary columns
@@ -68,8 +75,16 @@ if (!column.isPrimary()) { return false; }
     protected removeColumns(columns: Column[]): void {
-        var columnsCurrentlyValueColumns = Utils.filter(columns, (column: Column) => column.isValueActive() );
-        this.columnController.removeValueColumns(columnsCurrentlyValueColumns);
+        if (this.gridOptionsWrapper.isFunctionsPassive()) {
+            this.eventService.dispatchEvent(Events.EVENT_COLUMN_VALUE_REMOVE_REQUEST, {columns: columns} );
+        } else {
+            var columnsCurrentlyValueColumns = Utils.filter(columns, (column: Column) => column.isValueActive() );
+            this.columnController.removeValueColumns(columnsCurrentlyValueColumns);
+        }
     }
 
     protected addColumns(columns: Column[]) {
-        this.columnController.addValueColumns(columns);
+        if (this.gridOptionsWrapper.isFunctionsPassive()) {
+            this.eventService.dispatchEvent(Events.EVENT_COLUMN_VALUE_ADD_REQUEST, {columns: columns} );
+        } else {
+            this.columnController.addValueColumns(columns);
+        }
     }
@@ -76,0 +91,0 @@

src/toolPanel/columnsSelect/renderedColumn.ts

@@ -27,3 +27,2 @@ import {
         '  <span class="ag-column-select-indent"></span>' +
-        '  <span class="ag-column-select-icon"></span>' +
         '  <ag-checkbox class="ag-column-select-checkbox"></ag-checkbox>' +
@@ -43,3 +42,2 @@ '  <span class="ag-column-select-label"></span>' +
     @QuerySelector('.ag-column-select-checkbox') private cbSelect: AgCheckbox;
-    @QuerySelector('.ag-column-select-icon') private eIcon: HTMLElement;
 
@@ -69,4 +67,2 @@ private column: Column;
 
-        // this.loadIcon();
-
         if (this.allowDragging) {
@@ -82,2 +78,4 @@ this.addDragSource();
 
+        this.addDestroyableEventListener(this.gridOptionsWrapper, 'functionsReadOnly', this.onColumnStateChanged.bind(this));
+
         this.instantiate(this.context);
@@ -91,29 +89,9 @@
 
-    private loadIcon(): void {
-        // if (this.column.isAllowRowGroup()) {
-        //     this.eIcon.appendChild(Utils.createIconNoSpan('columnRowGroup', this.gridOptionsWrapper, null, svgFactory.createGroupIcon));
-        // } else if (this.column.isAllowPivot()) {
-        //     this.eIcon.appendChild(Utils.createIconNoSpan('columnPivot', this.gridOptionsWrapper, null, svgFactory.createPivotIcon));
-        // } else if (this.column.isAllowValue()) {
-        //     this.eIcon.appendChild(Utils.createIconNoSpan('columnValue', this.gridOptionsWrapper, null, svgFactory.createAggregationIcon));
-        // } else {
-        //     this.eIcon.appendChild(Utils.createIconNoSpan('columns', this.gridOptionsWrapper, null, svgFactory.createColumnIcon));
-        // }
+    private onClick(): void {
+        if (this.cbSelect.isReadOnly()) { return; }
 
-        // if (this.column.isAllowRowGroup()) {
-        //     this.eIcon.innerHTML = 'G';
-        // } else if (this.column.isAllowPivot()) {
-        //     this.eIcon.innerHTML = 'P';
-        // } else if (this.column.isAllowValue()) {
-        //     this.eIcon.innerHTML = 'V';
-        // } else {
-        //     this.eIcon.innerHTML = '-';
-        // }
-    }
-
-    private onClick(): void {
         this.cbSelect.toggle();
     }
 
-    private onChange(): void {
+    private onChange(event: any): void {
         // only want to action if the user clicked the checkbox, not is we are setting the checkbox because
@@ -126,46 +104,71 @@ // of a change in the model
         // user would think the checkboxes were clunky
-        if (this.cbSelect.isSelected()) {
-            // setTimeout(this.actionChecked.bind(this), 0);
-            this.actionChecked();
+        if (this.columnController.isPivotMode()) {
+            if (event.selected) {
+                this.actionCheckedPivotMode();
+            } else {
+                this.actionUnCheckedPivotMode();
+            }
         } else {
-            // setTimeout(this.actionUnChecked.bind(this), 0);
-            this.actionUnChecked();
+            this.columnController.setColumnVisible(this.column, event.selected);
         }
     }
 
-    private actionUnChecked(): void {
-        // what we do depends on the reduce state
-        if (this.columnController.isPivotMode()) {
-            // remove pivot if column is pivoted
-            if (this.column.isPivotActive()) {
-                this.columnController.removePivotColumn(this.column);
+    private actionUnCheckedPivotMode(): void {
+        var functionPassive = this.gridOptionsWrapper.isFunctionsPassive();
+        var column = this.column;
+        var columnController = this.columnController;
+
+        // remove pivot if column is pivoted
+        if (column.isPivotActive()) {
+            if (functionPassive) {
+                this.eventService.dispatchEvent(Events.EVENT_COLUMN_PIVOT_REMOVE_REQUEST, {columns: [column]});
+            } else {
+                columnController.removePivotColumn(column);
             }
-            // remove value if column is value
-            if (this.column.isValueActive()) {
-                this.columnController.removeValueColumn(this.column);
+        }
+        // remove value if column is value
+        if (column.isValueActive()) {
+            if (functionPassive) {
+                this.eventService.dispatchEvent(Events.EVENT_COLUMN_VALUE_REMOVE_REQUEST, {columns: [column]});
+            } else {
+                columnController.removeValueColumn(column);
             }
-            // remove group if column is grouped
-            if (this.column.isRowGroupActive()) {
-                this.columnController.removeRowGroupColumn(this.column);
+        }
+        // remove group if column is grouped
+        if (column.isRowGroupActive()) {
+            if (functionPassive) {
+                this.eventService.dispatchEvent(Events.EVENT_COLUMN_ROW_GROUP_REMOVE_REQUEST, {columns: [column]});
+            } else {
+                columnController.removeRowGroupColumn(column);
             }
-        } else {
-            // if not reducing, then it's just column visibility
-            this.columnController.setColumnVisible(this.column, false);
         }
     }
 
-    private actionChecked(): void {
-        // what we do depends on the reduce state
-        if (this.columnController.isPivotMode()) {
-            if (this.column.isAllowValue()) {
-                if (!this.column.isValueActive()) {
-                    this.columnController.addValueColumn(this.column);
-                }
+    private actionCheckedPivotMode(): void {
+        var column = this.column;
+        var columnController = this.columnController;
+
+        // function already active, so do nothing
+        if (column.isValueActive() || column.isPivotActive() || column.isRowGroupActive()) { return; }
+
+        var functionPassive = this.gridOptionsWrapper.isFunctionsPassive();
+
+        if (column.isAllowValue()) {
+            if (functionPassive) {
+                this.eventService.dispatchEvent(Events.EVENT_COLUMN_VALUE_ADD_REQUEST, {columns: [column]});
             } else {
-                if (!this.column.isPivotActive() && !this.column.isRowGroupActive()) {
-                    this.columnController.addRowGroupColumn(this.column);
-                }
+                columnController.addValueColumn(column);
             }
-        } else {
-            this.columnController.setColumnVisible(this.column, true);
+        } else if (column.isAllowRowGroup()) {
+            if (functionPassive) {
+                this.eventService.dispatchEvent(Events.EVENT_COLUMN_ROW_GROUP_ADD_REQUEST, {columns: [column]});
+            } else {
+                columnController.addRowGroupColumn(column);
+            }
+        } else if (column.isAllowPivot()) {
+            if (functionPassive) {
+                this.eventService.dispatchEvent(Events.EVENT_COLUMN_PIVOT_ADD_REQUEST, {columns: [column]});
+            } else {
+                columnController.addPivotColumn(column);
+            }
         }
@@ -185,8 +188,7 @@ }
         this.processingColumnStateChange = true;
-        if (this.columnController.isPivotMode()) {
+        var isPivotMode = this.columnController.isPivotMode();
+        if (isPivotMode) {
             // if reducing, checkbox means column is one of pivot, value or group
-            var isPivot = this.column.isPivotActive();
-            var isRowGroup = this.column.isRowGroupActive();
-            var isAggregation = this.column.isValueActive();
-            this.cbSelect.setSelected(isPivot || isRowGroup || isAggregation);
+            var anyFunctionActive = this.column.isAnyFunctionActive();
+            this.cbSelect.setSelected(anyFunctionActive);
         } else {
@@ -196,2 +198,15 @@ // if not reducing, the checkbox tells us if column is visible or not
         }
+
+        // read only in pivot mode if:
+        var checkboxReadOnly = isPivotMode
+            // a) gui is not allowed make any changes or
+            && (this.gridOptionsWrapper.isFunctionsReadOnly()
+            // b) column is not allow any functions on it
+            || !this.column.isAnyFunctionAllowed());
+
+        this.cbSelect.setReadOnly(checkboxReadOnly);
+
+        var checkboxPassive = isPivotMode && this.gridOptionsWrapper.isFunctionsPassive();
+        this.cbSelect.setPassive(checkboxPassive);
+
         this.processingColumnStateChange = false;
@@ -198,0 +213,0 @@ }

src/toolPanel/columnsSelect/renderedGroup.ts

@@ -180,13 +180,16 @@ import {
         var columnsToGroup: Column[] = [];
+        var columnsToPivot: Column[] = [];
 
         columns.forEach( column => {
+            // don't change any column that's already got a function active
+            if (column.isAnyFunctionActive()) { return; }
+
             if (column.isAllowValue()) {
-                if (!column.isValueActive()) {
-                    columnsToAggregate.push(column);
-                }
-            } else {
-                if (!column.isPivotActive() && !column.isRowGroupActive()) {
-                    columnsToGroup.push(column);
-                }
+                columnsToAggregate.push(column);
+            } else if (column.isAllowRowGroup()) {
+                columnsToGroup.push(column);
+            } else if (column.isAllowRowGroup()) {
+                columnsToPivot.push(column);
             }
+
         });
@@ -200,2 +203,5 @@
         }
+        if (columnsToPivot.length>0) {
+            this.columnController.addPivotColumns(columnsToPivot);
+        }
 
@@ -202,0 +208,0 @@ }

Fixed alerts

No v1

Quality

Package is not semver >=1. This means it is not stable and does not support ^ ranges.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

4244064

increased by1.46%

Lines of code

67779

increased by1.01%

Number of low quality alerts

1

decreased by-50%

No dependency changes