@adaptabletools/adaptable 13.1.1 → 14.0.0-canary.1

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

@@ -125,7 +125,7 @@ const getFormatDisplayTypeForScope = (scope, api) => {
     }
     // need to see if all columns are numeric or date
     if ('ColumnIds' in scope) {
-        const columns = scope.ColumnIds.map((c) => api.columnApi.getColumnFromId(c)).filter(Boolean);
+        const columns = scope.ColumnIds.map((c) => api.columnApi.getColumnWithColumnId(c)).filter(Boolean);
         const columnDataTypes = (0, uniq_1.default)(columns.map((c) => c.dataType));
         if (columnDataTypes.length == 1 && columnDataTypes[0] == 'Number') {
             return 'Number';
@@ -192,6 +192,7 @@ const renderDateFormat = (data, _onChange, setFormatOption, scopedCustomFormatte
                     ] })))))));
 };
 const renderNumberFormat = (data, onChange, setFormatOption, scopedCustomFormatters, formatColumnApi) => {
+    var _a, _b, _c;
     if (data.DisplayFormat.Formatter !== 'NumberFormatter') {
         return null;
     }
@@ -254,9 +255,11 @@ const renderNumberFormat = (data, onChange, setFormatOption, scopedCustomFormatt
                         React.createElement(FormLayout_1.FormRow, { label: "Integer Separator" },
                             React.createElement(Input_1.default, { "data-name": "integer-separator", value: data.DisplayFormat.Options.IntegerSeparator, onChange: (e) => setFormatOption('IntegerSeparator', e.currentTarget.value) })),
                         React.createElement(FormLayout_1.FormRow, { label: "Prefix" },
-                            React.createElement(Input_1.default, { "data-name": "prefix", value: data.DisplayFormat.Options.Prefix, onChange: (e) => setFormatOption('Prefix', e.currentTarget.value) })),
+                            React.createElement(Input_1.default, { "data-name": "prefix", value: (_a = data.DisplayFormat.Options.Prefix) !== null && _a !== void 0 ? _a : '', onChange: (e) => setFormatOption('Prefix', e.currentTarget.value) })),
                         React.createElement(FormLayout_1.FormRow, { label: "Suffix" },
-                            React.createElement(Input_1.default, { "data-name": "suffix", value: data.DisplayFormat.Options.Suffix, onChange: (e) => setFormatOption('Suffix', e.currentTarget.value) }))),
+                            React.createElement(Input_1.default, { "data-name": "suffix", value: (_b = data.DisplayFormat.Options.Suffix) !== null && _b !== void 0 ? _b : '', onChange: (e) => setFormatOption('Suffix', e.currentTarget.value) })),
+                        React.createElement(FormLayout_1.FormRow, { label: "Content" },
+                            React.createElement(Input_1.default, { "data-name": "content", type: "number", value: (_c = data.DisplayFormat.Options.Content) !== null && _c !== void 0 ? _c : '', onChange: (e) => setFormatOption('Content', e.currentTarget.value) }))),
                     React.createElement(FormLayout_1.default, null,
                         React.createElement(FormLayout_1.FormRow, { label: "Fraction Digits" },
                             React.createElement(Input_1.default, { "data-name": "fraction-digits", type: "number", min: "0", 
@@ -321,6 +324,7 @@ const renderNumberFormat = (data, onChange, setFormatOption, scopedCustomFormatt
                     ] })))));
 };
 const renderStringFormat = (data, _onChange, setFormatOption, scopedCustomFormatters, formatColumnApi) => {
+    var _a, _b, _c;
     if (data.DisplayFormat.Formatter !== 'StringFormatter') {
         return null;
     }
@@ -337,9 +341,11 @@ const renderStringFormat = (data, _onChange, setFormatOption, scopedCustomFormat
                             React.createElement(Radio_1.default, { "data-name": "case-none", marginLeft: 2, checked: data.DisplayFormat.Options.Case == undefined, onChange: (checked) => setFormatOption('Case', undefined) }, "None"),
                             React.createElement(CheckBox_1.CheckBox, { "data-name": "trim-checkbox", marginLeft: 5, checked: data.DisplayFormat.Options.Trim, onChange: (checked) => setFormatOption('Trim', checked) }, "Trim")),
                         React.createElement(FormLayout_1.FormRow, { label: "Prefix" },
-                            React.createElement(Input_1.default, { "data-name": "prefix", value: data.DisplayFormat.Options.Prefix, onChange: (e) => setFormatOption('Prefix', e.currentTarget.value) })),
+                            React.createElement(Input_1.default, { "data-name": "prefix", value: (_a = data.DisplayFormat.Options.Prefix) !== null && _a !== void 0 ? _a : '', onChange: (e) => setFormatOption('Prefix', e.currentTarget.value) })),
                         React.createElement(FormLayout_1.FormRow, { label: "Suffix" },
-                            React.createElement(Input_1.default, { "data-name": "suffix", value: data.DisplayFormat.Options.Suffix, onChange: (e) => setFormatOption('Suffix', e.currentTarget.value) })))))),
+                            React.createElement(Input_1.default, { "data-name": "suffix", value: (_b = data.DisplayFormat.Options.Suffix) !== null && _b !== void 0 ? _b : '', onChange: (e) => setFormatOption('Suffix', e.currentTarget.value) })),
+                        React.createElement(FormLayout_1.FormRow, { label: "Content" },
+                            React.createElement(Input_1.default, { "data-name": "content", value: (_c = data.DisplayFormat.Options.Content) !== null && _c !== void 0 ? _c : '', onChange: (e) => setFormatOption('Content', e.currentTarget.value) })))))),
         scopedCustomFormatters.length > 0 && (React.createElement(Tabs_1.Tabs, { marginTop: 2, keyboardNavigation: false },
             React.createElement(Tabs_1.Tabs.Tab, null, "Custom Formats"),
             React.createElement(Tabs_1.Tabs.Content, null,

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

@@ -9,8 +9,8 @@ function FormatColumnRuleWizardSection(props) {
     const { data, api, moduleInfo } = (0, OnePageAdaptableWizard_1.useOnePageAdaptableWizardContext)();
     return (React.createElement(EntityRulesEditor_1.EntityRulesEditor, { module: moduleInfo.ModuleName, defaultPredicateId: props.defaultPredicateId, 
         // TODO see what is this
-        predicateDefs: api.formatColumnApi.getFormatColumnDefsForScope(data.Scope), showNoRule: true, showBoolean: true, showAggregation: false, showObservable: false, showPredicate: !api.scopeApi.scopeIsAll(data.Scope), data: data, onChange: (formatColumn) => props.onChange(formatColumn), descriptions: {
-            selectPredicate: 'Select a Format Column Rule - to be applied when data changes',
+        predicateDefs: api.formatColumnApi.internalApi.getFormatColumnDefsForScope(data.Scope), showNoRule: true, showBoolean: true, showAggregation: false, showObservable: false, showPredicate: !api.scopeApi.scopeIsAll(data.Scope), data: data, onChange: (formatColumn) => props.onChange(formatColumn), descriptions: {
+            selectPredicate: 'Create a Format Column Rule - to be applied when data changes',
             useBooleanQuery: (React.createElement(React.Fragment, null,
                 "Use an BooleanQuery if ",
                 React.createElement("i", null, "Scope"),

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

@@ -20,21 +20,23 @@ const FormatColumnScopeWizardSection = (props) => {
             rowScope: 'Format all columns in the row',
             columnScope: 'Select columns to format',
         }, scope: data.Scope, updateScope: (Scope) => {
-            var _a;
+            var _a, _b;
             const newData = Object.assign(Object.assign({}, data), { Scope });
             const wholeRow = api.scopeApi.scopeIsAll(Scope);
-            if ((_a = newData.Rule) === null || _a === void 0 ? void 0 : _a.Predicate) {
+            if ((_b = (_a = newData.Rule) === null || _a === void 0 ? void 0 : _a.Predicates) === null || _b === void 0 ? void 0 : _b.length) {
                 if (wholeRow) {
                     // if scope is whole row, a predicate cannot be present, so we set the rule
                     // to be a boolean expression
-                    delete newData.Rule.Predicate;
+                    delete newData.Rule.Predicates;
                     newData.Rule.BooleanExpression = '';
                 }
                 else {
                     // if scope is not whole row, if you have a predicate, reset it
-                    newData.Rule.Predicate = {
-                        PredicateId: constants_1.DEFAULT_PREDICATE_ID_FOR_FORMAT_COLUMN,
-                    };
+                    newData.Rule.Predicates = [
+                        {
+                            PredicateId: constants_1.DEFAULT_PREDICATE_ID_FOR_FORMAT_COLUMN,
+                        },
+                    ];
                 }
             }
             props.onChange(newData);

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

@@ -34,9 +34,8 @@ exports.renderFormatColumnStyleSummary = renderFormatColumnStyleSummary;
 function FormatColumnStyleWizardSection(props) {
     var _a;
     const { data, api } = (0, OnePageAdaptableWizard_1.useOnePageAdaptableWizardContext)();
-    return (React.createElement(React.Fragment, null,
-        React.createElement(StyleComponent_1.StyleComponent, { headless: true, api: api, Style: (_a = data.Style) !== null && _a !== void 0 ? _a : {}, UpdateStyle: (Style) => {
-                props.onChange(Object.assign(Object.assign({}, data), { Style }));
-            } })));
+    return (React.createElement(StyleComponent_1.StyleComponent, { headless: true, api: api, Style: (_a = data.Style) !== null && _a !== void 0 ? _a : {}, UpdateStyle: (Style) => {
+            props.onChange(Object.assign(Object.assign({}, data), { Style }));
+        } }));
 }
 exports.FormatColumnStyleWizardSection = FormatColumnStyleWizardSection;

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

@@ -17,7 +17,7 @@ const ObjectFactory_1 = tslib_1.__importDefault(require("../../../Utilities/Obje
 const react_redux_1 = require("react-redux");
 const FormatColumnRedux = tslib_1.__importStar(require("../../../Redux/ActionsReducers/FormatColumnRedux"));
 const ObjectTagsWizardSection_1 = require("../../Wizard/ObjectTagsWizardSection");
-const EntityRulesEditor_1 = require("../../Components/EntityRulesEditor");
+const Utilities_1 = require("../../Components/EntityRulesEditor/Utilities");
 const FormatColumnRuleWizardSection_1 = require("./FormatColumnRuleWizardSection");
 const constants_1 = require("./constants");
 const adjustDisplayFormat = (formatColumn, api) => {
@@ -30,35 +30,21 @@ const adjustDisplayFormat = (formatColumn, api) => {
         formatDataType === 'Number') {
         formatColumn.DisplayFormat = {
             Formatter: 'NumberFormatter',
-            Options: {
-                FractionDigits: undefined,
-                FractionSeparator: '.',
-                IntegerDigits: undefined,
-                IntegerSeparator: ',',
-                Prefix: '',
-                Suffix: '',
-                Multiplier: 1,
-                Parentheses: false,
-            },
+            Options: {},
         };
     }
     if ((!formatColumn.DisplayFormat || formatColumn.DisplayFormat.Formatter !== 'DateFormatter') &&
         formatDataType === 'Date') {
         formatColumn.DisplayFormat = {
             Formatter: 'DateFormatter',
-            Options: {
-                Pattern: 'MM/dd/yyyy',
-            },
+            Options: {},
         };
     }
     if ((!formatColumn.DisplayFormat || formatColumn.DisplayFormat.Formatter !== 'StringFormatter') &&
         formatDataType === 'String') {
         formatColumn.DisplayFormat = {
             Formatter: 'StringFormatter',
-            Options: {
-                Case: undefined,
-                Trim: false,
-            },
+            Options: {},
         };
     }
     return formatColumn;
@@ -111,7 +97,7 @@ function FormatColumnWizard(props) {
             },
             {
                 isValid: (abObject, api, context) => {
-                    return abObject.Rule ? (0, EntityRulesEditor_1.isRuleValid)(abObject, api, context) : true;
+                    return abObject.Rule ? (0, Utilities_1.isRuleValid)(abObject, api, context) : true;
                 },
                 title: 'Condition',
                 details: 'Build a Rule when the Format Column should be applied',

package/src/View/GridInfo/ColumnInfoComponent.js

@@ -136,7 +136,7 @@ class ColumnInfoComponent extends React.Component {
                     React.createElement(PlusMinusSummary_1.PlusMinusSummary, { key: ModuleConstants.PlusMinusModuleId, summarisedColumn: this.state.SelectedColumn, teamSharingActivated: this.props.teamSharingActivated, accessLevel: this.getAccessLevel(ModuleConstants.PlusMinusModuleId), api: this.props.api, moduleInfo: moduleService.getModuleInfoByModule(ModuleConstants.PlusMinusModuleId) })));
             }
             if (this.isModuleAvailable(ModuleConstants.CalculatedColumnModuleId) &&
-                ArrayExtensions_1.ArrayExtensions.ContainsItem(this.props.api.calculatedColumnApi.getAllCalculatedColumn().map((cc) => cc.ColumnId), this.state.SelectedColumn.columnId)) {
+                ArrayExtensions_1.ArrayExtensions.ContainsItem(this.props.api.calculatedColumnApi.getCalculatedColumns().map((cc) => cc.ColumnId), this.state.SelectedColumn.columnId)) {
                 summaries.push(React.createElement("div", { key: ModuleConstants.CalculatedColumnModuleId, className: this.isModuleReadOnly(ModuleConstants.CalculatedColumnModuleId)
                         ? GeneralConstants.READ_ONLY_STYLE
                         : '' },

package/src/View/GridInfo/GridInfoPopup.js

@@ -25,7 +25,7 @@ const GridInfoPopup = (props) => {
      * Because it is not associated with a module yet, setting this flag to true.
      * Needed for the logic weather to show radio buttons (buttons.length >= 2)
      */
-    const showAdaptableObjects = true;
+    const showAdaptableObjects = entitlementService.isGridInfoSectionVisible('AdaptableObjectsSummary');
     const [state, setState] = React.useState({
         ActiveTab: ((_a = props.popupParams) === null || _a === void 0 ? void 0 : _a.column)
             ? 'ColumnInfo'
@@ -50,18 +50,18 @@ const GridInfoPopup = (props) => {
         var _a;
         const returnRows = [];
         const calcColumns = props.api.calculatedColumnApi
-            .getAllCalculatedColumn()
+            .getCalculatedColumns()
             .map((c) => c.ColumnId);
         const actionColumns = props.api.actionApi
-            .getAllActionColumn()
+            .getActionColumns()
             .map((ac) => ac.columnId);
         const freeTextColumns = props.api.freeTextColumnApi
-            .getAllFreeTextColumn()
+            .getFreeTextColumns()
             .map((c) => c.ColumnId);
-        const columnFilterDescription = props.api.filterApi.columnFiltersToString(props.api.filterApi.getColumnFilters());
+        const columnFilterDescription = props.api.filterApi.internalApi.columnFiltersToString(props.api.filterApi.getColumnFilters());
         const sorts = ArrayExtensions_1.default.IsNotNullOrEmpty(props.api.gridApi.getColumnSorts())
             ? props.api.gridApi.getColumnSorts().map((gs) => {
-                return props.api.columnApi.getFriendlyNameFromColumnId(gs.ColumnId) + ': ' + gs.SortOrder;
+                return props.api.columnApi.getFriendlyNameForColumnId(gs.ColumnId) + ': ' + gs.SortOrder;
             })
             : null;
         const selectedRowInfo = props.api.gridApi.getSelectedRowInfo();

package/src/View/Layout/LayoutRadioSelector.js

@@ -8,7 +8,7 @@ const AdaptableContext_1 = require("../AdaptableContext");
 const LayoutRadioSelector = ({ data }) => {
     const adaptable = (0, AdaptableContext_1.useAdaptable)();
     const currentLayout = adaptable.api.layoutApi.getCurrentLayout();
-    const layouts = adaptable.api.layoutApi.getAllLayout();
+    const layouts = adaptable.api.layoutApi.getLayouts();
     const isDisabled = (layouts === null || layouts === void 0 ? void 0 : layouts.length) === 1;
     const isSelected = currentLayout.Name === data.Name;
     const handleToggle = React.useCallback(() => {

package/src/View/Layout/LayoutStatusBarSubPanelPopover.js

@@ -7,7 +7,7 @@ const SelectList_1 = require("../../components/SelectList");
 const AdaptableContext_1 = require("../AdaptableContext");
 const LayoutStatusBarSubPanelPopover = () => {
     const adaptable = (0, AdaptableContext_1.useAdaptable)();
-    const layouts = adaptable.api.layoutApi.getAllLayout();
+    const layouts = adaptable.api.layoutApi.getLayouts();
     const options = layouts.map((layout) => ({ label: layout.Name, value: layout.Uuid }));
     const handleChange = (option) => {
         adaptable.api.layoutApi.setLayout(option.label);

package/src/View/Layout/LayoutViewPanel.js

@@ -55,7 +55,7 @@ function mapStateToProps(state, ownProps) {
         CurrentLayoutName,
         CurrentDraftLayout: state.Grid.CurrentLayout || selectedLayout,
         Layouts,
-        CanSave: state.Grid.CurrentLayout && !api.layoutApi.areDraftAndCurrentLayoutEqual(),
+        CanSave: state.Grid.CurrentLayout && !api.layoutApi.internalApi.areDraftAndCurrentLayoutEqual(),
     };
 }
 function mapDispatchToProps(dispatch) {

package/src/View/Layout/PivotDetailsPopoup.js

@@ -20,7 +20,7 @@ const PivotDetailsPopoup = (props) => {
     let data = rows;
     const columns = React.useMemo(() => {
         var _a, _b;
-        const getFriendlyName = (columnId) => adaptableApi.columnApi.getFriendlyNameFromColumnId(columnId);
+        const getFriendlyName = (columnId) => adaptableApi.columnApi.getFriendlyNameForColumnId(columnId);
         const pivotPreviewOptionColumn = (_b = (_a = adaptableApi.internalApi.getAdaptableOptions()) === null || _a === void 0 ? void 0 : _a.layoutOptions) === null || _b === void 0 ? void 0 : _b.pivotPreviewColumns;
         let pivotPreviewExtraColumns = [];
         if (typeof pivotPreviewOptionColumn === 'function') {

package/src/View/Layout/SaveLayoutButton.js

@@ -21,7 +21,7 @@ const SaveLayoutButton = () => {
         dispatch(LayoutRedux.LayoutSave(layout));
         dispatch(GridRedux.LayoutUpdateCurrentDraft(null));
     }, []);
-    const isSaveEnabled = currentDraftLayout && !adaptable.api.layoutApi.areDraftAndCurrentLayoutEqual();
+    const isSaveEnabled = currentDraftLayout && !adaptable.api.layoutApi.internalApi.areDraftAndCurrentLayoutEqual();
     if (!isManualSaveLayout) {
         return React.createElement(React.Fragment, null);
     }

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

@@ -21,7 +21,7 @@ const LayoutWizard = (props) => {
     var _a, _b;
     const dispatch = (0, react_redux_1.useDispatch)();
     const adaptable = (0, AdaptableContext_1.useAdaptable)();
-    const allLayouts = adaptable.api.layoutApi.getAllLayout();
+    const allLayouts = adaptable.api.layoutApi.getLayouts();
     const initialLayout = (_a = props.data) !== null && _a !== void 0 ? _a : (_b = props.popupParams) === null || _b === void 0 ? void 0 : _b.value;
     const [layout, setLayout] = React.useState(() => {
         var _a;
@@ -67,7 +67,7 @@ const LayoutWizard = (props) => {
         }
         props.onFinishWizard(layout);
     };
-    const layoutSupportedFeatures = adaptable.api.layoutApi.getLayoutSupportedFeatures();
+    const layoutSupportedFeatures = adaptable.api.layoutApi.internalApi.getLayoutSupportedFeatures();
     return (React.createElement(OnePageAdaptableWizard_1.OnePageAdaptableWizard, { titleContainerStyle: { width: 180 }, defaultCurrentSectionName: props.defaultCurrentSectionName, moduleInfo: props.moduleInfo, data: layout, onHide: props.onCloseWizard, onFinish: handleFinish, sections: [
             {
                 title: 'Settings',

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

@@ -32,7 +32,7 @@ const AggregationsSectionSummary = () => {
     const entires = Object.entries(aggregations !== null && aggregations !== void 0 ? aggregations : {});
     let content = null;
     if (entires.length) {
-        content = (React.createElement(FormLayout_1.default, null, entires.map(([columnId, aggregation]) => (React.createElement(FormLayout_1.FormRow, { key: columnId, label: adaptable.api.columnApi.getFriendlyNameFromColumnId(columnId) },
+        content = (React.createElement(FormLayout_1.default, null, entires.map(([columnId, aggregation]) => (React.createElement(FormLayout_1.FormRow, { key: columnId, label: adaptable.api.columnApi.getFriendlyNameForColumnId(columnId) },
             React.createElement(Tag_1.Tag, null, typeof aggregation === 'object' ? aggregation.type : aggregation))))));
     }
     else {
@@ -92,7 +92,7 @@ const ColumnRow = (props) => {
     let weightName = null;
     if (typeof aggValue === 'object' && aggValue.type === 'weightedAverage') {
         weightName = aggValue.weightedColumnId
-            ? adaptable.api.columnApi.getFriendlyNameFromColumnId(aggValue.weightedColumnId)
+            ? adaptable.api.columnApi.getFriendlyNameForColumnId(aggValue.weightedColumnId)
             : 'Select Weight';
     }
     return (React.createElement(rebass_1.Flex, { alignItems: "center" },
@@ -107,12 +107,12 @@ const AggregationsSection = (props) => {
     var _a, _b;
     const adaptable = (0, AdaptableContext_1.useAdaptable)();
     const { data: layout } = (0, OnePageAdaptableWizard_1.useOnePageAdaptableWizardContext)();
-    const allAggregableColumns = adaptable.api.columnApi.getAggregetableColumns();
+    const allAggregableColumns = adaptable.api.columnApi.getAggregatableColumns();
     const allColumns = adaptable.api.columnApi.getColumns();
     const numberColumns = adaptable.api.columnApi.getNumericColumns();
     const sortedAggregableColumns = React.useMemo(() => {
         var _a, _b;
-        return (0, sortWithOrder_1.sortWithOrderArray)(allAggregableColumns.map((col) => col.columnId), (_b = Object.keys((_a = layout.AggregationColumns) !== null && _a !== void 0 ? _a : {})) !== null && _b !== void 0 ? _b : [], { sortUnorderedItems: false }).map((colId) => adaptable.api.columnApi.getColumnFromId(colId));
+        return (0, sortWithOrder_1.sortWithOrderArray)(allAggregableColumns.map((col) => col.columnId), (_b = Object.keys((_a = layout.AggregationColumns) !== null && _a !== void 0 ? _a : {})) !== null && _b !== void 0 ? _b : [], { sortUnorderedItems: false }).map((colId) => adaptable.api.columnApi.getColumnWithColumnId(colId));
     }, [layout, allAggregableColumns]);
     const handleColumnsSelectionChange = React.useCallback((columnIds) => {
         props.onChange(Object.assign(Object.assign({}, layout), { AggregationColumns: columnIds.reduce((acc, colId) => {

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

@@ -35,7 +35,7 @@ const ColumnsSectionSummary = () => {
                 adaptable.api.columnApi.isAutoRowGroupColumn(columnId)) {
                 return null;
             }
-            const friendlyName = adaptable.api.columnApi.getFriendlyNameFromColumnId(columnId);
+            const friendlyName = adaptable.api.columnApi.getFriendlyNameForColumnId(columnId);
             const header = (_b = (_a = layout.ColumnHeadersMap) === null || _a === void 0 ? void 0 : _a[columnId]) !== null && _b !== void 0 ? _b : '';
             const columnWidth = (_c = layout.ColumnWidthMap) === null || _c === void 0 ? void 0 : _c[columnId];
             const columnPinning = (_d = layout.PinnedColumnsMap) === null || _d === void 0 ? void 0 : _d[columnId];
@@ -138,7 +138,7 @@ const ColumnRow = (props) => {
     const [isExpanded, setIsExpanded] = React.useState(false);
     const adaptable = (0, AdaptableContext_1.useAdaptable)();
     // headers
-    const initialHeader = adaptable.api.columnApi.getFriendlyNameFromColumnId(props.column.columnId);
+    const initialHeader = adaptable.api.columnApi.getFriendlyNameForColumnId(props.column.columnId);
     const customHeader = (_b = (_a = props.layout.ColumnHeadersMap) === null || _a === void 0 ? void 0 : _a[props.column.columnId]) !== null && _b !== void 0 ? _b : '';
     // column pinning
     const columnPinning = ((_c = props.layout.PinnedColumnsMap) === null || _c === void 0 ? void 0 : _c[props.column.columnId]) || 'None';
@@ -192,7 +192,7 @@ const ColumnsSection = (props) => {
     const { data: layout } = (0, OnePageAdaptableWizard_1.useOnePageAdaptableWizardContext)();
     const allColumns = adaptable.api.columnApi.getColumns();
     const sortedColumns = React.useMemo(() => {
-        return (0, sortWithOrder_1.sortWithOrderArray)(allColumns.map((col) => col.columnId), layout.Columns, { sortUnorderedItems: false }).map((colId) => adaptable.api.columnApi.getColumnFromId(colId));
+        return (0, sortWithOrder_1.sortWithOrderArray)(allColumns.map((col) => col.columnId), layout.Columns, { sortUnorderedItems: false }).map((colId) => adaptable.api.columnApi.getColumnWithColumnId(colId));
     }, [layout, allColumns]);
     const handlePinChange = (columnId, pinning) => {
         props.onChange(Object.assign(Object.assign({}, layout), { PinnedColumnsMap: Object.assign(Object.assign({}, layout.PinnedColumnsMap), { [columnId]: pinning }) }));
@@ -202,8 +202,8 @@ const ColumnsSection = (props) => {
     };
     const handleColumnsChange = (columnIds) => {
         var _a, _b;
-        const oldColumns = (_a = layout.Columns.map((colId) => adaptable.api.columnApi.getColumnFromId(colId))) !== null && _a !== void 0 ? _a : [];
-        const newColumns = (_b = columnIds.map((colId) => adaptable.api.columnApi.getColumnFromId(colId))) !== null && _b !== void 0 ? _b : [];
+        const oldColumns = (_a = layout.Columns.map((colId) => adaptable.api.columnApi.getColumnWithColumnId(colId))) !== null && _a !== void 0 ? _a : [];
+        const newColumns = (_b = columnIds.map((colId) => adaptable.api.columnApi.getColumnWithColumnId(colId))) !== null && _b !== void 0 ? _b : [];
         if (!(0, AdaptableColumn_1.isValidOrderForColumnGroups)({ oldColumns, newColumns })) {
             return;
         }

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

@@ -44,7 +44,7 @@ const FilterSection = (props) => {
                 ? Object.assign(Object.assign({}, columnFilter), { Predicate: predicate }) : layoutFilter) }));
     }, [layout.ColumnFilters]);
     const columnsOptions = React.useMemo(() => adaptable.api.columnApi
-        .getFiltrableColumns()
+        .getFilterableColumns()
         .filter(
     // filter out columns with filters already
     (abColumn) => {
@@ -52,7 +52,7 @@ const FilterSection = (props) => {
         return !((_a = layout.ColumnFilters) === null || _a === void 0 ? void 0 : _a.some((columnFilter) => abColumn.columnId === columnFilter.ColumnId));
     })
         .map(({ columnId }) => ({
-        label: adaptable.api.columnApi.getFriendlyNameFromColumnId(columnId),
+        label: adaptable.api.columnApi.getFriendlyNameForColumnId(columnId),
         onClick: () => {
             props.onChange(Object.assign(Object.assign({}, layout), { ColumnFilters: [
                     ...layoutFilters,

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

@@ -15,7 +15,7 @@ const PivotColumnsSectionSummary = () => {
     var _a;
     const adaptable = (0, AdaptableContext_1.useAdaptable)();
     const { data: layout } = (0, OnePageAdaptableWizard_1.useOnePageAdaptableWizardContext)();
-    return (React.createElement(rebass_1.Box, { p: 2, style: { borderRadius: 'var(--ab__border-radius)' }, backgroundColor: "var(--ab-color-defaultbackground)" }, ((_a = layout.PivotColumns) === null || _a === void 0 ? void 0 : _a.length) ? (layout.PivotColumns.map((columnId) => (React.createElement(Tag_1.Tag, { mr: 1, key: columnId }, adaptable.api.columnApi.getFriendlyNameFromColumnId(columnId))))) : (React.createElement(Tag_1.Tag, null, "No Column Pivoting"))));
+    return (React.createElement(rebass_1.Box, { p: 2, style: { borderRadius: 'var(--ab__border-radius)' }, backgroundColor: "var(--ab-color-defaultbackground)" }, ((_a = layout.PivotColumns) === null || _a === void 0 ? void 0 : _a.length) ? (layout.PivotColumns.map((columnId) => (React.createElement(Tag_1.Tag, { mr: 1, key: columnId }, adaptable.api.columnApi.getFriendlyNameForColumnId(columnId))))) : (React.createElement(Tag_1.Tag, null, "No Column Pivoting"))));
 };
 exports.PivotColumnsSectionSummary = PivotColumnsSectionSummary;
 const PivotColumnsSection = (props) => {
@@ -25,7 +25,7 @@ const PivotColumnsSection = (props) => {
     const allPivotColumns = adaptable.api.columnApi.getPivotableColumns();
     const sortedPivotColumns = React.useMemo(() => {
         var _a;
-        return (0, sortWithOrder_1.sortWithOrderArray)(allPivotColumns.map((col) => col.columnId), (_a = layout.PivotColumns) !== null && _a !== void 0 ? _a : [], { sortUnorderedItems: false }).map((colId) => adaptable.api.columnApi.getColumnFromId(colId));
+        return (0, sortWithOrder_1.sortWithOrderArray)(allPivotColumns.map((col) => col.columnId), (_a = layout.PivotColumns) !== null && _a !== void 0 ? _a : [], { sortUnorderedItems: false }).map((colId) => adaptable.api.columnApi.getColumnWithColumnId(colId));
     }, [layout, allPivotColumns]);
     const handleColumnsChange = (columnIds) => {
         props.onChange(Object.assign(Object.assign({}, layout), { PivotColumns: columnIds }));

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

@@ -16,7 +16,7 @@ const RowGroupingSectionSummary = () => {
     var _a;
     const adaptable = (0, AdaptableContext_1.useAdaptable)();
     const { data: layout } = (0, OnePageAdaptableWizard_1.useOnePageAdaptableWizardContext)();
-    return (React.createElement(rebass_1.Box, null, ((_a = layout.RowGroupedColumns) === null || _a === void 0 ? void 0 : _a.length) ? (layout.RowGroupedColumns.map((columnId) => (React.createElement(Tag_1.Tag, { mr: 1, key: columnId }, adaptable.api.columnApi.getFriendlyNameFromColumnId(columnId))))) : (React.createElement(Tag_1.Tag, null, "No Row Grouping"))));
+    return (React.createElement(rebass_1.Box, null, ((_a = layout.RowGroupedColumns) === null || _a === void 0 ? void 0 : _a.length) ? (layout.RowGroupedColumns.map((columnId) => (React.createElement(Tag_1.Tag, { mr: 1, key: columnId }, adaptable.api.columnApi.getFriendlyNameForColumnId(columnId))))) : (React.createElement(Tag_1.Tag, null, "No Row Grouping"))));
 };
 exports.RowGroupingSectionSummary = RowGroupingSectionSummary;
 const RowGroupingSection = (props) => {
@@ -26,7 +26,7 @@ const RowGroupingSection = (props) => {
     const allGroupableColumns = adaptable.api.columnApi.getGroupableColumns();
     const sortedGroupableColumns = React.useMemo(() => {
         var _a;
-        return (0, sortWithOrder_1.sortWithOrderArray)(allGroupableColumns.map((col) => col.columnId), (_a = layout.RowGroupedColumns) !== null && _a !== void 0 ? _a : [], { sortUnorderedItems: false }).map((colId) => adaptable.api.columnApi.getColumnFromId(colId));
+        return (0, sortWithOrder_1.sortWithOrderArray)(allGroupableColumns.map((col) => col.columnId), (_a = layout.RowGroupedColumns) !== null && _a !== void 0 ? _a : [], { sortUnorderedItems: false }).map((colId) => adaptable.api.columnApi.getColumnWithColumnId(colId));
     }, [layout, allGroupableColumns]);
     const handleColumnsChange = (columnIds) => {
         props.onChange(Object.assign(Object.assign({}, layout), { RowGroupedColumns: columnIds }));

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

@@ -35,7 +35,7 @@ const SortSection = (props) => {
     const allSortableColumns = adaptable.api.columnApi.getSortableColumns();
     const sortedSortColumns = React.useMemo(() => {
         var _a;
-        return (0, sortWithOrder_1.sortWithOrderArray)(allSortableColumns.map((col) => col.columnId), ((_a = layout.ColumnSorts) !== null && _a !== void 0 ? _a : []).map((sort) => sort.ColumnId), { sortUnorderedItems: false }).map((colId) => adaptable.api.columnApi.getColumnFromId(colId));
+        return (0, sortWithOrder_1.sortWithOrderArray)(allSortableColumns.map((col) => col.columnId), ((_a = layout.ColumnSorts) !== null && _a !== void 0 ? _a : []).map((sort) => sort.ColumnId), { sortUnorderedItems: false }).map((colId) => adaptable.api.columnApi.getColumnWithColumnId(colId));
     }, [layout, allSortableColumns]);
     const handleColumnsSelectionChange = React.useCallback((columnIds) => {
         props.onChange(Object.assign(Object.assign({}, layout), { ColumnSorts: (columnIds || []).map((columnId) => {

package/src/View/PlusMinus/Wizard/PlusMinusSettingsWizardSection.d.ts

@@ -4,7 +4,7 @@ import { PlusMinusNudge, AdaptableApi } from '../../../types';
 export declare const PlusMinusSettingsSummary: React.FunctionComponent<{
     hasCondition: boolean;
 }>;
-export declare const isSettingsValid: (hasCondition: boolean) => (data: PlusMinusNudge, api: AdaptableApi, context: OnePageAdaptableWizardContextType<PlusMinusNudge>) => true | "No valid Condition is specified" | "The Predicate is not valid" | "The Expression is not a valid Boolean Expression" | "Nudge value is not specified" | "Nudge value must be different than 0";
+export declare const isSettingsValid: (hasCondition: boolean) => (data: PlusMinusNudge, api: AdaptableApi, context: OnePageAdaptableWizardContextType<PlusMinusNudge>) => true | "The Expression is not a valid Boolean Expression" | "No valid Condition is specified" | "The Predicates are not valid" | "Nudge value is not specified" | "Nudge value must be different than 0";
 interface PlusMinusSettingsWizardSectionProps {
     onChange: (plusMinusNudge: PlusMinusNudge) => void;
     hasCondition: boolean;

package/src/View/PlusMinus/Wizard/PlusMinusSettingsWizardSection.js

@@ -10,7 +10,7 @@ const FormLayout_1 = tslib_1.__importStar(require("../../../components/FormLayou
 const Tabs_1 = require("../../../components/Tabs");
 const OnePageAdaptableWizard_1 = require("../../Wizard/OnePageAdaptableWizard");
 const PlusMinusRuleWizardSection_1 = require("./PlusMinusRuleWizardSection");
-const EntityRulesEditor_1 = require("../../Components/EntityRulesEditor");
+const Utilities_1 = require("../../Components/EntityRulesEditor/Utilities");
 const OnePageAdaptableWizard_2 = require("../../../View/Wizard/OnePageAdaptableWizard");
 const Tag_1 = require("../../../components/Tag");
 const PlusMinusSettingsSummary = (props) => {
@@ -24,7 +24,7 @@ const PlusMinusSettingsSummary = (props) => {
 };
 exports.PlusMinusSettingsSummary = PlusMinusSettingsSummary;
 const isSettingsValid = (hasCondition) => (data, api, context) => {
-    const ruleValidation = hasCondition ? (0, EntityRulesEditor_1.isRuleValid)(data, api, context) : true;
+    const ruleValidation = hasCondition ? (0, Utilities_1.isRuleValid)(data, api, context) : true;
     if (typeof ruleValidation === 'string') {
         return ruleValidation;
     }

package/src/View/Query/ExpandedQueryPopup.js

@@ -32,7 +32,7 @@ const ExpandedQueryPopup = (props) => {
             },
         } },
         React.createElement(rebass_1.Flex, { height: "100%", flexDirection: "column" },
-            React.createElement(ExpressionEditor_1.ExpressionEditor, { type: 'boolean', module: ModuleConstants_1.QueryModuleId, value: expression, onChange: (expression) => setExpression(expression), initialData: initialData, columns: props.api.columnApi.getQueryableColumns(), namedQueries: props.api.queryApi.getAllNamedQuery(), api: props.api }),
+            React.createElement(ExpressionEditor_1.ExpressionEditor, { type: 'boolean', module: ModuleConstants_1.QueryModuleId, value: expression, onChange: (expression) => setExpression(expression), initialData: initialData, columns: props.api.columnApi.getQueryableColumns(), namedQueries: props.api.queryApi.getNamedQueries(), api: props.api }),
             React.createElement(rebass_1.Flex, { flexDirection: "row", padding: 1, backgroundColor: "primary", alignItems: "center" },
                 React.createElement(SimpleButton_1.default, { margin: 1, variant: "text", "data-name": "action-close", onClick: () => {
                         props.onDismiss();

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

@@ -32,6 +32,6 @@ const NamedQueryExpressionWizardSection = (props) => {
     const initialData = (0, react_1.useMemo)(() => api.internalApi.getQueryPreviewData(), []);
     return (React.createElement(ExpressionEditor_1.ExpressionEditor, { allowSaveNamedQuery: false, type: 'boolean', module: moduleInfo.ModuleName, value: data.BooleanExpression, onChange: (BooleanExpression) => {
             props.onChange(Object.assign(Object.assign({}, data), { BooleanExpression }));
-        }, initialData: initialData, columns: api.columnApi.getQueryableColumns(), namedQueries: api.queryApi.getAllNamedQuery(), api: api }));
+        }, initialData: initialData, columns: api.columnApi.getQueryableColumns(), namedQueries: api.queryApi.getNamedQueries(), api: api }));
 };
 exports.NamedQueryExpressionWizardSection = NamedQueryExpressionWizardSection;

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

@@ -12,12 +12,12 @@ const ScheduleSettingsOpenFin_1 = require("./ScheduleSettingsOpenFin");
 const ScheduleSettingsGlue42_1 = require("./ScheduleSettingsGlue42");
 const ScheduleSettingsWizard = (props) => {
     const { data, api } = (0, OnePageAdaptableWizard_1.useOnePageAdaptableWizardContext)();
-    const allReports = api.exportApi.getAllReports();
+    const allReports = api.exportApi.getReports();
     if ((data === null || data === void 0 ? void 0 : data.ScheduleType) === Enums_1.ScheduleType.Reminder) {
         return (React.createElement(ScheduleSettingsReminder_1.ScheduleSettingsReminder, { reminderSchedule: data, onChange: props.onChange }));
     }
     if ((data === null || data === void 0 ? void 0 : data.ScheduleType) === Enums_1.ScheduleType.Report) {
-        const customDestinations = api.exportApi.getAllCustomDestination();
+        const customDestinations = api.exportApi.getCustomDestinations();
         return (React.createElement(ScheduleSettingsReport_1.ScheduleSettingsReport, { allReports: allReports !== null && allReports !== void 0 ? allReports : [], customDestinations: customDestinations || [], report: data, onChange: props.onChange }));
     }
     if ((data === null || data === void 0 ? void 0 : data.ScheduleType) === Enums_1.ScheduleType.ipushpull) {

package/src/View/Shortcut/Wizard/ShortcutWizard.js

@@ -24,7 +24,7 @@ const ShortcutWizard = (props) => {
     });
     const adaptable = (0, AdaptableContext_1.useAdaptable)();
     const availableKeys = React.useMemo(() => {
-        const availableKeys = shortcutKeys_1.shortcutKeys.filter((key) => adaptable.api.shortcutApi.getAllShortcut().every((shortcut) => shortcut.ShortcutKey !== key));
+        const availableKeys = shortcutKeys_1.shortcutKeys.filter((key) => adaptable.api.shortcutApi.getShortcuts().every((shortcut) => shortcut.ShortcutKey !== key));
         if (shortcut) {
             availableKeys.push(shortcut.ShortcutKey);
         }

package/src/View/SmartEdit/SmartEditViewPanel.js

@@ -41,7 +41,7 @@ class SmartEditViewPanelComponent extends React.Component {
     render() {
         let statusColour = this.getStatusColour();
         let selectedColumn = StringExtensions_1.StringExtensions.IsNotNullOrEmpty(this.state.SelectedColumnId)
-            ? this.props.api.columnApi.getColumnFromId(this.state.SelectedColumnId)
+            ? this.props.api.columnApi.getColumnWithColumnId(this.state.SelectedColumnId)
             : null;
         let previewPanel = (React.createElement(PreviewResultsPanel_1.PreviewResultsPanel, { previewInfo: this.props.PreviewInfo, api: this.props.api, selectedColumn: selectedColumn, showPanel: true, showHeader: false }));
         const operationMenuItems = EnumExtensions_1.EnumExtensions.getNames(Enums_1.MathOperation).map((mathOperation, index) => {

package/src/View/StatusBar/StatusBarPanel.js

@@ -41,7 +41,7 @@ const StatusBarPanel = (props) => {
         : content;
     return (React.createElement(rebass_1.Flex, Object.assign({}, flexProps, { alignItems: "center", justifyContent: "center", className: baseClassName, onClick: handleWrapperClick, style: { cursor: shouldTriggerActionOnWrapperClick ? 'pointer' : 'default' } }),
         props.icon && (React.createElement(SimpleButton_1.default, { tooltip: tooltip, color: props.color, icon: props.icon, iconSize: 15, variant: "text", onClick: handleIconClick, mr: preparedContent ? 1 : 0 })),
-        popover ? (React.createElement(AdaptablePopover_1.AdaptablePopover, { tooltipText: tooltip, showIcon: false, bodyText: [popoverContent], MessageType: 'Info', showEvent: 'focus', hideEvent: "blur", popoverMinWidth: popoverMinWidth }, preparedContent)) : (preparedContent),
+        popover ? (React.createElement(AdaptablePopover_1.AdaptablePopover, { alignPosition: [['BottomCenter', 'TopCenter']], tooltipText: tooltip, showIcon: false, bodyText: [popoverContent], MessageType: 'Info', showEvent: 'focus', hideEvent: "blur", popoverMinWidth: popoverMinWidth }, preparedContent)) : (preparedContent),
         ArrayExtensions_1.default.IsNotNullOrEmpty(extraActions) && (React.createElement(rebass_1.Box, { ml: 1 }, (_a = extraActions === null || extraActions === void 0 ? void 0 : extraActions.map) === null || _a === void 0 ? void 0 : _a.call(extraActions, (action, index) => React.createElement(action, { key: index }))))));
 };
 exports.StatusBarPanel = StatusBarPanel;

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

@@ -215,7 +215,7 @@ const SparklineObjectNumberArrayProperties = (props) => {
             let currentRow = 0;
             while (!cellData || currentRow < MAX_ROWS_TO_CHECK) {
                 const rowWithData = (_a = api.gridApi.getRowNodeForIndex(currentRow)) === null || _a === void 0 ? void 0 : _a.data;
-                const column = api.columnApi.getColumnFromId(data.ColumnId);
+                const column = api.columnApi.getColumnWithColumnId(data.ColumnId);
                 if ((_b = rowWithData === null || rowWithData === void 0 ? void 0 : rowWithData[column === null || column === void 0 ? void 0 : column.field]) === null || _b === void 0 ? void 0 : _b[0]) {
                     cellData = (_c = rowWithData === null || rowWithData === void 0 ? void 0 : rowWithData[column === null || column === void 0 ? void 0 : column.field]) === null || _c === void 0 ? void 0 : _c[0];
                     break;
@@ -257,7 +257,7 @@ const StyledColumnSparklineSettingsSection = (props) => {
         const newOptions = (0, ObjectExtensions_1.setInPath)((_a = data.SparkLineStyle.options) !== null && _a !== void 0 ? _a : {}, path, value);
         props.onChange(Object.assign(Object.assign({}, data), { SparkLineStyle: Object.assign(Object.assign({}, data.SparkLineStyle), { options: newOptions }) }));
     }, [data]);
-    const isObjectNumberArray = ((_a = api.columnApi.getColumnFromId(data.ColumnId)) === null || _a === void 0 ? void 0 : _a.dataType) === 'ObjectNumberArray';
+    const isObjectNumberArray = ((_a = api.columnApi.getColumnWithColumnId(data.ColumnId)) === null || _a === void 0 ? void 0 : _a.dataType) === 'ObjectNumberArray';
     return (React.createElement(React.Fragment, null,
         React.createElement(Tabs_1.Tabs, { mb: 2 },
             React.createElement(Tabs_1.Tabs.Tab, null, "Settings"),

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

@@ -15,6 +15,7 @@ const StyledColumnWizardStyleSection_1 = require("./StyledColumnWizardStyleSecti
 const Helper_1 = require("../../../Utilities/Helpers/Helper");
 const StyledColumnWizardSettingsSection_1 = require("./StyledColumnWizardSettingsSection");
 const StyledColumnSparklineSettingsSection_1 = require("./StyledColumnSparklineSettingsSection");
+const ObjectTagsWizardSection_1 = require("../../Wizard/ObjectTagsWizardSection");
 const StyledColumnWizard = (props) => {
     var _a, _b;
     const data = (_a = props.data) !== null && _a !== void 0 ? _a : (_b = props.popupParams) === null || _b === void 0 ? void 0 : _b.value;
@@ -83,6 +84,14 @@ const StyledColumnWizard = (props) => {
                 title: 'Column',
             },
             ...(styledColumn.SparkLineStyle ? sparklineSteps : checkboxGrandientPercentSteps),
+            {
+                details: 'Select Format Column tags',
+                title: 'Tags',
+                isVisible: (_, api) => api.internalApi.shouldDisplayTagSections(),
+                render: () => (React.createElement(rebass_1.Box, { padding: 2 },
+                    React.createElement(ObjectTagsWizardSection_1.ObjectTagsWizardSection, { onChange: setStyledColumn }))),
+                renderSummary: ObjectTagsWizardSection_1.renderObjectTagsSummary,
+            },
             '-',
             {
                 title: 'Summary',

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

@@ -14,7 +14,7 @@ const renderStyledColumnColumnSummary = (data) => {
         "Styled Column column:",
         ' ',
         React.createElement(Tag_1.Tag, null, data.ColumnId
-            ? api.columnApi.getFriendlyNameFromColumnId(data.ColumnId)
+            ? api.columnApi.getFriendlyNameForColumnId(data.ColumnId)
             : 'No Column Selected')));
 };
 exports.renderStyledColumnColumnSummary = renderStyledColumnColumnSummary;
@@ -37,7 +37,7 @@ const StyledColumnWizardColumnSection = (props) => {
                     ...api.columnApi.getObjectNumberArrayColumns(),
                 ]
                 : api.columnApi.getNumericColumns();
-        const styledColumns = api.styledColumnApi.getAllStyledColumn();
+        const styledColumns = api.styledColumnApi.getStyledColumns();
         const usedColumnIds = styledColumns
             .map((styledColumn) => {
             // filter out current styled column columnID

package/src/View/StyledColumn/Wizard/StyledColumnWizardStyleSection/Components/PercentBarColumnComparisonPreview.d.ts

@@ -0,0 +1,5 @@
+import * as React from 'react';
+import { PercentBarStyle } from '../../../../../types';
+export declare const PercentBarColumnComparisonPreview: React.FunctionComponent<{
+    percentBarStyle: PercentBarStyle;
+}>;