@openui5/sap.ui.rta 1.120.6 → 1.121.0

package/src/sap/ui/rta/plugin/iframe/AddIFrameDialog.fragment.xml

@@ -6,7 +6,7 @@
 		xmlns:layout="sap.ui.layout">
 	<Dialog
 		id="sapUiRtaAddIFrameDialog"
-		title="{/text/dialogTitle}"
+		title="{dialogInfo>/text/dialogTitle}"
 		verticalScrolling="true"
 		resizable="false"
 		class="sapUiRtaAddIFrameDialog"
@@ -24,11 +24,11 @@
 					id="sapUiRtaAddIFrameDialog_VL"
 					width="100%"
 					class="sapUiRtaAddIFrameDialogVlWrapper">
-				<VBox visible="{/asContainer/value}" class="sapUiRtaAddIFrameDialogContainerTitleVBox" renderType="Bare">
+				<VBox visible="{dialogInfo>/asContainer/value}" class="sapUiRtaAddIFrameDialogContainerTitleVBox" renderType="Bare">
 					<items>
 						<Label
 							id="sapUiRtaAddIFrameDialog_ContainerTitleLabel"
-							text="{/text/containerTitleLabel}"
+							text="{dialogInfo>/text/containerTitleLabel}"
 							class="sapUiRtaAddIFrameDialogContainerTitleLabel"
 							design="Bold"
 						/>
@@ -36,18 +36,18 @@
 							id="sapUiRtaAddIFrameDialog_ContainerTitle_TitleInput"
 							class="sapUiRtaAddIFrameDialogContainerTitleInput"
 							value="{
-								path : '/title/value',
+								path : 'dialogInfo>/title/value',
 								type : 'sap.ui.model.type.String'
 							}"
 							liveChange=".onContainerTitleChange"
 							valueLiveUpdate="true"
-							valueState="{/title/valueState}"
+							valueState="{dialogInfo>/title/valueState}"
 						/>
 					</items>
 				</VBox>
 				<VBox>
 					<items>
-						<Label id="sapUiRtaAddIFrameDialog_SizeTitle" text="{/text/sizeTitle}" class="sapUiRtaAddIFrameDialogSizeTitle" design="Bold"/>
+						<Label id="sapUiRtaAddIFrameDialog_SizeTitle" text="{dialogInfo>/text/sizeTitle}" class="sapUiRtaAddIFrameDialogSizeTitle" design="Bold"/>
 						<layout:Grid
 								id="sapUiRtaAddIFrameDialog_SizeGrid"
 								containerQuery="true" position="Center"
@@ -61,22 +61,22 @@
 							>
 								<form:content>
 									<Label id="sapUiRtaAddIFrameDialog_WidthLabel" class="sapUiRtaAddIFrameDialogWidthLabel" labelFor="sapUiRtaAddIFrameDialog_WidthInput"
-										text="{/text/widthLabel}">
+										text="{dialogInfo>/text/widthLabel}">
 									</Label>
 									<Input id="sapUiRtaAddIFrameDialog_WidthInput" class="sapUiRtaAddIFrameDialogWidthInput"
-										value="{path: '/frameWidth/value', type: 'FloatType', constraints: {minimum: 1}}"
-										valueState="{/frameWidth/valueState}"/>
+										value="{path: 'dialogInfo>/frameWidth/value', type: 'FloatType', constraints: {minimum: 1}}"
+										valueState="{dialogInfo>/frameWidth/valueState}"/>
 									<Select
 										id="sapUiRtaAddIFrameDialog_WidthUnit"
 										class="sapUiRtaAddIFrameDialogWidthUnit"
 										ariaLabelledBy="sapUiRtaAddIFrameDialog_WidthUnitLabel"
-										selectedKey="{/frameWidthUnit/value}"
-										items="{/unitsOfWidthMeasure}"
+										selectedKey="{dialogInfo>/frameWidthUnit/value}"
+										items="{dialogInfo>/unitsOfWidthMeasure}"
 										showSecondaryValues= "true"
 										columnRatio="1:5"
 										width="auto"
 										maxWidth="400px">
-											<core:ListItem key="{unit}" text="{unit}" additionalText="{descriptionText}"/>
+											<core:ListItem key="{dialogInfo>unit}" text="{dialogInfo>unit}" additionalText="{dialogInfo>descriptionText}"/>
 									</Select>
 								</form:content>
 							</form:SimpleForm>
