@sapui5/sap.fe.templates 1.101.0 → 1.103.0

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

@@ -7,10 +7,11 @@
 	xmlns:dt="sap.ui.dt"
 	xmlns="sap.m"
 	xmlns:opcontrol="sap.fe.templates.ObjectPage.controls"
+	xmlns:control="sap.fe.core.controls"
 	template:require="{
 		fpm: 'sap/fe/macros/fpm/fpm',
 		MODEL: 'sap/ui/model/odata/v4/AnnotationHelper',
-		OP: 'sap/fe/templates/ObjectPage/AnnotationHelper',
+		OP: 'sap/fe/templates/ObjectPage/ObjectPageTemplating',
 		COMMON: 'sap/fe/macros/CommonHelper',
 		ID: 'sap/fe/core/helpers/StableIdHelper'
 	}"
@@ -25,11 +26,12 @@
 				dt:designtime="not-adaptable-visibility"
 				id="{headerSection>id}"
 				title="{headerSection>title}"
+				titleLevel="H3"
 				visible="{headerSection>visible}"
 				titleUppercase="false"
 			>
 				<uxap:subSections>
-					<uxap:ObjectPageSubSection id="fe::EditableHeaderSubSection">
+					<uxap:ObjectPageSubSection id="fe::EditableHeaderSubSection" title="{headerSection>title}" titleLevel="H4">
 						<core:Fragment fragmentName="sap.fe.templates.ObjectPage.view.fragments.EditableHeaderFacet" type="XML" />
 					</uxap:ObjectPageSubSection>
 				</uxap:subSections>
@@ -42,6 +44,7 @@
 				dt:designtime="not-adaptable-visibility"
 				id="{section>id}"
 				title="{section>title}"
+				titleLevel="H3"
 				showTitle="{section>showTitle}"
 				titleUppercase="false"
 				visible="{section>visible}"
@@ -52,9 +55,62 @@
 							dt:designtime="not-adaptable-visibility"
 							id="{subSection>id}"
 							title="{subSection>title}"
+							titleLevel="H4"
 							showTitle="{subSection>showTitle}"
 							visible="{subSection>visible}"
 						>
+							<uxap:dependents>
+								<template:repeat list="{subSection>actions}" var="action">
+									<template:if test="{= ${action>type} === 'Menu'}">
+										<template:then>
+											<template:repeat list="{action>menu}" var="menuItemAction">
+												<template:if test="{menuItemAction>command}">
+													<template:if test="{= ${menuItemAction>type} === 'Default'}">
+														<template:then>
+															<control:CommandExecution
+																core:require="{FPM: 'sap/fe/core/helpers/FPMHelper'}"
+																execute="{= COMMON.buildActionWrapper(${menuItemAction>})}"
+																visible="{menuItemAction>visible}"
+																enabled="{menuItemAction>enabled}"
+																command="{menuItemAction>command}"
+															/>
+														</template:then>
+														<template:else>
+															<control:CommandExecution
+																execute="{menuItemAction>press}"
+																visible="{menuItemAction>visible}"
+																enabled="{menuItemAction>enabled}"
+																command="{menuItemAction>command}"
+															/>
+														</template:else>
+													</template:if>
+												</template:if>
+											</template:repeat>
+										</template:then>
+										<template:elseif test="{action>command}">
+											<template:if test="{= ${action>type} === 'Default'}">
+												<template:then>
+													<control:CommandExecution
+														core:require="{FPM: 'sap/fe/core/helpers/FPMHelper'}"
+														execute="{= COMMON.buildActionWrapper(${action>})}"
+														visible="{action>visible}"
+														enabled="{action>enabled}"
+														command="{action>command}"
+													/>
+												</template:then>
+												<template:else>
+													<control:CommandExecution
+														execute="{action>press}"
+														visible="{action>visible}"
+														enabled="{action>enabled}"
+														command="{action>command}"
+													/>
+												</template:else>
+											</template:if>
+										</template:elseif>
+									</template:if>
+								</template:repeat>
+							</uxap:dependents>
 							<!--uxap:customData>
 								<core:CustomData key="strategyForVisibilityChange" value="lazyLoading" />
 							</uxap:customData-->
@@ -66,12 +122,18 @@
 									<template:if test="{viewData>/useNewLazyLoading}">
 										<template:then>
 											<template:repeat list="{subSection>content}" var="subSection">
