@openui5/sap.ui.fl 1.103.0 → 1.105.0

package/src/sap/ui/fl/support/apps/contentbrowser/lrepConnector/LRepConnector.js

@@ -13,7 +13,7 @@ sap.ui.define(["sap/ui/fl/Utils", "sap/ui/thirdparty/jquery"], function(Utils, j
 	 * @constructor
 	 * @alias sap.ui.fl.support.apps.contentbrowser.lrepConnector.LRepConnector
 	 * @author SAP SE
-	 * @version 1.103.0
+	 * @version 1.105.0
 	 * @experimental Since 1.45
 	 */
 	var LrepConnector = {};
@@ -58,10 +58,11 @@ sap.ui.define(["sap/ui/fl/Utils", "sap/ui/thirdparty/jquery"], function(Utils, j
 	 * @param {string} sContent - Content of the file saved to the layered repository
 	 * @param {string} sTransportId - ID of an ABAP transport or ATO_NOTIFICATION
 	 * @param {string} sPackageName - Name of an ABAP package
+	 * @param [boolean] bSupport - Save file with support mode for activated version
 	 * @returns {Promise} Promise of the SAVE content request to the back end
 	 * @public
 	 */
-	LrepConnector.saveFile = function (sLayer, sNamespace, sFilename, sFileType, sContent, sTransportId, sPackageName) {
+	LrepConnector.saveFile = function (sLayer, sNamespace, sFilename, sFileType, sContent, sTransportId, sPackageName, bSupport) {
 		return new Promise(function (fnResolve, fnReject) {
 			if (!sLayer || sNamespace === undefined || !sFilename || !sFileType) {
 				fnReject();
@@ -73,6 +74,9 @@ sap.ui.define(["sap/ui/fl/Utils", "sap/ui/thirdparty/jquery"], function(Utils, j
 			var sChangeListSuffix = this._getChangeListSuffix(sTransportId);
 			var sPackageSuffix = this._getPackageSuffix(sPackageName);
 			var sUrl = LrepConnector.sContentPathPrefix + sContentSuffix + sLayerSuffix + sChangeListSuffix + sPackageSuffix;
+			if (bSupport) {
+				sUrl = sUrl + "&support=true";
+			}
 			this._getTokenAndSendPutRequest(sUrl, sContent, fnResolve, fnReject);
 		}.bind(this));
 	};
@@ -85,10 +89,11 @@ sap.ui.define(["sap/ui/fl/Utils", "sap/ui/thirdparty/jquery"], function(Utils, j
 	 * @param {string} sFileName - Name of the file
 	 * @param {string} sFileType - Type of the file
 	 * @param {string} sTransportId - ID of the ABAP transport or ATO_NOTIFICATION
+	 * @param [boolean] bSupport - Delete file with support mode for activated version
 	 * @returns {Promise} Promise of DELETE content request to the back end
 	 * @public
 	 */
-	LrepConnector.deleteFile = function (sLayer, sNamespace, sFileName, sFileType, sTransportId) {
+	LrepConnector.deleteFile = function (sLayer, sNamespace, sFileName, sFileType, sTransportId, bSupport) {
 		return new Promise(function (fnResolve, fnReject) {
 			if (!sLayer || sNamespace === undefined || !sFileName || !sFileType) {
 				fnReject();
@@ -99,6 +104,9 @@ sap.ui.define(["sap/ui/fl/Utils", "sap/ui/thirdparty/jquery"], function(Utils, j
 			var sLayerSuffix = this._getLayerSuffix(sLayer);
 			var sChangeListSuffix = this._getChangeListSuffix(sTransportId);
 			var sUrl = LrepConnector.sContentPathPrefix + sContentSuffix + sLayerSuffix + sChangeListSuffix;
+			if (bSupport) {
+				sUrl = sUrl + "&support=true";
+			}
 			this._getTokenAndSendDeletionRequest(sUrl, fnResolve, fnReject);
 		}.bind(this));
 	};

package/src/sap/ui/fl/support/apps/contentbrowser/utils/DataUtils.js

@@ -19,7 +19,7 @@ sap.ui.define([
 	 * @constructor
 	 * @alias sap.ui.fl.support.apps.contentbrowser.utils.DataUtils
 	 * @author SAP SE
-	 * @version 1.103.0
+	 * @version 1.105.0
 	 * @experimental Since 1.45
 	 */
 	var DataUtils = {

package/src/sap/ui/fl/support/apps/contentbrowser/utils/ErrorUtils.js

@@ -16,7 +16,7 @@ function (MessagePopoverItem, MessagePopover) {
 		 * @constructor
 		 * @alias sap.ui.fl.support.apps.contentbrowser.utils.ErrorUtils
 		 * @author SAP SE
-		 * @version 1.103.0
+		 * @version 1.105.0
 		 * @experimental Since 1.45
 		 */
 	var ErrorUtils = {};

package/src/sap/ui/fl/support/apps/contentbrowser/view/ContentDetails.view.xml

@@ -47,6 +47,7 @@
 				<ToolbarSpacer />
 				<Button text="{i18n>edit}" press=".onEditClicked" />
 				<Button text="{i18n>delete}" press=".onDeleteClicked" />
+				<CheckBox id="activeVersionCheckBox" text="{i18n>onActiveVersion}" valueState="Warning" visible="false"/>
 			</Toolbar>
 		</footer>
 	</Page>

package/src/sap/ui/fl/support/apps/contentbrowser/view/ContentDetailsEdit.view.xml

@@ -18,6 +18,7 @@
 				<ToolbarSpacer />
 				<Button text="{i18n>save}" press=".onSave" />
 				<Button text="{i18n>cancel}" press=".onCancel" />
+				<CheckBox id="activeVersionCheckBox" text="{i18n>onActiveVersion}" valueState="Warning" visible="false"/>
 			</Toolbar>
 		</footer>
 	</Page>

package/src/sap/ui/fl/transport/TransportSelection.js

@@ -17,7 +17,7 @@ sap.ui.define([
 	 * @alias sap.ui.fl.transport.TransportSelection
 	 * @constructor
 	 * @author SAP SE
-	 * @version 1.103.0
+	 * @version 1.105.0
 	 * @since 1.38.0
 	 * Helper object to select an ABAP transport for an LREP object. This is not a generic utility to select a transport request, but part
 	 *        of the SmartVariant control.

package/src/sap/ui/fl/util/IFrame.js

@@ -11,6 +11,7 @@ sap.ui.define([
 	"sap/ui/model/json/JSONModel",
 	"./getContainerUserInfo",
 	"sap/base/util/extend",
+	"sap/base/util/restricted/_CancelablePromise",
 	"sap/base/security/URLListValidator",
 	"sap/base/Log",
 	"sap/ui/core/library",
@@ -21,6 +22,7 @@ sap.ui.define([
 	JSONModel,
 	getContainerUserInfo,
 	extend,
+	CancelablePromise,
 	URLListValidator,
 	Log
 ) {
@@ -50,7 +52,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Control
 	 *
 	 * @author SAP SE
-	 * @version 1.103.0
+	 * @version 1.105.0
 	 *
 	 * @constructor
 	 * @private
@@ -114,7 +116,30 @@ sap.ui.define([
 			var sEncodedUrl = decodeURI(sUrl) === sUrl ? encodeURI(sUrl) : sUrl;
 
 			if (IFrame.isValidUrl(sEncodedUrl)) {
-				this.setProperty("url", sEncodedUrl);
+				// Setting the url of the IFrame directly can lead to issues
+				// if the change doesn't result in a reload of the embedded page
+				// e.g. when a navigation parameter is changed
+				// To avoid problems with the ushell and the embedded apps, it is safer
+				// to unload the iframe content first and thus force a full browser reload
+
+				if (this._oSetUrlPromise) {
+					this._oSetUrlPromise.cancel();
+					delete this._oSetUrlPromise;
+				}
+
+				this.setProperty("url", "");
+
+				this._oSetUrlPromise = new CancelablePromise(function (fnResolve, fnReject, onCancel) {
+					onCancel.shouldReject = false;
+					// Use a timeout here to avoid issues with browser caching in Chrome
+					// that seem to lead to a mismatch between IFrame content and src,
+					// see Chromium issue 324102
+					setTimeout(fnResolve, 0);
+				});
+
+				this._oSetUrlPromise.then(function() {
+					this.setProperty("url", sEncodedUrl);
+				}.bind(this));
 			} else {
 				Log.error("Provided URL is not valid as an IFrame src");
 			}

package/src/sap/ui/fl/util/ManagedObjectModel.js

@@ -25,7 +25,7 @@ sap.ui.define([
 	 * @extends sap.ui.core.Element
 	 *
 	 * @author SAP SE
-	 * @version 1.103.0
+	 * @version 1.105.0
 	 *
 	 * @constructor
 	 * @private

package/src/sap/ui/fl/util/resolveBinding.js

@@ -34,7 +34,7 @@ sap.ui.define([
 	 *
 	 * @function
 	 * @author SAP SE
-	 * @version 1.103.0
+	 * @version 1.105.0
 	 * @alias sap.ui.fl.util.resolveBinding
 	 * @experimental
 	 * @since 1.91