@sapui5/sap.fe.templates 1.100.0 → 1.102.0

package/src/sap/fe/templates/ObjectPage/overrides/Share.ts

@@ -0,0 +1,316 @@
+import Log from "sap/base/Log";
+import Share from "sap/fe/core/controllerextensions/Share";
+import ModelHelper from "sap/fe/core/helpers/ModelHelper";
+import SemanticKeyHelper from "sap/fe/core/helpers/SemanticKeyHelper";
+import ObjectPageController from "sap/fe/templates/ObjectPage/ObjectPageController.controller";
+import HashChanger from "sap/ui/core/routing/HashChanger";
+import Filter from "sap/ui/model/Filter";
+import FilterOperator from "sap/ui/model/FilterOperator";
+
+let bIsStickySupported: boolean;
+
+function createFilterToFetchActiveContext(mKeyValues: any, bIsActiveEntityDefined: any) {
+	const aKeys = Object.keys(mKeyValues);
+
+	const aFilters = aKeys.map(function (sKey: string) {
+		const sValue = mKeyValues[sKey];
+		if (sValue !== undefined) {
+			return new Filter(sKey, FilterOperator.EQ, sValue);
+		}
+	});
+
+	if (bIsActiveEntityDefined) {
+		const oActiveFilter = new Filter({
+			filters: [new Filter("SiblingEntity/IsActiveEntity", FilterOperator.EQ, true)],
+			and: false
+		});
+
+		aFilters.push(oActiveFilter);
+	}
+
+	const oCombinedFilter = new Filter(aFilters as any, true);
+	return oCombinedFilter;
+}
+function getActiveContextPath(oController: any, sPageEntityName: any, oFilter: any) {
+	const oListBinding = oController
+		.getView()
+		.getBindingContext()
+		.getModel()
+		.bindList("/" + sPageEntityName, undefined, undefined, oFilter, { "$$groupId": "$auto.Heroes" });
+	return oListBinding.requestContexts(0, 2).then(function (oContexts: any) {
+		if (oContexts && oContexts.length) {
+			return oContexts[0].getPath();
+		}
+	});
+}
+function getActiveContextInstances(oContext: any, oController: any, oEntitySet: any) {
+	const aActiveContextpromises: any[] = [];
+	const aPages: any[] = [];
+	let sMetaPath = oContext.getModel().getMetaModel().getMetaPath(oContext.getPath());
+	if (sMetaPath.indexOf("/") === 0) {
+		sMetaPath = sMetaPath.substring(1);
+	}
+	const aMetaPathArray = sMetaPath.split("/");
+	const sCurrentHashNoParams = HashChanger.getInstance().getHash().split("?")[0];
+	const aCurrentHashArray = sCurrentHashNoParams.split("/");
+
+	// oPageMap - creating an object that contains map of metapath name and it's technical details
+	// which is required to create a filter to fetch the relavant/correct active context
+	// Example: {SalesOrderManage:{technicalID:technicalIDValue}, _Item:{technicalID:technicalIDValue}} etc.,
+	const oPageMap: any = {};
+	const aPageHashArray: any[] = [];
+	aCurrentHashArray.forEach(function (sPageHash: any) {
+		const aKeyValues = sPageHash.substring(sPageHash.indexOf("(") + 1, sPageHash.length - 1).split(",");
+		const mKeyValues: any = {};
+		const sPageHashName = sPageHash.split("(")[0];
+		oPageMap[sPageHashName] = {};
+		aPageHashArray.push(sPageHashName);
+		oPageMap[sPageHashName]["bIsActiveEntityDefined"] = true;
+		for (let i = 0; i < aKeyValues.length; i++) {
+			const sKeyAssignment = aKeyValues[i];
+			const aParts = sKeyAssignment.split("=");
+			let sKeyValue = aParts[1];
+			let sKey = aParts[0];
+			// In case if only one technical key is defined then the url just contains the technicalIDValue but not the technicalID
+			// Example: SalesOrderManage(ID=11111129-aaaa-bbbb-cccc-ddddeeeeffff,IsActiveEntity=false)/_Item(11111129-aaaa-bbbb-cccc-ddddeeeeffff)
+			// In above example SalesOrderItem has only one technical key defined, hence technicalID info is not present in the url
+			// Hence in such cases we get technical key and use them to fetch active context
+			if (sKeyAssignment.indexOf("=") === -1) {
+				const oMetaModel = oContext.getModel().getMetaModel();
+				const aTechnicalKeys = oMetaModel.getObject("/" + aPageHashArray.join("/") + "/$Type/$Key");
+				sKeyValue = aParts[0];
+				sKey = aTechnicalKeys[0];
+				oPageMap[sPageHash.split("(")[0]]["bIsActiveEntityDefined"] = false;
+			}
+
+			if (sKey !== "IsActiveEntity") {
+				if (sKeyValue.indexOf("'") === 0 && sKeyValue.lastIndexOf("'") === sKeyValue.length - 1) {
+					// Remove the quotes from the value and decode special chars
+					sKeyValue = decodeURIComponent(sKeyValue.substring(1, sKeyValue.length - 1));
+				}
+				mKeyValues[sKey] = sKeyValue;
+			}
+		}
+		oPageMap[sPageHashName].mKeyValues = mKeyValues;
+	});
+
+	let oPageEntitySet = oEntitySet;
+	aMetaPathArray.forEach(function (sNavigationPath: any) {
+		const oPageInfo: any = {};
+		const sPageEntitySetName = oPageEntitySet.$NavigationPropertyBinding && oPageEntitySet.$NavigationPropertyBinding[sNavigationPath];
+		if (sPageEntitySetName) {
+			oPageInfo.pageEntityName = oPageEntitySet.$NavigationPropertyBinding[sNavigationPath];
+			oPageEntitySet =
+				oContext
+					.getModel()
+					.getMetaModel()
+					.getObject("/" + sPageEntitySetName) || oEntitySet;
+		} else {
+			oPageInfo.pageEntityName = sNavigationPath;
+		}
+		oPageInfo.mKeyValues = oPageMap[sNavigationPath].mKeyValues;
+		oPageInfo.bIsActiveEntityDefined = oPageMap[sNavigationPath].bIsActiveEntityDefined;
+		aPages.push(oPageInfo);
+	});
+
+	aPages.forEach(function (oPageInfo: any) {
+		const oFilter = createFilterToFetchActiveContext(oPageInfo.mKeyValues, oPageInfo.bIsActiveEntityDefined);
+		aActiveContextpromises.push(getActiveContextPath(oController, oPageInfo.pageEntityName, oFilter));
+	});
+
+	return aActiveContextpromises;
+}
+
+/**
+ * Method to fetch active context path's.
+ * @param {sap.ui.model.odata.v4.Context} oContext The Page Context
+ * @param oController
+ * @returns {Promise} Promise which is resolved once the active context's are fetched
+ */
+function getActiveContextPaths(oContext: any, oController: any) {
+	const sCurrentHashNoParams = HashChanger.getInstance().getHash().split("?")[0];
+	let sRootEntityName = sCurrentHashNoParams && sCurrentHashNoParams.substr(0, sCurrentHashNoParams.indexOf("("));
+	if (sRootEntityName.indexOf("/") === 0) {
+		sRootEntityName = sRootEntityName.substring(1);
+	}
+	const oEntitySet = oContext
+		.getModel()
+		.getMetaModel()
+		.getObject("/" + sRootEntityName);
+	const oPageContext = oContext;
+	const aActiveContextpromises = getActiveContextInstances(oContext, oController, oEntitySet);
+	if (aActiveContextpromises.length > 0) {
+		return Promise.all(aActiveContextpromises)
+			.then(function (aData: any[]) {
+				const aActiveContextPaths = [];
+				let oPageEntitySet = oEntitySet;
+				if (aData[0].indexOf("/") === 0) {
+					aActiveContextPaths.push(aData[0].substring(1));
+				} else {
+					aActiveContextPaths.push(aData[0]);
+				}
+				// In the active context paths identify and replace the entitySet Name with corresponding navigation property name
+				// Required to form the url pointing to active context
+				// Example : SalesOrderItem --> _Item, MaterialDetails --> _MaterialDetails etc.,
+				for (let i = 1; i < aData.length; i++) {
+					let sActiveContextPath = aData[i];
+					let sNavigatioProperty = "";
+					let sEntitySetName = sActiveContextPath && sActiveContextPath.substr(0, sActiveContextPath.indexOf("("));
+					if (sEntitySetName.indexOf("/") === 0) {
+						sEntitySetName = sEntitySetName.substring(1);
+					}
+					if (sActiveContextPath.indexOf("/") === 0) {
+						sActiveContextPath = sActiveContextPath.substring(1);
+					}
+					sNavigatioProperty = Object.keys(oPageEntitySet.$NavigationPropertyBinding)[
+						Object.values(oPageEntitySet.$NavigationPropertyBinding).indexOf(sEntitySetName)
+					];
+					if (sNavigatioProperty) {
+						aActiveContextPaths.push(sActiveContextPath.replace(sEntitySetName, sNavigatioProperty));
+						oPageEntitySet =
+							oPageContext
+								.getModel()
+								.getMetaModel()
+								.getObject("/" + sEntitySetName) || oEntitySet;
+					} else {
+						aActiveContextPaths.push(sActiveContextPath);
+					}
+				}
+				return aActiveContextPaths;
+			})
+			.catch(function (oError: any) {
+				Log.info("Failed to retrieve one or more active context path's", oError);
+			});
+	} else {
+		return Promise.resolve();
+	}
+}
+function fetchActiveContextPaths(oContext: any, oController: any) {
+	let oPromise, aSemanticKeys;
+	const sCurrentHashNoParams = HashChanger.getInstance().getHash().split("?")[0];
+	if (oContext) {
+		const oModel = oContext.getModel();
+		const oMetaModel = oModel.getMetaModel();
+		bIsStickySupported = ModelHelper.isStickySessionSupported(oMetaModel);
+		let sRootEntityName = sCurrentHashNoParams && sCurrentHashNoParams.substr(0, sCurrentHashNoParams.indexOf("("));
+		if (sRootEntityName.indexOf("/") === 0) {
+			sRootEntityName = sRootEntityName.substring(1);
+		}
+		aSemanticKeys = SemanticKeyHelper.getSemanticKeys(oMetaModel, sRootEntityName);
+	}
+	// Fetch active context details incase of below scenario's(where page is not sticky supported(we do not have draft instance))
+	// 1. In case of draft enabled Object page where semantic key based URL is not possible(like semantic keys are not modeled in the entity set)
+	// 2. In case of draft enabled Sub Object Pages (where semantic bookmarking is not supported)
+	const oViewData = oController.getView().getViewData();
+	if (oContext && !bIsStickySupported && ((oViewData.viewLevel === 1 && !aSemanticKeys) || oViewData.viewLevel >= 2)) {
+		oPromise = getActiveContextPaths(oContext, oController);
+		return oPromise;
+	} else {
+		return Promise.resolve();
+	}
+}
+
+// /**
+//  * Get share URL.
+//  * @param bIsEditable
+//  * @param bIsStickySupported
+//  * @param aActiveContextPaths
+//  * @returns {string} The share URL
+//  * @protected
+//  * @static
+//  */
+function getShareUrl(bIsEditable: any, bIsStickySupported: any, aActiveContextPaths: any) {
+	let sShareUrl;
+	const sHash = HashChanger.getInstance().getHash();
+	const sBasePath = (HashChanger.getInstance() as any).hrefForAppSpecificHash
+		? (HashChanger.getInstance() as any).hrefForAppSpecificHash("")
+		: "";
+	if (bIsEditable && !bIsStickySupported && aActiveContextPaths) {
+		sShareUrl = sBasePath + aActiveContextPaths.join("/");
+	} else {
+		sShareUrl = sHash ? sBasePath + sHash : window.location.hash;
+	}
+	return sShareUrl;
+}
+function getShareEmailUrl() {
+	const oUShellContainer = sap.ushell && sap.ushell.Container;
+	if (oUShellContainer) {
+		return oUShellContainer
+			.getFLPUrlAsync(true)
+			.then(function (sFLPUrl: any) {
+				return sFLPUrl;
+			})
+			.catch(function (sError: any) {
+				Log.error("Could not retrieve cFLP URL for the sharing dialog (dialog will not be opened)", sError);
+			});
+	} else {
+		return Promise.resolve(document.URL);
+	}
+}
+
+function getJamUrl(bIsEditMode: boolean, bIsStickySupported: any, aActiveContextPaths: any) {
+	let sJamUrl: string;
+	const sHash = HashChanger.getInstance().getHash();
+	const sBasePath = (HashChanger.getInstance() as any).hrefForAppSpecificHash
+		? (HashChanger.getInstance() as any).hrefForAppSpecificHash("")
+		: "";
+	if (bIsEditMode && !bIsStickySupported && aActiveContextPaths) {
+		sJamUrl = sBasePath + aActiveContextPaths.join("/");
+	} else {
+		sJamUrl = sHash ? sBasePath + sHash : window.location.hash;
+	}
+	// in case we are in cFLP scenario, the application is running
+	// inside an iframe, and there for we need to get the cFLP URL
+	// and not 'document.URL' that represents the iframe URL
+	if (sap.ushell && sap.ushell.Container && sap.ushell.Container.runningInIframe && sap.ushell.Container.runningInIframe()) {
+		sap.ushell.Container.getFLPUrl(true)
+			.then(function (sUrl: any) {
+				return sUrl.substr(0, sUrl.indexOf("#")) + sJamUrl;
+			})
+			.catch(function (sError: any) {
+				Log.error("Could not retrieve cFLP URL for the sharing dialog (dialog will not be opened)", sError);
+			});
+	} else {
+		return Promise.resolve(window.location.origin + window.location.pathname + sJamUrl);
+	}
+}
+
+const ShareExtensionOverride = {
+	adaptShareMetadata: function (this: Share, oShareMetadata: any) {
+		const oContext = this.base.getView().getBindingContext(),
+			oUIModel = this.base.getView().getModel("ui"),
+			bIsEditable = oUIModel.getProperty("/isEditable");
+		return fetchActiveContextPaths(oContext, this.base.getView().getController()).then((aActiveContextPaths) => {
+			const oPageTitleInfo = (this.base.getView().getController() as ObjectPageController)._getPageTitleInformation();
+
+			return Promise.all([
+				getJamUrl(bIsEditable, bIsStickySupported, aActiveContextPaths),
+				getShareUrl(bIsEditable, bIsStickySupported, aActiveContextPaths),
+				getShareEmailUrl()
+			])
+				.then(function (oData) {
+					let sTitle = oPageTitleInfo.title;
+					const sObjectSubtitle = oPageTitleInfo.subtitle ? oPageTitleInfo.subtitle.toString() : "";
+					if (sObjectSubtitle) {
+						sTitle = sTitle + " - " + sObjectSubtitle;
+					}
+					oShareMetadata.tile = {
+						title: oPageTitleInfo.title,
+						subtitle: sObjectSubtitle
+					};
+					oShareMetadata.email.title = sTitle;
+					oShareMetadata.title = sTitle;
+					oShareMetadata.jam.url = oData[0];
+					oShareMetadata.url = oData[1];
+					oShareMetadata.email.url = oData[2];
+
+					return oShareMetadata;
+				})
+				.catch(function (error: any) {
+					Log.error(error);
+				});
+		});
+	}
+};
+
+export default ShareExtensionOverride;