@@ -88,22 +88,22 @@
 							>
 								<form:content>
 									<Label id="sapUiRtaAddIFrameDialog_HeightLabel" class="sapUiRtaAddIFrameDialogHeightLabel" labelFor="sapUiRtaAddIFrameDialog_HeightInput"
-										text="{/text/heightLabel}"/>
+										text="{dialogInfo>/text/heightLabel}"/>
 									<Input id="sapUiRtaAddIFrameDialog_HeightInput" class="sapUiRtaAddIFrameDialogHeightInput"
-										value="{path: '/frameHeight/value', type: 'FloatType', constraints: {minimum: 1}}"
-										valueState="{/frameHeight/valueState}"/>
+										value="{path: 'dialogInfo>/frameHeight/value', type: 'FloatType', constraints: {minimum: 1}}"
+										valueState="{dialogInfo>/frameHeight/valueState}"/>
 									<Select
 										id="sapUiRtaAddIFrameDialog_HeightUnit"
 										class="sapUiRtaAddIFrameDialogHeightUnit"
 										ariaLabelledBy="sapUiRtaAddIFrameDialog_HeightUnitLabel"
-										selectedKey="{/frameHeightUnit/value}"
+										selectedKey="{dialogInfo>/frameHeightUnit/value}"
 										forceSelection="false"
-										items="{/unitsOfHeightMeasure}"
+										items="{dialogInfo>/unitsOfHeightMeasure}"
 										showSecondaryValues= "true"
 										columnRatio="1:5"
 										width="auto"
 										maxWidth="400px">
-											<core:ListItem key="{unit}" text="{= ${unit} === 'vh' ? '%' : ${unit}}" additionalText="{descriptionText}"/>
+											<core:ListItem key="{dialogInfo>unit}" text="{= ${dialogInfo>unit} === 'vh' ? '%' : ${dialogInfo>unit}}" additionalText="{dialogInfo>descriptionText}"/>
 									</Select>
 								</form:content>
 							</form:SimpleForm>
@@ -116,7 +116,7 @@
 						containerQuery="true"
 						position="Right"
 						defaultSpan="XL12 L12 M12 S12">
-					<Text id="sapUiRtaAddIFrameDialog_PercentText" text="{/text/percentUseLabel}" class="sapUiRtaAddIFrameDialogPercentText"/>
+					<Text id="sapUiRtaAddIFrameDialog_PercentText" text="{dialogInfo>/text/percentUseLabel}" class="sapUiRtaAddIFrameDialogPercentText"/>
 				</layout:Grid>
 				<layout:Grid
 						id="sapUiRtaAddIFrameDialog_EditGrid"
@@ -125,7 +125,7 @@
 						defaultSpan="XL6 L6 M6 S12">
 					<VBox id="sapUiRtaAddIFrameDialog_Parameters" class="sapUiRtaAddIFrameDialogParameters" renderType="Bare">
 						<items>
-							<Label id="sapUiRtaAddIFrameDialog_ParametersLabel" text="{/text/parametersLabel}" labelFor="sapUiRtaAddIFrameDialog_ParameterTable"
+							<Label id="sapUiRtaAddIFrameDialog_ParametersLabel" text="{dialogInfo>/text/parametersLabel}" labelFor="sapUiRtaAddIFrameDialog_ParameterTable"
 								   class="sapUiRtaAddIFrameDialogParametersLabel" design="Bold"/>
 							<SearchField
 								id="sapUiRtaAddIFrameDialog_ParametersSearch"
@@ -135,25 +135,25 @@
 								showSearchButton="false"
 							/>
 							<ScrollContainer height="12rem" vertical="true" >
-								<Table id="sapUiRtaAddIFrameDialog_ParameterTable" items="{/parameters/value}" ariaLabelledBy="sapUiRtaAddIFrameDialog_ParametersLabel"
+								<Table id="sapUiRtaAddIFrameDialog_ParameterTable" items="{dialogInfo>/parameters/value}" ariaLabelledBy="sapUiRtaAddIFrameDialog_ParametersLabel"
 									   class="sapUiSizeCompact sapUiRtaAddIFrameDialogParameterTable" sticky="ColumnHeaders">
 									<columns>
 										<Column>
 											<header>
-												<Label id="sapUiRtaAddIFrameDialog_ParameterLabel" class="sapUiRtaAddIFrameDialogParameterLabel" text="{/text/columnParameterLabel}"/>
+												<Label id="sapUiRtaAddIFrameDialog_ParameterLabel" class="sapUiRtaAddIFrameDialogParameterLabel" text="{dialogInfo>/text/columnParameterLabel}"/>
 											</header>
 										</Column>
 										<Column>
 											<header>
