@sapui5/sap.suite.ui.generic.template 1.139.0 → 1.139.2

package/src/sap/suite/ui/generic/template/QuickView/manifest.json

@@ -6,7 +6,7 @@
 	"type": "component",
 	"i18n": "i18n/i18n.properties",
 	"applicationVersion": {
-		"version": "1.139.0"
+		"version": "1.139.2"
 	},
 	"title": "{{TITLE}}",
 	"description": "{{DESCRIPTION}}",

package/src/sap/suite/ui/generic/template/js/AnnotationHelper.js

@@ -4523,6 +4523,86 @@ sap.ui.define(["sap/ui/model/odata/AnnotationHelper",
 					break;
 			}
 			return sPriority;
+		},
+
+		getModelData: function(oInterface, sBaseAnnotationPath, sEntitySetName) {
+			var oModel = oInterface.getModel() ? oInterface.getModel() : oInterface.getInterface(0).getModel(),
+				oBaseEntityType = oModel.getODataEntityType(oModel.getODataEntitySet(sEntitySetName).entityType);
+
+			if (sBaseAnnotationPath.indexOf("/") > -1) {
+				var oRelevantData = oAnnotationHelper.getRelevantDataForAnnotationRecord(oModel, sBaseAnnotationPath, oBaseEntityType);
+				return {
+					sAnnotationPath: oRelevantData.dataFieldValuePath[0] === '@' ? oRelevantData.dataFieldValuePath.substring(1) : oRelevantData.dataFieldValuePath,
+					oEntityType: oRelevantData.entityType
+				};
+			}
+			return {
+				sAnnotationPath: sBaseAnnotationPath[0] === '@' ? sBaseAnnotationPath.substring(1) : sBaseAnnotationPath,
+				oEntityType: oBaseEntityType
+			};
+		},
+
+		getSmartFormTitle: function(oInterface, oFacet, sEntitySetName, oBlock, oSubSectionData) {
+			if (!oFacet) {
+				return oAnnotationHelper.getTitleForSectionsForms(oBlock, oSubSectionData);
+			}
+			return oAnnotationHelper.getTitleForHeaderForm(oInterface, oFacet, sEntitySetName);
+		},
+
+		getTitleForSectionsForms: function(oBlock, oSubSectionData) {
+			if (oSubSectionData?.annotations?.Facet?.annotation?.Facets?.length > 1
+				|| oSubSectionData?.annotations?.Facet?.annotation?.Label?.String !== oBlock?.aggregations?.groups[0]?.annotations?.Facet?.annotation?.Label?.String
+			) {
+				// In case Section -> SubSection have more than one form, SmartForm will have it's titles visible
+				// or
+				// SubSectin title !== SmartForm title, SmartForm title will also be visible
+				return;
+			}
+			if (oBlock?.aggregations?.groups[0]?.annotations?.Facet?.annotation?.Label?.String !==  oBlock?.aggregations?.groups[0]?.targetAnnotation?.Label?.String) {
+				// Compare SmartForm title !== FiledGroup title
+				// if they differs -> use FiledGoup title
+				return oBlock?.aggregations?.groups[0]?.targetAnnotation?.Label?.String;
+			}
+			return;
+		},
+
+		getTitleForHeaderForm: function(oInterface, oFacet, sEntitySetName) {
+			if (oFacet.Target && oFacet.Target.AnnotationPath && oFacet.Target.AnnotationPath.indexOf("com.sap.vocabularies.UI.v1.DataPoint") > -1) {
+				// Process DataPoint case
+				var { sAnnotationPath, oEntityType } = oAnnotationHelper.getModelData(oInterface, oFacet.Target.AnnotationPath, sEntitySetName);
+				if (oEntityType[sAnnotationPath] && oEntityType[sAnnotationPath].Title && oEntityType[sAnnotationPath].Title.String) {
+					return oEntityType[sAnnotationPath].Title.String;
+				}
+				// As DataPoint don't have title -> try to get property name as SmartForm title
+				if (!oEntityType[sAnnotationPath] || !oEntityType[sAnnotationPath].Value || !oEntityType[sAnnotationPath].Value.Path || !oEntityType.property) {
+					return;
+				}
+				var aProperty = oEntityType.property.filter(function(entry) {
+					return entry.name === oEntityType[sAnnotationPath].Value.Path;
+				});
+				if (aProperty.length && aProperty[0]['sap:label']) {
+					// Property name found
+					return aProperty[0]['sap:label'];
+				}
+				return;
+			}
+			// It's Identification or FieldGroup case
+			if (oFacet.Label && oFacet.Label.String) {
+				return oFacet.Label.String;
+			}
+			if (!oFacet.Target || !oFacet.Target.AnnotationPath) {
+				return;
+			}
+			if (oFacet.Target.AnnotationPath.indexOf("com.sap.vocabularies.UI.v1.Identification") > -1) {
+				// Identification entry don't have any data which we can use as SmartForm title.
+				return;
+			}
+			var { sAnnotationPath, oEntityType } = oAnnotationHelper.getModelData(oInterface, oFacet.Target.AnnotationPath, sEntitySetName);
+			if (oEntityType[sAnnotationPath] && oEntityType[sAnnotationPath].Label && oEntityType[sAnnotationPath].Label.String) {
+				// Use FieldGroup.Label.String as SmartForm title
+				return oEntityType[sAnnotationPath].Label.String;
+			}
+			return;
 		}
 	};
 	oAnnotationHelper.getBlockForEditableHeaderFacet.requiresIContext = true;
