@adaptabletools/adaptable 11.0.0-canary.5 → 11.0.0-canary.6

package/src/View/Components/EntityRulesEditor/index.js

@@ -56,8 +56,8 @@ exports.EntityRulesEditor = (props) => {
         ? 'BooleanExpression'
         : data.Rule.ObservableExpression != undefined && showObservable
             ? 'ObservableExpression'
-            : data.Rule.AggregationExpression != undefined && showAggregation
-                ? 'AggregationExpression'
+            : data.Rule.AggregatedBooleanExpression != undefined && showAggregation
+                ? 'AggregatedBooleanExpression'
                 : 'Predicate';
     const [selectedTab, setSelectedTab] = React.useState(type);
     const setType = (type) => {
@@ -72,9 +72,9 @@ exports.EntityRulesEditor = (props) => {
                     ObservableExpression: '',
                 } }));
         }
-        else if (type === 'AggregationExpression' && showAggregation) {
+        else if (type === 'AggregatedBooleanExpression' && showAggregation) {
             props.onChange(Object.assign(Object.assign({}, data), { Rule: {
-                    AggregationExpression: '',
+                    AggregatedBooleanExpression: '',
                 } }));
         }
         else {
@@ -127,7 +127,7 @@ exports.EntityRulesEditor = (props) => {
         props.onChange(Object.assign(Object.assign({}, data), { Rule: { ObservableExpression: expression } }));
     };
     const setAggregationExpression = (expression) => {
-        props.onChange(Object.assign(Object.assign({}, data), { Rule: { AggregationExpression: expression } }));
+        props.onChange(Object.assign(Object.assign({}, data), { Rule: { AggregatedBooleanExpression: expression } }));
     };
     const initialData = api.internalApi.getQueryPreviewData();
     const showDocumentationLinks = api.internalApi.isDocumentationLinksDisplayed();
@@ -162,13 +162,13 @@ exports.EntityRulesEditor = (props) => {
                             background: 'var(--ab-color-action-add)',
                         }, onClick: () => window.open(DocumentationLinkConstants_1.PredicateDocsLink, '_blank') }),
                     "See Predicate documentation for more details and examples")))) : null,
-            showBoolean ? (React.createElement(QueryTab, { value: "BooleanExpression", type: type, label: "Boolean" })) : null,
+            showBoolean ? React.createElement(QueryTab, { value: "BooleanExpression", type: type, label: "Boolean" }) : null,
             showBoolean ? (React.createElement(Tabs_1.Tabs.Content, { value: 'BooleanExpression', paddingLeft: 0 },
                 React.createElement(ExpressionEditor_1.ExpressionEditor, { type: 'boolean', module: module, value: data.Rule.BooleanExpression, onChange: setBooleanExpression, initialData: initialData, columns: api.columnApi.getQueryableColumns(), namedQueries: api.queryApi.getAllNamedQuery(), api: api }))) : null,
             showObservable ? (React.createElement(QueryTab, { value: "ObservableExpression", type: type, label: "Observable" })) : null,
             showObservable ? (React.createElement(Tabs_1.Tabs.Content, { value: 'ObservableExpression', paddingLeft: 0 },
                 React.createElement(ExpressionEditor_1.ExpressionEditor, { type: 'observable', module: module, value: data.Rule.ObservableExpression, onChange: setReactiveExpression, initialData: initialData, columns: api.columnApi.getQueryableColumns(), namedQueries: api.queryApi.getAllNamedQuery(), api: api }))) : null,
