@openui5/sap.ui.fl 1.93.3 → 1.96.1

package/src/sap/ui/fl/write/api/ReloadInfoAPI.js

@@ -25,7 +25,7 @@ sap.ui.define([
 	"use strict";
 
 	function isDraftAvailable(oReloadInfo) {
-		var bUrlHasVersionParameter = !!Utils.getParameter(sap.ui.fl.Versions.UrlParameter);
+		var bUrlHasVersionParameter = !!Utils.getParameter(sap.ui.fl.Versions.UrlParameter, oReloadInfo.URLParsingService);
 		if (bUrlHasVersionParameter) {
 			return Promise.resolve(false);
 		}
@@ -39,7 +39,7 @@ sap.ui.define([
 	}
 
 	function areHigherLayerChangesAvailable(oReloadInfo) {
-		var bUrlHasMaxLayerParameter = this.hasMaxLayerParameterWithValue({value: oReloadInfo.layer});
+		var bUrlHasMaxLayerParameter = this.hasMaxLayerParameterWithValue({value: oReloadInfo.layer}, oReloadInfo.URLParsingService);
 		var bUserLayer = oReloadInfo.layer === Layer.USER;
 		if (bUserLayer || bUrlHasMaxLayerParameter) {
 			return Promise.resolve(false);
@@ -133,11 +133,11 @@ sap.ui.define([
 		 *
 		 * @param  {object} oParameter - Object containing the parameter value to be checked
 		 * @param  {string} oParameter.value - The parameter value to be checked
-		 *
+		 * @param  {sap.ushell.services.URLParsing} oURLParsingService - The Unified Shell's internal URL parsing service
 		 * @returns {boolean} True if the parameter with the given value is in the URL
 		 */
-		hasVersionParameterWithValue: function(oParameter) {
-			return Utils.hasParameterAndValue(sap.ui.fl.Versions.UrlParameter, oParameter.value);
+		hasVersionParameterWithValue: function(oParameter, oURLParsingService) {
+			return Utils.hasParameterAndValue(sap.ui.fl.Versions.UrlParameter, oParameter.value, oURLParsingService);
 		},
 
 		/**
@@ -145,12 +145,13 @@ sap.ui.define([
 		 *
 		 * @param  {object} oParameter - Object containing the parameter value to be checked
 		 * @param  {string} oParameter.value - The parameter value to be checked
+		 * @param  {sap.ushell.services.URLParsing} oURLParsingService - The Unified Shell's internal URL parsing service
 		 *
 		 * @returns {boolean} <code>true</code> if the parameter with the given value is in the URL
 		 */
-		hasMaxLayerParameterWithValue: function(oParameter) {
+		hasMaxLayerParameterWithValue: function(oParameter, oURLParsingService) {
 			var sParameterName = LayerUtils.FL_MAX_LAYER_PARAM;
-			return Utils.hasParameterAndValue(sParameterName, oParameter.value);
+			return Utils.hasParameterAndValue(sParameterName, oParameter.value, oURLParsingService);
 		},
 
 		/**
@@ -163,13 +164,14 @@ sap.ui.define([
 		 * @param  {string} oReloadInfo.parameters - The URL parameters to be modified
 		 * @param  {string} oReloadInfo.versionSwitch - Indicates if we are in a version switch scenario
 		 * @param  {string} oReloadInfo.version - Version we want to switch to
+		 * @param  {sap.ushell.services.URLParsing} oReloadInfo.URLParsingService - The Unified Shell's internal URL parsing service
 		 * @param  {boolean} [oReloadInfo.onExit=false] - Indicates if we are in a save+exit case/flow to not add the version=0 parameter
 		 *
 		 * @returns {string} The modified URL
 		 */
 		handleUrlParametersForStandalone: function(oReloadInfo) {
 			if (oReloadInfo.hasHigherLayerChanges) {
-				oReloadInfo.parameters = Utils.handleUrlParameters(oReloadInfo.parameters, LayerUtils.FL_MAX_LAYER_PARAM, oReloadInfo.layer);
+				oReloadInfo.parameters = Utils.handleUrlParameters(oReloadInfo.parameters, LayerUtils.FL_MAX_LAYER_PARAM, oReloadInfo.layer, oReloadInfo.URLParsingService);
 			}
 
 			// removes any version number set (original, draft, inactive and active versions)
@@ -178,11 +180,11 @@ sap.ui.define([
 
 			// startup reload due to draft
 			if (oReloadInfo.isDraftAvailable && !oReloadInfo.onExit) {
-				oReloadInfo.parameters = Utils.handleUrlParameters(oReloadInfo.parameters, sap.ui.fl.Versions.UrlParameter, sap.ui.fl.Versions.Draft);
+				oReloadInfo.parameters = Utils.handleUrlParameters(oReloadInfo.parameters, sap.ui.fl.Versions.UrlParameter, sap.ui.fl.Versions.Draft, oReloadInfo.URLParsingService);
 			}
 
 			if (oReloadInfo.versionSwitch) {
-				oReloadInfo.parameters = Utils.handleUrlParameters(oReloadInfo.parameters, sap.ui.fl.Versions.UrlParameter, oReloadInfo.version);
+				oReloadInfo.parameters = Utils.handleUrlParameters(oReloadInfo.parameters, sap.ui.fl.Versions.UrlParameter, oReloadInfo.version, oReloadInfo.URLParsingService);
 			}
 
 			// clean up if the last parameter was removed
@@ -201,11 +203,12 @@ sap.ui.define([
 		 * @param  {boolean} oReloadInfo.isDraftAvailable - Indicates if a draft is available
 		 * @param  {sap.ui.fl.Layer} oReloadInfo.layer - Current layer
 		 * @param  {sap.ui.fl.Selector} oReloadInfo.selector - Root control instance
+		 * @param  {sap.ushell.services.URLParsing} oReloadInfo.URLParsingService - The Unified Shell's internal URL parsing service
 		 *
 		 * @returns {object} oParsedHash Adjusted parsed hash
 		 */
 		handleParametersOnStart: function(oReloadInfo) {
-			var mParsedHash = Utils.getParsedURLHash();
+			var mParsedHash = Utils.getParsedURLHash(oReloadInfo.URLParsingService);
 			mParsedHash.params = mParsedHash.params || {};
 
 			if (oReloadInfo.hasHigherLayerChanges) {
@@ -224,12 +227,12 @@ sap.ui.define([
 		 * @param  {sap.ui.fl.Layer} oReloadInfo.layer - Current layer
 		 * @param  {sap.ui.fl.Selector} oReloadInfo.selector - Root control instance
 		 * @param  {boolean} oReloadInfo.versioningEnabled - Indicates if versioning is enabled by the backend
-		 *
+		 * @param  {sap.ushell.services.URLParsing} oReloadInfo.URLParsingService - The Unified Shell's internal URL parsing service
 		 * @returns {boolean} <code>true</code> if a draft got activated and had a draft initially when entering UI adaptation
 		 */
 		initialDraftGotActivated: function(oReloadInfo) {
 			if (oReloadInfo.versioningEnabled) {
-				var bUrlHasVersionParameter = this.hasVersionParameterWithValue({value: sap.ui.fl.Versions.Draft.toString()});
+				var bUrlHasVersionParameter = this.hasVersionParameterWithValue({value: sap.ui.fl.Versions.Draft.toString()}, oReloadInfo.URLParsingService);
 				return !VersionsAPI.isDraftAvailable(oReloadInfo) && bUrlHasVersionParameter;
 			}
 			return false;
@@ -245,6 +248,7 @@ sap.ui.define([
 		 * @param  {boolean} oReloadInfo.changesNeedReload - Indicates if changes (e.g. app descriptor changes) need hard reload
 		 * @param  {boolean} oReloadInfo.initialDraftGotActivated - Indicates if a draft got activated and had a draft initially when entering UI adaptation
 		 * @param  {boolean} oReloadInfo.activeVersion - Indicates the current active version
+		 * @param  {sap.ushell.services.URLParsing} oReloadInfo.URLParsingService - The Unified Shell's internal URL parsing service
 		 *
 		 * @returns {boolean} <code>true</code> if a draft got activated and had a draft initially when entering UI adaptation
 		 */
@@ -258,12 +262,12 @@ sap.ui.define([
 
 			// TODO fix app descriptor handling and reload behavior
 			// TODO move changesNeedReload near flexState; set flag when saving change that needs a reload
-			oReloadInfo.isDraftAvailable = oReloadInfo.isDraftAvailable || ReloadInfoAPI.hasVersionParameterWithValue({value: sap.ui.fl.Versions.Draft.toString()});
+			oReloadInfo.isDraftAvailable = oReloadInfo.isDraftAvailable || ReloadInfoAPI.hasVersionParameterWithValue({value: sap.ui.fl.Versions.Draft.toString()}, oReloadInfo.URLParsingService);
 
 			if (oReloadInfo.activeVersion > sap.ui.fl.Versions.Original) {
-				oReloadInfo.activeVersionNotSelected = oReloadInfo.activeVersion && !ReloadInfoAPI.hasVersionParameterWithValue({value: oReloadInfo.activeVersion.toString()});
+				oReloadInfo.activeVersionNotSelected = oReloadInfo.activeVersion && !ReloadInfoAPI.hasVersionParameterWithValue({value: oReloadInfo.activeVersion.toString()}, oReloadInfo.URLParsingService);
 			}
-			oReloadInfo.hasHigherLayerChanges = ReloadInfoAPI.hasMaxLayerParameterWithValue({value: oReloadInfo.layer});
+			oReloadInfo.hasHigherLayerChanges = ReloadInfoAPI.hasMaxLayerParameterWithValue({value: oReloadInfo.layer}, oReloadInfo.URLParsingService);
 			oReloadInfo.initialDraftGotActivated = ReloadInfoAPI.initialDraftGotActivated(oReloadInfo);
 			if (oReloadInfo.initialDraftGotActivated) {
 				oReloadInfo.isDraftAvailable = false;

package/ui5.yaml

@@ -1,5 +1,5 @@
 ---
-specVersion: "1.1"
+specVersion: "2.0"
 type: library
 metadata:
   name: sap.ui.fl
@@ -7,3 +7,6 @@ metadata:
    OpenUI5
     * (c) Copyright 2009-${currentYear} SAP SE or an SAP affiliate company.
     * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
+resources:
+  configuration:
+    propertiesFileSourceEncoding: ISO-8859-1

package/src/sap/ui/fl/write/_internal/fieldExtensibility/cap/editor/propertyEditor/annotationsEditor/AnnotationsEditor.js

@@ -1,49 +0,0 @@
-/*!
- * OpenUI5
- * (c) Copyright 2009-2021 SAP SE or an SAP affiliate company.
- * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
- */
-
-sap.ui.define([
-	"sap/ui/integration/designtime/baseEditor/propertyEditor/mapEditor/MapEditor"
-], function (
-	MapEditor
-) {
-	"use strict";
-
-	/**
-	 * @class
-	 * Constructor for a new <code>AnnotationsEditor</code>.
-	 *
-	 * @extends sap.ui.integration.designtime.baseEditor.propertyEditor.mapEditor.MapEditor
-	 * @alias sap.ui.fl.write._internal.fieldExtensibility.cap.editor.propertyEditor.annotationsEditor.AnnotationsEditor
-	 * @author SAP SE
-	 * @since 1.93
-	 * @version 1.93.3
-	 *
-	 * @private
-	 * @experimental 1.93
-	 * @ui5-restricted sap.ui.fl
-	 */
-	var AnnotationsEditor = MapEditor.extend("sap.ui.fl.write._internal.fieldExtensibility.cap.editor.propertyEditor.annotationsEditor.AnnotationsEditor", {
-		xmlFragment: "sap.ui.integration.designtime.baseEditor.propertyEditor.mapEditor.MapEditor",
-		metadata: {
-			library: "sap.ui.fl"
-		},
-		renderer: MapEditor.getMetadata().getRenderer().render
-	});
-
-	AnnotationsEditor.prototype.processInputValue = function(oValue) {
-		return {
-			value: oValue,
-			type: "json"
-		};
-	};
-
-	AnnotationsEditor.prototype._isValidItem = function() {
-		// Temporary fix, can be properly validated once the json type is registered in the MapEditor
-		return true;
-	};
-
-	return AnnotationsEditor;
-});

package/src/sap/ui/fl/write/_internal/fieldExtensibility/cap/editor/propertyEditor/dateEditor/DateEditor.js

@@ -1,43 +0,0 @@
-/*!
- * OpenUI5
- * (c) Copyright 2009-2021 SAP SE or an SAP affiliate company.
- * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
- */
-
-// Customization of the default date editor to support custom output formats
-// To be implemented in base class
-
-sap.ui.define([
-	"sap/ui/integration/designtime/baseEditor/propertyEditor/dateEditor/DateEditor",
-	"sap/ui/core/format/DateFormat"
-], function (
-	BaseDateEditor,
-	DateFormat
-) {
-	"use strict";
-
-	var DateEditor = BaseDateEditor.extend("sap.ui.fl.write._internal.fieldExtensibility.cap.editor.propertyEditor.dateEditor.DateEditor", {
-		xmlFragment: "sap.ui.integration.designtime.baseEditor.propertyEditor.dateEditor.DateEditor",
-		metadata: {
-			library: "sap.ui.fl"
-		},
-		renderer: BaseDateEditor.getMetadata().getRenderer().render
-	});
-
-	DateEditor.prototype._parse = function (sValue) {
-		if (sValue === "") {
-			return undefined;
-		}
-		var sParsedDate = new Date(sValue);
-
-		// TODO: For now use a hardcoded format, move to default config later
-		var oDateFormatterInstance = DateFormat.getDateInstance({
-			pattern: "yyyy-MM-dd"
-		});
-		return this._isValidDate(sParsedDate)
-			? oDateFormatterInstance.format(sParsedDate)
-			: sValue;
-	};
-
-	return DateEditor;
-});

package/src/sap/ui/fl/write/_internal/fieldExtensibility/cap/editor/propertyEditor/dateTimeEditor/DateTimeEditor.js

@@ -1,38 +0,0 @@
-/*!
- * OpenUI5
- * (c) Copyright 2009-2021 SAP SE or an SAP affiliate company.
- * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
- */
-
-// Customization of the default datetime editor to support custom output formats
-// To be implemented in base class
-
-sap.ui.define([
-	"sap/ui/integration/designtime/baseEditor/propertyEditor/dateTimeEditor/DateTimeEditor"
-], function (
-	BaseDateTimeEditor
-) {
-	"use strict";
-
-	var DateTimeEditor = BaseDateTimeEditor.extend("sap.ui.fl.write._internal.fieldExtensibility.cap.editor.propertyEditor.dateTimeEditor.DateTimeEditor", {
-		xmlFragment: "sap.ui.integration.designtime.baseEditor.propertyEditor.dateTimeEditor.DateTimeEditor",
-		metadata: {
-			library: "sap.ui.fl"
-		},
-		renderer: BaseDateTimeEditor.getMetadata().getRenderer().render
-	});
-
-	DateTimeEditor.prototype._parse = function (sValue) {
-		if (sValue === "") {
-			return undefined;
-		}
-		var sParsedDate = new Date(sValue);
-
-		// TODO: For now use a hardcoded format, move to default config later
-		return this._isValidDate(sParsedDate)
-			? sParsedDate.toISOString().split(".")[0] + "Z" // Cut ms
-			: sValue;
-	};
-
-	return DateTimeEditor;
-});