@adaptabletools/adaptable 20.2.6 → 20.2.8

package/src/Redux/ActionsReducers/LayoutRedux.d.ts

@@ -171,7 +171,6 @@ export interface LayoutReadyAction extends Redux.Action {
 export declare const LayoutAdd: (layout: Layout) => LayoutAddAction;
 export declare const LayoutDelete: (layout: Layout) => LayoutDeleteAction;
 export declare const LayoutSave: (layout: Layout) => LayoutSaveAction;
-export declare const LayoutSetColumnCaption: (layoutName: string, columnId: string, caption: string) => LayoutSetColumnCaptionAction;
 export declare const LayoutAddColumn: (layoutName: string, columnId: string) => LayoutAddColumnAction;
 export declare const LayoutRemoveColumn: (layoutName: string, columnId: string) => LayoutRemoveColumnAction;
 export declare const LayoutSelect: (layoutName: string) => LayoutSelectAction;

package/src/Redux/ActionsReducers/LayoutRedux.js

@@ -148,12 +148,6 @@ export const LayoutSave = (layout) => ({
     type: LAYOUT_SAVE,
     layout: normalizeLayout(layout),
 });
-export const LayoutSetColumnCaption = (layoutName, columnId, caption) => ({
-    type: LAYOUT_COLUMN_SET_CAPTION,
-    layoutName,
-    columnId,
-    caption,
-});
 export const LayoutAddColumn = (layoutName, columnId) => ({
     type: LAYOUT_COLUMN_ADD,
     layoutName,
@@ -243,22 +237,6 @@ export const LayoutReducer = (state = initialState, action) => {
                 Layouts: newLayouts,
             };
         }
-        case LAYOUT_COLUMN_SET_CAPTION: {
-            const setColumnCaptionAction = action;
-            const currentLayoutName = setColumnCaptionAction.layoutName;
-            let currentLayout = state.Layouts.find((l) => l.Name === currentLayoutName);
-            if (currentLayout) {
-                if (!currentLayout.ColumnHeaders) {
-                    currentLayout.ColumnHeaders = {};
-                }
-                currentLayout.ColumnHeaders[setColumnCaptionAction.columnId] =
-                    setColumnCaptionAction.caption;
-                return Object.assign({}, state, {
-                    Layouts: state.Layouts.map((abObject) => abObject.Uuid === currentLayout.Uuid ? currentLayout : abObject),
-                });
-            }
-            return state;
-        }
         case LAYOUT_COLUMN_ADD: {
             const addColumnAction = action;
             const layoutname = addColumnAction.layoutName;

package/src/Redux/Store/AdaptableStore.js

@@ -881,7 +881,6 @@ const adaptableMiddleware = (adaptable) => (function(middlewareAPI) {
                 case LayoutRedux.LAYOUT_EDIT:
                 case LayoutRedux.LAYOUT_SAVE:
                 case LayoutRedux.LAYOUT_DELETE:
-                case LayoutRedux.LAYOUT_COLUMN_SET_CAPTION:
                 case LayoutRedux.LAYOUT_SELECT: {
                     const oldLayoutState = middlewareAPI.getState().Layout;
                     // this must be called before 'next(action)'
@@ -907,8 +906,7 @@ const adaptableMiddleware = (adaptable) => (function(middlewareAPI) {
                         adaptable.applyFiltering();
                     }
                     if (returnAction.type == LayoutRedux.LAYOUT_SELECT ||
-                        returnAction.type == LayoutRedux.LAYOUT_DELETE ||
-                        returnAction.type == LayoutRedux.LAYOUT_COLUMN_SET_CAPTION) {
+                        returnAction.type == LayoutRedux.LAYOUT_DELETE) {
                         // tell AdapTable the Layout has been selected
                         if (newLayout) {
                             adaptable.updateLayoutInManagerAfterStoreHasChanged(newLayout);

package/src/Strategy/LayoutModule.js

@@ -42,7 +42,7 @@ export class LayoutModule extends AdaptableModuleBase {
     }
     getExplicitlyReferencedColumnIds(layout) {
         const columnIds = [];
-        if (layout.TableColumns) {
+        if (!isPivotLayout(layout) && layout.TableColumns) {
             const visibility = layout.ColumnVisibility || {};
             columnIds.push(...layout.TableColumns.filter((colId) => {
                 return visibility[colId] !== false;

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

@@ -13,7 +13,8 @@ export function ReorderDraggable(props) {
             return (React.createElement(Flex, { className: `${baseClassName}__option`, alignItems: "center", mt: index ? 1 : 0, key: identifier ?? index, backgroundColor: 'primary', padding: 2, "data-index": index, "data-id": identifier, "data-name": "option", ...flexProps },
                 React.createElement(Flex, { flex: 1, flexDirection: "row", alignItems: "center" },
                     reorderable ? (React.createElement(Box, { mr: 3, ...dragHandleProps },
-                        React.createElement(Icon, { name: "drag", style: { cursor: 'grab' } }))) : null,
+                        React.createElement(Icon, { name: "drag", style: { cursor: 'grab' } }))) : (React.createElement(Box, { mr: 3 },
+                        React.createElement(Icon, { name: "drag", style: { cursor: 'not-allowed', opacity: 0.3 } }))),
                     props.renderOption(option, index))));
         };
         const reorderable = isOptionDraggable ? isOptionDraggable(option) : true;

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

@@ -23,6 +23,7 @@ import { AdaptableFormControlTextClear } from '../../../Components/Forms/Adaptab
 import { sortColumnIdsByOrder } from '../../../../layout-manager/src/sortColumnIdsByOrder';
 import HelpBlock from '../../../../components/HelpBlock';
 import { AG_GRID_SELECTION_COLUMN } from '../../../../Utilities/Constants/GeneralConstants';
+import { isPivotLayout } from '../../../../Utilities/isPivotLayout';
 const PropertyOrderText = (props) => (React.createElement(Text, { fontWeight: 600, fontSize: 2 }, props.children));
 const columnTypes = {
     default: {
@@ -156,7 +157,8 @@ const ColumnRow = (props) => {
     const { column } = props;
     // width
     const columnWidth = props.layout.ColumnWidths?.[column.columnId];
-    const visible = (props.layout.TableColumns.includes(column.columnId) &&
+    const visible = (!isPivotLayout(props.layout) &&
+        props.layout.TableColumns.includes(column.columnId) &&
         props.layout.ColumnVisibility?.[column.columnId] !== false) ||
         isRowGroupColumn;
     return (React.createElement(Box, { "data-name": props.column.columnId, className: "ab-Layout-Wizard__ColumnRow" },
@@ -376,7 +378,9 @@ export const ColumnsSection = (props) => {
                 React.createElement(Box, null,
                     React.createElement(NaturallySizedIcon, { name: "info" })),
                 React.createElement(Text, { ml: 1 }, "Expand each Column to set Width, Pinnning and a custom Header")),
-            React.createElement(ReorderDraggable, { toIdentifier: (option) => `${option.columnId}`, order: currentOrder, renderOption: (option) => {
+            React.createElement(ReorderDraggable, { toIdentifier: (option) => `${option.columnId}`, isOptionDraggable: (option) => {
+                    return option.moveable;
+                }, order: currentOrder, renderOption: (option) => {
                     return (React.createElement(ColumnRow, { onColumnNameChange: handleColumnNameChange, onColumnWidthChange: handleColumnWidthChange, onColumnVisibilityChange: handleColumnVisibilityChange, onPinChange: handlePinChange, layout: layout, column: option }));
                 }, onChange: handleColumnsChange }),
             renderSelectionSection({

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

@@ -22,7 +22,7 @@ export const PivotRowGroupingSection = (props) => {
     const { data: layout } = useOnePageAdaptableWizardContext();
     const allGroupableColumns = adaptable.api.columnApi.getGroupableColumns();
     const sortedGroupableColumns = React.useMemo(() => {
-        return ArrayExtensions.sortArrayWithOrder(allGroupableColumns.map((col) => col.columnId), layout.RowGroupedColumns ?? [], { sortUnorderedItems: false }).map((colId) => adaptable.api.columnApi.getColumnWithColumnId(colId));
+        return ArrayExtensions.sortArrayWithOrder(allGroupableColumns.map((col) => col.columnId), layout.PivotGroupedColumns ?? [], { sortUnorderedItems: false }).map((colId) => adaptable.api.columnApi.getColumnWithColumnId(colId));
     }, [layout, allGroupableColumns]);
     const onChange = (layout) => {
         props.onChange(normalizeLayout(layout));

package/src/View/StateManagement/components/ExportDropdown.js

@@ -5,7 +5,7 @@ export const ExportDropdown = (props) => {
     const handleChange = (destination) => {
         switch (props.type) {
             case 'adaptableState':
-                const adaptableState = props.api.stateApi.getPersistedState();
+                const adaptableState = props.api.stateApi.getPersistentState();
                 handleExportState(destination, 'adaptableState', adaptableState);
                 break;
             case 'initialState':

package/src/agGrid/AdaptableAgGrid.js

@@ -3127,6 +3127,7 @@ You need to define at least one Layout!`);
                 }
             }
         }
+        const prevLayout = this._prevLayout;
         this._prevLayout = layout;
         const perfSetLayout = this.logger.beginPerf(`setLayout(${layout.Name})`);
         const isPivot = isPivotLayout(layout);
@@ -3149,7 +3150,10 @@ You need to define at least one Layout!`);
         // need to refresh the header,
         // as the Layout.ColumnHeaders state property is not implemented in the LayoutManager
         // and is specific to Adaptable, therefore we need to refresh it manually
-        this.refreshHeader();
+        if (!prevLayout ||
+            JSON.stringify(prevLayout.ColumnHeaders) !== JSON.stringify(layout.ColumnHeaders)) {
+            this.refreshHeader();
+        }
         const layoutModel = layoutStateToLayoutModel(layout);
         this.layoutManager?.setLayout(layoutModel, {
             skipApplyRowGroupsExpandedState: !shouldUpdateExpandState,

package/src/agGrid/AgGridAdapter.js

@@ -621,8 +621,8 @@ export class AgGridAdapter {
         return false;
     }
     isColumnSortable(colDef) {
-        if (colDef && colDef.sortable != null) {
-            return colDef.sortable;
+        if (colDef) {
+            return colDef.sortable ?? true;
         }
         return false;
     }

package/src/env.js

@@ -1,5 +1,5 @@
 export default {
     NEXT_PUBLIC_INFINITE_TABLE_LICENSE_KEY: "StartDate=2021-06-29|EndDate=2030-01-01|Owner=Adaptable|Type=distribution|TS=1624971462479|C=137829811,1004007071,2756196225,1839832928,3994409405,636616862" || '',
-    PUBLISH_TIMESTAMP: 1751633635859 || Date.now(),
-    VERSION: "20.2.6" || '--current-version--',
+    PUBLISH_TIMESTAMP: 1752148694307 || Date.now(),
+    VERSION: "20.2.8" || '--current-version--',
 };

package/src/layout-manager/src/LayoutManagerModel.d.ts

@@ -40,10 +40,6 @@ export interface BaseLayoutModel {
      * Same as RowSummaries, but for Pivot Layout
      */
     Ignore_RowSummaries?: any;
-    /**
-     * Same as above, but
-     */
-    Ignore_Name?: string;
     /**
      * Same as above, but for Column Headers
      */
@@ -51,6 +47,10 @@ export interface BaseLayoutModel {
     Ignore_Source?: string;
     Ignore_AdaptableVersion?: string;
     Ignore_Uuid?: string;
+    /**
+     * The Layout Name
+     */
+    Name?: string;
     ColumnVisibility?: {
         [columnId: string]: false;
     };

package/src/layout-manager/src/index.js

@@ -276,7 +276,7 @@ export class LayoutManager extends LMEmitter {
         }
         delete layout.TableColumns;
         const pivotLayout = {
-            Ignore_Name: layout.Ignore_Name,
+            Name: layout.Name,
             Ignore_GridFilter: layout.Ignore_GridFilter,
             Ignore_ColumnFilters: layout.Ignore_ColumnFilters,
             Ignore_ColumnHeaders: layout.Ignore_ColumnHeaders,
@@ -595,7 +595,7 @@ export class LayoutManager extends LMEmitter {
             }
         }
         const layout = simplifyTableLayoutModel({
-            Ignore_Name: this.currentLayout?.Ignore_Name || 'Default',
+            Name: this.currentLayout?.Name || 'Default',
             Ignore_GridFilter: this.currentLayout?.Ignore_GridFilter,
             Ignore_ColumnFilters: this.currentLayout?.Ignore_ColumnFilters,
             Ignore_ColumnHeaders: this.currentLayout?.Ignore_ColumnHeaders,

package/src/layout-manager/src/isLayoutEqual.js

@@ -49,7 +49,6 @@ export function isTableLayoutEqual(l1, l2) {
 function clearIgnoredProperties(layout) {
     delete layout.Ignore_GridFilter;
     delete layout.Ignore_ColumnFilters;
-    delete layout.Ignore_Name;
     delete layout.Ignore_ColumnHeaders;
     delete layout.Ignore_AutoSizeColumns;
     delete layout.Ignore_RowSummaries;

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

@@ -5644,13 +5644,13 @@ export declare const ADAPTABLE_METAMODEL: {
             kind: string;
             desc: string;
             isOpt: boolean;
-            ref?: undefined;
+            ref: string;
         } | {
             name: string;
             kind: string;
             desc: string;
             isOpt: boolean;
-            ref: string;
+            ref?: undefined;
         } | {
             name: string;
             kind: string;