From 9fe62467d56798e6f5ec1ebdf0a0c500dcbf3b4f Mon Sep 17 00:00:00 2001 From: David Lechner Date: Tue, 22 Nov 2022 14:41:58 -0600 Subject: [PATCH] alerts: use shorthand return --- src/alerts/UnexpectedErrorAlert.tsx | 17 +++++++++-------- src/app/alerts/UpdateServerFailure.tsx | 14 ++++++-------- src/ble/alerts/BluetoothNotAvailable.tsx | 14 ++++++-------- src/ble/alerts/MissingService.tsx | 14 ++++++-------- src/ble/alerts/NoGatt.tsx | 14 ++++++-------- src/ble/alerts/NoHub.tsx | 16 +++++++--------- src/ble/alerts/NoWebBluetooth.tsx | 14 ++++++-------- src/ble/alerts/OldFirmware.tsx | 14 ++++++-------- src/explorer/alerts/FileInUseAlert.tsx | 14 ++++++-------- src/explorer/alerts/NoFilesToBackup.tsx | 14 ++++++-------- src/firmware/alerts/DfuError.tsx | 14 ++++++-------- src/firmware/alerts/FlashProgress.tsx | 18 ++++++++---------- src/firmware/alerts/NoDfuHub.tsx | 14 ++++++-------- src/firmware/alerts/NoDfuInterface.tsx | 14 ++++++-------- src/firmware/alerts/NoWebUsb.tsx | 14 ++++++-------- src/firmware/alerts/ReleaseButton.tsx | 14 ++++++-------- src/mpy/alerts/CompilerError.tsx | 16 +++++++--------- 17 files changed, 109 insertions(+), 140 deletions(-) diff --git a/src/alerts/UnexpectedErrorAlert.tsx b/src/alerts/UnexpectedErrorAlert.tsx index eae61bcd..76dafb8f 100644 --- a/src/alerts/UnexpectedErrorAlert.tsx +++ b/src/alerts/UnexpectedErrorAlert.tsx @@ -76,11 +76,12 @@ const UnexpectedErrorAlert: React.VoidFunctionComponent = (onAction, { error }) => { - return { - message: , - icon: 'error', - intent: Intent.DANGER, - onDismiss: () => onAction('dismiss'), - }; -}; +export const unexpectedError: CreateToast<{ error: Error }> = ( + onAction, + { error }, +) => ({ + message: , + icon: 'error', + intent: Intent.DANGER, + onDismiss: () => onAction('dismiss'), +}); diff --git a/src/app/alerts/UpdateServerFailure.tsx b/src/app/alerts/UpdateServerFailure.tsx index 0abf2b2d..d70499a9 100644 --- a/src/app/alerts/UpdateServerFailure.tsx +++ b/src/app/alerts/UpdateServerFailure.tsx @@ -11,11 +11,9 @@ const UpdateServerFailure: React.VoidFunctionComponent = () => { return

{i18n.translate('updateServerFailure.message')}

; }; -export const updateServerFailure: CreateToast = (onAction) => { - return { - message: , - icon: 'error', - intent: Intent.DANGER, - onDismiss: () => onAction('dismiss'), - }; -}; +export const updateServerFailure: CreateToast = (onAction) => ({ + message: , + icon: 'error', + intent: Intent.DANGER, + onDismiss: () => onAction('dismiss'), +}); diff --git a/src/ble/alerts/BluetoothNotAvailable.tsx b/src/ble/alerts/BluetoothNotAvailable.tsx index 89591513..1c38d277 100644 --- a/src/ble/alerts/BluetoothNotAvailable.tsx +++ b/src/ble/alerts/BluetoothNotAvailable.tsx @@ -17,11 +17,9 @@ const BluetoothNotAvailable: React.VoidFunctionComponent = () => { ); }; -export const bluetoothNotAvailable: CreateToast = (onAction) => { - return { - message: , - icon: 'error', - intent: Intent.DANGER, - onDismiss: () => onAction('dismiss'), - }; -}; +export const bluetoothNotAvailable: CreateToast = (onAction) => ({ + message: , + icon: 'error', + intent: Intent.DANGER, + onDismiss: () => onAction('dismiss'), +}); diff --git a/src/ble/alerts/MissingService.tsx b/src/ble/alerts/MissingService.tsx index 74471879..3f922769 100644 --- a/src/ble/alerts/MissingService.tsx +++ b/src/ble/alerts/MissingService.tsx @@ -25,11 +25,9 @@ const MissingService: React.VoidFunctionComponent = ({ ); }; -export const missingService: CreateToast = (onAction, props) => { - return { - message: , - icon: 'error', - intent: Intent.DANGER, - onDismiss: () => onAction('dismiss'), - }; -}; +export const missingService: CreateToast = (onAction, props) => ({ + message: , + icon: 'error', + intent: Intent.DANGER, + onDismiss: () => onAction('dismiss'), +}); diff --git a/src/ble/alerts/NoGatt.tsx b/src/ble/alerts/NoGatt.tsx index 7a0d73be..26dc5f0b 100644 --- a/src/ble/alerts/NoGatt.tsx +++ b/src/ble/alerts/NoGatt.tsx @@ -11,11 +11,9 @@ const NoGatt: React.VoidFunctionComponent = () => { return

{i18n.translate('noGatt.message')}

; }; -export const noGatt: CreateToast = (onAction) => { - return { - message: , - icon: 'error', - intent: Intent.DANGER, - onDismiss: () => onAction('dismiss'), - }; -}; +export const noGatt: CreateToast = (onAction) => ({ + message: , + icon: 'error', + intent: Intent.DANGER, + onDismiss: () => onAction('dismiss'), +}); diff --git a/src/ble/alerts/NoHub.tsx b/src/ble/alerts/NoHub.tsx index 7f264a39..472d0480 100644 --- a/src/ble/alerts/NoHub.tsx +++ b/src/ble/alerts/NoHub.tsx @@ -45,12 +45,10 @@ const NoHub: React.VoidFunctionComponent = ({ onFlashFirmware }) => ); }; -export const noHub: CreateToast = (onAction) => { - return { - message: onAction('flashFirmware')} />, - icon: 'info-sign', - intent: Intent.PRIMARY, - timeout: 15000, - onDismiss: () => onAction('dismiss'), - }; -}; +export const noHub: CreateToast = (onAction) => ({ + message: onAction('flashFirmware')} />, + icon: 'info-sign', + intent: Intent.PRIMARY, + timeout: 15000, + onDismiss: () => onAction('dismiss'), +}); diff --git a/src/ble/alerts/NoWebBluetooth.tsx b/src/ble/alerts/NoWebBluetooth.tsx index a9261949..e3769ac2 100644 --- a/src/ble/alerts/NoWebBluetooth.tsx +++ b/src/ble/alerts/NoWebBluetooth.tsx @@ -39,11 +39,9 @@ const NoWebBluetooth: React.VoidFunctionComponent = () => { ); }; -export const noWebBluetooth: CreateToast = (onAction) => { - return { - message: , - icon: 'error', - intent: Intent.DANGER, - onDismiss: () => onAction('dismiss'), - }; -}; +export const noWebBluetooth: CreateToast = (onAction) => ({ + message: , + icon: 'error', + intent: Intent.DANGER, + onDismiss: () => onAction('dismiss'), +}); diff --git a/src/ble/alerts/OldFirmware.tsx b/src/ble/alerts/OldFirmware.tsx index de2a68cb..e5ec4499 100644 --- a/src/ble/alerts/OldFirmware.tsx +++ b/src/ble/alerts/OldFirmware.tsx @@ -30,11 +30,9 @@ const OldFirmware: React.VoidFunctionComponent = ({ export const oldFirmware: CreateToast = ( onAction, -) => { - return { - message: onAction('flashFirmware')} />, - icon: 'info-sign', - intent: Intent.PRIMARY, - onDismiss: () => onAction('dismiss'), - }; -}; +) => ({ + message: onAction('flashFirmware')} />, + icon: 'info-sign', + intent: Intent.PRIMARY, + onDismiss: () => onAction('dismiss'), +}); diff --git a/src/explorer/alerts/FileInUseAlert.tsx b/src/explorer/alerts/FileInUseAlert.tsx index 19f03b01..a7012a81 100644 --- a/src/explorer/alerts/FileInUseAlert.tsx +++ b/src/explorer/alerts/FileInUseAlert.tsx @@ -20,11 +20,9 @@ const FileInUseAlert: React.VoidFunctionComponent = ({ export const fileInUse: CreateToast<{ fileName: string }> = ( onAction, { fileName }, -) => { - return { - message: , - icon: 'error', - intent: Intent.DANGER, - onDismiss: () => onAction('dismiss'), - }; -}; +) => ({ + message: , + icon: 'error', + intent: Intent.DANGER, + onDismiss: () => onAction('dismiss'), +}); diff --git a/src/explorer/alerts/NoFilesToBackup.tsx b/src/explorer/alerts/NoFilesToBackup.tsx index 492ef0ae..dd2f6574 100644 --- a/src/explorer/alerts/NoFilesToBackup.tsx +++ b/src/explorer/alerts/NoFilesToBackup.tsx @@ -17,11 +17,9 @@ const NoFilesToBackup: React.VoidFunctionComponent = () => { ); }; -export const noFilesToBackup: CreateToast = (onAction) => { - return { - message: , - icon: 'info-sign', - intent: Intent.PRIMARY, - onDismiss: () => onAction('dismiss'), - }; -}; +export const noFilesToBackup: CreateToast = (onAction) => ({ + message: , + icon: 'info-sign', + intent: Intent.PRIMARY, + onDismiss: () => onAction('dismiss'), +}); diff --git a/src/firmware/alerts/DfuError.tsx b/src/firmware/alerts/DfuError.tsx index 3f5aab62..b5bbe133 100644 --- a/src/firmware/alerts/DfuError.tsx +++ b/src/firmware/alerts/DfuError.tsx @@ -23,11 +23,9 @@ const DfuError: React.VoidFunctionComponent = ({ onTryAgain }) => ); }; -export const dfuError: CreateToast = (onAction) => { - return { - message: onAction('tryAgain')} />, - icon: 'error', - intent: Intent.DANGER, - onDismiss: () => onAction('dismiss'), - }; -}; +export const dfuError: CreateToast = (onAction) => ({ + message: onAction('tryAgain')} />, + icon: 'error', + intent: Intent.DANGER, + onDismiss: () => onAction('dismiss'), +}); diff --git a/src/firmware/alerts/FlashProgress.tsx b/src/firmware/alerts/FlashProgress.tsx index 4cc95e7e..953f91af 100644 --- a/src/firmware/alerts/FlashProgress.tsx +++ b/src/firmware/alerts/FlashProgress.tsx @@ -40,13 +40,11 @@ const FlashProgress: React.VoidFunctionComponent = ({ ); }; -export const flashProgress: CreateToast = (onAction, props) => { - return { - message: , - icon: 'download', - intent: Intent.PRIMARY, - // close one second after progress is complete - timeout: (props.progress ?? 0) < 1 ? 0 : 1000, - onDismiss: () => onAction('dismiss'), - }; -}; +export const flashProgress: CreateToast = (onAction, props) => ({ + message: , + icon: 'download', + intent: Intent.PRIMARY, + // close one second after progress is complete + timeout: (props.progress ?? 0) < 1 ? 0 : 1000, + onDismiss: () => onAction('dismiss'), +}); diff --git a/src/firmware/alerts/NoDfuHub.tsx b/src/firmware/alerts/NoDfuHub.tsx index f36d41c8..0bbd4bed 100644 --- a/src/firmware/alerts/NoDfuHub.tsx +++ b/src/firmware/alerts/NoDfuHub.tsx @@ -33,11 +33,9 @@ const NoDfuHub: React.VoidFunctionComponent = () => { ); }; -export const noDfuHub: CreateToast = (onAction) => { - return { - message: , - icon: 'info-sign', - intent: Intent.PRIMARY, - onDismiss: () => onAction('dismiss'), - }; -}; +export const noDfuHub: CreateToast = (onAction) => ({ + message: , + icon: 'info-sign', + intent: Intent.PRIMARY, + onDismiss: () => onAction('dismiss'), +}); diff --git a/src/firmware/alerts/NoDfuInterface.tsx b/src/firmware/alerts/NoDfuInterface.tsx index 5b3d2a7b..97604b89 100644 --- a/src/firmware/alerts/NoDfuInterface.tsx +++ b/src/firmware/alerts/NoDfuInterface.tsx @@ -11,11 +11,9 @@ const NoDfuInterface: React.VoidFunctionComponent = () => { return

{i18n.translate('noDfuInterface.message')}

; }; -export const noDfuInterface: CreateToast = (onAction) => { - return { - message: , - icon: 'error', - intent: Intent.DANGER, - onDismiss: () => onAction('dismiss'), - }; -}; +export const noDfuInterface: CreateToast = (onAction) => ({ + message: , + icon: 'error', + intent: Intent.DANGER, + onDismiss: () => onAction('dismiss'), +}); diff --git a/src/firmware/alerts/NoWebUsb.tsx b/src/firmware/alerts/NoWebUsb.tsx index 873a1a4a..69bbf8f7 100644 --- a/src/firmware/alerts/NoWebUsb.tsx +++ b/src/firmware/alerts/NoWebUsb.tsx @@ -16,11 +16,9 @@ const NoWebUsb: React.VoidFunctionComponent = () => { ); }; -export const noWebUsb: CreateToast = (onAction) => { - return { - message: , - icon: 'error', - intent: Intent.DANGER, - onDismiss: () => onAction('dismiss'), - }; -}; +export const noWebUsb: CreateToast = (onAction) => ({ + message: , + icon: 'error', + intent: Intent.DANGER, + onDismiss: () => onAction('dismiss'), +}); diff --git a/src/firmware/alerts/ReleaseButton.tsx b/src/firmware/alerts/ReleaseButton.tsx index 855eff0c..24d01578 100644 --- a/src/firmware/alerts/ReleaseButton.tsx +++ b/src/firmware/alerts/ReleaseButton.tsx @@ -11,11 +11,9 @@ const ReleaseButton: React.VoidFunctionComponent = () => { return

{i18n.translate('releaseButton.message')}

; }; -export const releaseButton: CreateToast = (onAction) => { - return { - message: , - icon: 'info-sign', - intent: Intent.PRIMARY, - onDismiss: () => onAction('dismiss'), - }; -}; +export const releaseButton: CreateToast = (onAction) => ({ + message: , + icon: 'info-sign', + intent: Intent.PRIMARY, + onDismiss: () => onAction('dismiss'), +}); diff --git a/src/mpy/alerts/CompilerError.tsx b/src/mpy/alerts/CompilerError.tsx index befded90..2ac7b91c 100644 --- a/src/mpy/alerts/CompilerError.tsx +++ b/src/mpy/alerts/CompilerError.tsx @@ -47,12 +47,10 @@ const CompilerError: React.VoidFunctionComponent = ({ error export const compilerError: CreateToast = ( onAction, props, -) => { - return { - message: , - icon: 'error', - intent: Intent.DANGER, - timeout: 0, - onDismiss: () => onAction('dismiss'), - }; -}; +) => ({ + message: , + icon: 'error', + intent: Intent.DANGER, + timeout: 0, + onDismiss: () => onAction('dismiss'), +});