-												<core:Fragment fragmentName="sap.fe.templates.ObjectPage.view.fragments.SectionContentLazyLoader" type="XML" />
+												<core:Fragment
+													fragmentName="sap.fe.templates.ObjectPage.view.fragments.SectionContentLazyLoader"
+													type="XML"
+												/>
 											</template:repeat>
 										</template:then>
 										<template:else>
 											<template:repeat list="{subSection>content}" var="subSection">
-												<core:Fragment fragmentName="sap.fe.templates.ObjectPage.view.fragments.SectionContent" type="XML" />
+												<core:Fragment
+													fragmentName="sap.fe.templates.ObjectPage.view.fragments.SectionContent"
+													type="XML"
+												/>
 											</template:repeat>
 										</template:else>
 									</template:if>
@@ -79,10 +141,16 @@
 								<template:else>
 									<template:if test="{viewData>/useNewLazyLoading}">
 										<template:then>
-											<core:Fragment fragmentName="sap.fe.templates.ObjectPage.view.fragments.SectionContentLazyLoader" type="XML" />
+											<core:Fragment
+												fragmentName="sap.fe.templates.ObjectPage.view.fragments.SectionContentLazyLoader"
+												type="XML"
+											/>
 										</template:then>
 										<template:else>
-											<core:Fragment fragmentName="sap.fe.templates.ObjectPage.view.fragments.SectionContent" type="XML" />
+											<core:Fragment
+												fragmentName="sap.fe.templates.ObjectPage.view.fragments.SectionContent"
+												type="XML"
+											/>
 										</template:else>
 									</template:if>
 								</template:else>

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

@@ -11,22 +11,22 @@
 	template:require="{
 		fpm: 'sap/fe/macros/fpm/fpm',
 		MODEL: 'sap/ui/model/odata/v4/AnnotationHelper',
-		OP: 'sap/fe/templates/ObjectPage/AnnotationHelper',
+		OP: 'sap/fe/templates/ObjectPage/ObjectPageTemplating',
 		COMMON: 'sap/fe/macros/CommonHelper',
 		ID: 'sap/fe/core/helpers/StableIdHelper'
 	}"
 >
-		<!-- We want to ensure that statically non visible sections are non visible-->
-         <template:if test="{subSection>visible}">
-            <template:if test="{= ${subSection>type} === 'XMLFragment'}">
-                <template:then>
-                    <core:Fragment fragmentName="sap.fe.templates.ObjectPage.view.fragments.FormActions" type="XML" />
-                    <uxap:blocks>
-                        <opcontrol:SubSectionBlock>
-                            <opcontrol:content>
-                                <template:if test="{= ${subSection>sideContent} !== undefined}">
-                                    <template:then>
-                                        <layout:DynamicSideContent
+	<!-- We want to ensure that statically non visible sections are non visible-->
+	<template:if test="{subSection>visible}">
+		<template:if test="{= ${subSection>type} === 'XMLFragment'}">
+			<template:then>
+				<core:Fragment fragmentName="sap.fe.templates.ObjectPage.view.fragments.FormActions" type="XML" />
+				<uxap:blocks>
+					<opcontrol:SubSectionBlock>
+						<opcontrol:content>
+							<template:if test="{= ${subSection>sideContent} !== undefined}">
+								<template:then>
+									<layout:DynamicSideContent
 										id="{= ID.generate(['fe', ${subSection>key}, 'SideContentLayout'])}"
 										showMainContent="true"
 										showSideContent="{subSection>sideContent/visible}"
@@ -34,40 +34,39 @@
 										containerQuery="true"
 										equalSplit="{subSection>sideContent/equalSplit}"
 									>
-                                            <layout:mainContent>
-                                                <core:Fragment
+										<layout:mainContent>
+											<core:Fragment
 												fragmentName="sap.fe.templates.ObjectPage.view.fragments.SectionCustomSection"
 												type="XML"
 											/>
-                                            </layout:mainContent>
-                                            <layout:sideContent>
-                                                <core:Fragment
+										</layout:mainContent>
+										<layout:sideContent>
+											<core:Fragment
 												fragmentName="sap.fe.templates.ObjectPage.view.fragments.SideContentCustomContainer"
 												type="XML"
 											/>
-                                            </layout:sideContent>
-                                        </layout:DynamicSideContent>
-                                    </template:then>
-                                    <template:else>
-                                        <core:Fragment
+										</layout:sideContent>
+									</layout:DynamicSideContent>
+								</template:then>
+								<template:else>
+									<core:Fragment
 										fragmentName="sap.fe.templates.ObjectPage.view.fragments.SectionCustomSection"
 										type="XML"
 									/>