package/src/sap/fe/templates/ObjectPage/overrides/ViewState.js

@@ -1,66 +1,75 @@
 /*!
  * SAP UI development toolkit for HTML5 (SAPUI5)
-        (c) Copyright 2009-2021 SAP SE. All rights reserved
-    
+ *      (c) Copyright 2009-2021 SAP SE. All rights reserved
  */
-sap.ui.define(["sap/fe/core/library", "sap/fe/core/helpers/KeepAliveHelper"], function(CoreLibrary, KeepAliveHelper) {
-	"use strict";
+sap.ui.define(["sap/fe/core/helpers/KeepAliveHelper", "sap/fe/core/library"], function (KeepAliveHelper, CoreLibrary) {
+  "use strict";
 
-	var VariantManagement = CoreLibrary.VariantManagement;
+  var VariantManagement = CoreLibrary.VariantManagement;
+  var ViewStateExtensionOverride = {
+    applyInitialStateOnly: function () {
+      return false;
+    },
+    adaptStateControls: function (aStateControls) {
+      var oView = this.getView(),
+          oController = oView.getController(),
+          oViewData = oView.getViewData();
+      var bControlVM = false;
 
-	return {
-		applyInitialStateOnly: function() {
-			return false;
-		},
-		adaptStateControls: function(aStateControls) {
-			var oView = this.getView(),
-				oController = oView.getController(),
-				oViewData = oView.getViewData(),
-				bControlVM = false;
+      switch (oViewData.variantManagement) {
+        case VariantManagement.Control:
+          bControlVM = true;
+          break;
 
-			switch (oViewData.variantManagement) {
-				case VariantManagement.Control:
-					bControlVM = true;
-					break;
-				case VariantManagement.Page:
-				case VariantManagement.None:
-					break;
-				default:
-					throw new Error("unhandled variant setting: " + oViewData.getVariantManagement());
-			}
+        case VariantManagement.Page:
+        case VariantManagement.None:
+          break;
 
-			oController._findTables().forEach(function(oTable) {
-				var oQuickFilter = oTable.getQuickFilter();
-				if (oQuickFilter) {
-					aStateControls.push(oQuickFilter);
-				}
-				if (bControlVM) {
-					aStateControls.push(oTable.getVariant());
-				}
-			});
+        default:
+          throw new Error("unhandled variant setting: " + oViewData.getVariantManagement());
+      }
 
-			aStateControls.push(oView.byId("fe::ObjectPage"));
-		},
-		adaptBindingRefreshControls: function(aControls) {
-			var oView = this.getView(),
-				sRefreshStrategy = KeepAliveHelper.getViewRefreshInfo(oView),
-				oController = oView.getController(),
-				aControlsToRefresh = [];
+      oController._findTables().forEach(function (oTable) {
+        var oQuickFilter = oTable.getQuickFilter();
 
-			if (sRefreshStrategy) {
-				var oObjectPageControl = oController._getObjectPageLayoutControl();
-				aControlsToRefresh.push(oObjectPageControl);
-			}
-			if (sRefreshStrategy !== "includingDependents") {
-				var aViewControls = oController._findTables();
-				aControlsToRefresh = aControlsToRefresh.concat(KeepAliveHelper.getControlsForRefresh(oView, aViewControls) || []);
-			}
-			return aControlsToRefresh.reduce(function(aPrevControls, oControl) {
-				if (aPrevControls.indexOf(oControl) === -1) {
-					aPrevControls.push(oControl);
-				}
-				return aPrevControls;
-			}, aControls);
-		}
-	};
-});
+        if (oQuickFilter) {
+          aStateControls.push(oQuickFilter);
+        }
+
+        if (bControlVM) {
+          aStateControls.push(oTable.getVariant());
+        }
+      });
+
+      aStateControls.push(oView.byId("fe::ObjectPage"));
+    },
+    adaptBindingRefreshControls: function (aControls) {
+      var oView = this.getView(),
+          sRefreshStrategy = KeepAliveHelper.getViewRefreshInfo(oView),
+          oController = oView.getController();
+      var aControlsToRefresh = [];
+
+      if (sRefreshStrategy) {
+        var oObjectPageControl = oController._getObjectPageLayoutControl();
+
+        aControlsToRefresh.push(oObjectPageControl);
+      }
+
+      if (sRefreshStrategy !== "includingDependents") {
+        var aViewControls = oController._findTables();
+
+        aControlsToRefresh = aControlsToRefresh.concat(KeepAliveHelper.getControlsForRefresh(oView, aViewControls) || []);
+      }
+
+      return aControlsToRefresh.reduce(function (aPrevControls, oControl) {
+        if (aPrevControls.indexOf(oControl) === -1) {
+          aPrevControls.push(oControl);
+        }
+
+        return aPrevControls;
+      }, aControls);
+    }
+  };
+  return ViewStateExtensionOverride;
+}, false);
+//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIlZpZXdTdGF0ZS50cyJdLCJuYW1lcyI6WyJWYXJpYW50TWFuYWdlbWVudCIsIkNvcmVMaWJyYXJ5IiwiVmlld1N0YXRlRXh0ZW5zaW9uT3ZlcnJpZGUiLCJhcHBseUluaXRpYWxTdGF0ZU9ubHkiLCJhZGFwdFN0YXRlQ29udHJvbHMiLCJhU3RhdGVDb250cm9scyIsIm9WaWV3IiwiZ2V0VmlldyIsIm9Db250cm9sbGVyIiwiZ2V0Q29udHJvbGxlciIsIm9WaWV3RGF0YSIsImdldFZpZXdEYXRhIiwiYkNvbnRyb2xWTSIsInZhcmlhbnRNYW5hZ2VtZW50IiwiQ29udHJvbCIsIlBhZ2UiLCJOb25lIiwiRXJyb3IiLCJnZXRWYXJpYW50TWFuYWdlbWVudCIsIl9maW5kVGFibGVzIiwiZm9yRWFjaCIsIm9UYWJsZSIsIm9RdWlja0ZpbHRlciIsImdldFF1aWNrRmlsdGVyIiwicHVzaCIsImdldFZhcmlhbnQiLCJieUlkIiwiYWRhcHRCaW5kaW5nUmVmcmVzaENvbnRyb2xzIiwiYUNvbnRyb2xzIiwic1JlZnJlc2hTdHJhdGVneSIsIktlZXBBbGl2ZUhlbHBlciIsImdldFZpZXdSZWZyZXNoSW5mbyIsImFDb250cm9sc1RvUmVmcmVzaCIsIm9PYmplY3RQYWdlQ29udHJvbCIsIl9nZXRPYmplY3RQYWdlTGF5b3V0Q29udHJvbCIsImFWaWV3Q29udHJvbHMiLCJjb25jYXQiLCJnZXRDb250cm9sc0ZvclJlZnJlc2giLCJyZWR1Y2UiLCJhUHJldkNvbnRyb2xzIiwib0NvbnRyb2wiLCJpbmRleE9mIl0sIm1hcHBpbmdzIjoiO0FBQUE7QUFDQTtBQUNBOzs7O0FBSUEsTUFBTUEsaUJBQWlCLEdBQUdDLFdBQVcsQ0FBQ0QsaUJBQXRDO0FBRUEsTUFBTUUsMEJBQTBCLEdBQUc7QUFDbENDLElBQUFBLHFCQUFxQixFQUFFLFlBQVk7QUFDbEMsYUFBTyxLQUFQO0FBQ0EsS0FIaUM7QUFJbENDLElBQUFBLGtCQUFrQixFQUFFLFVBQTJCQyxjQUEzQixFQUFnRDtBQUNuRSxVQUFNQyxLQUFLLEdBQUcsS0FBS0MsT0FBTCxFQUFkO0FBQUEsVUFDQ0MsV0FBVyxHQUFHRixLQUFLLENBQUNHLGFBQU4sRUFEZjtBQUFBLFVBRUNDLFNBQVMsR0FBR0osS0FBSyxDQUFDSyxXQUFOLEVBRmI7QUFHQSxVQUFJQyxVQUFVLEdBQUcsS0FBakI7O0FBRUEsY0FBUUYsU0FBUyxDQUFDRyxpQkFBbEI7QUFDQyxhQUFLYixpQkFBaUIsQ0FBQ2MsT0FBdkI7QUFDQ0YsVUFBQUEsVUFBVSxHQUFHLElBQWI7QUFDQTs7QUFDRCxhQUFLWixpQkFBaUIsQ0FBQ2UsSUFBdkI7QUFDQSxhQUFLZixpQkFBaUIsQ0FBQ2dCLElBQXZCO0FBQ0M7O0FBQ0Q7QUFDQyxnQkFBTSxJQUFJQyxLQUFKLENBQVUsZ0NBQWdDUCxTQUFTLENBQUNRLG9CQUFWLEVBQTFDLENBQU47QUFSRjs7QUFXQ1YsTUFBQUEsV0FBRCxDQUFzQ1csV0FBdEMsR0FBb0RDLE9BQXBELENBQTRELFVBQVVDLE1BQVYsRUFBdUI7QUFDbEYsWUFBTUMsWUFBWSxHQUFHRCxNQUFNLENBQUNFLGNBQVAsRUFBckI7O0FBQ0EsWUFBSUQsWUFBSixFQUFrQjtBQUNqQmpCLFVBQUFBLGNBQWMsQ0FBQ21CLElBQWYsQ0FBb0JGLFlBQXBCO0FBQ0E7O0FBQ0QsWUFBSVYsVUFBSixFQUFnQjtBQUNmUCxVQUFBQSxjQUFjLENBQUNtQixJQUFmLENBQW9CSCxNQUFNLENBQUNJLFVBQVAsRUFBcEI7QUFDQTtBQUNELE9BUkQ7O0FBVUFwQixNQUFBQSxjQUFjLENBQUNtQixJQUFmLENBQW9CbEIsS0FBSyxDQUFDb0IsSUFBTixDQUFXLGdCQUFYLENBQXBCO0FBQ0EsS0FoQ2lDO0FBaUNsQ0MsSUFBQUEsMkJBQTJCLEVBQUUsVUFBMkJDLFNBQTNCLEVBQTJDO0FBQ3ZFLFVBQU10QixLQUFLLEdBQUcsS0FBS0MsT0FBTCxFQUFkO0FBQUEsVUFDQ3NCLGdCQUFnQixHQUFHQyxlQUFlLENBQUNDLGtCQUFoQixDQUFtQ3pCLEtBQW5DLENBRHBCO0FBQUEsVUFFQ0UsV0FBVyxHQUFHRixLQUFLLENBQUNHLGFBQU4sRUFGZjtBQUdBLFVBQUl1QixrQkFBNkIsR0FBRyxFQUFwQzs7QUFFQSxVQUFJSCxnQkFBSixFQUFzQjtBQUNyQixZQUFNSSxrQkFBa0IsR0FBSXpCLFdBQUQsQ0FBc0MwQiwyQkFBdEMsRUFBM0I7O0FBQ0FGLFFBQUFBLGtCQUFrQixDQUFDUixJQUFuQixDQUF3QlMsa0JBQXhCO0FBQ0E7O0FBQ0QsVUFBSUosZ0JBQWdCLEtBQUsscUJBQXpCLEVBQWdEO0FBQy9DLFlBQU1NLGFBQWEsR0FBSTNCLFdBQUQsQ0FBc0NXLFdBQXRDLEVBQXRCOztBQUNBYSxRQUFBQSxrQkFBa0IsR0FBR0Esa0JBQWtCLENBQUNJLE1BQW5CLENBQTBCTixlQUFlLENBQUNPLHFCQUFoQixDQUFzQy9CLEtBQXRDLEVBQTZDNkIsYUFBN0MsS0FBK0QsRUFBekYsQ0FBckI7QUFDQTs7QUFDRCxhQUFPSCxrQkFBa0IsQ0FBQ00sTUFBbkIsQ0FBMEIsVUFBVUMsYUFBVixFQUE4QkMsUUFBOUIsRUFBNkM7QUFDN0UsWUFBSUQsYUFBYSxDQUFDRSxPQUFkLENBQXNCRCxRQUF0QixNQUFvQyxDQUFDLENBQXpDLEVBQTRDO0FBQzNDRCxVQUFBQSxhQUFhLENBQUNmLElBQWQsQ0FBbUJnQixRQUFuQjtBQUNBOztBQUNELGVBQU9ELGFBQVA7QUFDQSxPQUxNLEVBS0pYLFNBTEksQ0FBUDtBQU1BO0FBckRpQyxHQUFuQztTQXdEZTFCLDBCIiwic291cmNlUm9vdCI6Ii4iLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgVmlld1N0YXRlIGZyb20gXCJzYXAvZmUvY29yZS9jb250cm9sbGVyZXh0ZW5zaW9ucy9WaWV3U3RhdGVcIjtcbmltcG9ydCBLZWVwQWxpdmVIZWxwZXIgZnJvbSBcInNhcC9mZS9jb3JlL2hlbHBlcnMvS2VlcEFsaXZlSGVscGVyXCI7XG5pbXBvcnQgQ29yZUxpYnJhcnkgZnJvbSBcInNhcC9mZS9jb3JlL2xpYnJhcnlcIjtcbmltcG9ydCBPYmplY3RQYWdlQ29udHJvbGxlciBmcm9tIFwic2FwL2ZlL3RlbXBsYXRlcy9PYmplY3RQYWdlL09iamVjdFBhZ2VDb250cm9sbGVyLmNvbnRyb2xsZXJcIjtcbmltcG9ydCBDb250cm9sIGZyb20gXCJzYXAvdWkvY29yZS9Db250cm9sXCI7XG5cbmNvbnN0IFZhcmlhbnRNYW5hZ2VtZW50ID0gQ29yZUxpYnJhcnkuVmFyaWFudE1hbmFnZW1lbnQ7XG5cbmNvbnN0IFZpZXdTdGF0ZUV4dGVuc2lvbk92ZXJyaWRlID0ge1xuXHRhcHBseUluaXRpYWxTdGF0ZU9ubHk6IGZ1bmN0aW9uICgpIHtcblx0XHRyZXR1cm4gZmFsc2U7XG5cdH0sXG5cdGFkYXB0U3RhdGVDb250cm9sczogZnVuY3Rpb24gKHRoaXM6IFZpZXdTdGF0ZSwgYVN0YXRlQ29udHJvbHM6IGFueSkge1xuXHRcdGNvbnN0IG9WaWV3ID0gdGhpcy5nZXRWaWV3KCksXG5cdFx0XHRvQ29udHJvbGxlciA9IG9WaWV3LmdldENvbnRyb2xsZXIoKSxcblx0XHRcdG9WaWV3RGF0YSA9IG9WaWV3LmdldFZpZXdEYXRhKCkgYXMgYW55O1xuXHRcdGxldCBiQ29udHJvbFZNID0gZmFsc2U7XG5cblx0XHRzd2l0Y2ggKG9WaWV3RGF0YS52YXJpYW50TWFuYWdlbWVudCkge1xuXHRcdFx0Y2FzZSBWYXJpYW50TWFuYWdlbWVudC5Db250cm9sOlxuXHRcdFx0XHRiQ29udHJvbFZNID0gdHJ1ZTtcblx0XHRcdFx0YnJlYWs7XG5cdFx0XHRjYXNlIFZhcmlhbnRNYW5hZ2VtZW50LlBhZ2U6XG5cdFx0XHRjYXNlIFZhcmlhbnRNYW5hZ2VtZW50Lk5vbmU6XG5cdFx0XHRcdGJyZWFrO1xuXHRcdFx0ZGVmYXVsdDpcblx0XHRcdFx0dGhyb3cgbmV3IEVycm9yKFwidW5oYW5kbGVkIHZhcmlhbnQgc2V0dGluZzogXCIgKyBvVmlld0RhdGEuZ2V0VmFyaWFudE1hbmFnZW1lbnQoKSk7XG5cdFx0fVxuXG5cdFx0KG9Db250cm9sbGVyIGFzIE9iamVjdFBhZ2VDb250cm9sbGVyKS5fZmluZFRhYmxlcygpLmZvckVhY2goZnVuY3Rpb24gKG9UYWJsZTogYW55KSB7XG5cdFx0XHRjb25zdCBvUXVpY2tGaWx0ZXIgPSBvVGFibGUuZ2V0UXVpY2tGaWx0ZXIoKTtcblx0XHRcdGlmIChvUXVpY2tGaWx0ZXIpIHtcblx0XHRcdFx0YVN0YXRlQ29udHJvbHMucHVzaChvUXVpY2tGaWx0ZXIpO1xuXHRcdFx0fVxuXHRcdFx0aWYgKGJDb250cm9sVk0pIHtcblx0XHRcdFx0YVN0YXRlQ29udHJvbHMucHVzaChvVGFibGUuZ2V0VmFyaWFudCgpKTtcblx0XHRcdH1cblx0XHR9KTtcblxuXHRcdGFTdGF0ZUNvbnRyb2xzLnB1c2gob1ZpZXcuYnlJZChcImZlOjpPYmplY3RQYWdlXCIpKTtcblx0fSxcblx0YWRhcHRCaW5kaW5nUmVmcmVzaENvbnRyb2xzOiBmdW5jdGlvbiAodGhpczogVmlld1N0YXRlLCBhQ29udHJvbHM6IGFueSkge1xuXHRcdGNvbnN0IG9WaWV3ID0gdGhpcy5nZXRWaWV3KCksXG5cdFx0XHRzUmVmcmVzaFN0cmF0ZWd5ID0gS2VlcEFsaXZlSGVscGVyLmdldFZpZXdSZWZyZXNoSW5mbyhvVmlldyksXG5cdFx0XHRvQ29udHJvbGxlciA9IG9WaWV3LmdldENvbnRyb2xsZXIoKTtcblx0XHRsZXQgYUNvbnRyb2xzVG9SZWZyZXNoOiBDb250cm9sW10gPSBbXTtcblxuXHRcdGlmIChzUmVmcmVzaFN0cmF0ZWd5KSB7XG5cdFx0XHRjb25zdCBvT2JqZWN0UGFnZUNvbnRyb2wgPSAob0NvbnRyb2xsZXIgYXMgT2JqZWN0UGFnZUNvbnRyb2xsZXIpLl9nZXRPYmplY3RQYWdlTGF5b3V0Q29udHJvbCgpO1xuXHRcdFx0YUNvbnRyb2xzVG9SZWZyZXNoLnB1c2gob09iamVjdFBhZ2VDb250cm9sKTtcblx0XHR9XG5cdFx0aWYgKHNSZWZyZXNoU3RyYXRlZ3kgIT09IFwiaW5jbHVkaW5nRGVwZW5kZW50c1wiKSB7XG5cdFx0XHRjb25zdCBhVmlld0NvbnRyb2xzID0gKG9Db250cm9sbGVyIGFzIE9iamVjdFBhZ2VDb250cm9sbGVyKS5fZmluZFRhYmxlcygpO1xuXHRcdFx0YUNvbnRyb2xzVG9SZWZyZXNoID0gYUNvbnRyb2xzVG9SZWZyZXNoLmNvbmNhdChLZWVwQWxpdmVIZWxwZXIuZ2V0Q29udHJvbHNGb3JSZWZyZXNoKG9WaWV3LCBhVmlld0NvbnRyb2xzKSB8fCBbXSk7XG5cdFx0fVxuXHRcdHJldHVybiBhQ29udHJvbHNUb1JlZnJlc2gucmVkdWNlKGZ1bmN0aW9uIChhUHJldkNvbnRyb2xzOiBhbnksIG9Db250cm9sOiBhbnkpIHtcblx0XHRcdGlmIChhUHJldkNvbnRyb2xzLmluZGV4T2Yob0NvbnRyb2wpID09PSAtMSkge1xuXHRcdFx0XHRhUHJldkNvbnRyb2xzLnB1c2gob0NvbnRyb2wpO1xuXHRcdFx0fVxuXHRcdFx0cmV0dXJuIGFQcmV2Q29udHJvbHM7XG5cdFx0fSwgYUNvbnRyb2xzKTtcblx0fVxufTtcblxuZXhwb3J0IGRlZmF1bHQgVmlld1N0YXRlRXh0ZW5zaW9uT3ZlcnJpZGU7XG4iXX0=

