@sapui5/sap.suite.ui.generic.template 1.124.6 → 1.124.8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sapui5/sap.suite.ui.generic.template",
-  "version": "1.124.6",
+  "version": "1.124.8",
   "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.124.6</version>
+	<version>1.124.8</version>
 
 	<documentation>Library with generic Suite UI templates.</documentation>
 

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

@@ -44,8 +44,7 @@ sap.ui.define(["sap/m/SegmentedButtonItem", "sap/m/Button", "sap/m/Text", "sap/m
 				}
 				//Enable "AdaptFilter" beside the "Go" button
 				if (!bShowGoButtonOnFilter) {
-					//TODO:Hiding "AdaptFilter" button using private API , public API to be used when available
-					me.oState.oSmartFilterbar.getAggregation("_filtersButton").setVisible(false);
+					me.oState.oSmartFilterbar.setShowFilterConfiguration(false);
 				}
 
 				oState.oHeader = oState.oPage.getHeader();

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

@@ -433,7 +433,7 @@ sap.ui.define([
 			oVisualFilterDialogModelClone.setProperty('/filterCompList/' + idx + '/searchVisible', bVisible);
 			oVisualFilterDialogModel.setData(oVisualFilterDialogModelClone.getData());
 			//update config object when VFConfig model is updated
-			this.oConfig = oVisualFilterDialogModel.getProperty();
+			this.oConfig = oVisualFilterDialogModel.getData();
 			//to enable Restore button on change of chart type, sort order, measure field and  show in filter bar changes
 			this.oState.oSmartFilterbar._oVariantManagement.currentVariantSetModified(true);
 		},

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.124.6"
+			"version": "1.124.8"
 		},
 		"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.124.6"
+			"version": "1.124.8"
 		},
 		"title": "Canvas",
 		"description": "Canvas Page",

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.124.6"
+			"version": "1.124.8"
 		},
 		"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.124.6"
+			"version": "1.124.8"
 		},
 		"title": "{{TITLE}}",
 		"description": "{{DESCRIPTION}}",

package/src/sap/suite/ui/generic/template/ObjectPage/templateSpecificPreparationHelper.js

