fix: use completed status when rejected applications are sent to archive

City-of-Helsinki · Dec 18, 2023 · 9f9d815 · 9f9d815
1 parent 04651a4
commit 9f9d815
Show file tree

Hide file tree

Showing 6 changed files with 55 additions and 53 deletions.
diff --git a/...tend/benefit/handler/src/components/batchProcessing/batchFooter/BatchFooterCompletion.tsx b/...tend/benefit/handler/src/components/batchProcessing/batchFooter/BatchFooterCompletion.tsx
@@ -166,7 +166,7 @@ const BatchFooterCompletion: React.FC<BatchProps> = ({
           <h3>{t('common:batches.form.headings.decisionDetails')}</h3>
         </$GridCell>
 
-        <$GridCell $colSpan={3}>
+        <$GridCell $colSpan={3} $colStart={1}>
           <$ViewFieldBold>
             {t('common:batches.form.fields.decisionMakerName')}
           </$ViewFieldBold>
@@ -193,55 +193,55 @@ const BatchFooterCompletion: React.FC<BatchProps> = ({
           </$ViewFieldBold>
           <$ViewField>{convertToUIDateFormat(decision_date)}</$ViewField>
         </$GridCell>
+      </$FormSection>
 
-        {expert_inspector_name?.length && expert_inspector_title?.length ? (
-          <>
-            <$GridCell $colSpan={3} $colStart={1}>
-              <$ViewFieldBold>
-                {t('common:batches.form.fields.expertInspectorName')}
-              </$ViewFieldBold>
-              <$ViewField>{expert_inspector_name}</$ViewField>
-            </$GridCell>
+      {expert_inspector_name?.length && expert_inspector_title?.length ? (
+        <$FormSection css="width: 100%">
+          <$GridCell $colSpan={3} $colStart={1}>
+            <$ViewFieldBold>
+              {t('common:batches.form.fields.expertInspectorName')}
+            </$ViewFieldBold>
+            <$ViewField>{expert_inspector_name}</$ViewField>
+          </$GridCell>
 
-            <$GridCell $colSpan={3}>
-              <$ViewFieldBold>
-                {t('common:batches.form.fields.expertInspectorTitle')}
-              </$ViewFieldBold>
-              <$ViewField>{expert_inspector_title}</$ViewField>
-            </$GridCell>
+          <$GridCell $colSpan={3}>
+            <$ViewFieldBold>
+              {t('common:batches.form.fields.expertInspectorTitle')}
+            </$ViewFieldBold>
+            <$ViewField>{expert_inspector_title}</$ViewField>
+          </$GridCell>
 
-            <$GridCell $colSpan={3}>
-              <$ViewFieldBold>
-                {t('common:batches.form.fields.p2pCheckerName')}
-              </$ViewFieldBold>
-              <$ViewField>{p2p_checker_name}</$ViewField>
-            </$GridCell>
-          </>
-        ) : (
-          <>
-            <$GridCell $colSpan={3} $colStart={1}>
-              <$ViewFieldBold>
-                {t('common:batches.form.fields.p2pInspectorName')}
-              </$ViewFieldBold>
-              <$ViewField>{p2p_inspector_name}</$ViewField>
-            </$GridCell>
+          <$GridCell $colSpan={6}>
+            <$ViewFieldBold>
+              {t('common:batches.form.fields.p2pCheckerName')}
+            </$ViewFieldBold>
+            <$ViewField>{p2p_checker_name}</$ViewField>
+          </$GridCell>
+        </$FormSection>
+      ) : (
+        <$FormSection>
+          <$GridCell $colSpan={3} $colStart={1}>
+            <$ViewFieldBold>
+              {t('common:batches.form.fields.p2pInspectorName')}
+            </$ViewFieldBold>
+            <$ViewField>{p2p_inspector_name}</$ViewField>
+          </$GridCell>
 
-            <$GridCell $colSpan={3}>
-              <$ViewFieldBold>
-                {t('common:batches.form.fields.p2pInspectorEmail')}
-              </$ViewFieldBold>
-              <$ViewField>{p2p_inspector_email}</$ViewField>
-            </$GridCell>
+          <$GridCell $colSpan={3}>
+            <$ViewFieldBold>
+              {t('common:batches.form.fields.p2pInspectorEmail')}
+            </$ViewFieldBold>
+            <$ViewField>{p2p_inspector_email}</$ViewField>
+          </$GridCell>
 
-            <$GridCell $colSpan={3}>
-              <$ViewFieldBold>
-                {t('common:batches.form.fields.p2pCheckerName')}
-              </$ViewFieldBold>
-              <$ViewField>{p2p_checker_name}</$ViewField>
-            </$GridCell>
-          </>
-        )}
-      </$FormSection>
+          <$GridCell $colSpan={3}>
+            <$ViewFieldBold>
+              {t('common:batches.form.fields.p2pCheckerName')}
+            </$ViewFieldBold>
+            <$ViewField>{p2p_checker_name}</$ViewField>
+          </$GridCell>
+        </$FormSection>
+      )}
 
       <div style={{ display: 'flex', width: '100%' }}>
         {batchStatus === BATCH_STATUSES.DECIDED_ACCEPTED && (

diff --git a/...tend/benefit/handler/src/components/batchProcessing/batchFooter/BatchFooterInspection.tsx b/...tend/benefit/handler/src/components/batchProcessing/batchFooter/BatchFooterInspection.tsx
@@ -61,7 +61,7 @@ BatchProps) => {
     setModalBatchToCompletion(false);
   };
 
-  const handleBatchStatusChange = (): void => {
+  const handleSubmitToDraft = (): void => {
     changeBatchStatus({
       id,
       status: BATCH_STATUSES.DRAFT,
@@ -138,7 +138,7 @@ BatchProps) => {
                 )}
                 text={t('common:batches.dialog.fromInspectionToDraft.text')}
                 onClose={handleModalClose}
-                onSubmit={handleBatchStatusChange}
+                onSubmit={handleSubmitToDraft}
               />
             ) : null}
             {isModalBatchToCompletion ? (

diff --git a/frontend/benefit/handler/src/components/batchProcessing/useBatchActionsInspected.ts b/frontend/benefit/handler/src/components/batchProcessing/useBatchActionsInspected.ts
@@ -192,7 +192,7 @@ const useBatchActionsInspected = (
       markBatchAs(
         proposalForDecision === PROPOSALS_FOR_DECISION.ACCEPTED
           ? BATCH_STATUSES.DECIDED_ACCEPTED
-          : BATCH_STATUSES.DECIDED_REJECTED,
+          : BATCH_STATUSES.COMPLETED,
         values
       ),
   };

diff --git a/frontend/benefit/handler/src/components/table/TableExtras.sc.ts b/frontend/benefit/handler/src/components/table/TableExtras.sc.ts
@@ -88,6 +88,7 @@ export const $HintText = styled.p`
 
 export const $FormSection = styled(FormSection)`
   margin-bottom: var(--spacing-m);
+  width: 100%;
 
   + hr {
     display: none;
@@ -108,7 +109,8 @@ export const $TableFooter = styled.footer<$TableFooterProps>`
   align-items: center;
   box-sizing: border-box;
 
-  form {
+  form,
+  > section {
     display: grid;
     width: 100%;
   }

diff --git a/frontend/benefit/handler/src/hooks/useBatchInspected.ts b/frontend/benefit/handler/src/hooks/useBatchInspected.ts
@@ -81,10 +81,9 @@ const useBatchInspected = (
         );
 
         if (
-          [
-            BATCH_STATUSES.DECIDED_REJECTED,
-            BATCH_STATUSES.DECIDED_ACCEPTED,
-          ].includes(backendStatus)
+          [BATCH_STATUSES.COMPLETED, BATCH_STATUSES.DECIDED_ACCEPTED].includes(
+            backendStatus
+          )
         ) {
           setBatchCloseAnimation(true);
           setTimeout(() => {

diff --git a/frontend/benefit/handler/src/hooks/useBatchStatus.ts b/frontend/benefit/handler/src/hooks/useBatchStatus.ts
@@ -80,6 +80,7 @@ const useBatchStatus = (
         );
         if (
           previousStatus === BATCH_STATUSES.AWAITING_FOR_DECISION ||
+          backendStatus === BATCH_STATUSES.COMPLETED ||
           (previousStatus === BATCH_STATUSES.AHJO_REPORT_CREATED &&
             backendStatus === BATCH_STATUSES.AWAITING_FOR_DECISION)
         ) {