@adaptabletools/adaptable 14.0.1-canary.1 → 14.0.1-canary.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adaptabletools/adaptable",
-  "version": "14.0.1-canary.1",
+  "version": "14.0.1-canary.2",
   "description": "Powerful data-agnostic HTML5 AG Grid extension which provides advanced, cutting-edge functionality to meet all DataGrid requirements",
   "keywords": [
     "web-components",

package/publishTimestamp.d.ts

@@ -1,2 +1,2 @@
-declare const _default: 1672761030413;
+declare const _default: 1672852001158;
 export default _default;

package/publishTimestamp.js

@@ -1,3 +1,3 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.default = 1672761030413;
+exports.default = 1672852001158;

package/src/AdaptableOptions/ChartingOptions.d.ts

@@ -21,6 +21,12 @@ export interface ChartContainer {
      * Name of the Location - used in Dropdowns
      */
     name: string;
+    /**
+     * Weather a single chart can be displayed or multiple in the same location
+     *
+     * @defaults 'single'
+     */
+    type?: 'single' | 'multiple';
     /**
      * Location - can be HTMLElement or Id of Div
      */

package/src/Api/Implementation/AlertApiImpl.js

@@ -267,7 +267,7 @@ class AlertApiImpl extends ApiBase_1.ApiBase {
         this.internalApi.executeAlertButton(button, context);
     }
     getActiveNonReactiveAlertDefinitions() {
-        (0, logDeprecation_1.logDeprecationInternal)('AlertApi', 'executeAlertButton');
+        (0, logDeprecation_1.logDeprecationInternal)('AlertApi', 'getActiveNonReactiveAlertDefinitions');
         return this.internalApi.getActiveNonReactiveAlertDefinitions();
     }
     getActiveReactiveAlertDefinitions() {

package/src/PredefinedConfig/Common/Enums.d.ts

@@ -1,12 +1,3 @@
-export declare enum DataType {
-    String = "String",
-    Number = "Number",
-    Boolean = "Boolean",
-    Date = "Date",
-    Object = "Object",
-    Unknown = "Unknown",
-    All = "All"
-}
 export declare enum MathOperation {
     Add = "Add",
     Subtract = "Subtract",

package/src/PredefinedConfig/Common/Enums.js

@@ -1,17 +1,7 @@
 "use strict";
 // General Enums
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ChangeDirection = exports.FilterOnDataChangeOptions = exports.SummaryOperation = exports.StatusColour = exports.ColumnMenuTab = exports.FontSize = exports.FontStyle = exports.FontWeight = exports.SelectionMode = exports.SortOrder = exports.ScheduleType = exports.ExportDestination = exports.MathOperation = exports.DataType = void 0;
-var DataType;
-(function (DataType) {
-    DataType["String"] = "String";
-    DataType["Number"] = "Number";
-    DataType["Boolean"] = "Boolean";
-    DataType["Date"] = "Date";
-    DataType["Object"] = "Object";
-    DataType["Unknown"] = "Unknown";
-    DataType["All"] = "All";
-})(DataType = exports.DataType || (exports.DataType = {}));
+exports.ChangeDirection = exports.FilterOnDataChangeOptions = exports.SummaryOperation = exports.StatusColour = exports.ColumnMenuTab = exports.FontSize = exports.FontStyle = exports.FontWeight = exports.SelectionMode = exports.SortOrder = exports.ScheduleType = exports.ExportDestination = exports.MathOperation = void 0;
 var MathOperation;
 (function (MathOperation) {
     MathOperation["Add"] = "Add";

package/src/PredefinedConfig/Common/SpecialColumnSettings.d.ts

@@ -5,7 +5,7 @@ export interface SpecialColumnSettings {
     /**
      *  Expression's return value DataType, only mandatory property
      */
-    DataType: 'String' | 'Number' | 'Boolean' | 'Date';
+    DataType: 'String' | 'Number' | 'Boolean' | 'Date' | 'NumberArray';
     /**
      * Preferred (pixel) Column Width; if unset, calculated dynamically by AG Grid
      */

package/src/Strategy/FormatColumnModule.d.ts

@@ -12,7 +12,7 @@ export declare class FormatColumnModule extends AdaptableModuleBase implements I
         includeLayoutNotAssociatedObjects?: boolean;
     }): AdaptableObject[];
     getExplicitlyReferencedColumnIds(formatColumn: FormatColumn): string[];
-    hasNamedQueryReferences(): boolean;
+    getReferencedNamedQueryNames(formatColumn: FormatColumn): string[];
     updateOldConfig(): void;
     private updateFormatColumnSingleToMultiplePredicates;
     private updateConditionalStylesColumnsOldConfig;

package/src/Strategy/FormatColumnModule.js

@@ -24,15 +24,23 @@ class FormatColumnModule extends AdaptableModuleBase_1.AdaptableModuleBase {
         return this.api.formatColumnApi.getFormatColumns(config);
     }
     getExplicitlyReferencedColumnIds(formatColumn) {
-        if (this.api.scopeApi.scopeHasColumns(formatColumn.Scope)) {
+        const queryExpression = this.api.queryLanguageApi.getAdaptableQueryExpression(formatColumn.Rule);
+        if (queryExpression) {
+            return this.api.queryLanguageApi.getColumnsFromExpression(queryExpression);
+        }
+        else if (this.api.scopeApi.scopeHasColumns(formatColumn.Scope)) {
             return this.api.scopeApi
                 .getColumnsForScope(formatColumn.Scope)
                 .map((adaptableColumn) => adaptableColumn.columnId);
         }
         return [];
     }
-    hasNamedQueryReferences() {
-        return false;
+    getReferencedNamedQueryNames(formatColumn) {
+        const queryExpression = this.api.queryLanguageApi.getAdaptableQueryExpression(formatColumn.Rule);
+        if (!queryExpression) {
+            return [];
+        }
+        return this.api.queryApi.internalApi.getReferencedNamedQueryNames(queryExpression);
     }
     updateOldConfig() {
         this.updateConditionalStylesColumnsOldConfig();

package/src/Strategy/StyledColumnModule.js

@@ -108,9 +108,14 @@ class StyledColumnModule extends AdaptableModuleBase_1.AdaptableModuleBase {
                     let styledColumn = this.api.styledColumnApi.getStyledColumnForColumnId(column.columnId);
                     let styledColumnExists = Boolean(styledColumn);
                     if (!styledColumn) {
+                        const emptyRanges = this.api.scopeApi.createCellColorRangesForScope({
+                            ColumnIds: [column.columnId],
+                        });
                         styledColumn = Object.assign(Object.assign({}, ObjectFactory_1.default.CreateEmptyStyledColumn()), { ColumnId: column.columnId, 
                             // numbers default to gradient
-                            GradientStyle: {} });
+                            GradientStyle: {
+                                CellRanges: emptyRanges,
+                            } });
                     }
                     if (styledColumn && styledColumn.IsReadOnly && styledColumn.IsReadOnly == true) {
                         styledColumnExists = false;

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

@@ -1,13 +1,13 @@
 import { ICalculatedColumnExpressionService } from './Interface/ICalculatedColumnExpressionService';
 import { RowNode } from '@ag-grid-community/core';
-import { AdaptableCalculatedColumnQuery, CalculatedColumn } from '../../PredefinedConfig/CalculatedColumnState';
+import { AdaptableCalculatedColumnQuery, CalculatedColumn, CalculatedColumnSettings } from '../../PredefinedConfig/CalculatedColumnState';
 import { AdaptableApi } from '../../../types';
 export declare class CalculatedColumnExpressionService implements ICalculatedColumnExpressionService {
     private adaptableApi;
     private aggregatedScalarLiveValuesMap;
     constructor(adaptableApi: AdaptableApi);
     destroy(): void;
-    getCalculatedColumnDataType(calculatedColumnQuery: AdaptableCalculatedColumnQuery): 'String' | 'Number' | 'Boolean' | 'Date';
+    getCalculatedColumnDataType(calculatedColumnQuery: AdaptableCalculatedColumnQuery): CalculatedColumnSettings['DataType'];
     isCalculatedColumnQueryValid(calculatedColumnQuery: AdaptableCalculatedColumnQuery): boolean;
     evaluateCalculatedColumnQuery(calculatedColumn: CalculatedColumn, rowNode: RowNode): any;
     createAggregatedScalarLiveValue(calculatedColumn: CalculatedColumn): void;

package/src/Utilities/Services/CalculatedColumnExpressionService.js

@@ -69,6 +69,9 @@ class CalculatedColumnExpressionService {
             if (typeof firstRowValue === 'number') {
                 return 'Number';
             }
+            if (Array.isArray(firstRowValue)) {
+                return 'NumberArray';
+            }
         }
         catch (e) {
             (0, LoggingHelper_1.LogAdaptableWarning)(`Invalid CalculatedColumn expression ${this.adaptableApi.queryLanguageApi.getAdaptableQueryExpression(calculatedColumnQuery)} :: ${e}`);

package/src/Utilities/Services/Interface/ICalculatedColumnExpressionService.d.ts

@@ -1,10 +1,10 @@
 import { IAdaptableService } from './IAdaptableService';
 import { RowNode } from '@ag-grid-community/core';
-import { AdaptableCalculatedColumnQuery, CalculatedColumn } from '../../../PredefinedConfig/CalculatedColumnState';
+import { AdaptableCalculatedColumnQuery, CalculatedColumn, CalculatedColumnSettings } from '../../../PredefinedConfig/CalculatedColumnState';
 export interface ICalculatedColumnExpressionService extends IAdaptableService {
     isCalculatedColumnQueryValid(calculatedColumnQuery: AdaptableCalculatedColumnQuery): boolean;
     evaluateCalculatedColumnQuery(calculatedColumn: CalculatedColumn, rowNode: RowNode): any;
-    getCalculatedColumnDataType(calculatedColumnQuery: AdaptableCalculatedColumnQuery): 'String' | 'Number' | 'Boolean' | 'Date';
+    getCalculatedColumnDataType(calculatedColumnQuery: AdaptableCalculatedColumnQuery): CalculatedColumnSettings['DataType'];
     createAggregatedScalarLiveValue(calculatedColumn: CalculatedColumn): void;
     destroyAggregatedScalarLiveValue(calculatedColumn: CalculatedColumn): void;
 }

package/src/View/AdaptableWizardView/AdaptableConfigurationDialog/UIOptions/UiOptionsForm.js

@@ -4,14 +4,22 @@ exports.UIElementsForm = void 0;
 const tslib_1 = require("tslib");
 const React = tslib_1.__importStar(require("react"));
 const rebass_1 = require("rebass");
+const Tabs_1 = require("../../../../components/Tabs");
 const UIOptionsActionColumnsForm_1 = require("./UIOptionsActionColumnsForm");
 const UIOptionsSidebarForm_1 = require("./UIOptionsSidebarForm");
 const UIOptionsStatusbarForm_1 = require("./UIOptionsStatusbarForm");
 const UIElementsForm = (props) => {
     let abOptions = props.adaptableOptions;
     return (React.createElement(rebass_1.Box, { p: 2 },
-        React.createElement(UIOptionsActionColumnsForm_1.UIOptionsActionColumnsForm, { abOptions: abOptions, onChange: props.onChangeadAptableOptions }),
-        React.createElement(UIOptionsSidebarForm_1.UIOptionsSidebarForm, { abOptions: abOptions, onChange: props.onChangeadAptableOptions }),
-        React.createElement(UIOptionsStatusbarForm_1.UIOptionsStatusbarForm, { abOptions: abOptions, onChange: props.onChangeadAptableOptions })));
+        React.createElement(Tabs_1.Tabs, null,
+            React.createElement(Tabs_1.Tabs.Tab, null, "Action Rows"),
+            React.createElement(Tabs_1.Tabs.Tab, null, "Sidebar"),
+            React.createElement(Tabs_1.Tabs.Tab, null, "Statusbar"),
+            React.createElement(Tabs_1.Tabs.Content, null,
+                React.createElement(UIOptionsActionColumnsForm_1.UIOptionsActionColumnsForm, { abOptions: abOptions, onChange: props.onChangeadAptableOptions })),
+            React.createElement(Tabs_1.Tabs.Content, null,
+                React.createElement(UIOptionsSidebarForm_1.UIOptionsSidebarForm, { abOptions: abOptions, onChange: props.onChangeadAptableOptions })),
+            React.createElement(Tabs_1.Tabs.Content, null,
+                React.createElement(UIOptionsStatusbarForm_1.UIOptionsStatusbarForm, { abOptions: abOptions, onChange: props.onChangeadAptableOptions })))));
 };
 exports.UIElementsForm = UIElementsForm;

package/src/View/CalculatedColumn/Wizard/CalculatedColumnSettingsWizardSection.js

@@ -78,6 +78,8 @@ const CalculatedColumnSettingsWizardSection = (props) => {
                                     Width: Number(e.target.value),
                                 }) })))))),
         ErrorMessage ? React.createElement(ErrorBox_1.default, { marginTop: 2 }, ErrorMessage) : null,
