@sapui5/sap.fe.test 1.107.1 → 1.108.0

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@sapui5/sap.fe.test",
-	"version": "1.107.1",
+	"version": "1.108.0",
 	"description": "SAPUI5 Library sap.fe.test",
 	"license": "SEE LICENSE IN LICENSE.txt",
 	"author": "SAP SE (https://www.sap.com)",

package/src/sap/fe/test/.library

@@ -6,7 +6,7 @@
     <copyright>SAP UI development toolkit for HTML5 (SAPUI5)
         (c) Copyright 2009-2021 SAP SE. All rights reserved
     </copyright>
-    <version>1.107.1</version>
+    <version>1.108.0</version>
 
     <documentation>UI5 library: sap.fe.test</documentation>
 

package/src/sap/fe/test/CollaborationClient.js

@@ -67,6 +67,14 @@ sap.ui.define(["sap/fe/core/controllerextensions/collaboration/CollaborationComm
               userAction: Activity.Leave
             });
           }).description("Remote session received notification on default user leaving the draft session").execute();
+        },
+        iCheckDefaultUserEnteredDraft: function () {
+          return OpaBuilder.create(this).check(function () {
+            return CollaborationAPI.checkReceived({
+              userID: "DEFAULT_USER",
+              userAction: Activity.Join
+            });
+          }).description("Remote session received notification on default user entering the draft session").execute();
         }
       }
     };
@@ -74,4 +82,4 @@ sap.ui.define(["sap/fe/core/controllerextensions/collaboration/CollaborationComm
 
   return CollaborationClient;
 }, false);
