@adaptabletools/adaptable 13.0.4-canary.2 → 13.0.5

package/src/Utilities/Defaults/DefaultSettingsPanel.js

@@ -14,27 +14,30 @@ exports.DEFAULT_NAVIGATION_ITEMS = [
     'Dashboard',
     'ToolPanel',
     'StatusBar',
-    'StateManagement',
     '-',
-    'Alert',
+    'Layout',
+    'Export',
     'CalculatedColumn',
+    'FreeTextColumn',
     'CustomSort',
-    'DataSet',
-    'Export',
-    'Filter',
-    'FlashingCell',
+    'Alert',
+    'SystemStatus',
+    '-',
+    'StyledColumn',
     'FormatColumn',
-    'FreeTextColumn',
-    'Layout',
-    'PlusMinus',
-    'Query',
+    'FlashingCell',
+    'Theme',
+    '-',
     'QuickSearch',
-    'Schedule',
-    'Shortcut',
-    'StyledColumn',
+    'Query',
+    'Filter',
+    'DataSet',
     '-',
-    'SystemStatus',
+    'PlusMinus',
+    'Shortcut',
     'DataChangeHistory',
+    '-',
+    'Schedule',
+    'StateManagement',
     'TeamSharing',
-    'Theme',
 ];

package/src/View/Components/Popups/WindowPopups/windowFactory.d.ts

@@ -1,4 +1,5 @@
 /// <reference types="react" />
 import { WindowPopupChildProps } from './WindowPopups';
 export declare const WINDOW_QUERY_EDITOR = "WINDOW_QUERY_EDITOR";
+export declare const SHOW_PIVOT_COLUMN_DETAILS = "SHOW_PIVOT_COLUMN_DETAILS";
 export declare const windowFactory: Record<string, React.FunctionComponent<WindowPopupChildProps>>;

package/src/View/Components/Popups/WindowPopups/windowFactory.js

@@ -1,8 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.windowFactory = exports.WINDOW_QUERY_EDITOR = void 0;
+exports.windowFactory = exports.SHOW_PIVOT_COLUMN_DETAILS = exports.WINDOW_QUERY_EDITOR = void 0;
 const ExpandedQueryPopup_1 = require("../../../Query/ExpandedQueryPopup");
+const PivotDetailsPopoup_1 = require("../../../Layout/PivotDetailsPopoup");
 exports.WINDOW_QUERY_EDITOR = 'WINDOW_QUERY_EDITOR';
+exports.SHOW_PIVOT_COLUMN_DETAILS = 'SHOW_PIVOT_COLUMN_DETAILS';
 exports.windowFactory = {
     [exports.WINDOW_QUERY_EDITOR]: ExpandedQueryPopup_1.ExpandedQueryPopup,
+    [exports.SHOW_PIVOT_COLUMN_DETAILS]: PivotDetailsPopoup_1.PivotDetailsPopoup,
 };

package/src/View/Layout/PivotDetailsPopoup.d.ts

@@ -0,0 +1,3 @@
+import * as React from 'react';
+import { WindowPopupChildProps } from '../Components/Popups/WindowPopups/WindowPopups';
+export declare const PivotDetailsPopoup: React.FunctionComponent<WindowPopupChildProps>;

package/src/View/Layout/PivotDetailsPopoup.js

