@sap/open.fe 1.97.0 → 1.98.0

package/packages/sap.fe.macros/src/sap/fe/macros/internal/situations/Runtime.ts

@@ -0,0 +1,215 @@
+import { ResourceModel } from "sap/fe/macros";
+import { Button, CustomListItem, HBox, Label, List, ObjectIdentifier, ObjectStatus, ResponsivePopover, Text, Toolbar } from "sap/m";
+import { Controller } from "sap/ui/core/mvc";
+import { CommonUtils } from "sap/fe/core";
+import formatters from "sap/fe/macros/internal/situations/Formatter";
+
+function getMultipleSituationsPopover(event: UI5Event, controller: Controller) {
+	const source = event.getSource();
+
+	let detailsPopover: ResponsivePopover | null;
+
+	const popover: ResponsivePopover = new ResponsivePopover({
+		showHeader: false,
+		contentWidth: "25em",
+		placement: "Horizontal",
+		content: [
+			new List({
+				items: {
+					path: "_Instance",
+					template: new CustomListItem({
+						type: "Navigation",
+
+						press(event: UI5Event) {
+							const pressedItem = event.getSource();
+
+							// Create the details popover if needed
+							if (!detailsPopover) {
+								detailsPopover = createPreviewPopover(controller, () => {
+									detailsPopover?.close();
+									popover.openBy(source);
+								});
+							}
+
+							pressedItem.setBusy(true);
+
+							// TODO: $orderby / $top=1 on '_Trigger' does not work
+							detailsPopover.bindElement({
+								path: event.getSource().getBindingContextPath(),
+								parameters: { $expand: "_Trigger($expand=_Attribute($expand=_AttributeValue))" },
+								events: {
+									dataReceived() {
+										pressedItem.setBusy(false);
+										popover.close();
+										detailsPopover?.openBy(source);
+									}
+								}
+							});
+							controller.getView().addDependent(detailsPopover);
+						},
+
+						content: [
+							new HBox({
+								items: [
+									new ObjectStatus({
+										icon: "sap-icon://alert",
+										state: "Warning",
+										tooltip: ResourceModel.getText("situation")
+									}).addStyleClass("sapUiTinyMarginEnd"),
+									new ObjectIdentifier({
+										title: {
+											parts: [{ path: "SitnInstceKey" }, { path: "_Trigger/0/_InstanceText/SituationTitle" }],
+											formatter: formatters.situationText
+										},
+										text: {
+											path: "SitnInstceLastChgdAtDateTime",
+											type: "sap.ui.model.odata.type.DateTimeOffset",
+											constraints: { precision: 7 },
+											formatOptions: { relative: true }
+										}
+									})
+								]
+							})
+								.addStyleClass("sapUiSmallMarginBeginEnd")
+								.addStyleClass("sapUiSmallMarginTopBottom")
+						]
+					}),
+					templateShareable: false
+				},
+				showNoData: false
+			})
+		]
+	});
+
+	return popover;
+}
+
+function createPreviewPopover(controller: Controller, back?: (event: UI5Event) => void): ResponsivePopover {
+	// if there is no 'back' handler, the preview popover is considered to be used for single situations,
+	// so prefix the binding paths with the first instance
+	const pathPrefix = back ? "" : "_Instance/0/";
+	const oShellServices = CommonUtils.getShellServices(controller.getView());
+
+	// Toolbar
+	const toolbar = new Toolbar();
+
+	if (back) {
+		toolbar.addContent(
+			new Button({
+				type: "Back",
+				tooltip: ResourceModel.getText("back"),
+				press: back
+			}).addStyleClass("sapUiNoMarginEnd")
+		);
+	}
+
+	toolbar
+		.addContent(
+			new ObjectStatus({
+				state: "Warning",
+				icon: "sap-icon://alert",
+				tooltip: ResourceModel.getText("situationIconTooltip")
+			}).addStyleClass("sapUiSmallMarginBegin")
+		)
+		.addContent(
+			new ObjectIdentifier({
+				titleActive: false,
+				title: {
+					parts: [
+						{ path: `${pathPrefix}SitnInstceKey` },
+						{ path: `${pathPrefix}_Trigger/0/_InstanceText/SituationTitle` },
+						{ value: `${pathPrefix}_Trigger/0/_Attribute` }
+					],
+					formatter: formatters.situationText
+				}
+			}).addStyleClass("sapUiSmallMarginEnd")
+		);
+
+	// Popover
+	const popover = new ResponsivePopover({
+		contentWidth: "25em",
+		placement: "Horizontal",
+		customHeader: toolbar,
+		content: [
+			new Label({
+				text: {
+					path: `${pathPrefix}SitnInstceLastChgdAtDateTime`,
+					type: "sap.ui.model.odata.type.DateTimeOffset",
+					constraints: { precision: 7 },
+					formatOptions: { relative: true }
+				}
+			}),
+			new Text({
+				text: {
+					parts: [
+						{ path: `${pathPrefix}SitnInstceKey` },
+						{ path: `${pathPrefix}_Trigger/0/_InstanceText/SituationText` },
+						{ value: `${pathPrefix}_Trigger/0/_Attribute` }
+					],
+					formatter: formatters.situationText
+				}
+			}).addStyleClass("sapUiTinyMarginTop")
+		],
+		endButton: new Button({
+			text: ResourceModel.getText("showDetails"),
+
+			press: (event: UI5Event) => {
+				const situationKey = event
+					.getSource()
+					.getBindingContext()
+					.getObject(`${pathPrefix}SitnInstceKey`);
+
+				const oArgs = {
+					appStatekey: "",
+					params: {
+						"ui-type": "extended",
+						"SitnInstceKey": situationKey
+					},
+					target: {
+						action: "display",
+						semanticObject: "SituationInstance"
+					}
+				};
+				if (situationKey) {
+					oShellServices.crossAppNavService.toExternal(oArgs);
+				}
+			}
+		})
+	})
+		.addStyleClass("sapUiPopupWithPadding")
+		.addStyleClass("sapUiResponsivePadding--header");
+
+	return popover;
+}
+
+function getSingleSituationPopover(event: UI5Event, controller: Controller) {
+	return createPreviewPopover(controller);
+}
+
+export function showPopover(controller: Controller, event: UI5Event, situationsNavigationProperty: string) {
+	const situationIndicator = event.getSource(),
+		bindingContext = situationIndicator.getBindingContext(),
+		numberOfSituations = bindingContext.getObject(`${situationsNavigationProperty}/SitnNumberOfInstances`);
+
+	const popover =
+		numberOfSituations <= 1 ? getSingleSituationPopover(event, controller) : getMultipleSituationsPopover(event, controller);
+
+	popover.setBusy(true);
+
+	// TODO: $orderby / $top=1 on '_Trigger' does not work
+	popover.bindElement({
+		path: bindingContext.getPath(situationsNavigationProperty),
+		parameters: {
+			$expand: "_Instance($expand=_Trigger($expand=_Attribute($expand=_AttributeValue)))"
+		},
+		events: {
+			dataReceived() {
+				popover.setBusy(false);
+			}
+		}
+	});
+	controller.getView().addDependent(popover);
+
+	popover.openBy(situationIndicator);
+}
+showPopover.__functionName = "rt.showPopover";

