@sap/open.fe 1.97.0 → 1.98.0

package/packages/sap.fe.templates/src/sap/fe/templates/ObjectPage/manifest.json

@@ -4,7 +4,7 @@
 		"id": "sap.fe.templates.ObjectPage",
 		"type": "component",
 		"applicationVersion": {
-			"version": "1.97.0"
+			"version": "1.98.0"
 		},
 		"title": "Object Page",
 		"tags": {
@@ -97,7 +97,7 @@
 		},
 		"handleValidation": true,
 		"dependencies": {
-			"minUI5Version": "1.97.0",
+			"minUI5Version": "1.98.0",
 			"libs": {
 				"sap.f": {},
 				"sap.fe.macros": {

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

@@ -6,6 +6,18 @@
 sap.ui.define([], function() {
 	"use strict";
 	return {
+		onBeforeContextUpdate: function(oListBinding, iCurrentContextIndex, iIndexUpdate) {
+			var oCurrentView = this.getView(),
+				oControlContext = oCurrentView && oCurrentView.getBindingContext(),
+				aCurrentContexts = oListBinding && oListBinding.getCurrentContexts(),
+				oPaginatorCurrentContext = aCurrentContexts[iCurrentContextIndex];
+
+			if (oPaginatorCurrentContext && oControlContext && oPaginatorCurrentContext.getPath() !== oControlContext.getPath()) {
+				// Prevent default update of context index in Object Page Paginator when view context is different from the paginator context.
+				return true;
+			}
+		},
+
 		onContextUpdate: function(oContext) {
 			var that = this;
 			that.base._routing.navigateToContext(oContext, { callExtension: true });

package/packages/sap.fe.templates/src/sap/fe/templates/ObjectPage/overrides/Paginator.js

@@ -3,4 +3,4 @@
         (c) Copyright 2009-2021 SAP SE. All rights reserved
     
  */
-sap.ui.define([],function(){"use strict";return{onContextUpdate:function(c){var t=this;t.base._routing.navigateToContext(c,{callExtension:true});}};});
+sap.ui.define([],function(){"use strict";return{onBeforeContextUpdate:function(l,c,i){var C=this.getView(),o=C&&C.getBindingContext(),a=l&&l.getCurrentContexts(),p=a[c];if(p&&o&&p.getPath()!==o.getPath()){return true;}},onContextUpdate:function(c){var t=this;t.base._routing.navigateToContext(c,{callExtension:true});}};});

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

@@ -230,25 +230,29 @@ sap.ui.define(
 			}
 		}
 
-		/**
-		 * Get share URL.
-		 * @param sEditMode
-		 * @param bIsStickySupported
-		 * @param aActiveContextPaths
-		 * @returns {string} The share URL
-		 * @protected
-		 * @static
-		 */
-		function getShareUrl(sEditMode, bIsStickySupported, aActiveContextPaths) {
-			var sShareUrl;
-			var sHash = HashChanger.getInstance().getHash();
-			var sBasePath = HashChanger.getInstance().hrefForAppSpecificHash ? HashChanger.getInstance().hrefForAppSpecificHash("") : "";
-			if (sEditMode === "Editable" && !bIsStickySupported && aActiveContextPaths) {
-				sShareUrl = sBasePath + aActiveContextPaths.join("/");
+		// /**
+		//  * Get share URL.
+		//  * @param sEditMode
+		//  * @param bIsStickySupported
+		//  * @param aActiveContextPaths
+		//  * @returns {string} The share URL
+		//  * @protected
+		//  * @static
+		//  */
+		function getShareUrl() {
+			var oUShellContainer = sap.ushell && sap.ushell.Container;
+			if (oUShellContainer) {
+				return oUShellContainer
+					.getFLPUrlAsync(true)
+					.then(function(sFLPUrl) {
+						return sFLPUrl;
+					})
+					.catch(function(sError) {
+						Log.error("Could not retrieve cFLP URL for the sharing dialog (dialog will not be opened)", sError);
+					});
 			} else {
-				sShareUrl = sHash ? sBasePath + sHash : window.location.hash;
+				return Promise.resolve(document.URL);
 			}
-			return sShareUrl;
 		}
 
 		function getJamUrl(sEditMode, bIsStickySupported, aActiveContextPaths) {
@@ -283,32 +287,32 @@ sap.ui.define(
 				oUIModel = this.base.getView().getModel("ui");
 				sEditMode = oUIModel.getProperty("/editMode");
 				return fetchActiveContextPaths(oContext, that.base.getView().getController()).then(function(aActiveContextPaths) {
-					var aPromises = [];
-					aPromises.push(
-						that.base
-							.getView()
-							.getController()
-							._getPageTitleInformation()
-					);
-					aPromises.push(getJamUrl(sEditMode, bIsStickySupported, aActiveContextPaths));
-					return Promise.all(aPromises).then(function(oData) {
-						var oPageTitleInfo = oData[0];
-						var sJamUrl = oData[1];
-						var sTitle = oPageTitleInfo.title;
-						var sObjectSubtitle = oPageTitleInfo.subtitle.toString();
-						if (sObjectSubtitle) {
-							sTitle = sTitle + " - " + sObjectSubtitle;
-						}
-						oShareMetadata.tile = {
-							title: oPageTitleInfo.title,
-							subtitle: oPageTitleInfo.subtitle.toString()
-						};
-						oShareMetadata.email.title = sTitle;
-						oShareMetadata.title = sTitle;
-						oShareMetadata.url = getShareUrl(sEditMode, bIsStickySupported, aActiveContextPaths);
-						oShareMetadata.jam.url = sJamUrl;
-						return oShareMetadata;
-					});
+					var oPageTitleInfo = that.base
+						.getView()
+						.getController()
+						._getPageTitleInformation();
+
+					return Promise.all([getJamUrl(sEditMode, bIsStickySupported, aActiveContextPaths), getShareUrl()])
+						.then(function(oData) {
+							var sTitle = oPageTitleInfo.title;
+							var sObjectSubtitle = oPageTitleInfo.subtitle.toString();
+							if (sObjectSubtitle) {
+								sTitle = sTitle + " - " + sObjectSubtitle;
+							}
+							oShareMetadata.tile = {
+								title: oPageTitleInfo.title,
+								subtitle: oPageTitleInfo.subtitle.toString()
+							};
+							oShareMetadata.email.title = sTitle;
+							oShareMetadata.title = sTitle;
+							oShareMetadata.jam.url = oData[0];
+							oShareMetadata.url = oData[1];
+
+							return oShareMetadata;
+						})
+						.catch(function(error) {
+							Log.error(error);
+						});
 				});
 			}
 		};

package/packages/sap.fe.templates/src/sap/fe/templates/ObjectPage/overrides/Share.js

@@ -3,4 +3,4 @@
         (c) Copyright 2009-2021 SAP SE. All rights reserved
     
  */
-sap.ui.define(["sap/ui/core/routing/HashChanger","sap/fe/core/helpers/ModelHelper","sap/fe/core/helpers/SemanticKeyHelper","sap/ui/model/Filter","sap/ui/model/FilterOperator","sap/base/Log"],function(H,M,S,F,a,L){"use strict";var I,u,e;function c(k,i){var l,K=Object.keys(k);l=K.map(function(s){var v=k[s];if(v!==undefined){return new F(s,a.EQ,v);}});if(i){var A=new F({filters:[new F("SiblingEntity/IsActiveEntity",a.EQ,true)],and:false});l.push(A);}var C=new F(l,true);return C;}function g(C,p,o){var l=C.getView().getBindingContext().getModel().bindList("/"+p,undefined,undefined,o,{"$$groupId":"$auto.Heroes"});return l.requestContexts(0,2).then(function(i){if(i&&i.length){return i[0].getPath();}});}function b(C,o,E){var A=[];var p=[];var m=C.getModel().getMetaModel().getMetaPath(C.getPath());if(m.indexOf("/")===0){m=m.substring(1);}var k=m.split("/");var s=H.getInstance().getHash().split("?")[0];var l=s.split("/");var P={};var n=[];l.forEach(function(r){var K=r.substring(r.indexOf("(")+1,r.length-1).split(",");var t={};var v=r.split("(")[0];P[v]={};n.push(v);P[v]["bIsActiveEntityDefined"]=true;for(var i=0;i<K.length;i++){var w=K[i];var x=w.split("=");var y=x[1];var z=x[0];if(w.indexOf("=")===-1){var B=C.getModel().getMetaModel();var T=B.getObject("/"+n.join("/")+"/$Type/$Key");y=x[0];z=T[0];P[r.split("(")[0]]["bIsActiveEntityDefined"]=false;}if(z!=="IsActiveEntity"){if(y.indexOf("'")===0&&y.lastIndexOf("'")===y.length-1){y=decodeURIComponent(y.substring(1,y.length-1));}t[z]=y;}}P[v].mKeyValues=t;});var q=E;k.forEach(function(N){var i={};var r=q.$NavigationPropertyBinding&&q.$NavigationPropertyBinding[N];if(r){i.pageEntityName=q.$NavigationPropertyBinding[N];q=C.getModel().getMetaModel().getObject("/"+r)||E;}else{i.pageEntityName=N;}i.mKeyValues=P[N].mKeyValues;i.bIsActiveEntityDefined=P[N].bIsActiveEntityDefined;p.push(i);});p.forEach(function(i){var r=c(i.mKeyValues,i.bIsActiveEntityDefined);A.push(g(o,i.pageEntityName,r));});return A;}function d(C,o){var s=H.getInstance().getHash().split("?")[0];var r=s&&s.substr(0,s.indexOf("("));if(r.indexOf("/")===0){r=r.substring(1);}var E=C.getModel().getMetaModel().getObject("/"+r);var p=C;var A=b(C,o,E);if(A.length>0){return Promise.all(A).then(function(D){var k=[];var P=E;if(D[0].indexOf("/")===0){k.push(D[0].substring(1));}else{k.push(D[0]);}for(var i=1;i<D.length;i++){var l=D[i];var n="";var m=l&&l.substr(0,l.indexOf("("));if(m.indexOf("/")===0){m=m.substring(1);}if(l.indexOf("/")===0){l=l.substring(1);}n=Object.keys(P.$NavigationPropertyBinding)[Object.values(P.$NavigationPropertyBinding).indexOf(m)];if(n){k.push(l.replace(m,n));P=p.getModel().getMetaModel().getObject("/"+m)||E;}else{k.push(l);}}return k;}).catch(function(i){L.info("Failed to retrieve one or more active context path's",i);});}else{return Promise.resolve();}}function f(C,o){var p,s;var i=H.getInstance().getHash().split("?")[0];if(C){var m=C.getModel();var k=m.getMetaModel();I=M.isStickySessionSupported(k);var r=i&&i.substr(0,i.indexOf("("));if(r.indexOf("/")===0){r=r.substring(1);}s=S.getSemanticKeys(k,r);}var v=o.getView().getViewData();if(C&&!I&&((v.viewLevel===1&&!s)||v.viewLevel>=2)){p=d(C,o);return p;}else{return Promise.resolve();}}function h(e,I,A){var s;var i=H.getInstance().getHash();var B=H.getInstance().hrefForAppSpecificHash?H.getInstance().hrefForAppSpecificHash(""):"";if(e==="Editable"&&!I&&A){s=B+A.join("/");}else{s=i?B+i:window.location.hash;}return s;}function j(e,I,A){var J;var s=H.getInstance().getHash();var B=H.getInstance().hrefForAppSpecificHash?H.getInstance().hrefForAppSpecificHash(""):"";if(e==="Editable"&&!I&&A){J=B+A.join("/");}else{J=s?B+s:window.location.hash;}if(sap.ushell&&sap.ushell.Container&&sap.ushell.Container.runningInIframe&&sap.ushell.Container.runningInIframe()){sap.ushell.Container.getFLPUrl(true).then(function(U){return U.substr(0,U.indexOf("#"))+J;}).catch(function(E){L.error("Could not retrieve cFLP URL for the sharing dialog (dialog will not be opened)",E);});}else{return Promise.resolve(window.location.origin+window.location.pathname+J);}}return{adaptShareMetadata:function(s){var t=this;var C=this.base.getView().getBindingContext();u=this.base.getView().getModel("ui");e=u.getProperty("/editMode");return f(C,t.base.getView().getController()).then(function(A){var p=[];p.push(t.base.getView().getController()._getPageTitleInformation());p.push(j(e,I,A));return Promise.all(p).then(function(D){var P=D[0];var J=D[1];var T=P.title;var o=P.subtitle.toString();if(o){T=T+" - "+o;}s.tile={title:P.title,subtitle:P.subtitle.toString()};s.email.title=T;s.title=T;s.url=h(e,I,A);s.jam.url=J;return s;});});}};});
+sap.ui.define(["sap/ui/core/routing/HashChanger","sap/fe/core/helpers/ModelHelper","sap/fe/core/helpers/SemanticKeyHelper","sap/ui/model/Filter","sap/ui/model/FilterOperator","sap/base/Log"],function(H,M,S,F,a,L){"use strict";var I,u,e;function c(k,i){var l,K=Object.keys(k);l=K.map(function(s){var v=k[s];if(v!==undefined){return new F(s,a.EQ,v);}});if(i){var A=new F({filters:[new F("SiblingEntity/IsActiveEntity",a.EQ,true)],and:false});l.push(A);}var C=new F(l,true);return C;}function g(C,p,o){var l=C.getView().getBindingContext().getModel().bindList("/"+p,undefined,undefined,o,{"$$groupId":"$auto.Heroes"});return l.requestContexts(0,2).then(function(i){if(i&&i.length){return i[0].getPath();}});}function b(C,o,E){var A=[];var p=[];var m=C.getModel().getMetaModel().getMetaPath(C.getPath());if(m.indexOf("/")===0){m=m.substring(1);}var k=m.split("/");var s=H.getInstance().getHash().split("?")[0];var l=s.split("/");var P={};var n=[];l.forEach(function(r){var K=r.substring(r.indexOf("(")+1,r.length-1).split(",");var t={};var v=r.split("(")[0];P[v]={};n.push(v);P[v]["bIsActiveEntityDefined"]=true;for(var i=0;i<K.length;i++){var w=K[i];var x=w.split("=");var y=x[1];var z=x[0];if(w.indexOf("=")===-1){var B=C.getModel().getMetaModel();var T=B.getObject("/"+n.join("/")+"/$Type/$Key");y=x[0];z=T[0];P[r.split("(")[0]]["bIsActiveEntityDefined"]=false;}if(z!=="IsActiveEntity"){if(y.indexOf("'")===0&&y.lastIndexOf("'")===y.length-1){y=decodeURIComponent(y.substring(1,y.length-1));}t[z]=y;}}P[v].mKeyValues=t;});var q=E;k.forEach(function(N){var i={};var r=q.$NavigationPropertyBinding&&q.$NavigationPropertyBinding[N];if(r){i.pageEntityName=q.$NavigationPropertyBinding[N];q=C.getModel().getMetaModel().getObject("/"+r)||E;}else{i.pageEntityName=N;}i.mKeyValues=P[N].mKeyValues;i.bIsActiveEntityDefined=P[N].bIsActiveEntityDefined;p.push(i);});p.forEach(function(i){var r=c(i.mKeyValues,i.bIsActiveEntityDefined);A.push(g(o,i.pageEntityName,r));});return A;}function d(C,o){var s=H.getInstance().getHash().split("?")[0];var r=s&&s.substr(0,s.indexOf("("));if(r.indexOf("/")===0){r=r.substring(1);}var E=C.getModel().getMetaModel().getObject("/"+r);var p=C;var A=b(C,o,E);if(A.length>0){return Promise.all(A).then(function(D){var k=[];var P=E;if(D[0].indexOf("/")===0){k.push(D[0].substring(1));}else{k.push(D[0]);}for(var i=1;i<D.length;i++){var l=D[i];var n="";var m=l&&l.substr(0,l.indexOf("("));if(m.indexOf("/")===0){m=m.substring(1);}if(l.indexOf("/")===0){l=l.substring(1);}n=Object.keys(P.$NavigationPropertyBinding)[Object.values(P.$NavigationPropertyBinding).indexOf(m)];if(n){k.push(l.replace(m,n));P=p.getModel().getMetaModel().getObject("/"+m)||E;}else{k.push(l);}}return k;}).catch(function(i){L.info("Failed to retrieve one or more active context path's",i);});}else{return Promise.resolve();}}function f(C,o){var p,s;var i=H.getInstance().getHash().split("?")[0];if(C){var m=C.getModel();var k=m.getMetaModel();I=M.isStickySessionSupported(k);var r=i&&i.substr(0,i.indexOf("("));if(r.indexOf("/")===0){r=r.substring(1);}s=S.getSemanticKeys(k,r);}var v=o.getView().getViewData();if(C&&!I&&((v.viewLevel===1&&!s)||v.viewLevel>=2)){p=d(C,o);return p;}else{return Promise.resolve();}}function h(){var U=sap.ushell&&sap.ushell.Container;if(U){return U.getFLPUrlAsync(true).then(function(s){return s;}).catch(function(E){L.error("Could not retrieve cFLP URL for the sharing dialog (dialog will not be opened)",E);});}else{return Promise.resolve(document.URL);}}function j(e,I,A){var J;var s=H.getInstance().getHash();var B=H.getInstance().hrefForAppSpecificHash?H.getInstance().hrefForAppSpecificHash(""):"";if(e==="Editable"&&!I&&A){J=B+A.join("/");}else{J=s?B+s:window.location.hash;}if(sap.ushell&&sap.ushell.Container&&sap.ushell.Container.runningInIframe&&sap.ushell.Container.runningInIframe()){sap.ushell.Container.getFLPUrl(true).then(function(U){return U.substr(0,U.indexOf("#"))+J;}).catch(function(E){L.error("Could not retrieve cFLP URL for the sharing dialog (dialog will not be opened)",E);});}else{return Promise.resolve(window.location.origin+window.location.pathname+J);}}return{adaptShareMetadata:function(s){var t=this;var C=this.base.getView().getBindingContext();u=this.base.getView().getModel("ui");e=u.getProperty("/editMode");return f(C,t.base.getView().getController()).then(function(A){var p=t.base.getView().getController()._getPageTitleInformation();return Promise.all([j(e,I,A),h()]).then(function(D){var T=p.title;var o=p.subtitle.toString();if(o){T=T+" - "+o;}s.tile={title:p.title,subtitle:p.subtitle.toString()};s.email.title=T;s.title=T;s.jam.url=D[0];s.url=D[1];return s;}).catch(function(i){L.error(i);});});}};});

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

@@ -41,26 +41,6 @@ sap.ui.define(["sap/fe/core/library", "sap/fe/core/helpers/KeepAliveHelper"], fu
 
 			aStateControls.push(oView.byId("fe::ObjectPage"));
 		},
-		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 &&
-							!(oControlState.variantId === oVM.getId() && oVM.getModified() === false)
-						) {
-							oVM.setModified(true);
-						}
-					}
-				});
-			}
-		},
 		adaptBindingRefreshControls: function(aControls) {
 			var oView = this.getView(),
 				sRefreshStrategy = KeepAliveHelper.getViewRefreshInfo(oView),

package/packages/sap.fe.templates/src/sap/fe/templates/ObjectPage/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/core/helpers/KeepAliveHelper"],function(C,K){"use strict";var V=C.VariantManagement;return{applyInitialStateOnly:function(){return false;},adaptStateControls:function(s){var v=this.getView(),c=v.getController(),o=v.getViewData(),b=false;switch(o.variantManagement){case V.Control:b=true;break;case V.Page:case V.None:break;default:throw new Error("unhandled variant setting: "+o.getVariantManagement());}c._findTables().forEach(function(t){var q=t.getQuickFilter();if(q){s.push(q);}if(b){s.push(t.getVariant());}});s.push(v.byId("fe::ObjectPage"));},adaptControlStateHandler:function(c,a){if(c.isA("sap.ui.fl.variants.VariantManagement")){a.push({retrieve:function(v){return{"variantId":v.getCurrentVariantKey()};},apply:function(v,o){if(o&&o.variantId!==undefined&&!(o.variantId===v.getId()&&v.getModified()===false)){v.setModified(true);}}});}},adaptBindingRefreshControls:function(c){var v=this.getView(),r=K.getViewRefreshInfo(v),o=v.getController(),a=[];if(r){var O=o._getObjectPageLayoutControl();a.push(O);}if(r!=="includingDependents"){var b=o._findTables();a=a.concat(K.getControlsForRefresh(v,b)||[]);}return a.reduce(function(p,d){if(p.indexOf(d)===-1){p.push(d);}return p;},c);}};});
+sap.ui.define(["sap/fe/core/library","sap/fe/core/helpers/KeepAliveHelper"],function(C,K){"use strict";var V=C.VariantManagement;return{applyInitialStateOnly:function(){return false;},adaptStateControls:function(s){var v=this.getView(),c=v.getController(),o=v.getViewData(),b=false;switch(o.variantManagement){case V.Control:b=true;break;case V.Page:case V.None:break;default:throw new Error("unhandled variant setting: "+o.getVariantManagement());}c._findTables().forEach(function(t){var q=t.getQuickFilter();if(q){s.push(q);}if(b){s.push(t.getVariant());}});s.push(v.byId("fe::ObjectPage"));},adaptBindingRefreshControls:function(c){var v=this.getView(),r=K.getViewRefreshInfo(v),o=v.getController(),a=[];if(r){var O=o._getObjectPageLayoutControl();a.push(O);}if(r!=="includingDependents"){var b=o._findTables();a=a.concat(K.getControlsForRefresh(v,b)||[]);}return a.reduce(function(p,d){if(p.indexOf(d)===-1){p.push(d);}return p;},c);}};});

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

@@ -3,43 +3,43 @@
 	"resources": [
 		{
 			"name": "AnnotationHelper-dbg.js",
-			"size": 18708,
+			"size": 19367,
 			"isDebug": true
 		},
 		{
 			"name": "AnnotationHelper.js",
-			"size": 6478
+			"size": 6727
 		},
 		{
 			"name": "Component-dbg.js",
-			"size": 4391,
+			"size": 4580,
 			"isDebug": true
 		},
 		{
 			"name": "Component.js",
-			"size": 1901
+			"size": 1972
 		},
 		{
 			"name": "ExtensionAPI-dbg.js",
-			"size": 4188,
+			"size": 4607,
 			"isDebug": true
 		},
 		{
 			"name": "ExtensionAPI.js",
-			"size": 1386
+			"size": 1512
 		},
 		{
 			"name": "ObjectPage.view.xml",
-			"size": 8663
+			"size": 9073
 		},
 		{
 			"name": "ObjectPageController-dbg.controller.js",
-			"size": 52602,
+			"size": 53422,
 			"isDebug": true
 		},
 		{
 			"name": "ObjectPageController.controller.js",
-			"size": 22479
+			"size": 22930
 		},
 		{
 			"name": "controls/StashableHBox-dbg.js",
@@ -152,30 +152,30 @@
 		},
 		{
 			"name": "overrides/Paginator-dbg.js",
-			"size": 326,
+			"size": 949,
 			"isDebug": true
 		},
 		{
 			"name": "overrides/Paginator.js",
-			"size": 274
+			"size": 446
 		},
 		{
 			"name": "overrides/Share-dbg.js",
-			"size": 12532,
+			"size": 12394,
 			"isDebug": true
 		},
 		{
 			"name": "overrides/Share.js",
-			"size": 4758
+			"size": 4792
 		},
 		{
 			"name": "overrides/ViewState-dbg.js",
-			"size": 2549,
+			"size": 2003,
 			"isDebug": true
 		},
 		{
 			"name": "overrides/ViewState.js",
-			"size": 1363
+			"size": 1066
 		},
 		{
 			"name": "templating/ObjectPageTemplating-dbg.js",
@@ -192,7 +192,7 @@
 		},
 		{
 			"name": "view/fragments/Actions.fragment.xml",
-			"size": 7948
+			"size": 7926
 		},
 		{
 			"name": "view/fragments/EditableHeaderFacet.fragment.xml",
@@ -230,10 +230,6 @@
 			"name": "view/fragments/HeaderFacetCustomContainer.fragment.xml",
 			"size": 1804
 		},
-		{
-			"name": "view/fragments/HeaderImage.fragment.xml",
-			"size": 787
-		},
 		{
 			"name": "view/fragments/ObjectPageHeaderAddress.fragment.xml",
 			"size": 829
@@ -248,11 +244,15 @@
 		},
 		{
 			"name": "view/fragments/Section.fragment.xml",
-			"size": 2906
+			"size": 3796
 		},
 		{
 			"name": "view/fragments/SectionContent.fragment.xml",
-			"size": 8550
+			"size": 8434
+		},
+		{
+			"name": "view/fragments/SectionContentLazyLoader.fragment.xml",
+			"size": 8975
 		},
 		{
 			"name": "view/fragments/SectionCustomSection.fragment.xml",
@@ -260,11 +260,11 @@
 		},
 		{
 			"name": "view/fragments/SectionFormContent.fragment.xml",
-			"size": 593
+			"size": 645
 		},
 		{
 			"name": "view/fragments/SectionMoreFormContent.fragment.xml",
-			"size": 598
+			"size": 650
 		},
 		{
 			"name": "view/fragments/SectionPresentationVisualization.fragment.xml",

package/packages/sap.fe.templates/src/sap/fe/templates/ObjectPage/view/fragments/Actions.fragment.xml

@@ -179,5 +179,5 @@
 		</template:repeat>
 	</template:if>
 	<core:Fragment fragmentName="sap.fe.templates.ObjectPage.view.fragments.RelatedApps" type="XML" />
-	<macro:Share id="fe::Share" shortCutExists="true" visible="{= OP.getShareButtonVisibility(${viewData>/}) }" />
+	<macro:Share id="fe::Share" visible="{= OP.getShareButtonVisibility(${viewData>/}) }" />
 </core:FragmentDefinition>

package/packages/sap.fe.templates/src/sap/fe/templates/ObjectPage/view/fragments/Section.fragment.xml

@@ -55,17 +55,36 @@
 							showTitle="{subSection>showTitle}"
 							visible="{subSection>visible}"
 						>
-							<uxap:customData>
+							<!--uxap:customData>
 								<core:CustomData key="strategyForVisibilityChange" value="lazyLoading" />
+							</uxap:customData-->
+							<uxap:customData>
+								<core:CustomData key="isVisibilityDynamic" value="{subSection>isVisibilityDynamic}" />
 							</uxap:customData>
 							<template:if test="{= ${subSection>type} === 'Mixed'}">
 								<template:then>
-									<template:repeat list="{subSection>content}" var="subSection">
-										<core:Fragment fragmentName="sap.fe.templates.ObjectPage.view.fragments.SectionContent" type="XML" />
-									</template:repeat>
+									<template:if test="{viewData>/useNewLazyLoading}">
+										<template:then>
+											<template:repeat list="{subSection>content}" var="subSection">
+												<core:Fragment fragmentName="sap.fe.templates.ObjectPage.view.fragments.SectionContentLazyLoader" type="XML" />
+											</template:repeat>
+										</template:then>
+										<template:else>
+											<template:repeat list="{subSection>content}" var="subSection">
+												<core:Fragment fragmentName="sap.fe.templates.ObjectPage.view.fragments.SectionContent" type="XML" />
+											</template:repeat>
+										</template:else>
+									</template:if>
 								</template:then>
 								<template:else>
-									<core:Fragment fragmentName="sap.fe.templates.ObjectPage.view.fragments.SectionContent" type="XML" />
+									<template:if test="{viewData>/useNewLazyLoading}">
+										<template:then>
+											<core:Fragment fragmentName="sap.fe.templates.ObjectPage.view.fragments.SectionContentLazyLoader" type="XML" />
+										</template:then>
+										<template:else>
+											<core:Fragment fragmentName="sap.fe.templates.ObjectPage.view.fragments.SectionContent" type="XML" />
+										</template:else>
+									</template:if>
 								</template:else>
 							</template:if>
 						</uxap:ObjectPageSubSection>

package/packages/sap.fe.templates/src/sap/fe/templates/ObjectPage/view/fragments/SectionContent.fragment.xml

@@ -131,10 +131,7 @@
                 <template:elseif test="{= ${subSection>type} === 'DataVisualization'}">
                     <uxap:blocks>
                         <template:if test="{= ${subSection>level} === 2}">
-                            <Title
-							text="{subSection>title}"
-							visible="{= ${subSection>visible} &amp;&amp; ${subSection>title} !=='undefined' &amp;&amp; ${subSection>showTitle} ? true : false}"
-						/>
+                            <Title text="{subSection>title}" visible="{subSection>titleVisible}" />
                         </template:if>
                          <opcontrol:SubSectionBlock visible="{subSection>visible}">
                             <opcontrol:content>

package/packages/sap.fe.templates/src/sap/fe/templates/ObjectPage/view/fragments/SectionContentLazyLoader.fragment.xml

@@ -0,0 +1,181 @@
+<core:FragmentDefinition
+	xmlns:uxap="sap.uxap"
+	xmlns:core="sap.ui.core"
+	xmlns:template="http://schemas.sap.com/sapui5/extension/sap.ui.core.template/1"
+	xmlns:fpm="sap.fe.macros.fpm"
+	xmlns:macro="sap.fe.macros"
+	xmlns:layout="sap.ui.layout"
+	xmlns:dt="sap.ui.dt"
+	xmlns="sap.m"
+	xmlns:opcontrol="sap.fe.templates.ObjectPage.controls"
+	template:require="{
+		fpm: 'sap/fe/macros/fpm/fpm',
+		MODEL: 'sap/ui/model/odata/v4/AnnotationHelper',
+		OP: 'sap/fe/templates/ObjectPage/AnnotationHelper',
+		COMMON: 'sap/fe/macros/CommonHelper',
+		ID: 'sap/fe/core/helpers/StableIdHelper'
+	}"
+>
+		<!-- We want to ensure that statically non visible sections are non visible-->
+         <template:if test="{subSection>visible}">
+            <template:if test="{= ${subSection>type} === 'XMLFragment'}">
+                <template:then>
+                    <core:Fragment fragmentName="sap.fe.templates.ObjectPage.view.fragments.FormActions" type="XML" />
+                    <uxap:blocks>
+						<uxap:ObjectPageLazyLoader stashed="true" id="{= ID.generate(['fe', ${subSection>key}])}">
+                        <opcontrol:SubSectionBlock>
+                            <opcontrol:content>
+                                <template:if test="{= ${subSection>sideContent} !== undefined}">
+                                    <template:then>
+                                        <layout:DynamicSideContent
+											id="{= ID.generate(['fe', ${subSection>key}, 'SideContentLayout'])}"
+											showMainContent="true"
+											showSideContent="{subSection>sideContent/visible}"
+											sideContentFallDown="BelowM"
+											containerQuery="true"
+											equalSplit="{subSection>sideContent/equalSplit}"
+										>
+                                            <layout:mainContent>
+                                                <core:Fragment
+													fragmentName="sap.fe.templates.ObjectPage.view.fragments.SectionCustomSection"
+													type="XML"
+												/>
+                                            </layout:mainContent>
+                                            <layout:sideContent>
+                                                <core:Fragment
+													fragmentName="sap.fe.templates.ObjectPage.view.fragments.SideContentCustomContainer"
+													type="XML"
+												/>
+                                            </layout:sideContent>
+                                        </layout:DynamicSideContent>
+                                    </template:then>
+                                    <template:else>
+                                        <core:Fragment
+											fragmentName="sap.fe.templates.ObjectPage.view.fragments.SectionCustomSection"
+											type="XML"
+										/>
+                                    </template:else>
+                                </template:if>
+                            </opcontrol:content>
+                        </opcontrol:SubSectionBlock>
+						</uxap:ObjectPageLazyLoader>
+                    </uxap:blocks>
+
+                </template:then>
+                <template:elseif test="{= ${subSection>type} === 'Form'}">
+                    <core:Fragment fragmentName="sap.fe.templates.ObjectPage.view.fragments.FormActions" type="XML" />
+                    <uxap:blocks>
+					<uxap:ObjectPageLazyLoader stashed="true" id="{= ID.generate(['fe', ${subSection>key}])}">
+                    <opcontrol:SubSectionBlock>
+                        <opcontrol:content>
+							<template:if test="{= ${subSection>sideContent} !== undefined}">
+							<template:then>
+								<layout:DynamicSideContent
+											id="{= ID.generate(['fe', ${subSection>key}, 'SideContentLayout'])}"
+											showMainContent="true"
+											showSideContent="{subSection>sideContent/visible}"
+											sideContentFallDown="BelowM"
+											containerQuery="true"
+											equalSplit="{subSection>sideContent/equalSplit}"
+										>
+									<layout:mainContent>
+										<core:Fragment fragmentName="sap.fe.templates.ObjectPage.view.fragments.SectionFormContent" type="XML" />
+									</layout:mainContent>
+									<layout:sideContent>
+										<core:Fragment fragmentName="sap.fe.templates.ObjectPage.view.fragments.SideContentCustomContainer" type="XML" />
+									</layout:sideContent>
+								</layout:DynamicSideContent>
+
+							</template:then>
+							<template:else>
+								<core:Fragment fragmentName="sap.fe.templates.ObjectPage.view.fragments.SectionFormContent" type="XML" />
+							</template:else>
+							</template:if>
+                        </opcontrol:content>
+                    </opcontrol:SubSectionBlock>
+					</uxap:ObjectPageLazyLoader>
+                    </uxap:blocks>
+                    <template:if test="{subSection>formDefinition/hasFacetsNotPartOfPreview}">
+                        <template:then>
+                            <!-- Button "Show More / Less" is displayed for a collection facets that contains at least one reference facets with annotation "PartOfPreview === TRUE" -->
+                            <uxap:moreBlocks>
+                                <template:if test="{= ${subSection>level} === 2}">
+                                    <Title text="{subSection>title}" />
+                                </template:if>
+                                <opcontrol:SubSectionBlock>
+                                    <opcontrol:content>
+										<template:if test="{= ${subSection>sideContent} !== undefined}">
+										<template:then>
+											<layout:DynamicSideContent
+												id="{= ID.generate(['fe', ${subSection>key}, 'MoreSideContentLayout'])}"
+												showMainContent="true"
+												showSideContent="{subSection>sideContent/visible}"
+												sideContentFallDown="BelowM"
+												containerQuery="true"
+												equalSplit="{subSection>sideContent/equalSplit}"
+											>
+												<layout:mainContent>
+													<core:Fragment fragmentName="sap.fe.templates.ObjectPage.view.fragments.SectionMoreFormContent" type="XML" />
+												</layout:mainContent>
+												<layout:sideContent>
+													<!--No Side Content for MoreBlocks so far-->
+												</layout:sideContent>
+											</layout:DynamicSideContent>
+										</template:then>
+										<template:else>
+											<core:Fragment fragmentName="sap.fe.templates.ObjectPage.view.fragments.SectionMoreFormContent" type="XML" />
+										</template:else>
+										</template:if>
+                                    </opcontrol:content>
+                                </opcontrol:SubSectionBlock>
+                            </uxap:moreBlocks>
+                        </template:then>
+                    </template:if>
+                </template:elseif>
+                <template:elseif test="{= ${subSection>type} === 'DataVisualization'}">
+                    <uxap:blocks>
+						<uxap:ObjectPageLazyLoader stashed="true" id="{= ID.generate(['fe', ${subSection>key}])}">
+                        <template:if test="{= ${subSection>level} === 2}">
+                            <Title
+								text="{subSection>title}"
+								visible="{= ${subSection>visible} &amp;&amp; ${subSection>title} !=='undefined' &amp;&amp; ${subSection>showTitle} ? true : false}"
+							/>
+                        </template:if>
+                         <opcontrol:SubSectionBlock visible="{subSection>visible}">
+                            <opcontrol:content>
+								<template:if test="{= ${subSection>sideContent} !== undefined}">
+								<template:then>
+									<layout:DynamicSideContent
+											id="{= ID.generate(['fe', ${subSection>key}, 'SideContentLayout'])}"
+											showMainContent="true"
+											showSideContent="{subSection>sideContent/visible}"
+											sideContentFallDown="BelowM"
+											containerQuery="true"
+											equalSplit="{subSection>sideContent/equalSplit}"
+										>
+										<layout:mainContent>
+											<core:Fragment fragmentName="sap.fe.templates.ObjectPage.view.fragments.SectionPresentationVisualization" type="XML" />
+										</layout:mainContent>
+										<layout:sideContent>
+											<core:Fragment fragmentName="sap.fe.templates.ObjectPage.view.fragments.SideContentCustomContainer" type="XML" />
+										</layout:sideContent>
+									</layout:DynamicSideContent>
+								</template:then>
+								<template:else>
+									<core:Fragment fragmentName="sap.fe.templates.ObjectPage.view.fragments.SectionPresentationVisualization" type="XML" />
+								</template:else>
+								</template:if>
+                            </opcontrol:content>
+                        </opcontrol:SubSectionBlock>
+					</uxap:ObjectPageLazyLoader>
+                    </uxap:blocks>
+                </template:elseif>
+                <template:elseif test="{= ${subSection>type} === 'Unknown'}">
+                    <Text text="{subSection>text}" />
+                </template:elseif>
+                <template:else>
+
+                </template:else>
+            </template:if>
+        </template:if>
+</core:FragmentDefinition>

package/packages/sap.fe.templates/src/sap/fe/templates/ObjectPage/view/fragments/SectionFormContent.fragment.xml

@@ -14,5 +14,6 @@
 		useFormContainerLabels="{= ${subSection>formDefinition/useFormContainerLabels}}"
 		partOfPreview="true"
 		formContainers="{subSection>formDefinition/formContainers}"
+		isVisible="{subSection>formDefinition/isVisible}"
 	/>
 </core:FragmentDefinition>

package/packages/sap.fe.templates/src/sap/fe/templates/ObjectPage/view/fragments/SectionMoreFormContent.fragment.xml

@@ -14,5 +14,6 @@
 		useFormContainerLabels="{= ${subSection>formDefinition/useFormContainerLabels}}"
 		partOfPreview="false"
 		formContainers="{subSection>formDefinition/formContainers}"
+		isVisible="{subSection>formDefinition/isVisible}"
 	/>
 </core:FragmentDefinition>