@@ -4593,6 +4673,7 @@ sap.ui.define(["sap/ui/model/odata/AnnotationHelper",
 	oAnnotationHelper.getTextArrangementPath.requiresIContext = true;
 	oAnnotationHelper.isValueHelpTableAvailable.requiresIContext = true;
 	oAnnotationHelper.getTextArrangementFinalString.requiresIContext = true;
+	oAnnotationHelper.getSmartFormTitle.requiresIContext = true;
 
 	return oAnnotationHelper;
 }, /* bExport= */ true);

package/src/sap/suite/ui/generic/template/lib/AppComponent.js

@@ -367,6 +367,20 @@ sap.ui.define([
 				oComponentData.feEnvironment.getShareControlVisibility();
 		}
 
+		// If the FE app is embedded within the Inbox app, the Inbox injects a dummy object named "feEnvironment" 
+		// into the "componentData". In this case, we obtain the (mocked) shell service from "feEnvironment" 
+		// instead of the standard ShellUIService. 
+		// The mocked shell service exposes few methods like "setTitle" and "setHierarchy". 
+		// They are invoked by NavigationController.
+		//
+		// Otherwise, we return the actual "ShellUIService" from the app component.
+		function fnGetShellUIServicePromise () {
+			var oComponentData = oAppComponent.getComponentData();
+			return oComponentData?.feEnvironment?.getShellService ?
+				Promise.resolve( oComponentData.feEnvironment.getShellService() ) :
+				oAppComponent.getService("ShellUIService");
+		}
+
 		function attachToApplicationController() {
 			oTemplateContract.fnAddSideEffectPromise = function(oPromise){
 				var i = 0;
@@ -426,7 +440,7 @@ sap.ui.define([
 				oViewDependencyHelper: new ViewDependencyHelper(oTemplateContract)
 			};
 			oTemplateContract.oViewDependencyHelper = oAppRegistryEntry.oViewDependencyHelper;
-			oTemplateContract.oShellServicePromise = oAppComponent.getService("ShellUIService");
+			oTemplateContract.oShellServicePromise = fnGetShellUIServicePromise();
 			oTemplateContract.oShellServicePromise.catch(function(){
 				oLogger.warning("No ShellService available");
 			});
@@ -944,7 +958,7 @@ sap.ui.define([
 	 * @public
 	 * @extends sap.ui.core.UIComponent
 	 * @author SAP SE
-	 * @version 1.139.0
+	 * @version 1.139.2
 	 * @name sap.suite.ui.generic.template.lib.AppComponent
 	 */
 	var oAppComponent = UIComponent.extend("sap.suite.ui.generic.template.lib.AppComponent", {

package/src/sap/suite/ui/generic/template/lib/ai/EasyFilterBarHandler.js

@@ -5,8 +5,9 @@ sap.ui.define([
     "sap/suite/ui/generic/template/genericUtilities/FeLogger",
     "sap/ui/model/FilterOperator",
     'sap/ui/model/Filter',
-    'sap/suite/ui/generic/template/js/AnnotationHelper'
-], function(BaseObject, extend, filterHelper, FeLogger, FilterOperator,Filter,AnnotationHelper) {
+    'sap/suite/ui/generic/template/js/AnnotationHelper',
+    "./EasyFilterDataFetcherHelper"
+], function(BaseObject, extend, filterHelper, FeLogger, FilterOperator,Filter,AnnotationHelper,EasyFilterDataFetcherHelper) {
     'use strict';
 
     /*
@@ -315,24 +316,28 @@ sap.ui.define([
                     // keySpecificSelectedValues will have one selectedValues object for each operator
                     // ex : [{operator: "EQ", selectedValues: ["HT-1010","HT-10001","1097"]}, {operator: "Contains", selectedValues: ["HT-100"]}]
                     oFilterItem.keySpecificSelectedValues.forEach(function (oSelectedValues) {
-                        var oRange = {
-                            Sign: "I", // currently not considering "E"
-                            High: ""
-                        };
-
                         if ((oSelectedValues.operator === "BT" || oSelectedValues.operator === "NB")) {
+                            var oRange = {
+                                Sign: oSelectedValues.operator === "NB" ? "E" : "I",
+                                High: ""
+                            };
                             oRange.Low = oSelectedValues.selectedValues[0];
                             oRange.High = oSelectedValues.selectedValues[1];
-                            oRange.Option = oSelectedValues.operator;
+                            oRange.Option = "BT";
                             oFilter.Ranges.push(oRange);
                         } else {
-                            oSelectedValues.selectedValues.forEach(function (oValue) {
-                                if (oSelectedValues.operator === "Contains") { // need to check for other operators if special handling is required
+                            oSelectedValues.selectedValues.forEach(function (sValue) {
+                                var oRange = {
+                                    Sign: EasyFilterDataFetcherHelper.isNegationOperator(oSelectedValues.operator) ? "E" : "I",
+                                    High: ""
+                                };
+
+                                if (isCPOperator(oSelectedValues.operator)) {
                                     oRange.Option = "CP";
-                                    oRange.Low = oValue;
+                                    oRange.Low = getValueForCPOperator(sValue,oSelectedValues.operator);
                                 } else {
-                                    oRange.Option = oSelectedValues.operator;
-                                    oRange.Low = oValue;
+                                    oRange.Option = EasyFilterDataFetcherHelper.isNegationOperator(oSelectedValues.operator) ? EasyFilterDataFetcherHelper.getReverseOperator(oSelectedValues.operator) : oSelectedValues.operator;
+                                    oRange.Low = sValue;
                                 }
                                 oFilter.Ranges.push(oRange);
                             });
@@ -348,6 +353,29 @@ sap.ui.define([
             };
         }
 
+        function getValueForCPOperator(sValue,sOperator) {
+            sOperator = EasyFilterDataFetcherHelper.isNegationOperator(sOperator) ? EasyFilterDataFetcherHelper.getReverseOperator(sOperator) : sOperator;
+            switch (sOperator) {
+                case FilterOperator.Contains:
+                    sValue = `*${sValue}*`;
+                    break;
+                case FilterOperator.EndsWith:
+                    sValue = `*${sValue}`;
+                    break;
+                case FilterOperator.StartsWith:
+                    sValue = `${sValue}*`;
+                    break;
+                default:
+                    break;
+            }
+            return sValue;
+        }
+
+        function isCPOperator(sOperator) {
+            return sOperator === FilterOperator.Contains || sOperator === FilterOperator.EndsWith || sOperator === FilterOperator.NotContains || sOperator === FilterOperator.NotEndsWith
+            || sOperator === FilterOperator.NotStartsWith || sOperator === FilterOperator.StartsWith;
+        }
+
         /**
          * This method is used to get the EasyFilter control from the floorplan
          * @returns EasyFilter control
@@ -506,191 +534,10 @@ sap.ui.define([
             }
         }
 
-        function getFiltersForDataFetching(key,keySpecificSelectedResult) {
-            const aFilters = [];
-
-            for (var i = 0; i < keySpecificSelectedResult.length;++i) {
-                    const result = keySpecificSelectedResult[i];
-                    if (result.operator === FilterOperator.BT || result.operator === FilterOperator.NB) {
-                        aFilters.push(new Filter({
-                            path: key,
-                            operator: result.operator,
-                            value1: result.selectedValues[0],
-                            value2: result.selectedValues[1]
-                        }));
-                    } else {
-                        for (var j = 0; j < result.selectedValues.length; ++j) {
-                            aFilters.push(new Filter({
-                                path: key,
-                                operator: result.operator,
-                                value1: result.selectedValues[j]
-                            }));
-                        }
-                    }
-            }
-            return aFilters;
-        }
-
         function onDataFetcher(key,keySpecificSelectedResult,totalAIResponse) {
-            return new Promise((resolve,reject)=>{
-
-            var aFinalResponse = [];
-            var oOwnerFilterControl = oState.oSmartFilterbar;
-            var sKey = key;
-            var sEntitySet = oController.getOwnerComponent().getEntitySet();
-            var oEntityType = oTemplateUtils.oCommonUtils.getMetaModelEntityType(sEntitySet);
-            var oSFBModel = oOwnerFilterControl.getModel();
-            var oSFBMetaModel = oSFBModel.getMetaModel();
-            var aFilters = getFiltersForDataFetching(key,keySpecificSelectedResult);
-            var oProperty = oSFBMetaModel.getODataProperty(oEntityType, key);
-            var sPropertyPath = oSFBMetaModel.getODataProperty(oEntityType, key,true);
-            var isValueHelpTableAvailable = AnnotationHelper.isValueHelpTableAvailable(oProperty);
-
-            if (isValueHelpTableAvailable) {
-                var oPropertyContext = oSFBMetaModel.createBindingContext(sPropertyPath);
-                var oVHPromise = oSFBMetaModel.getODataValueLists(oPropertyContext);
-                var filtersLength = aFilters.length;
-                // //Every Search on a value, create a seperate call to backend,but they are grouped into one batch
-                // //We need to ensure that once all calls are completed inside the batch to resolve the promise, else the system would be waiting indefenitely
-                var ctr = 0;
-                let fnForDescription = (oResponse,aMatchedFilterResults,sTextArrangementPath,sTextArrangement) => {
-                    ++ctr;
-                    var aResults = oResponse.results;
-
-                    //Check the description is present and follow the textArrangement annotation as well
-                    //If the value is not present ,make the ID and Description same
-                    aMatchedFilterResults.forEach((oFilter)=>{
-                        var result = aResults.find((res)=>res[key] === oFilter.getValue1());
-                        if (result) {
-                            aFinalResponse.push({
-                                operator: FilterOperator.EQ,
-                                selectedValues: [{
-                                    value: result[key],
-                                    description: AnnotationHelper.getTextArrangementFinalString(result,key,sTextArrangementPath.split("/")[1],sTextArrangement)
-                                   }]
-                            });
-                        } else {
-                            //Ideally description should be present, if in case its not present we will fallback to our default case where value and description would be same
-                            aFinalResponse.push(getkeySpecifiedResultFromFilters(oFilter));
-                        }
-                    });
-
-                    if (ctr === filtersLength) {
-                        resolve(aFinalResponse);
-                    }
-                };
-
-                
-                
-                let fnSuccessForValueList = (oResponse,oFilter,sValueListEntity) => {
-                    var oValueHelpEntity = oTemplateUtils.oCommonUtils.getMetaModelEntityType(sValueListEntity);
-                    var oValueHelpProperty = oSFBMetaModel.getODataProperty(oValueHelpEntity, key);
-                    var aResults = oResponse.results;
-                    var sTextArrangementPath = AnnotationHelper.getTextArrangementPath(oValueHelpProperty);
-                    var sTextArrangement = AnnotationHelper.getTextArrangementForEasyFilter(oValueHelpEntity,oValueHelpProperty);
-                    var navigationProperty = null;
-                    var sEntityForTextDescription = null;
-                    
-                    if (sTextArrangementPath && sTextArrangementPath.split("/").length > 1) {
-                        navigationProperty = sTextArrangementPath.split("/")[0];
-                        sEntityForTextDescription = oSFBMetaModel.getODataAssociationSetEnd(oValueHelpEntity,navigationProperty).entitySet;
-                    }
-
-                    //We are triggering the below call, only for fetching of the TextDescription.If its a different entity than ValueList only then trigger it
-                    if (aResults.length === 0) {
-                        ++ctr;
-                        aFinalResponse.push(getkeySpecifiedResultFromFilters(oFilter));
-                    } else if (aResults.length !== 0 && sEntityForTextDescription && sValueListEntity !== sEntityForTextDescription) {
-                        var aAllMatchedResults = aResults.map((result)=>{
-                            return result[key];
-                        });
-                       var aMatchedFilterResults = aAllMatchedResults.map((matchedResult)=>{
-                            return new Filter({
-                                path: key,
-                                operator: FilterOperator.EQ,
-                                value1:matchedResult
-                            });
-                       });
-                       // The below code only be executed when the textDescription and ValueList entities are different  
-                       oSFBModel.read("/" + sEntityForTextDescription, {
-                        filters: aMatchedFilterResults,
-                        success : function(response) {
-                                fnForDescription(response,aMatchedFilterResults);
-                            }
-                        });
-                    } else {
-                        //The below condition is when valueList entity and navigation property entity are same
-                        ++ctr;
-                        aResults.forEach((result)=>{
-                            aFinalResponse.push({
-                                operator: FilterOperator.EQ,
-                                selectedValues: [{
-                                    value: result[key],
-                                    description: AnnotationHelper.getTextArrangementFinalString(result,key,
-                                    sTextArrangementPath,sTextArrangement)
-                                   }]
-                            });
-                        });
-                    }
-
-                    if (ctr === filtersLength) {
-                        resolve(aFinalResponse);
-                    }
-                };
-
-                oVHPromise.then((oValueList)=>{
-                var oValueListDefaultBinding = oValueList[""];
-                var sValueListEntity = oValueListDefaultBinding.CollectionPath.String;
-                if (Array.isArray(oValueListDefaultBinding.Parameters)) {
-                    var oParameter = oValueListDefaultBinding.Parameters.find(oParam => (oParam.RecordType === "com.sap.vocabularies.Common.v1.ValueListParameterInOut" && oParam.LocalDataProperty.PropertyPath === sKey));
-                if (oParameter) {    
-                    key = oParameter.ValueListProperty.String; 
-                    }
-                }
-                    //Get All Records using $search
-                    aFilters.forEach((oFilter)=>{
-                        oSFBModel.read("/" + sValueListEntity, {
-                            urlParameters : {
-                                search: oFilter.getValue1()
-                            },
-                            success : function(response) {
-                                fnSuccessForValueList(response,oFilter,sValueListEntity);
-                            }
-                        });
-                    });
-                });
-
-            } else {
-                //When there is no valueList associate, just return the original value in CodeList type
-                aFilters.forEach((oFilter)=>aFinalResponse.push(getkeySpecifiedResultFromFilters(oFilter)));
-                resolve(aFinalResponse);
-            }
-        });
-    }
-
-         function getkeySpecifiedResultFromFilters(oFilter) {
-            var values = [];
-            if (oFilter.getOperator() === FilterOperator.BT || oFilter.getOperator() === FilterOperator.NB) {
-                var values = [{
-                    value: oFilter.getValue1(),
-                    description: oFilter.getValue1()
-                },{
-                    value: oFilter.getValue2(),
-                    description: oFilter.getValue2()
-                }];
-            } else {
-                values.push({
-                    value: oFilter.getValue1(),
-                    description: oFilter.getValue1()
-                });
-            }
-            return {
-                operator: oFilter.getOperator(),
-                selectedValues: values
-            };
+            return EasyFilterDataFetcherHelper.fetchDataForKey(key, keySpecificSelectedResult, oState, oController, oTemplateUtils);
         }
 
-
         return {
             getEasyFilterBar : fnGetEasyFilterBar,
             initialiseEasyFilterBar : fnInitialiseEasyFilterBar,
@@ -704,8 +551,7 @@ sap.ui.define([
 			onShowValueHelp: fnShowValueHelp,
             onFilterChange : fnOnFilterChange,
             handleVariantLoad : fnHandleVariantLoad,
-            onDataFetcher,
-            getkeySpecifiedResultFromFilters
+            onDataFetcher
         };
     }
 
@@ -714,5 +560,5 @@ sap.ui.define([
             extend(this, getMethods(oState, oController, oTemplateUtils));
         }
     });
-    
+
 });