From c4a614d654fb1b6b6210ff8b396260b9d7f42e4a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BAlia=20Jaeger=20Foresti?= <60678893+juliajforesti@users.noreply.github.com> Date: Wed, 1 Nov 2023 11:59:04 -0300 Subject: [PATCH] chore: normalize `Button` loading states (#30818) --- .../CreateDiscussion/CreateDiscussion.tsx | 2 +- .../Omnichannel/modals/TranscriptModal.tsx | 6 ++--- .../sidebar/header/CreateDirectMessage.tsx | 2 +- .../header/CreateTeam/CreateTeamModal.tsx | 4 +-- .../MatrixFederationManageServerModal.tsx | 19 +++----------- .../accessibility/AccessibilityPage.tsx | 7 +++--- .../account/profile/AccountProfileForm.tsx | 3 +++ .../account/profile/AccountProfilePage.tsx | 13 +++++++--- .../client/views/admin/cloud/PasteStep.tsx | 6 ++--- .../modals/RegisterWorkspaceTokenModal.tsx | 2 +- .../cloud/modals/RegisteredWorkspaceModal.tsx | 2 +- .../customEmoji/EditCustomEmojiWithData.tsx | 25 +++---------------- .../admin/customSounds/EditCustomSound.tsx | 24 ++---------------- .../CustomUserStatusFormWithData.tsx | 25 +++---------------- .../views/admin/import/ImportHistoryPage.tsx | 12 +++++++-- .../views/admin/import/NewImportPage.js | 19 +++----------- .../admin/oauthApps/EditOauthAppWithData.tsx | 25 +++---------------- .../client/views/admin/rooms/EditRoom.tsx | 2 +- .../AppDetailsPage/AppDetailsPage.tsx | 7 +++--- .../views/marketplace/AppInstallPage.js | 4 +-- .../departments/EditDepartment.tsx | 4 +-- .../chats/contextualBar/RoomEdit/RoomEdit.tsx | 11 ++++++-- .../contacts/contextualBar/ContactNewEdit.tsx | 12 +++++++-- .../omnichannel/webhooks/WebhooksPage.tsx | 2 +- .../OutlookEventsList/OutlookEventsList.tsx | 8 +++--- .../views/room/composer/ComposerReadOnly.tsx | 2 +- .../room/composer/messageBox/MessageBox.tsx | 2 +- .../ExportMessages/MailExportForm.tsx | 4 +-- .../Info/EditRoomInfo/EditRoomInfo.tsx | 8 +++--- .../NotificationPreferences.tsx | 4 +-- .../RoomMembers/AddUsers/AddUsers.tsx | 4 +-- .../InviteUsers/EditInviteLink.tsx | 4 +-- .../ForwardMessageModal.tsx | 2 +- .../room/webdav/AddWebdavAccountModal.tsx | 4 +-- .../views/room/webdav/SaveToWebdavModal.tsx | 4 +-- .../omnichannel/monitors/MonitorsTable.tsx | 2 +- .../omnichannel/priorities/PrioritiesPage.tsx | 6 ++--- .../priorities/PriorityEditForm.tsx | 6 ++--- apps/meteor/package.json | 2 +- ee/packages/ui-theming/package.json | 2 +- packages/fuselage-ui-kit/package.json | 2 +- packages/gazzodown/package.json | 2 +- packages/ui-client/package.json | 2 +- packages/ui-composer/package.json | 2 +- packages/ui-video-conf/package.json | 2 +- packages/uikit-playground/package.json | 2 +- .../src/EmailConfirmationForm.tsx | 2 +- .../web-ui-registration/src/LoginForm.tsx | 2 +- .../web-ui-registration/src/RegisterForm.tsx | 2 +- .../src/ResetPassword/ResetPasswordPage.tsx | 2 +- .../src/ResetPasswordForm.tsx | 2 +- yarn.lock | 24 +++++++++--------- 52 files changed, 139 insertions(+), 209 deletions(-) diff --git a/apps/meteor/client/components/CreateDiscussion/CreateDiscussion.tsx b/apps/meteor/client/components/CreateDiscussion/CreateDiscussion.tsx index 5a0ab9555939..95c4c7b2c437 100644 --- a/apps/meteor/client/components/CreateDiscussion/CreateDiscussion.tsx +++ b/apps/meteor/client/components/CreateDiscussion/CreateDiscussion.tsx @@ -224,7 +224,7 @@ const CreateDiscussion = ({ onClose, defaultParentRoom, parentMessageId, nameSug - diff --git a/apps/meteor/client/components/Omnichannel/modals/TranscriptModal.tsx b/apps/meteor/client/components/Omnichannel/modals/TranscriptModal.tsx index 2757b5d9a88b..0b3a94f5b16c 100644 --- a/apps/meteor/client/components/Omnichannel/modals/TranscriptModal.tsx +++ b/apps/meteor/client/components/Omnichannel/modals/TranscriptModal.tsx @@ -31,7 +31,7 @@ const TranscriptModal: FC = ({ setValue, setFocus, watch, - formState: { errors, isValid }, + formState: { errors, isValid, isSubmitting }, } = useForm({ defaultValues: { email: emailDefault || '', subject: t('Transcript_of_your_livechat_conversation') }, }); @@ -112,12 +112,12 @@ const TranscriptModal: FC = ({ )} {roomOpen && !transcriptRequest && ( - )} {!roomOpen && ( - )} diff --git a/apps/meteor/client/sidebar/header/CreateDirectMessage.tsx b/apps/meteor/client/sidebar/header/CreateDirectMessage.tsx index dd1ce944f423..853de76b665a 100644 --- a/apps/meteor/client/sidebar/header/CreateDirectMessage.tsx +++ b/apps/meteor/client/sidebar/header/CreateDirectMessage.tsx @@ -82,7 +82,7 @@ const CreateDirectMessage = ({ onClose }: { onClose: () => void }) => { - diff --git a/apps/meteor/client/sidebar/header/CreateTeam/CreateTeamModal.tsx b/apps/meteor/client/sidebar/header/CreateTeam/CreateTeamModal.tsx index e14ef6e77b37..af91766e918b 100644 --- a/apps/meteor/client/sidebar/header/CreateTeam/CreateTeamModal.tsx +++ b/apps/meteor/client/sidebar/header/CreateTeam/CreateTeamModal.tsx @@ -80,7 +80,7 @@ const CreateTeamModal = ({ onClose }: { onClose: () => void }): ReactElement => handleSubmit, setValue, watch, - formState: { isDirty, errors }, + formState: { isDirty, errors, isSubmitting }, } = useForm({ defaultValues: { isPrivate: true, @@ -304,7 +304,7 @@ const CreateTeamModal = ({ onClose }: { onClose: () => void }): ReactElement => - diff --git a/apps/meteor/client/sidebar/header/MatrixFederationSearch/MatrixFederationManageServerModal.tsx b/apps/meteor/client/sidebar/header/MatrixFederationSearch/MatrixFederationManageServerModal.tsx index 6ea69ce6c037..51021a91549a 100644 --- a/apps/meteor/client/sidebar/header/MatrixFederationSearch/MatrixFederationManageServerModal.tsx +++ b/apps/meteor/client/sidebar/header/MatrixFederationSearch/MatrixFederationManageServerModal.tsx @@ -1,16 +1,4 @@ -import { - Divider, - Modal, - ButtonGroup, - Button, - Field, - TextInput, - Throbber, - FieldLabel, - FieldRow, - FieldError, - FieldHint, -} from '@rocket.chat/fuselage'; +import { Divider, Modal, ButtonGroup, Button, Field, TextInput, FieldLabel, FieldRow, FieldError, FieldHint } from '@rocket.chat/fuselage'; import type { TranslationKey } from '@rocket.chat/ui-contexts'; import { useSetModal, useTranslation, useEndpoint, useToastMessageDispatch } from '@rocket.chat/ui-contexts'; import { useMutation, useQueryClient } from '@tanstack/react-query'; @@ -88,9 +76,8 @@ const MatrixFederationAddServerModal: VFC = }} mie={4} /> - {isError && errorKey && {t(errorKey)}} diff --git a/apps/meteor/client/views/account/accessibility/AccessibilityPage.tsx b/apps/meteor/client/views/account/accessibility/AccessibilityPage.tsx index c8179f08bef2..041215b0ebaa 100644 --- a/apps/meteor/client/views/account/accessibility/AccessibilityPage.tsx +++ b/apps/meteor/client/views/account/accessibility/AccessibilityPage.tsx @@ -46,6 +46,7 @@ const AccessibilityPage = () => { [t], ); + const pageFormId = useUniqueId(); const fontSizeId = useUniqueId(); const mentionsWithSymbolId = useUniqueId(); const clockModeId = useUniqueId(); @@ -53,7 +54,7 @@ const AccessibilityPage = () => { const hideRolesId = useUniqueId(); const { - formState: { isDirty, dirtyFields }, + formState: { isDirty, dirtyFields, isSubmitting }, handleSubmit, control, reset, @@ -85,7 +86,7 @@ const AccessibilityPage = () => { - + {t('Accessibility_activation')} @@ -216,7 +217,7 @@ const AccessibilityPage = () => { - diff --git a/apps/meteor/client/views/account/profile/AccountProfileForm.tsx b/apps/meteor/client/views/account/profile/AccountProfileForm.tsx index 65b3a0967d49..0de462cd5bd3 100644 --- a/apps/meteor/client/views/account/profile/AccountProfileForm.tsx +++ b/apps/meteor/client/views/account/profile/AccountProfileForm.tsx @@ -60,6 +60,7 @@ const AccountProfileForm = (props: AllHTMLAttributes): ReactEle control, watch, handleSubmit, + reset, formState: { errors }, } = useFormContext(); @@ -126,6 +127,8 @@ const AccountProfileForm = (props: AllHTMLAttributes): ReactEle dispatchToastMessage({ type: 'success', message: t('Profile_saved_successfully') }); } catch (error) { dispatchToastMessage({ type: 'error', message: error }); + } finally { + reset({ email, name, username, statusType, statusText, nickname, bio, customFields }); } }; diff --git a/apps/meteor/client/views/account/profile/AccountProfilePage.tsx b/apps/meteor/client/views/account/profile/AccountProfilePage.tsx index ba74c9a8f1ff..95d7c9d6eb01 100644 --- a/apps/meteor/client/views/account/profile/AccountProfilePage.tsx +++ b/apps/meteor/client/views/account/profile/AccountProfilePage.tsx @@ -43,7 +43,7 @@ const AccountProfilePage = (): ReactElement => { const { reset, - formState: { isDirty }, + formState: { isDirty, isSubmitting }, } = methods; const logoutOtherClients = useEndpoint('POST', '/v1/users.logoutOtherClients'); @@ -120,7 +120,7 @@ const AccountProfilePage = (): ReactElement => { - {allowDeleteOwnAccount && ( @@ -136,7 +136,14 @@ const AccountProfilePage = (): ReactElement => { - diff --git a/apps/meteor/client/views/admin/cloud/PasteStep.tsx b/apps/meteor/client/views/admin/cloud/PasteStep.tsx index 41d9bec37f4b..884d4a1e8d17 100644 --- a/apps/meteor/client/views/admin/cloud/PasteStep.tsx +++ b/apps/meteor/client/views/admin/cloud/PasteStep.tsx @@ -1,4 +1,4 @@ -import { Box, Button, Scrollable, Throbber, Modal } from '@rocket.chat/fuselage'; +import { Box, Button, Scrollable, Modal } from '@rocket.chat/fuselage'; import { useToastMessageDispatch, useEndpoint, useTranslation } from '@rocket.chat/ui-contexts'; import type { ChangeEvent, FC } from 'react'; import React, { useState } from 'react'; @@ -70,8 +70,8 @@ const PasteStep: FC = ({ onBackButtonClick, onFinish }) => { - diff --git a/apps/meteor/client/views/admin/cloud/modals/RegisterWorkspaceTokenModal.tsx b/apps/meteor/client/views/admin/cloud/modals/RegisterWorkspaceTokenModal.tsx index 89728457226b..b0290d614c92 100644 --- a/apps/meteor/client/views/admin/cloud/modals/RegisterWorkspaceTokenModal.tsx +++ b/apps/meteor/client/views/admin/cloud/modals/RegisterWorkspaceTokenModal.tsx @@ -89,7 +89,7 @@ const RegisterWorkspaceTokenModal = ({ onClose, onStatusChange, ...props }: Regi - diff --git a/apps/meteor/client/views/admin/cloud/modals/RegisteredWorkspaceModal.tsx b/apps/meteor/client/views/admin/cloud/modals/RegisteredWorkspaceModal.tsx index 050411075c74..9c5dd0159290 100644 --- a/apps/meteor/client/views/admin/cloud/modals/RegisteredWorkspaceModal.tsx +++ b/apps/meteor/client/views/admin/cloud/modals/RegisteredWorkspaceModal.tsx @@ -64,7 +64,7 @@ const RegisteredWorkspaceModal = ({ onClose, onStatusChange, ...props }: Registe - diff --git a/apps/meteor/client/views/admin/customEmoji/EditCustomEmojiWithData.tsx b/apps/meteor/client/views/admin/customEmoji/EditCustomEmojiWithData.tsx index 4fe1e324f800..d8eaf2b58d50 100644 --- a/apps/meteor/client/views/admin/customEmoji/EditCustomEmojiWithData.tsx +++ b/apps/meteor/client/views/admin/customEmoji/EditCustomEmojiWithData.tsx @@ -1,9 +1,10 @@ -import { Box, Button, ButtonGroup, Skeleton, Throbber, InputBox, Callout } from '@rocket.chat/fuselage'; +import { Callout } from '@rocket.chat/fuselage'; import { useEndpoint, useTranslation } from '@rocket.chat/ui-contexts'; import { useQuery } from '@tanstack/react-query'; import type { FC } from 'react'; import React, { useMemo } from 'react'; +import { FormSkeleton } from '../../../components/Skeleton'; import EditCustomEmoji from './EditCustomEmoji'; type EditCustomEmojiWithDataProps = { @@ -24,27 +25,7 @@ const EditCustomEmojiWithData: FC = ({ _id, onChan }); if (isLoading) { - return ( - - - - - - - - - - - - - - ); + return ; } if (error || !data || !data.emojis || data.emojis.update.length < 1) { diff --git a/apps/meteor/client/views/admin/customSounds/EditCustomSound.tsx b/apps/meteor/client/views/admin/customSounds/EditCustomSound.tsx index 6b85c0370a6a..f21bf86fc267 100644 --- a/apps/meteor/client/views/admin/customSounds/EditCustomSound.tsx +++ b/apps/meteor/client/views/admin/customSounds/EditCustomSound.tsx @@ -1,9 +1,9 @@ -import { Box, Button, ButtonGroup, Skeleton, Throbber, InputBox } from '@rocket.chat/fuselage'; import { useEndpoint, useToastMessageDispatch, useTranslation } from '@rocket.chat/ui-contexts'; import { useQuery } from '@tanstack/react-query'; import type { ReactElement } from 'react'; import React from 'react'; +import { FormSkeleton } from '../../../components/Skeleton'; import EditSound from './EditSound'; type EditCustomSoundProps = { @@ -36,27 +36,7 @@ function EditCustomSound({ _id, onChange, ...props }: EditCustomSoundProps): Rea ); if (isLoading) { - return ( - - - - - - - - - - - - - - ); + return ; } if (!data) { diff --git a/apps/meteor/client/views/admin/customUserStatus/CustomUserStatusFormWithData.tsx b/apps/meteor/client/views/admin/customUserStatus/CustomUserStatusFormWithData.tsx index b73774098f1b..d8d552a4341c 100644 --- a/apps/meteor/client/views/admin/customUserStatus/CustomUserStatusFormWithData.tsx +++ b/apps/meteor/client/views/admin/customUserStatus/CustomUserStatusFormWithData.tsx @@ -1,10 +1,11 @@ import type { IUserStatus } from '@rocket.chat/core-typings'; -import { Box, Button, ButtonGroup, Skeleton, Throbber, InputBox, Callout } from '@rocket.chat/fuselage'; +import { Box, Callout } from '@rocket.chat/fuselage'; import { useEndpoint, useTranslation } from '@rocket.chat/ui-contexts'; import { useQuery } from '@tanstack/react-query'; import type { ReactElement } from 'react'; import React, { useMemo } from 'react'; +import { FormSkeleton } from '../../../components/Skeleton'; import CustomUserStatusForm from './CustomUserStatusForm'; type CustomUserStatusFormWithDataProps = { @@ -34,27 +35,7 @@ const CustomUserStatusFormWithData = ({ _id, onReload, onClose }: CustomUserStat } if (isLoading) { - return ( - - - - - - - - - - - - - - ); + return ; } if (error || !data || data.count < 1) { diff --git a/apps/meteor/client/views/admin/import/ImportHistoryPage.tsx b/apps/meteor/client/views/admin/import/ImportHistoryPage.tsx index 8c4af4696ee5..daa3f3e392d8 100644 --- a/apps/meteor/client/views/admin/import/ImportHistoryPage.tsx +++ b/apps/meteor/client/views/admin/import/ImportHistoryPage.tsx @@ -101,12 +101,20 @@ function ImportHistoryPage() { {t('Import_New_File')} {hasAnySuccessfulImport && ( - )} {hasAnySuccessfulImport && ( - )} diff --git a/apps/meteor/client/views/admin/import/NewImportPage.js b/apps/meteor/client/views/admin/import/NewImportPage.js index 92d290c20fd2..eefc39b677d7 100644 --- a/apps/meteor/client/views/admin/import/NewImportPage.js +++ b/apps/meteor/client/views/admin/import/NewImportPage.js @@ -1,17 +1,4 @@ -import { - Box, - Button, - ButtonGroup, - Callout, - Chip, - Field, - Margins, - Select, - InputBox, - TextInput, - Throbber, - UrlInput, -} from '@rocket.chat/fuselage'; +import { Box, Button, ButtonGroup, Callout, Chip, Field, Margins, Select, InputBox, TextInput, UrlInput } from '@rocket.chat/fuselage'; import { useUniqueId, useSafely } from '@rocket.chat/fuselage-hooks'; import { useToastMessageDispatch, useRouter, useRouteParameter, useSetting, useEndpoint, useTranslation } from '@rocket.chat/ui-contexts'; import React, { useState, useMemo, useEffect } from 'react'; @@ -171,8 +158,8 @@ function NewImportPage() { {t('Back_to_imports')} {importer && ( - )} diff --git a/apps/meteor/client/views/admin/oauthApps/EditOauthAppWithData.tsx b/apps/meteor/client/views/admin/oauthApps/EditOauthAppWithData.tsx index a6bc9fc12acb..f87926429e67 100644 --- a/apps/meteor/client/views/admin/oauthApps/EditOauthAppWithData.tsx +++ b/apps/meteor/client/views/admin/oauthApps/EditOauthAppWithData.tsx @@ -1,9 +1,10 @@ -import { Box, Button, ButtonGroup, Skeleton, Throbber, InputBox } from '@rocket.chat/fuselage'; +import { Box } from '@rocket.chat/fuselage'; import { useEndpoint, useToastMessageDispatch, useTranslation } from '@rocket.chat/ui-contexts'; import { useQuery } from '@tanstack/react-query'; import type { ReactElement } from 'react'; import React, { useCallback } from 'react'; +import { FormSkeleton } from '../../../components/Skeleton'; import EditOauthApp from './EditOauthApp'; const EditOauthAppWithData = ({ _id, ...props }: { _id: string }): ReactElement => { @@ -29,27 +30,7 @@ const EditOauthAppWithData = ({ _id, ...props }: { _id: string }): ReactElement }, [refetch]); if (isLoading) { - return ( - - - - - - - - - - - - - - ); + return ; } if (error || !data || !_id) { diff --git a/apps/meteor/client/views/admin/rooms/EditRoom.tsx b/apps/meteor/client/views/admin/rooms/EditRoom.tsx index 8130f2e9ec8b..3ed6b14c69c4 100644 --- a/apps/meteor/client/views/admin/rooms/EditRoom.tsx +++ b/apps/meteor/client/views/admin/rooms/EditRoom.tsx @@ -293,7 +293,7 @@ const EditRoom = ({ room, onChange, onDelete }: EditRoomProps): ReactElement => - diff --git a/apps/meteor/client/views/marketplace/AppDetailsPage/AppDetailsPage.tsx b/apps/meteor/client/views/marketplace/AppDetailsPage/AppDetailsPage.tsx index 00d5d0ee6b37..86bbd6ec9c96 100644 --- a/apps/meteor/client/views/marketplace/AppDetailsPage/AppDetailsPage.tsx +++ b/apps/meteor/client/views/marketplace/AppDetailsPage/AppDetailsPage.tsx @@ -1,6 +1,6 @@ import type { ISetting } from '@rocket.chat/apps-engine/definition/settings'; import type { App } from '@rocket.chat/core-typings'; -import { Button, ButtonGroup, Box, Throbber } from '@rocket.chat/fuselage'; +import { Button, ButtonGroup, Box } from '@rocket.chat/fuselage'; import { useMutableCallback } from '@rocket.chat/fuselage-hooks'; import { useTranslation, useRouteParameter, useToastMessageDispatch, usePermission, useRouter } from '@rocket.chat/ui-contexts'; import type { ReactElement } from 'react'; @@ -76,9 +76,8 @@ const AppDetailsPage = ({ id }: { id: App['id'] }): ReactElement => { {installed && isAdminUser && ( - )} diff --git a/apps/meteor/client/views/marketplace/AppInstallPage.js b/apps/meteor/client/views/marketplace/AppInstallPage.js index aaa983d15cd9..774e2435c4e3 100644 --- a/apps/meteor/client/views/marketplace/AppInstallPage.js +++ b/apps/meteor/client/views/marketplace/AppInstallPage.js @@ -230,8 +230,8 @@ function AppInstallPage() { - diff --git a/apps/meteor/client/views/omnichannel/departments/EditDepartment.tsx b/apps/meteor/client/views/omnichannel/departments/EditDepartment.tsx index bb1d5b057437..1529cc9a7628 100644 --- a/apps/meteor/client/views/omnichannel/departments/EditDepartment.tsx +++ b/apps/meteor/client/views/omnichannel/departments/EditDepartment.tsx @@ -217,7 +217,7 @@ function EditDepartment({ data, id, title, allowedToForwardData }: EditDepartmen departmentsRoute.push({}); }); - const isFormValid = isValid && isDirty && !isSubmitting; + const isFormValid = isValid && isDirty; const formId = useUniqueId(); @@ -229,7 +229,7 @@ function EditDepartment({ data, id, title, allowedToForwardData }: EditDepartmen - diff --git a/apps/meteor/client/views/omnichannel/directory/chats/contextualBar/RoomEdit/RoomEdit.tsx b/apps/meteor/client/views/omnichannel/directory/chats/contextualBar/RoomEdit/RoomEdit.tsx index 89b7b4582fa5..2fc2c0dccc0f 100644 --- a/apps/meteor/client/views/omnichannel/directory/chats/contextualBar/RoomEdit/RoomEdit.tsx +++ b/apps/meteor/client/views/omnichannel/directory/chats/contextualBar/RoomEdit/RoomEdit.tsx @@ -64,7 +64,7 @@ function RoomEdit({ room, visitor, reload, reloadInfo, onClose }: RoomEditProps) const { register, control, - formState: { isDirty: isFormDirty, isValid: isFormValid }, + formState: { isDirty: isFormDirty, isValid: isFormValid, isSubmitting }, handleSubmit, } = useForm({ mode: 'onChange', @@ -151,7 +151,14 @@ function RoomEdit({ room, visitor, reload, reloadInfo, onClose }: RoomEditProps) {t('Cancel')} - diff --git a/apps/meteor/client/views/omnichannel/directory/contacts/contextualBar/ContactNewEdit.tsx b/apps/meteor/client/views/omnichannel/directory/contacts/contextualBar/ContactNewEdit.tsx index a41c155c4f9d..621110a5badf 100644 --- a/apps/meteor/client/views/omnichannel/directory/contacts/contextualBar/ContactNewEdit.tsx +++ b/apps/meteor/client/views/omnichannel/directory/contacts/contextualBar/ContactNewEdit.tsx @@ -83,7 +83,7 @@ const ContactNewEdit = ({ id, data, close }: ContactNewEditProps): ReactElement const { register, - formState: { errors, isValid, isDirty }, + formState: { errors, isValid, isDirty, isSubmitting }, control, setValue, handleSubmit, @@ -217,7 +217,15 @@ const ContactNewEdit = ({ id, data, close }: ContactNewEditProps): ReactElement - diff --git a/apps/meteor/client/views/omnichannel/webhooks/WebhooksPage.tsx b/apps/meteor/client/views/omnichannel/webhooks/WebhooksPage.tsx index 437c4a9a2afc..5da7b233d904 100644 --- a/apps/meteor/client/views/omnichannel/webhooks/WebhooksPage.tsx +++ b/apps/meteor/client/views/omnichannel/webhooks/WebhooksPage.tsx @@ -161,7 +161,7 @@ const WebhooksPage = ({ settings }: WebhooksPageProps) => { > {testWebhook.isLoading ? t('Sending') : t('Send_Test')} - diff --git a/apps/meteor/client/views/outlookCalendar/OutlookEventsList/OutlookEventsList.tsx b/apps/meteor/client/views/outlookCalendar/OutlookEventsList/OutlookEventsList.tsx index 13728fd9d1f6..6d547731e3c4 100644 --- a/apps/meteor/client/views/outlookCalendar/OutlookEventsList/OutlookEventsList.tsx +++ b/apps/meteor/client/views/outlookCalendar/OutlookEventsList/OutlookEventsList.tsx @@ -68,8 +68,8 @@ const OutlookEventsList = ({ onClose, changeRoute }: OutlookEventsListProps): Re - @@ -123,8 +123,8 @@ const OutlookEventsList = ({ onClose, changeRoute }: OutlookEventsListProps): Re {hasOutlookMethods && ( - )} diff --git a/apps/meteor/client/views/room/composer/ComposerReadOnly.tsx b/apps/meteor/client/views/room/composer/ComposerReadOnly.tsx index 682691c9a851..01156121c3e5 100644 --- a/apps/meteor/client/views/room/composer/ComposerReadOnly.tsx +++ b/apps/meteor/client/views/room/composer/ComposerReadOnly.tsx @@ -24,7 +24,7 @@ const ComposerReadOnly = (): ReactElement => { {t('room_is_read_only')} {!isSubscribed && ( - )} diff --git a/apps/meteor/client/views/room/composer/messageBox/MessageBox.tsx b/apps/meteor/client/views/room/composer/messageBox/MessageBox.tsx index da598c00be11..c92e124abb07 100644 --- a/apps/meteor/client/views/room/composer/messageBox/MessageBox.tsx +++ b/apps/meteor/client/views/room/composer/messageBox/MessageBox.tsx @@ -424,7 +424,7 @@ const MessageBox = ({ {!canSend && ( - )} diff --git a/apps/meteor/client/views/room/contextualBar/ExportMessages/MailExportForm.tsx b/apps/meteor/client/views/room/contextualBar/ExportMessages/MailExportForm.tsx index 281bc7ed83f0..6a48e4b679bc 100644 --- a/apps/meteor/client/views/room/contextualBar/ExportMessages/MailExportForm.tsx +++ b/apps/meteor/client/views/room/contextualBar/ExportMessages/MailExportForm.tsx @@ -44,7 +44,7 @@ const MailExportForm = ({ formId, rid, onCancel, exportOptions }: MailExportForm setValue, control, register, - formState: { errors, isDirty }, + formState: { errors, isDirty, isSubmitting }, handleSubmit, clearErrors, } = useFormContext(); @@ -209,7 +209,7 @@ const MailExportForm = ({ formId, rid, onCancel, exportOptions }: MailExportForm - diff --git a/apps/meteor/client/views/room/contextualBar/Info/EditRoomInfo/EditRoomInfo.tsx b/apps/meteor/client/views/room/contextualBar/Info/EditRoomInfo/EditRoomInfo.tsx index b2c552fd3d87..ac325ed64a80 100644 --- a/apps/meteor/client/views/room/contextualBar/Info/EditRoomInfo/EditRoomInfo.tsx +++ b/apps/meteor/client/views/room/contextualBar/Info/EditRoomInfo/EditRoomInfo.tsx @@ -61,7 +61,7 @@ const EditRoomInfo = ({ room, onClickClose, onClickBack }: EditRoomInfoProps) => reset, control, handleSubmit, - formState: { isDirty, dirtyFields, errors }, + formState: { isDirty, dirtyFields, errors, isSubmitting }, } = useForm({ mode: 'onBlur', defaultValues }); const sysMesOptions: SelectOption[] = useMemo( @@ -467,15 +467,15 @@ const EditRoomInfo = ({ room, onClickClose, onClickBack }: EditRoomInfoProps) => - - - diff --git a/apps/meteor/client/views/room/contextualBar/NotificationPreferences/NotificationPreferences.tsx b/apps/meteor/client/views/room/contextualBar/NotificationPreferences/NotificationPreferences.tsx index 1dbad165d473..5066825d8311 100644 --- a/apps/meteor/client/views/room/contextualBar/NotificationPreferences/NotificationPreferences.tsx +++ b/apps/meteor/client/views/room/contextualBar/NotificationPreferences/NotificationPreferences.tsx @@ -32,7 +32,7 @@ const NotificationPreferences = ({ }: NotificationPreferencesProps): ReactElement => { const t = useTranslation(); const { - formState: { isDirty }, + formState: { isDirty, isSubmitting }, } = useFormContext(); return ( @@ -48,7 +48,7 @@ const NotificationPreferences = ({ {handleClose && } - diff --git a/apps/meteor/client/views/room/contextualBar/RoomMembers/AddUsers/AddUsers.tsx b/apps/meteor/client/views/room/contextualBar/RoomMembers/AddUsers/AddUsers.tsx index 09eaca08cbc9..12a84dacd19e 100644 --- a/apps/meteor/client/views/room/contextualBar/RoomMembers/AddUsers/AddUsers.tsx +++ b/apps/meteor/client/views/room/contextualBar/RoomMembers/AddUsers/AddUsers.tsx @@ -39,7 +39,7 @@ const AddUsers = ({ rid, onClickBack, reload }: AddUsersProps): ReactElement => handleSubmit, control, getValues, - formState: { isDirty }, + formState: { isDirty, isSubmitting }, } = useForm({ defaultValues: { users: [] } }); const handleSave = useMutableCallback(async ({ users }) => { @@ -98,7 +98,7 @@ const AddUsers = ({ rid, onClickBack, reload }: AddUsersProps): ReactElement => {t('Add_users')} ) : ( - )} diff --git a/apps/meteor/client/views/room/contextualBar/RoomMembers/InviteUsers/EditInviteLink.tsx b/apps/meteor/client/views/room/contextualBar/RoomMembers/InviteUsers/EditInviteLink.tsx index 3d84d681469a..59a06fdb4251 100644 --- a/apps/meteor/client/views/room/contextualBar/RoomMembers/InviteUsers/EditInviteLink.tsx +++ b/apps/meteor/client/views/room/contextualBar/RoomMembers/InviteUsers/EditInviteLink.tsx @@ -14,7 +14,7 @@ const EditInviteLink = ({ daysAndMaxUses, onClickNewLink }: EditInviteLinkProps) const t = useTranslation(); const { handleSubmit, - formState: { isDirty }, + formState: { isDirty, isSubmitting }, control, } = useForm({ defaultValues: { days: daysAndMaxUses.days, maxUses: daysAndMaxUses.maxUses } }); @@ -68,7 +68,7 @@ const EditInviteLink = ({ daysAndMaxUses, onClickNewLink }: EditInviteLinkProps) - diff --git a/apps/meteor/client/views/room/modals/ForwardMessageModal/ForwardMessageModal.tsx b/apps/meteor/client/views/room/modals/ForwardMessageModal/ForwardMessageModal.tsx index c70436982b2e..f24eeb8563be 100644 --- a/apps/meteor/client/views/room/modals/ForwardMessageModal/ForwardMessageModal.tsx +++ b/apps/meteor/client/views/room/modals/ForwardMessageModal/ForwardMessageModal.tsx @@ -106,7 +106,7 @@ const ForwardMessageModal = ({ onClose, permalink, message }: ForwardMessageProp - diff --git a/apps/meteor/client/views/room/webdav/AddWebdavAccountModal.tsx b/apps/meteor/client/views/room/webdav/AddWebdavAccountModal.tsx index 4709e5296997..7e003f79a208 100644 --- a/apps/meteor/client/views/room/webdav/AddWebdavAccountModal.tsx +++ b/apps/meteor/client/views/room/webdav/AddWebdavAccountModal.tsx @@ -80,8 +80,8 @@ const AddWebdavAccountModal = ({ onClose, onConfirm }: AddWebdavAccountModalProp - diff --git a/apps/meteor/client/views/room/webdav/SaveToWebdavModal.tsx b/apps/meteor/client/views/room/webdav/SaveToWebdavModal.tsx index 5cc2ccdd48b4..24f7cc27cc59 100644 --- a/apps/meteor/client/views/room/webdav/SaveToWebdavModal.tsx +++ b/apps/meteor/client/views/room/webdav/SaveToWebdavModal.tsx @@ -114,8 +114,8 @@ const SaveToWebdavModal = ({ onClose, data }: SaveToWebdavModalProps): ReactElem - diff --git a/apps/meteor/ee/client/omnichannel/monitors/MonitorsTable.tsx b/apps/meteor/ee/client/omnichannel/monitors/MonitorsTable.tsx index b14e293b5d79..21eba51275be 100644 --- a/apps/meteor/ee/client/omnichannel/monitors/MonitorsTable.tsx +++ b/apps/meteor/ee/client/omnichannel/monitors/MonitorsTable.tsx @@ -130,7 +130,7 @@ const MonitorsTable = () => { {t('Username')} void} /> - diff --git a/apps/meteor/ee/client/omnichannel/priorities/PrioritiesPage.tsx b/apps/meteor/ee/client/omnichannel/priorities/PrioritiesPage.tsx index e67af3bfe62e..77ff92b561c9 100644 --- a/apps/meteor/ee/client/omnichannel/priorities/PrioritiesPage.tsx +++ b/apps/meteor/ee/client/omnichannel/priorities/PrioritiesPage.tsx @@ -1,4 +1,4 @@ -import { Button, ButtonGroup, Throbber } from '@rocket.chat/fuselage'; +import { Button, ButtonGroup } from '@rocket.chat/fuselage'; import { useMutableCallback } from '@rocket.chat/fuselage-hooks'; import { useEndpoint, useRoute, useSetModal, useToastMessageDispatch, useTranslation } from '@rocket.chat/ui-contexts'; import { useQueryClient } from '@tanstack/react-query'; @@ -77,8 +77,8 @@ export const PrioritiesPage = ({ priorityId, context }: PrioritiesPageProps): Re - diff --git a/apps/meteor/ee/client/omnichannel/priorities/PriorityEditForm.tsx b/apps/meteor/ee/client/omnichannel/priorities/PriorityEditForm.tsx index 042a6a7d2498..c39916369f5d 100644 --- a/apps/meteor/ee/client/omnichannel/priorities/PriorityEditForm.tsx +++ b/apps/meteor/ee/client/omnichannel/priorities/PriorityEditForm.tsx @@ -1,5 +1,5 @@ import type { ILivechatPriority, Serialized } from '@rocket.chat/core-typings'; -import { Field, FieldError, Button, Box, ButtonGroup, Throbber } from '@rocket.chat/fuselage'; +import { Field, FieldError, Button, Box, ButtonGroup } from '@rocket.chat/fuselage'; import { useMutableCallback } from '@rocket.chat/fuselage-hooks'; import type { TranslationKey } from '@rocket.chat/ui-contexts'; import { useToastMessageDispatch, useTranslation } from '@rocket.chat/ui-contexts'; @@ -101,8 +101,8 @@ const PriorityEditForm = ({ data, onSave, onCancel }: PriorityEditFormProps): Re {t('Cancel')} - diff --git a/apps/meteor/package.json b/apps/meteor/package.json index c480b9a8d1c3..ba575f5a7b3f 100644 --- a/apps/meteor/package.json +++ b/apps/meteor/package.json @@ -236,7 +236,7 @@ "@rocket.chat/favicon": "workspace:^", "@rocket.chat/forked-matrix-appservice-bridge": "^4.0.2", "@rocket.chat/forked-matrix-bot-sdk": "^0.6.0-beta.3", - "@rocket.chat/fuselage": "^0.36.0", + "@rocket.chat/fuselage": "^0.37.1", "@rocket.chat/fuselage-hooks": "^0.32.1", "@rocket.chat/fuselage-polyfills": "next", "@rocket.chat/fuselage-toastbar": "next", diff --git a/ee/packages/ui-theming/package.json b/ee/packages/ui-theming/package.json index adf0f958eee0..c29617a2eddf 100644 --- a/ee/packages/ui-theming/package.json +++ b/ee/packages/ui-theming/package.json @@ -4,7 +4,7 @@ "private": true, "devDependencies": { "@rocket.chat/css-in-js": "next", - "@rocket.chat/fuselage": "^0.36.0", + "@rocket.chat/fuselage": "^0.37.1", "@rocket.chat/fuselage-hooks": "^0.32.1", "@rocket.chat/icons": "^0.32.0", "@rocket.chat/ui-contexts": "workspace:~", diff --git a/packages/fuselage-ui-kit/package.json b/packages/fuselage-ui-kit/package.json index a460f76c64c4..8ea0d1fa555e 100644 --- a/packages/fuselage-ui-kit/package.json +++ b/packages/fuselage-ui-kit/package.json @@ -61,7 +61,7 @@ "@babel/preset-typescript": "~7.22.5", "@rocket.chat/apps-engine": "1.41.0-alpha.290", "@rocket.chat/eslint-config": "workspace:^", - "@rocket.chat/fuselage": "^0.36.0", + "@rocket.chat/fuselage": "^0.37.1", "@rocket.chat/fuselage-hooks": "^0.32.1", "@rocket.chat/fuselage-polyfills": "next", "@rocket.chat/icons": "^0.32.0", diff --git a/packages/gazzodown/package.json b/packages/gazzodown/package.json index d525c696c685..f179ce4e18b4 100644 --- a/packages/gazzodown/package.json +++ b/packages/gazzodown/package.json @@ -6,7 +6,7 @@ "@babel/core": "~7.22.9", "@rocket.chat/core-typings": "workspace:^", "@rocket.chat/css-in-js": "next", - "@rocket.chat/fuselage": "^0.36.0", + "@rocket.chat/fuselage": "^0.37.1", "@rocket.chat/fuselage-tokens": "^0.32.0", "@rocket.chat/message-parser": "next", "@rocket.chat/styled": "next", diff --git a/packages/ui-client/package.json b/packages/ui-client/package.json index 80e318c216ab..d5ff3b14c0a8 100644 --- a/packages/ui-client/package.json +++ b/packages/ui-client/package.json @@ -5,7 +5,7 @@ "devDependencies": { "@babel/core": "~7.22.9", "@rocket.chat/css-in-js": "next", - "@rocket.chat/fuselage": "^0.36.0", + "@rocket.chat/fuselage": "^0.37.1", "@rocket.chat/fuselage-hooks": "^0.32.1", "@rocket.chat/icons": "^0.32.0", "@rocket.chat/mock-providers": "workspace:^", diff --git a/packages/ui-composer/package.json b/packages/ui-composer/package.json index 123958b2936a..09e1270a3005 100644 --- a/packages/ui-composer/package.json +++ b/packages/ui-composer/package.json @@ -5,7 +5,7 @@ "devDependencies": { "@babel/core": "~7.22.9", "@rocket.chat/eslint-config": "workspace:^", - "@rocket.chat/fuselage": "^0.36.0", + "@rocket.chat/fuselage": "^0.37.1", "@rocket.chat/icons": "^0.32.0", "@storybook/addon-actions": "~6.5.16", "@storybook/addon-docs": "~6.5.16", diff --git a/packages/ui-video-conf/package.json b/packages/ui-video-conf/package.json index 7bdf2adec6ba..fa2167ff4d5f 100644 --- a/packages/ui-video-conf/package.json +++ b/packages/ui-video-conf/package.json @@ -6,7 +6,7 @@ "@babel/core": "~7.22.9", "@rocket.chat/css-in-js": "next", "@rocket.chat/eslint-config": "workspace:^", - "@rocket.chat/fuselage": "^0.36.0", + "@rocket.chat/fuselage": "^0.37.1", "@rocket.chat/fuselage-hooks": "^0.32.1", "@rocket.chat/icons": "^0.32.0", "@rocket.chat/styled": "next", diff --git a/packages/uikit-playground/package.json b/packages/uikit-playground/package.json index fdd2f3da9f41..b3d485729e0a 100644 --- a/packages/uikit-playground/package.json +++ b/packages/uikit-playground/package.json @@ -15,7 +15,7 @@ "@codemirror/tooltip": "^0.19.16", "@lezer/highlight": "^1.1.6", "@rocket.chat/css-in-js": "next", - "@rocket.chat/fuselage": "^0.36.0", + "@rocket.chat/fuselage": "^0.37.1", "@rocket.chat/fuselage-hooks": "^0.32.1", "@rocket.chat/fuselage-polyfills": "next", "@rocket.chat/fuselage-tokens": "^0.32.0", diff --git a/packages/web-ui-registration/src/EmailConfirmationForm.tsx b/packages/web-ui-registration/src/EmailConfirmationForm.tsx index 285181b6aa35..680d90897632 100644 --- a/packages/web-ui-registration/src/EmailConfirmationForm.tsx +++ b/packages/web-ui-registration/src/EmailConfirmationForm.tsx @@ -63,7 +63,7 @@ export const EmailConfirmationForm = ({ email, onBackToLogin }: { email?: string - diff --git a/packages/web-ui-registration/src/LoginForm.tsx b/packages/web-ui-registration/src/LoginForm.tsx index a6876614f4df..35141c4646c7 100644 --- a/packages/web-ui-registration/src/LoginForm.tsx +++ b/packages/web-ui-registration/src/LoginForm.tsx @@ -197,7 +197,7 @@ export const LoginForm = ({ setLoginRoute }: { setLoginRoute: DispatchLoginRoute - diff --git a/packages/web-ui-registration/src/RegisterForm.tsx b/packages/web-ui-registration/src/RegisterForm.tsx index df327f05ed61..0eda77879be7 100644 --- a/packages/web-ui-registration/src/RegisterForm.tsx +++ b/packages/web-ui-registration/src/RegisterForm.tsx @@ -290,7 +290,7 @@ export const RegisterForm = ({ setLoginRoute }: { setLoginRoute: DispatchLoginRo - diff --git a/packages/web-ui-registration/src/ResetPassword/ResetPasswordPage.tsx b/packages/web-ui-registration/src/ResetPassword/ResetPasswordPage.tsx index 19b0a13983bb..15290a823d4a 100644 --- a/packages/web-ui-registration/src/ResetPassword/ResetPasswordPage.tsx +++ b/packages/web-ui-registration/src/ResetPassword/ResetPasswordPage.tsx @@ -147,7 +147,7 @@ const ResetPasswordPage = (): ReactElement => { - diff --git a/packages/web-ui-registration/src/ResetPasswordForm.tsx b/packages/web-ui-registration/src/ResetPasswordForm.tsx index d53b5d1fd793..f395a093d4ec 100644 --- a/packages/web-ui-registration/src/ResetPasswordForm.tsx +++ b/packages/web-ui-registration/src/ResetPasswordForm.tsx @@ -84,7 +84,7 @@ export const ResetPasswordForm = ({ setLoginRoute }: { setLoginRoute: DispatchLo - diff --git a/yarn.lock b/yarn.lock index 46dbea7e1c21..f9c85dad267e 100644 --- a/yarn.lock +++ b/yarn.lock @@ -8299,7 +8299,7 @@ __metadata: "@babel/preset-typescript": ~7.22.5 "@rocket.chat/apps-engine": 1.41.0-alpha.290 "@rocket.chat/eslint-config": "workspace:^" - "@rocket.chat/fuselage": ^0.36.0 + "@rocket.chat/fuselage": ^0.37.1 "@rocket.chat/fuselage-hooks": ^0.32.1 "@rocket.chat/fuselage-polyfills": next "@rocket.chat/gazzodown": "workspace:^" @@ -8351,9 +8351,9 @@ __metadata: languageName: unknown linkType: soft -"@rocket.chat/fuselage@npm:^0.36.0": - version: 0.36.0 - resolution: "@rocket.chat/fuselage@npm:0.36.0" +"@rocket.chat/fuselage@npm:^0.37.1": + version: 0.37.1 + resolution: "@rocket.chat/fuselage@npm:0.37.1" dependencies: "@rocket.chat/css-in-js": ^0.31.25 "@rocket.chat/css-supports": ^0.31.25 @@ -8371,7 +8371,7 @@ __metadata: react: ^17.0.2 react-dom: ^17.0.2 react-virtuoso: 1.2.4 - checksum: 8554f90e1641e415a1fa4a30f72d05366cb986c1b2ab35e7143217bc017184567a04d947cc6c17be33320b1d1c922fbd1083c1c5f5ac880b15ae5beef01fdb6a + checksum: f51faa64c93d6563ef8851b1c640796c54a474f0e6fda7408d49bd7091252680a405f4e1a65cadefdce9910c118ff486e949301aa42fe8858c8eb2228870d885 languageName: node linkType: hard @@ -8382,7 +8382,7 @@ __metadata: "@babel/core": ~7.22.9 "@rocket.chat/core-typings": "workspace:^" "@rocket.chat/css-in-js": next - "@rocket.chat/fuselage": ^0.36.0 + "@rocket.chat/fuselage": ^0.37.1 "@rocket.chat/fuselage-tokens": ^0.32.0 "@rocket.chat/message-parser": next "@rocket.chat/styled": next @@ -8720,7 +8720,7 @@ __metadata: "@rocket.chat/favicon": "workspace:^" "@rocket.chat/forked-matrix-appservice-bridge": ^4.0.2 "@rocket.chat/forked-matrix-bot-sdk": ^0.6.0-beta.3 - "@rocket.chat/fuselage": ^0.36.0 + "@rocket.chat/fuselage": ^0.37.1 "@rocket.chat/fuselage-hooks": ^0.32.1 "@rocket.chat/fuselage-polyfills": next "@rocket.chat/fuselage-toastbar": next @@ -9573,7 +9573,7 @@ __metadata: dependencies: "@babel/core": ~7.22.9 "@rocket.chat/css-in-js": next - "@rocket.chat/fuselage": ^0.36.0 + "@rocket.chat/fuselage": ^0.37.1 "@rocket.chat/fuselage-hooks": ^0.32.1 "@rocket.chat/icons": ^0.32.0 "@rocket.chat/mock-providers": "workspace:^" @@ -9624,7 +9624,7 @@ __metadata: dependencies: "@babel/core": ~7.22.9 "@rocket.chat/eslint-config": "workspace:^" - "@rocket.chat/fuselage": ^0.36.0 + "@rocket.chat/fuselage": ^0.37.1 "@rocket.chat/icons": ^0.32.0 "@storybook/addon-actions": ~6.5.16 "@storybook/addon-docs": ~6.5.16 @@ -9695,7 +9695,7 @@ __metadata: resolution: "@rocket.chat/ui-theming@workspace:ee/packages/ui-theming" dependencies: "@rocket.chat/css-in-js": next - "@rocket.chat/fuselage": ^0.36.0 + "@rocket.chat/fuselage": ^0.37.1 "@rocket.chat/fuselage-hooks": ^0.32.1 "@rocket.chat/icons": ^0.32.0 "@rocket.chat/ui-contexts": "workspace:~" @@ -9738,7 +9738,7 @@ __metadata: "@rocket.chat/css-in-js": next "@rocket.chat/emitter": next "@rocket.chat/eslint-config": "workspace:^" - "@rocket.chat/fuselage": ^0.36.0 + "@rocket.chat/fuselage": ^0.37.1 "@rocket.chat/fuselage-hooks": ^0.32.1 "@rocket.chat/icons": ^0.32.0 "@rocket.chat/styled": next @@ -9781,7 +9781,7 @@ __metadata: "@codemirror/tooltip": ^0.19.16 "@lezer/highlight": ^1.1.6 "@rocket.chat/css-in-js": next - "@rocket.chat/fuselage": ^0.36.0 + "@rocket.chat/fuselage": ^0.37.1 "@rocket.chat/fuselage-hooks": ^0.32.1 "@rocket.chat/fuselage-polyfills": next "@rocket.chat/fuselage-tokens": ^0.32.0