@sapui5/sap.fe.macros 1.142.0 → 1.143.0

package/src/sap/fe/macros/filter/FilterUtils.ts

@@ -128,7 +128,8 @@ const oFilterUtils = {
 		metaModel?: ODataMetaModel,
 		appComponent?: AppComponent,
 		oModifier?: BaseTreeModifier,
-		lineItemTerm?: string
+		lineItemTerm?: string,
+		propertyInfosFromFilterBar?: PropertyInfo[]
 	): FilterField[] {
 		const oMetaModel = this._getFilterMetaModel(oFilterControl, metaModel);
 		const sFilterEntityTypePath = DelegateUtil.getCustomData<string>(oFilterControl, "entityType");
@@ -151,7 +152,8 @@ const oFilterUtils = {
 			includeHidden,
 			oModifier,
 			lineItemTerm,
-			annotationPath
+			annotationPath,
+			propertyInfosFromFilterBar
 		);
 	},
 
@@ -1165,7 +1167,8 @@ const oFilterUtils = {
 		includeHidden?: boolean,
 		oModifier?: BaseTreeModifier,
 		lineItemTerm?: string,
-		annotationPath?: string
+		annotationPath?: string,
+		propertyInfosFromFilterBar?: PropertyInfo[]
 	): FilterField[] {
 		const filterFields = FilterBarConverter.getSelectionFields(
 			oConverterContext,
@@ -1175,9 +1178,15 @@ const oFilterUtils = {
 			lineItemTerm
 		);
 		let selectionFields: FilterField[] = filterFields.selectionFields;
-		const propertyInfos = (oFilterControl as Partial<IFilterControl>).data
-			? this.getFilterPropertyInfo(oFilterControl)
-			: JSON.parse(filterFields.sPropertyInfo.replace(/\\\{/g, "{").replace(/\\\}/g, "}")); // propertyInfo string is returned from the getSelectionFields
+		let propertyInfos: PropertyInfo[];
+		//During templating time while adding a flex change propertyInfosFromFilterBar will be passed
+		if (propertyInfosFromFilterBar && propertyInfosFromFilterBar.length > 0) {
+			propertyInfos = propertyInfosFromFilterBar;
+		} else {
+			propertyInfos = (oFilterControl as Partial<IFilterControl>).data
+				? this.getFilterPropertyInfo(oFilterControl)
+				: JSON.parse(filterFields.sPropertyInfo.replace(/\\\{/g, "{").replace(/\\\}/g, "}")); // propertyInfo string is returned from the getSelectionFields
+		}
 		if (
 			(oModifier
 				? oModifier.getControlType(oFilterControl) === "sap.ui.mdc.FilterBar"
@@ -1389,6 +1398,31 @@ const oFilterUtils = {
 			}
 			return _propertyInfo;
 		});
+	},
+
+	/**
+	 * Checks if the Property already exists in the propertyInfo array, used during templating to avoid duplicates.
+	 * @param parentControl FilterBar control where the custom data is stored
+	 * @param modifier Modifier
+	 * @param propertyInfoName Name of the property to be checked
+	 * @returns Array of PropertyInfos after removing the unwanted properties
+	 */
+	_checkIfPropertyInfoExists: async function (
+		parentControl: FilterBar,
+		modifier: BaseTreeModifier,
+		propertyInfoName: string
+	): Promise<boolean> {
+		let propertyInfo: PropertyInfo[] = [];
+		try {
+			const customDataValue = await DelegateUtil.getCustomDataWithModifier<string>(parentControl, "feFilterInfo", modifier);
+			if (customDataValue) {
+				propertyInfo = JSON.parse(customDataValue);
+				return propertyInfo.some((obj: PropertyInfo) => obj.name === propertyInfoName);
+			}
+			return false;
+		} catch (error) {
+			return false;
+		}
 	}
 };