-//# sourceMappingURL=data:application/json;charset=utf-8;base64,{"version":3,"names":["CollaborationClient","oPageDefinition","sAppId","appId","sComponentId","componentId","viewId","actions","iEnterDraft","userID","userName","OpaBuilder","create","hasId","do","view","oContext","getBindingContext","CollaborationAPI","enterDraft","description","execute","iLeaveDraft","leaveDraft","iLockPropertyForEdition","sPropertyPath","startLiveChange","iUnlockPropertyForEdition","undoChange","iUpdatePropertyValue","value","updatePropertyValue","iDiscardDraft","discardDraft","iDeleteDraft","deleteDraft","assertions","iCheckDefaultUserChangedValue","check","checkReceived","userAction","Activity","Change","clientContent","iCheckDefaultUserLeftDraft","Leave"],"sourceRoot":".","sources":["CollaborationClient.ts"],"sourcesContent":["import { Activity } from \"sap/fe/core/controllerextensions/collaboration/CollaborationCommon\";\nimport CollaborationAPI from \"sap/fe/test/api/CollaborationAPI\";\nimport type Opa5 from \"sap/ui/test/Opa5\";\nimport OpaBuilder from \"sap/ui/test/OpaBuilder\";\n\nfunction CollaborationClient(oPageDefinition: { appId: string; componentId: string }) {\n\tconst sAppId = oPageDefinition.appId,\n\t\tsComponentId = oPageDefinition.componentId,\n\t\tviewId = `${sAppId}::${sComponentId}`;\n\n\treturn {\n\t\tactions: {\n\t\t\tiEnterDraft: function (userID: string, userName: string) {\n\t\t\t\treturn OpaBuilder.create(this as any as Opa5)\n\t\t\t\t\t.hasId(viewId)\n\t\t\t\t\t.do(function (view: any) {\n\t\t\t\t\t\tconst oContext = view.getBindingContext();\n\t\t\t\t\t\tCollaborationAPI.enterDraft(oContext, userID, userName);\n\t\t\t\t\t})\n\t\t\t\t\t.viewId(\"\")\n\t\t\t\t\t.description(\"Remote session entering draft\")\n\t\t\t\t\t.execute();\n\t\t\t},\n\n\t\t\tiLeaveDraft: function () {\n\t\t\t\treturn OpaBuilder.create(this as any as Opa5)\n\t\t\t\t\t.do(function () {\n\t\t\t\t\t\tCollaborationAPI.leaveDraft();\n\t\t\t\t\t})\n\t\t\t\t\t.description(\"Remote session leaving draft\")\n\t\t\t\t\t.execute();\n\t\t\t},\n\n\t\t\tiLockPropertyForEdition: function (sPropertyPath: string) {\n\t\t\t\treturn OpaBuilder.create(this as any as Opa5)\n\t\t\t\t\t.do(function () {\n\t\t\t\t\t\tCollaborationAPI.startLiveChange(sPropertyPath);\n\t\t\t\t\t})\n\t\t\t\t\t.description(`Remote session locking property ${sPropertyPath}`)\n\t\t\t\t\t.execute();\n\t\t\t},\n\n\t\t\tiUnlockPropertyForEdition: function () {\n\t\t\t\treturn OpaBuilder.create(this as any as Opa5)\n\t\t\t\t\t.do(function () {\n\t\t\t\t\t\tCollaborationAPI.undoChange();\n\t\t\t\t\t})\n\t\t\t\t\t.description(\"Remote session unlocking property \")\n\t\t\t\t\t.execute();\n\t\t\t},\n\n\t\t\tiUpdatePropertyValue: function (sPropertyPath: string, value: any) {\n\t\t\t\treturn OpaBuilder.create(this as any as Opa5)\n\t\t\t\t\t.do(function () {\n\t\t\t\t\t\tCollaborationAPI.updatePropertyValue(sPropertyPath, value);\n\t\t\t\t\t})\n\t\t\t\t\t.description(`Remote session updating property ${sPropertyPath} with ${value}`)\n\t\t\t\t\t.execute();\n\t\t\t},\n\n\t\t\tiDiscardDraft: function () {\n\t\t\t\treturn OpaBuilder.create(this as any as Opa5)\n\t\t\t\t\t.do(function () {\n\t\t\t\t\t\tCollaborationAPI.discardDraft();\n\t\t\t\t\t})\n\t\t\t\t\t.description(\"Remote session discarding draft\")\n\t\t\t\t\t.execute();\n\t\t\t},\n\n\t\t\tiDeleteDraft: function () {\n\t\t\t\treturn OpaBuilder.create(this as any as Opa5)\n\t\t\t\t\t.do(function () {\n\t\t\t\t\t\tCollaborationAPI.deleteDraft();\n\t\t\t\t\t})\n\t\t\t\t\t.description(\"Remote session deleting draft\")\n\t\t\t\t\t.execute();\n\t\t\t}\n\t\t},\n\t\tassertions: {\n\t\t\tiCheckDefaultUserChangedValue: function (sPropertyPath: string) {\n\t\t\t\treturn OpaBuilder.create(this as any as Opa5)\n\t\t\t\t\t.check(function () {\n\t\t\t\t\t\treturn CollaborationAPI.checkReceived({\n\t\t\t\t\t\t\tuserID: \"DEFAULT_USER\",\n\t\t\t\t\t\t\tuserAction: Activity.Change,\n\t\t\t\t\t\t\tclientContent: sPropertyPath\n\t\t\t\t\t\t});\n\t\t\t\t\t})\n\t\t\t\t\t.description(`Remote session received change notification for${sPropertyPath} changed`)\n\t\t\t\t\t.execute();\n\t\t\t},\n\n\t\t\tiCheckDefaultUserLeftDraft: function () {\n\t\t\t\treturn OpaBuilder.create(this as any as Opa5)\n\t\t\t\t\t.check(function () {\n\t\t\t\t\t\treturn CollaborationAPI.checkReceived({ userID: \"DEFAULT_USER\", userAction: Activity.Leave });\n\t\t\t\t\t})\n\t\t\t\t\t.description(\"Remote session received notification on default user leaving the draft session\")\n\t\t\t\t\t.execute();\n\t\t\t}\n\t\t}\n\t};\n}\n\nexport default CollaborationClient;\n"],"mappings":"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"}
+//# sourceMappingURL=data:application/json;charset=utf-8;base64,{"version":3,"names":["CollaborationClient","oPageDefinition","sAppId","appId","sComponentId","componentId","viewId","actions","iEnterDraft","userID","userName","OpaBuilder","create","hasId","do","view","oContext","getBindingContext","CollaborationAPI","enterDraft","description","execute","iLeaveDraft","leaveDraft","iLockPropertyForEdition","sPropertyPath","startLiveChange","iUnlockPropertyForEdition","undoChange","iUpdatePropertyValue","value","updatePropertyValue","iDiscardDraft","discardDraft","iDeleteDraft","deleteDraft","assertions","iCheckDefaultUserChangedValue","check","checkReceived","userAction","Activity","Change","clientContent","iCheckDefaultUserLeftDraft","Leave","iCheckDefaultUserEnteredDraft","Join"],"sourceRoot":".","sources":["CollaborationClient.ts"],"sourcesContent":["import { Activity } from \"sap/fe/core/controllerextensions/collaboration/CollaborationCommon\";\nimport CollaborationAPI from \"sap/fe/test/api/CollaborationAPI\";\nimport type Opa5 from \"sap/ui/test/Opa5\";\nimport OpaBuilder from \"sap/ui/test/OpaBuilder\";\n\nfunction CollaborationClient(oPageDefinition: { appId: string; componentId: string }) {\n\tconst sAppId = oPageDefinition.appId,\n\t\tsComponentId = oPageDefinition.componentId,\n\t\tviewId = `${sAppId}::${sComponentId}`;\n\n\treturn {\n\t\tactions: {\n\t\t\tiEnterDraft: function (userID: string, userName: string) {\n\t\t\t\treturn OpaBuilder.create(this as any as Opa5)\n\t\t\t\t\t.hasId(viewId)\n\t\t\t\t\t.do(function (view: any) {\n\t\t\t\t\t\tconst oContext = view.getBindingContext();\n\t\t\t\t\t\tCollaborationAPI.enterDraft(oContext, userID, userName);\n\t\t\t\t\t})\n\t\t\t\t\t.viewId(\"\")\n\t\t\t\t\t.description(\"Remote session entering draft\")\n\t\t\t\t\t.execute();\n\t\t\t},\n\n\t\t\tiLeaveDraft: function () {\n\t\t\t\treturn OpaBuilder.create(this as any as Opa5)\n\t\t\t\t\t.do(function () {\n\t\t\t\t\t\tCollaborationAPI.leaveDraft();\n\t\t\t\t\t})\n\t\t\t\t\t.description(\"Remote session leaving draft\")\n\t\t\t\t\t.execute();\n\t\t\t},\n\n\t\t\tiLockPropertyForEdition: function (sPropertyPath: string) {\n\t\t\t\treturn OpaBuilder.create(this as any as Opa5)\n\t\t\t\t\t.do(function () {\n\t\t\t\t\t\tCollaborationAPI.startLiveChange(sPropertyPath);\n\t\t\t\t\t})\n\t\t\t\t\t.description(`Remote session locking property ${sPropertyPath}`)\n\t\t\t\t\t.execute();\n\t\t\t},\n\n\t\t\tiUnlockPropertyForEdition: function () {\n\t\t\t\treturn OpaBuilder.create(this as any as Opa5)\n\t\t\t\t\t.do(function () {\n\t\t\t\t\t\tCollaborationAPI.undoChange();\n\t\t\t\t\t})\n\t\t\t\t\t.description(\"Remote session unlocking property \")\n\t\t\t\t\t.execute();\n\t\t\t},\n\n\t\t\tiUpdatePropertyValue: function (sPropertyPath: string, value: any) {\n\t\t\t\treturn OpaBuilder.create(this as any as Opa5)\n\t\t\t\t\t.do(function () {\n\t\t\t\t\t\tCollaborationAPI.updatePropertyValue(sPropertyPath, value);\n\t\t\t\t\t})\n\t\t\t\t\t.description(`Remote session updating property ${sPropertyPath} with ${value}`)\n\t\t\t\t\t.execute();\n\t\t\t},\n\n\t\t\tiDiscardDraft: function () {\n\t\t\t\treturn OpaBuilder.create(this as any as Opa5)\n\t\t\t\t\t.do(function () {\n\t\t\t\t\t\tCollaborationAPI.discardDraft();\n\t\t\t\t\t})\n\t\t\t\t\t.description(\"Remote session discarding draft\")\n\t\t\t\t\t.execute();\n\t\t\t},\n\n\t\t\tiDeleteDraft: function () {\n\t\t\t\treturn OpaBuilder.create(this as any as Opa5)\n\t\t\t\t\t.do(function () {\n\t\t\t\t\t\tCollaborationAPI.deleteDraft();\n\t\t\t\t\t})\n\t\t\t\t\t.description(\"Remote session deleting draft\")\n\t\t\t\t\t.execute();\n\t\t\t}\n\t\t},\n\t\tassertions: {\n\t\t\tiCheckDefaultUserChangedValue: function (sPropertyPath: string) {\n\t\t\t\treturn OpaBuilder.create(this as any as Opa5)\n\t\t\t\t\t.check(function () {\n\t\t\t\t\t\treturn CollaborationAPI.checkReceived({\n\t\t\t\t\t\t\tuserID: \"DEFAULT_USER\",\n\t\t\t\t\t\t\tuserAction: Activity.Change,\n\t\t\t\t\t\t\tclientContent: sPropertyPath\n\t\t\t\t\t\t});\n\t\t\t\t\t})\n\t\t\t\t\t.description(`Remote session received change notification for${sPropertyPath} changed`)\n\t\t\t\t\t.execute();\n\t\t\t},\n\n\t\t\tiCheckDefaultUserLeftDraft: function () {\n\t\t\t\treturn OpaBuilder.create(this as any as Opa5)\n\t\t\t\t\t.check(function () {\n\t\t\t\t\t\treturn CollaborationAPI.checkReceived({ userID: \"DEFAULT_USER\", userAction: Activity.Leave });\n\t\t\t\t\t})\n\t\t\t\t\t.description(\"Remote session received notification on default user leaving the draft session\")\n\t\t\t\t\t.execute();\n\t\t\t},\n\n\t\t\tiCheckDefaultUserEnteredDraft: function () {\n\t\t\t\treturn OpaBuilder.create(this as any as Opa5)\n\t\t\t\t\t.check(function () {\n\t\t\t\t\t\treturn CollaborationAPI.checkReceived({ userID: \"DEFAULT_USER\", userAction: Activity.Join });\n\t\t\t\t\t})\n\t\t\t\t\t.description(\"Remote session received notification on default user entering the draft session\")\n\t\t\t\t\t.execute();\n\t\t\t}\n\t\t}\n\t};\n}\n\nexport default CollaborationClient;\n"],"mappings":"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"}

package/src/sap/fe/test/CollaborationClient.ts

@@ -97,6 +97,15 @@ function CollaborationClient(oPageDefinition: { appId: string; componentId: stri
 					})
 					.description("Remote session received notification on default user leaving the draft session")
 					.execute();