package/src/sap/fe/templates/ObjectPage/overrides/ViewState.ts

@@ -0,0 +1,65 @@
+import ViewState from "sap/fe/core/controllerextensions/ViewState";
+import KeepAliveHelper from "sap/fe/core/helpers/KeepAliveHelper";
+import CoreLibrary from "sap/fe/core/library";
+import ObjectPageController from "sap/fe/templates/ObjectPage/ObjectPageController.controller";
+import Control from "sap/ui/core/Control";
+
+const VariantManagement = CoreLibrary.VariantManagement;
+
+const ViewStateExtensionOverride = {
+	applyInitialStateOnly: function () {
+		return false;
+	},
+	adaptStateControls: function (this: ViewState, aStateControls: any) {
+		const oView = this.getView(),
+			oController = oView.getController(),
+			oViewData = oView.getViewData() as any;
+		let bControlVM = false;
+
+		switch (oViewData.variantManagement) {
+			case VariantManagement.Control:
+				bControlVM = true;
+				break;
+			case VariantManagement.Page:
+			case VariantManagement.None:
+				break;
+			default:
+				throw new Error("unhandled variant setting: " + oViewData.getVariantManagement());
+		}
+
+		(oController as ObjectPageController)._findTables().forEach(function (oTable: any) {
+			const oQuickFilter = oTable.getQuickFilter();
+			if (oQuickFilter) {
+				aStateControls.push(oQuickFilter);
+			}
+			if (bControlVM) {
+				aStateControls.push(oTable.getVariant());
+			}
+		});
+
+		aStateControls.push(oView.byId("fe::ObjectPage"));
+	},
+	adaptBindingRefreshControls: function (this: ViewState, aControls: any) {
+		const oView = this.getView(),
+			sRefreshStrategy = KeepAliveHelper.getViewRefreshInfo(oView),
+			oController = oView.getController();
+		let aControlsToRefresh: Control[] = [];
+
+		if (sRefreshStrategy) {
+			const oObjectPageControl = (oController as ObjectPageController)._getObjectPageLayoutControl();
+			aControlsToRefresh.push(oObjectPageControl);
+		}
+		if (sRefreshStrategy !== "includingDependents") {
+			const aViewControls = (oController as ObjectPageController)._findTables();
+			aControlsToRefresh = aControlsToRefresh.concat(KeepAliveHelper.getControlsForRefresh(oView, aViewControls) || []);
+		}
+		return aControlsToRefresh.reduce(function (aPrevControls: any, oControl: any) {
+			if (aPrevControls.indexOf(oControl) === -1) {
+				aPrevControls.push(oControl);
+			}
+			return aPrevControls;
+		}, aControls);
+	}
+};
+
+export default ViewStateExtensionOverride;

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

