From 95da0ee71c61ee6007427019e224a62a8bff1077 Mon Sep 17 00:00:00 2001
From: robines <espi.robin@gmail.com>
Date: Sun, 27 Oct 2024 02:00:20 +0200
Subject: [PATCH] Fix various table sorting

---
 .../RecruitmentAdminPage.tsx                  |  2 +-
 .../RecruitmentGangAdminPage.tsx              |  1 +
 .../RecruitmentGangOverviewPage.tsx           |  5 +-
 .../ProcessedApplicants.tsx                   | 76 ++++++++++---------
 4 files changed, 46 insertions(+), 38 deletions(-)

diff --git a/frontend/src/PagesAdmin/RecruitmentAdminPage/RecruitmentAdminPage.tsx b/frontend/src/PagesAdmin/RecruitmentAdminPage/RecruitmentAdminPage.tsx
index 18040daf3..b5d8573b1 100644
--- a/frontend/src/PagesAdmin/RecruitmentAdminPage/RecruitmentAdminPage.tsx
+++ b/frontend/src/PagesAdmin/RecruitmentAdminPage/RecruitmentAdminPage.tsx
@@ -53,7 +53,7 @@ export function RecruitmentAdminPage() {
       cells: [
         {
           content: <Link url={pageUrl}>{dbT(element, 'name')}</Link>,
-          value: ROUTES.frontend.recruitment,
+          value: element.id,
         },
         {
           content: getObjectFieldOrNumber<string>(element?.organization, 'name'),
diff --git a/frontend/src/PagesAdmin/RecruitmentGangAdminPage/RecruitmentGangAdminPage.tsx b/frontend/src/PagesAdmin/RecruitmentGangAdminPage/RecruitmentGangAdminPage.tsx
index 3ab1a42f6..b44137a47 100644
--- a/frontend/src/PagesAdmin/RecruitmentGangAdminPage/RecruitmentGangAdminPage.tsx
+++ b/frontend/src/PagesAdmin/RecruitmentGangAdminPage/RecruitmentGangAdminPage.tsx
@@ -73,6 +73,7 @@ export function RecruitmentGangAdminPage() {
       cells: [
         {
           content: <Link url={pageUrl}>{dbT(recruitmentPosition, 'name')}</Link>,
+          value: dbT(recruitmentPosition, 'name'),
         },
         {
           value: recruitmentPosition.is_funksjonaer_position,
diff --git a/frontend/src/PagesAdmin/RecruitmentGangOverviewPage/RecruitmentGangOverviewPage.tsx b/frontend/src/PagesAdmin/RecruitmentGangOverviewPage/RecruitmentGangOverviewPage.tsx
index 9dee4a5d3..2b25a4ace 100644
--- a/frontend/src/PagesAdmin/RecruitmentGangOverviewPage/RecruitmentGangOverviewPage.tsx
+++ b/frontend/src/PagesAdmin/RecruitmentGangOverviewPage/RecruitmentGangOverviewPage.tsx
@@ -52,7 +52,10 @@ export function RecruitmentGangOverviewPage() {
     });
 
     return {
-      cells: [{ content: <Link url={pageUrl}>{dbT(gang, 'name')}</Link> }, gang.recruitment_positions],
+      cells: [
+        { content: <Link url={pageUrl}>{dbT(gang, 'name')}</Link>, value: dbT(gang, 'name') },
+        gang.recruitment_positions,
+      ],
     };
   });
 
diff --git a/frontend/src/PagesAdmin/RecruitmentPositionOverviewPage/components/ProcessedApplicants/ProcessedApplicants.tsx b/frontend/src/PagesAdmin/RecruitmentPositionOverviewPage/components/ProcessedApplicants/ProcessedApplicants.tsx
index f9e6a3d66..9d75ec8a9 100644
--- a/frontend/src/PagesAdmin/RecruitmentPositionOverviewPage/components/ProcessedApplicants/ProcessedApplicants.tsx
+++ b/frontend/src/PagesAdmin/RecruitmentPositionOverviewPage/components/ProcessedApplicants/ProcessedApplicants.tsx
@@ -27,42 +27,46 @@ export function ProcessedApplicants({ data, type, revertStateFunction }: Process
     revertStateFunction && { content: '', sortable: false },
   ];
 
-  const rows = data.map((application) => ({
-    cells: [
-      {
-        content: (
-          <Link
-            key={application.user.id}
-            url={reverse({
-              pattern: ROUTES.frontend.admin_recruitment_applicant,
-              urlParams: {
-                applicationID: application.id,
-              },
-            })}
-          >
-            {`${application.user.first_name} ${application.user.last_name}`}
-          </Link>
-        ),
-      },
-      { content: application.user?.phone_number, value: application.user?.phone_number },
-      { content: application.user?.email, value: application.user?.email },
-      { content: application.interview?.interview_time, value: application.interview?.interview_time },
-      { content: application.interview?.interview_location, value: application.interview?.interview_location },
-      { content: application.recruiter_status, value: application.recruiter_status },
-      revertStateFunction && {
-        content: (
-          <Button
-            display="pill"
-            theme="outlined"
-            onClick={() => revertStateFunction(application.id, { recruiter_status: 0 })}
-          >
-            {t(KEY.recruitment_revert_status)}
-          </Button>
-        ),
-        value: application.recruiter_status,
-      },
-    ],
-  }));
+  const rows = data.map((application) => {
+    const applicantName = `${application.user.first_name} ${application.user.last_name}`;
+    return {
+      cells: [
+        {
+          content: (
+            <Link
+              key={application.user.id}
+              url={reverse({
+                pattern: ROUTES.frontend.admin_recruitment_applicant,
+                urlParams: {
+                  applicationID: application.id,
+                },
+              })}
+            >
+              {applicantName}
+            </Link>
+          ),
+          value: applicantName,
+        },
+        { content: application.user?.phone_number, value: application.user?.phone_number },
+        { content: application.user?.email, value: application.user?.email },
+        { content: application.interview?.interview_time, value: application.interview?.interview_time },
+        { content: application.interview?.interview_location, value: application.interview?.interview_location },
+        { content: application.recruiter_status, value: application.recruiter_status },
+        revertStateFunction && {
+          content: (
+            <Button
+              display="pill"
+              theme="outlined"
+              onClick={() => revertStateFunction(application.id, { recruiter_status: 0 })}
+            >
+              {t(KEY.recruitment_revert_status)}
+            </Button>
+          ),
+          value: application.recruiter_status,
+        },
+      ],
+    };
+  });
 
   const styleType = {
     withdrawn: styles.withdrawn,