@@ -0,0 +1,43 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.PivotDetailsPopoup = void 0;
+const tslib_1 = require("tslib");
+const React = tslib_1.__importStar(require("react"));
+const InfiniteTable_1 = require("../../components/InfiniteTable");
+const AdaptableContext_1 = require("../AdaptableContext");
+const tableDOMProps = {
+    style: {
+        height: '100%',
+        minWidth: '10rem',
+        minHeight: 300,
+    },
+};
+const PivotDetailsPopoup = (props) => {
+    const adaptable = (0, AdaptableContext_1.useAdaptable)();
+    const primaryKey = adaptable.api.internalApi.getAdaptableOptions().primaryKey;
+    const { hasPivotValue, rows, rowGroups, columnId, } = props.popupProps;
+    let data = rows;
+    const getFriendlyName = (columnId) => adaptable.api.columnApi.getFriendlyNameFromColumnId(columnId);
+    let columns = {
+        [primaryKey]: { field: primaryKey, header: getFriendlyName(primaryKey) },
+    };
+    if (hasPivotValue) {
+        const [prefix, pivotColumnId, pivotValue, aggColumn] = columnId.split('_');
+        columns = Object.assign(Object.assign({}, columns), { [aggColumn]: { field: aggColumn, header: getFriendlyName(aggColumn) }, [pivotColumnId]: { field: pivotColumnId, header: getFriendlyName(pivotColumnId) } });
+        data = rows.filter((row) => (row === null || row === void 0 ? void 0 : row[pivotColumnId]) === pivotValue);
+    }
+    else {
+        columns = Object.assign(Object.assign({}, columns), { [columnId]: { field: columnId, header: getFriendlyName(columnId) } });
+    }
+    columns = Object.assign(Object.assign({}, columns), rowGroups.reduce((acc, groupColId) => {
+        acc[groupColId] = { field: groupColId, header: getFriendlyName(groupColId) };
+        return acc;
+    }, {}));
+    return (React.createElement(InfiniteTable_1.DataSource, { data: data, primaryKey: columnId },
+        React.createElement(InfiniteTable_1.InfiniteTable, { columnTypes: {
+                default: {
+                    defaultFlex: 1,
+                },
+            }, domProps: tableDOMProps, columns: columns })));
+};
+exports.PivotDetailsPopoup = PivotDetailsPopoup;

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

@@ -68,6 +68,7 @@ const LayoutWizard = (props) => {
         }
         props.onFinishWizard(layout);
     };
