From 987f6276fbd2fa9c2d9247e0153969244fb6dcaf Mon Sep 17 00:00:00 2001
From: john-tco <john.morley@cabinetoffice.gov.uk>
Date: Mon, 31 Jul 2023 12:11:54 +0100
Subject: [PATCH] fix add, fix delete

---
 .../manage-departments/add/index.page.tsx     |  4 +-
 .../delete/[id]/index.page.tsx                | 19 ++--
 .../edit/[id]/index.page.tsx                  | 89 +++++++++----------
 .../manage-departments/index.page.tsx         |  6 +-
 .../user/[id]/index.page.tsx                  |  1 -
 .../admin/src/services/SuperAdminService.ts   |  2 +-
 .../QuestionPageGetServerSideProps.tsx        |  3 +-
 7 files changed, 62 insertions(+), 62 deletions(-)

diff --git a/packages/admin/src/pages/super-admin-dashboard/manage-departments/add/index.page.tsx b/packages/admin/src/pages/super-admin-dashboard/manage-departments/add/index.page.tsx
index 47913b731..9e0ddf844 100644
--- a/packages/admin/src/pages/super-admin-dashboard/manage-departments/add/index.page.tsx
+++ b/packages/admin/src/pages/super-admin-dashboard/manage-departments/add/index.page.tsx
@@ -26,7 +26,7 @@ export function getServerSideProps(context: GetServerSidePropsContext) {
     handleRequest,
     jwt: getUserTokenFromCookies(context.req),
     onErrorMessage: 'Failed to create department, please try again later.',
-    onSuccessRedirectHref: `/super-admin-dashboard/manage-departments/edit/${context.params?.id}`,
+    onSuccessRedirectHref: `/super-admin-dashboard/manage-departments/`,
   });
 }
 
