@sap/open.fe 1.97.0 → 1.98.0

package/packages/sap.fe.templates/src/sap/fe/templates/ListReport/overrides/ViewState-dbg.js

@@ -13,9 +13,27 @@ sap.ui.define(
 		"sap/ui/mdc/p13n/StateUtil",
 		"sap/ui/Device",
 		"sap/ui/mdc/enum/ConditionValidated",
+		"sap/fe/macros/DelegateUtil",
+		"sap/fe/core/helpers/ModelHelper",
+		"sap/fe/macros/filter/FilterUtils",
+		"sap/fe/core/templating/PropertyFormatters",
 		"sap/base/Log"
 	],
-	function(CoreLibrary, NavLibrary, CommonUtils, KeepAliveHelper, ControlVariantApplyAPI, StateUtil, Device, ConditionValidated, Log) {
+	function(
+		CoreLibrary,
+		NavLibrary,
+		CommonUtils,
+		KeepAliveHelper,
+		ControlVariantApplyAPI,
+		StateUtil,
+		Device,
+		ConditionValidated,
+		DelegateUtil,
+		ModelHelper,
+		FilterUtils,
+		PropertyFormatters,
+		Log
+	) {
 		"use strict";
 
 		var NavType = NavLibrary.NavType,
@@ -23,6 +41,9 @@ sap.ui.define(
 			TemplateContentView = CoreLibrary.TemplateContentView,
 			InitialLoadMode = CoreLibrary.InitialLoadMode;
 
+		var FilterRestrictions = CommonUtils.FilterRestrictions,
+			CONDITION_PATH_TO_PROPERTY_PATH_REGEX = /\+|\*/g;
+
 		return {
 			applyInitialStateOnly: function() {
 				return true;
@@ -58,8 +79,7 @@ sap.ui.define(
 				var oView = this.getView(),
 					oController = oView.getController(),
 					oViewData = oView.getViewData(),
-					bControlVM = oViewData.variantManagement === VariantManagement.Control,
-					that = this;
+					bControlVM = oViewData.variantManagement === VariantManagement.Control;
 
 				if (oController._isMultiMode()) {
 					aStateControls.push(oController._getMultiModeControl());
@@ -77,9 +97,7 @@ sap.ui.define(
 					if (bControlVM) {
 						aStateControls.push(oTable.getVariant());
 					}
-					if (that.getView().getController().bTestAppState) {
-						aStateControls.push(oTable);
-					}
+					aStateControls.push(oTable);
 				});
 
 				if (oController._hasMultiVisualizations()) {
@@ -89,22 +107,6 @@ sap.ui.define(
 				aStateControls.push(oController._getFilterBarControl());
 				aStateControls.push(oView.byId("fe::ListReport"));
 			},
-			adaptControlStateHandler: function(oControl, aControlHandler) {
-				if (oControl.isA("sap.ui.fl.variants.VariantManagement")) {
-					aControlHandler.push({
-						retrieve: function(oVM) {
-							return {
-								"variantId": oVM.getCurrentVariantKey()
-							};
-						},
-						apply: function(oVM, oControlState) {
-							if (oControlState && oControlState.variantId !== undefined) {
-								oVM.setModified(true);
-							}
-						}
-					});
-				}
-			},
 			retrieveAdditionalStates: function(mAdditionalStates) {
 				var oView = this.getView(),
 					oController = oView.getController(),
@@ -331,10 +333,7 @@ sap.ui.define(
 				}
 				return oPromise.then(function(bClearFilterAndReplaceWithAppState) {
 					if (bClearFilterAndReplaceWithAppState) {
-						if (that.getView().getController().bTestAppState) {
-							return that._fnApplyConditions(oFilterBar, oConditions);
-						}
-						return that._fnClearFilterAndReplaceWithAppState(oFilterBar, oConditions);
+						return that._fnApplyConditions(oFilterBar, oConditions);
 					}
 				});
 			},
@@ -353,9 +352,35 @@ sap.ui.define(
 						}
 						delete oCondition.isEmpty;
 					};
+				var fnGetPropertyInfo = function(oFilterControl, sEntityTypePath) {
+					var sEntitySetPath = ModelHelper.getEntitySetPath(sEntityTypePath),
+						oMetaModel = oFilterControl.getModel().getMetaModel(),
+						oFR = CommonUtils.getFilterRestrictionsByPath(sEntitySetPath, oMetaModel),
+						aNonFilterableProps = oFR[FilterRestrictions.NON_FILTERABLE_PROPERTIES],
+						mFilterFields = FilterUtils.getConvertedFilterFields(oFilterControl, sEntityTypePath),
+						aPropertyInfo = [];
+					Object.keys(mFilterFields).forEach(function(sFilterFieldKey) {
+						var oConvertedProperty = mFilterFields[sFilterFieldKey];
+						var sPropertyPath = oConvertedProperty.conditionPath.replace(CONDITION_PATH_TO_PROPERTY_PATH_REGEX, "");
+						if (aNonFilterableProps.indexOf(sPropertyPath) === -1) {
+							var sAnnotationPath = oConvertedProperty.annotationPath;
+							var oPropertyContext = oMetaModel.createBindingContext(sAnnotationPath);
+							aPropertyInfo.push({
+								path: oConvertedProperty.conditionPath,
+								hiddenFilter: oConvertedProperty.availability === "Hidden",
+								hasValueHelp: !sAnnotationPath
+									? false
+									: PropertyFormatters.hasValueHelp(oPropertyContext.getObject(), { context: oPropertyContext })
+							});
+							return;
+						}
+					});
+					return aPropertyInfo;
+				};
 				return oFilterBar.initialized().then(function() {
-					oFilterBar
-						.getPropertyInfoSet()
+					var sEntityTypePath = DelegateUtil.getCustomData(oFilterBar, "entityType");
+					var aPropertyInfo = fnGetPropertyInfo(oFilterBar, sEntityTypePath);
+					aPropertyInfo
 						.filter(function(oPropertyInfo) {
 							return oPropertyInfo.path !== "$editState" && oPropertyInfo.path !== "$search";
 						})
@@ -378,9 +403,6 @@ sap.ui.define(
 						});
 					return StateUtil.applyExternalState(oFilterBar, { filter: mFilter, items: aItems });
 				});
-			},
-			_fnClearFilterAndReplaceWithAppState: function(oFilterBar, oConditions) {
-				return this._fnApplyConditions(oFilterBar, {}).then(this._fnApplyConditions.bind(this, oFilterBar, oConditions));
 			}
 		};
 	}

package/packages/sap.fe.templates/src/sap/fe/templates/ListReport/overrides/ViewState.js

@@ -3,4 +3,4 @@
         (c) Copyright 2009-2021 SAP SE. All rights reserved
     
  */
-sap.ui.define(["sap/fe/core/library","sap/fe/navigation/library","sap/fe/core/CommonUtils","sap/fe/core/helpers/KeepAliveHelper","sap/ui/fl/apply/api/ControlVariantApplyAPI","sap/ui/mdc/p13n/StateUtil","sap/ui/Device","sap/ui/mdc/enum/ConditionValidated","sap/base/Log"],function(C,N,a,K,b,S,D,c,L){"use strict";var d=N.NavType,V=C.VariantManagement,T=C.TemplateContentView,I=C.InitialLoadMode;return{applyInitialStateOnly:function(){return true;},onBeforeStateApplied:function(p){var v=this.getView(),o=v.getController(),f=o._getFilterBarControl(),t=o._getControls("table");f.setSuspendSelection(true);t.forEach(function(e){p.push(e.initialized());});p.push(f.initialized());delete this._bSearchTriggered;},onAfterStateApplied:function(){var v=this.getView(),o=v.getController();o._getFilterBarControl().setSuspendSelection(false);},adaptBindingRefreshControls:function(e){var v=this.getView(),o=v.getController(),f=o._getControls(),g=K.getControlsForRefresh(v,f);Array.prototype.push.apply(e,g);},adaptStateControls:function(s){var v=this.getView(),o=v.getController(),e=v.getViewData(),f=e.variantManagement===V.Control,t=this;if(o._isMultiMode()){s.push(o._getMultiModeControl());}var F=this._getFilterBarVM(v);if(F){s.push(F);}o._getControls("table").forEach(function(g){var q=g.getQuickFilter();if(q){s.push(q);}if(f){s.push(g.getVariant());}if(t.getView().getController().bTestAppState){s.push(g);}});if(o._hasMultiVisualizations()){s.push(o._getSegmentedButton(T.Chart));s.push(o._getSegmentedButton(T.Table));}s.push(o._getFilterBarControl());s.push(v.byId("fe::ListReport"));},adaptControlStateHandler:function(o,e){if(o.isA("sap.ui.fl.variants.VariantManagement")){e.push({retrieve:function(v){return{"variantId":v.getCurrentVariantKey()};},apply:function(v,f){if(f&&f.variantId!==undefined){v.setModified(true);}}});}},retrieveAdditionalStates:function(A){var v=this.getView(),o=v.getController(),p=v.getBindingContext("internal").getProperty("hasPendingFilters");A.dataLoaded=!p||!!this._bSearchTriggered;if(o._hasMultiVisualizations()){var s=v.getBindingContext("internal").getProperty("alpContentView");A.alpContentView=s;}delete this._bSearchTriggered;},applyAdditionalStates:function(A){var v=this.getView(),o=v.getController(),f=o._getFilterBarControl();if(A){if(A.dataLoaded===false){f._bSearchTriggered=false;}else if(A.dataLoaded===true){o._getFilterBarControl().triggerSearch();this._bSearchTriggered=true;}if(o._hasMultiVisualizations()){var i=v.getBindingContext("internal");if(!D.system.desktop&&A.alpContentView==T.Hybrid){A.alpContentView=T.Chart;}i.getModel().setProperty(i.getPath()+"/alpContentView",A.alpContentView);}}},applyNavigationParameters:function(n,r){var v=this.getView(),t=this,o=v.getController(),e=o.getOwnerComponent(),A=sap.ui.core.Component.getOwnerComponentFor(e),f=A.getComponentData(),s=(f&&f.startupParameters)||{},g=t.handleVariantIdPassedViaURLParams(s),F;g.then(function(h){if(h&&h.length>0){if(h[0]===true||h[1]===true){F=true;}}var R=t._applySelectionVariant(v,n,F).then(function(){var o=v.getController();var i=v.byId("fe::ListReport");var p=false;var j=t._getFilterBarVM(v);var k=o._getFilterBarControl();if((n.navigationType!==d.initial&&n.requiresStandardVariant)||(!j&&v.getViewData().initialLoad===I.Enabled)||o._shouldAutoTriggerSearch(j)){k.triggerSearch();}else{p=t._preventInitialSearch(j);}t._bSearchTriggered=!p;i.setHeaderExpanded(D.system.desktop||p);});r.push(R);}).catch(function(){L.error("Variant ID cannot be applied");});},handleVariantIdPassedViaURLParams:function(u){var p=u["sap-ui-fe-variant-id"],f=u["sap-ui-fe-filterbar-variant-id"],t=u["sap-ui-fe-table-variant-id"],v;if(p||f||t){v={sPageVariantId:p&&p[0],sFilterBarVariantId:f&&f[0],sTableVariantId:t&&t[0]};}return this._handleControlVariantId(v);},_handleControlVariantId:function(v){var o=this.getView(),p=[],t=this;var s=o.getViewData().variantManagement;if(v&&v.sPageVariantId&&s==="Page"){var e=o.byId("fe::PageVariantManagement");e.getVariants().forEach(function(h){if(h.key===v.sPageVariantId){p.push(t._applyControlVariant(e,v.sPageVariantId,true));}});}else if(v&&s==="Control"){if(v.sFilterBarVariantId){var e=o.byId(o.getContent()[0].data("filterBarVariantId"));e.getVariants().forEach(function(h){if(h.key===v.sFilterBarVariantId){p.push(t._applyControlVariant(e,v.sFilterBarVariantId,true));}});}if(v.sTableVariantId){var f=o.getController(),g=f._getControls("table");g.forEach(function(h){var i=h.getVariant();if(h&&i){i.getVariants().forEach(function(j){if(j.key===v.sTableVariantId){p.push(t._applyControlVariant(i,v.sTableVariantId));}});}});}}return Promise.all(p);},_applyControlVariant:function(v,s,f){var e=this._checkIfVariantIdIsAvailable(v,s)?s:v.getStandardVariantKey();var o=b.activateVariant({element:v,variantReference:e});return o.then(function(){return f;});},_getFilterBarVM:function(v){var o=v.getViewData();switch(o.variantManagement){case V.Page:return v.byId("fe::PageVariantManagement");case V.Control:return v.byId(v.getContent()[0].data("filterBarVariantId"));case V.None:return null;default:throw new Error("unhandled variant setting: "+o.variantManagement);}},_preventInitialSearch:function(v){if(!v){return true;}var e=v.getVariants();var o=e.find(function(i){return i.key===v.getCurrentVariantKey();});return!o.executeOnSelect;},_applySelectionVariant:function(v,n,f){var s=n.selectionVariant,o=n.selectionVariantDefaults;if(!s){return Promise.resolve();}var e={},m=v.getModel().getMetaModel(),g=v.getViewData(),h=g.contextPath||"/"+g.entitySet,F=v.byId(v.getContent()[0].data("filterBarId")),M=a.getMandatoryFilterFields(m,h),i,r=n.requiresStandardVariant;if(f){e=F.getConditions();}a.addDefaultDisplayCurrency(M,s,o);a.addSelectionVariantToConditions(s,e,m,h);switch(g.variantManagement){case V.Page:i=v.byId("fe::PageVariantManagement");break;case V.Control:i=v.byId(v.getContent()[0].data("filterBarVariantId"));break;case V.None:default:break;}return this._activateSelectionVariant(F,e,i,r,f);},_activateSelectionVariant:function(f,o,v,r,F){var t=this,p;if(v&&!F){var e=r?v.getStandardVariantKey():v.getDefaultVariantKey();if(e===null){e=v.getId();}p=b.activateVariant({element:v,variantReference:e}).then(function(){return r||v.getDefaultVariantKey()===v.getStandardVariantKey();});}else{p=Promise.resolve(true);}return p.then(function(g){if(g){if(t.getView().getController().bTestAppState){return t._fnApplyConditions(f,o);}return t._fnClearFilterAndReplaceWithAppState(f,o);}});},_fnApplyConditions:function(f,o){var F={},i=[],A=function(e){e.validated=c.Validated;if(e.operator==="Empty"){e.operator="EQ";e.values=[""];}else if(e.operator==="NotEmpty"){e.operator="NE";e.values=[""];}delete e.isEmpty;};return f.initialized().then(function(){f.getPropertyInfoSet().filter(function(p){return p.path!=="$editState"&&p.path!=="$search";}).forEach(function(p){if(p.path in o){F[p.path]=o[p.path];if(!p.hiddenFilter){i.push({name:p.path});}if(p.hasValueHelp){F[p.path].forEach(A);}else{F[p.path].forEach(function(e){e.validated=c.NotValidated;});}}else{F[p.path]=[];}});return S.applyExternalState(f,{filter:F,items:i});});},_fnClearFilterAndReplaceWithAppState:function(f,o){return this._fnApplyConditions(f,{}).then(this._fnApplyConditions.bind(this,f,o));}};});
+sap.ui.define(["sap/fe/core/library","sap/fe/navigation/library","sap/fe/core/CommonUtils","sap/fe/core/helpers/KeepAliveHelper","sap/ui/fl/apply/api/ControlVariantApplyAPI","sap/ui/mdc/p13n/StateUtil","sap/ui/Device","sap/ui/mdc/enum/ConditionValidated","sap/fe/macros/DelegateUtil","sap/fe/core/helpers/ModelHelper","sap/fe/macros/filter/FilterUtils","sap/fe/core/templating/PropertyFormatters","sap/base/Log"],function(C,N,a,K,b,S,D,c,d,M,F,P,L){"use strict";var e=N.NavType,V=C.VariantManagement,T=C.TemplateContentView,I=C.InitialLoadMode;var f=a.FilterRestrictions,g=/\+|\*/g;return{applyInitialStateOnly:function(){return true;},onBeforeStateApplied:function(p){var v=this.getView(),o=v.getController(),h=o._getFilterBarControl(),t=o._getControls("table");h.setSuspendSelection(true);t.forEach(function(i){p.push(i.initialized());});p.push(h.initialized());delete this._bSearchTriggered;},onAfterStateApplied:function(){var v=this.getView(),o=v.getController();o._getFilterBarControl().setSuspendSelection(false);},adaptBindingRefreshControls:function(h){var v=this.getView(),o=v.getController(),i=o._getControls(),j=K.getControlsForRefresh(v,i);Array.prototype.push.apply(h,j);},adaptStateControls:function(s){var v=this.getView(),o=v.getController(),h=v.getViewData(),i=h.variantManagement===V.Control;if(o._isMultiMode()){s.push(o._getMultiModeControl());}var j=this._getFilterBarVM(v);if(j){s.push(j);}o._getControls("table").forEach(function(t){var q=t.getQuickFilter();if(q){s.push(q);}if(i){s.push(t.getVariant());}s.push(t);});if(o._hasMultiVisualizations()){s.push(o._getSegmentedButton(T.Chart));s.push(o._getSegmentedButton(T.Table));}s.push(o._getFilterBarControl());s.push(v.byId("fe::ListReport"));},retrieveAdditionalStates:function(A){var v=this.getView(),o=v.getController(),p=v.getBindingContext("internal").getProperty("hasPendingFilters");A.dataLoaded=!p||!!this._bSearchTriggered;if(o._hasMultiVisualizations()){var s=v.getBindingContext("internal").getProperty("alpContentView");A.alpContentView=s;}delete this._bSearchTriggered;},applyAdditionalStates:function(A){var v=this.getView(),o=v.getController(),h=o._getFilterBarControl();if(A){if(A.dataLoaded===false){h._bSearchTriggered=false;}else if(A.dataLoaded===true){o._getFilterBarControl().triggerSearch();this._bSearchTriggered=true;}if(o._hasMultiVisualizations()){var i=v.getBindingContext("internal");if(!D.system.desktop&&A.alpContentView==T.Hybrid){A.alpContentView=T.Chart;}i.getModel().setProperty(i.getPath()+"/alpContentView",A.alpContentView);}}},applyNavigationParameters:function(n,r){var v=this.getView(),t=this,o=v.getController(),h=o.getOwnerComponent(),A=sap.ui.core.Component.getOwnerComponentFor(h),i=A.getComponentData(),s=(i&&i.startupParameters)||{},j=t.handleVariantIdPassedViaURLParams(s),k;j.then(function(l){if(l&&l.length>0){if(l[0]===true||l[1]===true){k=true;}}var R=t._applySelectionVariant(v,n,k).then(function(){var o=v.getController();var m=v.byId("fe::ListReport");var p=false;var q=t._getFilterBarVM(v);var u=o._getFilterBarControl();if((n.navigationType!==e.initial&&n.requiresStandardVariant)||(!q&&v.getViewData().initialLoad===I.Enabled)||o._shouldAutoTriggerSearch(q)){u.triggerSearch();}else{p=t._preventInitialSearch(q);}t._bSearchTriggered=!p;m.setHeaderExpanded(D.system.desktop||p);});r.push(R);}).catch(function(){L.error("Variant ID cannot be applied");});},handleVariantIdPassedViaURLParams:function(u){var p=u["sap-ui-fe-variant-id"],h=u["sap-ui-fe-filterbar-variant-id"],t=u["sap-ui-fe-table-variant-id"],v;if(p||h||t){v={sPageVariantId:p&&p[0],sFilterBarVariantId:h&&h[0],sTableVariantId:t&&t[0]};}return this._handleControlVariantId(v);},_handleControlVariantId:function(v){var o=this.getView(),p=[],t=this;var s=o.getViewData().variantManagement;if(v&&v.sPageVariantId&&s==="Page"){var h=o.byId("fe::PageVariantManagement");h.getVariants().forEach(function(k){if(k.key===v.sPageVariantId){p.push(t._applyControlVariant(h,v.sPageVariantId,true));}});}else if(v&&s==="Control"){if(v.sFilterBarVariantId){var h=o.byId(o.getContent()[0].data("filterBarVariantId"));h.getVariants().forEach(function(k){if(k.key===v.sFilterBarVariantId){p.push(t._applyControlVariant(h,v.sFilterBarVariantId,true));}});}if(v.sTableVariantId){var i=o.getController(),j=i._getControls("table");j.forEach(function(k){var l=k.getVariant();if(k&&l){l.getVariants().forEach(function(m){if(m.key===v.sTableVariantId){p.push(t._applyControlVariant(l,v.sTableVariantId));}});}});}}return Promise.all(p);},_applyControlVariant:function(v,s,h){var i=this._checkIfVariantIdIsAvailable(v,s)?s:v.getStandardVariantKey();var o=b.activateVariant({element:v,variantReference:i});return o.then(function(){return h;});},_getFilterBarVM:function(v){var o=v.getViewData();switch(o.variantManagement){case V.Page:return v.byId("fe::PageVariantManagement");case V.Control:return v.byId(v.getContent()[0].data("filterBarVariantId"));case V.None:return null;default:throw new Error("unhandled variant setting: "+o.variantManagement);}},_preventInitialSearch:function(v){if(!v){return true;}var h=v.getVariants();var o=h.find(function(i){return i.key===v.getCurrentVariantKey();});return!o.executeOnSelect;},_applySelectionVariant:function(v,n,h){var s=n.selectionVariant,o=n.selectionVariantDefaults;if(!s){return Promise.resolve();}var i={},m=v.getModel().getMetaModel(),j=v.getViewData(),k=j.contextPath||"/"+j.entitySet,l=v.byId(v.getContent()[0].data("filterBarId")),p=a.getMandatoryFilterFields(m,k),q,r=n.requiresStandardVariant;if(h){i=l.getConditions();}a.addDefaultDisplayCurrency(p,s,o);a.addSelectionVariantToConditions(s,i,m,k);switch(j.variantManagement){case V.Page:q=v.byId("fe::PageVariantManagement");break;case V.Control:q=v.byId(v.getContent()[0].data("filterBarVariantId"));break;case V.None:default:break;}return this._activateSelectionVariant(l,i,q,r,h);},_activateSelectionVariant:function(o,h,v,r,i){var t=this,p;if(v&&!i){var j=r?v.getStandardVariantKey():v.getDefaultVariantKey();if(j===null){j=v.getId();}p=b.activateVariant({element:v,variantReference:j}).then(function(){return r||v.getDefaultVariantKey()===v.getStandardVariantKey();});}else{p=Promise.resolve(true);}return p.then(function(k){if(k){return t._fnApplyConditions(o,h);}});},_fnApplyConditions:function(o,h){var m={},i=[],A=function(j){j.validated=c.Validated;if(j.operator==="Empty"){j.operator="EQ";j.values=[""];}else if(j.operator==="NotEmpty"){j.operator="NE";j.values=[""];}delete j.isEmpty;};var G=function(j,E){var s=M.getEntitySetPath(E),k=j.getModel().getMetaModel(),l=a.getFilterRestrictionsByPath(s,k),n=l[f.NON_FILTERABLE_PROPERTIES],p=F.getConvertedFilterFields(j,E),q=[];Object.keys(p).forEach(function(r){var t=p[r];var u=t.conditionPath.replace(g,"");if(n.indexOf(u)===-1){var v=t.annotationPath;var w=k.createBindingContext(v);q.push({path:t.conditionPath,hiddenFilter:t.availability==="Hidden",hasValueHelp:!v?false:P.hasValueHelp(w.getObject(),{context:w})});return;}});return q;};return o.initialized().then(function(){var E=d.getCustomData(o,"entityType");var p=G(o,E);p.filter(function(j){return j.path!=="$editState"&&j.path!=="$search";}).forEach(function(j){if(j.path in h){m[j.path]=h[j.path];if(!j.hiddenFilter){i.push({name:j.path});}if(j.hasValueHelp){m[j.path].forEach(A);}else{m[j.path].forEach(function(k){k.validated=c.NotValidated;});}}else{m[j.path]=[];}});return S.applyExternalState(o,{filter:m,items:i});});}};});

package/packages/sap.fe.templates/src/sap/fe/templates/ListReport/resources.json

@@ -12,25 +12,25 @@
 		},
 		{
 			"name": "ExtensionAPI-dbg.js",
-			"size": 3939,
+			"size": 3936,
 			"isDebug": true
 		},
 		{
 			"name": "ExtensionAPI.js",
-			"size": 1066
+			"size": 1063
 		},
 		{
 			"name": "ListReport.view.xml",
-			"size": 10428
+			"size": 10455
 		},
 		{
 			"name": "ListReportController-dbg.controller.js",
-			"size": 35868,
+			"size": 35647,
 			"isDebug": true
 		},
 		{
 			"name": "ListReportController.controller.js",
-			"size": 16719
+			"size": 16793
 		},
 		{
 			"name": "manifest.json",
@@ -38,30 +38,39 @@
 		},
 		{
 			"name": "overrides/IntentBasedNavigation-dbg.js",
-			"size": 2140,
+			"size": 2381,
 			"isDebug": true
 		},
 		{
 			"name": "overrides/IntentBasedNavigation.js",
-			"size": 995
+			"size": 1128
+		},
+		{
+			"name": "overrides/MassEdit-dbg.js",
+			"size": 3224,
+			"isDebug": true
+		},
+		{
+			"name": "overrides/MassEdit.js",
+			"size": 1732
 		},
 		{
 			"name": "overrides/Share-dbg.js",
-			"size": 4656,
+			"size": 4928,
 			"isDebug": true
 		},
 		{
 			"name": "overrides/Share.js",
-			"size": 2089
+			"size": 2254
 		},
 		{
 			"name": "overrides/ViewState-dbg.js",
-			"size": 14886,
+			"size": 15798,
 			"isDebug": true
 		},
 		{
 			"name": "overrides/ViewState.js",
-			"size": 7368
+			"size": 7557
 		},
 		{
 			"name": "view/fragments/CollectionVisualization.fragment.xml",

package/packages/sap.fe.templates/src/sap/fe/templates/ObjectPage/AnnotationHelper-dbg.js

@@ -448,6 +448,26 @@ sap.ui.define(
 						return undefined;
 					}
 				}
+			},
+			isSubSectionTitleVisible: function(sSubSectionvisible, sSubSectiontitle, sSubSectionshowTitle) {
+				if (sSubSectionvisible.indexOf("{=") === 0) {
+					// Dynamic expression
+					var sExpressionResult = sSubSectionvisible.substring(
+						sSubSectionvisible.indexOf("{=") + 2,
+						sSubSectionvisible.lastIndexOf("}")
+					);
+					return (
+						"{= (" +
+						sExpressionResult +
+						") && ('" +
+						sSubSectiontitle +
+						"' !=='undefined') && (" +
+						sSubSectionshowTitle +
+						" ? true : false) }"
+					);
+				} else {
+					return sSubSectionvisible && sSubSectiontitle !== "undefined" && (sSubSectionshowTitle ? true : false);
+				}
 			}
 		};
 