@@ -7,9 +7,8 @@
 	xmlns:macro="sap.fe.macros.internal"
 	template:require="{
 		ID: 'sap/fe/core/helpers/StableIdHelper',
-		OP: 'sap/fe/templates/ObjectPage/AnnotationHelper',
+		OP: 'sap/fe/templates/ObjectPage/ObjectPageTemplating',
 		MODEL: 'sap/ui/model/odata/v4/AnnotationHelper',
-		CORE: 'sap/fe/core/AnnotationHelper',
 		UI: 'sap/fe/core/templating/UIFormatters',
 		CRIT: 'sap/fe/core/templating/CriticalityFormatters',
 		COMMON: 'sap/fe/macros/CommonHelper',
@@ -17,9 +16,22 @@
 	}"
 >
 	<template:if test="{converterContext>header/actions}">
-	    <template:repeat list="{converterContext>header/actions}" var="headerAction">
-			<template:if test="{= CORE.isManifestAction(${headerAction>}) }">
+		<template:repeat list="{converterContext>header/actions}" var="headerAction">
+			<template:if test="{= ${headerAction>type} === 'DraftActions' &amp;&amp; OP.checkDraftState(${entitySet>@}) }">
 				<template:then>
+					<Button
+						id="fe::StandardAction::SwitchDraftAndActiveObject"
+						text="{= ( !(${ui>/editMode} === 'Editable') &amp;&amp; !${ui>createMode} &amp;&amp; ${HasDraftEntity} ) ? ${sap.fe.i18n>C_COMMON_OBJECT_PAGE_SAVED_VERSION_BUT} : ${sap.fe.i18n>C_COMMON_OBJECT_PAGE_DRAFT_BUT} }"
+						visible="{= OP.getSwitchDraftAndActiveVisibility(${entitySet>@}) }"
+						icon="sap-icon://navigation-down-arrow"
+						iconFirst="false"
+						type="Transparent"
+						press="._showSwitchDraftAndActivePopover($event)"
+					/>
+					<core:Fragment fragmentName="sap.fe.templates.ObjectPage.view.fragments.CollaborationDraft" type="XML" />
+					<ToolbarSpacer />
+				</template:then>
+				<template:elseif test="{= OP.isManifestAction(${headerAction>}) }">
 					<template:if test="{= ${headerAction>type} === 'Menu'}">
 						<template:then>
 							<MenuButton
