@sapui5/sap.suite.ui.generic.template 1.120.8 → 1.120.9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sapui5/sap.suite.ui.generic.template",
-  "version": "1.120.8",
+  "version": "1.120.9",
   "description": "SAPUI5 Library sap.suite.ui.generic.template",
   "keywords": [
     "sapui5",

package/src/sap/suite/ui/generic/template/.library

@@ -7,7 +7,7 @@
 
 		(c) Copyright 2009-2015 SAP SE. All rights reserved
 	</copyright>
-	<version>1.120.8</version>
+	<version>1.120.9</version>
 
 	<documentation>Library with generic Suite UI templates.</documentation>
 

package/src/sap/suite/ui/generic/template/AnalyticalListPage/controller/ControllerImplementation.js

@@ -255,37 +255,34 @@ sap.ui.define(["sap/fe/navigation/SelectionVariant",
 
 					var getFilterInfoForTilePromise = function () {
 						var oPresentationControlHandler = oTemplateUtils.oServices.oPresentationControlHandlerFactory.getPresentationControlHandler(oState.oSmartChart);
-						var oModel = oPresentationControlHandler.getModel();
-						var oEntityType = oTemplateUtils.oCommonUtils.getMetaModelEntityType(oPresentationControlHandler.getEntitySet());
+						var oMetaModel = oPresentationControlHandler.getModel().getMetaModel();
+						var sEntityTypeName = oMetaModel.getODataEntitySet(oPresentationControlHandler.getEntitySet()).entityType;
+						var oTable = oState.oSmartTable.getTable();
+						var oBinding = oTable.getBinding("rows") || oTable.getBinding("items");
+						var sServiceUrl = oBinding && oBinding.getDownloadUrl();
 						// - For Analytical Binding.
 						// we recv. aApplicationFilter and aApplicationFilters binding both but aApplicationFilter have actual filters operator value.
 						// - For List Binding.
 						// we recv. only aApplicationFilters contains filter operator.
-						var aFilters = oPresentationControlHandler.getBinding(oState).aApplicationFilter || oPresentationControlHandler.getBinding(oState).aApplicationFilters;
-						if (!aFilters || !aFilters.length) {
-							// case when no filters is applied
+						var aFilters = oBinding.aApplicationFilter || oBinding.aApplicationFilters;
+						// non-draft case when no filter is applied
+						if (!aFilters.length) {
 							return Promise.resolve({
-								bIsStatic: true,
-								sServiceUrl: ""
+								sServiceUrl: sServiceUrl
 							});
 						}
 						var oFilterData = oState.oSmartFilterbar.getFilterData();
-						var oFilterParams = filterHelper.getFilterParams(oModel, oEntityType, aFilters, oFilterData);
-						var oTable = oState.oSmartTable.getTable();
-						var oBinding = oTable.getBinding("rows") || oTable.getBinding("items");
-						var sServiceUrl = oBinding && oBinding.getDownloadUrl();
-						//chart only mode, no data in table
-						if (!sServiceUrl) {
+						var sFilterParams = filterHelper.getFilterParams(oMetaModel, sEntityTypeName, aFilters, oFilterData);
+						if (sFilterParams) {
+							sServiceUrl = oTemplateUtils.oCommonUtils.fnReplaceFiltersWithGetDownloadUrl(sServiceUrl, sFilterParams);
+							return Promise.resolve({
+								sServiceUrl: sServiceUrl
+							});
+						} else {
 							return Promise.resolve({
-								bIsStatic: true,
 								sServiceUrl: ""
 							});
 						}
-						sServiceUrl = oTemplateUtils.oCommonUtils.fnReplaceFiltersWithGetDownloadUrl(sServiceUrl, oFilterParams);
-						return Promise.resolve({
-							bIsStatic: oFilterParams.bIsStatic,
-							sServiceUrl: sServiceUrl
-						});
 					};
 
 					var oFragmentController = {
@@ -317,14 +314,12 @@ sap.ui.define(["sap/fe/navigation/SelectionVariant",
 						},
 
 						getServiceUrl: function () {
-							// only create static tile, if filter for any semanticDateRangeProperty (including custom filter field) exists
 							return getFilterInfoForTilePromise().then(function (oFilterInfo) {
-								var sServiceUrl = "";
-								if (!oFilterInfo.bIsStatic) {
-									sServiceUrl = oFilterInfo.sServiceUrl + "&$top=0&$inlinecount=allpages";
+								if (oFilterInfo.sServiceUrl) {
+									oFilterInfo.sServiceUrl = oFilterInfo.sServiceUrl ? (oFilterInfo.sServiceUrl + "&$top=0&$inlinecount=allpages") : "";
 								}
 								var oShareInfo = {
-									serviceUrl: sServiceUrl
+									serviceUrl: oFilterInfo.sServiceUrl
 								};
 								oController.onSaveAsTileExtension(oShareInfo);
 								return oShareInfo.serviceUrl;

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

@@ -8,7 +8,7 @@
 		"i18n": "i18n/i18n.properties",
 		"applicationVersion": {
 			"__comment": "applicationVersion oder componentversion??",
-			"version": "1.120.8"
+			"version": "1.120.9"
 		},
 		"title": "{{TITLE}}",
 		"description": "{{DESCRIPTION}}",

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

@@ -8,7 +8,7 @@
 		"i18n": "i18n/i18n.properties",
 		"applicationVersion": {
 			"__comment": "applicationVersion oder componentversion??",
-			"version": "1.120.8"
+			"version": "1.120.9"
 		},
 		"title": "Canvas",
 		"description": "Canvas Page",

package/src/sap/suite/ui/generic/template/ListReport/controller/ControllerImplementation.js

@@ -301,32 +301,35 @@ sap.ui.define([
 					var bAreDataShownInTable = oState.oIappStateHandler.areDataShownInTable();
 					if (bAreDataShownInTable) {
 						var oPresentationControlHandler = oState.oPresentationControlHandler;
-						var oModel = oPresentationControlHandler.getModel();
-						var oEntityType = oTemplateUtils.oCommonUtils.getMetaModelEntityType(oPresentationControlHandler.getEntitySet());
+						var oMetaModel = oPresentationControlHandler.getModel().getMetaModel();
+						var sEntityTypeName = oMetaModel.getODataEntitySet(oPresentationControlHandler.getEntitySet()).entityType;
+						var oBinding = oPresentationControlHandler.getBinding(oState);
+						var sServiceUrl = oBinding.getDownloadUrl();
 						// - For Analytical Binding.
 						// we recv. aApplicationFilter and aApplicationFilters binding both but aApplicationFilter have actual filters operator value.
 						// - For List Binding.
 						// we recv. only aApplicationFilters contains filter operator.
-						var aFilters = oPresentationControlHandler.getBinding(oState).aApplicationFilter || oPresentationControlHandler.getBinding(oState).aApplicationFilters;
-						if (!aFilters || !aFilters.length) {
-							// case when no filters is applied
+						var aFilters = oBinding.aApplicationFilter || oBinding.aApplicationFilters;
+						// non-draft case when no filter is applied
+						if (!aFilters.length) {
 							return Promise.resolve({
-								bIsStatic: true,
-								sServiceUrl: ""
+								sServiceUrl: sServiceUrl
 							});
 						}
 						var oFilterData = oState.oSmartFilterbar.getFilterData();
-						var oFilterParams = filterHelper.getFilterParams(oModel, oEntityType, aFilters, oFilterData);
-						var oBinding = oPresentationControlHandler.getBinding(oState);
-						var sServiceUrl = oBinding && oBinding.getDownloadUrl();
-						sServiceUrl = oTemplateUtils.oCommonUtils.fnReplaceFiltersWithGetDownloadUrl(sServiceUrl, oFilterParams);
-						return Promise.resolve({
-							bIsStatic: oFilterParams.bIsStatic,
-							sServiceUrl: sServiceUrl
-						});
+						var sFilterParams = filterHelper.getFilterParams(oMetaModel, sEntityTypeName, aFilters, oFilterData);
+						if (sFilterParams) {
+							sServiceUrl = oTemplateUtils.oCommonUtils.fnReplaceFiltersWithGetDownloadUrl(sServiceUrl, sFilterParams);
+							return Promise.resolve({
+								sServiceUrl: sServiceUrl
+							});
+						} else {
+							return Promise.resolve({
+								sServiceUrl: ""
+							});
+						}
 					}
 					return Promise.resolve({
-						bIsStatic: true,
 						sServiceUrl: ""
 					});
 				};
@@ -360,14 +363,12 @@ sap.ui.define([
 					},
 
 					getServiceUrl: function () { 
-						// only create static tile, if filter for any semanticDateRangeProperty (including custom filter field) exists
 						return getFilterInfoForTilePromise().then(function (oFilterInfo) {
-							var sServiceUrl = "";
-							if (!oFilterInfo.bIsStatic) {
-								sServiceUrl = oFilterInfo.sServiceUrl + "&$top=0&$inlinecount=allpages";
+							if (oFilterInfo.sServiceUrl) {
+								oFilterInfo.sServiceUrl = oFilterInfo.sServiceUrl ? (oFilterInfo.sServiceUrl + "&$top=0&$inlinecount=allpages") : "";
 							}
 							var oShareInfo = {
-								serviceUrl: sServiceUrl
+								serviceUrl: oFilterInfo.sServiceUrl
 							};
 							oController.onSaveAsTileExtension(oShareInfo);
 							return oShareInfo.serviceUrl;

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

@@ -8,7 +8,7 @@
 		"i18n": "i18n/i18n.properties",
 		"applicationVersion": {
 			"__comment": "applicationVersion oder componentversion??",
-			"version": "1.120.8"
+			"version": "1.120.9"
 		},
 		"title": "{{TITLE}}",
 		"description": "{{DESCRIPTION}}",

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

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

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

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

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

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

package/src/sap/suite/ui/generic/template/genericUtilities/filterHelper.js

@@ -3,8 +3,10 @@ sap.ui.define([
 	"sap/ui/core/format/DateFormat",
 	"sap/base/security/encodeURL",
 	"sap/m/DynamicDateUtil",
-	"sap/ui/core/CalendarType"
-], function (FilterOperator, DateFormat, encodeURL, DynamicDateUtil, CalendarType) {
+	"sap/suite/ui/generic/template/genericUtilities/metadataAnalyser",
+	"sap/base/i18n/date/CalendarType",
+	"sap/suite/ui/generic/template/genericUtilities/testableHelper"
+], function (FilterOperator, DateFormat, encodeURL, DynamicDateUtil, metadataAnalyser, CalendarType, testableHelper) {
     "use strict";
 
 	function getInfoForFilters(aFilters, getFilterInfoForPropertyFilters, bAnd){
@@ -95,7 +97,7 @@ sap.ui.define([
 	 * Formats a JavaScript value according to the given
 	 * <a href="http://www.odata.org/documentation/odata-version-2-0/overview#AbstractTypeSystem">
 	 * EDM type</a>.
-	 *
+	 * We are temperary using the method from UI5 model.
 	 * @param {any} vValue The value to format
 	 * @param {string} sType The EDM type (e.g. Edm.Decimal)
 	 * @param {boolean} bCaseSensitive Whether strings gets compared case sensitive or not
@@ -105,9 +107,7 @@ sap.ui.define([
 	function formatValue(vValue, sType, bCaseSensitive) {
 		var oDate, sValue;
 
-		if (bCaseSensitive === undefined) {
-			bCaseSensitive = true;
-		}
+		bCaseSensitive = bCaseSensitive === undefined || bCaseSensitive;
 
 		// null values should return the null literal
 		if (vValue === null || vValue === undefined) {
@@ -180,25 +180,39 @@ sap.ui.define([
 		}
 		return sValue;
 	}
-	
-	// Callback function used to concatinate basic or complex filter for each filter values
-	function getFilterInfoForPropertyFilters(oModel, oEntityType, oFilterData, bIsStatic, sProperty, aFiltersForProperty, sLogicalOperator) {
-		var oValue1, oValue2, sOperator, oProperty = oModel.oMetadata._getPropertyMetadata(oEntityType, sProperty);
+
+	/**
+     * Callback function used to concatenate basic or complex filters for each filter value
+     * @param {object} oParams - It contains information like (Model/EntityType/FilterData/bIsStatic),
+	 * Here  bIsStatic is subject to change from false to true whenever application uses custom sematic date
+	 * @param {String} sProperty - property name of the filter field from SFB
+	 * @param {Array} aFiltersForProperty - filter operator of field from SFB 
+	 * @param {String} sLogicalOperator - logical operator (and/or) betweem each filter item.
+     * @returns {string} - return combination of filters as a string.
+     */
+	function getFilterInfoForPropertyFilters(oParams, sProperty, aFiltersForProperty, sLogicalOperator) {
+		var oValue1, oValue2, sOperator, oProperty = metadataAnalyser.getPropertyMetadata(oParams.oMetaModel, oParams.sEntityTypeName, sProperty);
+		// for navigation properties
+		sProperty = sProperty.replaceAll("/", ".");
+		// If Custom filter is implemented date field for smart filter bar then we make static tile
+		if ((oProperty.type === "Edm.DateTime" || oProperty.type === "Edm.DateTimeOffset") && !oParams.oFilterData[sProperty]) {
+			oParams.bIsStatic = true;
+			return {
+				stringRep: "",
+				logicalOperator: sLogicalOperator
+			};
+		}
 		var sRet = aFiltersForProperty.map(function (oFilter) {
 			var bCaseSensitive = true;
 			if (oFilter.bCaseSensitive === undefined) {
 				bCaseSensitive = true;
 			}
-			// for navigation properties
-			var sNavProperty;
-			if (sProperty.split("/").length > 1) {
-				sNavProperty = sProperty.split("/").join(".");
-			}
-			if (oProperty && (oProperty.type === "Edm.DateTime" || oProperty.type === "Edm.DateTimeOffset") && oFilterData[sNavProperty || sProperty].conditionTypeInfo && oFilterData[sNavProperty || sProperty].conditionTypeInfo.data.operation !== "DATE") {
-				if (!DynamicDateUtil.getAllOptionKeys().includes(oFilterData[sNavProperty || sProperty].conditionTypeInfo.data.operation)) {
-					bIsStatic = true;
+			if ((oProperty.type === "Edm.DateTime" || oProperty.type === "Edm.DateTimeOffset") && oParams.oFilterData[sProperty].conditionTypeInfo && oParams.oFilterData[sProperty].conditionTypeInfo.data.operation !== "DATE") {
+				if (!DynamicDateUtil.getAllOptionKeys().includes(oParams.oFilterData[sProperty].conditionTypeInfo.data.operation)) {
+					oParams.bIsStatic = true;
+					return;
 				}
-				var oValue = getSematicDateFormat(oFilterData[sNavProperty || sProperty], oProperty.type);
+				var oValue = getSematicDateFormat(oParams.oFilterData[sProperty], oProperty.type);
 				oValue1 = oValue.oValue1;
 				oValue2 = oValue.oValue2;
 				sOperator = oValue.operator;
@@ -237,6 +251,8 @@ sap.ui.define([
 					return "endswith(" + sProperty + "," + oValue1 + ")";
 				case "NotEndsWith":
 					return "not%20endswith(" + sProperty + "," + oValue1 + ")";
+				default:
+					return "";
 			}
 		}).join("%20" + sLogicalOperator + "%20");
 		return {
@@ -247,22 +263,25 @@ sap.ui.define([
 
 	/**
      * Function returns filter params for service url
-     * @param {object} oEntityType
+     * @param {object} sEntityTypeName
 	 * @param {Array} aApplicationFilters - Smartfilterbar filters operators
 	 * @param {Object} oFilterData - smartfilterbar filter object with values
      * @returns {string} return filter param of service url
      */
-	function getFilterParams(oModel, oEntityType, aApplicationFilters, oFilterData) {
-		var bIsStatic = false;
-		var sFilterParams = "$filter=" + getFilterString(aApplicationFilters, getFilterInfoForPropertyFilters.bind(null, oModel, oEntityType, oFilterData, bIsStatic));
-		return {
-			sFilterParams: sFilterParams,
-			bIsStatic: bIsStatic
+	function getFilterParams(oMetaModel, sEntityTypeName, aApplicationFilters, oFilterData) {
+		var oParams = {
+			oMetaModel: oMetaModel,
+			sEntityTypeName: sEntityTypeName,
+			oFilterData: oFilterData,
+			bIsStatic: false
 		};
+		// Here oParams.bIsStrict will change if SFB have custom semantic-date filter.
+		var sFilterParams = "$filter=" + getFilterString(aApplicationFilters, getFilterInfoForPropertyFilters.bind(null, oParams));
+		sFilterParams = oParams.bIsStatic ? "" : sFilterParams;
+		return sFilterParams;
 	}
-
+	testableHelper.testableStatic(getFilterString, "filterHelper_getFilterString");
     return {
-        getFilterString: getFilterString,
 		getFilterParams: getFilterParams
     };
 });

package/src/sap/suite/ui/generic/template/genericUtilities/metadataAnalyser.js

@@ -251,6 +251,26 @@ sap.ui.define([
 			return null;
 		},
 
+		/**
+		* Function return metadata ODataProperty.
+	 	* 
+	 	* @param {object} oMetaModel
+	 	* @param {object} oEntityType
+	 	* @param {object} sProperty
+		* @returns {object} returns metadata oDataProperty
+	 	*/
+		getPropertyMetadata: function (oMetaModel, sEntityTypeName, sProperty) {
+			var oEntityType = oMetaModel.getODataEntityType(sEntityTypeName);
+			var aPathParts = sProperty.split("/");
+			for (var j = 0; j < aPathParts.length - 1; j++) {  // go through the parts finding the last entity type;
+				var oAssociationEnd = oMetaModel.getODataAssociationEnd(oEntityType, aPathParts[j]);
+				oEntityType = oMetaModel.getODataEntityType(oAssociationEnd.type);
+			}
+			sProperty = aPathParts[aPathParts.length - 1]; // last entry in array is a property
+			var oODataProperty = oMetaModel.getODataProperty(oEntityType, sProperty);
+			return oODataProperty;
+		},
+	
 		hasPropertyInSideEffect: hasPropertyInSideEffect
 	};
 

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

@@ -136,17 +136,7 @@ sap.ui.define(["sap/ui/model/odata/AnnotationHelper",
 	}
 
 	function isPropertyPathBoolean(oMetaModel, sEntityTypeName, sPropertyPath) {
-		var sProperty = sPropertyPath;
-		var oPathEntityType = oMetaModel.getODataEntityType(sEntityTypeName);
-		if (sProperty.indexOf("/") > -1) { // if it's a navigation path, we have to expand to find the right entity type
-			var aPathParts = sProperty.split("/");
-			for (var j = 0; j < aPathParts.length - 1; j++) {  // go through the parts finding the last entity type;
-				var oAssociationEnd = oMetaModel.getODataAssociationEnd(oPathEntityType, aPathParts[j]);
-				oPathEntityType = oMetaModel.getODataEntityType(oAssociationEnd.type);
-			}
-			sProperty = aPathParts[aPathParts.length - 1]; // last entry in array is a property
-		}
-		var oODataProperty = oMetaModel.getODataProperty(oPathEntityType, sProperty);
+		var oODataProperty = metadataAnalyser.getPropertyMetadata(oMetaModel, sEntityTypeName, sPropertyPath);
 		return (!!oODataProperty && oODataProperty.type === "Edm.Boolean");
 	}
 

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

@@ -907,7 +907,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.UIComponent
 	 * @abstract
 	 * @author SAP SE
-	 * @version 1.120.8
+	 * @version 1.120.9
 	 * @name sap.suite.ui.generic.template.lib.AppComponent
 	 */
 	return UIComponent.extend("sap.suite.ui.generic.template.lib.AppComponent", {

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

@@ -103,15 +103,15 @@ sap.ui.define(["sap/ui/base/Object",
 			return oEntityType;
 		}
 
-		function fnReplaceFiltersWithGetDownloadUrl(sServiceUrl, oFilterParams) {
-			var aFilters = sServiceUrl.split("?");
-			aFilters[1] = aFilters[1].split("&").map(function (params) {
+		function fnReplaceFiltersWithGetDownloadUrl(sServiceUrl, sFilterParams) {
+			var aServiceURLSplit = sServiceUrl.split("?");
+			aServiceURLSplit[1] = aServiceURLSplit[1].split("&").map(function (params) {
 				if (params.startsWith("$filter")) {
-					return oFilterParams.sFilterParams;
+					return sFilterParams;
 				}
 				return params;
 			}).join("&");
-			sServiceUrl = aFilters.join("?");
+			sServiceUrl = aServiceURLSplit.join("?");
 			return sServiceUrl;
 		}
 

package/src/sap/suite/ui/generic/template/lib/navigation/NavigationController.js

@@ -3051,7 +3051,7 @@ sap.ui.define(["sap/ui/base/Object",
 	 * @param {sap.suite.ui.generic.template.lib.AppComponent} oAppComponent The AppComponent instance
 	 * @public
 	 * @extends sap.ui.base.Object
-	 * @version 1.120.8
+	 * @version 1.120.9
 	 * @since 1.30.0
 	 * @alias sap.suite.ui.generic.template.lib.NavigationController
 	 */

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

@@ -60,7 +60,7 @@ sap.ui.define([
 		interfaces: [],
 		controls: [],
 		elements: [],
-		version: "1.120.8",
+		version: "1.120.9",
 		extensions: {
 			//Configuration used for rule loading of Support Assistant
 			"sap.ui.support": {