package/packages/sap.fe.templates/src/sap/fe/templates/ObjectPage/AnnotationHelper.js

@@ -3,4 +3,4 @@
         (c) Copyright 2009-2021 SAP SE. All rights reserved
     
  */
-sap.ui.define(["sap/ui/model/odata/v4/AnnotationHelper","sap/ui/base/ManagedObject","sap/fe/macros/CommonHelper"],function(O,M,C){"use strict";var A={getElementBinding:function(p){var n=O.getNavigationPath(p);if(n){return"{path:'"+n+"'}";}else{return"{path: ''}";}},checkDraftState:function(a){if(a["@com.sap.vocabularies.Common.v1.DraftRoot"]&&a["@com.sap.vocabularies.Common.v1.DraftRoot"]["EditAction"]){return true;}else{return false;}},getSwitchToActiveVisibility:function(a){if(this.checkDraftState(a)){return"{= (${ui>/editMode} === 'Editable') && !${ui>createMode} && %{DraftAdministrativeData/DraftIsCreatedByMe} }";}else{return false;}},getSwitchToDraftVisibility:function(a){if(this.checkDraftState(a)){return"{= !(${ui>/editMode} === 'Editable') && !${ui>createMode} && (${HasDraftEntity} && %{DraftAdministrativeData/DraftIsCreatedByMe}) }";}else{return false;}},_findAction:function(c,a){var o;if(c&&c.length){o=c.find(function(h){return h.type===a;});}return o;},getDeleteCommandExecutionEnabled:function(c){var d=A._findAction(c,"Secondary");return d?d.enabled:"true";},getDeleteCommandExecutionVisible:function(c){var d=A._findAction(c,"Secondary");return d?d.visible:"true";},getEditCommandExecutionVisible:function(c){var e=A._findAction(c,"Primary");return e?e.visible:"true";},getEditCommandExecutionEnabled:function(c){var e=A._findAction(c,"Primary");return e?e.enabled:"true";},getEditAction:function(e){var p=e.getPath(),a=e.getObject(p+"@");var d=a.hasOwnProperty("@com.sap.vocabularies.Common.v1.DraftRoot");var s=a.hasOwnProperty("@com.sap.vocabularies.Session.v1.StickySessionSupported");var b;if(d){b=e.getObject(p+"@com.sap.vocabularies.Common.v1.DraftRoot/EditAction");}else if(s){b=e.getObject(p+"@com.sap.vocabularies.Session.v1.StickySessionSupported/EditAction");}return!b?b:p+"/"+b;},isReadOnlyFromStaticAnnotations:function(a,f){var c,i,r;if(a["@Org.OData.Core.V1.Computed"]){c=a["@Org.OData.Core.V1.Computed"].Bool?a["@Org.OData.Core.V1.Computed"].Bool=="true":true;}if(a["@Org.OData.Core.V1.Immutable"]){i=a["@Org.OData.Core.V1.Immutable"].Bool?a["@Org.OData.Core.V1.Immutable"].Bool=="true":true;}r=c||i;if(f){r=r||f=="com.sap.vocabularies.Common.v1.FieldControlType/ReadOnly";}if(r){return false;}else{return true;}},isReadOnlyFromDynamicAnnotations:function(f){var i;if(f){if(M.bindingParser(f)){i="$"+f+" === '1'";}}if(i){return"{= "+i+"? false : true }";}else{return true;}},getExpressionForMicroChartTitlePress:function(c,m,s){if(c){if((c["targetOutbound"]&&c["targetOutbound"]["outbound"])||(c["targetOutbound"]&&c["targetOutbound"]["outbound"]&&c["targetSections"])){return(".handlers.onDataPointTitlePressed($controller, ${$source>/},'"+JSON.stringify(m)+"','"+c["targetOutbound"]["outbound"]+"','"+s+"' )");}else if(c["targetSections"]){return".handlers.navigateToSubSection($controller, '"+JSON.stringify(c["targetSections"])+"')";}else{return undefined;}}},getMicroChartTitleAsLink:function(c){if(c&&(c["targetOutbound"]||(c["targetOutbound"]&&c["targetSections"]))){return"External";}else if(c&&c["targetSections"]){return"InPage";}else{return"None";}},getGroupIdFromConfig:function(c,a,d){var o=c[a],b=["Heroes","Decoration","Workers","LongRunners"],g=d;if(o&&o.requestGroupId&&b.some(function(e){return e===o.requestGroupId;})){g="$auto."+o.requestGroupId;}return g;},getBindingWithGroupIdFromConfig:function(c,k){var g=A.getGroupIdFromConfig(c,k),b;if(g){b="{ path : '', parameters : { $$groupId : '"+g+"' } }";}return b;},doesFieldGroupContainOnlyOneMultiLineDataField:function(f){return f&&f.length===1&&!!f[0].isValueMultilineText;},getVisibleExpressionForBreadcrumbs:function(v){return v.showBreadCrumbs&&v.fclEnabled!==undefined?"{fclhelper>/breadCrumbIsVisible}":v.showBreadCrumbs;},getShareButtonVisibility:function(v){var s="!${ui>createMode}";if(v.fclEnabled){s="${fclhelper>/showShareIcon} && "+s;}return"{= "+s+" }";},getVisiblityOfHeaderFacet:function(a,f){return(A.isReadOnlyFromStaticAnnotations(a,f)&&A.isReadOnlyFromDynamicAnnotations(f));},getPressExpressionForDelete:function(e){var d="${$view>/getBindingContext}",t="${$view>/#fe::ObjectPage/getHeaderTitle/getExpandedHeading/getItems/1/getText}",D="${$view>/#fe::ObjectPage/getHeaderTitle/getExpandedContent/0/getItems/0/getText}";var p={title:t,entitySetName:C.addSingleQuotes(e),description:D};return C.generateFunction(".editFlow.deleteDocument",d,C.objectToString(p));},getPressExpressionForEdit:function(d,e,h){var E=C.addSingleQuotes(d&&d.Action),D=d&&d.InvocationGrouping&&d.InvocationGrouping["$EnumMember"],i=D==="com.sap.vocabularies.UI.v1.OperationGroupingType/ChangeSet"?"ChangeSet":"Isolated";var p={contexts:"${$view>/getBindingContext}",entitySetName:C.addSingleQuotes(e),invocationGrouping:C.addSingleQuotes(i),model:"${$source>/}.getModel()",label:C.addSingleQuotes(d&&d.Label,true),isNavigable:h&&h.isNavigable,defaultValuesExtensionFunction:h&&h.defaultValuesExtensionFunction?"'"+h.defaultValuesExtensionFunction+"'":undefined};return C.generateFunction(".handlers.onCallAction","${$view>/}",E,C.objectToString(p));},getPressExpressionForFooterAnnotationAction:function(d,e,h){var a=C.addSingleQuotes(d&&d.Action),D=d&&d.InvocationGrouping&&d.InvocationGrouping["$EnumMember"],i=D==="com.sap.vocabularies.UI.v1.OperationGroupingType/ChangeSet"?"ChangeSet":"Isolated";var p={contexts:"${$view>/#fe::ObjectPage/}.getBindingContext()",entitySetName:C.addSingleQuotes(e),invocationGrouping:C.addSingleQuotes(i),model:"${$source>/}.getModel()",label:C.addSingleQuotes(d&&d.Label,true),isNavigable:h&&h.isNavigable,defaultValuesExtensionFunction:h&&h.defaultValuesExtensionFunction?"'"+h.defaultValuesExtensionFunction+"'":undefined};return C.generateFunction(".handlers.onCallAction","${$view>/}",a,C.objectToString(p));},getStashableHBoxBinding:function(c,h){if(h&&h.Facet&&h.Facet.targetAnnotationType==="DataPoint"){return A.getBindingWithGroupIdFromConfig(c,h.Facet.targetAnnotationValue);}},getPressExpressionForLink:function(c,m){if(c){if(c["targetOutbound"]&&c["targetOutbound"]["outbound"]){return(".handlers.onDataPointTitlePressed($controller, ${$source>}, "+JSON.stringify(m)+","+JSON.stringify(c["targetOutbound"]["outbound"])+")");}else if(c["targetSections"]){return".handlers.navigateToSubSection($controller, '"+JSON.stringify(c["targetSections"])+"')";}else{return undefined;}}}};return A;},true);
+sap.ui.define(["sap/ui/model/odata/v4/AnnotationHelper","sap/ui/base/ManagedObject","sap/fe/macros/CommonHelper"],function(O,M,C){"use strict";var A={getElementBinding:function(p){var n=O.getNavigationPath(p);if(n){return"{path:'"+n+"'}";}else{return"{path: ''}";}},checkDraftState:function(a){if(a["@com.sap.vocabularies.Common.v1.DraftRoot"]&&a["@com.sap.vocabularies.Common.v1.DraftRoot"]["EditAction"]){return true;}else{return false;}},getSwitchToActiveVisibility:function(a){if(this.checkDraftState(a)){return"{= (${ui>/editMode} === 'Editable') && !${ui>createMode} && %{DraftAdministrativeData/DraftIsCreatedByMe} }";}else{return false;}},getSwitchToDraftVisibility:function(a){if(this.checkDraftState(a)){return"{= !(${ui>/editMode} === 'Editable') && !${ui>createMode} && (${HasDraftEntity} && %{DraftAdministrativeData/DraftIsCreatedByMe}) }";}else{return false;}},_findAction:function(c,a){var o;if(c&&c.length){o=c.find(function(h){return h.type===a;});}return o;},getDeleteCommandExecutionEnabled:function(c){var d=A._findAction(c,"Secondary");return d?d.enabled:"true";},getDeleteCommandExecutionVisible:function(c){var d=A._findAction(c,"Secondary");return d?d.visible:"true";},getEditCommandExecutionVisible:function(c){var e=A._findAction(c,"Primary");return e?e.visible:"true";},getEditCommandExecutionEnabled:function(c){var e=A._findAction(c,"Primary");return e?e.enabled:"true";},getEditAction:function(e){var p=e.getPath(),a=e.getObject(p+"@");var d=a.hasOwnProperty("@com.sap.vocabularies.Common.v1.DraftRoot");var s=a.hasOwnProperty("@com.sap.vocabularies.Session.v1.StickySessionSupported");var b;if(d){b=e.getObject(p+"@com.sap.vocabularies.Common.v1.DraftRoot/EditAction");}else if(s){b=e.getObject(p+"@com.sap.vocabularies.Session.v1.StickySessionSupported/EditAction");}return!b?b:p+"/"+b;},isReadOnlyFromStaticAnnotations:function(a,f){var c,i,r;if(a["@Org.OData.Core.V1.Computed"]){c=a["@Org.OData.Core.V1.Computed"].Bool?a["@Org.OData.Core.V1.Computed"].Bool=="true":true;}if(a["@Org.OData.Core.V1.Immutable"]){i=a["@Org.OData.Core.V1.Immutable"].Bool?a["@Org.OData.Core.V1.Immutable"].Bool=="true":true;}r=c||i;if(f){r=r||f=="com.sap.vocabularies.Common.v1.FieldControlType/ReadOnly";}if(r){return false;}else{return true;}},isReadOnlyFromDynamicAnnotations:function(f){var i;if(f){if(M.bindingParser(f)){i="$"+f+" === '1'";}}if(i){return"{= "+i+"? false : true }";}else{return true;}},getExpressionForMicroChartTitlePress:function(c,m,s){if(c){if((c["targetOutbound"]&&c["targetOutbound"]["outbound"])||(c["targetOutbound"]&&c["targetOutbound"]["outbound"]&&c["targetSections"])){return(".handlers.onDataPointTitlePressed($controller, ${$source>/},'"+JSON.stringify(m)+"','"+c["targetOutbound"]["outbound"]+"','"+s+"' )");}else if(c["targetSections"]){return".handlers.navigateToSubSection($controller, '"+JSON.stringify(c["targetSections"])+"')";}else{return undefined;}}},getMicroChartTitleAsLink:function(c){if(c&&(c["targetOutbound"]||(c["targetOutbound"]&&c["targetSections"]))){return"External";}else if(c&&c["targetSections"]){return"InPage";}else{return"None";}},getGroupIdFromConfig:function(c,a,d){var o=c[a],b=["Heroes","Decoration","Workers","LongRunners"],g=d;if(o&&o.requestGroupId&&b.some(function(e){return e===o.requestGroupId;})){g="$auto."+o.requestGroupId;}return g;},getBindingWithGroupIdFromConfig:function(c,k){var g=A.getGroupIdFromConfig(c,k),b;if(g){b="{ path : '', parameters : { $$groupId : '"+g+"' } }";}return b;},doesFieldGroupContainOnlyOneMultiLineDataField:function(f){return f&&f.length===1&&!!f[0].isValueMultilineText;},getVisibleExpressionForBreadcrumbs:function(v){return v.showBreadCrumbs&&v.fclEnabled!==undefined?"{fclhelper>/breadCrumbIsVisible}":v.showBreadCrumbs;},getShareButtonVisibility:function(v){var s="!${ui>createMode}";if(v.fclEnabled){s="${fclhelper>/showShareIcon} && "+s;}return"{= "+s+" }";},getVisiblityOfHeaderFacet:function(a,f){return(A.isReadOnlyFromStaticAnnotations(a,f)&&A.isReadOnlyFromDynamicAnnotations(f));},getPressExpressionForDelete:function(e){var d="${$view>/getBindingContext}",t="${$view>/#fe::ObjectPage/getHeaderTitle/getExpandedHeading/getItems/1/getText}",D="${$view>/#fe::ObjectPage/getHeaderTitle/getExpandedContent/0/getItems/0/getText}";var p={title:t,entitySetName:C.addSingleQuotes(e),description:D};return C.generateFunction(".editFlow.deleteDocument",d,C.objectToString(p));},getPressExpressionForEdit:function(d,e,h){var E=C.addSingleQuotes(d&&d.Action),D=d&&d.InvocationGrouping&&d.InvocationGrouping["$EnumMember"],i=D==="com.sap.vocabularies.UI.v1.OperationGroupingType/ChangeSet"?"ChangeSet":"Isolated";var p={contexts:"${$view>/getBindingContext}",entitySetName:C.addSingleQuotes(e),invocationGrouping:C.addSingleQuotes(i),model:"${$source>/}.getModel()",label:C.addSingleQuotes(d&&d.Label,true),isNavigable:h&&h.isNavigable,defaultValuesExtensionFunction:h&&h.defaultValuesExtensionFunction?"'"+h.defaultValuesExtensionFunction+"'":undefined};return C.generateFunction(".handlers.onCallAction","${$view>/}",E,C.objectToString(p));},getPressExpressionForFooterAnnotationAction:function(d,e,h){var a=C.addSingleQuotes(d&&d.Action),D=d&&d.InvocationGrouping&&d.InvocationGrouping["$EnumMember"],i=D==="com.sap.vocabularies.UI.v1.OperationGroupingType/ChangeSet"?"ChangeSet":"Isolated";var p={contexts:"${$view>/#fe::ObjectPage/}.getBindingContext()",entitySetName:C.addSingleQuotes(e),invocationGrouping:C.addSingleQuotes(i),model:"${$source>/}.getModel()",label:C.addSingleQuotes(d&&d.Label,true),isNavigable:h&&h.isNavigable,defaultValuesExtensionFunction:h&&h.defaultValuesExtensionFunction?"'"+h.defaultValuesExtensionFunction+"'":undefined};return C.generateFunction(".handlers.onCallAction","${$view>/}",a,C.objectToString(p));},getStashableHBoxBinding:function(c,h){if(h&&h.Facet&&h.Facet.targetAnnotationType==="DataPoint"){return A.getBindingWithGroupIdFromConfig(c,h.Facet.targetAnnotationValue);}},getPressExpressionForLink:function(c,m){if(c){if(c["targetOutbound"]&&c["targetOutbound"]["outbound"]){return(".handlers.onDataPointTitlePressed($controller, ${$source>}, "+JSON.stringify(m)+","+JSON.stringify(c["targetOutbound"]["outbound"])+")");}else if(c["targetSections"]){return".handlers.navigateToSubSection($controller, '"+JSON.stringify(c["targetSections"])+"')";}else{return undefined;}}},isSubSectionTitleVisible:function(s,S,a){if(s.indexOf("{=")===0){var e=s.substring(s.indexOf("{=")+2,s.lastIndexOf("}"));return("{= ("+e+") && ('"+S+"' !=='undefined') && ("+a+" ? true : false) }");}else{return s&&S!=="undefined"&&(a?true:false);}}};return A;},true);