-                                    </template:else>
-                                </template:if>
-                            </opcontrol:content>
-                        </opcontrol:SubSectionBlock>
-                    </uxap:blocks>
-
-                </template:then>
-                <template:elseif test="{= ${subSection>type} === 'Form'}">
-                    <core:Fragment fragmentName="sap.fe.templates.ObjectPage.view.fragments.FormActions" type="XML" />
-                    <uxap:blocks>
-                    <opcontrol:SubSectionBlock>
-                        <opcontrol:content>
+								</template:else>
+							</template:if>
+						</opcontrol:content>
+					</opcontrol:SubSectionBlock>
+				</uxap:blocks>
+			</template:then>
+			<template:elseif test="{= ${subSection>type} === 'Form'}">
+				<core:Fragment fragmentName="sap.fe.templates.ObjectPage.view.fragments.FormActions" type="XML" />
+				<uxap:blocks>
+					<opcontrol:SubSectionBlock>
+						<opcontrol:content>
 							<template:if test="{= ${subSection>sideContent} !== undefined}">
-							<template:then>
-								<layout:DynamicSideContent
+								<template:then>
+									<layout:DynamicSideContent
 										id="{= ID.generate(['fe', ${subSection>key}, 'SideContentLayout'])}"
 										showMainContent="true"
 										showSideContent="{subSection>sideContent/visible}"
@@ -75,32 +74,40 @@
 										containerQuery="true"
 										equalSplit="{subSection>sideContent/equalSplit}"
 									>
-									<layout:mainContent>
-										<core:Fragment fragmentName="sap.fe.templates.ObjectPage.view.fragments.SectionFormContent" type="XML" />
-									</layout:mainContent>
-									<layout:sideContent>
-										<core:Fragment fragmentName="sap.fe.templates.ObjectPage.view.fragments.SideContentCustomContainer" type="XML" />
-									</layout:sideContent>
-								</layout:DynamicSideContent>
-
-							</template:then>
-							<template:else>
-								<core:Fragment fragmentName="sap.fe.templates.ObjectPage.view.fragments.SectionFormContent" type="XML" />
-							</template:else>
+										<layout:mainContent>
+											<core:Fragment
+												fragmentName="sap.fe.templates.ObjectPage.view.fragments.SectionFormContent"
+												type="XML"
+											/>
+										</layout:mainContent>
+										<layout:sideContent>
+											<core:Fragment
+												fragmentName="sap.fe.templates.ObjectPage.view.fragments.SideContentCustomContainer"
+												type="XML"
+											/>
+										</layout:sideContent>
+									</layout:DynamicSideContent>
+								</template:then>
+								<template:else>
+									<core:Fragment
+										fragmentName="sap.fe.templates.ObjectPage.view.fragments.SectionFormContent"
+										type="XML"
+									/>
+								</template:else>
 							</template:if>
-                        </opcontrol:content>
-                    </opcontrol:SubSectionBlock>
-                    </uxap:blocks>
-                    <template:if test="{subSection>formDefinition/hasFacetsNotPartOfPreview}">
-                        <template:then>
-                            <!-- Button "Show More / Less" is displayed for a collection facets that contains at least one reference facets with annotation "PartOfPreview === TRUE" -->
-                            <uxap:moreBlocks>
-                                <template:if test="{= ${subSection>level} === 2}">
-                                    <Title text="{subSection>title}" />
-                                </template:if>
-                                <opcontrol:SubSectionBlock>
-                                    <opcontrol:content>
-										<template:if test="{= ${subSection>sideContent} !== undefined}">
+						</opcontrol:content>
+					</opcontrol:SubSectionBlock>
+				</uxap:blocks>
+				<template:if test="{subSection>formDefinition/hasFacetsNotPartOfPreview}">
+					<template:then>
+						<!-- Button "Show More / Less" is displayed for a collection facets that contains at least one reference facets with annotation "PartOfPreview === TRUE" -->
+						<uxap:moreBlocks>
+							<template:if test="{= ${subSection>level} === 2}">
+								<Title level="{= ${section>subSections}.length > 1 ? 'H5' : 'H4'}" text="{subSection>title}" />
+							</template:if>
+							<opcontrol:SubSectionBlock>
+								<opcontrol:content>
+									<template:if test="{= ${subSection>sideContent} !== undefined}">
 										<template:then>
 											<layout:DynamicSideContent
 												id="{= ID.generate(['fe', ${subSection>key}, 'MoreSideContentLayout'])}"
@@ -111,7 +118,10 @@
 												equalSplit="{subSection>sideContent/equalSplit}"
 											>
 												<layout:mainContent>
