Merge pull request #19516 from mozilla/FXA-11612

fix(admin-panel): fix incorrect bounce types

Author: MagentaManifold

packages/fxa-admin-panel/src/components/PageAccountSearch/EmailBounces/getBounceDescription.tsx

@@ -96,13 +96,6 @@ const getEmailBounceDescription = (
 ) => {
   let description: string[] | string = HIDE_ROW;
   switch (bounceType) {
-    case BounceType.Undetermined: {
-      if (bounceSubType === BounceSubType.Undetermined) {
-        description = BOUNCE_DESCRIPTIONS.undetermined;
-      }
-      break;
-    }
-
     case BounceType.Permanent: {
       if (bounceSubType === BounceSubType.General) {
         description = BOUNCE_DESCRIPTIONS.permanentGeneral;
@@ -148,7 +141,11 @@ const getEmailBounceDescription = (
       break;
     }
 
+    case BounceType.Undetermined:
     default: {
+      if (bounceSubType === BounceSubType.Undetermined) {
+        description = BOUNCE_DESCRIPTIONS.undetermined;
+      }
     }
   }
 

packages/fxa-admin-server/src/gql/model/email-bounces.model.ts

@@ -5,18 +5,17 @@ import { Field, ObjectType, registerEnumType } from '@nestjs/graphql';
 
 export enum BounceType {
   unmapped,
-  Undetermined,
   Permanent,
   Transient,
   Complaint,
+  Undetermined,
 }
 
 export enum BounceSubType {
   unmapped,
   Undetermined,
   General,
   NoEmail,
-  OnAccountSuppressionList,
   Suppressed,
   MailboxFull,
   MessageTooLarge,
@@ -28,6 +27,7 @@ export enum BounceSubType {
   NotSpam,
   Other,
   Virus,
+  OnAccountSuppressionList,
 }
 
 registerEnumType(BounceType, {

packages/fxa-admin-server/src/graphql.ts

@@ -10,18 +10,17 @@
 
 export enum BounceType {
     unmapped = "unmapped",
-    Undetermined = "Undetermined",
     Permanent = "Permanent",
     Transient = "Transient",
-    Complaint = "Complaint"
+    Complaint = "Complaint",
+    Undetermined = "Undetermined"
 }
 
 export enum BounceSubType {
     unmapped = "unmapped",
     Undetermined = "Undetermined",
     General = "General",
     NoEmail = "NoEmail",
-    OnAccountSuppressionList = "OnAccountSuppressionList",
     Suppressed = "Suppressed",
     MailboxFull = "MailboxFull",
     MessageTooLarge = "MessageTooLarge",
@@ -32,7 +31,8 @@ export enum BounceSubType {
     Fraud = "Fraud",
     NotSpam = "NotSpam",
     Other = "Other",
-    Virus = "Virus"
+    Virus = "Virus",
+    OnAccountSuppressionList = "OnAccountSuppressionList"
 }
 
 export enum ProviderId {

packages/fxa-admin-server/src/schema.gql

@@ -41,18 +41,17 @@ type EmailBounce {
 
 enum BounceType {
   unmapped
-  Undetermined
   Permanent
   Transient
   Complaint
+  Undetermined
 }
 
 enum BounceSubType {
   unmapped
   Undetermined
   General
   NoEmail
-  OnAccountSuppressionList
   Suppressed
   MailboxFull
   MessageTooLarge
@@ -64,6 +63,7 @@ enum BounceSubType {
   NotSpam
   Other
   Virus
+  OnAccountSuppressionList
 }
 
 type Email {

packages/fxa-shared/db/models/auth/email-bounce.ts

@@ -10,6 +10,7 @@ export const BOUNCE_TYPES = {
   Permanent: 1,
   Transient: 2,
   Complaint: 3,
+  Undetermined: 4,
 } as const;
 
 export const BOUNCE_SUB_TYPES = {
@@ -28,6 +29,7 @@ export const BOUNCE_SUB_TYPES = {
   'not-spam': 12,
   other: 13,
   virus: 14,
+  OnAccountSuppressionList: 15,
 } as const;
 
 export type BounceType = keyof typeof BOUNCE_TYPES;