@@ -45,7 +45,7 @@ const AddDepartmentPage = ({
         <FlexibleQuestionPageLayout
           fieldErrors={fieldErrors}
           csrfToken={csrfToken}
-          formAction={publicRuntimeConfig.SUB_PATH + formAction}
+          formAction={formAction}
         >
           <h1 className="govuk-heading-l">Add a department</h1>
           <TextInput
diff --git a/packages/admin/src/pages/super-admin-dashboard/manage-departments/delete/[id]/index.page.tsx b/packages/admin/src/pages/super-admin-dashboard/manage-departments/delete/[id]/index.page.tsx
index e2b30c3da..97c5663ca 100644
--- a/packages/admin/src/pages/super-admin-dashboard/manage-departments/delete/[id]/index.page.tsx
+++ b/packages/admin/src/pages/super-admin-dashboard/manage-departments/delete/[id]/index.page.tsx
@@ -16,10 +16,8 @@ export function getServerSideProps(context: GetServerSidePropsContext) {
     return { id: context.params?.id as string };
   };
 
-  const handleRequest = async (
-    body: Omit<Department, 'name' | 'ggisID'>,
-    jwt: string
-  ) => deleteDepartmentInformation(body.id, jwt);
+  const handleRequest = async (_body: { _csrf: string }, jwt: string) =>
+    deleteDepartmentInformation(context.params?.id as string, jwt);
 
   return QuestionPageGetServerSideProps({
     context,
@@ -27,7 +25,7 @@ export function getServerSideProps(context: GetServerSidePropsContext) {
     handleRequest,
     jwt: getUserTokenFromCookies(context.req),
     onErrorMessage: 'Failed to delete department, please try again later.',
-    onSuccessRedirectHref: `/super-admin-dashboard/manage-departments/edit/${context.params?.id}`,
+    onSuccessRedirectHref: `/super-admin-dashboard/manage-departments/`,
   });
 }
 
@@ -37,8 +35,6 @@ const DeleteDepartmentPage = ({
   csrfToken,
   fieldErrors,
 }: InferProps<typeof getServerSideProps>) => {
-  const { publicRuntimeConfig } = getConfig();
-
   return (
     <>
       <Meta title="Delete Department" />
@@ -47,9 +43,13 @@ const DeleteDepartmentPage = ({
         <FlexibleQuestionPageLayout
           fieldErrors={fieldErrors}
           csrfToken={csrfToken}
-          formAction={publicRuntimeConfig.SUB_PATH + formAction}
+          formAction={formAction}
         >
           <h1 className="govuk-heading-l">Delete department</h1>
+          <p className="govuk-body">
+            If you delete this department, all of its information will be lost.
+            You cannot undo this action.
+          </p>
           <div className="govuk-button-group">
             <button
               className="govuk-button govuk-button--warning"
@@ -58,7 +58,8 @@ const DeleteDepartmentPage = ({
               Delete department
             </button>
             <a
-              href={`${publicRuntimeConfig.SUB_PATH}/super-admin-dashboard/manage-departments/edit/${id}`}
+              className="govuk-link"
+              href={`/super-admin-dashboard/manage-departments/edit/${id}`}
             >
               Cancel
             </a>
diff --git a/packages/admin/src/pages/super-admin-dashboard/manage-departments/edit/[id]/index.page.tsx b/packages/admin/src/pages/super-admin-dashboard/manage-departments/edit/[id]/index.page.tsx
index 0e62ea084..ef25cde6a 100644
--- a/packages/admin/src/pages/super-admin-dashboard/manage-departments/edit/[id]/index.page.tsx
+++ b/packages/admin/src/pages/super-admin-dashboard/manage-departments/edit/[id]/index.page.tsx
@@ -53,54 +53,49 @@ const EditDepartmentPage = ({
 
   return (
     <>
-      <div className="govuk-grid-row govuk-!-padding-top-2">
-        <Meta title="Edit Department" />
-        <CustomLink isBackButton href={'/super-admin-dashboard/'} />
-        <div className="govuk-width-container">
-          <main className="govuk-main-wrapper govuk-main-wrapper--auto-spacing">
-            <div className="govuk-grid-row">
-              <h1 className="govuk-heading-l">Edit department</h1>
-              <FlexibleQuestionPageLayout
-                fieldErrors={fieldErrors}
-                csrfToken={csrfToken}
-                formAction={publicRuntimeConfig.SUB_PATH + formAction}
-              >
-                <TextInput
-                  questionTitle={`Department name`}
-                  titleSize="m"
-                  fieldName="departmentName"
-                  defaultValue={departmentName}
-                  fieldErrors={fieldErrors}
-                  TitleTag="h2"
-                />
-                <TextInput
-                  questionHintText={
-                    'This should be the departments GGIS ID, not the ID of a grant within it.'
-                  }
-                  width="10"
-                  questionTitle={`GGGIS ID number`}
-                  titleSize="m"
-                  fieldName="ggisId"
-                  defaultValue={ggisID}
-                  fieldErrors={fieldErrors}
-                  TitleTag="h2"
-                />
-                <div className="govuk-button-group">
-                  <button className="govuk-button" data-module="govuk-button">
-                    Save changes
-                  </button>
+      <Meta title="Edit Department" />
+      <CustomLink isBackButton href={'/super-admin-dashboard/'} />
 
-                  <a
-                    href={`${publicRuntimeConfig.SUB_PATH}/super-admin-dashboard/manage-departments/delete/${id}`}
-                    className="govuk-button govuk-button--warning"
-                  >
-                    Delete department
-                  </a>
-                </div>
-              </FlexibleQuestionPageLayout>
-            </div>
-          </main>
-        </div>
+      <div className="govuk-!-padding-top-7">
+        <h1 className="govuk-heading-l">Edit department</h1>
+        <FlexibleQuestionPageLayout
+          fieldErrors={fieldErrors}
+          csrfToken={csrfToken}
+          formAction={formAction}
+        >
+          <TextInput
+            questionTitle={`Department name`}
+            titleSize="m"
+            fieldName="departmentName"
+            defaultValue={departmentName}
+            fieldErrors={fieldErrors}
+            TitleTag="h2"
+          />
+          <TextInput
+            questionHintText={
+              'This should be the departments GGIS ID, not the ID of a grant within it.'
+            }
+            width="10"
+            questionTitle={`GGGIS ID number`}
+            titleSize="m"
+            fieldName="ggisId"
+            defaultValue={ggisID}
+            fieldErrors={fieldErrors}
+            TitleTag="h2"
+          />
+          <div className="govuk-button-group">
+            <button className="govuk-button" data-module="govuk-button">
+              Save changes
+            </button>
+
+            <a
+              href={`${publicRuntimeConfig.SUB_PATH}/super-admin-dashboard/manage-departments/delete/${id}`}
+              className="govuk-button govuk-button--warning"
+            >
+              Delete department
+            </a>
+          </div>
+        </FlexibleQuestionPageLayout>
       </div>
     </>
   );
diff --git a/packages/admin/src/pages/super-admin-dashboard/manage-departments/index.page.tsx b/packages/admin/src/pages/super-admin-dashboard/manage-departments/index.page.tsx
index 01dd064b3..e53916c5e 100644
--- a/packages/admin/src/pages/super-admin-dashboard/manage-departments/index.page.tsx
+++ b/packages/admin/src/pages/super-admin-dashboard/manage-departments/index.page.tsx
@@ -44,7 +44,11 @@ const ManageDepartmentsPage = ({
           hasWiderKeyColumn
           rows={departments.map((dept, idx) => getDepartmentRow(idx, dept))}
         />
-        <CustomLink href={`/manage-departments/add`} isButton isSecondaryButton>
+        <CustomLink
+          href={`/super-admin-dashboard/manage-departments/add`}
+          isButton
+          isSecondaryButton
+        >
           Add new department
         </CustomLink>
       </div>
diff --git a/packages/admin/src/pages/super-admin-dashboard/user/[id]/index.page.tsx b/packages/admin/src/pages/super-admin-dashboard/user/[id]/index.page.tsx
index 1d75c48c8..63abe2c26 100644
--- a/packages/admin/src/pages/super-admin-dashboard/user/[id]/index.page.tsx
+++ b/packages/admin/src/pages/super-admin-dashboard/user/[id]/index.page.tsx
@@ -28,7 +28,6 @@ const UserPage = ({ user }: UserPageProps) => {
   return (
     <>
       <Meta title="Manage User" />
-
       <div className="govuk-!-padding-top-2">
         <div className="govuk-width-container">
           <a
diff --git a/packages/admin/src/services/SuperAdminService.ts b/packages/admin/src/services/SuperAdminService.ts
index 8c0ff919e..216f28e55 100644
--- a/packages/admin/src/services/SuperAdminService.ts
+++ b/packages/admin/src/services/SuperAdminService.ts
@@ -127,7 +127,7 @@ export const deleteDepartmentInformation = async (
   userToken: string
 ) =>
   axios.delete(
-    `${process.env.USER_SERVICE_URL}/department/${id}`,
+    `${process.env.USER_SERVICE_URL}/department/${Number(id)}`,
     axiosUserServiceConfig(userToken)
   );
 
diff --git a/packages/gap-web-ui/src/components/question-page/QuestionPageGetServerSideProps.tsx b/packages/gap-web-ui/src/components/question-page/QuestionPageGetServerSideProps.tsx
index 33bb7c1a7..39fc15eaa 100644
--- a/packages/gap-web-ui/src/components/question-page/QuestionPageGetServerSideProps.tsx
+++ b/packages/gap-web-ui/src/components/question-page/QuestionPageGetServerSideProps.tsx
@@ -25,6 +25,7 @@ import {
  *
  * @returns A redirect to the relevant location, or a set of props needed to load a page
  */
+
 export default async function QuestionPageGetServerSideProps<
   T extends PageBodyResponse,
   K extends FetchPageData,
@@ -56,7 +57,7 @@ export default async function QuestionPageGetServerSideProps<
 
   return {
     props: {
-      csrfToken: ((req as any).csrfToken?.() || '') as string,
+      csrfToken: (req as any).csrfToken?.() || '',
       formAction: resolvedUrl,
       fieldErrors,
       pageData,