@adaptabletools/adaptable 16.0.9 → 16.1.0-canary.0

package/src/Strategy/{CommentsModule.js → NotesModule.js}

@@ -1,21 +1,21 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.CommentsModule = void 0;
+exports.NotesModule = void 0;
 const tslib_1 = require("tslib");
 const ModuleConstants = tslib_1.__importStar(require("../Utilities/Constants/ModuleConstants"));
 const AdaptableModuleBase_1 = require("./AdaptableModuleBase");
 /**
- * In the first iteration a cell can have only one comment, the
- * comments is a list to allow further development.
+ * In the first iteration a cell can have only one note, the
+ * notes is a list to allow further development.
  */
-class CommentsModule extends AdaptableModuleBase_1.AdaptableModuleBase {
+class NotesModule extends AdaptableModuleBase_1.AdaptableModuleBase {
     constructor(api) {
-        super(ModuleConstants.CommentsModuleId, ModuleConstants.CommentsFriendlyName, 'comment', 'CommentsPopup', 'Comments', api);
+        super(ModuleConstants.NotesModuleId, ModuleConstants.NotesFriendlyName, 'note', 'NotesPopup', 'Notes', api);
         this.adaptable = api.internalApi.getAdaptableInstance();
         this.adaptable.api.eventApi.on('AdaptableReady', () => this.handleAdaptableReady());
     }
     isModuleAvailable() {
-        // FIXME remove this once Comments feature is public
+        // FIXME remove this once Notes feature is public
         return false;
     }
     handleAdaptableReady() {
@@ -41,36 +41,36 @@ class CommentsModule extends AdaptableModuleBase_1.AdaptableModuleBase {
             return undefined;
         }
         const items = [];
-        const isCellCommentable = (_b = (_a = this.adaptable.api.optionsApi) === null || _a === void 0 ? void 0 : _a.getCommentOptions()) === null || _b === void 0 ? void 0 : _b.isCellCommentable;
-        if (!isCellCommentable ||
-            isCellCommentable({
+        const isCellNotable = (_b = (_a = this.adaptable.api.optionsApi) === null || _a === void 0 ? void 0 : _a.getNotesOptions()) === null || _b === void 0 ? void 0 : _b.isCellNotable;
+        if (!isCellNotable ||
+            isCellNotable({
                 adaptableApi: this.adaptable.api,
                 primaryKeyValue: menuContext.primaryKeyValue,
                 columnId: menuContext.adaptableColumn.columnId,
                 userName: this.adaptable.api.optionsApi.getUserName(),
                 adaptableId: this.adaptable.adaptableOptions.adaptableId,
             }))
-            items.push(...this.getAddRemoveCommentMenuItems(menuContext));
+            items.push(...this.getAddRemoveNoteMenuItems(menuContext));
         return items;
     }
-    getAddRemoveCommentMenuItems(menuContext) {
+    getAddRemoveNoteMenuItems(menuContext) {
         var _a;
         const items = [];
-        // does not have comment
-        const [comment] = (_a = this.adaptable.api.commentsApi.getCellComments({
+        // does not have note
+        const [note] = (_a = this.adaptable.api.notesApi.getCellNotes({
             PrimaryKeyValue: menuContext.primaryKeyValue,
             ColumnId: menuContext.adaptableColumn.columnId,
         })) !== null && _a !== void 0 ? _a : [];
-        if (comment) {
-            items.push(this.createColumnMenuItemClickFunction('Remove Comment', this.moduleInfo.Glyph, () => {
-                this.api.commentsApi.deleteComment(comment);
+        if (note) {
+            items.push(this.createColumnMenuItemClickFunction('Remove Note', this.moduleInfo.Glyph, () => {
+                this.api.notesApi.deleteNote(note);
             }));
         }
         else {
-            items.push(this.createColumnMenuItemClickFunction('Add Comment', this.moduleInfo.Glyph, () => {
+            items.push(this.createColumnMenuItemClickFunction('Add Note', this.moduleInfo.Glyph, () => {
                 // add an empty one
-                this.api.commentsApi.addComment('', menuContext.primaryKeyValue, menuContext.adaptableColumn.columnId);
-                this.api.commentsApi.showComment({
+                this.api.notesApi.addNote('', menuContext.primaryKeyValue, menuContext.adaptableColumn.columnId);
+                this.api.notesApi.showNotes({
                     PrimaryKeyValue: menuContext.primaryKeyValue,
                     ColumnId: menuContext.adaptableColumn.columnId,
                 }, true);
@@ -96,46 +96,46 @@ class CommentsModule extends AdaptableModuleBase_1.AdaptableModuleBase {
     }
     handleMouseEnter(event) {
         var _a;
-        const editMode = this.adaptable.api.commentsApi.getCommentPopupEditMode();
+        const editMode = this.adaptable.api.notesApi.getNotePopupEditMode();
         if (editMode) {
             // ignore
             return;
         }
         const cellPosition = this.getCellPositionFromEvent(event);
-        const openCommentGridCell = this.adaptable.api.commentsApi.getOpenCommentGridCell();
-        // Hovering over someting that is not a cell and there is no open comment
-        if (!cellPosition && openCommentGridCell) {
-            // need to close if the new cell does not have a comment
-            this.adaptable.api.commentsApi.hideComment();
+        const openNoteGridCell = this.adaptable.api.notesApi.getOpenNoteGridCell();
+        // Hovering over someting that is not a cell and there is no open note
+        if (!cellPosition && openNoteGridCell) {
+            // need to close if the new cell does not have a note
+            this.adaptable.api.notesApi.hideNote();
         }
-        else if ((_a = this.adaptable.api.commentsApi.getCellComments(cellPosition)) === null || _a === void 0 ? void 0 : _a.length) {
-            this.adaptable.api.commentsApi.showComment(cellPosition, false);
+        else if ((_a = this.adaptable.api.notesApi.getCellNotes(cellPosition)) === null || _a === void 0 ? void 0 : _a.length) {
+            this.adaptable.api.notesApi.showNotes(cellPosition, false);
         }
     }
-    handleCellSelected(commentGridCell) {
+    handleCellSelected(noteGridCell) {
         // if already opened - do nothing
-        const openCommentGridCell = this.adaptable.api.commentsApi.getOpenCommentGridCell();
-        if ((openCommentGridCell === null || openCommentGridCell === void 0 ? void 0 : openCommentGridCell.PrimaryKeyValue) === commentGridCell.PrimaryKeyValue &&
-            (openCommentGridCell === null || openCommentGridCell === void 0 ? void 0 : openCommentGridCell.ColumnId) === commentGridCell.ColumnId) {
+        const openNoteGridCell = this.adaptable.api.notesApi.getOpenNoteGridCell();
+        if ((openNoteGridCell === null || openNoteGridCell === void 0 ? void 0 : openNoteGridCell.PrimaryKeyValue) === noteGridCell.PrimaryKeyValue &&
+            (openNoteGridCell === null || openNoteGridCell === void 0 ? void 0 : openNoteGridCell.ColumnId) === noteGridCell.ColumnId) {
             return;
         }
-        // if open but this has no comment, close
-        const cellComments = this.adaptable.api.commentsApi.getCellComments(commentGridCell);
-        if (openCommentGridCell && !(cellComments === null || cellComments === void 0 ? void 0 : cellComments.length)) {
+        // if open but this has no note, close
+        const cellNotes = this.adaptable.api.notesApi.getCellNotes(noteGridCell);
+        if (openNoteGridCell && !(cellNotes === null || cellNotes === void 0 ? void 0 : cellNotes.length)) {
             // hide only if in edit mode
             // because if you select a cell and move the mouse fast over another cell
-            // with a comment, you do not want to close that comment
+            // with a note, you do not want to close that note
             // the selection is debounced, so the moment goes over the new cell this event is triggered
-            if (this.adaptable.api.commentsApi.getCommentPopupEditMode()) {
-                this.adaptable.api.commentsApi.hideComment();
+            if (this.adaptable.api.notesApi.getNotePopupEditMode()) {
+                this.adaptable.api.notesApi.hideNote();
             }
             return;
         }
-        // if open but the new selection has a comment open that one in edit mode (because of click)
-        if (openCommentGridCell && (cellComments === null || cellComments === void 0 ? void 0 : cellComments.length)) {
-            this.adaptable.api.commentsApi.showComment(commentGridCell, true);
+        // if open but the new selection has a note open that one in edit mode (because of click)
+        if (openNoteGridCell && (cellNotes === null || cellNotes === void 0 ? void 0 : cellNotes.length)) {
+            this.adaptable.api.notesApi.showNotes(noteGridCell, true);
             return;
         }
     }
 }
-exports.CommentsModule = CommentsModule;
+exports.NotesModule = NotesModule;

package/src/Strategy/Utilities/Layout/getLayoutFilterViewItems.d.ts

@@ -1,4 +1,6 @@
 import { AdaptableApi, Layout } from '../../../../types';
+import { ColumnFilter } from '../../../types';
+export declare const getFilterPreview: (columnFilter: ColumnFilter, api: AdaptableApi) => string;
 export declare const getLayoutFilterViewItems: (layout: Layout, api: AdaptableApi) => {
     name: string;
     values: string[];

package/src/Strategy/Utilities/Layout/getLayoutFilterViewItems.js

@@ -1,28 +1,30 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getLayoutFilterViewItems = void 0;
-const getLayoutFilterViewItems = (layout, api) => {
-    var _a;
+exports.getLayoutFilterViewItems = exports.getFilterPreview = void 0;
+const getFilterPreview = (columnFilter, api) => {
+    var _a, _b, _c;
     const columnIdToFriendlyName = (columnId) => {
         return api.columnApi.getFriendlyNameForColumnId(columnId);
     };
+    return `[${columnIdToFriendlyName(columnFilter.ColumnId)}: ${(_a = columnFilter === null || columnFilter === void 0 ? void 0 : columnFilter.Predicate) === null || _a === void 0 ? void 0 : _a.PredicateId} ${((_c = (_b = columnFilter.Predicate) === null || _b === void 0 ? void 0 : _b.Inputs) !== null && _c !== void 0 ? _c : [])
+        .map((input) => {
+        if (typeof input === 'string') {
+            return input;
+        }
+        if (typeof (input === null || input === void 0 ? void 0 : input.toString) === 'function') {
+            return input.toString();
+        }
+        return '';
+    })
+        .filter(Boolean)
+        .join(', ')}]`;
+};
+exports.getFilterPreview = getFilterPreview;
+const getLayoutFilterViewItems = (layout, api) => {
+    var _a;
     return {
         name: 'Filter',
-        values: ((_a = layout.ColumnFilters) !== null && _a !== void 0 ? _a : []).map((customFilter) => {
-            var _a, _b;
-            return `[${columnIdToFriendlyName(customFilter.ColumnId)}: ${customFilter.Predicate.PredicateId} ${((_b = (_a = customFilter.Predicate) === null || _a === void 0 ? void 0 : _a.Inputs) !== null && _b !== void 0 ? _b : [])
-                .map((input) => {
-                if (typeof input === 'string') {
-                    return input;
-                }
-                if (typeof (input === null || input === void 0 ? void 0 : input.toString) === 'function') {
-                    return input.toString();
-                }
-                return '';
-            })
-                .filter(Boolean)
-                .join(', ')}]`;
-        }),
+        values: ((_a = layout.ColumnFilters) !== null && _a !== void 0 ? _a : []).map((columnFilter) => (0, exports.getFilterPreview)(columnFilter, api)),
     };
 };
 exports.getLayoutFilterViewItems = getLayoutFilterViewItems;

package/src/Utilities/Constants/DocumentationLinkConstants.d.ts

@@ -6,6 +6,7 @@ export declare const ObservableQueryDocsLink: string;
 export declare const AggregatedBooleanQueryDocsLink: string;
 export declare const AggregatedScalarQueryDocsLink: string;
 export declare const CumulativeAggregatedScalarQueryDocsLink: string;
+export declare const QuantileAggregatedScalarQueryDocsLink: string;
 export declare const PredicateDocsLink: string;
 export declare const PrimaryKeyDocsLink: string;
 export declare const LicenseDocsLink: string;

package/src/Utilities/Constants/DocumentationLinkConstants.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.AgGridModulesDocsLink = exports.AdaptableOptionsDocsLink = exports.LicenseDocsLink = exports.PrimaryKeyDocsLink = exports.PredicateDocsLink = exports.CumulativeAggregatedScalarQueryDocsLink = exports.AggregatedScalarQueryDocsLink = exports.AggregatedBooleanQueryDocsLink = exports.ObservableQueryDocsLink = exports.ScalarQueryDocsLink = exports.BooleanQueryDocsLink = exports.ExpressionEditorDocsLink = exports.HOST_URL_DOCS = void 0;
+exports.AgGridModulesDocsLink = exports.AdaptableOptionsDocsLink = exports.LicenseDocsLink = exports.PrimaryKeyDocsLink = exports.PredicateDocsLink = exports.QuantileAggregatedScalarQueryDocsLink = exports.CumulativeAggregatedScalarQueryDocsLink = exports.AggregatedScalarQueryDocsLink = exports.AggregatedBooleanQueryDocsLink = exports.ObservableQueryDocsLink = exports.ScalarQueryDocsLink = exports.BooleanQueryDocsLink = exports.ExpressionEditorDocsLink = exports.HOST_URL_DOCS = void 0;
 exports.HOST_URL_DOCS = 'https://docs.adaptabletools.com';
 //export const HOST_URL_DOCS = 'http://localhost:3000';
 exports.ExpressionEditorDocsLink = `${exports.HOST_URL_DOCS}/guide/ui-expression-editor`;
@@ -10,6 +10,7 @@ exports.ObservableQueryDocsLink = `${exports.HOST_URL_DOCS}/guide/adaptable-ql-e
 exports.AggregatedBooleanQueryDocsLink = `${exports.HOST_URL_DOCS}/guide/adaptable-ql-expression-aggregation-boolean`;
 exports.AggregatedScalarQueryDocsLink = `${exports.HOST_URL_DOCS}/guide/adaptable-ql-expression-aggregation-scalar`;
 exports.CumulativeAggregatedScalarQueryDocsLink = `${exports.HOST_URL_DOCS}/guide/adaptable-ql-expression-cumulative`;
+exports.QuantileAggregatedScalarQueryDocsLink = `${exports.HOST_URL_DOCS}/guide/adaptable-ql-expression-quantile`;
 exports.PredicateDocsLink = `${exports.HOST_URL_DOCS}/guide/adaptable-predicate`;
 exports.PrimaryKeyDocsLink = `${exports.HOST_URL_DOCS}/guide/getting-started-primary-key`;
 exports.LicenseDocsLink = `${exports.HOST_URL_DOCS}/guide/licensing`;

package/src/Utilities/Constants/ModuleConstants.d.ts

@@ -33,8 +33,10 @@ export declare const Glue42ModuleId: ModuleConstants;
 export declare const Glue42FriendlyName = "Glue42";
 export declare const GridInfoModuleId: ModuleConstants;
 export declare const GridInfoFriendlyName = "Grid Info";
-export declare const CommentsModuleId: ModuleConstants;
-export declare const CommentsFriendlyName = "Comments";
+export declare const ColumnInfoModuleId: ModuleConstants;
+export declare const ColumnInfoFriendlyName = "Column Info";
+export declare const NotesModuleId: ModuleConstants;
+export declare const NotesFriendlyName = "Notes";
 export declare const IPushPullModuleId: ModuleConstants;
 export declare const IPushPullFriendlyName = "IPushPull";
 export declare const LayoutModuleId: ModuleConstants;
@@ -69,6 +71,8 @@ export declare const SettingsPanelModuleId: ModuleConstants;
 export declare const SettingsPanelFriendlyName = "Settings Panel";
 export declare const StatusBarModuleId: ModuleConstants;
 export declare const StatusBarFriendlyName = "Status Bar";
+export declare const DataImportModuleId: ModuleConstants;
+export declare const DataImportFriendyName = "Data Import";
 export declare const ADAPTABLE_MODULE_MAP: {
     Alert: string;
     FlashingCell: string;
@@ -104,5 +108,7 @@ export declare const ADAPTABLE_MODULE_MAP: {
     ToolPanel: string;
     SettingsPanel: string;
     StatusBar: string;
-    Comments: string;
+    Notes: string;
+    ColumnInfo: string;
+    DataImport: string;
 };

package/src/Utilities/Constants/ModuleConstants.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ScheduleFriendlyName = exports.ScheduleModuleId = exports.QuickSearchFriendlyName = exports.QuickSearchModuleId = exports.QueryFriendlyName = exports.QueryModuleId = exports.PlusMinusFriendlyName = exports.PlusMinusModuleId = exports.OpenFinFriendlyName = exports.OpenFinModuleId = exports.LayoutFriendlyName = exports.LayoutModuleId = exports.IPushPullFriendlyName = exports.IPushPullModuleId = exports.CommentsFriendlyName = exports.CommentsModuleId = exports.GridInfoFriendlyName = exports.GridInfoModuleId = exports.Glue42FriendlyName = exports.Glue42ModuleId = exports.FreeTextColumnFriendlyName = exports.FreeTextColumnModuleId = exports.FormatColumnFriendlyName = exports.FormatColumnModuleId = exports.FilterFriendlyName = exports.FilterModuleId = exports.Fdc3FriendlyName = exports.Fdc3ModuleId = exports.ExportFriendlyName = exports.ExportModuleId = exports.DataSetFriendlyName = exports.DataSetModuleId = exports.DataChangeHistoryFriendlyName = exports.DataChangeHistoryModuleId = exports.DashboardFriendlyName = exports.DashboardModuleId = exports.CustomSortFriendlyName = exports.CustomSortModuleId = exports.ChartingFriendlyName = exports.ChartingModuleId = exports.CellSummaryFriendlyName = exports.CellSummaryModuleId = exports.CalculatedColumnFriendlyName = exports.CalculatedColumnModuleId = exports.BulkUpdateFriendlyName = exports.BulkUpdateModuleId = exports.FlashingCellFriendlyName = exports.FlashingCellModuleId = exports.AlertModuleFriendlyName = exports.AlertModuleId = void 0;
-exports.ADAPTABLE_MODULE_MAP = exports.StatusBarFriendlyName = exports.StatusBarModuleId = exports.SettingsPanelFriendlyName = exports.SettingsPanelModuleId = exports.ToolPanelFriendlyName = exports.ToolPanelModuleId = exports.ThemeFriendlyName = exports.ThemeModuleId = exports.TeamSharingFriendlyName = exports.TeamSharingModuleId = exports.SystemStatusFriendlyName = exports.SystemStatusModuleId = exports.StateManagementFriendlyName = exports.StateManagementModuleId = exports.StyledColumnFriendlyName = exports.StyledColumnModuleId = exports.SmartEditFriendlyName = exports.SmartEditModuleId = exports.ShortcutFriendlyName = exports.ShortcutModuleId = void 0;
+exports.QuickSearchFriendlyName = exports.QuickSearchModuleId = exports.QueryFriendlyName = exports.QueryModuleId = exports.PlusMinusFriendlyName = exports.PlusMinusModuleId = exports.OpenFinFriendlyName = exports.OpenFinModuleId = exports.LayoutFriendlyName = exports.LayoutModuleId = exports.IPushPullFriendlyName = exports.IPushPullModuleId = exports.NotesFriendlyName = exports.NotesModuleId = exports.ColumnInfoFriendlyName = exports.ColumnInfoModuleId = exports.GridInfoFriendlyName = exports.GridInfoModuleId = exports.Glue42FriendlyName = exports.Glue42ModuleId = exports.FreeTextColumnFriendlyName = exports.FreeTextColumnModuleId = exports.FormatColumnFriendlyName = exports.FormatColumnModuleId = exports.FilterFriendlyName = exports.FilterModuleId = exports.Fdc3FriendlyName = exports.Fdc3ModuleId = exports.ExportFriendlyName = exports.ExportModuleId = exports.DataSetFriendlyName = exports.DataSetModuleId = exports.DataChangeHistoryFriendlyName = exports.DataChangeHistoryModuleId = exports.DashboardFriendlyName = exports.DashboardModuleId = exports.CustomSortFriendlyName = exports.CustomSortModuleId = exports.ChartingFriendlyName = exports.ChartingModuleId = exports.CellSummaryFriendlyName = exports.CellSummaryModuleId = exports.CalculatedColumnFriendlyName = exports.CalculatedColumnModuleId = exports.BulkUpdateFriendlyName = exports.BulkUpdateModuleId = exports.FlashingCellFriendlyName = exports.FlashingCellModuleId = exports.AlertModuleFriendlyName = exports.AlertModuleId = void 0;
+exports.ADAPTABLE_MODULE_MAP = exports.DataImportFriendyName = exports.DataImportModuleId = exports.StatusBarFriendlyName = exports.StatusBarModuleId = exports.SettingsPanelFriendlyName = exports.SettingsPanelModuleId = exports.ToolPanelFriendlyName = exports.ToolPanelModuleId = exports.ThemeFriendlyName = exports.ThemeModuleId = exports.TeamSharingFriendlyName = exports.TeamSharingModuleId = exports.SystemStatusFriendlyName = exports.SystemStatusModuleId = exports.StateManagementFriendlyName = exports.StateManagementModuleId = exports.StyledColumnFriendlyName = exports.StyledColumnModuleId = exports.SmartEditFriendlyName = exports.SmartEditModuleId = exports.ShortcutFriendlyName = exports.ShortcutModuleId = exports.ScheduleFriendlyName = exports.ScheduleModuleId = void 0;
 exports.AlertModuleId = 'Alert';
 exports.AlertModuleFriendlyName = 'Alert';
 exports.FlashingCellModuleId = 'FlashingCell';
@@ -36,8 +36,10 @@ exports.Glue42ModuleId = 'Glue42';
 exports.Glue42FriendlyName = 'Glue42';
 exports.GridInfoModuleId = 'GridInfo';
 exports.GridInfoFriendlyName = 'Grid Info';
-exports.CommentsModuleId = 'Comments';
-exports.CommentsFriendlyName = 'Comments';
+exports.ColumnInfoModuleId = 'ColumnInfo';
+exports.ColumnInfoFriendlyName = 'Column Info';
+exports.NotesModuleId = 'Notes';
+exports.NotesFriendlyName = 'Notes';
 exports.IPushPullModuleId = 'IPushPull';
 exports.IPushPullFriendlyName = 'IPushPull';
 exports.LayoutModuleId = 'Layout';
@@ -72,6 +74,8 @@ exports.SettingsPanelModuleId = 'SettingsPanel';
 exports.SettingsPanelFriendlyName = 'Settings Panel';
 exports.StatusBarModuleId = 'StatusBar';
 exports.StatusBarFriendlyName = 'Status Bar';
+exports.DataImportModuleId = 'DataImport';
+exports.DataImportFriendyName = 'Data Import';
 exports.ADAPTABLE_MODULE_MAP = {
     [exports.AlertModuleId]: exports.AlertModuleFriendlyName,
     [exports.FlashingCellModuleId]: exports.FlashingCellFriendlyName,
@@ -107,5 +111,7 @@ exports.ADAPTABLE_MODULE_MAP = {
     [exports.ToolPanelModuleId]: exports.ToolPanelFriendlyName,
     [exports.SettingsPanelModuleId]: exports.SettingsPanelFriendlyName,
     [exports.StatusBarModuleId]: exports.StatusBarFriendlyName,
-    [exports.CommentsModuleId]: exports.CommentsFriendlyName,
+    [exports.NotesModuleId]: exports.NotesFriendlyName,
+    [exports.ColumnInfoModuleId]: exports.ColumnInfoFriendlyName,
+    [exports.DataImportModuleId]: exports.DataImportFriendyName,
 };

package/src/Utilities/Defaults/DefaultAdaptableOptions.js

@@ -40,6 +40,7 @@ exports.DefaultAdaptableOptions = {
         showSystemStatusMessageNotifications: false,
         maxSystemMessagesInStore: 100,
     },
+    dataImportOptions: {},
     flashingCellOptions: {
         defaultFlashDuration: 500,
         defaultFlashTarget: 'cell',
@@ -80,6 +81,7 @@ exports.DefaultAdaptableOptions = {
         columnFriendlyName: undefined,
         columnTypes: GeneralConstants_1.EMPTY_ARRAY,
         showMissingColumnsWarning: true,
+        addColumnGroupToColumnFriendlyName: false,
     },
     dashboardOptions: {
         canFloat: true,
@@ -223,7 +225,8 @@ exports.DefaultAdaptableOptions = {
     },
     quickSearchOptions: {
         excludeColumnFromQuickSearch: undefined,
-        runQuickSearchOnRowGroups: false,
+        runQuickSearchOnRowGroups: true,
+        runQuickSearchOnPivotColumns: true,
         clearSearchesOnStartUp: false,
         quickSearchPlaceholder: 'Search',
         filterResultsAfterQuickSearch: false,
@@ -294,6 +297,7 @@ exports.DefaultAdaptableOptions = {
     chartingOptions: {
         saveStrategy: 'none',
         agGridContainerName: GeneralConstants.AG_GRID_CHART_WINDOW,
+        externalChartingOptions: {},
     },
     fdc3Options: {
         enableLogging: false,

package/src/Utilities/Defaults/DefaultSettingsPanel.js

@@ -11,6 +11,7 @@ exports.STANDALONE_MODULE_POPUPS = [
  */
 exports.DEFAULT_NAVIGATION_ITEMS = [
     'GridInfo',
+    'ColumnInfo',
     'Dashboard',
     'ToolPanel',
     'StatusBar',
@@ -38,8 +39,9 @@ exports.DEFAULT_NAVIGATION_ITEMS = [
     'DataChangeHistory',
     '-',
     'Charting',
+    'DataImport',
     'Schedule',
     'StateManagement',
     'TeamSharing',
-    'Comments',
+    'Notes',
 ];

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

@@ -6,7 +6,7 @@ import { AggregateParams } from './scalarAggregationHelper';
  * List of all the AggregatedScalar Functions available in AdaptableQL
  */
 export declare type AggregatedScalarFunctionName = ScalarAggregationFunction | OperandFunction;
-export declare type ScalarAggregationFunction = 'SUM' | 'PERCENTAGE' | 'QUANT' | 'AVG' | 'MIN' | 'MAX' | 'COUNT' | 'CUMUL';
+export declare type ScalarAggregationFunction = 'SUM' | 'PERCENTAGE' | 'QUANT' | 'QUARTILE' | 'PERCENTILE' | 'AVG' | 'MIN' | 'MAX' | 'COUNT' | 'CUMUL';
 declare type OperandFunction = 'COL' | 'OVER' | 'GROUP_BY' | 'WEIGHT';
 export interface ScalarAggregationParameter extends BaseParameter<'aggregationScalar', ScalarAggregationFunction> {
     value: AggregatedScalarExpressionEvaluation;
@@ -35,8 +35,9 @@ export interface CumulatedAggregationValue {
     numberOfCumulatedValues?: number;
     totalAggregationValue?: number;
 }
-export declare const cumulativeAggregatedExpressionFunctions: AggregatedScalarFunctionName[];
 export declare const aggregatedExpressionFunctions: AggregatedScalarFunctionName[];
+export declare const cumulativeAggregatedExpressionFunctions: AggregatedScalarFunctionName[];
+export declare const quantileAggregatedExpressionFunctions: AggregatedScalarFunctionName[];
 export declare const aggregatedScalarExpressionFunctions: Record<AggregatedScalarFunctionName, ExpressionFunction>;
 export declare const aggregatedScalarExpressionFunctionNames: AggregatedScalarFunctionName[];
 export {};

package/src/Utilities/ExpressionFunctions/aggregatedScalarExpressionFunctions.js

@@ -1,12 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.aggregatedScalarExpressionFunctionNames = exports.aggregatedScalarExpressionFunctions = exports.aggregatedExpressionFunctions = exports.cumulativeAggregatedExpressionFunctions = void 0;
+exports.aggregatedScalarExpressionFunctionNames = exports.aggregatedScalarExpressionFunctions = exports.quantileAggregatedExpressionFunctions = exports.cumulativeAggregatedExpressionFunctions = exports.aggregatedExpressionFunctions = void 0;
 const expressionFunctionUtils_1 = require("./expressionFunctionUtils");
 const ExpressionEvaluationError_1 = require("../../parser/src/ExpressionEvaluationError");
 const TypeExtensions_1 = require("../Extensions/TypeExtensions");
-exports.cumulativeAggregatedExpressionFunctions = [
-    'CUMUL',
-    'OVER',
+exports.aggregatedExpressionFunctions = [
     'SUM',
     'PERCENTAGE',
     'MIN',
@@ -17,18 +15,25 @@ exports.cumulativeAggregatedExpressionFunctions = [
     'COL',
     'GROUP_BY',
 ];
-exports.aggregatedExpressionFunctions = [
+exports.cumulativeAggregatedExpressionFunctions = [
+    'CUMUL',
+    'OVER',
     'SUM',
     'PERCENTAGE',
     'MIN',
     'MAX',
-    'QUANT',
     'AVG',
-    'COUNT',
     'WEIGHT',
     'COL',
     'GROUP_BY',
 ];
+exports.quantileAggregatedExpressionFunctions = [
+    'QUANT',
+    'QUARTILE',
+    'PERCENTILE',
+    'COL',
+    'GROUP_BY',
+];
 exports.aggregatedScalarExpressionFunctions = {
     CUMUL: {
         handler(args, context) {
@@ -350,10 +355,11 @@ exports.aggregatedScalarExpressionFunctions = {
             const quantileColumnParameter = (0, expressionFunctionUtils_1.extractColumnParameter)('QUANT', args);
             const quantileColumnName = quantileColumnParameter.value;
             (0, expressionFunctionUtils_1.validateColumnType)(quantileColumnName, ['Number'], 'QUANT', context.adaptableApi);
-            const qNumber = args.find((arg) => typeof arg === 'number');
-            if (qNumber == null || qNumber <= 0) {
-                throw new ExpressionEvaluationError_1.ExpressionEvaluationError('QUANT', 'expects a positive number as argument');
+            const qNumberCandidates = args.filter((arg) => typeof arg === 'number');
+            if (qNumberCandidates.length !== 1) {
+                throw new ExpressionEvaluationError_1.ExpressionEvaluationError('QUANT', 'expects a single positive numeric argument as q-quantile');
             }
+            const qNumber = qNumberCandidates[0];
             const groupByOperand = (0, expressionFunctionUtils_1.extractParameter)('QUANT', 'operand', ['GROUP_BY'], args, {
                 isOptional: true,
             });
@@ -476,6 +482,26 @@ exports.aggregatedScalarExpressionFunctions = {
         ],
         category: 'aggregation',
     },
+    QUARTILE: {
+        handler(args, context) {
+            const quartileArgs = [...args, 4];
+            return exports.aggregatedScalarExpressionFunctions.QUANT.handler(quartileArgs, context);
+        },
+        description: 'Calculates the Quartiles of the given group and displays which quartile the given value is in',
+        signatures: ['QUARTILE( [colName])', 'QUARTILE( [colName1], GROUP_BY([colName2]) )'],
+        examples: ['QUARTILE( [col1], 5)', 'QUARTILE( [col1], 4, GROUP_BY([col2]) )'],
+        category: 'aggregation',
+    },
+    PERCENTILE: {
+        handler(args, context) {
+            const quartileArgs = [...args, 100];
+            return exports.aggregatedScalarExpressionFunctions.QUANT.handler(quartileArgs, context);
+        },
+        description: 'Calculates the Percentile of the given group and displays which percentile the given value is in',
+        signatures: ['PERCENTILE( [colName])', 'PERCENTILE( [colName1], GROUP_BY([colName2]) )'],
+        examples: ['PERCENTILE( [col1], 5)', 'PERCENTILE( [col1], 4, GROUP_BY([col2]) )'],
+        category: 'aggregation',
+    },
     COUNT: {
         handler(args, context) {
             const countColumnParameter = (0, expressionFunctionUtils_1.extractColumnParameter)('COUNT', args);

package/src/Utilities/Extensions/ObjectExtensions.d.ts

@@ -8,3 +8,4 @@
  * @returns
  */
 export declare function setInPath<T>(obj: any, path: string[], value: any): T;
+export declare function isObjectEmpty(obj?: any): boolean;

package/src/Utilities/Extensions/ObjectExtensions.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.setInPath = void 0;
+exports.isObjectEmpty = exports.setInPath = void 0;
 /**
  * Returns a new object with the property updated.
  * The property is identified by the path.
@@ -18,3 +18,7 @@ function setInPath(obj, path, value) {
     return Object.assign(Object.assign({}, obj), { [path[0]]: setInPath((_a = obj === null || obj === void 0 ? void 0 : obj[path[0]]) !== null && _a !== void 0 ? _a : {}, path.slice(1), value) });
 }
 exports.setInPath = setInPath;
+function isObjectEmpty(obj) {
+    return !obj || Object.keys(obj).length === 0;
+}
+exports.isObjectEmpty = isObjectEmpty;

package/src/Utilities/Helpers/AdaptableHelper.js

@@ -11,6 +11,7 @@ function assignAdaptableOptions(adaptableOptions) {
     const returnedAdaptableOptions = Object.assign({}, DefaultAdaptableOptions_1.DefaultAdaptableOptions, adaptableOptions);
     returnedAdaptableOptions.adaptableStateKey =
         (_a = returnedAdaptableOptions.adaptableStateKey) !== null && _a !== void 0 ? _a : returnedAdaptableOptions.adaptableId;
+    returnedAdaptableOptions.dataImportOptions = Object.assign({}, DefaultAdaptableOptions_1.DefaultAdaptableOptions.dataImportOptions, adaptableOptions.dataImportOptions);
     returnedAdaptableOptions.expressionOptions = Object.assign({}, DefaultAdaptableOptions_1.DefaultAdaptableOptions.expressionOptions, adaptableOptions.expressionOptions);
     returnedAdaptableOptions.calendarOptions = Object.assign({}, DefaultAdaptableOptions_1.DefaultAdaptableOptions.calendarOptions, adaptableOptions.calendarOptions);
     returnedAdaptableOptions.columnOptions = Object.assign({}, DefaultAdaptableOptions_1.DefaultAdaptableOptions.columnOptions, adaptableOptions.columnOptions);
@@ -43,6 +44,7 @@ function assignAdaptableOptions(adaptableOptions) {
     returnedAdaptableOptions.toolPanelOptions = Object.assign({}, DefaultAdaptableOptions_1.DefaultAdaptableOptions.toolPanelOptions, adaptableOptions.toolPanelOptions);
     returnedAdaptableOptions.dataChangeHistoryOptions = Object.assign({}, DefaultAdaptableOptions_1.DefaultAdaptableOptions.dataChangeHistoryOptions, adaptableOptions.dataChangeHistoryOptions);
     returnedAdaptableOptions.chartingOptions = Object.assign({}, DefaultAdaptableOptions_1.DefaultAdaptableOptions.chartingOptions, adaptableOptions.chartingOptions);
+    returnedAdaptableOptions.chartingOptions.externalChartingOptions = Object.assign({}, DefaultAdaptableOptions_1.DefaultAdaptableOptions.chartingOptions.externalChartingOptions, returnedAdaptableOptions.chartingOptions.externalChartingOptions);
     returnedAdaptableOptions.settingsPanelOptions = Object.assign({}, DefaultAdaptableOptions_1.DefaultAdaptableOptions.settingsPanelOptions, adaptableOptions.settingsPanelOptions);
     returnedAdaptableOptions.fdc3Options = Object.assign({}, DefaultAdaptableOptions_1.DefaultAdaptableOptions.fdc3Options, adaptableOptions.fdc3Options);
     returnedAdaptableOptions.fdc3Options.actionColumnDefaultConfiguration = Object.assign({}, DefaultAdaptableOptions_1.DefaultAdaptableOptions.fdc3Options.actionColumnDefaultConfiguration, returnedAdaptableOptions.fdc3Options.actionColumnDefaultConfiguration);

package/src/Utilities/Interface/MessagePopups.d.ts

@@ -1,8 +1,8 @@
 import { Action } from 'redux';
-import { ModuleParams } from '../../View/Components/SharedProps/ModuleViewPopupProps';
-import { AdaptableModule } from '../../PredefinedConfig/Common/Types';
 import { AdaptableMessageType } from '../../PredefinedConfig/Common/AdaptableMessageType';
+import { AdaptableModule } from '../../PredefinedConfig/Common/Types';
 import { AdaptableForm, BaseContext } from '../../types';
+import { ModuleParams } from '../../View/Components/SharedProps/ModuleViewPopupProps';
 export interface UIConfirmation {
     Header: string;
     Msg: string;

package/src/Utilities/ObjectFactory.d.ts

@@ -23,7 +23,7 @@ import { AdaptableMessageType } from '../PredefinedConfig/Common/AdaptableMessag
 import { SystemStatusMessageInfo } from '../PredefinedConfig/Common/SystemStatusMessageInfo';
 import { NotificationsOptions } from '../AdaptableOptions/NotificationsOptions';
 import { CellSummmary } from '../PredefinedConfig/Common/CellSummary';
-import { AdaptableTheme, ChartDefinition, ColumnFilter, CustomDisplayFormatterContext, FlashingCellDefinition, GridDataChangedInfo, SystemFilterPredicateId } from '../types';
+import { AdaptableTheme, BaseContext, ChartDefinition, ColumnFilter, CustomDisplayFormatterContext, FlashingCellDefinition, GridDataChangedInfo, SystemFilterPredicateId } from '../types';
 import { IRowNode } from '@ag-grid-community/core';
 import { AdaptableApi, BadgeStyleDefinition } from '../../types';
 import { ToastOptions } from '../components/Toastify';
@@ -67,6 +67,7 @@ export declare function CreateEmptyStyledColumn(): StyledColumn;
 export declare function CreateDefaultStyledColumnBadge(): BadgeStyleDefinition;
 export declare function CreateEmptyChartDefinition(chartDefinition?: ChartDefinition): ChartDefinition;
 export declare function CreateCustomDisplayFormatterContext(value: any, node: IRowNode, abColumn: AdaptableColumn, api: AdaptableApi): CustomDisplayFormatterContext;
+export declare const createBaseContext: (adaptableApi: AdaptableApi) => BaseContext;
 export declare function CreateEmptyTheme(name?: string): AdaptableTheme;
 export declare function CreateToastOptions(notificationsOptions: NotificationsOptions, { onClose, containerId }: {
     onClose?: VoidFunction;

package/src/Utilities/ObjectFactory.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ObjectFactory = exports.CreateToastOptions = exports.CreateEmptyTheme = exports.CreateCustomDisplayFormatterContext = exports.CreateEmptyChartDefinition = exports.CreateDefaultStyledColumnBadge = exports.CreateEmptyStyledColumn = exports.CreateColumnFilter = exports.CreateEmptyCellSummmary = exports.CreateSystemStatusMessageInfo = exports.CreateEmptyStyle = exports.CreateEmptyLayout = exports.CreateEmptyFreeTextColumn = exports.CreateEmptyFormatColumn = exports.CreateEmptyShortcut = exports.CreateEmptySchedule = exports.CreateReportSchedule = exports.CreateGlue42Schedule = exports.CreateIPushPullSchedule = exports.CreateEmptyOpenFinSchedule = exports.CreateEmptyGlue42Schedule = exports.CreateEmptyIPushPullSchedule = exports.CreateEmptyOpenFinReport = exports.CreateEmptyGlue42Report = exports.CreateEmptyIPushPullReport = exports.CreateEmptyReportSchedule = exports.CreateEmptyReminderSchedule = exports.CreateEmptyBaseSchedule = exports.CreateExternalReport = exports.CreateEmptyReport = exports.CreateInternalAlertDefinitionForMessages = exports.CreateEmptyFlashingCellDefinition = exports.CreateEmptyAlertDefinition = exports.CreateRowChangedAlert = exports.CreateCellChangedAlert = exports.CreateGenericAlert = exports.CreateEmptyPlusMinusNudge = exports.CreateEmptyNamedQuery = exports.CreateEmptyCalculatedColumn = exports.CreateEmptyCustomSort = void 0;
+exports.ObjectFactory = exports.CreateToastOptions = exports.CreateEmptyTheme = exports.createBaseContext = exports.CreateCustomDisplayFormatterContext = exports.CreateEmptyChartDefinition = exports.CreateDefaultStyledColumnBadge = exports.CreateEmptyStyledColumn = exports.CreateColumnFilter = exports.CreateEmptyCellSummmary = exports.CreateSystemStatusMessageInfo = exports.CreateEmptyStyle = exports.CreateEmptyLayout = exports.CreateEmptyFreeTextColumn = exports.CreateEmptyFormatColumn = exports.CreateEmptyShortcut = exports.CreateEmptySchedule = exports.CreateReportSchedule = exports.CreateGlue42Schedule = exports.CreateIPushPullSchedule = exports.CreateEmptyOpenFinSchedule = exports.CreateEmptyGlue42Schedule = exports.CreateEmptyIPushPullSchedule = exports.CreateEmptyOpenFinReport = exports.CreateEmptyGlue42Report = exports.CreateEmptyIPushPullReport = exports.CreateEmptyReportSchedule = exports.CreateEmptyReminderSchedule = exports.CreateEmptyBaseSchedule = exports.CreateExternalReport = exports.CreateEmptyReport = exports.CreateInternalAlertDefinitionForMessages = exports.CreateEmptyFlashingCellDefinition = exports.CreateEmptyAlertDefinition = exports.CreateRowChangedAlert = exports.CreateCellChangedAlert = exports.CreateGenericAlert = exports.CreateEmptyPlusMinusNudge = exports.CreateEmptyNamedQuery = exports.CreateEmptyCalculatedColumn = exports.CreateEmptyCustomSort = void 0;
 const Enums_1 = require("../PredefinedConfig/Common/Enums");
 const GeneralConstants_1 = require("./Constants/GeneralConstants");
 const Uuid_1 = require("../PredefinedConfig/Uuid");
@@ -348,7 +348,7 @@ function CreateEmptyCellSummmary() {
         Min: undefined,
         Count: undefined,
         Std_Deviation: undefined,
-        Only: undefined
+        Only: undefined,
     };
 }
 exports.CreateEmptyCellSummmary = CreateEmptyCellSummmary;
@@ -395,6 +395,14 @@ function CreateCustomDisplayFormatterContext(value, node, abColumn, api) {
     };
 }
 exports.CreateCustomDisplayFormatterContext = CreateCustomDisplayFormatterContext;
+const createBaseContext = (adaptableApi) => {
+    return {
+        adaptableApi: adaptableApi,
+        userName: adaptableApi.optionsApi.getUserName(),
+        adaptableId: adaptableApi.optionsApi.getAdaptableId(),
+    };
+};
+exports.createBaseContext = createBaseContext;
 function CreateEmptyTheme(name) {
     return {
         Uuid: (0, Uuid_1.createUuid)(),

package/src/Utilities/Services/Interface/IEntitlementService.d.ts

@@ -8,5 +8,9 @@ export interface IEntitlementService extends IAdaptableService {
     isModuleFullEntitlement(adaptableModule: AdaptableModule): boolean;
     isModuleReadOnlyEntitlement(adaptableModule: AdaptableModule): boolean;
     getEntitlementAccessLevelForModule(adaptableModule: AdaptableModule): AccessLevel;
+    /**
+     * No longer used
+     * @deprecated
+     */
     isGridInfoSectionVisible(section: GridInfoSection): boolean;
 }

package/src/Utilities/Services/Interface/IQueryLanguageService.d.ts

@@ -37,9 +37,9 @@ export interface IQueryLanguageService extends IAdaptableService {
     getModuleExpressionFunctionsMap(module: AdaptableModule): ModuleExpressionFunctionsMap;
     getColumnsFromExpression(input: string): string[];
     getNamedQueryNamesFromExpression(input: string): string[];
-    isCumulativeAggregate(input: string): boolean;
     evaluateCustomQueryVariable(functionName: string, args?: any[]): any;
     getExpressionWithColumnFriendlyNames(expression: string): string;
+    getNodesFromExpression(input: string, nodeType: string): string[];
 }
 export interface ModuleExpressionFunctionsMap {
     booleanFunctions?: ExpressionFunctionMap<BooleanFunctionName>;

package/src/Utilities/Services/ModuleService.js

@@ -143,6 +143,8 @@ class ModuleService {
                 return learnUrl + 'handbook-column-formatting#styled-columns';
             case 'Charting':
                 return learnUrl + 'handbook-charts';
+            case 'DataImport':
+                return learnUrl + 'handbook-data-import';
             default:
                 return 'good';
         }

package/src/Utilities/Services/QueryLanguageService.d.ts

@@ -40,12 +40,11 @@ export declare class QueryLanguageService implements IQueryLanguageService {
     computeAggregatedBooleanValue(expression: string, module: AdaptableModule): boolean;
     getColumnsFromExpression(input?: string): string[];
     getNamedQueryNamesFromExpression(input?: string): string[];
-    isCumulativeAggregate(input: string): boolean;
     getExpressionWithColumnFriendlyNames(expression?: string): string;
     getModuleExpressionFunctionsMap(module: AdaptableModule): ModuleExpressionFunctionsMap;
     private extractMappedExpressionFunctions;
     evaluateCustomQueryVariable(functionName: string, args?: any[]): any;
     private getBooleanAndScalarFunctions;
     private getExpressionCacheKey;
-    private getNodesFromExpression;
+    getNodesFromExpression(input: string, nodeType: string): string[];
 }