@sapui5/sap.fe.core 1.94.0 → 1.96.3

package/src/sap/fe/core/controllerextensions/Placeholder.js

@@ -1,286 +1,149 @@
 /*!
  * SAPUI5
- * (c) Copyright 2009-2021 SAP SE. All rights reserved.
+ * (c) Copyright 2009-2022 SAP SE. All rights reserved.
  */
 
-sap.ui.define(["sap/ui/core/mvc/ControllerExtension", "sap/fe/core/BusyLocker", "sap/base/util/UriParameters", "sap/base/Log"], function(
-	ControllerExtension,
-	BusyLocker,
-	UriParameters,
-	Log
-) {
-	"use strict";
+sap.ui.define(
+	[
+		"sap/ui/core/mvc/ControllerExtension",
+		"sap/base/util/UriParameters",
+		"sap/base/util/ObjectPath",
+		"sap/ui/core/Placeholder",
+		"sap/fe/placeholder/library" // library dependency
+	],
+	function(ControllerExtension, UriParameters, ObjectPath, Placeholder) {
+		"use strict";
 
-	/**
-	 * {@link sap.ui.core.mvc.ControllerExtension Controller extension} for Placeholder
-	 *
-	 * @namespace
-	 * @alias sap.fe.core.controllerextensions.Placeholder
-	 *
-	 **/
-	var Extension = ControllerExtension.extend("sap.fe.core.controllerextensions.Placeholder", {
-		enumViewType: {
-			OBJECTPAGE: "ObjectPage",
-			LISTREPORT: "ListReport"
-		},
-
-		getEnumStartingParams: function() {
-			return {
-				FE_VIEW_CREATED: "FE-VIEW-CREATED",
-				FE_DATA_LOADED: "FE-DATA-LOADED",
-				FE_HEROES_LOADED: "FE-HEROES-LOADED",
-				FE_WORKERS_LOADED: "FE-WORKERS-LOADED",
-				FE_HEROES_WORKERS_LOADED: "FE-HEROES-WORKERS-LOADED",
-				DISABLED: "DISABLED"
-			};
-		},
-
-		override: {
-			onExit: function() {
-				this.oRouter.detachBeforeRouteMatched(this._fnBeforeRouteMatched);
-				sap.m.NavContainer.addCustomTransition(
-					"placeholder",
-					function(oFromPage, oToPage, fCallback) {
-						sap.m.NavContainer.transitions["show"].to(oFromPage, oToPage, fCallback);
-					},
-					sap.m.NavContainer.transitions["show"].back
-				);
-			}
-		},
-
-		attachRouteMatchers: function() {
-			this._init();
-			var that = this;
-			if (this.isPlaceholderEnabled()) {
-				this._fnBeforeRouteMatched = function(oEvent) {
-					var bDisplayBusyIndicator = that.navigateToPlaceholder(
-						that.oAppComponent,
-						that.oRouter,
-						that.oRootContainer,
-						that.oPlaceholders
-					);
-					if (bDisplayBusyIndicator) {
-						var oRootView = that.oAppComponent.getRootControl();
-						BusyLocker.lock(oRootView);
-						that.oRouter.attachEventOnce("routeMatched", function() {
-							var oRootView = that.oAppComponent.getRootControl();
-							if (BusyLocker.isLocked(oRootView)) {
-								BusyLocker.unlock(oRootView);
+		/**
+		 * {@link sap.ui.core.mvc.ControllerExtension Controller extension} for Placeholder
+		 *
+		 * @namespace
+		 * @alias sap.fe.core.controllerextensions.Placeholder
+		 *
+		 **/
+		var Extension = ControllerExtension.extend("sap.fe.core.controllerextensions.Placeholder", {
+			attachHideCallback: function() {
+				if (this.isPlaceholderEnabled()) {
+					var oView = this.base.getView();
+					var oPage = oView.getParent().oContainer;
+					var oNavContainer = oPage.getParent();
+
+					var _fnContainerDelegate = {
+						onAfterShow: function(oEvent) {
+							if (oEvent.isBackToPage) {
+								oNavContainer.hidePlaceholder();
+							} else if (
+								UriParameters.fromQuery(window.location.hash.replace(/#.*\?/, "")).get("restoreHistory") === "true"
+							) {
+								// in case we navigate to the listreport using the shell
+								oNavContainer.hidePlaceholder();
 							}
-						});
-					}
-				};
-				this.oRouter.attachBeforeRouteMatched(this._fnBeforeRouteMatched);
-			}
-		},
+						}
+					};
+					oPage.addEventDelegate(_fnContainerDelegate);
 
-		_init: function() {
-			var that = this;
-			this.oAppComponent = this.base.getAppComponent();
-			this.oRouting = this.oAppComponent._oRouting;
-			this.oRootContainer = this.oAppComponent.getRootContainer();
-			this.oRouter = this.oAppComponent.getRouter();
-			this.oPlaceholders = {};
+					var oPageReady = oView.getController().pageReady;
+					//In case of objectPage, the placeholder should be hidden when heroes requests are received
+					// But for some scenario like "Create item", heroes requests are not sent .
+					// The pageReady event is then used as fallback
 
-			this.setPlaceholderMapping({
-				"sap.fe.templates.ListReport": {
-					placeHolderName: "sap.fe.placeholder.view.PlaceholderLR",
-					viewType: this.enumViewType.LISTREPORT
-				},
-				"sap.fe.templates.AnalyticalListPage": {
-					placeHolderName: "sap.fe.placeholder.view.PlaceholderLR",
-					viewType: this.enumViewType.LISTREPORT
-				},
-				"sap.fe.templates.ObjectPage": {
-					placeHolderName: "sap.fe.placeholder.view.PlaceholderOP",
-					viewType: this.enumViewType.OBJECTPAGE
+					var aAttachEvents = ["pageReady"];
+					if (oView.getControllerName() === "sap.fe.templates.ObjectPage.ObjectPageController") {
+						aAttachEvents.push("heroesBatchReceived");
+					}
+					aAttachEvents.forEach(function(sEvent) {
+						oPageReady.attachEvent(
+							sEvent,
+							null,
+							function() {
+								oNavContainer.hidePlaceholder();
+							},
+							null
+						);
+					});
 				}
-			});
-
-			sap.m.NavContainer.addCustomTransition(
-				"placeholder",
-				function(oFromPage, oToPage, fCallback) {
-					if (oFromPage.getController && oFromPage.getController().isPlaceholder && oFromPage.getController().isPlaceholder()) {
-						var sTransition = oFromPage.getController().getOptions("transition");
-						if (sTransition !== that.getEnumStartingParams().FE_VIEW_CREATED) {
-							oFromPage.getController().fireEvent("targetPageInsertedInContainer", { targetpage: oToPage });
-							var oFromViewCtrl = oFromPage.getController();
-							var oFromPageZIndex = oFromPage.$().css("z-index");
-							oFromPage.$().css("z-index", 100);
-							oToPage.removeStyleClass("sapMNavItemHidden"); // remove the "hidden" class which has been added by the NavContainer before the transition was called
-							fCallback();
-							var _removePlaceholder = function(oEvent) {
-								oFromPage.$().css("z-index", oFromPageZIndex);
-								oFromPage.addStyleClass("sapMNavItemHidden");
-								oFromViewCtrl.currentTargetNavigated();
-
-								aPlaceHolderEvents.forEach(function(oEvent) {
-									oPageReady.detachEvent(oEvent.eventId, oEvent.fn);
-								});
-								aPlaceHolderEvents = [];
-							};
-
-							var aPlaceHolderEvents = [];
-							var oPageReady = oToPage
-								.getComponentInstance()
-								.getRootControl()
-								.getController().pageReady;
-							oPageReady.attachEvent("pageReady", _removePlaceholder);
-							aPlaceHolderEvents.push({ "eventId": "pageReady", "fn": _removePlaceholder });
-
-							var pWaitHeroes, pWaitWorkers;
-							var fnInitWaitHeroes = function() {
-								return new Promise(function(resolve, reject) {
-									oPageReady.attachEvent("heroesBatchReceived", resolve);
-									oPageReady.attachEvent("pageReady", reject);
-									aPlaceHolderEvents.push({ "eventId": "heroesBatchReceived", "fn": resolve });
-									aPlaceHolderEvents.push({ "eventId": "pageReady", "fn": reject });
-								});
-							};
-
-							var fnInitWaitWorkers = function() {
-								return new Promise(function(resolve, reject) {
-									oPageReady.attachEvent("workersBatchReceived", resolve);
-									oPageReady.attachEvent("pageReady", reject);
-									aPlaceHolderEvents.push({ "eventId": "workersBatchReceived", "fn": resolve });
-									aPlaceHolderEvents.push({ "eventId": "pageReady", "fn": reject });
-								});
-							};
-
-							switch (sTransition) {
-								case that.getEnumStartingParams().FE_HEROES_LOADED:
-									pWaitHeroes = fnInitWaitHeroes();
-									pWaitHeroes.then(_removePlaceholder).catch(function() {
-										Log.info("PlaceHolder : Heroes request not received");
-									});
-									break;
-								case that.getEnumStartingParams().FE_WORKERS_LOADED:
-									pWaitWorkers = fnInitWaitWorkers();
-									pWaitWorkers.then(_removePlaceholder).catch(function() {
-										Log.info("PlaceHolder : Workers request not received");
-									});
-									break;
-								case that.getEnumStartingParams().FE_HEROES_WORKERS_LOADED:
-									pWaitHeroes = fnInitWaitHeroes();
-									pWaitWorkers = fnInitWaitWorkers();
-									Promise.all([pWaitHeroes, pWaitWorkers])
-										.then(_removePlaceholder)
-										.catch(function() {
-											Log.info("PlaceHolder : Heroes or Workers request not received");
-										});
-									break;
-
-								default:
-							}
-						} else {
-							var oFromViewCtrl = oFromPage.getController();
-							oFromViewCtrl.currentTargetNavigated();
-							sap.m.NavContainer.transitions["show"].to(oFromPage, oToPage, fCallback);
+			},
+			attachRouteMatchers: function() {
+				this._init();
+			},
+
+			_init: function() {
+				this.oAppComponent = this.base.getAppComponent();
+				this.oRouting = this.oAppComponent._oRouting;
+				this.oRootContainer = this.oAppComponent.getRootContainer();
+				this.oRouter = this.oAppComponent.getRouter();
+				this.oPlaceholders = {};
+
+				// eslint-disable-next-line no-constant-condition
+				if (this.isPlaceholderEnabled()) {
+					Placeholder.registerProvider(function(oConfig) {
+						switch (oConfig.name) {
+							case "sap.fe.templates.ListReport":
+								return {
+									html: "sap/fe/placeholder/view/PlaceholderLR.fragment.html",
+									autoClose: false
+								};
+							case "sap.fe.templates.ObjectPage":
+								return {
+									html: "sap/fe/placeholder/view/PlaceholderOP.fragment.html",
+									autoClose: false
+								};
+							default:
+								return;
 						}
-					} else {
-						sap.m.NavContainer.transitions["show"].to(oFromPage, oToPage, fCallback);
+					});
+				}
+				if (this.isPlaceholderDebugEnabled()) {
+					this.initPlaceholderDebug();
+				}
+			},
+
+			initPlaceholderDebug: function() {
+				this.resetPlaceholderDebugStats();
+				var that = this;
+				var handler = {
+					apply: function(target, thisArg, argumentsList) {
+						if (that.oRootContainer._placeholder && that.oRootContainer._placeholder.placeholder) {
+							that.debugStats.iHidePlaceholderTimestamp = Date.now();
+						}
+						return target.bind(that.oRootContainer)();
 					}
-				},
-				sap.m.NavContainer.transitions["show"].back
-			); /* code for transition */
-		},
-
-		isPlaceholderEnabled: function() {
-			var bPlaceholderEnabled = false;
-			switch (UriParameters.fromQuery(window.location.search).get("sap-ui-xx-placeholder")) {
-				case "true":
-					bPlaceholderEnabled = true;
-					break;
-				case "false":
-					bPlaceholderEnabled = false;
-					break;
-				default:
-					bPlaceholderEnabled =
-						window["sap-ushell-config"] &&
-						window["sap-ushell-config"].apps &&
-						window["sap-ushell-config"].apps.placeholder &&
-						window["sap-ushell-config"].apps.placeholder.enabled;
-			}
-			return bPlaceholderEnabled;
-		},
-
-		setPlaceholderMapping: function(oMapping) {
-			this.oPlaceholderMapping = oMapping;
-		},
-
-		getPlaceholderMapping: function(oMapping) {
-			return this.oPlaceholderMapping;
-		},
-
-		createPlaceholderView: function(sViewName) {
-			var oPlaceholder = new sap.ui.core.mvc.XMLView({
-				viewName: this.oPlaceholderMapping[sViewName].placeHolderName
-			});
-			return oPlaceholder;
-		},
-
-		/**
-		 * Trigger the navigation to the Placeholder based on the current hash (support NavContainer and FlexibleColumnLayout).
-		 *
-		 * @function
-		 * @name sap.fe.templates.RootContainer.controller.Fcl.controller#navigateToPlaceholder
-		 * @memberof sap.fe.templates.RootContainer.controller.Fcl.controller
-		 * @param {object} [oAppComponent] the app component
-		 * @param {object} [oRouter] the router component
-		 * @param {object} [oRootContainer] NavContainer of FCL
-		 * @param {object} [oPlaceholders] Map of placeholders for each kind of view (List Report, Object Page)
-		 * @ui5-restricted
-		 * @final
-		 */
+				};
+				// eslint-disable-next-line no-undef
+				var proxy1 = new Proxy(this.oRootContainer.hidePlaceholder, handler);
+				this.oRootContainer.hidePlaceholder = proxy1;
+			},
+			isPlaceholderDebugEnabled: function() {
+				if (UriParameters.fromQuery(window.location.search).get("sap-ui-xx-placeholder-debug") === "true") {
+					return true;
+				}
+				return false;
+			},
+
+			resetPlaceholderDebugStats: function() {
+				this.debugStats = {
+					iHidePlaceholderTimestamp: 0,
+					iPageReadyEventTimestamp: 0,
+					iHeroesBatchReceivedEventTimestamp: 0
+				};
+			},
 
-		navigateToPlaceholder: function(oAppComponent, oRouter, oRootContainer, oPlaceholders) {
-			var oRouting = oAppComponent.getRoutingService();
-			var sCurrentTechnicalPath = oRouter
-				.getHashChanger()
-				.getHash()
-				.match(/([^?]*)/)[0];
-			var oRoute = oRouting.getRouteFromHash(oRouter, oAppComponent);
-			var aTargets = oRouting.getTargetsFromRoute(oRoute, oAppComponent);
-			var that = this;
-			var bDisplayBusyIndicator = true;
+			getPlaceholderDebugStats: function() {
+				return this.debugStats;
+			},
 
-			//if the technical Path doesn't change, the placeholder is not reloaded
-			// eg: this is the case when the user click on another section in the view (only the appstate is updated)
-			if (sCurrentTechnicalPath !== this.sPreviousTechnicalPath) {
-				aTargets.forEach(function(oTarget, index) {
-					if (that.isPlaceholderEnabled()) {
-						var oPlaceholderTarget;
-						var oPlaceholderMapping = that.getPlaceholderMapping();
-						if (oPlaceholderMapping[oTarget.name]) {
-							switch (oPlaceholderMapping[oTarget.name].viewType) {
-								case that.enumViewType.OBJECTPAGE:
-									oPlaceholders.oOP = oPlaceholders.oOP ? oPlaceholders.oOP : {};
-									oPlaceholderTarget = oPlaceholders.oOP;
-									break;
-								case that.enumViewType.LISTREPORT:
-									oPlaceholders.oLR = oPlaceholders.oLR ? oPlaceholders.oLR : {};
-									oPlaceholderTarget = oPlaceholders.oLR;
-									break;
-								default:
-									break;
-							}
+			isPlaceholderEnabled: function() {
+				var bPlaceholderEnabledInFLP = ObjectPath.get("sap-ushell-config.apps.placeholder.enabled");
+				if (bPlaceholderEnabledInFLP === false) {
+					return false;
+				}
 
-							bDisplayBusyIndicator = that.base.displayPlaceholders(
-								oTarget,
-								aTargets,
-								oPlaceholderTarget,
-								oRootContainer,
-								oRouter
-							)
-								? false
-								: true;
-						}
-					}
-				});
+				return sap.ui
+					.getCore()
+					.getConfiguration()
+					.getPlaceholder();
 			}
-			this.sPreviousTechnicalPath = sCurrentTechnicalPath;
-			return bDisplayBusyIndicator;
-		}
-	});
-	return Extension;
-});
+		});
+		return Extension;
+	}
+);

package/src/sap/fe/core/controllerextensions/Routing.js

@@ -1,6 +1,6 @@
 /*!
  * SAPUI5
- * (c) Copyright 2009-2021 SAP SE. All rights reserved.
+ * (c) Copyright 2009-2022 SAP SE. All rights reserved.
  */
 sap.ui.define(["sap/ui/core/mvc/ControllerExtension", "sap/ui/core/mvc/OverrideExecution"], function(
 	ControllerExtension,

package/src/sap/fe/core/controllerextensions/RoutingListener.js

@@ -1,6 +1,6 @@
 /*!
  * SAPUI5
- * (c) Copyright 2009-2021 SAP SE. All rights reserved.
+ * (c) Copyright 2009-2022 SAP SE. All rights reserved.
  */
 sap.ui.define(["sap/fe/core/controllerextensions/InternalRouting"], function(InternalRouting) {
 	"use strict";

package/src/sap/fe/core/controllerextensions/Share.js

@@ -1,6 +1,6 @@
 /*!
  * SAPUI5
- * (c) Copyright 2009-2021 SAP SE. All rights reserved.
+ * (c) Copyright 2009-2022 SAP SE. All rights reserved.
  */
 
 // ---------------------------------------------------------------------------------------
@@ -133,20 +133,26 @@ sap.ui.define(
 						}
 					};
 				oLastFocusedControl = by;
+
+				var setShareEmailData = function(oShareActionSheet, oModelData) {
+					var oShareMailModel = oShareActionSheet.getModel("shareData");
+					var oNewMailData = extend(oShareMailModel.getData(), oModelData);
+					oShareMailModel.setData(oNewMailData);
+				};
 				return Promise.resolve(that.adaptShareMetadata(oShareMetadata))
 					.then(function(oModelData) {
 						fragmentController = {
 							shareEmailPressed: function() {
+								var oMailData = oShareActionSheet.getModel("shareData");
+								oMailData = oMailData.getData();
 								var oResource = sap.ui.getCore().getLibraryResourceBundle("sap.fe.core");
-								var sEmailSubject = oModelData.email.title
-									? oModelData.email.title
-									: oResource.getText("T_SHARE_UTIL_HELPER_SAPFE_EMAIL_SUBJECT", [oModelData.title]);
+								var sEmailSubject = oMailData.email.title
+									? oMailData.email.title
+									: oResource.getText("T_SHARE_UTIL_HELPER_SAPFE_EMAIL_SUBJECT", [oMailData.title]);
 								library.URLHelper.triggerEmail(
 									null,
 									sEmailSubject,
-									window.location.origin +
-										window.location.pathname +
-										(oModelData.email.url ? oModelData.email.url : oModelData.url)
+									oMailData.email.url ? oMailData.email.url : oMailData.url
 								);
 							},
 							onSaveTilePress: function() {
@@ -196,10 +202,12 @@ sap.ui.define(
 						};
 						if (by.shareSheet) {
 							oShareActionSheet = by.shareSheet;
+
 							var oShareModel = oShareActionSheet.getModel("share");
 							that._setStaticShareData(oShareModel);
 							var oNewData = extend(oShareModel.getData(), oTileData);
 							oShareModel.setData(oNewData);
+							setShareEmailData(oShareActionSheet, oModelData);
 							oShareActionSheet.openBy(by);
 						} else {
 							var sFragmentName = "sap.fe.macros.share.ShareSheet",
@@ -211,11 +219,16 @@ sap.ui.define(
 								})
 								.then(function(oActionSheet) {
 									oShareActionSheet = oActionSheet;
+
 									oShareActionSheet.setModel(new JSONModel(oTileData || {}), "share");
 									var oShareModel = oShareActionSheet.getModel("share");
 									that._setStaticShareData(oShareModel);
 									var oNewData = extend(oShareModel.getData(), oTileData);
 									oShareModel.setData(oNewData);
+
+									oShareActionSheet.setModel(new JSONModel(oModelData || {}), "shareData");
+									setShareEmailData(oShareActionSheet, oModelData);
+
 									by.addDependent(oShareActionSheet);
 									oShareActionSheet.openBy(by);
 									fragmentController.setShareSheet(oShareActionSheet);