@@ -38,7 +50,7 @@
 														<MenuItem
 															id="{= ID.generate(['fe', ${dataField>}]) }"
 															text="{dataField>Label}"
-															press="{= OP.getPressExpressionForEdit(${dataField>}, ${entitySet>@sapui.name}, ${headerAction>}) }"
+															press="{= ${menuItemAction>command} ? ('cmd:' + ${menuItemAction>command}) : OP.getPressExpressionForEdit(${dataField>}, ${entitySet>@sapui.name}, ${headerAction>}) }"
 															visible="{menuItemAction>visible}"
 															enabled="{menuItemAction>enabled}"
 														/>
@@ -47,7 +59,7 @@
 														<MenuItem
 															id="{= ID.generate(['fe', ${dataField>}]) }"
 															text="{dataField>Label}"
-															press="{menuItemAction>press}"
+															press="{= ${menuItemAction>command} ? ('cmd:' + ${menuItemAction>command}) : ${menuItemAction>press}}"
 															enabled="{menuItemAction>enabled}"
 															visible="{menuItemAction>visible}"
 															macrodata:IBNData="{menuItemAction>customData}"
@@ -58,7 +70,7 @@
 															core:require="{FPM: 'sap/fe/core/helpers/FPMHelper'}"
 															id="{= ID.generate(['fe',${menuItemAction>id}])}"
 															text="{menuItemAction>text}"
