@sapui5/sap.fe.macros 1.141.1 → 1.142.0

package/src/sap/fe/macros/table/delegates/TableDelegate.ts

@@ -1,4 +1,12 @@
-import type { DataFieldAbstractTypes, DataFieldForAnnotation, FieldGroupType } from "@sap-ux/vocabularies-types/vocabularies/UI";
+import type { EntitySet, NavigationProperty, Property } from "@sap-ux/vocabularies-types";
+import type {
+	ConnectedFields,
+	DataField,
+	DataFieldAbstractTypes,
+	DataFieldForAnnotation,
+	DataPointType,
+	FieldGroupType
+} from "@sap-ux/vocabularies-types/vocabularies/UI";
 import Log from "sap/base/Log";
 import deepEqual from "sap/base/util/deepEqual";
 import deepExtend from "sap/base/util/deepExtend";
@@ -11,12 +19,12 @@ import type { FEView } from "sap/fe/core/BaseController";
 import type { BaseTreeModifier } from "sap/fe/core/CommonUtils";
 import CommonUtils from "sap/fe/core/CommonUtils";
 import type TemplateComponent from "sap/fe/core/TemplateComponent";
+import CollaborationManager from "sap/fe/core/controllerextensions/cards/CollaborationManager";
 import type { ListReportManifestSettings } from "sap/fe/core/converters/ManifestSettings";
+import * as MetaModelConverter from "sap/fe/core/converters/MetaModelConverter";
 import { getInvolvedDataModelObjects } from "sap/fe/core/converters/MetaModelConverter";
