@sapui5/sap.fe.core 1.100.0 → 1.102.0

package/src/sap/fe/core/{actions → controllerextensions}/collaboration/ActivitySync.ts

@@ -1,38 +1,37 @@
-import Event from "sap/ui/base/Event";
-import Control from "sap/ui/core/Control";
-import SapPcpWebSocket from "sap/ui/core/ws/SapPcpWebSocket";
+import CommonUtils from "sap/fe/core/CommonUtils";
+import {
+	broadcastCollaborationMessage,
+	endCollaboration,
+	initializeCollaboration,
+	isCollaborationConnected
+} from "sap/fe/core/controllerextensions/collaboration/ActivityBase";
+import {
+	Activity,
+	CollaborationUtils,
+	Message,
+	User,
+	UserActivity
+} from "sap/fe/core/controllerextensions/collaboration/CollaborationCommon";
 import MessageBox from "sap/m/MessageBox";
-import { Activity, CollaborationUtils, Message, User, UserActivity } from "sap/fe/core/actions/collaboration/CollaborationCommon";
+import Control from "sap/ui/core/Control";
 import View from "sap/ui/core/mvc/View";
-import UriParameters from "sap/base/util/UriParameters";
-import ODataMetaModel from "sap/ui/model/odata/v4/ODataMetaModel";
-import Log from "sap/base/Log";
+import JSONModel from "sap/ui/model/json/JSONModel";
 import Context from "sap/ui/model/odata/v4/Context";
-import ResourceBundle from "sap/base/i18n/ResourceBundle";
+import ODataMetaModel from "sap/ui/model/odata/v4/ODataMetaModel";
 
-const CONNECTED = "/collaboration/connected";
-const CONNECTION = "/collaboration/connection";
 const MYACTIVITY = "/collaboration/myActivity";
 const ACTIVEUSERS = "/collaboration/activeUsers";
 const ACTIVITIES = "/collaboration/activities";
 