+    const layoutSupportedFeatures = adaptable.api.layoutApi.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',
@@ -96,13 +97,14 @@ const LayoutWizard = (props) => {
             {
                 title: 'Pivot Columns',
                 details: 'Select Pivot Columns',
-                isVisible: () => layout === null || layout === void 0 ? void 0 : layout.EnablePivot,
+                isVisible: () => (layout === null || layout === void 0 ? void 0 : layout.EnablePivot) && layoutSupportedFeatures.PivotColumns,
                 renderSummary: () => React.createElement(PivotColumnsSection_1.PivotColumnsSectionSummary, null),
                 render: () => (React.createElement(rebass_1.Box, { p: 2, style: { height: '100%' } },
                     React.createElement(PivotColumnsSection_1.PivotColumnsSection, { onChange: (newLayout) => setLayout(newLayout) }))),
             },
             {
                 title: 'Row Groups',
+                isVisible: () => layoutSupportedFeatures.RowGroupedColumns,
                 details: 'Configure Row Grouping',
                 renderSummary: () => React.createElement(RowGroupingSection_1.RowGroupingSectionSummary, null),
                 render: () => (React.createElement(rebass_1.Box, { p: 2, style: { height: '100%' } },
@@ -110,6 +112,7 @@ const LayoutWizard = (props) => {
             },
             {
                 title: 'Aggregations',
+                isVisible: () => layoutSupportedFeatures.AggregationColumns,
                 details: 'Select Column Aggregations',
                 renderSummary: () => React.createElement(AggregationsSection_1.AggregationsSectionSummary, null),
                 isValid: (data) => (0, AggregationsSection_1.isAggregationsSectionValid)(data),
@@ -118,6 +121,7 @@ const LayoutWizard = (props) => {
             },
             {
                 title: 'Sort',
+                isVisible: () => layoutSupportedFeatures.ColumnSorts,
                 renderSummary: () => React.createElement(SortSection_1.SortSectionSummary, null),
                 details: 'Configure Column Sorts',
                 render: () => (React.createElement(rebass_1.Box, { p: 2, style: { height: '100%' } },
@@ -125,6 +129,7 @@ const LayoutWizard = (props) => {
             },
             {
                 title: 'Filters',
+                isVisible: () => layoutSupportedFeatures.ColumnFilters,
                 isValid: (layout) => (0, FilterSection_1.isColumnFiltersValid)(layout),
                 details: 'View Column Filters',
                 renderSummary: () => React.createElement(FilterSection_1.FilterSectionSummary, null),

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

@@ -32,10 +32,7 @@ const SortSection = (props) => {
     var _a;
     const adaptable = (0, AdaptableContext_1.useAdaptable)();
     const { data: layout } = (0, OnePageAdaptableWizard_1.useOnePageAdaptableWizardContext)();
-    const allSortableColumns = adaptable.api.columnApi.getSortableColumns().filter((column) => {
-        // filter out columns that are not in the layout
-        return layout.Columns.includes(column.columnId);
-    });
+    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));

package/src/agGrid/Adaptable.d.ts

@@ -381,6 +381,7 @@ export declare class Adaptable implements IAdaptable {
     initLicenseService(): LicenseService;
     showCharts(charts: ChartModel[]): ChartRef[];
     getChartModels(): ChartModel[];
+    getRowModel(): import("@ag-grid-community/core").RowModelType;
     private getActiveAdaptableAggFuncForCol;
     private registerAdaptableAggFuncs;
     /**

package/src/agGrid/Adaptable.js

@@ -1303,12 +1303,6 @@ class Adaptable {
         let sortIndex = 0;
         const sortModelMap = ((_a = layout.ColumnSorts) !== null && _a !== void 0 ? _a : []).reduce((acc, customSort) => {
             const colId = customSort.ColumnId;
-            if (!layoutColumnsMap[colId]) {
-                // pivot layouts may have no pivot columns, only aggregation columns
-                if (!layout.AggregationColumns || layout.AggregationColumns[colId] == undefined) {
-                    return acc;
-                }
-            }
             acc[colId] = {
                 colId,
                 sort: customSort.SortOrder === 'Asc' ? 'asc' : 'desc',
@@ -1329,8 +1323,8 @@ class Adaptable {
                 [];
         let isChanged = false;
         const colsToAutoSize = {};
-        let newColState = this.getSortedColumnStateForVisibleColumns(columnsToShow, columnsState);
-        newColState = newColState
+        let newColumnsState = this.getSortedColumnStateForVisibleColumns(columnsToShow, columnsState);
+        newColumnsState = newColumnsState
             .map((colState) => {
             var _a, _b, _c, _d, _e;
             const { colId } = colState;
@@ -1342,7 +1336,8 @@ class Adaptable {
             if (layout.ColumnWidthMap && layout.ColumnWidthMap[colId] != null) {
                 newColState.width = layout.ColumnWidthMap[colId];
             }
-            else {
+            else if (!hide) {
+                // autosize only the columns which are part of the selected layout
                 colsToAutoSize[colId] = true;
             }
             newColState.rowGroupIndex =
@@ -1406,7 +1401,7 @@ class Adaptable {
             // order changed
             const toString = (c) => `${c.colId}-${c.rowGroupIndex}-${c.pivotIndex}-${c.aggFunc}-${c.pinned}-${c.width}-${c.hide}`;
             const oldColStateString = columnsState.map(toString).join(',');
-            const newColStateString = newColState.map(toString).join(',');
+            const newColStateString = newColumnsState.map(toString).join(',');
             isChanged = newColStateString != oldColStateString;
         }
         const pivoted = !!layout.EnablePivot;
@@ -1459,7 +1454,7 @@ class Adaptable {
                 this.gridOptions.columnApi.setPivotMode(pivoted);
             }
             this.gridOptions.columnApi.applyColumnState({
-                state: newColState,
+                state: newColumnsState,
                 applyOrder: true,
             });
             this.api.gridApi.setColumnSorts(layout.ColumnSorts);
@@ -1497,9 +1492,8 @@ class Adaptable {
                     (_a = this.gridOptions.columnApi) === null || _a === void 0 ? void 0 : _a.autoSizeAllColumns();
                 }, 200);
             }, 100);
-            return;
         }
-        if (((_f = (_e = this.adaptableOptions) === null || _e === void 0 ? void 0 : _e.layoutOptions) === null || _f === void 0 ? void 0 : _f.autoSizeColumnsInLayout) &&
+        else if (((_f = (_e = this.adaptableOptions) === null || _e === void 0 ? void 0 : _e.layoutOptions) === null || _f === void 0 ? void 0 : _f.autoSizeColumnsInLayout) &&
             colsToAutoSizeArray.length) {
             (_g = this.gridOptions.columnApi) === null || _g === void 0 ? void 0 : _g.autoSizeColumns(colsToAutoSizeArray);
         }
@@ -4683,6 +4677,9 @@ import "@adaptabletools/adaptable/themes/${themeName}.css"`);
         }
         return this.gridOptions.api.getChartModels();
     }
+    getRowModel() {
+        return this.gridOptions.rowModelType;
+    }
     getActiveAdaptableAggFuncForCol(columnId) {
         if (!columnId) {
             return null;

package/src/components/Modal/index.js

@@ -11,8 +11,6 @@ const rebass_1 = require("rebass");
 const Backdrop_1 = tslib_1.__importStar(require("./Backdrop"));
 const uuid_1 = require("../utils/uuid");
 const UIHelper_1 = require("../../View/UIHelper");
-// const uuidv4 = require('uuid/v4');
-// const createUuid = (): string => uuidv4();
 let portalElement;
 const ensurePortalElement = () => {
     if (!(0, UIHelper_1.isBrowserDocumentAvailable)()) {

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

@@ -1324,6 +1324,17 @@ export declare const ADAPTABLE_METAMODEL: {
             isOptional: boolean;
         }[];
     };
+    CalendarApi: {
+        name: string;
+        kind: string;
+        description: string;
+        properties: {
+            name: string;
+            kind: string;
+            description: string;
+            uiLabel: string;
+        }[];
+    };
     CellChangedInfo: {
         name: string;
         kind: string;
@@ -3235,6 +3246,7 @@ export declare const ADAPTABLE_METAMODEL: {
             isOptional: boolean;
             defaultValue: string;
             gridInfo?: undefined;
+            reference?: undefined;
             noCode?: undefined;
         } | {
             name: string;
@@ -3244,6 +3256,7 @@ export declare const ADAPTABLE_METAMODEL: {
             isOptional: boolean;
             defaultValue?: undefined;
             gridInfo?: undefined;
+            reference?: undefined;
             noCode?: undefined;
         } | {
             name: string;
@@ -3253,6 +3266,17 @@ export declare const ADAPTABLE_METAMODEL: {
             isOptional: boolean;
             gridInfo: string;
             defaultValue: string;
+            reference?: undefined;
+            noCode?: undefined;
+        } | {
+            name: string;
+            kind: string;
+            description: string;
+            uiLabel: string;
+            isOptional: boolean;
+            defaultValue: string;
+            reference: string;
+            gridInfo?: undefined;
             noCode?: undefined;
         } | {
             name: string;
@@ -3263,6 +3287,7 @@ export declare const ADAPTABLE_METAMODEL: {
             gridInfo: string;
             noCode: string;
             defaultValue: string;
+            reference?: undefined;
         })[];
     };
     GlobalExpressionFunctionsContext: {
@@ -3352,21 +3377,6 @@ export declare const ADAPTABLE_METAMODEL: {
         name: string;
         kind: string;
         description: string;
-        properties: ({
-            name: string;
-            kind: string;
-            description: string;
-            uiLabel: string;
-            isOptional: boolean;
-            reference?: undefined;
-        } | {
-            name: string;
-            kind: string;
-            description: string;
-            uiLabel: string;
-            isOptional: boolean;
-            reference: string;
-        })[];
     };
     GridApi: {
         name: string;
@@ -3474,6 +3484,29 @@ export declare const ADAPTABLE_METAMODEL: {
             reference: string;
         }[];
     };
+    HolidayContext: {
+        name: string;
+        kind: string;
+        description: string;
+        properties: {
+            name: string;
+            kind: string;
+            description: string;
+            uiLabel: string;
+        }[];
+    };
+    Holidays: {
+        name: string;
+        kind: string;
+        description: string;
+        properties: {
+            name: string;
+            kind: string;
+            description: string;
+            uiLabel: string;
+            isOptional: boolean;
+        }[];
+    };
     IAdaptableNoCodeWizard: {
         name: string;
         kind: string;
@@ -4056,14 +4089,6 @@ export declare const ADAPTABLE_METAMODEL: {
             isOptional: boolean;
             defaultValue: string;
             reference?: undefined;
-        } | {
-            name: string;
-            kind: string;
-            description: string;
-            uiLabel: string;
-            isOptional: boolean;
-            defaultValue?: undefined;
-            reference?: undefined;
         } | {
             name: string;
             kind: string;
@@ -4375,6 +4400,11 @@ export declare const ADAPTABLE_METAMODEL: {
             uiLabel: string;
         }[];
     };
+    RangeValueType: {
+        name: string;
+        kind: string;
+        description: string;
+    };
     ReactFrameworkComponent: {
         name: string;
         kind: string;