Auto calculate num actions for jury tables.

(cherry picked from commit 1294b6e) # Conflicts: # webapp/src/Controller/Jury/ExecutableController.php # webapp/src/Twig/TwigExtension.php
DOMjudge · Oct 4, 2023 · 8f523ae · 8f523ae
1 parent 9457175
commit 8f523ae
Show file tree

Hide file tree

Showing 20 changed files with 22 additions and 20 deletions.
diff --git a/webapp/src/Controller/Jury/ContestController.php b/webapp/src/Controller/Jury/ContestController.php
@@ -379,7 +379,6 @@ public function indexAction(Request $request): Response
             'upcoming_contest' => $upcomingContest,
             'contests_table' => $contests_table,
             'table_fields' => $table_fields,
-            'num_actions' => $this->isGranted('ROLE_ADMIN') && !$contest->isLocked() ? 2 : 0,
         ]);
     }
 

diff --git a/webapp/src/Controller/Jury/ExecutableController.php b/webapp/src/Controller/Jury/ExecutableController.php
@@ -116,7 +116,6 @@ public function indexAction(Request $request): Response
         return $this->render('jury/executables.html.twig', [
             'executables' => $executables_table,
             'table_fields' => $table_fields,
-            'num_actions' => count($execactions),
             'form' => $form->createView(),
         ]);
     }

diff --git a/webapp/src/Controller/Jury/JudgehostController.php b/webapp/src/Controller/Jury/JudgehostController.php
@@ -184,7 +184,6 @@ public function indexAction(Request $request): Response
         $data = [
             'judgehosts' => $judgehosts_table,
             'table_fields' => $table_fields,
-            'num_actions' => $this->isGranted('ROLE_ADMIN') ? 2 : 0,
             'all_checked_in_recently' => $all_checked_in_recently,
             'refresh' => [
                 'after' => 5,

diff --git a/webapp/src/Controller/Jury/LanguageController.php b/webapp/src/Controller/Jury/LanguageController.php
@@ -146,7 +146,6 @@ public function indexAction(): Response
             'enabled_languages' => $enabled_languages,
             'disabled_languages' => $disabled_languages,
             'table_fields' => $table_fields,
-            'num_actions' => $this->isGranted('ROLE_ADMIN') ? 2 : 0,
         ]);
     }
 

diff --git a/webapp/src/Controller/Jury/ProblemController.php b/webapp/src/Controller/Jury/ProblemController.php
@@ -214,7 +214,6 @@ public function indexAction(): Response
         $data = [
             'problems' => $problems_table,
             'table_fields' => $table_fields,
-            'num_actions' => $this->isGranted('ROLE_ADMIN') ? 4 : 2,
         ];
 
         return $this->render('jury/problems.html.twig', $data);

diff --git a/webapp/src/Controller/Jury/TeamAffiliationController.php b/webapp/src/Controller/Jury/TeamAffiliationController.php
@@ -143,7 +143,6 @@ public function indexAction(string $projectDir): Response
         return $this->render('jury/team_affiliations.html.twig', [
             'team_affiliations' => $team_affiliations_table,
             'table_fields' => $table_fields,
-            'num_actions' => $this->isGranted('ROLE_ADMIN') ? 2 : 0,
         ]);
     }
 

diff --git a/webapp/src/Controller/Jury/TeamCategoryController.php b/webapp/src/Controller/Jury/TeamCategoryController.php
@@ -127,7 +127,6 @@ public function indexAction(): Response
         return $this->render('jury/team_categories.html.twig', [
             'team_categories' => $team_categories_table,
             'table_fields' => $table_fields,
-            'num_actions' => $this->isGranted('ROLE_ADMIN') ? 2 : 0,
         ]);
     }
 

diff --git a/webapp/src/Controller/Jury/TeamController.php b/webapp/src/Controller/Jury/TeamController.php
@@ -239,7 +239,6 @@ public function indexAction(): Response
         return $this->render('jury/teams.html.twig', [
             'teams' => $teams_table,
             'table_fields' => $table_fields,
-            'num_actions' => $this->isGranted('ROLE_ADMIN') ? 3 : 1,
         ]);
     }
 

diff --git a/webapp/src/Controller/Jury/UserController.php b/webapp/src/Controller/Jury/UserController.php
@@ -184,7 +184,6 @@ public function indexAction(): Response
         return $this->render('jury/users.html.twig', [
             'users' => $users_table,
             'table_fields' => $table_fields,
-            'num_actions' => $this->isGranted('ROLE_ADMIN') ? 2 : 0,
         ]);
     }
 

diff --git a/webapp/src/Twig/TwigExtension.php b/webapp/src/Twig/TwigExtension.php
@@ -128,6 +128,7 @@ public function getFilters(): array
             new TwigFilter('printWarningContent', [$this, 'printWarningContent'], ['is_safe' => ['html']]),
             new TwigFilter('entityIdBadge', [$this, 'entityIdBadge'], ['is_safe' => ['html']]),
             new TwigFilter('medalType', [$this->awards, 'medalType']),
