@adaptabletools/adaptable-cjs 17.0.0-canary.4 → 18.0.0-canary.1

package/src/Strategy/LayoutModule.js

@@ -18,6 +18,7 @@ const AggregationColumns_1 = require("../PredefinedConfig/Common/AggregationColu
 const windowFactory_1 = require("../View/Components/Popups/WindowPopups/windowFactory");
 const flattenDeep_1 = tslib_1.__importDefault(require("lodash/flattenDeep"));
 const StringExtensions_1 = tslib_1.__importDefault(require("../Utilities/Extensions/StringExtensions"));
+const getGridFilterPreview_1 = require("../View/Layout/Wizard/getGridFilterPreview");
 class LayoutModule extends AdaptableModuleBase_1.AdaptableModuleBase {
     constructor(api) {
         super(ModuleConstants.LayoutModuleId, ModuleConstants.LayoutFriendlyName, 'grid', 'LayoutPopup', 'Named sets of column visibility, order, groupings, aggregation, pivots etc.', api);
@@ -127,7 +128,6 @@ class LayoutModule extends AdaptableModuleBase_1.AdaptableModuleBase {
             [
                 ...this.api.scheduleApi.getReportSchedules(loadConfig),
                 ...this.api.scheduleApi.getReminderSchedules(loadConfig),
-                ...this.api.scheduleApi.getGlue42Schedules(loadConfig),
                 ...this.api.scheduleApi.getIPushPullSchedules(loadConfig),
                 ...this.api.scheduleApi.getOpenFinSchedules(loadConfig),
             ].forEach((schedule) => layoutAssociatedObjectReferences.push({
@@ -139,7 +139,7 @@ class LayoutModule extends AdaptableModuleBase_1.AdaptableModuleBase {
         return teamSharingReferences;
     }
     hasNamedQueryReferences() {
-        return false;
+        return true;
     }
     handleAdaptableReady() {
         requestAnimationFrame(() => {
@@ -242,11 +242,13 @@ class LayoutModule extends AdaptableModuleBase_1.AdaptableModuleBase {
         return returnColumnMenuItems;
     }
     createViewPivotItemsMenuItem(menuContext) {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
         // current group => menuContext.rowNode.field;
-        if (((_b = (_a = menuContext.selectedCellInfo) === null || _a === void 0 ? void 0 : _a.gridCells) === null || _b === void 0 ? void 0 : _b.length) !== 1) {
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
+        const selectedCellInfo = (_a = menuContext.selectedCellInfo) !== null && _a !== void 0 ? _a : this.api.gridApi.getSelectedCellInfo();
+        if (((_b = selectedCellInfo === null || selectedCellInfo === void 0 ? void 0 : selectedCellInfo.gridCells) === null || _b === void 0 ? void 0 : _b.length) !== 1) {
             return;
         }
+        const gridCell = (_c = menuContext.gridCell) !== null && _c !== void 0 ? _c : selectedCellInfo.gridCells[0];
         const currentLayout = this.api.layoutApi.getCurrentLayout();
         if (!currentLayout.EnablePivot) {
             return;
@@ -265,11 +267,11 @@ class LayoutModule extends AdaptableModuleBase_1.AdaptableModuleBase {
          */
         // pivot_status_Booked_price
         // price
-        const aggColumn = (_f = (_e = (_d = (_c = agGridColumn === null || agGridColumn === void 0 ? void 0 : agGridColumn.getColDef) === null || _c === void 0 ? void 0 : _c.call(agGridColumn).pivotValueColumn) === null || _d === void 0 ? void 0 : _d.getColDef) === null || _e === void 0 ? void 0 : _e.call(_d)) === null || _f === void 0 ? void 0 : _f.field;
+        const aggColumn = (_g = (_f = (_e = (_d = agGridColumn === null || agGridColumn === void 0 ? void 0 : agGridColumn.getColDef) === null || _d === void 0 ? void 0 : _d.call(agGridColumn).pivotValueColumn) === null || _e === void 0 ? void 0 : _e.getColDef) === null || _f === void 0 ? void 0 : _f.call(_e)) === null || _g === void 0 ? void 0 : _g.field;
         // Booked
-        const pivotValue = (_j = (_h = (_g = agGridColumn === null || agGridColumn === void 0 ? void 0 : agGridColumn.getColDef) === null || _g === void 0 ? void 0 : _g.call(agGridColumn)) === null || _h === void 0 ? void 0 : _h.pivotKeys) === null || _j === void 0 ? void 0 : _j[0];
+        const pivotValue = (_k = (_j = (_h = agGridColumn === null || agGridColumn === void 0 ? void 0 : agGridColumn.getColDef) === null || _h === void 0 ? void 0 : _h.call(agGridColumn)) === null || _j === void 0 ? void 0 : _j.pivotKeys) === null || _k === void 0 ? void 0 : _k[0];
         // status - the preview works only with one column
-        const pivotColumnId = (_k = currentLayout === null || currentLayout === void 0 ? void 0 : currentLayout.PivotColumns) === null || _k === void 0 ? void 0 : _k[0];
+        const pivotColumnId = (_l = currentLayout === null || currentLayout === void 0 ? void 0 : currentLayout.PivotColumns) === null || _l === void 0 ? void 0 : _l[0];
         function getData(rows) {
             return [
                 ...rows.map((row) => {
@@ -282,9 +284,7 @@ class LayoutModule extends AdaptableModuleBase_1.AdaptableModuleBase {
         }
         const data = (0, flattenDeep_1.default)(getData(menuContext.rowNode.childrenAfterFilter));
         const rowGroups = currentLayout.RowGroupedColumns;
-        const cellValue = isPivotColumn
-            ? menuContext.rowNode.aggData[columnId]
-            : menuContext.gridCell.displayValue;
+        const cellValue = isPivotColumn ? menuContext.rowNode.aggData[columnId] : gridCell.displayValue;
         const popupProps = {
             hasPivotValue: isPivotColumn,
             columnId,
@@ -392,10 +392,8 @@ class LayoutModule extends AdaptableModuleBase_1.AdaptableModuleBase {
                         .filter(Boolean),
                 },
                 (layout === null || layout === void 0 ? void 0 : layout.GridFilter) &&
-                    StringExtensions_1.default.IsNotNullOrEmpty(layout.GridFilter.Expression) && {
-                    name: 'Grid Filter',
-                    values: [layout.GridFilter.Expression],
-                },
+                    StringExtensions_1.default.IsNotNullOrEmpty(layout.GridFilter.Expression) &&
+                    (0, getGridFilterPreview_1.getGridFilterViewItems)(layout),
             ].filter(Boolean),
             abObject: layout,
         };
@@ -443,5 +441,12 @@ class LayoutModule extends AdaptableModuleBase_1.AdaptableModuleBase {
         // we need to refresh the column defs, as some configs may have changed
         this.api.internalApi.getAdaptableInstance().setupColumns();
     }
+    getReferencedNamedQueryNames(layout) {
+        var _a;
+        if (!((_a = layout.GridFilter) === null || _a === void 0 ? void 0 : _a.Expression)) {
+            return [];
+        }
+        return this.api.namedQueryApi.internalApi.getReferencedNamedQueryNames(layout.GridFilter.Expression);
+    }
 }
 exports.LayoutModule = LayoutModule;

package/src/Strategy/NotesModule.d.ts

@@ -1,23 +1,10 @@
 import { AdaptableApi } from '../Api/AdaptableApi';
 import { AdaptableMenuItem, ContextMenuContext } from '../PredefinedConfig/Common/Menu';
-import { NoteGridCell } from '../types';
 import { AdaptableModuleBase } from './AdaptableModuleBase';
 import { IModule } from './Interface/IModule';
-/**
- * In the first iteration a cell can have only one note, the
- * notes is a list to allow further development.
- */
 export declare class NotesModule extends AdaptableModuleBase implements IModule {
     private adaptable;
     constructor(api: AdaptableApi);
-    isModuleAvailable(): boolean;
-    handleAdaptableReady(): void;
     addContextMenuItems(menuContext: ContextMenuContext): AdaptableMenuItem[] | undefined;
     private getAddRemoveNoteMenuItems;
-    getCellPositionFromEvent(event: MouseEvent): null | {
-        PrimaryKeyValue: string | number;
-        ColumnId: string;
-    };
-    handleMouseEnter(event: MouseEvent): void;
-    handleCellSelected(noteGridCell: NoteGridCell): void;
 }

package/src/Strategy/NotesModule.js

@@ -4,37 +4,15 @@ 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 note, the
- * notes is a list to allow further development.
- */
 class NotesModule extends AdaptableModuleBase_1.AdaptableModuleBase {
     constructor(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 Notes feature is public
-        return false;
-    }
-    handleAdaptableReady() {
-        if (!this.isModuleAvailable()) {
-            return;
-        }
-        this.adaptable._on('MouseEnter', (event) => this.handleMouseEnter(event));
-        this.api.eventApi.on('SelectionChanged', (params) => {
-            const cells = params.selectedCellInfo.gridCells;
-            if ((cells === null || cells === void 0 ? void 0 : cells.length) === 1) {
-                const selectedCell = cells[0];
-                const cellSelected = {
-                    PrimaryKeyValue: selectedCell.primaryKeyValue,
-                    ColumnId: selectedCell.column.columnId,
-                };
-                this.handleCellSelected(cellSelected);
-            }
-        });
     }
+    // isModuleAvailable(): boolean {
+    //   // FIXME remove this once Notes feature is public
+    //   return true;
+    // }
     addContextMenuItems(menuContext) {
         var _a, _b;
         if (!this.isModuleAvailable()) {
@@ -45,8 +23,10 @@ class NotesModule extends AdaptableModuleBase_1.AdaptableModuleBase {
         if (!isCellNotable ||
             isCellNotable({
                 adaptableApi: this.adaptable.api,
-                primaryKeyValue: menuContext.primaryKeyValue,
-                columnId: menuContext.adaptableColumn.columnId,
+                address: {
+                    PrimaryKeyValue: menuContext.primaryKeyValue,
+                    ColumnId: menuContext.adaptableColumn.columnId,
+                },
                 userName: this.adaptable.api.optionsApi.getUserName(),
                 adaptableId: this.adaptable.adaptableOptions.adaptableId,
             }))
@@ -70,7 +50,7 @@ class NotesModule extends AdaptableModuleBase_1.AdaptableModuleBase {
             items.push(this.createColumnMenuItemClickFunction('Add Note', this.moduleInfo.Glyph, () => {
                 // add an empty one
                 this.api.notesApi.addNote('', menuContext.primaryKeyValue, menuContext.adaptableColumn.columnId);
-                this.api.notesApi.showNotes({
+                this.api.internalApi.getCellPopupService().showPopup({
                     PrimaryKeyValue: menuContext.primaryKeyValue,
                     ColumnId: menuContext.adaptableColumn.columnId,
                 }, true);
@@ -78,64 +58,5 @@ class NotesModule extends AdaptableModuleBase_1.AdaptableModuleBase {
         }
         return items;
     }
-    getCellPositionFromEvent(event) {
-        var _a, _b;
-        const target = event.target;
-        if (!((_b = (_a = target === null || target === void 0 ? void 0 : target.classList) === null || _a === void 0 ? void 0 : _a.contains) === null || _b === void 0 ? void 0 : _b.call(_a, 'ag-cell'))) {
-            return null;
-        }
-        try {
-            return {
-                PrimaryKeyValue: target.parentElement.getAttribute('row-id'),
-                ColumnId: target.getAttribute('col-id'),
-            };
-        }
-        catch (e) {
-            return null;
-        }
-    }
-    handleMouseEnter(event) {
-        var _a;
-        const editMode = this.adaptable.api.notesApi.getNotePopupEditMode();
-        if (editMode) {
-            // ignore
-            return;
-        }
-        const cellPosition = this.getCellPositionFromEvent(event);
-        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.notesApi.getCellNotes(cellPosition)) === null || _a === void 0 ? void 0 : _a.length) {
-            this.adaptable.api.notesApi.showNotes(cellPosition, false);
-        }
-    }
-    handleCellSelected(noteGridCell) {
-        // if already opened - do nothing
-        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 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 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.notesApi.getNotePopupEditMode()) {
-                this.adaptable.api.notesApi.hideNote();
-            }
-            return;
-        }
-        // 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.NotesModule = NotesModule;

package/src/Strategy/PlusMinusModule.js

@@ -12,6 +12,7 @@ const getScopeViewItems_1 = require("./Utilities/getScopeViewItems");
 const PlusMinusWizard_1 = require("../View/PlusMinus/Wizard/PlusMinusWizard");
 const getRuleViewItems_1 = require("./Utilities/getRuleViewItems");
 const getObjectTagsViewItems_1 = require("./Utilities/getObjectTagsViewItems");
+const MovePlusMinus_1 = require("../View/PlusMinus/MovePlusMinus");
 class PlusMinusModule extends AdaptableModuleBase_1.AdaptableModuleBase {
     constructor(api) {
         super(ModuleConstants.PlusMinusModuleId, ModuleConstants.PlusMinusFriendlyName, 'add-circle', 'PlusMinusPopup', 'Configure how a cell value will edit when the + or - keys are pressed', api);
@@ -218,6 +219,7 @@ class PlusMinusModule extends AdaptableModuleBase_1.AdaptableModuleBase {
     }
     getViewProperties() {
         return {
+            actions: [MovePlusMinus_1.MovePlusMinus],
             getEditAction: PlusMinusRedux.PlusMinusNudgeEdit,
             getDeleteAction: PlusMinusRedux.PlusMinusNudgeDelete,
             getSuspendAction: PlusMinusRedux.PlusMinusNudgeSuspend,

package/src/Strategy/ScheduleModule.js

@@ -60,9 +60,6 @@ class ScheduleModule extends AdaptableModuleBase_1.AdaptableModuleBase {
             .forEach((iPushPullSchedule) => {
             this.addSchedule(iPushPullSchedule, Enums_1.ScheduleType.ipushpull);
         });
-        this.api.scheduleApi.getActiveGlue42Schedules().forEach((glue42Schedule) => {
-            this.addSchedule(glue42Schedule, Enums_1.ScheduleType.Glue42);
-        });
         this.api.scheduleApi.getActiveOpenFinSchedules().forEach((OpenFinSchedule) => {
             this.addSchedule(OpenFinSchedule, Enums_1.ScheduleType.OpenFin);
         });
@@ -132,7 +129,6 @@ class ScheduleModule extends AdaptableModuleBase_1.AdaptableModuleBase {
             allSchedules.push(...this.api.scheduleApi.getReportSchedules(config));
         }
         allSchedules.push(...this.api.scheduleApi.getIPushPullSchedules(config));
-        allSchedules.push(...this.api.scheduleApi.getGlue42Schedules(config));
         allSchedules.push(...this.api.scheduleApi.getOpenFinSchedules(config));
         return allSchedules;
     }
@@ -163,7 +159,6 @@ class ScheduleModule extends AdaptableModuleBase_1.AdaptableModuleBase {
         const exportAcessLevel = entitlementService.getEntitlementAccessLevelForModule(ModuleConstants.ExportModuleId);
         const abObjectTypes = [];
         const ippApi = this.api.pluginsApi.getipushpullPluginApi();
-        const glue42Api = this.api.pluginsApi.getGlue42PluginApi();
         const openFinApi = this.api.pluginsApi.getOpenFinPluginApi();
         if (accessLevel !== 'Hidden') {
             abObjectTypes.push({
@@ -183,12 +178,6 @@ class ScheduleModule extends AdaptableModuleBase_1.AdaptableModuleBase {
                 accessLevel,
             });
         }
-        if (glue42Api && glue42Api.isGlue42Running()) {
-            abObjectTypes.push({
-                name: 'Glue42',
-                accessLevel,
-            });
-        }
         if (openFinApi && openFinApi.isOpenFinRunning()) {
             abObjectTypes.push({
                 name: 'OpenFin',
@@ -209,9 +198,6 @@ class ScheduleModule extends AdaptableModuleBase_1.AdaptableModuleBase {
                     case Enums_1.ScheduleType.ipushpull:
                         editAction = ScheduleRedux.IPushPullScheduleEdit(schedule);
                         break;
-                    case Enums_1.ScheduleType.Glue42:
-                        editAction = ScheduleRedux.Glue42ScheduleEdit(schedule);
-                        break;
                     case Enums_1.ScheduleType.OpenFin:
                         editAction = ScheduleRedux.OpenFinScheduleEdit(schedule);
                         break;
@@ -230,9 +216,6 @@ class ScheduleModule extends AdaptableModuleBase_1.AdaptableModuleBase {
                     case Enums_1.ScheduleType.ipushpull:
                         deleteAction = ScheduleRedux.IPushPullScheduleDelete(schedule);
                         break;
-                    case Enums_1.ScheduleType.Glue42:
-                        deleteAction = ScheduleRedux.Glue42ScheduleDelete(schedule);
-                        break;
                     case Enums_1.ScheduleType.OpenFin:
                         deleteAction = ScheduleRedux.OpenFinScheduleDelete(schedule);
                         break;
@@ -251,9 +234,6 @@ class ScheduleModule extends AdaptableModuleBase_1.AdaptableModuleBase {
                     case Enums_1.ScheduleType.ipushpull:
                         suspendAction = ScheduleRedux.IPushPullScheduleSuspend(schedule);
                         break;
-                    case Enums_1.ScheduleType.Glue42:
-                        suspendAction = ScheduleRedux.Glue42ScheduleSuspend(schedule);
-                        break;
                     case Enums_1.ScheduleType.OpenFin:
                         suspendAction = ScheduleRedux.OpenFinScheduleSuspend(schedule);
                         break;
@@ -272,9 +252,6 @@ class ScheduleModule extends AdaptableModuleBase_1.AdaptableModuleBase {
                     case Enums_1.ScheduleType.ipushpull:
                         unSuspendAction = ScheduleRedux.IPushPullScheduleUnSuspend(schedule);
                         break;
-                    case Enums_1.ScheduleType.Glue42:
-                        unSuspendAction = ScheduleRedux.Glue42ScheduleUnSuspend(schedule);
-                        break;
                     case Enums_1.ScheduleType.OpenFin:
                         unSuspendAction = ScheduleRedux.OpenFinScheduleUnSuspend(schedule);
                         break;

package/src/Strategy/Utilities/Export/getExportRowsViewItems.d.ts

@@ -1,5 +1,6 @@
+/// <reference types="react" />
 import { AdaptableApi, Report } from '../../../types';
 export declare const getExportRowsViewItems: (report: Report, api: AdaptableApi) => {
     name: string;
-    values: string[];
+    view: JSX.Element;
 };

package/src/Strategy/Utilities/Export/getExportRowsViewItems.js

@@ -1,14 +1,23 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getExportRowsViewItems = void 0;
+const tslib_1 = require("tslib");
+const React = tslib_1.__importStar(require("react"));
+const ExpressionPreview_1 = require("../../../components/ExpressionEditor/ExpressionPreview");
+const Tag_1 = require("../../../components/Tag");
 const getExportRowsViewItems = (report, api) => {
+    let element = null;
+    if (report.ReportRowScope === 'ExpressionRows') {
+        element = React.createElement(ExpressionPreview_1.ExpressionPreview, { query: report.Query });
+    }
+    else {
+        element = api.internalApi
+            .getReportService()
+            .GetReportExpressionDescription(report, api.columnApi.getColumns());
+    }
     return {
         name: 'Rows',
-        values: [
-            api.internalApi
-                .getReportService()
-                .GetReportExpressionDescription(report, api.columnApi.getColumns()),
-        ],
+        view: React.createElement(Tag_1.Tag, null, element),
     };
 };
 exports.getExportRowsViewItems = getExportRowsViewItems;

package/src/Strategy/Utilities/getExpressionViewItems.js

@@ -1,11 +1,17 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getExpressionViewItems = void 0;
+const tslib_1 = require("tslib");
+const React = tslib_1.__importStar(require("react"));
+const ExpressionPreview_1 = require("../../components/ExpressionEditor/ExpressionPreview");
+const Tag_1 = require("../../components/Tag");
 const getExpressionViewItems = (query, api) => {
-    const expressionText = api.internalApi.getAdaptableQueryExpressionText(query);
+    // const expressionText = api.internalApi.getAdaptableQueryExpressionText(query);
     return {
         name: 'Expression',
-        values: [expressionText],
+        // values: [],
+        view: (React.createElement(Tag_1.Tag, null,
+            React.createElement(ExpressionPreview_1.ExpressionPreview, { query: query }))),
     };
 };
 exports.getExpressionViewItems = getExpressionViewItems;

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

@@ -7,3 +7,4 @@ export declare const APPLICATION = "Application";
 export declare const CELL_SUMMARY = "CellSummary";
 export declare const SYSTEM_FILTER = "SystemFilter";
 export declare const PLUGINS = "Plugins";
+export declare const COMMENT = "Comment";

package/src/Utilities/Constants/ConfigConstants.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.PLUGINS = exports.SYSTEM_FILTER = exports.CELL_SUMMARY = exports.APPLICATION = exports.BULK_UPDATE = exports.TEAM_SHARING = exports.POPUP = exports.GRID = exports.SYSTEM = void 0;
+exports.COMMENT = exports.PLUGINS = exports.SYSTEM_FILTER = exports.CELL_SUMMARY = exports.APPLICATION = exports.BULK_UPDATE = exports.TEAM_SHARING = exports.POPUP = exports.GRID = exports.SYSTEM = void 0;
 // constants used in Config
 exports.SYSTEM = 'System';
 exports.GRID = 'Grid';
@@ -11,3 +11,4 @@ exports.APPLICATION = 'Application';
 exports.CELL_SUMMARY = 'CellSummary';
 exports.SYSTEM_FILTER = 'SystemFilter';
 exports.PLUGINS = 'Plugins';
+exports.COMMENT = 'Comment';

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

@@ -7,6 +7,7 @@ export declare const MISSING_COLUMN: string;
 export declare const DEFAULT_LAYOUT: string;
 export declare const LIGHT_THEME: string;
 export declare const DARK_THEME: string;
+export declare const OS_THEME: string;
 export declare const USER_NAME: string;
 export declare const ADAPTABLE_ID: string;
 export declare const ADAPTABLE: string;

package/src/Utilities/Constants/GeneralConstants.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.CURRENT_LAYOUT_STATE_PROPERTY = exports.SUMMARY_OPERATION_STATE_PROPERTY = exports.ALERT_DEFAULT_SHOW_POPUP = exports.ALERT_DEFAULT_MESSAGE_TYPE = exports.PLUS_MINUS_DEFAULT_NUDGE_VALUE = exports.SERVER_VALIDATION_MESSAGE_TYPE = exports.SERVER_VALIDATION_HEADER = exports.DEFAULT_LIVE_REPORT_THROTTLE_TIME = exports.THEME_DEFAULT_CURRENT_THEME = exports.SYSTEM_DEFAULT_SYSTEM_STATUS_TYPE = exports.CELL_SUMMARY_DEFAULT_OPERATION = exports.QUICK_SEARCH_DEBOUNCE_TIME = exports.QUICK_SEARCH_DEFAULT_FORE_COLOR = exports.QUICK_SEARCH_DEFAULT_BACK_COLOR = exports.SYSTEM_STATUS_DEFAULT_MAX_MESSAGES_IN_STORE = exports.DEFAULT_DOUBLE_DISPLAY_VALUE = exports.DEFAULT_INTEGER_DISPLAY_VALUE = exports.DEFAULT_STRING_DISPLAY_VALUE = exports.BLANK_DISTINCT_COLUMN_VALUE = exports.DEFAULT_DATE_FORMAT_PATTERN = exports.ADAPTABLE_FDC3_ACTION_COLUMN_FRIENDLY_NAME = exports.ADAPTABLE_ROW_ACTION_BUTTONS_FRIENDLY_NAME = exports.ADAPTABLE_ROW_ACTION_BUTTONS = exports.AG_GRID_CHART_WINDOW = exports.AG_GRID_PIVOT_COLUMN = exports.AG_GRID_GROUPED_COLUMN = exports.HALF_SECOND = exports.AB_FDC3_COLUMN = exports.AB_ROW_ACTIONS_COLUMN = exports.AB_SPECIAL_COLUMN = exports.EMPTY_ARRAY = exports.EMPTY_STRING = exports.FILTER_THROTTLE = exports.FILTER_NEVER = exports.FILTER_ALWAYS = exports.ALL_COLUMN_VALUES = exports.READ_ONLY_STYLE = exports.MENU_PREFIX = exports.AGGRID_TOOLPANEL_COLUMNS = exports.AGGRID_TOOLPANEL_FILTERS = exports.ADAPTABLE_TOOLPANEL_COMPONENT = exports.ADAPTABLE_TOOLPANEL_ID = exports.ADAPTABLE = exports.ADAPTABLE_ID = exports.USER_NAME = exports.DARK_THEME = exports.LIGHT_THEME = exports.DEFAULT_LAYOUT = exports.MISSING_COLUMN = exports.AUTOGENERATED_PK_COLUMN = void 0;
-exports.THEME_STYLE = exports.SELECTED_ROWS_REPORT = exports.SELECTED_CELLS_REPORT = exports.CURRENT_DATA_REPORT = exports.ALL_DATA_REPORT = exports.VISUAL_DATA_REPORT = exports.SYSTEM_THEMES = exports.SMART_EDIT_MATH_OPERATION_STATE_PROPERTY = exports.SMART_EDIT_VALUE_STATE_PROPERTY = exports.QUICK_SEARCH_STYLE_STATE_PROPERTY = exports.QUICK_SEARCH_TEXT_STATE_PROPERTY = exports.CURRENT_THEME_STATE_PROPERTY = exports.FLASHING_CELL_DEFAULT_DURATION_STATE_PROPERTY = exports.FLASHING_CELL_DEFAULT_DOWN_COLOR_STATE_PROPERTY = exports.FLASHING_CELL_DEFAULT_UP_COLOR_STATE_PROPERTY = exports.CURRENT_REPORT_STATE_PROPERTY = void 0;
+exports.SUMMARY_OPERATION_STATE_PROPERTY = exports.ALERT_DEFAULT_SHOW_POPUP = exports.ALERT_DEFAULT_MESSAGE_TYPE = exports.PLUS_MINUS_DEFAULT_NUDGE_VALUE = exports.SERVER_VALIDATION_MESSAGE_TYPE = exports.SERVER_VALIDATION_HEADER = exports.DEFAULT_LIVE_REPORT_THROTTLE_TIME = exports.THEME_DEFAULT_CURRENT_THEME = exports.SYSTEM_DEFAULT_SYSTEM_STATUS_TYPE = exports.CELL_SUMMARY_DEFAULT_OPERATION = exports.QUICK_SEARCH_DEBOUNCE_TIME = exports.QUICK_SEARCH_DEFAULT_FORE_COLOR = exports.QUICK_SEARCH_DEFAULT_BACK_COLOR = exports.SYSTEM_STATUS_DEFAULT_MAX_MESSAGES_IN_STORE = exports.DEFAULT_DOUBLE_DISPLAY_VALUE = exports.DEFAULT_INTEGER_DISPLAY_VALUE = exports.DEFAULT_STRING_DISPLAY_VALUE = exports.BLANK_DISTINCT_COLUMN_VALUE = exports.DEFAULT_DATE_FORMAT_PATTERN = exports.ADAPTABLE_FDC3_ACTION_COLUMN_FRIENDLY_NAME = exports.ADAPTABLE_ROW_ACTION_BUTTONS_FRIENDLY_NAME = exports.ADAPTABLE_ROW_ACTION_BUTTONS = exports.AG_GRID_CHART_WINDOW = exports.AG_GRID_PIVOT_COLUMN = exports.AG_GRID_GROUPED_COLUMN = exports.HALF_SECOND = exports.AB_FDC3_COLUMN = exports.AB_ROW_ACTIONS_COLUMN = exports.AB_SPECIAL_COLUMN = exports.EMPTY_ARRAY = exports.EMPTY_STRING = exports.FILTER_THROTTLE = exports.FILTER_NEVER = exports.FILTER_ALWAYS = exports.ALL_COLUMN_VALUES = exports.READ_ONLY_STYLE = exports.MENU_PREFIX = exports.AGGRID_TOOLPANEL_COLUMNS = exports.AGGRID_TOOLPANEL_FILTERS = exports.ADAPTABLE_TOOLPANEL_COMPONENT = exports.ADAPTABLE_TOOLPANEL_ID = exports.ADAPTABLE = exports.ADAPTABLE_ID = exports.USER_NAME = exports.OS_THEME = exports.DARK_THEME = exports.LIGHT_THEME = exports.DEFAULT_LAYOUT = exports.MISSING_COLUMN = exports.AUTOGENERATED_PK_COLUMN = void 0;
+exports.THEME_STYLE = exports.SELECTED_ROWS_REPORT = exports.SELECTED_CELLS_REPORT = exports.CURRENT_DATA_REPORT = exports.ALL_DATA_REPORT = exports.VISUAL_DATA_REPORT = exports.SYSTEM_THEMES = exports.SMART_EDIT_MATH_OPERATION_STATE_PROPERTY = exports.SMART_EDIT_VALUE_STATE_PROPERTY = exports.QUICK_SEARCH_STYLE_STATE_PROPERTY = exports.QUICK_SEARCH_TEXT_STATE_PROPERTY = exports.CURRENT_THEME_STATE_PROPERTY = exports.FLASHING_CELL_DEFAULT_DURATION_STATE_PROPERTY = exports.FLASHING_CELL_DEFAULT_DOWN_COLOR_STATE_PROPERTY = exports.FLASHING_CELL_DEFAULT_UP_COLOR_STATE_PROPERTY = exports.CURRENT_REPORT_STATE_PROPERTY = exports.CURRENT_LAYOUT_STATE_PROPERTY = void 0;
 const Enums_1 = require("../../PredefinedConfig/Common/Enums");
 const UIHelper_1 = require("../../View/UIHelper");
 exports.AUTOGENERATED_PK_COLUMN = '__ADAPTABLE_PK__';
@@ -9,6 +9,7 @@ exports.MISSING_COLUMN = ' [MISSING]';
 exports.DEFAULT_LAYOUT = 'Default Layout';
 exports.LIGHT_THEME = 'light';
 exports.DARK_THEME = 'dark';
+exports.OS_THEME = 'os';
 exports.USER_NAME = 'anonymous';
 exports.ADAPTABLE_ID = 'adaptable_id';
 exports.ADAPTABLE = 'AdapTable';
@@ -58,7 +59,7 @@ exports.CELL_SUMMARY_DEFAULT_OPERATION = Enums_1.SummaryOperation.Sum;
 exports.SYSTEM_DEFAULT_SYSTEM_STATUS_TYPE = 'Info';
 // theme
 exports.THEME_DEFAULT_CURRENT_THEME = exports.LIGHT_THEME;
-// Live Report Throttle Time (used in OpenFin, IPushPull, Glue42 etc.)
+// Live Report Throttle Time (used in OpenFin, IPushPull etc.)
 exports.DEFAULT_LIVE_REPORT_THROTTLE_TIME = 2000;
 exports.SERVER_VALIDATION_HEADER = 'Server Validation Message';
 exports.SERVER_VALIDATION_MESSAGE_TYPE = 'Info';
@@ -92,6 +93,10 @@ exports.SYSTEM_THEMES = [
         Name: exports.DARK_THEME,
         Description: 'Dark Theme',
     },
+    {
+        Name: exports.OS_THEME,
+        Description: 'OS Theme',
+    },
 ];
 exports.VISUAL_DATA_REPORT = 'Visual Data';
 exports.ALL_DATA_REPORT = 'All Data';

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

@@ -33,14 +33,14 @@ export declare const FormatColumnModuleId: ModuleConstants;
 export declare const FormatColumnFriendlyName = "Format Column";
 export declare const FreeTextColumnModuleId: ModuleConstants;
 export declare const FreeTextColumnFriendlyName = "Free Text Column";
-export declare const Glue42ModuleId: ModuleConstants;
-export declare const Glue42FriendlyName = "Glue42";
 export declare const GridInfoModuleId: ModuleConstants;
 export declare const GridInfoFriendlyName = "Grid Info";
 export declare const ColumnInfoModuleId: ModuleConstants;
 export declare const ColumnInfoFriendlyName = "Column Info";
 export declare const NotesModuleId: ModuleConstants;
 export declare const NotesFriendlyName = "Notes";
+export declare const CommentsModuleId: ModuleConstants;
+export declare const CommentsFriendlyName = "Comments";
 export declare const IPushPullModuleId: ModuleConstants;
 export declare const IPushPullFriendlyName = "IPushPull";
 export declare const LayoutModuleId: ModuleConstants;
@@ -91,7 +91,6 @@ export declare const ADAPTABLE_MODULE_MAP: {
     ColumnFilter: string;
     FormatColumn: string;
     FreeTextColumn: string;
-    Glue42: string;
     GridInfo: string;
     IPushPull: string;
     Layout: string;
@@ -114,6 +113,7 @@ export declare const ADAPTABLE_MODULE_MAP: {
     DataImport: string;
     NamedQuery: string;
     GridFilter: string;
+    Comments: string;
     Query: string;
     Filter: string;
 };

package/src/Utilities/Constants/ModuleConstants.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-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.NamedQueryFriendlyName = exports.NamedQueryModuleId = exports.GridFilterFriendlyName = exports.GridFilterModuleId = exports.ColumnFilterFriendlyName = exports.ColumnFilterModuleId = 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.PlusMinusFriendlyName = exports.PlusMinusModuleId = exports.OpenFinFriendlyName = exports.OpenFinModuleId = exports.LayoutFriendlyName = exports.LayoutModuleId = exports.IPushPullFriendlyName = exports.IPushPullModuleId = exports.CommentsFriendlyName = exports.CommentsModuleId = exports.NotesFriendlyName = exports.NotesModuleId = exports.ColumnInfoFriendlyName = exports.ColumnInfoModuleId = exports.GridInfoFriendlyName = exports.GridInfoModuleId = exports.FreeTextColumnFriendlyName = exports.FreeTextColumnModuleId = exports.FormatColumnFriendlyName = exports.FormatColumnModuleId = exports.NamedQueryFriendlyName = exports.NamedQueryModuleId = exports.GridFilterFriendlyName = exports.GridFilterModuleId = exports.ColumnFilterFriendlyName = exports.ColumnFilterModuleId = 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 = exports.QuickSearchFriendlyName = exports.QuickSearchModuleId = void 0;
 exports.AlertModuleId = 'Alert';
 exports.AlertModuleFriendlyName = 'Alert';
@@ -36,14 +36,14 @@ exports.FormatColumnModuleId = 'FormatColumn';
 exports.FormatColumnFriendlyName = 'Format Column';
 exports.FreeTextColumnModuleId = 'FreeTextColumn';
 exports.FreeTextColumnFriendlyName = 'Free Text Column';
-exports.Glue42ModuleId = 'Glue42';
-exports.Glue42FriendlyName = 'Glue42';
 exports.GridInfoModuleId = 'GridInfo';
 exports.GridInfoFriendlyName = 'Grid Info';
 exports.ColumnInfoModuleId = 'ColumnInfo';
 exports.ColumnInfoFriendlyName = 'Column Info';
 exports.NotesModuleId = 'Notes';
 exports.NotesFriendlyName = 'Notes';
+exports.CommentsModuleId = 'Comments';
+exports.CommentsFriendlyName = 'Comments';
 exports.IPushPullModuleId = 'IPushPull';
 exports.IPushPullFriendlyName = 'IPushPull';
 exports.LayoutModuleId = 'Layout';
@@ -94,7 +94,6 @@ exports.ADAPTABLE_MODULE_MAP = {
     [exports.ColumnFilterModuleId]: exports.ColumnFilterFriendlyName,
     [exports.FormatColumnModuleId]: exports.FormatColumnFriendlyName,
     [exports.FreeTextColumnModuleId]: exports.FreeTextColumnFriendlyName,
-    [exports.Glue42ModuleId]: exports.Glue42FriendlyName,
     [exports.GridInfoModuleId]: exports.GridInfoFriendlyName,
     [exports.IPushPullModuleId]: exports.IPushPullFriendlyName,
     [exports.LayoutModuleId]: exports.LayoutFriendlyName,
@@ -117,6 +116,7 @@ exports.ADAPTABLE_MODULE_MAP = {
     [exports.DataImportModuleId]: exports.DataImportFriendyName,
     [exports.NamedQueryModuleId]: exports.NamedQueryFriendlyName,
     [exports.GridFilterModuleId]: exports.GridFilterFriendlyName,
+    [exports.CommentsModuleId]: exports.CommentsFriendlyName,
     // Remove next version
     ['Query']: 'Query',
     ['Filter']: 'Filter',

package/src/Utilities/Defaults/DefaultAdaptableOptions.js

@@ -148,7 +148,7 @@ exports.DefaultAdaptableOptions = {
     dataSetOptions: { dataSets: GeneralConstants_1.EMPTY_ARRAY },
     groupingOptions: {
         showGroupingTotalsAsHeader: false,
-        unbalancedGroupsKey: undefined,
+        balancedGroupsKey: undefined,
         restoreUngroupedColumns: false,
         autoOrderGroupedColumns: true,
     },
@@ -186,7 +186,6 @@ exports.DefaultAdaptableOptions = {
             hideQuickFilterDropdown: undefined,
             hideQuickFilterInput: undefined,
             quickFilterTrigger: 'mouseenter',
-            quickFilterValuesTrigger: 'mouseenter',
             quickFilterDebounce: 250,
             quickFilterHeight: null,
             showQuickFilter: true,
@@ -198,6 +197,7 @@ exports.DefaultAdaptableOptions = {
             defaultFilterFormTab: 'Values',
         },
         valuesFilterOptions: {
+            valuesFilterTrigger: 'mouseenter',
             sortValuesFilter: false,
             filterValuesUsingTime: false,
             showDistinctFilteredValuesOnly: false,
@@ -225,7 +225,7 @@ exports.DefaultAdaptableOptions = {
         showSuspendFilterButton: false,
     },
     gridFilterOptions: {
-        availableFilterEditors: 'Both',
+        availableFilterEditors: ['ExpressionEditor', 'QueryBuilder'],
         clearGridFilterOnStartUp: false,
     },
     predicateOptions: {

package/src/Utilities/Defaults/DefaultSettingsPanel.js

@@ -45,4 +45,5 @@ exports.DEFAULT_SETTINGS_PANEL_NAVIGATION_ITEMS = [
     'StateManagement',
     'TeamSharing',
     'Notes',
+    'Comments',
 ];

package/src/Utilities/ExpressionFunctions/aggregatedBooleanExpressionFunctions.js

@@ -7,7 +7,13 @@ const ExpressionEvaluationError_1 = require("../../parser/src/ExpressionEvaluati
 const expressionFunctionUtils_1 = require("./expressionFunctionUtils");
 const aggregatedScalarExpressionFunctions_1 = require("./aggregatedScalarExpressionFunctions");
 const TypeExtensions_1 = require("../Extensions/TypeExtensions");
-const SUPPORTED_AGGREGATION_FNS = ['SUM', 'MIN', 'MAX', 'AVG', 'COUNT'];
+const SUPPORTED_AGGREGATION_FNS = [
+    'SUM',
+    'MIN',
+    'MAX',
+    'AVG',
+    'COUNT',
+];
 const aggregationScalarOperandMap = {
     SUM: ['string', 'number'],
     MIN: ['string', 'number'],

package/src/Utilities/ExpressionFunctions/booleanExpressionFunctions.js

@@ -244,6 +244,12 @@ exports.booleanExpressionFunctions = {
         signatures: ['values IN (value, value, ...value)'],
         examples: ['[col1] IN (5, 10, AVG([col2],[col3]))'],
         returnType: 'boolean',
+        inputs: [
+            ['number', 'number[]'],
+            // Date is currently not supported in select
+            // ['date', 'date[]'],
+            ['text', 'text[]'],
+        ],
     },
     CONTAINS: {
         handler(args, context) {

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

@@ -1,2 +1,3 @@
 export declare const normalizeDateParams: (args: [string | number | Date, string | number | Date]) => [number | Date, number | Date];
 export declare const normalizeDateParam: (args: string | number | Date) => Date;
+export declare const formatDate: (date: Date | number, format: string) => string;