@adaptabletools/adaptable 12.0.0-canary.2 → 12.0.0-canary.5

package/src/Redux/ActionsReducers/TeamSharingRedux.js

@@ -12,52 +12,62 @@ exports.TEAMSHARING_REMOVE_ITEM = 'TEAMSHARING_REMOVE_ITEM';
 exports.TEAMSHARING_LINK_ITEM = 'TEAMSHARING_LINK_ITEM';
 exports.TEAMSHARING_UPDATE_ITEM = 'TEAMSHARING_UPDATE_ITEM';
 exports.TEAMSHARING_CHECK_FOR_UPDATES = 'TEAMSHARING_CHECK_FOR_UPDATES';
-exports.TeamSharingShare = (entity, module, configuration) => ({
+const TeamSharingShare = (entity, module, configuration) => ({
     type: exports.TEAMSHARING_SHARE,
     Entity: entity,
     Module: module,
     Configuration: configuration,
 });
-exports.TeamSharingSet = (Entities) => ({
+exports.TeamSharingShare = TeamSharingShare;
+const TeamSharingSet = (Entities) => ({
     type: exports.TEAMSHARING_SET,
     Entities,
 });
-exports.TeamSharingImportItem = (SharedEntity) => ({
+exports.TeamSharingSet = TeamSharingSet;
+const TeamSharingImportItem = (SharedEntity) => ({
     type: exports.TEAMSHARING_IMPORT_ITEM,
     SharedEntity,
 });
-exports.TeamSharingProcessImport = (ImportSteps) => ({
+exports.TeamSharingImportItem = TeamSharingImportItem;
+const TeamSharingProcessImport = (ImportSteps) => ({
     type: exports.TEAMSHARING_PROCESS_IMPORT,
     ImportSteps,
 });
-exports.TeamSharingCommitImport = () => ({
+exports.TeamSharingProcessImport = TeamSharingProcessImport;
+const TeamSharingCommitImport = () => ({
     type: exports.TEAMSHARING_COMMIT_IMPORT,
 });
-exports.TeamSharingRemoveItem = (Uuid) => ({
+exports.TeamSharingCommitImport = TeamSharingCommitImport;
+const TeamSharingRemoveItem = (Uuid) => ({
     type: exports.TEAMSHARING_REMOVE_ITEM,
     Uuid,
 });
-exports.TeamSharingGet = () => ({
+exports.TeamSharingRemoveItem = TeamSharingRemoveItem;
+const TeamSharingGet = () => ({
     type: exports.TEAMSHARING_GET,
 });
-exports.TeamSharingLinkItem = (...SharedEntities) => ({
+exports.TeamSharingGet = TeamSharingGet;
+const TeamSharingLinkItem = (...SharedEntities) => ({
     type: exports.TEAMSHARING_LINK_ITEM,
     SharedEntities,
 });
-exports.TeamSharingUpdateItem = (ChangedAdaptableObject, UserName) => ({
+exports.TeamSharingLinkItem = TeamSharingLinkItem;
+const TeamSharingUpdateItem = (ChangedAdaptableObject, UserName) => ({
     type: exports.TEAMSHARING_UPDATE_ITEM,
     ChangedAdaptableObject,
     UserName,
 });
-exports.TeamSharingCheckForUpdates = () => ({
+exports.TeamSharingUpdateItem = TeamSharingUpdateItem;
+const TeamSharingCheckForUpdates = () => ({
     type: exports.TEAMSHARING_CHECK_FOR_UPDATES,
 });
+exports.TeamSharingCheckForUpdates = TeamSharingCheckForUpdates;
 const initialTeamSharingState = {
     SharedEntities: GeneralConstants_1.EMPTY_ARRAY,
     ActiveSharedEntityMap: {},
     importProcessInProgress: false,
 };
-exports.TeamSharingReducer = (state = initialTeamSharingState, action) => {
+const TeamSharingReducer = (state = initialTeamSharingState, action) => {
     switch (action.type) {
         case exports.TEAMSHARING_SET: {
             const actionTyped = action;
@@ -98,3 +108,4 @@ exports.TeamSharingReducer = (state = initialTeamSharingState, action) => {
             return state;
     }
 };
+exports.TeamSharingReducer = TeamSharingReducer;

package/src/Redux/ActionsReducers/ThemeRedux.js

@@ -18,28 +18,32 @@ exports.THEME_SELECT = 'THEME_SELECT';
  * @ReduxAction Theme Module is ready
  */
 exports.THEME_READY = 'THEME_READY';
-exports.ThemeSetSystemThemes = (SystemThemes) => ({
+const ThemeSetSystemThemes = (SystemThemes) => ({
     type: exports.THEME_SET_SYSTEM_THEMES,
     SystemThemes,
 });
-exports.ThemeSetUserThemes = (UserThemes) => ({
+exports.ThemeSetSystemThemes = ThemeSetSystemThemes;
+const ThemeSetUserThemes = (UserThemes) => ({
     type: exports.THEME_SET_USER_THEMES,
     UserThemes,
 });
-exports.ThemeSelect = (Theme) => ({
+exports.ThemeSetUserThemes = ThemeSetUserThemes;
+const ThemeSelect = (Theme) => ({
     type: exports.THEME_SELECT,
     Theme,
 });
-exports.ThemeReady = (themeState) => ({
+exports.ThemeSelect = ThemeSelect;
+const ThemeReady = (themeState) => ({
     type: exports.THEME_READY,
     themeState,
 });
+exports.ThemeReady = ThemeReady;
 const initialState = {
     CurrentTheme: GeneralConstants_1.THEME_DEFAULT_CURRENT_THEME,
     SystemThemes: GeneralConstants_1.SYSTEM_THEMES,
     UserThemes: GeneralConstants_1.EMPTY_ARRAY,
 };
-exports.ThemeReducer = (state = initialState, action) => {
+const ThemeReducer = (state = initialState, action) => {
     switch (action.type) {
         case exports.THEME_SET_SYSTEM_THEMES:
             return Object.assign({}, state, {
@@ -57,3 +61,4 @@ exports.ThemeReducer = (state = initialState, action) => {
             return state;
     }
 };
+exports.ThemeReducer = ThemeReducer;

package/src/Redux/ActionsReducers/ToolPanelRedux.js

@@ -29,40 +29,47 @@ exports.TOOLPANEL_SET_MODULE_BUTTONS = 'TOOLPANEL_SET_MODULE_BUTTONS';
  * @ReduxAction AdapTable ToolPanel Component is ready
  */
 exports.TOOLPANEL_READY = 'TOOLPANEL_READY';
-exports.ToolPanelSetToolPanels = (toolPanels) => ({
+const ToolPanelSetToolPanels = (toolPanels) => ({
     type: exports.TOOLPANEL_SET_TOOLPANELS,
     toolPanels,
 });
-exports.ToolPanelShowToolPanel = (toolPanel) => ({
+exports.ToolPanelSetToolPanels = ToolPanelSetToolPanels;
+const ToolPanelShowToolPanel = (toolPanel) => ({
     type: exports.TOOLPANEL_SHOW_TOOLPANEL,
     toolPanel,
 });
-exports.ToolPanelHideToolPanel = (toolPanel) => ({
+exports.ToolPanelShowToolPanel = ToolPanelShowToolPanel;
+const ToolPanelHideToolPanel = (toolPanel) => ({
     type: exports.TOOLPANEL_HIDE_TOOLPANEL,
     toolPanel,
 });
-exports.ToolPanelExpandToolPanel = (toolPanel) => ({
+exports.ToolPanelHideToolPanel = ToolPanelHideToolPanel;
+const ToolPanelExpandToolPanel = (toolPanel) => ({
     type: exports.TOOLPANEL_EXPAND_TOOLPANEL,
     toolPanel,
 });
-exports.ToolPanelCollapseToolPanel = (toolPanel) => ({
+exports.ToolPanelExpandToolPanel = ToolPanelExpandToolPanel;
+const ToolPanelCollapseToolPanel = (toolPanel) => ({
     type: exports.TOOLPANEL_COLLAPSE_TOOLPANEL,
     toolPanel,
 });
-exports.ToolPanelSetModuleButtons = (moduleButtons) => ({
+exports.ToolPanelCollapseToolPanel = ToolPanelCollapseToolPanel;
+const ToolPanelSetModuleButtons = (moduleButtons) => ({
     type: exports.TOOLPANEL_SET_MODULE_BUTTONS,
     moduleButtons: moduleButtons,
 });
-exports.ToolPanelReady = (toolPanelState) => ({
+exports.ToolPanelSetModuleButtons = ToolPanelSetModuleButtons;
+const ToolPanelReady = (toolPanelState) => ({
     type: exports.TOOLPANEL_READY,
     toolPanelState,
 });
+exports.ToolPanelReady = ToolPanelReady;
 const initialState = {
     // default ToolPanels are set in ToolPanelModule.updateOldConfig() because we have to evaluate the ToolPanelOptions (for CustomToolPanel)
     ToolPanels: undefined,
     ModuleButtons: ['SettingsPanel'],
 };
-exports.ToolPanelReducer = (state = initialState, action) => {
+const ToolPanelReducer = (state = initialState, action) => {
     var _a, _b, _c, _d;
     const setToolPanels = (state, toolPanels = []) => {
         return Object.assign(Object.assign({}, state), { ToolPanels: [...toolPanels] });
@@ -108,3 +115,4 @@ exports.ToolPanelReducer = (state = initialState, action) => {
             return state;
     }
 };
+exports.ToolPanelReducer = ToolPanelReducer;

package/src/Redux/DeadRedux.js

@@ -3,10 +3,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.UpdatedRowReducer = exports.UpdatedRowClear = exports.UPDATED_ROW_CLEAR = exports.FlashingCellReducer = exports.FlashingCellClear = exports.FLASHING_CELL_CLEAR = exports.PercentBarReducer = exports.PercentBarClear = exports.PERCENT_BAR_CLEAR = exports.GradientColumnReducer = exports.GradientColumnClear = exports.GRADIENT_COLUMN_CLEAR = void 0;
 const initialGradientColumnState = {};
 exports.GRADIENT_COLUMN_CLEAR = 'GRADIENT_COLUMN_CLEAR';
-exports.GradientColumnClear = () => ({
+const GradientColumnClear = () => ({
     type: exports.GRADIENT_COLUMN_CLEAR,
 });
-exports.GradientColumnReducer = (state = initialGradientColumnState, action) => {
+exports.GradientColumnClear = GradientColumnClear;
+const GradientColumnReducer = (state = initialGradientColumnState, action) => {
     switch (action.type) {
         case exports.GRADIENT_COLUMN_CLEAR: {
             return Object.assign({}, initialGradientColumnState);
@@ -15,12 +16,14 @@ exports.GradientColumnReducer = (state = initialGradientColumnState, action) =>
             return state;
     }
 };
+exports.GradientColumnReducer = GradientColumnReducer;
 const initialPercentBarState = {};
 exports.PERCENT_BAR_CLEAR = 'PERCENT_BAR_CLEAR';
-exports.PercentBarClear = () => ({
+const PercentBarClear = () => ({
     type: exports.PERCENT_BAR_CLEAR,
 });
-exports.PercentBarReducer = (state = initialPercentBarState, action) => {
+exports.PercentBarClear = PercentBarClear;
+const PercentBarReducer = (state = initialPercentBarState, action) => {
     switch (action.type) {
         case exports.PERCENT_BAR_CLEAR: {
             return Object.assign({}, initialPercentBarState);
@@ -29,12 +32,14 @@ exports.PercentBarReducer = (state = initialPercentBarState, action) => {
             return state;
     }
 };
+exports.PercentBarReducer = PercentBarReducer;
 const initialFlashingCellState = {};
 exports.FLASHING_CELL_CLEAR = 'FLASHING_CELL_CLEAR';
-exports.FlashingCellClear = () => ({
+const FlashingCellClear = () => ({
     type: exports.FLASHING_CELL_CLEAR,
 });
-exports.FlashingCellReducer = (state = initialFlashingCellState, action) => {
+exports.FlashingCellClear = FlashingCellClear;
+const FlashingCellReducer = (state = initialFlashingCellState, action) => {
     switch (action.type) {
         case exports.FLASHING_CELL_CLEAR: {
             return Object.assign({}, initialFlashingCellState);
@@ -43,12 +48,14 @@ exports.FlashingCellReducer = (state = initialFlashingCellState, action) => {
             return state;
     }
 };
+exports.FlashingCellReducer = FlashingCellReducer;
 const initialUpdatedRowState = {};
 exports.UPDATED_ROW_CLEAR = 'UPDATED_ROW_CLEAR';
-exports.UpdatedRowClear = () => ({
+const UpdatedRowClear = () => ({
     type: exports.UPDATED_ROW_CLEAR,
 });
-exports.UpdatedRowReducer = (state = initialUpdatedRowState, action) => {
+exports.UpdatedRowClear = UpdatedRowClear;
+const UpdatedRowReducer = (state = initialUpdatedRowState, action) => {
     switch (action.type) {
         case exports.UPDATED_ROW_CLEAR: {
             return Object.assign({}, initialUpdatedRowState);
@@ -57,3 +64,4 @@ exports.UpdatedRowReducer = (state = initialUpdatedRowState, action) => {
             return state;
     }
 };
+exports.UpdatedRowReducer = UpdatedRowReducer;

package/src/Redux/Store/AdaptableReduxMerger.js

@@ -144,7 +144,7 @@ function MergeState(oldState, newState) {
 }
 exports.MergeState = MergeState;
 let initialState;
-exports.mergeReducer = (rootReducer, LOAD_STATE_TYPE) => {
+const mergeReducer = (rootReducer, LOAD_STATE_TYPE) => {
     let finalReducer = rootReducer;
     finalReducer = (state, action) => {
         if (action.type === LOAD_STATE_TYPE) {
@@ -158,3 +158,4 @@ exports.mergeReducer = (rootReducer, LOAD_STATE_TYPE) => {
     };
     return finalReducer;
 };
+exports.mergeReducer = mergeReducer;

package/src/Redux/Store/AdaptableStore.js

@@ -56,13 +56,15 @@ const NON_PERSIST_ACTIONS = {
     [SystemRedux_1.SYSTEM_PROGRESS_INDICATOR_SHOW]: true,
     [SystemRedux_1.SYSTEM_PROGRESS_INDICATOR_HIDE]: true,
 };
-exports.InitState = () => ({
+const InitState = () => ({
     type: exports.INIT_STATE,
 });
-exports.LoadState = (State) => ({
+exports.InitState = InitState;
+const LoadState = (State) => ({
     type: exports.LOAD_STATE,
     State,
 });
+exports.LoadState = LoadState;
 class AdaptableStore {
     /**
      *
@@ -730,6 +732,12 @@ const adaptableMiddleware = (adaptable) => function (middlewareAPI) {
                             middlewareAPI.dispatch(PopupRedux_1.PopupShowForm({
                                 Id: 'data-set-form',
                                 Form: dataSet.form,
+                                prepareContext: (context) => {
+                                    return new Promise((resolve) => {
+                                        const preparedContext = Object.assign(Object.assign({}, context), { dataSet });
+                                        resolve(preparedContext);
+                                    });
+                                },
                             }));
                         }
                     });

package/src/Strategy/AlertModule.d.ts

@@ -1,13 +1,10 @@
-/// <reference types="react" />
 import { AdaptableApi } from '../Api/AdaptableApi';
 import { AlertDefinition } from '../PredefinedConfig/AlertState';
 import { AdaptableAlert } from '../PredefinedConfig/Common/AdaptableAlert';
 import { AdaptableMenuItem, ContextMenuContext } from '../PredefinedConfig/Common/Menu';
 import { TeamSharingImportInfo } from '../PredefinedConfig/TeamSharingState';
-import * as AlertRedux from '../Redux/ActionsReducers/AlertRedux';
-import * as SystemRedux from '../Redux/ActionsReducers/SystemRedux';
 import { AdaptableModuleBase } from './AdaptableModuleBase';
-import { AdaptableObjectView, IModule } from './Interface/IModule';
+import { AdaptableModuleView, AdaptableObjectView, IModule } from './Interface/IModule';
 import { AdaptableObject } from '../PredefinedConfig/Common/AdaptableObject';
 export declare class AlertModule extends AdaptableModuleBase implements IModule {
     constructor(api: AdaptableApi);
@@ -37,19 +34,6 @@ export declare class AlertModule extends AdaptableModuleBase implements IModule
     };
     toView(alert: AlertDefinition): AdaptableObjectView;
     toViewAll(): AdaptableObjectView[];
-    getViewProperties(): {
-        getDeleteAction: (alertDefinition: AlertDefinition) => AlertRedux.AlertDefinitionDeleteAction;
-        getSuspendAction: (alertDefinition: AlertDefinition) => AlertRedux.AlertDefinitionSuspendAction;
-        getUnSuspendAction: (alertDefinition: AlertDefinition) => AlertRedux.AlertDefinitionUnSuspendAction;
-        getCompactDeleteAction: (alert: AdaptableAlert) => SystemRedux.SystemAlertDeleteAction;
-        getDeleteAllAction: () => SystemRedux.SystemAlertDeleteAllAction;
-        emptyView: import("react").FunctionComponent<{
-            module: IModule;
-        }>;
-        getEditWizard: () => (props: import("../View/Alert/Wizard/AlertWizard").AlertWizardProps) => JSX.Element;
-        getStatusBarPanelProps: () => {
-            view: () => JSX.Element;
-        };
-    };
+    getViewProperties(): AdaptableModuleView;
     canBeAssociatedWithLayouts(): boolean;
 }

package/src/Strategy/AlertModule.js

@@ -160,7 +160,8 @@ class AlertModule extends AdaptableModuleBase_1.AdaptableModuleBase {
         // the row node data is most probably stale because the reactive queries buffer the changed data
         // so we have to refresh it
         reactiveAlertInfo.dataChangeLogEntry.rowNode = this.api.gridApi.getRowNodeForPrimaryKey(reactiveAlertInfo.dataChangeLogEntry.primaryKeyValue);
-        reactiveAlertInfo.dataChangeLogEntry.rowData = (_a = reactiveAlertInfo.dataChangeLogEntry.rowNode) === null || _a === void 0 ? void 0 : _a.data;
+        reactiveAlertInfo.dataChangeLogEntry.rowData =
+            (_a = reactiveAlertInfo.dataChangeLogEntry.rowNode) === null || _a === void 0 ? void 0 : _a.data;
         if (reactiveAlertInfo.type === 'alert') {
             this.showAlertForDefinitions(reactiveAlertInfo.dataChangeLogEntry, [
                 reactiveAlertInfo.alertDefinition,

package/src/Strategy/ConditionalStyleModule.d.ts

@@ -1,14 +1,12 @@
-/// <reference types="react" />
 import { AdaptableApi } from '../Api/AdaptableApi';
 import { AdaptableColumn } from '../PredefinedConfig/Common/AdaptableColumn';
 import { AdaptableMenuItem } from '../PredefinedConfig/Common/Menu';
 import { ConditionalStyle } from '../PredefinedConfig/ConditionalStyleState';
 import { TeamSharingImportInfo } from '../PredefinedConfig/TeamSharingState';
-import * as ConditionalStyleRedux from '../Redux/ActionsReducers/ConditionalStyleRedux';
 import { AdaptableModuleBase } from './AdaptableModuleBase';
 import { IConditionalStyleModule } from './Interface/IConditionalStyleModule';
 import { AdaptableObject } from '../PredefinedConfig/Common/AdaptableObject';
-import { AdaptableObjectView } from './Interface/IModule';
+import { AdaptableModuleView, AdaptableObjectView } from './Interface/IModule';
 export declare class ConditionalStyleModule extends AdaptableModuleBase implements IConditionalStyleModule {
     constructor(api: AdaptableApi);
     getModuleAdaptableObjects(config?: {
@@ -26,12 +24,6 @@ export declare class ConditionalStyleModule extends AdaptableModuleBase implemen
     private shouldRunStyle;
     toView(conditionalStyle: ConditionalStyle): AdaptableObjectView;
     toViewAll(): AdaptableObjectView[];
-    getViewProperties(): {
-        getDeleteAction: (conditionalStyle: ConditionalStyle) => ConditionalStyleRedux.ConditionalStyleAction;
-        getSuspendAction: (conditionalStyle: ConditionalStyle) => ConditionalStyleRedux.ConditionalStyleSuspendAction;
-        getUnSuspendAction: (conditionalStyle: ConditionalStyle) => ConditionalStyleRedux.ConditionalStyleUnSuspendAction;
-        emptyView: string;
-        getEditWizard(): import("react").FunctionComponent<import("../View/ConditionalStyle/Wizard/ConditionalStyleWizard").ConditionalStyleWizardProps>;
-    };
+    getViewProperties(): AdaptableModuleView;
     canBeAssociatedWithLayouts(): boolean;
 }

package/src/Strategy/DashboardModule.js

@@ -63,7 +63,9 @@ class DashboardModule extends AdaptableModuleBase_1.AdaptableModuleBase {
                 {
                     label: this.moduleInfo.FriendlyName,
                     isVisible: true,
-                    icon: 'dashboard',
+                    icon: {
+                        name: 'dashboard',
+                    },
                     subItems: menuItems,
                 },
             ];

package/src/Strategy/DataChangeHistoryModule.d.ts

@@ -1,16 +1,10 @@
-/// <reference types="react" />
 import { AdaptableModuleBase } from './AdaptableModuleBase';
-import { IModule } from './Interface/IModule';
+import { AdaptableModuleView, IModule } from './Interface/IModule';
 import { AdaptableApi } from '../Api/AdaptableApi';
 export declare class DataChangeHistoryModule extends AdaptableModuleBase implements IModule {
     constructor(api: AdaptableApi);
     getPopupMaxWidth(): number;
     hasNamedQueryReferences(): boolean;
     private shouldLogDataChange;
-    getViewProperties(): {
-        getStatusBarPanelProps: () => {
-            triggerActionOnWrapperClick: boolean;
-            content: import("react").FunctionComponent<{}>;
-        };
-    };
+    getViewProperties(): AdaptableModuleView;
 }

package/src/Strategy/DataSetModule.d.ts

@@ -1,6 +1,5 @@
-/// <reference types="react" />
 import { AdaptableModuleBase } from './AdaptableModuleBase';
-import { AdaptableObjectView, IModule } from './Interface/IModule';
+import { AdaptableModuleView, AdaptableObjectView, IModule } from './Interface/IModule';
 import { AdaptableApi } from '../Api/AdaptableApi';
 import { AdaptableObject } from '../PredefinedConfig/Common/AdaptableObject';
 import { DataSet } from '../AdaptableOptions/GeneralOptions';
@@ -11,15 +10,5 @@ export declare class DataSetModule extends AdaptableModuleBase implements IModul
     hasNamedQueryReferences(): boolean;
     toView(dataSet: DataSet): AdaptableObjectView;
     toViewAll(): AdaptableObjectView[];
-    getViewProperties(): {
-        actions: import("react").FunctionComponent<{
-            data: DataSet;
-            id?: string;
-            accessLevel: import("../types").AccessLevel;
-        }>[];
-        getStatusBarPanelProps: () => {
-            content: string;
-            popover: import("react").FunctionComponent<{}>;
-        };
-    };
+    getViewProperties(): AdaptableModuleView;
 }

package/src/Strategy/ExportModule.d.ts

@@ -1,14 +1,12 @@
-/// <reference types="react" />
 import { AdaptableModuleBase } from './AdaptableModuleBase';
 import { IExportModule } from './Interface/IExportModule';
 import { ExportDestination } from '../PredefinedConfig/Common/Enums';
 import { Report } from '../PredefinedConfig/ExportState';
-import * as ExportRedux from '../Redux/ActionsReducers/ExportRedux';
 import { TeamSharingImportInfo } from '../PredefinedConfig/TeamSharingState';
 import { AdaptableMenuItem, ContextMenuContext } from '../PredefinedConfig/Common/Menu';
 import { AdaptableApi } from '../Api/AdaptableApi';
 import { AdaptableObject } from '../PredefinedConfig/Common/AdaptableObject';
-import { AdaptableObjectView } from './Interface/IModule';
+import { AdaptableModuleView, AdaptableObjectView } from './Interface/IModule';
 export declare class ExportModule extends AdaptableModuleBase implements IExportModule {
     constructor(api: AdaptableApi);
     getModuleAdaptableObjects(): AdaptableObject[];
@@ -29,14 +27,5 @@ export declare class ExportModule extends AdaptableModuleBase implements IExport
     private showEmptyExportWarning;
     toView(report: Report): AdaptableObjectView;
     toViewAll(): AdaptableObjectView[];
-    getViewProperties(): {
-        newTooltipText: string;
-        actions: import("./Interface/IModule").AdaptableModuleViewAction[];
-        getDeleteAction: (report: Report) => ExportRedux.ReportDeleteAction;
-        getEditWizard(): (props: import("../View/Export/Wizard/NewReportWizard").NewReportWizardProps) => JSX.Element;
-        getStatusBarPanelProps: () => {
-            content: import("react").FunctionComponent<import("../View/Export/ExportSelector").ExportSelectorProps>;
-            triggerActionOnWrapperClick: boolean;
-        };
-    };
+    getViewProperties(): AdaptableModuleView;
 }

package/src/Strategy/ExportModule.js

@@ -77,7 +77,7 @@ class ExportModule extends AdaptableModuleBase_1.AdaptableModuleBase {
             {
                 label: 'Export Selected Cells',
                 isVisible: true,
-                icon: this.moduleInfo.Glyph,
+                icon: { name: this.moduleInfo.Glyph },
                 subItems: menuItems,
             },
         ];

package/src/Strategy/FilterModule.d.ts

@@ -1,10 +1,8 @@
-/// <reference types="react" />
 import { AdaptableModuleBase } from './AdaptableModuleBase';
 import { AdaptableColumn } from '../PredefinedConfig/Common/AdaptableColumn';
 import { AdaptableMenuItem, ContextMenuContext } from '../PredefinedConfig/Common/Menu';
-import * as LayoutRedux from '../Redux/ActionsReducers/LayoutRedux';
 import { TeamSharingImportInfo } from '../PredefinedConfig/TeamSharingState';
-import { AdaptableObjectCompactView, AdaptableObjectView, IModule } from './Interface/IModule';
+import { AdaptableModuleView, AdaptableObjectCompactView, AdaptableObjectView, IModule } from './Interface/IModule';
 import { AdaptableApi } from '../Api/AdaptableApi';
 import { AdaptableObject } from '../PredefinedConfig/Common/AdaptableObject';
 import { ColumnFilter } from '../types';
@@ -20,15 +18,5 @@ export declare class FilterModule extends AdaptableModuleBase implements IModule
     toViewCompact(filter: ColumnFilter): AdaptableObjectCompactView;
     toView(filter: ColumnFilter): AdaptableObjectView;
     toViewAll(): AdaptableObjectView[];
-    getViewProperties(): {
-        getDeleteAction: (columnFilter: ColumnFilter) => LayoutRedux.LayoutFilterClearAction;
-        getCompactDeleteAction: (columnFilter: ColumnFilter) => LayoutRedux.LayoutFilterClearAction;
-        getDeleteAllAction: () => LayoutRedux.LayoutFilterClearAllAction;
-        emptyView: string;
-        getStatusBarPanelProps(): {
-            content: string;
-            popover: import("react").FunctionComponent<{}>;
-            popoverMinWidth: number;
-        };
-    };
+    getViewProperties(): AdaptableModuleView;
 }

package/src/Strategy/FilterModule.js

@@ -79,7 +79,7 @@ class FilterModule extends AdaptableModuleBase_1.AdaptableModuleBase {
         return {
             ModuleEntities: this.api.filterApi.getColumnFilters(),
             AddAction: LayoutRedux.LayoutColumnFilterAdd,
-            EditAction: LayoutRedux.LayoutColumnFilterEdit,
+            EditAction: LayoutRedux.LayoutColumnFilterEdit, //TODO need to change this to ColumnFilterSet
         };
     }
     toViewCompact(filter) {

package/src/Strategy/FlashingCellModule.d.ts

@@ -1,12 +1,10 @@
-/// <reference types="react" />
 import { AdaptableApi } from '../Api/AdaptableApi';
 import { AdaptableColumn } from '../PredefinedConfig/Common/AdaptableColumn';
 import { CellDataChangedInfo } from '../PredefinedConfig/Common/CellDataChangedInfo';
 import { AdaptableMenuItem, ContextMenuContext } from '../PredefinedConfig/Common/Menu';
 import { TeamSharingImportInfo } from '../PredefinedConfig/TeamSharingState';
-import * as FlashingCellRedux from '../Redux/ActionsReducers/FlashingCellRedux';
 import { AdaptableModuleBase } from './AdaptableModuleBase';
-import { AdaptableObjectView, IModule } from './Interface/IModule';
+import { AdaptableModuleView, AdaptableObjectView, IModule } from './Interface/IModule';
 import { AdaptableObject } from '../PredefinedConfig/Common/AdaptableObject';
 import { FlashingCellDefinition } from '../PredefinedConfig/FlashingCellState';
 export declare class FlashingCellModule extends AdaptableModuleBase implements IModule {
@@ -26,11 +24,6 @@ export declare class FlashingCellModule extends AdaptableModuleBase implements I
     getTeamSharingAction(): TeamSharingImportInfo<FlashingCellDefinition>;
     toView(flashingCell: FlashingCellDefinition): AdaptableObjectView;
     toViewAll(): AdaptableObjectView[];
-    getViewProperties(): {
-        getSuspendAction: (flashingCellDefinition: FlashingCellDefinition) => FlashingCellRedux.FlashingCellDefinitionEditAction;
-        getUnSuspendAction: (flashingCellDefinition: FlashingCellDefinition) => FlashingCellRedux.FlashingCellDefinitionEditAction;
-        getDeleteAction: (flashingCellDefinition: FlashingCellDefinition) => FlashingCellRedux.FlashingCellDefinitionDeleteAction;
-        getEditWizard: () => (props: import("../View/FlashingCell/Wizard/FlashingCellWizard").FlashingCellWizardProps) => JSX.Element;
-    };
+    getViewProperties(): AdaptableModuleView;
     canBeAssociatedWithLayouts(): boolean;
 }

package/src/Strategy/GridInfoModule.js

@@ -43,7 +43,9 @@ class GridInfoModule extends AdaptableModuleBase_1.AdaptableModuleBase {
                     {
                         label: 'Show Info',
                         isVisible: true,
-                        icon: this.moduleInfo.Glyph,
+                        icon: {
+                            name: this.moduleInfo.Glyph,
+                        },
                         subItems: selectMenuItems,
                     },
                 ];
@@ -89,7 +91,9 @@ class GridInfoModule extends AdaptableModuleBase_1.AdaptableModuleBase {
                     {
                         label: 'Show Info',
                         isVisible: true,
-                        icon: this.moduleInfo.Glyph,
+                        icon: {
+                            name: this.moduleInfo.Glyph,
+                        },
                         subItems: selectMenuItems,
                     },
                 ];

package/src/Strategy/LayoutModule.d.ts

@@ -1,12 +1,10 @@
-/// <reference types="react" />
 import { AdaptableModuleBase } from './AdaptableModuleBase';
 import { LayoutState, Layout } from '../PredefinedConfig/LayoutState';
 import { AdaptableMenuItem, ContextMenuContext } from '../PredefinedConfig/Common/Menu';
-import * as LayoutRedux from '../Redux/ActionsReducers/LayoutRedux';
 import { TeamSharingImportInfo } from '../PredefinedConfig/TeamSharingState';
 import { AdaptableColumn } from '../PredefinedConfig/Common/AdaptableColumn';
 import { AdaptableApi } from '../Api/AdaptableApi';
-import { IModule } from './Interface/IModule';
+import { AdaptableModuleView, IModule } from './Interface/IModule';
 import { AdaptableObject } from '../PredefinedConfig/Common/AdaptableObject';
 export declare class LayoutModule extends AdaptableModuleBase implements IModule {
     protected LayoutState: LayoutState;
@@ -32,19 +30,6 @@ export declare class LayoutModule extends AdaptableModuleBase implements IModule
         }[];
         abObject: Layout;
     };
-    getViewProperties(): {
-        actions: import("react").FunctionComponent<{
-            data: Layout;
-            accessLevel: import("../types").AccessLevel;
-        }>[];
-        getDeleteAction: (layout: Layout) => LayoutRedux.LayoutDeleteAction;
-        onOpenEditPopup: (layout?: Layout) => void;
-        getStatusBarPanelProps: () => {
-            content: string;
-            popover: import("react").FunctionComponent<{}>;
-            popoverMinWidth: number;
-            extraActions: import("react").FunctionComponent<{}>[];
-        };
-    };
+    getViewProperties(): AdaptableModuleView;
     handleLayoutChange(): void;
 }

package/src/Strategy/LayoutModule.js

@@ -15,7 +15,8 @@ class LayoutModule extends AdaptableModuleBase_1.AdaptableModuleBase {
         super(ModuleConstants.LayoutModuleId, 'Layout', 'layout', 'LayoutPopup', 'Named sets of column visibility, order, groupings, aggregation, pivots etc.', api);
         this.api.eventApi.on('LayoutChanged', (layoutChangedInfo) => {
             var _a;
-            if (layoutChangedInfo.newLayoutState.CurrentLayout !== ((_a = layoutChangedInfo.oldLayoutState) === null || _a === void 0 ? void 0 : _a.CurrentLayout)) {
+            if (layoutChangedInfo.newLayoutState.CurrentLayout !==
+                ((_a = layoutChangedInfo.oldLayoutState) === null || _a === void 0 ? void 0 : _a.CurrentLayout)) {
                 // we are interested only if current layout was changed (is different from the previous one)
                 this.handleLayoutChange();
             }
@@ -111,7 +112,9 @@ class LayoutModule extends AdaptableModuleBase_1.AdaptableModuleBase {
             returnColumnMenuItems.push({
                 label: 'Select',
                 isVisible: true,
-                icon: 'tab-unselected',
+                icon: {
+                    name: 'tab-unselected',
+                },
                 subItems: selectMenuItems,
             });
         }
@@ -146,7 +149,7 @@ class LayoutModule extends AdaptableModuleBase_1.AdaptableModuleBase {
                 returnColumnMenuItems.push({
                     label: 'Grid',
                     isVisible: true,
-                    icon: 'align-justify',
+                    icon: { name: 'align-justify' },
                     subItems: gridMenuItems,
                 });
             }