-															press="{= CORE.buildActionWrapper(${menuItemAction>}, ${headerAction>})}"
+															press="{= ${menuItemAction>command} ? ('cmd:' + ${menuItemAction>command}) : COMMON.buildActionWrapper(${menuItemAction>}, ${headerAction>})}"
 															visible="{menuItemAction>visible}"
 															enabled="{menuItemAction>enabled}"
 														/>
@@ -76,23 +88,22 @@
 								core:require="{FPM: 'sap/fe/core/helpers/FPMHelper'}"
 								id="{= ID.generate(['fe',${headerAction>id}])}"
 								text="{headerAction>text}"
-								press="{= CORE.buildActionWrapper(${headerAction>})}"
+								press="{= ${headerAction>command} ? ('cmd:' + ${headerAction>command}) : COMMON.buildActionWrapper(${headerAction>})}"
 								type="Default"
 								visible="{headerAction>visible}"
 								enabled="{headerAction>enabled}"
 							/>
 						</template:else>
 					</template:if>
-				</template:then>
-
+				</template:elseif>
 				<template:elseif test="{= ${headerAction>type} === 'Primary'}">
 					<template:with path="entitySet>" helper="OP.getEditAction" var="editAction">
 						<template:with path="editAction>@Org.OData.Core.V1.OperationAvailable" var="operationAvailable">
 							<template:if test="{= ${operationAvailable>} !== false }">
