@adaptabletools/adaptable 19.2.3 → 20.0.0-canary.0

package/src/Utilities/Services/TeamSharingService.js

@@ -14,13 +14,12 @@ export class TeamSharingService {
         }
     }
     buildCustomSharedEntity(Entity, Configuration) {
-        var _a;
         const currentTime = Date.now();
         const currentUser = this.adaptableApi.optionsApi.getUserName();
         return {
             EntityType: 'customEntity',
             Entity,
-            Uuid: (_a = Configuration.Uuid) !== null && _a !== void 0 ? _a : createUuid(),
+            Uuid: Configuration.Uuid ?? createUuid(),
             Name: Configuration.Name,
             Description: Configuration.Description,
             Tags: Configuration.Tags,
@@ -46,7 +45,13 @@ export class TeamSharingService {
             // shared entity may have been removed in the meantime
             return [sharedEntities, []];
         }
-        activeSharedEntity = Object.assign(Object.assign({}, activeSharedEntity), { Entity: changedAdaptableObject, ChangedAt: Date.now(), ChangedBy: userName, Revision: activeSharedEntity.Revision + 1 });
+        activeSharedEntity = {
+            ...activeSharedEntity,
+            Entity: changedAdaptableObject,
+            ChangedAt: Date.now(),
+            ChangedBy: userName,
+            Revision: activeSharedEntity.Revision + 1,
+        };
         // update EntityDependencyIds (references may have been removed or new ones added)
         const updatedEntityDependencyIds = [];
         const currentEntityDependencies = this.getSharedEntityDependencies(activeSharedEntity, sharedEntities);
@@ -82,12 +87,12 @@ export class TeamSharingService {
             const importInfo = this.adaptableApi.internalApi
                 .getModuleService()
                 .getTeamSharingAction(Module);
-            if (importInfo === null || importInfo === void 0 ? void 0 : importInfo.ModuleEntities.some((moduleEntity) => moduleEntity.Uuid === Entity.Uuid)) {
+            if (importInfo?.ModuleEntities.some((moduleEntity) => moduleEntity.Uuid === Entity.Uuid)) {
                 configOverwriteNeedsConfirmation = true;
-                return importInfo === null || importInfo === void 0 ? void 0 : importInfo.EditAction(Entity);
+                return importInfo?.EditAction(Entity);
             }
             else {
-                return importInfo === null || importInfo === void 0 ? void 0 : importInfo.AddAction(Entity);
+                return importInfo?.AddAction(Entity);
             }
         };
         const existingSharedEntities = this.adaptableApi.teamSharingApi.getLoadedAdaptableSharedEntities();
@@ -99,9 +104,8 @@ export class TeamSharingService {
         return [importSteps, configOverwriteNeedsConfirmation];
     }
     getSharedEntityLocalAndRemoteRevisions(changedAdaptableObjectId, remoteSharedEntities) {
-        var _a, _b, _c, _d;
-        const localRevision = (_b = (_a = this.adaptableApi.internalApi.getState().TeamSharing.ActiveSharedEntityMap[changedAdaptableObjectId]) === null || _a === void 0 ? void 0 : _a.Revision) !== null && _b !== void 0 ? _b : -1;
-        const remoteRevision = (_d = (_c = remoteSharedEntities.find((sharedEntity) => sharedEntity.Entity.Uuid === changedAdaptableObjectId)) === null || _c === void 0 ? void 0 : _c.Revision) !== null && _d !== void 0 ? _d : -1;
+        const localRevision = this.adaptableApi.internalApi.getState().TeamSharing.ActiveSharedEntityMap[changedAdaptableObjectId]?.Revision ?? -1;
+        const remoteRevision = remoteSharedEntities.find((sharedEntity) => sharedEntity.Entity.Uuid === changedAdaptableObjectId)?.Revision ?? -1;
         return [localRevision, remoteRevision];
     }
     getStaleActiveSharedEntities() {
@@ -111,8 +115,7 @@ export class TeamSharingService {
         sharedEntities
             .filter((sharedEntity) => sharedEntity.Type === 'Active')
             .forEach((sharedEntity) => {
-            var _a, _b;
-            const importedRevision = (_b = (_a = activeEntities[sharedEntity.Entity.Uuid]) === null || _a === void 0 ? void 0 : _a.Revision) !== null && _b !== void 0 ? _b : Number.MAX_VALUE;
+            const importedRevision = activeEntities[sharedEntity.Entity.Uuid]?.Revision ?? Number.MAX_VALUE;
             if (sharedEntity.Revision > importedRevision) {
                 result[sharedEntity.Uuid] = {
                     sharedEntity,
@@ -136,7 +139,7 @@ export class TeamSharingService {
             if (updateNotification === 'SystemStatus') {
                 this.adaptableApi.systemStatusApi.setInfoSystemStatus(`TeamSharing: ${notificationMessage}`);
             }
-            this.adaptableApi.teamSharingApi.internalApi.fireTeamSharingEntityChangedEvent(sharedEntityActiveInfo.sharedEntity);
+            this.adaptableApi.eventApi.internalApi.fireTeamSharingEntityChangedEvent(sharedEntityActiveInfo.sharedEntity);
         });
     }
     showUpdateNotificationAlert(sharedEntityActiveInfo, message) {
@@ -154,7 +157,7 @@ export class TeamSharingService {
             },
             {
                 Label: 'Import',
-                Action: (context) => {
+                Command: (context) => {
                     this.adaptableApi.teamSharingApi.importSharedEntry(sharedEntityActiveInfo.sharedEntity);
                 },
                 ButtonStyle: {
@@ -170,7 +173,7 @@ export class TeamSharingService {
                     tone: 'error',
                     variant: 'raised',
                 },
-                Action: () => {
+                Command: () => {
                     this.dismissedNotifications.push({
                         entityUuid: sharedEntityActiveInfo.sharedEntity.Uuid,
                     });
@@ -181,14 +184,19 @@ export class TeamSharingService {
             alertType: 'generic',
             header: 'Team Sharing Update',
             message: message,
-            alertDefinition: Object.assign(Object.assign({}, ObjectFactory.CreateEmptyAlertDefinition()), { MessageType: 'Info', AlertProperties: {
+            alertDefinition: {
+                ...ObjectFactory.CreateEmptyAlertDefinition(),
+                MessageType: 'Info',
+                AlertProperties: {
                     DisplayNotification: updateNotification === 'AlertWithNotification',
                     NotificationDuration: 'always',
-                }, AlertForm: {
+                },
+                AlertForm: {
                     Buttons: buttons,
-                } }),
+                },
+            },
         };
-        this.adaptableApi.alertApi.showAdaptableAlert(alert);
+        this.adaptableApi.alertApi.displayAdaptableAlert(alert);
         if (showUpdateNotificationOncePerUpdate) {
             this.dismissedNotifications.push({
                 entityUuid: sharedEntityActiveInfo.sharedEntity.Uuid,
@@ -246,10 +254,10 @@ export class TeamSharingService {
         return Array.from(result.values());
     }
     getTeamSharingReferences(adaptableObject, module) {
-        var _a, _b;
-        return ((_b = (_a = this.adaptableApi.internalApi
+        return (this.adaptableApi.internalApi
             .getModuleService()
-            .getModuleById(module)) === null || _a === void 0 ? void 0 : _a.getTeamSharingReferences(adaptableObject)) !== null && _b !== void 0 ? _b : []);
+            .getModuleById(module)
+            ?.getTeamSharingReferences(adaptableObject) ?? []);
     }
     getSharedEntityDependencies(input, allSharedEntities) {
         return input.EntityDependencyIds.map((dependencyId) => allSharedEntities.find((sharedEntity) => sharedEntity.Uuid === dependencyId)).filter((dependencyEntity) => !!dependencyEntity);

package/src/Utilities/Services/ThemeService.js

@@ -1,6 +1,5 @@
 export class ThemeService {
     constructor(api) {
-        var _a;
         this.unsubscribe = () => { };
         this.onThemeChanged = () => {
             let currentTheme = this.api.themeApi.getCurrentThemeObject();
@@ -16,7 +15,7 @@ export class ThemeService {
             this.styleSheetObject = new CSSStyleSheet();
             // ts does not know about adoptedStyleSheets
             document.adoptedStyleSheets = [
-                ...((_a = document.adoptedStyleSheets) !== null && _a !== void 0 ? _a : []),
+                ...(document.adoptedStyleSheets ?? []),
                 this.styleSheetObject,
             ];
         }

package/src/Utilities/Services/ValidationService.js

@@ -2,6 +2,7 @@ import { ArrayExtensions } from '../Extensions/ArrayExtensions';
 import StringExtensions from '../Extensions/StringExtensions';
 import { AlertModuleId } from '../Constants/ModuleConstants';
 import { SERVER_VALIDATION_HEADER, SERVER_VALIDATION_MESSAGE_TYPE, } from '../Constants/GeneralConstants';
+import { errorOnce } from '../../agGrid/AdaptableLogger';
 export class ValidationService {
     constructor(adaptableApi) {
         this.adaptableApi = adaptableApi;
@@ -20,10 +21,18 @@ export class ValidationService {
         if (ArrayExtensions.IsNotEmpty(editingRules)) {
             editingRules.forEach((alertDefinition) => {
                 if (alertDefinition.Rule.BooleanExpression) {
-                    let isSatisfiedExpression = cellDataChangedInfo.rowNode != null &&
-                        this.adaptableApi.internalApi
-                            .getQueryLanguageService()
-                            .evaluateBooleanExpression(alertDefinition.Rule.BooleanExpression, AlertModuleId, cellDataChangedInfo.rowNode);
+                    let isSatisfiedExpression = false;
+                    try {
+                        isSatisfiedExpression =
+                            cellDataChangedInfo.rowNode != null &&
+                                this.adaptableApi.internalApi
+                                    .getQueryLanguageService()
+                                    .evaluateBooleanExpression(alertDefinition.Rule.BooleanExpression, AlertModuleId, cellDataChangedInfo.rowNode);
+                    }
+                    catch (error) {
+                        isSatisfiedExpression = false;
+                        errorOnce(error.message);
+                    }
                     if (isSatisfiedExpression) {
                         failedValidations.push(alertDefinition);
                     }
@@ -47,7 +56,7 @@ export class ValidationService {
                 alertDefinition: failedRules[0],
                 cellDataChangedInfo: cellDataChangedInfo,
             };
-            this.adaptableApi.alertApi.internalApi.publishAlertFiredEvent(alert);
+            this.adaptableApi.eventApi.internalApi.fireAlertFiredEvent(alert);
             // This is not needed because the change event is triggered regardless
             // if the edit is succesful. This is because (I think) Adaptable uses a non-standard way ot detecting data changes.
             // https://github.com/AdaptableTools/adaptable/issues/2197
@@ -68,19 +77,27 @@ export class ValidationService {
         return true;
     }
     IsAlertDefinitionTriggered(alertDefinition, dataChangedEvent) {
-        var _a;
         const displayValue = this.adaptableApi.gridApi.getDisplayValueFromRowNode(dataChangedEvent.rowNode, dataChangedEvent.column.columnId);
-        const predicateDefHandlerContext = Object.assign({ value: dataChangedEvent.newValue, oldValue: dataChangedEvent.oldValue, displayValue, node: dataChangedEvent.rowNode, column: dataChangedEvent.column }, this.adaptableApi.internalApi.buildBaseContext());
-        return this.adaptableApi.predicateApi.handlePredicates((_a = alertDefinition.Rule) === null || _a === void 0 ? void 0 : _a.Predicates, predicateDefHandlerContext, false);
+        const predicateDefHandlerContext = {
+            value: dataChangedEvent.newValue,
+            oldValue: dataChangedEvent.oldValue,
+            displayValue,
+            node: dataChangedEvent.rowNode,
+            column: dataChangedEvent.column,
+            ...this.adaptableApi.internalApi.buildBaseContext(),
+        };
+        return this.adaptableApi.predicateApi.handlePredicates(alertDefinition.Rule?.Predicates, predicateDefHandlerContext, false);
     }
     performServerValidation(cellDataChangedInfo, config) {
-        const serverValidationContext = Object.assign({ cellDataChangedInfo: cellDataChangedInfo }, this.adaptableApi.internalApi.buildBaseContext());
+        const serverValidationContext = {
+            cellDataChangedInfo: cellDataChangedInfo,
+            ...this.adaptableApi.internalApi.buildBaseContext(),
+        };
         return () => {
             this.adaptableApi.optionsApi
                 .getEditOptions()
                 .validateOnServer(serverValidationContext)
                 .then((validationResult) => {
-                var _a, _b;
                 if (validationResult.newCellValue === undefined) {
                     validationResult.newCellValue = cellDataChangedInfo.newValue;
                 }
@@ -89,11 +106,11 @@ export class ValidationService {
                 if (validationResult.newCellValue !== cellDataChangedInfo.newValue) {
                     cellDataChangedInfo.newValue = validationResult.newCellValue;
                     // this.adaptable.setValue(cellDataChangedInfo, false);
-                    const row = (_a = cellDataChangedInfo.rowNode) === null || _a === void 0 ? void 0 : _a.data;
+                    const row = cellDataChangedInfo.rowNode?.data;
                     if (!row) {
                         return;
                     }
-                    row[(_b = this.adaptableApi.columnApi.internalApi.getAgGridColumnFieldForAdaptableColumn(cellDataChangedInfo.column.columnId)) !== null && _b !== void 0 ? _b : cellDataChangedInfo.column.columnId] = validationResult.newCellValue;
+                    row[this.adaptableApi.columnApi.internalApi.getAgGridColumnFieldForAdaptableColumn(cellDataChangedInfo.column.columnId) ?? cellDataChangedInfo.column.columnId] = validationResult.newCellValue;
                     this.adaptableApi.gridApi.updateGridData([row]);
                     if (StringExtensions.IsNotNullOrEmpty(validationResult.validationMessage) &&
                         this.adaptableApi.optionsApi.getEditOptions().displayServerValidationMessages) {
@@ -112,10 +129,9 @@ export class ValidationService {
         };
     }
     createValidationDescription(alertDefinition) {
-        var _a, _b;
         return (this.adaptableApi.columnScopeApi.getScopeDescription(alertDefinition.Scope) +
             ' ' +
-            ((_b = (_a = alertDefinition.Rule) === null || _a === void 0 ? void 0 : _a.Predicates) === null || _b === void 0 ? void 0 : _b.map((predicate) => this.adaptableApi.predicateApi.predicateToString(predicate)).join(' AND ')));
+            alertDefinition.Rule?.Predicates?.map((predicate) => this.adaptableApi.predicateApi.predicateToString(predicate)).join(' AND '));
     }
     createValidationMessage(alertDefinition) {
         let returnMessage = this.createValidationDescription(alertDefinition);

package/src/Utilities/adaptableQlUtils.d.ts

@@ -1,2 +1,3 @@
 import { AdaptableColumnDataType, ExpressionFunctionInputType } from '../types';
 export declare const mapColumnDataTypeToExpressionFunctionType: (dataType: AdaptableColumnDataType) => ExpressionFunctionInputType;
+export declare const mapExpressionFunctionTypeToColumnDataType: (type: ExpressionFunctionInputType) => AdaptableColumnDataType;

package/src/Utilities/adaptableQlUtils.js

@@ -1,14 +1,41 @@
 export const mapColumnDataTypeToExpressionFunctionType = (dataType) => {
-    if (dataType === 'Number') {
+    if (dataType === 'number') {
         return 'number';
     }
-    if (dataType === 'Boolean') {
+    if (dataType === 'boolean') {
         return 'boolean';
     }
-    if (dataType === 'String') {
+    if (dataType === 'text') {
         return 'text';
     }
-    if (dataType === 'Date') {
+    if (dataType === 'date' || dataType === 'dateString') {
         return 'date';
     }
+    if (dataType === 'numberArray') {
+        return 'number[]';
+    }
+    if (dataType === 'textArray') {
+        return 'text[]';
+    }
+};
+export const mapExpressionFunctionTypeToColumnDataType = (type) => {
+    if (type === 'number') {
+        return 'number';
+    }
+    if (type === 'boolean') {
+        return 'boolean';
+    }
+    if (type === 'text') {
+        return 'text';
+    }
+    if (type === 'date') {
+        return 'date';
+    }
+    if (type === 'number[]') {
+        return 'numberArray';
+    }
+    if (type === 'text[]') {
+        return 'textArray';
+    }
+    return undefined;
 };

package/src/{agGrid → Utilities}/buildSortedColumnStateForLayout.d.ts

@@ -1,5 +1,5 @@
-import { ColumnState, GridOptions } from '@ag-grid-community/core';
-import { Layout } from '../types';
+import { ColumnState, GridOptions } from 'ag-grid-enterprise';
+import { Layout } from '../../types';
 export declare function buildSortedColumnStateForLayout(params: {
     columnState: ColumnState[];
     layout: Layout;

package/src/{agGrid → Utilities}/buildSortedColumnStateForLayout.js

@@ -1,17 +1,21 @@
-import { AG_GRID_GROUPED_COLUMN } from '../Utilities/Constants/GeneralConstants';
-import { getAutoRowGroupColumnIdFor } from '../Api/Internal/ColumnInternalApi';
-import { isAutoRowGroupColumn } from '../Api/Implementation/ColumnApiImpl';
 import { sortColumnStateForVisibleColumns } from './sortColumnStateForVisibleColumns';
+import { isAutoRowGroupColumn } from '../Api/Implementation/ColumnApiImpl';
+import { getAutoRowGroupColumnIdFor } from '../Api/Internal/ColumnInternalApi';
+import { AG_GRID_GROUPED_COLUMN } from './Constants/GeneralConstants';
+import { isPivotLayout } from '../Api/Implementation/LayoutHelpers';
 export function buildSortedColumnStateForLayout(params) {
     const { columnState, layout, groupDisplayType } = params;
-    let visibleColumnList = [...layout.Columns];
+    const isPivot = isPivotLayout(layout);
+    let orderedColumns = isPivot ? layout.PivotColumns : layout.TableColumns;
+    const columnVisibilityMap = layout.ColumnVisibility || {};
     const multipleGroupColumns = groupDisplayType === 'multipleColumns';
     const singleGroupColumn = !multipleGroupColumns;
     const rowGroupedColumnsIndexes = {};
     let generatedRowGroupColumnsIds = [];
+    const rowGroupedColumns = isPivot ? layout.PivotGroupedColumns : layout.RowGroupedColumns;
     // here we make sure the visibleColumnList includes all the generated group columns
-    if (layout.RowGroupedColumns) {
-        layout.RowGroupedColumns.forEach((colId, index) => {
+    if (rowGroupedColumns) {
+        rowGroupedColumns.forEach((colId, index) => {
             rowGroupedColumnsIndexes[colId] = index;
             rowGroupedColumnsIndexes[getAutoRowGroupColumnIdFor(colId)] = index;
         });
@@ -19,17 +23,17 @@ export function buildSortedColumnStateForLayout(params) {
         // make sure we add the grouped columns to the visible column list
         // at the start of the list
         if (singleGroupColumn) {
-            if (!visibleColumnList.includes(AG_GRID_GROUPED_COLUMN)) {
-                visibleColumnList = [AG_GRID_GROUPED_COLUMN, ...visibleColumnList];
+            if (!orderedColumns.includes(AG_GRID_GROUPED_COLUMN)) {
+                orderedColumns = [AG_GRID_GROUPED_COLUMN, ...orderedColumns];
             }
             generatedRowGroupColumnsIds.push(AG_GRID_GROUPED_COLUMN);
         }
         else {
             let missingGroupColumns = 0;
-            [...layout.RowGroupedColumns].reverse().forEach((colId) => {
+            [...rowGroupedColumns].reverse().forEach((colId) => {
                 const groupColId = getAutoRowGroupColumnIdFor(colId);
-                if (!visibleColumnList.includes(groupColId)) {
-                    visibleColumnList = [groupColId, ...visibleColumnList];
+                if (!orderedColumns.includes(groupColId)) {
+                    orderedColumns = [groupColId, ...orderedColumns];
                     missingGroupColumns++;
                 }
                 generatedRowGroupColumnsIds = [groupColId, ...generatedRowGroupColumnsIds];
@@ -39,8 +43,8 @@ export function buildSortedColumnStateForLayout(params) {
             // but we only need to do this if the layout.Columns list missed some of the
             // group columns, but not all of them. if all were missing, we already
             // inserted them at the start of the list
-            if (missingGroupColumns && missingGroupColumns < layout.RowGroupedColumns.length) {
-                visibleColumnList.sort((colId1, colId2) => {
+            if (missingGroupColumns && missingGroupColumns < rowGroupedColumns.length) {
+                orderedColumns.sort((colId1, colId2) => {
                     const isRowGroup1 = isAutoRowGroupColumn(colId1);
                     const isRowGroup2 = isAutoRowGroupColumn(colId2);
                     if (isRowGroup1 && isRowGroup2) {
@@ -51,17 +55,13 @@ export function buildSortedColumnStateForLayout(params) {
             }
         }
     }
-    const visibleColumnsIndexes = visibleColumnList.reduce((acc, colId, index) => {
-        acc[colId] = index;
-        return acc;
-    }, {});
-    const pivotMode = layout.EnablePivot;
+    const pivotMode = isPivot;
     if (pivotMode) {
         // in pivot mode, we sort the Visible columns of the layout
         // to make sure the group cols are at the beginning
-        const groupCols = visibleColumnList.filter(isAutoRowGroupColumn);
-        visibleColumnList = visibleColumnList.filter((colId) => !isAutoRowGroupColumn(colId));
-        visibleColumnList = [...groupCols, ...visibleColumnList];
+        const groupCols = orderedColumns.filter(isAutoRowGroupColumn);
+        orderedColumns = orderedColumns.filter((colId) => !isAutoRowGroupColumn(colId));
+        orderedColumns = [...groupCols, ...orderedColumns];
     }
     // we're now ready to go over the columnState
     // we want as much as possible to keep the order of the columns
@@ -84,20 +84,31 @@ export function buildSortedColumnStateForLayout(params) {
     // visible columns in the layout
     newColumnState = newColumnState.map((colState) => {
         const { colId } = colState;
-        const visibleIndex = visibleColumnsIndexes[colId];
-        if (visibleIndex == null) {
-            return Object.assign(Object.assign({}, colState), { hide: true });
+        const hidden = columnVisibilityMap[colId] === false || !orderedColumns.includes(colId);
+        if (hidden) {
+            return {
+                ...colState,
+                hide: true,
+            };
         }
-        return Object.assign(Object.assign({}, colState), { hide: null });
+        return { ...colState, hide: null };
     });
     // third step - correctly mark the columns that are grouped
     newColumnState = newColumnState.map((colState) => {
         const { colId } = colState;
         const groupIndex = rowGroupedColumnsIndexes[colId];
         if (groupIndex != null) {
-            return Object.assign(Object.assign({}, colState), { rowGroup: true, rowGroupIndex: groupIndex });
+            return {
+                ...colState,
+                rowGroup: true,
+                rowGroupIndex: groupIndex,
+            };
         }
-        return Object.assign(Object.assign({}, colState), { rowGroup: false, rowGroupIndex: null });
+        return {
+            ...colState,
+            rowGroup: false,
+            rowGroupIndex: null,
+        };
     });
     // fourth step - add the new group columns, if they are missing
     const columnStateIndexes = newColumnState.reduce((acc, colState, index) => {
@@ -116,5 +127,5 @@ export function buildSortedColumnStateForLayout(params) {
     });
     // fitfth step - sort the column state to respect the order of the visible columns
     // we can't simply call sort in this case
-    return sortColumnStateForVisibleColumns(newColumnState, visibleColumnList);
+    return sortColumnStateForVisibleColumns(newColumnState, orderedColumns);
 }

package/src/{agGrid → Utilities}/createAgStatusPanelComponent.d.ts

@@ -1,7 +1,7 @@
 import * as React from 'react';
-import { IStatusPanelParams } from '@ag-grid-community/core';
-import { AdaptableApi } from '../../types';
+import { IStatusPanelParams } from 'ag-grid-enterprise';
 import { IAdaptable } from '../AdaptableInterfaces/IAdaptable';
+import { AdaptableApi } from '../types';
 export interface StatusPanelProps {
     params: IStatusPanelParams;
     adaptableApi: AdaptableApi;
@@ -9,7 +9,7 @@ export interface StatusPanelProps {
         Key: string;
     };
 }
-export declare const createAgStatusPanelComponent: (component: React.FunctionComponent<StatusPanelProps>, adaptable: IAdaptable, context: StatusPanelProps['context']) => ((props: IStatusPanelParams) => JSX.Element) | {
+export declare const createAgStatusPanelComponent: (component: React.FunctionComponent<StatusPanelProps>, adaptable: IAdaptable, context: StatusPanelProps['context']) => ((props: IStatusPanelParams) => React.JSX.Element) | {
     new (): {
         params: IStatusPanelParams;
         eGui: HTMLElement;

package/src/{agGrid → Utilities}/createAgStatusPanelComponent.js

@@ -38,8 +38,7 @@ export const createAgStatusPanelComponent = (component, adaptable, context) => {
             return this.eGui;
         }
         destroy() {
-            var _a;
-            (_a = this.unmountReactRoot) === null || _a === void 0 ? void 0 : _a.call(this);
+            this.unmountReactRoot?.();
         }
     };
 };

package/src/Utilities/getExpressionViewItems.d.ts

@@ -0,0 +1,3 @@
+import { AdaptableObjectItemView } from '../Strategy/Interface/IModule';
+import { AdaptableCalculatedColumnQuery, AdaptableApi } from '../types';
+export declare const getExpressionViewItems: (query: AdaptableCalculatedColumnQuery, api: AdaptableApi) => AdaptableObjectItemView;

package/src/{Strategy/Utilities → Utilities}/getExpressionViewItems.js

@@ -1,6 +1,6 @@
 import * as React from 'react';
-import { ExpressionPreview } from '../../components/ExpressionEditor/ExpressionPreview';
-import { Tag } from '../../components/Tag';
+import { ExpressionPreview } from '../components/ExpressionEditor/ExpressionPreview';
+import { Tag } from '../components/Tag';
 export const getExpressionViewItems = (query, api) => {
     // const expressionText = api.internalApi.getAdaptableQueryExpressionText(query);
     return {

package/src/Utilities/getObjectTagsViewItems.d.ts

@@ -0,0 +1,3 @@
+import { AdaptableObjectItemView } from '../Strategy/Interface/IModule';
+import { AdaptableObject, AdaptableApi } from '../types';
+export declare const getObjectTagsViewItems: (object: AdaptableObject, api: AdaptableApi) => AdaptableObjectItemView;

package/src/{Strategy/Utilities → Utilities}/getObjectTagsViewItems.js

@@ -1,22 +1,20 @@
 import React from 'react';
-import SimpleButton from '../../components/SimpleButton';
 import { useDispatch } from 'react-redux';
+import SimpleButton from '../components/SimpleButton';
 export const getObjectTagsViewItems = (object, api) => {
-    var _a, _b, _c, _d;
-    if (!api.internalApi.shouldDisplayTagSections() || !((_a = object === null || object === void 0 ? void 0 : object.Tags) === null || _a === void 0 ? void 0 : _a.length)) {
+    if (!api.internalApi.shouldDisplayTagSections() || !object?.Tags?.length) {
         return;
     }
     const currentLayoutName = api.layoutApi.getCurrentLayoutName();
-    const hasCurrentLayoutAsTag = (_c = ((_b = object === null || object === void 0 ? void 0 : object.Tags) !== null && _b !== void 0 ? _b : [])) === null || _c === void 0 ? void 0 : _c.includes(currentLayoutName);
+    const hasCurrentLayoutAsTag = (object?.Tags ?? [])?.includes(currentLayoutName);
     return {
         name: 'Tags',
-        values: (_d = object === null || object === void 0 ? void 0 : object.Tags) === null || _d === void 0 ? void 0 : _d.map((tag) => api.internalApi.getLabelForTag(tag)),
+        values: object?.Tags?.map((tag) => api.internalApi.getLabelForTag(tag)),
         viewAfter: (props) => {
             const dispatch = useDispatch();
             const viewOptions = props.module.getViewProperties();
             const handleToggleTag = React.useCallback(() => {
-                var _a;
-                let tags = (_a = props.data.Tags) !== null && _a !== void 0 ? _a : [];
+                let tags = props.data.Tags ?? [];
                 if (hasCurrentLayoutAsTag) {
                     // remove layout
                     tags = tags.filter((tag) => tag !== currentLayoutName);
@@ -24,7 +22,10 @@ export const getObjectTagsViewItems = (object, api) => {
                 else {
                     tags.push(currentLayoutName);
                 }
-                const newObject = Object.assign(Object.assign({}, props.data), { Tags: tags });
+                const newObject = {
+                    ...props.data,
+                    Tags: tags,
+                };
                 const editAction = viewOptions.getEditAction(newObject);
                 dispatch(editAction);
             }, [hasCurrentLayoutAsTag, props.data]);

package/src/{Strategy/Utilities → Utilities}/getRuleViewItems.d.ts

@@ -1,4 +1,4 @@
-import { AdaptableApi } from '../../../types';
+import { AdaptableApi } from '../../types';
 export declare const getRuleViewItems: (rule: any, api: AdaptableApi) => {
     name: string;
     values: any[];

package/src/Utilities/getRuleViewItems.js

@@ -0,0 +1,10 @@
+export const getRuleViewItems = (rule, api) => {
+    return {
+        name: 'Condition',
+        values: [
+            rule?.Predicates?.length
+                ? rule?.Predicates?.map((predicate) => api.predicateApi.predicateToString(predicate)).join(' AND ')
+                : api.internalApi.getAdaptableQueryExpressionText(rule) ?? 'No condition',
+        ],
+    };
+};

package/src/Utilities/getScopeViewItems.d.ts

@@ -0,0 +1,3 @@
+import { AdaptableObjectItemView } from "../Strategy/Interface/IModule";
+import { ColumnScope, AdaptableApi } from "../types";
+export declare const getScopeViewItems: (scope: ColumnScope, api: AdaptableApi) => AdaptableObjectItemView;

package/src/Utilities/isPivotLayout.d.ts

@@ -0,0 +1,2 @@
+import { isPivotLayout } from '../Api/Implementation/LayoutHelpers';
+export { isPivotLayout };

package/src/Utilities/isPivotLayout.js

@@ -0,0 +1,2 @@
+import { isPivotLayout } from '../Api/Implementation/LayoutHelpers';
+export { isPivotLayout };

package/src/Utilities/license/decode.js

@@ -1 +1 @@
-import{compute_string as e}from"./hashing";const t=()=>new Error("Invalid License");export const GENERIC_APP_NAME="GenericAdaptableApp";export const fieldsToLicenseDetails=e=>{var a;const r=e.reduce(((e,t)=>(e.set(t.name,t.value),e)),new Map),n={start:new Date(r.get("StartDate")),end:new Date(r.get("EndDate")),owner:r.get("Owner"),appName:r.get("AppName")||GENERIC_APP_NAME,timestamp:r.get("TS")?Number(r.get("TS")):0,trial:"true"===r.get("Trial"),ref:null!==(a=r.get("Ref"))&&void 0!==a?a:""};if(!(n.start&&n.end&&n.owner&&"boolean"==typeof n.trial&&n.ref))throw t();return n};export const decode=a=>{let r="",n=a.split("|").map((e=>{let[t,a]=e.split("=");return"C"===t&&(r=a),{name:t,value:a}}));if(!r)throw t();const o=r.split(",").reverse(),s=o.pop();o.forEach(((a,r)=>{const o=n[r];if(e(o.value)!==a)throw t()}));const i=[...n];i.pop();const p=i.map((e=>`${e.name}=${e.value}`)).join("|");if(e(p)!==s)throw t();return n=n.map((e=>Object.assign(Object.assign({},e),{value:decodeURI(e.value)}))),fieldsToLicenseDetails(n)};
+import{compute_string as e}from"./hashing";const t=()=>new Error("Invalid License");export const GENERIC_APP_NAME="GenericAdaptableApp";export const fieldsToLicenseDetails=e=>{const r=e.reduce(((e,t)=>(e.set(t.name,t.value),e)),new Map),a={start:new Date(r.get("StartDate")),end:new Date(r.get("EndDate")),owner:r.get("Owner"),appName:r.get("AppName")||GENERIC_APP_NAME,timestamp:r.get("TS")?Number(r.get("TS")):0,trial:"true"===r.get("Trial"),ref:r.get("Ref")??""};if(!(a.start&&a.end&&a.owner&&"boolean"==typeof a.trial&&a.ref))throw t();return a};export const decode=r=>{let a="",n=r.split("|").map((e=>{let[t,r]=e.split("=");return"C"===t&&(a=r),{name:t,value:r}}));if(!a)throw t();const o=a.split(",").reverse(),s=o.pop();o.forEach(((r,a)=>{const o=n[a];if(e(o.value)!==r)throw t()}));const p=[...n];p.pop();const i=p.map((e=>`${e.name}=${e.value}`)).join("|");if(e(i)!==s)throw t();return n=n.map((e=>({...e,value:decodeURI(e.value)}))),fieldsToLicenseDetails(n)};

package/src/Utilities/logDeprecation.d.ts

@@ -1,6 +1,6 @@
 import { AdaptableLogger } from '../agGrid/AdaptableLogger';
 type StringKey<T> = Extract<keyof T, string>;
-export declare const logDeprecation: <T>(logger: AdaptableLogger, typeName: string, oldProp: Extract<keyof T, string>, newProp?: Extract<keyof T, string>, message?: string) => void;
-export declare const logDeprecationExternal: <OLD_TYPE, NEW_TYPE>(logger: AdaptableLogger, oldTypeName: string, oldProp: Extract<keyof OLD_TYPE, string>, newTypeName: string, newProp: Extract<keyof NEW_TYPE, string>, message?: string) => void;
-export declare const logDeprecationInternal: <T>(logger: AdaptableLogger, typeName: string, oldProp: Extract<keyof T, string>) => void;
+export declare const logDeprecation: <T>(logger: AdaptableLogger, typeName: string, oldProp: StringKey<T>, newProp?: StringKey<T>, message?: string) => void;
+export declare const logDeprecationExternal: <OLD_TYPE, NEW_TYPE>(logger: AdaptableLogger, oldTypeName: string, oldProp: StringKey<OLD_TYPE>, newTypeName: string, newProp: StringKey<NEW_TYPE>, message?: string) => void;
+export declare const logDeprecationInternal: <T>(logger: AdaptableLogger, typeName: string, oldProp: StringKey<T>) => void;
 export {};

package/src/Utilities/logDeprecation.js

@@ -11,11 +11,11 @@ const doOnce = (func, key) => {
 };
 export const logDeprecation = (logger, typeName, oldProp, newProp, message) => {
     const newPropMsg = newProp ? `Please use '${typeName}.${newProp}()' instead. ` : '';
-    doOnce(() => logger.consoleWarn(`'${typeName}.${oldProp}()' is deprecated. ${newPropMsg}${message !== null && message !== void 0 ? message : ''}`), `Deprecated_${oldProp}`);
+    doOnce(() => logger.consoleWarn(`'${typeName}.${oldProp}()' is deprecated. ${newPropMsg}${message ?? ''}`), `Deprecated_${oldProp}`);
 };
 export const logDeprecationExternal = (logger, oldTypeName, oldProp, newTypeName, newProp, message) => {
     const newPropMsg = newProp ? `Please use '${newTypeName}.${newProp}()' instead. ` : '';
-    doOnce(() => logger.consoleWarn(`'${oldTypeName}.${oldProp}()' is deprecated. ${newPropMsg}${message !== null && message !== void 0 ? message : ''}`), `Deprecated_${oldProp}`);
+    doOnce(() => logger.consoleWarn(`'${oldTypeName}.${oldProp}()' is deprecated. ${newPropMsg}${message ?? ''}`), `Deprecated_${oldProp}`);
 };
 export const logDeprecationInternal = (logger, typeName, oldProp) => {
     doOnce(() => logger.consoleWarn(`'${typeName}.${oldProp}()' is deprecated. The method will be removed in the next major release.

package/src/Utilities/runIfNotResolvedIn.js

@@ -7,7 +7,7 @@
  */
 export const runIfNotResolvedIn = async (promise, callback, delay = 100) => {
     let isFulfilled = false;
-    promise === null || promise === void 0 ? void 0 : promise.then(() => {
+    promise?.then(() => {
         isFulfilled = true;
     });
     (async () => {

package/src/{Strategy/Utilities → Utilities}/updateSingleToMultiplePredicates.js

@@ -1,7 +1,6 @@
 export function updateSingleToMultiplePredicates(rule) {
-    var _a;
     if ('Predicate' in rule && rule.Predicate) {
-        rule.Predicates = [rule.Predicate, ...((_a = rule.Predicates) !== null && _a !== void 0 ? _a : [])];
+        rule.Predicates = [rule.Predicate, ...(rule.Predicates ?? [])];
         delete rule.Predicate;
     }
     return rule;

package/src/{agGrid → Utilities}/weightedAverage.d.ts

@@ -1,4 +1,4 @@
-import { IAggFuncParams } from '@ag-grid-community/core';
+import { IAggFuncParams } from 'ag-grid-enterprise';
 export declare const getNumericValue: (input: unknown) => number | null;
 export declare const weightedAverage: (params: IAggFuncParams, columnId: string, weightColumnId: string) => {
     [x: string]: number | (() => number | "");