package/packages/sap.fe.templates/src/sap/fe/templates/ObjectPage/Component-dbg.js

@@ -16,6 +16,7 @@ sap.ui.define(
 		"use strict";
 
 		var VariantManagement = CoreLibrary.VariantManagement,
+			CreationMode = CoreLibrary.CreationMode,
 			ObjectPageComponent = TemplateComponent.extend("sap.fe.templates.ObjectPage.Component", {
 				metadata: {
 					properties: {
@@ -87,25 +88,26 @@ sap.ui.define(
 
 				// TODO: this should be ideally be handled by the editflow/routing without the need to have this method in the
 				// object page - for now keep it here
-				createDeferredContext: function(sPath, bActionCreate) {
+				createDeferredContext: function(sPath, oListBinding, bActionCreate) {
 					if (!this.DeferredContextCreated) {
 						this.DeferredContextCreated = true;
-						var oListBinding,
-							that = this,
+						var that = this,
 							oParamters = {
 								"$$groupId": "$auto.Heroes",
 								"$$updateGroupId": "$auto"
 							};
-
-						oListBinding = new ODataListBinding(
-							this.getModel(),
-							sPath.replace("(...)", ""),
-							undefined,
-							undefined,
-							undefined,
-							oParamters
-						);
-
+						if (!oListBinding || oListBinding.isRelative() === false) {
+							oListBinding = new ODataListBinding(
+								this.getModel(),
+								sPath.replace("(...)", ""),
+								undefined,
+								undefined,
+								undefined,
+								oParamters
+							);
+						} else {
+							oListBinding.mParameters = oParamters;
+						}
 						var oStartUpParams =
 								this.oAppComponent &&
 								this.oAppComponent.getComponentData() &&
@@ -120,7 +122,7 @@ sap.ui.define(
 						that.getRootControl()
 							.getController()
 							.editFlow.createDocument(oListBinding, {
-								creationMode: "Sync",
+								creationMode: CreationMode.Sync,
 								createAction: bActionCreate,
 								data: createParams
 							})

package/packages/sap.fe.templates/src/sap/fe/templates/ObjectPage/Component.js

@@ -3,4 +3,4 @@
         (c) Copyright 2009-2021 SAP SE. All rights reserved
     
  */
-sap.ui.define(["sap/fe/core/TemplateComponent","sap/ui/model/odata/v4/ODataListBinding","sap/fe/core/CommonUtils","sap/base/Log","sap/fe/core/library","sap/fe/templates/ObjectPage/SectionLayout"],function(T,O,C,L,a,S){"use strict";var V=a.VariantManagement,b=T.extend("sap.fe.templates.ObjectPage.Component",{metadata:{properties:{variantManagement:{type:"sap.fe.core.VariantManagement",defaultValue:V.None},sectionLayout:{type:"sap.fe.templates.ObjectPage.SectionLayout",defaultValue:S.Page},showRelatedApps:{type:"boolean",defaultValue:false},additionalSemanticObjects:{type:"object"},editableHeaderContent:{type:"boolean",defaultValue:true},showBreadCrumbs:{type:"boolean",defaultValue:true},prepareOnEdit:{type:"boolean",defaultValue:false},inboundParameters:{type:"object"}},library:"sap.fe.templates",manifest:"json"},isContextExpected:function(){return true;},createDeferredContext:function(p,A){if(!this.DeferredContextCreated){this.DeferredContextCreated=true;var l,t=this,P={"$$groupId":"$auto.Heroes","$$updateGroupId":"$auto"};l=new O(this.getModel(),p.replace("(...)",""),undefined,undefined,undefined,P);var s=this.oAppComponent&&this.oAppComponent.getComponentData()&&this.oAppComponent.getComponentData().startupParameters,i=this.getViewData().inboundParameters,c;if(s.preferredMode&&s.preferredMode[0].indexOf("create")!==-1){c=C.getAdditionalParamsForCreate(s,i);}t.getRootControl().getController().editFlow.createDocument(l,{creationMode:"Sync",createAction:A,data:c}).finally(function(){t.DeferredContextCreated=false;}).catch(function(){window.history.back();});}},setVariantManagement:function(v){if(v===V.Page){L.error("ObjectPage does not support Page-level variant management yet");v=V.None;}this.setProperty("variantManagement",v);}});return b;},true);
+sap.ui.define(["sap/fe/core/TemplateComponent","sap/ui/model/odata/v4/ODataListBinding","sap/fe/core/CommonUtils","sap/base/Log","sap/fe/core/library","sap/fe/templates/ObjectPage/SectionLayout"],function(T,O,C,L,a,S){"use strict";var V=a.VariantManagement,b=a.CreationMode,c=T.extend("sap.fe.templates.ObjectPage.Component",{metadata:{properties:{variantManagement:{type:"sap.fe.core.VariantManagement",defaultValue:V.None},sectionLayout:{type:"sap.fe.templates.ObjectPage.SectionLayout",defaultValue:S.Page},showRelatedApps:{type:"boolean",defaultValue:false},additionalSemanticObjects:{type:"object"},editableHeaderContent:{type:"boolean",defaultValue:true},showBreadCrumbs:{type:"boolean",defaultValue:true},prepareOnEdit:{type:"boolean",defaultValue:false},inboundParameters:{type:"object"}},library:"sap.fe.templates",manifest:"json"},isContextExpected:function(){return true;},createDeferredContext:function(p,l,A){if(!this.DeferredContextCreated){this.DeferredContextCreated=true;var t=this,P={"$$groupId":"$auto.Heroes","$$updateGroupId":"$auto"};if(!l||l.isRelative()===false){l=new O(this.getModel(),p.replace("(...)",""),undefined,undefined,undefined,P);}else{l.mParameters=P;}var s=this.oAppComponent&&this.oAppComponent.getComponentData()&&this.oAppComponent.getComponentData().startupParameters,i=this.getViewData().inboundParameters,d;if(s.preferredMode&&s.preferredMode[0].indexOf("create")!==-1){d=C.getAdditionalParamsForCreate(s,i);}t.getRootControl().getController().editFlow.createDocument(l,{creationMode:b.Sync,createAction:A,data:d}).finally(function(){t.DeferredContextCreated=false;}).catch(function(){window.history.back();});}},setVariantManagement:function(v){if(v===V.Page){L.error("ObjectPage does not support Page-level variant management yet");v=V.None;}this.setProperty("variantManagement",v);}});return c;},true);

package/packages/sap.fe.templates/src/sap/fe/templates/ObjectPage/ExtensionAPI-dbg.js

@@ -106,6 +106,9 @@ sap.ui.define(["sap/fe/core/ExtensionAPI", "sap/fe/core/CommonUtils", "sap/fe/co
 		 */
 		getSelectedContexts: function(sTableId) {
 			var oTable = this._view.byId(sTableId);
+			if (oTable && oTable.isA("sap.fe.macros.TableAPI")) {
+				oTable = oTable.getContent();
+			}
 			return (oTable && oTable.isA("sap.ui.mdc.Table") && oTable.getSelectedContexts()) || [];
 		},
 
@@ -123,6 +126,18 @@ sap.ui.define(["sap/fe/core/ExtensionAPI", "sap/fe/core/CommonUtils", "sap/fe/co
 				oBlock = this._view.byId(sBlockID),
 				bBlockState = bShow === undefined ? !oBlock.getShowSideContent() : bShow;
 			oBlock.setShowSideContent(bBlockState);
+		},
+
+		/**
+		 * Gets the bound context of the current object page.
+		 *
+		 * @alias sap.fe.templates.ObjectPage.ExtensionAPI#getBindingContext
+		 * @returns {sap.ui.model.odata.v4.Context} Context bound to the object page
+		 *
+		 * @public
+		 */
+		getBindingContext: function() {
+			return this._view.getBindingContext();
 		}
 	});
 

package/packages/sap.fe.templates/src/sap/fe/templates/ObjectPage/ExtensionAPI.js

@@ -3,4 +3,4 @@
         (c) Copyright 2009-2021 SAP SE. All rights reserved
     
  */
-sap.ui.define(["sap/fe/core/ExtensionAPI","sap/fe/core/CommonUtils","sap/fe/core/converters/helpers/ID"],function(E,C,I){"use strict";var e=E.extend("sap.fe.templates.ObjectPage.ExtensionAPI",{refresh:function(p){var b=this._view.getBindingContext(),a=C.getAppComponent(this._view),s=a.getSideEffectsService(),m=b.getModel().getMetaModel(),P,S={TargetProperties:[],TargetEntities:[]},c,B,k;if(p===undefined||p===null){S.TargetEntities.push({$NavigationPropertyPath:""});}else{P=Array.isArray(p)?p:[p];B=this._controller.getOwnerComponent().getEntitySet();for(var i=0;i<P.length;i++){c=P[i];if(c===""){S.TargetProperties.push({$PropertyPath:"*"});}else{k=m.getObject("/"+B+"/"+c+"/$kind");if(k==="NavigationProperty"){S.TargetEntities.push({$NavigationPropertyPath:c});}else if(k){S.TargetProperties.push({$PropertyPath:c});}else{return Promise.reject(c+" is not a valid path to be refreshed");}}}}return s.requestSideEffects(S.TargetEntities.concat(S.TargetProperties),b);},getSelectedContexts:function(t){var T=this._view.byId(t);return(T&&T.isA("sap.ui.mdc.Table")&&T.getSelectedContexts())||[];},showSideContent:function(s,S){var b=I.SideContentLayoutID(s),B=this._view.byId(b),a=S===undefined?!B.getShowSideContent():S;B.setShowSideContent(a);}});return e;});
+sap.ui.define(["sap/fe/core/ExtensionAPI","sap/fe/core/CommonUtils","sap/fe/core/converters/helpers/ID"],function(E,C,I){"use strict";var e=E.extend("sap.fe.templates.ObjectPage.ExtensionAPI",{refresh:function(p){var b=this._view.getBindingContext(),a=C.getAppComponent(this._view),s=a.getSideEffectsService(),m=b.getModel().getMetaModel(),P,S={TargetProperties:[],TargetEntities:[]},c,B,k;if(p===undefined||p===null){S.TargetEntities.push({$NavigationPropertyPath:""});}else{P=Array.isArray(p)?p:[p];B=this._controller.getOwnerComponent().getEntitySet();for(var i=0;i<P.length;i++){c=P[i];if(c===""){S.TargetProperties.push({$PropertyPath:"*"});}else{k=m.getObject("/"+B+"/"+c+"/$kind");if(k==="NavigationProperty"){S.TargetEntities.push({$NavigationPropertyPath:c});}else if(k){S.TargetProperties.push({$PropertyPath:c});}else{return Promise.reject(c+" is not a valid path to be refreshed");}}}}return s.requestSideEffects(S.TargetEntities.concat(S.TargetProperties),b);},getSelectedContexts:function(t){var T=this._view.byId(t);if(T&&T.isA("sap.fe.macros.TableAPI")){T=T.getContent();}return(T&&T.isA("sap.ui.mdc.Table")&&T.getSelectedContexts())||[];},showSideContent:function(s,S){var b=I.SideContentLayoutID(s),B=this._view.byId(b),a=S===undefined?!B.getShowSideContent():S;B.setShowSideContent(a);},getBindingContext:function(){return this._view.getBindingContext();}});return e;});