-							<Button
+								<Button
 									unittest:id="EditActionTest"
 									id="fe::StandardAction::Edit"
-									type="{path: 'entitySet>./@com.sap.vocabularies.UI.v1.Identification', formatter: 'CORE.buildEmphasizedButtonExpression'}"
+									type="{path: 'entitySet>./@com.sap.vocabularies.UI.v1.Identification', formatter: 'OP.buildEmphasizedButtonExpression'}"
 									text="{sap.fe.i18n>C_COMMON_OBJECT_PAGE_EDIT}"
 									enabled="{headerAction>enabled}"
 									visible="{headerAction>visible}"
@@ -118,24 +129,6 @@
 						ariaHasPopup="Dialog"
 					/>
 				</template:elseif>
-				<template:elseif test="{= ${headerAction>type} === 'SwitchToActiveObject' &amp;&amp; OP.checkDraftState(${entitySet>@}) }">
-					<Button
-						id="fe::StandardAction::SwitchToActiveObject"
-						type="Default"
-						text="{sap.fe.i18n>C_COMMON_OBJECT_PAGE_DISPLAY_SAVED_VERSION}"
-						visible="{= OP.getSwitchToActiveVisibility(${entitySet>@}) }"
-						press="cmd:SwitchToActiveObject"
-					/>
-				</template:elseif>
-				<template:elseif test="{= ${headerAction>type} === 'SwitchToDraftObject' &amp;&amp; OP.checkDraftState(${entitySet>@}) }">
-					<Button
-						id="fe::StandardAction::SwitchToDraftObject"
-						type="Default"
-						text="{sap.fe.i18n>C_COMMON_OBJECT_PAGE_RETURN_TO_DRAFT}"
-						visible="{= OP.getSwitchToDraftVisibility(${entitySet>@}) }"
-						press="cmd:SwitchToDraftObject"
-					/>
-				</template:elseif>
 				<template:elseif test="{= ${headerAction>type} === 'ForAction'}">
 					<template:with path="headerAction>annotationPath" var="dataField">
 						<template:if