+            new TwigFilter('numTableActions', [$this, 'numTableActions']),
         ];
     }
 
@@ -1207,4 +1208,13 @@ public function entityIdBadge(BaseApiEntity $entity, string $idPrefix = ''): str
             'externalId' => $externalIdField ? $propertyAccessor->getValue($entity, $externalIdField) : null,
         ]);
     }
+
+    public function numTableActions(array $tableData): int
+    {
+        $maxNumActions = 0;
+        foreach ($tableData as $item) {
+            $maxNumActions = max($maxNumActions, count($item['actions'] ?? []));
+        }
+        return $maxNumActions;
+    }
 }
diff --git a/webapp/templates/jury/contests.html.twig b/webapp/templates/jury/contests.html.twig
@@ -87,7 +87,7 @@
 
     <h3>All available contests</h3>
 
-    {{ macros.table(contests_table, table_fields, num_actions) }}
+    {{ macros.table(contests_table, table_fields) }}
 
     {% if is_granted('ROLE_ADMIN') %}
         <p>

diff --git a/webapp/templates/jury/executables.html.twig b/webapp/templates/jury/executables.html.twig
@@ -12,7 +12,7 @@
 
     <h1>Executables</h1>
 
-    {{ macros.table(executables, table_fields, num_actions, {'ordering': 'false'}) }}
+    {{ macros.table(executables, table_fields, {'ordering': 'false'}) }}
 
     {% if is_granted('ROLE_ADMIN') %}
         <p>

diff --git a/webapp/templates/jury/jury_macros.twig b/webapp/templates/jury/jury_macros.twig
@@ -85,12 +85,13 @@
     </style>
 {% endmacro %}
 
-{% macro table(data, fields, num_actions, options) %}
+{% macro table(data, fields, options) %}
 
     <div class="table-wrapper">
         <table class="data-table table table-sm table-striped" style="width:auto">
             <thead class="">
             <tr>
+                {%- set num_actions = data | numTableActions %}
                 {%- set default_sort = 0 %}
                 {%- set default_sort_order = 'asc' %}
                 {%- for key,column in fields %}

diff --git a/webapp/templates/jury/languages.html.twig b/webapp/templates/jury/languages.html.twig
@@ -12,14 +12,14 @@
 
     <h1>Enabled languages</h1>
 
-    {{ macros.table(enabled_languages, table_fields, num_actions) }}
+    {{ macros.table(enabled_languages, table_fields) }}
 
     <br/>
     <br/>
 
     <h1>Disabled languages</h1>
 
-    {{ macros.table(disabled_languages, table_fields, num_actions) }}
+    {{ macros.table(disabled_languages, table_fields) }}
 
     {% if is_granted('ROLE_ADMIN') %}
         <p>

diff --git a/webapp/templates/jury/partials/judgehost_list.html.twig b/webapp/templates/jury/partials/judgehost_list.html.twig
@@ -1,2 +1,2 @@
 {% import "jury/jury_macros.twig" as macros %}
-{{ macros.table(judgehosts, table_fields, num_actions, {ordering: 'false'}) }}
+{{ macros.table(judgehosts, table_fields, {ordering: 'false'}) }}
diff --git a/webapp/templates/jury/problems.html.twig b/webapp/templates/jury/problems.html.twig
@@ -12,7 +12,7 @@
 
     <h1>Problems</h1>
 
-    {{ macros.table(problems, table_fields, num_actions) }}
+    {{ macros.table(problems, table_fields) }}
 
     {% if is_granted('ROLE_ADMIN') %}
         <p>

diff --git a/webapp/templates/jury/team_affiliations.html.twig b/webapp/templates/jury/team_affiliations.html.twig
@@ -12,7 +12,7 @@
 
     <h1>Affiliations</h1>
 
-    {{ macros.table(team_affiliations, table_fields, num_actions) }}
+    {{ macros.table(team_affiliations, table_fields) }}
 
     {%- if is_granted('ROLE_ADMIN') %}
 

diff --git a/webapp/templates/jury/team_categories.html.twig b/webapp/templates/jury/team_categories.html.twig
@@ -12,7 +12,7 @@
 
     <h1>Categories</h1>
 
-    {{ macros.table(team_categories, table_fields, num_actions) }}
+    {{ macros.table(team_categories, table_fields) }}
 
     {% if is_granted('ROLE_ADMIN') %}
         <p>

diff --git a/webapp/templates/jury/teams.html.twig b/webapp/templates/jury/teams.html.twig
@@ -12,7 +12,7 @@
 
     <h1>Teams</h1>
 
-    {{ macros.table(teams, table_fields, num_actions) }}
+    {{ macros.table(teams, table_fields) }}
 
     {%- if is_granted('ROLE_ADMIN') %}
 

diff --git a/webapp/templates/jury/users.html.twig b/webapp/templates/jury/users.html.twig
@@ -12,7 +12,7 @@
 
     <h1>Users</h1>
 
-    {{ macros.table(users, table_fields, num_actions) }}
+    {{ macros.table(users, table_fields) }}
 
     {% if is_granted('ROLE_ADMIN') %}
         <p>