@sapui5/sap.fe.core 1.99.0 → 1.100.0

package/src/sap/fe/core/CommonUtils.ts

@@ -6,7 +6,6 @@ import library from "sap/fe/core/library";
 import ModelHelper from "sap/fe/core/helpers/ModelHelper";
 import SemanticDateOperators from "sap/fe/core/helpers/SemanticDateOperators";
 import mergeObjects from "sap/base/util/merge";
-import DataLossOrDraftDiscardHandler from "sap/fe/core/controls/DataLossOrDraftDiscard/DataLossOrDraftDiscardHandler";
 import XMLTemplateProcessor from "sap/ui/core/XMLTemplateProcessor";
 import XMLPreprocessor from "sap/ui/core/util/XMLPreprocessor";
 import Fragment from "sap/ui/core/Fragment";
@@ -14,7 +13,7 @@ import ODataMetaModel from "sap/ui/model/odata/v4/ODataMetaModel";
 import ResourceBundle from "sap/base/i18n/ResourceBundle";
 import { bindingExpression, compileBinding, constant, transformRecursively } from "sap/fe/core/helpers/BindingExpression";
 import { getConditions } from "./templating/FilterHelper";
-import { AppComponent } from "sap/fe/core";
+import AppComponent from "sap/fe/core/AppComponent";
 import JSONModel from "sap/ui/model/json/JSONModel";
 import { generate } from "sap/fe/core/helpers/StableIdHelper";
 import ODataModel from "sap/ui/model/odata/v4/ODataModel";
@@ -22,6 +21,14 @@ import Control from "sap/ui/core/Control";
 import FilterOperatorUtil from "sap/ui/mdc/condition/FilterOperatorUtil";
 import TypeUtil from "sap/ui/mdc/odata/v4/TypeUtil";
 import { IssueCategory, IssueSeverity, IssueCategoryType } from "sap/fe/core/converters/helpers/IssueManager";