-export const isConnected = function(control: Control): boolean {
-	return !!control.getModel("internal").getProperty(CONNECTED);
+export const isConnected = function (control: Control): boolean {
+	const internalModel = control.getModel("internal") as JSONModel;
+	return isCollaborationConnected(internalModel);
 };
 
-export const send = function(control: Control, action: Activity, content: string | string[] | Context | Context[] | undefined) {
+export const send = function (control: Control, action: Activity, content: string | string[] | undefined) {
 	if (isConnected(control)) {
-		const contentArray = Array.isArray(content) ? content : [content];
-		let clientContent: string = "";
-		contentArray.forEach(function(c) {
-			if (c) {
-				clientContent += clientContent ? "|" : "";
-				clientContent += typeof c === "string" ? c : c.getPath();
-			}
-		});
-
-		const internalModel = control.getModel("internal") as any;
-		const webSocket = internalModel.getProperty(CONNECTION) as SapPcpWebSocket;
+		const internalModel = control.getModel("internal") as JSONModel;
+		const clientContent = Array.isArray(content) ? content.join("|") : content;
 
 		if (action === Activity.LiveChange) {
 			// To avoid unnecessary traffic we keep track of live changes and send it only once
@@ -47,24 +46,22 @@ export const send = function(control: Control, action: Activity, content: string
 			internalModel.setProperty(MYACTIVITY, null);
 		}
 
-		webSocket.send("", {
-			clientAction: action,
-			clientContent: clientContent
-		});
-
-		if (action === Activity.Activate || action === Activity.Discard) {
-			disconnect(control);
-		}
+		broadcastCollaborationMessage(action, clientContent, internalModel);
 	}
 };
 
-export const connect = async function(view: View) {
-	const internalModel: any = view.getModel("internal");
+const getWebSocketBaseURL = function (bindingContext: Context): string {
+	return bindingContext.getModel().getMetaModel().getObject("/@com.sap.vocabularies.Common.v1.WebSocketBaseURL");
+};
+
+export const isCollaborationEnabled = function (view: View): boolean {
+	const bindingContext = view?.getBindingContext && (view.getBindingContext() as Context);
+	return !!(bindingContext && getWebSocketBaseURL(bindingContext));
+};
+
+export const connect = async function (view: View) {
+	const internalModel = view.getModel("internal") as JSONModel;
 	const me = CollaborationUtils.getMe(view);
-	if (internalModel.getProperty(CONNECTION)) {
-		// connection already established
-		return;
-	}
 
 	// Retrieving ME from shell service
 	if (!me) {
@@ -72,13 +69,8 @@ export const connect = async function(view: View) {
 		return;
 	}
 
-	const activeUsers: any[] = [me];
-	internalModel.setProperty("/collaboration", { activeUsers: activeUsers, activities: {} });
 	const bindingContext = view.getBindingContext() as Context;
-	const webSocketBaseURL = bindingContext
-		.getModel()
-		.getMetaModel()
-		.getObject("/@com.sap.vocabularies.Common.v1.WebSocketBaseURL");
+	const webSocketBaseURL = getWebSocketBaseURL(bindingContext);
 
 	if (!webSocketBaseURL) {
 		return;
@@ -89,57 +81,17 @@ export const connect = async function(view: View) {
 		return;
 	}
 
-	const webSocket = establishWebSocketConnection(webSocketBaseURL, sDraftUUID, view);
-
-	webSocket.attachMessage(function(event: Event) {
-		const message: Message = event.getParameter("pcpFields");
-		messageReceive(message, view, webSocket);
+	initializeCollaboration(me, webSocketBaseURL, sDraftUUID, internalModel, (message: Message) => {
+		messageReceive(message, view);
 	});
 };
 
-export const disconnect = function(control: Control) {
-	const internalModel = control.getModel("internal") as any;
-	const webSocket = internalModel.getProperty(CONNECTION) as SapPcpWebSocket;
-	webSocket.close();
-	internalModel.setProperty(CONNECTION, null);
+export const disconnect = function (control: Control) {
+	const internalModel = control.getModel("internal") as JSONModel;
+	endCollaboration(internalModel);
 };
 
-function establishWebSocketConnection(socketBaseURL: string, draftUUID: string, view: View) {
-	const internalModel: any = view.getModel("internal");
-	const hostLocation = window.location;
-	let socketURI;
-
-	// Support useBackendUrl for local testing
-	const useBackendUrl = UriParameters.fromQuery(window.location.search).get("useBackendUrl");
-	if (useBackendUrl) {
-		socketURI = useBackendUrl.replace("https", "wss");
-	} else {
-		socketURI = hostLocation.protocol === "https:" ? "wss:" : "ws:";
-		socketURI += "//" + hostLocation.host;
-	}
-
-	socketURI += (socketBaseURL.startsWith("/") ? "" : "/") + socketBaseURL + "?draft=" + draftUUID;
-
-	const webSocket = new SapPcpWebSocket(socketURI, ["v10.pcp.sap.com"]); // TODO: use enum
-	internalModel.setProperty(CONNECTION, webSocket);
-
-	webSocket.attachOpen(function() {
-		internalModel.setProperty(CONNECTED, true);
-	});
-
-	webSocket.attachError(function() {
-		Log.error("The connection to the websocket channel " + socketBaseURL + " could not be established");
-		internalModel.setProperty(CONNECTED, false);
-	});
-
-	webSocket.attachClose(function() {
-		internalModel.setProperty(CONNECTED, false);
-	});
-
-	return webSocket;
-}
-
-function messageReceive(message: Message, view: View, webSocket: any) {
+function messageReceive(message: Message, view: View) {
 	const internalModel: any = view.getModel("internal");
 	let activeUsers: User[] = internalModel.getProperty(ACTIVEUSERS);
 	let activities: UserActivity[];
@@ -154,40 +106,37 @@ function messageReceive(message: Message, view: View, webSocket: any) {
 		color: CollaborationUtils.getUserColor(message.userID, activeUsers, [])
 	};
 
+	// eslint-disable-next-line default-case
 	switch (message.userAction) {
 		case Activity.Join:
 		case Activity.JoinEcho:
-			if (activeUsers.findIndex(user => user.id === sender.id) === -1) {
+			if (activeUsers.findIndex((user) => user.id === sender.id) === -1) {
 				activeUsers.push(sender);
 				internalModel.setProperty(ACTIVEUSERS, activeUsers);
 			}
 
 			if (message.userAction === Activity.Join) {
 				// we echo our existence to the newly entered user and also send the current activity if there is any
-				webSocket.send("", {
-					clientAction: Activity.JoinEcho,
-					clientContent: internalModel.getProperty(MYACTIVITY)
-				});
-				// TODO: echo current activity
+				broadcastCollaborationMessage(Activity.JoinEcho, internalModel.getProperty(MYACTIVITY), internalModel);
 			}
 
 			if (message.userAction === Activity.JoinEcho) {
 				if (message.clientContent) {
 					// another user was already typing therefore I want to see his activity immediately. Calling me again as a live change
 					message.userAction = Activity.LiveChange;
-					messageReceive(message, view, webSocket);
+					messageReceive(message, view);
 				}
 			}
 
 			break;
 		case Activity.Leave:
 			// Removing the active user. Not removing "me" if I had the screen open in another session
-			activeUsers = activeUsers.filter(user => user.id !== sender.id || user.me);
+			activeUsers = activeUsers.filter((user) => user.id !== sender.id || user.me);
 			internalModel.setProperty(ACTIVEUSERS, activeUsers);
 			const allActivities = internalModel.getProperty(ACTIVITIES) || {};
-			const removeUserActivities = function(bag: any) {
+			const removeUserActivities = function (bag: any) {
 				if (Array.isArray(bag)) {
-					return bag.filter(activity => activity.id !== sender.id);
+					return bag.filter((activity) => activity.id !== sender.id);
 				} else {
 					for (const p in bag) {
 						bag[p] = removeUserActivities(bag[p]);
@@ -200,12 +149,23 @@ function messageReceive(message: Message, view: View, webSocket: any) {
 			break;
 
 		case Activity.Change:
-			let currentActivities: any[] = internalModel.getProperty(ACTIVITIES + metaPath) || [];
-			activityKey = getActivityKey(message.clientContent);
-			currentActivities = currentActivities.filter(activity => activity.key !== activityKey);
-			internalModel.setProperty(ACTIVITIES + metaPath, currentActivities);
+			const metaPaths = message?.clientContent?.split("|").map((path) => {
+				return (view.getModel().getMetaModel() as ODataMetaModel).getMetaPath(path);
+			});
 
-			update(view, message, metaPath, Activity.Change);
+			metaPaths.forEach((metaPath, i) => {
+				const nesteedMessage = {
+					...message,
+					clientContent: message?.clientContent?.split("|")[i]
+				};
+				let currentActivities: any[] = internalModel.getProperty(ACTIVITIES + metaPath) || [];
+				activityKey = getActivityKey(nesteedMessage.clientContent);
+				currentActivities = currentActivities?.filter && currentActivities.filter((activity) => activity.key !== activityKey);
+				if (currentActivities) {
+					internalModel.setProperty(ACTIVITIES + metaPath, currentActivities);
+					update(view, nesteedMessage, metaPath, Activity.Change);
+				}
+			});
 			break;
 		case Activity.Create:
 			// For create we actually just need to refresh the table
@@ -217,12 +177,12 @@ function messageReceive(message: Message, view: View, webSocket: any) {
 			break;
 		case Activity.Activate:
 			disconnect(view);
-			MessageBox.information(getText("C_COLLABORATIONDRAFT_ACTIVATE", sender.name));
+			MessageBox.information(CollaborationUtils.getText("C_COLLABORATIONDRAFT_ACTIVATE", sender.name));
 			navigate(message.clientContent, view);
 			break;
 		case Activity.Discard:
 			disconnect(view);
-			MessageBox.information(getText("C_COLLABORATIONDRAFT_DISCARD", sender.name));
+			MessageBox.information(CollaborationUtils.getText("C_COLLABORATIONDRAFT_DISCARD", sender.name));
 			navigate(message.clientContent, view);
 			break;
 		/*
@@ -248,7 +208,7 @@ function messageReceive(message: Message, view: View, webSocket: any) {
 			}
 
 			activities = internalModel.getProperty(ACTIVITIES + metaPath);
-			activities = activities ? activities.slice() : [];
+			activities = activities?.slice ? activities.slice() : [];
 			activities.push(activity);
 			internalModel.setProperty(ACTIVITIES + metaPath, activities);
 			break;
@@ -258,7 +218,7 @@ function messageReceive(message: Message, view: View, webSocket: any) {
 			activityKey = getActivityKey(message.clientContent);
 			internalModel.setProperty(
 				ACTIVITIES + metaPath,
-				activities.filter(a => a.key !== activityKey)
+				activities.filter((a) => a.key !== activityKey)
 			);
 			break;
 	}
@@ -268,7 +228,7 @@ function update(view: View, message: Message, metaPath: string, action: Activity
 	const appComponent = CollaborationUtils.getAppComponent(view);
 	const metaModel = view.getModel().getMetaModel() as ODataMetaModel;
 	const currentPage = getCurrentPage(view);
-	const sideEffectsService = (appComponent as any).getSideEffectsService(); // TODO: add to appcomponent
+	const sideEffectsService = appComponent.getSideEffectsService();
 	const currentContext = currentPage.getBindingContext();
 	const currentPath = currentContext.getPath();
 	const currentMetaPath = metaModel.getMetaPath(currentPath);
@@ -277,12 +237,13 @@ function update(view: View, message: Message, metaPath: string, action: Activity
 	if (action === Activity.Delete) {
 		// check if user currently displays one deleted object
 		const deletedObjects = message.clientContent.split("|");
-		if (deletedObjects.findIndex(deletedObject => currentPath.startsWith(deletedObject)) > -1) {
+		const parentDeletedIndex = deletedObjects.findIndex((deletedObject) => currentPath.startsWith(deletedObject));
+		if (parentDeletedIndex > -1) {
 			// any other user deleted the object I'm currently looking at. Inform the user we will navigate to root now
-			MessageBox.information(getText("C_COLLABORATIONDRAFT_DELETE", message.userDescription), {
-				onClose: function() {
-					// TODO: Navigate to root? To be implemented
-					history.back();
+			MessageBox.information(CollaborationUtils.getText("C_COLLABORATIONDRAFT_DELETE", message.userDescription), {
+				onClose: function () {
+					const targetContext = view.getModel().bindContext(deletedObjects[parentDeletedIndex]).getBoundContext();
+					currentPage.getController()._routing.navigateBackFromContext(targetContext);
 				}
 			});
 		}
@@ -301,7 +262,7 @@ function update(view: View, message: Message, metaPath: string, action: Activity
 				}
 			];
 			const entityType = sideEffectsService.getEntityTypeFromContext(currentContext);
-			const entityTypeSideEffects = sideEffectsService.getODataEntitySideEffects(entityType);
+			const entityTypeSideEffects = sideEffectsService.getODataEntitySideEffects(entityType!);
 			// Poor man solution without checking source targets, just for POC, this is throw-way coding only
 			const object: any = Object; // just to overcome TS issues, will be anyway replaced
 			const relevantSideEffects = object.fromEntries(
@@ -310,7 +271,7 @@ function update(view: View, message: Message, metaPath: string, action: Activity
 					.filter((x: any[]) => x[1].SourceProperties?.findIndex((source: any) => source.value === activityPath) > -1)
 			);
 			for (const p in relevantSideEffects) {
-				relevantSideEffects[p].TargetProperties.forEach(function(targetProperty: any) {
+				relevantSideEffects[p].TargetProperties.forEach(function (targetProperty: any) {
 					sideEffects.push({
 						$PropertyPath: targetProperty
 					});
@@ -327,29 +288,26 @@ function update(view: View, message: Message, metaPath: string, action: Activity
 function navigate(path: string, view: View) {
 	// TODO: routing.navigate doesn't consider semantic bookmarking
 	const currentPage = getCurrentPage(view);
-	const targetContext = view
-		.getModel()
-		.bindContext(path)
-		.getBoundContext();
+	const targetContext = view.getModel().bindContext(path).getBoundContext();
 	currentPage.getController().routing.navigate(targetContext);
 }
 
 function getCurrentPage(view: View) {
 	const appComponent = CollaborationUtils.getAppComponent(view);
-	// TODO: isn't there an easier way to get the current page?
-	// TODO: What about FCL?
-	return (appComponent.getRootControl() as any)
-		.getContent()[0]
-		.getCurrentPage()
-		.getComponentInstance()
-		.getRootControl();
+	const rootViewController = appComponent.getRootViewController() as any;
+	return rootViewController.isFclEnabled()
+		? rootViewController.getRightmostView()
+		: CommonUtils.getTargetView((appComponent.getRootContainer() as any).getCurrentPage());
 }
 
 function getActivityKey(x: string): string {
 	return x.substring(x.lastIndexOf("(") + 1, x.lastIndexOf(")"));
 }
 
-function getText(textId: string, ...args: string[]): string {
-	const oResourceModel = sap.ui.getCore().getLibraryResourceBundle("sap.fe.core") as ResourceBundle;
-	return oResourceModel.getText(textId, args);
-}
+export default {
+	connect: connect,
+	disconnect: disconnect,
+	isConnected: isConnected,
+	isCollaborationEnabled: isCollaborationEnabled,
+	send: send
+};

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

@@ -0,0 +1,146 @@
+/*!
+ * SAP UI development toolkit for HTML5 (SAPUI5)
+ *      (c) Copyright 2009-2021 SAP SE. All rights reserved
+ */
+sap.ui.define(["sap/ui/core/Component", "sap/ui/core/Core"], function (Component, Core) {
+  "use strict";
+
+  var _exports = {};
+
+  var Role;
+
+  (function (Role) {
+    Role["Owner"] = "O";
+    Role["Edit"] = "E";
+  })(Role || (Role = {}));
+
+  _exports.Role = Role;
+  var Activity;
+
+  (function (Activity) {
+    Activity["Join"] = "JOIN";
+    Activity["JoinEcho"] = "JOINECHO";
+    Activity["Leave"] = "LEAVE";
+    Activity["Change"] = "CHANGE";
+    Activity["Create"] = "CREATE";
+    Activity["Delete"] = "DELETE";
+    Activity["Action"] = "ACTION";
+    Activity["LiveChange"] = "LIVECHANGE";
+    Activity["Activate"] = "ACTIVATE";
+    Activity["Discard"] = "DISCARD";
+    Activity["Undo"] = "UNDO";
+  })(Activity || (Activity = {}));
+
+  _exports.Activity = Activity;
+
+  function formatInitials(fullName) {
+    // remove titles - those are the ones from S/4 to be checked if there are others
+    var academicTitles = ["Dr.", "Prof.", "Prof. Dr.", "B.A.", "MBA", "Ph.D."];
+    academicTitles.forEach(function (academicTitle) {
+      fullName = fullName.replace(academicTitle, "");
+    });
+    var initials;
+    var parts = fullName.trimStart().split(" ");
+
+    if (parts.length > 1) {
+      var _parts$shift, _parts$pop;
+
+      initials = ((parts === null || parts === void 0 ? void 0 : (_parts$shift = parts.shift()) === null || _parts$shift === void 0 ? void 0 : _parts$shift.charAt(0)) || "") + ((_parts$pop = parts.pop()) === null || _parts$pop === void 0 ? void 0 : _parts$pop.charAt(0));
+    } else {
+      initials = fullName.substring(0, 2);
+    }
+
+    return initials.toUpperCase();
+  }
+
+  function getUserColor(UserID, activeUsers, invitedUsers) {
+    // search if user is known
+    var user = activeUsers.find(function (u) {
+      return u.id === UserID;
+    });
+
+    if (user) {
+      return user.color;
+    } else {
+      var _loop = function (i) {
+        if (activeUsers.findIndex(function (u) {
+          return u.color === i;
+        }) === -1 && invitedUsers.findIndex(function (u) {
+          return u.color === i;
+        }) === -1) {
+          return {
+            v: i
+          };
+        }
+      };
+
+      // search for next free color
+      for (var i = 1; i <= 10; i++) {
+        var _ret = _loop(i);
+
+        if (typeof _ret === "object") return _ret.v;
+      } // this seems to be a popular object :) for now just return 10 for all.
+      // for invited we should start from 1 again so the colors are different
+
+
+      return 10;
+    }
+  } // copied from CommonUtils. Due to a cycle dependency I can't use CommonUtils here.
+  // That's to be fixed. the discard popover thingy shouldn't be in the common utils at all
+
+
+  function getAppComponent(oControl) {
+    if (oControl.isA("sap.fe.core.AppComponent")) {
+      return oControl;
+    }
+
+    var oOwner = Component.getOwnerComponentFor(oControl);
+
+    if (!oOwner) {
+      return oControl;
+    } else {
+      return getAppComponent(oOwner);
+    }
+  }
+
+  function getMe(view) {
+    var shellServiceHelper = getAppComponent(view).getShellServices();
+
+    if (!shellServiceHelper || !shellServiceHelper.hasUShell()) {
+      throw "No Shell... No User";
+    }
+
+    var me = {
+      initials: shellServiceHelper.getUser().getInitials(),
+      id: shellServiceHelper.getUser().getId(),
+      name: shellServiceHelper.getUser().getFullName() + " (" + getText("C_COLLABORATIONDRAFT_YOU") + ")",
+      initialName: shellServiceHelper.getUser().getFullName(),
+      color: 6,
+      //  same color as FLP...
+      role: Role.Owner,
+      me: true
+    };
+    return me;
+  }
+
+  function getText(textId) {
+    var oResourceModel = Core.getLibraryResourceBundle("sap.fe.core");
+
+    for (var _len = arguments.length, args = new Array(_len > 1 ? _len - 1 : 0), _key = 1; _key < _len; _key++) {
+      args[_key - 1] = arguments[_key];
+    }
+
+    return oResourceModel.getText(textId, args);
+  }
+
+  var CollaborationUtils = {
+    formatInitials: formatInitials,
+    getUserColor: getUserColor,
+    getMe: getMe,
+    getAppComponent: getAppComponent,
+    getText: getText
+  };
+  _exports.CollaborationUtils = CollaborationUtils;
+  return _exports;
+}, false);
+//# sourceMappingURL=data:application/json;charset=utf-8;base64,{"version":3,"sources":["CollaborationCommon.ts"],"names":["Role","Activity","formatInitials","fullName","academicTitles","forEach","academicTitle","replace","initials","parts","trimStart","split","length","shift","charAt","pop","substring","toUpperCase","getUserColor","UserID","activeUsers","invitedUsers","user","find","u","id","color","i","findIndex","getAppComponent","oControl","isA","oOwner","Component","getOwnerComponentFor","getMe","view","shellServiceHelper","getShellServices","hasUShell","me","getUser","getInitials","getId","name","getFullName","getText","initialName","role","Owner","textId","oResourceModel","Core","getLibraryResourceBundle","args","CollaborationUtils"],"mappings":"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","sourceRoot":".","sourcesContent":["import AppComponent from \"sap/fe/core/AppComponent\";\nimport Component from \"sap/ui/core/Component\";\nimport Core from \"sap/ui/core/Core\";\nimport View from \"sap/ui/core/mvc/View\";\nimport { CoreEx } from \"../../../../../../../../types/extension_types\";\n\nexport type User = {\n\tid: string;\n\tinitials?: string;\n\tname: string;\n\trole?: Role;\n\tcolor?: number;\n\ttransient?: boolean;\n\tme?: boolean;\n\tinitialName?: string;\n};\n\nexport type UserActivity = User & {\n\tkey?: string;\n};\n\nexport enum Role {\n\tOwner = \"O\",\n\tEdit = \"E\"\n}\n\nexport enum Activity {\n\tJoin = \"JOIN\",\n\tJoinEcho = \"JOINECHO\",\n\tLeave = \"LEAVE\",\n\tChange = \"CHANGE\",\n\tCreate = \"CREATE\",\n\tDelete = \"DELETE\",\n\tAction = \"ACTION\",\n\tLiveChange = \"LIVECHANGE\",\n\tActivate = \"ACTIVATE\",\n\tDiscard = \"DISCARD\",\n\tUndo = \"UNDO\"\n}\n\nexport type Message = {\n\tuserDescription: string;\n\tuserID: string;\n\tuserAction: string;\n\tclientAction: string;\n\tclientContent: string;\n};\n\nfunction formatInitials(fullName: string): string {\n\t// remove titles - those are the ones from S/4 to be checked if there are others\n\tconst academicTitles = [\"Dr.\", \"Prof.\", \"Prof. Dr.\", \"B.A.\", \"MBA\", \"Ph.D.\"];\n\tacademicTitles.forEach(function (academicTitle) {\n\t\tfullName = fullName.replace(academicTitle, \"\");\n\t});\n\n\tlet initials: string;\n\tconst parts = fullName.trimStart().split(\" \");\n\n\tif (parts.length > 1) {\n\t\tinitials = (parts?.shift()?.charAt(0) || \"\") + parts.pop()?.charAt(0);\n\t} else {\n\t\tinitials = fullName.substring(0, 2);\n\t}\n\n\treturn initials.toUpperCase();\n}\n\nfunction getUserColor(UserID: string, activeUsers: User[], invitedUsers: User[]) {\n\t// search if user is known\n\tconst user = activeUsers.find((u) => u.id === UserID);\n\tif (user) {\n\t\treturn user.color;\n\t} else {\n\t\t// search for next free color\n\t\tfor (let i = 1; i <= 10; i++) {\n\t\t\tif (activeUsers.findIndex((u) => u.color === i) === -1 && invitedUsers.findIndex((u) => u.color === i) === -1) {\n\t\t\t\treturn i;\n\t\t\t}\n\t\t}\n\t\t// this seems to be a popular object :) for now just return 10 for all.\n\t\t// for invited we should start from 1 again so the colors are different\n\t\treturn 10;\n\t}\n}\n\n// copied from CommonUtils. Due to a cycle dependency I can't use CommonUtils here.\n// That's to be fixed. the discard popover thingy shouldn't be in the common utils at all\nfunction getAppComponent(oControl: any): AppComponent {\n\tif (oControl.isA(\"sap.fe.core.AppComponent\")) {\n\t\treturn oControl;\n\t}\n\tconst oOwner = Component.getOwnerComponentFor(oControl);\n\tif (!oOwner) {\n\t\treturn oControl;\n\t} else {\n\t\treturn getAppComponent(oOwner);\n\t}\n}\n\nfunction getMe(view: View): User {\n\tconst shellServiceHelper = getAppComponent(view).getShellServices();\n\tif (!shellServiceHelper || !shellServiceHelper.hasUShell()) {\n\t\tthrow \"No Shell... No User\";\n\t}\n\tconst me: User = {\n\t\tinitials: shellServiceHelper.getUser().getInitials(),\n\t\tid: shellServiceHelper.getUser().getId(),\n\t\tname: shellServiceHelper.getUser().getFullName() + \" (\" + getText(\"C_COLLABORATIONDRAFT_YOU\") + \")\",\n\t\tinitialName: shellServiceHelper.getUser().getFullName(),\n\t\tcolor: 6, //  same color as FLP...\n\t\trole: Role.Owner,\n\t\tme: true\n\t};\n\n\treturn me;\n}\n\nfunction getText(textId: string, ...args: string[]): string {\n\tconst oResourceModel = (Core as CoreEx).getLibraryResourceBundle(\"sap.fe.core\");\n\treturn oResourceModel.getText(textId, args);\n}\n\nexport const CollaborationUtils = {\n\tformatInitials: formatInitials,\n\tgetUserColor: getUserColor,\n\tgetMe: getMe,\n\tgetAppComponent: getAppComponent,\n\tgetText: getText\n};\n"]}

package/src/sap/fe/core/{actions → controllerextensions}/collaboration/CollaborationCommon.ts

@@ -1,6 +1,8 @@
-import View from "sap/ui/core/mvc/View";
-import Component from "sap/ui/core/Component";
 import AppComponent from "sap/fe/core/AppComponent";
+import Component from "sap/ui/core/Component";
+import Core from "sap/ui/core/Core";
+import View from "sap/ui/core/mvc/View";
+import { CoreEx } from "../../../../../../../../types/extension_types";
 
 export type User = {
 	id: string;
@@ -10,6 +12,7 @@ export type User = {
 	color?: number;
 	transient?: boolean;
 	me?: boolean;
+	initialName?: string;
 };
 
 export type UserActivity = User & {
@@ -46,7 +49,7 @@ export type Message = {
 function formatInitials(fullName: string): string {
 	// remove titles - those are the ones from S/4 to be checked if there are others
 	const academicTitles = ["Dr.", "Prof.", "Prof. Dr.", "B.A.", "MBA", "Ph.D."];
-	academicTitles.forEach(function(academicTitle) {
+	academicTitles.forEach(function (academicTitle) {
 		fullName = fullName.replace(academicTitle, "");
 	});
 
@@ -64,13 +67,13 @@ function formatInitials(fullName: string): string {
 
 function getUserColor(UserID: string, activeUsers: User[], invitedUsers: User[]) {
 	// search if user is known
-	const user = activeUsers.find(u => u.id === UserID);
+	const user = activeUsers.find((u) => u.id === UserID);
 	if (user) {
 		return user.color;
 	} else {
 		// search for next free color
 		for (let i = 1; i <= 10; i++) {
-			if (activeUsers.findIndex(u => u.color === i) === -1 && invitedUsers.findIndex(u => u.color === i) === -1) {
+			if (activeUsers.findIndex((u) => u.color === i) === -1 && invitedUsers.findIndex((u) => u.color === i) === -1) {
 				return i;
 			}
 		}
@@ -102,18 +105,25 @@ function getMe(view: View): User {
 	const me: User = {
 		initials: shellServiceHelper.getUser().getInitials(),
 		id: shellServiceHelper.getUser().getId(),
-		name: shellServiceHelper.getUser().getFullName(),
+		name: shellServiceHelper.getUser().getFullName() + " (" + getText("C_COLLABORATIONDRAFT_YOU") + ")",
+		initialName: shellServiceHelper.getUser().getFullName(),
 		color: 6, //  same color as FLP...
 		role: Role.Owner,
 		me: true
 	};
-	me.name += " (You)"; // TODO resource bundle
+
 	return me;
 }
 
+function getText(textId: string, ...args: string[]): string {
+	const oResourceModel = (Core as CoreEx).getLibraryResourceBundle("sap.fe.core");
+	return oResourceModel.getText(textId, args);
+}
+
 export const CollaborationUtils = {
 	formatInitials: formatInitials,
 	getUserColor: getUserColor,
 	getMe: getMe,
-	getAppComponent: getAppComponent
+	getAppComponent: getAppComponent,
+	getText: getText
 };