package/packages/sap.fe.macros/src/sap/fe/macros/internal/valuehelp/TableDelegate-dbg.js

@@ -124,21 +124,20 @@ sap.ui.define(
 		 * Updates the binding info with the relevant path and model from the metadata.
 		 *
 		 * @param {object} oMDCTable The MDC table instance
-		 * @param {object} oMetadataInfo The metadataInfo set on the table
 		 * @param {object} oBindingInfo The bindingInfo of the table
 		 */
-		ODataTableDelegate.updateBindingInfo = function(oMDCTable, oMetadataInfo, oBindingInfo) {
-			TableDelegate.updateBindingInfo.apply(this, [oMDCTable, oMetadataInfo, oBindingInfo]);
+		ODataTableDelegate.updateBindingInfo = function(oMDCTable, oBindingInfo) {
+			TableDelegate.updateBindingInfo.apply(this, [oMDCTable, oBindingInfo]);
 			if (!oMDCTable) {
 				return;
 			}
 
+			var oMetadataInfo = oMDCTable.getDelegate().payload;
+
 			if (oMetadataInfo && oBindingInfo) {
 				oBindingInfo.path = oBindingInfo.path || oMetadataInfo.collectionPath || "/" + oMetadataInfo.collectionName;
 				oBindingInfo.model = oBindingInfo.model || oMetadataInfo.model;
 			}
-			// we add information to the binding by reading the more precise one we wrote in the customData
-			//Object.assign(oBindingInfo, DelegateUtil.getCustomData(oMDCTable, "rowsBindingInfo"));
 
 			if (!oBindingInfo) {
 				oBindingInfo = {};
@@ -159,9 +158,7 @@ sap.ui.define(
 					aFilters.push(oInnerFilterInfo.filters);
 				}
 			}
-			// if (!oBindingInfo.parameters) {
-			// 	oBindingInfo.parameters = {};
-			// }
+
 			if (oFilter) {
 				mConditions = oFilter.getConditions();
 				if (mConditions) {
@@ -181,6 +178,8 @@ sap.ui.define(
 				// get the basic search
 				oBindingInfo.parameters.$search = CommonUtils.normalizeSearchTerm(oFilter.getSearch()) || undefined;
 			}
+
+			this._applyDefaultSorting(oBindingInfo, oMDCTable.getDelegate().payload);
 			// add select to oBindingInfo (BCP 2170163012)
 			oBindingInfo.parameters.$select = aTableProperties.reduce(function(sQuery, oProperty) {
 				// Navigation properties (represented by X/Y) should not be added to $select.
@@ -212,6 +211,28 @@ sap.ui.define(
 			return oTable.getModel(oMetadataInfo.model);
 		};
 
+		/**
+		 * Applies a default sort order if needed. This is only the case if the request is not a $search request
+		 * (means the parameter $search of the bindingInfo is undefined) and if not already a sort order is set,
+		 * e.g. via presentation variant or manual by the user.
+		 *
+		 * @param {object} oBindingInfo The bindingInfo of the table
+		 * @param {object} oPayload The payload of the TableDelegate
+		 */
+		ODataTableDelegate._applyDefaultSorting = function(oBindingInfo, oPayload) {
+			if (
+				oBindingInfo.parameters &&
+				oBindingInfo.parameters.$search == undefined &&
+				oBindingInfo.sorter &&
+				oBindingInfo.sorter.length == 0
+			) {
+				var defaultSortPropertyName = oPayload ? oPayload.defaultSortPropertyName : undefined;
+				if (defaultSortPropertyName) {
+					oBindingInfo.sorter.push(new sap.ui.model.Sorter(defaultSortPropertyName, false));
+				}
+			}
+		};
+
 		return ODataTableDelegate;
 	}
 );

package/packages/sap.fe.macros/src/sap/fe/macros/internal/valuehelp/TableDelegate.js

@@ -3,4 +3,4 @@
         (c) Copyright 2009-2021 SAP SE. All rights reserved
     
  */
-sap.ui.define(["sap/ui/mdc/odata/v4/TableDelegate","sap/ui/core/Core","sap/ui/mdc/util/FilterUtil","sap/ui/mdc/odata/v4/util/DelegateUtil","sap/ui/mdc/odata/v4/FilterBarDelegate","sap/ui/mdc/odata/v4/ODataMetaModelUtil","sap/ui/mdc/odata/v4/TypeUtil","sap/ui/model/Filter","sap/ui/model/FilterOperator","sap/base/Log","sap/fe/macros/DelegateUtil","sap/fe/core/helpers/ModelHelper","sap/fe/core/CommonUtils"],function(T,C,F,D,a,O,b,c,d,L,M,e,f){"use strict";var g=Object.assign({},T);g.fetchProperties=function(t){var m=this._getModel(t);var p;if(!m){p=new Promise(function(r){t.attachModelContextChange({resolver:r},o,this);}.bind(this)).then(function(m){return this._createPropertyInfos(t,m);}.bind(this));}else{p=this._createPropertyInfos(t,m);}return p.then(function(P){if(t.data){t.data("$tablePropertyInfo",P);}return P;});};function o(E,h){var t=E.getSource();var m=this._getModel(t);if(m){t.detachModelContextChange(o);h.resolver(m);}}g._createPropertyInfos=function(t,m){var h=t.getDelegate().payload;var p=[];var E="/"+h.collectionName;var i=m.getMetaModel();return i.requestObject(E+"@").then(function(j){var s=j["@Org.OData.Capabilities.V1.SortRestrictions"]||{};var S=O.getSortRestrictionsInfo(s);var k=j["@Org.OData.Capabilities.V1.FilterRestrictions"];var l=O.getFilterRestrictionsInfo(k);var n=M.getCustomData(t,"columns");n.customData.forEach(function(q){p.push({name:q.path,path:q.path,label:q.label,sortable:S[q.path]?S[q.path].sortable:q.sortable,filterable:l[q.path]?l[q.path].filterable:q.filterable,typeConfig:M.isTypeFilterable(q.$Type)?t.getTypeUtil().getTypeConfig(q.$Type):undefined,maxConditions:O.isMultiValueFilterExpression(l.propertyInfo[q.path])?-1:1});});return p;});};g.updateBindingInfo=function(m,h,B){T.updateBindingInfo.apply(this,[m,h,B]);if(!m){return;}if(h&&B){B.path=B.path||h.collectionPath||"/"+h.collectionName;B.model=B.model||h.model;}if(!B){B={};}var i=C.byId(m.getFilter()),j=m.isFilteringEnabled(),k;var I,l;var n=[];var t=m.data("$tablePropertyInfo");if(j){k=m.getConditions();I=F.getFilterInfo(m,k,t);if(I.filters){n.push(I.filters);}}if(i){k=i.getConditions();if(k){var p=D.getParameterNames(i);l=F.getFilterInfo(i,k,t,p);if(l.filters){n.push(l.filters);}var P=D.getParametersInfo(i,k);if(P){B.path=P;}}B.parameters.$search=f.normalizeSearchTerm(i.getSearch())||undefined;}B.parameters.$select=t.reduce(function(q,r){if(r.path&&r.path.indexOf("/")===-1){q=q?q+","+r.path:r.path;}return q;},"");if(e.isDraftSupported(m.getModel().getMetaModel(),B.path)){n.push(new c("IsActiveEntity",d.EQ,true));}B.filters=new c(n,true);};g.getFilterDelegate=function(){return a;};g.getTypeUtil=function(p){return b;};g._getModel=function(t){var m=t.getDelegate().payload;return t.getModel(m.model);};return g;});
+sap.ui.define(["sap/ui/mdc/odata/v4/TableDelegate","sap/ui/core/Core","sap/ui/mdc/util/FilterUtil","sap/ui/mdc/odata/v4/util/DelegateUtil","sap/ui/mdc/odata/v4/FilterBarDelegate","sap/ui/mdc/odata/v4/ODataMetaModelUtil","sap/ui/mdc/odata/v4/TypeUtil","sap/ui/model/Filter","sap/ui/model/FilterOperator","sap/base/Log","sap/fe/macros/DelegateUtil","sap/fe/core/helpers/ModelHelper","sap/fe/core/CommonUtils"],function(T,C,F,D,a,O,b,c,d,L,M,e,f){"use strict";var g=Object.assign({},T);g.fetchProperties=function(t){var m=this._getModel(t);var p;if(!m){p=new Promise(function(r){t.attachModelContextChange({resolver:r},o,this);}.bind(this)).then(function(m){return this._createPropertyInfos(t,m);}.bind(this));}else{p=this._createPropertyInfos(t,m);}return p.then(function(P){if(t.data){t.data("$tablePropertyInfo",P);}return P;});};function o(E,h){var t=E.getSource();var m=this._getModel(t);if(m){t.detachModelContextChange(o);h.resolver(m);}}g._createPropertyInfos=function(t,m){var h=t.getDelegate().payload;var p=[];var E="/"+h.collectionName;var i=m.getMetaModel();return i.requestObject(E+"@").then(function(j){var s=j["@Org.OData.Capabilities.V1.SortRestrictions"]||{};var S=O.getSortRestrictionsInfo(s);var k=j["@Org.OData.Capabilities.V1.FilterRestrictions"];var l=O.getFilterRestrictionsInfo(k);var n=M.getCustomData(t,"columns");n.customData.forEach(function(q){p.push({name:q.path,path:q.path,label:q.label,sortable:S[q.path]?S[q.path].sortable:q.sortable,filterable:l[q.path]?l[q.path].filterable:q.filterable,typeConfig:M.isTypeFilterable(q.$Type)?t.getTypeUtil().getTypeConfig(q.$Type):undefined,maxConditions:O.isMultiValueFilterExpression(l.propertyInfo[q.path])?-1:1});});return p;});};g.updateBindingInfo=function(m,B){T.updateBindingInfo.apply(this,[m,B]);if(!m){return;}var h=m.getDelegate().payload;if(h&&B){B.path=B.path||h.collectionPath||"/"+h.collectionName;B.model=B.model||h.model;}if(!B){B={};}var i=C.byId(m.getFilter()),j=m.isFilteringEnabled(),k;var I,l;var n=[];var t=m.data("$tablePropertyInfo");if(j){k=m.getConditions();I=F.getFilterInfo(m,k,t);if(I.filters){n.push(I.filters);}}if(i){k=i.getConditions();if(k){var p=D.getParameterNames(i);l=F.getFilterInfo(i,k,t,p);if(l.filters){n.push(l.filters);}var P=D.getParametersInfo(i,k);if(P){B.path=P;}}B.parameters.$search=f.normalizeSearchTerm(i.getSearch())||undefined;}this._applyDefaultSorting(B,m.getDelegate().payload);B.parameters.$select=t.reduce(function(q,r){if(r.path&&r.path.indexOf("/")===-1){q=q?q+","+r.path:r.path;}return q;},"");if(e.isDraftSupported(m.getModel().getMetaModel(),B.path)){n.push(new c("IsActiveEntity",d.EQ,true));}B.filters=new c(n,true);};g.getFilterDelegate=function(){return a;};g.getTypeUtil=function(p){return b;};g._getModel=function(t){var m=t.getDelegate().payload;return t.getModel(m.model);};g._applyDefaultSorting=function(B,p){if(B.parameters&&B.parameters.$search==undefined&&B.sorter&&B.sorter.length==0){var h=p?p.defaultSortPropertyName:undefined;if(h){B.sorter.push(new sap.ui.model.Sorter(h,false));}}};return g;});

package/packages/sap.fe.macros/src/sap/fe/macros/internal/valuehelp/ValueHelp-dbg.designtime.js

@@ -342,7 +342,7 @@ sap.ui.define(
 				 * Defines that a property is not displayed as a filter.
 				 *
 				 * <br>
-				 * <i>Example in OData V4 notation with invisible, filterable property "LocationName", taken from {@link sap.fe.macros.FilterField#annotations/HiddenFilter}</i>
+				 * <i>Example in OData V4 notation with invisible, filterable property "LocationName", taken from {@link sap.fe.macros.internal.FilterField#annotations/HiddenFilter}</i>
 				 * <pre>
 				 *     &lt;Annotations Target=&quot;LocationName&quot;&gt;
 				 *         &lt;Annotation Term=&quot;com.sap.vocabularies.UI.v1.HiddenFilter&quot; /&gt;

package/packages/sap.fe.macros/src/sap/fe/macros/internal/valuehelp/ValueHelpContent.fragment.xml

@@ -37,16 +37,6 @@
 				</mdcField:suggestContent>
 			</mdcField:FieldValueHelp>
 		</template:then>
-		<template:elseif
-			test="{= ${this>useSemanticDateRange} ? ValueHelpTemplating.isSemanticDateRange(${property>@@Property.getPropertyObjectPath}) : false}"
-		>
-			<mdcField:ConditionFieldHelp
-				id="{= ValueHelpTemplating.generateID(${this>_flexId},${this>idPrefix},${originalProperty>@@Property.getRelativePropertyPath},${property>@@Property.getRelativePropertyPath})}"
-				title="{property>@@Property.getLabel}"
-				customData:requestGroupId="{this>requestGroupId}"
-				label="{this.i18n>M_CONDITIONFIELDHELP_PERIOD}"
-			/>
-		</template:elseif>
 		<template:elseif test="{= ${property>@@Property.hasDateType} || ${this>filterFieldValueHelp}}">
 			<mdcField:FieldValueHelp
 				unittest:id="ValueHelpMacroFragmentWithDateTimeFilters"

package/packages/sap.fe.macros/src/sap/fe/macros/internal/valuehelp/ValueListDialogTable.fragment.xml

@@ -24,10 +24,10 @@
 			delegate="{parts: [{path:'valueList>'}], formatter:'VLH.getTableDelegate'}"
 			threshold="20"
 			p13nMode="Column,Sort"
-			sortConditions="{parts: [{path:'valueList>'},{path:'source>/bSuggestion'}], formatter:'VLH.getValueHelpTableSortConditions'}"
+			sortConditions="{parts: [{path:'valueList>'},{path:'source>/bSuggestion'}], formatter:'VLH.getSortConditionsFromPresentationVariant'}"
 			macrodata:columns="{= COMMON.stringifyCustomData(${viewData>/columns})}"
 			autoBindOnInit="{= VLH.fetchValuesOnInitialLoad(${valueList>})}"
-			enableAutoColumnWidth="true"
+			enableAutoColumnWidth="{viewData>/enableAutoColumnWidth}"
 		>
 			<mdc:columns>
 				<template:repeat list="{valueList>Parameters}" var="parameter">