-import type { WrappedCard } from "sap/fe/core/services/CollaborationManagerServiceFactory";
-
-import type { EntitySet, NavigationProperty } from "@sap-ux/vocabularies-types";
-import CollaborationManager from "sap/fe/core/controllerextensions/cards/CollaborationManager";
+import type { PageContextPathTarget } from "sap/fe/core/converters/TemplateConverter";
+import FilterRestrictions from "sap/fe/core/converters/controls/Common/filter/FilterRestrictions";
 import type {
 	AnnotationTableColumn,
 	ColumnExportSettings,
@@ -26,6 +34,7 @@ import type {
 } from "sap/fe/core/converters/controls/Common/table/Columns";
 import { ColumnType } from "sap/fe/core/converters/controls/Common/table/Columns";
 import type { CustomElement } from "sap/fe/core/converters/helpers/ConfigurableObject";
+import { getConnectedFieldsData, getConnectedFieldsSeparator } from "sap/fe/core/converters/helpers/DataFieldHelper";
 import ValueFormatter from "sap/fe/core/formatters/ValueFormatter";
 import DeleteHelper from "sap/fe/core/helpers/DeleteHelper";
 import ExcelFormat from "sap/fe/core/helpers/ExcelFormatHelper";
@@ -34,10 +43,11 @@ import ModelHelper from "sap/fe/core/helpers/ModelHelper";
 import PromiseKeeper from "sap/fe/core/helpers/PromiseKeeper";
 import { getLocalizedText, getResourceModel } from "sap/fe/core/helpers/ResourceModelHelper";
 import SizeHelper from "sap/fe/core/helpers/SizeHelper";
+import type { WrappedCard } from "sap/fe/core/services/CollaborationManagerServiceFactory";
 import type { DataModelObjectPath } from "sap/fe/core/templating/DataModelPathHelper";
 import { isPathFilterable } from "sap/fe/core/templating/DataModelPathHelper";
 import { isTypeFilterable } from "sap/fe/core/type/EDM";
-import type { CollectionBindingInfo } from "sap/fe/macros/CollectionBindingInfo";
+import type { SerializedCollectionBindingInfo } from "sap/fe/macros/CollectionBindingInfo";
 import CollectionBindingInfoAPI from "sap/fe/macros/CollectionBindingInfo";
 import CommonHelper from "sap/fe/macros/CommonHelper";
 import DelegateUtil from "sap/fe/macros/DelegateUtil";
@@ -79,12 +89,17 @@ import type ODataMetaModel from "sap/ui/model/odata/v4/ODataMetaModel";
 import type ODataModel from "sap/ui/model/odata/v4/ODataModel";
 import type QuickFilterSelector from "../QuickFilterSelector";
 import TableEventHandlerProvider from "../TableEventHandlerProvider";
-
 const SEMANTICKEY_HAS_DRAFTINDICATOR = "/semanticKeyHasDraftIndicator";
 const SEARCH_HAS_BEEN_FIRED = "searchFired";
 const COLUMN_HAS_BEEN_ADDED = "columnAdded";
 const PREVIOUS_SORTERS = "previousSorters";
 
+async function delayFor(delay: number): Promise<void> {
+	return new Promise<void>((resolve) => {
+		setTimeout(resolve, delay);
+	});
+}
+
 /**
  * Helper class for sap.ui.mdc.Table.
  * <h3><b>Note:</b></h3>
@@ -137,10 +152,11 @@ export default Object.assign({}, TableDelegateBase, {
 					case "com.sap.vocabularies.UI.v1.DataField":
 						oDataFieldWidth = TableSizeHelper.getWidthForDataField(
 							oData,
-							showDataFieldsLabel,
 							propertyInfos,
 							convertedMetaData,
-							false
+							false,
+							involvedDataModelObjects as DataModelObjectPath<Property | DataFieldAbstractTypes | DataPointType>,
+							showDataFieldsLabel
 						);
 						break;
 					case "com.sap.vocabularies.UI.v1.DataFieldForAction":
@@ -166,7 +182,54 @@ export default Object.assign({}, TableDelegateBase, {
 			});
 		}
 	},
-
+	/**
+	 * This function calculates the width of a ConnectedFields column.
+	 * The width of the ConnectedFields is the sum of the width of the 2 properties contained in the ConnectedFields
+	 * The result of this calculation is stored in the visualSettings.widthCalculation.minWidth property, which is used by the MDCtable.
+	 * @param table Instance of the MDCtable
+	 * @param propertyInfo Current propertyInfo
+	 * @param propertyInfos Array of properties
+	 * @private
+	 * @alias sap.fe.macros.TableDelegate
+	 */
+	_computeVisualSettingsForConnectedField: function (
+		table: Table,
+		propertyInfo: EnhancedFEPropertyInfo,
+		propertyInfos: EnhancedFEPropertyInfo[]
+	) {
+		if (propertyInfo.key.indexOf("DataFieldForAnnotation::ConnectedFields::") === 0) {
+			const metaModel = (table.getModel() as ODataModel).getMetaModel();
+			const involvedDataModelObjects = getInvolvedDataModelObjects(metaModel.getContext(propertyInfo.annotationPath));
+			const convertedMetaData = involvedDataModelObjects.convertedTypes;
+			const dataField = involvedDataModelObjects.targetObject as DataFieldForAnnotation;
+			const connectedFields = dataField.Target.$target as ConnectedFields;
+			const connectedFieldsSeparator = getConnectedFieldsSeparator(connectedFields);
+			const fieldWidths: number[] = [];
+			getConnectedFieldsData(connectedFields).forEach(function (data: DataFieldAbstractTypes) {
+				const dataFieldWidth = TableSizeHelper.getWidthForDataField(
+					data as DataField,
+					propertyInfos,
+					convertedMetaData,
+					false,
+					involvedDataModelObjects as DataModelObjectPath<Property | DataFieldAbstractTypes | DataPointType>
+				);
+				if (dataFieldWidth) {
+					fieldWidths.push(dataFieldWidth.propertyWidth);
+				}
+			});
+			const separatorWidth = SizeHelper.getButtonWidth(connectedFieldsSeparator);
+			fieldWidths.push(separatorWidth);
+			const columnWidth = fieldWidths.reduce(function (acc: number, value: number) {
+				return acc + value;
+			}, 0);
+			propertyInfo.visualSettings = deepExtend(propertyInfo.visualSettings as object, {
+				widthCalculation: {
+					verticalArrangement: true,
+					minWidth: Math.ceil(columnWidth)
+				}
+			});
+		}
+	},
 	_computeVisualSettingsForPropertyWithValueHelp: function (table: Table, property: EnhancedFEPropertyInfo) {
 		const tableAPI = this._getTableAPI(table);
 		if (!property.propertyInfos) {
@@ -183,7 +246,6 @@ export default Object.assign({}, TableDelegateBase, {
 			}
 		}
 	},
-
 	_computeVisualSettingsForPropertyWithUnit: function (
 		table: Table,
 		propertyInfo: PropertyInfo,
@@ -210,7 +272,6 @@ export default Object.assign({}, TableDelegateBase, {
 			});
 		}
 	},
-
 	_computeLabel: function (property: EnhancedFEPropertyInfo, labelMap: { [label: string]: EnhancedFEPropertyInfo[] }) {
 		if (property.label) {
 			const propertiesWithSameLabel = labelMap[property.label];
@@ -252,12 +313,14 @@ export default Object.assign({}, TableDelegateBase, {
 		});
 		properties.forEach((property) => {
 			this._computeVisualSettingsForFieldGroup(table, property, properties);
+			this._computeVisualSettingsForConnectedField(table, property, properties);
 			this._computeVisualSettingsForPropertyWithValueHelp(table, property);
 			this._computeLabel(property, labelMap);
 		});
 		// Add the $editState property
 		properties.push({
 			key: "$editState",
+			name: "$editState",
 			path: "$editState",
 			groupLabel: "",
 			group: "",
@@ -270,7 +333,6 @@ export default Object.assign({}, TableDelegateBase, {
 		} as EnhancedFEPropertyInfo);
 		return properties;
 	},
-
 	_getTableAPI(table: Table): TableAPI {
 		let tableAPI: TableAPI | undefined = table.getParent() as TableAPI;
 		if (!tableAPI) {
@@ -278,12 +340,10 @@ export default Object.assign({}, TableDelegateBase, {
 		}
 		return tableAPI;
 	},
-
 	getColumnsFor: function (table: Table): TableColumn[] {
 		const tableAPI = this._getTableAPI(table);
 		return tableAPI.getTableDefinition().columns;
 	},
-
 	/**
 	 * Returns the export capabilities for the given sap.ui.mdc.Table instance.
 	 * @param oTable Instance of the table
@@ -319,7 +379,6 @@ export default Object.assign({}, TableDelegateBase, {
 				return oCapabilities;
 			});
 	},
-
 	/**
 	 * Filtering on navigation properties that are not part of the LineItem annotation nor of the custom columns is forbidden.
 	 * @param columnInfo
@@ -337,7 +396,6 @@ export default Object.assign({}, TableDelegateBase, {
 				!(isConstant(isFilterable) && isFilterable.value === false))
 		);
 	},
-
 	_fetchPropertyInfo: function (
 		metaModel: MetaModel,
 		columnInfo: AnnotationTableColumn,
@@ -379,23 +437,19 @@ export default Object.assign({}, TableDelegateBase, {
 			// if I set this clipBoardSettings the copy provider extract the data according to the template in the html property and it is properly copied in excel
 			// but when we copy elsewhere we only get the raw data and not the templated data
 		}
-
 		// Set visualSettings only if it exists
 		if (columnInfo.visualSettings && Object.keys(columnInfo.visualSettings).length > 0) {
 			propertyInfo.visualSettings = columnInfo.visualSettings;
 		}
-
 		if (columnInfo.exportDataPointTargetValue) {
 			propertyInfo.exportDataPointTargetValue = columnInfo.exportDataPointTargetValue;
 		}
-
 		// MDC expects  'propertyInfos' only for complex properties.
 		// An empty array throws validation error and undefined value is unhandled.
 		if (columnInfo.propertyInfos?.length) {
 			propertyInfo.propertyInfos = columnInfo.propertyInfos;
 		} else {
 			// Add properties which are supported only by simple PropertyInfos.
-
 			//get the DataModelObjectPath for the column
 			const columnDataModelObjectPath = getInvolvedDataModelObjects(
 				metaModel.getContext(columnInfo.annotationPath),
@@ -429,12 +483,9 @@ export default Object.assign({}, TableDelegateBase, {
 				});
 			}
 		}
-
 		this._computeVisualSettingsForPropertyWithUnit(table, propertyInfo, columnInfo.unit, columnInfo.unitText, columnInfo.timezoneText);
-
 		return propertyInfo;
 	},
-
 	/**
 	 * Extend the export settings based on the column info.
 	 * @param exportSettings The export settings to be extended
@@ -451,7 +502,6 @@ export default Object.assign({}, TableDelegateBase, {
 		}
 		return exportSettings;
 	},
-
 	/**
 	 * Gets the type config for the given column info.
 	 * @param columnInfo The columnInfo object.
@@ -488,7 +538,6 @@ export default Object.assign({}, TableDelegateBase, {
 		}
 		propertyInfo.text = columnInfo.textArrangement?.textProperty;
 	},
-
 	_updateAnalyticalPropertyInfoAttributes(propertyInfo: PropertyInfo, columnInfo: AnnotationTableColumn) {
 		if (columnInfo.aggregatable) {
 			propertyInfo.aggregatable = columnInfo.aggregatable;
@@ -497,7 +546,6 @@ export default Object.assign({}, TableDelegateBase, {
 			propertyInfo.extension = columnInfo.extension;
 		}
 	},
-
 	_fetchComputedPropertyInfo: function (columnInfo: ComputedTableColumn, table: Table) {
 		const label = getLocalizedText(columnInfo.label, table); // Todo: To be removed once MDC provides translation support
 		const propertyInfo: PropertyInfo = {
@@ -516,7 +564,6 @@ export default Object.assign({}, TableDelegateBase, {
 		}
 		return propertyInfo;
 	},
-
 	_fetchCustomPropertyInfo: function (columnInfo: CustomBasedTableColumn, table: Table, appComponent: AppComponent) {
 		let label;
 		if (columnInfo.header) {
@@ -536,7 +583,6 @@ export default Object.assign({}, TableDelegateBase, {
 			exportSettings: columnInfo.exportSettings,
 			visualSettings: columnInfo.visualSettings as PropertyInfo["visualSettings"]
 		};
-
 		// MDC expects 'propertyInfos' only for complex properties.
 		// An empty array throws validation error and undefined value is unhandled.
 		if (columnInfo.propertyInfos && columnInfo.propertyInfos.length) {
@@ -580,9 +626,11 @@ export default Object.assign({}, TableDelegateBase, {
 		appComponent: AppComponent
 	): Promise<PropertyInfo[]> {
 		// when fetching properties, this binding context is needed - so lets create it only once and use if for all properties/data-fields/line-items
-		const bindingPath = ModelHelper.getEntitySetPath(entityTypePath);
 		let fetchedProperties: PropertyInfo[] = [];
-		const nonFilterableProperties = CommonUtils.getFilterRestrictionsByPath(bindingPath, metaModel).NonFilterableProperties;
+		const dataModel = MetaModelConverter.getInvolvedDataModelObjects(metaModel.getContext(entityTypePath));
+		const nonFilterableProperties = FilterRestrictions.getFilterRestrictionsByDataModel(
+			dataModel as DataModelObjectPath<PageContextPathTarget>
+		).NonFilterableProperties;
 		return Promise.resolve(this.getColumnsFor(table))
 			.then((columns: TableColumn[]) => {
 				// DraftAdministrativeData does not work via 'entitySet/$NavigationPropertyBinding/DraftAdministrativeData'
@@ -626,7 +674,6 @@ export default Object.assign({}, TableDelegateBase, {
 				return fetchedProperties;
 			});
 	},
-
 	_getCachedOrFetchPropertiesForEntity: async function (
 		table: Table,
 		entityTypePath: string,
@@ -638,6 +685,10 @@ export default Object.assign({}, TableDelegateBase, {
 		if (fetchedProperties.length) {
 			return Promise.resolve(fetchedProperties);
 		}
+		if (appComponent.delayTime > 0) {
+			// First call let's add a small delay to ensure this doesn't block the initial view creation
+			await delayFor(appComponent.delayTime);
+		}
 		return this._fetchPropertiesForEntity(table, entityTypePath, metaModel, appComponent).then(function (
 			subFetchedProperties: PropertyInfo[]
 		) {
@@ -661,28 +712,25 @@ export default Object.assign({}, TableDelegateBase, {
 			table.setNoData(illustratedMessage);
 		}
 	},
-
-	setTableNoDataIllustratedMessage: function (table: Table, bindingInfo: CollectionBindingInfo) {
+	setTableNoDataIllustratedMessage: function (table: Table, bindingInfo: SerializedCollectionBindingInfo) {
 		const tableFilterInfo = TableUtils.getAllFilterInfo(table);
 		const resourceModel = getResourceModel(table);
 		const suffixResourceKey = bindingInfo.path?.startsWith("/") ? bindingInfo.path.substring(1) : bindingInfo.path;
 		let illustratedInformation: $IllustratedMessageSettings;
-
 		const getNoDataIllustratedMessageWithFilters = function (): $IllustratedMessageSettings {
 			if (table.data("hiddenFilters") || table.getQuickFilter()) {
 				return {
-					title: resourceModel.getText("T_ILLUSTRATED_MESSAGE_TITLE_NOSEARCHRESULTS"),
+					title: resourceModel.getText("T_ILLUSTRATED_MESSAGE_TITLE_NOSEARCHRESULTS", undefined, suffixResourceKey),
 					description: resourceModel.getText("M_TABLE_AND_CHART_NO_DATA_TEXT_MULTI_VIEW", undefined, suffixResourceKey),
-					illustrationType: IllustratedMessageType.NoSearchResults
+					illustrationType: IllustratedMessageType.NoFilterResults
 				};
 			}
 			return {
-				title: resourceModel.getText("T_ILLUSTRATED_MESSAGE_TITLE_NOSEARCHRESULTS"),
+				title: resourceModel.getText("T_ILLUSTRATED_MESSAGE_TITLE_NOSEARCHRESULTS", undefined, suffixResourceKey),
 				description: resourceModel.getText("T_TABLE_AND_CHART_NO_DATA_TEXT_WITH_FILTER", undefined, suffixResourceKey),
-				illustrationType: IllustratedMessageType.NoSearchResults
+				illustrationType: IllustratedMessageType.NoFilterResults
 			};
 		};
-
 		const filterAssociation = table.getFilter();
 		const hasFilterOrSearch = tableFilterInfo.search || tableFilterInfo.filters?.length;
 		if (filterAssociation && !/BasicSearch$/.test(filterAssociation)) {
@@ -692,9 +740,9 @@ export default Object.assign({}, TableDelegateBase, {
 				illustratedInformation = getNoDataIllustratedMessageWithFilters();
 			} else {
 				illustratedInformation = {
-					title: resourceModel.getText("T_ILLUSTRATED_MESSAGE_TITLE_NOSEARCHRESULTS"),
+					title: resourceModel.getText("T_ILLUSTRATED_MESSAGE_TITLE_NOSEARCHRESULTS", undefined, suffixResourceKey),
 					description: resourceModel.getText("T_TABLE_AND_CHART_NO_DATA_TEXT", undefined, suffixResourceKey),
-					illustrationType: IllustratedMessageType.NoSearchResults
+					illustrationType: IllustratedMessageType.NoFilterResults
 				};
 			}
 		} else if (hasFilterOrSearch) {
@@ -702,9 +750,9 @@ export default Object.assign({}, TableDelegateBase, {
 			illustratedInformation = getNoDataIllustratedMessageWithFilters();
 		} else {
 			illustratedInformation = {
-				title: resourceModel.getText("T_ILLUSTRATED_MESSAGE_TITLE_NODATA"),
+				title: resourceModel.getText("T_ILLUSTRATED_MESSAGE_TITLE_NODATA", undefined, suffixResourceKey),
 				description: resourceModel.getText("M_TABLE_AND_CHART_NO_FILTERS_NO_DATA_TEXT", undefined, suffixResourceKey),
-				illustrationType: IllustratedMessageType.NoData
+				illustrationType: IllustratedMessageType.NoEntries
 			};
 		}
 		if (CommonUtils.getTargetView(table).getViewData().liveMode) {
@@ -712,15 +760,14 @@ export default Object.assign({}, TableDelegateBase, {
 				illustratedInformation = getNoDataIllustratedMessageWithFilters();
 			} else {
 				illustratedInformation = {
-					title: resourceModel.getText("T_ILLUSTRATED_MESSAGE_TITLE_NOSEARCHRESULTS"),
-					description: resourceModel.getText("M_TABLE_AND_CHART_NO_FILTERS_NO_DATA_TEXT"),
-					illustrationType: IllustratedMessageType.NoSearchResults
+					title: resourceModel.getText("T_ILLUSTRATED_MESSAGE_TITLE_NOSEARCHRESULTS", undefined, suffixResourceKey),
+					description: resourceModel.getText("M_TABLE_AND_CHART_NO_FILTERS_NO_DATA_TEXT", undefined, suffixResourceKey),
+					illustrationType: IllustratedMessageType.NoFilterResults
 				};
 			}
 		}
 		const tableAPI = this._getTableAPI(table);
 		illustratedInformation.illustrationSize = tableAPI.getNoDataMessageMode();
-
 		if (illustratedInformation.illustrationSize === "text") {
 			const currentNoData = table.getNoData();
 			if (typeof currentNoData === "string" && currentNoData === illustratedInformation.description) {
@@ -732,7 +779,6 @@ export default Object.assign({}, TableDelegateBase, {
 			this.setNoDataInformation(table, illustratedInformation);
 		}
 	},
-
 	/**
 	 * Handles the dataRequested event for the table binding to set up table defaults.
 	 * @param oTable The MDC table instance
@@ -757,7 +803,6 @@ export default Object.assign({}, TableDelegateBase, {
 			oInternalModelContext.setProperty("dataRequestedAttached", true);
 		}
 	},
-
 	handleTableDataReceived: function (oTable: Table, oInternalModelContext: InternalModelContext): void {
 		const oBinding = oTable && oTable.getRowBinding(),
 			bDataReceivedAttached = oInternalModelContext && oInternalModelContext.getProperty("dataReceivedAttached");
@@ -789,7 +834,6 @@ export default Object.assign({}, TableDelegateBase, {
 			oInternalModelContext.setProperty("dataReceivedAttached", true);
 		}
 	},
-
 	/**
 	 * Set the optimistic batch promise for the enabler callback function.
 	 * @param controller The controller
@@ -802,7 +846,6 @@ export default Object.assign({}, TableDelegateBase, {
 			this.setOptimisticBatchForModel(controller, model, tableAPI);
 		}
 	},
-
 	/**
 	 * Enable the optimistic batch mode if available.
 	 * @param controller
@@ -814,7 +857,6 @@ export default Object.assign({}, TableDelegateBase, {
 		const tableAPI = this._getTableAPI(table);
 		tableAPI.getOptimisticBatchEnablerPromise()?.resolve(!filtersPropertiesAsPotentiallySensitiveDataOrDateType);
 	},
-
 	/**
 	 * Setter for the optimistic batch enabler callback function.
 	 * @param controller
@@ -831,10 +873,8 @@ export default Object.assign({}, TableDelegateBase, {
 			});
 		}
 	},
-
 	rebind: async function (oTable: Table, oBindingInfo: BaseAggregationBindingInfo): Promise<void> {
 		const tableAPI = this._getTableAPI(oTable);
-
 		const bIsSuspended = tableAPI?.getProperty("bindingSuspended");
 		tableAPI?.setProperty("outDatedBinding", bIsSuspended);
 		if (!bIsSuspended) {
@@ -853,7 +893,6 @@ export default Object.assign({}, TableDelegateBase, {
 		}
 		return Promise.resolve();
 	},
-
 	/**
 	 * Fetches the relevant metadata for the table and returns property info array.
 	 * @param table Instance of the MDCtable
@@ -875,7 +914,6 @@ export default Object.assign({}, TableDelegateBase, {
 				return properties;
 			});
 	},
-
 	preInit: async function (table: Table): Promise<void> {
 		return (TableDelegateBase.preInit as (table: Table) => Promise<void>).apply(this, [table]).then(() => {
 			/**
@@ -890,7 +928,7 @@ export default Object.assign({}, TableDelegateBase, {
 			return;
 		});
 	},
-	updateBindingInfo: function (table: Table, bindingInfo: CollectionBindingInfo) {
+	updateBindingInfo: function (table: Table, bindingInfo: SerializedCollectionBindingInfo) {
 		const internalBindingContext = table.getBindingContext("internal") as InternalModelContext | undefined;
 		const tableAPI = this._getTableAPI(table);
 		const quickFilter = table.getQuickFilter() as QuickFilterSelector | undefined;
@@ -903,7 +941,6 @@ export default Object.assign({}, TableDelegateBase, {
 			this.setTableNoDataIllustratedMessage(table, bindingInfo);
 			this._handleRecommendationOutputFields(table, bindingInfo);
 			this._handleFiltersForExternalID(table, bindingInfo);
-
 			tableAPI?.fireEvent("beforeRebindTable", {
 				collectionBindingInfo: collectionBindingInfoAPI,
 				quickFilterKey: quickFilter?.getSelectedKey()
@@ -931,8 +968,7 @@ export default Object.assign({}, TableDelegateBase, {
 			Log.error("Error while updating the binding info", e as string);
 		}
 	},
-
-	_handleSortersOnCurrenciesOrUoM: function (table: Table, bindingInfo: CollectionBindingInfo) {
+	_handleSortersOnCurrenciesOrUoM: function (table: Table, bindingInfo: SerializedCollectionBindingInfo) {
 		const sorters: Sorter[] | undefined = bindingInfo.sorter;
 		const newSortersToBeApplied: Sorter[] = [];
 		if (sorters?.length) {
@@ -952,8 +988,7 @@ export default Object.assign({}, TableDelegateBase, {
 			bindingInfo.sorter = newSortersToBeApplied;
 		}
 	},
-
-	_handleFiltersForExternalID: function (table: Table, bindingInfo: CollectionBindingInfo) {
+	_handleFiltersForExternalID: function (table: Table, bindingInfo: SerializedCollectionBindingInfo) {
 		const metaModel = (table.getModel() as ODataModel)?.getMetaModel();
 		const entityTypePath = bindingInfo.path + "/";
 		const filters = bindingInfo.filters?.getFilters();
@@ -961,8 +996,7 @@ export default Object.assign({}, TableDelegateBase, {
 			TableUtils.updateFiltersForExternalID(metaModel, filters as unknown as ConditionObject[], entityTypePath);
 		}
 	},
-
-	_handleRecommendationOutputFields: function (table: Table, oBindingInfo: CollectionBindingInfo) {
+	_handleRecommendationOutputFields: function (table: Table, oBindingInfo: SerializedCollectionBindingInfo) {
 		const tableAPI = this._getTableAPI(table);
 		const controller = tableAPI?.getPageController();
 		if (controller?.recommendations.isRecommendationEnabled()) {
@@ -976,7 +1010,6 @@ export default Object.assign({}, TableDelegateBase, {
 			}
 		}
 	},
-
 	/**
 	 * Update the cards when the binding is refreshed.
 	 * @param table The mdc table control.
@@ -996,7 +1029,6 @@ export default Object.assign({}, TableDelegateBase, {
 			appComponent.getCollaborationManagerService().shareAvailableCards();
 		}
 	},
-
 	/**
 	 * The hook implemented by MDC that we can override.
 	 * This allows us to define properties to be requested in the MDC table (Main case is for the analytical table).
@@ -1014,7 +1046,6 @@ export default Object.assign({}, TableDelegateBase, {
 				Object.keys(tableAPI.tableDefinition.requestAtLeast)
 					// for analytic tables with aggregationOnLeafLevel we should not request the semanticKey expected when all keys are requested ->  it will permits to navigate from a node level when semanticKey are enabled
 					// restriction are also excluded as we cannot destinguish between a node and a aggregation level
-
 					.filter((fieldName: string) =>
 						!allKkeysRequested
 							? tableAPI.tableDefinition.requestAtLeast[fieldName].some(
@@ -1026,7 +1057,6 @@ export default Object.assign({}, TableDelegateBase, {
 		}
 		return Object.keys(tableAPI.tableDefinition.requestAtLeast ?? {});
 	},
-
 	/**
 	 * Check if all keys() excepted IsActiveEntity) are requested in the table.
 	 * @param tableAPI The table API
@@ -1038,11 +1068,9 @@ export default Object.assign({}, TableDelegateBase, {
 		const keyPropertyNames = allColumns
 			.filter((c) => c.isKey && c.relativePath && c.relativePath !== "IsActiveEntity")
 			.map((c) => c.relativePath);
-
 		const displayedColumns = table
 			.getColumns()
 			.map((column) => tableAPI.getTableDefinition().columns.find((c) => c.name === column.getPropertyKey()));
-
 		// Store all properties referenced by displayed columns in a Set
 		const referencedPropertyPaths = new Set<string>();
 		function processColumn(col: AnnotationTableColumn): void {
@@ -1050,7 +1078,6 @@ export default Object.assign({}, TableDelegateBase, {
 			if (col.relativePath && col.propertyInfos === undefined) {
 				referencedPropertyPaths.add(col.relativePath);
 			}
-
 			// Add the additional properties referenced by the column
 			col.extension?.additionalProperties?.forEach((additionalColumnName) => {
 				const additionalColumn = allColumns.find((c) => c.name === additionalColumnName);
@@ -1065,7 +1092,6 @@ export default Object.assign({}, TableDelegateBase, {
 			}
 			// Process the column itself
 			processColumn(column as AnnotationTableColumn);
-
 			// Process the columns referenced by the column
 			column.propertyInfos?.forEach((relatedColumnName) => {
 				const relatedColumn = allColumns.find((c) => c.name === relatedColumnName);
@@ -1074,7 +1100,6 @@ export default Object.assign({}, TableDelegateBase, {
 				}
 			});
 		});
-
 		return keyPropertyNames.every((propName) => propName && referencedPropertyPaths.has(propName));
 	},
 	/**
@@ -1091,7 +1116,7 @@ export default Object.assign({}, TableDelegateBase, {
 		// If not found in aggregation, check the query options
 		return binding.getQueryOptionsFromParameters().$search;
 	},
-	updateBinding: function (table: MDCTable, bindingInfo: CollectionBindingInfo, binding?: ODataListBinding): void {
+	updateBinding: function (table: MDCTable, bindingInfo: SerializedCollectionBindingInfo, binding?: ODataListBinding): void {
 		const tableAPI = this._getTableAPI(table);
 		const bIsSuspended = tableAPI?.getProperty("bindingSuspended");
 		if (!bIsSuspended) {
@@ -1108,14 +1133,12 @@ export default Object.assign({}, TableDelegateBase, {
 					delete bindingInfo.parameters.$$getKeepAliveContext;
 				}
 			}
-
 			let needManualRefresh = false;
 			const view = CommonUtils.getTargetView(table);
 			const internalBindingContext = table.getBindingContext("internal");
 			const manualUpdatePropertyKey = "pendingManualBindingUpdate";
 			const pendingManualUpdate = internalBindingContext?.getProperty(manualUpdatePropertyKey) as boolean;
 			const newSorters = JSON.stringify(bindingInfo.sorter ?? []);
-
 			if (binding) {
 				/**
 				 * Manual refresh if filters are not changed by binding.refresh() since updating the bindingInfo
@@ -1125,7 +1148,6 @@ export default Object.assign({}, TableDelegateBase, {
 				const viewData = view?.getViewData() as ListReportManifestSettings;
 				const oldFilters = binding.getFilters("Application");
 				const previousSorters = internalBindingContext?.getProperty(PREVIOUS_SORTERS) ?? "[]";
-
 				const filterNotChanged =
 					((bindingInfo.filters === null && oldFilters.length === 0) || // on analytical tables, the filters are set to null when no filters
 						deepEqual(bindingInfo.filters, oldFilters[0])) &&
@@ -1133,7 +1155,6 @@ export default Object.assign({}, TableDelegateBase, {
 					bindingInfo.path === binding.getPath() && // The path can be changed in case of a parametrized entity
 					this.getSearchQuery(binding) === bindingInfo?.parameters?.$search;
 				const LRMultiViewEnabled = !!viewData.views;
-
 				needManualRefresh =
 					filterNotChanged &&
 					(internalBindingContext?.getProperty(SEARCH_HAS_BEEN_FIRED) || // check if the search has been triggered
@@ -1145,7 +1166,6 @@ export default Object.assign({}, TableDelegateBase, {
 			if (tableAPI.getTableDefinition().enableAnalytics !== true) {
 				// Aggregate conditions never make sense outside of an analytical table
 				table.setAggregateConditions();
-
 				// Group conditions don't make sense in a Tree or Grid table
 				if (
 					tableAPI.getTableDefinition().control.type === "GridTable" ||
@@ -1161,7 +1181,6 @@ export default Object.assign({}, TableDelegateBase, {
 			tableAPI.setTableBindingInfo(bindingInfo);
 			// we make the call to update the download url but do not await it
 			tableAPI.setDownloadUrl();
-
 			table.fireEvent("bindingUpdated");
 			if (needManualRefresh && table.getFilter() && binding) {
 				binding
@@ -1177,12 +1196,10 @@ export default Object.assign({}, TableDelegateBase, {
 			internalBindingContext?.setProperty(SEARCH_HAS_BEEN_FIRED, false);
 			internalBindingContext?.setProperty(COLUMN_HAS_BEEN_ADDED, false);
 			internalBindingContext?.setProperty(PREVIOUS_SORTERS, newSorters);
-
 			//for Treetable, it's necessary to clear the pastableContexts since the binding destroys previous contexts.
 			if (tableAPI.getTableDefinition().control.type === "TreeTable") {
 				internalBindingContext?.setProperty("pastableContexts", []);
 			}
-
 			const attachedEvents = tableAPI.storedEvents ?? [];
 			attachedEvents.forEach(({ eventId, callback, listener, data }) => {
 				table.getRowBinding()?.attachEvent(eventId, data, callback, listener);
@@ -1190,8 +1207,7 @@ export default Object.assign({}, TableDelegateBase, {
 		}
 		tableAPI?.setProperty("outDatedBinding", bIsSuspended);
 	},
-
-	_computeRowBindingInfoFromTemplate: function (oTable: Table): CollectionBindingInfo {
+	_computeRowBindingInfoFromTemplate: function (oTable: Table): SerializedCollectionBindingInfo {
 		const tableAPI = this._getTableAPI(oTable);
 		const rowBindingInfo = tableAPI.getTableTemplateBindingInfo();
 		const bindingContext = oTable.getBindingContext();
@@ -1207,15 +1223,13 @@ export default Object.assign({}, TableDelegateBase, {
 		) {
 			tableCanBeInInlineEdit = true;
 		}
-
 		if (tableCanBeInInlineEdit) {
 			rowBindingInfo.parameters ??= {};
 			rowBindingInfo.parameters.$$updateGroupId = CommonUtils.INLINEEDIT_UPDATEGROUPID;
 		}
-
 		return rowBindingInfo;
 	},
-	_internalUpdateBindingInfo: function (oTable: Table, oBindingInfo: CollectionBindingInfo) {
+	_internalUpdateBindingInfo: function (oTable: Table, oBindingInfo: SerializedCollectionBindingInfo) {
 		const oInternalModelContext = oTable.getBindingContext("internal") as InternalModelContext | undefined;
 		Object.assign(oBindingInfo, this._computeRowBindingInfoFromTemplate(oTable));
 		/**
@@ -1232,7 +1246,6 @@ export default Object.assign({}, TableDelegateBase, {
 		if (oInternalModelContext) {
 			oInternalModelContext.setProperty("dataReceivedAttached", false);
 		}
-
 		let oFilter;
 		const oFilterInfo = TableUtils.getAllFilterInfo(oTable);
 		// Prepare binding info with filter/search parameters
@@ -1242,7 +1255,6 @@ export default Object.assign({}, TableDelegateBase, {
 		if (oFilterInfo.bindingPath) {
 			oBindingInfo.path = oFilterInfo.bindingPath;
 		}
-
 		const oDataStateIndicator = oTable.getDataStateIndicator();
 		if (oDataStateIndicator && oDataStateIndicator.isFiltering()) {
 			// Include filters on messageStrip
@@ -1253,11 +1265,13 @@ export default Object.assign({}, TableDelegateBase, {
 		} else {
 			this.updateBindingInfoWithSearchQuery(oBindingInfo, oFilterInfo, oFilter);
 		}
-
 		this.addFilterOnActiveEntities(oTable, oBindingInfo);
 	},
-
-	updateBindingInfoWithSearchQuery: function (bindingInfo: CollectionBindingInfo, filterInfo: InternalBindingInfo, filter?: Filter) {
+	updateBindingInfoWithSearchQuery: function (
+		bindingInfo: SerializedCollectionBindingInfo,
+		filterInfo: InternalBindingInfo,
+		filter?: Filter
+	) {
 		bindingInfo.filters = filter;
 		bindingInfo.parameters ??= {};
 		if (filterInfo.search) {
@@ -1271,9 +1285,8 @@ export default Object.assign({}, TableDelegateBase, {
 	 * @param table
 	 * @param bindingInfo
 	 */
-	addFilterOnActiveEntities: function (table: Table, bindingInfo: CollectionBindingInfo) {
+	addFilterOnActiveEntities: function (table: Table, bindingInfo: SerializedCollectionBindingInfo) {
 		const payload = table.getPayload() as { filterOnActiveEntities?: boolean };
-
 		if (payload?.filterOnActiveEntities === true) {
 			const filterOnActive = new Filter({ path: "IsActiveEntity", operator: "EQ", value1: true });
 			if (bindingInfo.filters) {
@@ -1283,7 +1296,6 @@ export default Object.assign({}, TableDelegateBase, {
 			}
 		}
 	},
-
 	/**
 	 * Creates a template from the fragment of a slot column.
 	 * @param columnInfo The custom table column
@@ -1308,7 +1320,6 @@ export default Object.assign({}, TableDelegateBase, {
 			return Promise.resolve(null);
 		}
 		const slotXML = slotColumnsXML.getElementsByTagName("slot")[0];
-
 		if (columnInfo.template) {
 			if (slotXML) {
 				const oTemplate = new DOMParser().parseFromString(columnInfo.template as string, "text/xml");
@@ -1336,7 +1347,6 @@ export default Object.assign({}, TableDelegateBase, {
 			controller: view.getController()
 		}) as Promise<Control | Control[]>;
 	},
-
 	_getExportFormat: function (dataType?: string) {
 		switch (dataType) {
 			case "Edm.Date":
@@ -1349,11 +1359,9 @@ export default Object.assign({}, TableDelegateBase, {
 				return undefined;
 		}
 	},
-
 	_getVHRelevantFields: function (oMetaModel: ODataMetaModel, sMetadataPath: string, sBindingPath?: string): string[] {
 		let aFields: string[] = [],
 			oDataFieldData = oMetaModel.getObject(sMetadataPath);
-
 		if (oDataFieldData.$kind && oDataFieldData.$kind === "Property") {
 			oDataFieldData = oMetaModel.getObject(`${sMetadataPath}@com.sap.vocabularies.UI.v1.DataFieldDefault`);
 			sMetadataPath = `${sMetadataPath}@com.sap.vocabularies.UI.v1.DataFieldDefault`;
@@ -1470,7 +1478,6 @@ export default Object.assign({}, TableDelegateBase, {
 		}
 		return;
 	},
-
 	/**
 	 * Invoked when a column is added using the table personalization dialog.
 	 * @param table Instance of table control
@@ -1495,7 +1502,6 @@ export default Object.assign({}, TableDelegateBase, {
 			// We return null here because everything should apply at runtime
 			return Promise.resolve(null);
 		}
-
 		const columnInfo = aColumns.find(function (oColumn) {
 			return oColumn.name === propertyInfoName;
 		});
@@ -1518,26 +1524,21 @@ export default Object.assign({}, TableDelegateBase, {
 			mPropertyBag.view ||
 			CommonUtils.getTargetView(table as UI5Element) ||
 			(mPropertyBag.appComponent ? CommonUtils.getCurrentPageView(mPropertyBag.appComponent) : undefined);
-
 		if (columnInfo.type === "Default") {
 			Log.error("Custom columns defined in the manifest are not supported when using a table building block.");
 			throw new Error("Custom columns defined in the manifest are not supported when using a table building block.");
 		}
-
 		if (columnInfo.type === "Slot") {
 			return this._templateSlotColumnFragment(columnInfo as CustomElement<CustomBasedTableColumn>, view, oModifier, sTableId);
 		}
-
 		if (columnInfo.type === "Computed") {
 			const enableAnalytics = this._getTableAPI(table as Table).getTableDefinition().enableAnalytics;
 			return getComputedColumn(sTableId, columnInfo as ComputedTableColumn, oTableContext, enableAnalytics);
 		}
-
 		// fall-back
 		if (!oMetaModel) {
 			return Promise.resolve(null);
 		}
-
 		let propertyInfos = tableAPI.getEnhancedFetchedPropertyInfos();
 		if (!propertyInfos.length) {
 			// If the propertyInfos are not fetched yet, we need to fetch them
@@ -1548,9 +1549,7 @@ export default Object.assign({}, TableDelegateBase, {
 		const propertyInfo = propertyInfos.find(function (propInfo: EnhancedFEPropertyInfo) {
 			return propInfo.name === propertyInfoName;
 		});
-
 		const oPropertyContext: Context = oMetaModel.createBindingContext(propertyInfo!.annotationPath)!;
-
 		const fnTemplateFragment = async (
 			oInPropertyInfo: unknown,
 			oView: FEView
@@ -1558,7 +1557,6 @@ export default Object.assign({}, TableDelegateBase, {
 			let bDisplayMode: boolean | undefined;
 			let sTableTypeCustomData: string | undefined;
 			let sCreationModeCustomData: string | undefined;
-
 			return Promise.all([
 				DelegateUtil.getCustomDataWithModifier<string | boolean>(table, "displayModePropertyBinding", oModifier),
 				DelegateUtil.getCustomDataWithModifier<string>(table, "tableType", oModifier),
@@ -1574,7 +1572,6 @@ export default Object.assign({}, TableDelegateBase, {
 				if (bDisplayMode !== undefined && typeof bDisplayMode !== "boolean") {
 					bDisplayMode = bDisplayMode === "true";
 				}
-
 				const oThis = new JSONModel({
 						enableAutoColumnWidth: tableAPI.getTableDefinition().control.enableAutoColumnWidth,
 						readOnly: bDisplayMode,
@@ -1604,7 +1601,6 @@ export default Object.assign({}, TableDelegateBase, {
 						},
 						appComponent: mPropertyBag.appComponent
 					};
-
 				const tableCollection = getInvolvedDataModelObjects<EntitySet | NavigationProperty>(
 					oMetaModel.createBindingContext(tableAPI.tableDefinition.annotation.collection)!
 				);
@@ -1635,10 +1631,8 @@ export default Object.assign({}, TableDelegateBase, {
 				});
 			});
 		};
-
 		return fnTemplateFragment(propertyInfo, view);
 	},
-
 	/**
 	 * Provide the Table's filter delegate to provide basic filter functionality such as adding FilterFields.
 	 * @returns Object for the Tables filter personalization.
@@ -1660,7 +1654,6 @@ export default Object.assign({}, TableDelegateBase, {
 			}
 		);
 	},
-
 	/**
 	 * Returns the TypeMap attached to this delegate.
 	 * @returns Any instance of TypeMap
@@ -1668,7 +1661,6 @@ export default Object.assign({}, TableDelegateBase, {
 	getTypeMap: function (/*oPayload: object*/) {
 		return TypeMap;
 	},
-
 	/**
 	 * Format the title of the group header .
 	 * @param table Instance of table control
@@ -1696,14 +1688,12 @@ export default Object.assign({}, TableDelegateBase, {
 				case "Description":
 					value = propertyInfo.descriptionProperty ? context.getProperty(propertyInfo.descriptionProperty, externalFormat) : null;
 					break;
-
 				case "DescriptionValue":
 					value = ValueFormatter.formatWithBrackets(
 						propertyInfo.descriptionProperty ? context.getProperty(propertyInfo.descriptionProperty, externalFormat) : null,
 						propertyInfo.valueProperty ? context.getProperty(propertyInfo.valueProperty, externalFormat) : null
 					);
 					break;
-
 				case "ValueDescription":
 					value = ValueFormatter.formatWithBrackets(
 						propertyInfo.valueProperty ? context.getProperty(propertyInfo.valueProperty, externalFormat) : null,