fix: dont allow reject if not in allocation state

City-of-Helsinki · May 8, 2024 · b717e05 · b717e05
1 parent bd30763
commit b717e05
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 3 deletions.
diff --git a/apps/admin-ui/src/spa/applications/[id]/index.tsx b/apps/admin-ui/src/spa/applications/[id]/index.tsx
@@ -342,9 +342,11 @@ function SchedulesContent({
 
 function RejectOptionButton({
   option,
+  applicationStatus,
   refetch,
 }: {
   option: ReservationUnitOptionNode;
+  applicationStatus: ApplicationStatusChoice;
   refetch: () => Promise<ApolloQueryResult<Query>>;
 }) {
   const [mutation, { loading }] = useMutation<
@@ -409,7 +411,8 @@ function RejectOptionButton({
     console.warn("no allocatedTimeSlots", option);
   }
 
-  const isDisabled = option.allocatedTimeSlots?.length > 0;
+  const canReject = applicationStatus === ApplicationStatusChoice.InAllocation;
+  const isDisabled = !canReject || option.allocatedTimeSlots?.length > 0;
   return (
     <Button
       variant="supplementary"
@@ -497,6 +500,9 @@ function ApplicationSectionDetails({
         return (
           <RejectOptionButton
             option={reservationUnitOption}
+            applicationStatus={
+              application.status ?? ApplicationStatusChoice.Draft
+            }
             refetch={refetch}
           />
         );

diff --git a/apps/admin-ui/src/spa/applications/queries.tsx b/apps/admin-ui/src/spa/applications/queries.tsx
@@ -6,7 +6,7 @@ export const APPLICATION_ADMIN_QUERY = gql`
   ${APPLICATION_ADMIN_FRAGMENT}
   query ApplicationAdmin($id: ID!) {
     application(id: $id) {
-      ...ApplicationCommon
+      ...ApplicationAdminFragment
       workingMemo
     }
   }

diff --git a/packages/common/src/queries/application.tsx b/packages/common/src/queries/application.tsx
@@ -200,8 +200,9 @@ const APPLICATION_ROUND_FRAGMENT = gql`
 export const APPLICATION_ADMIN_FRAGMENT = gql`
   ${APPLICANT_FRAGMENT}
   ${APPLICATION_SECTION_UI_FRAGMENT}
-  fragment ApplicationCommon on ApplicationNode {
+  fragment ApplicationAdminFragment on ApplicationNode {
     pk
+    id
     status
     lastModifiedDate
     ...ApplicantFragment
@@ -215,6 +216,7 @@ export const APPLICATION_ADMIN_FRAGMENT = gql`
         rejected
         allocatedTimeSlots {
           pk
+          id
         }
       }
     }