+			},
+
+			iCheckDefaultUserEnteredDraft: function () {
+				return OpaBuilder.create(this as any as Opa5)
+					.check(function () {
+						return CollaborationAPI.checkReceived({ userID: "DEFAULT_USER", userAction: Activity.Join });
+					})
+					.description("Remote session received notification on default user entering the draft session")
+					.execute();
 			}
 		}
 	};

package/src/sap/fe/test/ObjectPage.js

@@ -293,7 +293,7 @@ sap.ui.define(
 							iClickQuickViewCancelButton: function () {
 								return OpaBuilder.create(this)
 									.hasType("sap.m.Button")
-									.has("Cancek")
+									.has(OpaBuilder.Matchers.resourceBundle("text", "sap.ui.mdc", "p13nDialog.CANCEL"))
 									.doPress()
 									.description("Pressing Quickview 'Cancel' button")
 									.execute();
@@ -439,15 +439,6 @@ sap.ui.define(
 									.description("Entering '" + sValue + " in field ")
 									.execute();
 							},
-
-							iOpenVHDInDialog: function (sFieldId) {
-								return OpaBuilder.create(this)
-									.isDialogElement()
-									.hasId(sFieldId + "-inner-vhi")
-									.doPress()
-									.description("Opening value help for '" + sFieldId + "' from within a dialog")
-									.execute();
-							},
 							iClickOnMessageButton: function () {
 								return OpaBuilder.create(this)
 

package/src/sap/fe/test/Utils.js

@@ -24,20 +24,8 @@ sap.ui.define(
 			}
 			var oUriParams = new UriParameters(window.location.href),
 				sDeltaManifest = oUriParams.get("manifest"),
-				sUser = oUriParams.get("user"),
-				sTenantID,
-				sMainServiceUri = "",
-				oDefaultManifest = LoaderExtensions.loadResource(sComponentName + "/manifest.json");
+				oTargetManifest = LoaderExtensions.loadResource(sComponentName + "/manifest.json");
 
-			try {
-				if (window.parent.__karma__.config.ui5.config.usetenants) {
-					sTenantID = window.parent.__karma__.config.ui5.shardIndex;
-				}
-			} catch (error) {
-				sTenantID = undefined;
-			}
-
-			var oTargetManifest = oDefaultManifest;
 			if (sDeltaManifest) {
 				sDeltaManifest.split(",").forEach(function (sSingleDeltaManifest) {
 					if (sSingleDeltaManifest.indexOf("/") !== 0) {
@@ -51,13 +39,13 @@ sap.ui.define(
 				});
 			}
 
-			if (sTenantID !== undefined && oTargetManifest["sap.app"].tenantSupport !== false) {
-				sMainServiceUri += "/tenant-" + sTenantID;
-				oTargetManifest.tenantID = sTenantID;
+			var uri = new URL(oTargetManifest["sap.app"].dataSources.mainService.uri, document.location);
+			var sUser = oUriParams.get("user");
+			if (sUser) {
+				uri.searchParams.set("user", sUser);
 			}
 
-			oTargetManifest["sap.app"].dataSources.mainService.uri =
-				sMainServiceUri + oTargetManifest["sap.app"].dataSources.mainService.uri + (sUser ? "?u=" + sUser : "");
+			oTargetManifest["sap.app"].dataSources.mainService.uri = uri.toString();
 
 			return oTargetManifest;
 		};

package/src/sap/fe/test/api/APIHelper.js

@@ -7,54 +7,39 @@ sap.ui.define(["sap/fe/test/Utils", "sap/ui/test/OpaBuilder", "sap/fe/test/build
 	"use strict";
 
 	var APIHelper = {
-		createSaveAsTileBuilder: function () {
-			return new FEBuilder().isDialogElement().hasType("sap.ushell.ui.footerbar.AddBookmarkButton");
-		},
-
 		createSaveAsTileCheckBuilder: function (mState) {
-			return APIHelper.createSaveAsTileBuilder()
+			return APIHelper.createMenuActionCheckBuilder({ icon: "sap-icon://add-favorite" })
 				.hasState(mState)
 				.description(Utils.formatMessage("Checking 'Save as Tile' action in state '{0}'", mState));
 		},
 
 		createSaveAsTileExecutorBuilder: function (sBookmarkTitle) {
-			return APIHelper.createSaveAsTileBuilder()
-				.doPress()
-				.description("Executing 'Save as Tile' action")
-				.success(
-					FEBuilder.create()
-						.isDialogElement()
-						.hasType("sap.m.Input")
-						.hasProperties({ id: "bookmarkTitleInput" })
-						.doEnterText(sBookmarkTitle)
-						.description(Utils.formatMessage("Enter '{0}' as Bookmark title", sBookmarkTitle))
-						.success(
-							FEBuilder.create()
-								.isDialogElement()
-								.hasType("sap.m.Button")
-								.hasProperties({ id: "bookmarkOkBtn" })
-								.doPress()
-								.description("Confirm 'Save as Tile' dialog")
-						)
-				);
-		},
-
-		createSendEmailBuilder: function () {
-			return new FEBuilder()
-				.isDialogElement()
-				.hasType("sap.m.Button")
-				.hasProperties({ icon: "sap-icon://email" })
-				.has(OpaBuilder.Matchers.resourceBundle("text", "sap.fe.core", "T_SEMANTIC_CONTROL_SEND_EMAIL"));
+			return APIHelper.createMenuActionExecutorBuilder({ icon: "sap-icon://add-favorite" }).success(
+				FEBuilder.create()
+					.isDialogElement()
+					.hasType("sap.m.Input")
+					.hasProperties({ id: "bookmarkTitleInput" })
+					.doEnterText(sBookmarkTitle)
+					.description(Utils.formatMessage("Enter '{0}' as Bookmark title", sBookmarkTitle))
+					.success(
+						FEBuilder.create()
+							.isDialogElement()
+							.hasType("sap.m.Button")
+							.hasProperties({ id: "bookmarkOkBtn" })
+							.doPress()
+							.description("Confirm 'Save as Tile' dialog")
+					)
+			);
 		},
 
 		createSendEmailCheckBuilder: function (mState) {
-			return APIHelper.createSendEmailBuilder()
+			return APIHelper.createMenuActionCheckBuilder({ icon: "sap-icon://email" })
 				.hasState(mState)
 				.description(Utils.formatMessage("Checking 'Send Email' action in state '{0}'", mState));
 		},
 
 		createSendEmailExecutorBuilder: function () {
-			return APIHelper.createSendEmailBuilder().doPress().description("Executing 'Send Email' action");
+			return APIHelper.createMenuActionExecutorBuilder({ icon: "sap-icon://email" }).description("Executing 'Send Email' action");
 		},
 
 		createMenuAndListActionMatcher: function (vAction, bReturnAction) {

package/src/sap/fe/test/api/CollaborationAPI.js

@@ -34,11 +34,12 @@ sap.ui.define(["sap/base/Log", "sap/fe/core/controllerextensions/collaboration/A
 
       var sDraftUUID = oContext.getProperty("DraftAdministrativeData/DraftUUID");
       this._internalModel = new JSONModel({});
+      var serviceUrl = oContext.getModel().getServiceUrl();
       initializeCollaboration({
         id: userID,
         name: userName,
         initialName: userName
-      }, webSocketBaseURL, sDraftUUID, this._internalModel, this._onMessageReceived.bind(this), true);
+      }, webSocketBaseURL, sDraftUUID, serviceUrl, this._internalModel, this._onMessageReceived.bind(this), true);
       this._rootPath = oContext.getPath();
       this._oModel = oContext.getModel();
     },
@@ -212,4 +213,4 @@ sap.ui.define(["sap/base/Log", "sap/fe/core/controllerextensions/collaboration/A
   };
   return CollaborationAPI;
 }, false);
-//# sourceMappingURL=data:application/json;charset=utf-8;base64,{"version":3,"names":["CollaborationAPI","_lastReceivedMessage","undefined","_rootPath","_oModel","_lockedPropertyPath","_internalModel","enterDraft","oContext","userID","userName","webSocketBaseURL","getModel","getMetaModel","getObject","Log","error","sDraftUUID","getProperty","JSONModel","initializeCollaboration","id","name","initialName","_onMessageReceived","bind","getPath","checkReceived","message","found","userAction","clientContent","leaveDraft","endCollaboration","destroy","startLiveChange","sPropertyPath","undoChange","broadcastCollaborationMessage","Activity","LiveChange","updatePropertyValue","value","oContextBinding","bindContext","$$patchWithoutSideEffects","$$groupId","$$updateGroupId","oPropertyBinding","bindProperty","getBoundContext","requestValue","then","setValue","attachEventOnce","Change","catch","err","Undo","discardDraft","draftContext","_getDraftContext","requestProperty","draft","deleteDraft","Discard","replace","activeContext","context","requestCanonicalPath","delete","Delete","oMessage","clientAction","Join","JoinEcho"],"sourceRoot":".","sources":["CollaborationAPI.ts"],"sourcesContent":["import Log from \"sap/base/Log\";\nimport {\n\tbroadcastCollaborationMessage,\n\tendCollaboration,\n\tinitializeCollaboration\n} from \"sap/fe/core/controllerextensions/collaboration/ActivityBase\";\nimport type { Message } from \"sap/fe/core/controllerextensions/collaboration/CollaborationCommon\";\nimport { Activity } from \"sap/fe/core/controllerextensions/collaboration/CollaborationCommon\";\nimport draft from \"sap/fe/core/controllerextensions/editFlow/draft\";\nimport type Context from \"sap/ui/model/Context\";\nimport JSONModel from \"sap/ui/model/json/JSONModel\";\nimport type ODataModel from \"sap/ui/model/odata/v4/ODataModel\";\n\nconst CollaborationAPI = {\n\t_lastReceivedMessage: undefined as Message | undefined,\n\t_rootPath: \"\",\n\t_oModel: undefined as ODataModel | undefined,\n\t_lockedPropertyPath: \"\",\n\t_internalModel: undefined as JSONModel | undefined,\n\n\t/**\n\t * Open an existing collaborative draft with a new user, and creates a 'ghost client' for this user.\n\t *\n\t * @param oContext The context of the collaborative draft\n\t * @param userID The ID of the user\n\t * @param userName The name of the user\n\t */\n\tenterDraft: function (oContext: Context, userID: string, userName: string) {\n\t\tconst webSocketBaseURL: string = oContext.getModel().getMetaModel().getObject(\"/@com.sap.vocabularies.Common.v1.WebSocketBaseURL\");\n\n\t\tif (!webSocketBaseURL) {\n\t\t\tLog.error(\"Cannot find WebSocketBaseURL annotation\");\n\t\t\treturn;\n\t\t}\n\n\t\tconst sDraftUUID: string = oContext.getProperty(\"DraftAdministrativeData/DraftUUID\");\n\t\tthis._internalModel = new JSONModel({});\n\n\t\tinitializeCollaboration(\n\t\t\t{\n\t\t\t\tid: userID,\n\t\t\t\tname: userName,\n\t\t\t\tinitialName: userName\n\t\t\t},\n\t\t\twebSocketBaseURL,\n\t\t\tsDraftUUID,\n\t\t\tthis._internalModel,\n\t\t\tthis._onMessageReceived.bind(this),\n\t\t\ttrue\n\t\t);\n\n\t\tthis._rootPath = oContext.getPath();\n\t\tthis._oModel = oContext.getModel() as ODataModel;\n\t},\n\n\t/**\n\t * Checks if the ghost client has revieved a given message.\n\t *\n\t * @param message The message content to be looked for\n\t * @returns True if the last recieved message matches the content\n\t */\n\tcheckReceived: function (message: Partial<Message>): boolean {\n\t\tif (!this._lastReceivedMessage) {\n\t\t\treturn false;\n\t\t}\n\n\t\tconst found =\n\t\t\t(!message.userID || message.userID === this._lastReceivedMessage.userID) &&\n\t\t\t(!message.userAction || message.userAction === this._lastReceivedMessage.userAction) &&\n\t\t\t(!message.clientContent || message.clientContent === this._lastReceivedMessage.clientContent);\n\n\t\tthis._lastReceivedMessage = undefined; // reset history to avoid finding the same message twice\n\n\t\treturn found;\n\t},\n\n\t/**\n\t * Closes the ghost client and removes the user from the collaborative draft.\n\t */\n\tleaveDraft: function () {\n\t\tif (this._internalModel) {\n\t\t\tendCollaboration(this._internalModel);\n\t\t\tthis._internalModel.destroy();\n\t\t\tthis._internalModel = undefined;\n\t\t}\n\t},\n\n\t/**\n\t * Simulates that the user starts typing in an input (live change).\n\t *\n\t * @param sPropertyPath The path of the property being modified\n\t */\n\tstartLiveChange: function (sPropertyPath: string) {\n\t\tif (this._internalModel) {\n\t\t\tif (this._lockedPropertyPath) {\n\t\t\t\t// Unlock previous property path\n\t\t\t\tthis.undoChange();\n\t\t\t}\n\t\t\tthis._lockedPropertyPath = sPropertyPath;\n\t\t\tbroadcastCollaborationMessage(Activity.LiveChange, `${this._rootPath}/${sPropertyPath}`, this._internalModel);\n\t\t}\n\t},\n\n\t/**\n\t * Simulates that the user has modified a property.\n\t *\n\t * @param sPropertyPath The path of the property being modified\n\t * @param value The new value of the property being modified\n\t */\n\tupdatePropertyValue: function (sPropertyPath: string, value: any) {\n\t\tif (this._internalModel) {\n\t\t\tif (this._lockedPropertyPath !== sPropertyPath) {\n\t\t\t\tthis.startLiveChange(sPropertyPath);\n\t\t\t}\n\n\t\t\tconst oContextBinding = this._oModel!.bindContext(this._rootPath, undefined, {\n\t\t\t\t$$patchWithoutSideEffects: true,\n\t\t\t\t$$groupId: \"$auto\",\n\t\t\t\t$$updateGroupId: \"$auto\"\n\t\t\t});\n\n\t\t\tconst oPropertyBinding = this._oModel!.bindProperty(sPropertyPath, oContextBinding.getBoundContext());\n\n\t\t\toPropertyBinding\n\t\t\t\t.requestValue()\n\t\t\t\t.then(() => {\n\t\t\t\t\toPropertyBinding.setValue(value);\n\t\t\t\t\toContextBinding.attachEventOnce(\"patchCompleted\", () => {\n\t\t\t\t\t\tbroadcastCollaborationMessage(Activity.Change, `${this._rootPath}/${sPropertyPath}`, this._internalModel!);\n\t\t\t\t\t\tthis._lockedPropertyPath = \"\";\n\t\t\t\t\t});\n\t\t\t\t})\n\t\t\t\t.catch(function (err) {\n\t\t\t\t\tLog.error(err);\n\t\t\t\t});\n\t\t}\n\t},\n\n\t/**\n\t * Simulates that the user did an 'undo' (to be called after startLiveChange).\n\t */\n\tundoChange: function () {\n\t\tif (this._lockedPropertyPath) {\n\t\t\tbroadcastCollaborationMessage(Activity.Undo, `${this._rootPath}/${this._lockedPropertyPath}`, this._internalModel!);\n\t\t\tthis._lockedPropertyPath = \"\";\n\t\t}\n\t},\n\n\t/**\n\t * Simulates that the user has discarded the draft.\n\t */\n\tdiscardDraft: function () {\n\t\tif (this._internalModel) {\n\t\t\tconst draftContext = this._getDraftContext();\n\n\t\t\tdraftContext\n\t\t\t\t.requestProperty(\"IsActiveEntity\")\n\t\t\t\t.then(() => {\n\t\t\t\t\tdraft.deleteDraft(draftContext);\n\t\t\t\t})\n\t\t\t\t.then(() => {\n\t\t\t\t\tbroadcastCollaborationMessage(\n\t\t\t\t\t\tActivity.Discard,\n\t\t\t\t\t\tthis._rootPath.replace(\"IsActiveEntity=false\", \"IsActiveEntity=true\"),\n\t\t\t\t\t\tthis._internalModel!\n\t\t\t\t\t);\n\t\t\t\t\tthis._internalModel!.destroy();\n\t\t\t\t\tthis._internalModel = undefined;\n\t\t\t\t})\n\t\t\t\t.catch(function (err: any) {\n\t\t\t\t\tLog.error(err);\n\t\t\t\t});\n\t\t}\n\t},\n\n\t/**\n\t * Simulates that the user has deleted the draft.\n\t */\n\tdeleteDraft: function () {\n\t\tif (this._internalModel) {\n\t\t\tconst draftContext = this._getDraftContext();\n\t\t\tlet activeContext: Context;\n\n\t\t\tdraftContext\n\t\t\t\t.requestProperty(\"IsActiveEntity\")\n\t\t\t\t.then(() => {\n\t\t\t\t\treturn draftContext.getModel().bindContext(`${this._rootPath}/SiblingEntity`).getBoundContext();\n\t\t\t\t})\n\t\t\t\t.then((context: any) => {\n\t\t\t\t\tactiveContext = context;\n\t\t\t\t\treturn context.requestCanonicalPath();\n\t\t\t\t})\n\t\t\t\t.then(() => {\n\t\t\t\t\treturn draft.deleteDraft(draftContext);\n\t\t\t\t})\n\t\t\t\t.then(() => {\n\t\t\t\t\t(activeContext as any).delete();\n\t\t\t\t\tbroadcastCollaborationMessage(Activity.Delete, this._rootPath, this._internalModel!);\n\t\t\t\t\tthis._internalModel!.destroy();\n\t\t\t\t\tthis._internalModel = undefined;\n\t\t\t\t})\n\t\t\t\t.catch(function (err: any) {\n\t\t\t\t\tLog.error(err);\n\t\t\t\t});\n\t\t}\n\t},\n\n\t// /////////////////////////////\n\t// Private methods\n\n\t_getDraftContext: function (): any {\n\t\treturn this._oModel!.bindContext(this._rootPath, undefined, {\n\t\t\t$$patchWithoutSideEffects: true,\n\t\t\t$$groupId: \"$auto\",\n\t\t\t$$updateGroupId: \"$auto\"\n\t\t}).getBoundContext();\n\t},\n\n\t/**\n\t * Callback of the ghost client when receiving a message on the web socket.\n\t *\n\t * @param oMessage The message\n\t */\n\t_onMessageReceived: function (oMessage: Message) {\n\t\toMessage.userAction = oMessage.userAction || oMessage.clientAction;\n\t\tthis._lastReceivedMessage = oMessage;\n\n\t\tif (oMessage.userAction === Activity.Join) {\n\t\t\tbroadcastCollaborationMessage(\n\t\t\t\tActivity.JoinEcho,\n\t\t\t\tthis._lockedPropertyPath ? `${this._rootPath}/${this._lockedPropertyPath}` : undefined,\n\t\t\t\tthis._internalModel!\n\t\t\t);\n\t\t}\n\t}\n};\n\nexport default CollaborationAPI;\n"],"mappings":"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"}
+//# sourceMappingURL=data:application/json;charset=utf-8;base64,{"version":3,"names":["CollaborationAPI","_lastReceivedMessage","undefined","_rootPath","_oModel","_lockedPropertyPath","_internalModel","enterDraft","oContext","userID","userName","webSocketBaseURL","getModel","getMetaModel","getObject","Log","error","sDraftUUID","getProperty","JSONModel","serviceUrl","getServiceUrl","initializeCollaboration","id","name","initialName","_onMessageReceived","bind","getPath","checkReceived","message","found","userAction","clientContent","leaveDraft","endCollaboration","destroy","startLiveChange","sPropertyPath","undoChange","broadcastCollaborationMessage","Activity","LiveChange","updatePropertyValue","value","oContextBinding","bindContext","$$patchWithoutSideEffects","$$groupId","$$updateGroupId","oPropertyBinding","bindProperty","getBoundContext","requestValue","then","setValue","attachEventOnce","Change","catch","err","Undo","discardDraft","draftContext","_getDraftContext","requestProperty","draft","deleteDraft","Discard","replace","activeContext","context","requestCanonicalPath","delete","Delete","oMessage","clientAction","Join","JoinEcho"],"sourceRoot":".","sources":["CollaborationAPI.ts"],"sourcesContent":["import Log from \"sap/base/Log\";\nimport {\n\tbroadcastCollaborationMessage,\n\tendCollaboration,\n\tinitializeCollaboration\n} from \"sap/fe/core/controllerextensions/collaboration/ActivityBase\";\nimport type { Message } from \"sap/fe/core/controllerextensions/collaboration/CollaborationCommon\";\nimport { Activity } from \"sap/fe/core/controllerextensions/collaboration/CollaborationCommon\";\nimport draft from \"sap/fe/core/controllerextensions/editFlow/draft\";\nimport JSONModel from \"sap/ui/model/json/JSONModel\";\nimport type ODataModel from \"sap/ui/model/odata/v4/ODataModel\";\nimport type { V4Context } from \"types/extension_types\";\n\nconst CollaborationAPI = {\n\t_lastReceivedMessage: undefined as Message | undefined,\n\t_rootPath: \"\",\n\t_oModel: undefined as ODataModel | undefined,\n\t_lockedPropertyPath: \"\",\n\t_internalModel: undefined as JSONModel | undefined,\n\n\t/**\n\t * Open an existing collaborative draft with a new user, and creates a 'ghost client' for this user.\n\t *\n\t * @param oContext The context of the collaborative draft\n\t * @param userID The ID of the user\n\t * @param userName The name of the user\n\t */\n\tenterDraft: function (oContext: V4Context, userID: string, userName: string) {\n\t\tconst webSocketBaseURL: string = oContext.getModel().getMetaModel().getObject(\"/@com.sap.vocabularies.Common.v1.WebSocketBaseURL\");\n\n\t\tif (!webSocketBaseURL) {\n\t\t\tLog.error(\"Cannot find WebSocketBaseURL annotation\");\n\t\t\treturn;\n\t\t}\n\n\t\tconst sDraftUUID: string = oContext.getProperty(\"DraftAdministrativeData/DraftUUID\");\n\t\tthis._internalModel = new JSONModel({});\n\n\t\tconst serviceUrl = oContext.getModel().getServiceUrl();\n\n\t\tinitializeCollaboration(\n\t\t\t{\n\t\t\t\tid: userID,\n\t\t\t\tname: userName,\n\t\t\t\tinitialName: userName\n\t\t\t},\n\t\t\twebSocketBaseURL,\n\t\t\tsDraftUUID,\n\t\t\tserviceUrl,\n\t\t\tthis._internalModel,\n\t\t\tthis._onMessageReceived.bind(this),\n\t\t\ttrue\n\t\t);\n\n\t\tthis._rootPath = oContext.getPath();\n\t\tthis._oModel = oContext.getModel() as ODataModel;\n\t},\n\n\t/**\n\t * Checks if the ghost client has revieved a given message.\n\t *\n\t * @param message The message content to be looked for\n\t * @returns True if the last recieved message matches the content\n\t */\n\tcheckReceived: function (message: Partial<Message>): boolean {\n\t\tif (!this._lastReceivedMessage) {\n\t\t\treturn false;\n\t\t}\n\n\t\tconst found =\n\t\t\t(!message.userID || message.userID === this._lastReceivedMessage.userID) &&\n\t\t\t(!message.userAction || message.userAction === this._lastReceivedMessage.userAction) &&\n\t\t\t(!message.clientContent || message.clientContent === this._lastReceivedMessage.clientContent);\n\n\t\tthis._lastReceivedMessage = undefined; // reset history to avoid finding the same message twice\n\n\t\treturn found;\n\t},\n\n\t/**\n\t * Closes the ghost client and removes the user from the collaborative draft.\n\t */\n\tleaveDraft: function () {\n\t\tif (this._internalModel) {\n\t\t\tendCollaboration(this._internalModel);\n\t\t\tthis._internalModel.destroy();\n\t\t\tthis._internalModel = undefined;\n\t\t}\n\t},\n\n\t/**\n\t * Simulates that the user starts typing in an input (live change).\n\t *\n\t * @param sPropertyPath The path of the property being modified\n\t */\n\tstartLiveChange: function (sPropertyPath: string) {\n\t\tif (this._internalModel) {\n\t\t\tif (this._lockedPropertyPath) {\n\t\t\t\t// Unlock previous property path\n\t\t\t\tthis.undoChange();\n\t\t\t}\n\t\t\tthis._lockedPropertyPath = sPropertyPath;\n\t\t\tbroadcastCollaborationMessage(Activity.LiveChange, `${this._rootPath}/${sPropertyPath}`, this._internalModel);\n\t\t}\n\t},\n\n\t/**\n\t * Simulates that the user has modified a property.\n\t *\n\t * @param sPropertyPath The path of the property being modified\n\t * @param value The new value of the property being modified\n\t */\n\tupdatePropertyValue: function (sPropertyPath: string, value: any) {\n\t\tif (this._internalModel) {\n\t\t\tif (this._lockedPropertyPath !== sPropertyPath) {\n\t\t\t\tthis.startLiveChange(sPropertyPath);\n\t\t\t}\n\n\t\t\tconst oContextBinding = this._oModel!.bindContext(this._rootPath, undefined, {\n\t\t\t\t$$patchWithoutSideEffects: true,\n\t\t\t\t$$groupId: \"$auto\",\n\t\t\t\t$$updateGroupId: \"$auto\"\n\t\t\t});\n\n\t\t\tconst oPropertyBinding = this._oModel!.bindProperty(sPropertyPath, oContextBinding.getBoundContext());\n\n\t\t\toPropertyBinding\n\t\t\t\t.requestValue()\n\t\t\t\t.then(() => {\n\t\t\t\t\toPropertyBinding.setValue(value);\n\t\t\t\t\toContextBinding.attachEventOnce(\"patchCompleted\", () => {\n\t\t\t\t\t\tbroadcastCollaborationMessage(Activity.Change, `${this._rootPath}/${sPropertyPath}`, this._internalModel!);\n\t\t\t\t\t\tthis._lockedPropertyPath = \"\";\n\t\t\t\t\t});\n\t\t\t\t})\n\t\t\t\t.catch(function (err) {\n\t\t\t\t\tLog.error(err);\n\t\t\t\t});\n\t\t}\n\t},\n\n\t/**\n\t * Simulates that the user did an 'undo' (to be called after startLiveChange).\n\t */\n\tundoChange: function () {\n\t\tif (this._lockedPropertyPath) {\n\t\t\tbroadcastCollaborationMessage(Activity.Undo, `${this._rootPath}/${this._lockedPropertyPath}`, this._internalModel!);\n\t\t\tthis._lockedPropertyPath = \"\";\n\t\t}\n\t},\n\n\t/**\n\t * Simulates that the user has discarded the draft.\n\t */\n\tdiscardDraft: function () {\n\t\tif (this._internalModel) {\n\t\t\tconst draftContext = this._getDraftContext();\n\n\t\t\tdraftContext\n\t\t\t\t.requestProperty(\"IsActiveEntity\")\n\t\t\t\t.then(() => {\n\t\t\t\t\tdraft.deleteDraft(draftContext);\n\t\t\t\t})\n\t\t\t\t.then(() => {\n\t\t\t\t\tbroadcastCollaborationMessage(\n\t\t\t\t\t\tActivity.Discard,\n\t\t\t\t\t\tthis._rootPath.replace(\"IsActiveEntity=false\", \"IsActiveEntity=true\"),\n\t\t\t\t\t\tthis._internalModel!\n\t\t\t\t\t);\n\t\t\t\t\tthis._internalModel!.destroy();\n\t\t\t\t\tthis._internalModel = undefined;\n\t\t\t\t})\n\t\t\t\t.catch(function (err: any) {\n\t\t\t\t\tLog.error(err);\n\t\t\t\t});\n\t\t}\n\t},\n\n\t/**\n\t * Simulates that the user has deleted the draft.\n\t */\n\tdeleteDraft: function () {\n\t\tif (this._internalModel) {\n\t\t\tconst draftContext = this._getDraftContext();\n\t\t\tlet activeContext: V4Context;\n\n\t\t\tdraftContext\n\t\t\t\t.requestProperty(\"IsActiveEntity\")\n\t\t\t\t.then(() => {\n\t\t\t\t\treturn draftContext.getModel().bindContext(`${this._rootPath}/SiblingEntity`).getBoundContext();\n\t\t\t\t})\n\t\t\t\t.then((context: any) => {\n\t\t\t\t\tactiveContext = context;\n\t\t\t\t\treturn context.requestCanonicalPath();\n\t\t\t\t})\n\t\t\t\t.then(() => {\n\t\t\t\t\treturn draft.deleteDraft(draftContext);\n\t\t\t\t})\n\t\t\t\t.then(() => {\n\t\t\t\t\t(activeContext as any).delete();\n\t\t\t\t\tbroadcastCollaborationMessage(Activity.Delete, this._rootPath, this._internalModel!);\n\t\t\t\t\tthis._internalModel!.destroy();\n\t\t\t\t\tthis._internalModel = undefined;\n\t\t\t\t})\n\t\t\t\t.catch(function (err: any) {\n\t\t\t\t\tLog.error(err);\n\t\t\t\t});\n\t\t}\n\t},\n\n\t// /////////////////////////////\n\t// Private methods\n\n\t_getDraftContext: function (): any {\n\t\treturn this._oModel!.bindContext(this._rootPath, undefined, {\n\t\t\t$$patchWithoutSideEffects: true,\n\t\t\t$$groupId: \"$auto\",\n\t\t\t$$updateGroupId: \"$auto\"\n\t\t}).getBoundContext();\n\t},\n\n\t/**\n\t * Callback of the ghost client when receiving a message on the web socket.\n\t *\n\t * @param oMessage The message\n\t */\n\t_onMessageReceived: function (oMessage: Message) {\n\t\toMessage.userAction = oMessage.userAction || oMessage.clientAction;\n\t\tthis._lastReceivedMessage = oMessage;\n\n\t\tif (oMessage.userAction === Activity.Join) {\n\t\t\tbroadcastCollaborationMessage(\n\t\t\t\tActivity.JoinEcho,\n\t\t\t\tthis._lockedPropertyPath ? `${this._rootPath}/${this._lockedPropertyPath}` : undefined,\n\t\t\t\tthis._internalModel!\n\t\t\t);\n\t\t}\n\t}\n};\n\nexport default CollaborationAPI;\n"],"mappings":"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"}

package/src/sap/fe/test/api/CollaborationAPI.ts

@@ -7,9 +7,9 @@ import {
 import type { Message } from "sap/fe/core/controllerextensions/collaboration/CollaborationCommon";
 import { Activity } from "sap/fe/core/controllerextensions/collaboration/CollaborationCommon";
 import draft from "sap/fe/core/controllerextensions/editFlow/draft";
-import type Context from "sap/ui/model/Context";
 import JSONModel from "sap/ui/model/json/JSONModel";
 import type ODataModel from "sap/ui/model/odata/v4/ODataModel";
+import type { V4Context } from "types/extension_types";
 
 const CollaborationAPI = {
 	_lastReceivedMessage: undefined as Message | undefined,
@@ -25,7 +25,7 @@ const CollaborationAPI = {
 	 * @param userID The ID of the user
 	 * @param userName The name of the user
 	 */
-	enterDraft: function (oContext: Context, userID: string, userName: string) {
+	enterDraft: function (oContext: V4Context, userID: string, userName: string) {
 		const webSocketBaseURL: string = oContext.getModel().getMetaModel().getObject("/@com.sap.vocabularies.Common.v1.WebSocketBaseURL");
 
 		if (!webSocketBaseURL) {
@@ -36,6 +36,8 @@ const CollaborationAPI = {
 		const sDraftUUID: string = oContext.getProperty("DraftAdministrativeData/DraftUUID");
 		this._internalModel = new JSONModel({});
 
+		const serviceUrl = oContext.getModel().getServiceUrl();
+
 		initializeCollaboration(
 			{
 				id: userID,
@@ -44,6 +46,7 @@ const CollaborationAPI = {
 			},
 			webSocketBaseURL,
 			sDraftUUID,
+			serviceUrl,
 			this._internalModel,
 			this._onMessageReceived.bind(this),
 			true
@@ -179,7 +182,7 @@ const CollaborationAPI = {
 	deleteDraft: function () {
 		if (this._internalModel) {
 			const draftContext = this._getDraftContext();
-			let activeContext: Context;
+			let activeContext: V4Context;
 
 			draftContext
 				.requestProperty("IsActiveEntity")

package/src/sap/fe/test/api/DialogValueHelpAssertions.js

@@ -206,7 +206,6 @@ sap.ui.define(
 			var oBuilder = FEBuilder.create(oApiInstance.getOpaInstance())
 					.isDialogElement()
 					.mustBeVisible(false)
-					.hasType("sap.m.IconTabFilter")
 					.description(
 						Utils.formatMessage(
 							"Checking that the tab '{1}' on value help dialog '{0}' has state='{2}'",
@@ -218,11 +217,12 @@ sap.ui.define(
 				oTabIdMatcher = FEBuilder.Matchers.id(RegExp(sIdSuffix + "$"));
 
 			if (mState && mState.visible === false) {
+				oBuilder.hasType("sap.m.IconTabBar");
 				oBuilder.check(function (aIconTabFilters) {
 					return OpaBuilder.Matchers.filter(oTabIdMatcher)(aIconTabFilters).length === 0;
 				});
 			} else {
-				oBuilder.has(oTabIdMatcher).hasState(mState);
+				oBuilder.hasType("sap.m.IconTabFilter").has(oTabIdMatcher).hasState(mState);
 			}
 
 			return oApiInstance.prepareResult(oBuilder.execute());
@@ -236,7 +236,7 @@ sap.ui.define(
 		 * @public
 		 */
 		DialogValueHelpAssertions.prototype.iCheckSearchAndSelect = function (mState) {
-			return _checkTabBuilder(this, "-VHP--fromList", mState);
+			return _checkTabBuilder(this, "-ITB--header-0", mState); // might be an issue, but there´s no stable id provided anymore
 		};
 
 		/**
@@ -247,7 +247,7 @@ sap.ui.define(
 		 * @public
 		 */
 		DialogValueHelpAssertions.prototype.iCheckDefineConditions = function (mState) {
-			return _checkTabBuilder(this, "-VHP--defineCondition", mState);
+			return _checkTabBuilder(this, "-ITB--header-1", mState); // might be an issue, but there´s no stable id provided anymore
 		};
 		/**
 		 * Checks the dialog.

package/src/sap/fe/test/api/FilterBarAssertions.js

@@ -88,6 +88,38 @@ sap.ui.define(
 			);
 		};
 
+		/**
+		 * Checks if the focus is on the filter field.
+		 
+		 * @param {string} [sFilterFieldLabel] The field label
+		 * @returns {object} The result of the {@link sap.ui.test.Opa5#waitFor} function, to be used for chained statements
+		 * @public
+		 */
+
+		FilterBarAssertions.prototype.iSeeFocusOnFilterField = function (sFilterFieldLabel) {
+			var oFilterBarBuilder = this.getBuilder();
+			return this.prepareResult(
+				oFilterBarBuilder
+					.hasFocusOnFilterField(sFilterFieldLabel)
+					.description(Utils.formatMessage("Checking focus on Filter Field '{0}' ", sFilterFieldLabel))
+					.execute()
+			);
+		};
+
+		/**
+		 * Checks if the focus is on the Go Button of the filter bar.
+		 
+		 * @returns {object} The result of the {@link sap.ui.test.Opa5#waitFor} function, to be used for chained statements
+		 * @public
+		 */
+
+		FilterBarAssertions.prototype.iSeeFocusOnGoButton = function () {
+			var oFilterBarBuilder = this.getBuilder();
+			return this.prepareResult(
+				oFilterBarBuilder.hasFocusOnGoButton().description(Utils.formatMessage("Checking focus on the Go Button' ")).execute()
+			);
+		};
+
 		/**
 		 * Checks the search field in the filter bar. If the <code>sSearchText</code> parameter is <code>undefined</code>, the search text is not validated.
 		 *

package/src/sap/fe/test/api/FormAPI.js

@@ -72,7 +72,8 @@ sap.ui.define(
 					this.createFormElementMatcher(vFieldIdentifier, "DataField"),
 					this.createFormElementMatcher(vFieldIdentifier, "DataFieldWithNavigationPath"),
 					this.createFormElementMatcher(vFieldIdentifier, "DataFieldWithUrl"),
-					this.createFormElementMatcher(vFieldIdentifier, "DataFieldForAnnotation")
+					this.createFormElementMatcher(vFieldIdentifier, "DataFieldForAnnotation"),
+					this.createFormElementMatcher(vFieldIdentifier, "DataFieldWithIntentBasedNavigation")
 				);
 		};
 

package/src/sap/fe/test/api/FormActions.js

@@ -73,7 +73,7 @@ sap.ui.define(
 				// Action Button in Section Header
 				return this.prepareResult(
 					oFormBuilder
-						.doOnAggregation("actions", this.createActionMatcher(vActionIdentifier), OpaBuilder.Actions.press())
+						.doOnSubSectionToolBar(this.createActionMatcher(vActionIdentifier))
 						.description(Utils.formatMessage("Pressing action '{1}' on form '{0}'", this.getIdentifier(), vActionIdentifier))
 						.execute()
 				);

package/src/sap/fe/test/api/HeaderAssertions.js

@@ -484,11 +484,18 @@ sap.ui.define(
 					.hasChildren(
 						FEBuilder.create(this)
 							.hasType("sap.uxap.ObjectPageDynamicHeaderTitle")
-							.hasChildren(
-								FEBuilder.create(this)
-									.hasType("sap.m.Avatar")
-									.checkNumberOfMatches(iExpectedNumber + 1) // +1 because of avatar to add a user
-							)
+							.has(OpaBuilder.Matchers.children(FEBuilder.create(this).hasType("sap.m.Avatar")))
+							.has(function (aAvatars) {
+								return aAvatars && aAvatars.length == iExpectedNumber + 1; // +1 because of avatar to add a user
+							})
+						// .hasChildren(
+						// 	FEBuilder.create(this)
+						// 		.hasType("sap.m.Avatar")
+						// 		.has(function(oControl) {
+						// 			return true;
+						// 		})
+						// 		//.checkNumberOfMatches(iExpectedNumber + 1) // +1 because of avatar to add a user
+						// )
 					)
 					.description(Utils.formatMessage("Checking number of collaborating user: {0}", iExpectedNumber))
 					.execute()

package/src/sap/fe/test/api/TableAPI.js

@@ -9,12 +9,13 @@ sap.ui.define(
 		"sap/fe/test/Utils",
 		"sap/fe/test/builder/FEBuilder",
 		"sap/fe/test/builder/MdcTableBuilder",
-		"sap/fe/test/builder/DialogBuilder",
 		"sap/ui/test/OpaBuilder",
 		"sap/ui/test/actions/Action",
-		"sap/ui/core/SortOrder"
+		"sap/ui/core/SortOrder",
+		"sap/ui/test/Opa5",
+		"sap/base/util/UriParameters"
 	],
-	function (BaseAPI, Utils, FEBuilder, TableBuilder, DialogBuilder, OpaBuilder, Action, SortOrder) {
+	function (BaseAPI, Utils, FEBuilder, TableBuilder, OpaBuilder, Action, SortOrder, Opa5, SAPUriParameters) {
 		"use strict";
 
 		/**
@@ -167,6 +168,36 @@ sap.ui.define(
 		 * @public
 		 */
 		TableAPI.prototype.iConfirmFilterDialog = function () {
+			// TODO: Remove this temporary toggle when MDC development for the "Filter Query Panel" has been finished
+			var bUseQueryPanel = new SAPUriParameters(Opa5.getWindow().location.search).getAll("sap-ui-xx-filterQueryPanel")[0] === "true";
+			if (bUseQueryPanel) {
+				return this._iConfirmFilterDialogWithQueryPanel();
+			} else {
+				return this._iConfirmFilterDialogWithListPanel();
+			}
+		};
+
+		TableAPI.prototype._iConfirmFilterDialogWithQueryPanel = function () {
+			var sTableId = this.getIdentifier(),
+				oFilterDialogBuilder = TableBuilder.createFilteringDialogBuilder(this.getOpaInstance()).hasChildren(
+					OpaBuilder.create().hasType("sap.m.ComboBox")
+				),
+				oComboBoxBuilder = OpaBuilder.create(this.getOpaInstance()).isDialogElement().hasType("sap.m.ComboBox");
+			return this.prepareResult(
+				FEBuilder.create(this.getOpaInstance())
+					.success(function () {
+						if (FEBuilder.controlsExist(oComboBoxBuilder)) {
+							oFilterDialogBuilder
+								.doPressFooterButton(OpaBuilder.Matchers.resourceBundle("text", "sap.ui.mdc", "p13nDialog.OK"))
+								.description(Utils.formatMessage("Closing the filter dialog for '{0}' (if currently open)", sTableId))
+								.execute();
+						}
+					})
+					.execute()
+			);
+		};
+
+		TableAPI.prototype._iConfirmFilterDialogWithListPanel = function () {
 			return this.prepareResult(
 				TableBuilder.createFilteringDialogBuilder(this.getOpaInstance())
 					.doPressFooterButton(OpaBuilder.Matchers.resourceBundle("text", "sap.ui.mdc", "p13nDialog.OK"))
@@ -175,6 +206,55 @@ sap.ui.define(
 			);
 		};
 
+		/**
+		 * Helper method to personalize table, to select a columns from the combo box on the filter dialog.
+		 *
+		 * @param {string | sap.fe.test.api.ColumnIdentifier} vColumnIdentifier The identifier provided
+		 * @returns {object} The result of the {@link sap.ui.test.Opa5#waitFor} function, to be used for chained statements
+		 * @ui5-restricted
+		 */
+		TableAPI.prototype.selectColumnOnFilterDialog = function (vColumnIdentifier) {
+			var sTableId = this.getIdentifier().id,
+				oComboBox,
+				// TODO: Remove this temporary workaround when obsolete
+				fnItemKeyCleansing = function (sKey) {
+					return sKey.startsWith("Property::") ? sKey.split("::")[1] : sKey;
+				},
+				oColumnListBuilder = FEBuilder.create(this.getOpaInstance()).hasType("sap.m.ComboBox").isDialogElement(),
+				oColumnBuilder = TableBuilder.createFilteringDialogBuilder(this.getOpaInstance())
+					.has(OpaBuilder.Matchers.children(oColumnListBuilder))
+					.has(function (aMatchingComboBoxes) {
+						if (aMatchingComboBoxes.length !== 1) {
+							throw Error(Utils.formatMessage("Cannot open filtering dialog of table '{0}'", sTableId));
+						}
+						oComboBox = aMatchingComboBoxes[0];
+						return oComboBox.getItems();
+					}),
+				oColumnMatcher = function (aFoundComboBoxItems) {
+					var fnFindColumn = Utils.isOfType(vColumnIdentifier, String)
+						? function (oItem) {
+								return oItem.getText() === vColumnIdentifier;
+						  }
+						: function (oItem) {
+								return fnItemKeyCleansing(oItem.getKey()) === vColumnIdentifier.name;
+						  };
+					return aFoundComboBoxItems.filter(fnFindColumn);
+				};
+			return this.prepareResult(
+				oColumnBuilder
+					.has(oColumnMatcher)
+					.do(function (aMatchingItems) {
+						if (aMatchingItems.length === 0) {
+							throw Error(Utils.formatMessage("Cannot open filter field '{0}'", vColumnIdentifier));
+						}
+						var oItemToSelect = aMatchingItems[0],
+							sItemText = oItemToSelect.getText();
+						OpaBuilder.Actions.executor(OpaBuilder.Actions.enterText(sItemText, false, false, true))(oComboBox);
+					})
+					.execute()
+			);
+		};
+
 		/**
 		 * Helper method to personalize table, either adapt columns or filter. If no actions are given, this function can be used for checking only.
 		 * During execution it checks for an already open dialog. If it does not exist, it is opened before