-												<Label id="sapUiRtaAddIFrameDialog_ValueLabel" class="sapUiRtaAddIFrameDialog_ValueLabel" text="{/text/columnUiValueLabel}"/>
+												<Label id="sapUiRtaAddIFrameDialog_ValueLabel" class="sapUiRtaAddIFrameDialog_ValueLabel" text="{dialogInfo>/text/columnUiValueLabel}"/>
 											</header>
 										</Column>
 									</columns>
 									<items>
 										<ColumnListItem type="Active" press="onParameterPress">
 											<cells>
-												<Text text="{label}"/>
-												<Text text="{value}" wrapping="false"/>
+												<Text text="{dialogInfo>label}"/>
+												<Text text="{dialogInfo>value}" wrapping="false"/>
 											</cells>
 										</ColumnListItem>
 									</items>
@@ -164,10 +164,19 @@
 					<VBox id="sapUiRtaAddIFrameDialog_EditUrl" class="sapUiRtaAddIFrameDialogEditUrl" renderType="Bare">
 						<items>
 							<Label id="sapUiRtaAddIFrameDialog_EditUrlLabel" labelFor="sapUiRtaAddIFrameDialog_EditUrlTA"
-								   class="sapUiRtaAddIFrameDialogEditUrlLabel" text="{/text/editUrlLabel}" design="Bold" />
-							<TextArea id="sapUiRtaAddIFrameDialog_EditUrlTA" ariaLabelledBy="sapUiRtaAddIFrameDialog_EditUrlLabel"
-									  class="sapUiRtaAddIFrameDialog_EditUrlTA"
-									  valueLiveUpdate="true" value="{/frameUrl/value}" liveChange="onUrlChange" rows="11" width="100%" />
+								   class="sapUiRtaAddIFrameDialogEditUrlLabel" text="{dialogInfo>/text/editUrlLabel}" design="Bold" />
+							<TextArea
+								id="sapUiRtaAddIFrameDialog_EditUrlTA"
+								fieldGroupIds = "sapUiRtaAddIFrameDialog_EditUrlTA"
+								ariaLabelledBy="sapUiRtaAddIFrameDialog_EditUrlLabel"
+								class="sapUiRtaAddIFrameDialog_EditUrlTA"
+								valueLiveUpdate="true"
+								value="{dialogInfo>/frameUrl/value}"
+								valueState="{= !!${dialogInfo>/frameUrlError/value} ? 'Error' : 'None'}"
+								valueStateText="{dialogInfo>/frameUrlError/value}"
+								validateFieldGroup="onValidateUrl"
+								rows="11"
+								width="100%" />
 						</items>
 					</VBox>
 				</layout:Grid>
@@ -178,7 +187,7 @@
 						defaultSpan="XL12 L12 M12 S12">
 					<FormattedText
 							id="sapUiRtaAddIFrameDialog_DocumentationLink"
-							htmlText="{/documentationLink/HTML}" class="sapUiRtaAddIFrameDialogDocumentationLink"/>
+							htmlText="{dialogInfo>/documentationLink/HTML}" class="sapUiRtaAddIFrameDialogDocumentationLink"/>
 				</layout:Grid>
 				<layout:Grid
 					id="sapUiRtaAddIFrameDialog_PreviewLinkGrid"
@@ -195,21 +204,22 @@
 								<Title
 									id="sapUiRtaAddIFrameDialog_PreviewLinkTitle"
 									class="sapUiRtaAddIFrameDialogPreviewLinkTitle"
-									text="{/text/previewUrlLabel}" />
+									text="{dialogInfo>/text/previewUrlLabel}" />
 								<ToolbarSpacer />
 								<Button
 									id="sapUiRtaAddIFrameDialog_PreviewButton"
