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

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;

package/src/Utilities/ExpressionFunctions/dateUtils.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.normalizeDateParam = exports.normalizeDateParams = void 0;
+exports.formatDate = exports.normalizeDateParam = exports.normalizeDateParams = void 0;
 const normalizeDateParams = (args) => {
     let [first, second] = args;
     if (typeof first === 'string') {
@@ -22,3 +22,20 @@ const normalizeDateParam = (args) => {
     return args;
 };
 exports.normalizeDateParam = normalizeDateParam;
+const formatDate = (date, format) => {
+    date = (0, exports.normalizeDateParam)(date);
+    const day = date.getDate();
+    const month = date.getMonth() + 1;
+    const year = date.getFullYear();
+    const hour = date.getHours();
+    const minute = date.getMinutes();
+    const second = date.getSeconds();
+    return format
+        .replace('DD', day.toString().padStart(2, '0'))
+        .replace('MM', month.toString().padStart(2, '0'))
+        .replace('YYYY', year.toString())
+        .replace('HH', hour.toString().padStart(2, '0'))
+        .replace('mm', minute.toString().padStart(2, '0'))
+        .replace('ss', second.toString().padStart(2, '0'));
+};
+exports.formatDate = formatDate;

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

@@ -2,6 +2,6 @@ import { ExpressionFunction } from '../../parser/src/types';
 /**
  * List of all the Scalar Functions available in AdaptableQL
  */
-export type ScalarFunctionName = 'ADD' | 'SUB' | 'MUL' | 'DIV' | 'MOD' | 'POW' | 'ABS' | 'CEILING' | 'FLOOR' | 'ROUND' | 'MIN' | 'MAX' | 'AVG' | 'DATE' | 'NOW' | 'TODAY' | 'DAY' | 'WEEK' | 'MONTH' | 'YEAR' | 'ADD_DAYS' | 'ADD_WEEKS' | 'ADD_MONTHS' | 'ADD_YEARS' | 'DIFF_DAYS' | 'DIFF_WEEKS' | 'DIFF_MONTHS' | 'DIFF_YEARS' | 'SUB_STRING' | 'REPLACE' | 'COALESCE' | 'NULL' | 'LEN' | 'UPPER' | 'LOWER' | 'CONCAT' | 'IF' | 'CASE' | 'COL' | 'VAR' | 'TO_ARRAY' | 'QUERY' | 'IS_BLANK' | 'IS_NOT_BLANK';
+export type ScalarFunctionName = 'ADD' | 'SUB' | 'MUL' | 'DIV' | 'MOD' | 'POW' | 'ABS' | 'CEILING' | 'FLOOR' | 'ROUND' | 'MIN' | 'MAX' | 'AVG' | 'DATE' | 'NOW' | 'CURRENT_DAY' | 'DAY' | 'WEEK' | 'MONTH' | 'YEAR' | 'ADD_DAYS' | 'ADD_WEEKS' | 'ADD_MONTHS' | 'ADD_YEARS' | 'DIFF_DAYS' | 'DIFF_WEEKS' | 'DIFF_MONTHS' | 'DIFF_YEARS' | 'SUB_STRING' | 'REPLACE' | 'COALESCE' | 'NULL' | 'LEN' | 'UPPER' | 'LOWER' | 'CONCAT' | 'IF' | 'CASE' | 'COL' | 'VAR' | 'TO_ARRAY' | 'QUERY' | 'IS_BLANK' | 'IS_NOT_BLANK';
 export declare const scalarExpressionFunctions: Record<ScalarFunctionName, ExpressionFunction>;
 export declare const scalarExpressionFunctionNames: ScalarFunctionName[];

package/src/Utilities/ExpressionFunctions/scalarExpressionFunctions.js

@@ -151,7 +151,7 @@ exports.scalarExpressionFunctions = {
     },
     IS_NOT_BLANK: {
         handler(args) {
-            return args[0] !== undefined && args[0] !== null && (String)(args[0]).trim() !== '';
+            return args[0] !== undefined && args[0] !== null && String(args[0]).trim() !== '';
         },
         category: 'special',
         description: 'Returns true if input value is not empty',
@@ -387,13 +387,13 @@ exports.scalarExpressionFunctions = {
         category: 'dates',
         returnType: 'date',
     },
-    TODAY: {
+    CURRENT_DAY: {
         handler() {
             return (0, startOfDay_1.default)(new Date());
         },
         description: 'Returns the current day',
-        signatures: ['TODAY()'],
-        examples: ['[col1] > TODAY()'],
+        signatures: ['CURRENT_DAY()'],
+        examples: ['[col1] > CURRENT_DAY()'],
         category: 'dates',
         returnType: 'date',
     },
@@ -443,7 +443,7 @@ exports.scalarExpressionFunctions = {
         },
         description: 'Returns a date based on input data and days to add',
         signatures: ['ADD_DAYS(input: date, days: number)'],
-        examples: ['ADD_DAYS(TODAY(), 5)', 'ADD_DAYS([col1], 5)'],
+        examples: ['ADD_DAYS(CURRENT_DAY(), 5)', 'ADD_DAYS([col1], 5)'],
         category: 'dates',
         returnType: 'date',
     },
@@ -453,7 +453,7 @@ exports.scalarExpressionFunctions = {
         },
         description: 'Returns a date based on input data and weeks to add',
         signatures: ['ADD_WEEKS(input: date, weeks: number)'],
-        examples: ['ADD_WEEKS(TODAY(), 5)', 'ADD_WEEKS([col1], 5)'],
+        examples: ['ADD_WEEKS(CURRENT_DAY(), 5)', 'ADD_WEEKS([col1], 5)'],
         category: 'dates',
         returnType: 'date',
     },
@@ -463,7 +463,7 @@ exports.scalarExpressionFunctions = {
         },
         description: 'Returns a date based on input data and months to add',
         signatures: ['ADD_MONTHS(input: date, months: number)'],
-        examples: ['ADD_MONTHS(TODAY(), 5)', 'ADD_MONTHS([col1], 5)'],
+        examples: ['ADD_MONTHS(CURRENT_DAY(), 5)', 'ADD_MONTHS([col1], 5)'],
         category: 'dates',
         returnType: 'date',
     },
@@ -473,7 +473,7 @@ exports.scalarExpressionFunctions = {
         },
         description: 'Returns a date based on input data and years to add',
         signatures: ['ADD_YEARS(input: date, years: number)'],
-        examples: ['ADD_YEARS(TODAY(), 5)', 'ADD_YEARS([col1], 5)'],
+        examples: ['ADD_YEARS(CURRENT_DAY(), 5)', 'ADD_YEARS([col1], 5)'],
         category: 'dates',
         returnType: 'date',
     },
