@sapui5/sap.suite.ui.generic.template 1.120.22 → 1.120.23

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sapui5/sap.suite.ui.generic.template",
-  "version": "1.120.22",
+  "version": "1.120.23",
   "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.22</version>
+	<version>1.120.23</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.22"
+			"version": "1.120.23"
 		},
 		"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.22"
+			"version": "1.120.23"
 		},
 		"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.22"
+			"version": "1.120.23"
 		},
 		"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.22"
+			"version": "1.120.23"
 		},
 		"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.22"
+			"version": "1.120.23"
 		},
 		"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.22"
+		"version": "1.120.23"
 	},
 	"title": "{{TITLE}}",
 	"description": "{{DESCRIPTION}}",

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

@@ -5,8 +5,9 @@ sap.ui.define([
 	"sap/m/DynamicDateUtil",
 	"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) {
+	"sap/suite/ui/generic/template/genericUtilities/testableHelper",
+	"sap/ui/model/Filter"
+], function (FilterOperator, DateFormat, encodeURL, DynamicDateUtil, metadataAnalyser, CalendarType, testableHelper,Filter) {
     "use strict";
 
 	function getInfoForFilters(aFilters, getFilterInfoForPropertyFilters, bAnd){
@@ -260,6 +261,71 @@ sap.ui.define([
 		};
 	}
 
+/**
+	 * function wraps the table level filters into single filter object
+	 * This is done to follow the same format as SFB and chart filters 
+	 * returns the updated aFilters
+	 * @param {Array} aFilters - It contains all the filters applied (in SFB , chart or table level filters)
+	 * @returns {Array} - returns array containing all the filters applied including the table filters wrapped as single filter object similar to SFB and chart filters
+	 */
+
+	function fnNormaliseControlFilters(aFilters) {
+		var aTableFilters = [];
+
+		var aChartAndSFBFilters = [];
+
+		aFilters.forEach(function(oFilter){
+			if (oFilter.aFilters) {
+				aChartAndSFBFilters.push(oFilter);
+			} else {
+				aTableFilters.push(oFilter);
+			}
+		});
+
+		if (aTableFilters && aTableFilters.length > 1) {
+			//Grouping the table level filters based on sPath
+			var aGroupedTableFilters = aTableFilters.reduce(function
+				(aGroupedFilters, oCurrentfilter){
+					var path = oCurrentfilter.sPath;
+
+					if (!aGroupedFilters[path]) {
+						aGroupedFilters[path] = [];
+					}
+
+					aGroupedFilters[path].push(oCurrentfilter);
+
+					return aGroupedFilters;
+				},
+				{}
+			);
+
+			// Convert grouped table filters into nested filter groups
+
+			var aTableFilterGroups = Object.keys(aGroupedTableFilters).map(
+				function(sPath){
+					return new Filter({
+						filters: aGroupedTableFilters[sPath],
+
+						and: false // OR logic within each group
+					});
+				}
+			);
+
+			// Forming a single top-level table filter
+
+			aTableFilters = new Filter({
+				filters: aTableFilterGroups,
+
+				and: true // AND logic for combining everything
+			});
+
+			// combining filters from chart , SFB , and table
+			aChartAndSFBFilters.push(aTableFilters);
+			return aChartAndSFBFilters;
+		}
+
+		return aFilters;
+	}
 	/**
      * Function returns filter params for service url
      * @param {object} sEntityTypeName
@@ -274,6 +340,7 @@ sap.ui.define([
 			oFilterData: oFilterData,
 			bIsStatic: false
 		};
+		aApplicationFilters = fnNormaliseControlFilters(aApplicationFilters);
 		// 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;
@@ -281,6 +348,7 @@ sap.ui.define([
 	}
 	testableHelper.testableStatic(getFilterInfoForPropertyFilters, "filterHelper_getFilterInfoForPropertyFilters");
 	testableHelper.testableStatic(getFilterString, "filterHelper_getFilterString");
+	testableHelper.testableStatic(fnNormaliseControlFilters, "filterHelper_fnNormaliseControlFilters");
     return {
 		getFilterParams: getFilterParams
     };

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.22
+	 * @version 1.120.23
 	 * @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

@@ -216,7 +216,7 @@ sap.ui.define(["sap/ui/model/Context", "sap/suite/ui/generic/template/lib/Messag
 						]);
 				var sEdit =  oResourceObject.getText("Edit");
 				var sCancel =  oResourceObject.getText("CANCEL");
-					MessageBox.warning(sWarningText, {
+				MessageBox.warning(sWarningText, {
 					title: oResourceObject.getText("ST_UNSAVED_CHANGES_TITLE"),
 					actions: [sEdit, sCancel],
 					emphasizedAction: sEdit,
@@ -224,7 +224,7 @@ sap.ui.define(["sap/ui/model/Context", "sap/suite/ui/generic/template/lib/Messag
 						if (sAction === sEdit) {
 							resolve();
 						} else if (sAction === sCancel) {
-							if (bOpenInEditMode) {
+							if (bOpenInEditMode && oViewProxy && oViewProxy.navigateUp) {
 								oViewProxy.navigateUp();
 							}
 						}
@@ -368,7 +368,9 @@ sap.ui.define(["sap/ui/model/Context", "sap/suite/ui/generic/template/lib/Messag
 												});
 												oApplication.getBusyHelper().setBusy(oUnsavedChangesEditPromise, true);
 											};
-											var editRejection = Function.prototype;
+											var editRejection = reject({
+												cancelled: true
+											});
 											var unSavedChangesDialogPromise = fnUnsavedChangesDialog(undefined, oResponse.DraftAdministrativeData,oCommonUtils, oViewProxy, bOpenInEditMode);
 											unSavedChangesDialogPromise.then(editConfirmation,editRejection);
 										}

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

@@ -1589,6 +1589,10 @@ sap.ui.define(["sap/ui/base/Object",
 					if (oError.lockedByUser) {
 						var sLockText = oCommonUtils.getText("ST_GENERIC_DRAFT_LOCKED_BY_USER", [" ", oError.lockedByUser]);
 						MessageBox.error(sLockText);
+					} else if (oError.cancelled) {
+						if (oViewProxy && oViewProxy.navigateUp){
+							oViewProxy.navigateUp();
+						}
 					} else {
 						MessageUtils.handleError(MessageUtils.operations.editEntity, oController, oServices, oError);
 						if (oViewProxy && oViewProxy.navigateUp){

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

@@ -126,13 +126,17 @@ sap.ui.define(["sap/ui/base/Object", "sap/base/util/each", "sap/base/util/extend
 					var oTreeNode = oTemplateContract.mEntityTree[sEntitySet];
 					if (oTreeNode && !oTreeNode.noOData){
 						if (aKeysFromIdentity){
+							// Get the root context's info for the current draft context
+							oRootContextInfo = getRootContextInfo(oTreeNode, aKeysFromIdentity);
+							// If the current context is a draft, register context info for the active sibling as well
 							if (oContextInfo.bIsDraft){
 								var aActiveKeys = [];
 								var oActiveFoundPromise = oTemplateContract.oApplicationProxy.fillSiblingKeyPromise(oTreeNode, aKeysFromIdentity, aActiveKeys);
 								oActiveFoundPromise.then(function(oReplaceNode){
 									var sReplacePath = oReplaceNode.getPath(3, aActiveKeys);
-									if (!mPath2ContextData[sReplacePath]){
-										mPath2ContextData[sReplacePath] = {
+									var oActiveContextData = mPath2ContextData[sReplacePath];
+									if (!oActiveContextData){
+										oActiveContextData = {
 											oContextInfo: {
 												bIsDraft: false,
 												bIsDraftSupported: true,
@@ -142,30 +146,18 @@ sap.ui.define(["sap/ui/base/Object", "sap/base/util/each", "sap/base/util/extend
 											},
 											aKeysFromIdentity: aActiveKeys
 										};
+										// Finally add the active context data to the cache
+										mPath2ContextData[sReplacePath] = oActiveContextData;
+									}
+
+									// Fill rootContextInfo for the active context's data
+									if (!oActiveContextData.oRootContextInfo) {
+										oActiveContextData.oRootContextInfo = getRootContextInfo(oReplaceNode, aActiveKeys);
+										// Add the active context's data to root context info's children
+										oActiveContextData.oRootContextInfo.childContexts[sReplacePath] = oActiveContextData;
 									}
 								});	
 							}
-							if (oTreeNode && !oTreeNode.noOData){
-								var oMainObjectNode = oTemplateContract.oApplicationProxy.getAncestralNode(oTreeNode, 1);
-								var oActiveDraftInfoForDraftRoot = mActiveDraftRoots[oMainObjectNode.entitySet];
-								if (!oActiveDraftInfoForDraftRoot){
-									oActiveDraftInfoForDraftRoot = {
-										treeNode: oMainObjectNode,
-										draftRoots: Object.create(null)
-									};
-									mActiveDraftRoots[oMainObjectNode.entitySet] = oActiveDraftInfoForDraftRoot;
-								}
-								var sRootKey = aKeysFromIdentity[1];
-								oRootContextInfo = oActiveDraftInfoForDraftRoot[sRootKey];
-								if (!oRootContextInfo){
-									oRootContextInfo = {
-										treeNode: oMainObjectNode,
-										key: sRootKey,
-										childContexts: Object.create(null)
-									};
-									oActiveDraftInfoForDraftRoot[sRootKey] = oRootContextInfo;
-								}
-							}
 						}
 						var oModel = oContext.getModel();
 						var oMetaModel = oModel.getMetaModel();
@@ -201,6 +193,30 @@ sap.ui.define(["sap/ui/base/Object", "sap/base/util/each", "sap/base/util/extend
 				return oContextInfo;
 			}
 
+			// Gets the root context's info for the given tree node
+			function getRootContextInfo(oTreeNode, aKeysFromIdentity) {
+				var oMainObjectNode = oTemplateContract.oApplicationProxy.getAncestralNode(oTreeNode, 1);
+				var oActiveDraftInfoForDraftRoot = mActiveDraftRoots[oMainObjectNode.entitySet];
+				if (!oActiveDraftInfoForDraftRoot){
+					oActiveDraftInfoForDraftRoot = {
+						treeNode: oMainObjectNode,
+						draftRoots: Object.create(null)
+					};
+					mActiveDraftRoots[oMainObjectNode.entitySet] = oActiveDraftInfoForDraftRoot;
+				}
+				var sRootKey = aKeysFromIdentity[1];
+				var oRootContextInfo = oActiveDraftInfoForDraftRoot[sRootKey];
+				if (!oRootContextInfo){
+					oRootContextInfo = {
+						treeNode: oMainObjectNode,
+						key: sRootKey,
+						childContexts: Object.create(null)
+					};
+					oActiveDraftInfoForDraftRoot[sRootKey] = oRootContextInfo;
+				}
+				return oRootContextInfo;
+			}
+
 			function getPathOfLastShownDraftRoot() {
 				for (var i = aPathOfLastShownDraftRoots.length - 1; i >= 0; i--) {
 					var oContext = mPath2ContextData[aPathOfLastShownDraftRoots[i]].oContext;

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

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