Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

(feat) O3-2883: Use toast notifications for system-generated error messages #937

Merged
merged 1 commit into from
Feb 22, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions packages/framework/esm-error-handling/src/index.ts
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
/** @module @category Error Handling */
import { dispatchNotificationShown } from '@openmrs/esm-globals';
import { dispatchToastShown } from '@openmrs/esm-globals';

window.onerror = function (error) {
console.error('Unexpected error: ', error);
dispatchNotificationShown({
dispatchToastShown({
hadijahkyampeire marked this conversation as resolved.
Show resolved Hide resolved
description: error ?? 'Oops! An unexpected error occurred.',
kind: 'error',
title: 'Error',
Expand All @@ -13,7 +13,7 @@ window.onerror = function (error) {

window.onunhandledrejection = function (event) {
console.error('Unhandled rejection: ', event.reason);
dispatchNotificationShown({
dispatchToastShown({
description: event.reason ?? 'Oops! An unhandled promise rejection occurred.',
denniskigen marked this conversation as resolved.
Show resolved Hide resolved
kind: 'error',
title: 'Error',
Expand Down
10 changes: 5 additions & 5 deletions packages/framework/esm-framework/docs/API.md
Original file line number Diff line number Diff line change
Expand Up @@ -690,7 +690,7 @@ ___

#### Defined in

[packages/framework/esm-styleguide/src/toasts/toast.component.tsx:28](https://github.com/openmrs/openmrs-esm-core/blob/main/packages/framework/esm-styleguide/src/toasts/toast.component.tsx#L28)
[packages/framework/esm-styleguide/src/toasts/toast.component.tsx:23](https://github.com/openmrs/openmrs-esm-core/blob/main/packages/framework/esm-styleguide/src/toasts/toast.component.tsx#L23)

___

Expand Down Expand Up @@ -4629,7 +4629,7 @@ ___

#### Defined in

[packages/framework/esm-globals/src/events.ts:104](https://github.com/openmrs/openmrs-esm-core/blob/main/packages/framework/esm-globals/src/events.ts#L104)
[packages/framework/esm-globals/src/events.ts:107](https://github.com/openmrs/openmrs-esm-core/blob/main/packages/framework/esm-globals/src/events.ts#L107)

___

Expand All @@ -4655,7 +4655,7 @@ ___

#### Defined in

[packages/framework/esm-globals/src/events.ts:97](https://github.com/openmrs/openmrs-esm-core/blob/main/packages/framework/esm-globals/src/events.ts#L97)
[packages/framework/esm-globals/src/events.ts:100](https://github.com/openmrs/openmrs-esm-core/blob/main/packages/framework/esm-globals/src/events.ts#L100)

___

Expand All @@ -4681,7 +4681,7 @@ ___

#### Defined in

[packages/framework/esm-globals/src/events.ts:118](https://github.com/openmrs/openmrs-esm-core/blob/main/packages/framework/esm-globals/src/events.ts#L118)
[packages/framework/esm-globals/src/events.ts:121](https://github.com/openmrs/openmrs-esm-core/blob/main/packages/framework/esm-globals/src/events.ts#L121)

___

Expand All @@ -4707,7 +4707,7 @@ ___

#### Defined in

[packages/framework/esm-globals/src/events.ts:111](https://github.com/openmrs/openmrs-esm-core/blob/main/packages/framework/esm-globals/src/events.ts#L111)
[packages/framework/esm-globals/src/events.ts:114](https://github.com/openmrs/openmrs-esm-core/blob/main/packages/framework/esm-globals/src/events.ts#L114)

___

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@

#### Defined in

[packages/framework/esm-globals/src/events.ts:72](https://github.com/openmrs/openmrs-esm-core/blob/main/packages/framework/esm-globals/src/events.ts#L72)
[packages/framework/esm-globals/src/events.ts:71](https://github.com/openmrs/openmrs-esm-core/blob/main/packages/framework/esm-globals/src/events.ts#L71)

___

Expand All @@ -36,7 +36,7 @@ ___

#### Defined in

[packages/framework/esm-globals/src/events.ts:75](https://github.com/openmrs/openmrs-esm-core/blob/main/packages/framework/esm-globals/src/events.ts#L75)
[packages/framework/esm-globals/src/events.ts:74](https://github.com/openmrs/openmrs-esm-core/blob/main/packages/framework/esm-globals/src/events.ts#L74)

___

Expand All @@ -46,7 +46,7 @@ ___

#### Defined in

[packages/framework/esm-globals/src/events.ts:70](https://github.com/openmrs/openmrs-esm-core/blob/main/packages/framework/esm-globals/src/events.ts#L70)
[packages/framework/esm-globals/src/events.ts:69](https://github.com/openmrs/openmrs-esm-core/blob/main/packages/framework/esm-globals/src/events.ts#L69)

___

Expand All @@ -56,7 +56,7 @@ ___

#### Defined in

[packages/framework/esm-globals/src/events.ts:74](https://github.com/openmrs/openmrs-esm-core/blob/main/packages/framework/esm-globals/src/events.ts#L74)
[packages/framework/esm-globals/src/events.ts:73](https://github.com/openmrs/openmrs-esm-core/blob/main/packages/framework/esm-globals/src/events.ts#L73)

___

Expand All @@ -66,7 +66,7 @@ ___

#### Defined in

[packages/framework/esm-globals/src/events.ts:69](https://github.com/openmrs/openmrs-esm-core/blob/main/packages/framework/esm-globals/src/events.ts#L69)
[packages/framework/esm-globals/src/events.ts:68](https://github.com/openmrs/openmrs-esm-core/blob/main/packages/framework/esm-globals/src/events.ts#L68)

___

Expand All @@ -76,7 +76,7 @@ ___

#### Defined in

[packages/framework/esm-globals/src/events.ts:76](https://github.com/openmrs/openmrs-esm-core/blob/main/packages/framework/esm-globals/src/events.ts#L76)
[packages/framework/esm-globals/src/events.ts:75](https://github.com/openmrs/openmrs-esm-core/blob/main/packages/framework/esm-globals/src/events.ts#L75)

___

Expand All @@ -86,7 +86,7 @@ ___

#### Defined in

[packages/framework/esm-globals/src/events.ts:71](https://github.com/openmrs/openmrs-esm-core/blob/main/packages/framework/esm-globals/src/events.ts#L71)
[packages/framework/esm-globals/src/events.ts:70](https://github.com/openmrs/openmrs-esm-core/blob/main/packages/framework/esm-globals/src/events.ts#L70)

## Methods

Expand All @@ -100,4 +100,4 @@ ___

#### Defined in

[packages/framework/esm-globals/src/events.ts:73](https://github.com/openmrs/openmrs-esm-core/blob/main/packages/framework/esm-globals/src/events.ts#L73)
[packages/framework/esm-globals/src/events.ts:72](https://github.com/openmrs/openmrs-esm-core/blob/main/packages/framework/esm-globals/src/events.ts#L72)
15 changes: 2 additions & 13 deletions packages/framework/esm-framework/docs/interfaces/ShowToastEvent.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
- [actionButtonLabel](ShowToastEvent.md#actionbuttonlabel)
- [description](ShowToastEvent.md#description)
- [kind](ShowToastEvent.md#kind)
- [millis](ShowToastEvent.md#millis)
- [title](ShowToastEvent.md#title)

### Methods
Expand All @@ -24,7 +23,7 @@

#### Defined in

[packages/framework/esm-globals/src/events.ts:63](https://github.com/openmrs/openmrs-esm-core/blob/main/packages/framework/esm-globals/src/events.ts#L63)
[packages/framework/esm-globals/src/events.ts:62](https://github.com/openmrs/openmrs-esm-core/blob/main/packages/framework/esm-globals/src/events.ts#L62)

___

Expand All @@ -48,16 +47,6 @@ ___

___

### millis

• `Optional` **millis**: `number`

#### Defined in

[packages/framework/esm-globals/src/events.ts:62](https://github.com/openmrs/openmrs-esm-core/blob/main/packages/framework/esm-globals/src/events.ts#L62)

___

### title

• `Optional` **title**: `string`
Expand All @@ -78,4 +67,4 @@ ___

#### Defined in

[packages/framework/esm-globals/src/events.ts:64](https://github.com/openmrs/openmrs-esm-core/blob/main/packages/framework/esm-globals/src/events.ts#L64)
[packages/framework/esm-globals/src/events.ts:63](https://github.com/openmrs/openmrs-esm-core/blob/main/packages/framework/esm-globals/src/events.ts#L63)
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
- [critical](ToastDescriptor.md#critical)
- [description](ToastDescriptor.md#description)
- [kind](ToastDescriptor.md#kind)
- [millis](ToastDescriptor.md#millis)
- [title](ToastDescriptor.md#title)

### UI Methods
Expand All @@ -31,7 +30,7 @@

#### Defined in

[packages/framework/esm-styleguide/src/toasts/toast.component.tsx:17](https://github.com/openmrs/openmrs-esm-core/blob/main/packages/framework/esm-styleguide/src/toasts/toast.component.tsx#L17)
[packages/framework/esm-styleguide/src/toasts/toast.component.tsx:13](https://github.com/openmrs/openmrs-esm-core/blob/main/packages/framework/esm-styleguide/src/toasts/toast.component.tsx#L13)

___

Expand All @@ -41,7 +40,7 @@ ___

#### Defined in

[packages/framework/esm-styleguide/src/toasts/toast.component.tsx:19](https://github.com/openmrs/openmrs-esm-core/blob/main/packages/framework/esm-styleguide/src/toasts/toast.component.tsx#L19)
[packages/framework/esm-styleguide/src/toasts/toast.component.tsx:15](https://github.com/openmrs/openmrs-esm-core/blob/main/packages/framework/esm-styleguide/src/toasts/toast.component.tsx#L15)

___

Expand All @@ -51,7 +50,7 @@ ___

#### Defined in

[packages/framework/esm-styleguide/src/toasts/toast.component.tsx:15](https://github.com/openmrs/openmrs-esm-core/blob/main/packages/framework/esm-styleguide/src/toasts/toast.component.tsx#L15)
[packages/framework/esm-styleguide/src/toasts/toast.component.tsx:11](https://github.com/openmrs/openmrs-esm-core/blob/main/packages/framework/esm-styleguide/src/toasts/toast.component.tsx#L11)

___

Expand All @@ -61,17 +60,7 @@ ___

#### Defined in

[packages/framework/esm-styleguide/src/toasts/toast.component.tsx:18](https://github.com/openmrs/openmrs-esm-core/blob/main/packages/framework/esm-styleguide/src/toasts/toast.component.tsx#L18)

___

### millis

• `Optional` **millis**: `number`

#### Defined in

[packages/framework/esm-styleguide/src/toasts/toast.component.tsx:21](https://github.com/openmrs/openmrs-esm-core/blob/main/packages/framework/esm-styleguide/src/toasts/toast.component.tsx#L21)
[packages/framework/esm-styleguide/src/toasts/toast.component.tsx:14](https://github.com/openmrs/openmrs-esm-core/blob/main/packages/framework/esm-styleguide/src/toasts/toast.component.tsx#L14)

___

Expand All @@ -81,7 +70,7 @@ ___

#### Defined in

[packages/framework/esm-styleguide/src/toasts/toast.component.tsx:20](https://github.com/openmrs/openmrs-esm-core/blob/main/packages/framework/esm-styleguide/src/toasts/toast.component.tsx#L20)
[packages/framework/esm-styleguide/src/toasts/toast.component.tsx:16](https://github.com/openmrs/openmrs-esm-core/blob/main/packages/framework/esm-styleguide/src/toasts/toast.component.tsx#L16)

## UI Methods

Expand All @@ -95,4 +84,4 @@ ___

#### Defined in

[packages/framework/esm-styleguide/src/toasts/toast.component.tsx:16](https://github.com/openmrs/openmrs-esm-core/blob/main/packages/framework/esm-styleguide/src/toasts/toast.component.tsx#L16)
[packages/framework/esm-styleguide/src/toasts/toast.component.tsx:12](https://github.com/openmrs/openmrs-esm-core/blob/main/packages/framework/esm-styleguide/src/toasts/toast.component.tsx#L12)
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
- [description](ToastNotificationMeta.md#description)
- [id](ToastNotificationMeta.md#id)
- [kind](ToastNotificationMeta.md#kind)
- [millis](ToastNotificationMeta.md#millis)
- [title](ToastNotificationMeta.md#title)

### UI Methods
Expand All @@ -36,7 +35,7 @@

#### Defined in

[packages/framework/esm-styleguide/src/toasts/toast.component.tsx:17](https://github.com/openmrs/openmrs-esm-core/blob/main/packages/framework/esm-styleguide/src/toasts/toast.component.tsx#L17)
[packages/framework/esm-styleguide/src/toasts/toast.component.tsx:13](https://github.com/openmrs/openmrs-esm-core/blob/main/packages/framework/esm-styleguide/src/toasts/toast.component.tsx#L13)

___

Expand All @@ -50,7 +49,7 @@ ___

#### Defined in

[packages/framework/esm-styleguide/src/toasts/toast.component.tsx:19](https://github.com/openmrs/openmrs-esm-core/blob/main/packages/framework/esm-styleguide/src/toasts/toast.component.tsx#L19)
[packages/framework/esm-styleguide/src/toasts/toast.component.tsx:15](https://github.com/openmrs/openmrs-esm-core/blob/main/packages/framework/esm-styleguide/src/toasts/toast.component.tsx#L15)

___

Expand All @@ -64,7 +63,7 @@ ___

#### Defined in

[packages/framework/esm-styleguide/src/toasts/toast.component.tsx:15](https://github.com/openmrs/openmrs-esm-core/blob/main/packages/framework/esm-styleguide/src/toasts/toast.component.tsx#L15)
[packages/framework/esm-styleguide/src/toasts/toast.component.tsx:11](https://github.com/openmrs/openmrs-esm-core/blob/main/packages/framework/esm-styleguide/src/toasts/toast.component.tsx#L11)

___

Expand All @@ -74,7 +73,7 @@ ___

#### Defined in

[packages/framework/esm-styleguide/src/toasts/toast.component.tsx:25](https://github.com/openmrs/openmrs-esm-core/blob/main/packages/framework/esm-styleguide/src/toasts/toast.component.tsx#L25)
[packages/framework/esm-styleguide/src/toasts/toast.component.tsx:20](https://github.com/openmrs/openmrs-esm-core/blob/main/packages/framework/esm-styleguide/src/toasts/toast.component.tsx#L20)

___

Expand All @@ -88,21 +87,7 @@ ___

#### Defined in

[packages/framework/esm-styleguide/src/toasts/toast.component.tsx:18](https://github.com/openmrs/openmrs-esm-core/blob/main/packages/framework/esm-styleguide/src/toasts/toast.component.tsx#L18)

___

### millis

• `Optional` **millis**: `number`

#### Inherited from

[ToastDescriptor](ToastDescriptor.md).[millis](ToastDescriptor.md#millis)

#### Defined in

[packages/framework/esm-styleguide/src/toasts/toast.component.tsx:21](https://github.com/openmrs/openmrs-esm-core/blob/main/packages/framework/esm-styleguide/src/toasts/toast.component.tsx#L21)
[packages/framework/esm-styleguide/src/toasts/toast.component.tsx:14](https://github.com/openmrs/openmrs-esm-core/blob/main/packages/framework/esm-styleguide/src/toasts/toast.component.tsx#L14)

___

Expand All @@ -116,7 +101,7 @@ ___

#### Defined in

[packages/framework/esm-styleguide/src/toasts/toast.component.tsx:20](https://github.com/openmrs/openmrs-esm-core/blob/main/packages/framework/esm-styleguide/src/toasts/toast.component.tsx#L20)
[packages/framework/esm-styleguide/src/toasts/toast.component.tsx:16](https://github.com/openmrs/openmrs-esm-core/blob/main/packages/framework/esm-styleguide/src/toasts/toast.component.tsx#L16)

## UI Methods

Expand All @@ -134,4 +119,4 @@ ___

#### Defined in

[packages/framework/esm-styleguide/src/toasts/toast.component.tsx:16](https://github.com/openmrs/openmrs-esm-core/blob/main/packages/framework/esm-styleguide/src/toasts/toast.component.tsx#L16)
[packages/framework/esm-styleguide/src/toasts/toast.component.tsx:12](https://github.com/openmrs/openmrs-esm-core/blob/main/packages/framework/esm-styleguide/src/toasts/toast.component.tsx#L12)
5 changes: 4 additions & 1 deletion packages/framework/esm-globals/src/events.ts
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,6 @@ export interface ShowToastEvent {
description: any;
kind?: 'error' | 'info' | 'info-square' | 'success' | 'warning' | 'warning-alt';
title?: string;
millis?: number;
actionButtonLabel?: string | any;
onActionButtonClick?: () => void;
}
Expand Down Expand Up @@ -93,6 +92,10 @@ export function dispatchSnackbarShown(data: ShowSnackbarEvent) {
window.dispatchEvent(new CustomEvent(snackbarShownName, { detail: data }));
}

export function dispatchToastShown(data: ShowToastEvent) {
window.dispatchEvent(new CustomEvent(toastShownName, { detail: data }));
}

/** @category UI */
export function subscribeNotificationShown(cb: (data: ShowNotificationEvent) => void) {
const handler = (ev: CustomEvent) => cb(ev.detail);
Expand Down
27 changes: 3 additions & 24 deletions packages/framework/esm-styleguide/src/toasts/toast.component.tsx
Original file line number Diff line number Diff line change
@@ -1,11 +1,7 @@
/** @module @category UI */
import React, { useEffect, useCallback, useState } from 'react';
import React, { useCallback } from 'react';
import { ActionableNotification } from '@carbon/react';

const defaultOptions = {
millis: 5000,
};

export interface ToastProps {
toast: ToastNotificationMeta;
closeToast(): void;
Expand All @@ -18,7 +14,6 @@ export interface ToastDescriptor {
kind?: ToastType;
critical?: boolean;
title?: string;
millis?: number;
}

export interface ToastNotificationMeta extends ToastDescriptor {
Expand All @@ -28,30 +23,14 @@ export interface ToastNotificationMeta extends ToastDescriptor {
export type ToastType = 'error' | 'info' | 'info-square' | 'success' | 'warning' | 'warning-alt';

export const Toast: React.FC<ToastProps> = ({ toast, closeToast }) => {
const {
description,
kind,
critical,
title,
actionButtonLabel,
onActionButtonClick = () => {},
millis = defaultOptions.millis,
} = toast;
const [waitingForTime, setWaitingForTime] = useState(true);
const { description, kind, critical, title, actionButtonLabel, onActionButtonClick = () => {} } = toast;
const handleActionClick = useCallback(() => {
onActionButtonClick();
closeToast();
}, [closeToast, onActionButtonClick]);

useEffect(() => {
if (!actionButtonLabel && waitingForTime) {
const timeoutId = setTimeout(closeToast, millis);
return () => clearTimeout(timeoutId);
}
}, [closeToast, waitingForTime, millis, actionButtonLabel]);

return (
<div onMouseEnter={() => setWaitingForTime(false)} onMouseLeave={() => setWaitingForTime(true)}>
<div>
<ActionableNotification
actionButtonLabel={actionButtonLabel}
kind={kind || 'info'}
Expand Down
Loading