@@ -485,7 +485,7 @@ exports.scalarExpressionFunctions = {
         },
         description: 'Returns the difference in days between 2 dates',
         signatures: ['DIFF_DAYS(a: date, b: date)'],
-        examples: ['DIFF_DAYS([col1], TODAY())'],
+        examples: ['DIFF_DAYS([col1], CURRENT_DAY())'],
         category: 'dates',
         returnType: 'number',
     },
@@ -497,7 +497,7 @@ exports.scalarExpressionFunctions = {
         },
         description: 'Returns the difference in weeks between 2 dates',
         signatures: ['DIFF_WEEKS(a: date, b: date)'],
-        examples: ['DIFF_WEEKS([col1], TODAY())'],
+        examples: ['DIFF_WEEKS([col1], CURRENT_DAY())'],
         category: 'dates',
         returnType: 'number',
     },
@@ -509,7 +509,7 @@ exports.scalarExpressionFunctions = {
         },
         description: 'Returns the difference in months between 2 dates',
         signatures: ['DIFF_MONTHS(a: date, b: date)'],
-        examples: ['DIFF_MONTHS([col1], TODAY())'],
+        examples: ['DIFF_MONTHS([col1], CURRENT_DAY())'],
         category: 'dates',
         returnType: 'number',
     },
@@ -521,7 +521,7 @@ exports.scalarExpressionFunctions = {
         },
         description: 'Returns the difference in years between 2 dates',
         signatures: ['DIFF_YEARS(a: date, b: date)'],
-        examples: ['DIFF_YEARS([col1], TODAY())'],
+        examples: ['DIFF_YEARS([col1], CURRENT_DAY())'],
         category: 'dates',
         returnType: 'number',
     },

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

@@ -17,6 +17,7 @@ export declare function IsNotNullOrEmpty(arrayToCheck: any[] | undefined | null)
 export declare function IsNullOrEmptyOrContainsSingleEmptyValue(arrayToCheck: any[]): boolean;
 export declare function IsNotNullOrEmptyNorContainsSingleEmptyValue(arrayToCheck: any[]): boolean;
 export declare function HasSingleEmptyValue(arrayToCheck: any[]): boolean;
+export declare function getOccurrence(arrayToCheck: any[], valueToCheck: any): number;
 export declare function hasOneItem(arrayToCheck: any[]): boolean;
 export declare function hasItemsOfCount(arrayToCheck: any[], numberOfItems: number): boolean;
 export declare function moveArray(array: any[], from: number, to: number): void;