-									enabled="{=${/previewUrl/value} !== ${/frameUrl/value} || ${/previewUseLegacyNavigation/value} !== ${/useLegacyNavigation/value}}"
-									text="{=${/previewUrl/value} === '' ? ${/text/showPreviewButton} : ${/text/updatePreviewButton} }"
+									enabled="{= !${dialogInfo>/frameUrlError/value} &amp;&amp; ${dialogInfo>/previousFrameUrl/value} !== ${dialogInfo>/frameUrl/value} || ${dialogInfo>/previewUseLegacyNavigation/value} !== ${dialogInfo>/useLegacyNavigation/value}}"
+									text="{=${dialogInfo>/previewUrl/value} === '' ? ${dialogInfo>/text/showPreviewButton} : ${dialogInfo>/text/updatePreviewButton} }"
 									press="onShowPreview"
 									class="sapUiTinyMarginTop sapUiRtaAddIFrameDialogPreviewButton" />
 							</OverflowToolbar>
 						</headerToolbar>
 						<content>
+							<Label visible="false" id="sapUiRtaAddIFrameDialog_PreviewLinkResolver"/>
 							<Link
 								id="sapUiRtaAddIFrameDialog_PreviewLink"
 								class="sapUiRtaAddIFrameDialogPreviewLink"
-								href="{/previewUrl/value}" text="{/previewUrl/value}" wrapping="true" visible="{= !!${/previewUrl/value} }" />
+								href="{dialogInfo>/previewUrl/value}" text="{dialogInfo>/previewUrl/value}" wrapping="true" visible="{= !!${dialogInfo>/previewUrl/value} }" />
 						</content>
 					</Panel>
 				</layout:Grid>
@@ -229,14 +239,14 @@
 							<Label
 								id="sapUiRtaAddIFrameDialog_NoPreviewLabel"
 								class="sapUiRtaAddIFrameDialogNoPreviewLabel" wrapping="true"
-								text="{/text/previewUrlMessage}" textAlign="Center" visible="{= !${/previewUrl/value} }" />
+								text="{dialogInfo>/text/previewUrlMessage}" textAlign="Center" visible="{= !${dialogInfo>/previewUrl/value} }" />
 							<util:IFrame
 									id="sapUiRtaAddIFrameDialog_PreviewFrame"
 									height="100%"
-									title="{/text/previewFrameLabel}"
-									useLegacyNavigation="{/previewUseLegacyNavigation/value/}"
+									title="{dialogInfo>/text/previewFrameLabel}"
+									useLegacyNavigation="{dialogInfo>/previewUseLegacyNavigation/value/}"
 									class="sapUiRtaAddIFrameDialogPreviewFrame"
-									visible="{= !!${/previewUrl/value} }"/>
+									visible="{= !!${dialogInfo>/previewUrl/value} }"/>
 						</items>
 					</VBox>
 				</layout:Grid>
@@ -254,7 +264,7 @@
 									class="sapUiRtaAddIFrameDialogPreviewLinkToolbar" height="3rem" style="Clear">
 								<Title
 									class="sapUiRtaAddIFrameDialogPreviewLinkTitle"
-									text="{/text/advancedSettingsTitle}" />
+									text="{dialogInfo>/text/advancedSettingsTitle}" />
 								<ToolbarSpacer />
 							</OverflowToolbar>
 						</headerToolbar>
@@ -266,9 +276,9 @@
 									id="sapUiRtaAddIFrameDialog_UseLegacyNavigationToggle"
 									customTextOn=" "
 									customTextOff=" "
-									state="{/useLegacyNavigation/value}" />
+									state="{dialogInfo>/useLegacyNavigation/value}" />
 								<Label
-									text="{/text/useLegacyNavigationLabel}" />
+									text="{dialogInfo>/text/useLegacyNavigationLabel}" />
 								<Button
 									icon="sap-icon://hint"
 									type="Transparent"
@@ -281,9 +291,9 @@
 			</layout:VerticalLayout>
 
 			<!-- Invisible Texts for ARIA -->
-			<core:InvisibleText id="sapUiRtaAddIFrameDialog_WidthUnitLabel" text="{/text/widthUnitLabel}"/>
-			<core:InvisibleText id="sapUiRtaAddIFrameDialog_HeightUnitLabel" text="{/text/heightUnitLabel}"/>
-			<core:InvisibleText id="sapUiRtaAddIFrameDialog_ParameterSearchLabel" text="{/text/parameterSearchLabel}"/>
+			<core:InvisibleText id="sapUiRtaAddIFrameDialog_WidthUnitLabel" text="{dialogInfo>/text/widthUnitLabel}"/>
+			<core:InvisibleText id="sapUiRtaAddIFrameDialog_HeightUnitLabel" text="{dialogInfo>/text/heightUnitLabel}"/>
+			<core:InvisibleText id="sapUiRtaAddIFrameDialog_ParameterSearchLabel" text="{dialogInfo>/text/parameterSearchLabel}"/>
 		</content>
 
 		<beginButton>