-            showAggregation ? (React.createElement(QueryTab, { value: "AggregationExpression", type: type, label: "Aggregation" })) : null,
-            showAggregation ? (React.createElement(Tabs_1.Tabs.Content, { value: 'AggregationExpression', paddingLeft: 0 },
-                React.createElement(ExpressionEditor_1.ExpressionEditor, { type: 'aggregation', module: module, value: data.Rule.AggregationExpression, onChange: setAggregationExpression, initialData: initialData, columns: api.columnApi.getQueryableColumns(), namedQueries: api.queryApi.getAllNamedQuery(), api: api }))) : null)));
+            showAggregation ? (React.createElement(QueryTab, { value: "AggregatedBooleanExpression", type: type, label: "AggregatedBoolean" })) : null,
+            showAggregation ? (React.createElement(Tabs_1.Tabs.Content, { value: 'AggregatedBooleanExpression', paddingLeft: 0 },
+                React.createElement(ExpressionEditor_1.ExpressionEditor, { type: 'aggregatedBoolean', module: module, value: data.Rule.AggregatedBooleanExpression, onChange: setAggregationExpression, initialData: initialData, columns: api.columnApi.getQueryableColumns(), namedQueries: api.queryApi.getAllNamedQuery(), api: api }))) : null)));
 };

package/src/View/ConditionalStyle/Wizard/ConditionalStyleRuleWizardSection.js

@@ -34,9 +34,9 @@ function ConditionalStyleRuleWizardSection(props) {
                     React.createElement("i", null, "Scope"),
                     " is 'Whole Row' - so any data change may be evaluated in a complex ObservableExpression")),
                 useAggregationQuery: (React.createElement(React.Fragment, null,
-                    "Use an AggregationQuery if ",
+                    "Use an AggregatedBooleanQuery if ",
                     React.createElement("i", null, "Scope"),
-                    " is 'Whole Row' - so any data change may be evaluated in a complex AggregationExpression")),
+                    " is 'Whole Row' - so any data change may be evaluated in a complex AggregatedBooleanExpression")),
             } })));
 }
 exports.ConditionalStyleRuleWizardSection = ConditionalStyleRuleWizardSection;

package/src/View/CustomSort/Wizard/CustomSortWizard.js

@@ -53,7 +53,7 @@ exports.CustomSortWizard = (props) => {
             },
             {
                 title: 'Sort Order',
-                details: 'Select values to specify Custom Sort order - use the "Drag to reorder" checkbox to modify order',
+                details: 'Select values to specify Custom Sort order - use "Drag to reorder" checkbox to modify order',
                 isValid: CustomSortValuesWizardSection_1.isValidCustomSortOrder,
                 renderSummary: CustomSortValuesWizardSection_1.renderCustomSortValuesSummary,
                 render: () => (React.createElement(rebass_1.Box, { padding: 2, style: { height: '100%' } },

package/src/View/FlashingCell/Wizard/FlashingCellRulesWizardSection.js

@@ -41,8 +41,8 @@ exports.FlashingAlertRulesWizardSection = (props) => {
                 React.createElement("i", null, "Scope"),
                 " is 'Whole Row' - so any data change may be evaluated in a complex ObservableExpression")),
             useAggregationQuery: (React.createElement(React.Fragment, null,
-                "Use an AggregationQuery if ",
+                "Use an AggregatedBooleanQuery if ",
                 React.createElement("i", null, "Scope"),
-                " is 'Whole Row' - so any data change may be evaluated in a complex AggregationExpression")),
+                " is 'Whole Row' - so any data change may be evaluated in a complex AggregatedBooleanExpression")),
         } }));
 };

package/src/View/FlashingCell/Wizard/FlashingCellWizard.js

