--wip-- [skip ci]

xwiki · Mar 12, 2024 · af1b08d · af1b08d
1 parent f85c3bb
commit af1b08d
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 28 deletions.
diff --git a/...st-docker/src/test/it/org/xwiki/administration/test/ui/UsersGroupsRightsManagementIT.java b/...st-docker/src/test/it/org/xwiki/administration/test/ui/UsersGroupsRightsManagementIT.java
@@ -276,23 +276,25 @@ void createAndDeleteUser(TestUtils setup, TestReference testReference)
 
         usersPage = UsersAdministrationSectionPage.gotoPage();
 
+        int rowNumber = usersPage.getRowNumberByUsername(userName);
+
         // Verify the user is enabled and can only be edited or disabled
-        assertFalse(usersPage.isUserDisabled(1));
-        assertFalse(usersPage.canDeleteUser(1));
-        assertFalse(usersPage.canEnableUser(1));
-        assertTrue(usersPage.canDisableUser(1));
-        assertTrue(usersPage.canEditUser(1));
+        assertFalse(usersPage.isUserDisabled(rowNumber));
+        assertFalse(usersPage.canDeleteUser(rowNumber));
+        assertFalse(usersPage.canEnableUser(rowNumber));
+        assertTrue(usersPage.canDisableUser(rowNumber));
+        assertTrue(usersPage.canEditUser(rowNumber));
 
         // Verify that when the user is disabled it can be enabled back, deleted or edited
-        usersPage = usersPage.disableUser(1);
-        assertTrue(usersPage.isUserDisabled(1));
-        assertTrue(usersPage.canDeleteUser(1));
-        assertTrue(usersPage.canEnableUser(1));
-        assertFalse(usersPage.canDisableUser(1));
-        assertTrue(usersPage.canEditUser(1));
+        usersPage = usersPage.disableUser(rowNumber);
+        assertTrue(usersPage.isUserDisabled(rowNumber));
+        assertTrue(usersPage.canDeleteUser(rowNumber));
+        assertTrue(usersPage.canEnableUser(rowNumber));
+        assertFalse(usersPage.canDisableUser(rowNumber));
+        assertTrue(usersPage.canEditUser(rowNumber));
 
         // Delete the newly created user and see if groups are cleaned
-        ConfirmationModal confirmation = usersPage.clickDeleteUser(1);
+        ConfirmationModal confirmation = usersPage.clickDeleteUser(rowNumber);
         assertTrue(confirmation.getMessage().contains("Are you sure you want to proceed?"));
         confirmation.clickOk();
         usersPage.getUsersLiveData().getTableLayout().assertRow("User",

diff --git a/...bjects/src/main/java/org/xwiki/administration/test/po/UsersAdministrationSectionPage.java b/...bjects/src/main/java/org/xwiki/administration/test/po/UsersAdministrationSectionPage.java
@@ -78,6 +78,12 @@ public DeleteUserConfirmationModal clickDeleteUser(int rowNumber)
         return new DeleteUserConfirmationModal();
     }
 
+    public int getRowNumberByUsername(String userName)
+    {
+        int rowNumber = getUsersLiveData().getTableLayout().getRowIndexForElement(By.xpath("//a[text()='" + userName + "']"));
+        return rowNumber;
+    }
+
     public boolean canDeleteUser(int rowNumber)
     {
         return getUsersLiveData().getTableLayout().hasAction(rowNumber, "delete");

diff --git a/...form-livedata/xwiki-platform-livedata-webjar/src/main/vue/displayers/DisplayerActions.vue b/...form-livedata/xwiki-platform-livedata-webjar/src/main/vue/displayers/DisplayerActions.vue
@@ -30,24 +30,24 @@
     all the displayer default behavior
   -->
   <BaseDisplayer
-      class="displayer-actions"
-      view-only
-      :property-id="propertyId"
-      :entry="entry"
-      :is-empty="false"
-      :intercept-touch="false"
+    class="displayer-actions"
+    view-only
+    :property-id="propertyId"
+    :entry="entry"
+    :is-empty="false"
+    :intercept-touch="false"
   >
 
     <!-- Provide the Action Viewer widget to the `viewer` slot -->
     <template #viewer>
       <div class="actions-container">
         <a
-            v-for="action in actions"
-            :key="action.id"
-            :class="'action action_' + action.id"
-            :title="action.description"
-            :href="sanitizeUrl(entry[action.urlProperty]) || '#'"
-            @click="handleClick($event, action)"
+          v-for="action in actions"
+          :key="action.id"
+          :class="'action action_' + action.id"
+          :title="action.description"
+          :href="sanitizeUrl(entry[action.urlProperty]) || '#'"
+          @click="handleClick($event, action)"
         >
           <XWikiIcon :iconDescriptor="action.icon" class="action-icon"/>
           <span class="action-name">{{ action.name }}</span>
@@ -90,9 +90,9 @@ export default {
     actions () {
       // The list of actions can be overwritten from the displayer configuration.
       return (this.config.actions || this.data.meta.actions)
-          // Show only the actions that are allowed for the current live data entry.
-          .filter(action => this.logic.isActionAllowed(action, this.entry))
-          .map(action => this.logic.getActionDescriptor(action));
+        // Show only the actions that are allowed for the current live data entry.
+        .filter(action => this.logic.isActionAllowed(action, this.entry))
+        .map(action => this.logic.getActionDescriptor(action));
     },
   },
   methods: {
@@ -122,7 +122,7 @@ export default {
           if (async.body) {
             options.body = async.body;
           }
-
+          
           if(async.headers) {
             options.headers = async.headers;
           }