@sapui5/sap.suite.ui.generic.template 1.120.15 → 1.120.17

package/package.json

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

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

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

@@ -388,16 +388,23 @@ sap.ui.define([
 					var oBindingParams = oEvent.getParameter("bindingParams");
 					if (oBindingParams.filters && oBindingParams.filters.length) {
 						/*
-						 * Add a new filter condition to always show all items that are just created. In case we are in a draft,
-						 * that just means to add "or HasActiveEntity = false". For active documents however, that condition
-						 * would always be true. Thus, we have to add
-						 * "or (HasActiveEntity = false and IsActiveEntity = false)".
-						 * However, this condition is not evaluated correctly by gateway, so we have to transform it to
-						 * (IsActiveEntity = true and x) or (Is ActiveEntity = false and (x or HasActiveEntity = false)),
-						 * where x is the condition provided by the user
+						 *Handling of the filter condition during edit or display:
+						 * 	Add a new filter condition to always show all items that are just created. In case we are in a draft,
+						 * 	that just means to add "or HasActiveEntity = false". For active documents however, that condition
+						 * 	would always be true. Thus, we have to add
+						 * 	"or (HasActiveEntity = false and IsActiveEntity = false)".
+						 * 	However, this condition is not evaluated correctly by gateway, so we have to transform it to
+						 *  (IsActiveEntity = true and x) or (Is ActiveEntity = false and (x or HasActiveEntity = false)),
+						 * 	where x is the condition provided by the user
+
+						 * Handling of the filter condition during create:
+						 *  checking the value of dispaly Mode , iDisplayMode = 4 for create 
+						 *  if it is a create the filter condition evaluates to the user filter x 
 						 */
 						var oUserFilter = FilterProcessor.groupFilters(oBindingParams.filters);
-						if (!oEvent.getParameter("messageFilterActive")) {
+						var oTemplatePrivateModel = oTemplateUtils.oComponentUtils.getTemplatePrivateModel();
+						var iDisplayMode = oTemplatePrivateModel.getProperty("/objectPage/displayMode");
+						if (!oEvent.getParameter("messageFilterActive") && !(iDisplayMode === 4) ){
 							oBindingParams.filters = new Filter({
 								filters: [
 									new Filter({

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

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

package/src/sap/suite/ui/generic/template/genericUtilities/controlStateWrapperFactory/SmartTableChartCommon.js

@@ -5,13 +5,13 @@ sap.ui.define([
     /**
      * Constructor for SmartTableChartCommon
      * ...
-     * @param {object} mParams 
+     * @param {object} mParams
      * @param mParams.oCustomFiltersWrapper - wrapper for custom filters (from SFB point of view)
-     *   (currently containing: generic (currently only editState), app extension, and adaptation extension - but this is knowledge of LR, i.e. of iAppStateHandler, not of SFB) 
-     * @returns
+     *   (currently containing: generic (currently only editState), app extension, and adaptation extension - but this is knowledge of LR, i.e. of iAppStateHandler, not of SFB)
+     * @returns {object}
      */
 
-    // deals with state of SFB itself, without SVM (see SmartVariantManagementWrapper) and go-button 
+    // deals with state of SFB itself, without SVM (see SmartVariantManagementWrapper) and go-button
     // (does not contain a state from SFB point of view - however, we remember whether it was pressed once
     // to restore data - this information is not considered being part of SFB)
     function SmartTableChartCommon(vTarget, oController, oFactory, sInitializationEvent) {
@@ -44,7 +44,7 @@ sap.ui.define([
             function fnSetState(oState) {
                 if (oState) {
                     if (!oState.oUiState) {
-                        // Legacy handling for state without additional level oUiState (created with 1.99.0 - 1.99.3). Could be relevant on LR and OP, and independent of VM 
+                        // Legacy handling for state without additional level oUiState (created with 1.99.0 - 1.99.3). Could be relevant on LR and OP, and independent of VM
                         oState = {
                             oUiState: oState
                         };
@@ -90,32 +90,38 @@ sap.ui.define([
         function fnGetState() {
             if (bSmartControlInitialized) {
                 if (oVariantManagementStateWrapper) {
-                    // oVariantManagementStateWrapper would be undefined only in cases SmartControl is not yet initialized 
-                    // or VariantManagement is not enabled. 
+                    // oVariantManagementStateWrapper would be undefined only in cases SmartControl is not yet initialized
+                    // or VariantManagement is not enabled.
                     return oVariantManagementStateWrapper.getState();
                 }
-                
+
                 if (oSmartControlStateWrapper && !bVariantManagementActive) {
-                    // VariantManagement is not turned on & SmartControlStateWrapper instance 
+                    // VariantManagement is not turned on & SmartControlStateWrapper instance
                     return oSmartControlStateWrapper.getState();
                 }
             }
-            
-            // Control is not available and StateWrapper is not initialized 
+
+            // Control is not available and StateWrapper is not initialized
             return oPreliminaryState;
         }
 
         function fnSetState(oState) {
             oPreliminaryState = oState;
             oControlAssignedPromise.then(function () {
-                // map legacy states - before separating VM state from state of managed control, inner state information 
-                // (presentation variant and selection variant) were put as oUiState on the same level as VM state 
+                // map legacy states - before separating VM state from state of managed control, inner state information
+                // (presentation variant and selection variant) were put as oUiState on the same level as VM state
                 // information (variant id and dirty indicator), now they are contained in map managedControlStates
-                if (oState && oState.oUiState && !oState.managedControlStates){
-                    oState.managedControlStates = Object.create(null);
-                    oState.managedControlStates[oSmartControlStateWrapper.getLocalId()] = {oUiState: oState.oUiState};
-                    oState.modified = oState.bVariantModified;
-                    oState.variantId = oState.sVariantId;
+                if (oState){
+                    if (oState.oUiState && !oState.managedControlStates) {
+                        oState.managedControlStates = Object.create(null);
+                        oState.managedControlStates[oSmartControlStateWrapper.getLocalId()] = {oUiState: oState.oUiState};
+                    }
+                    if (oState.bVariantModified !== undefined) {
+                        oState.modified = oState.bVariantModified;
+                    }
+                    if (oState.sVariantId !== undefined) {
+                      oState.variantId = oState.sVariantId;
+                    }
                 }
 
                 if (bVariantManagementActive) {
@@ -124,7 +130,7 @@ sap.ui.define([
                     return;
                 }
 
-                // SmartTable/Chart shall be used 
+                // SmartTable/Chart shall be used
                 oSmartControlStateWrapper.setState(oPreliminaryState);
             });
         }
@@ -155,7 +161,7 @@ sap.ui.define([
             // in each case) -thus, we better create and return a vm wrapper here, passing the inner wrapper (the same, we would create in the other cases).
             // Additionally, this simplifies the adaptation to the change of format (formerly, variant data and control data were mixed on same level)
 
-            // to identify the situation, check properties smartVariant and useVariantManagement. (In LR/ALP, we could directly check component settings controlling these properties, but not 
+            // to identify the situation, check properties smartVariant and useVariantManagement. (In LR/ALP, we could directly check component settings controlling these properties, but not
             // in OP, as they could be different per section. Checking control's properties would also incorporate UI changes, however, these properties are anyway not allowed to be changed.)
             // values:	smartVariant	useVariantManagement
             // a)			null			false				on LR currently: truthy (id of VM) and true - but PageVM is not created, and thus being ignored => adapt how properties are set in xml

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

@@ -922,7 +922,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.UIComponent
 	 * @abstract
 	 * @author SAP SE
-	 * @version 1.120.15
+	 * @version 1.120.17
 	 * @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/CRUDHelper.js

@@ -4,7 +4,7 @@ sap.ui.define(["sap/ui/model/Context", "sap/suite/ui/generic/template/lib/Messag
 
 		var oRejectedPromise = Promise.reject();
 		oRejectedPromise.catch(Function.prototype);
-		
+
 		function createNonDraft(oParentContext, sBindingPath, oModel, vPredefinedValues, bMakeRequestsCanonical) {
 			var oCreateContext = oModel.createEntry(sBindingPath, {
 				properties: vPredefinedValues,
@@ -184,7 +184,7 @@ sap.ui.define(["sap/ui/model/Context", "sap/suite/ui/generic/template/lib/Messag
 					MessageUtils.handleTransientMessages(oTemplateContract);
 				});
 			};
-			
+
 			var fnPropertyChanged = function(oEvent){
 				oTemplateContract.oTemplatePrivateGlobalModel.setProperty("/generic/draftIndicatorState", sap.m.DraftIndicatorState.Clear);
 
@@ -242,7 +242,7 @@ sap.ui.define(["sap/ui/model/Context", "sap/suite/ui/generic/template/lib/Messag
 					var oEditEntityPromise = oTransactionController.editEntity(oContext, false, sRootExpand);
 					resolve(oEditEntityPromise);
 					// The active context is invalidated as the DraftAdministrativeData of the context(the active context) has changed after draft creation.
-					// This is done to keep the DraftAdministrativeData of the record updated.					
+					// This is done to keep the DraftAdministrativeData of the record updated.
 					oEditEntityPromise.then(function(){
 						oModel.invalidateEntry(oContext);
 					});
@@ -331,8 +331,8 @@ sap.ui.define(["sap/ui/model/Context", "sap/suite/ui/generic/template/lib/Messag
 			oTemplateContract.oBusyHelper.setBusy(oRet, true);
 			return oRet;
 		}
-		
-		/* 
+
+		/*
 		Allows direct edit on the entires on the list, unlike the method 'edit'above, this method first edit the entry with preserveChanges as true
 		If the response indicates an unsaved change or locked record, a corresponding dialog is shown to proceed or cancel with the edit.
 		*/
@@ -346,7 +346,7 @@ sap.ui.define(["sap/ui/model/Context", "sap/suite/ui/generic/template/lib/Messag
 							oViewDependencyHelper.setRootPageToDirty();
 							resolve({
 								context: oResponse.context
-							});		
+							});
 						}, function(oResponse) {
 							if (oResponse && oResponse.response && oResponse.response.statusCode === "409") {
 								//remove transient message associated with rc 409 in order to prevent message pop-up
@@ -364,7 +364,7 @@ sap.ui.define(["sap/ui/model/Context", "sap/suite/ui/generic/template/lib/Messag
 													oViewDependencyHelper.setRootPageToDirty();
 													resolve({
 														context: oResponse.context
-													});	
+													});
 												});
 												oApplication.getBusyHelper().setBusy(oUnsavedChangesEditPromise, true);
 											};
@@ -393,7 +393,7 @@ sap.ui.define(["sap/ui/model/Context", "sap/suite/ui/generic/template/lib/Messag
 			});
 			return oPromise;
 		}
-		
+
 		function deleteEntity(oDraftController, fnExecuteDelete, oApplicationProxy, oContext, bIsActiveEntity, sActionType){
 			var bHasActiveEntity = oDraftController.hasActiveEntity(oContext);
 			var oSiblingPromise = bHasActiveEntity && !bIsActiveEntity ? oApplicationProxy.getDraftSiblingPromise(oContext) : Promise.resolve();
@@ -404,10 +404,10 @@ sap.ui.define(["sap/ui/model/Context", "sap/suite/ui/generic/template/lib/Messag
 						return  { context: oActive };
 					};
 					var oCancellationPromise = oDeletePromise.then(fnTransformActiveContext);
-					oApplicationProxy.cancellationStarted(oContext, oCancellationPromise, sActionType, oActive);					
+					oApplicationProxy.cancellationStarted(oContext, oCancellationPromise, sActionType, oActive);
 				}
 				return oDeletePromise;
-			});			
+			});
 		}
 
 		function discardDraft(oDraftController, oTransactionController, oApplicationProxy, oContext){
@@ -416,7 +416,7 @@ sap.ui.define(["sap/ui/model/Context", "sap/suite/ui/generic/template/lib/Messag
 			};
 			return deleteEntity(oDraftController, fnExecuteDelete, oApplicationProxy, oContext, false, "discardAction");
 		}
-		
+
 		function fnGetMessagesFromContextFilter(oContextFilter, oMessageManager, bExcludeETagMessages) {
 			var oMessageModel = oMessageManager.getMessageModel();
 			var oMessageBinding = oMessageModel.bindList("/", null, null, [oContextFilter]); // Note: It is necessary to create this binding each time, since UI5 does not update it (because there is no change handler)
@@ -425,7 +425,7 @@ sap.ui.define(["sap/ui/model/Context", "sap/suite/ui/generic/template/lib/Messag
 			});
 			if (bExcludeETagMessages){
 				aRet = aRet.filter(function(oMessage){
-					return !MessageUtils.isMessageETagMessage(oMessage);	
+					return !MessageUtils.isMessageETagMessage(oMessage);
 				});
 			}
 			return aRet;
@@ -479,7 +479,7 @@ sap.ui.define(["sap/ui/model/Context", "sap/suite/ui/generic/template/lib/Messag
 							// In case 2 and 3 it is expected that at least one of those messages is an error message.
 							// Note that in case 2 and possibly also in case 1 we need to suppress the generic error message (like "An exception has occurred") which is coming as a transient message to
 							// indicate that the activation request has failed.
-							// Note that case 3 has 2 subcases 
+							// Note that case 3 has 2 subcases
 							// 3a) Some severe technical error has happened which even prevented the Preparation call to be executed successfully
 							// 3b) The Preparation call was successful and did not find any reason which prevents activation. However, the call of activation failed.
 							//     Note that this failure may still be because of business reasons (excluding reasons named in case 1) or technical reasons.
@@ -526,12 +526,12 @@ sap.ui.define(["sap/ui/model/Context", "sap/suite/ui/generic/template/lib/Messag
 							var bHasStateError = aCurrentStateMessages.some(function(oMessage) {
 								return oMessage.type === "Error";
 							});
-							var bIsWarning = bIs412 && !bHasStateError;
+							var bHasStateWarning = aCurrentStateMessages.some(function(oMessage) {
+								return oMessage.type === "Warning";
+							});
+							var bIsWarning = bIs412 && !bHasStateError && (!!aTransientWarnings.length || bHasStateWarning);
 							if (bIsWarning) {
 								// Only show transient warnings in the confirmation popup if no state warning is available (note that backend sometimes sends warnings redundantly as transient and state message)
-								var bHasStateWarning = aCurrentStateMessages.some(function(oMessage) {
-									return oMessage.type === "Warning";
-								});
 								var aMessagesForUserDecision = bHasStateWarning ? aCurrentStateMessages : aTransientWarnings;
 								var oCustomMessageProvider = aCurrentStateMessages.length === 0 && { // if confirmation popup is to show transient messages these messages should be excluded from the
 									isCustomMessage: function (oMessage) {                             // normal handling of transient messages (until the confirmation popup is closed)
@@ -541,7 +541,7 @@ sap.ui.define(["sap/ui/model/Context", "sap/suite/ui/generic/template/lib/Messag
 								if (oCustomMessageProvider){
 									oServices.oApplication.registerCustomMessageProvider(oCustomMessageProvider);
 								}
-								oServices.oApplication.removeTransientMessages();								
+								oServices.oApplication.removeTransientMessages();
 								var fnOnConfirmationPopupClose = function(bConfirmed){
 									if (oCustomMessageProvider){ // if transient messages have been shown in the confirmation popup they can be removed from the message model when the confirmation popup is closed
 										oServices.oApplication.deregisterCustomMessageProvider(oCustomMessageProvider);
@@ -581,7 +581,7 @@ sap.ui.define(["sap/ui/model/Context", "sap/suite/ui/generic/template/lib/Messag
 					oBusyHelper.setBusy(oGetSiblingPromise);
 					oGetSiblingPromise.then(fnActivate.bind(null, false));
 				});
-			
+
 				oBusyHelper.setBusy(oActivationStartedPromise);
 			});
 			return oRet;

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.15
+	 * @version 1.120.17
 	 * @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.15",
+		version: "1.120.17",
 		extensions: {
 			//Configuration used for rule loading of Support Assistant
 			"sap.ui.support": {