@@ -65,7 +65,7 @@ exports.FlashingCellWizard = (props) => {
                 title: 'Scope',
             },
             {
-                details: 'Build the rules for when Cells should Flash',
+                details: 'Build the Rules for when Cells should Flash',
                 isValid: isValidFlashingCellRules_1.isValidFlashingCellRules,
                 render: () => React.createElement(FlashingCellRulesWizardSection_1.FlashingAlertRulesWizardSection, { onChange: setFlashingCell }),
                 renderSummary: FlashingCellRulesWizardSection_1.renderFlashingAlertRulesSummary,

package/src/View/FormatColumn/Wizard/FormatColumnWizard.js

@@ -113,7 +113,7 @@ function FormatColumnWizard(props) {
             },
             {
                 title: 'Style',
-                details: 'Format Column style',
+                details: 'Format Column Style',
                 isValid: FormatColumnStyleWizardSection_1.isFormatColumnStyleValid,
                 renderSummary: FormatColumnStyleWizardSection_1.renderFormatColumnStyleSummary,
                 render: () => {

package/src/View/Query/Wizard/NamedQueryWizard.js

@@ -33,14 +33,14 @@ function NamedQueryWizard(props) {
     return (React.createElement(OnePageAdaptableWizard_1.OnePageAdaptableWizard, { defaultCurrentSectionName: props.defaultCurrentSectionName, onFinish: handleFinish, sections: [
             {
                 title: 'Expression',
-                details: 'Specify the query expression',
+                details: "Specify the Query's Expression",
                 renderSummary: NamedQueryExpressionWizardSection_1.renderNamedQueryExpressionSummary,
                 isValid: NamedQueryExpressionWizardSection_1.isValidNamedQueryExpression,
                 render: () => React.createElement(NamedQueryExpressionWizardSection_1.NamedQueryExpressionWizardSection, { onChange: setNamedQuery }),
             },
             {
                 title: 'Query Name',
-                details: 'Specify a unique name for the query',
+                details: 'Specify a unique name for the Query',
                 renderSummary: NamedQuerySettingsWizardSection_1.renderNamedQuerySettingsSummary,
                 isValid: NamedQuerySettingsWizardSection_1.isValidNamedQuerySettings,
                 render: () => {
@@ -50,7 +50,7 @@ function NamedQueryWizard(props) {
             '-',
             {
                 title: 'Summary',
-                details: 'Review your query',
+                details: 'Review your Query',
                 render: () => {
                     return (React.createElement(rebass_1.Box, { padding: 2 },
                         React.createElement(OnePageAdaptableWizard_1.OnePageWizardSummary, null)));

package/src/agGrid/Adaptable.js

@@ -291,7 +291,7 @@ class Adaptable {
     // the 'old' constructor which takes an Adaptable adaptable object
     // this is still used internally but should not be used externally as a preference
     async init(adaptableOptions, runtimeConfig, _staticInit) {
-        var _a, _b, _c, _d, _e, _f, _g;
+        var _a, _b, _c, _d, _e, _f;
         if (!_staticInit) {
             LoggingHelper_1.ConsoleLogWarning(`
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
@@ -376,7 +376,6 @@ class Adaptable {
             abColDefDate: (_d = this.gridOptions.columnTypes.abColDefDate) !== null && _d !== void 0 ? _d : {},
             abColDefObject: (_e = this.gridOptions.columnTypes.abColDefObject) !== null && _e !== void 0 ? _e : {},
             abColDefCustom: (_f = this.gridOptions.columnTypes.abColDefCustom) !== null && _f !== void 0 ? _f : {},
-            abColDefNumberArray: (_g = this.gridOptions.columnTypes.abColDefNumberArray) !== null && _g !== void 0 ? _g : {},
         });
         if (this.gridOptions.columnTypes.abColDefNumber.cellEditor === undefined) {
             this.gridOptions.columnTypes.abColDefNumber.cellEditor = AdaptableNumberEditor_1.AdaptableNumberEditor;

package/src/agGrid/agGridHelper.js

@@ -494,7 +494,7 @@ class agGridHelper {
             dataType = Enums_1.DataType.Date;
         }
         else if (Array.isArray(value) && value.length && typeof value[0] === 'number') {
-            dataType = Enums_1.DataType.NumberArray;
+            dataType = Enums_1.DataType.Unknown;
         }
         else {
             switch (typeof value) {
@@ -525,8 +525,6 @@ class agGridHelper {
             switch (colType) {
                 case 'abColDefNumber':
                     return Enums_1.DataType.Number;
-                case 'abColDefNumberArray':
-                    return Enums_1.DataType.NumberArray;
                 case 'abColDefString':
                     return Enums_1.DataType.String;
                 case 'abColDefBoolean':
@@ -552,8 +550,6 @@ class agGridHelper {
                 return 'abColDefDate';
             case Enums_1.DataType.Number:
                 return 'abColDefNumber';
-            case Enums_1.DataType.NumberArray:
-                return 'abColDefNumberArray';
             case Enums_1.DataType.Object:
                 return 'abColDefObject';
             case Enums_1.DataType.String:

package/src/components/ExpressionEditor/EditorInputReactive.d.ts

@@ -2,7 +2,7 @@
 import { AdaptableApi } from '../../Api/AdaptableApi';
 import { AdaptableModule } from '../../PredefinedConfig/Common/Types';
 interface EditorInputReactiveProps {
-    type: 'observable' | 'aggregation';
+    type: 'observable' | 'aggregatedBoolean';
     module: AdaptableModule;
     value: string;
     onChange: (value: string) => void;

package/src/components/ExpressionEditor/EditorInputReactive.js

@@ -17,7 +17,7 @@ function EditorInputReactive(props) {
         .getModuleExpressionFunctions(props.module);
     const reactiveExpressionFns = props.type === 'observable'
         ? moduleExpressionFunctions.observableFunctions
-        : moduleExpressionFunctions.aggregationFunctions;
+        : moduleExpressionFunctions.aggregatedBooleanFunctions;
     const whereClauseExpressionsFns = Object.assign(Object.assign({}, moduleExpressionFunctions.booleanFunctions), moduleExpressionFunctions.scalarFunctions);
     const [value, setValue] = useProperty_1.default(props, 'value', '', {
         onChange: props.onChange,

package/src/components/ExpressionEditor/index.d.ts

@@ -4,7 +4,7 @@ import { NamedQuery } from '../../PredefinedConfig/QueryState';
 interface ExpressionEditorProps {
     value: string;
     onChange: (value: string) => void;
-    type: 'boolean' | 'scalar' | 'observable' | 'aggregation';
+    type: 'boolean' | 'scalar' | 'observable' | 'aggregatedBoolean';
     module: AdaptableModule;
     initialData: {
         [key: string]: any;

package/src/components/ExpressionEditor/index.js

@@ -35,7 +35,7 @@ function ExpressionEditor(props) {
     const { namedQuery, setNamedQuery } = NamedQueryContext_1.useNamedQueryContext();
     const textAreaRef = react_1.useRef(null);
     const allowSaveNamedQuery = (_a = props.allowSaveNamedQuery) !== null && _a !== void 0 ? _a : type === 'boolean';
-    const editorInput = type === 'observable' || type === 'aggregation' ? (React.createElement(EditorInputReactive_1.default, { type: type, module: module, value: props.value, onChange: (value) => {
+    const editorInput = type === 'observable' || type === 'aggregatedBoolean' ? (React.createElement(EditorInputReactive_1.default, { type: type, module: module, value: props.value, onChange: (value) => {
             setExpressionText(value);
             props.onChange(value);
         }, testData: data, api: props.api })) : (
@@ -157,7 +157,7 @@ const renderQueryHints = (type) => {
             description: "An Order Cost cell contains its highest value in the whole Grid within the last hour - for rows where Cust Ref is 'TRADH'",
         });
     }
-    if (type === 'aggregation') {
+    if (type === 'aggregatedBoolean') {
         examples.push({
             code: 'SUM([PnL]) > 50000000',
             description: "The sum of the 'PnL' column values in all rows is greater than 5 Million",
@@ -188,5 +188,5 @@ const queryDocumentationLinks = {
     boolean: DocumentationLinkConstants_1.BooleanQueryDocsLink,
     scalar: DocumentationLinkConstants_1.ScalarQueryDocsLink,
     observable: DocumentationLinkConstants_1.ObservableQueryDocsLink,
-    aggregation: DocumentationLinkConstants_1.AggregationQueryDocsLink,
+    aggregatedBoolean: DocumentationLinkConstants_1.AggregationQueryDocsLink,
 };

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

@@ -3087,6 +3087,17 @@ export declare const ADAPTABLE_METAMODEL: {
             reference: string;
         }[];
     };
+    SettingsPanelApi: {
+        name: string;
+        kind: string;
+        description: string;
+        properties: {
+            name: string;
+            kind: string;
+            description: string;
+            uiLabel: string;
+        }[];
+    };
     SharedEntity: {
         name: string;
         kind: string;

package/src/metamodel/adaptable.metamodel.js

@@ -359,6 +359,13 @@ exports.ADAPTABLE_METAMODEL = {
                 "uiLabel": "Scope Api",
                 "reference": "ScopeApi"
             },
+            {
+                "name": "settingsPanelApi",
+                "kind": "REFERENCE",
+                "description": "Provides access to the Settings Panel",
+                "uiLabel": "Settings Panel Api",
+                "reference": "SettingsPanelApi"
+            },
             {
                 "name": "shortcutApi",
                 "kind": "REFERENCE",
@@ -1032,7 +1039,7 @@ exports.ADAPTABLE_METAMODEL = {
             {
                 "name": "gridOptions",
                 "kind": "REFERENCE",
-                "description": "The AG Grid object which AdapTable interacts with. Note: if using React or Angular Wrapper, no need to populate this property as AdapTable wires it up differently",
+                "description": "The AG Grid object which AdapTable interacts with. Note: if using AdapTable React or AdapTable Angular, no need to populate this property as AdapTable wires it up differently",
                 "uiLabel": "Grid Options",
                 "isOptional": true,
                 "defaultValue": "n/a (Mandatory)",
@@ -2656,12 +2663,6 @@ exports.ADAPTABLE_METAMODEL = {
                 "description": "Returns all Groupable Columns",
                 "uiLabel": "Get Groupable Columns"
             },
-            {
-                "name": "getNumericArrayColumns",
-                "kind": "function",
-                "description": "Returns all numeric array Columns",
-                "uiLabel": "Get Numeric Array Columns"
-            },
             {
                 "name": "getNumericColumns",
                 "kind": "function",
@@ -3310,7 +3311,7 @@ exports.ADAPTABLE_METAMODEL = {
             {
                 "name": "agGridContainerWaitTimeout",
                 "kind": "number",
-                "description": "how long AdapTable waits for AG Grid before giving up connecting to it; useful when AG Grid is instantiated separately (eg: by React or Angular Wrappers)",
+                "description": "how long AdapTable waits for AG Grid before giving up connecting to it; useful when AG Grid is instantiated separately (eg: by AdapTable React or AdapTable Angular)",
                 "uiLabel": "Ag Grid Container Wait Timeout",
                 "isOptional": true,
                 "gridInfo": "item",
@@ -8996,7 +8997,7 @@ exports.ADAPTABLE_METAMODEL = {
             {
                 "name": "getColumnsFromExpression",
                 "kind": "function",
-                "description": "Returns all Columns referenced in a Query",
+                "description": "Returns all Columns referenced in a QueryExpression",
                 "uiLabel": "Get Columns From Expression"
             },
             {
@@ -9012,10 +9013,10 @@ exports.ADAPTABLE_METAMODEL = {
                 "uiLabel": "Get Queryable Column Ids"
             },
             {
-                "name": "isValidAggregationExpression",
+                "name": "isValidAggregatedBooleanExpression",
                 "kind": "function",
-                "description": "Whether the given AggregationExpression is valid",
-                "uiLabel": "Is Valid Aggregation Expression"
+                "description": "Whether the given AggregatedBooleanExpression is valid",
+                "uiLabel": "Is Valid Aggregated Boolean Expression"
             },
             {
                 "name": "isValidBooleanExpression",
@@ -9037,10 +9038,10 @@ exports.ADAPTABLE_METAMODEL = {
         "description": "Options for managing Expressions using AdapTableQL",
         "properties": [
             {
-                "name": "defaultAggregationFunctions",
+                "name": "defaultAggregatedBooleanFunctions",
                 "kind": "REFERENCE",
-                "description": "Aggregation Expression Functions available in AdapTableQL",
-                "uiLabel": "Default Aggregation Functions",
+                "description": "Aggregated Boolean Expression Functions available in AdapTableQL",
+                "uiLabel": "Default Aggregated Boolean Functions",
                 "isOptional": true,
                 "gridInfo": "item",
                 "defaultValue": "null (sets all)",
@@ -9950,6 +9951,25 @@ exports.ADAPTABLE_METAMODEL = {
             }
         ]
     },
+    "SettingsPanelApi": {
+        "name": "SettingsPanelApi",
+        "kind": "Interface",
+        "description": "Provides run-time access to the Settings Panel",
+        "properties": [
+            {
+                "name": "showCustomSettingsPanel",
+                "kind": "function",
+                "description": "Opens a the settings panel to the custom module",
+                "uiLabel": "Show Custom Settings Panel"
+            },
+            {
+                "name": "showSettingsPanel",
+                "kind": "function",
+                "description": "Opens settings panel to specified module, when not specified it opens the first available module",
+                "uiLabel": "Show Settings Panel"
+            }
+        ]
+    },
     "SharedEntity": {
         "name": "SharedEntity",
         "kind": "Interface",
@@ -11073,7 +11093,7 @@ exports.ADAPTABLE_METAMODEL = {
                 "description": "Which sections to show in the Grid Info Screen",
                 "uiLabel": "Grid Info Sections",
                 "isOptional": true,
-                "defaultValue": "['GridSummary', 'AdaptableOptions','ColumnInfo']",
+                "defaultValue": "['GridSummary', 'AdaptableOptions', 'ColumnInfo']",
                 "reference": "unknown"
             },
             {

package/src/types.d.ts

@@ -17,7 +17,7 @@ export type { OpenFinPluginOptions } from './AdaptableOptions/OpenFinPluginOptio
 export type { FinancePluginOptions, WeightedAverageColumn, InstrumentColumn, } from './AdaptableOptions/FinancePluginOptions';
 export type { DateInputOptions } from './AdaptableOptions/DateInputOptions';
 export type { FilterOptions } from './AdaptableOptions/FilterOptions';
-export type { SearchOptions } from './AdaptableOptions/SearchOptions';
+export type { SearchOptions, ServerSearchOption, ServerSearchOptions, } from './AdaptableOptions/SearchOptions';
 export type { AdaptablePersistStateFunction, AdaptableStateFunctionConfig, AdaptableLoadStateFunction, StateOptions, } from './AdaptableOptions/StateOptions';
 export type { AccessLevel, Entitlement } from './PredefinedConfig/Common/Entitlement';
 export type { FilterActionOnDataChange } from './PredefinedConfig/Common/FilterActionOnDataChange';
@@ -61,6 +61,7 @@ export type { QueryApi } from './Api/QueryApi';
 export type { QueryLanguageApi } from './Api/QueryLanguageApi';
 export type { QuickSearchApi } from './Api/QuickSearchApi';
 export type { ScheduleApi } from './Api/ScheduleApi';
+export type { SettingsPanelApi } from './Api/SettingsPanelApi';
 export type { ScopeApi } from './Api/ScopeApi';
 export type { ShortcutApi } from './Api/ShortcutApi';
 export type { SmartEditApi } from './Api/SmartEditApi';

package/version.d.ts

@@ -1,2 +1,2 @@
-declare const _default: "11.0.0-canary.5";
+declare const _default: "11.0.0-canary.6";
 export default _default;

package/version.js

@@ -1,3 +1,3 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.default = '11.0.0-canary.5'; // PLEASE DONT UPDATE THIS!!! - will be updated at build time with the correct version
+exports.default = '11.0.0-canary.6'; // PLEASE DONT UPDATE THIS!!! - will be updated at build time with the correct version