@sapui5/sap.fe.templates 1.136.1 → 1.136.3

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@sapui5/sap.fe.templates",
-	"version": "1.136.1",
+	"version": "1.136.3",
 	"description": "SAPUI5 Library sap.fe.templates",
 	"keywords": [
 		"sapui5",

package/src/sap/fe/templates/.library

@@ -6,7 +6,7 @@
 		SAP UI development toolkit for HTML5 (SAPUI5)
         (c) Copyright 2009-2021 SAP SE. All rights reserved
 	</copyright>
-	<version>1.136.1</version>
+	<version>1.136.3</version>
 
 	<documentation>UI5 library: sap.fe.templates</documentation>
 

package/src/sap/fe/templates/AnalyticalListPage/manifest.json

@@ -4,7 +4,7 @@
 		"id": "sap.fe.templates.AnalyticalListPage",
 		"type": "component",
 		"applicationVersion": {
-			"version": "1.136.1"
+			"version": "1.136.3"
 		},
 		"title": "Analytical List Page",
 		"tags": {

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

@@ -184,7 +184,7 @@
 											p13nMode="Item,Value"
 											useSemanticDateRange="{converterContext>useSemanticDateRange}"
 											suspendSelection="true"
-											toggleControlId="{= ${converterContext>/filterLayout} === 'compactvisual' ? ID.generate([ ${converterContext>filterBarId}, 'LayoutToggle']) : undefined }"
+											toggleControlId="{= ${converterContext>/filterLayout} === 'compactvisual' || ${converterContext>easyFilterEnabled} ? ID.generate([ ${converterContext>filterBarId}, 'LayoutToggle']) : undefined }"
 											initialLayout="{= ${converterContext>/filterLayout} === 'compactvisual' ? ${converterContext>/filterInitialLayout} : undefined }"
 											disableDraftEditStateFilter="{filterBarContext>disableDraftEditStateFilter}"
 										/>
@@ -194,56 +194,54 @@
 						</template:if>
 					</f:DynamicPageTitle>
 				</f:title>
-				<f:header>
-					<f:DynamicPageHeader pinnable="{converterContext>showPinnableToggle}">
-						<VBox>
-							<template:if test="{= !!${converterContext>expandedHeaderFragment} }">
-								<template:then>
-									<core:Fragment fragmentName="{converterContext>expandedHeaderFragment}" type="XML" />
-								</template:then>
-							</template:if>
-							<template:if test="{= !${converterContext>hideFilterBar} }">
-								<template:then>
-									<template:with path="converterContext>filterBar" var="filterBarContext">
-										<macroInternal:FilterBar
-											id="{converterContext>filterBarId}"
-											_applyIdToContent="true"
-											metaPath="{entityType>}"
-											variantBackreference="{= LR.getVariantBackReference(${viewData>}, ${converterContext>} )}"
-											selectionFields="{filterBarContext>selectionFields}"
-											internalFilterChanged=".handlers.onFiltersChanged"
-											filterConditions="{parts:[{path:'converterContext>filterConditions'}, {path:'entitySet>'}, {path:'viewData>'}, {path:'filterBarContext>showDraftEditStatus'}], formatter: 'FILTER.getFilterConditions'}"
-											internalSearch=".handlers.onSearch"
-											hideBasicSearch="{filterBarContext>hideBasicSearch}"
-											showClearButton="{filterBarContext>showClearButton}"
-											afterClear=".onAfterClear"
-											liveMode="{viewData>/liveMode}"
-											showAdaptFiltersButton="true"
-											p13nMode="Item,Value"
-											useSemanticDateRange="{converterContext>useSemanticDateRange}"
-											suspendSelection="true"
-											toggleControlId="{= ${converterContext>/filterLayout} === 'compactvisual' ? ID.generate([ ${converterContext>filterBarId}, 'LayoutToggle']) : undefined }"
-											initialLayout="{= ${converterContext>/filterLayout} === 'compactvisual' ? ${converterContext>/filterInitialLayout} : undefined }"
-											disableDraftEditStateFilter="{filterBarContext>disableDraftEditStateFilter}"
-										/>
-									</template:with>
-								</template:then>
-							</template:if>
-							<template:if test="{converterContext>easyFilterEnabled}">
-								<template:then>
-									<macroAI:EasyFilterBar
-										id="fe::EasyFilterBar"
-										contextPath="{entityType>}"
-										filterBar="{converterContext>filterBarId}"
-										contentSwitcher="{= ID.generate([ ${converterContext>filterBarId}, 'LayoutToggle']) }"
-										contentSwitcherKey="ai"
-										visible="false"
+				<template:if test="{= !${converterContext>hideFilterBar} }">
+					<f:header>
+						<f:DynamicPageHeader pinnable="{converterContext>showPinnableToggle}">
+							<VBox>
+								<template:if test="{= !!${converterContext>expandedHeaderFragment} }">
+									<template:then>
+										<core:Fragment fragmentName="{converterContext>expandedHeaderFragment}" type="XML" />
+									</template:then>
+								</template:if>
+								<template:with path="converterContext>filterBar" var="filterBarContext">
+									<macroInternal:FilterBar
+										id="{converterContext>filterBarId}"
+										_applyIdToContent="true"
+										metaPath="{entityType>}"
+										variantBackreference="{= LR.getVariantBackReference(${viewData>}, ${converterContext>} )}"
+										selectionFields="{filterBarContext>selectionFields}"
+										internalFilterChanged=".handlers.onFiltersChanged"
+										filterConditions="{parts:[{path:'converterContext>filterConditions'}, {path:'entitySet>'}, {path:'viewData>'}, {path:'filterBarContext>showDraftEditStatus'}], formatter: 'FILTER.getFilterConditions'}"
+										internalSearch=".handlers.onSearch"
+										hideBasicSearch="{filterBarContext>hideBasicSearch}"
+										showClearButton="{filterBarContext>showClearButton}"
+										afterClear=".onAfterClear"
+										liveMode="{viewData>/liveMode}"
+										showAdaptFiltersButton="true"
+										p13nMode="Item,Value"
+										useSemanticDateRange="{converterContext>useSemanticDateRange}"
+										suspendSelection="true"
+										toggleControlId="{= ${converterContext>/filterLayout} === 'compactvisual' || ${converterContext>easyFilterEnabled} ? ID.generate([ ${converterContext>filterBarId}, 'LayoutToggle']) : undefined }"
+										initialLayout="{= ${converterContext>/filterLayout} === 'compactvisual' ? ${converterContext>/filterInitialLayout} : undefined }"
+										disableDraftEditStateFilter="{filterBarContext>disableDraftEditStateFilter}"
 									/>
-								</template:then>
-							</template:if>
-						</VBox>
-					</f:DynamicPageHeader>
-				</f:header>
+								</template:with>
+								<template:if test="{converterContext>easyFilterEnabled}">
+									<template:then>
+										<macroAI:EasyFilterBar
+											id="fe::EasyFilterBar"
+											contextPath="{entityType>}"
+											filterBar="{converterContext>filterBarId}"
+											contentSwitcher="{= ID.generate([ ${converterContext>filterBarId}, 'LayoutToggle']) }"
+											contentSwitcherKey="ai"
+											visible="false"
+										/>
+									</template:then>
+								</template:if>
+							</VBox>
+						</f:DynamicPageHeader>
+					</f:header>
+				</template:if>
 				<f:content>
 					<template:if test="{= ${converterContext>views}.length > 0}">
 						<template:if test="{converterContext>multiViewsControl}">