@sapui5/sap.fe.templates 1.100.0 → 1.101.0

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

@@ -17,9 +17,22 @@
 	}"
 >
 	<template:if test="{converterContext>header/actions}">
-	    <template:repeat list="{converterContext>header/actions}" var="headerAction">
-			<template:if test="{= CORE.isManifestAction(${headerAction>}) }">
+		<template:repeat list="{converterContext>header/actions}" var="headerAction">
+			<template:if test="{= ${headerAction>type} === 'DraftActions' &amp;&amp; OP.checkDraftState(${entitySet>@}) }">
 				<template:then>
+					<Button
+						id="fe::StandardAction::SwitchDraftAndActiveObject"
+						text="{= ( !(${ui>/editMode} === 'Editable') &amp;&amp; !${ui>createMode} &amp;&amp; ${HasDraftEntity} ) ? ${sap.fe.i18n>C_COMMON_OBJECT_PAGE_SAVED_VERSION_BUT} : ${sap.fe.i18n>C_COMMON_OBJECT_PAGE_DRAFT_BUT} }"
+						visible="{= OP.getSwitchDraftAndActiveVisibility(${entitySet>@}) }"
+						icon="sap-icon://navigation-down-arrow"
+						iconFirst="false"
+						type="Transparent"
+						press="._showSwitchDraftAndActivePopover($event)"
+					/>
+					<core:Fragment fragmentName="sap.fe.templates.ObjectPage.view.fragments.CollaborationDraft" type="XML" />
+					<ToolbarSpacer />
+				</template:then>
+				<template:elseif test="{= CORE.isManifestAction(${headerAction>}) }">
 					<template:if test="{= ${headerAction>type} === 'Menu'}">
 						<template:then>
 							<MenuButton
@@ -83,13 +96,12 @@
 							/>
 						</template:else>
 					</template:if>
-				</template:then>
-
+				</template:elseif>
 				<template:elseif test="{= ${headerAction>type} === 'Primary'}">
 					<template:with path="entitySet>" helper="OP.getEditAction" var="editAction">
 						<template:with path="editAction>@Org.OData.Core.V1.OperationAvailable" var="operationAvailable">
 							<template:if test="{= ${operationAvailable>} !== false }">
-							<Button
+								<Button
 									unittest:id="EditActionTest"
 									id="fe::StandardAction::Edit"
 									type="{path: 'entitySet>./@com.sap.vocabularies.UI.v1.Identification', formatter: 'CORE.buildEmphasizedButtonExpression'}"
@@ -118,24 +130,6 @@
 						ariaHasPopup="Dialog"
 					/>
 				</template:elseif>
-				<template:elseif test="{= ${headerAction>type} === 'SwitchToActiveObject' &amp;&amp; OP.checkDraftState(${entitySet>@}) }">
-					<Button
-						id="fe::StandardAction::SwitchToActiveObject"
-						type="Default"
-						text="{sap.fe.i18n>C_COMMON_OBJECT_PAGE_DISPLAY_SAVED_VERSION}"
-						visible="{= OP.getSwitchToActiveVisibility(${entitySet>@}) }"
-						press="cmd:SwitchToActiveObject"
-					/>
-				</template:elseif>
-				<template:elseif test="{= ${headerAction>type} === 'SwitchToDraftObject' &amp;&amp; OP.checkDraftState(${entitySet>@}) }">
-					<Button
-						id="fe::StandardAction::SwitchToDraftObject"
-						type="Default"
-						text="{sap.fe.i18n>C_COMMON_OBJECT_PAGE_RETURN_TO_DRAFT}"
-						visible="{= OP.getSwitchToDraftVisibility(${entitySet>@}) }"
-						press="cmd:SwitchToDraftObject"
-					/>
-				</template:elseif>
 				<template:elseif test="{= ${headerAction>type} === 'ForAction'}">
 					<template:with path="headerAction>annotationPath" var="dataField">
 						<template:if
@@ -164,7 +158,7 @@
 				</template:elseif>
 				<template:elseif test="{= ${headerAction>type} === 'ForNavigation'}">
 					<template:with path="headerAction>annotationPath" var="dataField">
-							<Button
+						<Button
 							id="{= ID.generate(['fe', ${dataField>}]) }"
 							text="{headerAction>text}"
 							press="{headerAction>press}"

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

@@ -17,20 +17,22 @@
 			class="sapUiTinyMarginBegin"
 			items="{internal>/collaboration/activeUsers}"
 			visible="{= ${ui>/isEditable} && ${internal>/collaboration/connected} }"
+			alignItems="Center"
+			justifyContent="Start"
 		>
