@adaptabletools/adaptable 23.1.0 → 24.0.0-canary.0

package/src/Api/PlusMinusApi.d.ts

@@ -1,6 +1,5 @@
 import { PlusMinusState, PlusMinusNudge } from '../AdaptableState/PlusMinusState';
 import { CellUpdateRequest, GridCell } from '../AdaptableState/Selection/GridCell';
-import { LayoutExtendedConfig } from '../types';
 /**
  * Provides run-time access to the Plus / Minus Module and associated state
  */
@@ -15,13 +14,13 @@ export interface PlusMinusApi {
      * Retrieves all Plus Minus Rules in Adaptable State with those with expressions first
      * @returns all plus minus rules
      */
-    getAllPlusMinus(config?: LayoutExtendedConfig): PlusMinusNudge[];
+    getAllPlusMinus(): PlusMinusNudge[];
     /**
      * Retrieves Plus Minus Rule by the technical ID (from `PlusMinusState`)
      * @param id Plus Minus id
      * @returns plus minus rule
      */
-    getPlusMinusById(id: PlusMinusNudge['Uuid'], config?: LayoutExtendedConfig): PlusMinusNudge;
+    getPlusMinusById(id: PlusMinusNudge['Uuid']): PlusMinusNudge;
     /**
      * Retrieves a Plus Minus Nudge by its Name
      * @param name Name of the Plus Minus Nudge
@@ -32,12 +31,12 @@ export interface PlusMinusApi {
      * Retrieves all active (not-suspended) Plus Minus Rules in Adaptable State with those with expressions first
      * @returns plus minus rules
      */
-    getAllActivePlusMinus(config?: LayoutExtendedConfig): PlusMinusNudge[];
+    getAllActivePlusMinus(): PlusMinusNudge[];
     /**
      * Retrieves all suspended Plus Minus Rules in Adaptable State with those with expressions first
      * @returns plus minus rules
      */
-    getAllSuspendedPlusMinus(config?: LayoutExtendedConfig): PlusMinusNudge[];
+    getAllSuspendedPlusMinus(): PlusMinusNudge[];
     /**
      * Applies a Plus Minus Rule to given cells
      * @param plusMinusNudge Plus Minus Rule to apply

package/src/Api/ShortcutApi.d.ts

@@ -1,5 +1,4 @@
 import { ShortcutState, Shortcut } from '../AdaptableState/ShortcutState';
-import { LayoutExtendedConfig } from '../types';
 /**
  * Provides run-time access to Shortcut Module and associated state
  */
@@ -12,13 +11,13 @@ export interface ShortcutApi {
      * Gets all Shortcuts in Adaptable State
      * @returns shortcuts
      */
-    getShortcuts(config?: LayoutExtendedConfig): Shortcut[];
+    getShortcuts(): Shortcut[];
     /**
      * Retrieves Shortcut by Id
      * @param id Shortcut id
      * @returns shortcut
      */
-    getShortcutById(id: Shortcut['Uuid'], config?: LayoutExtendedConfig): Shortcut;
+    getShortcutById(id: Shortcut['Uuid']): Shortcut;
     /**
      * Retrieves a Shortcut by its Name
      * @param name Name of the Shortcut
@@ -29,12 +28,12 @@ export interface ShortcutApi {
      * Gets all active (not-suspended) Shortcuts in Adaptable State
      * @returns shortcuts
      */
-    getActiveShortcuts(config?: LayoutExtendedConfig): Shortcut[];
+    getActiveShortcuts(): Shortcut[];
     /**
      * Gets all suspended Shortcuts in Adaptable State
      * @returns shortcuts
      */
-    getSuspendedShortcuts(config?: LayoutExtendedConfig): Shortcut[];
+    getSuspendedShortcuts(): Shortcut[];
     /**
      * Adds new Shortcut to the state
      * @param shortcut Shortcut to add

package/src/Api/StateApi.d.ts

@@ -74,7 +74,7 @@ export interface StateApi {
      * Loads supplied user state, replacing (NOT merging) existing User(persisted) State.
      * @param state
      */
-    loadUserState(state: InitialState): void;
+    loadUserState(state: InitialState): Promise<void>;
     /**
      * Retrieves ALL state which is currently stored by Adaptable (both persistent and transient/internal)
      */

package/src/Api/StyledColumnApi.d.ts

@@ -1,7 +1,6 @@
 import type { AgChartInstance, AgSparklineOptions } from 'ag-charts-types';
 import { AdaptableColumn } from '../AdaptableState/Common/AdaptableColumn';
 import { StyledColumn, StyledColumnState } from '../AdaptableState/StyledColumnState';
-import { LayoutExtendedConfig } from '../types';
 /**
  * Provides run-time access to Styled Column Module and associated state
  */
@@ -14,35 +13,35 @@ export interface StyledColumnApi {
      * Retrieves all Styled Columns in Adaptable State
      * @returns Styled Columns
      */
-    getStyledColumns(config?: LayoutExtendedConfig): StyledColumn[];
+    getStyledColumns(): StyledColumn[];
     /**
      * Retrieves Styled Column by Id
      * @param id Styled Column id
      * @returns Styled Column
      */
-    getStyledColumnById(id: StyledColumn['Uuid'], config?: LayoutExtendedConfig): StyledColumn;
+    getStyledColumnById(id: StyledColumn['Uuid']): StyledColumn;
     /**
      * Retrieves Styled Column by Name
      * @param name Styled Column name
      * @returns Styled Column
      */
-    getStyledColumnByName(name: StyledColumn['Name'], config?: LayoutExtendedConfig): StyledColumn | undefined;
+    getStyledColumnByName(name: StyledColumn['Name']): StyledColumn | undefined;
     /**
      * Retrieves Styled Column for given Column Id
      * @param columnId Styled Column id
      * @returns Styled Column
      */
-    getStyledColumnForColumnId(columnId: StyledColumn['ColumnId'], config?: LayoutExtendedConfig): StyledColumn;
+    getStyledColumnForColumnId(columnId: StyledColumn['ColumnId']): StyledColumn;
     /**
      * Retrieves all active (not-suspended) Styled Columns in Adaptable State
      * @returns Styled Columns
      */
-    getActiveStyledColumns(config?: LayoutExtendedConfig): StyledColumn[];
+    getActiveStyledColumns(): StyledColumn[];
     /**
      * Retrieves all suspended Styled Columns in Adaptable State
      * @returns Styled Columns
      */
-    getSuspendedStyledColumns(config?: LayoutExtendedConfig): StyledColumn[];
+    getSuspendedStyledColumns(): StyledColumn[];
     /**
      * Delete a Styled column
      * @param styledColumn

package/src/Redux/ActionsReducers/CommentsRedux.js

@@ -1,6 +1,6 @@
 import { EMPTY_ARRAY } from '../../Utilities/Constants/GeneralConstants';
 import ObjectFactory from '../../Utilities/ObjectFactory';
-import { AnnotationsService } from '../../Utilities/Services/AnnotationsService';
+import { CommentsService } from '../../Utilities/Services/CommentsService';
 export const COMMENT_ADD = 'COMMENT_ADD';
 export const COMMENT_THREAD_ADD = 'COMMENT_THREAD_ADD';
 export const COMMENT_THREAD_DELETE = 'COMMENT_THREAD_DELETE';
@@ -40,7 +40,7 @@ export const GetCellCommentSelector = (state, address) => {
         return undefined;
     }
     return (state?.CommentThreads ?? []).find((commentThread) => {
-        return AnnotationsService.isSameAddress(commentThread, address);
+        return CommentsService.isSameAddress(commentThread, address);
     });
 };
 const initialState = {
@@ -52,7 +52,7 @@ export const CommentsReducer = (state = initialState, action) => {
             const addAction = action;
             const commentThread = state.CommentThreads ?? [];
             const cellCommentIndex = commentThread.findIndex((cellComments) => {
-                return AnnotationsService.isSameAddress(cellComments, addAction.cellAddress);
+                return CommentsService.isSameAddress(cellComments, addAction.cellAddress);
             });
             let comments = [...commentThread];
             if (cellCommentIndex === -1) {
@@ -83,14 +83,14 @@ export const CommentsReducer = (state = initialState, action) => {
             const deleteAction = action;
             return {
                 ...state,
-                CommentThreads: (state.CommentThreads ?? []).filter((cellComments) => !AnnotationsService.isSameAddress(cellComments, deleteAction.cellAddress)),
+                CommentThreads: (state.CommentThreads ?? []).filter((cellComments) => !CommentsService.isSameAddress(cellComments, deleteAction.cellAddress)),
             };
         }
         case COMMENT_EDIT: {
             const editAction = action;
             let edited = false;
             const adaptableCellComments = (state.CommentThreads ?? []).map((cellComments) => {
-                if (AnnotationsService.isSameAddress(cellComments, editAction.cellAddress)) {
+                if (CommentsService.isSameAddress(cellComments, editAction.cellAddress)) {
                     edited = true;
                     return {
                         ...cellComments,
@@ -112,7 +112,7 @@ export const CommentsReducer = (state = initialState, action) => {
             const deleteAction = action;
             const adaptableCellComments = (state.CommentThreads ?? [])
                 .map((cellComments) => {
-                if (AnnotationsService.isSameAddress(cellComments, deleteAction.cellAddress)) {
+                if (CommentsService.isSameAddress(cellComments, deleteAction.cellAddress)) {
                     const newComments = cellComments.Comments.filter((comment) => comment.Uuid !== deleteAction.commentUuid);
                     if (newComments.length === 0) {
                         return null;

package/src/Redux/ActionsReducers/DashboardRedux.js

@@ -61,7 +61,7 @@ const initialState = {
     IsFloating: false,
     IsHidden: false,
     FloatingPosition: { x: 100, y: 100 },
-    ModuleButtons: ['SettingsPanel'],
+    ModuleButtons: [],
     DashboardTitle: '',
 };
 export const DashboardReducer = (state = initialState, action) => {

package/src/Redux/ActionsReducers/InternalRedux.d.ts

@@ -16,6 +16,9 @@ import { SelectedRowInfo } from '../../AdaptableState/Selection/SelectedRowInfo'
 import { CellHighlightInfo, RowHighlightInfo, RowsHighlightInfo } from '../../types';
 import { IRowNode } from 'ag-grid-enterprise';
 import { ColumnHighlightInfo } from '../../AdaptableState/Common/ColumnHighlightInfo';
+import { FormulaTraceInfo } from '../../AdaptableState/Common/FormulaTraceInfo';
+import { CompactCalculatedColumnEditorInfo } from '../../AdaptableState/Common/CompactCalculatedColumnEditorInfo';
+import type { QlGroup } from "../../../vendor/aql/index.js";
 export declare const SET_COLUMNS = "SET_COLUMNS";
 export declare const SET_SELECTED_CELLS = "SET_SELECTED_CELLS";
 export declare const SET_SELECTED_ROWS = "SET_SELECTED_ROWS";
@@ -27,6 +30,10 @@ export declare const HIGHLIGHT_CELL_DELETE_ALL = "HIGHLIGHT_CELL_DELETE_ALL";
 export declare const HIGHLIGHT_COLUMN_ADD = "HIGHLIGHT_COLUMN_ADD";
 export declare const HIGHLIGHT_COLUMN_DELETE = "HIGHLIGHT_COLUMN_DELETE";
 export declare const HIGHLIGHT_COLUMN_DELETE_ALL = "HIGHLIGHT_COLUMN_DELETE_ALL";
+export declare const FORMULA_TRACE_SHOW = "FORMULA_TRACE_SHOW";
+export declare const FORMULA_TRACE_HIDE = "FORMULA_TRACE_HIDE";
+export declare const COMPACT_CALCULATED_COLUMN_EDITOR_SHOW = "COMPACT_CALCULATED_COLUMN_EDITOR_SHOW";
+export declare const COMPACT_CALCULATED_COLUMN_EDITOR_HIDE = "COMPACT_CALCULATED_COLUMN_EDITOR_HIDE";
 export declare const HIGHLIGHT_ROW_ADD = "HIGHLIGHT_ROW_ADD";
 export declare const HIGHLIGHT_ROWS_ADD = "HIGHLIGHT_ROWS_ADD";
 export declare const HIGHLIGHT_ROW_DELETE = "HIGHLIGHT_ROW_DELETE";
@@ -65,6 +72,9 @@ export declare const DATA_CHANGE_HISTORY_RESUME = "DATA_CHANGE_HISTORY_RESUME";
 export declare const SETTINGS_PANEL_SET = "SETTINGS_PANEL_SET";
 export declare const QUICK_FILTER_BAR_SHOW = "QUICK_FILTER_BAR_SHOW";
 export declare const QUICK_FILTER_BAR_HIDE = "QUICK_FILTER_BAR_HIDE";
+export declare const COLUMN_FILTER_DRAFT_SET = "COLUMN_FILTER_DRAFT_SET";
+export declare const COLUMN_FILTER_DRAFT_CLEAR = "COLUMN_FILTER_DRAFT_CLEAR";
+export declare const COLUMN_FILTER_DRAFT_CLEAR_ALL = "COLUMN_FILTER_DRAFT_CLEAR_ALL";
 export declare const DISABLE_DELETE_CONFIRMATION = "DISABLE_DELETE_CONFIRMATION";
 export declare const LAYOUT_SHOW_NON_EXTENDED_OBJECTS = "LAYOUT_SHOW_NON_EXTENDED_OBJECTS";
 export declare const DASHBOARD_REFRESH = "DASHBOARD_REFRESH";
@@ -96,6 +106,16 @@ export interface HighlightCellDeleteAction extends Redux.Action {
 }
 export interface HighlightCellDeleteAllAction extends Redux.Action {
 }
+export interface FormulaTraceShowAction extends Redux.Action {
+    formulaTraceInfo: FormulaTraceInfo;
+}
+export interface FormulaTraceHideAction extends Redux.Action {
+}
+export interface CompactCalculatedColumnEditorShowAction extends Redux.Action {
+    compactCalculatedColumnEditorInfo: CompactCalculatedColumnEditorInfo;
+}
+export interface CompactCalculatedColumnEditorHideAction extends Redux.Action {
+}
 export interface HighlightColumnAddAction extends Redux.Action {
     columnHighlightInfo: ColumnHighlightInfo;
 }
@@ -132,6 +152,12 @@ export interface SystemExportEndAction extends Redux.Action {
 export declare const HighlightCellAdd: (cellHighlightInfo: CellHighlightInfo) => HighlightCellAddAction;
 export declare const HighlightCellDelete: (primaryKeyValue: CellHighlightInfo["primaryKeyValue"], columnId: CellHighlightInfo["columnId"]) => HighlightCellDeleteAction;
 export declare const HighlightCellDeleteAll: () => HighlightCellDeleteAllAction;
+export declare const FormulaTraceShow: (formulaTraceInfo: FormulaTraceInfo) => FormulaTraceShowAction;
+export declare const FormulaTraceHide: () => FormulaTraceHideAction;
+export declare const FormulaTraceInfoSelector: (state: InternalState) => FormulaTraceInfo | undefined;
+export declare const CompactCalculatedColumnEditorShow: (compactCalculatedColumnEditorInfo: CompactCalculatedColumnEditorInfo) => CompactCalculatedColumnEditorShowAction;
+export declare const CompactCalculatedColumnEditorHide: () => CompactCalculatedColumnEditorHideAction;
+export declare const CompactCalculatedColumnEditorInfoSelector: (state: InternalState) => CompactCalculatedColumnEditorInfo | undefined;
 export declare const HighlightColumnAdd: (columnHighlightInfo: ColumnHighlightInfo) => HighlightColumnAddAction;
 export declare const HighlightColumnDelete: (columnId: ColumnHighlightInfo["columnId"]) => HighlightColumnDeleteAction;
 export declare const HighlightColumnDeleteAll: () => HighlightColumnDeleteAllAction;
@@ -213,6 +239,7 @@ export interface SmartEditSetPreviewAction extends Redux.Action {
 }
 export interface SmartEditSetValidSelectionAction extends Redux.Action {
     isValidSmartEditSelection: boolean;
+    alert?: AdaptableAlert | null;
 }
 export interface BulkUpdateCheckCellSelectionAction extends Redux.Action {
 }
@@ -299,7 +326,7 @@ export interface CellPopupShowAction extends Redux.Action {
     editMode?: boolean;
 }
 export interface CellPopupEditFocusedEntityAction extends Redux.Action {
-    focusedEntity: 'Note' | 'Comment';
+    focusedEntity: 'Comment';
 }
 export interface CellPopupHideAction extends Redux.Action {
 }
@@ -315,7 +342,7 @@ export declare const SystemStatusMessageInfoDeleteAll: () => SystemStatusMessage
 export declare const SmartEditChangeValue: (value: number) => SmartEditChangeValueAction;
 export declare const SmartEditChangeOperation: (smartEditOperation: SmartEditOperation) => SmartEditChangeOperationAction;
 export declare const SmartEditCheckCellSelection: () => SmartEditCheckCellSelectionAction;
-export declare const SmartEditSetValidSelection: (IsValidSmartEditSelection: boolean) => SmartEditSetValidSelectionAction;
+export declare const SmartEditSetValidSelection: (IsValidSmartEditSelection: boolean, alert?: AdaptableAlert | null) => SmartEditSetValidSelectionAction;
 export declare const SmartEditSetPreview: (SmartEditPreviewInfo: PreviewInfo) => SmartEditSetPreviewAction;
 export declare const BulkUpdateCheckCellSelection: () => BulkUpdateCheckCellSelectionAction;
 export declare const BulkUpdateSetValidSelection: (bulkUpdateValidationResult: BulkUpdateValidationResult) => BulkUpdateSetValidSelectionAction;
@@ -335,6 +362,17 @@ export declare const DataChangeHistoryResume: () => DataChangeHistoryResumeActio
 export declare const SettingsPanelSet: (name: string, settings: InternalState["SettingsPanel"]["0"]) => SettingsPanelSetAction;
 export declare const QuickFilterBarShow: () => QuickFilterBarShowAction;
 export declare const QuickFilterBarHide: () => QuickFilterBarHideAction;
+export interface ColumnFilterDraftSetAction extends Redux.Action {
+    columnId: string;
+    draft: QlGroup;
+}
+export interface ColumnFilterDraftClearAction extends Redux.Action {
+    columnId: string;
+}
+export declare const ColumnFilterDraftSet: (columnId: string, draft: QlGroup) => ColumnFilterDraftSetAction;
+export declare const ColumnFilterDraftClear: (columnId: string) => ColumnFilterDraftClearAction;
+export declare const ColumnFilterDraftClearAll: () => Redux.Action;
+export declare const ColumnFilterDraftSelector: (state: InternalState, columnId: string) => QlGroup | undefined;
 export declare const LayoutShowNonExtendedObjects: (showNonExtendedObjects: boolean) => LayoutShowNonExtendedObjectsAction;
 export declare const DashboardRefresh: () => DashboardRefreshAction;
 export declare const DataSetSelect: (dataSet: DataSet) => DataSetSelectAction;
@@ -345,7 +383,7 @@ export declare const SystemExportBegin: (reportName: ReportNameType, reportForma
 export declare const SystemExportEnd: () => SystemExportEndAction;
 export declare const QuickSearchFloatingVisibility: (visible: boolean) => QuickSearchFloatingVisibilityAction;
 export declare const CellPopupShow: (cellPosition: CellAddress, editMode?: boolean) => CellPopupShowAction;
-export declare const CellPopupEditFocusedEntity: (focusedEntity: "Note" | "Comment") => CellPopupEditFocusedEntityAction;
+export declare const CellPopupEditFocusedEntity: (focusedEntity: "Comment") => CellPopupEditFocusedEntityAction;
 export declare const RowSummarySet: (rowSummaries: InternalState["RowSummary"]["rowSummaries"]) => {
     readonly type: "SUMMARY_ROW_SET";
     readonly rowSummaries: import("../../AdaptableState/InternalState").SystemRowSummary[];
@@ -353,8 +391,8 @@ export declare const RowSummarySet: (rowSummaries: InternalState["RowSummary"]["
 export declare const CellPopupHide: () => CellPopupHideAction;
 export declare const DisableDeleteConfirmationSelector: (state: InternalState) => boolean;
 export declare const QuickSearchFloatingVisibilitySelector: (state: InternalState) => boolean;
-export declare const CommentsAndNotesSelector: (state: InternalState) => CellAddress;
-export declare const CommentsAndNotesEditModeSelector: (state: InternalState) => boolean;
-export declare const CommentsAndNotesFocusedEntitySelector: (state: InternalState) => "Comment" | "Note";
+export declare const CommentPopupPositionSelector: (state: InternalState) => CellAddress;
+export declare const CommentPopupEditModeSelector: (state: InternalState) => boolean;
+export declare const CommentPopupFocusedEntitySelector: (state: InternalState) => "Comment";
 export declare const DataImportCompleted: (dataImportedInfo: DataImportedInfo) => DataImportCompletedAction;
 export declare const InternalReducer: Redux.Reducer<InternalState>;

package/src/Redux/ActionsReducers/InternalRedux.js

@@ -3,7 +3,8 @@ import { CELL_SUMMARY_DEFAULT_OPERATION } from '../../Utilities/Constants/ReduxC
 import { MathOperation } from '../../AdaptableState/Common/Enums';
 import { cloneObject } from '../../Utilities/Helpers/Helper';
 import { getRuleAlertProperties } from '../../Utilities/Helpers/Scheduling/ScheduledAlertHelper';
-import { AnnotationsService } from '../../Utilities/Services/AnnotationsService';
+import { CommentsService } from '../../Utilities/Services/CommentsService';
+import * as LayoutRedux from './LayoutRedux';
 export const SET_COLUMNS = 'SET_COLUMNS';
 export const SET_SELECTED_CELLS = 'SET_SELECTED_CELLS';
 export const SET_SELECTED_ROWS = 'SET_SELECTED_ROWS';
@@ -15,6 +16,10 @@ export const HIGHLIGHT_CELL_DELETE_ALL = 'HIGHLIGHT_CELL_DELETE_ALL';
 export const HIGHLIGHT_COLUMN_ADD = 'HIGHLIGHT_COLUMN_ADD';
 export const HIGHLIGHT_COLUMN_DELETE = 'HIGHLIGHT_COLUMN_DELETE';
 export const HIGHLIGHT_COLUMN_DELETE_ALL = 'HIGHLIGHT_COLUMN_DELETE_ALL';
+export const FORMULA_TRACE_SHOW = 'FORMULA_TRACE_SHOW';
+export const FORMULA_TRACE_HIDE = 'FORMULA_TRACE_HIDE';
+export const COMPACT_CALCULATED_COLUMN_EDITOR_SHOW = 'COMPACT_CALCULATED_COLUMN_EDITOR_SHOW';
+export const COMPACT_CALCULATED_COLUMN_EDITOR_HIDE = 'COMPACT_CALCULATED_COLUMN_EDITOR_HIDE';
 export const HIGHLIGHT_ROW_ADD = 'HIGHLIGHT_ROW_ADD';
 export const HIGHLIGHT_ROWS_ADD = 'HIGHLIGHT_ROWS_ADD';
 export const HIGHLIGHT_ROW_DELETE = 'HIGHLIGHT_ROW_DELETE';
@@ -53,6 +58,9 @@ export const DATA_CHANGE_HISTORY_RESUME = 'DATA_CHANGE_HISTORY_RESUME';
 export const SETTINGS_PANEL_SET = 'SETTINGS_PANEL_SET';
 export const QUICK_FILTER_BAR_SHOW = 'QUICK_FILTER_BAR_SHOW';
 export const QUICK_FILTER_BAR_HIDE = 'QUICK_FILTER_BAR_HIDE';
+export const COLUMN_FILTER_DRAFT_SET = 'COLUMN_FILTER_DRAFT_SET';
+export const COLUMN_FILTER_DRAFT_CLEAR = 'COLUMN_FILTER_DRAFT_CLEAR';
+export const COLUMN_FILTER_DRAFT_CLEAR_ALL = 'COLUMN_FILTER_DRAFT_CLEAR_ALL';
 export const DISABLE_DELETE_CONFIRMATION = 'DISABLE_DELETE_CONFIRMATION';
 export const LAYOUT_SHOW_NON_EXTENDED_OBJECTS = 'LAYOUT_SHOW_NON_EXTENDED_OBJECTS';
 export const DASHBOARD_REFRESH = 'DASHBOARD_REFRESH';
@@ -78,6 +86,26 @@ export const HighlightCellDelete = (primaryKeyValue, columnId) => ({
 export const HighlightCellDeleteAll = () => ({
     type: HIGHLIGHT_CELL_DELETE_ALL,
 });
+export const FormulaTraceShow = (formulaTraceInfo) => ({
+    type: FORMULA_TRACE_SHOW,
+    formulaTraceInfo,
+});
+export const FormulaTraceHide = () => ({
+    type: FORMULA_TRACE_HIDE,
+});
+export const FormulaTraceInfoSelector = (state) => {
+    return state?.FormulaTraceInfo;
+};
+export const CompactCalculatedColumnEditorShow = (compactCalculatedColumnEditorInfo) => ({
+    type: COMPACT_CALCULATED_COLUMN_EDITOR_SHOW,
+    compactCalculatedColumnEditorInfo,
+});
+export const CompactCalculatedColumnEditorHide = () => ({
+    type: COMPACT_CALCULATED_COLUMN_EDITOR_HIDE,
+});
+export const CompactCalculatedColumnEditorInfoSelector = (state) => {
+    return state?.CompactCalculatedColumnEditorInfo;
+};
 export const HighlightColumnAdd = (columnHighlightInfo) => ({
     type: HIGHLIGHT_COLUMN_ADD,
     columnHighlightInfo: columnHighlightInfo,
@@ -175,9 +203,10 @@ export const SmartEditChangeOperation = (smartEditOperation) => ({
 export const SmartEditCheckCellSelection = () => ({
     type: SMARTEDIT_CHECK_CELL_SELECTION,
 });
-export const SmartEditSetValidSelection = (IsValidSmartEditSelection) => ({
+export const SmartEditSetValidSelection = (IsValidSmartEditSelection, alert) => ({
     type: SMARTEDIT_SET_VALID_SELECTION,
     isValidSmartEditSelection: IsValidSmartEditSelection,
+    alert: alert ?? null,
 });
 export const SmartEditSetPreview = (SmartEditPreviewInfo) => ({
     type: SMARTEDIT_SET_PREVIEW,
@@ -252,6 +281,19 @@ export const QuickFilterBarShow = () => ({
 export const QuickFilterBarHide = () => ({
     type: QUICK_FILTER_BAR_HIDE,
 });
+export const ColumnFilterDraftSet = (columnId, draft) => ({
+    type: COLUMN_FILTER_DRAFT_SET,
+    columnId,
+    draft,
+});
+export const ColumnFilterDraftClear = (columnId) => ({
+    type: COLUMN_FILTER_DRAFT_CLEAR,
+    columnId,
+});
+export const ColumnFilterDraftClearAll = () => ({
+    type: COLUMN_FILTER_DRAFT_CLEAR_ALL,
+});
+export const ColumnFilterDraftSelector = (state, columnId) => state?.ColumnFilterDrafts?.[columnId];
 export const LayoutShowNonExtendedObjects = (showNonExtendedObjects) => ({
     type: LAYOUT_SHOW_NON_EXTENDED_OBJECTS,
     showNonExtendedObjects: showNonExtendedObjects,
@@ -308,14 +350,14 @@ export const DisableDeleteConfirmationSelector = (state) => {
 export const QuickSearchFloatingVisibilitySelector = (state) => {
     return state?.QuickSearch?.floatingVisible;
 };
-export const CommentsAndNotesSelector = (state) => {
-    return state?.NotesAndComments?.popupPosition;
+export const CommentPopupPositionSelector = (state) => {
+    return state?.CommentPopup?.popupPosition;
 };
-export const CommentsAndNotesEditModeSelector = (state) => {
-    return state?.NotesAndComments?.editMode;
+export const CommentPopupEditModeSelector = (state) => {
+    return state?.CommentPopup?.editMode;
 };
-export const CommentsAndNotesFocusedEntitySelector = (state) => {
-    return state?.NotesAndComments?.focusedEntity;
+export const CommentPopupFocusedEntitySelector = (state) => {
+    return state?.CommentPopup?.focusedEntity;
 };
 export const DataImportCompleted = (dataImportedInfo) => ({
     type: DATA_IMPORT_COMPLETED,
@@ -328,12 +370,15 @@ const initialState = {
     CellHighlightInfo: EMPTY_ARRAY,
     ColumnHighlightInfo: EMPTY_ARRAY,
     RowHighlightInfo: EMPTY_ARRAY,
+    FormulaTraceInfo: undefined,
+    CompactCalculatedColumnEditorInfo: undefined,
     SettingsPanelModuleEntries: EMPTY_ARRAY,
     AdaptableAlerts: EMPTY_ARRAY,
     SystemStatusMessages: EMPTY_ARRAY,
     Dashboard: { DashboardModuleButtons: EMPTY_ARRAY, DashboardRevision: 1 },
     SmartEdit: {
         IsValidSmartEditSelection: false,
+        Alert: null,
         SmartEditPreviewInfo: null,
         SmartEditValue: 1,
         SmartEditOperation: MathOperation.Multiply,
@@ -360,6 +405,7 @@ const initialState = {
     },
     SettingsPanel: {},
     IsQuickFilterVisible: true,
+    ColumnFilterDrafts: {},
     CurrentDataSet: EMPTY_STRING,
     Charting: {
         currentChartModels: [],
@@ -373,6 +419,14 @@ const initialState = {
         inProgress: null,
     },
 };
+const clearColumnFilterDraft = (state, columnId) => {
+    if (!state.ColumnFilterDrafts?.[columnId]) {
+        return state;
+    }
+    const drafts = { ...state.ColumnFilterDrafts };
+    delete drafts[columnId];
+    return { ...state, ColumnFilterDrafts: drafts };
+};
 const removeDataChangeHistoryLog = (state, uniqueKey) => {
     const updatedDataChangeHistoryLogs = { ...state.DataChangeHistory.logs };
     delete updatedDataChangeHistoryLogs[uniqueKey];
@@ -437,6 +491,32 @@ export const InternalReducer = (state = initialState, action) => {
                 CellHighlightInfo: [],
             });
         }
+        case FORMULA_TRACE_SHOW: {
+            const actionTyped = action;
+            return {
+                ...state,
+                FormulaTraceInfo: actionTyped.formulaTraceInfo,
+            };
+        }
+        case FORMULA_TRACE_HIDE: {
+            return {
+                ...state,
+                FormulaTraceInfo: undefined,
+            };
+        }
+        case COMPACT_CALCULATED_COLUMN_EDITOR_SHOW: {
+            const actionTyped = action;
+            return {
+                ...state,
+                CompactCalculatedColumnEditorInfo: actionTyped.compactCalculatedColumnEditorInfo,
+            };
+        }
+        case COMPACT_CALCULATED_COLUMN_EDITOR_HIDE: {
+            return {
+                ...state,
+                CompactCalculatedColumnEditorInfo: undefined,
+            };
+        }
         case HIGHLIGHT_COLUMN_ADD: {
             const actionTypedAdd = action;
             return Object.assign({}, state, {
@@ -596,6 +676,7 @@ export const InternalReducer = (state = initialState, action) => {
                     ...state.SmartEdit,
                     IsValidSmartEditSelection: action
                         .isValidSmartEditSelection,
+                    Alert: action.alert ?? null,
                 },
             };
         case SMARTEDIT_SET_PREVIEW:
@@ -634,12 +715,13 @@ export const InternalReducer = (state = initialState, action) => {
         case CACHED_QUERY_ADD: {
             const actionTypedAdd = action;
             let cachedQueries = [].concat(state.CachedQueries);
-            let queryToAdd = actionTypedAdd.cachedQuery;
-            if (queryToAdd) {
-                if (cachedQueries.length == 5) {
+            const queryToAdd = actionTypedAdd.cachedQuery;
+            if (queryToAdd?.expression) {
+                cachedQueries = cachedQueries.filter((cachedQuery) => cachedQuery.expression !== queryToAdd.expression);
+                if (cachedQueries.length >= 5) {
                     cachedQueries.splice(0, 1);
                 }
-                cachedQueries.push(actionTypedAdd.cachedQuery);
+                cachedQueries.push(queryToAdd);
             }
             return Object.assign({}, state, { CachedQueries: cachedQueries });
         }
@@ -765,6 +847,43 @@ export const InternalReducer = (state = initialState, action) => {
             return Object.assign({}, state, { IsQuickFilterVisible: true });
         case QUICK_FILTER_BAR_HIDE:
             return Object.assign({}, state, { IsQuickFilterVisible: false });
+        case COLUMN_FILTER_DRAFT_SET: {
+            const typedAction = action;
+            return {
+                ...state,
+                ColumnFilterDrafts: {
+                    ...state.ColumnFilterDrafts,
+                    [typedAction.columnId]: typedAction.draft,
+                },
+            };
+        }
+        case COLUMN_FILTER_DRAFT_CLEAR: {
+            const typedAction = action;
+            return clearColumnFilterDraft(state, typedAction.columnId);
+        }
+        case COLUMN_FILTER_DRAFT_CLEAR_ALL: {
+            if (!Object.keys(state.ColumnFilterDrafts ?? {}).length) {
+                return state;
+            }
+            return { ...state, ColumnFilterDrafts: {} };
+        }
+        case LayoutRedux.LAYOUT_COLUMN_FILTER_ADD:
+        case LayoutRedux.LAYOUT_COLUMN_FILTER_EDIT:
+        case LayoutRedux.LAYOUT_COLUMN_FILTER_SET: {
+            const typedAction = action;
+            return clearColumnFilterDraft(state, typedAction.columnFilter?.ColumnId);
+        }
+        case LayoutRedux.LAYOUT_COLUMN_FILTER_CLEAR: {
+            const typedAction = action;
+            return clearColumnFilterDraft(state, typedAction.columnId);
+        }
+        case LayoutRedux.LAYOUT_COLUMN_FILTER_CLEAR_ALL:
+        case LayoutRedux.LAYOUT_SELECT: {
+            if (!Object.keys(state.ColumnFilterDrafts ?? {}).length) {
+                return state;
+            }
+            return { ...state, ColumnFilterDrafts: {} };
+        }
         case LAYOUT_SHOW_NON_EXTENDED_OBJECTS: {
             const typedAction = action;
             return {
@@ -837,17 +956,17 @@ export const InternalReducer = (state = initialState, action) => {
         case CELL_POPUP_SHOW: {
             const typedAction = action;
             let newAddress = typedAction?.cellPosition;
-            const oldAddress = state?.NotesAndComments?.popupPosition;
-            if (AnnotationsService.isSameAddress(oldAddress, typedAction.cellPosition)) {
+            const oldAddress = state?.CommentPopup?.popupPosition;
+            if (CommentsService.isSameAddress(oldAddress, typedAction.cellPosition)) {
                 newAddress = oldAddress;
-                if (typedAction.editMode === state.NotesAndComments.editMode) {
+                if (typedAction.editMode === state.CommentPopup.editMode) {
                     return state;
                 }
             }
             return {
                 ...state,
-                NotesAndComments: {
-                    ...state.NotesAndComments,
+                CommentPopup: {
+                    ...state.CommentPopup,
                     editMode: typedAction.editMode,
                     popupPosition: newAddress,
                 },
@@ -857,8 +976,8 @@ export const InternalReducer = (state = initialState, action) => {
             const typedAction = action;
             return {
                 ...state,
-                NotesAndComments: {
-                    ...state.NotesAndComments,
+                CommentPopup: {
+                    ...state.CommentPopup,
                     focusedEntity: typedAction.focusedEntity,
                 },
             };
@@ -866,7 +985,7 @@ export const InternalReducer = (state = initialState, action) => {
         case CELL_POPUP_HIDE: {
             return {
                 ...state,
-                NotesAndComments: {
+                CommentPopup: {
                     editMode: false,
                     popupPosition: null,
                 },