From 3d09375397739406388db9546d2358804d42800e Mon Sep 17 00:00:00 2001
From: andsamfu <andermhe@stud.ntnu.no>
Date: Thu, 31 Oct 2024 20:06:53 +0100
Subject: [PATCH 1/8] Created missing useTitle to files (#1545)

* Created missing useTitle to files

* Removed unused code

* Added back wrong deleted file, and short modified code
---
 .../OrganizationRecruitmentPage.tsx                         | 3 ++-
 .../InterviewNotesAdminPage/InterviewNotesAdminPage.tsx     | 5 ++++-
 .../RecruitmentGangAllApplicantsAdminPage.tsx               | 3 ++-
 .../RecruitmentOverviewPage/RecruitmentOverviewPage.tsx     | 2 ++
 .../RecruitmentRecruiterDashboardPage.tsx                   | 3 ++-
 .../RecruitmentSeparatePositionFormAdminPage.tsx            | 5 ++++-
 .../RecruitmentUsersWithoutInterviewGangPage.tsx            | 3 ++-
 .../RecruitmentUsersWithoutThreeInterviewCriteriaPage.tsx   | 3 ++-
 frontend/src/PagesAdmin/RoleAdminPage/RoleAdminPage.tsx     | 5 ++++-
 frontend/src/PagesAdmin/RolesAdminPage/RolesAdminPage.tsx   | 6 ++++--
 frontend/src/PagesAdmin/RoomAdminPage/RoomAdminPage.tsx     | 3 ++-
 .../SultenMenuItemFormAdminPage.tsx                         | 2 ++
 frontend/src/PagesAdmin/UsersAdminPage/UsersAdminPage.tsx   | 5 ++++-
 13 files changed, 36 insertions(+), 12 deletions(-)

diff --git a/frontend/src/Pages/OrganizationRecruitmentPage/OrganizationRecruitmentPage.tsx b/frontend/src/Pages/OrganizationRecruitmentPage/OrganizationRecruitmentPage.tsx
index d2ab3e25b..efae692f0 100644
--- a/frontend/src/Pages/OrganizationRecruitmentPage/OrganizationRecruitmentPage.tsx
+++ b/frontend/src/Pages/OrganizationRecruitmentPage/OrganizationRecruitmentPage.tsx
@@ -7,7 +7,7 @@ import { PersonalRow } from '~/Pages/RecruitmentPage';
 import { getOrganization, getRecruitment } from '~/api';
 import { useOrganizationContext } from '~/context/OrgContextProvider';
 import type { RecruitmentDto } from '~/dto';
-import { useDesktop } from '~/hooks';
+import { useDesktop, useTitle } from '~/hooks';
 import { KEY } from '~/i18n/constants';
 import { OrgNameType, type OrgNameTypeValue } from '~/types';
 import { dbT, getObjectFieldOrNumber } from '~/utils';
@@ -24,6 +24,7 @@ export function OrganizationRecruitmentPage() {
   const [recruitment, setRecruitment] = useState<RecruitmentDto>();
   const [organizationName, setOrganizationName] = useState<OrgNameTypeValue>(OrgNameType.FALLBACK);
   const [loading, setLoading] = useState<boolean>(true);
+  useTitle(dbT(recruitment, 'name') ?? '');
 
   useEffect(() => {
     if (recruitmentId) {
diff --git a/frontend/src/PagesAdmin/InterviewNotesAdminPage/InterviewNotesAdminPage.tsx b/frontend/src/PagesAdmin/InterviewNotesAdminPage/InterviewNotesAdminPage.tsx
index 17a0c9d3f..011e6a765 100644
--- a/frontend/src/PagesAdmin/InterviewNotesAdminPage/InterviewNotesAdminPage.tsx
+++ b/frontend/src/PagesAdmin/InterviewNotesAdminPage/InterviewNotesAdminPage.tsx
@@ -6,6 +6,7 @@ import { Button } from '~/Components';
 import { TextAreaField } from '~/Components/TextAreaField/TextAreaField';
 import { getRecruitmentApplicationsForGang, putRecruitmentApplicationInterview } from '~/api';
 import type { InterviewDto, RecruitmentApplicationDto } from '~/dto';
+import { useTitle } from '~/hooks';
 import { STATUS } from '~/http_status_codes';
 import { KEY } from '~/i18n/constants';
 import { ROUTES } from '~/routes';
@@ -25,6 +26,8 @@ export function InterviewNotesPage() {
   const [nameUser, setNameUser] = useState<string>('');
   const { t } = useTranslation();
   const navigate = useNavigate();
+  const title = t(KEY.recruitment_interview_notes);
+  useTitle(title);
 
   // biome-ignore lint/correctness/useExhaustiveDependencies: t does not need to be in deplist
   useEffect(() => {
@@ -73,7 +76,7 @@ export function InterviewNotesPage() {
   }
 
   return (
-    <AdminPageLayout title={t(KEY.recruitment_interview_notes)} header={true}>
+    <AdminPageLayout title={title} header={true}>
       <div className={styles.container}>
         <label htmlFor="INotes">
           {t(KEY.recruitment_applicant)}: {nameUser}
diff --git a/frontend/src/PagesAdmin/RecruitmentGangAllApplicantsAdminPage/RecruitmentGangAllApplicantsAdminPage.tsx b/frontend/src/PagesAdmin/RecruitmentGangAllApplicantsAdminPage/RecruitmentGangAllApplicantsAdminPage.tsx
index 4781ad16f..1dfb3a1dd 100644
--- a/frontend/src/PagesAdmin/RecruitmentGangAllApplicantsAdminPage/RecruitmentGangAllApplicantsAdminPage.tsx
+++ b/frontend/src/PagesAdmin/RecruitmentGangAllApplicantsAdminPage/RecruitmentGangAllApplicantsAdminPage.tsx
@@ -7,7 +7,7 @@ import { Table } from '~/Components/Table';
 import { Text } from '~/Components/Text/Text';
 import { downloadCSVGangRecruitment, getGang, getRecruitment, getRecruitmentApplicationsForGang } from '~/api';
 import type { GangDto, RecruitmentApplicationDto, RecruitmentDto } from '~/dto';
-import { useCustomNavigate } from '~/hooks';
+import { useCustomNavigate, useTitle } from '~/hooks';
 import { STATUS } from '~/http_status_codes';
 import { KEY } from '~/i18n/constants';
 import { reverse } from '~/named-urls';
@@ -118,6 +118,7 @@ export function RecruitmentGangAllApplicantsAdminPage() {
   };
 
   const title = t(KEY.recruitment_all_applications);
+  useTitle(title);
   const header = (
     <div className={styles.header}>
       <Text as="strong" size="m" className={styles.headerBold}>
diff --git a/frontend/src/PagesAdmin/RecruitmentOverviewPage/RecruitmentOverviewPage.tsx b/frontend/src/PagesAdmin/RecruitmentOverviewPage/RecruitmentOverviewPage.tsx
index 7dbffc3a7..738255c51 100644
--- a/frontend/src/PagesAdmin/RecruitmentOverviewPage/RecruitmentOverviewPage.tsx
+++ b/frontend/src/PagesAdmin/RecruitmentOverviewPage/RecruitmentOverviewPage.tsx
@@ -3,6 +3,7 @@ import { useTranslation } from 'react-i18next';
 import { TabView } from '~/Components';
 import type { Tab } from '~/Components/TabBar/TabBar';
 import { AdminPageLayout } from '~/PagesAdmin/AdminPageLayout/AdminPageLayout';
+import { useTitle } from '~/hooks';
 import { KEY } from '~/i18n/constants';
 import { RecruitmentProgression } from './Components/RecruitmentProgression';
 import { RecruitmentStatistics } from './Components/RecruitmentStatistics';
@@ -14,6 +15,7 @@ export function RecruitmentOverviewPage() {
     { key: 1, label: t(KEY.recruitment_progression), value: <RecruitmentProgression /> },
     { key: 2, label: t(KEY.recruitment_statistics), value: <RecruitmentStatistics /> },
   ];
+  useTitle(t(KEY.recruitment_overview));
   return (
     <AdminPageLayout title={`${t(KEY.recruitment_overview)}: ${RECRUITMENT_TITLE_PLACEHOLDER}`}>
       <TabView tabs={tabs} />
diff --git a/frontend/src/PagesAdmin/RecruitmentRecruiterDashboardPage/RecruitmentRecruiterDashboardPage.tsx b/frontend/src/PagesAdmin/RecruitmentRecruiterDashboardPage/RecruitmentRecruiterDashboardPage.tsx
index 8a66eb323..3afb7fb29 100644
--- a/frontend/src/PagesAdmin/RecruitmentRecruiterDashboardPage/RecruitmentRecruiterDashboardPage.tsx
+++ b/frontend/src/PagesAdmin/RecruitmentRecruiterDashboardPage/RecruitmentRecruiterDashboardPage.tsx
@@ -7,7 +7,7 @@ import { Table } from '~/Components/Table';
 import { Text } from '~/Components/Text/Text';
 import { getRecruitmentRecruiterDashboard } from '~/api';
 import type { RecruitmentApplicationDto, RecruitmentDto } from '~/dto';
-import { useCustomNavigate } from '~/hooks';
+import { useCustomNavigate, useTitle } from '~/hooks';
 import { STATUS } from '~/http_status_codes';
 import { KEY } from '~/i18n/constants';
 import { reverse } from '~/named-urls';
@@ -23,6 +23,7 @@ export function RecruitmentRecruiterDashboardPage() {
   const [recruitment, setRecruitment] = useState<RecruitmentDto>();
   const [applications, setApplications] = useState<RecruitmentApplicationDto[]>();
   const [loading, setLoading] = useState(true);
+  useTitle(`${t(KEY.recruitment_recruiter_dashboard)} ${dbT(recruitment, 'name')}`);
 
   // biome-ignore lint/correctness/useExhaustiveDependencies: navigate must not be in deplist
   useEffect(() => {
diff --git a/frontend/src/PagesAdmin/RecruitmentSeparatePositionFormAdminPage/RecruitmentSeparatePositionFormAdminPage.tsx b/frontend/src/PagesAdmin/RecruitmentSeparatePositionFormAdminPage/RecruitmentSeparatePositionFormAdminPage.tsx
index c113d44ed..eead6cb0f 100644
--- a/frontend/src/PagesAdmin/RecruitmentSeparatePositionFormAdminPage/RecruitmentSeparatePositionFormAdminPage.tsx
+++ b/frontend/src/PagesAdmin/RecruitmentSeparatePositionFormAdminPage/RecruitmentSeparatePositionFormAdminPage.tsx
@@ -5,6 +5,7 @@ import { SamfForm } from '~/Forms/SamfForm';
 import { SamfFormField } from '~/Forms/SamfFormField';
 import { postRecruitmentSeparatePosition, putRecruitmentSeparatePosition } from '~/api';
 import type { RecruitmentSeparatePositionDto } from '~/dto';
+import { useTitle } from '~/hooks';
 import { KEY } from '~/i18n/constants';
 import { reverse } from '~/named-urls';
 import type { SeparatePositionLoader } from '~/router/loaders';
@@ -25,6 +26,8 @@ type FormType = {
 export function RecruitmentSeparatePositionFormAdminPage() {
   const { t } = useTranslation();
   const navigate = useNavigate();
+  const title = `${t(KEY.common_create)} ${t(KEY.recruitment_position)}`;
+  useTitle(title);
 
   // Form data
   const { recruitmentId, separatePositionId } = useParams();
@@ -80,7 +83,7 @@ export function RecruitmentSeparatePositionFormAdminPage() {
   }
   return (
     <>
-      <AdminPageLayout title={`${t(KEY.common_create)} ${t(KEY.recruitment_position)}`} header={true}>
+      <AdminPageLayout title={title} header={true}>
         <div className={styles.wrapper}>
           <SamfForm<FormType> onSubmit={handleOnSubmit} initialData={initialData} submitText={submitText}>
             <div className={styles.row}>
diff --git a/frontend/src/PagesAdmin/RecruitmentUsersWithoutInterviewGangPage/RecruitmentUsersWithoutInterviewGangPage.tsx b/frontend/src/PagesAdmin/RecruitmentUsersWithoutInterviewGangPage/RecruitmentUsersWithoutInterviewGangPage.tsx
index e104622ed..3098a460e 100644
--- a/frontend/src/PagesAdmin/RecruitmentUsersWithoutInterviewGangPage/RecruitmentUsersWithoutInterviewGangPage.tsx
+++ b/frontend/src/PagesAdmin/RecruitmentUsersWithoutInterviewGangPage/RecruitmentUsersWithoutInterviewGangPage.tsx
@@ -6,7 +6,7 @@ import { RecruitmentWithoutInterviewTable } from '~/Components';
 import { Text } from '~/Components/Text/Text';
 import { getApplicantsWithoutInterviews, getGang, getRecruitment } from '~/api';
 import type { GangDto, RecruitmentDto, RecruitmentUserDto } from '~/dto';
-import { useCustomNavigate } from '~/hooks';
+import { useCustomNavigate, useTitle } from '~/hooks';
 import { STATUS } from '~/http_status_codes';
 import { KEY } from '~/i18n/constants';
 import { ROUTES } from '~/routes';
@@ -73,6 +73,7 @@ export function RecruitmentUsersWithoutInterviewGangPage() {
   }, [recruitmentId]);
 
   const title = t(KEY.recruitment_applicants_without_interview);
+  useTitle(title);
   const header = (
     <div className={styles.header}>
       <Text as="strong" size="m" className={styles.headerBold}>
diff --git a/frontend/src/PagesAdmin/RecruitmentUsersWithoutThreeInterviewCriteriaPage/RecruitmentUsersWithoutThreeInterviewCriteriaPage.tsx b/frontend/src/PagesAdmin/RecruitmentUsersWithoutThreeInterviewCriteriaPage/RecruitmentUsersWithoutThreeInterviewCriteriaPage.tsx
index aba5d48fc..d0784d1c0 100644
--- a/frontend/src/PagesAdmin/RecruitmentUsersWithoutThreeInterviewCriteriaPage/RecruitmentUsersWithoutThreeInterviewCriteriaPage.tsx
+++ b/frontend/src/PagesAdmin/RecruitmentUsersWithoutThreeInterviewCriteriaPage/RecruitmentUsersWithoutThreeInterviewCriteriaPage.tsx
@@ -6,7 +6,7 @@ import { RecruitmentWithoutInterviewTable } from '~/Components';
 import { Text } from '~/Components/Text/Text';
 import { getApplicantsWithoutThreeInterviewCriteria, getRecruitment } from '~/api';
 import type { RecruitmentDto, RecruitmentUserDto } from '~/dto';
-import { useCustomNavigate } from '~/hooks';
+import { useCustomNavigate, useTitle } from '~/hooks';
 import { STATUS } from '~/http_status_codes';
 import { KEY } from '~/i18n/constants';
 import { ROUTES } from '~/routes';
@@ -21,6 +21,7 @@ export function RecruitmentUsersWithoutThreeInterviewCriteriaPage() {
   const [showSpinner, setShowSpinner] = useState<boolean>(true);
   const { t } = useTranslation();
   const navigate = useCustomNavigate();
+  useTitle(t(KEY.recruitment_three_interviews_criteria_button));
 
   // biome-ignore lint/correctness/useExhaustiveDependencies: t does not need to be in deplist
   useEffect(() => {
diff --git a/frontend/src/PagesAdmin/RoleAdminPage/RoleAdminPage.tsx b/frontend/src/PagesAdmin/RoleAdminPage/RoleAdminPage.tsx
index 6daa3fe0f..c57ce479a 100644
--- a/frontend/src/PagesAdmin/RoleAdminPage/RoleAdminPage.tsx
+++ b/frontend/src/PagesAdmin/RoleAdminPage/RoleAdminPage.tsx
@@ -1,12 +1,15 @@
 import { useTranslation } from 'react-i18next';
 import { AdminPageLayout } from '~/PagesAdmin/AdminPageLayout/AdminPageLayout';
+import { useTitle } from '~/hooks';
 import { KEY } from '~/i18n/constants';
 
 export function RoleAdminPage() {
   const { t } = useTranslation();
+  const title = t(KEY.common_role);
+  useTitle(title);
 
   return (
-    <AdminPageLayout title={t(KEY.common_role)}>
+    <AdminPageLayout title={title}>
       <div />
     </AdminPageLayout>
   );
diff --git a/frontend/src/PagesAdmin/RolesAdminPage/RolesAdminPage.tsx b/frontend/src/PagesAdmin/RolesAdminPage/RolesAdminPage.tsx
index 5b253c7da..96ec3bc2b 100644
--- a/frontend/src/PagesAdmin/RolesAdminPage/RolesAdminPage.tsx
+++ b/frontend/src/PagesAdmin/RolesAdminPage/RolesAdminPage.tsx
@@ -6,6 +6,7 @@ import { Button, CrudButtons, Link } from '~/Components';
 import { Table } from '~/Components/Table';
 import { AdminPageLayout } from '~/PagesAdmin/AdminPageLayout/AdminPageLayout';
 import { getRoles } from '~/api';
+import { useTitle } from '~/hooks';
 import { KEY } from '~/i18n/constants';
 import { reverse } from '~/named-urls';
 import { ROUTES } from '~/routes';
@@ -13,8 +14,9 @@ import { lowerCapitalize } from '~/utils';
 
 export function RolesAdminPage() {
   const { t } = useTranslation();
-
   const navigate = useNavigate();
+  const title = t(KEY.common_roles);
+  useTitle(title);
 
   const { data: roles, isLoading } = useQuery({
     queryKey: ['roles'],
@@ -72,7 +74,7 @@ export function RolesAdminPage() {
   );
 
   return (
-    <AdminPageLayout title={t(KEY.common_roles)} loading={isLoading} header={header}>
+    <AdminPageLayout title={title} loading={isLoading} header={header}>
       <Table data={data} columns={columns} />
     </AdminPageLayout>
   );
diff --git a/frontend/src/PagesAdmin/RoomAdminPage/RoomAdminPage.tsx b/frontend/src/PagesAdmin/RoomAdminPage/RoomAdminPage.tsx
index 535c6216f..058016f03 100644
--- a/frontend/src/PagesAdmin/RoomAdminPage/RoomAdminPage.tsx
+++ b/frontend/src/PagesAdmin/RoomAdminPage/RoomAdminPage.tsx
@@ -6,7 +6,7 @@ import { Button, CrudButtons, Table } from '~/Components';
 import { AdminPageLayout } from '~/PagesAdmin/AdminPageLayout/AdminPageLayout';
 import { deleteInterviewRoom, getInterviewRoomsForRecruitment } from '~/api';
 import type { InterviewRoomDto } from '~/dto';
-import { useCustomNavigate } from '~/hooks';
+import { useCustomNavigate, useTitle } from '~/hooks';
 import { KEY } from '~/i18n/constants';
 import { reverse } from '~/named-urls';
 import type { RecruitmentLoader } from '~/router/loaders';
@@ -17,6 +17,7 @@ export function RoomAdminPage() {
   const data = useRouteLoaderData('recruitment') as RecruitmentLoader | undefined;
   const navigate = useCustomNavigate();
   const { t } = useTranslation();
+  useTitle(`${t(KEY.common_room)} ${t(KEY.common_overview)}`);
 
   useEffect(() => {
     if (data?.recruitment?.id) {
diff --git a/frontend/src/PagesAdmin/SultenMenuItemFormAdminPage/SultenMenuItemFormAdminPage.tsx b/frontend/src/PagesAdmin/SultenMenuItemFormAdminPage/SultenMenuItemFormAdminPage.tsx
index 691c88634..10dc0c12b 100644
--- a/frontend/src/PagesAdmin/SultenMenuItemFormAdminPage/SultenMenuItemFormAdminPage.tsx
+++ b/frontend/src/PagesAdmin/SultenMenuItemFormAdminPage/SultenMenuItemFormAdminPage.tsx
@@ -8,6 +8,7 @@ import { SamfForm } from '~/Forms/SamfForm';
 import { SamfFormField } from '~/Forms/SamfFormField';
 import { getFoodCategories, getFoodPreferences, getMenuItem, postMenuItem, putMenuItem } from '~/api';
 import type { FoodCategoryDto, FoodPreferenceDto, MenuItemDto } from '~/dto';
+import { useTitle } from '~/hooks';
 import { STATUS } from '~/http_status_codes';
 import { KEY } from '~/i18n/constants';
 import { reverse } from '~/named-urls';
@@ -57,6 +58,7 @@ export function SultenMenuItemFormAdminPage() {
 
   const submitText = id ? t(KEY.common_save) : t(KEY.common_create);
   const title = `${id ? t(KEY.common_edit) : t(KEY.common_create)} ${lowerCapitalize(`${t(KEY.sulten_dishes)}`)}`;
+  useTitle(title);
 
   // Fetch data if edit mode.
 
diff --git a/frontend/src/PagesAdmin/UsersAdminPage/UsersAdminPage.tsx b/frontend/src/PagesAdmin/UsersAdminPage/UsersAdminPage.tsx
index 8bfd43b72..7fd36c020 100644
--- a/frontend/src/PagesAdmin/UsersAdminPage/UsersAdminPage.tsx
+++ b/frontend/src/PagesAdmin/UsersAdminPage/UsersAdminPage.tsx
@@ -6,6 +6,7 @@ import { Table } from '~/Components/Table';
 import { AdminPageLayout } from '~/PagesAdmin/AdminPageLayout/AdminPageLayout';
 import { getUsers } from '~/api';
 import type { UserDto } from '~/dto';
+import { useTitle } from '~/hooks';
 import { KEY } from '~/i18n/constants';
 import { getFullName } from '~/utils';
 import { ImpersonateButton } from './components';
@@ -15,6 +16,8 @@ export function UsersAdminPage() {
 
   const [users, setUsers] = useState<UserDto[]>();
   const [loading, setLoading] = useState(true);
+  const title = t(KEY.common_users);
+  useTitle(title);
 
   useEffect(() => {
     setLoading(true);
@@ -70,7 +73,7 @@ export function UsersAdminPage() {
   }, [t, users]);
 
   return (
-    <AdminPageLayout title={t(KEY.common_users)} loading={loading}>
+    <AdminPageLayout title={title} loading={loading}>
       <Table data={data} columns={columns} />
     </AdminPageLayout>
   );

From fb67b564ff20e18675af21d88ede028bbc5b48b6 Mon Sep 17 00:00:00 2001
From: Snorre Skjellestad Kristiansen
 <54811445+snorrekr@users.noreply.github.com>
Date: Thu, 31 Oct 2024 21:36:58 +0100
Subject: [PATCH 2/8] Add promo video to form (#1292)

* add promo video to form

* add backend or something

* remove useless method

* add promo_media to frontend display

* fix migrations

* code cleanup

* fix migrations

* Fix poetry and other shit

* fix serialalalala ruff

* fix tests

* fix migrations

* fix merge conflicts

* remove type not in use

* fix conflicts

* Fix no promo media
---
 .../migrations/0010_recruitment_promo_media.py | 18 ++++++++++++++++++
 backend/samfundet/models/recruitment.py        |  1 +
 backend/samfundet/serializers.py               | 12 ++++++++++++
 .../OrganizationRecruitmentPage.tsx            |  5 ++---
 .../RecruitmentFormAdminPage.tsx               | 16 ++++++++++++++++
 .../recruitmentSchema.ts                       | 12 ++++++++++++
 frontend/src/dto.ts                            |  1 +
 frontend/src/i18n/constants.ts                 |  1 +
 frontend/src/i18n/translations.ts              |  2 ++
 9 files changed, 65 insertions(+), 3 deletions(-)
 create mode 100644 backend/samfundet/migrations/0010_recruitment_promo_media.py

diff --git a/backend/samfundet/migrations/0010_recruitment_promo_media.py b/backend/samfundet/migrations/0010_recruitment_promo_media.py
new file mode 100644
index 000000000..8aa5e3431
--- /dev/null
+++ b/backend/samfundet/migrations/0010_recruitment_promo_media.py
@@ -0,0 +1,18 @@
+# Generated by Django 5.1.1 on 2024-10-31 19:56
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('samfundet', '0009_recruitmentpositionsharedinterviewgroup_name_en_and_more'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='recruitment',
+            name='promo_media',
+            field=models.CharField(blank=True, default=None, help_text='Youtube video id', max_length=11, null=True),
+        ),
+    ]
diff --git a/backend/samfundet/models/recruitment.py b/backend/samfundet/models/recruitment.py
index 20dbd2037..514fcda9d 100644
--- a/backend/samfundet/models/recruitment.py
+++ b/backend/samfundet/models/recruitment.py
@@ -31,6 +31,7 @@ class Recruitment(CustomBaseModel):
     organization = models.ForeignKey(null=False, blank=False, to=Organization, on_delete=models.CASCADE, help_text='The organization that is recruiting')
 
     max_applications = models.PositiveIntegerField(null=True, blank=True, verbose_name='Max applications per applicant')
+    promo_media = models.CharField(max_length=11, help_text='Youtube video id', null=True, default=None, blank=True)
 
     def resolve_org(self, *, return_id: bool = False) -> Organization | int:
         if return_id:
diff --git a/backend/samfundet/serializers.py b/backend/samfundet/serializers.py
index 94da3771c..3e8488380 100644
--- a/backend/samfundet/serializers.py
+++ b/backend/samfundet/serializers.py
@@ -1,5 +1,6 @@
 from __future__ import annotations
 
+import re
 import itertools
 from typing import TYPE_CHECKING
 from collections import defaultdict
@@ -739,11 +740,22 @@ class Meta:
 
 class RecruitmentSerializer(CustomBaseSerializer):
     separate_positions = RecruitmentSeparatePositionSerializer(many=True, read_only=True)
+    promo_media = serializers.CharField(max_length=100, allow_blank=True, allow_null=True)
 
     class Meta:
         model = Recruitment
         fields = '__all__'
 
+    def validate_promo_media(self, value: str | None) -> str | None:
+        if value is None or value == '':
+            return None
+        match = re.search(r'(youtu.*be.*)\/(watch\?v=|embed\/|v|shorts|)(.*?((?=[&#?])|$))', value)
+        if match:
+            return match.group(3)
+        if len(value) == 11:
+            return value
+        raise ValidationError('Invalid youtube url')
+
     def to_representation(self, instance: Recruitment) -> dict:
         data = super().to_representation(instance)
         data['organization'] = OrganizationSerializer(instance.organization).data
diff --git a/frontend/src/Pages/OrganizationRecruitmentPage/OrganizationRecruitmentPage.tsx b/frontend/src/Pages/OrganizationRecruitmentPage/OrganizationRecruitmentPage.tsx
index efae692f0..8d2479493 100644
--- a/frontend/src/Pages/OrganizationRecruitmentPage/OrganizationRecruitmentPage.tsx
+++ b/frontend/src/Pages/OrganizationRecruitmentPage/OrganizationRecruitmentPage.tsx
@@ -16,7 +16,6 @@ import styles from './OrganizationRecruitmentPage.module.scss';
 
 export function OrganizationRecruitmentPage() {
   const isDesktop = useDesktop();
-  const embededId = '-nYQb8_TvQ4'; // TODO: Make this dynamic DO IN ISSUE #1121 for backend. #1274 for frontend
   const { recruitmentId } = useParams<{ recruitmentId: string }>();
   const [viewAllPositions, setViewAllPositions] = useState<boolean>(true);
   const { t } = useTranslation();
@@ -77,9 +76,9 @@ export function OrganizationRecruitmentPage() {
               {dbT(recruitment, 'name')}
             </Text>
           </div>
-          {embededId ? (
+          {recruitment?.promo_media ? (
             <>
-              <Video embedId={embededId} className={styles.video} />
+              <Video embedId={recruitment.promo_media} className={styles.video} />
             </>
           ) : (
             <></>
diff --git a/frontend/src/PagesAdmin/RecruitmentFormAdminPage/RecruitmentFormAdminPage.tsx b/frontend/src/PagesAdmin/RecruitmentFormAdminPage/RecruitmentFormAdminPage.tsx
index 8375ac071..86b02bc6b 100644
--- a/frontend/src/PagesAdmin/RecruitmentFormAdminPage/RecruitmentFormAdminPage.tsx
+++ b/frontend/src/PagesAdmin/RecruitmentFormAdminPage/RecruitmentFormAdminPage.tsx
@@ -58,6 +58,7 @@ export function RecruitmentFormAdminPage() {
       utcTimestampToLocal(data?.recruitment?.reprioritization_deadline_for_groups, false) || '',
     organization: getObjectFieldOrNumber<number>(data?.recruitment?.organization, 'id') || 1,
     max_applications: data?.recruitment?.max_applications,
+    promo_media: data?.recruitment?.promo_media || '',
   };
 
   const form = useForm<recruitmentFormType>({
@@ -231,6 +232,21 @@ export function RecruitmentFormAdminPage() {
                 )}
               />
             </div>
+            <div className={styles.row}>
+              <FormField
+                control={form.control}
+                name="promo_media"
+                render={({ field }) => (
+                  <FormItem className={styles.item}>
+                    <FormLabel>{`${t(KEY.recruitment_promo_media)}`}</FormLabel>
+                    <FormControl>
+                      <Input type="text" {...field} />
+                    </FormControl>
+                    <FormMessage />
+                  </FormItem>
+                )}
+              />
+            </div>
             <Button type="submit">{submitText}</Button>
           </div>
         </form>
diff --git a/frontend/src/PagesAdmin/RecruitmentFormAdminPage/recruitmentSchema.ts b/frontend/src/PagesAdmin/RecruitmentFormAdminPage/recruitmentSchema.ts
index da87fb2f9..671cbfa13 100644
--- a/frontend/src/PagesAdmin/RecruitmentFormAdminPage/recruitmentSchema.ts
+++ b/frontend/src/PagesAdmin/RecruitmentFormAdminPage/recruitmentSchema.ts
@@ -15,6 +15,7 @@ export const recruitmentSchema = z
     reprioritization_deadline_for_groups: LOCAL_DATETIME,
     organization: z.number().min(1, { message: 'Organization is required' }),
     max_applications: z.number().min(0).max(99).optional(),
+    promo_media: z.string(),
   })
   .refine(
     (data) => {
@@ -59,6 +60,17 @@ export const recruitmentSchema = z
       message: i18next.t(KEY.error_recruitment_form_4),
       path: ['reprioritization_deadline_for_groups'],
     },
+  )
+  .refine(
+    (data) => {
+      const promoMedia = data.promo_media;
+      const regex = /(youtu.*be.*)\/(watch\?v=|embed\/|v|shorts|)(.*?((?=[&#?])|$))/;
+      return promoMedia.match(regex) || promoMedia.length === 11 || promoMedia === '';
+    },
+    {
+      message: 'Fucky whucky youtube link',
+      path: ['promo_media'],
+    },
   );
 
 export type recruitmentFormType = z.infer<typeof recruitmentSchema>;
diff --git a/frontend/src/dto.ts b/frontend/src/dto.ts
index e576c6469..4cd54cb1c 100644
--- a/frontend/src/dto.ts
+++ b/frontend/src/dto.ts
@@ -415,6 +415,7 @@ export type RecruitmentDto = {
   organization: number | OrganizationDto;
   separate_positions?: RecruitmentSeparatePositionDto[];
   recruitment_progress?: number;
+  promo_media?: string;
 };
 
 export type RecruitmentSeparatePositionDto = {
diff --git a/frontend/src/i18n/constants.ts b/frontend/src/i18n/constants.ts
index 5d765cf3a..e48befa8e 100644
--- a/frontend/src/i18n/constants.ts
+++ b/frontend/src/i18n/constants.ts
@@ -321,6 +321,7 @@ export const KEY = {
   recrutment_default_application_letter: 'recrutment_default_application_letter',
   reprioritization_deadline_for_groups: 'reprioritization_deadline_for_groups',
   max_applications: 'max_applications',
+  recruitment_promo_media: 'recruitment_promo_media',
   recruitment_norwegian_applicants_only: 'recruitment_norwegian_applicants_only',
   reprioritization_deadline_for_applicant: 'reprioritization_deadline_for_applicant',
   recruitment_show_unprocessed_applicants: 'recruitment_show_unprocessed_applicants',
diff --git a/frontend/src/i18n/translations.ts b/frontend/src/i18n/translations.ts
index 24a5c1db2..7bdb3c977 100644
--- a/frontend/src/i18n/translations.ts
+++ b/frontend/src/i18n/translations.ts
@@ -307,6 +307,7 @@ export const nb = prepareTranslations({
   [KEY.recrutment_default_application_letter]: 'Standard søknadstekst',
   [KEY.reprioritization_deadline_for_groups]: 'Flaggefrist',
   [KEY.max_applications]: 'Maks søknader per bruker',
+  [KEY.recruitment_promo_media]: 'Promo video',
   [KEY.recruitment_norwegian_applicants_only]: 'Kun norsktalende søkere',
   [KEY.reprioritization_deadline_for_applicant]: 'Omprioriteringsfrist',
   [KEY.recruitment_show_unprocessed_applicants]: 'Vis ubehandlede søkere',
@@ -787,6 +788,7 @@ export const en = prepareTranslations({
   [KEY.recrutment_default_application_letter]: 'Default application letter',
   [KEY.reprioritization_deadline_for_groups]: 'Group reprioritization deadline',
   [KEY.max_applications]: 'Max applications per user',
+  [KEY.recruitment_promo_media]: 'Promo video',
   [KEY.reprioritization_deadline_for_applicant]: 'Reprioritization deadline',
   [KEY.recruitment_show_unprocessed_applicants]: 'Show unprocessed applicants',
   [KEY.recruitment_show_all_applicants]: 'Show all applicants',

From c035714c92d08c7289e5efd4c40e26d48a37d8ab Mon Sep 17 00:00:00 2001
From: Robin <16273164+robines@users.noreply.github.com>
Date: Sat, 2 Nov 2024 01:38:59 +0100
Subject: [PATCH 3/8] Fix promo video message (#1582)

* Replace promo video error message

* Add description, fix regex to allow copy-pasting YT links
---
 .../RecruitmentFormAdminPage/RecruitmentFormAdminPage.tsx  | 4 +++-
 .../RecruitmentFormAdminPage/recruitmentSchema.ts          | 4 ++--
 frontend/src/i18n/constants.ts                             | 2 ++
 frontend/src/i18n/translations.ts                          | 7 +++++++
 4 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/frontend/src/PagesAdmin/RecruitmentFormAdminPage/RecruitmentFormAdminPage.tsx b/frontend/src/PagesAdmin/RecruitmentFormAdminPage/RecruitmentFormAdminPage.tsx
index 86b02bc6b..32432db3b 100644
--- a/frontend/src/PagesAdmin/RecruitmentFormAdminPage/RecruitmentFormAdminPage.tsx
+++ b/frontend/src/PagesAdmin/RecruitmentFormAdminPage/RecruitmentFormAdminPage.tsx
@@ -17,6 +17,7 @@ import {
   NumberInput,
 } from '~/Components';
 import type { DropdownOption } from '~/Components/Dropdown/Dropdown';
+import { FormDescription } from '~/Components/Forms/Form';
 import { getOrganizations, postRecruitment, putRecruitment } from '~/api';
 import type { OrganizationDto, RecruitmentDto } from '~/dto';
 import { useTitle } from '~/hooks';
@@ -238,7 +239,8 @@ export function RecruitmentFormAdminPage() {
                 name="promo_media"
                 render={({ field }) => (
                   <FormItem className={styles.item}>
-                    <FormLabel>{`${t(KEY.recruitment_promo_media)}`}</FormLabel>
+                    <FormLabel>{t(KEY.recruitment_promo_media)}</FormLabel>
+                    <FormDescription>{t(KEY.promo_media_description)}</FormDescription>
                     <FormControl>
                       <Input type="text" {...field} />
                     </FormControl>
diff --git a/frontend/src/PagesAdmin/RecruitmentFormAdminPage/recruitmentSchema.ts b/frontend/src/PagesAdmin/RecruitmentFormAdminPage/recruitmentSchema.ts
index 671cbfa13..7ae4146a1 100644
--- a/frontend/src/PagesAdmin/RecruitmentFormAdminPage/recruitmentSchema.ts
+++ b/frontend/src/PagesAdmin/RecruitmentFormAdminPage/recruitmentSchema.ts
@@ -64,11 +64,11 @@ export const recruitmentSchema = z
   .refine(
     (data) => {
       const promoMedia = data.promo_media;
-      const regex = /(youtu.*be.*)\/(watch\?v=|embed\/|v|shorts|)(.*?((?=[&#?])|$))/;
+      const regex = /^(https?:\/\/)?(www\.)?(youtu.*be.*)\/(watch\?v=|embed\/|v|shorts|)(.*?((?=[&#?])|$))/;
       return promoMedia.match(regex) || promoMedia.length === 11 || promoMedia === '';
     },
     {
-      message: 'Fucky whucky youtube link',
+      message: i18next.t(KEY.promo_media_invalid),
       path: ['promo_media'],
     },
   );
diff --git a/frontend/src/i18n/constants.ts b/frontend/src/i18n/constants.ts
index e48befa8e..6f8a67974 100644
--- a/frontend/src/i18n/constants.ts
+++ b/frontend/src/i18n/constants.ts
@@ -471,6 +471,8 @@ export const KEY = {
   notfoundpage_contact_prompt: 'notfoundpage_contact_prompt',
   saksdokumentpage_publication_date: 'saksdokumentpage_publication_date',
   eventsadminpage_successful_delete_toast: 'eventsadminpage_successful_delete_toast',
+  promo_media_description: 'promo_media_description',
+  promo_media_invalid: 'promo_media_invalid',
 
   error_generic: 'error_generic',
   error_generic_description: 'error_generic_description',
diff --git a/frontend/src/i18n/translations.ts b/frontend/src/i18n/translations.ts
index 7bdb3c977..1e3a3b20e 100644
--- a/frontend/src/i18n/translations.ts
+++ b/frontend/src/i18n/translations.ts
@@ -472,6 +472,9 @@ export const nb = prepareTranslations({
   [KEY.admin_saksdokumenter_cannot_reupload]: 'Det er ikke mulig å endre filen som er lastet opp.',
   [KEY.eventsadminpage_successful_delete_toast]: 'Slettingen av arrangementet var vellykket.',
 
+  [KEY.promo_media_description]: 'Lenke eller ID til en YouTube-video',
+  [KEY.promo_media_invalid]: 'Må være en gyldig lenke til en YouTube-video',
+
   // Errors
   [KEY.error_generic]: 'Uventet feil',
   [KEY.error_generic_description]: 'En uventet feil oppsto, vennligst prøv igjen',
@@ -888,6 +891,10 @@ export const en = prepareTranslations({
   [KEY.admin_information_confirm_cancel]: 'Are you sure you want to exit without saving?',
   [KEY.admin_saksdokumenter_cannot_reupload]: 'It is not possible to change the uploaded file.',
   [KEY.eventsadminpage_successful_delete_toast]: 'Succsessfully deleted event.',
+
+  [KEY.promo_media_description]: 'Link or ID of a YouTube video',
+  [KEY.promo_media_invalid]: 'Must be a valid link to a YouTube video',
+
   [KEY.recruitment_three_interviews_criteria_header]:
     'Applicants with less than 3 interviews, but have applied to more than 3 positions',
   [KEY.recruitment_three_interviews_criteria_button]: 'Applicants with less than 3 interviews',

From 475739ba3e35ac944363815de5ae9314b4b536ff Mon Sep 17 00:00:00 2001
From: Robin <16273164+robines@users.noreply.github.com>
Date: Sat, 2 Nov 2024 01:43:17 +0100
Subject: [PATCH 4/8] Update contributors page (#1584)

---
 .../Contributor.tsx => ContributorItem.tsx}   | 13 +-----------
 .../ContributorsPage/ContributorsPage.tsx     | 21 +++++--------------
 .../components/Contributor/index.ts           |  1 -
 .../ContributorsPage/components/index.ts      |  1 -
 frontend/src/Pages/ContributorsPage/types.ts  | 11 ++++++++++
 5 files changed, 17 insertions(+), 30 deletions(-)
 rename frontend/src/Pages/ContributorsPage/{components/Contributor/Contributor.tsx => ContributorItem.tsx} (90%)
 delete mode 100644 frontend/src/Pages/ContributorsPage/components/Contributor/index.ts
 delete mode 100644 frontend/src/Pages/ContributorsPage/components/index.ts
 create mode 100644 frontend/src/Pages/ContributorsPage/types.ts

diff --git a/frontend/src/Pages/ContributorsPage/components/Contributor/Contributor.tsx b/frontend/src/Pages/ContributorsPage/ContributorItem.tsx
similarity index 90%
rename from frontend/src/Pages/ContributorsPage/components/Contributor/Contributor.tsx
rename to frontend/src/Pages/ContributorsPage/ContributorItem.tsx
index 78dde9035..7348c371e 100644
--- a/frontend/src/Pages/ContributorsPage/components/Contributor/Contributor.tsx
+++ b/frontend/src/Pages/ContributorsPage/ContributorItem.tsx
@@ -7,18 +7,7 @@ import darkAvatar from '~/assets/contributors/default_dark.svg';
 import { THEME } from '~/constants';
 import { useGlobalContext } from '~/context/GlobalContextProvider';
 import { KEY } from '~/i18n/constants';
-
-export type Contributor = {
-  name: string;
-  from: string;
-  to?: string;
-  github?: string;
-  picture?: string;
-  websjef?: {
-    from: string;
-    to: string;
-  };
-};
+import type { Contributor } from './types';
 
 type Props = {
   contributor: Contributor;
diff --git a/frontend/src/Pages/ContributorsPage/ContributorsPage.tsx b/frontend/src/Pages/ContributorsPage/ContributorsPage.tsx
index 2d090cc5f..df8645322 100644
--- a/frontend/src/Pages/ContributorsPage/ContributorsPage.tsx
+++ b/frontend/src/Pages/ContributorsPage/ContributorsPage.tsx
@@ -6,19 +6,14 @@ import robines from '~/assets/contributors/robines.jpg';
 import snorre98 from '~/assets/contributors/snorre98.jpg';
 import sygard from '~/assets/contributors/sygard.jpg';
 import { KEY } from '~/i18n/constants';
+import { ContributorItem } from './ContributorItem';
 import styles from './ContributorsPage.module.scss';
-import { type Contributor, ContributorItem } from './components';
+import type { Contributor } from './types';
 
 // biome-ignore format: array should not be formatted
 const CONTRIBUTORS: Contributor[] = [
   // H17
-  {
-    name: 'Kevin Kristiansen',
-    github: 'KevinKristiansen',
-    from: 'H17',
-    to: 'V20',
-    websjef: { from: 'V18', to: 'H18' },
-  },
+  { name: 'Kevin Kristiansen', github: 'KevinKristiansen', from: 'H17', to: 'V20', websjef: { from: 'V18', to: 'H18' } },
   // H19
   { name: 'Emil Telstad', github: 'emilte', from: 'H19' },
   { name: 'Sigve Røkenes', github: 'evgiz', from: 'H19', to: 'H23', websjef: { from: 'H20', to: 'V21' } },
@@ -39,15 +34,9 @@ const CONTRIBUTORS: Contributor[] = [
   { name: 'Eirik Hoem', github: 'eiriksho', from: 'H22', to: 'V23' },
   { name: 'Simen Seeberg-Rommetveit', github: 'simensee', from: 'H22' },
   // V23
-  {
-    name: 'Robin Espinosa Jelle',
-    github: 'robines',
-    from: 'V23',
-    picture: robines,
-    websjef: { from: 'H23', to: 'V24' },
-  },
+  { name: 'Robin Espinosa Jelle', github: 'robines', from: 'V23', picture: robines, websjef: { from: 'H23', to: 'V24' } },
   { name: 'Johanne Grønlien Gjedrem', github: 'johannegg', from: 'V23' },
-  { name: 'Tinius Presterud', github: 'tiniuspre', from: 'V23' },
+  { name: 'Tinius Presterud', github: 'tiniuspre', from: 'V23', to: 'V24' },
   // H23
   { name: 'Amalie Johansen Vik', github: 'amaliejvik', from: 'H23', picture: amaliejvik },
   { name: 'Marion Lystad', github: 'marionlys', from: 'H23' },
diff --git a/frontend/src/Pages/ContributorsPage/components/Contributor/index.ts b/frontend/src/Pages/ContributorsPage/components/Contributor/index.ts
deleted file mode 100644
index 688926668..000000000
--- a/frontend/src/Pages/ContributorsPage/components/Contributor/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { type Contributor, ContributorItem } from './Contributor';
diff --git a/frontend/src/Pages/ContributorsPage/components/index.ts b/frontend/src/Pages/ContributorsPage/components/index.ts
deleted file mode 100644
index 688926668..000000000
--- a/frontend/src/Pages/ContributorsPage/components/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { type Contributor, ContributorItem } from './Contributor';
diff --git a/frontend/src/Pages/ContributorsPage/types.ts b/frontend/src/Pages/ContributorsPage/types.ts
new file mode 100644
index 000000000..69350b0f6
--- /dev/null
+++ b/frontend/src/Pages/ContributorsPage/types.ts
@@ -0,0 +1,11 @@
+export type Contributor = {
+  name: string;
+  from: string;
+  to?: string;
+  github?: string;
+  picture?: string;
+  websjef?: {
+    from: string;
+    to: string;
+  };
+};

From 3bb3c8d459c23fd413769690ab216d9c56230dcd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Snorre=20S=C3=A6ther?=
 <112980079+Snorre98@users.noreply.github.com>
Date: Tue, 5 Nov 2024 21:53:25 +0100
Subject: [PATCH 5/8] Improve UX of recruitment users without three interview
 page (#1601)

* renamed applicationsWithoutInterview and and changd navigation link

* UX improvment
---
 .../RecruitmentWithoutInterviewTable.tsx      |  5 +--
 .../components/WithoutInterviewList.tsx       | 36 ++++++++++++++++---
 .../components/WithoutInterviewModal.tsx      | 22 ++++++++----
 frontend/src/i18n/constants.ts                |  1 +
 frontend/src/i18n/translations.ts             |  2 ++
 5 files changed, 53 insertions(+), 13 deletions(-)

diff --git a/frontend/src/Components/RecruitmentWithoutInterviewTable/RecruitmentWithoutInterviewTable.tsx b/frontend/src/Components/RecruitmentWithoutInterviewTable/RecruitmentWithoutInterviewTable.tsx
index 3925b2e87..e07800bef 100644
--- a/frontend/src/Components/RecruitmentWithoutInterviewTable/RecruitmentWithoutInterviewTable.tsx
+++ b/frontend/src/Components/RecruitmentWithoutInterviewTable/RecruitmentWithoutInterviewTable.tsx
@@ -24,7 +24,7 @@ export function RecruitmentWithoutInterviewTable({ applicants }: RecruitmentWith
     { content: t(KEY.common_phonenumber), sortable: true },
     { content: t(KEY.recruitment_applicant_top_position), sortable: true },
     { content: t(KEY.recruitment_number_of_applications), sortable: true },
-    { content: t(KEY.common_processed), sortable: true },
+    { content: t(KEY.recruitment_interview_planned), sortable: true },
   ];
 
   function filterUsers(): RecruitmentUserDto[] {
@@ -64,7 +64,8 @@ export function RecruitmentWithoutInterviewTable({ applicants }: RecruitmentWith
         value: user.applications_without_interview ? user.applications_without_interview.length : 0,
         content: (
           <WithoutInterviewModal
-            applications_without_interview={user.applications_without_interview}
+            user={user}
+            applicationsWithoutInterview={user.applications_without_interview}
             applications={user.applications}
           />
         ),
diff --git a/frontend/src/Components/RecruitmentWithoutInterviewTable/components/WithoutInterviewList.tsx b/frontend/src/Components/RecruitmentWithoutInterviewTable/components/WithoutInterviewList.tsx
index 3d41bd7a3..e9a3234aa 100644
--- a/frontend/src/Components/RecruitmentWithoutInterviewTable/components/WithoutInterviewList.tsx
+++ b/frontend/src/Components/RecruitmentWithoutInterviewTable/components/WithoutInterviewList.tsx
@@ -1,7 +1,8 @@
+import { Icon } from '@iconify/react';
 import { useTranslation } from 'react-i18next';
-import { Link } from '~/Components';
+import { Link, Text } from '~/Components';
 import { Table } from '~/Components/Table';
-import type { RecruitmentApplicationDto } from '~/dto';
+import type { RecruitmentApplicationDto, RecruitmentUserDto } from '~/dto';
 import { KEY } from '~/i18n/constants';
 import { reverse } from '~/named-urls';
 import { ROUTES } from '~/routes';
@@ -10,17 +11,23 @@ import styles from './WithoutInterview.module.scss';
 
 type WithoutInterviewListProps = {
   applications: RecruitmentApplicationDto[];
+  user: RecruitmentUserDto;
+  applicationsWithoutInterview: RecruitmentApplicationDto[];
 };
 
-export function WithoutInterviewList({ applications }: WithoutInterviewListProps) {
+export function WithoutInterviewList({ applications, user, applicationsWithoutInterview }: WithoutInterviewListProps) {
   const { t } = useTranslation();
 
   const tableColumns = [
     { content: t(KEY.recruitment_position), sortable: true },
+
+    { content: t(KEY.recruitment_interview_planned), sortable: true },
     { content: t(KEY.recruitment_priority), sortable: true },
   ];
 
   function applicationToRow(application: RecruitmentApplicationDto) {
+    const hasInterview = !applicationsWithoutInterview.some((app) => app.id === application.id);
+
     return {
       cells: [
         {
@@ -28,9 +35,11 @@ export function WithoutInterviewList({ applications }: WithoutInterviewListProps
           content: (
             <Link
               url={reverse({
-                pattern: ROUTES.frontend.admin_recruitment_applicant,
+                pattern: ROUTES.frontend.admin_recruitment_gang_position_applicants_overview,
                 urlParams: {
-                  applicationID: application.id,
+                  recruitmentId: application.recruitment,
+                  gangId: application.recruitment_position.gang.id,
+                  positionId: application.recruitment_position.id,
                 },
               })}
             >
@@ -38,12 +47,29 @@ export function WithoutInterviewList({ applications }: WithoutInterviewListProps
             </Link>
           ),
         },
+
+        {
+          value: hasInterview ? 1 : 0,
+          content: (
+            <Icon
+              icon={
+                hasInterview
+                  ? 'material-symbols:check-circle-outline-rounded'
+                  : 'material-symbols:close-small-outline-rounded'
+              }
+            />
+          ),
+        },
         application.applicant_priority,
       ],
     };
   }
+
   return (
     <div className={styles.container}>
+      <Text size="l">
+        {user.first_name} {user.last_name}
+      </Text>
       <Table columns={tableColumns} data={applications.map((application) => applicationToRow(application))} />
     </div>
   );
diff --git a/frontend/src/Components/RecruitmentWithoutInterviewTable/components/WithoutInterviewModal.tsx b/frontend/src/Components/RecruitmentWithoutInterviewTable/components/WithoutInterviewModal.tsx
index 2318b9e60..db9fc67a8 100644
--- a/frontend/src/Components/RecruitmentWithoutInterviewTable/components/WithoutInterviewModal.tsx
+++ b/frontend/src/Components/RecruitmentWithoutInterviewTable/components/WithoutInterviewModal.tsx
@@ -1,21 +1,26 @@
 import { useState } from 'react';
 import { Button, IconButton, Modal } from '~/Components';
-import type { RecruitmentApplicationDto } from '~/dto';
+import type { RecruitmentApplicationDto, RecruitmentUserDto } from '~/dto';
 import styles from './WithoutInterview.module.scss';
 import { WithoutInterviewList } from './WithoutInterviewList';
 
 type WithoutInterviewModalProps = {
+  user: RecruitmentUserDto;
   applications: RecruitmentApplicationDto[];
-  applications_without_interview: RecruitmentApplicationDto[];
+  applicationsWithoutInterview: RecruitmentApplicationDto[];
 };
 
-export function WithoutInterviewModal({ applications, applications_without_interview }: WithoutInterviewModalProps) {
+export function WithoutInterviewModal({
+  applications,
+  applicationsWithoutInterview,
+  user,
+}: WithoutInterviewModalProps) {
   const [withoutInterviewModal, setWithoutInterviewModal] = useState(false);
 
   return (
     <>
-      <Button theme="text" onClick={() => setWithoutInterviewModal(true)}>
-        {applications.length - applications_without_interview.length} / {applications.length}
+      <Button theme="outlined" display="pill" onClick={() => setWithoutInterviewModal(true)}>
+        {applications.length - applicationsWithoutInterview.length} / {applications.length}
       </Button>
       <Modal isOpen={withoutInterviewModal}>
         <IconButton
@@ -24,7 +29,12 @@ export function WithoutInterviewModal({ applications, applications_without_inter
           icon="mdi:close"
           onClick={() => setWithoutInterviewModal(false)}
         />
-        <WithoutInterviewList applications={applications_without_interview} />
+
+        <WithoutInterviewList
+          applicationsWithoutInterview={applicationsWithoutInterview}
+          user={user}
+          applications={applications}
+        />
       </Modal>
     </>
   );
diff --git a/frontend/src/i18n/constants.ts b/frontend/src/i18n/constants.ts
index 6f8a67974..a237bf674 100644
--- a/frontend/src/i18n/constants.ts
+++ b/frontend/src/i18n/constants.ts
@@ -280,6 +280,7 @@ export const KEY = {
   recruitment_interviewer: 'recruitment_interviewer',
   recruitment_interviewers: 'recruitment_interviewers',
   recruitment_interviews: 'recruitment_interviews',
+  recruitment_interview_planned: 'recruitment_interview_planned',
   recruitment_no_interviews: 'recruitment_no_interviews',
   recruitment_interview_set: 'recruitment_interview_set',
   recruitment_interview_groups: 'recruitment_interview_groups',
diff --git a/frontend/src/i18n/translations.ts b/frontend/src/i18n/translations.ts
index 1e3a3b20e..5e693cd43 100644
--- a/frontend/src/i18n/translations.ts
+++ b/frontend/src/i18n/translations.ts
@@ -262,6 +262,7 @@ export const nb = prepareTranslations({
   [KEY.recruitment_not_applied]: 'Du har ikke sendt søknader til noen stillinger ennå',
   [KEY.recruitment_will_be_anonymized]: 'All info relatert til dine søknader vil bli slettet 3 uker etter opptaket',
   [KEY.recruitment_interviews]: 'Intervjuer',
+  [KEY.recruitment_interview_planned]: 'Intervjuer planlagt',
   [KEY.recruitment_interviewer]: 'Intervjuer',
   [KEY.recruitment_interviewers]: 'Intervjuere',
   [KEY.recruitment_no_interviews]: 'Ingen intervjuer',
@@ -747,6 +748,7 @@ export const en = prepareTranslations({
   [KEY.recruitment_will_be_anonymized]:
     'All info related to the applications will be anonymized three weeks after the recruitment is over',
   [KEY.recruitment_interviews]: 'Interviews',
+  [KEY.recruitment_interview_planned]: 'Interviews planned',
   [KEY.recruitment_interviewer]: 'Interviewer',
   [KEY.recruitment_interviewers]: 'Interviewers',
   [KEY.recruitment_no_interviews]: 'No interviews',

From 329b0d9ae01c85624db4f92de42acaf1957251bd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Snorre=20S=C3=A6ther?=
 <112980079+Snorre98@users.noreply.github.com>
Date: Tue, 5 Nov 2024 22:27:47 +0100
Subject: [PATCH 6/8] 1597 bug position route not related to recruitment
 (#1598)

* refactor in organization recruitment page

* improve organization recruitment page refactor

* removed comment

* refactor to use recruitmentId
---
 .../Components/GangPosition/GangPosition.tsx    |  2 +-
 .../GangPositionDropdown.tsx                    |  7 ++++---
 .../GangTypeContainer/GangTypeContainer.tsx     | 17 ++++++++++-------
 .../PositionsTable/PositionsTable.tsx           |  8 ++++----
 .../OrganizationRecruitmentPage.tsx             |  3 +--
 .../RecruitmentApplicationFormPage.tsx          |  4 ++--
 .../RecruitmentApplicationsOverviewPage.tsx     |  4 ++--
 .../RecruitmentGangAdminPage.tsx                |  1 +
 .../RecruitmentRecruiterDashboardPage.tsx       |  1 +
 frontend/src/routes/frontend.ts                 |  2 +-
 10 files changed, 27 insertions(+), 22 deletions(-)

diff --git a/frontend/src/Pages/OrganizationRecruitmentPage/Components/GangPosition/GangPosition.tsx b/frontend/src/Pages/OrganizationRecruitmentPage/Components/GangPosition/GangPosition.tsx
index 0b0a32026..e22c843c0 100644
--- a/frontend/src/Pages/OrganizationRecruitmentPage/Components/GangPosition/GangPosition.tsx
+++ b/frontend/src/Pages/OrganizationRecruitmentPage/Components/GangPosition/GangPosition.tsx
@@ -37,7 +37,7 @@ export function GangPosition({ type, recruitmentPositions }: GangItemProps) {
                 <Link
                   url={reverse({
                     pattern: ROUTES.frontend.recruitment_application,
-                    urlParams: { positionId: pos.id, gangId: gang.id },
+                    urlParams: { positionId: pos.id, recruitmentId: pos.recruitment },
                   })}
                   className={styles.position_short_desc}
                 >
diff --git a/frontend/src/Pages/OrganizationRecruitmentPage/Components/GangPositionDropdown/GangPositionDropdown.tsx b/frontend/src/Pages/OrganizationRecruitmentPage/Components/GangPositionDropdown/GangPositionDropdown.tsx
index 21743ab80..931798285 100644
--- a/frontend/src/Pages/OrganizationRecruitmentPage/Components/GangPositionDropdown/GangPositionDropdown.tsx
+++ b/frontend/src/Pages/OrganizationRecruitmentPage/Components/GangPositionDropdown/GangPositionDropdown.tsx
@@ -7,12 +7,13 @@ import styles from './GangPositionDropdown.module.scss';
 
 type GangItemProps = {
   type: GangTypeDto;
+  recruitmentId?: string;
   recruitmentPositions?: RecruitmentPositionDto[];
 };
 
 //TODO: DO IN ISSUE #1121, only get gang types recruiting from backend
 // TODO: so the filtering should be done from the backend
-export function GangPositionDropdown({ type, recruitmentPositions }: GangItemProps) {
+export function GangPositionDropdown({ type, recruitmentPositions, recruitmentId }: GangItemProps) {
   const filteredGangs = type.gangs
     .map((gang) => {
       const filteredPositions = recruitmentPositions?.filter((pos) => pos.gang.id === gang.id);
@@ -30,7 +31,7 @@ export function GangPositionDropdown({ type, recruitmentPositions }: GangItemPro
                 <Link
                   url={reverse({
                     pattern: ROUTES.frontend.recruitment_application,
-                    urlParams: { positionId: pos.id, gangId: gang.id },
+                    urlParams: { positionId: pos.id, recruitmentId: recruitmentId },
                   })}
                   className={styles.position_name}
                 >
@@ -39,7 +40,7 @@ export function GangPositionDropdown({ type, recruitmentPositions }: GangItemPro
                 <Link
                   url={reverse({
                     pattern: ROUTES.frontend.recruitment_application,
-                    urlParams: { positionId: pos.id, gangId: gang.id },
+                    urlParams: { positionId: pos.id, recruitmentId: recruitmentId },
                   })}
                   className={styles.position_short_desc}
                 >
diff --git a/frontend/src/Pages/OrganizationRecruitmentPage/Components/GangTypeContainer/GangTypeContainer.tsx b/frontend/src/Pages/OrganizationRecruitmentPage/Components/GangTypeContainer/GangTypeContainer.tsx
index 9c32c12cb..ccfdf7185 100644
--- a/frontend/src/Pages/OrganizationRecruitmentPage/Components/GangTypeContainer/GangTypeContainer.tsx
+++ b/frontend/src/Pages/OrganizationRecruitmentPage/Components/GangTypeContainer/GangTypeContainer.tsx
@@ -1,19 +1,17 @@
 import { useEffect, useState } from 'react';
+import { useParams } from 'react-router-dom';
 import { SamfundetLogoSpinner } from '~/Components';
 import { getGangList, getRecruitmentPositions } from '~/api';
 import type { GangTypeDto, RecruitmentPositionDto } from '~/dto';
 import { GangPositionDropdown } from '../GangPositionDropdown';
 
-type GangTypeContainerProps = {
-  recruitmentId: string;
-};
-
-export function GangTypeContainer({ recruitmentId = '-1' }: GangTypeContainerProps) {
+export function GangTypeContainer() {
   const [recruitmentPositions, setRecruitmentPositions] = useState<RecruitmentPositionDto[]>();
   const [recruitingGangTypes, setRecruitingGangs] = useState<GangTypeDto[]>();
   const [loading, setLoading] = useState<boolean>(true);
-
+  const { recruitmentId } = useParams();
   useEffect(() => {
+    if (!recruitmentId) return;
     Promise.all([getRecruitmentPositions(recruitmentId), getGangList()])
       .then(([recruitmentRes, gangsRes]) => {
         setRecruitmentPositions(recruitmentRes.data);
@@ -31,7 +29,12 @@ export function GangTypeContainer({ recruitmentId = '-1' }: GangTypeContainerPro
   ) : (
     <>
       {recruitingGangTypes?.map((gangType) => (
-        <GangPositionDropdown key={gangType.id} type={gangType} recruitmentPositions={recruitmentPositions} />
+        <GangPositionDropdown
+          key={gangType.id}
+          type={gangType}
+          recruitmentPositions={recruitmentPositions}
+          recruitmentId={recruitmentId}
+        />
       ))}
     </>
   );
diff --git a/frontend/src/Pages/OrganizationRecruitmentPage/Components/PositionsTable/PositionsTable.tsx b/frontend/src/Pages/OrganizationRecruitmentPage/Components/PositionsTable/PositionsTable.tsx
index 1daf2862f..eb0eaf61c 100644
--- a/frontend/src/Pages/OrganizationRecruitmentPage/Components/PositionsTable/PositionsTable.tsx
+++ b/frontend/src/Pages/OrganizationRecruitmentPage/Components/PositionsTable/PositionsTable.tsx
@@ -21,15 +21,15 @@ export function PositionsTable({ currentSelectedGang, setLoading, loading }: Pos
   const [positions, setPositions] = useState<RecruitmentPositionDto[]>([]);
   const navigate = useNavigate();
   const { t } = useTranslation();
-  const recruitmentId = useParams();
+  const { recruitmentId } = useParams();
   const { organizationTheme } = useOrganizationContext();
 
   useEffect(() => {
-    if (!currentSelectedGang || !recruitmentId.recruitmentId) {
+    if (!currentSelectedGang || !recruitmentId) {
       return;
     }
     setLoading(true);
-    getRecruitmentPositionsGangForApplicant(recruitmentId.recruitmentId, currentSelectedGang.id)
+    getRecruitmentPositionsGangForApplicant(recruitmentId, currentSelectedGang.id)
       .then((response) => {
         setPositions(response.data);
         setLoading(false);
@@ -48,7 +48,7 @@ export function PositionsTable({ currentSelectedGang, setLoading, loading }: Pos
   const tableData = positions.map((item) => {
     const positionPageURL = reverse({
       pattern: ROUTES.frontend.recruitment_application,
-      urlParams: { positionId: item.id, gangId: item.id },
+      urlParams: { positionId: item.id, recruitmentId: recruitmentId },
     });
     return {
       cells: [
diff --git a/frontend/src/Pages/OrganizationRecruitmentPage/OrganizationRecruitmentPage.tsx b/frontend/src/Pages/OrganizationRecruitmentPage/OrganizationRecruitmentPage.tsx
index 8d2479493..eb0b49c75 100644
--- a/frontend/src/Pages/OrganizationRecruitmentPage/OrganizationRecruitmentPage.tsx
+++ b/frontend/src/Pages/OrganizationRecruitmentPage/OrganizationRecruitmentPage.tsx
@@ -113,8 +113,7 @@ export function OrganizationRecruitmentPage() {
               <Text>Placeholder for tag-autocomplete search </Text>
               {/*^^^ issue #1275 */}
             </div>
-            {recruitmentId &&
-              (viewAllPositions ? <GangTypeContainer recruitmentId={recruitmentId} /> : <RecruitmentTabs />)}
+            {recruitmentId && (viewAllPositions ? <GangTypeContainer /> : <RecruitmentTabs />)}
             {recruitment?.separate_positions && recruitment.separate_positions.length > 0 && (
               <GangSeparatePositions recruitmentSeparatePositions={recruitment.separate_positions} />
             )}
diff --git a/frontend/src/Pages/RecruitmentApplicationFormPage/RecruitmentApplicationFormPage.tsx b/frontend/src/Pages/RecruitmentApplicationFormPage/RecruitmentApplicationFormPage.tsx
index e28efb093..fe6f0d720 100644
--- a/frontend/src/Pages/RecruitmentApplicationFormPage/RecruitmentApplicationFormPage.tsx
+++ b/frontend/src/Pages/RecruitmentApplicationFormPage/RecruitmentApplicationFormPage.tsx
@@ -40,7 +40,7 @@ export function RecruitmentApplicationFormPage() {
 
   const [loading, setLoading] = useState(true);
 
-  const { positionId } = useParams();
+  const { positionId, recruitmentId } = useParams();
 
   useTitle(recruitmentPosition ? (dbT(recruitmentPosition, 'name') as string) : '');
 
@@ -175,7 +175,7 @@ export function RecruitmentApplicationFormPage() {
                       navigate({
                         url: reverse({
                           pattern: ROUTES.frontend.recruitment_application,
-                          urlParams: { positionId: pos.id, gangId: pos.gang.id },
+                          urlParams: { positionId: pos.id, recruitmentId: recruitmentId },
                         }),
                       });
                     }}
diff --git a/frontend/src/Pages/RecruitmentApplicationsOverviewPage/RecruitmentApplicationsOverviewPage.tsx b/frontend/src/Pages/RecruitmentApplicationsOverviewPage/RecruitmentApplicationsOverviewPage.tsx
index d36979d25..c6d3cebc3 100644
--- a/frontend/src/Pages/RecruitmentApplicationsOverviewPage/RecruitmentApplicationsOverviewPage.tsx
+++ b/frontend/src/Pages/RecruitmentApplicationsOverviewPage/RecruitmentApplicationsOverviewPage.tsx
@@ -70,7 +70,7 @@ export function RecruitmentApplicationsOverviewPage() {
               pattern: ROUTES.frontend.recruitment_application,
               urlParams: {
                 positionId: application.recruitment_position.id,
-                gangId: application.recruitment_position.gang.id,
+                recruitmentId: recruitmentId,
               },
             })}
             className={styles.position_name}
@@ -131,7 +131,7 @@ export function RecruitmentApplicationsOverviewPage() {
               pattern: ROUTES.frontend.recruitment_application,
               urlParams: {
                 positionId: application.recruitment_position.id,
-                gangId: application.recruitment_position.gang.id,
+                recruitmentId: recruitmentId,
               },
             })}
             className={styles.withdrawnLink}
diff --git a/frontend/src/PagesAdmin/RecruitmentGangAdminPage/RecruitmentGangAdminPage.tsx b/frontend/src/PagesAdmin/RecruitmentGangAdminPage/RecruitmentGangAdminPage.tsx
index b44137a47..936037ebd 100644
--- a/frontend/src/PagesAdmin/RecruitmentGangAdminPage/RecruitmentGangAdminPage.tsx
+++ b/frontend/src/PagesAdmin/RecruitmentGangAdminPage/RecruitmentGangAdminPage.tsx
@@ -99,6 +99,7 @@ export function RecruitmentGangAdminPage() {
                     pattern: ROUTES.frontend.recruitment_application,
                     urlParams: {
                       positionId: recruitmentPosition.id,
+                      recruitmentId: recruitmentId,
                     },
                   }),
                 );
diff --git a/frontend/src/PagesAdmin/RecruitmentRecruiterDashboardPage/RecruitmentRecruiterDashboardPage.tsx b/frontend/src/PagesAdmin/RecruitmentRecruiterDashboardPage/RecruitmentRecruiterDashboardPage.tsx
index 3afb7fb29..a1e5f76d1 100644
--- a/frontend/src/PagesAdmin/RecruitmentRecruiterDashboardPage/RecruitmentRecruiterDashboardPage.tsx
+++ b/frontend/src/PagesAdmin/RecruitmentRecruiterDashboardPage/RecruitmentRecruiterDashboardPage.tsx
@@ -93,6 +93,7 @@ export function RecruitmentRecruiterDashboardPage() {
                   pattern: ROUTES.frontend.recruitment_application,
                   urlParams: {
                     positionId: application.recruitment_position.id,
+                    recruitmentId: recruitmentId,
                   },
                 })}
               >
diff --git a/frontend/src/routes/frontend.ts b/frontend/src/routes/frontend.ts
index e29a2550d..4bf28443b 100644
--- a/frontend/src/routes/frontend.ts
+++ b/frontend/src/routes/frontend.ts
@@ -19,7 +19,7 @@ export const ROUTES_FRONTEND = {
   contributors: '/contributors',
   // Recruitment:
   recruitment: '/recruitment/',
-  recruitment_application: '/recruitment/position/:positionId/',
+  recruitment_application: '/recruitment/:recruitmentId/position/:positionId/',
   recruitment_application_overview: '/recruitment/:recruitmentId/my-applications/',
   organization_recruitment: '/recruitment/:recruitmentId/',
   contact: '/contact',

From 24b97cab6fb21d9352c289844f3f688243c90a67 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Snorre=20S=C3=A6ther?=
 <112980079+Snorre98@users.noreply.github.com>
Date: Tue, 5 Nov 2024 23:14:43 +0100
Subject: [PATCH 7/8] refactors the "without interview table" to use the
 correct link (#1599)

---
 .../RecruitmentWithoutInterviewTable.tsx          | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/frontend/src/Components/RecruitmentWithoutInterviewTable/RecruitmentWithoutInterviewTable.tsx b/frontend/src/Components/RecruitmentWithoutInterviewTable/RecruitmentWithoutInterviewTable.tsx
index e07800bef..a414c3bc0 100644
--- a/frontend/src/Components/RecruitmentWithoutInterviewTable/RecruitmentWithoutInterviewTable.tsx
+++ b/frontend/src/Components/RecruitmentWithoutInterviewTable/RecruitmentWithoutInterviewTable.tsx
@@ -3,6 +3,7 @@ import { useTranslation } from 'react-i18next';
 import { Table } from '~/Components/Table';
 import type { RecruitmentUserDto } from '~/dto';
 import { KEY } from '~/i18n/constants';
+import { reverse } from '~/named-urls';
 import { ROUTES } from '~/routes';
 import { dbT } from '~/utils';
 import { InputField } from '../InputField';
@@ -54,7 +55,19 @@ export function RecruitmentWithoutInterviewTable({ applicants }: RecruitmentWith
     return [
       {
         value: `${user.first_name} ${user.last_name}`,
-        content: <Link url={ROUTES.frontend.recruitment_application}>{`${user.first_name} ${user.last_name}`}</Link>,
+        content: (
+          <Link
+            url={reverse({
+              pattern: ROUTES.frontend.admin_recruitment_applicant,
+              urlParams: {
+                applicationID: user.top_application.id,
+              },
+            })}
+            className={styles.text}
+          >
+            {user.first_name} {user.last_name}
+          </Link>
+        ),
       },
       user.email,
       user.phone_number,

From 0fa76f0dc86eacd9a0cfdbc0546b4b0885c83fb1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Snorre=20S=C3=A6ther?=
 <112980079+Snorre98@users.noreply.github.com>
Date: Tue, 5 Nov 2024 23:33:27 +0100
Subject: [PATCH 8/8] adds new column and implements type map (#1600)

---
 .../RecruitmentGangAllApplicantsAdminPage.tsx          | 10 ++++++++--
 frontend/src/dto.ts                                    |  2 +-
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/frontend/src/PagesAdmin/RecruitmentGangAllApplicantsAdminPage/RecruitmentGangAllApplicantsAdminPage.tsx b/frontend/src/PagesAdmin/RecruitmentGangAllApplicantsAdminPage/RecruitmentGangAllApplicantsAdminPage.tsx
index 1dfb3a1dd..e35d79a0f 100644
--- a/frontend/src/PagesAdmin/RecruitmentGangAllApplicantsAdminPage/RecruitmentGangAllApplicantsAdminPage.tsx
+++ b/frontend/src/PagesAdmin/RecruitmentGangAllApplicantsAdminPage/RecruitmentGangAllApplicantsAdminPage.tsx
@@ -12,6 +12,7 @@ import { STATUS } from '~/http_status_codes';
 import { KEY } from '~/i18n/constants';
 import { reverse } from '~/named-urls';
 import { ROUTES } from '~/routes';
+import { RecruitmentPriorityChoicesMapping, RecruitmentStatusChoicesMapping } from '~/types';
 import { dbT } from '~/utils';
 import { AdminPageLayout } from '../AdminPageLayout/AdminPageLayout';
 import styles from './RecruitmentGangAllApplicantsAdminPage.module.scss';
@@ -64,7 +65,6 @@ export function RecruitmentGangAllApplicantsAdminPage() {
           setRecruitment(resp.data);
         })
         .catch((data) => {
-          // TODO add error pop up message?
           if (data.request.status === STATUS.HTTP_404_NOT_FOUND) {
             navigate({ url: ROUTES.frontend.admin_recruitment });
           }
@@ -81,6 +81,7 @@ export function RecruitmentGangAllApplicantsAdminPage() {
     { content: t(KEY.recruitment_position), sortable: true },
     { content: t(KEY.recruitment_interview_time), sortable: true },
     { content: t(KEY.recruitment_interview_location), sortable: true },
+    { content: t(KEY.recruitment_recruiter_priority), sortable: true },
     { content: t(KEY.recruitment_recruiter_status), sortable: true },
   ];
 
@@ -106,7 +107,12 @@ export function RecruitmentGangAllApplicantsAdminPage() {
         { content: <Link url={applicationURL}>{dbT(application.recruitment_position, 'name')}</Link> },
         application.interview?.interview_time,
         application.interview?.interview_location,
-        application.recruiter_status,
+        application.recruiter_priority !== undefined
+          ? RecruitmentPriorityChoicesMapping[application.recruiter_priority]
+          : 'N/A',
+        application.recruiter_status !== undefined
+          ? RecruitmentStatusChoicesMapping[application.recruiter_status]
+          : 'N/A',
       ],
     };
   });
diff --git a/frontend/src/dto.ts b/frontend/src/dto.ts
index 4cd54cb1c..3a538bd24 100644
--- a/frontend/src/dto.ts
+++ b/frontend/src/dto.ts
@@ -505,7 +505,7 @@ export type RecruitmentApplicationDto = {
   recruitment: number;
   user: UserDto;
   applicant_priority: number;
-  recruiter_priority?: number | string;
+  recruiter_priority?: number;
   recruiter_status?: number;
   applicant_state?: number;
   created_at: string;