Remove deprecated toast danger MessageType (#2181)

* 🔥 Remove danger-specific messageType tests * 🔥 Remover danger messageType from Toast * 🔥 Remove use of danger type for toast in cookbook
kirbydesign · Apr 22, 2022 · 16e2b6d · 16e2b6d
1 parent 73df668
commit 16e2b6d
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 33 deletions.
diff --git a/apps/cookbook/src/app/examples/alert-example/alert-example.component.ts b/apps/cookbook/src/app/examples/alert-example/alert-example.component.ts
@@ -140,7 +140,7 @@ this.modalController.showAlert(config);`;
   private onAlertDestructiveClosed(result?: boolean) {
     const config: ToastConfig = {
       message: result ? 'Message deleted' : 'Nothing happened',
-      messageType: result ? 'danger' : 'success',
+      messageType: result ? 'warning' : 'success',
       durationInMs: 1500,
     };
     this.toastController.showToast(config);

diff --git a/apps/cookbook/src/app/examples/list-swipe-example/list-swipe-example.component.ts b/apps/cookbook/src/app/examples/list-swipe-example/list-swipe-example.component.ts
@@ -136,7 +136,7 @@ export class ListSwipeExampleComponent {
     item.deleted = !item.deleted;
     const config: ToastConfig = {
       message: `Item '${item.title}' has been deleted.`,
-      messageType: 'danger',
+      messageType: 'warning',
       durationInMs: 1500,
     };
     this.toastController.showToast(config);

diff --git a/libs/designsystem/src/lib/components/toast/config/toast-config.ts b/libs/designsystem/src/lib/components/toast/config/toast-config.ts
@@ -5,7 +5,4 @@ export interface ToastConfig {
   animated?: boolean;
 }
 
-/**
- * 'danger' is deprecated. Use Kirby Alert for critical events
- */
-export type MessageType = 'success' | 'warning' | 'danger';
+export type MessageType = 'success' | 'warning';
diff --git a/libs/designsystem/src/lib/components/toast/services/toast.helper.spec.ts b/libs/designsystem/src/lib/components/toast/services/toast.helper.spec.ts
@@ -61,13 +61,12 @@ describe('ToastHelper', () => {
     });
 
     describe('when configured with messageType', () => {
-      type MessageType = 'success' | 'warning' | 'danger';
-      type NotificationColor = 'success' | 'warning' | 'danger';
+      type MessageType = 'success' | 'warning';
+      type NotificationColor = 'success' | 'warning';
 
       const messageTypeColorMap = new Map<MessageType, NotificationColor>([
         ['success', 'success'],
         ['warning', 'warning'],
-        ['danger', 'danger'],
       ]);
 
       messageTypeColorMap.forEach((notificationColor, messageType) => {
@@ -79,26 +78,12 @@ describe('ToastHelper', () => {
           const ionToast = window.document.getElementsByTagName('ion-toast')[0];
           await TestHelper.whenReady(ionToast);
           const toastWrapper = ionToast.shadowRoot.querySelector('.toast-wrapper');
-          const expectedColor =
-            messageType === 'danger' ? getColor('warning') : getColor(notificationColor);
+
           expect(toastWrapper).toHaveComputedStyle({
-            'background-color': expectedColor,
+            'background-color': getColor(notificationColor),
           });
         });
       });
-
-      it(`should display warning in console when using 'danger' MessageType`, async () => {
-        spyOn(console, 'warn');
-
-        overlay = await spectator.service.showToast({
-          message: 'Test message',
-          messageType: 'danger',
-        });
-
-        expect(console.warn).toHaveBeenCalledWith(
-          `[DEPRECATED] 'danger' message type is deprecated. Use Kirby Alerts for critical warnings. Toast will be shown as 'warning'`
-        );
-      });
     });
   });
 });
diff --git a/libs/designsystem/src/lib/components/toast/services/toast.helper.ts b/libs/designsystem/src/lib/components/toast/services/toast.helper.ts
@@ -30,14 +30,6 @@ export class ToastHelper {
   private getCssClass(messageType: MessageType): string {
     let cssClass = ToastHelper.CSS_CLASS;
 
-    if (messageType === 'danger') {
-      console.warn(
-        `[DEPRECATED] 'danger' message type is deprecated. Use Kirby Alerts for critical warnings. Toast will be shown as 'warning'`
-      );
-
-      messageType = 'warning';
-    }
-
     if (messageType) {
       cssClass += ' ' + messageType;
     }