@@ -50,6 +51,7 @@ export declare const ArrayExtensions: {
     IsNullOrEmptyOrContainsSingleEmptyValue: typeof IsNullOrEmptyOrContainsSingleEmptyValue;
     IsNotNullOrEmptyNorContainsSingleEmptyValue: typeof IsNotNullOrEmptyNorContainsSingleEmptyValue;
     HasSingleEmptyValue: typeof HasSingleEmptyValue;
+    getOccurrence: typeof getOccurrence;
     hasOneItem: typeof hasOneItem;
     hasItemsOfCount: typeof hasItemsOfCount;
     moveArray: typeof moveArray;

package/src/Utilities/Extensions/ArrayExtensions.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ArrayExtensions = exports.createCommaSeparatedString = exports.groupArrayBy = exports.sortCellValueArrayDates = exports.sortCellValueArrayNumeric = exports.sortCellValueArray = exports.sortArray = exports.sortArrayWithProperty = exports.areArraysEqualWithOrderandProperties = exports.areArraysEqualWithOrder = exports.areArraysNotEqual = exports.areArraysEqual = exports.moveArray = exports.hasItemsOfCount = exports.hasOneItem = exports.HasSingleEmptyValue = exports.IsNotNullOrEmptyNorContainsSingleEmptyValue = exports.IsNullOrEmptyOrContainsSingleEmptyValue = exports.IsNotNullOrEmpty = exports.IsNullOrEmpty = exports.IsNotEmpty = exports.IsEmpty = exports.IsNotNull = exports.IsNull = exports.RetrieveDistinct = exports.NotContainsItem = exports.ContainsAnyItem = exports.ContainsItem = exports.AddItem = exports.NotCorrectLength = exports.CorrectLength = exports.GetLength = void 0;
+exports.ArrayExtensions = exports.createCommaSeparatedString = exports.groupArrayBy = exports.sortCellValueArrayDates = exports.sortCellValueArrayNumeric = exports.sortCellValueArray = exports.sortArray = exports.sortArrayWithProperty = exports.areArraysEqualWithOrderandProperties = exports.areArraysEqualWithOrder = exports.areArraysNotEqual = exports.areArraysEqual = exports.moveArray = exports.hasItemsOfCount = exports.hasOneItem = exports.getOccurrence = exports.HasSingleEmptyValue = exports.IsNotNullOrEmptyNorContainsSingleEmptyValue = exports.IsNullOrEmptyOrContainsSingleEmptyValue = exports.IsNotNullOrEmpty = exports.IsNullOrEmpty = exports.IsNotEmpty = exports.IsEmpty = exports.IsNotNull = exports.IsNull = exports.RetrieveDistinct = exports.NotContainsItem = exports.ContainsAnyItem = exports.ContainsItem = exports.AddItem = exports.NotCorrectLength = exports.CorrectLength = exports.GetLength = void 0;
 const Enums_1 = require("../../PredefinedConfig/Common/Enums");
 function GetLength(arrayToCheck) {
     return IsNotNull(arrayToCheck) ? arrayToCheck.length : 0;
@@ -95,6 +95,12 @@ function HasSingleEmptyValue(arrayToCheck) {
     return false;
 }
 exports.HasSingleEmptyValue = HasSingleEmptyValue;
+function getOccurrence(arrayToCheck, valueToCheck) {
+    var count = 0;
+    arrayToCheck.forEach((v) => v === valueToCheck && count++);
+    return count;
+}
+exports.getOccurrence = getOccurrence;
 function hasOneItem(arrayToCheck) {
     return hasItemsOfCount(arrayToCheck, 1);
 }
@@ -302,6 +308,7 @@ exports.ArrayExtensions = {
     IsNullOrEmptyOrContainsSingleEmptyValue,
     IsNotNullOrEmptyNorContainsSingleEmptyValue,
     HasSingleEmptyValue,
+    getOccurrence,
     hasOneItem,
     hasItemsOfCount,
     moveArray,

package/src/Utilities/Helpers/PreviewHelper.js

@@ -44,7 +44,8 @@ function GetCellInfosFromPreview(previewInfo, bypassValidationWarnings) {
                     normalisedValue: previewResult.computedValue,
                     rowNode: previewResult.rowNode,
                     column: previewInfo.column,
-                    isPivotCell: false, isRowGroupCell: false
+                    isPivotCell: false,
+                    isRowGroupCell: false,
                 });
             }
         }
@@ -59,7 +60,9 @@ function GetCellInfosFromPreview(previewInfo, bypassValidationWarnings) {
                 rawValue: pr.computedValue,
                 displayValue: pr.computedValue,
                 normalisedValue: pr.computedValue,
-                rowNode: pr.rowNode, isPivotCell: false, isRowGroupCell: false
+                rowNode: pr.rowNode,
+                isPivotCell: false,
+                isRowGroupCell: false,
             });
         });
     }