@adaptabletools/adaptable 19.2.2 → 19.2.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adaptabletools/adaptable",
-  "version": "19.2.2",
+  "version": "19.2.3",
   "description": "Powerful data-agnostic HTML5 AG Grid extension which provides advanced, cutting-edge functionality to meet all DataGrid requirements",
   "keywords": [
     "web-components",

package/src/AdaptableOptions/CustomSortOptions.d.ts

@@ -1,7 +1,7 @@
 import { ColumnScope } from '../../types';
 import { AdaptableComparerFunction } from '../PredefinedConfig/Common/AdaptableComparerFunction';
 /**
- * Options for providing Custom Sorts comparers
+ * Used to provide Custom Sorts comparers
  */
 export interface CustomSortOptions<TData = any> {
     /**

package/src/Api/Internal/CustomSortInternalApi.d.ts

@@ -4,4 +4,5 @@ import { AdaptableComparerFunction } from '../../PredefinedConfig/Common/Adaptab
 export declare class CustomSortInternalApi extends ApiBase {
     getCustomSortComparer(columnId: string): ColumnValuesComparer | undefined;
     getDefaultCustomSortComparer(columnId: string, columnValues: any[]): AdaptableComparerFunction;
+    columnHasCustomSortComparer(columnId: string): boolean;
 }

package/src/Api/Internal/CustomSortInternalApi.js

@@ -35,4 +35,8 @@ export class CustomSortInternalApi extends ApiBase {
             return indexFirstElement - indexSecondElement;
         };
     }
+    columnHasCustomSortComparer(columnId) {
+        const columnSortComparer = this.getCustomSortComparer(columnId);
+        return columnSortComparer ? true : false;
+    }
 }

package/src/PredefinedConfig/CustomSortState.d.ts

@@ -21,5 +21,5 @@ export interface CustomSort extends SuspendableObject {
      * Order of values by which Column will be sorted
      *
      */
-    SortedValues?: string[];
+    SortedValues?: any[];
 }

package/src/Strategy/CustomSortModule.js

@@ -20,24 +20,21 @@ export class CustomSortModule extends AdaptableModuleBase {
     }
     createColumnMenuItems(column) {
         if (column && this.isModuleEditable() && column.sortable) {
-            let customSort = this.api.customSortApi
-                .getCustomSorts()
-                .find((x) => x.ColumnId == column.columnId);
-            let label = customSort ? 'Edit ' : 'Create ';
-            // dont show a menu item if there is a custom sort that uses a comparer function
-            const columnSortComparer = this.api.customSortApi.internalApi.getCustomSortComparer(column.columnId);
-            if (columnSortComparer) {
-                return undefined;
+            if (!this.api.customSortApi.internalApi.columnHasCustomSortComparer(column.columnId)) {
+                let customSort = this.api.customSortApi
+                    .getCustomSorts()
+                    .find((x) => x.ColumnId == column.columnId);
+                let label = customSort ? 'Edit ' : 'Create ';
+                let popupParam = {
+                    column: column,
+                    action: customSort ? 'Edit' : 'New',
+                    source: 'ColumnMenu',
+                };
+                let name = customSort ? 'custom-sort-edit' : 'custom-sort-add';
+                return [
+                    this.createMenuItemShowPopup(name, label + 'Custom Sort', this.moduleInfo.Popup, this.moduleInfo.Glyph, popupParam),
+                ];
             }
-            let popupParam = {
-                column: column,
-                action: customSort ? 'Edit' : 'New',
-                source: 'ColumnMenu',
-            };
-            let name = customSort ? 'custom-sort-edit' : 'custom-sort-add';
-            return [
-                this.createMenuItemShowPopup(name, label + 'Custom Sort', this.moduleInfo.Popup, this.moduleInfo.Glyph, popupParam),
-            ];
         }
     }
     getTeamSharingAction() {

package/src/Strategy/Interface/IModule.d.ts

@@ -22,7 +22,7 @@ export interface ModuleInfo {
 }
 export type TeamSharingReferences = TeamSharingReference[];
 export type TeamSharingReference = {
-    Module: StrictExtract<AdaptableModule, 'CalculatedColumn' | 'FreeTextColumn' | 'NamedQuery' | 'Alert' | 'CustomSort' | 'FlashingCell' | 'FormatColumn' | 'PlusMinus' | 'Shortcut' | 'Schedule'>;
+    Module: StrictExtract<AdaptableModule, 'CalculatedColumn' | 'FreeTextColumn' | 'NamedQuery' | 'Alert' | 'CustomSort' | 'FlashingCell' | 'FormatColumn' | 'PlusMinus' | 'Shortcut' | 'Schedule' | 'StyledColumn'>;
     Reference: AdaptableObject;
 };
 export interface AdaptableObjectItemView {

package/src/Strategy/LayoutModule.js

@@ -77,6 +77,10 @@ export class LayoutModule extends AdaptableModuleBase {
                 Reference: formatColumn,
                 Module: 'FormatColumn',
             }));
+            this.api.styledColumnApi.getStyledColumns(loadConfig).forEach((styledcolumn) => layoutAssociatedObjectReferences.push({
+                Reference: styledcolumn,
+                Module: 'StyledColumn',
+            }));
             this.api.plusMinusApi.getAllPlusMinus(loadConfig).forEach((plusMinusNudge) => layoutAssociatedObjectReferences.push({
                 Reference: plusMinusNudge,
                 Module: 'PlusMinus',
@@ -388,7 +392,7 @@ export class LayoutModule extends AdaptableModuleBase {
             .getModuleService()
             .getModuleById('Schedule')
             .setUpScheduleJobs();
-        // CustomSort, FlashingCell, FormatColumn
+        // CustomSort, FlashingCell, FormatColumn, StyledColumn
         // we need to re-setup the column defs, as some colDefs properties may be changed
         this.api.internalApi
             .getAdaptableInstance()

package/src/Strategy/StyledColumnModule.d.ts

@@ -2,7 +2,6 @@ import { AdaptableModuleBase } from './AdaptableModuleBase';
 import { AdaptableColumn } from '../PredefinedConfig/Common/AdaptableColumn';
 import { AdaptableMenuItem } from '../PredefinedConfig/Common/Menu';
 import { TeamSharingImportInfo } from '../PredefinedConfig/TeamSharingState';
-import { FormatColumn } from '../PredefinedConfig/FormatColumnState';
 import { AdaptableModuleView, AdaptableObjectView, IModule } from './Interface/IModule';
 import { AdaptableApi } from '../Api/AdaptableApi';
 import { AdaptableObject } from '../PredefinedConfig/Common/AdaptableObject';
@@ -12,7 +11,7 @@ export declare class StyledColumnModule extends AdaptableModuleBase implements I
     getModuleAdaptableObjects(config?: {
         includeLayoutNotAssociatedObjects?: boolean;
     }): AdaptableObject[];
-    getExplicitlyReferencedColumnIds(formatColumn: FormatColumn): string[];
+    getExplicitlyReferencedColumnIds(styledColumn: StyledColumn): string[];
     hasNamedQueryReferences(): boolean;
     createColumnMenuItems(column: AdaptableColumn): AdaptableMenuItem<"calculated-column-edit" | "cell-summary-show" | "column-group" | "column-filter-group" | "column-filter-bar-hide" | "column-filter-bar-show" | "column-filter-clear" | "column-filter-suspend" | "column-filter-unsuspend" | "column-info-show" | "custom-sort-add" | "custom-sort-edit" | "dashboard-group" | "dashboard-collapse" | "dashboard-configure" | "dashboard-dock" | "dashboard-expand" | "dashboard-float" | "dashboard-hide" | "dashboard-show" | "data-import" | "flashing-cell-add" | "flashing-cell-delete" | "format-column-add" | "format-column-edit" | "free-text-column-edit" | "grid-group" | "grid-info-show" | "layout-column-caption-change" | "layout-column-hide" | "layout-edit" | "layout-column-select" | "layout-column-select-preserve" | "layout-column-select-reset" | "layout-grid-select" | "plus-minus-add" | "settings-panel-open" | "styling-group" | "styled-column-badge-add" | "styled-column-badge-edit" | "styled-column-gradient-add" | "styled-column-gradient-edit" | "styled-column-percent-bar-add" | "styled-column-percent-bar-edit" | "styled-column-sparkline-add" | "styled-column-sparkline-edit" | "system-status-show" | "_navbar">[];
     private getGlyphForStyledColumn;

package/src/Strategy/StyledColumnModule.js

@@ -9,18 +9,13 @@ import { StyledColumnBadgePreview } from '../View/StyledColumn/Wizard/StyledColu
 export class StyledColumnModule extends AdaptableModuleBase {
     constructor(api) {
         super(ModuleConstants.StyledColumnModuleId, ModuleConstants.StyledColumnFriendlyName, 'brush', 'StyledColumnPopup', // to change
-        'Create a Special Column Style e.g Gradient or Percent Bar', api);
+        'Create a Special Column Style e.g Gradient, Percent Bar or Badge', api);
     }
     getModuleAdaptableObjects(config) {
         return this.api.styledColumnApi.getStyledColumns(config);
     }
-    getExplicitlyReferencedColumnIds(formatColumn) {
-        if (this.api.columnScopeApi.scopeHasColumns(formatColumn.Scope)) {
-            return this.api.columnScopeApi
-                .getColumnsForScope(formatColumn.Scope)
-                .map((adaptableColumn) => adaptableColumn.columnId);
-        }
-        return [];
+    getExplicitlyReferencedColumnIds(styledColumn) {
+        return [styledColumn.ColumnId];
     }
     hasNamedQueryReferences() {
         return false;

package/src/Strategy/Utilities/CustomSort/getCustomSortSortOrderViewItems.d.ts

@@ -1,5 +1,5 @@
 import { CustomSort } from '../../../../types';
 export declare const getCustomSortSortOrderViewItems: (customSort: CustomSort) => {
     name: string;
-    values: string[];
+    values: any[];
 };

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

@@ -20,6 +20,9 @@ export const CustomSortColumnWizardSection = (props) => {
     const { data, api } = useOnePageAdaptableWizardContext();
     const sortableCols = React.useMemo(() => {
         const sortableColumns = api.columnApi.getSortableColumns();
+        const nonComparerSortableColumns = sortableColumns.filter((c) => {
+            return api.customSortApi.internalApi.columnHasCustomSortComparer(c.columnId);
+        });
         const customSorts = api.customSortApi.getCustomSorts();
         const columnSortComparers = api.optionsApi.getCustomSortOptions().customSortComparers || [];
         const usedColumnIds = [
@@ -28,6 +31,9 @@ export const CustomSortColumnWizardSection = (props) => {
         ];
         // filter out used colum ids, but include the current one
         return sortableColumns.filter((column) => {
+            if (api.customSortApi.internalApi.columnHasCustomSortComparer(column.columnId)) {
+                return false;
+            }
             if (!props.isNew && column.columnId === (data === null || data === void 0 ? void 0 : data.ColumnId)) {
                 return true;
             }

package/src/agGrid/AdaptableAgGrid.js

@@ -1789,7 +1789,8 @@ export class AdaptableAgGrid {
                 return acc;
             }
             const ColumnGroupId = columnGroup.getGroupId();
-            const AllowGroupSplit = !columnGroup.getProvidedColumnGroup().getColGroupDef().marryChildren;
+            const AllowGroupSplit = !columnGroup.getProvidedColumnGroup().getColGroupDef()
+                .marryChildren;
             const FriendlyName = (_c = columnGroup.getProvidedColumnGroup().getColGroupDef().headerName) !== null && _c !== void 0 ? _c : ColumnGroupId;
             const columnsInGroup = columnGroup.getLeafColumns();
             columnsInGroup.forEach((col) => {
@@ -3648,7 +3649,9 @@ export class AdaptableAgGrid {
             if (cellDataChangedInfo.trigger === 'undo') {
                 this.logger.info(`Undo data change: PK(${cellDataChangedInfo.primaryKeyValue}) Col(${cellDataChangedInfo.column}) RevertedValue(${cellDataChangedInfo.oldValue}) OriginalValue(${cellDataChangedInfo.newValue})`);
             }
-            if (cellDataChangedInfo.trigger === 'edit' || cellDataChangedInfo.trigger === 'undo') {
+            if (cellDataChangedInfo.trigger === 'edit' ||
+                cellDataChangedInfo.trigger === 'undo' ||
+                cellDataChangedInfo.trigger === 'tick') {
                 this.checkChangedCellCurrentlySelected(cellDataChangedInfo);
                 this.api.freeTextColumnApi.internalApi.handleFreeTextColumnDataChange(cellDataChangedInfo);
             }
@@ -3757,14 +3760,14 @@ export class AdaptableAgGrid {
             let matchingCell = selectedCellInfo.gridCells.find((gc) => gc.primaryKeyValue == cellDataChangedInfo.primaryKeyValue &&
                 gc.column == cellDataChangedInfo.column);
             if (matchingCell) {
-                this.refreshSelectedCellsState();
+                this.debouncedSetSelectedCells();
             }
         }
         let selectedRowInfo = this.api.gridApi.getSelectedRowInfo();
         if (selectedRowInfo && ArrayExtensions.IsNotNullOrEmpty(selectedRowInfo.gridRows)) {
             let matchingRow = selectedRowInfo.gridRows.find((gr) => gr.primaryKeyValue == cellDataChangedInfo.primaryKeyValue);
             if (matchingRow) {
-                this.refreshSelectedRowsState();
+                this.debouncedSetSelectedRows();
             }
         }
     }

package/src/env.js

@@ -1,5 +1,5 @@
 export default {
-    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: 1732896393268 || Date.now(),
-    VERSION: "19.2.2" || '--current-version--',
+    INFINITE_TABLE_LICENSE_KEY: process.env.INFINITE_TABLE_LICENSE_KEY || '',
+    PUBLISH_TIMESTAMP: 1736417144748 || Date.now(),
+    VERSION: "19.2.3" || '--current-version--',
 };