chore: [M3-6666] - Clean up for consistent spelling of "canceled" (#9335

) * Update api-v4 types * Clean up checks and string manip for inconsistent spelling * Added changeset: Use 'canceled' instead of 'cancelled' for EntityTransferStatus * Forgot to commit mock canceled transfer event
linode · Jun 29, 2023 · d003eda · d003eda
1 parent 2c3dfc9
commit d003eda
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 12 deletions.
diff --git a/packages/api-v4/.changeset/pr-9335-changed-1687980892035.md b/packages/api-v4/.changeset/pr-9335-changed-1687980892035.md
@@ -0,0 +1,5 @@
+---
+"@linode/api-v4": Changed
+---
+
+Use 'canceled' instead of 'cancelled' for EntityTransferStatus ([#9335](https://github.com/linode/manager/pull/9335))
diff --git a/packages/api-v4/src/entity-transfers/types.ts b/packages/api-v4/src/entity-transfers/types.ts
@@ -1,7 +1,7 @@
 export type EntityTransferStatus =
   | 'pending'
   | 'accepted'
-  | 'cancelled'
+  | 'canceled'
   | 'completed'
   | 'failed'
   | 'stale';

diff --git a/packages/manager/cypress/e2e/core/account/service-transfer.spec.ts b/packages/manager/cypress/e2e/core/account/service-transfer.spec.ts
@@ -37,7 +37,7 @@ const serviceTransferStatuses = [
   'failed',
   'accepted',
   'stale',
-  'cancelled',
+  'canceled',
 ];
 
 /**
@@ -214,10 +214,9 @@ describe('Account service transfers', () => {
                 cy.findByText(
                   formatDate(sentTransfer.created, dateFormatOptions)
                 ).should('be.visible');
-                cy.findByText(
-                  sentTransfer.status.replace('cancelled', 'canceled'),
-                  { exact: false }
-                ).should('be.visible');
+                cy.findByText(sentTransfer.status, { exact: false }).should(
+                  'be.visible'
+                );
               });
           });
         });

diff --git a/packages/manager/src/features/EntityTransfers/RenderTransferRow.tsx b/packages/manager/src/features/EntityTransfers/RenderTransferRow.tsx
@@ -167,7 +167,7 @@ export const RenderTransferRow: React.FC<CombinedProps> = (props) => {
       ) : null}
       {transferTypeIsSent ? (
         <TableCell className={classes.cellContents}>
-          {capitalize(status?.replace('cancelled', 'canceled') ?? '')}
+          {capitalize(status ?? '')}
         </TableCell>
       ) : null}
     </TableRow>

diff --git a/packages/manager/src/features/ToastNotifications/ToastNotifications.tsx b/packages/manager/src/features/ToastNotifications/ToastNotifications.tsx
@@ -139,17 +139,18 @@ class ToastNotifications extends React.PureComponent<WithSnackbarProps, {}> {
               ),
             });
           case 'image_upload':
-            const isDeletion = event.message === 'Upload cancelled.';
+            const isDeletion = event.message === 'Upload canceled.';
             return toastSuccessAndFailure({
               enqueueSnackbar,
               eventStatus: event.status,
               persistFailureMessage: true,
               successMessage: `Image ${label} is now available.`,
               failureMessage: isDeletion
                 ? undefined
-                : `There was a problem uploading image ${label}: ${event.message
-                    ?.replace('cancelled', 'canceled')
-                    .replace(/(\d+)/g, '$1 MB')}`,
+                : `There was a problem uploading image ${label}: ${event.message?.replace(
+                    /(\d+)/g,
+                    '$1 MB'
+                  )}`,
             });
           case 'image_delete':
             return toastSuccessAndFailure({

diff --git a/packages/manager/src/mocks/serverHandlers.ts b/packages/manager/src/mocks/serverHandlers.ts
@@ -123,11 +123,16 @@ const entityTransfers = [
       is_sender: true,
       status: 'pending',
     });
+    const transfer5 = entityTransferFactory.build({
+      is_sender: true,
+      status: 'canceled',
+    });
 
     const combinedTransfers = transfers1.concat(
       transfers2,
       transfers3,
-      transfer4
+      transfer4,
+      transfer5
     );
     return res(ctx.json(makeResourcePage(combinedTransfers)));
   }),