@sapui5/sap.fe.core 1.102.2 → 1.104.1

package/src/sap/fe/core/controllerextensions/ViewState.ts

@@ -4,9 +4,9 @@ import CommonUtils from "sap/fe/core/CommonUtils";
 import { defineUI5Class, extensible, finalExtension, privateExtension, publicExtension } from "sap/fe/core/helpers/ClassSupport";
 import KeepAliveHelper from "sap/fe/core/helpers/KeepAliveHelper";
 import ModelHelper from "sap/fe/core/helpers/ModelHelper";
-import PageController from "sap/fe/core/PageController";
+import type PageController from "sap/fe/core/PageController";
 import NavLibrary from "sap/fe/navigation/library";
-import ManagedObject from "sap/ui/base/ManagedObject";
+import type ManagedObject from "sap/ui/base/ManagedObject";
 import ControllerExtension from "sap/ui/core/mvc/ControllerExtension";
 import OverrideExecution from "sap/ui/core/mvc/OverrideExecution";
 import ControlVariantApplyAPI from "sap/ui/fl/apply/api/ControlVariantApplyAPI";
@@ -108,7 +108,7 @@ const _mControlStateHandlerMap: Record<string, any> = {
 					}
 				}
 			} else {
-				Log.info("Table: " + oTable.getId() + " was not refreshed. No binding found!");
+				Log.info(`Table: ${oTable.getId()} was not refreshed. No binding found!`);
 			}
 		}
 	},
@@ -129,7 +129,9 @@ const _mControlStateHandlerMap: Record<string, any> = {
 			};
 		},
 		apply: function (oOPLayout: any, oControlState: any) {
-			oControlState && oOPLayout.setSelectedSection(oControlState.selectedSection);
+			if (oControlState) {
+				oOPLayout.setSelectedSection(oControlState.selectedSection);
+			}
 		},
 		refreshBinding: function (oOPLayout: any) {
 			const oBindingContext = oOPLayout.getBindingContext();
@@ -160,7 +162,7 @@ const _mControlStateHandlerMap: Record<string, any> = {
 					oBinding.refresh();
 				}
 			} else {
-				Log.info("ObjectPage: " + oOPLayout.getId() + " was not refreshed. No binding found!");
+				Log.info(`ObjectPage: ${oOPLayout.getId()} was not refreshed. No binding found!`);
 			}
 		}
 	},
