You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@streampipes.apache.org by ho...@apache.org on 2026/08/10 13:30:15 UTC

(streampipes) 07/08: cleaned

This is an automated email from the ASF dual-hosted git repository.

JHoelli pushed a commit to branch 1381-cleanup-duplicated-testing-logic
in repository https://gitbox.apache.org/repos/asf/streampipes.git

commit 3a43079d99a1668daf1e3584bd53c49fdfe62ac5
Author: Jacqueline Höllig <j....@gmx.net>
AuthorDate: Mon Aug 10 13:26:33 2026 +0000

    cleaned
---
 ui/cypress/support/utils/user/PermissionUtils.ts | 52 ++++--------------------
 1 file changed, 7 insertions(+), 45 deletions(-)

diff --git a/ui/cypress/support/utils/user/PermissionUtils.ts b/ui/cypress/support/utils/user/PermissionUtils.ts
index ff8b5363e2..6332470560 100644
--- a/ui/cypress/support/utils/user/PermissionUtils.ts
+++ b/ui/cypress/support/utils/user/PermissionUtils.ts
@@ -40,7 +40,7 @@ export class PermissionUtils {
     public static changeOwnershipInManageDialog(email: string) {
         cy.dataCy('owner-select').click();
         cy.get(`[data-cy="owner-option-${email}"]`, { timeout: 10000 }).click();
-        PermissionUtils.saveManageDialog();
+        PermissionUtils.save();
     }
 
     public static markElementAsPublic(resourceName: string) {
@@ -58,7 +58,7 @@ export class PermissionUtils {
 
     public static markElementAsPublicInManageDialog() {
         StaticPropertyUtils.clickCheckbox('permission-public-element');
-        PermissionUtils.saveManageDialog();
+        PermissionUtils.save();
     }
 
     public static authorizeUser(resourceName: string, email: string) {
@@ -70,13 +70,6 @@ export class PermissionUtils {
         PermissionUtils.save();
     }
 
-    public static authorizeUserInManageDialog(email: string) {
-        cy.dataCy('authorized-user').type(email);
-        cy.get('.cdk-overlay-container mat-option').contains(email).click();
-
-        PermissionUtils.saveManageDialog();
-    }
-
     public static authorizeGroup(resourceName: string, groupName: string) {
         PermissionUtils.openManagePermissions(resourceName);
         cy.dataCy('authorized-group').type(groupName);
@@ -89,45 +82,14 @@ export class PermissionUtils {
         cy.dataCy('authorized-group').type(groupName);
         cy.get('.cdk-overlay-container mat-option').contains(groupName).click();
 
-        PermissionUtils.saveManageDialog();
-    }
-
-    public static saveManageDialog() {
-        cy.dataCy('sp-manage-save').should('be.visible').click();
-    }
-
-    public static cancelManageDialog() {
-        cy.dataCy('sp-manage-cancel').should('be.visible').click();
+        PermissionUtils.save();
     }
-
     public static save() {
-        //necessary as the old permission dialog is currently not replaced everywhere
-        cy.get('body').then($body => {
-            const $saveButton = $body.find('[data-cy="sp-manage-save"]');
-
-            if ($saveButton.length) {
-                cy.wrap($saveButton).click();
-            } else {
-                cy.dataCy('sp-manage-permissions-save')
-                    .should('be.visible')
-                    .click();
-            }
-        });
+        cy.dataCy('sp-manage-save').should('be.visible').click();
     }
 
     public static cancel() {
-        //necessary as the old permission dialog is currently not replaced everywhere
-        cy.get('body').then($body => {
-            const $saveButton = $body.find('[data-cy="sp-manage-cancel"]');
-
-            if ($saveButton.length) {
-                cy.wrap($saveButton).click();
-            } else {
-                cy.dataCy('sp-manage-permissions-cancel')
-                    .should('be.visible')
-                    .click();
-            }
-        });
+        cy.dataCy('sp-manage-cancel').should('be.visible').click();
     }
 
     public static validateUserCanNotChangePermissions(resourceName: string) {
@@ -168,12 +130,12 @@ export class PermissionUtils {
 
     public static validateUserCanChangePermissionsInManageDialog() {
         cy.dataCy('permission-public-element').should('exist');
-        PermissionUtils.cancelManageDialog();
+        PermissionUtils.cancel();
     }
 
     public static validateUserCanNotChangePermissionsInManageDialog() {
         cy.dataCy('warning-permissions-managed-by-owner').should('exist');
-        PermissionUtils.cancelManageDialog();
+        PermissionUtils.cancel();
     }
 
     private static validateAnonymousPublicLinkOption() {