@sapui5/sap.fe.templates 1.95.0 → 1.96.4

package/src/sap/fe/templates/ObjectPage/Component.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(
 	[
@@ -68,12 +68,6 @@ sap.ui.define(
 						prepareOnEdit: {
 							type: "boolean",
 							defaultValue: false
-						},
-						/**
-						 * Temporary fix to avoid activating all bindings when a message doesn't have a controlId at first
-						 */
-						_disableLazyLoadingForMessages: {
-							type: "boolean"
 						}
 					},
 					library: "sap.fe.templates",

package/src/sap/fe/templates/ObjectPage/ExtensionAPI.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/ExtensionAPI", "sap/fe/core/CommonUtils", "sap/fe/core/converters/helpers/ID"], function(
 	ExtensionAPI,

package/src/sap/fe/templates/ObjectPage/ObjectPage.view.xml

@@ -88,7 +88,7 @@
 									</FlexBox>
 									<template:with path="entityType>@com.sap.vocabularies.UI.v1.HeaderInfo" var="headerInfo">
 										<Title
-											text="{= OPTemplating.getExpressionForTitle(${headerInfo>@@UI.getConverterContext}, ${viewData>}, ${fullContextPath>@@UI.getDataModelObjectPath})}"
+											text="{= OPTemplating.getExpressionForTitle(${headerInfo>@@UI.getConverterContext}, ${viewData>}, ${fullContextPath>@@UI.getDataModelObjectPath}, ${entitySet>@com.sap.vocabularies.Common.v1.DraftRoot})}"
 											wrapping="true"
 										/>
 									</template:with>
@@ -99,7 +99,7 @@
 									<core:Fragment fragmentName="sap.fe.templates.ObjectPage.view.fragments.HeaderImage" type="XML" />
 									<template:with path="entityType>@com.sap.vocabularies.UI.v1.HeaderInfo" var="headerInfo">
 										<Title
-											text="{= OPTemplating.getExpressionForTitle(${headerInfo>@@UI.getConverterContext}, ${viewData>}, ${fullContextPath>@@UI.getDataModelObjectPath})}"
+											text="{= OPTemplating.getExpressionForTitle(${headerInfo>@@UI.getConverterContext}, ${viewData>}, ${fullContextPath>@@UI.getDataModelObjectPath}, ${entitySet>@com.sap.vocabularies.Common.v1.DraftRoot})}"
 											wrapping="true"
 										/>
 									</template:with>

package/src/sap/fe/templates/ObjectPage/ObjectPageController.controller.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(
 	[
@@ -112,7 +112,7 @@ sap.ui.define(
 				getNavigationMode: function() {
 					var bIsStickyEditMode =
 						this._oView.getController().getStickyEditMode && this._oView.getController().getStickyEditMode();
-					return bIsStickyEditMode ? "explace" : "inplace";
+					return bIsStickyEditMode ? "explace" : undefined;
 				}
 			}),
 			viewState: ViewState.override(ViewStateOverrides),
@@ -295,7 +295,9 @@ sap.ui.define(
 							// In IconTabBar mode keep the second section bound if there is an editable header and we are switching to display mode
 							if (iSkip < 1 || (bUseIconTabBar && (iSection > 1 || (iSection === 1 && !bEditableHeader && !bIsInEditMode)))) {
 								var oSubSection = aSubSections[iSubSection];
-								oSubSection.setBindingContext(null);
+								if (oSubSection.data().isVisibilityDynamic !== "true") {
+									oSubSection.setBindingContext(null);
+								}
 							}
 						}
 					}
@@ -315,7 +317,7 @@ sap.ui.define(
 				var aActions = oObjectPage.getHeaderTitle() && oObjectPage.getHeaderTitle().getActions();
 				if (aActions && aActions.length) {
 					oFirstClickableElement = aActions.find(function(oAction) {
-						return oAction.getVisible();
+						return oAction.getVisible() && oAction.getEnabled();
 					});
 				}
 				return oFirstClickableElement;
@@ -354,37 +356,28 @@ sap.ui.define(
 				return undefined;
 			},
 
-			initialTab: {
-				value: true
+			_updateFocusInEditMode: function(aSubSections) {
+				var oObjectPage = this.byId("fe::ObjectPage");
+
+				var oMandatoryField = this._getFirstEmptyMandatoryFieldFromSubSection(aSubSections);
+				var oFieldToFocus;
+				if (oMandatoryField) {
+					oFieldToFocus = oMandatoryField.content.getContentEdit()[0];
+				} else {
+					oFieldToFocus = oObjectPage._getFirstEditableInput() || this._getFirstClickableElement(oObjectPage);
+				}
+
+				if (oFieldToFocus) {
+					setTimeout(function() {
+						// We set the focus in a timeeout, otherwise the focus sometimes goes to the TabBar
+						oFieldToFocus.focus();
+					}, 0);
+				}
 			},
 
 			_handleSubSectionEnteredViewPort: function(oEvent) {
 				var oSubSection = oEvent.getParameter("subSection");
-				var oInternalModelContext = this.getView().getBindingContext("internal");
 				oSubSection.setBindingContext(undefined);
-				var oObjectPage = this.byId("fe::ObjectPage");
-				if (oObjectPage.getModel("ui").getProperty("/editMode") !== "Display") {
-					if (
-						this.getView().getViewData().sectionLayout === "Tabs" &&
-						this.initialTab.value === false &&
-						oInternalModelContext.getProperty("errorNavigationSectionFlag") === false
-					) {
-						var oFieldToFocus = this._getFirstEmptyMandatoryFieldFromSubSection([oSubSection]);
-						if (oFieldToFocus) {
-							oFieldToFocus.content.getContentEdit()[0].focus();
-						} else {
-							var oFirstEditableInput = oObjectPage._getFirstEditableInput();
-							if (oFirstEditableInput) {
-								oFirstEditableInput.focus();
-							} else {
-								var oFirstClickableElement = this._getFirstClickableElement(oObjectPage);
-								if (oFirstClickableElement) {
-									oFirstClickableElement.focus();
-								}
-							}
-						}
-					}
-				}
 			},
 
 			_onBackNavigationInDraft: function(oContext) {
@@ -434,7 +427,6 @@ sap.ui.define(
 						}
 					}
 					// Workaround ends here!!
-					TableUtils.getSemanticTargetsFromTable(that, oTable);
 
 					// Update 'enabled' property of DataFieldForAction buttons on table toolbar
 					// The same is also performed on Table selectionChange event
@@ -563,92 +555,61 @@ sap.ui.define(
 			},
 			onPageReady: function(mParameters) {
 				// Apply app state only after the page is ready with the first section selected
-				function getVisibleSections(oObjectPage) {
-					var aVisibleSections;
-					var aSections = oObjectPage.getSections();
-					if (aSections && aSections.length) {
-						aVisibleSections = aSections.filter(function(oSection) {
-							return oSection.getVisible() === true;
-						});
-					}
-					return aVisibleSections;
-				}
 				var that = this;
-				var oInternalModelContext = this.getView().getBindingContext("internal");
-				var oBindingContext = this.getView().getBindingContext();
+				var oView = this.getView();
+				var oInternalModelContext = oView.getBindingContext("internal");
+				var oBindingContext = oView.getBindingContext();
 				//Show popup while navigating back from object page in case of draft
 				if (oBindingContext) {
 					var bIsStickyMode = ModelHelper.isStickySessionSupported(oBindingContext.getModel().getMetaModel());
 					if (!bIsStickyMode) {
-						var oAppComponent = CommonUtils.getAppComponent(this.getView());
+						var oAppComponent = CommonUtils.getAppComponent(oView);
 						oAppComponent.getShellServices().setBackNavigation(that._onBackNavigationInDraft.bind(that, oBindingContext));
 					}
 				}
 				this.getAppComponent()
 					.getAppStateHandler()
 					.applyAppState();
-				var oLastFocusedControl = mParameters.lastFocusedControl;
-				if (oLastFocusedControl && oLastFocusedControl.controlId && oLastFocusedControl.focusInfo) {
-					var oView = this.getView();
-					var oFocusControl = oView.byId(oLastFocusedControl.controlId);
-					if (oFocusControl) {
-						oFocusControl.applyFocusInfo(oLastFocusedControl.focusInfo);
-						return;
-					}
-				}
-				var oObjectPage = this.byId("fe::ObjectPage");
-				// set the focus to the first action button, or to the first editable input if in editable mode
-				var isInDisplayMode = oObjectPage.getModel("ui").getProperty("/editMode") === "Display";
-				var oFirstClickableElement;
-				var aVisibleSections = getVisibleSections(oObjectPage);
 
-				if (isInDisplayMode) {
-					//Focus on the first visible section if page OP is in Display Mode
-					oObjectPage.setSelectedSection(aVisibleSections[0].getId());
-					oFirstClickableElement = this._getFirstClickableElement(oObjectPage);
-					if (oFirstClickableElement) {
-						oFirstClickableElement.focus();
-					}
-				} else {
-					//Focus on first mandatory empty field
+				if (mParameters.forceFocus) {
+					var oObjectPage = this.byId("fe::ObjectPage");
+					// set the focus to the first action button, or to the first editable input if in editable mode
+					var isInDisplayMode = oObjectPage.getModel("ui").getProperty("/editMode") === "Display";
+					var aVisibleSections = oObjectPage.getSections().filter(function(oSection) {
+						return oSection.getVisible() === true;
+					});
+					// Select the first visible section
 					oObjectPage.setSelectedSection(aVisibleSections[0].getId());
-					if (
-						this.getView().getViewData().sectionLayout === "Page" ||
-						(this.getView().getViewData().sectionLayout === "Tabs" && this.initialTab.value === true)
-					) {
-						var oFieldToFocus;
-						var aSubSections = [];
-						for (var section = 0; section < aVisibleSections.length; section++) {
-							aSubSections = aVisibleSections[section].getSubSections();
-							oFieldToFocus = this._getFirstEmptyMandatoryFieldFromSubSection(aSubSections);
-							if (oFieldToFocus) {
-								oFieldToFocus.content.getContentEdit()[0].focus();
-								break;
-							}
-						}
 
-						//this.initialTab.value = false;
-					}
-					if (!oFieldToFocus) {
-						var oFirstEditableInput = oObjectPage._getFirstEditableInput();
-						if (oFirstEditableInput) {
-							oFirstEditableInput.focus();
+					if (isInDisplayMode) {
+						var oFirstClickableElement = this._getFirstClickableElement(oObjectPage);
+						if (oFirstClickableElement) {
+							oFirstClickableElement.focus();
+						}
+					} else {
+						var aVisibleSubSections;
+						if (oView.getViewData().sectionLayout === "Tabs") {
+							// In a tabbed layout, only the subsections of the selected section are visible on the screen
+							aVisibleSubSections = aVisibleSections[0].getSubSections();
 						} else {
-							oFirstClickableElement = this._getFirstClickableElement(oObjectPage);
-							if (oFirstClickableElement) {
-								oFirstClickableElement.focus();
-							}
+							// In a paged layout, all subsections of the visible sections are visible on the screen
+							aVisibleSubSections = aVisibleSections
+								.map(function(oSection) {
+									return oSection.getSubSections();
+								})
+								.flat();
 						}
+						this._updateFocusInEditMode(aVisibleSubSections);
 					}
-					this.initialTab.value = false;
 				}
+
 				oInternalModelContext.setProperty("errorNavigationSectionFlag", false);
 				this._checkDataPointTitleForExternalNavigation();
 			},
 			/**
-			 * Get sticky edit mode.
+			 * Get the status of edit mode for sticky session.
 			 *
-			 * @returns {boolean} Sticky edit mode status
+			 * @returns {boolean} The status of edit mode for sticky session
 			 *
 			 *
 			 */
@@ -806,18 +767,19 @@ sap.ui.define(
 						);
 					}
 				});
-				return Promise.all(aWaitCreateDocuments).then(function(aBindings) {
-					var mParameters = {
-						bExecuteSideEffectsOnError: bExecuteSideEffectsOnError,
-						bindings: aBindings
-					};
-					return that.editFlow
-						.saveDocument(oContext, mParameters)
-						.catch(that._showMessagePopover.bind(that))
-						.finally(function() {
+				return Promise.all(aWaitCreateDocuments)
+					.then(function(aBindings) {
+						var mParameters = {
+							bExecuteSideEffectsOnError: bExecuteSideEffectsOnError,
+							bindings: aBindings
+						};
+						return that.editFlow.saveDocument(oContext, mParameters).catch(that._showMessagePopover.bind(that));
+					})
+					.finally(function() {
+						if (BusyLocker.isLocked(oModel)) {
 							BusyLocker.unlock(oModel);
-						});
-				});
+						}
+					});
 			},
 
 			_cancelDocument: function(oContext, mParameters) {
@@ -1072,7 +1034,7 @@ sap.ui.define(
 						var oTitleHierarchyCache = oRootViewController.getTitleHierarchyCache();
 						var pWaitForTitleHiearchyInfo;
 						var sParameterPath = oMetaModel.getMetaPath(sPath);
-						var bResultContext = oMetaModel.getProperty(sParameterPath + "/@com.sap.vocabularies.Common.v1.ResultContext");
+						var bResultContext = oMetaModel.getObject(sParameterPath + "/@com.sap.vocabularies.Common.v1.ResultContext");
 						if (bResultContext) {
 							// We dont need to create a breadcrumb for Parameter path
 							iSkipParameterized = 1;
@@ -1300,7 +1262,8 @@ sap.ui.define(
 							.getModel()
 							.getMetaModel()
 							.getMetaPath(oDataPointOrChartBindingContext.getPath()),
-						aNavigationData = oController._getChartContextData(oDataPointOrChartBindingContext, sCollectionPath);
+						aNavigationData = oController._getChartContextData(oDataPointOrChartBindingContext, sCollectionPath),
+						additionalNavigationParameters;
 
 					aNavigationData = aNavigationData.map(function(oNavigationData) {
 						return {
@@ -1308,10 +1271,18 @@ sap.ui.define(
 							metaPath: sMetaPath + (sCollectionPath ? "/" + sCollectionPath : "")
 						};
 					});
+					if (oTargetInfo && oTargetInfo.parameters) {
+						var oParams =
+							oTargetInfo.parameters && oController._intentBasedNavigation.getOutboundParams(oTargetInfo.parameters);
+						if (Object.keys(oParams).length > 0) {
+							additionalNavigationParameters = oParams;
+						}
+					}
 					if (oTargetInfo && oTargetInfo.semanticObject && oTargetInfo.action) {
 						oController._intentBasedNavigation.navigate(oTargetInfo.semanticObject, oTargetInfo.action, {
 							navigationContexts: aNavigationData,
-							semanticObjectMapping: aSemanticObjectMapping
+							semanticObjectMapping: aSemanticObjectMapping,
+							additionalNavigationParameters: additionalNavigationParameters
 						});
 					}
 				},
@@ -1339,6 +1310,17 @@ sap.ui.define(
 					//will be called always when we click on a section tab
 					this.getExtensionAPI().updateAppState();
 					this.bSectionNavigated = true;
+
+					var oInternalModelContext = this.getView().getBindingContext("internal");
+					var oObjectPage = this.byId("fe::ObjectPage");
+					if (
+						oObjectPage.getModel("ui").getProperty("/editMode") !== "Display" &&
+						this.getView().getViewData().sectionLayout === "Tabs" &&
+						oInternalModelContext.getProperty("errorNavigationSectionFlag") === false
+					) {
+						var oSubSection = oEvent.getParameter("subSection");
+						this._updateFocusInEditMode([oSubSection]);
+					}
 				},
 				onVariantSelected: function(oEvent) {
 					this.getExtensionAPI().updateAppState();
@@ -1394,11 +1376,6 @@ sap.ui.define(
 				onChartSelectionChanged: function(oEvent) {
 					ChartRuntime.fnUpdateChart(oEvent);
 				}
-			},
-			formatters: {
-				compareTitleFromTableAndTab: function(headerVisible, tableTitle, tabTitle) {
-					return this.commonFormatters.compareTitleFromTableAndTab(headerVisible, tableTitle, tabTitle, this);
-				}
 			}
 		});
 	}

package/src/sap/fe/templates/ObjectPage/controls/StashableHBox.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/m/HBox", "sap/m/HBoxRenderer", "sap/ui/core/StashedControlSupport"],

package/src/sap/fe/templates/ObjectPage/controls/StashableVBox.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/m/VBox", "sap/m/VBoxRenderer", "sap/ui/core/StashedControlSupport"],

package/src/sap/fe/templates/ObjectPage/controls/SubSectionBlock.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/uxap/BlockBase"], function(BlockBase) {
@@ -9,7 +9,7 @@ sap.ui.define(["sap/uxap/BlockBase"], function(BlockBase) {
 	var SubSectionBlock = BlockBase.extend("sap.fe.templates.ObjectPage.controls.SubSectionBlock", {
 		metadata: {
 			properties: {
-				"columnLayout": { type: "sap.uxap.BlockBaseColumnLayout", group: "Behavior", defaultValue: 4 }
+				columnLayout: { type: "sap.uxap.BlockBaseColumnLayout", group: "Behavior", defaultValue: 4 }
 			},
 			aggregations: {
 				content: {

package/src/sap/fe/templates/ObjectPage/designtime/FlexBox.designtime.js

@@ -1,6 +1,6 @@
 /*!
  * SAPUI5
- * (c) Copyright 2009-2021 SAP SE. All rights reserved.
+ * (c) Copyright 2009-2022 SAP SE. All rights reserved.
  */
 // Provides the Design Time Metadata for the sap.m.FlexBox control
 sap.ui.define([], function() {

package/src/sap/fe/templates/ObjectPage/designtime/StashableHBox.designtime.js

@@ -1,6 +1,6 @@
 /*!
  * SAPUI5
- * (c) Copyright 2009-2021 SAP SE. All rights reserved.
+ * (c) Copyright 2009-2022 SAP SE. All rights reserved.
  */
 
 // Provides the Design Time Metadata for the sap.fe.templates.ObjectPage.controls.StashableHBox control

package/src/sap/fe/templates/ObjectPage/designtime/StashableVBox.designtime.js

@@ -1,6 +1,6 @@
 /*!
  * SAPUI5
- * (c) Copyright 2009-2021 SAP SE. All rights reserved.
+ * (c) Copyright 2009-2022 SAP SE. All rights reserved.
  */
 
 // Provides the Design Time Metadata for the sap.fe.templates.ObjectPage.controls.StashableVBox control

package/src/sap/fe/templates/ObjectPage/flexibility/StashableHBox.flexibility.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/fl/changeHandler/BaseRename"], function(BaseRename) {

package/src/sap/fe/templates/ObjectPage/flexibility/StashableVBox.flexibility.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([], function() {

package/src/sap/fe/templates/ObjectPage/overrides/IntentBasedNavigation.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/CommonUtils", "sap/fe/navigation/SelectionVariant"], function(CommonUtils, SelectionVariant) {
 	"use strict";

package/src/sap/fe/templates/ObjectPage/overrides/InternalRouting.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/CommonUtils", "sap/fe/navigation/SelectionVariant"], function(CommonUtils, SelectionVariant) {
 	"use strict";

package/src/sap/fe/templates/ObjectPage/overrides/MessageHandler.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([], function() {
 	"use strict";

package/src/sap/fe/templates/ObjectPage/overrides/Paginator.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([], function() {
 	"use strict";