-			<f:Avatar initials="{internal>initials}" backgroundColor="Accent{internal>color}" displaySize="XS" press="._showCollaborationUserDetails" />
+			<f:Avatar
+				initials="{internal>initials}"
+				backgroundColor="Accent{internal>color}"
+				displaySize="XS"
+				press="._showCollaborationUserDetails"
+			/>
 		</HBox>
-
 		<template:if test="{entitySet>@com.sap.vocabularies.Common.v1.DraftRoot/ShareAction}">
 			<!-- For now the invite action is only shown on the root. we might provide it on all levels later as well -->
 			<!-- Button class="sapUiTinyMarginBegin" visible="{ui>/isEditable}" text="Invite" press="._manageCollaboration" / -->
-			<Avatar
-				visible="{ui>/isEditable}"
-				backgroundColor="TileIcon"
-				src="sap-icon://add-employee"
-				displaySize="XS"
-				press="._manageCollaboration"
-			/>
+			<HBox visible="{ui>/isEditable}" alignItems="Center" justifyContent="Start">
+				<Avatar backgroundColor="TileIcon" src="sap-icon://add-employee" displaySize="XS" press="._manageCollaboration" />
+			</HBox>
 		</template:if>
 	</template:if>
 </core:FragmentDefinition>

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

@@ -30,7 +30,7 @@
 			type="Emphasized"
 			ariaHasPopup="Dialog"
 		/>
-			<ToolbarSpacer />
+		<ToolbarSpacer />
 			<template:if
 			test="{= ${entitySet>@com.sap.vocabularies.Common.v1.DraftRoot} || ${entitySet>@com.sap.vocabularies.Common.v1.DraftNode}
 			 					|| COMMON.isDraftParentEntityForContainment(${entitySet>$ContainsTarget}, undefined, ${converterContext>}) }"
@@ -48,7 +48,7 @@
 							type="{path: 'entitySet>./@com.sap.vocabularies.UI.v1.Identification', formatter: 'CORE.buildEmphasizedButtonExpression'}"
 							enabled="true"
 							press="._applyDocument(${$view>/getBindingContext})"
-							visible="{= ${ui>/editMode} === 'Editable'}"
+							visible="{ui>/isEditable}"
 						/>
 					</template:then>
 					<template:elseif test="{= ${footerAction>type} === 'ForAction'}">
@@ -82,7 +82,7 @@
 							text="{= OPTemplating.getExpressionForSaveButton(${viewData>}, ${fullContextPath>@@UI.getDataModelObjectPath})}"
 							tooltip="{= COMMON.getTooltipForKeyboardShortcuts(${sap.fe.i18n>T_KEYBOARD_SHORTCUT_SAVE_WIN}, ${sap.fe.i18n>T_KEYBOARD_SHORTCUT_SAVE_MAC})}"
 							type="{path: 'entitySet>./@com.sap.vocabularies.UI.v1.Identification', formatter: 'CORE.buildEmphasizedButtonExpression'}"
-							visible="{= ${ui>/editMode} === 'Editable' }"
+							visible="{ui>/isEditable}"
 							enabled="true"
 							press="cmd:Save"
 						/>
@@ -93,7 +93,7 @@
 							id="fe::FooterBar::StandardAction::Cancel"
 							text="{sap.fe.i18n>C_COMMON_OBJECT_PAGE_CANCEL}"
 							press="cmd:Cancel"
-							visible="{= ${ui>/editMode} === 'Editable' }"
+							visible="{ui>/isEditable}"
 							ariaHasPopup="Dialog"
 							enabled="true"
 						>

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

@@ -0,0 +1,27 @@
+<core:FragmentDefinition
+	xmlns:core="sap.ui.core"
+	xmlns:template="http://schemas.sap.com/sapui5/extension/sap.ui.core.template/1"
+	xmlns:unittest="http://schemas.sap.com/sapui5/preprocessorextension/sap.fe.unittesting/1"
+	xmlns="sap.m"
+>
+	<Popover
+		unittest:id="SwitchDraftAndActiveObjectPopOver"
+		showHeader="false"
+		contentWidth="15.625rem"
+		verticalScrolling="false"
+		class="sapUiNoContentPadding"
+	>
+		<content>
+			<SelectList
+				selectedKey="{= %{HasDraftEntity} ? 'switchToActive' : 'switchToDraft' }"
+				itemPress="._switchDraftAndActivePopoverListSelect($event)"
+			>
+				<customData>
+					<core:CustomData key="listIdentifier" value="switchDraftAndActivePopoverList" />
+				</customData>
+				<core:Item text="{i18n>C_COMMON_OBJECT_PAGE_DISPLAY_DRAFT_MIT}" key="switchToDraft" />
+				<core:Item text="{i18n>C_COMMON_OBJECT_PAGE_DISPLAY_SAVED_VERSION_MIT}" key="switchToActive" />
+			</SelectList>
+		</content>
+	</Popover>
+</core:FragmentDefinition>