@sapui5/sap.suite.ui.generic.template 1.114.11 → 1.114.12

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sapui5/sap.suite.ui.generic.template",
-  "version": "1.114.11",
+  "version": "1.114.12",
   "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.114.11</version>
+	<version>1.114.12</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.114.11"
+			"version": "1.114.12"
 		},
 		"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.114.11"
+			"version": "1.114.12"
 		},
 		"title": "Canvas",
 		"description": "Canvas Page",

package/src/sap/suite/ui/generic/template/ListReport/Component.js

@@ -62,8 +62,8 @@ sap.ui.define(["sap/ui/core/mvc/OverrideExecution",
 			adaptToChildContext: function(sCurrentChildContext) {
 				oViewProxy.adaptToChildContext(sCurrentChildContext);
 			},
-			refreshBinding: function(bUnconditional, mRefreshInfos) {
-				oViewProxy.refreshBinding(bUnconditional, mRefreshInfos);
+			refreshBinding: function(bUnconditional, mRefreshInfos,bWithoutAssociationsRefresh,fnRefreshCallback) {
+				oViewProxy.refreshBinding(bUnconditional, mRefreshInfos,fnRefreshCallback);
 			},
 			getItems: function(){
 				return oViewProxy.getItems();

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

@@ -527,14 +527,14 @@ sap.ui.define([
 						});
 					};
 
-					oViewProxy.refreshBinding = function (bUnconditional, mEntitySets) {
+					oViewProxy.refreshBinding = function (bUnconditional, mEntitySets,fnRefreshCallback) {
 						if (oState.oIappStateHandler.areDataShownInTable()) { // only if data are currently shown a refresh needs to be triggered
 							if (oState.oMultipleViewsHandler.refreshOperation(2, null, !bUnconditional && mEntitySets)) {
 								return; // multiple views handler has done the job
 							}
 							if (bUnconditional || mEntitySets[oController.getOwnerComponent().getEntitySet()]) {
 								oTemplateUtils.oCommonUtils.refreshModel(oController.getOwnerComponent().getEntitySet());
-								oState.oPresentationControlHandler.refresh();
+								oState.oPresentationControlHandler.refresh(undefined,undefined,fnRefreshCallback);
 							}
 						}
 					};

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

@@ -597,6 +597,18 @@ sap.ui.define([
 			return deepEqual(aFirstComparate.map(JSON.stringify).sort(), aSecondComparate.map(JSON.stringify).sort());
 		}
 
+		//Startup semantic date will be priortised in case of collision
+		function fnMergeSemanticDates(aSFBSemanticDate, aStartupSemanticDate){
+			var oSemanticDateMap = {};
+			aSFBSemanticDate.forEach(function(oVal) {
+				oSemanticDateMap[oVal.PropertyName] = oVal;
+			});
+			aStartupSemanticDate.forEach(function(oVal) {
+				oSemanticDateMap[oVal.PropertyName] = oVal;
+			});
+			return Object.values(oSemanticDateMap);
+		}
+
 		function fnAdaptToAppStateStartUpWithParameters(oAppData, oURLParameters, sPreferredQuickVariantSelectionKey){
 			handleVariantIdPassedViaURLParams(oURLParameters);
 			
@@ -611,7 +623,7 @@ sap.ui.define([
 					// In case semantic date field is present, parseNavigation returns semanticDates in stringified format and otherwise an empty object.
 					// Moreover, if there is no semanticDates retrieved from NavigationHandler, then the existing values of semantic
 					// dates properties considered by smartfilterbar (from annotation, change handler etc) should be taken into consideration.
-					semanticDates: (typeof oAppData.semanticDates === "string" ? JSON.parse(oAppData.semanticDates) : oAppData.semanticDates) || oSFBSemanticDates || {}
+					semanticDates: (typeof oAppData.semanticDates === "string" ? JSON.parse(oAppData.semanticDates) : oAppData.semanticDates) || {}
 			};
 			//Apply sort order coming from the XAppState to the smart table.
 			if (oAppData.presentationVariant !== undefined) {
@@ -637,9 +649,26 @@ sap.ui.define([
 					oController.modifyStartupExtension(oStartupObject);
 
 					oStartupObject.semanticDates = semanticDateRangeTypeHelper.addSemanticDateRangeDefaultValue(oSettings, oState.oSmartFilterbar, oStartupObject.semanticDates, oStartupObject.urlParameters, oStartupObject.selectionVariant);
+					var bSemanticDateEqual = deepEqual(oStartupObject.semanticDates, oSFBSemanticDates);
+					//Now we can merge the dates based on properties
+					if (oSFBSemanticDates && oSFBSemanticDates.Dates) {
+						oStartupObject.semanticDates.Dates = fnMergeSemanticDates(oSFBSemanticDates.Dates, oStartupObject.semanticDates.Dates);
+					}
 					// Smart filter bar all the filters will be replaced by the one which are coming from oUiState build base of oSelectionVariant where the Semantic Date Default Values
 					// is missing and because of that the values are replaced. Hence adding the semantic Dates to oSelectionVariant as mentioned by the Smart Control Colleague in the mentioned BCP
-					oStartupObject.semanticDates.Dates.forEach(function(oSelectDateOption){
+					oStartupObject.semanticDates.Dates.forEach(function(oSelectDateOption) {
+						var oSelectionDateOption = oStartupObject.selectionVariant.getSelectOption(oSelectDateOption.PropertyName);
+						var oSFBSelectionOption =  oSFBSelectionVariant.getSelectOption(oSelectDateOption.PropertyName);
+						//If startup object contains date range with the oSelectionDateOption PropertyName no need to override
+						if (oSelectionDateOption && oSelectionDateOption.length != 0) {
+							return;
+						}
+						//If SmartFilterBar has the property for that in that case add it to selectOption
+						if (oSFBSelectionOption && oSFBSelectionOption.length != 0) {
+							oStartupObject.selectionVariant.massAddSelectOption(oSelectDateOption.PropertyName,oSFBSelectionOption);
+							return;
+						}
+						//If none has in that case we will add the selectOption with empty value
 						oStartupObject.selectionVariant.addSelectOption(oSelectDateOption.PropertyName, "I", "EQ", "");
 					});
 
@@ -660,14 +689,15 @@ sap.ui.define([
 					var fnParameterExists = function (oParameter) {
 						return aParameterNames.includes(oParameter.PropertyName);
 					};
-
+					//Get variant merged will prioritize oStartupObject.selection variant
 					var oTargetSelectionVariant = listUtils.getMergedVariants([oSFBSelectionVariant, oStartupObject.selectionVariant]);
 					var aTargetSelectionVariantJSON = oTargetSelectionVariant.toJSONObject();
 
 					var oSFBSelectionVariantJSON = oSFBSelectionVariant.toJSONObject();
 					if (
 							!fnArrayContainsSameEnteries(oSFBSelectionVariantJSON.SelectOptions.filter(fnFilterItemExists), aTargetSelectionVariantJSON.SelectOptions.filter(fnFilterItemExists)) ||
-							!fnArrayContainsSameEnteries(oSFBSelectionVariantJSON.Parameters.filter(fnParameterExists), aTargetSelectionVariantJSON.Parameters.filter(fnParameterExists))
+							!fnArrayContainsSameEnteries(oSFBSelectionVariantJSON.Parameters.filter(fnParameterExists), aTargetSelectionVariantJSON.Parameters.filter(fnParameterExists)) ||
+							!bSemanticDateEqual
 					) {
 						fnApplySelectionVariantToSFB(oTargetSelectionVariant, oAppData.selectionVariant, true, oStartupObject.semanticDates, false);
 						oSmartVariantManagement.currentVariantSetModified(true);

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

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

@@ -854,7 +854,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.UIComponent
 	 * @abstract
 	 * @author SAP SE
-	 * @version 1.114.11
+	 * @version 1.114.12
 	 * @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/CommonEventHandlers.js

@@ -2108,7 +2108,22 @@ sap.ui.define(["sap/ui/base/Object",
 		 */
 		function CRUDManagerCallAction(mParams, oState, sEntitySet) {
 			var oResponse;
-
+			/*
+			After receiving the responses from the functionImport, we will refresh the table to retrieve the latest changes made in the backend.
+			However, the UI table can only refresh a fixed number of rows. If the user has selected the "selectAll" button or has chosen rows beyond the refresh limit, those rows will not be fetched, but the selections will still be present on those rows. 
+			This can lead to a user experience issue. To resolve this problem, we are removing the selections for all the rows.
+			*/
+			var oControl = mParams.sourceControl;
+			var  fnRefreshCallback = function() {
+				if (oControl && oControl.isA("sap.ui.table.Table")) {
+					var oSelectionPlugin = controlHelper.getSelectionPluginForUITable(oControl);
+					if (oSelectionPlugin) {
+						oSelectionPlugin.clearSelection();
+					} else {
+						oControl.clearSelection();
+					}
+				}
+			};
 			// only for oCustomData.Type === "com.sap.vocabularies.UI.v1.DataFieldForAction"
 			// DataFieldForIntentBasedNavigation separated within ToolbarButton.fragment, uses other event handler
 			// NO ITEM SELECTED: supported - if selection is required then button will be disabled via applicable-path otherwise the button will always be enabled
@@ -2120,7 +2135,7 @@ sap.ui.define(["sap/ui/base/Object",
 				oServices.oCRUDManager.callAction({
 					functionImportPath: mParams.functionImportPath,
 					contexts: mParams.contexts,
-					sourceControlHandler: oServices.oPresentationControlHandlerFactory.getPresentationControlHandler(oCommonUtils.getOwnerPresentationControl(mParams.sourceControl)),
+					sourceControlHandler: oServices.oPresentationControlHandlerFactory.getPresentationControlHandler(oCommonUtils.getOwnerPresentationControl(oControl)),
 					label: mParams.label,
 					operationGrouping: mParams.operationGrouping,
 					skipProperties: mParams.skipProperties
@@ -2131,7 +2146,7 @@ sap.ui.define(["sap/ui/base/Object",
 							if (oResponse.response && oResponse.context && (!oResponse.actionContext || oResponse.actionContext && oResponse.context.getPath() !== oResponse.actionContext.getPath())) {
 								//Delaying the content call of the component that triggered the action as it is not needed immediately as we have already navigated to the other component.
 								//We set the calling component to dirty which will trigger the refresh of the content once it is activated again.
-								oServices.oApplication.getBusyHelper().getUnbusy().then(oServices.oViewDependencyHelper.setMeToDirty.bind(null, oController.getOwnerComponent(), sEntitySet));
+								oServices.oApplication.getBusyHelper().getUnbusy().then(oServices.oViewDependencyHelper.setMeToDirty.bind(null, oController.getOwnerComponent(), sEntitySet,fnRefreshCallback));
 								break;
 							}
 						}

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

@@ -613,10 +613,10 @@ sap.ui.define(["sap/ui/base/Object",
 			}
 		}
 
-		function fnRefreshBinding(bUnconditional) {
+		function fnRefreshBinding(bUnconditional,fnRefreshCallback) {
 			bUnconditional = bUnconditional || oComponent.getIsRefreshRequired();
 			if (bUnconditional || !isEmptyObject(oComponentRegistryEntry.mRefreshInfos) || oComponentRegistryEntry.bWithoutAssociationsRefresh) {
-				(oComponentRegistryEntry.methods.refreshBinding || Function.prototype)(bUnconditional, oComponentRegistryEntry.mRefreshInfos, oComponentRegistryEntry.bWithoutAssociationsRefresh);
+				(oComponentRegistryEntry.methods.refreshBinding || Function.prototype)(bUnconditional, oComponentRegistryEntry.mRefreshInfos, oComponentRegistryEntry.bWithoutAssociationsRefresh,fnRefreshCallback);
 				oComponent.setIsRefreshRequired(false);
 				oComponentRegistryEntry.mRefreshInfos = Object.create(null);
 			}

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

@@ -759,8 +759,9 @@ sap.ui.define(["sap/ui/base/Object", "sap/base/util/each", "sap/base/util/extend
 							aKeysFromIdentity = oNewIdentity && oNewIdentity.keys;
 							var oNewIdentityContext = oModel.getContext(sCanonicalPath2) || oModel.createBindingContext(sCanonicalPath2);
 							var oNewIdentityContextInfo = oNewIdentityContext && fnCreateDraftInfo(oNewIdentityContext);
-							// if both oContextData1 and oContextData2 are active object then they are not identical as their canonicalPath didn't match 
-							if (oNewIdentityContext && !oNewIdentityContextInfo.bIsDraft) {
+							// if both oContextData1 and oContextData2 are active object then they are not identical as their canonicalPath didn't match
+							// If oContextData2 is a create draft they cannot be detected to be identical via the siblings as well, since create drafts do not possess siblings. Therefore, we resolve to false as well.
+							if (oNewIdentityContext && (!oNewIdentityContextInfo.bIsDraft || oNewIdentityContextInfo.bIsCreate)) {
 								fnResolve(false);
 							} else { // check whether oContextData1 and sCanonicalPath2 context are siblings
 								var oSiblingPromise = getDraftSiblingPromise(oContextData1.oContext);

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

@@ -41,19 +41,19 @@ sap.ui.define(["sap/ui/base/Object", "sap/suite/ui/generic/template/js/Annotatio
 		 * @param {Object} oComponent - the component that shall be set to dirty
 		 * @param {String} sEntitySet - only this navigation property is set to dirty
 		 */
-		function setMeToDirty(oComponent, sEntitySet) {
+		function setMeToDirty(oComponent, sEntitySet,fnRefreshCallback) {
 			if (sEntitySet) {
 				var oRegistryEntry = oTemplateContract.componentRegistry[oComponent.getId()];
 				var mRefreshInfos = oRegistryEntry.mRefreshInfos;
 				mRefreshInfos[sEntitySet] = true;
 				if (oRegistryEntry.utils.isComponentActive()){
-					oRegistryEntry.utils.refreshBinding();
+					oRegistryEntry.utils.refreshBinding(undefined,fnRefreshCallback);
 				}
 			} else if (oComponent.setIsRefreshRequired){
 				oComponent.setIsRefreshRequired(true);
 			}
 		}
-		
+          
 		function addSuccessorComponents(oTreeNode, aSuccessorComponents){
 			for (var i = 0; i < oTreeNode.children.length; i++){
 				var oChildNode = oTemplateContract.mEntityTree[oTreeNode.children[i]];

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

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

package/src/sap/suite/ui/generic/template/lib/presentationControl/SmartTableHandler.js

@@ -129,13 +129,16 @@ sap.ui.define([
 
 		/* @param {string} sBatchGroupId - Batch GroupId Id is used to merge the batch request
 		   @param {boolean} bNoMessageRefresh - can be used to surpress the refresh of the header messages in edit mode. Used in lazy loading.*/
-		function fnRefresh(sBatchGroupId, bNoMessageRefresh) {
+		function fnRefresh(sBatchGroupId, bNoMessageRefresh,fnRefreshCallback) {
 			var oBindingInfo = fnGetBindingInfo();
 			if (oBindingInfo && oBindingInfo.binding) {
 				return new Promise(function(fnResolve, fnReject){
 					var fnDataReceived = function(oEvent){
 						oBindingInfo.binding.detachDataReceived(fnDataReceived);
 						fnHandleReceivedEvent(fnResolve, fnReject, oEvent);
+						if (typeof fnRefreshCallback === "function") {
+							(fnRefreshCallback || Function.prototype)();
+						}
 					};
 					oBindingInfo.binding.attachDataReceived(fnDataReceived);
 					// Pass the BatchGroupId only if it is being supplied

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

@@ -38,7 +38,7 @@ sap.ui.define(['sap/ui/core/Core', 'sap/ui/core/library','sap/fe/placeholder/lib
 		interfaces: [],
 		controls: [],
 		elements: [],
-		version: "1.114.11",
+		version: "1.114.12",
 		extensions: {
 			//Configuration used for rule loading of Support Assistant
 			"sap.ui.support": {