+import { isConnected, disconnect } from "sap/fe/core/actions/collaboration/ActivitySync";
+import Context from "sap/ui/model/Context";
+import { performAfterDiscardorKeepDraft } from "./controls/DataLossOrDraftDiscard/DataLossOrDraftDiscardHandler";
+import Button from "sap/m/Button";
+import Dialog from "sap/m/Dialog";
+import Bar from "sap/m/Bar";
+import Title from "sap/m/Title";
+import messageHandling from "./actions/messageHandling";
 
 const ProgrammingModel = library.ProgrammingModel;
 const aValidTypes = [
@@ -43,6 +50,7 @@ const aValidTypes = [
 	"Edm.Time",
 	"Edm.TimeOfDay"
 ];
+
 function normalizeSearchTerm(sSearchTerm: string) {
 	if (!sSearchTerm) {
 		return undefined;
@@ -72,6 +80,8 @@ function getPropertyDataType(oNavigationContext: any) {
 			case "com.sap.vocabularies.UI.v1.DataField":
 			case "com.sap.vocabularies.UI.v1.DataFieldWithNavigationPath":
 			case "com.sap.vocabularies.UI.v1.DataFieldWithUrl":
+			case "com.sap.vocabularies.UI.v1.DataFieldWithIntentBasedNavigation":
+			case "com.sap.vocabularies.UI.v1.DataFieldWithAction":
 				sDataType = oNavigationContext.getProperty("Value/$Path/$Type");
 				break;
 
@@ -196,11 +206,11 @@ function isPropertyFilterable(oModel: ODataMetaModel, sEntitySetPath: string, sP
 	let bIsFilterable;
 
 	// Parameters should be rendered as filterfields
-	if (oModel.getProperty(sEntitySetPath + "/@com.sap.vocabularies.Common.v1.ResultContext") === true) {
+	if (oModel.getObject(sEntitySetPath + "/@com.sap.vocabularies.Common.v1.ResultContext") === true) {
 		return true;
 	}
 
-	const oNavigationContext = oModel.createBindingContext(sEntitySetPath + "/" + sProperty);
+	const oNavigationContext = oModel.createBindingContext(sEntitySetPath + "/" + sProperty) as Context;
 
 	if (oNavigationContext.getProperty("@com.sap.vocabularies.UI.v1.Hidden") === true) {
 		return false;
@@ -494,11 +504,20 @@ function fnProcessDataLossOrDraftDiscardConfirmation(
 	fnCancelFunction: any,
 	oContext: any,
 	oController: any,
-	bSkipBindingToView: any
+	bSkipBindingToView?: boolean
 ) {
 	const oModel = oContext.getModel();
 	let _bIsModified = false;
 	const draftDataContext = oModel.bindContext(oContext.getPath() + "/DraftAdministrativeData").getBoundContext();
+
+	const collaborationConnected = isConnected(oController.getView());
+	const processFunctionForDrafts = !collaborationConnected
+		? fnProcessFunction
+		: function(...args: any[]) {
+				disconnect(oController.getView());
+				fnProcessFunction.apply(null, ...args);
+		  };
+
 	if (
 		oContext &&
 		oContext.getObject() &&
@@ -512,14 +531,9 @@ function fnProcessDataLossOrDraftDiscardConfirmation(
 				if (draftAdminData) {
 					_bIsModified = !(draftAdminData.CreationDateTime === draftAdminData.LastChangeDateTime);
 					if (_bIsModified) {
-						DataLossOrDraftDiscardHandler.performAfterDiscardorKeepDraft(
-							fnProcessFunction,
-							fnCancelFunction,
-							oController,
-							bSkipBindingToView
-						);
+						performAfterDiscardorKeepDraft(processFunctionForDrafts, fnCancelFunction, oController, bSkipBindingToView);
 					} else {
-						fnProcessFunction();
+						processFunctionForDrafts();
 					}
 				} else {
 					fnProcessFunction();
@@ -767,7 +781,7 @@ function getEntitySetName(oMetaModel: any, sEntityType: any) {
 		}
 	}
 }
-function computeDisplayMode(oPropertyAnnotations: any, oCollectionAnnotations: any) {
+function computeDisplayMode(oPropertyAnnotations: any, oCollectionAnnotations?: any) {
 	const oTextAnnotation = oPropertyAnnotations["@com.sap.vocabularies.Common.v1.Text"],
 		oTextArrangementAnnotation =
 			oTextAnnotation &&
@@ -831,7 +845,7 @@ function _requestProperty(oSelectedContext: any, sAction: any, sProperty: any, s
 }
 function _setContextsBasedOnOperationAvailable(oInternalModelContext: any, aRequestPromises: any) {
 	return Promise.all(aRequestPromises)
-		.then(function(aResults: [any, any, any, any, any, any, any, any, any, any]) {
+		.then(function(aResults: any[]) {
 			if (aResults.length) {
 				const aApplicableContexts: any[] = [],
 					aNotApplicableContexts: any[] = [];
@@ -964,7 +978,20 @@ function getOperatorsForProperty(
 	const oFilterRestrictions = CommonUtils.getFilterRestrictionsByPath(sEntitySetPath, oContext);
 	const aEqualsOps = ["EQ"];
 	const aSingleRangeOps = ["EQ", "GE", "LE", "LT", "GT", "BT", "NOTLE", "NOTLT", "NOTGE", "NOTGT"];
-	const aSingleValueDateOps = ["TODAY", "TOMORROW", "YESTERDAY", "DATE"];
+	const aSingleValueDateOps = [
+		"TODAY",
+		"TOMORROW",
+		"YESTERDAY",
+		"DATE",
+		"FIRSTDAYWEEK",
+		"LASTDAYWEEK",
+		"FIRSTDAYMONTH",
+		"LASTDAYMONTH",
+		"FIRSTDAYQUARTER",
+		"LASTDAYQUARTER",
+		"FIRSTDAYYEAR",
+		"LASTDAYYEAR"
+	];
 	const aMultiRangeOps = ["EQ", "GE", "LE", "LT", "GT", "BT", "NE", "NOTBT", "NOTLE", "NOTLT", "NOTGE", "NOTGT"];
 	const aSearchExpressionOps = ["Contains", "NotContains", "StartsWith", "NotStartsWith", "EndsWith", "NotEndsWith"];
 	const aSemanticDateOpsExt = SemanticDateOperators.getSupportedOperations();
@@ -1279,7 +1306,7 @@ function addPageContextToSelectionVariant(oSelectionVariant: any, mPageContext:
 	const oNavigationService = oAppComponent.getNavigationService();
 	return oNavigationService.mixAttributesAndSelectionVariant(mPageContext, oSelectionVariant.toJSONString());
 }
-function addExternalStateFiltersToSelectionVariant(oSelectionVariant: any, mFilters: any, oTargetInfo: any, oFilterInfo: any) {
+function addExternalStateFiltersToSelectionVariant(oSelectionVariant: any, mFilters: any, oTargetInfo: any, oFilterInfo?: any) {
 	let sFilter: any,
 		sLow = "",
 		sHigh = null;
@@ -1444,7 +1471,7 @@ function addDefaultDisplayCurrency(aMandatoryFilterFields: any[], oSelectionVari
 		}
 	}
 }
-function getNonComputedVisibleFields(oMetaModel: ODataMetaModel, sPath: any, oView: any) {
+function getNonComputedVisibleFields(oMetaModel: ODataMetaModel, sPath: any, oView?: any) {
 	const aTechnicalKeys = oMetaModel.getObject(sPath + "/").$Key;
 	const aNonComputedVisibleFields = [];
 	const oEntityType = oMetaModel.getObject(sPath + "/");
@@ -1668,7 +1695,7 @@ function fnGetSemanticObjectsFromPath(oMetaModel: any, sPath: any) {
 }
 function fnUpdateSemanticTargetsModel(aGetLinksPromises: any, aSemanticObjects: any, oInternalModelContext: any, sCurrentHash: any) {
 	return Promise.all(aGetLinksPromises)
-		.then(function(aValues: [any, any, any, any, any, any, any, any, any, any]) {
+		.then(function(aValues: any[]) {
 			let aLinks,
 				_oLink,
 				_sLinkIntentAction,
@@ -1927,7 +1954,7 @@ function getFilterRestrictionsByPath(sEntitySetPath: any, oMetaModel: any) {
 
 	return oRet;
 }
-function templateControlFragment(sFragmentName: any, oPreprocessorSettings: any, oOptions: any, oModifier: any) {
+function templateControlFragment(sFragmentName: any, oPreprocessorSettings: any, oOptions: any, oModifier?: any) {
 	oOptions = oOptions || {};
 	if (oModifier) {
 		return oModifier.templateControlFragment(sFragmentName, oPreprocessorSettings, oOptions.view).then(function(oFragment: any) {
@@ -1956,21 +1983,27 @@ function templateControlFragment(sFragmentName: any, oPreprocessorSettings: any,
 			});
 	}
 }
-function requestSingletonProperty(sPath: string, oModel: ODataModel) {
-	if (!sPath || !oModel) {
+function getSingletonPath(path: string, metaModel: ODataMetaModel): string | undefined {
+	const parts = path.split("/").filter(Boolean),
+		propertyName = parts.pop(),
+		navigationPath = parts.join("/"),
+		entitySet = navigationPath && metaModel.getObject("/" + navigationPath);
+	if (entitySet?.$kind === "Singleton") {
+		const singletonName = parts[parts.length - 1];
+		return "/" + singletonName + "/" + propertyName;
+	}
+	return undefined;
+}
+function requestSingletonProperty(path: string, model: ODataModel) {
+	if (!path || !model) {
 		return Promise.resolve(null);
 	}
-
-	const oMetaModel = oModel.getMetaModel();
+	const metaModel = model.getMetaModel();
 	// Find the underlying entity set from the property path and check whether it is a singleton.
-	const aParts = sPath.split("/").filter(Boolean),
-		sPropertyName = aParts.pop(),
-		sNavigationPath = aParts.join("/"),
-		oEntitySet = sNavigationPath && oMetaModel.getObject("/" + sNavigationPath);
-	if (oEntitySet && oEntitySet.$kind === "Singleton") {
-		const sSingletonName = aParts[aParts.length - 1],
-			oPropertyBinding = oModel.bindProperty("/" + sSingletonName + "/" + sPropertyName);
-		return oPropertyBinding.requestValue();
+	const resolvedPath = getSingletonPath(path, metaModel);
+	if (resolvedPath) {
+		const propertyBinding = model.bindProperty(resolvedPath);
+		return propertyBinding.requestValue();
 	}
 
 	return Promise.resolve(null);
@@ -2018,6 +2051,70 @@ function loadMacroLibrary() {
 		});
 	});
 }
+
+function fnOnStrictHandlingFailed(sGroupId: string, actionName: string, oModel: ODataModel, aMessages: any[]) {
+	const localI18nRef = sap.ui.getCore().getLibraryResourceBundle("sap.fe.core") as ResourceBundle,
+		sActionName = actionName,
+		sCancelButtonTxt = localI18nRef.getText("CANCEL");
+	if (aMessages.length === 1) {
+		const sMessage = aMessages[0].message + "\n" + localI18nRef.getText("PROCEED");
+		const dialogPromise = new Promise(function(resolve) {
+			MessageBox.warning(sMessage, {
+				title: localI18nRef.getText("WARNING"),
+				actions: [sActionName, sCancelButtonTxt],
+				emphasizedAction: sActionName,
+				onClose: function(sAction: string) {
+					if (sAction === sActionName) {
+						resolve(true);
+						oModel.submitBatch(sGroupId);
+					} else {
+						resolve(false);
+					}
+				}
+			});
+		});
+		return dialogPromise;
+	}
+	return new Promise(function(resolve) {
+		const oMessageDialogModel = new JSONModel();
+		oMessageDialogModel.setData(aMessages);
+		const bStrictHandlingFlow = true;
+		const oMessageObject = messageHandling.prepareMessageViewForDialog(oMessageDialogModel, bStrictHandlingFlow);
+		const oDialog = new Dialog({
+			resizable: true,
+			content: oMessageObject.oMessageView,
+			state: "Warning",
+			customHeader: new Bar({
+				contentLeft: [oMessageObject.oBackButton],
+				contentMiddle: [new Title({ text: "Warning" })]
+			}),
+			contentHeight: "50%",
+			contentWidth: "50%",
+			verticalScrolling: false
+		});
+		oDialog.setBeginButton(
+			new Button({
+				press: function() {
+					resolve(true);
+					oModel.submitBatch(sGroupId);
+					oDialog.close();
+				},
+				type: "Emphasized",
+				text: getTranslatedText("IGNORE", localI18nRef, sActionName)
+			})
+		);
+		oDialog.setEndButton(
+			new Button({
+				press: function() {
+					resolve(false);
+					oDialog.close();
+				},
+				text: sCancelButtonTxt
+			})
+		);
+		oDialog.open();
+	});
+}
 const CommonUtils = {
 	isPropertyFilterable: isPropertyFilterable,
 	isFieldControlPathInapplicable: isFieldControlPathInapplicable,
@@ -2072,7 +2169,9 @@ const CommonUtils = {
 	},
 	AllowedExpressionsPrio: ["SingleValue", "MultiValue", "SingleRange", "MultiRange", "SearchExpression", "MultiRangeOrSearchExpression"],
 	fnProcessDataLossOrDraftDiscardConfirmation: fnProcessDataLossOrDraftDiscardConfirmation,
-	normalizeSearchTerm: normalizeSearchTerm
+	normalizeSearchTerm: normalizeSearchTerm,
+	fnOnStrictHandlingFailed: fnOnStrictHandlingFailed,
+	getSingletonPath: getSingletonPath
 };
 
 export default CommonUtils;