-        React.createElement(SpecialColumnSettingsWizardStep_1.SpecialColumnSettingsWizardStep, { isEditable: false, settings: data.CalculatedColumnSettings, onChange: handleSpecialColumnSettingsChange })));
+        React.createElement(SpecialColumnSettingsWizardStep_1.SpecialColumnSettingsWizardStep, { isEditable: false, 
+            // @ts-ignore CalculatedColumn has a broader DataType
+            settings: data.CalculatedColumnSettings, onChange: handleSpecialColumnSettingsChange })));
 };
 exports.CalculatedColumnSettingsWizardSection = CalculatedColumnSettingsWizardSection;

package/src/View/Components/Charting/useChartState.js

@@ -20,6 +20,18 @@ const useChartState = (chartDefinition) => {
         const currentChartRef = (_a = adaptable.api.chartingApi.getChartRef(chartDefinition.Model.chartId)) !== null && _a !== void 0 ? _a : null;
         setChartRef(currentChartRef);
     }, [currentChartModels, chartDefinition]);
+    const closeAlreadyOpenedChartsInContainer = (element) => {
+        const chartModelAlreadyInChartContainer = currentChartModels.find((chartModel) => {
+            const chartRef = adaptable.api.chartingApi.getChartRef(chartModel.chartId);
+            return chartRef && element.contains(chartRef.chartElement);
+        });
+        if (chartModelAlreadyInChartContainer) {
+            const chartRef = adaptable.api.chartingApi.getChartRef(chartModelAlreadyInChartContainer.chartId);
+            if (chartRef) {
+                chartRef.destroyChart();
+            }
+        }
+    };
     const handleShowChart = React.useCallback((chartContainer) => {
         if (!adaptable || !chartDefinition) {
             return;
@@ -41,15 +53,8 @@ const useChartState = (chartDefinition) => {
          * If multple charts are opened in the same contianer, it infinitly adds the charts to the container.
          */
         if (chartContainer && element) {
-            const chartModelAlreadyInChartContainer = currentChartModels.find((chartModel) => {
-                const chartRef = adaptable.api.chartingApi.getChartRef(chartModel.chartId);
-                return chartRef && element.contains(chartRef.chartElement);
-            });
-            if (chartModelAlreadyInChartContainer) {
-                const chartRef = adaptable.api.chartingApi.getChartRef(chartModelAlreadyInChartContainer.chartId);
-                if (chartRef) {
-                    chartRef.destroyChart();
-                }
+            if (chartContainer.type !== 'multiple') {
+                closeAlreadyOpenedChartsInContainer(element);
             }
             adaptable.api.chartingApi.showChartDefinitionOnce(chartDefinition, element);
         }

package/src/View/FreeTextColumn/Wizard/FreeTextColumnSettingsWizardSection.js

@@ -3,13 +3,13 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.FreeTextColumnSettingsWizardSection = exports.isValidFreeTextColumn = exports.renderFreeTextColumnSummary = void 0;
 const tslib_1 = require("tslib");
 const React = tslib_1.__importStar(require("react"));
+const react_1 = require("react");
 const rebass_1 = require("rebass");
 const Input_1 = tslib_1.__importDefault(require("../../../components/Input"));
 const ErrorBox_1 = tslib_1.__importDefault(require("../../../components/ErrorBox"));
 const Radio_1 = tslib_1.__importDefault(require("../../../components/Radio"));
 const FormLayout_1 = tslib_1.__importStar(require("../../../components/FormLayout"));
 const DropdownButton_1 = tslib_1.__importDefault(require("../../../components/DropdownButton"));
-const react_1 = require("react");
 const OnePageAdaptableWizard_1 = require("../../Wizard/OnePageAdaptableWizard");
 const AdaptableInput_1 = tslib_1.__importDefault(require("../../Components/AdaptableInput"));
 const CheckBox_1 = require("../../../components/CheckBox");
@@ -78,10 +78,11 @@ const FreeTextColumnSettingsWizardSection = (props) => {
         props.onChange(Object.assign(Object.assign({}, data), { FriendlyName: ColumnName }));
     };
     const handleDataTypeChange = (DataType) => {
-        const newData = Object.assign(Object.assign({}, data), { DataType });
+        var _a;
+        const newData = Object.assign(Object.assign({}, data), { FreeTextColumnSettings: Object.assign(Object.assign({}, data.FreeTextColumnSettings), { DataType }) });
         delete newData.DefaultValue;
         if (!DataType) {
-            delete newData.DataType;
+            (_a = newData.FreeTextColumnSettings) === null || _a === void 0 ? true : delete _a.DataType;
         }
         props.onChange(newData);
     };

package/src/View/StyledColumn/Wizard/StyledColumnWizard.js

@@ -29,11 +29,11 @@ const StyledColumnWizard = (props) => {
     });
     const dispatch = (0, react_redux_1.useDispatch)();
     const handleFinish = () => {
-        if (data) {
-            dispatch(StyledColumnRedux.StyledColumnEdit(styledColumn));
+        if (props.popupParams.action === 'New' || !data) {
+            dispatch(StyledColumnRedux.StyledColumnAdd(styledColumn));
         }
         else {
-            dispatch(StyledColumnRedux.StyledColumnAdd(styledColumn));
+            dispatch(StyledColumnRedux.StyledColumnEdit(styledColumn));
         }
         props.onFinishWizard(styledColumn);
     };

package/src/metamodel/adaptable.metamodel.d.ts

@@ -1535,12 +1535,19 @@ export declare const ADAPTABLE_METAMODEL: {
         name: string;
         kind: string;
         description: string;
-        properties: {
+        properties: ({
             name: string;
             kind: string;
             description: string;
             uiLabel: string;
-        }[];
+            isOptional?: undefined;
+        } | {
+            name: string;
+            kind: string;
+            description: string;
+            uiLabel: string;
+            isOptional: boolean;
+        })[];
     };
     ChartDefinition: {
         name: string;