@sapui5/sap.fe.templates 1.97.0 → 1.100.0

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

@@ -1,6 +1,7 @@
 /*!
- * SAPUI5
- * (c) Copyright 2009-2021 SAP SE. All rights reserved.
+ * SAP UI development toolkit for HTML5 (SAPUI5)
+        (c) Copyright 2009-2021 SAP SE. All rights reserved
+    
  */
 sap.ui.define(
 	[
@@ -15,6 +16,7 @@ sap.ui.define(
 		"use strict";
 
 		var VariantManagement = CoreLibrary.VariantManagement,
+			CreationMode = CoreLibrary.CreationMode,
 			ObjectPageComponent = TemplateComponent.extend("sap.fe.templates.ObjectPage.Component", {
 				metadata: {
 					properties: {
@@ -62,13 +64,6 @@ sap.ui.define(
 							type: "boolean",
 							defaultValue: true
 						},
-						/**
-						 * Calls draftPrepare on draftEdit
-						 */
-						prepareOnEdit: {
-							type: "boolean",
-							defaultValue: false
-						},
 						/**
 						 * Defines the properties which can be used for inbound Navigation
 						 */
@@ -86,32 +81,33 @@ sap.ui.define(
 
 				// TODO: this should be ideally be handled by the editflow/routing without the need to have this method in the
 				// object page - for now keep it here
-				createDeferredContext: function(sPath, bActionCreate) {
+				createDeferredContext: function(sPath, oListBinding, bActionCreate) {
 					if (!this.DeferredContextCreated) {
 						this.DeferredContextCreated = true;
-						var oListBinding,
-							that = this,
+						var that = this,
 							oParamters = {
 								"$$groupId": "$auto.Heroes",
 								"$$updateGroupId": "$auto"
 							};
-
-						oListBinding = new ODataListBinding(
-							this.getModel(),
-							sPath.replace("(...)", ""),
-							undefined,
-							undefined,
-							undefined,
-							oParamters
-						);
-
+						if (!oListBinding || oListBinding.isRelative() === false) {
+							oListBinding = new ODataListBinding(
+								this.getModel(),
+								sPath.replace("(...)", ""),
+								undefined,
+								undefined,
+								undefined,
+								oParamters
+							);
+						} else {
+							oListBinding.mParameters = oParamters;
+						}
 						var oStartUpParams =
 								this.oAppComponent &&
 								this.oAppComponent.getComponentData() &&
 								this.oAppComponent.getComponentData().startupParameters,
 							oInboundParameters = this.getViewData().inboundParameters,
 							createParams;
-						if (oStartUpParams.preferredMode && oStartUpParams.preferredMode[0].indexOf("create") !== -1) {
+						if (oStartUpParams && oStartUpParams.preferredMode && oStartUpParams.preferredMode[0].indexOf("create") !== -1) {
 							createParams = CommonUtils.getAdditionalParamsForCreate(oStartUpParams, oInboundParameters);
 						}
 
@@ -119,18 +115,14 @@ sap.ui.define(
 						that.getRootControl()
 							.getController()
 							.editFlow.createDocument(oListBinding, {
-								creationMode: "Sync",
+								creationMode: CreationMode.Sync,
 								createAction: bActionCreate,
 								data: createParams
 							})
 							.finally(function() {
 								that.DeferredContextCreated = false;
 							})
-							.catch(function() {
-								// the creation failed or was aborted by the user - showing the object page doesn't make any sense
-								// now - for now just use window.history.back to navigate back
-								window.history.back();
-							});
+							.catch(function() {});
 					}
 				},
 

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

@@ -1,6 +1,7 @@
 /*!
- * SAPUI5
- * (c) Copyright 2009-2021 SAP SE. All rights reserved.
+ * SAP UI development toolkit for HTML5 (SAPUI5)
+        (c) Copyright 2009-2021 SAP SE. All rights reserved
+    
  */
 sap.ui.define(["sap/fe/core/ExtensionAPI", "sap/fe/core/CommonUtils", "sap/fe/core/converters/helpers/ID"], function(
 	ExtensionAPI,
@@ -105,6 +106,9 @@ sap.ui.define(["sap/fe/core/ExtensionAPI", "sap/fe/core/CommonUtils", "sap/fe/co
 		 */
 		getSelectedContexts: function(sTableId) {
 			var oTable = this._view.byId(sTableId);
+			if (oTable && oTable.isA("sap.fe.macros.TableAPI")) {
+				oTable = oTable.getContent();
+			}
 			return (oTable && oTable.isA("sap.ui.mdc.Table") && oTable.getSelectedContexts()) || [];
 		},
 
@@ -122,6 +126,18 @@ sap.ui.define(["sap/fe/core/ExtensionAPI", "sap/fe/core/CommonUtils", "sap/fe/co
 				oBlock = this._view.byId(sBlockID),
 				bBlockState = bShow === undefined ? !oBlock.getShowSideContent() : bShow;
 			oBlock.setShowSideContent(bBlockState);
+		},
+
+		/**
+		 * Gets the bound context of the current object page.
+		 *
+		 * @alias sap.fe.templates.ObjectPage.ExtensionAPI#getBindingContext
+		 * @returns {sap.ui.model.odata.v4.Context} Context bound to the object page
+		 *
+		 * @public
+		 */
+		getBindingContext: function() {
+			return this._view.getBindingContext();
 		}
 	});
 

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

@@ -79,107 +79,89 @@
 					/>
 				</uxap:dependents>
 				<template:if test="{converterContext>header/visible}">
-					<uxap:headerTitle>
-						<uxap:ObjectPageDynamicHeaderTitle primaryArea="Begin">
-							<uxap:expandedHeading>
+					<template:with path="converterContext>header" var="header">
+						<uxap:headerTitle>
+							<uxap:ObjectPageDynamicHeaderTitle primaryArea="Begin">
+								<core:Fragment fragmentName="sap.fe.templates.ObjectPage.view.fragments.Heading" type="XML" />
+								<uxap:expandedContent>
 								<FlexBox>
-									<FlexBox visible="{converterContext>header/title/expandedImageVisible}">
-										<core:Fragment fragmentName="sap.fe.templates.ObjectPage.view.fragments.HeaderImage" type="XML" />
-									</FlexBox>
-									<template:with path="entityType>@com.sap.vocabularies.UI.v1.HeaderInfo" var="headerInfo">
-										<Title
-											text="{= OPTemplating.getExpressionForTitle(${headerInfo>@@UI.getConverterContext}, ${viewData>}, ${fullContextPath>@@UI.getDataModelObjectPath}, ${entitySet>@com.sap.vocabularies.Common.v1.DraftRoot})}"
-											wrapping="true"
-										/>
-									</template:with>
-								</FlexBox>
-							</uxap:expandedHeading>
-							<uxap:snappedHeading>
-								<FlexBox>
-									<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}, ${entitySet>@com.sap.vocabularies.Common.v1.DraftRoot})}"
-											wrapping="true"
-										/>
-									</template:with>
+									<template:if test="{entityType>@com.sap.vocabularies.UI.v1.HeaderInfo/Description}">
+									<Label
+												text="{= OPTemplating.getExpressionForDescription(${headerInfo>@@UI.getConverterContext}, ${fullContextPath>@@UI.getDataModelObjectPath})}"
+												wrapping="true"
+											/>
+									</template:if>
+									<core:Fragment fragmentName="sap.fe.templates.ObjectPage.view.fragments.CollaborationDraft" type="XML" />
 								</FlexBox>
-							</uxap:snappedHeading>
-							<uxap:expandedContent>
-							 <FlexBox>
-                            	<template:if test="{entityType>@com.sap.vocabularies.UI.v1.HeaderInfo/Description}">
-              					  <Label
-											text="{= OPTemplating.getExpressionForDescription(${headerInfo>@@UI.getConverterContext}, ${fullContextPath>@@UI.getDataModelObjectPath})}"
-											wrapping="true"
-										/>
-            					  </template:if>
-			    			 </FlexBox>
-							</uxap:expandedContent>
-							<uxap:snappedContent>
-								<FlexBox>
-                            		<template:if test="{entityType>@com.sap.vocabularies.UI.v1.HeaderInfo/Description}">
-                						<Label
-											text="{= OPTemplating.getExpressionForDescription(${headerInfo>@@UI.getConverterContext}, ${fullContextPath>@@UI.getDataModelObjectPath})}"
-											wrapping="true"
-										/>
-            						</template:if>
-			    				</FlexBox>
-							</uxap:snappedContent>
-							<uxap:content>
-								<template:if test="{entitySet>@com.sap.vocabularies.Common.v1.DraftRoot}">
-									<macro:DraftIndicator DraftIndicatorType="IconOnly" class="sapUiTinyMarginBegin sapMTB sapMTBNewFlex" entitySet="{entitySet>}" />
-								</template:if>
-							</uxap:content>
-							<uxap:navigationActions>
-								<template:if test="{= ${viewData>/viewLevel} > 1}">
-									<macro:Paginator id="fe::Paginator" />
-								</template:if>
-								<!-- Flexible column layout menu-->
-								<template:if test="{= ${viewData>/fclEnabled} }">
-									<macro:FlexibleColumnLayoutActions />
-								</template:if>
-							</uxap:navigationActions>
-							<uxap:actions>
-								<core:Fragment fragmentName="sap.fe.templates.ObjectPage.view.fragments.Actions" type="XML" />
-							</uxap:actions>
-							<uxap:breadcrumbs>
-								<Breadcrumbs
-									unittest:id="BreadcrumbsTest"
-									visible="{= OP.getVisibleExpressionForBreadcrumbs(${viewData>/}) }"
-									modelContextChange="._setBreadcrumbLinks(${$source>/})"
-									id="fe::Breadcrumbs"
+								</uxap:expandedContent>
+								<uxap:snappedContent>
+									<FlexBox>
+										<template:if test="{entityType>@com.sap.vocabularies.UI.v1.HeaderInfo/Description}">
+											<Label
+												text="{= OPTemplating.getExpressionForDescription(${headerInfo>@@UI.getConverterContext}, ${fullContextPath>@@UI.getDataModelObjectPath})}"
+												wrapping="true"
+											/>
+										</template:if>
+										<core:Fragment fragmentName="sap.fe.templates.ObjectPage.view.fragments.CollaborationDraft" type="XML" />
+									</FlexBox>
+								</uxap:snappedContent>
+								<uxap:content>
+									<template:if test="{entitySet>@com.sap.vocabularies.Common.v1.DraftRoot}">
+										<macro:DraftIndicator DraftIndicatorType="IconOnly" class="sapUiTinyMarginBegin sapMTB sapMTBNewFlex" entitySet="{entitySet>}" />
+									</template:if>
+									<template:if test="{header>situations}">
+										<internal:SituationsIndicator xmlns:internal="sap.fe.macros.internal" entitySet="{entitySet>}" />
+									</template:if>
+								</uxap:content>
+								<uxap:navigationActions>
+									<template:if test="{= ${viewData>/viewLevel} > 1}">
+										<macro:Paginator id="fe::Paginator" />
+									</template:if>
+									<!-- Flexible column layout menu-->
+									<template:if test="{= ${viewData>/fclEnabled} }">
+										<macro:FlexibleColumnLayoutActions />
+									</template:if>
+								</uxap:navigationActions>
+								<uxap:actions>
+									<core:Fragment fragmentName="sap.fe.templates.ObjectPage.view.fragments.Actions" type="XML" />
+								</uxap:actions>
+								<uxap:breadcrumbs>
+									<Breadcrumbs
+										unittest:id="BreadcrumbsTest"
+										visible="{= OP.getVisibleExpressionForBreadcrumbs(${viewData>/}) }"
+										modelContextChange="._setBreadcrumbLinks(${$source>/})"
+										id="fe::Breadcrumbs"
+									>
+									</Breadcrumbs>
+								</uxap:breadcrumbs>
+							</uxap:ObjectPageDynamicHeaderTitle>
+						</uxap:headerTitle>
+						<template:if test="{header>hasContent}">
+							<uxap:headerContent>
+								<FlexBox
+									id="fe::HeaderContentContainer"
+									unittest:id="FlexBoxTest"
+									dt:designtime="sap/fe/templates/ObjectPage/designtime/FlexBox.designtime"
+									wrap="Wrap"
+									fitContainer="true"
+									alignItems="Stretch"
 								>
-								</Breadcrumbs>
-							</uxap:breadcrumbs>
-						</uxap:ObjectPageDynamicHeaderTitle>
-					</uxap:headerTitle>
-					<template:if test="{converterContext>header/hasContent}">
-						<uxap:headerContent>
-							<FlexBox
-								id="fe::HeaderContentContainer"
-								unittest:id="FlexBoxTest"
-								dt:designtime="sap/fe/templates/ObjectPage/designtime/FlexBox.designtime"
-								wrap="Wrap"
-								fitContainer="true"
-								alignItems="Stretch"
-							>
-								<template:if test="{converterContext>header/avatar}">
-									<template:with path="converterContext>header/avatar" var="avatar">
-									<Avatar
+									<template:if test="{header>avatar}">
+										<Avatar
 											unittest:id="AvatarOPHeaderContent"
 											class="sapUiSmallMarginEnd sapUiSmallMarginBottom"
-											src="{avatar>src}"
-											initials="{avatar>initials}"
-											fallbackIcon="{avatar>fallbackIcon}"
-											displayShape="{avatar>displayShape}"
+											src="{header>avatar/src}"
+											initials="{header>avatar/initials}"
+											fallbackIcon="{header>avatar/fallbackIcon}"
+											displayShape="{header>avatar/displayShape}"
 											displaySize="XL"
 										/>
-									</template:with>
-								</template:if>
-								<core:Fragment fragmentName="sap.fe.templates.ObjectPage.view.fragments.HeaderContent" type="XML" />
-							</FlexBox>
-						</uxap:headerContent>
-					</template:if>
+									</template:if>
+									<core:Fragment fragmentName="sap.fe.templates.ObjectPage.view.fragments.HeaderContent" type="XML" />
+								</FlexBox>
+							</uxap:headerContent>
+						</template:if>
+					</template:with>
 				</template:if>
 				<uxap:sections>
 					<core:Fragment fragmentName="sap.fe.templates.ObjectPage.view.fragments.Section" type="XML" />