@@ -331,62 +331,110 @@ sap.ui.define([
 			fnSetTargetEntity(oEntitySet);
 
 			var bToolbarButtonVisible = fnGetTableToolbarButtonVisibility(oSettings, oEntitySet, oResult.type);
-			var oPathforRestriction = fnGetRestrictionForPasteButton(oEntitySet);
 			/* Workaround fix for non draft apps with no section settings defined in the manifest. In UI5v1.93, the export to excel button is displayed by default because of a code gap in
 			   FE which later got fixed with a change related to paste button in UI5v1.96 wherein the export button is not displayed by default. This looks like a regression issue to customers
 			   for which we have provided this temporary solution which shall get removed soon. */
 			oResult.bExportToExcel = (!oComponentUtils.isDraftEnabled() && !oSettings.sections) || bToolbarButtonVisible;
-			if (oPathforRestriction) {
-				var sPathforRestriction = "";
-				if (oPathforRestriction.insertable) {
-					sPathforRestriction = "${" + oPathforRestriction.insertable + "}";
-				}
-				if (oPathforRestriction.updatable) {
-					sPathforRestriction = sPathforRestriction ? sPathforRestriction + " || ${" + oPathforRestriction.updatable + "}" : "${" + oPathforRestriction.updatable + "}";
-				}
-				sPathforRestriction = sPathforRestriction && "(" + sPathforRestriction + ")";
-				oResult.vShowPasteButton = bToolbarButtonVisible ? "{= ${ui>/editable} && " + sPathforRestriction + "}" : false;
-			} else {
-				oResult.vShowPasteButton = bToolbarButtonVisible ? "{ui>/editable}" : false;
-			}
-
+			oResult.vShowPasteButton = fnGetPasteButtonVisibility(oEntitySet);
 			oResult.commandExecution = fnGetTableLevelStandardActions();
 			oResult.persistencyKeyState = fnGetPersistencyKeyState(oSettings.tableSettings);
 
 			return oResult;
 		}
-		
-		// fnGetRestrictionForPasteButton return object contains updatable and insertable restriction for the given Entity Set.
-		function fnGetRestrictionForPasteButton(oEntitySet) {
-			var oLeadingEntitySet = oMetaModel.getODataEntitySet(sLeadingEntitySet);
-			var oInsertableAnnotation, oUpdatableAnnotation;
-			
-			var oInsertRestrictionSetViaNavRestrictions = AnnotationHelper.handleNavigationRestrictions(oMetaModel, oLeadingEntitySet, oEntitySet, 'Insertable');
-			if (oInsertRestrictionSetViaNavRestrictions) {
-				oInsertableAnnotation = oInsertRestrictionSetViaNavRestrictions['Insertable'];
-			} else {
-				var oSectionInsertRestriction = oEntitySet['Org.OData.Capabilities.V1.InsertRestrictions'];
-				oInsertableAnnotation = oSectionInsertRestriction && oSectionInsertRestriction['Insertable'];
-			}
 
-			var oUpdateRestrictionSetViaNavRestrictions = AnnotationHelper.handleNavigationRestrictions(oMetaModel, oLeadingEntitySet, oEntitySet, 'Updatable');
-			if (oUpdateRestrictionSetViaNavRestrictions) {
-				oUpdatableAnnotation = oUpdateRestrictionSetViaNavRestrictions['Updatable'];
-			} else {
-				var oSectionUpdatableRestriction = oEntitySet['Org.OData.Capabilities.V1.UpdateRestrictions'];
-				oUpdatableAnnotation = oSectionUpdatableRestriction && oSectionUpdatableRestriction['Updatable'];
+		/**
+		 * Finds out the paste button visibility. It can be visible when,
+		 * 1. The object page is editable AND
+		 * 2. Either the table should be insertable OR updatable
+		 * @param {object} oEntitySet Table's entity set info
+		 * @returns {boolean|string} Returns a boolean value for visibility or binding expression
+		 */
+		function fnGetPasteButtonVisibility (oEntitySet) {
+			var vInsertRestriction = fnGetRestrictionForPaste(oEntitySet, "Insertable");
+			var vUpdateRestriction = fnGetRestrictionForPaste(oEntitySet, "Updatable");
+
+			// If both the restrictions are boolean and falsy, paste button should be hidden.
+			// Hence, immediately return false
+			if (!(vInsertRestriction || vUpdateRestriction)) {
+				return false;
 			}
 
-			var sInsertablePath = oInsertableAnnotation ? oInsertableAnnotation.Path : "";
-			var sUpdatablePath = oUpdatableAnnotation ? oUpdatableAnnotation.Path : "";
+			// As we are going to combine insertable and updatable by OR condition, if there's any boolean value "true" found, it will be always evaluated to true
+			// Hence, no need to include them in the binding and just return the binding expression "ui>/editable"
+			var bAnyBooleanTrue = [vInsertRestriction, vUpdateRestriction].some(function (vRestriction) {
+				return vRestriction === true;
+			});
+			if (bAnyBooleanTrue) {
+				return "{ui>/editable}";
+			}
 			
-			if (sInsertablePath || sUpdatablePath) {
-				return {
-					insertable: sInsertablePath,
-					updatable: sUpdatablePath
-				};
+			// Now the remaining cases are either
+			// 1. Both are path expressions or
+			// 2. One path expression and one boolean value "false"
+			//
+			// While building OR expression, "${expression} || false" will always be evaluated to "${expression}"
+			// Hence, we can omit the "false" values and build binding expression with "Path" values
+			var sPathRestriction = [vInsertRestriction, vUpdateRestriction].filter(function (vRestriction) {
+				return (typeof vRestriction === "string");
+			}).map(function (sPath) {
+				return "${" + sPath + "}";
+			}).join(" || ");
+
+			// Add "editable" with "path" expression
+			return "{= ${ui>/editable} && ( " + sPathRestriction + " )}";
+		}
+
+		/**
+		 * Checks the navigation restriction on the parent entity set or current entity set 
+		 * and returns the boolean value or path for the restriction
+		 * 
+		 * 1. If NavigationRestriction is available on parent entity set
+		 * 	a. Restricted by boolean value - returns the boolean value
+		 *  b. Restricted by path - Checks the data type of path and returns it
+		 * 
+		 * 2. If Restriction is available on table's entity set
+		 *  a. Restricted by boolean value - returns the boolean value
+		 *  b. Restricted by path - ignores it
+		 *  Important: Reason for ignoring the path. As path value refers to the individual records on the table, it can't control the whole table's paste functionality
+		 * 
+		 * 3. If no restriction available, returns true
+		 * 
+		 * @param {object} oEntitySet Table's entity set info
+		 * @param {string} sRestrictionType "Insertable" or "Updatable"
+		 * @returns {boolean|string} Boolean value or path for the restriction 
+		 */
+		function fnGetRestrictionForPaste (oEntitySet, sRestrictionType) {
+			var mAnnotation = {
+				Insertable: "Org.OData.Capabilities.V1.InsertRestrictions",
+				Updatable: "Org.OData.Capabilities.V1.UpdateRestrictions"
+			};
+
+			// Navigation restriction on parent entity set
+			var oLeadingEntitySet = oMetaModel.getODataEntitySet(sLeadingEntitySet);
+			var oNavRestriction = AnnotationHelper.handleNavigationRestrictions(oMetaModel, oLeadingEntitySet, oEntitySet, sRestrictionType);
+			var oNavRestrictionAnnotation = oNavRestriction && oNavRestriction[sRestrictionType];
+
+			// Restriction on table entity set
+			var oSectionRestriction = oEntitySet[mAnnotation[sRestrictionType]];
+			var oSectionRestrictionAnnotation = oSectionRestriction && oSectionRestriction[sRestrictionType];
+
+			// Check for navigation restriction
+			if (oNavRestrictionAnnotation) {
+				if (oNavRestrictionAnnotation.Bool) {
+					return oNavRestrictionAnnotation.Bool !== "false";
+				} else if (oNavRestrictionAnnotation.Path) {
+					var bIsBooleanPath = AnnotationHelper._isPropertyPathBoolean(oMetaModel, oLeadingEntitySet.entityType, oNavRestrictionAnnotation.Path);
+					if (!bIsBooleanPath) {
+						oLogger.error("Service Broken: Restrictions annotations for entity type " + sLeadingEntitySet + " for section '" + sRestrictionType + "' are invalid.");
+						return false;
+					}
+					return oNavRestrictionAnnotation.Path;
+				}
+			} else if (oSectionRestrictionAnnotation && oSectionRestrictionAnnotation.Bool) {
+				return oSectionRestrictionAnnotation.Bool !== "false";
 			}
-			return null;
+			// If no annotation found, return true
+			return true;
 		}
 		
 		// used in the process of determining the visibility of export to excel and paste button depending on certain restrictions/conditions.

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

@@ -6,7 +6,7 @@
 		"type": "component",
 		"i18n": "i18n/i18n.properties",
 		"applicationVersion": {
-			"version": "1.124.6"
+			"version": "1.124.8"
 		},
 		"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.124.6"
+		"version": "1.124.8"
 	},
 	"title": "{{TITLE}}",
 	"description": "{{DESCRIPTION}}",

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

@@ -920,7 +920,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.UIComponent
 	 * @abstract
 	 * @author SAP SE
-	 * @version 1.124.6
+	 * @version 1.124.8
 	 * @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/i18n/i18n_es.properties

@@ -25,9 +25,9 @@ ST_SUCCESS=Con \u00E9xito
 
 ST_CHANGES_APPLIED=Se han aplicado las modificaciones
 
-DATA_LOSS_MESSAGE=Si sale se per.entr.
+DATA_LOSS_MESSAGE=Sus entradas se perder\u00E1n al abandonar esta p\u00E1gina.
 
-DATA_LOSS_GENERAL_MESSAGE=Si cont.se per.entr.
+DATA_LOSS_GENERAL_MESSAGE=Si contin\u00FAa se perder\u00E1n sus entradas.
 
 PROCEED=Continuar
 

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

@@ -3149,7 +3149,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.124.6
+	 * @version 1.124.8
 	 * @since 1.30.0
 	 * @alias sap.suite.ui.generic.template.lib.NavigationController
 	 */

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

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