From 73d675ab9544f8173c7d30c469e9cd7cbbbccf15 Mon Sep 17 00:00:00 2001
From: Benjamin Dauvergne <bdauvergne@entrouvert.com>
Date: Fri, 28 Jan 2022 19:20:52 +0100
Subject: [PATCH 1/3] manager: use .clickable-rows class (#59991)

And deprecate .plaintable which is now useless.
---
 .../static/authentic2/manager/css/style.css   |  4 ---
 src/authentic2/manager/tables.py              | 33 +++++++++++--------
 2 files changed, 20 insertions(+), 17 deletions(-)

diff --git a/src/authentic2/manager/static/authentic2/manager/css/style.css b/src/authentic2/manager/static/authentic2/manager/css/style.css
index 3c670ab2..c1818ab8 100644
--- a/src/authentic2/manager/static/authentic2/manager/css/style.css
+++ b/src/authentic2/manager/static/authentic2/manager/css/style.css
@@ -270,10 +270,6 @@ span.activity {
 	padding-right: 30px;
 }
 
-table.main.plaintable tr:hover td {
-	cursor: default;
-}
-
 a.role-inheritance-view-all {
     font-style: italic;
 }
diff --git a/src/authentic2/manager/tables.py b/src/authentic2/manager/tables.py
index 54feb849..47cb81d5 100644
--- a/src/authentic2/manager/tables.py
+++ b/src/authentic2/manager/tables.py
@@ -111,7 +111,7 @@ class UserTable(Table):
 
     class Meta(Table.Meta):
         model = User
-        attrs = {'class': 'main', 'id': 'user-table'}
+        attrs = {'class': 'main clickable-rows', 'id': 'user-table'}
         fields = ('username', 'email', 'first_name', 'last_name', 'ou')
         sequence = ('get_full_name', '...')
         empty_text = _('None')
@@ -150,7 +150,7 @@ class MixedUserRoleTable(Table):
     )
 
     class Meta(Table.Meta):
-        attrs = {'class': 'main', 'id': 'user-table'}
+        attrs = {'class': 'main clickable-rows', 'id': 'user-table'}
         row_attrs = {
             "data-pk": lambda record: '%s-%s' % ('user' if isinstance(record, User) else 'role', record.pk)
         }
@@ -181,7 +181,7 @@ class RoleTable(Table):
 
     class Meta(Table.Meta):
         model = Role
-        attrs = {'class': 'main', 'id': 'role-table'}
+        attrs = {'class': 'main clickable-rows', 'id': 'role-table'}
         fields = ('name', 'slug', 'ou', 'member_count')
 
 
@@ -204,7 +204,7 @@ class OUTable(Table):
 
     class Meta(Table.Meta):
         model = OrganizationalUnit
-        attrs = {'class': 'main', 'id': 'ou-table'}
+        attrs = {'class': 'main clickable-rows', 'id': 'ou-table'}
         fields = ('name', 'slug', 'default')
         empty_text = _('None')
 
@@ -248,7 +248,7 @@ class OuUserRolesTable(Table):
 
     class Meta(Table.Meta):
         model = Role
-        attrs = {'class': 'main plaintable', 'id': 'role-table'}
+        attrs = {'class': 'main clickable-rows', 'id': 'role-table'}
         fields = ('name', 'ou')
         empty_text = _('None')
         order_by = ('name',)
@@ -282,31 +282,38 @@ class UserRolesTable(Table):
 
     class Meta(Table.Meta):
         model = Role
-        attrs = {'class': 'main', 'id': 'role-table'}
+        attrs = {'class': 'main clickable-rows', 'id': 'role-table'}
         fields = ('name', 'ou')
         empty_text = _('None')
         order_by = ('name', 'ou')
 
 
 class ServiceTable(Table):
+    name = tables.LinkColumn(
+        viewname='a2-manager-service',
+        kwargs={'service_pk': A('pk')},
+        accessor='name',
+        verbose_name=_('label'),
+    )
     ou = tables.Column()
-    name = tables.Column()
     slug = tables.Column()
 
     class Meta(Table.Meta):
         model = Service
-        attrs = {'class': 'main', 'id': 'service-table'}
-        fields = ('ou', 'name', 'slug')
+        attrs = {'class': 'main clickable-rows', 'id': 'service-table'}
+        fields = ('name', 'slug', 'ou')
         empty_text = _('None')
         order_by = ('ou', 'name', 'slug')
 
 
 class ServiceRolesTable(Table):
-    name = tables.Column(accessor='name', verbose_name=_('name'))
+    name = tables.LinkColumn(
+        viewname='a2-manager-role-members', kwargs={'pk': A('pk')}, accessor='name', verbose_name=_('label')
+    )
 
     class Meta(Table.Meta):
         model = Role
-        attrs = {'class': 'main', 'id': 'service-role-table'}
+        attrs = {'class': 'main clickable-rows', 'id': 'service-role-table'}
         fields = ('name',)
         empty_text = _('No access restriction. All users are allowed to connect to this service.')
 
@@ -318,7 +325,7 @@ class UserAuthorizationsTable(Table):
 
     class Meta(Table.Meta):
         model = OIDCAuthorization
-        attrs = {'class': 'main plaintable', 'id': 'user-authorizations-table'}
+        attrs = {'class': 'main', 'id': 'user-authorizations-table'}
         fields = ('client', 'created', 'expired')
         empty_text = _('This user has not granted profile data access to any service yet.')
 
@@ -346,6 +353,6 @@ class InheritanceRolesTable(Table):
 
     class Meta(Table.Meta):
         model = Role
-        attrs = {'class': 'main plaintable', 'id': 'inheritance-role-table'}
+        attrs = {'class': 'main clickable-rows', 'id': 'inheritance-role-table'}
         fields = ('name', 'ou')
         empty_text = _('None')
-- 
2.35.1