@sapui5/sap.fe.core 1.98.0 → 1.99.0

package/src/sap/fe/core/converters/controls/Common/Table.ts

@@ -29,6 +29,7 @@ import {
 	SelectionMode,
 	TableColumnSettings,
 	TableManifestConfiguration,
+	TableManifestSettingsConfiguration,
 	TemplateType,
 	VariantManagementType,
 	ViewPathConfiguration,
@@ -73,7 +74,7 @@ import {
 	or,
 	resolveBindingString
 } from "sap/fe/core/helpers/BindingExpression";
-import { Draft, bindingContextPathVisitor, UI } from "sap/fe/core/converters/helpers/BindingHelper";
+import { Entity, bindingContextPathVisitor, UI } from "sap/fe/core/converters/helpers/BindingHelper";
 import { KeyHelper } from "sap/fe/core/converters/helpers/Key";
 import tableFormatters from "sap/fe/core/formatters/TableFormatter";
 import { MessageType } from "sap/fe/core/formatters/TableFormatterTypes";
@@ -111,7 +112,11 @@ import {
 	getStandardActionPaste,
 	getStandardActionMassEdit,
 	isDraftOrStickySupported,
-	getInsertUpdateActionsTemplating
+	getInsertUpdateActionsTemplating,
+	getCreateVisibility,
+	isInDisplayMode,
+	getMassEditVisibility,
+	getRestrictions
 } from "./table/StandardActions";
 
 export type TableAnnotationConfiguration = {
@@ -132,6 +137,7 @@ export type TableAnnotationConfiguration = {
 	standardActions: {
 		actions: Record<string, StandardActionConfigType>;
 		isInsertUpdateTemplated: boolean;
+		updatablePropertyPath: string;
 	};
 	displayMode?: boolean;
 	threshold: number;
@@ -204,6 +210,7 @@ export type TableControlConfiguration = {
 	showRowCount: boolean;
 	enableMassEdit: boolean | undefined;
 	enableAutoColumnWidth: boolean;
+	dataStateIndicatorFilter: string | undefined;
 };
 
 export type TableType = "GridTable" | "ResponsiveTable" | "AnalyticalTable";
@@ -247,6 +254,7 @@ export type AnnotationTableColumn = BaseTableColumn & {
 	showDataFieldsLabel?: boolean;
 	isKey?: boolean;
 	unit?: string;
+	unitText?: string;
 	exportSettings?: {
 		template?: string;
 		label?: string;
@@ -306,7 +314,6 @@ export type TableVisualization = {
 	aggregates?: Record<string, AggregateData>;
 	enableAnalytics?: boolean;
 	enableAnalyticsSearch?: boolean;
-	enableDataStateFilter: boolean;
 	operationAvailableMap: string;
 	operationAvailableProperties: string;
 };
@@ -557,13 +564,17 @@ export function updateLinkedProperties(entityType: EntityType, tableColumns: Tab
 	tableColumns.forEach(oColumn => {
 		const oTableColumn = oColumn as AnnotationTableColumn;
 		if (oTableColumn.propertyInfos === undefined && oTableColumn.relativePath) {
-			const oProperty = entityType.entityProperties.find(oProp => oProp.name === oTableColumn.relativePath);
+			const oProperty = entityType.entityProperties.find((oProp: Property) => oProp.name === oTableColumn.relativePath);
 			if (oProperty) {
-				const sUnit = getAssociatedCurrencyProperty(oProperty)?.name || getAssociatedUnitProperty(oProperty)?.name;
-				if (sUnit) {
-					const oUnitColumn = findColumnByPath(sUnit);
-
+				const oUnit = getAssociatedCurrencyProperty(oProperty) || getAssociatedUnitProperty(oProperty);
+				if (oUnit) {
+					const oUnitColumn = findColumnByPath(oUnit.name);
 					oTableColumn.unit = oUnitColumn?.name;
+				} else {
+					const sUnit = oProperty?.annotations?.Measures?.ISOCurrency || oProperty?.annotations?.Measures?.Unit;
+					if (sUnit) {
+						oTableColumn.unitText = `${sUnit}`;
+					}
 				}
 
 				const displayMode = getDisplayMode(oProperty),
@@ -616,7 +627,6 @@ export function createTableVisualization(
 		control: tableManifestConfig,
 		actions: removeDuplicateActions(getTableActions(lineItemAnnotation, visualizationPath, converterContext, navigationSettings)),
 		columns: columns,
-		enableDataStateFilter: converterContext.getTemplateType() === "ObjectPage",
 		operationAvailableMap: JSON.stringify(operationAvailableMap),
 		operationAvailableProperties: getOperationAvailableProperties(operationAvailableMap, converterContext)
 	};
@@ -642,7 +652,6 @@ export function createDefaultTableVisualization(converterContext: ConverterConte
 		control: tableManifestConfig,
 		actions: [],
 		columns: columns,
-		enableDataStateFilter: converterContext.getTemplateType() === "ObjectPage",
 		operationAvailableMap: JSON.stringify(operationAvailableMap),
 		operationAvailableProperties: getOperationAvailableProperties(operationAvailableMap, converterContext)
 	};
@@ -700,6 +709,22 @@ function getOperationAvailableMap(lineItemAnnotation: LineItem | undefined, conv
 	return operationAvailableMap;
 }
 
+/**
+ * Gets updatable propertyPath for the current entityset if valid.
+ *
+ * @param converterContext The instance of the converter context
+ * @returns {string} The updatable property for the rows
+ */
+function getCurrentEntitySetUpdatablePath(converterContext: ConverterContext): string {
+	const restrictions = getRestrictions(converterContext);
+	const entitySet = converterContext.getEntitySet();
+	const updatable = restrictions.isUpdatable;
+	const isOnlyDynamicOnCurrentEntity: any = updatable.isOnlyCurrentEntityExpression && !isConstant(updatable.expression);
+	const updatablePropertyPath = (entitySet?.annotations.Capabilities?.UpdateRestrictions?.Updatable as any)?.path;
+
+	return isOnlyDynamicOnCurrentEntity ? (updatablePropertyPath as string) : "";
+}
+
 /**
  * Method to retrieve all property paths assigned to the Core.OperationAvailable annotation.
  *
@@ -922,7 +947,8 @@ export function getSelectionMode(
 	converterContext: ConverterContext,
 	isEntitySet: boolean,
 	targetCapabilities: TableCapabilityRestriction,
-	isDeleteButtonVisible?: Expression<boolean>
+	deleteButtonVisibilityExpression?: Expression<boolean>,
+	massEditVisibilityExpression: Expression<boolean> = constant(false)
 ): string | undefined {
 	if (!lineItemAnnotation) {
 		return SelectionMode.None;
@@ -943,12 +969,31 @@ export function getSelectionMode(
 		isParentDeletable = isPathDeletable(converterContext.getDataModelObjectPath(), undefined);
 		parentEntitySetDeletable = isParentDeletable ? compileBinding(isParentDeletable, true) : isParentDeletable;
 	}
-	if (selectionMode && selectionMode === SelectionMode.None && isDeleteButtonVisible) {
-		return compileBinding(ifElse(isDeleteButtonVisible, constant("Multi"), constant("None")));
+
+	const bMassEditEnabled: boolean = !isConstant(massEditVisibilityExpression) || massEditVisibilityExpression.value !== false;
+	if (selectionMode && selectionMode === SelectionMode.None && deleteButtonVisibilityExpression) {
+		if (converterContext.getTemplateType() === TemplateType.ObjectPage && bMassEditEnabled) {
+			// Mass Edit in OP is enabled only in edit mode.
+			return compileBinding(
+				ifElse(
+					and(equal(bindingExpression("/editMode", "ui"), "Editable"), massEditVisibilityExpression),
+					constant("Multi"),
+					ifElse(deleteButtonVisibilityExpression, constant("Multi"), constant("None"))
+				)
+			);
+		} else if (bMassEditEnabled) {
+			return SelectionMode.Multi;
+		}
+
+		return compileBinding(ifElse(deleteButtonVisibilityExpression, constant("Multi"), constant("None")));
 	}
 	if (!selectionMode || selectionMode === SelectionMode.Auto) {
 		selectionMode = SelectionMode.Multi;
 	}
+	if (bMassEditEnabled) {
+		// Override default selection mode when mass edit is visible
+		selectionMode = selectionMode === SelectionMode.Single ? SelectionMode.Single : SelectionMode.Multi;
+	}
 
 	if (
 		hasBoundActionsAlwaysVisibleInToolBar(lineItemAnnotation, converterContext.getEntityType()) ||
@@ -965,12 +1010,22 @@ export function getSelectionMode(
 	aVisibleBindingExpressions = getVisibleExpForCustomActionsRequiringContext(manifestActions);
 
 	// No action requiring a context:
-	if (aHiddenBindingExpressions.length === 0 && aVisibleBindingExpressions.length === 0 && isDeleteButtonVisible) {
+	if (
+		aHiddenBindingExpressions.length === 0 &&
+		aVisibleBindingExpressions.length === 0 &&
+		(deleteButtonVisibilityExpression || bMassEditEnabled)
+	) {
 		if (!isEntitySet) {
-			if (targetCapabilities.isDeletable || parentEntitySetDeletable !== "false") {
+			// Example: OP case
+			if (targetCapabilities.isDeletable || parentEntitySetDeletable !== "false" || bMassEditEnabled) {
+				// Building expression for delete and mass edit
+				const buttonVisibilityExpression = or(
+					deleteButtonVisibilityExpression || true, // default delete visibility as true
+					massEditVisibilityExpression
+				);
 				return compileBinding(
 					ifElse(
-						and(equal(bindingExpression("/editMode", "ui"), "Editable"), isDeleteButtonVisible),
+						and(equal(bindingExpression("/editMode", "ui"), "Editable"), buttonVisibilityExpression),
 						constant(selectionMode),
 						constant(SelectionMode.None)
 					)
@@ -979,18 +1034,28 @@ export function getSelectionMode(
 				return SelectionMode.None;
 			}
 			// EntitySet deletable:
-		} else if (targetCapabilities.isDeletable && isDeleteButtonVisible) {
-			return compileBinding(ifElse(isDeleteButtonVisible, constant(selectionMode), constant("None")));
+		} else if (bMassEditEnabled) {
+			// example: LR scenario
+			return selectionMode;
+		} else if (targetCapabilities.isDeletable && deleteButtonVisibilityExpression) {
+			return compileBinding(ifElse(deleteButtonVisibilityExpression, constant(selectionMode), constant("None")));
 			// EntitySet not deletable:
 		} else {
 			return SelectionMode.None;
 		}
 		// There are actions requiring a context:
 	} else if (!isEntitySet) {
-		if (targetCapabilities.isDeletable || parentEntitySetDeletable !== "false") {
+		// Example: OP case
+		if (targetCapabilities.isDeletable || parentEntitySetDeletable !== "false" || bMassEditEnabled) {
+			// Use selectionMode in edit mode if delete is enabled or mass edit is visible
+			const editModebuttonVisibilityExpression = ifElse(
+				bMassEditEnabled && !targetCapabilities.isDeletable,
+				massEditVisibilityExpression,
+				constant(true)
+			);
 			return compileBinding(
 				ifElse(
-					equal(bindingExpression("/editMode", "ui"), "Editable"),
+					and(equal(bindingExpression("/editMode", "ui"), "Editable"), editModebuttonVisibilityExpression),
 					constant(selectionMode),
 					ifElse(
 						or(...aHiddenBindingExpressions.concat(aVisibleBindingExpressions)),
@@ -1009,13 +1074,14 @@ export function getSelectionMode(
 			);
 		}
 		//EntitySet deletable:
-	} else if (targetCapabilities.isDeletable) {
-		return SelectionMode.Multi;
+	} else if (targetCapabilities.isDeletable || bMassEditEnabled) {
+		// Example: LR scenario
+		return selectionMode;
 		//EntitySet not deletable:
 	} else {
 		return compileBinding(
 			ifElse(
-				or(...aHiddenBindingExpressions.concat(aVisibleBindingExpressions)),
+				or(...aHiddenBindingExpressions.concat(aVisibleBindingExpressions), massEditVisibilityExpression),
 				constant(selectionMode),
 				constant(SelectionMode.None)
 			)
@@ -1121,14 +1187,25 @@ function getHighlightRowBinding(
 			defaultHighlightRowDefinition = getMessageTypeFromCriticalityType(criticalityAnnotation);
 		}
 	}
-	return ifElse(
-		isDraftRoot && Draft.IsNewObject,
-		MessageType.Information as MessageType,
-		formatResult(
-			[defaultHighlightRowDefinition, bindingExpression(`filteredMessages`, "internal")],
-			tableFormatters.rowHighlighting,
-			targetEntityType
-		)
+
+	const aMissingKeys: any[] = [];
+	targetEntityType?.keys.forEach((key: any) => {
+		if (key.name !== "IsActiveEntity") {
+			aMissingKeys.push(bindingExpression(key.name, undefined));
+		}
+	});
+
+	return formatResult(
+		[
+			defaultHighlightRowDefinition,
+			bindingExpression(`filteredMessages`, "internal"),
+			isDraftRoot && Entity.HasActive,
+			isDraftRoot && Entity.IsActive,
+			`${isDraftRoot}`,
+			...aMissingKeys
+		],
+		tableFormatters.rowHighlighting,
+		targetEntityType
 	);
 }
 
@@ -1445,7 +1522,7 @@ const _isValidColumn = function(dataField: DataFieldAbstractTypes) {
 export const _getVisibleExpression = function(
 	dataFieldModelPath: DataModelObjectPath,
 	formatOptions?: any,
-	returnExpression?: Boolean
+	returnExpression: boolean = false
 ): BindingExpression<string> {
 	const targetObject: DataFieldAbstractTypes | DataPointTypeTypes = dataFieldModelPath.targetObject;
 	let propertyValue;
@@ -1498,7 +1575,7 @@ export const _getVisibleExpression = function(
 const _getFieldGroupHiddenExpressions = function(
 	dataFieldGroup: DataFieldAbstractTypes,
 	fieldFormatOptions: any
-): BindingExpression<string> {
+): BindingExpression<string> | undefined {
 	const aFieldGroupHiddenExpressions: BindingExpression<string>[] = [];
 	if (
 		dataFieldGroup.$Type === UIAnnotationTypes.DataFieldForAnnotation &&
@@ -1512,6 +1589,8 @@ const _getFieldGroupHiddenExpressions = function(
 		return compileBinding(
 			ifElse(or(...(aFieldGroupHiddenExpressions as ExpressionOrPrimitive<boolean>[])), constant(true), constant(false))
 		);
+	} else {
+		return undefined;
 	}
 };
 
@@ -1907,7 +1986,8 @@ const getColumnsFromAnnotations = function(
 			}
 
 			// TODO: For situation POC - increase width of the column with the situations indicator - works for the situations demo app only!
-			// Might be a good idea to move the complete column width determination to the converter, that would allow us to widen the columns as needed. This workaround only deals with Date columns.
+			// Might be a good idea to move the complete column width determination to the converter, that would allow us to widen
+			// the columns as needed. This workaround only deals with Date columns.
 			const { hasDraftIndicator } = getDefaultDraftIndicatorForColumn(name, semanticKeys);
 			const widthOverride =
 				(converterContext.getEntityType().annotations as any).FE?.Situations &&
@@ -2163,9 +2243,10 @@ export function getP13nMode(
 		// No personalization configured in manifest.
 		aPersonalization.push("Sort");
 		aPersonalization.push("Column");
-		if (variantManagement === VariantManagementType.Control) {
+		if (variantManagement === VariantManagementType.Control || _isFilterBarHidden(manifestWrapper, converterContext)) {
 			// Feature parity with V2.
 			// Enable table filtering by default only in case of Control level variant management.
+			// Or when the LR filter bar is hidden via manifest setting
 			aPersonalization.push("Filter");
 		}
 		if (bAnalyticalTable) {
@@ -2177,6 +2258,24 @@ export function getP13nMode(
 	return undefined;
 }
 
+/**
+ * Returns a boolean suggesting if a filter bar is being used on the page.
+ *
+ * Chart has a dependency to filter bar (issue with loading data). Once resolved, the check for chart should be removed here.
+ * Until then, hiding filter bar is now allowed if a chart is being used on LR.
+ *
+ * @param {ManifestWrapper} manifestWrapper Manifest settings getter for the page
+ * @param {ConverterContext} converterContext The instance of the converter context
+ * @returns {boolean} Boolean suggesting if a filter bar is being used on the page.
+ */
+function _isFilterBarHidden(manifestWrapper: ManifestWrapper, converterContext: ConverterContext): boolean {
+	return (
+		manifestWrapper.isFilterBarHidden() &&
+		!converterContext.getManifestWrapper().hasMultipleVisualizations() &&
+		converterContext.getTemplateType() !== TemplateType.AnalyticalListPage
+	);
+}
+
 /**
  * Returns a JSON string containing the sort conditions for the presentation variant.
  *
@@ -2314,14 +2413,24 @@ export function getTableAnnotationConfiguration(
 		tableManifestConfiguration,
 		viewConfiguration
 	);
-	const isDeleteButtonVisible = getDeleteVisibility(converterContext, standardActionsContext);
+
+	const deleteButtonVisibilityExpression = getDeleteVisibility(converterContext, standardActionsContext);
+	const createButtonVisibilityExpression = getCreateVisibility(converterContext, standardActionsContext);
+	const massEditButtonVisibilityExpression = getMassEditVisibility(converterContext, standardActionsContext);
+	const isInsertUpdateTemplated = getInsertUpdateActionsTemplating(
+		standardActionsContext,
+		isDraftOrStickySupported(converterContext),
+		compileBinding(createButtonVisibilityExpression) === "false"
+	);
+
 	const selectionMode = getSelectionMode(
 		lineItemAnnotation,
 		visualizationPath,
 		converterContext,
 		hasAbsolutePath,
 		targetCapabilities,
-		isDeleteButtonVisible
+		deleteButtonVisibilityExpression,
+		massEditButtonVisibilityExpression
 	);
 	let threshold = navigationPropertyPath ? 10 : 30;
 	if (presentationVariantAnnotation?.MaxItems) {
@@ -2331,17 +2440,12 @@ export function getTableAnnotationConfiguration(
 	const creationBehaviour = _getCreationBehaviour(lineItemAnnotation, tableManifestConfiguration, converterContext, navigationSettings);
 	const variantManagement: VariantManagementType = pageManifestSettings.getVariantManagement();
 	const isSearchable = isPathSearchable(converterContext.getDataModelObjectPath());
-	const tableActions = {
+	const standardActions = {
 		create: getStandardActionCreate(converterContext, standardActionsContext),
 		"delete": getStandardActionDelete(converterContext, standardActionsContext),
-		paste: getStandardActionPaste(converterContext, standardActionsContext),
-		massEdit: getStandardActionMassEdit(converterContext, standardActionsContext, selectionMode)
+		paste: getStandardActionPaste(converterContext, standardActionsContext, isInsertUpdateTemplated),
+		massEdit: getStandardActionMassEdit(converterContext, standardActionsContext)
 	};
-	const isInsertUpdateTemplated = getInsertUpdateActionsTemplating(
-		standardActionsContext,
-		isDraftOrStickySupported(converterContext),
-		tableActions.create.visible === "false"
-	);
 
 	return {
 		id: id,
@@ -2357,16 +2461,18 @@ export function getTableAnnotationConfiguration(
 		),
 		p13nMode: p13nMode,
 		standardActions: {
-			actions: tableActions,
-			isInsertUpdateTemplated: isInsertUpdateTemplated
+			actions: standardActions,
+			isInsertUpdateTemplated: isInsertUpdateTemplated,
+			updatablePropertyPath: getCurrentEntitySetUpdatablePath(converterContext)
 		},
 		displayMode: isInDisplayMode(converterContext, viewConfiguration),
 		create: creationBehaviour,
 		selectionMode: selectionMode,
 		autoBindOnInit:
-			converterContext.getTemplateType() !== TemplateType.ListReport &&
-			converterContext.getTemplateType() !== TemplateType.AnalyticalListPage &&
-			!(viewConfiguration && converterContext.getManifestWrapper().hasMultipleVisualizations(viewConfiguration)),
+			_isFilterBarHidden(pageManifestSettings, converterContext) ||
+			(converterContext.getTemplateType() !== TemplateType.ListReport &&
+				converterContext.getTemplateType() !== TemplateType.AnalyticalListPage &&
+				!(viewConfiguration && pageManifestSettings.hasMultipleVisualizations(viewConfiguration))),
 		variantManagement: variantManagement === "Control" && !p13nMode ? VariantManagementType.None : variantManagement,
 		threshold: threshold,
 		sortConditions: getSortConditions(converterContext, presentationVariantAnnotation, columns),
@@ -2408,19 +2514,6 @@ function _getExportDataType(dataType: string, isComplexProperty: boolean = false
 	return exportDataType;
 }
 
-function isInDisplayMode(converterContext: ConverterContext, viewConfiguration?: ViewPathConfiguration): boolean {
-	const templateType = converterContext.getTemplateType();
-	if (
-		templateType === TemplateType.ListReport ||
-		templateType === TemplateType.AnalyticalListPage ||
-		(viewConfiguration && converterContext.getManifestWrapper().hasMultipleVisualizations(viewConfiguration))
-	) {
-		return true;
-	}
-	// updatable will be handled at the property level
-	return false;
-}
-
 /**
  * Split the visualization path into the navigation property path and annotation.
  *
@@ -2461,126 +2554,166 @@ export function getSelectionVariantConfiguration(
 	return undefined;
 }
 
+function _getFullScreenBasedOnDevice(
+	tableSettings: TableManifestSettingsConfiguration,
+	converterContext: ConverterContext,
+	isIphone: boolean
+): boolean {
+	// If enableFullScreen is not set, use as default true on phone and false otherwise
+	let enableFullScreen = tableSettings.enableFullScreen ?? isIphone;
+	// Make sure that enableFullScreen is not set on ListReport for desktop or tablet
+	if (!isIphone && enableFullScreen && converterContext.getTemplateType() === TemplateType.ListReport) {
+		enableFullScreen = false;
+		converterContext.getDiagnostics().addIssue(IssueCategory.Manifest, IssueSeverity.Low, IssueType.FULLSCREENMODE_NOT_ON_LISTREPORT);
+	}
+	return enableFullScreen;
+}
+
+function _getMultiSelectMode(
+	tableSettings: TableManifestSettingsConfiguration,
+	tableType: TableType,
+	converterContext: ConverterContext
+): string | undefined {
+	let multiSelectMode: string | undefined;
+	if (tableType !== "ResponsiveTable") {
+		return undefined;
+	}
+	switch (converterContext.getTemplateType()) {
+		case TemplateType.ListReport:
+		case TemplateType.AnalyticalListPage:
+			multiSelectMode = !tableSettings.selectAll ? "ClearAll" : "Default";
+			break;
+		case TemplateType.ObjectPage:
+			multiSelectMode = tableSettings.selectAll === false ? "ClearAll" : "Default";
+			if (converterContext.getManifestWrapper().useIconTabBar()) {
+				multiSelectMode = !tableSettings.selectAll ? "ClearAll" : "Default";
+			}
+			break;
+		default:
+	}
+
+	return multiSelectMode;
+}
+
+function _getTableType(
+	tableSettings: TableManifestSettingsConfiguration,
+	aggregationHelper: AggregationHelper,
+	converterContext: ConverterContext
+): TableType {
+	let tableType = tableSettings?.type || "ResponsiveTable";
+	if (converterContext.getTemplateType() !== "ObjectPage") {
+		if (tableSettings?.type === "AnalyticalTable" && !aggregationHelper.isAnalyticsSupported()) {
+			tableType = "GridTable";
+		}
+		if (!tableSettings?.type) {
+			if (converterContext.getManifestWrapper().isDesktop() && aggregationHelper.isAnalyticsSupported()) {
+				tableType = "AnalyticalTable";
+			} else {
+				tableType = "ResponsiveTable";
+			}
+		}
+	}
+	return tableType;
+}
+function _getFilters(
+	tableSettings: TableManifestSettingsConfiguration,
+	quickFilterPaths: { annotationPath: string }[],
+	quickSelectionVariant: any,
+	path: { annotationPath: string },
+	converterContext: ConverterContext
+): any {
+	if (quickSelectionVariant) {
+		quickFilterPaths.push({ annotationPath: path.annotationPath });
+	}
+	return {
+		quickFilters: {
+			enabled:
+				converterContext.getTemplateType() === TemplateType.ListReport ? "{= ${pageInternal>hasPendingFilters} !== true}" : true,
+			showCounts: tableSettings?.quickVariantSelection?.showCounts,
+			paths: quickFilterPaths
+		}
+	};
+}
+
+function _getEnableExport(
+	tableSettings: TableManifestSettingsConfiguration,
+	converterContext: ConverterContext,
+	enablePaste: boolean
+): boolean {
+	return tableSettings.enableExport !== undefined
+		? tableSettings.enableExport
+		: converterContext.getTemplateType() !== "ObjectPage" || enablePaste;
+}
+
+function _getFilterConfiguration(
+	tableSettings: TableManifestSettingsConfiguration,
+	lineItemAnnotation: LineItem | undefined,
+	converterContext: ConverterContext
+): any {
+	if (!lineItemAnnotation) {
+		return {};
+	}
+	const quickFilterPaths: { annotationPath: string }[] = [];
+	const targetEntityType = converterContext.getAnnotationEntityType(lineItemAnnotation);
+	let quickSelectionVariant: any;
+	let filters;
+	tableSettings?.quickVariantSelection?.paths?.forEach((path: { annotationPath: string }) => {
+		quickSelectionVariant = targetEntityType.resolvePath("@" + path.annotationPath);
+		filters = _getFilters(tableSettings, quickFilterPaths, quickSelectionVariant, path, converterContext);
+	});
+
+	let hideTableTitle = false;
+	hideTableTitle = !!tableSettings.quickVariantSelection?.hideTableTitle;
+	return {
+		filters: filters,
+		headerVisible: !(quickSelectionVariant && hideTableTitle)
+	};
+}
+
 export function getTableManifestConfiguration(
 	lineItemAnnotation: LineItem | undefined,
 	visualizationPath: string,
 	converterContext: ConverterContext,
-	checkCondensedLayout: boolean = false
+	checkCondensedLayout = false
 ): TableControlConfiguration {
 	const tableManifestSettings: TableManifestConfiguration = converterContext.getManifestControlConfiguration(visualizationPath);
 	const tableSettings = (tableManifestSettings && tableManifestSettings.tableSettings) || {};
-	let quickSelectionVariant: any;
-	const quickFilterPaths: { annotationPath: string }[] = [];
-	let enableExport = true;
-	let creationMode = CreationMode.NewPage;
-	let filters;
-	let createAtEnd = true;
-	let disableAddRowButtonForEmptyData = false;
-	let customValidationFunction;
-	let condensedTableLayout = false;
-	let hideTableTitle = false;
-	let tableType: TableType = "ResponsiveTable";
-	let enableFullScreen = false;
-	let selectionLimit = 200;
-	let multiSelectMode;
+	const creationMode = CreationMode.NewPage;
 	const enableAutoColumnWidth = !converterContext.getManifestWrapper().isPhone();
 	const enablePaste =
 		tableSettings.enablePaste !== undefined ? tableSettings.enablePaste : converterContext.getTemplateType() === "ObjectPage"; // Paste is disabled by default excepted for OP
+	const dataStateIndicatorFilter =
+		converterContext.getTemplateType() === TemplateType.ListReport ? "API.dataStateIndicatorFilter" : undefined;
 	const isCondensedTableLayoutCompliant = checkCondensedLayout && converterContext.getManifestWrapper().isCondensedLayoutCompliant();
+	const oFilterConfiguration = _getFilterConfiguration(tableSettings, lineItemAnnotation, converterContext);
+	const customValidationFunction = tableSettings.creationMode?.customValidationFunction;
+	const condensedTableLayout = tableSettings.condensedTableLayout !== undefined ? tableSettings.condensedTableLayout : false;
 	const entityType = converterContext.getEntityType();
 	const aggregationHelper = new AggregationHelper(entityType, converterContext);
-	if (lineItemAnnotation) {
-		const targetEntityType = converterContext.getAnnotationEntityType(lineItemAnnotation);
-		tableSettings?.quickVariantSelection?.paths?.forEach((path: { annotationPath: string }) => {
-			quickSelectionVariant = targetEntityType.resolvePath("@" + path.annotationPath);
-			// quickSelectionVariant = converterContext.getEntityTypeAnnotation(path.annotationPath);
-			if (quickSelectionVariant) {
-				quickFilterPaths.push({ annotationPath: path.annotationPath });
-			}
-			filters = {
-				quickFilters: {
-					enabled:
-						converterContext.getTemplateType() === TemplateType.ListReport
-							? "{= ${pageInternal>hasPendingFilters} !== true}"
-							: true,
-					showCounts: tableSettings?.quickVariantSelection?.showCounts,
-					paths: quickFilterPaths
-				}
-			};
-		});
-		creationMode = tableSettings.creationMode?.name || creationMode;
-		createAtEnd = tableSettings.creationMode?.createAtEnd !== undefined ? tableSettings.creationMode?.createAtEnd : true;
-		customValidationFunction = tableSettings.creationMode?.customValidationFunction;
-		// if a custom validation function is provided, disableAddRowButtonForEmptyData should not be considered, i.e. set to false
-		disableAddRowButtonForEmptyData = !customValidationFunction ? !!tableSettings.creationMode?.disableAddRowButtonForEmptyData : false;
-		condensedTableLayout = tableSettings.condensedTableLayout !== undefined ? tableSettings.condensedTableLayout : false;
-		hideTableTitle = !!tableSettings.quickVariantSelection?.hideTableTitle;
-		tableType = tableSettings?.type || "ResponsiveTable";
-		if (converterContext.getTemplateType() !== "ObjectPage") {
-			if (tableSettings?.type === "AnalyticalTable" && !aggregationHelper.isAnalyticsSupported()) {
-				tableType = "GridTable";
-			}
-			if (!tableSettings?.type) {
-				if (converterContext.getManifestWrapper().isDesktop() && aggregationHelper.isAnalyticsSupported()) {
-					tableType = "AnalyticalTable";
-				} else {
-					tableType = "ResponsiveTable";
-				}
-			}
-		}
-		// If enableFullScreen is not set, use as default true on phone and false otherwise
-		enableFullScreen = tableSettings.enableFullScreen ?? converterContext.getManifestWrapper().isPhone();
-		// Make sure that enableFullScreen is not set on ListReport for desktop or tablet
-		if (
-			!converterContext.getManifestWrapper().isPhone() &&
-			enableFullScreen &&
-			converterContext.getTemplateType() === TemplateType.ListReport
-		) {
-			enableFullScreen = false;
-			converterContext
-				.getDiagnostics()
-				.addIssue(IssueCategory.Manifest, IssueSeverity.Low, IssueType.FULLSCREENMODE_NOT_ON_LISTREPORT);
-		}
-		selectionLimit = tableSettings.selectAll === true || tableSettings.selectionLimit === 0 ? 0 : tableSettings.selectionLimit || 200;
-		if (tableType === "ResponsiveTable") {
-			if (
-				converterContext.getTemplateType() === TemplateType.ListReport ||
-				converterContext.getTemplateType() === TemplateType.AnalyticalListPage
-			) {
-				multiSelectMode = !!tableSettings.selectAll ? "Default" : "ClearAll";
-			}
-			if (converterContext.getTemplateType() === TemplateType.ObjectPage) {
-				if (converterContext.getManifestWrapper().useIconTabBar()) {
-					multiSelectMode = !!tableSettings.selectAll ? "Default" : "ClearAll";
-				} else {
-					multiSelectMode = tableSettings.selectAll === false ? "ClearAll" : "Default";
-				}
-			}
-		}
-		enableExport =
-			tableSettings.enableExport !== undefined
-				? tableSettings.enableExport
-				: converterContext.getTemplateType() !== "ObjectPage" || enablePaste;
-	}
-	return {
-		filters: filters,
-		type: tableType,
-		enableFullScreen: enableFullScreen,
-		headerVisible: !(quickSelectionVariant && hideTableTitle),
-		enableExport: enableExport,
-		creationMode: creationMode,
-		createAtEnd: createAtEnd,
-		disableAddRowButtonForEmptyData: disableAddRowButtonForEmptyData,
+	const tableType: TableType = _getTableType(tableSettings, aggregationHelper, converterContext);
+	const oConfiguration = {
+		createAtEnd: tableSettings.creationMode?.createAtEnd !== undefined ? tableSettings.creationMode?.createAtEnd : true,
+		creationMode: tableSettings.creationMode?.name || creationMode,
 		customValidationFunction: customValidationFunction,
-		useCondensedTableLayout: condensedTableLayout && isCondensedTableLayoutCompliant,
-		selectionLimit: selectionLimit,
-		multiSelectMode: multiSelectMode,
+		dataStateIndicatorFilter: dataStateIndicatorFilter,
+		// if a custom validation function is provided, disableAddRowButtonForEmptyData should not be considered, i.e. set to false
+		disableAddRowButtonForEmptyData: !customValidationFunction ? !!tableSettings.creationMode?.disableAddRowButtonForEmptyData : false,
+		enableAutoColumnWidth: enableAutoColumnWidth,
+		enableExport: _getEnableExport(tableSettings, converterContext, enablePaste),
+		enableFullScreen: _getFullScreenBasedOnDevice(tableSettings, converterContext, converterContext.getManifestWrapper().isPhone()),
+		enableMassEdit: tableSettings?.enableMassEdit,
 		enablePaste: enablePaste,
+		headerVisible: true,
+		multiSelectMode: _getMultiSelectMode(tableSettings, tableType, converterContext),
+		selectionLimit: tableSettings.selectAll === true || tableSettings.selectionLimit === 0 ? 0 : tableSettings.selectionLimit || 200,
+
 		showRowCount:
 			!tableSettings?.quickVariantSelection?.showCounts && !converterContext.getManifestWrapper().getViewConfiguration()?.showCounts,
-		enableMassEdit: tableSettings?.enableMassEdit,
-		enableAutoColumnWidth: enableAutoColumnWidth
+		type: tableType,
+		useCondensedTableLayout: condensedTableLayout && isCondensedTableLayoutCompliant
 	};
+
+	return { ...oConfiguration, ...oFilterConfiguration };
 }
 
 export type configTypeConstraints = {
@@ -2607,11 +2740,11 @@ export type configType = {
 
 export function getTypeConfig(oProperty: Property | DataFieldAbstractTypes, dataType: string | undefined): any {
 	let oTargetMapping = EDM_TYPE_MAPPING[(oProperty as Property)?.type] || (dataType ? EDM_TYPE_MAPPING[dataType] : undefined);
-	if (!oTargetMapping && (oProperty as Property).targetType && (oProperty as Property).targetType?._type === "TypeDefinition") {
+	if (!oTargetMapping && (oProperty as Property)?.targetType && (oProperty as Property).targetType?._type === "TypeDefinition") {
 		oTargetMapping = EDM_TYPE_MAPPING[((oProperty as Property).targetType as TypeDefinition).underlyingType];
 	}
 	const propertyTypeConfig: configType = {
-		type: oTargetMapping.type,
+		type: oTargetMapping?.type,
 		constraints: {},
 		formatOptions: {}
 	};