@@ -171,7 +173,9 @@ const _mControlStateHandlerMap: Record<string, any> = {
 			};
 		},
 		apply: function (oQuickFilter: any, oControlState: any) {
-			oControlState && oQuickFilter.setSelectorKey(oControlState.selectedKey);
+			if (oControlState) {
+				oQuickFilter.setSelectorKey(oControlState.selectedKey);
+			}
 		}
 	},
 	"sap.m.SegmentedButton": {
@@ -181,7 +185,9 @@ const _mControlStateHandlerMap: Record<string, any> = {
 			};
 		},
 		apply: function (oSegmentedButton: any, oControlState: any) {
-			oControlState && oSegmentedButton.setSelectedKey(oControlState.selectedKey);
+			if (oControlState) {
+				oSegmentedButton.setSelectedKey(oControlState.selectedKey);
+			}
 		}
 	},
 	"sap.m.Select": {
@@ -191,7 +197,9 @@ const _mControlStateHandlerMap: Record<string, any> = {
 			};
 		},
 		apply: function (oSelect: any, oControlState: any) {
-			oControlState && oSelect.setSelectedKey(oControlState.selectedKey);
+			if (oControlState) {
+				oSelect.setSelectedKey(oControlState.selectedKey);
+			}
 		}
 	},
 	"sap.f.DynamicPage": {
@@ -201,7 +209,9 @@ const _mControlStateHandlerMap: Record<string, any> = {
 			};
 		},
 		apply: function (oDynamicPage: any, oControlState: any) {
-			oControlState && oDynamicPage.setHeaderExpanded(oControlState.headerExpanded);
+			if (oControlState) {
+				oDynamicPage.setHeaderExpanded(oControlState.headerExpanded);
+			}
 		}
 	},
 	"sap.ui.core.mvc.View": {
@@ -270,25 +280,25 @@ class ViewState extends ControllerExtension {
 
 	@publicExtension()
 	@finalExtension()
-	refreshViewBindings() {
-		return this.collectResults(this.base.viewState.adaptBindingRefreshControls).then((aControls: any) => {
-			let oPromiseChain = Promise.resolve();
-			aControls
-				.filter((oControl: any) => {
-					return oControl && oControl.isA && oControl.isA("sap.ui.base.ManagedObject");
-				})
-				.forEach((oControl: any) => {
-					oPromiseChain = oPromiseChain.then(this.refreshControlBinding.bind(this, oControl));
-				});
-			return oPromiseChain;
-		});
+	async refreshViewBindings() {
+		const aControls = await this.collectResults(this.base.viewState.adaptBindingRefreshControls);
+		let oPromiseChain = Promise.resolve();
+		aControls
+			.filter((oControl: any) => {
+				return oControl && oControl.isA && oControl.isA("sap.ui.base.ManagedObject");
+			})
+			.forEach((oControl: any) => {
+				oPromiseChain = oPromiseChain.then(this.refreshControlBinding.bind(this, oControl));
+			});
+		return oPromiseChain;
 	}
 	/**
 	 * This function should add all controls relevant for refreshing to the provided control array.
 	 *
 	 * This function is meant to be individually overridden by consuming controllers, but not to be called directly.
 	 * The override execution is: {@link sap.ui.core.mvc.OverrideExecution.After}.
-	 * @param {Array<sap.ui.base.ManagedObject>} aCollectedControls The collected controls
+	 *
+	 * @param aCollectedControls The collected controls
 	 * @alias sap.fe.core.controllerextensions.ViewState#adaptBindingRefreshControls
 	 * @protected
 	 */
@@ -305,7 +315,7 @@ class ViewState extends ControllerExtension {
 		const oControlRefreshBindingHandler = this.getControlRefreshBindingHandler(oControl);
 		let oPromiseChain = Promise.resolve();
 		if (typeof oControlRefreshBindingHandler.refreshBinding !== "function") {
-			Log.info("refreshBinding handler for control: " + oControl.getMetadata().getName() + " is not provided");
+			Log.info(`refreshBinding handler for control: ${oControl.getMetadata().getName()} is not provided`);
 		} else {
 			oPromiseChain = oPromiseChain.then(oControlRefreshBindingHandler.refreshBinding.bind(this, oControl));
 		}
@@ -343,9 +353,8 @@ class ViewState extends ControllerExtension {
 	 * This function is meant to be individually overridden by consuming controllers, but not to be called directly.
 	 * The override execution is: {@link sap.ui.core.mvc.OverrideExecution.After}.
 	 *
-	 * @param {sap.ui.base.ManagedObject} oControl The control for which the refresh handler is adapted.
-	 * @param {Array<object>} oControlHandler A plain object which can have one function: <code>refreshBinding</code>
-	 *
+	 * @param oControl The control for which the refresh handler is adapted.
+	 * @param oControlHandler A plain object which can have one function: <code>refreshBinding</code>
 	 * @alias sap.fe.core.controllerextensions.ViewState#adaptBindingRefreshHandler
 	 * @protected
 	 */
@@ -392,9 +401,9 @@ class ViewState extends ControllerExtension {
 	 * Helper function to enable multi override. It is adding an additional parameter (array) to the provided
 	 * function (and its parameters), that will be evaluated via <code>Promise.all</code>.
 	 *
-	 * @param {Function} fnCall The function to be called
+	 * @param fnCall The function to be called
 	 * @param args
-	 * @returns {Promise} A promise to be resolved with the result of all overrides
+	 * @returns A promise to be resolved with the result of all overrides
 	 */
 	@privateExtension()
 	@finalExtension()
@@ -411,9 +420,8 @@ class ViewState extends ControllerExtension {
 	 * This function is meant to be individually overridden by consuming controllers, but not to be called directly.
 	 * The override execution is: {@link sap.ui.core.mvc.OverrideExecution.After}.
 	 *
-	 * @param {sap.ui.base.ManagedObject} oControl The control to get state handler for
-	 * @param {Array<object>} aControlHandler A list of plain objects with two functions: <code>retrieve</code> and <code>apply</code>
-	 *
+	 * @param oControl The control to get state handler for
+	 * @param aControlHandler A list of plain objects with two functions: <code>retrieve</code> and <code>apply</code>
 	 * @alias sap.fe.core.controllerextensions.ViewState#adaptControlStateHandler
 	 * @protected
 	 */
@@ -427,8 +435,8 @@ class ViewState extends ControllerExtension {
 	/**
 	 * Returns a map of <code>retrieve</code> and <code>apply</code> functions for a certain control.
 	 *
-	 * @param {sap.ui.base.ManagedObject} oControl The control to get state handler for
-	 * @returns {object} A plain object with two functions: <code>retrieve</code> and <code>apply</code>
+	 * @param oControl The control to get state handler for
+	 * @returns A plain object with two functions: <code>retrieve</code> and <code>apply</code>
 	 */
 	@privateExtension()
 	@finalExtension()
@@ -453,7 +461,8 @@ class ViewState extends ControllerExtension {
 	 *
 	 * This function is meant to be individually overridden by consuming controllers, but not to be called directly.
 	 * The override execution is: {@link sap.ui.core.mvc.OverrideExecution.After}.
-	 * @param {Array<sap.ui.base.ManagedObject>} aCollectedControls The collected controls
+	 *
+	 * @param aCollectedControls The collected controls
 	 * @alias sap.fe.core.controllerextensions.ViewState#adaptStateControls
 	 * @protected
 	 */
@@ -467,8 +476,8 @@ class ViewState extends ControllerExtension {
 	/**
 	 * Returns the key to be used for given control.
 	 *
-	 * @param {sap.ui.base.ManagedObject} oControl The control to get state key for
-	 * @returns {string} The key to be used for storing the controls state
+	 * @param oControl The control to get state key for
+	 * @returns The key to be used for storing the controls state
 	 */
 	@publicExtension()
 	@finalExtension()
@@ -480,56 +489,47 @@ class ViewState extends ControllerExtension {
 	 * Retrieve the view state of this extensions view.
 	 * When this function is called more than once before finishing, all but the final response will resolve to <code>undefined</code>.
 	 *
-	 * @returns {Promise} A promise resolving the view state
-	 *
+	 * @returns A promise resolving the view state
 	 * @alias sap.fe.core.controllerextensions.ViewState#retrieveViewState
 	 * @public
 	 */
 	@publicExtension()
 	@finalExtension()
-	retrieveViewState() {
+	async retrieveViewState() {
 		++this._iRetrievingStateCounter;
-		return this._pInitialStateApplied
-			.then(() => {
-				return this.collectResults(this.base.viewState.adaptStateControls);
-			})
-			.then((aControls: any) => {
-				return Promise.all(
-					aControls
-						.filter(function (oControl: any) {
-							return oControl && oControl.isA && oControl.isA("sap.ui.base.ManagedObject");
-						})
-						.map((oControl: any) => {
-							return this.retrieveControlState(oControl).then((vResult: any) => {
-								return {
-									key: this.getStateKey(oControl),
-									value: vResult
-								};
-							});
-						})
-				);
-			})
-			.then(function (aResolvedStates: any) {
-				return aResolvedStates.reduce(function (oStates: any, mState: any) {
-					const oCurrentState: any = {};
-					oCurrentState[mState.key] = mState.value;
-					return mergeObjects(oStates, oCurrentState);
-				}, {});
-			})
-			.then((oViewState: any) => {
-				return Promise.resolve(this._retrieveAdditionalStates()).then(function (mAdditionalStates: any) {
-					if (mAdditionalStates && Object.keys(mAdditionalStates).length) {
-						oViewState[ADDITIONAL_STATES_KEY] = mAdditionalStates;
-					}
-					return oViewState;
-				});
-			})
-			.finally(() => {
-				--this._iRetrievingStateCounter;
-			})
-			.then((oViewState: any) => {
-				return this._iRetrievingStateCounter === 0 ? oViewState : undefined;
-			});
+		let oViewState: any;
+
+		try {
+			await this._pInitialStateApplied;
+			const aControls = await this.collectResults(this.base.viewState.adaptStateControls);
+			const aResolvedStates = await Promise.all(
+				aControls
+					.filter(function (oControl: any) {
+						return oControl && oControl.isA && oControl.isA("sap.ui.base.ManagedObject");
+					})
+					.map((oControl: any) => {
+						return this.retrieveControlState(oControl).then((vResult: any) => {
+							return {
+								key: this.getStateKey(oControl),
+								value: vResult
+							};
+						});
+					})
+			);
+			oViewState = aResolvedStates.reduce(function (oStates: any, mState: any) {
+				const oCurrentState: any = {};
+				oCurrentState[mState.key] = mState.value;
+				return mergeObjects(oStates, oCurrentState);
+			}, {});
+			const mAdditionalStates = await Promise.resolve(this._retrieveAdditionalStates());
+			if (mAdditionalStates && Object.keys(mAdditionalStates).length) {
+				oViewState[ADDITIONAL_STATES_KEY] = mAdditionalStates;
+			}
+		} finally {
+			--this._iRetrievingStateCounter;
+		}
+
+		return this._iRetrievingStateCounter === 0 ? oViewState : undefined;
 	}
 
 	/**
@@ -538,8 +538,7 @@ class ViewState extends ControllerExtension {
 	 * This function is meant to be individually overridden by consuming controllers, but not to be called directly.
 	 * The override execution is: {@link sap.ui.core.mvc.OverrideExecution.After}.
 	 *
-	 * @param {object} mAdditionalStates The additional state
-	 *
+	 * @param mAdditionalStates The additional state
 	 * @alias sap.fe.core.controllerextensions.ViewState#retrieveAdditionalStates
 	 * @protected
 	 */
@@ -553,7 +552,7 @@ class ViewState extends ControllerExtension {
 	/**
 	 * Returns a map of additional states (not control bound) to be added to the current view state of the given view.
 	 *
-	 * @returns {object | Promise<object>} Additional view states
+	 * @returns Additional view states
 	 */
 	_retrieveAdditionalStates() {
 		const mAdditionalStates = {};
@@ -564,8 +563,8 @@ class ViewState extends ControllerExtension {
 	/**
 	 * Returns the current state for the given control.
 	 *
-	 * @param {sap.ui.base.ManagedObject} oControl The object to get the state for
-	 * @returns {Promise<object>} The state for the given control
+	 * @param oControl The object to get the state for
+	 * @returns The state for the given control
 	 */
 	@privateExtension()
 	@finalExtension()
@@ -574,7 +573,7 @@ class ViewState extends ControllerExtension {
 		return Promise.all(
 			aControlStateHandlers.map((mControlStateHandler: any) => {
 				if (typeof mControlStateHandler.retrieve !== "function") {
-					throw new Error("controlStateHandler.retrieve is not a function for control: " + oControl.getMetadata().getName());
+					throw new Error(`controlStateHandler.retrieve is not a function for control: ${oControl.getMetadata().getName()}`);
 				}
 				return mControlStateHandler.retrieve.call(this, oControl);
 			})
@@ -594,9 +593,8 @@ class ViewState extends ControllerExtension {
 	 * Important:
 	 * You should only override this method for custom pages and not for the standard ListReportPage and ObjectPage!
 	 *
-	 * @returns {boolean} If <code>true</code>, only the initial view state is applied once,
+	 * @returns If <code>true</code>, only the initial view state is applied once,
 	 * else any new view state is also applied on follow-up calls (default)
-	 *
 	 * @alias sap.fe.core.controllerextensions.ViewState#applyInitialStateOnly
 	 * @protected
 	 */
@@ -608,21 +606,19 @@ class ViewState extends ControllerExtension {
 	/**
 	 * Applies the given view state to this extensions view.
 	 *
-	 * @param {object} oViewState The view state to apply (can be undefined)
-	 * @param {object} oNavParameter The current navigation parameter
-	 * @param {sap.fe.navigation.NavType} oNavParameter.navigationType The actual navigation type
-	 * @param {object} oNavParameter.selectionVariant The selectionVariant from the navigation
-	 * @param {object} oNavParameter.selectionVariantDefaults The selectionVariant defaults from the navigation
-	 * @param {boolean} oNavParameter.requiresStandardVariant Defines whether standard variant must be used in VM
-	 *
-	 * @returns {Promise} Promise for async state handling
-	 *
+	 * @param oViewState The view state to apply (can be undefined)
+	 * @param oNavParameter The current navigation parameter
+	 * @param oNavParameter.navigationType The actual navigation type
+	 * @param oNavParameter.selectionVariant The selectionVariant from the navigation
+	 * @param oNavParameter.selectionVariantDefaults The selectionVariant defaults from the navigation
+	 * @param oNavParameter.requiresStandardVariant Defines whether standard variant must be used in VM
+	 * @returns Promise for async state handling
 	 * @alias sap.fe.core.controllerextensions.ViewState#applyViewState
 	 * @public
 	 */
 	@publicExtension()
 	@finalExtension()
-	applyViewState(
+	async applyViewState(
 		oViewState: any,
 		oNavParameter: {
 			navigationType: any;
@@ -632,39 +628,40 @@ class ViewState extends ControllerExtension {
 		}
 	): Promise<any> {
 		if (this.base.viewState.applyInitialStateOnly() && this._getInitialStateApplied()) {
-			return Promise.resolve();
+			return;
 		}
-		return this.collectResults(this.base.viewState.onBeforeStateApplied)
-			.then(() => {
-				return this.collectResults(this.base.viewState.adaptStateControls);
-			})
-			.then((aControls: any) => {
-				let oPromiseChain = Promise.resolve();
-				aControls
-					.filter(function (oControl: any) {
-						return oControl && oControl.isA && oControl.isA("sap.ui.base.ManagedObject");
-					})
-					.forEach((oControl: any) => {
-						const sKey = this.getStateKey(oControl);
-						oPromiseChain = oPromiseChain.then(
-							this.applyControlState.bind(this, oControl, oViewState ? oViewState[sKey] : undefined, oNavParameter)
-						);
-					});
-				return oPromiseChain;
-			})
-			.then(() => {
-				if (oNavParameter.navigationType === NavType.iAppState) {
-					return this.collectResults(
-						this.base.viewState.applyAdditionalStates,
-						oViewState ? oViewState[ADDITIONAL_STATES_KEY] : undefined
+
+		try {
+			await this.collectResults(this.base.viewState.onBeforeStateApplied);
+			const aControls = await this.collectResults(this.base.viewState.adaptStateControls);
+			let oPromiseChain = Promise.resolve();
+			aControls
+				.filter(function (oControl: any) {
+					return oControl && oControl.isA && oControl.isA("sap.ui.base.ManagedObject");
+				})
+				.forEach((oControl: any) => {
+					const sKey = this.getStateKey(oControl);
+					oPromiseChain = oPromiseChain.then(
+						this.applyControlState.bind(this, oControl, oViewState ? oViewState[sKey] : undefined, oNavParameter)
 					);
-				} else {
-					return this.collectResults(this.base.viewState.applyNavigationParameters, oNavParameter);
-				}
-			})
-			.finally(() => {
-				return this.collectResults(this.base.viewState.onAfterStateApplied).then(this._setInitialStateApplied.bind(this));
-			});
+				});
+			await oPromiseChain;
+			if (oNavParameter.navigationType === NavType.iAppState) {
+				await this.collectResults(
+					this.base.viewState.applyAdditionalStates,
+					oViewState ? oViewState[ADDITIONAL_STATES_KEY] : undefined
+				);
+			} else {
+				await this.collectResults(this.base.viewState.applyNavigationParameters, oNavParameter);
+			}
+		} finally {
+			try {
+				await this.collectResults(this.base.viewState.onAfterStateApplied);
+				this._setInitialStateApplied();
+			} catch (e: any) {
+				Log.error(e);
+			}
+		}
 	}
 
 	@privateExtension()
@@ -696,8 +693,7 @@ class ViewState extends ControllerExtension {
 	 * This function is meant to be individually overridden by consuming controllers, but not to be called directly.
 	 * The override execution is: {@link sap.ui.core.mvc.OverrideExecution.After}.
 	 *
-	 * @param {Promise} aPromises Extensible array of promises to be resolved before continuing
-	 *
+	 * @param aPromises Extensible array of promises to be resolved before continuing
 	 * @alias sap.fe.core.controllerextensions.ViewState#onBeforeStateApplied
 	 * @protected
 	 */
@@ -714,8 +710,7 @@ class ViewState extends ControllerExtension {
 	 * This function is meant to be individually overridden by consuming controllers, but not to be called directly.
 	 * The override execution is: {@link sap.ui.core.mvc.OverrideExecution.After}.
 	 *
-	 * @param {Promise} aPromises Extensible array of promises to be resolved before continuing
-	 *
+	 * @param aPromises Extensible array of promises to be resolved before continuing
 	 * @alias sap.fe.core.controllerextensions.ViewState#onAfterStateApplied
 	 * @protected
 	 */
@@ -732,9 +727,8 @@ class ViewState extends ControllerExtension {
 	 * This function is meant to be individually overridden by consuming controllers, but not to be called directly.
 	 * The override execution is: {@link sap.ui.core.mvc.OverrideExecution.After}.
 	 *
-	 * @param {object} oViewState The current view state
-	 * @param {Promise} aPromises Extensible array of promises to be resolved before continuing
-	 *
+	 * @param oViewState The current view state
+	 * @param aPromises Extensible array of promises to be resolved before continuing
 	 * @alias sap.fe.core.controllerextensions.ViewState#applyAdditionalStates
 	 * @protected
 	 */
@@ -751,13 +745,12 @@ class ViewState extends ControllerExtension {
 	 * This function is meant to be individually overridden by consuming controllers, but not to be called directly.
 	 * The override execution is: {@link sap.ui.core.mvc.OverrideExecution.After}.
 	 *
-	 * @param {object} oNavParameter The current navigation parameter
-	 * @param {sap.fe.navigation.NavType} oNavParameter.navigationType The actual navigation type
-	 * @param {object} [oNavParameter.selectionVariant] The selectionVariant from the navigation
-	 * @param {object} [oNavParameter.selectionVariantDefaults] The selectionVariant defaults from the navigation
-	 * @param {boolean} [oNavParameter.requiresStandardVariant] Defines whether standard variant must be used in VM
-	 * @param {Promise} aPromises Extensible array of promises to be resolved before continuing
-	 *
+	 * @param oNavParameter The current navigation parameter
+	 * @param oNavParameter.navigationType The actual navigation type
+	 * @param [oNavParameter.selectionVariant] The selectionVariant from the navigation
+	 * @param [oNavParameter.selectionVariantDefaults] The selectionVariant defaults from the navigation
+	 * @param [oNavParameter.requiresStandardVariant] Defines whether standard variant must be used in VM
+	 * @param aPromises Extensible array of promises to be resolved before continuing
 	 * @alias sap.fe.core.controllerextensions.ViewState#applyNavigationParameters
 	 * @protected
 	 */
@@ -780,10 +773,10 @@ class ViewState extends ControllerExtension {
 	/**
 	 * Applying the given state to the given control.
 	 *
-	 * @param {sap.ui.base.ManagedObject} oControl The object to apply the given state
-	 * @param {object} oControlState The state for the given control
-	 * @param {object} [oNavParameters] The current navigation parameters
-	 * @returns {any} Return a promise for async state handling
+	 * @param oControl The object to apply the given state
+	 * @param oControlState The state for the given control
+	 * @param [oNavParameters] The current navigation parameters
+	 * @returns Return a promise for async state handling
 	 */
 	@privateExtension()
 	@finalExtension()
@@ -792,7 +785,7 @@ class ViewState extends ControllerExtension {
 		let oPromiseChain = Promise.resolve();
 		aControlStateHandlers.forEach((mControlStateHandler: any) => {
 			if (typeof mControlStateHandler.apply !== "function") {
-				throw new Error("controlStateHandler.apply is not a function for control: " + oControl.getMetadata().getName());
+				throw new Error(`controlStateHandler.apply is not a function for control: ${oControl.getMetadata().getName()}`);
 			}
 			oPromiseChain = oPromiseChain.then(mControlStateHandler.apply.bind(this, oControl, oControlState, oNavParameters));
 		});

package/src/sap/fe/core/controllerextensions/collaboration/ActivityBase.js

@@ -43,7 +43,7 @@ sap.ui.define(["sap/base/Log", "sap/base/util/UriParameters", "sap/fe/core/contr
       internalModel.setProperty(CONNECTED, true);
     });
     webSocket.attachError(function () {
-      Log.error("The connection to the websocket channel " + webSocketBaseURL + " could not be established");
+      Log.error("The connection to the websocket channel ".concat(webSocketBaseURL, " could not be established"));
       internalModel.setProperty(CONNECTED, false);
     });
     webSocket.attachClose(function () {
@@ -88,13 +88,13 @@ sap.ui.define(["sap/base/Log", "sap/base/util/UriParameters", "sap/fe/core/contr
       socketURI = useBackendUrl.replace("https", "wss");
     } else {
       socketURI = hostLocation.protocol === "https:" ? "wss:" : "ws:";
-      socketURI += "//" + hostLocation.host;
+      socketURI += "//".concat(hostLocation.host);
     }
 
-    socketURI += (socketBaseURL.startsWith("/") ? "" : "/") + socketBaseURL + "?draft=" + draftUUID;
+    socketURI += "".concat((socketBaseURL.startsWith("/") ? "" : "/") + socketBaseURL, "?draft=").concat(draftUUID);
 
     if (sendUserInfo) {
-      socketURI += "&userID=" + encodeURI(user.id) + "&userName=" + encodeURI(user.initialName || "");
+      socketURI += "&userID=".concat(encodeURI(user.id), "&userName=").concat(encodeURI(user.initialName || ""));
     }
 
     return new SapPcpWebSocket(socketURI, [SUPPORTED_PROTOCOLS.v10]);
@@ -102,4 +102,4 @@ sap.ui.define(["sap/base/Log", "sap/base/util/UriParameters", "sap/fe/core/contr
 
   return _exports;
 }, false);
-//# sourceMappingURL=data:application/json;charset=utf-8;base64,{"version":3,"sources":["ActivityBase.ts"],"names":["COLLABORATION","CONNECTED","CONNECTION","isCollaborationConnected","internalModel","getProperty","initializeCollaboration","user","webSocketBaseURL","draftUUID","receiveCallback","sendUserInfo","activeUsers","setProperty","activities","UriParameters","fromQuery","window","location","search","get","webSocket","createWebSocket","attachMessage","event","message","getParameter","attachOpen","attachError","Log","error","attachClose","broadcastCollaborationMessage","action","content","send","clientAction","clientContent","Activity","Activate","Discard","endCollaboration","close","socketBaseURL","hostLocation","socketURI","useBackendUrl","replace","protocol","host","startsWith","encodeURI","id","initialName","SapPcpWebSocket","SUPPORTED_PROTOCOLS","v10"],"mappings":"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","sourceRoot":".","sourcesContent":["import Log from \"sap/base/Log\";\nimport UriParameters from \"sap/base/util/UriParameters\";\nimport { Activity, Message, User } from \"sap/fe/core/controllerextensions/collaboration/CollaborationCommon\";\nimport Event from \"sap/ui/base/Event\";\nimport SapPcpWebSocket, { SUPPORTED_PROTOCOLS } from \"sap/ui/core/ws/SapPcpWebSocket\";\nimport JSONModel from \"sap/ui/model/json/JSONModel\";\n\nconst COLLABORATION = \"/collaboration\";\nconst CONNECTED = \"/collaboration/connected\";\nconst CONNECTION = \"/collaboration/connection\";\n\nexport function isCollaborationConnected(internalModel: JSONModel): boolean {\n\treturn !!internalModel.getProperty(CONNECTED);\n}\n\nexport function initializeCollaboration(\n\tuser: User,\n\twebSocketBaseURL: string,\n\tdraftUUID: string,\n\tinternalModel: JSONModel,\n\treceiveCallback: (_: Message) => void,\n\tsendUserInfo = false\n) {\n\tif (internalModel.getProperty(CONNECTION)) {\n\t\t// connection already established\n\t\treturn;\n\t}\n\n\tconst activeUsers: any[] = [user];\n\tinternalModel.setProperty(COLLABORATION, { activeUsers: activeUsers, activities: {} });\n\n\tsendUserInfo = sendUserInfo || UriParameters.fromQuery(window.location.search).get(\"useFLPUser\") === \"true\";\n\n\tconst webSocket = createWebSocket(user, webSocketBaseURL, draftUUID, sendUserInfo);\n\n\tinternalModel.setProperty(CONNECTION, webSocket);\n\n\twebSocket.attachMessage(function (event: Event) {\n\t\tconst message: Message = event.getParameter(\"pcpFields\");\n\t\treceiveCallback(message);\n\t});\n\n\twebSocket.attachOpen(function () {\n\t\tinternalModel.setProperty(CONNECTED, true);\n\t});\n\n\twebSocket.attachError(function () {\n\t\tLog.error(\"The connection to the websocket channel \" + webSocketBaseURL + \" could not be established\");\n\t\tinternalModel.setProperty(CONNECTED, false);\n\t});\n\n\twebSocket.attachClose(function () {\n\t\tinternalModel.setProperty(CONNECTED, false);\n\t});\n}\n\nexport function broadcastCollaborationMessage(action: Activity, content: string | undefined, internalModel: JSONModel) {\n\tif (isCollaborationConnected(internalModel)) {\n\t\tconst webSocket = internalModel.getProperty(CONNECTION) as SapPcpWebSocket;\n\n\t\twebSocket.send(\"\", {\n\t\t\tclientAction: action,\n\t\t\tclientContent: content\n\t\t});\n\n\t\tif (action === Activity.Activate || action === Activity.Discard) {\n\t\t\tendCollaboration(internalModel);\n\t\t}\n\t}\n}\n\nexport function endCollaboration(internalModel: JSONModel) {\n\tconst webSocket = internalModel.getProperty(CONNECTION) as SapPcpWebSocket;\n\twebSocket.close();\n\tinternalModel.setProperty(CONNECTION, null);\n}\n\nfunction createWebSocket(user: User, socketBaseURL: string, draftUUID: string, sendUserInfo = false) {\n\tconst hostLocation = window.location;\n\tlet socketURI;\n\n\t// Support useBackendUrl for local testing\n\tconst useBackendUrl = UriParameters.fromQuery(window.location.search).get(\"useBackendUrl\");\n\tif (useBackendUrl) {\n\t\tsocketURI = useBackendUrl.replace(\"https\", \"wss\");\n\t} else {\n\t\tsocketURI = hostLocation.protocol === \"https:\" ? \"wss:\" : \"ws:\";\n\t\tsocketURI += \"//\" + hostLocation.host;\n\t}\n\n\tsocketURI += (socketBaseURL.startsWith(\"/\") ? \"\" : \"/\") + socketBaseURL + \"?draft=\" + draftUUID;\n\n\tif (sendUserInfo) {\n\t\tsocketURI += \"&userID=\" + encodeURI(user.id) + \"&userName=\" + encodeURI(user.initialName || \"\");\n\t}\n\n\treturn new SapPcpWebSocket(socketURI, [SUPPORTED_PROTOCOLS.v10]);\n}\n"]}
+//# sourceMappingURL=data:application/json;charset=utf-8;base64,{"version":3,"sources":["ActivityBase.ts"],"names":["COLLABORATION","CONNECTED","CONNECTION","isCollaborationConnected","internalModel","getProperty","initializeCollaboration","user","webSocketBaseURL","draftUUID","receiveCallback","sendUserInfo","activeUsers","setProperty","activities","UriParameters","fromQuery","window","location","search","get","webSocket","createWebSocket","attachMessage","event","message","getParameter","attachOpen","attachError","Log","error","attachClose","broadcastCollaborationMessage","action","content","send","clientAction","clientContent","Activity","Activate","Discard","endCollaboration","close","socketBaseURL","hostLocation","socketURI","useBackendUrl","replace","protocol","host","startsWith","encodeURI","id","initialName","SapPcpWebSocket","SUPPORTED_PROTOCOLS","v10"],"mappings":"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","sourceRoot":".","sourcesContent":["import Log from \"sap/base/Log\";\nimport UriParameters from \"sap/base/util/UriParameters\";\nimport type { Message, User } from \"sap/fe/core/controllerextensions/collaboration/CollaborationCommon\";\nimport { Activity } from \"sap/fe/core/controllerextensions/collaboration/CollaborationCommon\";\nimport type Event from \"sap/ui/base/Event\";\nimport SapPcpWebSocket, { SUPPORTED_PROTOCOLS } from \"sap/ui/core/ws/SapPcpWebSocket\";\nimport type JSONModel from \"sap/ui/model/json/JSONModel\";\n\nconst COLLABORATION = \"/collaboration\";\nconst CONNECTED = \"/collaboration/connected\";\nconst CONNECTION = \"/collaboration/connection\";\n\nexport function isCollaborationConnected(internalModel: JSONModel): boolean {\n\treturn !!internalModel.getProperty(CONNECTED);\n}\n\nexport function initializeCollaboration(\n\tuser: User,\n\twebSocketBaseURL: string,\n\tdraftUUID: string,\n\tinternalModel: JSONModel,\n\treceiveCallback: (_: Message) => void,\n\tsendUserInfo = false\n) {\n\tif (internalModel.getProperty(CONNECTION)) {\n\t\t// connection already established\n\t\treturn;\n\t}\n\n\tconst activeUsers: any[] = [user];\n\tinternalModel.setProperty(COLLABORATION, { activeUsers: activeUsers, activities: {} });\n\n\tsendUserInfo = sendUserInfo || UriParameters.fromQuery(window.location.search).get(\"useFLPUser\") === \"true\";\n\n\tconst webSocket = createWebSocket(user, webSocketBaseURL, draftUUID, sendUserInfo);\n\n\tinternalModel.setProperty(CONNECTION, webSocket);\n\n\twebSocket.attachMessage(function (event: Event) {\n\t\tconst message: Message = event.getParameter(\"pcpFields\");\n\t\treceiveCallback(message);\n\t});\n\n\twebSocket.attachOpen(function () {\n\t\tinternalModel.setProperty(CONNECTED, true);\n\t});\n\n\twebSocket.attachError(function () {\n\t\tLog.error(`The connection to the websocket channel ${webSocketBaseURL} could not be established`);\n\t\tinternalModel.setProperty(CONNECTED, false);\n\t});\n\n\twebSocket.attachClose(function () {\n\t\tinternalModel.setProperty(CONNECTED, false);\n\t});\n}\n\nexport function broadcastCollaborationMessage(action: Activity, content: string | undefined, internalModel: JSONModel) {\n\tif (isCollaborationConnected(internalModel)) {\n\t\tconst webSocket = internalModel.getProperty(CONNECTION) as SapPcpWebSocket;\n\n\t\twebSocket.send(\"\", {\n\t\t\tclientAction: action,\n\t\t\tclientContent: content\n\t\t});\n\n\t\tif (action === Activity.Activate || action === Activity.Discard) {\n\t\t\tendCollaboration(internalModel);\n\t\t}\n\t}\n}\n\nexport function endCollaboration(internalModel: JSONModel) {\n\tconst webSocket = internalModel.getProperty(CONNECTION) as SapPcpWebSocket;\n\twebSocket.close();\n\tinternalModel.setProperty(CONNECTION, null);\n}\n\nfunction createWebSocket(user: User, socketBaseURL: string, draftUUID: string, sendUserInfo = false) {\n\tconst hostLocation = window.location;\n\tlet socketURI;\n\n\t// Support useBackendUrl for local testing\n\tconst useBackendUrl = UriParameters.fromQuery(window.location.search).get(\"useBackendUrl\");\n\tif (useBackendUrl) {\n\t\tsocketURI = useBackendUrl.replace(\"https\", \"wss\");\n\t} else {\n\t\tsocketURI = hostLocation.protocol === \"https:\" ? \"wss:\" : \"ws:\";\n\t\tsocketURI += `//${hostLocation.host}`;\n\t}\n\n\tsocketURI += `${(socketBaseURL.startsWith(\"/\") ? \"\" : \"/\") + socketBaseURL}?draft=${draftUUID}`;\n\n\tif (sendUserInfo) {\n\t\tsocketURI += `&userID=${encodeURI(user.id)}&userName=${encodeURI(user.initialName || \"\")}`;\n\t}\n\n\treturn new SapPcpWebSocket(socketURI, [SUPPORTED_PROTOCOLS.v10]);\n}\n"]}

package/src/sap/fe/core/controllerextensions/collaboration/ActivityBase.ts

@@ -1,9 +1,10 @@
 import Log from "sap/base/Log";
 import UriParameters from "sap/base/util/UriParameters";
-import { Activity, Message, User } from "sap/fe/core/controllerextensions/collaboration/CollaborationCommon";
-import Event from "sap/ui/base/Event";
+import type { Message, User } from "sap/fe/core/controllerextensions/collaboration/CollaborationCommon";
+import { Activity } from "sap/fe/core/controllerextensions/collaboration/CollaborationCommon";
+import type Event from "sap/ui/base/Event";
 import SapPcpWebSocket, { SUPPORTED_PROTOCOLS } from "sap/ui/core/ws/SapPcpWebSocket";
-import JSONModel from "sap/ui/model/json/JSONModel";
+import type JSONModel from "sap/ui/model/json/JSONModel";
 
 const COLLABORATION = "/collaboration";
 const CONNECTED = "/collaboration/connected";
@@ -45,7 +46,7 @@ export function initializeCollaboration(
 	});
 
 	webSocket.attachError(function () {
-		Log.error("The connection to the websocket channel " + webSocketBaseURL + " could not be established");
+		Log.error(`The connection to the websocket channel ${webSocketBaseURL} could not be established`);
 		internalModel.setProperty(CONNECTED, false);
 	});
 
@@ -85,13 +86,13 @@ function createWebSocket(user: User, socketBaseURL: string, draftUUID: string, s
 		socketURI = useBackendUrl.replace("https", "wss");
 	} else {
 		socketURI = hostLocation.protocol === "https:" ? "wss:" : "ws:";
-		socketURI += "//" + hostLocation.host;
+		socketURI += `//${hostLocation.host}`;
 	}
 
-	socketURI += (socketBaseURL.startsWith("/") ? "" : "/") + socketBaseURL + "?draft=" + draftUUID;
+	socketURI += `${(socketBaseURL.startsWith("/") ? "" : "/") + socketBaseURL}?draft=${draftUUID}`;
 
 	if (sendUserInfo) {
-		socketURI += "&userID=" + encodeURI(user.id) + "&userName=" + encodeURI(user.initialName || "");
+		socketURI += `&userID=${encodeURI(user.id)}&userName=${encodeURI(user.initialName || "")}`;
 	}
 
 	return new SapPcpWebSocket(socketURI, [SUPPORTED_PROTOCOLS.v10]);