npm - @adaptabletools/adaptable-cjs - Versions diffs - 18.0.0-canary.9 → 18.0.0 - Mend

@adaptabletools/adaptable-cjs 18.0.0-canary.9 → 18.0.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (422) hide show

package/src/Strategy/StyledColumnModule.js CHANGED Viewed

@@ -19,8 +19,8 @@ class StyledColumnModule extends AdaptableModuleBase_1.AdaptableModuleBase {
         return this.api.styledColumnApi.getStyledColumns(config);
     }
     getExplicitlyReferencedColumnIds(formatColumn) {
-        if (this.api.scopeApi.scopeHasColumns(formatColumn.Scope)) {
-            return this.api.scopeApi
+        if (this.api.columnScopeApi.scopeHasColumns(formatColumn.Scope)) {
+            return this.api.columnScopeApi
                 .getColumnsForScope(formatColumn.Scope)
                 .map((adaptableColumn) => adaptableColumn.columnId);
         }
@@ -29,7 +29,7 @@ class StyledColumnModule extends AdaptableModuleBase_1.AdaptableModuleBase {
     hasNamedQueryReferences() {
         return false;
     }
-    addColumnMenuItems(column) {
+    createColumnMenuItems(column) {
         let returnColumnMenuItems = [];
         // Need a Column and an editable Module
         if (column && this.isModuleEditable()) {
@@ -49,6 +49,9 @@ class StyledColumnModule extends AdaptableModuleBase_1.AdaptableModuleBase {
                         styledColumn = Object.assign(Object.assign({}, ObjectFactory_1.default.CreateEmptyStyledColumn()), { ColumnId: column.columnId, SparkLineStyle: {} });
                     }
                     let label = hasSparklineStyle ? 'Edit ' : 'Create ';
+                    let name = hasSparklineStyle
+                        ? 'styled-column-sparkline-edit'
+                        : 'styled-column-sparkline-add';
                     let popupParam = {
                         action: sparklineColumnExists ? 'Edit' : 'New',
                         source: 'ColumnMenu',
@@ -57,7 +60,7 @@ class StyledColumnModule extends AdaptableModuleBase_1.AdaptableModuleBase {
                             defaultCurrentSectionName: 'Settings',
                         },
                     };
-                    returnColumnMenuItems.push(this.createColumnMenuItemShowPopup(label + 'Sparkline Column', this.moduleInfo.Popup, this.getGlyphForStyledColumn(styledColumn), popupParam));
+                    returnColumnMenuItems.push(this.createMenuItemShowPopup(name, label + 'Sparkline Column', this.moduleInfo.Popup, this.getGlyphForStyledColumn(styledColumn), popupParam));
                 }
             }
             // Next do non sparkline
@@ -81,8 +84,10 @@ class StyledColumnModule extends AdaptableModuleBase_1.AdaptableModuleBase {
                             },
                         };
                         const icon = this.getGlyphForStyledColumn(styledColumn);
-                        const label = `Edit ${this.getTypeLabel(styledColumn)} Style`;
-                        returnColumnMenuItems.push(this.createColumnMenuItemShowPopup(label, this.moduleInfo.Popup, icon, popupParam));
+                        const typeLabel = this.getTypeLabel(styledColumn);
+                        const label = `Edit ${typeLabel}`;
+                        const name = this.getTypeName(styledColumn);
+                        returnColumnMenuItems.push(this.createMenuItemShowPopup(name, label, this.moduleInfo.Popup, icon, popupParam));
                     }
                 }
                 else {
@@ -93,8 +98,8 @@ class StyledColumnModule extends AdaptableModuleBase_1.AdaptableModuleBase {
                         value: newStyledColumn,
                         config: {},
                     };
-                    const badgeLabel = column.dataType === 'Number' ? 'Badge' : 'Create Badge Style';
-                    const newBadgeButton = this.createColumnMenuItemShowPopup(badgeLabel, this.moduleInfo.Popup, 'badge', Object.assign(Object.assign({}, popupParam), { value: Object.assign(Object.assign({}, newStyledColumn), { BadgeStyle: {
+                    const badgeLabel = 'Create Badge Style';
+                    const newBadgeButton = this.createMenuItemShowPopup('styled-column-badge-add', badgeLabel, this.moduleInfo.Popup, 'badge', Object.assign(Object.assign({}, popupParam), { value: Object.assign(Object.assign({}, newStyledColumn), { BadgeStyle: {
                                 Badges: [ObjectFactory_1.default.CreateDefaultStyledColumnBadge()],
                             } }), config: {
                             defaultCurrentSectionName: 'Badges',
@@ -103,26 +108,20 @@ class StyledColumnModule extends AdaptableModuleBase_1.AdaptableModuleBase {
                         // Number
                         // Create Styled Column - Gradient | Percent Bar | Badge
                         case 'Number':
-                            const emptyRanges = this.api.scopeApi.createCellColorRangesForScope({
+                            const emptyRanges = this.api.columnScopeApi.createCellColorRangesForScope({
                                 ColumnIds: [column.columnId],
                             });
-                            const newGrandientButton = this.createColumnMenuItemShowPopup('Gradient', this.moduleInfo.Popup, 'gradient', Object.assign(Object.assign({}, popupParam), { value: Object.assign(Object.assign({}, newStyledColumn), { GradientStyle: {
+                            const newGrandientButton = this.createMenuItemShowPopup('styled-column-gradient-add', 'Create Gradient Column', this.moduleInfo.Popup, 'gradient', Object.assign(Object.assign({}, popupParam), { value: Object.assign(Object.assign({}, newStyledColumn), { GradientStyle: {
                                         CellRanges: emptyRanges,
                                     } }), config: {
                                     defaultCurrentSectionName: 'Style',
                                 } }));
-                            const newPrecentBarButton = this.createColumnMenuItemShowPopup('Percent Bar', this.moduleInfo.Popup, 'percent', Object.assign(Object.assign({}, popupParam), { value: Object.assign(Object.assign({}, newStyledColumn), { PercentBarStyle: {
+                            const newPercentBarButton = this.createMenuItemShowPopup('styled-column-percent-bar-add', 'Create Percent Bar', this.moduleInfo.Popup, 'percent', Object.assign(Object.assign({}, popupParam), { value: Object.assign(Object.assign({}, newStyledColumn), { PercentBarStyle: {
                                         CellRanges: emptyRanges,
                                     } }), config: {
                                     defaultCurrentSectionName: 'Style',
                                 } }));
-                            returnColumnMenuItems.push({
-                                label: 'Create Styled Column',
-                                module: this.moduleInfo.ModuleName,
-                                isVisible: true,
-                                icon: { name: this.moduleInfo.Glyph },
-                                subItems: [newGrandientButton, newPrecentBarButton, newBadgeButton],
-                            });
+                            returnColumnMenuItems.push(...[newGrandientButton, newPercentBarButton, newBadgeButton]);
                             break;
                         case 'String':
                             returnColumnMenuItems.push(newBadgeButton);
@@ -159,6 +158,7 @@ class StyledColumnModule extends AdaptableModuleBase_1.AdaptableModuleBase {
         };
     }
     toView(styledColumn) {
+        var _a, _b, _c, _d, _e, _f;
         const specificTypeItems = [];
         if (styledColumn.GradientStyle || styledColumn.PercentBarStyle) {
             specificTypeItems.push({
@@ -168,10 +168,14 @@ class StyledColumnModule extends AdaptableModuleBase_1.AdaptableModuleBase {
                 },
             });
         }
-        if (!styledColumn.BadgeStyle) {
+        if (styledColumn.BadgeStyle) {
             specificTypeItems.push({
                 name: 'Settings',
-                values: [`Include grouped rows: ${styledColumn.IncludeGroupedRows ? 'Yes' : 'No'}`],
+                values: [
+                    `Data Rows: ${((_b = (_a = styledColumn.BadgeStyle) === null || _a === void 0 ? void 0 : _a.RowScope) === null || _b === void 0 ? void 0 : _b.ExcludeDataRows) ? 'No' : 'Yes'}`,
+                    `Group Rows: ${((_d = (_c = styledColumn.BadgeStyle) === null || _c === void 0 ? void 0 : _c.RowScope) === null || _d === void 0 ? void 0 : _d.ExcludeGroupRows) ? 'No' : 'Yes'}`,
+                    `Summary Rows: ${((_f = (_e = styledColumn.BadgeStyle) === null || _e === void 0 ? void 0 : _e.RowScope) === null || _f === void 0 ? void 0 : _f.ExcludeSummaryRows) ? 'No' : 'Yes'}`,
+                ],
             });
         }
         if (styledColumn.BadgeStyle) {
@@ -221,7 +225,7 @@ class StyledColumnModule extends AdaptableModuleBase_1.AdaptableModuleBase {
     getTypeLabel(styledColumn) {
         let type = null;
         if (styledColumn.GradientStyle) {
-            type = 'Gradient';
+            type = 'Gradient Column';
         }
         else if (styledColumn.PercentBarStyle) {
             type = 'Percent Bar';
@@ -230,7 +234,23 @@ class StyledColumnModule extends AdaptableModuleBase_1.AdaptableModuleBase {
             type = 'Spark Line';
         }
         else if (styledColumn.BadgeStyle) {
-            type = 'Badge';
+            type = 'Badge Style';
+        }
+        return type;
+    }
+    getTypeName(styledColumn) {
+        let type = null;
+        if (styledColumn.GradientStyle) {
+            type = 'styled-column-gradient-edit';
+        }
+        else if (styledColumn.PercentBarStyle) {
+            type = 'styled-column-percent-bar-edit';
+        }
+        else if (styledColumn.SparkLineStyle) {
+            type = 'styled-column-sparkline-edit';
+        }
+        else if (styledColumn.BadgeStyle) {
+            type = 'styled-column-badge-edit';
         }
         return type;
     }

package/src/Strategy/SystemStatusModule.d.ts CHANGED Viewed

@@ -1,11 +1,11 @@
 import { AdaptableModuleBase } from './AdaptableModuleBase';
-import { AdaptableMenuItem, ContextMenuContext } from '../PredefinedConfig/Common/Menu';
+import { ContextMenuContext } from '../PredefinedConfig/Common/Menu';
 import { AdaptableColumn } from '../PredefinedConfig/Common/AdaptableColumn';
 import { AdaptableModuleView, IModule } from './Interface/IModule';
 import { AdaptableApi } from '../Api/AdaptableApi';
 export declare class SystemStatusModule extends AdaptableModuleBase implements IModule {
     constructor(api: AdaptableApi);
-    addColumnMenuItems(column: AdaptableColumn): AdaptableMenuItem[] | undefined;
-    addContextMenuItems(menuContext: ContextMenuContext): AdaptableMenuItem[] | undefined;
+    createColumnMenuItems(column: AdaptableColumn): import("../Utilities/MenuItem").MenuItemShowPopup<"calculated-column-edit" | "cell-summary-show" | "column-group" | "column-filter-group" | "column-filter-bar-hide" | "column-filter-bar-show" | "column-filter-clear" | "column-filter-suspend" | "column-filter-unsuspend" | "column-info-show" | "custom-sort-add" | "custom-sort-edit" | "dashboard-group" | "dashboard-collapse" | "dashboard-configure" | "dashboard-dock" | "dashboard-expand" | "dashboard-float" | "dashboard-hide" | "dashboard-show" | "data-import" | "flashing-cell-add" | "flashing-cell-delete" | "format-column-add" | "format-column-edit" | "free-text-column-edit" | "grid-group" | "grid-info-show" | "layout-column-caption-change" | "layout-column-hide" | "layout-edit" | "layout-column-select" | "layout-column-select-preserve" | "layout-column-select-reset" | "layout-grid-select" | "plus-minus-add" | "settings-panel-open" | "styling-group" | "styled-column-badge-add" | "styled-column-badge-edit" | "styled-column-gradient-add" | "styled-column-gradient-edit" | "styled-column-percent-bar-add" | "styled-column-percent-bar-edit" | "styled-column-sparkline-add" | "styled-column-sparkline-edit" | "system-status-show" | "_navbar">[];
+    createContextMenuItems(menuContext: ContextMenuContext): import("../Utilities/MenuItem").MenuItemShowPopup<"calculated-column-edit" | "cell-summary-show" | "column-group" | "column-filter-group" | "column-filter-clear" | "column-filter-suspend" | "column-filter-unsuspend" | "column-info-show" | "dashboard-group" | "dashboard-collapse" | "dashboard-configure" | "dashboard-dock" | "dashboard-expand" | "dashboard-float" | "dashboard-hide" | "dashboard-show" | "data-import" | "grid-group" | "grid-info-show" | "layout-edit" | "settings-panel-open" | "system-status-show" | "menu-group" | "alert-clear" | "bulk-update-apply" | "column-filter-on-cell-value" | "comment-add" | "comment-remove" | "edit-group" | "export-group" | "export-visual-data" | "export-visual-data-excel" | "export-all-data-excel" | "export-all-data" | "export-all-data-csv" | "export-all-data-clipboard" | "export-all-data-json" | "export-all-data-table" | "export-current-data" | "export-current-data-excel" | "export-current-data-csv" | "export-current-data-clipboard" | "export-current-data-json" | "export-current-data-table" | "export-selected-cells" | "export-selected-cells-excel" | "export-selected-cells-csv" | "export-selected-cells-clipboard" | "export-selected-cells-json" | "export-selected-cells-table" | "export-selected-rows" | "export-selected-rows-excel" | "export-selected-rows-csv" | "export-selected-rows-clipboard" | "export-selected-rows-json" | "export-selected-rows-table" | "fdc3-broadcast" | "fdc3-raise-intent" | "flashing-cell-clear" | "flashing-row-clear" | "layout-aggregated-view" | "layout-auto-size" | "layout-clear-selection" | "layout-select-all" | "note-add" | "note-remove" | "smart-edit-apply">[];
     getViewProperties(): AdaptableModuleView;
 }

package/src/Strategy/SystemStatusModule.js CHANGED Viewed

@@ -9,20 +9,23 @@ class SystemStatusModule extends AdaptableModuleBase_1.AdaptableModuleBase {
     constructor(api) {
         super(ModuleConstants.SystemStatusModuleId, ModuleConstants.SystemStatusFriendlyName, 'traffic-lights', 'SystemStatusPopup', 'Provide messages about the Status of your application', api);
     }
-    addColumnMenuItems(column) {
+    createColumnMenuItems(column) {
         if (this.isModuleAvailable()) {
             return [
-                this.createColumnMenuItemShowPopup('Show System Status', this.moduleInfo.Popup, this.moduleInfo.Glyph),
+                this.createMenuItemShowPopup('system-status-show', 'Show System Status', this.moduleInfo.Popup, this.moduleInfo.Glyph, {
+                    source: 'ColumnMenu',
+                }),
             ];
         }
     }
-    addContextMenuItems(menuContext) {
+    createContextMenuItems(menuContext) {
         if (this.isModuleAvailable()) {
             let popUpParams = {
                 source: 'ContextMenu',
             };
             return [
                 this.createMainMenuItemShowPopup({
+                    Name: 'system-status-show',
                     Label: 'Show System Status',
                     ComponentName: this.moduleInfo.Popup,
                     Icon: this.moduleInfo.Glyph,

package/src/Strategy/Utilities/FormatColumn/getFormatColumnSettingsViewItems.js CHANGED Viewed

@@ -2,10 +2,12 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getFormatColumnSettingsViewItems = void 0;
 const getFormatColumnSettingsViewItems = (formatColumn) => {
-    var _a;
+    var _a, _b, _c, _d;
     const values = [
         `Cell alignment: ${(_a = formatColumn.CellAlignment) !== null && _a !== void 0 ? _a : 'default'}`,
-        `Include grouped rows: ${formatColumn.IncludeGroupedRows ? 'Yes' : 'No'}`,
+        `Data Rows: ${((_b = formatColumn.RowScope) === null || _b === void 0 ? void 0 : _b.ExcludeDataRows) ? 'Yes' : 'No'}`,
+        `Group Rows: ${((_c = formatColumn.RowScope) === null || _c === void 0 ? void 0 : _c.ExcludeGroupRows) ? 'Yes' : 'No'}`,
+        `Row Summaries: ${((_d = formatColumn.RowScope) === null || _d === void 0 ? void 0 : _d.ExcludeSummaryRows) ? 'Yes' : 'No'}`,
     ].filter(Boolean);
     return {
         name: 'Settings',

package/src/Strategy/Utilities/getScopeViewItems.d.ts CHANGED Viewed

@@ -1,3 +1,3 @@
-import { AdaptableApi, AdaptableScope } from '../../../types';
+import { AdaptableApi, ColumnScope } from '../../../types';
 import { AdaptableObjectItemView } from '../Interface/IModule';
-export declare const getScopeViewItems: (scope: AdaptableScope, api: AdaptableApi) => AdaptableObjectItemView;
+export declare const getScopeViewItems: (scope: ColumnScope, api: AdaptableApi) => AdaptableObjectItemView;

package/src/Strategy/Utilities/getScopeViewItems.js CHANGED Viewed

@@ -13,6 +13,9 @@ const getScopeViewItems = (scope, api) => {
     if ('All' in scope) {
         values = ['All Columns'];
     }
+    if ('ColumnTypes' in scope) {
+        values = scope.ColumnTypes;
+    }
     return {
         label: 'Target',
         name: 'Target',

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

@@ -35,6 +35,7 @@ export declare const ADAPTABLE_ROW_ACTION_BUTTONS = "adaptableRowActionButtons";
 export declare const ADAPTABLE_ROW_ACTION_BUTTONS_FRIENDLY_NAME = "(ActionRowButtons)";
 export declare const ADAPTABLE_FDC3_ACTION_COLUMN_FRIENDLY_NAME = "(FDC3ActionColumn)";
 export declare const DEFAULT_DATE_FORMAT_PATTERN = "dd-MM-yyyy";
+export declare const DEFAULT_DATE_FORMAT_PATTERN_WITH_TIME = "dd-MM-yyyy HH:mm:ss";
 export declare const BLANK_DISTINCT_COLUMN_VALUE = "[BLANKS]";
 export declare const DEFAULT_STRING_DISPLAY_VALUE = "Hello World";
 export declare const DEFAULT_INTEGER_DISPLAY_VALUE = 12345;

package/src/Utilities/Constants/GeneralConstants.js CHANGED Viewed

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-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.GROUP_PATH_SEPARATOR = 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 = exports.SUMMARY_OPERATION_STATE_PROPERTY = void 0;
+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_WITH_TIME = 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.GROUP_PATH_SEPARATOR = 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 = exports.SUMMARY_OPERATION_STATE_PROPERTY = exports.ALERT_DEFAULT_SHOW_POPUP = void 0;
 const Enums_1 = require("../../PredefinedConfig/Common/Enums");
 const UIHelper_1 = require("../../View/UIHelper");
 exports.AUTOGENERATED_PK_COLUMN = '__ADAPTABLE_PK__';
@@ -38,6 +38,7 @@ exports.ADAPTABLE_ROW_ACTION_BUTTONS = 'adaptableRowActionButtons';
 exports.ADAPTABLE_ROW_ACTION_BUTTONS_FRIENDLY_NAME = '(ActionRowButtons)';
 exports.ADAPTABLE_FDC3_ACTION_COLUMN_FRIENDLY_NAME = '(FDC3ActionColumn)';
 exports.DEFAULT_DATE_FORMAT_PATTERN = 'dd-MM-yyyy';
+exports.DEFAULT_DATE_FORMAT_PATTERN_WITH_TIME = 'dd-MM-yyyy HH:mm:ss';
 exports.BLANK_DISTINCT_COLUMN_VALUE = '[BLANKS]';
 exports.DEFAULT_STRING_DISPLAY_VALUE = 'Hello World';
 exports.DEFAULT_INTEGER_DISPLAY_VALUE = 12345;

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

@@ -37,10 +37,10 @@ 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 NoteModuleId: ModuleConstants;
+export declare const NoteFriendlyName = "Note";
+export declare const CommentModuleId: ModuleConstants;
+export declare const CommentFriendlyName = "Comment";
 export declare const IPushPullModuleId: ModuleConstants;
 export declare const IPushPullFriendlyName = "IPushPull";
 export declare const LayoutModuleId: ModuleConstants;
@@ -108,12 +108,12 @@ export declare const ADAPTABLE_MODULE_MAP: {
     ToolPanel: string;
     SettingsPanel: string;
     StatusBar: string;
-    Notes: string;
+    Note: string;
     ColumnInfo: string;
     DataImport: string;
     NamedQuery: string;
     GridFilter: string;
-    Comments: string;
+    Comment: string;
     Query: string;
     Filter: string;
 };

package/src/Utilities/Constants/ModuleConstants.js CHANGED Viewed

@@ -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.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.PlusMinusFriendlyName = exports.PlusMinusModuleId = exports.OpenFinFriendlyName = exports.OpenFinModuleId = exports.LayoutFriendlyName = exports.LayoutModuleId = exports.IPushPullFriendlyName = exports.IPushPullModuleId = exports.CommentFriendlyName = exports.CommentModuleId = exports.NoteFriendlyName = exports.NoteModuleId = 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';
@@ -40,10 +40,10 @@ 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.NoteModuleId = 'Note';
+exports.NoteFriendlyName = 'Note';
+exports.CommentModuleId = 'Comment';
+exports.CommentFriendlyName = 'Comment';
 exports.IPushPullModuleId = 'IPushPull';
 exports.IPushPullFriendlyName = 'IPushPull';
 exports.LayoutModuleId = 'Layout';
@@ -111,12 +111,12 @@ exports.ADAPTABLE_MODULE_MAP = {
     [exports.ToolPanelModuleId]: exports.ToolPanelFriendlyName,
     [exports.SettingsPanelModuleId]: exports.SettingsPanelFriendlyName,
     [exports.StatusBarModuleId]: exports.StatusBarFriendlyName,
-    [exports.NotesModuleId]: exports.NotesFriendlyName,
+    [exports.NoteModuleId]: exports.NoteFriendlyName,
     [exports.ColumnInfoModuleId]: exports.ColumnInfoFriendlyName,
     [exports.DataImportModuleId]: exports.DataImportFriendyName,
     [exports.NamedQueryModuleId]: exports.NamedQueryFriendlyName,
     [exports.GridFilterModuleId]: exports.GridFilterFriendlyName,
-    [exports.CommentsModuleId]: exports.CommentsFriendlyName,
+    [exports.CommentModuleId]: exports.CommentFriendlyName,
     // Remove next version
     ['Query']: 'Query',
     ['Filter']: 'Filter',

package/src/Utilities/Defaults/DefaultSettingsPanel.js CHANGED Viewed

@@ -44,7 +44,7 @@ exports.DEFAULT_SETTINGS_PANEL_NAVIGATION_ITEMS = [
     'Charting',
     'Schedule',
     'TeamSharing',
-    'Notes',
-    'Comments',
+    'Note',
+    'Comment',
     'StateManagement',
 ];

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

@@ -1,12 +1,12 @@
+import { IRowNode } from '@ag-grid-community/core';
 import { ExpressionFunction } from '../../parser/src/types';
 import { BaseParameter } from './expressionFunctionUtils';
-import { IRowNode } from '@ag-grid-community/core';
 import { AggregateParams } from './scalarAggregationHelper';
 /**
  * List of all the AggregatedScalar Functions available in AdaptableQL
  */
 export type AggregatedScalarFunctionName = ScalarAggregationFunction | OperandFunction;
-export type ScalarAggregationFunction = 'SUM' | 'PERCENTAGE' | 'QUANT' | 'QUARTILE' | 'PERCENTILE' | 'AVG' | 'MIN' | 'MAX' | 'COUNT' | 'CUMUL' | 'MEDIAN' | 'MODE' | 'DISTINCT' | 'ONLY' | 'STD_DEVIATION';
+export type ScalarAggregationFunction = 'SUM' | 'PERCENTAGE' | 'QUANT' | 'QUARTILE' | 'PERCENTILE' | 'AVG' | 'MIN' | 'MAX' | 'COUNT' | 'CUMUL' | 'MEDIAN' | 'MODE' | 'DISTINCT' | 'ONLY' | 'STD_DEVIATION' | 'OLDEST' | 'NEWEST';
 type OperandFunction = 'COL' | 'OVER' | 'GROUP_BY' | 'WEIGHT';
 export interface ScalarAggregationParameter extends BaseParameter<'aggregationScalar', ScalarAggregationFunction> {
     value: AggregatedScalarExpressionEvaluation;