@adaptabletools/adaptable 14.0.3 → 14.0.4

package/src/Strategy/ExportModule.d.ts

@@ -16,6 +16,7 @@ export declare class ExportModule extends AdaptableModuleBase implements IExport
     export(report: Report, exportDestination: ExportDestination | string): void;
     private isCustomDestination;
     private convertReportToJSON;
+    private openReportInTablePopup;
     private convertReportToCsv;
     private convertReportToExcel;
     private copyToClipboard;

package/src/Strategy/ExportModule.js

@@ -19,6 +19,8 @@ const ReportExportDropdown_1 = require("../View/Export/ReportExportDropdown");
 const getObjectTagsViewItems_1 = require("./Utilities/getObjectTagsViewItems");
 const ExportSelector_1 = require("../View/Export/ExportSelector");
 const SystemRedux_1 = require("../Redux/ActionsReducers/SystemRedux");
+const windowFactory_1 = require("../View/Components/Popups/WindowPopups/windowFactory");
+const Uuid_1 = require("../PredefinedConfig/Uuid");
 class ExportModule extends AdaptableModuleBase_1.AdaptableModuleBase {
     constructor(api) {
         super(ModuleConstants.ExportModuleId, ModuleConstants.ExportFriendlyName, 'export-data', 'ExportPopup', 'Export data from the Grid to numerous locations in numerous formatso', api);
@@ -124,6 +126,9 @@ class ExportModule extends AdaptableModuleBase_1.AdaptableModuleBase {
                     case Enums_1.ExportDestination.JSON:
                         this.convertReportToJSON(report);
                         break;
+                    case Enums_1.ExportDestination.Table:
+                        this.openReportInTablePopup(report);
+                        break;
                 }
             }
             this.api.internalApi.dispatchReduxAction((0, SystemRedux_1.SystemVisualExportEnd)());
@@ -148,6 +153,44 @@ class ExportModule extends AdaptableModuleBase_1.AdaptableModuleBase {
         const jsonFileName = this.api.internalApi.getReportService().getReportFileName(report.Name) + '.json';
         Helper_1.Helper.createDownloadedFile(jsonContent, jsonFileName, 'application/json');
     }
+    openReportInTablePopup(report) {
+        const reportData = this.api.internalApi.getReportService().getReportData(report, true);
+        if (this.isEmptyReportData(reportData)) {
+            this.showEmptyExportWarning();
+            return;
+        }
+        const popupProps = {
+            reportData,
+        };
+        let title = 'Export Table';
+        if (report.Name) {
+            title = `${title} [${report.Name}]`;
+        }
+        if (report.Scope) {
+            const scopeText = this.api.internalApi
+                .getReportService()
+                .GetReportColumnScopeShortDescription(report);
+            if (scopeText === null || scopeText === void 0 ? void 0 : scopeText.length) {
+                title = `${title} ${scopeText.join(',')}`;
+            }
+        }
+        if (report.Query) {
+            const queryText = this.api.internalApi
+                .getReportService()
+                .GetReportExpressionDescription(report, this.api.columnApi.getColumns());
+            if (queryText === null || queryText === void 0 ? void 0 : queryText.length) {
+                title = `${title} ${queryText}`;
+            }
+        }
+        this.api.internalApi.showPopupWindow({
+            // allow to open multiple tables
+            id: 'report-table-' + (0, Uuid_1.createUuid)(),
+            title: title,
+            icon: 'export-data',
+            factoryId: windowFactory_1.SHOW_EXPORT_TABLE,
+            popupProps,
+        });
+    }
     convertReportToCsv(report) {
         const csvContent = this.createCSVContent(report);
         if (StringExtensions_1.default.IsNullOrEmpty(csvContent)) {

package/src/Strategy/FlashingCellModule.js

@@ -216,7 +216,7 @@ class FlashingCellModule extends AdaptableModuleBase_1.AdaptableModuleBase {
     }
     isAlertPredicateTriggered(alert, dataChangedEvent, defaultNoPredicateReturn = false) {
         var _a;
-        return this.api.predicateApi.handlePredicates((_a = alert.Rule) === null || _a === void 0 ? void 0 : _a.Predicates, {
+        return this.api.predicateApi.handleColumnPredicates((_a = alert.Rule) === null || _a === void 0 ? void 0 : _a.Predicates, {
             value: dataChangedEvent.newValue,
             oldValue: dataChangedEvent.oldValue,
             // TODO send real display value

package/src/Strategy/FormatColumnModule.js

@@ -64,13 +64,18 @@ class FormatColumnModule extends AdaptableModuleBase_1.AdaptableModuleBase {
         const dashboardModuleButtons = this.api.internalApi.getState().Dashboard.ModuleButtons;
         if (dashboardModuleButtons.includes('ConditionalStyle')) {
             dashboardModuleButtons[dashboardModuleButtons.indexOf('ConditionalStyle')] = 'FormatColumn';
-            this.api.dashboardApi.setModuleButtons([...new Set(dashboardModuleButtons)]);
+            const test2 = dashboardModuleButtons;
+            this.api.dashboardApi.setModuleButtons([
+                ...new Set(dashboardModuleButtons),
+            ]);
         }
         // update ConditionalStyle toolPanel buttons
         const toolPanelModuleButtons = this.api.internalApi.getState().ToolPanel.ModuleButtons;
         if (toolPanelModuleButtons.includes('ConditionalStyle')) {
             toolPanelModuleButtons[toolPanelModuleButtons.indexOf('ConditionalStyle')] = 'FormatColumn';
-            this.api.toolPanelApi.setModuleButtons([...new Set(dashboardModuleButtons)]);
+            this.api.toolPanelApi.setModuleButtons([
+                ...new Set(dashboardModuleButtons),
+            ]);
         }
     }
     updateFormatColumnSingleToMultiplePredicates() {

package/src/Strategy/Interface/IModule.d.ts

@@ -22,7 +22,7 @@ export interface ModuleInfo {
 }
 export declare type TeamSharingReferences = TeamSharingReference[];
 export declare type TeamSharingReference = {
-    Module: StrictExtract<AdaptableModule, 'CalculatedColumn' | 'FreeTextColumn' | 'Query' | 'Alert' | 'ConditionalStyle' | 'CustomSort' | 'FlashingCell' | 'FormatColumn' | 'PlusMinus' | 'Shortcut' | 'Schedule'>;
+    Module: StrictExtract<AdaptableModule, 'CalculatedColumn' | 'FreeTextColumn' | 'Query' | 'Alert' | 'CustomSort' | 'FlashingCell' | 'FormatColumn' | 'PlusMinus' | 'Shortcut' | 'Schedule'>;
     Reference: AdaptableObject;
 };
 export interface AdaptableObjectItemView {

package/src/Strategy/LayoutModule.js

@@ -293,7 +293,14 @@ class LayoutModule extends AdaptableModuleBase_1.AdaptableModuleBase {
             isVisible: true,
             label: 'Expand Aggregated Value',
             onClick: () => {
-                this.api.internalApi.showPopupWindow(windowFactory_1.SHOW_PIVOT_COLUMN_DETAILS, `Rows for Aggregated Value: ${cellValue}`, undefined, popupProps);
+                this.api.internalApi.showPopupWindow({
+                    // force only one window instance opened
+                    id: windowFactory_1.SHOW_PIVOT_COLUMN_DETAILS,
+                    factoryId: windowFactory_1.SHOW_PIVOT_COLUMN_DETAILS,
+                    title: `Rows for Aggregated Value: ${cellValue}`,
+                    icon: undefined,
+                    popupProps,
+                });
             },
             icon: {
                 name: 'arrowexpand',

package/src/Strategy/StyledColumnModule.js

@@ -73,6 +73,9 @@ class StyledColumnModule extends AdaptableModuleBase_1.AdaptableModuleBase {
     }
     addColumnMenuItems(column) {
         let returnColumnMenuItems = [];
+        const config = {
+            defaultCurrentSectionName: 'Style',
+        };
         // Need a Column and an editable Module
         if (column && this.isModuleEditable()) {
             // First look at Sparkline Columns - needs to be editable array type
@@ -99,6 +102,7 @@ class StyledColumnModule extends AdaptableModuleBase_1.AdaptableModuleBase {
                         action: sparklineColumnExists ? 'Edit' : 'New',
                         source: 'ColumnMenu',
                         value: styledColumn,
+                        config,
                     };
                     returnColumnMenuItems.push(this.createColumnMenuItemShowPopup(label + 'Sparkline Column', this.moduleInfo.Popup, this.moduleInfo.Glyph, popupParam));
                 }
@@ -127,6 +131,7 @@ class StyledColumnModule extends AdaptableModuleBase_1.AdaptableModuleBase {
                         action: styledColumnExists ? 'Edit' : 'New',
                         source: 'ColumnMenu',
                         value: styledColumn,
+                        config,
                     };
                     returnColumnMenuItems.push(this.createColumnMenuItemShowPopup(label + 'Styled Column', this.moduleInfo.Popup, this.moduleInfo.Glyph, popupParam));
                 }

package/src/Strategy/ThemeModule.js

@@ -18,10 +18,16 @@ class ThemeModule extends AdaptableModuleBase_1.AdaptableModuleBase {
     getViewProperties() {
         return {
             getStatusBarPanelProps: () => {
-                const currentTheme = this.api.themeApi.getCurrentTheme();
+                var _a;
+                const currentThemeName = this.api.themeApi.getCurrentTheme();
+                const currentTheme = this.api.themeApi
+                    .getThemes()
+                    .find((theme) => theme.Name === currentThemeName);
+                const text = (_a = currentTheme === null || currentTheme === void 0 ? void 0 : currentTheme.Description) !== null && _a !== void 0 ? _a : currentThemeName;
                 return {
-                    content: currentTheme,
+                    content: text,
                     popover: ThemeStatusPanelPopover_1.ThemeStatusPanelPopover,
+                    popoverMinWidth: 120,
                 };
             },
         };

package/src/Strategy/Utilities/Alert/getAlertPreviewViewItems.js

@@ -4,7 +4,7 @@ exports.getAlertPreviewViewItems = void 0;
 const tslib_1 = require("tslib");
 const React = tslib_1.__importStar(require("react"));
 const Tag_1 = require("../../../components/Tag");
-const AlertDisplayWizardSection_1 = require("../../../View/Alert/Wizard/AlertDisplayWizardSection");
+const AlertNotificationWizardSection_1 = require("../../../View/Alert/Wizard/AlertNotificationWizardSection");
 const getAlertPreviewViewItems = (alert, api) => {
     return {
         name: 'Type and Display',
@@ -13,7 +13,7 @@ const getAlertPreviewViewItems = (alert, api) => {
             if (!((_a = alert === null || alert === void 0 ? void 0 : alert.AlertProperties) === null || _a === void 0 ? void 0 : _a.DisplayNotification)) {
                 return React.createElement(Tag_1.Tag, null, alert.MessageType);
             }
-            return (React.createElement(AlertDisplayWizardSection_1.AlertPreview, { focusFirstButton: false, style: { maxWidth: 400 }, mt: 2, api: api, alertDefinition: alert }));
+            return (React.createElement(AlertNotificationWizardSection_1.AlertPreview, { focusFirstButton: false, style: { maxWidth: 400 }, mt: 2, api: api, alertDefinition: alert }));
         },
     };
 };

package/src/Strategy/Utilities/Alert/getAlertTypeViewItems.d.ts

@@ -0,0 +1,5 @@
+import { AlertDefinition } from '../../../types';
+export declare const getAlertTypeViewItems: (alert: AlertDefinition) => {
+    name: string;
+    values: string[];
+};

package/src/Strategy/Utilities/Alert/getAlertTypeViewItems.js

@@ -0,0 +1,13 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getAlertTypeViewItems = void 0;
+const getAlertType_1 = require("./../../../View/Alert/Utilities/getAlertType");
+const getAlertTypeViewItems = (alert) => {
+    const alertType = (0, getAlertType_1.getAlertType)(alert);
+    const text = (0, getAlertType_1.getAlertTypeText)(alertType);
+    return {
+        name: 'Type',
+        values: [text],
+    };
+};
+exports.getAlertTypeViewItems = getAlertTypeViewItems;

package/src/Strategy/Utilities/getObjectTagsViewItems.js

@@ -2,13 +2,13 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getObjectTagsViewItems = void 0;
 const getObjectTagsViewItems = (object, api) => {
-    var _a;
-    if (!api.internalApi.shouldDisplayTagSections()) {
+    var _a, _b;
+    if (!api.internalApi.shouldDisplayTagSections() || !((_a = object === null || object === void 0 ? void 0 : object.Tags) === null || _a === void 0 ? void 0 : _a.length)) {
         return;
     }
     return {
         name: 'Tags',
-        values: (_a = object === null || object === void 0 ? void 0 : object.Tags) === null || _a === void 0 ? void 0 : _a.map((tag) => api.internalApi.getLabelForTag(tag)),
+        values: (_b = object === null || object === void 0 ? void 0 : object.Tags) === null || _b === void 0 ? void 0 : _b.map((tag) => api.internalApi.getLabelForTag(tag)),
     };
 };
 exports.getObjectTagsViewItems = getObjectTagsViewItems;

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

@@ -11,8 +11,6 @@ export declare const CellSummaryModuleId: ModuleConstants;
 export declare const CellSummaryFriendlyName = "Cell Summary";
 export declare const ChartingModuleId: ModuleConstants;
 export declare const ChartingFriendlyName = "Charts";
-export declare const ConditionalStyleModuleId: ModuleConstants;
-export declare const ConditionalStyleFriendlyName = "Conditional Style";
 export declare const CustomSortModuleId: ModuleConstants;
 export declare const CustomSortFriendlyName = "Custom Sort";
 export declare const DashboardModuleId: ModuleConstants;
@@ -74,7 +72,6 @@ export declare const ADAPTABLE_MODULE_MAP: {
     CalculatedColumn: string;
     CellSummary: string;
     Charting: string;
-    ConditionalStyle: string;
     CustomSort: string;
     Dashboard: string;
     DataChangeHistory: string;

package/src/Utilities/Constants/ModuleConstants.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ShortcutFriendlyName = exports.ShortcutModuleId = exports.ScheduleFriendlyName = exports.ScheduleModuleId = exports.QuickSearchFriendlyName = exports.QuickSearchModuleId = exports.QueryFriendlyName = exports.QueryModuleId = exports.PlusMinusFriendlyName = exports.PlusMinusModuleId = exports.OpenFinFriendlyName = exports.OpenFinModuleId = exports.LayoutFriendlyName = exports.LayoutModuleId = exports.IPushPullFriendlyName = exports.IPushPullModuleId = exports.GridInfoFriendlyName = exports.GridInfoModuleId = exports.Glue42FriendlyName = exports.Glue42ModuleId = exports.FreeTextColumnFriendlyName = exports.FreeTextColumnModuleId = exports.FormatColumnFriendlyName = exports.FormatColumnModuleId = exports.FilterFriendlyName = exports.FilterModuleId = exports.ExportFriendlyName = exports.ExportModuleId = exports.DataSetFriendlyName = exports.DataSetModuleId = exports.DataChangeHistoryFriendlyName = exports.DataChangeHistoryModuleId = exports.DashboardFriendlyName = exports.DashboardModuleId = exports.CustomSortFriendlyName = exports.CustomSortModuleId = exports.ConditionalStyleFriendlyName = exports.ConditionalStyleModuleId = exports.ChartingFriendlyName = exports.ChartingModuleId = exports.CellSummaryFriendlyName = exports.CellSummaryModuleId = exports.CalculatedColumnFriendlyName = exports.CalculatedColumnModuleId = exports.BulkUpdateFriendlyName = exports.BulkUpdateModuleId = exports.FlashingCellFriendlyName = exports.FlashingCellModuleId = exports.AlertModuleFriendlyName = exports.AlertModuleId = void 0;
-exports.ADAPTABLE_MODULE_MAP = exports.StatusBarFriendlyName = exports.StatusBarModuleId = exports.SettingsPanelFriendlyName = exports.SettingsPanelModuleId = exports.ToolPanelFriendlyName = exports.ToolPanelModuleId = exports.ThemeFriendlyName = exports.ThemeModuleId = exports.TeamSharingFriendlyName = exports.TeamSharingModuleId = exports.SystemStatusFriendlyName = exports.SystemStatusModuleId = exports.StateManagementFriendlyName = exports.StateManagementModuleId = exports.StyledColumnFriendlyName = exports.StyledColumnModuleId = exports.SmartEditFriendlyName = exports.SmartEditModuleId = void 0;
+exports.SmartEditFriendlyName = exports.SmartEditModuleId = exports.ShortcutFriendlyName = exports.ShortcutModuleId = exports.ScheduleFriendlyName = exports.ScheduleModuleId = exports.QuickSearchFriendlyName = exports.QuickSearchModuleId = exports.QueryFriendlyName = exports.QueryModuleId = exports.PlusMinusFriendlyName = exports.PlusMinusModuleId = exports.OpenFinFriendlyName = exports.OpenFinModuleId = exports.LayoutFriendlyName = exports.LayoutModuleId = exports.IPushPullFriendlyName = exports.IPushPullModuleId = exports.GridInfoFriendlyName = exports.GridInfoModuleId = exports.Glue42FriendlyName = exports.Glue42ModuleId = exports.FreeTextColumnFriendlyName = exports.FreeTextColumnModuleId = exports.FormatColumnFriendlyName = exports.FormatColumnModuleId = exports.FilterFriendlyName = exports.FilterModuleId = exports.ExportFriendlyName = exports.ExportModuleId = exports.DataSetFriendlyName = exports.DataSetModuleId = exports.DataChangeHistoryFriendlyName = exports.DataChangeHistoryModuleId = exports.DashboardFriendlyName = exports.DashboardModuleId = exports.CustomSortFriendlyName = exports.CustomSortModuleId = exports.ChartingFriendlyName = exports.ChartingModuleId = exports.CellSummaryFriendlyName = exports.CellSummaryModuleId = exports.CalculatedColumnFriendlyName = exports.CalculatedColumnModuleId = exports.BulkUpdateFriendlyName = exports.BulkUpdateModuleId = exports.FlashingCellFriendlyName = exports.FlashingCellModuleId = exports.AlertModuleFriendlyName = exports.AlertModuleId = void 0;
+exports.ADAPTABLE_MODULE_MAP = exports.StatusBarFriendlyName = exports.StatusBarModuleId = exports.SettingsPanelFriendlyName = exports.SettingsPanelModuleId = exports.ToolPanelFriendlyName = exports.ToolPanelModuleId = exports.ThemeFriendlyName = exports.ThemeModuleId = exports.TeamSharingFriendlyName = exports.TeamSharingModuleId = exports.SystemStatusFriendlyName = exports.SystemStatusModuleId = exports.StateManagementFriendlyName = exports.StateManagementModuleId = exports.StyledColumnFriendlyName = exports.StyledColumnModuleId = void 0;
 exports.AlertModuleId = 'Alert';
 exports.AlertModuleFriendlyName = 'Alert';
 exports.FlashingCellModuleId = 'FlashingCell';
@@ -14,8 +14,6 @@ exports.CellSummaryModuleId = 'CellSummary';
 exports.CellSummaryFriendlyName = 'Cell Summary';
 exports.ChartingModuleId = 'Charting';
 exports.ChartingFriendlyName = 'Charts';
-exports.ConditionalStyleModuleId = 'ConditionalStyle';
-exports.ConditionalStyleFriendlyName = 'Conditional Style';
 exports.CustomSortModuleId = 'CustomSort';
 exports.CustomSortFriendlyName = 'Custom Sort';
 exports.DashboardModuleId = 'Dashboard';
@@ -77,7 +75,6 @@ exports.ADAPTABLE_MODULE_MAP = {
     [exports.CalculatedColumnModuleId]: exports.CalculatedColumnFriendlyName,
     [exports.CellSummaryModuleId]: exports.CellSummaryFriendlyName,
     [exports.ChartingModuleId]: exports.ChartingFriendlyName,
-    [exports.ConditionalStyleModuleId]: exports.ConditionalStyleFriendlyName,
     [exports.CustomSortModuleId]: exports.CustomSortFriendlyName,
     [exports.DashboardModuleId]: exports.DashboardFriendlyName,
     [exports.DataChangeHistoryModuleId]: exports.DataChangeHistoryFriendlyName,

package/src/Utilities/Defaults/DefaultAdaptableOptions.js

@@ -135,6 +135,7 @@ exports.DefaultAdaptableOptions = {
             Enums_1.ExportDestination.CSV,
             Enums_1.ExportDestination.Clipboard,
             Enums_1.ExportDestination.JSON,
+            Enums_1.ExportDestination.Table,
         ],
         systemReportNames: [
             GeneralConstants.ALL_DATA_REPORT,

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

@@ -5,7 +5,7 @@ import { AggregatedScalarExpressionEvaluation } from './aggregatedScalarExpressi
  * List of all the Aggregation Functions available in AdaptableQL
  */
 export declare type AggregatedBooleanFunctionName = 'WHERE' | 'COL' | 'GROUP_BY' | 'WEIGHT' | AggregationFunction | ComparisonFunction;
-declare type AggregationFunction = 'SUM' | 'MIN' | 'MAX' | 'AVG';
+declare type AggregationFunction = 'SUM' | 'MIN' | 'MAX' | 'AVG' | 'COUNT';
 declare type ComparisonFunction = 'EQ' | 'NEQ' | 'LT' | 'GT' | 'LTE' | 'GTE';
 export interface BooleanAggregationParameter extends BaseParameter<'aggregationBoolean', AggregationFunction> {
     scalarAggregation: ScalarAggregationOperand;

package/src/Utilities/ExpressionFunctions/aggregatedBooleanExpressionFunctions.js

@@ -7,12 +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'];
+const SUPPORTED_AGGREGATION_FNS = ['SUM', 'MIN', 'MAX', 'AVG', 'COUNT'];
 const aggregationScalarOperandMap = {
     SUM: ['string', 'number'],
     MIN: ['string', 'number'],
     MAX: ['string', 'number'],
     AVG: ['string', 'number'],
+    COUNT: ['string', 'number'],
 };
 // 0. optional non-capturing block of empty spaces
 // 1. block containing a numeric value (any digits) (required)
@@ -35,6 +36,7 @@ exports.aggregatedBooleanExpressionFunctions = {
     MAX: aggregatedScalarExpressionFunctions_1.aggregatedScalarExpressionFunctions['MAX'],
     AVG: aggregatedScalarExpressionFunctions_1.aggregatedScalarExpressionFunctions['AVG'],
     WEIGHT: aggregatedScalarExpressionFunctions_1.aggregatedScalarExpressionFunctions['WEIGHT'],
+    COUNT: aggregatedScalarExpressionFunctions_1.aggregatedScalarExpressionFunctions['COUNT'],
     GROUP_BY: aggregatedScalarExpressionFunctions_1.aggregatedScalarExpressionFunctions['GROUP_BY'],
     EQ: {
         handler(args, context) {

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

@@ -6,7 +6,7 @@ import { AggregateParams } from './scalarAggregationHelper';
  * List of all the AggregatedScalar Functions available in AdaptableQL
  */
 export declare type AggregatedScalarFunctionName = ScalarAggregationFunction | OperandFunction;
-export declare type ScalarAggregationFunction = 'SUM' | 'PERCENTAGE' | 'QUANT' | 'AVG' | 'MIN' | 'MAX' | 'CUMUL';
+export declare type ScalarAggregationFunction = 'SUM' | 'PERCENTAGE' | 'QUANT' | 'AVG' | 'MIN' | 'MAX' | 'COUNT' | 'CUMUL';
 declare type OperandFunction = 'COL' | 'OVER' | 'GROUP_BY' | 'WEIGHT';
 export interface ScalarAggregationParameter extends BaseParameter<'aggregationScalar', ScalarAggregationFunction> {
     value: AggregatedScalarExpressionEvaluation;

package/src/Utilities/ExpressionFunctions/aggregatedScalarExpressionFunctions.js

@@ -12,6 +12,7 @@ exports.cumulativeAggregatedExpressionFunctions = [
     'MIN',
     'MAX',
     'AVG',
+    'COUNT',
     'WEIGHT',
     'COL',
     'GROUP_BY',
@@ -23,6 +24,7 @@ exports.aggregatedExpressionFunctions = [
     'MAX',
     'QUANT',
     'AVG',
+    'COUNT',
     'WEIGHT',
     'COL',
     'GROUP_BY',
@@ -30,7 +32,7 @@ exports.aggregatedExpressionFunctions = [
 exports.aggregatedScalarExpressionFunctions = {
     CUMUL: {
         handler(args, context) {
-            const aggregationParameter = (0, expressionFunctionUtils_1.extractParameter)('CUMUL', 'aggregationScalar', ['SUM', 'PERCENTAGE', 'AVG', 'MIN', 'MAX'], args);
+            const aggregationParameter = (0, expressionFunctionUtils_1.extractParameter)('CUMUL', 'aggregationScalar', ['SUM', 'PERCENTAGE', 'AVG', 'MIN', 'MAX', 'COUNT'], args);
             const overColumnParameter = (0, expressionFunctionUtils_1.extractParameter)('CUMUL', 'operand', ['OVER'], args);
             const groupByParameter = (0, expressionFunctionUtils_1.extractParameter)('MAX', 'operand', ['GROUP_BY'], args, {
                 isOptional: true,
@@ -474,6 +476,49 @@ exports.aggregatedScalarExpressionFunctions = {
         ],
         category: 'aggregation',
     },
+    COUNT: {
+        handler(args, context) {
+            const countColumnParameter = (0, expressionFunctionUtils_1.extractColumnParameter)('COUNT', args);
+            const countColumnName = countColumnParameter.value;
+            const groupByParameter = (0, expressionFunctionUtils_1.extractParameter)('COUNT', 'operand', ['GROUP_BY'], args, {
+                isOptional: true,
+            });
+            const aggregationExpressionEvaluation = {
+                aggregationParams: {
+                    reducers: {
+                        COUNT: {
+                            name: 'COUNT',
+                            field: countColumnName,
+                            initialValue: 0,
+                            reducer: (totalSum, rowValue) => {
+                                if (isUndefinedValue(rowValue)) {
+                                    return totalSum;
+                                }
+                                return totalSum + 1;
+                            },
+                        },
+                    },
+                },
+                rowFilterFn: context.filterFn,
+            };
+            addGroupByParams(groupByParameter === null || groupByParameter === void 0 ? void 0 : groupByParameter.value, aggregationExpressionEvaluation);
+            const result = {
+                name: 'COUNT',
+                type: 'aggregationScalar',
+                value: aggregationExpressionEvaluation,
+            };
+            return result;
+        },
+        description: 'Counts the number of non-null (i.e. not empty) values in a given column.\nOptionally the aggregation may be computed within provided individual groups',
+        signatures: [
+            'COUNT( [colName] )',
+            'COUNT( COL(name: string))',
+            'COUNT( [colNameA], GROUP_BY( [colNameB] ))',
+            'COUNT( COL(nameA: string), GROUP_BY( COL(nameB: string)))',
+        ],
+        examples: ['COUNT([colA])', 'COUNT([colA], GROUP_BY([colB]))'],
+        category: 'aggregation',
+    },
     OVER: {
         handler(args, context) {
             const columnParameter = (0, expressionFunctionUtils_1.extractColumnParameter)('OVER', args);
@@ -641,7 +686,23 @@ const mapAggregationToCumulation = (aggregationParameter, overColumnParameter, c
                                 return cumulationBag;
                             },
                         }
-                        : null;
+                        : aggregationParameter.name === 'COUNT'
+                            ? {
+                                name: 'CUMUL_COUNT',
+                                field: aggregationReducer.field,
+                                initialValue: {
+                                    currentValue: aggregationReducer.initialValue,
+                                    cumulatedValues: {},
+                                },
+                                reducer: (cumulationBag, rowValue, rowNode) => {
+                                    if (isDefinedValue(rowValue)) {
+                                        cumulationBag.currentValue = cumulationBag.currentValue + 1;
+                                    }
+                                    cumulationBag.cumulatedValues[rowNode.id] = cumulationBag.currentValue;
+                                    return cumulationBag;
+                                },
+                            }
+                            : null;
     const rowValueGetter = aggregationParameter.name === 'PERCENTAGE'
         ? (rowNode, cumulationBag) => {
             const cumulatedSum = cumulationBag.cumulatedValues[rowNode.id];
@@ -674,7 +735,7 @@ const addGroupByParams = (groupByColumnNames, expressionEvaluation) => {
     }
 };
 const isUndefinedValue = (input) => {
-    return input == undefined || input === '';
+    return input == undefined || (typeof input === 'string' && input.trim() === '');
 };
 const isDefinedValue = (input) => {
     return !isUndefinedValue(input);

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

@@ -63,6 +63,7 @@ export interface WindowPopup {
          * - used to identify the 'Component' name, to know what to instantiate
          */
         Id: string;
+        FactoryId: string;
         Title: string;
         PopupProps?: any;
         Icon?: string;

package/src/Utilities/Services/AggregatedScalarLiveValue.js

@@ -2,6 +2,15 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AggregatedScalarLiveValue = void 0;
 const scalarAggregationHelper_1 = require("../ExpressionFunctions/scalarAggregationHelper");
+const LoggingHelper_1 = require("../Helpers/LoggingHelper");
+const doOnceFlags = {};
+const logOnce = (message) => {
+    if (doOnceFlags[message]) {
+        return;
+    }
+    (0, LoggingHelper_1.LogAdaptableWarning)(message);
+    doOnceFlags[message] = true;
+};
 class AggregatedScalarLiveValue {
     constructor(source, requestingModule, adaptableApi) {
         this.source = source;
@@ -32,6 +41,10 @@ class AggregatedScalarLiveValue {
     }
     getAggregatedValueForRow(rowNode) {
         const aggregationValue = this.getAggregationValue(rowNode);
+        if (aggregationValue == undefined) {
+            logOnce(`${this.aggregatedScalarExpression} :: aggregation value is NOT available!`);
+            return;
+        }
         if (this.expressionEvaluation.rowValueGetter) {
             return this.expressionEvaluation.rowValueGetter(rowNode, aggregationValue);
         }

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

@@ -5,6 +5,14 @@ export declare class ChartingService implements IChartingService {
     private api;
     constructor(api: AdaptableApi);
     onChartModelChange(models: ChartModel[], eventType: string, params: any): void;
+    /**
+     * Emit events only for adaptable charting definition changes
+     * - an adaptable chart opens
+     * - an adaptable chart closes
+     * - an adaptable chart is created
+     * - an adaptable chart is deleted
+     */
+    emitAdaptableChartDefinitonChange(): void;
     saveNewChart(chartModel: ChartModel): void;
     destroy(): void;
 }

package/src/Utilities/Services/ChartingService.js

@@ -35,6 +35,21 @@ class ChartingService {
                 break;
         }
         this.api.internalApi.dispatchReduxAction(SystemRedux.SystemChartingSetCurrentChartModels(models));
+        this.emitAdaptableChartDefinitonChange();
+    }
+    /**
+     * Emit events only for adaptable charting definition changes
+     * - an adaptable chart opens
+     * - an adaptable chart closes
+     * - an adaptable chart is created
+     * - an adaptable chart is deleted
+     */
+    emitAdaptableChartDefinitonChange() {
+        const chartingOpenState = this.api.chartingApi.getChartingOpenState();
+        this.api.eventApi.emit('ChartsChanged', {
+            chartingOpenState,
+            adaptableApi: this.api,
+        });
     }
     saveNewChart(chartModel) {
         var _a, _b;

package/src/Utilities/Services/ReportService.js

@@ -188,7 +188,7 @@ class ReportService {
     }
     GetReportColumnsForReport(report, includePrimaryKey = false) {
         let reportColumns = [];
-        let gridColumns = this.adaptableApi.columnApi.getColumns();
+        let gridColumns = this.adaptableApi.columnApi.getExportableColumns();
         if (this.adaptableApi.exportApi.isServerReport(report)) {
             return reportColumns;
         }

package/src/View/AdaptableViewFactory.js

@@ -30,7 +30,7 @@ const DataChangeHistoryPopup_1 = require("./DataChangeHistory/DataChangeHistoryP
 const DataChangeHistoryViewPanel_1 = require("./DataChangeHistory/DataChangeHistoryViewPanel");
 const StateManagementViewPanel_1 = require("./StateManagement/StateManagementViewPanel");
 const StatusBarPopup_1 = require("./StatusBar/StatusBarPopup");
-const ChartingViewPanel_1 = require("./Components/Charting/ChartingViewPanel");
+const ChartingViewPanel_1 = require("./Charting/ChartingViewPanel");
 exports.AdaptableViewFactory = {
     BulkUpdatePopup: BulkUpdatePopup_1.BulkUpdatePopup,
     DashboardPopup: DashboardPopup_1.DashboardPopup,

package/src/View/AdaptableWizardView/AdaptableConfigurationDialog/ConfigurationWizard.js

@@ -11,8 +11,8 @@ const GridOptionsForm_1 = tslib_1.__importDefault(require("./GridOptionsForm"));
 const EntitlementsForm_1 = tslib_1.__importDefault(require("./EntitlementsForm"));
 const UiOptionsForm_1 = require("./UIOptions/UiOptionsForm");
 const FinanceForm_1 = require("./FinanceForm");
-const DefaultAdaptableOptions_1 = require("../../../Utilities/Defaults/DefaultAdaptableOptions");
 const AdaptableOptionsForm_1 = require("./AdaptableOptionsForm");
+const AdaptableHelper_1 = tslib_1.__importDefault(require("../../../Utilities/Helpers/AdaptableHelper"));
 const ConfigurationWizard = (props) => {
     var _a, _b;
     const [isPrimaryKeySelected, setIsValid] = React.useState(true);
@@ -23,7 +23,8 @@ const ConfigurationWizard = (props) => {
                 toolPanels: ['columns', 'filters', 'adaptable'],
             },
         };
-        return Object.assign(Object.assign(Object.assign({}, DefaultAdaptableOptions_1.DefaultAdaptableOptions), props.adaptableOptions), { gridOptions: Object.assign(Object.assign({}, gridOptionDefaults), (_a = props === null || props === void 0 ? void 0 : props.adaptableOptions) === null || _a === void 0 ? void 0 : _a.gridOptions) });
+        const preparedAdaptableOptions = Object.assign(Object.assign({}, props.adaptableOptions), { gridOptions: Object.assign(Object.assign({}, gridOptionDefaults), (_a = props === null || props === void 0 ? void 0 : props.adaptableOptions) === null || _a === void 0 ? void 0 : _a.gridOptions) });
+        return AdaptableHelper_1.default.assignAdaptableOptions(preparedAdaptableOptions);
     });
     const [selectedColumns, setSelectedColumns] = (0, react_1.useState)(() => {
         return props.adaptableOptions.gridOptions.columnDefs.reduce((acc, col) => {

package/src/View/Alert/Utilities/getAlertType.d.ts

@@ -0,0 +1,15 @@
+import { AlertDefinition } from '../../../types';
+export declare enum AlertType {
+    DataChange = "DataChange",
+    RowChange = "RowChange",
+    Aggregation = "Aggregation",
+    Observable = "Observable"
+}
+/**
+ * Based on alert shape the type is derived.
+ * In the future the alert will get a type property.
+ *
+ * @param alert
+ */
+export declare const getAlertType: (alert: AlertDefinition) => AlertType | null;
+export declare const getAlertTypeText: (alertType: AlertType) => string;