@adaptabletools/adaptable 15.0.0-canary.4 → 15.0.0-canary.6

package/src/Strategy/TeamSharingModule.js

@@ -81,14 +81,13 @@ class TeamSharingModule extends AdaptableModuleBase_1.AdaptableModuleBase {
         return Object.values(action).find((actionProperty) => (0, isAdaptableObject_1.isAdaptableObject)(actionProperty));
     }
     isAdaptableObjectPresentInLocalState(sharedEntity) {
-        return !!this.api.internalApi
+        var _a;
+        return !!((_a = this.api.internalApi
             .getModuleService()
-            .getModuleById(sharedEntity.Module)
-            .getModuleAdaptableObjects()
-            .find((adaptableObject) => adaptableObject.Uuid === sharedEntity.Entity.Uuid);
+            .getModuleById(sharedEntity.Module)) === null || _a === void 0 ? void 0 : _a.getModuleAdaptableObjects().find((adaptableObject) => adaptableObject.Uuid === sharedEntity.Entity.Uuid));
     }
     isSharedEntityADependency(sharedEntity) {
-        const allSharedEntries = this.api.teamSharingApi.getLoadedSharedEntities();
+        const allSharedEntries = this.api.teamSharingApi.getLoadedAdaptableSharedEntities();
         return allSharedEntries.some((sharedEntryCandidate) => {
             var _a;
             return (_a = sharedEntryCandidate === null || sharedEntryCandidate === void 0 ? void 0 : sharedEntryCandidate.EntityDependencyIds) === null || _a === void 0 ? void 0 : _a.includes(sharedEntity.Uuid);
@@ -106,7 +105,7 @@ class TeamSharingModule extends AdaptableModuleBase_1.AdaptableModuleBase {
             sharedEntity.EntityDependencyIds.length === 0) {
             return [sharedEntity];
         }
-        const allSharedEntities = this.api.teamSharingApi.getLoadedSharedEntities();
+        const allSharedEntities = this.api.teamSharingApi.getLoadedAdaptableSharedEntities();
         const dependencies = sharedEntity.EntityDependencyIds.map((dependencyUuid) => allSharedEntities.find((entity) => entity.Uuid === dependencyUuid));
         return (0, flatten_1.default)(dependencies.map((dependency) => this.getDependencies(dependency)));
     }
@@ -158,7 +157,7 @@ class TeamSharingModule extends AdaptableModuleBase_1.AdaptableModuleBase {
     }
     toViewAll() {
         var _a;
-        return (((_a = this.api.teamSharingApi.getLoadedSharedEntities()) !== null && _a !== void 0 ? _a : [])
+        return (((_a = this.api.teamSharingApi.getLoadedAdaptableSharedEntities()) !== null && _a !== void 0 ? _a : [])
             // only top level
             .filter((sharedEntity) => !this.isSharedEntityADependency(sharedEntity))
             .map((item) => this.toView(item)));

package/src/Utilities/Defaults/DefaultAdaptableOptions.js

@@ -212,6 +212,7 @@ exports.DefaultAdaptableOptions = {
         showDistinctFilteredValuesOnly: false,
         showClearFilterButton: false,
         showSuspendFilterButton: false,
+        quickFilterWildcards: {},
     },
     searchOptions: {
         excludeColumnFromQuickSearch: undefined,
@@ -229,8 +230,10 @@ exports.DefaultAdaptableOptions = {
     },
     teamSharingOptions: {
         enableTeamSharing: false,
-        setSharedEntities: undefined,
-        getSharedEntities: undefined,
+        persistSharedEntities: undefined,
+        loadSharedEntities: undefined,
+        applySharedEntities: (sharedEntities) => sharedEntities,
+        saveSharedEntities: (sharedEntities) => sharedEntities,
         updateInterval: 0,
         updateNotification: undefined,
     },

package/src/Utilities/Services/Interface/ITeamSharingService.d.ts

@@ -1,14 +1,15 @@
 import { IAdaptableService } from './IAdaptableService';
 import { AdaptableObject } from '../../../PredefinedConfig/Common/AdaptableObject';
 import { AdaptableModule } from '../../../PredefinedConfig/Common/Types';
-import { SharedEntity, SharedEntityConfig, SharedEntityActiveStatus, TeamSharingImportStep } from '../../../PredefinedConfig/TeamSharingState';
+import { AdaptableSharedEntityConfig, SharedEntityActiveStatus, TeamSharingImportStep, AdaptableSharedEntity, CustomSharedEntityConfig, CustomSharedEntity } from '../../../PredefinedConfig/TeamSharingState';
 import { TypeUuid } from '../../../PredefinedConfig/Uuid';
 export interface ITeamSharingService extends IAdaptableService {
-    buildSharedEntityWithDependencies(adaptableObject: AdaptableObject, module: AdaptableModule, configuration: SharedEntityConfig): SharedEntity[];
-    getSharedEntityDependants(sharedEntityId: TypeUuid, sharedEntities: SharedEntity[]): SharedEntity[];
-    updateActiveSharedEntity(changedAdaptableObject: AdaptableObject, userName: string, sharedEntities: SharedEntity[]): [SharedEntity[], SharedEntity[]];
-    buildSharedEntityImportActions(sharedEntity: SharedEntity): [TeamSharingImportStep[], boolean];
-    getSharedEntityLocalAndRemoteRevisions(changedAdaptableObjectId: TypeUuid, remoteSharedEntities: SharedEntity[]): any;
+    buildSharedEntityWithDependencies(adaptableObject: AdaptableObject, module: AdaptableModule, configuration: AdaptableSharedEntityConfig): AdaptableSharedEntity[];
+    getSharedEntityDependants(sharedEntityId: TypeUuid, sharedEntities: AdaptableSharedEntity[]): AdaptableSharedEntity[];
+    updateActiveSharedEntity(changedAdaptableObject: AdaptableObject, userName: string, sharedEntities: AdaptableSharedEntity[]): [AdaptableSharedEntity[], AdaptableSharedEntity[]];
+    buildSharedEntityImportActions(sharedEntity: AdaptableSharedEntity): [TeamSharingImportStep[], boolean];
+    getSharedEntityLocalAndRemoteRevisions(changedAdaptableObjectId: TypeUuid, remoteSharedEntities: AdaptableSharedEntity[]): any;
     getStaleActiveSharedEntities(): SharedEntityActiveStatus;
     showUpdateNotifications(): void;
+    buildCustomSharedEntity(Entity: any, Configuration: CustomSharedEntityConfig): CustomSharedEntity;
 }

package/src/Utilities/Services/TeamSharingService.d.ts

@@ -1,18 +1,19 @@
 import { ITeamSharingService } from './Interface/ITeamSharingService';
 import { AdaptableModule } from '../../PredefinedConfig/Common/Types';
 import { AdaptableObject } from '../../PredefinedConfig/Common/AdaptableObject';
-import { SharedEntity, SharedEntityConfig, SharedEntityActiveStatus, TeamSharingImportStep } from '../../PredefinedConfig/TeamSharingState';
+import { AdaptableSharedEntityConfig, SharedEntityActiveStatus, TeamSharingImportStep, AdaptableSharedEntity, CustomSharedEntity, CustomSharedEntityConfig } from '../../PredefinedConfig/TeamSharingState';
 import { TypeUuid } from '../../PredefinedConfig/Uuid';
 import { AdaptableApi } from '../../../types';
 export declare class TeamSharingService implements ITeamSharingService {
     private adaptableApi;
     private updateCheckTimerId;
     constructor(adaptableApi: AdaptableApi);
-    buildSharedEntityWithDependencies(adaptableObject: AdaptableObject, module: AdaptableModule, configuration: SharedEntityConfig): SharedEntity[];
-    getSharedEntityDependants(sharedEntityId: TypeUuid, sharedEntities: SharedEntity[]): SharedEntity[];
-    updateActiveSharedEntity(changedAdaptableObject: AdaptableObject, userName: string, sharedEntities: SharedEntity[]): [SharedEntity[], SharedEntity[]];
-    buildSharedEntityImportActions(importedSharedEntity: SharedEntity): [TeamSharingImportStep[], boolean];
-    getSharedEntityLocalAndRemoteRevisions(changedAdaptableObjectId: TypeUuid, remoteSharedEntities: SharedEntity[]): [number, number];
+    buildCustomSharedEntity(Entity: any, Configuration: CustomSharedEntityConfig): CustomSharedEntity;
+    buildSharedEntityWithDependencies(adaptableObject: AdaptableObject, module: AdaptableModule, configuration: AdaptableSharedEntityConfig): AdaptableSharedEntity[];
+    getSharedEntityDependants(sharedEntityId: TypeUuid, sharedEntities: AdaptableSharedEntity[]): AdaptableSharedEntity[];
+    updateActiveSharedEntity(changedAdaptableObject: AdaptableObject, userName: string, sharedEntities: AdaptableSharedEntity[]): [AdaptableSharedEntity[], AdaptableSharedEntity[]];
+    buildSharedEntityImportActions(importedSharedEntity: AdaptableSharedEntity): [TeamSharingImportStep[], boolean];
+    getSharedEntityLocalAndRemoteRevisions(changedAdaptableObjectId: TypeUuid, remoteSharedEntities: AdaptableSharedEntity[]): [number, number];
     getStaleActiveSharedEntities(): SharedEntityActiveStatus;
     showUpdateNotifications(): void;
     destroy(): void;

package/src/Utilities/Services/TeamSharingService.js

@@ -14,6 +14,23 @@ class TeamSharingService {
             }, updateInterval);
         }
     }
+    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 : (0, Uuid_1.createUuid)(),
+            Name: Configuration.Name,
+            Description: Configuration.Description,
+            Tags: Configuration.Tags,
+            UserName: currentUser,
+            Timestamp: currentTime,
+            ChangedBy: currentUser,
+            ChangedAt: currentTime,
+        };
+    }
     buildSharedEntityWithDependencies(adaptableObject, module, configuration) {
         const sharingUserName = this.adaptableApi.optionsApi.getUserName();
         const sharingTimestamp = new Date().getTime();
@@ -74,7 +91,7 @@ class TeamSharingService {
                 return importInfo === null || importInfo === void 0 ? void 0 : importInfo.AddAction(Entity);
             }
         };
-        const existingSharedEntities = this.adaptableApi.teamSharingApi.internalApi.getLocalTeamSharingEntities();
+        const existingSharedEntities = this.adaptableApi.teamSharingApi.getLoadedAdaptableSharedEntities();
         const sharedEntityDependencyTree = this.getSharedEntityDependencyTree(importedSharedEntity, existingSharedEntities);
         const importSteps = sharedEntityDependencyTree.map((sharedEntity) => ({
             sharedEntity,
@@ -89,7 +106,7 @@ class TeamSharingService {
         return [localRevision, remoteRevision];
     }
     getStaleActiveSharedEntities() {
-        const sharedEntities = this.adaptableApi.teamSharingApi.internalApi.getLocalTeamSharingEntities();
+        const sharedEntities = this.adaptableApi.teamSharingApi.getLoadedAdaptableSharedEntities();
         const activeEntities = this.adaptableApi.internalApi.getState().TeamSharing.ActiveSharedEntityMap;
         const result = {};
         sharedEntities
@@ -131,6 +148,7 @@ class TeamSharingService {
     createSharedEntity(adaptableObject, module, configuration, sharingUserName, sharingTimestamp, createdSharedEntities) {
         // create main shared entity
         const mainSharedEntity = {
+            EntityType: 'adaptableEntity',
             Uuid: (0, Uuid_1.createUuid)(),
             Entity: adaptableObject,
             EntityDependencyIds: [],
@@ -175,10 +193,10 @@ class TeamSharingService {
         return Array.from(result.values());
     }
     getTeamSharingReferences(adaptableObject, module) {
-        return this.adaptableApi.internalApi
+        var _a, _b;
+        return ((_b = (_a = this.adaptableApi.internalApi
             .getModuleService()
-            .getModuleById(module)
-            .getTeamSharingReferences(adaptableObject);
+            .getModuleById(module)) === null || _a === void 0 ? void 0 : _a.getTeamSharingReferences(adaptableObject)) !== null && _b !== void 0 ? _b : []);
     }
     getSharedEntityDependencies(input, allSharedEntities) {
         return input.EntityDependencyIds.map((dependencyId) => allSharedEntities.find((sharedEntity) => sharedEntity.Uuid === dependencyId)).filter((dependencyEntity) => !!dependencyEntity);

package/src/View/Components/AdaptableObjectList/AdaptableObjectList.d.ts

@@ -2,7 +2,7 @@ import * as React from 'react';
 import { Action } from 'redux';
 import { AdaptableObject } from '../../../PredefinedConfig/Common/AdaptableObject';
 import { AdaptableObjectItemView, AdaptableObjectView, IModule } from '../../../Strategy/Interface/IModule';
-import { AccessLevel, SharedEntityConfig } from '../../../types';
+import { AccessLevel, AdaptableSharedEntityConfig } from '../../../types';
 export declare const AdaptableObjectListItemView: React.FunctionComponent<{
     abObject: AdaptableObject;
     accessLevel?: AccessLevel;
@@ -16,7 +16,7 @@ export declare const AdaptableObjectListItemView: React.FunctionComponent<{
     entityType: string;
     handleOnEdit?: (tagName?: string) => void;
     items: AdaptableObjectItemView[];
-    onShare?: (config: SharedEntityConfig) => void;
+    onShare?: (config: AdaptableSharedEntityConfig) => void;
     onSuspend?: () => void;
     onUnSuspend?: () => void;
     showActions?: boolean;

package/src/View/Components/Buttons/ButtonShare.d.ts

@@ -1,8 +1,8 @@
 import * as React from 'react';
 import { SimpleButtonProps } from '../../../components/SimpleButton';
-import { SharedEntityConfig } from '../../../PredefinedConfig/TeamSharingState';
+import { AdaptableSharedEntityConfig } from '../../../PredefinedConfig/TeamSharingState';
 interface ButtonShareProps extends SimpleButtonProps {
-    onShare: (config: SharedEntityConfig) => void;
+    onShare: (config: AdaptableSharedEntityConfig) => void;
     Header: string;
 }
 interface ButtonShareState {

package/src/View/Components/Buttons/EntityListActionButtons.d.ts

@@ -1,13 +1,13 @@
 import * as React from 'react';
 import * as Redux from 'redux';
 import { AccessLevel } from '../../../PredefinedConfig/Common/Entitlement';
-import { SharedEntityConfig } from '../../../PredefinedConfig/TeamSharingState';
+import { AdaptableSharedEntityConfig } from '../../../PredefinedConfig/TeamSharingState';
 import { AdaptableObject } from '../../../PredefinedConfig/Common/AdaptableObject';
 import { SuspendableObject } from '../../../PredefinedConfig/Common/SuspendableObject';
 export interface EntityListActionButtonsProps extends React.ClassAttributes<EntityListActionButtons> {
     editClick?: () => void;
     cloneClick?: () => void;
-    shareClick?: (config: SharedEntityConfig) => void;
+    shareClick?: (config: AdaptableSharedEntityConfig) => void;
     showEdit?: boolean;
     showClone?: boolean;
     showDelete?: boolean;

package/src/View/Components/ModuleSummary/ModuleDetail.d.ts

@@ -2,7 +2,7 @@ import * as React from 'react';
 import * as Redux from 'redux';
 import { AdaptableObject } from '../../../PredefinedConfig/Common/AdaptableObject';
 import { ModuleInfo } from '../../../Strategy/Interface/IModule';
-import { SharedEntityConfig } from '../../../PredefinedConfig/TeamSharingState';
+import { AdaptableSharedEntityConfig } from '../../../PredefinedConfig/TeamSharingState';
 import { AccessLevel } from '../../../PredefinedConfig/Common/Entitlement';
 export interface ModuleDetailProps extends React.ClassAttributes<ModuleDetail> {
     key: string;
@@ -12,7 +12,7 @@ export interface ModuleDetailProps extends React.ClassAttributes<ModuleDetail> {
     moduleInfo: ModuleInfo;
     accessLevel: AccessLevel;
     onEdit: () => void;
-    onShare: (config: SharedEntityConfig) => void;
+    onShare: (config: AdaptableSharedEntityConfig) => void;
     onDelete: Redux.Action;
     showBold?: boolean;
     showEdit?: boolean;

package/src/View/Components/Popups/AdaptablePopupTeamSharing.d.ts

@@ -1,9 +1,9 @@
 /// <reference types="react" />
-import { SharedEntityConfig } from '../../../PredefinedConfig/TeamSharingState';
+import { AdaptableSharedEntityConfig } from '../../../PredefinedConfig/TeamSharingState';
 export interface AdaptablePopupTeamSharingProps {
     showPopup: boolean;
     header: string;
     onClose: () => void;
-    onConfirm: (config: SharedEntityConfig) => void;
+    onConfirm: (config: AdaptableSharedEntityConfig) => void;
 }
 export declare const AdaptablePopupTeamSharing: (props: AdaptablePopupTeamSharingProps) => JSX.Element;

package/src/View/Components/SharedProps/ConfigEntityRowProps.d.ts

@@ -5,7 +5,7 @@ import { IColItem } from '../../UIInterfaces';
 import { AdaptableApi } from '../../../Api/AdaptableApi';
 import { ModuleInfo } from '../../../Strategy/Interface/IModule';
 import { AccessLevel } from '../../../PredefinedConfig/Common/Entitlement';
-import { SharedEntityConfig } from '../../../PredefinedConfig/TeamSharingState';
+import { AdaptableSharedEntityConfig } from '../../../PredefinedConfig/TeamSharingState';
 export interface BaseRowProps<View> extends React.ClassAttributes<View> {
     colItems: IColItem[];
     api: AdaptableApi;
@@ -18,7 +18,7 @@ export interface BaseEntityRowProps<View> extends BaseRowProps<View> {
     moduleInfo: ModuleInfo;
 }
 export interface SharedEntityRowProps<View> extends BaseEntityRowProps<View> {
-    onShare: (config: SharedEntityConfig) => void;
+    onShare: (config: AdaptableSharedEntityConfig) => void;
     teamSharingActivated: boolean;
     accessLevel: AccessLevel;
     onSuspend?: (adaptableObject: AdaptableObject) => void;

package/src/View/Components/SharedProps/ModuleSummaryProps.d.ts

@@ -2,8 +2,8 @@ import { AdaptableColumn } from '../../../PredefinedConfig/Common/AdaptableColum
 import { ModuleViewPopupProps } from './ModuleViewPopupProps';
 import * as TeamSharingRedux from '../../../Redux/ActionsReducers/TeamSharingRedux';
 import { AdaptableObject } from '../../../PredefinedConfig/Common/AdaptableObject';
-import { SharedEntityConfig } from '../../../PredefinedConfig/TeamSharingState';
+import { AdaptableSharedEntityConfig } from '../../../PredefinedConfig/TeamSharingState';
 export interface ModuleSummaryProps<View> extends ModuleViewPopupProps<View> {
     summarisedColumn: AdaptableColumn;
-    onShare: (entity: AdaptableObject, config: SharedEntityConfig) => TeamSharingRedux.TeamSharingShareAction;
+    onShare: (entity: AdaptableObject, config: AdaptableSharedEntityConfig) => TeamSharingRedux.TeamSharingShareAction;
 }

package/src/View/TeamSharing/SharedEntityDependencies.d.ts

@@ -1,8 +1,8 @@
 import * as React from 'react';
-import { SharedEntity } from '../../../types';
+import { AdaptableSharedEntity } from '../../../types';
 export declare const Dependencies: React.FunctionComponent<{
-    sharedEntity: SharedEntity;
+    sharedEntity: AdaptableSharedEntity;
 }>;
 export declare const SharedEntityDependencies: React.FunctionComponent<{
-    data: SharedEntity;
+    data: AdaptableSharedEntity;
 }>;

package/src/View/TeamSharing/SharedEntityObjectView.d.ts

@@ -1,9 +1,9 @@
 import * as React from 'react';
-import { SharedEntity } from '../../../types';
+import { AdaptableSharedEntity } from '../../../types';
 export declare const SharedEntityTypeItemView: React.FunctionComponent<{
-    data: SharedEntity;
+    data: AdaptableSharedEntity;
 }>;
 export declare const getSharedEntityActiveStatusObjectView: (isDependency: boolean) => (props: {
-    data: SharedEntity;
+    data: AdaptableSharedEntity;
 }) => JSX.Element;
-export declare const getSharedEntityStaleDepsItemView: (staleDependencies: SharedEntity[]) => () => JSX.Element;
+export declare const getSharedEntityStaleDepsItemView: (staleDependencies: AdaptableSharedEntity[]) => () => JSX.Element;

package/src/View/TeamSharing/SharedEntityObjectView.js

@@ -14,13 +14,13 @@ const SharedEntityTypeItemView = (props) => {
     const moduleName = props.data.Module;
     const module = adaptable.ModuleService.getModuleById(moduleName);
     const sharedObject = props.data.Entity;
-    const item = module.toView(sharedObject);
+    const item = module === null || module === void 0 ? void 0 : module.toView(sharedObject);
     return (React.createElement(React.Fragment, null,
         React.createElement(rebass_1.Flex, { mb: 2, mt: 2 },
             React.createElement(rebass_1.Flex, { mr: 2, alignItems: "center" },
                 React.createElement(Tag_1.Tag, { style: { margin: 0 } }, props.data.Module)),
-            isExpanded ? (React.createElement(SimpleButton_1.default, { "data-name": "shared-entity-collapse-button", onClick: () => setIsExpanded(false), icon: "arrow-up" }, "Collapse")) : (React.createElement(SimpleButton_1.default, { "data-name": "shared-entity-epxand-button", onClick: () => setIsExpanded(true), icon: "arrow-down" }, "Expand"))),
-        isExpanded && (React.createElement(rebass_1.Box, { as: "ul", padding: 0, className: "ab-Shared-Entity-Shared-Object" },
+            item ? (isExpanded ? (React.createElement(SimpleButton_1.default, { "data-name": "shared-entity-collapse-button", onClick: () => setIsExpanded(false), icon: "arrow-up" }, "Collapse")) : (React.createElement(SimpleButton_1.default, { "data-name": "shared-entity-expand-button", onClick: () => setIsExpanded(true), icon: "arrow-down" }, "Expand"))) : null),
+        isExpanded && item && (React.createElement(rebass_1.Box, { as: "ul", padding: 0, className: "ab-Shared-Entity-Shared-Object" },
             React.createElement(AdaptableObjectList_1.AdaptableObjectListItem, { hideControls: true, data: item, module: module })))));
 };
 exports.SharedEntityTypeItemView = SharedEntityTypeItemView;
@@ -31,9 +31,8 @@ const getSharedEntityActiveStatusObjectView = (isDependency) => (props) => {
     const sharedEntity = props.data;
     const isAdaptableObjectPresentInLocalState = !!adaptable.api.internalApi
         .getModuleService()
-        .getModuleById(sharedEntity.Module)
-        .getModuleAdaptableObjects()
-        .find((adaptableObject) => adaptableObject.Uuid === sharedEntity.Entity.Uuid);
+        .getModuleById('TeamSharing')
+        .isAdaptableObjectPresentInLocalState(sharedEntity);
     const isUpToDateAndActive = isAdaptableObjectPresentInLocalState &&
         sharedEntity.Type === 'Active' &&
         ((_a = activeEntries[sharedEntity.Entity.Uuid]) === null || _a === void 0 ? void 0 : _a.Revision) === sharedEntity.Revision;

package/src/View/Theme/ThemePopup.js

@@ -49,11 +49,10 @@ class ThemePopupComponent extends React.Component {
         const isCustomTheme = this.props.api.themeApi
             .getUserThemes()
             .some((theme) => theme.Name === this.props.CurrentTheme);
-        return (React.createElement(PopupPanel_1.PopupPanel, { headerText: this.props.moduleInfo.FriendlyName, glyphicon: this.props.moduleInfo.Glyph, infoLink: this.props.moduleInfo.HelpPage, infoLinkDisabled: !this.props.api.internalApi.isDocumentationLinksDisplayed() },
+        return (React.createElement(PopupPanel_1.PopupPanel, { headerText: this.props.moduleInfo.FriendlyName, glyphicon: this.props.moduleInfo.Glyph, infoLink: this.props.moduleInfo.HelpPage, infoLinkDisabled: !this.props.api.internalApi.isDocumentationLinksDisplayed(), button: React.createElement(ButtonNew_1.ButtonNew, { ml: 2, onClick: this.handleCreateNewTheme, accessLevel: this.props.accessLevel }) },
             React.createElement(FormLayout_1.default, null,
                 React.createElement(FormLayout_1.FormRow, { label: "Current Theme:" },
-                    React.createElement(DropdownButton_1.default, { "data-name": "select-theme-dropdown", columns: ['label'], style: { width: '50%', minWidth: 200 }, placeholder: "Select theme", value: this.props.CurrentTheme, items: optionThemes, accessLevel: this.props.accessLevel }, currentThemeDescription),
-                    React.createElement(ButtonNew_1.ButtonNew, { ml: 2, onClick: this.handleCreateNewTheme, accessLevel: this.props.accessLevel }))),
+                    React.createElement(DropdownButton_1.default, { "data-name": "select-theme-dropdown", columns: ['label'], style: { width: '50%', minWidth: 200 }, placeholder: "Select theme", value: this.props.CurrentTheme, items: optionThemes, accessLevel: this.props.accessLevel }, currentThemeDescription))),
             isCustomTheme && (React.createElement(rebass_1.Box, { mt: 3 },
                 React.createElement(ThemeEditor_1.ThemeEditor, { accessLevel: this.props.accessLevel, theme: this.props.CurrentTheme })))));
     }

package/src/agGrid/Adaptable.js

@@ -3201,10 +3201,14 @@ class Adaptable {
                     ? this.getFormatColumnCellStyle(abColumn, activeFormatColumnsWithStyle, params)
                     : {})), (styledColumn ? this.getStyledColumnStyle(styledColumn, abColumn, params) : {})), (isQuickSearchActive ? quickSearchStyle : {})), this.getAlertCellStyle(abColumn, params)), this.getFlashingCellStyle(abColumn, params)), this.getCellHighlightStyle(abColumn, params));
                 // remove null values, AG Grid 29 fails, it asumes they are strings
+                // TODO AFL: remove once AG-7903 and AG-7917 are fixed
                 Object.keys(result).forEach((key) => {
                     if (result[key] === null || result[key] === undefined) {
                         delete result[key];
                     }
+                    if (typeof result[key] === 'number') {
+                        result[key] = String(result[key]);
+                    }
                 });
                 return result;
             };