Merge branch 'master' into robin/send-match-to-crumb

Samfundet · Sep 29, 2024 · 9065642 · 9065642
2 parents 389e724 + e65f650
commit 9065642
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 20 deletions.
diff --git a/...nd/src/PagesAdmin/RecruitmentRecruiterDashboardPage/RecruitmentRecruiterDashboardPage.tsx b/...nd/src/PagesAdmin/RecruitmentRecruiterDashboardPage/RecruitmentRecruiterDashboardPage.tsx
@@ -24,29 +24,29 @@ export function RecruitmentRecruiterDashboardPage() {
   const [applications, setApplications] = useState<RecruitmentApplicationDto[]>();
   const [loading, setLoading] = useState(true);
 
+  // biome-ignore lint/correctness/useExhaustiveDependencies: navigate must not be in deplist
   useEffect(() => {
-    if (recruitmentId) {
-      getRecruitmentRecruiterDashboard(recruitmentId)
-        .then((resp) => {
-          setRecruitment(resp.data.recruitment);
-          setApplications(resp.data.applications);
-          setLoading(false);
-        })
-        .catch((data) => {
-          toast.error(t(KEY.common_something_went_wrong));
-          if (data.request.status === STATUS.HTTP_404_NOT_FOUND) {
-            navigate({ url: ROUTES.frontend.not_found });
-          }
-        });
-    }
-  }, [navigate, recruitmentId, t]);
+    if (!recruitmentId) return;
+    getRecruitmentRecruiterDashboard(recruitmentId)
+      .then((resp) => {
+        setRecruitment(resp.data.recruitment);
+        setApplications(resp.data.applications);
+        setLoading(false);
+      })
+      .catch((data) => {
+        toast.error(t(KEY.common_something_went_wrong));
+        if (data.request.status === STATUS.HTTP_404_NOT_FOUND) {
+          navigate({ url: ROUTES.frontend.not_found });
+        }
+      });
+  }, [recruitmentId, t]);
 
   if (!recruitmentId) {
     navigate({ url: ROUTES.frontend.not_found });
     return <></>;
   }
 
-  const title = `${t(KEY.recruitment_overview)} - ${getObjectFieldOrNumber(recruitment?.organization, 'name')} - ${dbT(
+  const title = `${t(KEY.recruitment_recruiter_dashboard)} - ${getObjectFieldOrNumber(recruitment?.organization, 'name')} - ${dbT(
     recruitment,
     'name',
   )}`;

diff --git a/frontend/src/i18n/constants.ts b/frontend/src/i18n/constants.ts
@@ -336,6 +336,7 @@ export const KEY = {
   recruitment_no_current_applications_gang: 'recruitment_no_current_applications_gang',
   recruitment_progression: 'recruitment_progression',
   recruitment_overview: 'recruitment_overview',
+  recruitment_recruiter_dashboard: 'recruitment_recruiter_dashboard',
   recruitment_dashboard_description: 'recruitment_dashboard_description',
   recruitment_application: 'recruitment_application',
   recruitment_admitted: 'recruitment_admitted',

diff --git a/frontend/src/i18n/translations.ts b/frontend/src/i18n/translations.ts
@@ -299,6 +299,7 @@ export const nb = prepareTranslations({
   [KEY.recruitment_applications]: 'søknader',
   [KEY.recruitment_progression]: 'Opptak fremgang',
   [KEY.recruitment_overview]: 'Opptak oversikt',
+  [KEY.recruitment_recruiter_dashboard]: 'Dashbord',
   [KEY.recruitment_statistics]: 'Opptak statistikk',
   [KEY.recruitment_applications_processed]: 'søknader behandlet',
   [KEY.recruitment_automatic_rejection]: 'Automatisk avslag',
@@ -723,6 +724,7 @@ export const en = prepareTranslations({
   [KEY.application_deadline]: 'Application deadline',
   [KEY.recruitment_progression]: 'Recruitment progression',
   [KEY.recruitment_overview]: 'Recruitment overview',
+  [KEY.recruitment_recruiter_dashboard]: 'Dashboard',
   [KEY.recruitment_admitted]: 'admitted',
   [KEY.recruitment_statistics]: 'Recruitment statistics',
   [KEY.recruitment_applications]: 'applications',

diff --git a/frontend/src/router/router.tsx b/frontend/src/router/router.tsx
@@ -349,10 +349,6 @@ export const router = createBrowserRouter(
             }
             handle={{ crumb: () => <Link url={ROUTES.frontend.admin_recruitment_create}>{t(KEY.common_create)}</Link> }}
           />
-          <Route
-            path={ROUTES.frontend.admin_recruitment_recruiter_dashboard}
-            element={<RecruitmentRecruiterDashboardPage />}
-          />
           <Route
             path={ROUTES.frontend.admin_recruitment_gang_all_applications}
             element={<RecruitmentGangAllApplicantsAdminPage />}
@@ -409,6 +405,15 @@ export const router = createBrowserRouter(
                 crumb: ({ pathname }: UIMatch) => <Link url={pathname}>{t(KEY.common_edit)}</Link>,
               }}
             />
+            <Route
+              path={ROUTES.frontend.admin_recruitment_recruiter_dashboard}
+              element={<RecruitmentRecruiterDashboardPage />}
+              handle={{
+                crumb: ({ pathname }: UIMatch) => (
+                  <Link url={pathname}>{t(KEY.recruitment_recruiter_dashboard)}</Link>
+                ),
+              }}
+            />
             <Route
               path={ROUTES.frontend.admin_recruitment_gang_separateposition_create}
               element={