@@ -150,7 +143,7 @@
 											id="{= ID.generate(['fe', ${dataField>}]) }"
 											unittest:id="AnnotationActionTest"
 											text="{dataField>Label}"
-											press="{= OP.getPressExpressionForEdit(${dataField>}, ${entitySet>@sapui.name}, ${headerAction>}) }"
+											press="{= ${headerAction>command} ? ('cmd:' + ${headerAction>command}) : OP.getPressExpressionForEdit(${dataField>}, ${entitySet>@sapui.name}, ${headerAction>}) }"
 											visible="{headerAction>visible}"
 											enabled="{headerAction>enabled}"
 											type="{= CRIT.buildExpressionForCriticalityButtonType(${dataField>@@UI.getDataModelObjectPath}) }"
@@ -164,10 +157,10 @@
 				</template:elseif>
 				<template:elseif test="{= ${headerAction>type} === 'ForNavigation'}">
 					<template:with path="headerAction>annotationPath" var="dataField">
-							<Button
+						<Button
 							id="{= ID.generate(['fe', ${dataField>}]) }"
 							text="{headerAction>text}"
-							press="{headerAction>press}"
+							press="{= ${headerAction>command} ? ('cmd:' + ${headerAction>command}) : ${headerAction>press}}"
 							enabled="{headerAction>enabled}"
 							type="{headerAction>buttonType}"
 							visible="{headerAction>visible}"