refactor to use recruitmentId

Samfundet · Nov 3, 2024 · 03f4040 · 03f4040
1 parent 460ebc8
commit 03f4040
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 8 deletions.
diff --git 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/...ages/OrganizationRecruitmentPage/Components/GangPositionDropdown/GangPositionDropdown.tsx b/...ages/OrganizationRecruitmentPage/Components/GangPositionDropdown/GangPositionDropdown.tsx
@@ -31,7 +31,7 @@ export function GangPositionDropdown({ type, recruitmentPositions, recruitmentId
                 <Link
                   url={reverse({
                     pattern: ROUTES.frontend.recruitment_application,
-                    urlParams: { positionId: pos.id, gangId: gang.id, recruitmentId: recruitmentId },
+                    urlParams: { positionId: pos.id, recruitmentId: recruitmentId },
                   })}
                   className={styles.position_name}
                 >
@@ -40,7 +40,7 @@ export function GangPositionDropdown({ type, recruitmentPositions, recruitmentId
                 <Link
                   url={reverse({
                     pattern: ROUTES.frontend.recruitment_application,
-                    urlParams: { positionId: pos.id, gangId: gang.id, recruitmentId: recruitmentId },
+                    urlParams: { positionId: pos.id, recruitmentId: recruitmentId },
                   })}
                   className={styles.position_short_desc}
                 >

diff --git a/frontend/src/Pages/OrganizationRecruitmentPage/Components/PositionsTable/PositionsTable.tsx b/frontend/src/Pages/OrganizationRecruitmentPage/Components/PositionsTable/PositionsTable.tsx
@@ -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, recruitmentId: recruitmentId },
+      urlParams: { positionId: item.id, recruitmentId: recruitmentId },
     });
     return {
       cells: [

diff --git 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/...end/src/Pages/RecruitmentApplicationsOverviewPage/RecruitmentApplicationsOverviewPage.tsx b/...end/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
@@ -99,6 +99,7 @@ export function RecruitmentGangAdminPage() {
                     pattern: ROUTES.frontend.recruitment_application,
                     urlParams: {
                       positionId: recruitmentPosition.id,
+                      recruitmentId: recruitmentId,
                     },
                   }),
                 );

diff --git a/...nd/src/PagesAdmin/RecruitmentRecruiterDashboardPage/RecruitmentRecruiterDashboardPage.tsx b/...nd/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,
                   },
                 })}
               >