@sapui5/sap.fe.templates 1.95.0 → 1.98.0

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

@@ -79,93 +79,108 @@
 					/>
 				</uxap:dependents>
 				<template:if test="{converterContext>header/visible}">
-					<uxap:headerTitle>
-						<uxap:ObjectPageDynamicHeaderTitle primaryArea="Begin">
-							<uxap:expandedHeading>
-								<FlexBox>
-									<FlexBox visible="{converterContext>header/title/expandedImageVisible}">
-										<core:Fragment fragmentName="sap.fe.templates.ObjectPage.view.fragments.HeaderImage" type="XML" />
+					<template:with path="converterContext>header/avatar" var="avatar">
+						<uxap:headerTitle>
+							<uxap:ObjectPageDynamicHeaderTitle primaryArea="Begin">
+								<uxap:expandedHeading>
+									<FlexBox>
+										<FlexBox visible="{converterContext>header/title/expandedImageVisible}">
+										<Avatar
+												class="sapUiSmallMarginEnd"
+												src="{avatar>src}"
+												initials="{avatar>initials}"
+												fallbackIcon="{avatar>fallbackIcon}"
+												displayShape="{avatar>displayShape}"
+												displaySize="S"
+											/>
+										</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>
-									<template:with path="entityType>@com.sap.vocabularies.UI.v1.HeaderInfo" var="headerInfo">
-										<Title
-											text="{= OPTemplating.getExpressionForTitle(${headerInfo>@@UI.getConverterContext}, ${viewData>}, ${fullContextPath>@@UI.getDataModelObjectPath})}"
-											wrapping="true"
+								</uxap:expandedHeading>
+								<uxap:snappedHeading>
+									<FlexBox>
+											<Avatar
+											class="sapUiSmallMarginEnd"
+											src="{avatar>src}"
+											initials="{avatar>initials}"
+											fallbackIcon="{avatar>fallbackIcon}"
+											displayShape="{avatar>displayShape}"
+											displaySize="S"
 										/>
-									</template:with>
-								</FlexBox>
-							</uxap:expandedHeading>
-							<uxap:snappedHeading>
+										<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:snappedHeading>
+								<uxap:expandedContent>
 								<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})}"
-											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>
 								</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>
+									</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>
+									<internal:SituationsIndicator xmlns:internal="sap.fe.macros.internal" entitySet="{entitySet>}" />
+								</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="{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"
 								>
-								</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="{converterContext>header/avatar}">
+										<Avatar
 											unittest:id="AvatarOPHeaderContent"
 											class="sapUiSmallMarginEnd sapUiSmallMarginBottom"
 											src="{avatar>src}"
@@ -174,12 +189,12 @@
 											displayShape="{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" />