@adaptabletools/adaptable 20.0.0-canary.1 → 20.0.0-canary.10

package/src/Utilities/Helpers/AdaptableHelper.js

@@ -43,6 +43,15 @@ export function addAdaptableObjectPrimitives(adaptableObject) {
     adaptableObject.AdaptableVersion = GET_CURRENT_VERSION();
     return adaptableObject;
 }
+export function removeAdaptableObjectPrimitivesInline(target) {
+    if (!target || typeof target !== 'object') {
+        return target;
+    }
+    delete target.Source;
+    delete target.Uuid;
+    delete target.AdaptableVersion;
+    return target;
+}
 export function removeAdaptableObjectPrimitives(adaptableObject) {
     const clonedObject = structuredClone(adaptableObject);
     const sanitiseObject = (object) => {
@@ -70,6 +79,7 @@ export const AdaptableHelper = {
     getAccessLevelForObject,
     addAdaptableObjectPrimitives,
     removeAdaptableObjectPrimitives,
+    removeAdaptableObjectPrimitivesInline,
     isAdaptableObject,
 };
 export default AdaptableHelper;

package/src/Utilities/ObjectFactory.js

@@ -162,6 +162,7 @@ export function CreateEmptyReportSchedule() {
         Schedule: CreateEmptySchedule(),
         ReportName: EMPTY_STRING,
         ReportFormat: EMPTY_STRING,
+        ExportDestination: 'Download',
     };
 }
 export function CreateEmptyIPushPullReport() {

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

@@ -1,7 +1,7 @@
 import { IAdaptableService } from './Interface/IAdaptableService';
 import { AdaptableApi } from '../../Api/AdaptableApi';
 import { Fdc3Options } from '../../AdaptableOptions/Fdc3Options';
-import { AppIdentifier, DesktopAgent, IntentResolution } from '@finos/fdc3';
+import { AppIdentifier, Channel, DesktopAgent, IntentResolution } from '@finos/fdc3';
 import { Context } from '@finos/fdc3/dist/context/ContextTypes';
 export declare class Fdc3Service implements IAdaptableService {
     private adaptableApi;
@@ -15,7 +15,7 @@ export declare class Fdc3Service implements IAdaptableService {
     destroy(): void;
     raiseIntent(intent: string, context: Context, app?: AppIdentifier): Promise<IntentResolution>;
     raiseIntentForContext(context: Context, app?: AppIdentifier): Promise<IntentResolution>;
-    broadcast(context: Context): Promise<void>;
+    broadcast(context: Context, channel?: Channel): Promise<void>;
     private logFdc3Event;
     private logFdc3Error;
     private getFdc3Api;

package/src/Utilities/Services/Fdc3Service.js

@@ -131,7 +131,7 @@ export class Fdc3Service {
             this.logFdc3Error(error);
         }
     }
-    broadcast(context) {
+    broadcast(context, channel) {
         if (!this.getDesktopAgent()) {
             return;
         }
@@ -144,7 +144,12 @@ export class Fdc3Service {
                 context,
             };
             this.adaptableApi.eventApi.emit('Fdc3Message', payload);
-            return this.getDesktopAgent().broadcast(context);
+            if (channel) {
+                return channel.broadcast(context);
+            }
+            else {
+                return this.getDesktopAgent().broadcast(context);
+            }
         }
         catch (error) {
             this.logFdc3Error(error);

package/src/Utilities/Services/RowSummaryService.js

@@ -1,4 +1,4 @@
-import { ROW_SUMMARY_ROW_ID, WEIGHTED_AVERAGE_AGGREATED_FUNCTION, } from '../../PredefinedConfig/Common/RowSummary';
+import { ROW_SUMMARY_ROW_ID, WEIGHTED_AVERAGE_AGGREGATED_FUNCTION, } from '../../PredefinedConfig/Common/RowSummary';
 import { RowSummarySet } from '../../Redux/ActionsReducers/InternalRedux';
 import * as ModuleConstants from '../../Utilities/Constants/ModuleConstants';
 import Helper from '../Helpers/Helper';
@@ -124,7 +124,7 @@ export class RowSummaryService {
                     if (!expressionLiveValue) {
                         try {
                             let aggregatedScalarExpression = `${expression}([${columnId}])`;
-                            if (aggregatedScalarExpression.includes(WEIGHTED_AVERAGE_AGGREATED_FUNCTION) &&
+                            if (aggregatedScalarExpression.includes(WEIGHTED_AVERAGE_AGGREGATED_FUNCTION) &&
                                 aggColsMap[columnId] &&
                                 typeof aggColsMap[columnId] === 'object') {
                                 const weight = aggColsMap[columnId].weightedColumnId;

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

@@ -5,10 +5,10 @@ export declare class ThemeService implements IThemeService {
     private unsubscribe;
     private styleSheetObject;
     constructor(api: AdaptableApi);
+    destroy(): void;
     subscribe(): void;
     onThemeChanged: () => void;
     applyNewThemeVariables(theme: AdaptableTheme): void;
-    destroy(): void;
     showMissingThemeFiles(theme: AdaptableTheme): void;
     getDOMPrefferedColorScheme(): 'dark' | 'light';
     mapOsTheme(theme: AdaptableTheme | string): AdaptableTheme;

package/src/Utilities/Services/ThemeService.js

@@ -20,6 +20,11 @@ export class ThemeService {
             ];
         }
     }
+    destroy() {
+        this.api = null;
+        this.unsubscribe();
+        document.adoptedStyleSheets = [...document.adoptedStyleSheets].filter((sheet) => sheet !== this.styleSheetObject);
+    }
     subscribe() {
         const themeChangedUnsubscribe = this.api.eventApi.on('ThemeChanged', this.onThemeChanged);
         const prefferedColorSchemeUnsubscribe = this.attachPrefferedColorSchemeListener();
@@ -44,11 +49,6 @@ export class ThemeService {
         str += '}';
         this.styleSheetObject.replaceSync(str);
     }
-    destroy() {
-        this.api = null;
-        this.unsubscribe();
-        document.adoptedStyleSheets = [...document.adoptedStyleSheets].filter((sheet) => sheet !== this.styleSheetObject);
-    }
     showMissingThemeFiles(theme) {
         // run time defined theme
         // because it may be an empty theme

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

@@ -42,6 +42,47 @@ export const ConfigurationWizard = (props) => {
                 delete newColumn.caption;
                 return newColumn;
             });
+            const columnDefs = adaptableConfig.gridOptions.columnDefs;
+            // handle the layout creation
+            let Layouts = newAdaptableOptions.predefinedConfig?.Layout?.Layouts || [];
+            const NewLayout = {
+                TableColumns: columnDefs.map((col) => col.colId ?? col.field),
+                Name: 'Default Layout',
+            };
+            let currentLayoutName = NewLayout.Name;
+            let found = false;
+            if (!Layouts.length) {
+                // no layouts, make this the only one
+                Layouts = [NewLayout];
+            }
+            else {
+                Layouts = Layouts.map((layout) => {
+                    if (found) {
+                        return layout;
+                    }
+                    if (layout.TableColumns?.length === 0) {
+                        // when finding the first empty layout
+                        // set its column to be those of the new layout
+                        found = true;
+                        // and grab the name so we can put it in the Layout.CurrentLayout state
+                        currentLayoutName = layout.Name;
+                        layout = { ...layout };
+                        layout.TableColumns = NewLayout.TableColumns;
+                    }
+                    return layout;
+                });
+                if (!found) {
+                    Layouts.push(NewLayout);
+                }
+            }
+            newAdaptableOptions.predefinedConfig = {
+                ...newAdaptableOptions.predefinedConfig,
+                Layout: {
+                    ...newAdaptableOptions.predefinedConfig.Layout,
+                    Layouts: Layouts,
+                    CurrentLayout: currentLayoutName,
+                },
+            };
             newAdaptableOptions.primaryKey = columnsHandle.current.getPrimaryKey();
         }
         const newAdaptableConfig = {

package/src/View/Components/ColumnFilter/utils.js

@@ -91,8 +91,8 @@ export const mapColumnFilterToQlPredicate = (columnFilter, abColumn, qlPredicate
                     : { operator: 'Equals', args: [] };
                 break;
             case 'text':
-                defaultQlPredicate = columnFilterOptions.defaultStringColumnFilter
-                    ? { operator: columnFilterOptions.defaultStringColumnFilter, args: [] }
+                defaultQlPredicate = columnFilterOptions.defaultTextColumnFilter
+                    ? { operator: columnFilterOptions.defaultTextColumnFilter, args: [] }
                     : { operator: 'Contains', args: [] };
                 break;
             case 'date':

package/src/View/Components/FilterForm/ListBoxFilterForm.js

@@ -24,7 +24,7 @@ export const ColumnValuesSelect = (props) => {
         }
         return true;
     });
-    const component = (React.createElement(Select, { isMulti: true, searchable: true, closeMenuOnSelect: false, size: "small", menuStyle: {
+    const component = (React.createElement(Select, { isMulti: true, showHeaderSelectionCheckbox: true, searchable: true, closeMenuOnSelect: false, size: "small", menuStyle: {
             minWidth: `var(--ab-cmp-select-column-menu-${column.columnId}__min-width, var(--ab-cmp-select-column-menu__min-width, 260px))`,
         }, ...props.selectProps, options: options, value: value, isLoading: props.isLoading, onChange: props.onChange }));
     return (React.createElement("div", { className: join(baseClassName, props.isLoading && `${baseClassName}--loading`), onKeyDownCapture: (e) => {

package/src/View/DataChangeHistory/DataChangeHistoryPopup.js

@@ -54,7 +54,10 @@ class DataChangeHistoryPopupComponent extends React.Component {
                 this.props.api.dataChangeHistoryApi.clearDataChangeHistoryEntry(changeToBeUndone);
             }
         };
-        const currentAgGridTheme = this.props.api.themeApi.getAgGridCurrentThemeName();
+        const agGridThemeMode = this.props.api.internalApi
+            .getAdaptableInstance()
+            .agGridThemeAdapter.getAgGridThemeMode();
+        const currentAgGridTheme = agGridThemeMode === 'legacy' ? this.props.api.themeApi.getAgGridCurrentThemeName() : '';
         return (React.createElement(PopupPanel, { headerText: this.props.moduleInfo.FriendlyName, glyphicon: this.props.moduleInfo.Glyph, infoLink: this.props.moduleInfo.HelpPage, infoLinkDisabled: !this.props.api.internalApi.isDocumentationLinksDisplayed() },
             React.createElement(Flex, { className: "ab-DataChangeHistoryPopup", flexDirection: "column", style: { height: '100%' } },
                 React.createElement(Flex, { style: {

package/src/View/GridInfo/GridInfoPopup/GridInfoPopup.js

@@ -10,7 +10,9 @@ import { AdaptableObjectRow } from '../../Components/AdaptableObjectRow';
 import { PopupPanel } from '../../Components/Popups/AdaptablePopup/PopupPanel';
 import { AdaptableObjectsSummary } from './AdaptableObjectsSummary';
 import { ADAPTABLE_VERSION } from '../../../EnvVars';
-const version = ADAPTABLE_VERSION;
+import { AG_GRID_VERSION } from '../../../agGrid/agGridModules';
+const adaptableVersion = ADAPTABLE_VERSION;
+const agGridVersion = AG_GRID_VERSION;
 export const GridInfoPopup = (props) => {
     const api = props.api;
     const CreateGridSummaries = (colItems) => {
@@ -33,7 +35,10 @@ export const GridInfoPopup = (props) => {
             : null;
         const selectedRowInfo = api.gridApi.getSelectedRowInfo();
         if (api.optionsApi.getUserInterfaceOptions()?.showAdapTableVersion) {
-            returnRows.push(createReadOnlyColItem(colItems, 'AdapTable Version', version));
+            returnRows.push(createReadOnlyColItem(colItems, 'AdapTable Version', adaptableVersion));
+        }
+        if (api.optionsApi.getUserInterfaceOptions()?.showAgGridVersion) {
+            returnRows.push(createReadOnlyColItem(colItems, 'AG Grid Version', agGridVersion));
         }
         returnRows.push(createReadOnlyColItem(colItems, 'Sorted Columns', ArrayExtensions.IsNotNullOrEmpty(sorts) ? sorts.join('; ') : 'None'));
         returnRows.push(createReadOnlyColItem(colItems, 'Column Filters', columnFilterDescription));

package/src/View/Layout/Wizard/LayoutWizard.js

@@ -15,7 +15,7 @@ import { SortSection, SortSectionSummary } from './sections/SortSection';
 import { FilterSection, FilterSectionSummary, isColumnFiltersValid, } from './sections/FilterSection';
 import { GridFilterSection, GridFilterSectionSummary, isGridFiltersValid, } from './sections/GridFilterSection';
 import { areSummaryRowsValid, RowSummarySection, RowSummarySectionSummary, } from './sections/RowSummarySection';
-import { WEIGHTED_AVERAGE_AGGREATED_FUNCTION } from '../../../PredefinedConfig/Common/RowSummary';
+import { WEIGHTED_AVERAGE_AGGREGATED_FUNCTION } from '../../../PredefinedConfig/Common/RowSummary';
 import { isPivotLayout } from '../../../Utilities/isPivotLayout';
 import { PivotRowGroupingSection, PivotRowGroupingSectionSummary, } from './sections/PivotRowGroupingSection';
 import { PivotAggregationsSection, PivotAggregationsSectionSummary, } from './sections/PivotAggregationsSection';
@@ -208,7 +208,7 @@ export const LayoutWizard = (props) => {
                                         ColumnsMap: Object.entries(rowSummary.ColumnsMap).reduce((acc, [columnId, aggFunc]) => {
                                             if (
                                             // see if it is weighted avg
-                                            aggFunc === WEIGHTED_AVERAGE_AGGREATED_FUNCTION &&
+                                            aggFunc === WEIGHTED_AVERAGE_AGGREGATED_FUNCTION &&
                                                 // see if we have a weight in the agg columns
                                                 aggColsMap[columnId] &&
                                                 (typeof aggColsMap[columnId] !== 'object' ||

package/src/View/Layout/Wizard/sections/RowSummarySection.js

@@ -7,7 +7,7 @@ import { Select } from '../../../../components/Select';
 import SimpleButton from '../../../../components/SimpleButton';
 import { Tabs } from '../../../../components/Tabs';
 import { Tag } from '../../../../components/Tag';
-import { summarySupportedExpressions, WEIGHTED_AVERAGE_AGGREATED_FUNCTION, } from '../../../../PredefinedConfig/Common/RowSummary';
+import { summarySupportedExpressions, WEIGHTED_AVERAGE_AGGREGATED_FUNCTION, } from '../../../../PredefinedConfig/Common/RowSummary';
 import { mapColumnDataTypeToExpressionFunctionType } from '../../../../Utilities/adaptableQlUtils';
 import { LayoutModuleId } from '../../../../Utilities/Constants/ModuleConstants';
 import { aggregatedExpressionFunctions } from '../../../../Utilities/ExpressionFunctions/aggregatedScalarExpressionFunctions';
@@ -169,7 +169,7 @@ const RowSummaryEditor = React.memo(({ rowSummary, onChange, availableScalarExpr
                             aggregation.weightedColumnId) {
                             expressionOptions.push({
                                 label: 'WEIGHTERD_AVG',
-                                value: WEIGHTED_AVERAGE_AGGREATED_FUNCTION,
+                                value: WEIGHTED_AVERAGE_AGGREGATED_FUNCTION,
                             });
                         }
                         const expression = rowSummary.ColumnsMap[column.columnId];

package/src/View/Schedule/Wizard/ScheduleSettingsWizard/ScheduleSettingsReport.d.ts

@@ -1,10 +1,12 @@
 import * as React from 'react';
+import { ExportDestinationType } from '../../../../AdaptableOptions/ExportOptions';
 import { Report, ReportFormatType, ReportSchedule } from '../../../../PredefinedConfig/ExportState';
 interface ReportScheduleProps {
     report: ReportSchedule;
     onChange: (reminder: ReportSchedule) => void;
     allReports: Report[];
     allFormats: ReportFormatType[];
+    allDestinations: ExportDestinationType[];
 }
 export declare const ScheduleSettingsReport: React.FunctionComponent<ReportScheduleProps>;
 export {};

package/src/View/Schedule/Wizard/ScheduleSettingsWizard/ScheduleSettingsReport.js

@@ -18,14 +18,24 @@ export const ScheduleSettingsReport = (props) => {
             });
         },
     }));
+    const destinationOptions = props.allDestinations.map((destination) => ({
+        label: destination,
+        value: destination,
+        onClick: () => {
+            props.onChange({
+                ...props.report,
+                ExportDestination: destination,
+            });
+        },
+    }));
     return (React.createElement(Box, { "data-name": "schedule-settings-report" },
         React.createElement(Tabs, { autoFocus: false, mb: 3 },
-            React.createElement(Tabs.Tab, null, "Report Schedule Settings"),
+            React.createElement(Tabs.Tab, null, "Report Settings"),
             React.createElement(Tabs.Content, null,
                 React.createElement(FormLayout, null,
                     React.createElement(FormRow, { label: "Export" },
                         React.createElement(Box, { maxWidth: 300 },
-                            React.createElement(Select, { "data-name": "select-export", options: reportOptions, value: props?.report?.ReportName, placeholder: "Select Export", onChange: (value) => props.onChange({
+                            React.createElement(Select, { "data-name": "select-report", options: reportOptions, value: props?.report?.ReportName, placeholder: "Select Export", onChange: (value) => props.onChange({
                                     ...props.report,
                                     ReportName: value,
                                 }) }))),
@@ -34,5 +44,11 @@ export const ScheduleSettingsReport = (props) => {
                             React.createElement(Select, { "data-name": "select-format", options: formatOptions, value: props?.report?.ReportFormat, placeholder: "Select Format", onChange: (value) => props.onChange({
                                     ...props.report,
                                     ReportFormat: value,
+                                }) }))),
+                    React.createElement(FormRow, { label: "Destination" },
+                        React.createElement(Box, { maxWidth: 300 },
+                            React.createElement(Select, { "data-name": "select-destination", options: destinationOptions, value: props?.report?.ExportDestination, placeholder: "Select Format", onChange: (value) => props.onChange({
+                                    ...props.report,
+                                    ExportDestination: value,
                                 }) }))))))));
 };

package/src/View/Schedule/Wizard/ScheduleSettingsWizard/ScheduleSettingsSummary.js

@@ -39,6 +39,10 @@ export const getScheduleSettingsValues = (data) => {
                 label: 'Report Format',
                 value: report?.ReportFormat || 'Not Specified',
             },
+            {
+                label: 'Export Destination',
+                value: report?.ExportDestination || 'Download',
+            },
         ];
     }
     if (data.ScheduleType === ScheduleType.ipushpull) {

package/src/View/Schedule/Wizard/ScheduleSettingsWizard/ScheduleSettingsWizard.js

@@ -13,7 +13,8 @@ export const ScheduleSettingsWizard = (props) => {
     }
     if (data?.ScheduleType === ScheduleType.Report) {
         const allFormats = api.exportApi.getAvailableSystemFormats();
-        return (React.createElement(ScheduleSettingsReport, { allReports: allReports ?? [], allFormats: allFormats ?? [], report: data, onChange: props.onChange }));
+        const allDestinations = api.exportApi.getAllExportDestinations();
+        return (React.createElement(ScheduleSettingsReport, { allReports: allReports ?? [], allFormats: allFormats ?? [], allDestinations: allDestinations ?? [], report: data, onChange: props.onChange }));
     }
     if (data?.ScheduleType === ScheduleType.ipushpull) {
         const ippApi = api.pluginsApi.getipushpullPluginApi();

package/src/View/StyledColumn/Wizard/StyledColumnSparklineSettingsSection.d.ts

@@ -1,6 +1,5 @@
 import * as React from 'react';
-import { StyledColumn } from '../../../types';
-export interface StyledColumnSparklineSettingsSectionProps {
+import type { StyledColumn } from '../../../types';
+export declare const StyledColumnSparklineSettingsSection: React.FC<{
     onChange: (data: StyledColumn) => void;
-}
-export declare const StyledColumnSparklineSettingsSection: React.FunctionComponent<StyledColumnSparklineSettingsSectionProps>;
+}>;