From edd083a66d782a80e1ce89a62acf26a9ae798583 Mon Sep 17 00:00:00 2001 From: davy-c Date: Fri, 5 Mar 2021 15:55:01 +0900 Subject: [PATCH 1/3] fix toast --- src/cloud/components/atoms/ServiceConnect.tsx | 2 +- .../Rows/ContentManagerDocRow.tsx | 2 +- .../Rows/ContentManagerFolderRow.tsx | 2 +- .../DocTagsList/TagsAutoCompleteInput.tsx | 2 +- .../molecules/DocTagsList/index.tsx | 2 +- .../components/molecules/Editor/index.tsx | 2 +- .../molecules/OpenInviteSection.tsx | 2 +- .../components/molecules/ServiceSelector.tsx | 2 +- .../UpdateBillingEmailForm.tsx | 2 +- .../UpdateBillingMethodForm.tsx | 2 +- .../SubscriptionForm/UpdateBillingPromo.tsx | 2 +- .../molecules/SubscriptionForm/index.tsx | 2 +- .../organisms/FreeTrialPopup/index.tsx | 2 +- .../Modal/contents/Import/ImportModal.tsx | 2 +- .../Modal/contents/TemplatesModal/index.tsx | 5 ++++- .../SideNavigator/SideNavigatorFolderForm.tsx | 2 +- .../SideNavigator/SidebarNewDocControls.tsx | 2 +- .../SideNavigatorWorkspaceControls.tsx | 2 +- .../Subscription/SubscriptionManagement.tsx | 2 +- .../DocContextMenu/index.tsx | 2 +- .../ControlsContextMenu/TagContextMenu.tsx | 2 +- .../organisms/settings/MembersTab.tsx | 2 +- src/cloud/lib/stores/apiTokens/store.ts | 2 +- .../lib/stores/serviceConnections/store.ts | 2 +- src/cloud/lib/stores/toast/index.ts | 20 +++++++++++++------ src/cloud/pages/[teamId]/uploads.tsx | 2 +- 26 files changed, 42 insertions(+), 31 deletions(-) diff --git a/src/cloud/components/atoms/ServiceConnect.tsx b/src/cloud/components/atoms/ServiceConnect.tsx index 0decc8160a..844b7bd7af 100644 --- a/src/cloud/components/atoms/ServiceConnect.tsx +++ b/src/cloud/components/atoms/ServiceConnect.tsx @@ -19,7 +19,7 @@ const ServiceConnect = ({ children = 'Connect', ...buttonProps }: ServiceConnectProps) => { - const { pushAxiosErrorMessage, pushMessage } = useToast() + const { pushApiErrorMessage: pushAxiosErrorMessage, pushMessage } = useToast() const childRef = useRef() useEffect(() => { diff --git a/src/cloud/components/molecules/ContentManager/Rows/ContentManagerDocRow.tsx b/src/cloud/components/molecules/ContentManager/Rows/ContentManagerDocRow.tsx index d8fb78946f..d5f671844a 100644 --- a/src/cloud/components/molecules/ContentManager/Rows/ContentManagerDocRow.tsx +++ b/src/cloud/components/molecules/ContentManager/Rows/ContentManagerDocRow.tsx @@ -62,7 +62,7 @@ const ContentmanagerDocRow = ({ }: ContentManagerDocRowProps) => { const [sending, setSending] = useState() const { updateDocsMap, deleteDocHandler, updateDocHandler } = useNav() - const { pushMessage, pushAxiosErrorMessage } = useToast() + const { pushMessage, pushApiErrorMessage: pushAxiosErrorMessage } = useToast() const { openModal } = useModal() const { permissions = [] } = usePage() diff --git a/src/cloud/components/molecules/ContentManager/Rows/ContentManagerFolderRow.tsx b/src/cloud/components/molecules/ContentManager/Rows/ContentManagerFolderRow.tsx index 4f2d81a9c6..c9c1fc605c 100644 --- a/src/cloud/components/molecules/ContentManager/Rows/ContentManagerFolderRow.tsx +++ b/src/cloud/components/molecules/ContentManager/Rows/ContentManagerFolderRow.tsx @@ -54,7 +54,7 @@ const ContentmanagerFolderRow = ({ deleteFolderHandler, updateFolderHandler, } = useNav() - const { pushMessage, pushAxiosErrorMessage } = useToast() + const { pushMessage, pushApiErrorMessage: pushAxiosErrorMessage } = useToast() const { openModal } = useModal() const toggleFolderBookmark = useCallback( diff --git a/src/cloud/components/molecules/DocTagsList/TagsAutoCompleteInput.tsx b/src/cloud/components/molecules/DocTagsList/TagsAutoCompleteInput.tsx index 5e5ac080f8..aea7d44f07 100644 --- a/src/cloud/components/molecules/DocTagsList/TagsAutoCompleteInput.tsx +++ b/src/cloud/components/molecules/DocTagsList/TagsAutoCompleteInput.tsx @@ -25,7 +25,7 @@ const TagsAutoCompleteInput = ({ team, doc }: TagsAutoCompleteInputProps) => { const containerRef = useRef(null) const { tagsMap, updateDocsMap, updateTagsMap } = useNav() const [sending, setSending] = useState(false) - const { pushAxiosErrorMessage } = useToast() + const { pushApiErrorMessage: pushAxiosErrorMessage } = useToast() const [tagText, setTagText] = useState('') useEffect(() => { diff --git a/src/cloud/components/molecules/DocTagsList/index.tsx b/src/cloud/components/molecules/DocTagsList/index.tsx index c61df467a6..199ac5e9a1 100644 --- a/src/cloud/components/molecules/DocTagsList/index.tsx +++ b/src/cloud/components/molecules/DocTagsList/index.tsx @@ -24,7 +24,7 @@ const maxTagsDisplayed = 4 const DocTagsList = ({ doc, team }: DocTagsListProps) => { const [sending, setSending] = useState(false) - const { pushAxiosErrorMessage } = useToast() + const { pushApiErrorMessage: pushAxiosErrorMessage } = useToast() const { updateDocsMap } = useNav() const [removing, setRemoving] = useState() const [expanded, setExpanded] = useState(false) diff --git a/src/cloud/components/molecules/Editor/index.tsx b/src/cloud/components/molecules/Editor/index.tsx index 866c2bc34d..1f564f75fa 100644 --- a/src/cloud/components/molecules/Editor/index.tsx +++ b/src/cloud/components/molecules/Editor/index.tsx @@ -111,7 +111,7 @@ const Editor = ({ revisionHistory, }: EditorProps) => { const { currentUserPermissions } = usePage() - const { pushMessage, pushAxiosErrorMessage } = useToast() + const { pushMessage, pushApiErrorMessage: pushAxiosErrorMessage } = useToast() const [color] = useState(() => getColorFromString(user.id)) const { preferences, setPreferences } = usePreferences() const editorRef = useRef(null) diff --git a/src/cloud/components/molecules/OpenInviteSection.tsx b/src/cloud/components/molecules/OpenInviteSection.tsx index b2dc234c30..48d770835c 100644 --- a/src/cloud/components/molecules/OpenInviteSection.tsx +++ b/src/cloud/components/molecules/OpenInviteSection.tsx @@ -37,7 +37,7 @@ const OpenInvitesSection = ({ userPermissions }: OpenInvitesSectionProps) => { SerializedOpenInvite | undefined >(undefined) const { messageBox } = useDialog() - const { pushAxiosErrorMessage } = useToast() + const { pushApiErrorMessage: pushAxiosErrorMessage } = useToast() useEffectOnce(() => { fetchOpenInvite() diff --git a/src/cloud/components/molecules/ServiceSelector.tsx b/src/cloud/components/molecules/ServiceSelector.tsx index a71ebd03d6..9e4fc705f3 100644 --- a/src/cloud/components/molecules/ServiceSelector.tsx +++ b/src/cloud/components/molecules/ServiceSelector.tsx @@ -24,7 +24,7 @@ interface ServiceSelectorProps { type Services = 'github' | 'slack' | 'vercel' const ServiceSelector = ({ onSelect }: ServiceSelectorProps) => { - const { pushAxiosErrorMessage } = useToast() + const { pushApiErrorMessage: pushAxiosErrorMessage } = useToast() const [connections, setConnections] = useState( [] ) diff --git a/src/cloud/components/molecules/SubscriptionForm/UpdateBillingEmailForm.tsx b/src/cloud/components/molecules/SubscriptionForm/UpdateBillingEmailForm.tsx index 4ac87fa955..db6354c63b 100644 --- a/src/cloud/components/molecules/SubscriptionForm/UpdateBillingEmailForm.tsx +++ b/src/cloud/components/molecules/SubscriptionForm/UpdateBillingEmailForm.tsx @@ -22,7 +22,7 @@ const UpdateBillingEmailForm = ({ onSuccess, onCancel, }: UpdateBillingEmailFormProps) => { - const { pushAxiosErrorMessage } = useToast() + const { pushApiErrorMessage: pushAxiosErrorMessage } = useToast() const [sending, setSending] = useState(false) const [email, setEmail] = useState(sub != null ? sub.email : '') diff --git a/src/cloud/components/molecules/SubscriptionForm/UpdateBillingMethodForm.tsx b/src/cloud/components/molecules/SubscriptionForm/UpdateBillingMethodForm.tsx index ce38644551..d237899047 100644 --- a/src/cloud/components/molecules/SubscriptionForm/UpdateBillingMethodForm.tsx +++ b/src/cloud/components/molecules/SubscriptionForm/UpdateBillingMethodForm.tsx @@ -28,7 +28,7 @@ const UpdateBillingMethodForm = ({ }: UpdateBillingMethodFormProps) => { const stripe = useStripe() const elements = useElements() - const { pushAxiosErrorMessage } = useToast() + const { pushApiErrorMessage: pushAxiosErrorMessage } = useToast() const [sending, setSending] = useState(false) const { settings } = useSettings() diff --git a/src/cloud/components/molecules/SubscriptionForm/UpdateBillingPromo.tsx b/src/cloud/components/molecules/SubscriptionForm/UpdateBillingPromo.tsx index 0e532e32db..b92c9b0357 100644 --- a/src/cloud/components/molecules/SubscriptionForm/UpdateBillingPromo.tsx +++ b/src/cloud/components/molecules/SubscriptionForm/UpdateBillingPromo.tsx @@ -19,7 +19,7 @@ const UpdateBillingPromoForm = ({ sub, onCancel, }: UpdateBillingPromoFormProps) => { - const { pushAxiosErrorMessage, pushMessage } = useToast() + const { pushApiErrorMessage: pushAxiosErrorMessage, pushMessage } = useToast() const [sending, setSending] = useState(false) const [promoCode, setPromoCode] = useState('') diff --git a/src/cloud/components/molecules/SubscriptionForm/index.tsx b/src/cloud/components/molecules/SubscriptionForm/index.tsx index df557126f4..00e85181a7 100644 --- a/src/cloud/components/molecules/SubscriptionForm/index.tsx +++ b/src/cloud/components/molecules/SubscriptionForm/index.tsx @@ -51,7 +51,7 @@ const SubscriptionForm = ({ const [sending, setSending] = useState(false) const { settings } = useSettings() const { permissions = [] } = usePage() - const { pushAxiosErrorMessage } = useToast() + const { pushApiErrorMessage: pushAxiosErrorMessage } = useToast() const [currentPlan] = useState( initialPlan != null ? initialPlan : 'standard' ) diff --git a/src/cloud/components/organisms/FreeTrialPopup/index.tsx b/src/cloud/components/organisms/FreeTrialPopup/index.tsx index 6b8a72b49d..a7030b57b0 100644 --- a/src/cloud/components/organisms/FreeTrialPopup/index.tsx +++ b/src/cloud/components/organisms/FreeTrialPopup/index.tsx @@ -17,7 +17,7 @@ interface FreeTrialPopupProps { const FreeTrialPopup = ({ team, close }: FreeTrialPopupProps) => { const [sending, setSending] = useState(false) const { updateTeamSubscription } = usePage() - const { pushAxiosErrorMessage } = useToast() + const { pushApiErrorMessage: pushAxiosErrorMessage } = useToast() const onCloseCallback = useCallback(() => { if (sending) { diff --git a/src/cloud/components/organisms/Modal/contents/Import/ImportModal.tsx b/src/cloud/components/organisms/Modal/contents/Import/ImportModal.tsx index 30ff4a7304..60d76137c4 100644 --- a/src/cloud/components/organisms/Modal/contents/Import/ImportModal.tsx +++ b/src/cloud/components/organisms/Modal/contents/Import/ImportModal.tsx @@ -30,7 +30,7 @@ const ImportModal = () => { const [uploadType, setUploadType] = useState< AllowedDocTypeImports | undefined >() - const { pushAxiosErrorMessage, pushMessage } = useToast() + const { pushApiErrorMessage: pushAxiosErrorMessage, pushMessage } = useToast() const { team, pageFolder, pageWorkspace, setPartialPageData } = usePage() const [sending, setSending] = useState(false) const { updateDocsMap, updateFoldersMap, updateWorkspacesMap } = useNav() diff --git a/src/cloud/components/organisms/Modal/contents/TemplatesModal/index.tsx b/src/cloud/components/organisms/Modal/contents/TemplatesModal/index.tsx index c2bd1ce98d..42dd2365c5 100644 --- a/src/cloud/components/organisms/Modal/contents/TemplatesModal/index.tsx +++ b/src/cloud/components/organisms/Modal/contents/TemplatesModal/index.tsx @@ -65,7 +65,10 @@ const TemplatesModal = ({ callback }: TemplatesModalProps) => { createDocHandler, currentParentFolderId, } = useNav() - const { pushDocHandlerErrorMessage, pushAxiosErrorMessage } = useToast() + const { + pushDocHandlerErrorMessage, + pushApiErrorMessage: pushAxiosErrorMessage, + } = useToast() const contentSideRef = React.createRef() const menuRef = React.createRef() const [filter, setFilter] = useState('') diff --git a/src/cloud/components/organisms/Sidebar/SideNavigator/SideNavigatorFolderForm.tsx b/src/cloud/components/organisms/Sidebar/SideNavigator/SideNavigatorFolderForm.tsx index cf5c29a6f4..fdafa9db94 100644 --- a/src/cloud/components/organisms/Sidebar/SideNavigator/SideNavigatorFolderForm.tsx +++ b/src/cloud/components/organisms/Sidebar/SideNavigator/SideNavigatorFolderForm.tsx @@ -26,7 +26,7 @@ const SideNavigatorFolderForm = ({ const [name, setName] = useState('') const inputRef = useRef(null) const { createFolderHandler } = useNav() - const { pushAxiosErrorMessage } = useToast() + const { pushApiErrorMessage: pushAxiosErrorMessage } = useToast() const updateName = useCallback( (event: React.ChangeEvent) => { diff --git a/src/cloud/components/organisms/Sidebar/SideNavigator/SidebarNewDocControls.tsx b/src/cloud/components/organisms/Sidebar/SideNavigator/SidebarNewDocControls.tsx index 8482be43db..c32a6388f4 100644 --- a/src/cloud/components/organisms/Sidebar/SideNavigator/SidebarNewDocControls.tsx +++ b/src/cloud/components/organisms/Sidebar/SideNavigator/SidebarNewDocControls.tsx @@ -45,7 +45,7 @@ const SidebarNewDocControls = ({ disabled }: SidebarNewDocControlsProps) => { const newDocUploader = useRef(null) const uploaderFormRef = useRef(null) const [sending, setSending] = useState(false) - const { pushMessage, pushAxiosErrorMessage } = useToast() + const { pushMessage, pushApiErrorMessage: pushAxiosErrorMessage } = useToast() const navigateToTeam = useNavigateToTeam() const navigateToWorkspace = useNavigateToWorkspace() const navigateToDoc = useNavigateToDoc() diff --git a/src/cloud/components/organisms/Sidebar/SidebarWorkspaces/SideNavigatorWorkspaceControls.tsx b/src/cloud/components/organisms/Sidebar/SidebarWorkspaces/SideNavigatorWorkspaceControls.tsx index d8643b19ca..69b7499e6b 100644 --- a/src/cloud/components/organisms/Sidebar/SidebarWorkspaces/SideNavigatorWorkspaceControls.tsx +++ b/src/cloud/components/organisms/Sidebar/SidebarWorkspaces/SideNavigatorWorkspaceControls.tsx @@ -54,7 +54,7 @@ const SideNavigatorWorkspaceControls = ({ const { popup } = useContextMenu() const { messageBox } = useDialog() const { - pushAxiosErrorMessage, + pushApiErrorMessage: pushAxiosErrorMessage, pushMessage, pushDocHandlerErrorMessage, } = useToast() diff --git a/src/cloud/components/organisms/Subscription/SubscriptionManagement.tsx b/src/cloud/components/organisms/Subscription/SubscriptionManagement.tsx index f29ff88935..287a9affdf 100644 --- a/src/cloud/components/organisms/Subscription/SubscriptionManagement.tsx +++ b/src/cloud/components/organisms/Subscription/SubscriptionManagement.tsx @@ -46,7 +46,7 @@ const SubscriptionManagement = ({ const [sending, setSending] = useState(false) const { updateTeamSubscription } = usePage() const [fetchingHistory, setFetchingHistory] = useState(false) - const { pushAxiosErrorMessage, pushMessage } = useToast() + const { pushApiErrorMessage: pushAxiosErrorMessage, pushMessage } = useToast() const [targetedPlan, setTargetedPlan] = useState< 'Free' | 'Standard' | 'Pro' >() diff --git a/src/cloud/components/organisms/Topbar/Controls/ControlsContextMenu/DocContextMenu/index.tsx b/src/cloud/components/organisms/Topbar/Controls/ControlsContextMenu/DocContextMenu/index.tsx index f37c64da42..3d1c66c4ae 100644 --- a/src/cloud/components/organisms/Topbar/Controls/ControlsContextMenu/DocContextMenu/index.tsx +++ b/src/cloud/components/organisms/Topbar/Controls/ControlsContextMenu/DocContextMenu/index.tsx @@ -109,7 +109,7 @@ const DocContextMenu = ({ permissions = [], currentUserPermissions, } = usePage() - const { pushMessage, pushAxiosErrorMessage } = useToast() + const { pushMessage, pushApiErrorMessage: pushAxiosErrorMessage } = useToast() const { openModal } = useModal() const [sliceContributors, setSliceContributors] = useState(true) const { preferences, setPreferences } = usePreferences() diff --git a/src/cloud/components/organisms/Topbar/Controls/ControlsContextMenu/TagContextMenu.tsx b/src/cloud/components/organisms/Topbar/Controls/ControlsContextMenu/TagContextMenu.tsx index 7aad0e9721..7fee706b27 100644 --- a/src/cloud/components/organisms/Topbar/Controls/ControlsContextMenu/TagContextMenu.tsx +++ b/src/cloud/components/organisms/Topbar/Controls/ControlsContextMenu/TagContextMenu.tsx @@ -41,7 +41,7 @@ const TagContextMenu = ({ const [sendingRemoval, setSendingRemoval] = useState(false) const { removeFromTagsMap } = useNav() const { setPartialPageData, pageTag } = usePage() - const { pushAxiosErrorMessage } = useToast() + const { pushApiErrorMessage: pushAxiosErrorMessage } = useToast() const { messageBox } = useDialog() const { t } = useTranslation() diff --git a/src/cloud/components/organisms/settings/MembersTab.tsx b/src/cloud/components/organisms/settings/MembersTab.tsx index 754f369399..fbf260ea27 100644 --- a/src/cloud/components/organisms/settings/MembersTab.tsx +++ b/src/cloud/components/organisms/settings/MembersTab.tsx @@ -62,7 +62,7 @@ const MembersTab = () => { globalData: { currentUser }, } = useGlobalData() const { messageBox } = useDialog() - const { pushAxiosErrorMessage } = useToast() + const { pushApiErrorMessage: pushAxiosErrorMessage } = useToast() const { setClosed, openSettingsTab } = useSettings() const [sending, setSending] = useState() const router = useRouter() diff --git a/src/cloud/lib/stores/apiTokens/store.ts b/src/cloud/lib/stores/apiTokens/store.ts index 0d0852d023..e441a4c74e 100644 --- a/src/cloud/lib/stores/apiTokens/store.ts +++ b/src/cloud/lib/stores/apiTokens/store.ts @@ -22,7 +22,7 @@ type State = | { state: 'initialised'; tokens: SerializedApiToken[]; actions: Actions } export function useApiTokensStore(): State { - const { pushAxiosErrorMessage } = useToast() + const { pushApiErrorMessage: pushAxiosErrorMessage } = useToast() const [tokens, setTokens] = useState([]) const [initialised, setInitialised] = useState(false) diff --git a/src/cloud/lib/stores/serviceConnections/store.ts b/src/cloud/lib/stores/serviceConnections/store.ts index 2c82bd6396..e6fa1d8f13 100644 --- a/src/cloud/lib/stores/serviceConnections/store.ts +++ b/src/cloud/lib/stores/serviceConnections/store.ts @@ -28,7 +28,7 @@ export type State = } export function useServiceConnectionsStore(): State { - const { pushAxiosErrorMessage } = useToast() + const { pushApiErrorMessage: pushAxiosErrorMessage } = useToast() const [connections, setConnections] = useState( [] ) diff --git a/src/cloud/lib/stores/toast/index.ts b/src/cloud/lib/stores/toast/index.ts index 70a9b034b7..897e3530fb 100644 --- a/src/cloud/lib/stores/toast/index.ts +++ b/src/cloud/lib/stores/toast/index.ts @@ -1,6 +1,7 @@ import { useState, useCallback } from 'react' import { createStoreContext } from '../../utils/context' import { generateSecret } from '../../utils/secret' +import ky from 'ky' export interface ToastMessage { id: string @@ -13,7 +14,7 @@ export interface ToastMessage { interface ToastStore { readonly messages: ToastMessage[] pushMessage: (message: Omit) => void - pushAxiosErrorMessage: (error: any) => void + pushApiErrorMessage: (error: any) => void pushDocHandlerErrorMessage: (error: any) => void removeMessage: (message: ToastMessage) => void } @@ -40,10 +41,17 @@ const useToastStore = (): ToastStore => { ) const pushApiErrorMessage = useCallback( - (error: any) => { - const title = 'Error' - const description = 'Something wrong happened' - console.error(error) + async (error: any) => { + let title = 'Error' + let description = 'Something wrong happened' + + if (error instanceof ky.HTTPError) { + title = error.response.status.toString() + const errorMessage = await error.response.text() + const split = errorMessage.replace('Error: ', '').split('\n') + description = split[0] + } + setMessages((prev) => [ { id: generateSecret(), @@ -72,7 +80,7 @@ const useToastStore = (): ToastStore => { return { messages, pushMessage, - pushAxiosErrorMessage: pushApiErrorMessage, + pushApiErrorMessage, pushDocHandlerErrorMessage, removeMessage: (message) => setMessages(messages.filter(({ id }) => id !== message.id)), diff --git a/src/cloud/pages/[teamId]/uploads.tsx b/src/cloud/pages/[teamId]/uploads.tsx index ebb781d52c..d421013aa0 100644 --- a/src/cloud/pages/[teamId]/uploads.tsx +++ b/src/cloud/pages/[teamId]/uploads.tsx @@ -33,7 +33,7 @@ const UploadListPage = ({ const [sending, setSending] = useState(false) const { t } = useTranslation() const { messageBox } = useDialog() - const { pushAxiosErrorMessage } = useToast() + const { pushApiErrorMessage: pushAxiosErrorMessage } = useToast() const { subscription, permissions } = usePage() const { openSettingsTab } = useSettings() From 0b06dc87014698f03de77da228947c35b0a70d6f Mon Sep 17 00:00:00 2001 From: davy-c Date: Fri, 5 Mar 2021 16:00:54 +0900 Subject: [PATCH 2/3] fix --- src/cloud/lib/stores/toast/index.ts | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/cloud/lib/stores/toast/index.ts b/src/cloud/lib/stores/toast/index.ts index 897e3530fb..619550b69a 100644 --- a/src/cloud/lib/stores/toast/index.ts +++ b/src/cloud/lib/stores/toast/index.ts @@ -46,10 +46,11 @@ const useToastStore = (): ToastStore => { let description = 'Something wrong happened' if (error instanceof ky.HTTPError) { - title = error.response.status.toString() - const errorMessage = await error.response.text() - const split = errorMessage.replace('Error: ', '').split('\n') - description = split[0] + try { + title = error.response.status.toString() + const errorMessage = await error.response.text() + description = errorMessage.split('\n')[0].split(': ')[1] + } catch (error) {} } setMessages((prev) => [ From 3b5caf7851c89469a6146816ffa8aefa36b18cdd Mon Sep 17 00:00:00 2001 From: davy-c Date: Fri, 5 Mar 2021 16:05:15 +0900 Subject: [PATCH 3/3] fix rename --- src/cloud/components/atoms/ServiceConnect.tsx | 6 +++--- .../Rows/ContentManagerDocRow.tsx | 6 +++--- .../Rows/ContentManagerFolderRow.tsx | 6 +++--- .../DocTagsList/TagsAutoCompleteInput.tsx | 6 +++--- .../molecules/DocTagsList/index.tsx | 6 +++--- .../components/molecules/Editor/index.tsx | 6 +++--- .../molecules/OpenInviteSection.tsx | 18 ++++++++-------- .../components/molecules/ServiceSelector.tsx | 4 ++-- .../UpdateBillingEmailForm.tsx | 4 ++-- .../UpdateBillingMethodForm.tsx | 4 ++-- .../SubscriptionForm/UpdateBillingPromo.tsx | 4 ++-- .../molecules/SubscriptionForm/index.tsx | 4 ++-- .../organisms/FreeTrialPopup/index.tsx | 6 +++--- .../Modal/contents/Import/ImportModal.tsx | 6 +++--- .../Modal/contents/TemplatesModal/index.tsx | 13 +++++------- .../SideNavigator/SideNavigatorFolderForm.tsx | 6 +++--- .../SideNavigator/SidebarNewDocControls.tsx | 6 +++--- .../SideNavigatorWorkspaceControls.tsx | 6 +++--- .../Subscription/SubscriptionManagement.tsx | 6 +++--- .../DocContextMenu/index.tsx | 6 +++--- .../ControlsContextMenu/TagContextMenu.tsx | 6 +++--- .../organisms/settings/MembersTab.tsx | 21 +++++++------------ src/cloud/lib/stores/apiTokens/store.ts | 16 +++++++------- .../lib/stores/serviceConnections/store.ts | 8 +++---- src/cloud/pages/[teamId]/uploads.tsx | 6 +++--- 25 files changed, 88 insertions(+), 98 deletions(-) diff --git a/src/cloud/components/atoms/ServiceConnect.tsx b/src/cloud/components/atoms/ServiceConnect.tsx index 844b7bd7af..5e7a89e694 100644 --- a/src/cloud/components/atoms/ServiceConnect.tsx +++ b/src/cloud/components/atoms/ServiceConnect.tsx @@ -19,7 +19,7 @@ const ServiceConnect = ({ children = 'Connect', ...buttonProps }: ServiceConnectProps) => { - const { pushApiErrorMessage: pushAxiosErrorMessage, pushMessage } = useToast() + const { pushApiErrorMessage, pushMessage } = useToast() const childRef = useRef() useEffect(() => { @@ -36,7 +36,7 @@ const ServiceConnect = ({ ) onConnect(connection) } catch (err) { - pushAxiosErrorMessage(err) + pushApiErrorMessage(err) } } else { pushMessage({ @@ -53,7 +53,7 @@ const ServiceConnect = ({ return () => { window.removeEventListener('message', callback) } - }, [service, pushMessage, pushAxiosErrorMessage, onConnect]) + }, [service, pushMessage, pushApiErrorMessage, onConnect]) const onClick = useCallback(() => { if (childRef.current != null && childRef.current.closed) { diff --git a/src/cloud/components/molecules/ContentManager/Rows/ContentManagerDocRow.tsx b/src/cloud/components/molecules/ContentManager/Rows/ContentManagerDocRow.tsx index d5f671844a..90f9afdfb1 100644 --- a/src/cloud/components/molecules/ContentManager/Rows/ContentManagerDocRow.tsx +++ b/src/cloud/components/molecules/ContentManager/Rows/ContentManagerDocRow.tsx @@ -62,7 +62,7 @@ const ContentmanagerDocRow = ({ }: ContentManagerDocRowProps) => { const [sending, setSending] = useState() const { updateDocsMap, deleteDocHandler, updateDocHandler } = useNav() - const { pushMessage, pushApiErrorMessage: pushAxiosErrorMessage } = useToast() + const { pushMessage, pushApiErrorMessage } = useToast() const { openModal } = useModal() const { permissions = [] } = usePage() @@ -162,12 +162,12 @@ const ContentmanagerDocRow = ({ try { await updateDocHandler(doc, { workspaceId, parentFolderId }) } catch (error) { - pushAxiosErrorMessage(error) + pushApiErrorMessage(error) } setSending(undefined) setUpdating((prev) => prev.filter((id) => id !== patternedId)) }, - [updateDocHandler, updating, setUpdating, pushAxiosErrorMessage] + [updateDocHandler, updating, setUpdating, pushApiErrorMessage] ) const openMoveForm = useCallback( diff --git a/src/cloud/components/molecules/ContentManager/Rows/ContentManagerFolderRow.tsx b/src/cloud/components/molecules/ContentManager/Rows/ContentManagerFolderRow.tsx index c9c1fc605c..e312d2f033 100644 --- a/src/cloud/components/molecules/ContentManager/Rows/ContentManagerFolderRow.tsx +++ b/src/cloud/components/molecules/ContentManager/Rows/ContentManagerFolderRow.tsx @@ -54,7 +54,7 @@ const ContentmanagerFolderRow = ({ deleteFolderHandler, updateFolderHandler, } = useNav() - const { pushMessage, pushApiErrorMessage: pushAxiosErrorMessage } = useToast() + const { pushMessage, pushApiErrorMessage } = useToast() const { openModal } = useModal() const toggleFolderBookmark = useCallback( @@ -121,12 +121,12 @@ const ContentmanagerFolderRow = ({ emoji: 'unchanged', }) } catch (error) { - pushAxiosErrorMessage(error) + pushApiErrorMessage(error) } setSending(undefined) setUpdating((prev) => prev.filter((id) => id !== patternedId)) }, - [updateFolderHandler, updating, setUpdating, pushAxiosErrorMessage] + [updateFolderHandler, updating, setUpdating, pushApiErrorMessage] ) const openMoveForm = useCallback( diff --git a/src/cloud/components/molecules/DocTagsList/TagsAutoCompleteInput.tsx b/src/cloud/components/molecules/DocTagsList/TagsAutoCompleteInput.tsx index aea7d44f07..83ca395b13 100644 --- a/src/cloud/components/molecules/DocTagsList/TagsAutoCompleteInput.tsx +++ b/src/cloud/components/molecules/DocTagsList/TagsAutoCompleteInput.tsx @@ -25,7 +25,7 @@ const TagsAutoCompleteInput = ({ team, doc }: TagsAutoCompleteInputProps) => { const containerRef = useRef(null) const { tagsMap, updateDocsMap, updateTagsMap } = useNav() const [sending, setSending] = useState(false) - const { pushApiErrorMessage: pushAxiosErrorMessage } = useToast() + const { pushApiErrorMessage } = useToast() const [tagText, setTagText] = useState('') useEffect(() => { @@ -51,12 +51,12 @@ const TagsAutoCompleteInput = ({ team, doc }: TagsAutoCompleteInputProps) => { setShowInput(false) setTagText('') } catch (error) { - pushAxiosErrorMessage(error) + pushApiErrorMessage(error) } setSending(false) }, - [pushAxiosErrorMessage, sending, doc.id, team, updateDocsMap, updateTagsMap] + [pushApiErrorMessage, sending, doc.id, team, updateDocsMap, updateTagsMap] ) const activateAndFocus = useCallback(() => { diff --git a/src/cloud/components/molecules/DocTagsList/index.tsx b/src/cloud/components/molecules/DocTagsList/index.tsx index 199ac5e9a1..3634b7ed9e 100644 --- a/src/cloud/components/molecules/DocTagsList/index.tsx +++ b/src/cloud/components/molecules/DocTagsList/index.tsx @@ -24,7 +24,7 @@ const maxTagsDisplayed = 4 const DocTagsList = ({ doc, team }: DocTagsListProps) => { const [sending, setSending] = useState(false) - const { pushApiErrorMessage: pushAxiosErrorMessage } = useToast() + const { pushApiErrorMessage } = useToast() const { updateDocsMap } = useNav() const [removing, setRemoving] = useState() const [expanded, setExpanded] = useState(false) @@ -41,12 +41,12 @@ const DocTagsList = ({ doc, team }: DocTagsListProps) => { const { doc: newDoc } = await deleteTagFromDoc(team.id, doc.id, tagId) updateDocsMap([newDoc.id, newDoc]) } catch (error) { - pushAxiosErrorMessage(error) + pushApiErrorMessage(error) } setRemoving(undefined) setSending(false) }, - [doc.id, team.id, sending, setSending, pushAxiosErrorMessage, updateDocsMap] + [doc.id, team.id, sending, setSending, pushApiErrorMessage, updateDocsMap] ) const listContent = useMemo(() => { diff --git a/src/cloud/components/molecules/Editor/index.tsx b/src/cloud/components/molecules/Editor/index.tsx index 1f564f75fa..f058b959d6 100644 --- a/src/cloud/components/molecules/Editor/index.tsx +++ b/src/cloud/components/molecules/Editor/index.tsx @@ -111,7 +111,7 @@ const Editor = ({ revisionHistory, }: EditorProps) => { const { currentUserPermissions } = usePage() - const { pushMessage, pushApiErrorMessage: pushAxiosErrorMessage } = useToast() + const { pushMessage, pushApiErrorMessage } = useToast() const [color] = useState(() => getColorFromString(user.id)) const { preferences, setPreferences } = usePreferences() const editorRef = useRef(null) @@ -237,14 +237,14 @@ const Editor = ({ return { type: 'file', url, title: file.name } } } catch (err) { - pushAxiosErrorMessage(err) + pushApiErrorMessage(err) return null } } } else { fileUploadHandlerRef.current = undefined } - }, [team, pushMessage, pushAxiosErrorMessage, doc]) + }, [team, pushMessage, pushApiErrorMessage, doc]) useEffect(() => { return () => { diff --git a/src/cloud/components/molecules/OpenInviteSection.tsx b/src/cloud/components/molecules/OpenInviteSection.tsx index 48d770835c..4a057a61c1 100644 --- a/src/cloud/components/molecules/OpenInviteSection.tsx +++ b/src/cloud/components/molecules/OpenInviteSection.tsx @@ -37,7 +37,7 @@ const OpenInvitesSection = ({ userPermissions }: OpenInvitesSectionProps) => { SerializedOpenInvite | undefined >(undefined) const { messageBox } = useDialog() - const { pushApiErrorMessage: pushAxiosErrorMessage } = useToast() + const { pushApiErrorMessage } = useToast() useEffectOnce(() => { fetchOpenInvite() @@ -53,9 +53,9 @@ const OpenInvitesSection = ({ userPermissions }: OpenInvitesSectionProps) => { setOpenInvite(invite) setFetching(false) } catch (error) { - pushAxiosErrorMessage(error) + pushApiErrorMessage(error) } - }, [team, pushAxiosErrorMessage]) + }, [team, pushApiErrorMessage]) const createInvite = useCallback(async () => { if (team == null) { @@ -67,10 +67,10 @@ const OpenInvitesSection = ({ userPermissions }: OpenInvitesSectionProps) => { const { invite } = await createOpenInvite(team) setOpenInvite(invite) } catch (error) { - pushAxiosErrorMessage(error) + pushApiErrorMessage(error) } setSending(false) - }, [team, pushAxiosErrorMessage]) + }, [team, pushApiErrorMessage]) const cancelInvite = useCallback( async (invite: SerializedOpenInvite) => { @@ -94,7 +94,7 @@ const OpenInvitesSection = ({ userPermissions }: OpenInvitesSectionProps) => { await cancelOpenInvite(team, invite) setOpenInvite(undefined) } catch (error) { - pushAxiosErrorMessage(error) + pushApiErrorMessage(error) } setSending(false) return @@ -104,7 +104,7 @@ const OpenInvitesSection = ({ userPermissions }: OpenInvitesSectionProps) => { }, }) }, - [messageBox, t, team, pushAxiosErrorMessage] + [messageBox, t, team, pushApiErrorMessage] ) const resetInvite = useCallback(async () => { @@ -131,7 +131,7 @@ const OpenInvitesSection = ({ userPermissions }: OpenInvitesSectionProps) => { ) setOpenInvite(newInvite) } catch (error) { - pushAxiosErrorMessage(error) + pushApiErrorMessage(error) } setSending(false) return @@ -140,7 +140,7 @@ const OpenInvitesSection = ({ userPermissions }: OpenInvitesSectionProps) => { } }, }) - }, [messageBox, t, team, pushAxiosErrorMessage, openInvite]) + }, [messageBox, t, team, pushApiErrorMessage, openInvite]) const toggleOpenInvite = useCallback(() => { if (openInvite != null) { diff --git a/src/cloud/components/molecules/ServiceSelector.tsx b/src/cloud/components/molecules/ServiceSelector.tsx index 9e4fc705f3..2e79fd7a9f 100644 --- a/src/cloud/components/molecules/ServiceSelector.tsx +++ b/src/cloud/components/molecules/ServiceSelector.tsx @@ -24,7 +24,7 @@ interface ServiceSelectorProps { type Services = 'github' | 'slack' | 'vercel' const ServiceSelector = ({ onSelect }: ServiceSelectorProps) => { - const { pushApiErrorMessage: pushAxiosErrorMessage } = useToast() + const { pushApiErrorMessage } = useToast() const [connections, setConnections] = useState( [] ) @@ -38,7 +38,7 @@ const ServiceSelector = ({ onSelect }: ServiceSelectorProps) => { const { connections } = await getUserServiceConnections() setConnections(connections) } catch (err) { - pushAxiosErrorMessage(err) + pushApiErrorMessage(err) } finally { setIsLoadingConnections(false) } diff --git a/src/cloud/components/molecules/SubscriptionForm/UpdateBillingEmailForm.tsx b/src/cloud/components/molecules/SubscriptionForm/UpdateBillingEmailForm.tsx index db6354c63b..0b9807b697 100644 --- a/src/cloud/components/molecules/SubscriptionForm/UpdateBillingEmailForm.tsx +++ b/src/cloud/components/molecules/SubscriptionForm/UpdateBillingEmailForm.tsx @@ -22,7 +22,7 @@ const UpdateBillingEmailForm = ({ onSuccess, onCancel, }: UpdateBillingEmailFormProps) => { - const { pushApiErrorMessage: pushAxiosErrorMessage } = useToast() + const { pushApiErrorMessage } = useToast() const [sending, setSending] = useState(false) const [email, setEmail] = useState(sub != null ? sub.email : '') @@ -37,7 +37,7 @@ const UpdateBillingEmailForm = ({ const { subscription } = await updateSubEmail(sub.teamId, email) onSuccess(subscription) } catch (error) { - pushAxiosErrorMessage(error) + pushApiErrorMessage(error) setSending(false) } } diff --git a/src/cloud/components/molecules/SubscriptionForm/UpdateBillingMethodForm.tsx b/src/cloud/components/molecules/SubscriptionForm/UpdateBillingMethodForm.tsx index d237899047..cbab3a5597 100644 --- a/src/cloud/components/molecules/SubscriptionForm/UpdateBillingMethodForm.tsx +++ b/src/cloud/components/molecules/SubscriptionForm/UpdateBillingMethodForm.tsx @@ -28,7 +28,7 @@ const UpdateBillingMethodForm = ({ }: UpdateBillingMethodFormProps) => { const stripe = useStripe() const elements = useElements() - const { pushApiErrorMessage: pushAxiosErrorMessage } = useToast() + const { pushApiErrorMessage } = useToast() const [sending, setSending] = useState(false) const { settings } = useSettings() @@ -59,7 +59,7 @@ const UpdateBillingMethodForm = ({ }) onSuccess(subscription) } catch (error) { - pushAxiosErrorMessage(error) + pushApiErrorMessage(error) setSending(false) } } diff --git a/src/cloud/components/molecules/SubscriptionForm/UpdateBillingPromo.tsx b/src/cloud/components/molecules/SubscriptionForm/UpdateBillingPromo.tsx index b92c9b0357..8c4d70179f 100644 --- a/src/cloud/components/molecules/SubscriptionForm/UpdateBillingPromo.tsx +++ b/src/cloud/components/molecules/SubscriptionForm/UpdateBillingPromo.tsx @@ -19,7 +19,7 @@ const UpdateBillingPromoForm = ({ sub, onCancel, }: UpdateBillingPromoFormProps) => { - const { pushApiErrorMessage: pushAxiosErrorMessage, pushMessage } = useToast() + const { pushApiErrorMessage, pushMessage } = useToast() const [sending, setSending] = useState(false) const [promoCode, setPromoCode] = useState('') @@ -45,7 +45,7 @@ const UpdateBillingPromoForm = ({ description: `Promo code ${promoCode} is not available for this account`, }) } else { - pushAxiosErrorMessage(error) + pushApiErrorMessage(error) } } finally { setSending(false) diff --git a/src/cloud/components/molecules/SubscriptionForm/index.tsx b/src/cloud/components/molecules/SubscriptionForm/index.tsx index 00e85181a7..de745ea46a 100644 --- a/src/cloud/components/molecules/SubscriptionForm/index.tsx +++ b/src/cloud/components/molecules/SubscriptionForm/index.tsx @@ -51,7 +51,7 @@ const SubscriptionForm = ({ const [sending, setSending] = useState(false) const { settings } = useSettings() const { permissions = [] } = usePage() - const { pushApiErrorMessage: pushAxiosErrorMessage } = useToast() + const { pushApiErrorMessage } = useToast() const [currentPlan] = useState( initialPlan != null ? initialPlan : 'standard' ) @@ -110,7 +110,7 @@ const SubscriptionForm = ({ setSending(false) onSuccess(subscription) } catch (error) { - pushAxiosErrorMessage(error) + pushApiErrorMessage(error) setSending(false) } } diff --git a/src/cloud/components/organisms/FreeTrialPopup/index.tsx b/src/cloud/components/organisms/FreeTrialPopup/index.tsx index a7030b57b0..eb737bacb6 100644 --- a/src/cloud/components/organisms/FreeTrialPopup/index.tsx +++ b/src/cloud/components/organisms/FreeTrialPopup/index.tsx @@ -17,7 +17,7 @@ interface FreeTrialPopupProps { const FreeTrialPopup = ({ team, close }: FreeTrialPopupProps) => { const [sending, setSending] = useState(false) const { updateTeamSubscription } = usePage() - const { pushApiErrorMessage: pushAxiosErrorMessage } = useToast() + const { pushApiErrorMessage } = useToast() const onCloseCallback = useCallback(() => { if (sending) { @@ -38,10 +38,10 @@ const FreeTrialPopup = ({ team, close }: FreeTrialPopupProps) => { updateTeamSubscription(subscription) close() } catch (error) { - pushAxiosErrorMessage(error) + pushApiErrorMessage(error) } setSending(false) - }, [sending, pushAxiosErrorMessage, updateTeamSubscription, team, close]) + }, [sending, pushApiErrorMessage, updateTeamSubscription, team, close]) return ( diff --git a/src/cloud/components/organisms/Modal/contents/Import/ImportModal.tsx b/src/cloud/components/organisms/Modal/contents/Import/ImportModal.tsx index 60d76137c4..a704a62f2c 100644 --- a/src/cloud/components/organisms/Modal/contents/Import/ImportModal.tsx +++ b/src/cloud/components/organisms/Modal/contents/Import/ImportModal.tsx @@ -30,7 +30,7 @@ const ImportModal = () => { const [uploadType, setUploadType] = useState< AllowedDocTypeImports | undefined >() - const { pushApiErrorMessage: pushAxiosErrorMessage, pushMessage } = useToast() + const { pushApiErrorMessage, pushMessage } = useToast() const { team, pageFolder, pageWorkspace, setPartialPageData } = usePage() const [sending, setSending] = useState(false) const { updateDocsMap, updateFoldersMap, updateWorkspacesMap } = useNav() @@ -125,7 +125,7 @@ const ImportModal = () => { } } } catch (error) { - pushAxiosErrorMessage(error) + pushApiErrorMessage(error) } } setSending(false) @@ -134,7 +134,7 @@ const ImportModal = () => { [ selectedWorkspaceId, selectedFolderId, - pushAxiosErrorMessage, + pushApiErrorMessage, team, uploadType, sending, diff --git a/src/cloud/components/organisms/Modal/contents/TemplatesModal/index.tsx b/src/cloud/components/organisms/Modal/contents/TemplatesModal/index.tsx index 42dd2365c5..928b2dd400 100644 --- a/src/cloud/components/organisms/Modal/contents/TemplatesModal/index.tsx +++ b/src/cloud/components/organisms/Modal/contents/TemplatesModal/index.tsx @@ -65,10 +65,7 @@ const TemplatesModal = ({ callback }: TemplatesModalProps) => { createDocHandler, currentParentFolderId, } = useNav() - const { - pushDocHandlerErrorMessage, - pushApiErrorMessage: pushAxiosErrorMessage, - } = useToast() + const { pushDocHandlerErrorMessage, pushApiErrorMessage } = useToast() const contentSideRef = React.createRef() const menuRef = React.createRef() const [filter, setFilter] = useState('') @@ -236,7 +233,7 @@ const TemplatesModal = ({ callback }: TemplatesModalProps) => { await destroyDocTemplate(template.id) removeFromTemplatesMap(template.id) } catch (error) { - pushAxiosErrorMessage(error) + pushApiErrorMessage(error) } setSendingState(undefined) return @@ -246,7 +243,7 @@ const TemplatesModal = ({ callback }: TemplatesModalProps) => { }, }) }, - [messageBox, pushAxiosErrorMessage, removeFromTemplatesMap] + [messageBox, pushApiErrorMessage, removeFromTemplatesMap] ) const saveTemplate = useCallback(async () => { @@ -263,7 +260,7 @@ const TemplatesModal = ({ callback }: TemplatesModalProps) => { }) updateTemplatesMap([template.id, template]) } catch (error) { - pushAxiosErrorMessage(error) + pushApiErrorMessage(error) } setSendingState(undefined) }, [ @@ -273,7 +270,7 @@ const TemplatesModal = ({ callback }: TemplatesModalProps) => { emoji, selectedTemplateId, updateTemplatesMap, - pushAxiosErrorMessage, + pushApiErrorMessage, ]) const bindCallback = useCallback((editor: CodeMirror.Editor) => { diff --git a/src/cloud/components/organisms/Sidebar/SideNavigator/SideNavigatorFolderForm.tsx b/src/cloud/components/organisms/Sidebar/SideNavigator/SideNavigatorFolderForm.tsx index fdafa9db94..fce6a969eb 100644 --- a/src/cloud/components/organisms/Sidebar/SideNavigator/SideNavigatorFolderForm.tsx +++ b/src/cloud/components/organisms/Sidebar/SideNavigator/SideNavigatorFolderForm.tsx @@ -26,7 +26,7 @@ const SideNavigatorFolderForm = ({ const [name, setName] = useState('') const inputRef = useRef(null) const { createFolderHandler } = useNav() - const { pushApiErrorMessage: pushAxiosErrorMessage } = useToast() + const { pushApiErrorMessage } = useToast() const updateName = useCallback( (event: React.ChangeEvent) => { @@ -71,7 +71,7 @@ const SideNavigatorFolderForm = ({ await createFolderHandler(body) close() } catch (error) { - pushAxiosErrorMessage(error) + pushApiErrorMessage(error) close() } }, @@ -80,7 +80,7 @@ const SideNavigatorFolderForm = ({ workspaceId, parentFolderId, createFolderHandler, - pushAxiosErrorMessage, + pushApiErrorMessage, close, ] ) diff --git a/src/cloud/components/organisms/Sidebar/SideNavigator/SidebarNewDocControls.tsx b/src/cloud/components/organisms/Sidebar/SideNavigator/SidebarNewDocControls.tsx index c32a6388f4..d725bda29f 100644 --- a/src/cloud/components/organisms/Sidebar/SideNavigator/SidebarNewDocControls.tsx +++ b/src/cloud/components/organisms/Sidebar/SideNavigator/SidebarNewDocControls.tsx @@ -45,7 +45,7 @@ const SidebarNewDocControls = ({ disabled }: SidebarNewDocControlsProps) => { const newDocUploader = useRef(null) const uploaderFormRef = useRef(null) const [sending, setSending] = useState(false) - const { pushMessage, pushApiErrorMessage: pushAxiosErrorMessage } = useToast() + const { pushMessage, pushApiErrorMessage } = useToast() const navigateToTeam = useNavigateToTeam() const navigateToWorkspace = useNavigateToWorkspace() const navigateToDoc = useNavigateToDoc() @@ -141,7 +141,7 @@ const SidebarNewDocControls = ({ disabled }: SidebarNewDocControlsProps) => { } } } catch (error) { - pushAxiosErrorMessage(error) + pushApiErrorMessage(error) } } setSending(false) @@ -162,7 +162,7 @@ const SidebarNewDocControls = ({ disabled }: SidebarNewDocControlsProps) => { navigateToFolder, navigateToTeam, navigateToWorkspace, - pushAxiosErrorMessage, + pushApiErrorMessage, ] ) diff --git a/src/cloud/components/organisms/Sidebar/SidebarWorkspaces/SideNavigatorWorkspaceControls.tsx b/src/cloud/components/organisms/Sidebar/SidebarWorkspaces/SideNavigatorWorkspaceControls.tsx index 69b7499e6b..000db25aa1 100644 --- a/src/cloud/components/organisms/Sidebar/SidebarWorkspaces/SideNavigatorWorkspaceControls.tsx +++ b/src/cloud/components/organisms/Sidebar/SidebarWorkspaces/SideNavigatorWorkspaceControls.tsx @@ -54,7 +54,7 @@ const SideNavigatorWorkspaceControls = ({ const { popup } = useContextMenu() const { messageBox } = useDialog() const { - pushApiErrorMessage: pushAxiosErrorMessage, + pushApiErrorMessage, pushMessage, pushDocHandlerErrorMessage, } = useToast() @@ -121,7 +121,7 @@ const SideNavigatorWorkspaceControls = ({ removeFromFoldersMap(...workspaceFolders.map((doc) => doc.id)) } } catch (error) { - pushAxiosErrorMessage(error) + pushApiErrorMessage(error) } return case 1: @@ -134,7 +134,7 @@ const SideNavigatorWorkspaceControls = ({ [ messageBox, t, - pushAxiosErrorMessage, + pushApiErrorMessage, team, removeFromWorkspacesMap, pushMessage, diff --git a/src/cloud/components/organisms/Subscription/SubscriptionManagement.tsx b/src/cloud/components/organisms/Subscription/SubscriptionManagement.tsx index 287a9affdf..b544abdcab 100644 --- a/src/cloud/components/organisms/Subscription/SubscriptionManagement.tsx +++ b/src/cloud/components/organisms/Subscription/SubscriptionManagement.tsx @@ -46,7 +46,7 @@ const SubscriptionManagement = ({ const [sending, setSending] = useState(false) const { updateTeamSubscription } = usePage() const [fetchingHistory, setFetchingHistory] = useState(false) - const { pushApiErrorMessage: pushAxiosErrorMessage, pushMessage } = useToast() + const { pushApiErrorMessage, pushMessage } = useToast() const [targetedPlan, setTargetedPlan] = useState< 'Free' | 'Standard' | 'Pro' >() @@ -60,11 +60,11 @@ const SubscriptionManagement = ({ const data = await getTeamPortalUrl(subscription.teamId) window.open(data.url, '_blank') } catch (error) { - pushAxiosErrorMessage(error) + pushApiErrorMessage(error) } setFetchingHistory(false) - }, [fetchingHistory, subscription.teamId, pushAxiosErrorMessage]) + }, [fetchingHistory, subscription.teamId, pushApiErrorMessage]) const cancellingCallback = useCallback(() => { if (subscription.status === 'canceled') { diff --git a/src/cloud/components/organisms/Topbar/Controls/ControlsContextMenu/DocContextMenu/index.tsx b/src/cloud/components/organisms/Topbar/Controls/ControlsContextMenu/DocContextMenu/index.tsx index 3d1c66c4ae..315fb1315c 100644 --- a/src/cloud/components/organisms/Topbar/Controls/ControlsContextMenu/DocContextMenu/index.tsx +++ b/src/cloud/components/organisms/Topbar/Controls/ControlsContextMenu/DocContextMenu/index.tsx @@ -109,7 +109,7 @@ const DocContextMenu = ({ permissions = [], currentUserPermissions, } = usePage() - const { pushMessage, pushApiErrorMessage: pushAxiosErrorMessage } = useToast() + const { pushMessage, pushApiErrorMessage } = useToast() const { openModal } = useModal() const [sliceContributors, setSliceContributors] = useState(true) const { preferences, setPreferences } = usePreferences() @@ -278,13 +278,13 @@ const DocContextMenu = ({ try { await updateDocHandler(doc, { workspaceId, parentFolderId }) } catch (error) { - pushAxiosErrorMessage(error) + pushApiErrorMessage(error) } setSendingMove(false) }, [ updateDocHandler, - pushAxiosErrorMessage, + pushApiErrorMessage, sendingTemplate, sendingArchive, sendingMove, diff --git a/src/cloud/components/organisms/Topbar/Controls/ControlsContextMenu/TagContextMenu.tsx b/src/cloud/components/organisms/Topbar/Controls/ControlsContextMenu/TagContextMenu.tsx index 7fee706b27..61e2858dca 100644 --- a/src/cloud/components/organisms/Topbar/Controls/ControlsContextMenu/TagContextMenu.tsx +++ b/src/cloud/components/organisms/Topbar/Controls/ControlsContextMenu/TagContextMenu.tsx @@ -41,7 +41,7 @@ const TagContextMenu = ({ const [sendingRemoval, setSendingRemoval] = useState(false) const { removeFromTagsMap } = useNav() const { setPartialPageData, pageTag } = usePage() - const { pushApiErrorMessage: pushAxiosErrorMessage } = useToast() + const { pushApiErrorMessage } = useToast() const { messageBox } = useDialog() const { t } = useTranslation() @@ -98,7 +98,7 @@ const TagContextMenu = ({ setPartialPageData({ pageTag: undefined }) } } catch (error) { - pushAxiosErrorMessage(error) + pushApiErrorMessage(error) } setSendingRemoval(false) @@ -111,7 +111,7 @@ const TagContextMenu = ({ }, [ sendingRemoval, - pushAxiosErrorMessage, + pushApiErrorMessage, setSendingRemoval, removeFromTagsMap, setPartialPageData, diff --git a/src/cloud/components/organisms/settings/MembersTab.tsx b/src/cloud/components/organisms/settings/MembersTab.tsx index fbf260ea27..8b3922ee59 100644 --- a/src/cloud/components/organisms/settings/MembersTab.tsx +++ b/src/cloud/components/organisms/settings/MembersTab.tsx @@ -62,7 +62,7 @@ const MembersTab = () => { globalData: { currentUser }, } = useGlobalData() const { messageBox } = useDialog() - const { pushApiErrorMessage: pushAxiosErrorMessage } = useToast() + const { pushApiErrorMessage } = useToast() const { setClosed, openSettingsTab } = useSettings() const [sending, setSending] = useState() const router = useRouter() @@ -192,7 +192,7 @@ const MembersTab = () => { }) } } catch (error) { - pushAxiosErrorMessage(error) + pushApiErrorMessage(error) } setSending(undefined) return @@ -203,7 +203,7 @@ const MembersTab = () => { }) }, [ - pushAxiosErrorMessage, + pushApiErrorMessage, messageBox, currentUser, t, @@ -269,7 +269,7 @@ const MembersTab = () => { ), }) } catch (error) { - pushAxiosErrorMessage(error) + pushApiErrorMessage(error) } setSending(undefined) return @@ -279,14 +279,7 @@ const MembersTab = () => { }, }) }, - [ - pushAxiosErrorMessage, - messageBox, - t, - permissions, - setPartialPageData, - team, - ] + [pushApiErrorMessage, messageBox, t, permissions, setPartialPageData, team] ) const removeGuestAccess = useCallback( (guestId: string, docId: string) => { @@ -321,7 +314,7 @@ const MembersTab = () => { updateGuestsMap([updatedGuest.id, updatedGuest]) } } catch (error) { - pushAxiosErrorMessage(error) + pushApiErrorMessage(error) } remove(guestId) remove(`${guestId}-${docId}`) @@ -339,7 +332,7 @@ const MembersTab = () => { remove, setGuestsMap, updateGuestsMap, - pushAxiosErrorMessage, + pushApiErrorMessage, has, ] ) diff --git a/src/cloud/lib/stores/apiTokens/store.ts b/src/cloud/lib/stores/apiTokens/store.ts index e441a4c74e..905213721b 100644 --- a/src/cloud/lib/stores/apiTokens/store.ts +++ b/src/cloud/lib/stores/apiTokens/store.ts @@ -22,7 +22,7 @@ type State = | { state: 'initialised'; tokens: SerializedApiToken[]; actions: Actions } export function useApiTokensStore(): State { - const { pushApiErrorMessage: pushAxiosErrorMessage } = useToast() + const { pushApiErrorMessage } = useToast() const [tokens, setTokens] = useState([]) const [initialised, setInitialised] = useState(false) @@ -33,7 +33,7 @@ export function useApiTokensStore(): State { setTokens(tokens) setInitialised(true) } catch (error) { - pushAxiosErrorMessage(error) + pushApiErrorMessage(error) } } getUserTokens() @@ -45,10 +45,10 @@ export function useApiTokensStore(): State { const { token } = await createToken(name, team) setTokens((tokens) => [token, ...tokens]) } catch (error) { - pushAxiosErrorMessage(error) + pushApiErrorMessage(error) } }, - [pushAxiosErrorMessage] + [pushApiErrorMessage] ) const updateApiToken = useCallback( @@ -63,10 +63,10 @@ export function useApiTokensStore(): State { return [...left, token, ...right] }) } catch (error) { - pushAxiosErrorMessage(error) + pushApiErrorMessage(error) } }, - [pushAxiosErrorMessage] + [pushApiErrorMessage] ) const deleteApiToken = useCallback( @@ -77,10 +77,10 @@ export function useApiTokensStore(): State { return tokens.filter((tok) => tok.id !== token.id) }) } catch (error) { - pushAxiosErrorMessage(error) + pushApiErrorMessage(error) } }, - [pushAxiosErrorMessage] + [pushApiErrorMessage] ) if (!initialised) { diff --git a/src/cloud/lib/stores/serviceConnections/store.ts b/src/cloud/lib/stores/serviceConnections/store.ts index e6fa1d8f13..2f1a4d755c 100644 --- a/src/cloud/lib/stores/serviceConnections/store.ts +++ b/src/cloud/lib/stores/serviceConnections/store.ts @@ -28,7 +28,7 @@ export type State = } export function useServiceConnectionsStore(): State { - const { pushApiErrorMessage: pushAxiosErrorMessage } = useToast() + const { pushApiErrorMessage } = useToast() const [connections, setConnections] = useState( [] ) @@ -42,7 +42,7 @@ export function useServiceConnectionsStore(): State { setConnections(connections) initialise.current = true } catch (err) { - pushAxiosErrorMessage(err) + pushApiErrorMessage(err) } finally { setIsLoadingConnections(false) } @@ -59,12 +59,12 @@ export function useServiceConnectionsStore(): State { return conns.filter((conn) => conn.id !== connection.id) }) } catch (err) { - pushAxiosErrorMessage(err) + pushApiErrorMessage(err) } finally { setIsLoadingConnections(false) } }, - [pushAxiosErrorMessage] + [pushApiErrorMessage] ) const addConnection = useCallback( diff --git a/src/cloud/pages/[teamId]/uploads.tsx b/src/cloud/pages/[teamId]/uploads.tsx index d421013aa0..89a22a5910 100644 --- a/src/cloud/pages/[teamId]/uploads.tsx +++ b/src/cloud/pages/[teamId]/uploads.tsx @@ -33,7 +33,7 @@ const UploadListPage = ({ const [sending, setSending] = useState(false) const { t } = useTranslation() const { messageBox } = useDialog() - const { pushApiErrorMessage: pushAxiosErrorMessage } = useToast() + const { pushApiErrorMessage } = useToast() const { subscription, permissions } = usePage() const { openSettingsTab } = useSettings() @@ -63,7 +63,7 @@ const UploadListPage = ({ }) }) .catch((error: any) => { - pushAxiosErrorMessage(error) + pushApiErrorMessage(error) }) .finally(() => setSending(false)) return @@ -74,7 +74,7 @@ const UploadListPage = ({ }, }) }, - [messageBox, setCurrentFiles, pushAxiosErrorMessage, sending, t] + [messageBox, setCurrentFiles, pushApiErrorMessage, sending, t] ) return (