CCM-11966: Feedback

Author: m-salaudeen

infrastructure/terraform/modules/backend-api/spec.tmpl.json

@@ -777,8 +777,7 @@
           "VALIDATION_FAILED",
           "VIRUS_SCAN_FAILED",
           "WAITING_FOR_PROOF",
-          "PROOF_AVAILABLE",
-          "TEMPLATE_PROOF_APPROVED"
+          "PROOF_AVAILABLE"
         ],
         "type": "string"
       },

lambdas/backend-client/src/schemas/union-lists.ts

@@ -50,7 +50,6 @@ export const TEMPLATE_STATUS_LIST = arrayOfAll<TemplateStatus>()([
   'VALIDATION_FAILED',
   'VIRUS_SCAN_FAILED',
   'WAITING_FOR_PROOF',
-  'TEMPLATE_PROOF_APPROVED',
 ]);
 
 export const LANGUAGE_LIST = arrayOfAll<Language>()([

lambdas/backend-client/src/types/generated/types.gen.ts

@@ -233,8 +233,7 @@ export type TemplateStatus =
   | 'VALIDATION_FAILED'
   | 'VIRUS_SCAN_FAILED'
   | 'WAITING_FOR_PROOF'
-  | 'PROOF_AVAILABLE'
-  | 'TEMPLATE_PROOF_APPROVED';
+  | 'PROOF_AVAILABLE';
 
 export type TemplateSuccess = {
   data: TemplateDto;

utils/utils/src/__tests__/enum.test.ts

@@ -228,6 +228,18 @@ describe('statusToDisplayMapping', () => {
     ).toEqual('Template proof approved');
   });
 
+  test('statusToDisplay if no files', () => {
+    expect(
+      statusToDisplayMapping(
+        {
+          ...mockLetterTemplate,
+          templateStatus: 'SUBMITTED',
+        },
+        false
+      )
+    ).toEqual('Submitted');
+  });
+
   test('SUBMITTED', () => {
     expect(
       statusToDisplayMapping({
@@ -260,7 +272,6 @@ describe('statusToColourMapping', () => {
         VIRUS_SCAN_FAILED: 'red',
         VALIDATION_FAILED: 'red',
         PROOF_AVAILABLE: 'orange',
-        TEMPLATE_PROOF_APPROVED: 'grey',
       };
 
       expect(
@@ -285,7 +296,6 @@ describe('statusToColourMapping', () => {
             VALIDATION_FAILED: 'red',
             PROOF_AVAILABLE: 'orange',
             NOT_YET_SUBMITTED: 'green',
-            TEMPLATE_PROOF_APPROVED: 'grey',
           };
 
           expect(
@@ -391,7 +401,6 @@ describe('templateDisplayCopyAction', () => {
     ['LETTER', 'VIRUS_SCAN_FAILED', false],
     ['LETTER', 'VALIDATION_FAILED', false],
     ['LETTER', 'PROOF_AVAILABLE', false],
-    ['LETTER', 'TEMPLATE_PROOF_APPROVED', false],
   ])(
     'should give the expected result for display of copy action when template has type of %s and status of %s',
     (templateType, templateStatus, shouldDisplayCopyAction) => {
@@ -427,7 +436,6 @@ describe('templateDisplayDeleteAction', () => {
     ['LETTER', 'VIRUS_SCAN_FAILED', true],
     ['LETTER', 'VALIDATION_FAILED', true],
     ['LETTER', 'PROOF_AVAILABLE', true],
-    ['LETTER', 'TEMPLATE_PROOF_APPROVED', false],
   ])(
     'should give the expected result for display of delete action when template has type of %s and status of %s',
     (templateType, templateStatus, shouldDisplayDeleteAction) => {

utils/utils/src/enum.ts

@@ -93,50 +93,35 @@ export const templateTypeDisplayMappings = (type: TemplateType) =>
     LETTER: 'Letter',
   })[type];
 
-const statusToDisplayMappings: Record<TemplateStatus, string> = {
-  NOT_YET_SUBMITTED: 'Not yet submitted',
-  SUBMITTED: 'Submitted',
-  DELETED: '', // will not be shown in the UI
-  PENDING_PROOF_REQUEST: 'Files uploaded',
-  PENDING_UPLOAD: 'Checking files',
-  PENDING_VALIDATION: 'Checking files',
-  VALIDATION_FAILED: 'Checks failed',
-  VIRUS_SCAN_FAILED: 'Checks failed',
-  WAITING_FOR_PROOF: 'Waiting for proof',
-  PROOF_AVAILABLE: 'Proof available',
-  TEMPLATE_PROOF_APPROVED: 'Template proof approved',
-} as const;
-
-const isProofEmpty = (
+const isProofAvailable = (
   template: Pick<TemplateDto & LetterProperties, 'files'>
 ) => Object.entries(template.files.proofs ?? {}).length > 0;
 
-const templateStatusToDisplayMappingsLetter = (
-  status: TemplateStatus,
-  isRoutingEnabled: boolean,
-  isProofAvailable: boolean
-) =>
-  isRoutingEnabled && isProofAvailable && status === 'SUBMITTED'
-    ? statusToDisplayMappings['TEMPLATE_PROOF_APPROVED']
-    : statusToDisplayMappings[status];
-
-const templateStatusToDisplayMappingsDigital = (status: TemplateStatus) =>
-  ({
-    ...statusToDisplayMappings,
-    NOT_YET_SUBMITTED: 'Draft',
-  })[status];
-
 export const statusToDisplayMapping = (
   template: TemplateDto,
   isRoutingEnabled: boolean = false
-): string =>
-  template.templateType === 'LETTER'
-    ? templateStatusToDisplayMappingsLetter(
-        template.templateStatus,
-        isRoutingEnabled,
-        isProofEmpty(template)
-      )
-    : templateStatusToDisplayMappingsDigital(template.templateStatus);
+): string => {
+  const statusToDisplayMappings: Record<TemplateStatus, string> = {
+    NOT_YET_SUBMITTED:
+      template.templateType === 'LETTER' ? 'Not yet submitted' : 'Draft',
+    SUBMITTED:
+      template.templateType === 'LETTER' &&
+      isRoutingEnabled &&
+      isProofAvailable(template)
+        ? 'Template proof approved'
+        : 'Submitted',
+    DELETED: '', // will not be shown in the UI
+    PENDING_PROOF_REQUEST: 'Files uploaded',
+    PENDING_UPLOAD: 'Checking files',
+    PENDING_VALIDATION: 'Checking files',
+    VALIDATION_FAILED: 'Checks failed',
+    VIRUS_SCAN_FAILED: 'Checks failed',
+    WAITING_FOR_PROOF: 'Waiting for proof',
+    PROOF_AVAILABLE: 'Proof available',
+  } as const;
+
+  return statusToDisplayMappings[template.templateStatus];
+};
 
 type Colour =
   | 'white'
@@ -162,7 +147,6 @@ const colourMappings: Record<TemplateStatus, Colour> = {
   VALIDATION_FAILED: 'red',
   WAITING_FOR_PROOF: 'yellow',
   PROOF_AVAILABLE: 'orange',
-  TEMPLATE_PROOF_APPROVED: 'grey',
 } as const;
 
 const templateStatusToColourMappingsLetter = (
@@ -228,7 +212,6 @@ const templateStatusCopyAction = (status: TemplateStatus) =>
       VALIDATION_FAILED: true,
       WAITING_FOR_PROOF: false,
       PROOF_AVAILABLE: false,
-      TEMPLATE_PROOF_APPROVED: true,
     }) satisfies Record<TemplateStatus, boolean>
   )[status];
 
@@ -255,7 +238,6 @@ const templateStatusDeleteAction = (status: TemplateStatus) =>
       VALIDATION_FAILED: true,
       WAITING_FOR_PROOF: false,
       PROOF_AVAILABLE: true,
-      TEMPLATE_PROOF_APPROVED: false,
     }) satisfies Record<TemplateStatus, boolean>
   )[status];