@@ -291,9 +301,9 @@
 				id="sapUiRtaAddIFrameDialogSaveButton"
 				class="sapUiRtaAddIFrameDialogSaveButton"
 				type="Emphasized"
-				text="{/text/saveText}"
+				text="{dialogInfo>/text/saveText}"
 				press="onSavePress"
-				enabled="{= !!${/frameUrl/value} }"
+				enabled="{=!!${dialogInfo>/frameUrl/value} &amp;&amp; !${dialogInfo>/frameUrlError/value}}"
 			/>
 		</beginButton>
 		<endButton>
@@ -301,7 +311,7 @@
 				id="sapUiRtaAddIFrameDialogCancelButton"
 				class="sapUiRtaAddIFrameDialogCancelButton"
 				type="Transparent"
-				text="{/text/cancelText}"
+				text="{dialogInfo>/text/cancelText}"
 				press="onCancelPress"
 			/>
 		</endButton>

package/src/sap/ui/rta/plugin/iframe/AddIFrameDialog.js

@@ -104,6 +104,12 @@ sap.ui.define([
 				value: "",
 				valueState: ValueState.None
 			},
+			previousFrameUrl: {
+				value: ""
+			},
+			frameUrlError: {
+				value: undefined
+			},
 			previewUrl: { value: "" },
 			documentationLink: {
 				HTML: _sDocumentationHTML
@@ -144,7 +150,7 @@ sap.ui.define([
 	 * @class Context - Dialog for IFrame settings in Runtime Authoring
 	 * @extends sap.ui.base.ManagedObject
 	 * @author SAP SE
-	 * @version 1.120.6
+	 * @version 1.121.0
 	 * @constructor
 	 * @private
 	 * @since 1.78
@@ -162,24 +168,26 @@ sap.ui.define([
 	/**
 	 * Open the Add IFrame Dialog
 	 *
-	 * @param {object|undefined} mSettings - existing IFrame settings
-	 * @returns {Promise} promise resolving to IFrame settings
+	 * @param {object|undefined} mSettings - Existing IFrame settings
+	 * @param {sap.ui.core.Control} oReferenceControl - Control to take the default model from
+	 * @returns {Promise} Promise resolving to IFrame settings
 	 * @public
 	 */
-	AddIFrameDialog.prototype.open = function(mSettings) {
+	AddIFrameDialog.prototype.open = function(mSettings, oReferenceControl) {
 		return new Promise(function(resolve) {
 			this._fnResolve = resolve;
-			this._createDialog(mSettings);
+			this._createDialog(mSettings, oReferenceControl);
 		}.bind(this));
 	};
 
 	/**
 	 * Create the Add IFrame Dialog
 	 *
-	 * @param {object|undefined} mSettings - existing IFrame settings
+	 * @param {object|undefined} mSettings - Existing IFrame settings
+	 * @param {sap.ui.core.Control} oReferenceControl - Control to take the default model from
 	 * @private
 	 */
-	AddIFrameDialog.prototype._createDialog = function(mSettings) {
+	AddIFrameDialog.prototype._createDialog = function(mSettings, oReferenceControl) {
 		this._oJSONModel = createJSONModel(
 			!!mSettings?.updateMode,
 			!!mSettings?.asContainer,
@@ -194,7 +202,9 @@ sap.ui.define([
 		}).then(function(oAddIFrameDialog) {
 			this._oDialog = oAddIFrameDialog;
 			this._oDialog.addStyleClass(RtaUtils.getRtaStyleClassName());
-			this._oDialog.setModel(this._oJSONModel);
+			this._oDialog.setModel(this._oJSONModel, "dialogInfo");
+			this._oDialog.setModel(oReferenceControl.getModel());
+			this._oDialog.setBindingContext(oReferenceControl.getBindingContext());
 			this._openDialog();
 		}.bind(this)).catch(function(oError) {
 			Log.error("Error loading fragment sap.ui.rta.plugin.iframe.AddIFrameDialog: ", oError);
@@ -209,6 +219,9 @@ sap.ui.define([
 	AddIFrameDialog.prototype._openDialog = function() {
 		this._oDialog.attachAfterOpen(function() {
 			this._disablePanelExpand();
+			const oIframe = Element.getElementById("sapUiRtaAddIFrameDialog_PreviewFrame");
+			const oUserModel = oIframe.getModel("$user");
+			this._oDialog.setModel(oUserModel, "$user");
 			this.fireOpened();
 		}.bind(this));
 

package/src/sap/ui/rta/plugin/iframe/AddIFrameDialogController.js

@@ -9,9 +9,9 @@ sap.ui.define([
 	"sap/m/Text",
 	"sap/ui/core/mvc/Controller",
 	"sap/ui/core/Element",
+	"sap/ui/core/Lib",
 	"sap/ui/core/library",
 	"sap/ui/rta/util/validateText",
-	"sap/ui/rta/Utils",
 	"sap/ui/fl/util/IFrame",
 	"sap/ui/model/Filter",
 	"sap/ui/model/FilterOperator",
@@ -22,9 +22,9 @@ sap.ui.define([
 	Text,
 	Controller,
 	Element,
+	Lib,
 	coreLibrary,
 	validateText,
-	Utils,
 	IFrame,
 	Filter,
 	FilterOperator,
@@ -35,11 +35,22 @@ sap.ui.define([
 	// shortcut for sap.ui.core.ValueState
 	var {ValueState} = coreLibrary;
 
+	const _oTextResources = Lib.getResourceBundleFor("sap.ui.rta");
+
 	var _aTextInputFields = ["frameUrl", "title"];
 	var _aNumericInputFields = ["frameWidth", "frameHeight"];
 	var _aOtherInputFields = ["frameWidthUnit", "frameHeightUnit", "useLegacyNavigation"];
 
 	function isValidUrl(sUrl) {
+		if (
+			typeof sUrl !== "string"
+			|| sUrl.trim() === ""
+		) {
+			return {
+				result: false,
+				error: IFrame.VALIDATION_ERROR.INVALID_URL
+			};
+		}
 		return IFrame.isValidUrl(encodeURI(sUrl));
 	}
 
@@ -48,7 +59,6 @@ sap.ui.define([
 		constructor: function(oJSONModel, mSettings) {
 			this._oJSONModel = oJSONModel;
 			this._importSettings(mSettings);
-			this._mParameterHashMap = this._buildParameterHashMap(mSettings);
 		},
 
 		/**
@@ -75,8 +85,8 @@ sap.ui.define([
 		 * Event handler for save button
 		 */
 		onSavePress() {
-			var sUrl = this._buildPreviewURL(this._buildReturnedURL());
-			if (isValidUrl(sUrl) && this._areAllTextFieldsValid() && this._areAllValueStateNones()) {
+			const sUrl = this._buildPreviewURL();
+			if (isValidUrl(sUrl).result && this._areAllTextFieldsValid() && this._areAllValueStateNones()) {
 				this._close(this._buildReturnedSettings());
 			} else {
 				this._setFocusOnInvalidInput();
@@ -88,14 +98,15 @@ sap.ui.define([
 		 * @param {sap.ui.base.Event} oEvent - Event
 		 */
 		onShowPreview() {
-			var sURL = this._buildPreviewURL(this._buildReturnedURL());
-			if (!isValidUrl(sURL)) {
+			const sReturnedURL = this._buildReturnedURL();
+			const sURL = this._buildPreviewURL();
+			if (!isValidUrl(sURL).result) {
 				return;
 			}
-			var oIFrame = Element.getElementById("sapUiRtaAddIFrameDialog_PreviewFrame");
+			const oIFrame = Element.getElementById("sapUiRtaAddIFrameDialog_PreviewFrame");
 			// enable/disable expanding the Panel
-			var oPanel = Element.getElementById("sapUiRtaAddIFrameDialog_PreviewLinkPanel");
-			var oPanelButton = oPanel.getDependents()[0];
+			const oPanel = Element.getElementById("sapUiRtaAddIFrameDialog_PreviewLinkPanel");
+			const oPanelButton = oPanel.getDependents()[0];
 			if (sURL) {
 				oPanelButton.setEnabled(true);
 			} else {
@@ -104,11 +115,12 @@ sap.ui.define([
 			}
 			try {
 				this._oJSONModel.setProperty("/previewUrl/value", sURL);
+				this._oJSONModel.setProperty("/previousFrameUrl/value", sReturnedURL);
 				this._oJSONModel.setProperty(
 					"/previewUseLegacyNavigation/value",
 					this._oJSONModel.getProperty("/useLegacyNavigation/value")
 				);
-				oIFrame.setUrl(sURL);
+				oIFrame.applySettings({ url: sURL });
 			} catch (oError) {
 				Log.error("Error previewing the URL: ", oError);
 			}
@@ -119,9 +131,9 @@ sap.ui.define([
 		 * @param {sap.ui.base.Event} oEvent - Event
 		 */
 		onParameterPress(oEvent) {
-			var sKey = oEvent.getSource().getBindingContext().getObject().key;
+			const sKey = oEvent.getSource().getBindingContext("dialogInfo").getObject().key;
 			this._oJSONModel.setProperty("/frameUrl/value", this._addURLParameter(sKey));
-			this.onUrlChange();
+			this.onValidateUrl();
 		},
 
 		/**
@@ -156,15 +168,20 @@ sap.ui.define([
 
 		/**
 		 * Build preview URL
-		 *
-		 * @param {string} sEditURL - URL with parameters in braces
-		 * @returns {string} URL with parameters and values
+		 * @returns {string} URL with resolved bindings
 		 * @private
 		 */
-		_buildPreviewURL(sEditURL) {
-			return sEditURL.replace(/{(.*?)}/g, function(sMatch) {
-				return this._mParameterHashMap[sMatch];
-			}.bind(this));
+		_buildPreviewURL() {
+			const sUrl = this._buildReturnedURL();
+			const oResolver = Element.getElementById("sapUiRtaAddIFrameDialog_PreviewLinkResolver");
+			try {
+				oResolver.applySettings({
+					text: sUrl
+				});
+			} catch (err) {
+				return undefined;
+			}
+			return oResolver.getText();
 		},
 
 		/**
@@ -175,7 +192,11 @@ sap.ui.define([
 		 * @private
 		 */
 		_addURLParameter(sParameter) {
-			return this._buildReturnedURL() + sParameter;
+			const oTextField = Element.getElementById("sapUiRtaAddIFrameDialog_EditUrlTA");
+			const iCurrentSelectionStart = oTextField.getFocusDomRef().selectionStart;
+			const iCurrentSelectionEnd = oTextField.getFocusDomRef().selectionEnd;
+			const sCurrentUrl = this._buildReturnedURL();
+			return `${sCurrentUrl.substring(0, iCurrentSelectionStart)}${sParameter}${sCurrentUrl.substring(iCurrentSelectionEnd)}`;
 		},
 
 		/**
@@ -188,28 +209,21 @@ sap.ui.define([
 			return urlCleaner(this._oJSONModel.getProperty("/frameUrl/value"));
 		},
 
-		onUrlChange() {
-			var sUrl = this._buildPreviewURL(this._buildReturnedURL());
-			var oUrlInput = Element.getElementById("sapUiRtaAddIFrameDialog_EditUrlTA");
-			if (isValidUrl(sUrl)) {
-				oUrlInput.setValueState("None");
+		onValidateUrl() {
+			const sUrl = this._buildPreviewURL();
+			const { result: bResult, error: sError } = isValidUrl(sUrl);
+			if (bResult) {
+				this._oJSONModel.setProperty("/frameUrlError/value", "");
 			} else {
-				oUrlInput.setValueState("Error");
-			}
-		},
-
-		/**
-		 * Build hashmap for parameters
-		 *
-		 * @param {object} mParameters - URL parameters
-		 * @returns {object} Parameter hashmap
-		 * @private
-		 */
-		_buildParameterHashMap(mParameters) {
-			if (mParameters && mParameters.parameters) {
-				return Utils.buildHashMapFromArray(mParameters.parameters, "key", "value");
+				const sErrorKey = {
+					[IFrame.VALIDATION_ERROR.UNSAFE_PROTOCOL]: "IFRAME_ADDIFRAME_ERROR_UNSAFE_PROTOCOL",
+					[IFrame.VALIDATION_ERROR.MIXED_CONTENT]: "IFRAME_ADDIFRAME_ERROR_MIXED_CONTENT",
+					[IFrame.VALIDATION_ERROR.FORBIDDEN_URL]: "IFRAME_ADDIFRAME_ERROR_FORBIDDEN_URL",
+					[IFrame.VALIDATION_ERROR.INVALID_URL]: "IFRAME_ADDIFRAME_ERROR_INVALID_URL"
+				}[sError];
+				const sErrorText = _oTextResources.getText(sErrorKey);
+				this._oJSONModel.setProperty("/frameUrlError/value", sErrorText);
 			}
-			return {};
 		},
 
 		/**
@@ -353,6 +367,7 @@ sap.ui.define([
 					oElement.focus();
 					return true;
 				}
+				return false;
 			}, this);
 		}
 	});

package/src/sap/ui/rta/service/Action.js

@@ -24,7 +24,7 @@ sap.ui.define([
 	 * @name sap.ui.rta.service.Action
 	 * @author SAP SE
 	 * @since 1.58
-	 * @version 1.120.6
+	 * @version 1.121.0
 	 * @private
 	 * @ui5-restricted
 	 *

package/src/sap/ui/rta/service/ControllerExtension.js

@@ -32,7 +32,7 @@ sap.ui.define([
 	 * @name sap.ui.rta.service.ControllerExtension
 	 * @author SAP SE
 	 * @since 1.58
-	 * @version 1.120.6
+	 * @version 1.121.0
 	 * @private
 	 * @ui5-restricted
 	*/

package/src/sap/ui/rta/service/Outline.js

@@ -5,32 +5,32 @@
  */
 
 sap.ui.define([
-	"sap/ui/dt/OverlayRegistry",
-	"sap/ui/dt/ElementOverlay",
-	"sap/ui/dt/AggregationOverlay",
-	"sap/ui/dt/Util",
-	"sap/ui/fl/Utils",
-	"sap/ui/fl/write/api/ExtensionPointRegistryAPI",
+	"sap/base/Log",
 	"sap/base/util/deepEqual",
 	"sap/base/util/isEmptyObject",
 	"sap/base/util/merge",
 	"sap/base/util/restricted/_omit",
+	"sap/ui/dt/AggregationOverlay",
+	"sap/ui/dt/ElementOverlay",
+	"sap/ui/dt/OverlayRegistry",
+	"sap/ui/dt/Util",
+	"sap/ui/fl/apply/api/ExtensionPointRegistryAPI",
+	"sap/ui/fl/Utils",
 	"sap/ui/core/mvc/View",
-	"sap/base/Log",
 	"sap/ui/base/DesignTime"
 ], function(
-	OverlayRegistry,
-	ElementOverlay,
-	AggregationOverlay,
-	DtUtil,
-	FlUtils,
-	ExtensionPointRegistryAPI,
+	Log,
 	deepEqual,
 	isEmptyObject,
 	merge,
 	_omit,
+	AggregationOverlay,
+	ElementOverlay,
+	OverlayRegistry,
+	DtUtil,
+	ExtensionPointRegistryAPI,
+	FlUtils,
 	View,
-	Log,
 	DesignTime
 ) {
 	"use strict";
@@ -43,7 +43,7 @@ sap.ui.define([
 	 * @name sap.ui.rta.service.Outline
 	 * @author SAP SE
 	 * @since 1.56
-	 * @version 1.120.6
+	 * @version 1.121.0
 	 * @private
 	 * @ui5-restricted
 	 */
@@ -202,6 +202,7 @@ sap.ui.define([
 			} else if (oData.bIsView) {
 				return this._attachNotConsideredExtensionPoints(oOverlay, oData);
 			}
+			return undefined;
 		};
 
 		function getTemplateData(oChildOverlay, mTemplateData, mInnerTemplateData) {
@@ -324,7 +325,10 @@ sap.ui.define([
 			var oParentElementOverlay = oOverlay.getParentElementOverlay();
 			return oParentElementOverlay
 				&& sParentAggregationName
-				&& oParentElementOverlay.getAggregationOverlay(sParentAggregationName, "AggregationBindingTemplateOverlays") === oParentAggregationOverlay;
+				&& oParentElementOverlay.getAggregationOverlay(
+					sParentAggregationName,
+					"AggregationBindingTemplateOverlays"
+				) === oParentAggregationOverlay;
 		}
 
 		function getElementOverlayData(oOverlay, oElement, oDtMetadata) {
@@ -628,8 +632,8 @@ sap.ui.define([
 			exports: {
 				/**
 				 * Returns an outline model data associated with the key user adaptation instance, starting from the passed control.
-				 * If no control is passed, the root control(s) of the respective key user adaptation instance is taken as the initial control.
-				 * Throws an error if the control ID parameter is not a valid control with a stable ID.
+				 * If no control is passed, the root control(s) of the respective key user adaptation instance is taken as the initial
+				 * control. Throws an error if the control ID parameter is not a valid control with a stable ID.
 				 *
 				 * @method sap.ui.rta.service.Outline.get
 				 * @param {string} [sId] - ID of the control to start with. If omitted the root control(s) is used.