fix users table and modify role test

FalkorDB · Feb 4, 2025 · fca6cb1 · fca6cb1
1 parent 34f246a
commit fca6cb1
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 16 deletions.
diff --git a/app/components/TableComponent.tsx b/app/components/TableComponent.tsx
@@ -22,6 +22,7 @@ type Cell = {
     value: DataCell,
     onChange?: (value: string) => Promise<boolean>,
     type?: string
+    comboboxType?: string
 }
 
 export interface Row {
@@ -164,6 +165,7 @@ export default function TableComponent({ headers, rows, children, setRows, optio
                                                                         cell.onChange!(value)
                                                                         handleSetEditable("", "")
                                                                     }}
+                                                                    type={cell.comboboxType}
                                                                 />
                                                                 : <div className="w-full flex gap-2 items-center">
                                                                     <Input

diff --git a/app/settings/users/Users.tsx b/app/settings/users/Users.tsx
@@ -61,7 +61,8 @@ export default function Users() {
                     }, {
                         value: role,
                         onChange: username === "default" ? undefined : (value: string) => handleSetRole(username, value, role),
-                        type: "combobox"
+                        type: "combobox",
+                        comboboxType: "Role",
                     }],
                     checked: false,
                 })))
@@ -90,7 +91,8 @@ export default function Users() {
                 }, {
                     value: role,
                     onChange: (value: string) => handleSetRole(username, value, role),
-                    type: "combobox"
+                    type: "combobox",
+                    comboboxType: "Role"
                 }],
                 checked: false,
             }] as Row[])

diff --git a/e2e/logic/POM/settingsUsersPage.ts b/e2e/logic/POM/settingsUsersPage.ts
@@ -20,8 +20,12 @@ export default class SettingsUsersPage extends BasePage {
         return this.page.locator("//div[@role='dialog']//button[span[text()='Select Role']]")
     }
 
-    private get selectRoleBtn(): Locator {
-        return this.page.locator("//button[span[text()='Select Role']]")
+    private get userSelectRoleEditBtn(): (selectedUser: string) => Locator {
+        return (selectedUser: string) => this.page.locator(`//tbody/tr[@data-id='${selectedUser}']/td[3]/div/div/button`)
+    }
+
+    private get userSelectRoleBtn(): (selectedUser: string) => Locator {
+        return (selectedUser: string) => this.page.locator(`//tbody/tr[@data-id='${selectedUser}']/td[3]/button`)
     }
 
     private get selectUserRole(): (role: string) => Locator {
@@ -93,20 +97,12 @@ export default class SettingsUsersPage extends BasePage {
 
     async modifyUserRole(selectedUser: string, role: string): Promise<void> {
         await this.page.waitForLoadState('networkidle');
-        await this.userCheckboxBtn(selectedUser).click();
-        await this.selectRoleBtn.click();
+        await this.userSelectRoleEditBtn(selectedUser).click();
+        await this.userSelectRoleBtn(selectedUser).click();
         await this.selectUserRole(role).click();
         await waitForTimeOut(this.page, 1500)
     }
 
-    async modifyTwoUsersRoles(selectedUser1: string, selectedUser2: string, role: string): Promise<void> {
-        await this.page.waitForLoadState('networkidle');
-        await this.userCheckboxBtn(selectedUser1).click();
-        await this.userCheckboxBtn(selectedUser2).click();
-        await this.selectRoleBtn.click();
-        await this.selectUserRole(role).click()
-    }
-
     async deleteTwoUsers(selectedUser1: string, selectedUser2: string): Promise<void> {
         await this.page.waitForLoadState('networkidle');
         await this.userCheckboxBtn(selectedUser1).click()

diff --git a/e2e/tests/settingsUsers.spec.ts b/e2e/tests/settingsUsers.spec.ts
@@ -56,7 +56,7 @@ test.describe('Settings Tests', () => {
 
     })
 
-    test("@admin Add two users -> change their roles via checkbox -> Validate that the users roles have been changed", async () => {
+    test("@admin Add two users -> change their roles -> Validate that the users roles have been changed", async () => {
         // Adding two user
         const settingsUsersPage = await browser.createNewPage(SettingsUsersPage, urls.settingsUrl)
         await settingsUsersPage.navigateToUserTab();
@@ -67,7 +67,8 @@ test.describe('Settings Tests', () => {
 
         // modify users roles
         const userRole = user.ReadOnly;
-        await settingsUsersPage.modifyTwoUsersRoles(username1, username2, userRole)
+        await settingsUsersPage.modifyUserRole(username1, userRole)
+        await settingsUsersPage.modifyUserRole(username2, userRole)
         await settingsUsersPage.refreshPage()
         await settingsUsersPage.navigateToUserTab()
         const userName1Role = await settingsUsersPage.getUserRole(username1)