@adaptabletools/adaptable 11.0.6 → 11.0.7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adaptabletools/adaptable",
-  "version": "11.0.6",
+  "version": "11.0.7",
   "description": "Powerful data-agnostic HTML5 datagrid add-on that sits on top of an underlying grid component and provides all the rich functionality that advanced users expect from their DataGrids and Data Tables",
   "keywords": [
     "web-components",

package/publishTimestamp.d.ts

@@ -1,2 +1,2 @@
-declare const _default: 1647234590845;
+declare const _default: 1647406497522;
 export default _default;

package/publishTimestamp.js

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

package/src/AdaptableOptions/GeneralOptions.d.ts

@@ -35,9 +35,9 @@ export interface GeneralOptions {
      */
     showGroupingTotalsAsHeader?: boolean;
     /**
-     * Sort Grouped Column automatically (using Custom Sort if one applied)
+     * Order Grouped Column automatically, deriving from Adaptable State if available (CustomSort or Layout ColumnSort)
      *
-     * Order Grouped Column automatically, trying to sort them (in the specified priority order) based on an active CustomSort, a defined Column Comparator, or at least alphanumerically
+     * The default group order will be derived from (in the specified priority): 1. an active CustomSort,  2. the defined ColDef Comparator, 3. current Layout ColumnSort or 4. alphanumerically
      * @defaultValue true
      * @gridInfoItem
      */

package/src/Api/Implementation/LayoutApiImpl.d.ts

@@ -2,6 +2,7 @@ import { ApiBase } from './ApiBase';
 import { LayoutApi } from '../LayoutApi';
 import { LayoutState, Layout } from '../../PredefinedConfig/LayoutState';
 import { AdaptableColumn } from '../../PredefinedConfig/Common/AdaptableColumn';
+import { ColumnSort } from '../../PredefinedConfig/Common/ColumnSort';
 export declare class LayoutApiImpl extends ApiBase implements LayoutApi {
     getLayoutState(): LayoutState;
     shouldAutoSaveLayout: (layout?: Layout) => boolean;
@@ -12,6 +13,7 @@ export declare class LayoutApiImpl extends ApiBase implements LayoutApi {
     setLayout(layoutName: string): void;
     fireLayoutChangedEvent(trigger: string, oldSate: LayoutState, newState: LayoutState): void;
     getCurrentLayout(): Layout;
+    getCurrentLayoutColumnSort(columnId: string): ColumnSort['SortOrder'] | null;
     getCurrentLayoutName(): string;
     getLayoutByName(layoutName: string): Layout | null;
     getAllLayout(): Layout[];

package/src/Api/Implementation/LayoutApiImpl.js

@@ -69,6 +69,11 @@ class LayoutApiImpl extends ApiBase_1.ApiBase {
         let layoutName = state.Layout.CurrentLayout;
         return (this.getLayoutByName(layoutName) || ObjectFactory_1.default.CreateEmptyLayout({ Name: GeneralConstants_1.DEFAULT_LAYOUT }));
     }
+    getCurrentLayoutColumnSort(columnId) {
+        var _a, _b, _c, _d;
+        const currentLayout = this.getCurrentLayout();
+        return ((_d = (_c = (_b = (_a = currentLayout === null || currentLayout === void 0 ? void 0 : currentLayout.ColumnSorts) === null || _a === void 0 ? void 0 : _a.find) === null || _b === void 0 ? void 0 : _b.call(_a, (sort) => sort.ColumnId === columnId)) === null || _c === void 0 ? void 0 : _c.SortOrder) !== null && _d !== void 0 ? _d : null);
+    }
     getCurrentLayoutName() {
         return this.getAdaptableState().Layout.CurrentLayout;
     }

package/src/Api/LayoutApi.d.ts

@@ -1,4 +1,4 @@
-import { AdaptableColumn } from '../../types';
+import { AdaptableColumn, ColumnSort } from '../../types';
 import { LayoutState, Layout } from '../PredefinedConfig/LayoutState';
 /**
  * Provides run-time access to the Layout Module and associated state
@@ -24,6 +24,11 @@ export interface LayoutApi {
      * @returns layout
      */
     getCurrentLayout(): Layout;
+    /**
+     * Retrieves the sort order of a column from the current layout
+     * @param columnId Column id
+     */
+    getCurrentLayoutColumnSort(columnId: string): ColumnSort['SortOrder'] | null;
     /**
      * Retrieves map with visible columns in current Layout
      */

package/src/Utilities/Constants/DocumentationLinkConstants.js

@@ -3,12 +3,12 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.LicenseDocsLink = exports.PrimaryKeyDocsLink = exports.PredicateDocsLink = exports.AggregatedScalarQueryDocsLink = exports.AggregatedBooleanQueryDocsLink = exports.ObservableQueryDocsLink = exports.ScalarQueryDocsLink = exports.BooleanQueryDocsLink = exports.ExpressionEditorDocsLink = exports.HOST_URL_DOCS = void 0;
 exports.HOST_URL_DOCS = 'https://docs.adaptabletools.com';
 //export const HOST_URL_DOCS = 'http://localhost:3000';
-exports.ExpressionEditorDocsLink = `${exports.HOST_URL_DOCS}/learn/ui-expression-editor`;
-exports.BooleanQueryDocsLink = `${exports.HOST_URL_DOCS}/learn/adaptable-ql-expression-boolean`;
-exports.ScalarQueryDocsLink = `${exports.HOST_URL_DOCS}/learn/adaptable-ql-expression-scalar`;
-exports.ObservableQueryDocsLink = `${exports.HOST_URL_DOCS}/learn/adaptable-ql-expression-observable`;
-exports.AggregatedBooleanQueryDocsLink = `${exports.HOST_URL_DOCS}/learn/adaptable-ql-expression-aggregation#aggregated-boolean-expressions`;
-exports.AggregatedScalarQueryDocsLink = `${exports.HOST_URL_DOCS}/learn/adaptable-ql-expression-aggregation#aggregated-scalar-expressions`;
-exports.PredicateDocsLink = `${exports.HOST_URL_DOCS}/learn/adaptable-ql-predicate`;
-exports.PrimaryKeyDocsLink = `${exports.HOST_URL_DOCS}/learn/dev-guide-tutorial-primary-key`;
+exports.ExpressionEditorDocsLink = `${exports.HOST_URL_DOCS}/guide/ui-expression-editor`;
+exports.BooleanQueryDocsLink = `${exports.HOST_URL_DOCS}/guide/adaptable-ql-expression-boolean`;
+exports.ScalarQueryDocsLink = `${exports.HOST_URL_DOCS}/guide/adaptable-ql-expression-scalar`;
+exports.ObservableQueryDocsLink = `${exports.HOST_URL_DOCS}/guide/adaptable-ql-expression-observable`;
+exports.AggregatedBooleanQueryDocsLink = `${exports.HOST_URL_DOCS}/guide/adaptable-ql-expression-aggregation#aggregated-boolean-expressions`;
+exports.AggregatedScalarQueryDocsLink = `${exports.HOST_URL_DOCS}/guide/adaptable-ql-expression-aggregation#aggregated-scalar-expressions`;
+exports.PredicateDocsLink = `${exports.HOST_URL_DOCS}/guide/adaptable-ql-predicate`;
+exports.PrimaryKeyDocsLink = `${exports.HOST_URL_DOCS}/guide/dev-guide-tutorial-primary-key`;
 exports.LicenseDocsLink = `${exports.HOST_URL_DOCS}/licensing`;

package/src/agGrid/agGridHelper.js

@@ -516,6 +516,10 @@ class agGridHelper {
                 if (definedColumnComparator) {
                     return definedColumnComparator(nodeA.key, nodeB.key);
                 }
+                const sortOder = adaptable.api.layoutApi.getCurrentLayoutColumnSort(firstGroupedColumn.columnId);
+                if (sortOder === 'Desc') {
+                    return nodeA.key > nodeB.key ? -1 : 1;
+                }
             }
             // if no comparator available, just sort alphanumerically
             if (nodeA.key == nodeB.key) {

package/src/metamodel/adaptable.metamodel.js

@@ -6532,7 +6532,7 @@ exports.ADAPTABLE_METAMODEL = {
             {
                 "name": "autoOrderGroupedColumns",
                 "kind": "boolean",
-                "description": "Sort Grouped Column automatically (using Custom Sort if one applied)",
+                "description": "Order Grouped Column automatically, deriving from Adaptable State if available (CustomSort or Layout ColumnSort)",
                 "uiLabel": "Auto Order Grouped Columns",
                 "isOptional": true,
                 "gridInfo": "item",
@@ -8054,6 +8054,12 @@ exports.ADAPTABLE_METAMODEL = {
                 "description": "Retrieves Current Layout from Layout State",
                 "uiLabel": "Get Current Layout"
             },
+            {
+                "name": "getCurrentLayoutColumnSort",
+                "kind": "function",
+                "description": "Retrieves the sort order of a column from the current layout",
+                "uiLabel": "Get Current Layout Column Sort"
+            },
             {
                 "name": "getCurrentLayoutName",
                 "kind": "function",

package/src/types.d.ts

@@ -116,7 +116,7 @@ export type { ColumnSort } from './PredefinedConfig/Common/ColumnSort';
 export type { DataChangedInfo } from './PredefinedConfig/Common/DataChangedInfo';
 export type { DataUpdateConfig } from './PredefinedConfig/Common/DataUpdateConfig';
 export type { AdaptableFormData, AdaptableForm, AdaptableFormField, } from './PredefinedConfig/Common/AdaptableForm';
-export type { AdaptableButton } from './PredefinedConfig/Common/AdaptableButton';
+export type { AdaptableButton, ButtonContext } from './PredefinedConfig/Common/AdaptableButton';
 export type { AdaptableMenuItem, UserMenuItem, ColumnMenuContext, ContextMenuContext, } from './PredefinedConfig/Common/Menu';
 export type { Schedule } from './PredefinedConfig/Common/Schedule';
 export type { ButtonStyle } from './PredefinedConfig/Common/ButtonStyle';

package/version.d.ts

@@ -1,2 +1,2 @@
-declare const _default: "11.0.6";
+declare const _default: "11.0.7";
 export default _default;

package/version.js

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