-													<core:Fragment fragmentName="sap.fe.templates.ObjectPage.view.fragments.SectionMoreFormContent" type="XML" />
+													<core:Fragment
+														fragmentName="sap.fe.templates.ObjectPage.view.fragments.SectionMoreFormContent"
+														type="XML"
+													/>
 												</layout:mainContent>
 												<layout:sideContent>
 													<!--No Side Content for MoreBlocks so far-->
@@ -119,23 +129,30 @@
 											</layout:DynamicSideContent>
 										</template:then>
 										<template:else>
-											<core:Fragment fragmentName="sap.fe.templates.ObjectPage.view.fragments.SectionMoreFormContent" type="XML" />
+											<core:Fragment
+												fragmentName="sap.fe.templates.ObjectPage.view.fragments.SectionMoreFormContent"
+												type="XML"
+											/>
 										</template:else>
-										</template:if>
-                                    </opcontrol:content>
-                                </opcontrol:SubSectionBlock>
-                            </uxap:moreBlocks>
-                        </template:then>
-                    </template:if>
-                </template:elseif>
-                <template:elseif test="{= ${subSection>type} === 'DataVisualization'}">
-                    <uxap:blocks>
-                        <template:if test="{= ${subSection>level} === 2}">
-                            <Title text="{subSection>title}" visible="{subSection>titleVisible}" />
-                        </template:if>
-                         <opcontrol:SubSectionBlock visible="{subSection>visible}">
-                            <opcontrol:content>
-								<template:if test="{= ${subSection>sideContent} !== undefined}">
+									</template:if>
+								</opcontrol:content>
+							</opcontrol:SubSectionBlock>
+						</uxap:moreBlocks>
+					</template:then>
+				</template:if>
+			</template:elseif>
+			<template:elseif test="{= ${subSection>type} === 'DataVisualization'}">
+				<uxap:blocks>
+					<template:if test="{= ${subSection>level} === 2}">
+						<Title
+							level="{= ${section>subSections}.length > 1 ? 'H5' : 'H4'}"
+							text="{subSection>title}"
+							visible="{subSection>titleVisible}"
+						/>
+					</template:if>
+					<opcontrol:SubSectionBlock visible="{subSection>visible}">
+						<opcontrol:content>
+							<template:if test="{= ${subSection>sideContent} !== undefined}">
 								<template:then>
 									<layout:DynamicSideContent
 										id="{= ID.generate(['fe', ${subSection>key}, 'SideContentLayout'])}"
@@ -146,27 +163,34 @@
 										equalSplit="{subSection>sideContent/equalSplit}"
 									>
 										<layout:mainContent>
-											<core:Fragment fragmentName="sap.fe.templates.ObjectPage.view.fragments.SectionPresentationVisualization" type="XML" />
+											<core:Fragment
+												fragmentName="sap.fe.templates.ObjectPage.view.fragments.SectionPresentationVisualization"
+												type="XML"
+											/>
 										</layout:mainContent>
 										<layout:sideContent>
-											<core:Fragment fragmentName="sap.fe.templates.ObjectPage.view.fragments.SideContentCustomContainer" type="XML" />
+											<core:Fragment
+												fragmentName="sap.fe.templates.ObjectPage.view.fragments.SideContentCustomContainer"
+												type="XML"
+											/>
 										</layout:sideContent>
 									</layout:DynamicSideContent>
 								</template:then>
 								<template:else>
-									<core:Fragment fragmentName="sap.fe.templates.ObjectPage.view.fragments.SectionPresentationVisualization" type="XML" />
+									<core:Fragment
+										fragmentName="sap.fe.templates.ObjectPage.view.fragments.SectionPresentationVisualization"
+										type="XML"
+									/>
 								</template:else>
-								</template:if>
-                            </opcontrol:content>
-                        </opcontrol:SubSectionBlock>
-                    </uxap:blocks>
-                </template:elseif>
-                <template:elseif test="{= ${subSection>type} === 'Unknown'}">
-                    <Text text="{subSection>text}" />
-                </template:elseif>
-                <template:else>
-
-                </template:else>
-            </template:if>
-         </template:if>
+							</template:if>
+						</opcontrol:content>
+					</opcontrol:SubSectionBlock>
+				</uxap:blocks>
+			</template:elseif>
+			<template:elseif test="{= ${subSection>type} === 'Unknown'}">
+				<Text text="{subSection>text}" />
+			</template:elseif>
+			<template:else />
+		</template:if>
+	</template:if>
 </core:FragmentDefinition>