diff --git a/apps/meteor/.storybook/main.ts b/apps/meteor/.storybook/main.ts index 4e358f72d3b52..f186b65e864fe 100644 --- a/apps/meteor/.storybook/main.ts +++ b/apps/meteor/.storybook/main.ts @@ -28,6 +28,7 @@ export default { 'react$': require.resolve('../../../node_modules/react'), // 'react/jsx-runtime': require.resolve('../../../node_modules/react/jsx-runtime'), '@tanstack/react-query': require.resolve('../../../node_modules/@tanstack/react-query'), + '@rocket.chat/fuselage$': require.resolve('../../../node_modules/@rocket.chat/fuselage'), 'swiper/swiper.css$': 'swiper/css', 'swiper/modules/navigation/navigation.min.css$': 'swiper/css/navigation', 'swiper/modules/keyboard/keyboard.min.css$': 'swiper/css/keyboard', diff --git a/apps/meteor/client/apps/gameCenter/GameCenterContainer.tsx b/apps/meteor/client/apps/gameCenter/GameCenterContainer.tsx index 6ff1f333c50b4..a275e98107a92 100644 --- a/apps/meteor/client/apps/gameCenter/GameCenterContainer.tsx +++ b/apps/meteor/client/apps/gameCenter/GameCenterContainer.tsx @@ -1,8 +1,4 @@ import { Avatar } from '@rocket.chat/fuselage'; -import type { ReactElement } from 'react'; -import { useTranslation } from 'react-i18next'; - -import type { IGame } from './GameCenter'; import { ContextualbarTitle, ContextualbarHeader, @@ -10,7 +6,11 @@ import { ContextualbarContent, ContextualbarClose, ContextualbarDialog, -} from '../../components/Contextualbar'; +} from '@rocket.chat/ui-client'; +import type { ReactElement } from 'react'; +import { useTranslation } from 'react-i18next'; + +import type { IGame } from './GameCenter'; interface IGameCenterContainerProps { handleClose: () => void; diff --git a/apps/meteor/client/apps/gameCenter/GameCenterList.tsx b/apps/meteor/client/apps/gameCenter/GameCenterList.tsx index 1e9e1bb2b5c37..539a4f20b4a92 100644 --- a/apps/meteor/client/apps/gameCenter/GameCenterList.tsx +++ b/apps/meteor/client/apps/gameCenter/GameCenterList.tsx @@ -1,11 +1,4 @@ import { Avatar, Icon, Table, TableBody, TableCell, TableHead, TableRow } from '@rocket.chat/fuselage'; -import { useSetModal } from '@rocket.chat/ui-contexts'; -import type { ReactElement } from 'react'; -import { memo, useCallback } from 'react'; -import { useTranslation } from 'react-i18next'; - -import type { IGame } from './GameCenter'; -import GameCenterInvitePlayersModal from './GameCenterInvitePlayersModal'; import { ContextualbarHeader, ContextualbarTitle, @@ -13,7 +6,14 @@ import { ContextualbarContent, ContextualbarDialog, ContextualbarSkeleton, -} from '../../components/Contextualbar'; +} from '@rocket.chat/ui-client'; +import { useSetModal } from '@rocket.chat/ui-contexts'; +import type { ReactElement } from 'react'; +import { memo, useCallback } from 'react'; +import { useTranslation } from 'react-i18next'; + +import type { IGame } from './GameCenter'; +import GameCenterInvitePlayersModal from './GameCenterInvitePlayersModal'; interface IGameCenterListProps { handleClose: () => void; diff --git a/apps/meteor/client/components/UserInfo/UserInfo.stories.tsx b/apps/meteor/client/components/UserInfo/UserInfo.stories.tsx index cf8aa0baad335..815b11a00089b 100644 --- a/apps/meteor/client/components/UserInfo/UserInfo.stories.tsx +++ b/apps/meteor/client/components/UserInfo/UserInfo.stories.tsx @@ -1,6 +1,6 @@ +import { ContextualbarDialog } from '@rocket.chat/ui-client'; import type { Meta, StoryFn } from '@storybook/react'; -import { ContextualbarDialog } from '../Contextualbar'; import * as Status from '../UserStatus'; import UserInfo from './UserInfo'; import { UserCardRole } from '../UserCard'; diff --git a/apps/meteor/client/components/UserInfo/UserInfo.tsx b/apps/meteor/client/components/UserInfo/UserInfo.tsx index 0cc6a86e36245..b85010d89957e 100644 --- a/apps/meteor/client/components/UserInfo/UserInfo.tsx +++ b/apps/meteor/client/components/UserInfo/UserInfo.tsx @@ -1,6 +1,6 @@ import type { IUser, Serialized } from '@rocket.chat/core-typings'; import { Box, Margins, Tag } from '@rocket.chat/fuselage'; -import { useUserDisplayName } from '@rocket.chat/ui-client'; +import { useUserDisplayName, ContextualbarScrollableContent } from '@rocket.chat/ui-client'; import type { TranslationKey } from '@rocket.chat/ui-contexts'; import type { ReactElement, ReactNode } from 'react'; import { memo } from 'react'; @@ -8,7 +8,6 @@ import { useTranslation } from 'react-i18next'; import { useTimeAgo } from '../../hooks/useTimeAgo'; import { useUserCustomFields } from '../../hooks/useUserCustomFields'; -import { ContextualbarScrollableContent } from '../Contextualbar'; import { InfoPanel, InfoPanelActionGroup, diff --git a/apps/meteor/client/views/admin/ABAC/AdminABACRoomAttributesForm.tsx b/apps/meteor/client/views/admin/ABAC/AdminABACRoomAttributesForm.tsx index fa30bf880a5d9..58fea8aca408f 100644 --- a/apps/meteor/client/views/admin/ABAC/AdminABACRoomAttributesForm.tsx +++ b/apps/meteor/client/views/admin/ABAC/AdminABACRoomAttributesForm.tsx @@ -10,12 +10,11 @@ import { IconButton, TextInput, } from '@rocket.chat/fuselage'; +import { ContextualbarScrollableContent } from '@rocket.chat/ui-client'; import { useCallback, useId, useMemo } from 'react'; import { useFieldArray, useFormContext } from 'react-hook-form'; import { useTranslation } from 'react-i18next'; -import { ContextualbarScrollableContent } from '../../../components/Contextualbar'; - export type AdminABACRoomAttributesFormFormData = { name: string; attributeValues: { value: string }[]; diff --git a/apps/meteor/client/views/admin/customEmoji/AddCustomEmoji.tsx b/apps/meteor/client/views/admin/customEmoji/AddCustomEmoji.tsx index b4d2ec04caef4..0b6fc7a2b10f0 100644 --- a/apps/meteor/client/views/admin/customEmoji/AddCustomEmoji.tsx +++ b/apps/meteor/client/views/admin/customEmoji/AddCustomEmoji.tsx @@ -1,10 +1,10 @@ import { Box, Button, ButtonGroup, Margins, TextInput, Field, FieldLabel, FieldRow, FieldError, IconButton } from '@rocket.chat/fuselage'; +import { ContextualbarScrollableContent, ContextualbarFooter } from '@rocket.chat/ui-client'; import { useToastMessageDispatch } from '@rocket.chat/ui-contexts'; import type { ReactElement, ChangeEvent } from 'react'; import { useCallback, useState } from 'react'; import { useTranslation } from 'react-i18next'; -import { ContextualbarScrollableContent, ContextualbarFooter } from '../../../components/Contextualbar'; import { useEndpointUploadMutation } from '../../../hooks/useEndpointUploadMutation'; import { useSingleFileInput } from '../../../hooks/useSingleFileInput'; diff --git a/apps/meteor/client/views/admin/customEmoji/CustomEmojiRoute.tsx b/apps/meteor/client/views/admin/customEmoji/CustomEmojiRoute.tsx index 1d6844215a2d6..2896565672e32 100644 --- a/apps/meteor/client/views/admin/customEmoji/CustomEmojiRoute.tsx +++ b/apps/meteor/client/views/admin/customEmoji/CustomEmojiRoute.tsx @@ -1,4 +1,5 @@ import { Button } from '@rocket.chat/fuselage'; +import { ContextualbarHeader, ContextualbarClose, ContextualbarDialog, ContextualbarTitle } from '@rocket.chat/ui-client'; import { useRoute, useRouteParameter, usePermission } from '@rocket.chat/ui-contexts'; import type { ReactElement } from 'react'; import { useCallback, useRef } from 'react'; @@ -7,7 +8,6 @@ import { useTranslation } from 'react-i18next'; import AddCustomEmoji from './AddCustomEmoji'; import CustomEmoji from './CustomEmoji'; import EditCustomEmojiWithData from './EditCustomEmojiWithData'; -import { ContextualbarHeader, ContextualbarClose, ContextualbarDialog, ContextualbarTitle } from '../../../components/Contextualbar'; import { Page, PageHeader, PageContent } from '../../../components/Page'; import NotAuthorizedPage from '../../notAuthorized/NotAuthorizedPage'; diff --git a/apps/meteor/client/views/admin/customEmoji/EditCustomEmoji.tsx b/apps/meteor/client/views/admin/customEmoji/EditCustomEmoji.tsx index dfc1705868087..95a52d142623a 100644 --- a/apps/meteor/client/views/admin/customEmoji/EditCustomEmoji.tsx +++ b/apps/meteor/client/views/admin/customEmoji/EditCustomEmoji.tsx @@ -11,13 +11,12 @@ import { FieldError, IconButton, } from '@rocket.chat/fuselage'; -import { GenericModal } from '@rocket.chat/ui-client'; +import { GenericModal, ContextualbarScrollableContent, ContextualbarFooter } from '@rocket.chat/ui-client'; import { useSetModal, useAbsoluteUrl, useToastMessageDispatch } from '@rocket.chat/ui-contexts'; import type { ChangeEvent } from 'react'; import { useCallback, useState, useMemo, useEffect } from 'react'; import { useTranslation } from 'react-i18next'; -import { ContextualbarScrollableContent, ContextualbarFooter } from '../../../components/Contextualbar'; import { useEndpointMutation } from '../../../hooks/useEndpointMutation'; import { useEndpointUploadMutation } from '../../../hooks/useEndpointUploadMutation'; import { useSingleFileInput } from '../../../hooks/useSingleFileInput'; diff --git a/apps/meteor/client/views/admin/customSounds/AddCustomSound.tsx b/apps/meteor/client/views/admin/customSounds/AddCustomSound.tsx index 71d1495c1f703..3bc46c8742f1d 100644 --- a/apps/meteor/client/views/admin/customSounds/AddCustomSound.tsx +++ b/apps/meteor/client/views/admin/customSounds/AddCustomSound.tsx @@ -1,11 +1,11 @@ import { Field, FieldLabel, FieldRow, TextInput, Box, Margins, Button, ButtonGroup, IconButton } from '@rocket.chat/fuselage'; +import { ContextualbarScrollableContent, ContextualbarFooter } from '@rocket.chat/ui-client'; import { useToastMessageDispatch, useMethod } from '@rocket.chat/ui-contexts'; import type { ReactElement, FormEvent } from 'react'; import { useState, useCallback } from 'react'; import { useTranslation } from 'react-i18next'; import { validate, createSoundData } from './lib'; -import { ContextualbarScrollableContent, ContextualbarFooter } from '../../../components/Contextualbar'; import { useSingleFileInput } from '../../../hooks/useSingleFileInput'; type AddCustomSoundProps = { diff --git a/apps/meteor/client/views/admin/customSounds/CustomSoundsPage.tsx b/apps/meteor/client/views/admin/customSounds/CustomSoundsPage.tsx index d59d28f57231b..637679914740a 100644 --- a/apps/meteor/client/views/admin/customSounds/CustomSoundsPage.tsx +++ b/apps/meteor/client/views/admin/customSounds/CustomSoundsPage.tsx @@ -1,4 +1,5 @@ import { Button } from '@rocket.chat/fuselage'; +import { ContextualbarTitle, ContextualbarClose, ContextualbarHeader, ContextualbarDialog } from '@rocket.chat/ui-client'; import { useRoute, useRouteParameter } from '@rocket.chat/ui-contexts'; import { useCallback, useRef } from 'react'; import { useTranslation } from 'react-i18next'; @@ -6,7 +7,6 @@ import { useTranslation } from 'react-i18next'; import AddCustomSound from './AddCustomSound'; import CustomSoundsTable from './CustomSoundsTable'; import EditCustomSound from './EditCustomSound'; -import { ContextualbarTitle, ContextualbarClose, ContextualbarHeader, ContextualbarDialog } from '../../../components/Contextualbar'; import { Page, PageHeader, PageContent } from '../../../components/Page'; const CustomSoundsPage = () => { diff --git a/apps/meteor/client/views/admin/customSounds/EditSound.tsx b/apps/meteor/client/views/admin/customSounds/EditSound.tsx index c722b891dc136..9f72df02ca7bd 100644 --- a/apps/meteor/client/views/admin/customSounds/EditSound.tsx +++ b/apps/meteor/client/views/admin/customSounds/EditSound.tsx @@ -1,12 +1,11 @@ import { Box, Button, ButtonGroup, Margins, TextInput, Field, FieldLabel, FieldRow, IconButton } from '@rocket.chat/fuselage'; -import { GenericModal } from '@rocket.chat/ui-client'; +import { GenericModal, ContextualbarScrollableContent, ContextualbarFooter } from '@rocket.chat/ui-client'; import { useSetModal, useToastMessageDispatch, useMethod } from '@rocket.chat/ui-contexts'; import type { ReactElement, SyntheticEvent } from 'react'; import { useCallback, useState, useMemo, useEffect } from 'react'; import { useTranslation } from 'react-i18next'; import { validate, createSoundData } from './lib'; -import { ContextualbarScrollableContent, ContextualbarFooter } from '../../../components/Contextualbar'; import { useSingleFileInput } from '../../../hooks/useSingleFileInput'; type EditSoundProps = { diff --git a/apps/meteor/client/views/admin/customUserStatus/CustomUserStatusForm.tsx b/apps/meteor/client/views/admin/customUserStatus/CustomUserStatusForm.tsx index 34303070c2413..322a2a0fe78ed 100644 --- a/apps/meteor/client/views/admin/customUserStatus/CustomUserStatusForm.tsx +++ b/apps/meteor/client/views/admin/customUserStatus/CustomUserStatusForm.tsx @@ -1,14 +1,12 @@ import type { IUserStatus } from '@rocket.chat/core-typings'; import type { SelectOption } from '@rocket.chat/fuselage'; import { FieldGroup, Button, ButtonGroup, TextInput, Field, FieldLabel, FieldRow, FieldError, Select, Box } from '@rocket.chat/fuselage'; -import { GenericModal } from '@rocket.chat/ui-client'; +import { GenericModal, ContextualbarScrollableContent, ContextualbarFooter } from '@rocket.chat/ui-client'; import { useSetModal, useRoute, useToastMessageDispatch, useTranslation, useEndpoint } from '@rocket.chat/ui-contexts'; import type { ReactElement } from 'react'; import { useId, useCallback } from 'react'; import { useForm, Controller } from 'react-hook-form'; -import { ContextualbarScrollableContent, ContextualbarFooter } from '../../../components/Contextualbar'; - type CustomUserStatusFormFormData = { name: string; statusType: string; diff --git a/apps/meteor/client/views/admin/customUserStatus/CustomUserStatusRoute.tsx b/apps/meteor/client/views/admin/customUserStatus/CustomUserStatusRoute.tsx index ec1fa54e396c4..8fe585138f335 100644 --- a/apps/meteor/client/views/admin/customUserStatus/CustomUserStatusRoute.tsx +++ b/apps/meteor/client/views/admin/customUserStatus/CustomUserStatusRoute.tsx @@ -1,4 +1,5 @@ import { Button, ButtonGroup } from '@rocket.chat/fuselage'; +import { ContextualbarHeader, ContextualbarClose, ContextualbarTitle, ContextualbarDialog } from '@rocket.chat/ui-client'; import { useRoute, useRouteParameter, usePermission, useTranslation, useSetting } from '@rocket.chat/ui-contexts'; import type { ReactElement } from 'react'; import { useCallback, useRef, useEffect } from 'react'; @@ -7,7 +8,6 @@ import CustomUserActiveConnections from './CustomUserActiveConnections'; import CustomUserStatusFormWithData from './CustomUserStatusFormWithData'; import CustomUserStatusService from './CustomUserStatusService'; import CustomUserStatusTable from './CustomUserStatusTable'; -import { ContextualbarHeader, ContextualbarClose, ContextualbarTitle, ContextualbarDialog } from '../../../components/Contextualbar'; import { Page, PageHeader, PageContent } from '../../../components/Page'; import { useIsEnterprise } from '../../../hooks/useIsEnterprise'; import NotAuthorizedPage from '../../notAuthorized/NotAuthorizedPage'; diff --git a/apps/meteor/client/views/admin/customUserStatus/CustomUserStatusService.tsx b/apps/meteor/client/views/admin/customUserStatus/CustomUserStatusService.tsx index aedfd964250a3..e048233f99fe9 100644 --- a/apps/meteor/client/views/admin/customUserStatus/CustomUserStatusService.tsx +++ b/apps/meteor/client/views/admin/customUserStatus/CustomUserStatusService.tsx @@ -11,11 +11,11 @@ import { StatesSubtitle, ToggleSwitch, } from '@rocket.chat/fuselage'; +import { ContextualbarContent, ContextualbarFooter } from '@rocket.chat/ui-client'; import { useEndpoint, useSetting } from '@rocket.chat/ui-contexts'; import { useMutation } from '@tanstack/react-query'; import { Trans, useTranslation } from 'react-i18next'; -import { ContextualbarContent, ContextualbarFooter } from '../../../components/Contextualbar'; import { useIsEnterprise } from '../../../hooks/useIsEnterprise'; import { links } from '../../../lib/links'; import { useActiveConnections } from '../../hooks/useActiveConnections'; diff --git a/apps/meteor/client/views/admin/deviceManagement/DeviceManagementAdminPage.tsx b/apps/meteor/client/views/admin/deviceManagement/DeviceManagementAdminPage.tsx index c6dbe9176e07d..08b1d9a3f1010 100644 --- a/apps/meteor/client/views/admin/deviceManagement/DeviceManagementAdminPage.tsx +++ b/apps/meteor/client/views/admin/deviceManagement/DeviceManagementAdminPage.tsx @@ -1,9 +1,9 @@ +import { ContextualbarDialog } from '@rocket.chat/ui-client'; import { useRouteParameter, useRouter } from '@rocket.chat/ui-contexts'; import { useTranslation } from 'react-i18next'; import DeviceManagementAdminTable from './DeviceManagementAdminTable'; import DeviceManagementInfo from './DeviceManagementInfo'; -import { ContextualbarDialog } from '../../../components/Contextualbar'; import { Page, PageHeader, PageContent } from '../../../components/Page'; const DeviceManagementAdminPage = () => { diff --git a/apps/meteor/client/views/admin/deviceManagement/DeviceManagementInfo/DeviceManagementInfo.tsx b/apps/meteor/client/views/admin/deviceManagement/DeviceManagementInfo/DeviceManagementInfo.tsx index ffed8290ab354..132f39ee9d64d 100644 --- a/apps/meteor/client/views/admin/deviceManagement/DeviceManagementInfo/DeviceManagementInfo.tsx +++ b/apps/meteor/client/views/admin/deviceManagement/DeviceManagementInfo/DeviceManagementInfo.tsx @@ -1,18 +1,18 @@ import type { DeviceManagementPopulatedSession } from '@rocket.chat/core-typings'; import { Box, Button, ButtonGroup, StatusBullet } from '@rocket.chat/fuselage'; import { UserAvatar } from '@rocket.chat/ui-avatar'; -import { useRoute, useUserPresence } from '@rocket.chat/ui-contexts'; -import type { ReactElement } from 'react'; -import { useCallback } from 'react'; -import { useTranslation } from 'react-i18next'; - import { ContextualbarHeader, ContextualbarClose, ContextualbarScrollableContent, ContextualbarFooter, ContextualbarTitle, -} from '../../../../components/Contextualbar'; +} from '@rocket.chat/ui-client'; +import { useRoute, useUserPresence } from '@rocket.chat/ui-contexts'; +import type { ReactElement } from 'react'; +import { useCallback } from 'react'; +import { useTranslation } from 'react-i18next'; + import { InfoPanel, InfoPanelField, InfoPanelLabel, InfoPanelText } from '../../../../components/InfoPanel'; import { useDeviceLogout } from '../../../../hooks/useDeviceLogout'; import { useFormatDateAndTime } from '../../../../hooks/useFormatDateAndTime'; diff --git a/apps/meteor/client/views/admin/deviceManagement/DeviceManagementInfo/DeviceManagementInfoWithData.tsx b/apps/meteor/client/views/admin/deviceManagement/DeviceManagementInfo/DeviceManagementInfoWithData.tsx index 639afdad59fae..c1a33d69fae10 100644 --- a/apps/meteor/client/views/admin/deviceManagement/DeviceManagementInfo/DeviceManagementInfoWithData.tsx +++ b/apps/meteor/client/views/admin/deviceManagement/DeviceManagementInfo/DeviceManagementInfoWithData.tsx @@ -1,17 +1,17 @@ import type { Serialized, DeviceManagementPopulatedSession } from '@rocket.chat/core-typings'; import { Box, States, StatesIcon, StatesTitle, StatesSubtitle } from '@rocket.chat/fuselage'; -import { useEndpoint } from '@rocket.chat/ui-contexts'; -import { useQuery } from '@tanstack/react-query'; -import { useTranslation } from 'react-i18next'; - -import DeviceManagementInfo from './DeviceManagementInfo'; import { ContextualbarHeader, ContextualbarClose, ContextualbarContent, ContextualbarTitle, ContextualbarSkeletonBody, -} from '../../../../components/Contextualbar'; +} from '@rocket.chat/ui-client'; +import { useEndpoint } from '@rocket.chat/ui-contexts'; +import { useQuery } from '@tanstack/react-query'; +import { useTranslation } from 'react-i18next'; + +import DeviceManagementInfo from './DeviceManagementInfo'; import { deviceManagementQueryKeys } from '../../../../lib/queryKeys'; const convertSessionFromAPI = ({ diff --git a/apps/meteor/client/views/admin/moderation/ModConsoleReportDetails.tsx b/apps/meteor/client/views/admin/moderation/ModConsoleReportDetails.tsx index f5a9ef43feae3..490cff666bf53 100644 --- a/apps/meteor/client/views/admin/moderation/ModConsoleReportDetails.tsx +++ b/apps/meteor/client/views/admin/moderation/ModConsoleReportDetails.tsx @@ -1,12 +1,12 @@ import type { IUser } from '@rocket.chat/core-typings'; import { Tabs, TabsItem, ContextualbarHeader, ContextualbarTitle } from '@rocket.chat/fuselage'; import { useEffectEvent } from '@rocket.chat/fuselage-hooks'; +import { ContextualbarClose, ContextualbarDialog } from '@rocket.chat/ui-client'; import { useTranslation, useRouter, useRouteParameter } from '@rocket.chat/ui-contexts'; import { useState } from 'react'; import UserMessages from './UserMessages'; import UserReportInfo from './UserReports/UserReportInfo'; -import { ContextualbarClose, ContextualbarDialog } from '../../../components/Contextualbar'; type ModConsoleReportDetailsProps = { userId: IUser['_id']; diff --git a/apps/meteor/client/views/admin/moderation/UserMessages.tsx b/apps/meteor/client/views/admin/moderation/UserMessages.tsx index 4c1f1bd10fe0e..b0b9d9b50edf0 100644 --- a/apps/meteor/client/views/admin/moderation/UserMessages.tsx +++ b/apps/meteor/client/views/admin/moderation/UserMessages.tsx @@ -1,5 +1,6 @@ import { Box, Callout, Message, StatesAction, StatesActions, StatesIcon, StatesTitle } from '@rocket.chat/fuselage'; import { useEffectEvent } from '@rocket.chat/fuselage-hooks'; +import { ContextualbarFooter } from '@rocket.chat/ui-client'; import { useEndpoint } from '@rocket.chat/ui-contexts'; import { useQuery } from '@tanstack/react-query'; import { Fragment } from 'react'; @@ -7,7 +8,6 @@ import { useTranslation } from 'react-i18next'; import MessageContextFooter from './MessageContextFooter'; import ContextMessage from './helpers/ContextMessage'; -import { ContextualbarFooter } from '../../../components/Contextualbar'; import GenericNoResults from '../../../components/GenericNoResults'; // TODO: We should use Contextualbar components here diff --git a/apps/meteor/client/views/admin/moderation/UserReports/UserReportInfo.tsx b/apps/meteor/client/views/admin/moderation/UserReports/UserReportInfo.tsx index 661f374cc6357..0525e16a52bef 100644 --- a/apps/meteor/client/views/admin/moderation/UserReports/UserReportInfo.tsx +++ b/apps/meteor/client/views/admin/moderation/UserReports/UserReportInfo.tsx @@ -10,13 +10,13 @@ import { FieldLabel, FieldRow, } from '@rocket.chat/fuselage'; +import { ContextualbarScrollableContent, ContextualbarFooter } from '@rocket.chat/ui-client'; import { useEndpoint } from '@rocket.chat/ui-contexts'; import { useQuery } from '@tanstack/react-query'; import { useMemo } from 'react'; import { useTranslation } from 'react-i18next'; import UserContextFooter from './UserContextFooter'; -import { ContextualbarScrollableContent, ContextualbarFooter } from '../../../../components/Contextualbar'; import GenericNoResults from '../../../../components/GenericNoResults'; import { FormSkeleton } from '../../../../components/Skeleton'; import { UserCardRole } from '../../../../components/UserCard'; diff --git a/apps/meteor/client/views/admin/oauthApps/EditOauthApp.tsx b/apps/meteor/client/views/admin/oauthApps/EditOauthApp.tsx index 1dfa57b4179c2..bf9cb89d8de25 100644 --- a/apps/meteor/client/views/admin/oauthApps/EditOauthApp.tsx +++ b/apps/meteor/client/views/admin/oauthApps/EditOauthApp.tsx @@ -13,15 +13,13 @@ import { ToggleSwitch, FieldGroup, } from '@rocket.chat/fuselage'; -import { GenericModal } from '@rocket.chat/ui-client'; +import { GenericModal, ContextualbarScrollableContent } from '@rocket.chat/ui-client'; import { useSetModal, useToastMessageDispatch, useRoute, useAbsoluteUrl, useTranslation, useEndpoint } from '@rocket.chat/ui-contexts'; import type { ReactElement, ComponentProps } from 'react'; import { useCallback, useId, useMemo } from 'react'; import type { SubmitHandler } from 'react-hook-form'; import { useForm, Controller } from 'react-hook-form'; -import { ContextualbarScrollableContent } from '../../../components/Contextualbar'; - type EditOAuthAddAppPayload = { name: string; active: boolean; diff --git a/apps/meteor/client/views/admin/oauthApps/OAuthAddApp.tsx b/apps/meteor/client/views/admin/oauthApps/OAuthAddApp.tsx index cdd6c0db8e7b9..c1a4ceb2aa2e8 100644 --- a/apps/meteor/client/views/admin/oauthApps/OAuthAddApp.tsx +++ b/apps/meteor/client/views/admin/oauthApps/OAuthAddApp.tsx @@ -11,6 +11,7 @@ import { ToggleSwitch, FieldGroup, } from '@rocket.chat/fuselage'; +import { ContextualbarScrollableContent } from '@rocket.chat/ui-client'; import { useToastMessageDispatch, useRoute, useEndpoint } from '@rocket.chat/ui-contexts'; import type { ReactElement } from 'react'; import { useCallback, useId } from 'react'; @@ -18,8 +19,6 @@ import type { SubmitHandler } from 'react-hook-form'; import { useForm, Controller } from 'react-hook-form'; import { useTranslation } from 'react-i18next'; -import { ContextualbarScrollableContent } from '../../../components/Contextualbar'; - type OAuthAddAppPayload = { name: string; active: boolean; diff --git a/apps/meteor/client/views/admin/permissions/EditRolePage.tsx b/apps/meteor/client/views/admin/permissions/EditRolePage.tsx index 4c4e9fb8f506f..aeb06597a5419 100644 --- a/apps/meteor/client/views/admin/permissions/EditRolePage.tsx +++ b/apps/meteor/client/views/admin/permissions/EditRolePage.tsx @@ -1,14 +1,13 @@ import type { IRole } from '@rocket.chat/core-typings'; import { Box, ButtonGroup, Button, Margins } from '@rocket.chat/fuselage'; import { useEffectEvent } from '@rocket.chat/fuselage-hooks'; -import { GenericModal } from '@rocket.chat/ui-client'; +import { GenericModal, ContextualbarFooter, ContextualbarScrollableContent } from '@rocket.chat/ui-client'; import { useSetModal, useToastMessageDispatch, useRoute, useEndpoint } from '@rocket.chat/ui-contexts'; import type { ReactElement } from 'react'; import { FormProvider, useForm } from 'react-hook-form'; import { useTranslation } from 'react-i18next'; import RoleForm from './RoleForm'; -import { ContextualbarFooter, ContextualbarScrollableContent } from '../../../components/Contextualbar'; export type EditRolePageFormData = { roleId: string; diff --git a/apps/meteor/client/views/admin/permissions/PermissionsContextBar.tsx b/apps/meteor/client/views/admin/permissions/PermissionsContextBar.tsx index 64b9e7bc92890..9f5d84596b7ce 100644 --- a/apps/meteor/client/views/admin/permissions/PermissionsContextBar.tsx +++ b/apps/meteor/client/views/admin/permissions/PermissionsContextBar.tsx @@ -1,11 +1,11 @@ import { useEffectEvent } from '@rocket.chat/fuselage-hooks'; +import { ContextualbarHeader, ContextualbarTitle, ContextualbarClose, ContextualbarDialog } from '@rocket.chat/ui-client'; import { useRouteParameter, useRoute, useTranslation, useSetModal } from '@rocket.chat/ui-contexts'; import type { ReactElement } from 'react'; import { useEffect } from 'react'; import CustomRoleUpsellModal from './CustomRoleUpsellModal'; import EditRolePageWithData from './EditRolePageWithData'; -import { ContextualbarHeader, ContextualbarTitle, ContextualbarClose, ContextualbarDialog } from '../../../components/Contextualbar'; import { useHasLicenseModule } from '../../../hooks/useHasLicenseModule'; const PermissionsContextBar = (): ReactElement | null => { diff --git a/apps/meteor/client/views/admin/rooms/EditRoom.tsx b/apps/meteor/client/views/admin/rooms/EditRoom.tsx index 2f590e135d770..7b5de5c711c92 100644 --- a/apps/meteor/client/views/admin/rooms/EditRoom.tsx +++ b/apps/meteor/client/views/admin/rooms/EditRoom.tsx @@ -14,13 +14,13 @@ import { FieldError, } from '@rocket.chat/fuselage'; import { useEffectEvent } from '@rocket.chat/fuselage-hooks'; +import { ContextualbarScrollableContent, ContextualbarFooter } from '@rocket.chat/ui-client'; import { useEndpoint, useToastMessageDispatch } from '@rocket.chat/ui-contexts'; import { useId } from 'react'; import { useForm, Controller } from 'react-hook-form'; import { useTranslation } from 'react-i18next'; import { useEditAdminRoomPermissions } from './useEditAdminRoomPermissions'; -import { ContextualbarScrollableContent, ContextualbarFooter } from '../../../components/Contextualbar'; import RoomAvatarEditor from '../../../components/avatar/RoomAvatarEditor'; import { getDirtyFields } from '../../../lib/getDirtyFields'; import { roomCoordinator } from '../../../lib/rooms/roomCoordinator'; diff --git a/apps/meteor/client/views/admin/rooms/EditRoomWithData.tsx b/apps/meteor/client/views/admin/rooms/EditRoomWithData.tsx index 910f4def4dccd..897d01d6a8b3d 100644 --- a/apps/meteor/client/views/admin/rooms/EditRoomWithData.tsx +++ b/apps/meteor/client/views/admin/rooms/EditRoomWithData.tsx @@ -1,10 +1,10 @@ import type { IRoom } from '@rocket.chat/core-typings'; +import { ContextualbarHeader, ContextualbarTitle, ContextualbarClose, ContextualbarSkeletonBody } from '@rocket.chat/ui-client'; import { useEndpoint } from '@rocket.chat/ui-contexts'; import { useQuery } from '@tanstack/react-query'; import { useTranslation } from 'react-i18next'; import EditRoom from './EditRoom'; -import { ContextualbarHeader, ContextualbarTitle, ContextualbarClose, ContextualbarSkeletonBody } from '../../../components/Contextualbar'; type EditRoomWithDataProps = { rid?: IRoom['_id']; onReload: () => void; onClose: () => void }; diff --git a/apps/meteor/client/views/admin/rooms/RoomsPage.tsx b/apps/meteor/client/views/admin/rooms/RoomsPage.tsx index 9082b6c4be878..3eb1380e1892c 100644 --- a/apps/meteor/client/views/admin/rooms/RoomsPage.tsx +++ b/apps/meteor/client/views/admin/rooms/RoomsPage.tsx @@ -1,4 +1,5 @@ import { useEffectEvent } from '@rocket.chat/fuselage-hooks'; +import { ContextualbarDialog } from '@rocket.chat/ui-client'; import { useRouteParameter, useRouter } from '@rocket.chat/ui-contexts'; import type { ReactElement } from 'react'; import { useRef } from 'react'; @@ -6,7 +7,6 @@ import { useTranslation } from 'react-i18next'; import EditRoomWithData from './EditRoomWithData'; import RoomsTable from './RoomsTable'; -import { ContextualbarDialog } from '../../../components/Contextualbar'; import { Page, PageHeader, PageContent } from '../../../components/Page'; const RoomsPage = (): ReactElement => { diff --git a/apps/meteor/client/views/admin/users/AdminInviteUsers.tsx b/apps/meteor/client/views/admin/users/AdminInviteUsers.tsx index 43df439b0e3bd..7477dca1bd8c1 100644 --- a/apps/meteor/client/views/admin/users/AdminInviteUsers.tsx +++ b/apps/meteor/client/views/admin/users/AdminInviteUsers.tsx @@ -9,6 +9,7 @@ import { StatesTitle, TextAreaInput, } from '@rocket.chat/fuselage'; +import { ContextualbarScrollableContent, ContextualbarFooter, ContextualbarContent } from '@rocket.chat/ui-client'; import { useTranslation, useRoute } from '@rocket.chat/ui-contexts'; import type { ChangeEvent } from 'react'; import { useCallback, useState } from 'react'; @@ -16,7 +17,6 @@ import { useCallback, useState } from 'react'; import { useSendInvitationEmailMutation } from './hooks/useSendInvitationEmailMutation'; import { useSmtpQuery } from './hooks/useSmtpQuery'; import { validateEmail } from '../../../../lib/emailValidator'; -import { ContextualbarScrollableContent, ContextualbarFooter, ContextualbarContent } from '../../../components/Contextualbar'; import { FormSkeleton } from '../../../components/Skeleton'; // TODO: Replace using RHF diff --git a/apps/meteor/client/views/admin/users/AdminUserCreated.tsx b/apps/meteor/client/views/admin/users/AdminUserCreated.tsx index f6cd067e8325d..bff02ba87b69b 100644 --- a/apps/meteor/client/views/admin/users/AdminUserCreated.tsx +++ b/apps/meteor/client/views/admin/users/AdminUserCreated.tsx @@ -1,9 +1,8 @@ import { Button, ButtonGroup } from '@rocket.chat/fuselage'; +import { ContextualbarEmptyContent, ContextualbarFooter } from '@rocket.chat/ui-client'; import { useRouter } from '@rocket.chat/ui-contexts'; import { useTranslation } from 'react-i18next'; -import { ContextualbarEmptyContent, ContextualbarFooter } from '../../../components/Contextualbar'; - const AdminUserCreated = ({ uid }: { uid: string }) => { const { t } = useTranslation(); const router = useRouter(); diff --git a/apps/meteor/client/views/admin/users/AdminUserForm.tsx b/apps/meteor/client/views/admin/users/AdminUserForm.tsx index c8d706432e77f..1f092d79d1bb7 100644 --- a/apps/meteor/client/views/admin/users/AdminUserForm.tsx +++ b/apps/meteor/client/views/admin/users/AdminUserForm.tsx @@ -19,7 +19,7 @@ import { import type { SelectOption } from '@rocket.chat/fuselage'; import { useEffectEvent } from '@rocket.chat/fuselage-hooks'; import type { UserCreateParamsPOST } from '@rocket.chat/rest-typings'; -import { CustomFieldsForm } from '@rocket.chat/ui-client'; +import { CustomFieldsForm, ContextualbarScrollableContent, ContextualbarFooter } from '@rocket.chat/ui-client'; import { useAccountsCustomFields, useSetting, @@ -40,7 +40,6 @@ import { useSmtpQuery } from './hooks/useSmtpQuery'; import { useVoipExtensionPermission } from './useVoipExtensionPermission'; import { validateEmail } from '../../../../lib/emailValidator'; import { parseCSV } from '../../../../lib/utils/parseCSV'; -import { ContextualbarScrollableContent, ContextualbarFooter } from '../../../components/Contextualbar'; import UserAvatarEditor from '../../../components/avatar/UserAvatarEditor'; import { useEndpointMutation } from '../../../hooks/useEndpointMutation'; import { useUpdateAvatar } from '../../../hooks/useUpdateAvatar'; diff --git a/apps/meteor/client/views/admin/users/AdminUserInfoWithData.tsx b/apps/meteor/client/views/admin/users/AdminUserInfoWithData.tsx index 0ae6099a1c4ba..8179d68150d0b 100644 --- a/apps/meteor/client/views/admin/users/AdminUserInfoWithData.tsx +++ b/apps/meteor/client/views/admin/users/AdminUserInfoWithData.tsx @@ -1,6 +1,7 @@ import type { IUser } from '@rocket.chat/core-typings'; import { Callout } from '@rocket.chat/fuselage'; import { useEffectEvent } from '@rocket.chat/fuselage-hooks'; +import { ContextualbarContent } from '@rocket.chat/ui-client'; import { useSetting, useRolesDescription, useTranslation, useEndpoint } from '@rocket.chat/ui-contexts'; import { useQuery } from '@tanstack/react-query'; import type { ReactElement } from 'react'; @@ -9,7 +10,6 @@ import { useMemo } from 'react'; import AdminUserInfoActions from './AdminUserInfoActions'; import type { AdminUsersTab } from './AdminUsersPage'; import { getUserEmailAddress } from '../../../../lib/getUserEmailAddress'; -import { ContextualbarContent } from '../../../components/Contextualbar'; import { FormSkeleton } from '../../../components/Skeleton'; import { UserCardRole } from '../../../components/UserCard'; import { UserInfo } from '../../../components/UserInfo'; diff --git a/apps/meteor/client/views/admin/users/AdminUserUpgrade.tsx b/apps/meteor/client/views/admin/users/AdminUserUpgrade.tsx index 40cc879b5a246..cf423011ebcd9 100644 --- a/apps/meteor/client/views/admin/users/AdminUserUpgrade.tsx +++ b/apps/meteor/client/views/admin/users/AdminUserUpgrade.tsx @@ -1,8 +1,8 @@ import { Button, ButtonGroup } from '@rocket.chat/fuselage'; +import { ContextualbarScrollableContent, ContextualbarFooter, ContextualbarEmptyContent } from '@rocket.chat/ui-client'; import { useRouter } from '@rocket.chat/ui-contexts'; import { useTranslation } from 'react-i18next'; -import { ContextualbarScrollableContent, ContextualbarFooter, ContextualbarEmptyContent } from '../../../components/Contextualbar'; import { useExternalLink } from '../../../hooks/useExternalLink'; import { useCheckoutUrl } from '../subscription/hooks/useCheckoutUrl'; diff --git a/apps/meteor/client/views/admin/users/AdminUsersPage.tsx b/apps/meteor/client/views/admin/users/AdminUsersPage.tsx index 46ed046fc5e1e..4081f41879e9e 100644 --- a/apps/meteor/client/views/admin/users/AdminUsersPage.tsx +++ b/apps/meteor/client/views/admin/users/AdminUsersPage.tsx @@ -2,7 +2,7 @@ import type { LicenseInfo } from '@rocket.chat/core-typings'; import { Callout, ContextualbarIcon, Skeleton, Tabs, TabsItem } from '@rocket.chat/fuselage'; import { useDebouncedValue, useEffectEvent } from '@rocket.chat/fuselage-hooks'; import type { OptionProp } from '@rocket.chat/ui-client'; -import { ExternalLink } from '@rocket.chat/ui-client'; +import { ExternalLink, ContextualbarHeader, ContextualbarTitle, ContextualbarClose, ContextualbarDialog } from '@rocket.chat/ui-client'; import { useRouteParameter, useTranslation, useRouter, useEndpoint } from '@rocket.chat/ui-contexts'; import { useQuery } from '@tanstack/react-query'; import type { ReactElement } from 'react'; @@ -20,7 +20,6 @@ import UsersTable from './UsersTable'; import useFilteredUsers from './hooks/useFilteredUsers'; import usePendingUsersCount from './hooks/usePendingUsersCount'; import { useSeatsCap } from './useSeatsCap'; -import { ContextualbarHeader, ContextualbarTitle, ContextualbarClose, ContextualbarDialog } from '../../../components/Contextualbar'; import { usePagination } from '../../../components/GenericTable/hooks/usePagination'; import { useSort } from '../../../components/GenericTable/hooks/useSort'; import { Page, PageHeader, PageContent } from '../../../components/Page'; diff --git a/apps/meteor/client/views/marketplace/AppDetailsPage/tabs/AppLogs/Filters/AppLogsFilterContextualBar.stories.tsx b/apps/meteor/client/views/marketplace/AppDetailsPage/tabs/AppLogs/Filters/AppLogsFilterContextualBar.stories.tsx index be9ef6fee70f5..29e6cefc2be25 100644 --- a/apps/meteor/client/views/marketplace/AppDetailsPage/tabs/AppLogs/Filters/AppLogsFilterContextualBar.stories.tsx +++ b/apps/meteor/client/views/marketplace/AppDetailsPage/tabs/AppLogs/Filters/AppLogsFilterContextualBar.stories.tsx @@ -1,10 +1,10 @@ import { mockAppRoot } from '@rocket.chat/mock-providers'; +import { Contextualbar } from '@rocket.chat/ui-client'; import { action } from '@storybook/addon-actions'; import type { Meta } from '@storybook/react'; import { FormProvider, useForm } from 'react-hook-form'; import { AppLogsFilterContextualBar } from './AppLogsFilterContextualBar'; -import { Contextualbar } from '../../../../../../components/Contextualbar'; export default { component: AppLogsFilterContextualBar, diff --git a/apps/meteor/client/views/marketplace/AppDetailsPage/tabs/AppLogs/Filters/AppLogsFilterContextualBar.tsx b/apps/meteor/client/views/marketplace/AppDetailsPage/tabs/AppLogs/Filters/AppLogsFilterContextualBar.tsx index 4e82b5520634b..4a5d592cd2200 100644 --- a/apps/meteor/client/views/marketplace/AppDetailsPage/tabs/AppLogs/Filters/AppLogsFilterContextualBar.tsx +++ b/apps/meteor/client/views/marketplace/AppDetailsPage/tabs/AppLogs/Filters/AppLogsFilterContextualBar.tsx @@ -1,11 +1,4 @@ import { Box, Button, Label } from '@rocket.chat/fuselage'; -import { Controller } from 'react-hook-form'; -import { useTranslation } from 'react-i18next'; - -import DateTimeFilter from './DateTimeFilter'; -import { InstanceFilterSelect } from './InstanceFilterSelect'; -import { SeverityFilterSelect } from './SeverityFilterSelect'; -import { TimeFilterSelect } from './TimeFilterSelect'; import { ContextualbarHeader, ContextualbarIcon, @@ -14,7 +7,14 @@ import { ContextualbarScrollableContent, ContextualbarDialog, ContextualbarFooter, -} from '../../../../../../components/Contextualbar'; +} from '@rocket.chat/ui-client'; +import { Controller } from 'react-hook-form'; +import { useTranslation } from 'react-i18next'; + +import DateTimeFilter from './DateTimeFilter'; +import { InstanceFilterSelect } from './InstanceFilterSelect'; +import { SeverityFilterSelect } from './SeverityFilterSelect'; +import { TimeFilterSelect } from './TimeFilterSelect'; import { useAppLogsFilterFormContext } from '../useAppLogsFilterForm'; type AppLogsFilterContextualBarProps = { diff --git a/apps/meteor/client/views/omnichannel/agents/AgentEdit.tsx b/apps/meteor/client/views/omnichannel/agents/AgentEdit.tsx index 5faa573cc200e..029b680a2e2bb 100644 --- a/apps/meteor/client/views/omnichannel/agents/AgentEdit.tsx +++ b/apps/meteor/client/views/omnichannel/agents/AgentEdit.tsx @@ -2,19 +2,19 @@ import type { ILivechatAgent, ILivechatAgentStatus, ILivechatDepartmentAgents } import { Field, FieldLabel, FieldGroup, FieldRow, TextInput, Button, Box, Icon, Select, ButtonGroup } from '@rocket.chat/fuselage'; import type { SelectOption } from '@rocket.chat/fuselage'; import { useEffectEvent } from '@rocket.chat/fuselage-hooks'; -import { useToastMessageDispatch, useSetting, useTranslation, useEndpoint, useRouter } from '@rocket.chat/ui-contexts'; -import { useQueryClient } from '@tanstack/react-query'; -import { useId, useMemo } from 'react'; -import { useForm, Controller, FormProvider } from 'react-hook-form'; - -import { getUserEmailAddress } from '../../../../lib/getUserEmailAddress'; import { ContextualbarTitle, ContextualbarClose, ContextualbarHeader, ContextualbarScrollableContent, ContextualbarFooter, -} from '../../../components/Contextualbar'; +} from '@rocket.chat/ui-client'; +import { useToastMessageDispatch, useSetting, useTranslation, useEndpoint, useRouter } from '@rocket.chat/ui-contexts'; +import { useQueryClient } from '@tanstack/react-query'; +import { useId, useMemo } from 'react'; +import { useForm, Controller, FormProvider } from 'react-hook-form'; + +import { getUserEmailAddress } from '../../../../lib/getUserEmailAddress'; import { UserInfoAvatar } from '../../../components/UserInfo'; import { omnichannelQueryKeys } from '../../../lib/queryKeys'; import { MaxChatsPerAgent } from '../additionalForms'; diff --git a/apps/meteor/client/views/omnichannel/agents/AgentEditWithData.tsx b/apps/meteor/client/views/omnichannel/agents/AgentEditWithData.tsx index 041f65d289d67..f53797805775e 100644 --- a/apps/meteor/client/views/omnichannel/agents/AgentEditWithData.tsx +++ b/apps/meteor/client/views/omnichannel/agents/AgentEditWithData.tsx @@ -1,12 +1,12 @@ import type { ILivechatAgent } from '@rocket.chat/core-typings'; import { Box } from '@rocket.chat/fuselage'; +import { ContextualbarSkeletonBody } from '@rocket.chat/ui-client'; import { useEndpoint } from '@rocket.chat/ui-contexts'; import { useQuery } from '@tanstack/react-query'; import type { ReactElement } from 'react'; import { useTranslation } from 'react-i18next'; import AgentEdit from './AgentEdit'; -import { ContextualbarSkeletonBody } from '../../../components/Contextualbar'; import { omnichannelQueryKeys } from '../../../lib/queryKeys'; const AgentEditWithData = ({ uid }: { uid: ILivechatAgent['_id'] }): ReactElement => { diff --git a/apps/meteor/client/views/omnichannel/agents/AgentInfo.tsx b/apps/meteor/client/views/omnichannel/agents/AgentInfo.tsx index acac40c9c6e90..e409ed17522eb 100644 --- a/apps/meteor/client/views/omnichannel/agents/AgentInfo.tsx +++ b/apps/meteor/client/views/omnichannel/agents/AgentInfo.tsx @@ -1,16 +1,16 @@ import { Box, Margins, ButtonGroup } from '@rocket.chat/fuselage'; -import { useEndpoint, useRouter } from '@rocket.chat/ui-contexts'; -import { useQuery } from '@tanstack/react-query'; -import type { HTMLAttributes } from 'react'; -import { useTranslation } from 'react-i18next'; - import { ContextualbarTitle, ContextualbarClose, ContextualbarHeader, ContextualbarScrollableContent, ContextualbarSkeletonBody, -} from '../../../components/Contextualbar'; +} from '@rocket.chat/ui-client'; +import { useEndpoint, useRouter } from '@rocket.chat/ui-contexts'; +import { useQuery } from '@tanstack/react-query'; +import type { HTMLAttributes } from 'react'; +import { useTranslation } from 'react-i18next'; + import { InfoPanelLabel, InfoPanelText } from '../../../components/InfoPanel'; import { UserInfoAvatar, UserInfoUsername } from '../../../components/UserInfo'; import { UserStatus } from '../../../components/UserStatus'; diff --git a/apps/meteor/client/views/omnichannel/agents/AgentsPage.tsx b/apps/meteor/client/views/omnichannel/agents/AgentsPage.tsx index 06470aa6d290a..165e147de1c41 100644 --- a/apps/meteor/client/views/omnichannel/agents/AgentsPage.tsx +++ b/apps/meteor/client/views/omnichannel/agents/AgentsPage.tsx @@ -1,4 +1,5 @@ import { useEffectEvent } from '@rocket.chat/fuselage-hooks'; +import { ContextualbarDialog } from '@rocket.chat/ui-client'; import { usePermission, useRouteParameter, useRouter } from '@rocket.chat/ui-contexts'; import type { ReactElement } from 'react'; import { useTranslation } from 'react-i18next'; @@ -6,7 +7,6 @@ import { useTranslation } from 'react-i18next'; import AgentEditWithData from './AgentEditWithData'; import AgentInfo from './AgentInfo'; import AgentsTable from './AgentsTable'; -import { ContextualbarDialog } from '../../../components/Contextualbar'; import { Page, PageHeader, PageContent } from '../../../components/Page'; import NotAuthorizedPage from '../../notAuthorized/NotAuthorizedPage'; diff --git a/apps/meteor/client/views/omnichannel/cannedResponses/contextualBar/CannedResponse/CannedResponse.tsx b/apps/meteor/client/views/omnichannel/cannedResponses/contextualBar/CannedResponse/CannedResponse.tsx index 77ce5defe4dde..f6f7885db6d98 100644 --- a/apps/meteor/client/views/omnichannel/cannedResponses/contextualBar/CannedResponse/CannedResponse.tsx +++ b/apps/meteor/client/views/omnichannel/cannedResponses/contextualBar/CannedResponse/CannedResponse.tsx @@ -1,9 +1,5 @@ import type { ILivechatDepartment, IOmnichannelCannedResponse } from '@rocket.chat/core-typings'; import { Box, Button, ButtonGroup, Tag } from '@rocket.chat/fuselage'; -import type { MouseEventHandler } from 'react'; -import { memo } from 'react'; -import { useTranslation } from 'react-i18next'; - import { ContextualbarHeader, ContextualbarTitle, @@ -12,7 +8,11 @@ import { ContextualbarFooter, ContextualbarDialog, ContextualbarClose, -} from '../../../../../components/Contextualbar'; +} from '@rocket.chat/ui-client'; +import type { MouseEventHandler } from 'react'; +import { memo } from 'react'; +import { useTranslation } from 'react-i18next'; + import { useScopeDict } from '../../../hooks/useScopeDict'; type CannedResponseProps = { diff --git a/apps/meteor/client/views/omnichannel/cannedResponses/contextualBar/CannedResponse/CannedResponseList.stories.tsx b/apps/meteor/client/views/omnichannel/cannedResponses/contextualBar/CannedResponse/CannedResponseList.stories.tsx index e138d2de96a49..5b7b091b8fba7 100644 --- a/apps/meteor/client/views/omnichannel/cannedResponses/contextualBar/CannedResponse/CannedResponseList.stories.tsx +++ b/apps/meteor/client/views/omnichannel/cannedResponses/contextualBar/CannedResponse/CannedResponseList.stories.tsx @@ -1,9 +1,9 @@ import { Box } from '@rocket.chat/fuselage'; +import { Contextualbar } from '@rocket.chat/ui-client'; import { action } from '@storybook/addon-actions'; import type { Meta, StoryFn } from '@storybook/react'; import CannedResponseList from './CannedResponseList'; -import { Contextualbar } from '../../../../../components/Contextualbar'; export default { component: CannedResponseList, diff --git a/apps/meteor/client/views/omnichannel/cannedResponses/contextualBar/CannedResponse/CannedResponseList.tsx b/apps/meteor/client/views/omnichannel/cannedResponses/contextualBar/CannedResponse/CannedResponseList.tsx index 25bd97200de6a..53fc20de6c021 100644 --- a/apps/meteor/client/views/omnichannel/cannedResponses/contextualBar/CannedResponse/CannedResponseList.tsx +++ b/apps/meteor/client/views/omnichannel/cannedResponses/contextualBar/CannedResponse/CannedResponseList.tsx @@ -1,7 +1,15 @@ import type { ILivechatDepartment, IOmnichannelCannedResponse } from '@rocket.chat/core-typings'; import { Box, Button, ButtonGroup, ContextualbarEmptyContent, Icon, Margins, Select, TextInput } from '@rocket.chat/fuselage'; import { useAutoFocus, useResizeObserver } from '@rocket.chat/fuselage-hooks'; -import { VirtualizedScrollbars } from '@rocket.chat/ui-client'; +import { + VirtualizedScrollbars, + ContextualbarHeader, + ContextualbarTitle, + ContextualbarClose, + ContextualbarContent, + ContextualbarFooter, + ContextualbarDialog, +} from '@rocket.chat/ui-client'; import { useRoomToolbox } from '@rocket.chat/ui-contexts'; import type { Dispatch, FormEventHandler, MouseEvent, ReactElement, SetStateAction } from 'react'; import { memo } from 'react'; @@ -10,14 +18,6 @@ import { Virtuoso } from 'react-virtuoso'; import Item from './Item'; import WrapCannedResponse from './WrapCannedResponse'; -import { - ContextualbarHeader, - ContextualbarTitle, - ContextualbarClose, - ContextualbarContent, - ContextualbarFooter, - ContextualbarDialog, -} from '../../../../../components/Contextualbar'; import { useCanCreateCannedResponse } from '../../hooks/useCanCreateCannedResponse'; type CannedResponseListProps = { diff --git a/apps/meteor/client/views/omnichannel/contactHistory/MessageList/ContactHistoryMessagesList.tsx b/apps/meteor/client/views/omnichannel/contactHistory/MessageList/ContactHistoryMessagesList.tsx index 06622af0740b2..4d16d9da8d99d 100644 --- a/apps/meteor/client/views/omnichannel/contactHistory/MessageList/ContactHistoryMessagesList.tsx +++ b/apps/meteor/client/views/omnichannel/contactHistory/MessageList/ContactHistoryMessagesList.tsx @@ -12,16 +12,8 @@ import { Throbber, } from '@rocket.chat/fuselage'; import { useDebouncedValue, useResizeObserver } from '@rocket.chat/fuselage-hooks'; -import { VirtualizedScrollbars } from '@rocket.chat/ui-client'; -import { useSetting, useUserPreference, useUserId } from '@rocket.chat/ui-contexts'; -import type { ChangeEvent, ReactElement } from 'react'; -import { useMemo, useState } from 'react'; -import { useTranslation } from 'react-i18next'; -import { Virtuoso } from 'react-virtuoso'; - -import ContactHistoryMessage from './ContactHistoryMessage'; -import { useHistoryMessageList } from './useHistoryMessageList'; import { + VirtualizedScrollbars, ContextualbarHeader, ContextualbarIcon, ContextualbarTitle, @@ -30,7 +22,15 @@ import { ContextualbarEmptyContent, ContextualbarDialog, ContextualbarFooter, -} from '../../../../components/Contextualbar'; +} from '@rocket.chat/ui-client'; +import { useSetting, useUserPreference, useUserId } from '@rocket.chat/ui-contexts'; +import type { ChangeEvent, ReactElement } from 'react'; +import { useMemo, useState } from 'react'; +import { useTranslation } from 'react-i18next'; +import { Virtuoso } from 'react-virtuoso'; + +import ContactHistoryMessage from './ContactHistoryMessage'; +import { useHistoryMessageList } from './useHistoryMessageList'; import { useRecordList } from '../../../../hooks/lists/useRecordList'; import { AsyncStatePhase } from '../../../../lib/asyncState'; import { isMessageNewDay } from '../../../room/MessageList/lib/isMessageNewDay'; diff --git a/apps/meteor/client/views/omnichannel/contactInfo/ContactInfo/ContactInfo.tsx b/apps/meteor/client/views/omnichannel/contactInfo/ContactInfo/ContactInfo.tsx index 507a1c0713dc5..4ffdb0727971c 100644 --- a/apps/meteor/client/views/omnichannel/contactInfo/ContactInfo/ContactInfo.tsx +++ b/apps/meteor/client/views/omnichannel/contactInfo/ContactInfo/ContactInfo.tsx @@ -1,17 +1,17 @@ import type { ILivechatContact, Serialized } from '@rocket.chat/core-typings'; import { Box, Button, ButtonGroup, Callout, IconButton, Tabs, TabsItem } from '@rocket.chat/fuselage'; import { UserAvatar } from '@rocket.chat/ui-avatar'; -import { usePermission, useRouteParameter, useSetModal } from '@rocket.chat/ui-contexts'; -import { useTranslation } from 'react-i18next'; - -import ReviewContactModal from './ReviewContactModal'; import { ContextualbarHeader, ContextualbarIcon, ContextualbarTitle, ContextualbarClose, ContextualbarDialog, -} from '../../../../components/Contextualbar'; +} from '@rocket.chat/ui-client'; +import { usePermission, useRouteParameter, useSetModal } from '@rocket.chat/ui-contexts'; +import { useTranslation } from 'react-i18next'; + +import ReviewContactModal from './ReviewContactModal'; import { useFormatDate } from '../../../../hooks/useFormatDate'; import { useContactRoute } from '../../hooks/useContactRoute'; import { useValidCustomFields } from '../hooks/useValidCustomFields'; diff --git a/apps/meteor/client/views/omnichannel/contactInfo/ContactInfo/ContactInfoWithData.tsx b/apps/meteor/client/views/omnichannel/contactInfo/ContactInfo/ContactInfoWithData.tsx index 5dd18f49a5334..f5f62299c2ccd 100644 --- a/apps/meteor/client/views/omnichannel/contactInfo/ContactInfo/ContactInfoWithData.tsx +++ b/apps/meteor/client/views/omnichannel/contactInfo/ContactInfo/ContactInfoWithData.tsx @@ -1,7 +1,7 @@ +import { ContextualbarSkeleton } from '@rocket.chat/ui-client'; import { useEndpoint, usePermission } from '@rocket.chat/ui-contexts'; import { useQuery } from '@tanstack/react-query'; -import { ContextualbarSkeleton } from '../../../../components/Contextualbar'; import ContactInfoError from '../ContactInfoError'; import ContactInfo from './ContactInfo'; diff --git a/apps/meteor/client/views/omnichannel/contactInfo/ContactInfoError.tsx b/apps/meteor/client/views/omnichannel/contactInfo/ContactInfoError.tsx index a715d17eb08a5..89c6a1d6002cb 100644 --- a/apps/meteor/client/views/omnichannel/contactInfo/ContactInfoError.tsx +++ b/apps/meteor/client/views/omnichannel/contactInfo/ContactInfoError.tsx @@ -1,5 +1,3 @@ -import { useTranslation } from 'react-i18next'; - import { ContextualbarHeader, ContextualbarIcon, @@ -7,7 +5,8 @@ import { ContextualbarClose, ContextualbarEmptyContent, ContextualbarDialog, -} from '../../../components/Contextualbar'; +} from '@rocket.chat/ui-client'; +import { useTranslation } from 'react-i18next'; const ContactInfoError = ({ onClose }: { onClose: () => void }) => { const { t } = useTranslation(); diff --git a/apps/meteor/client/views/omnichannel/contactInfo/EditContactInfo.tsx b/apps/meteor/client/views/omnichannel/contactInfo/EditContactInfo.tsx index c9ca41a50f64a..d6d4a0f7cca95 100644 --- a/apps/meteor/client/views/omnichannel/contactInfo/EditContactInfo.tsx +++ b/apps/meteor/client/views/omnichannel/contactInfo/EditContactInfo.tsx @@ -1,6 +1,16 @@ import type { ILivechatContact, Serialized } from '@rocket.chat/core-typings'; import { Field, FieldLabel, FieldRow, FieldError, TextInput, ButtonGroup, Button, IconButton, Divider } from '@rocket.chat/fuselage'; -import { CustomFieldsForm } from '@rocket.chat/ui-client'; +import { + CustomFieldsForm, + ContextualbarScrollableContent, + ContextualbarFooter, + ContextualbarHeader, + ContextualbarIcon, + ContextualbarTitle, + ContextualbarClose, + ContextualbarDialog, + ContextualbarSkeleton, +} from '@rocket.chat/ui-client'; import { useEndpoint, useSetModal } from '@rocket.chat/ui-contexts'; import { useQueryClient } from '@tanstack/react-query'; import type { ReactElement } from 'react'; @@ -13,16 +23,6 @@ import { useCreateContact } from './hooks/useCreateContact'; import { useEditContact } from './hooks/useEditContact'; import { hasAtLeastOnePermission } from '../../../../app/authorization/client'; import { validateEmail } from '../../../../lib/emailValidator'; -import { - ContextualbarScrollableContent, - ContextualbarFooter, - ContextualbarHeader, - ContextualbarIcon, - ContextualbarTitle, - ContextualbarClose, - ContextualbarDialog, - ContextualbarSkeleton, -} from '../../../components/Contextualbar'; import { useHasLicenseModule } from '../../../hooks/useHasLicenseModule'; import { omnichannelQueryKeys } from '../../../lib/queryKeys'; import { ContactManagerInput } from '../additionalForms'; diff --git a/apps/meteor/client/views/omnichannel/contactInfo/EditContactInfoWithData.tsx b/apps/meteor/client/views/omnichannel/contactInfo/EditContactInfoWithData.tsx index 28448dc32f3ab..59edec81ea071 100644 --- a/apps/meteor/client/views/omnichannel/contactInfo/EditContactInfoWithData.tsx +++ b/apps/meteor/client/views/omnichannel/contactInfo/EditContactInfoWithData.tsx @@ -1,9 +1,9 @@ +import { ContextualbarSkeleton } from '@rocket.chat/ui-client'; import { useEndpoint } from '@rocket.chat/ui-contexts'; import { useQuery } from '@tanstack/react-query'; import ContactInfoError from './ContactInfoError'; import EditContactInfo from './EditContactInfo'; -import { ContextualbarSkeleton } from '../../../components/Contextualbar'; type EditContactInfoWithDataProps = { id: string; diff --git a/apps/meteor/client/views/omnichannel/contactInfo/tabs/ContactInfoChannels/ContactInfoChannels.tsx b/apps/meteor/client/views/omnichannel/contactInfo/tabs/ContactInfoChannels/ContactInfoChannels.tsx index 1b1ae992fd0e0..6f2e941e8c7a2 100644 --- a/apps/meteor/client/views/omnichannel/contactInfo/tabs/ContactInfoChannels/ContactInfoChannels.tsx +++ b/apps/meteor/client/views/omnichannel/contactInfo/tabs/ContactInfoChannels/ContactInfoChannels.tsx @@ -1,13 +1,12 @@ import type { ILivechatContact } from '@rocket.chat/core-typings'; import { Box, States, StatesIcon, StatesTitle, Throbber } from '@rocket.chat/fuselage'; -import { VirtualizedScrollbars } from '@rocket.chat/ui-client'; +import { VirtualizedScrollbars, ContextualbarContent, ContextualbarEmptyContent } from '@rocket.chat/ui-client'; import { useEndpoint } from '@rocket.chat/ui-contexts'; import { useQuery } from '@tanstack/react-query'; import { useTranslation } from 'react-i18next'; import { Virtuoso } from 'react-virtuoso'; import ContactInfoChannelsItem from './ContactInfoChannelsItem'; -import { ContextualbarContent, ContextualbarEmptyContent } from '../../../../../components/Contextualbar'; import useOutboundProvidersList from '../../../components/outboundMessage/hooks/useOutboundProvidersList'; type ContactInfoChannelsProps = { diff --git a/apps/meteor/client/views/omnichannel/contactInfo/tabs/ContactInfoDetails/ContactInfoDetails.tsx b/apps/meteor/client/views/omnichannel/contactInfo/tabs/ContactInfoDetails/ContactInfoDetails.tsx index 6a049eb95e1a1..f594ac7444377 100644 --- a/apps/meteor/client/views/omnichannel/contactInfo/tabs/ContactInfoDetails/ContactInfoDetails.tsx +++ b/apps/meteor/client/views/omnichannel/contactInfo/tabs/ContactInfoDetails/ContactInfoDetails.tsx @@ -1,11 +1,11 @@ import type { ILivechatContact } from '@rocket.chat/core-typings'; import { Divider, Margins } from '@rocket.chat/fuselage'; +import { ContextualbarScrollableContent } from '@rocket.chat/ui-client'; import { useTranslation } from 'react-i18next'; import ContactInfoDetailsEntry from './ContactInfoDetailsEntry'; import ContactInfoPhoneEntry from './ContactInfoPhoneEntry'; import ContactManagerInfo from './ContactManagerInfo'; -import { ContextualbarScrollableContent } from '../../../../../components/Contextualbar'; import { useFormatDate } from '../../../../../hooks/useFormatDate'; import CustomField from '../../../components/CustomField'; import Field from '../../../components/Field'; diff --git a/apps/meteor/client/views/omnichannel/contactInfo/tabs/ContactInfoHistory/ContactInfoHistory.tsx b/apps/meteor/client/views/omnichannel/contactInfo/tabs/ContactInfoHistory/ContactInfoHistory.tsx index ecba14dc3690d..1d2f5bbc56155 100644 --- a/apps/meteor/client/views/omnichannel/contactInfo/tabs/ContactInfoHistory/ContactInfoHistory.tsx +++ b/apps/meteor/client/views/omnichannel/contactInfo/tabs/ContactInfoHistory/ContactInfoHistory.tsx @@ -2,7 +2,7 @@ import type { ILivechatContact, Serialized } from '@rocket.chat/core-typings'; import { OmnichannelSourceType } from '@rocket.chat/core-typings'; import { Box, Margins, Throbber, States, StatesIcon, StatesTitle, Select } from '@rocket.chat/fuselage'; import { useLocalStorage } from '@rocket.chat/fuselage-hooks'; -import { VirtualizedScrollbars } from '@rocket.chat/ui-client'; +import { VirtualizedScrollbars, ContextualbarContent, ContextualbarEmptyContent } from '@rocket.chat/ui-client'; import { useEndpoint, useSetModal } from '@rocket.chat/ui-contexts'; import { useQuery } from '@tanstack/react-query'; import type { Key } from 'react'; @@ -11,7 +11,6 @@ import { useTranslation } from 'react-i18next'; import { Virtuoso } from 'react-virtuoso'; import ContactInfoHistoryItem from './ContactInfoHistoryItem'; -import { ContextualbarContent, ContextualbarEmptyContent } from '../../../../../components/Contextualbar'; import { useHasLicenseModule } from '../../../../../hooks/useHasLicenseModule'; import { useOmnichannelSource } from '../../../hooks/useOmnichannelSource'; import AdvancedContactModal from '../../AdvancedContactModal'; diff --git a/apps/meteor/client/views/omnichannel/contactInfo/tabs/ContactInfoHistory/ContactInfoHistoryMessages.tsx b/apps/meteor/client/views/omnichannel/contactInfo/tabs/ContactInfoHistory/ContactInfoHistoryMessages.tsx index f18453ed9674e..364560dd480fe 100644 --- a/apps/meteor/client/views/omnichannel/contactInfo/tabs/ContactInfoHistory/ContactInfoHistoryMessages.tsx +++ b/apps/meteor/client/views/omnichannel/contactInfo/tabs/ContactInfoHistory/ContactInfoHistoryMessages.tsx @@ -13,14 +13,13 @@ import { Throbber, } from '@rocket.chat/fuselage'; import { useDebouncedValue, useResizeObserver } from '@rocket.chat/fuselage-hooks'; -import { VirtualizedScrollbars } from '@rocket.chat/ui-client'; +import { VirtualizedScrollbars, ContextualbarContent, ContextualbarEmptyContent, ContextualbarFooter } from '@rocket.chat/ui-client'; import { useSetting, useUserPreference, useUserId } from '@rocket.chat/ui-contexts'; import type { ChangeEvent, ReactElement } from 'react'; import { useMemo, useState } from 'react'; import { useTranslation } from 'react-i18next'; import { Virtuoso } from 'react-virtuoso'; -import { ContextualbarContent, ContextualbarEmptyContent, ContextualbarFooter } from '../../../../../components/Contextualbar'; import { useRecordList } from '../../../../../hooks/lists/useRecordList'; import { AsyncStatePhase } from '../../../../../lib/asyncState'; import { isMessageNewDay } from '../../../../room/MessageList/lib/isMessageNewDay'; diff --git a/apps/meteor/client/views/omnichannel/currentChats/CustomFieldsList.tsx b/apps/meteor/client/views/omnichannel/currentChats/CustomFieldsList.tsx index 2a6c4da7b7622..e83e08cf32685 100644 --- a/apps/meteor/client/views/omnichannel/currentChats/CustomFieldsList.tsx +++ b/apps/meteor/client/views/omnichannel/currentChats/CustomFieldsList.tsx @@ -1,17 +1,16 @@ import type { ILivechatCustomField } from '@rocket.chat/core-typings'; import { Field, FieldLabel, FieldRow, TextInput, Select } from '@rocket.chat/fuselage'; -import { useTranslation, useRoute } from '@rocket.chat/ui-contexts'; -import type { ReactElement, Dispatch, SetStateAction } from 'react'; -import { useEffect } from 'react'; -import { Controller, useForm } from 'react-hook-form'; - import { ContextualbarScrollableContent, ContextualbarHeader, ContextualbarClose, ContextualbarDialog, ContextualbarTitle, -} from '../../../components/Contextualbar'; +} from '@rocket.chat/ui-client'; +import { useTranslation, useRoute } from '@rocket.chat/ui-contexts'; +import type { ReactElement, Dispatch, SetStateAction } from 'react'; +import { useEffect } from 'react'; +import { Controller, useForm } from 'react-hook-form'; type CustomFieldsListProps = { setCustomFields: Dispatch>; diff --git a/apps/meteor/client/views/omnichannel/customFields/CustomFieldsPage.tsx b/apps/meteor/client/views/omnichannel/customFields/CustomFieldsPage.tsx index 0a4299b164918..f191cd555cfcd 100644 --- a/apps/meteor/client/views/omnichannel/customFields/CustomFieldsPage.tsx +++ b/apps/meteor/client/views/omnichannel/customFields/CustomFieldsPage.tsx @@ -1,12 +1,12 @@ import { Button } from '@rocket.chat/fuselage'; import { useEffectEvent } from '@rocket.chat/fuselage-hooks'; +import { ContextualbarDialog } from '@rocket.chat/ui-client'; import { useRouteParameter, useRouter } from '@rocket.chat/ui-contexts'; import { useTranslation } from 'react-i18next'; import CustomFieldsTable from './CustomFieldsTable'; import EditCustomFields from './EditCustomFields'; import EditCustomFieldsWithData from './EditCustomFieldsWithData'; -import { ContextualbarDialog } from '../../../components/Contextualbar'; import { Page, PageHeader, PageContent } from '../../../components/Page'; const CustomFieldsPage = () => { diff --git a/apps/meteor/client/views/omnichannel/customFields/EditCustomFields.tsx b/apps/meteor/client/views/omnichannel/customFields/EditCustomFields.tsx index ab1784933b395..bfe82257ad713 100644 --- a/apps/meteor/client/views/omnichannel/customFields/EditCustomFields.tsx +++ b/apps/meteor/client/views/omnichannel/customFields/EditCustomFields.tsx @@ -14,18 +14,18 @@ import { Box, } from '@rocket.chat/fuselage'; import { useEffectEvent } from '@rocket.chat/fuselage-hooks'; -import { useToastMessageDispatch, useTranslation, useEndpoint } from '@rocket.chat/ui-contexts'; -import { useQueryClient } from '@tanstack/react-query'; -import { useId, useMemo } from 'react'; -import { FormProvider, useForm, Controller } from 'react-hook-form'; - import { ContextualbarTitle, ContextualbarHeader, ContextualbarClose, ContextualbarFooter, ContextualbarScrollableContent, -} from '../../../components/Contextualbar'; +} from '@rocket.chat/ui-client'; +import { useToastMessageDispatch, useTranslation, useEndpoint } from '@rocket.chat/ui-contexts'; +import { useQueryClient } from '@tanstack/react-query'; +import { useId, useMemo } from 'react'; +import { FormProvider, useForm, Controller } from 'react-hook-form'; + import { CustomFieldsAdditionalForm } from '../additionalForms'; import { useRemoveCustomField } from './useRemoveCustomField'; diff --git a/apps/meteor/client/views/omnichannel/customFields/EditCustomFieldsWithData.tsx b/apps/meteor/client/views/omnichannel/customFields/EditCustomFieldsWithData.tsx index 180c20dc79d17..9344dd014e4c4 100644 --- a/apps/meteor/client/views/omnichannel/customFields/EditCustomFieldsWithData.tsx +++ b/apps/meteor/client/views/omnichannel/customFields/EditCustomFieldsWithData.tsx @@ -1,11 +1,11 @@ import type { ILivechatCustomField } from '@rocket.chat/core-typings'; import { Callout } from '@rocket.chat/fuselage'; +import { ContextualbarSkeletonBody } from '@rocket.chat/ui-client'; import { useEndpoint } from '@rocket.chat/ui-contexts'; import { useQuery } from '@tanstack/react-query'; import { useTranslation } from 'react-i18next'; import EditCustomFields from './EditCustomFields'; -import { ContextualbarSkeletonBody } from '../../../components/Contextualbar'; const EditCustomFieldsWithData = ({ customFieldId, onClose }: { customFieldId: ILivechatCustomField['_id']; onClose: () => void }) => { const { t } = useTranslation(); diff --git a/apps/meteor/client/views/omnichannel/directory/CallsContextualBarDirectory.tsx b/apps/meteor/client/views/omnichannel/directory/CallsContextualBarDirectory.tsx index 721e19492f398..580d4df682d12 100644 --- a/apps/meteor/client/views/omnichannel/directory/CallsContextualBarDirectory.tsx +++ b/apps/meteor/client/views/omnichannel/directory/CallsContextualBarDirectory.tsx @@ -1,12 +1,12 @@ import type { IVoipRoom } from '@rocket.chat/core-typings'; import { Box } from '@rocket.chat/fuselage'; +import { ContextualbarSkeleton } from '@rocket.chat/ui-client'; import { useEndpoint, useRoute, useRouteParameter, useSearchParameter } from '@rocket.chat/ui-contexts'; import { useQuery } from '@tanstack/react-query'; import { useTranslation } from 'react-i18next'; import Call from './calls/Call'; import { VoipInfo } from './calls/contextualBar/VoipInfo'; -import { ContextualbarSkeleton } from '../../../components/Contextualbar'; import { voipQueryKeys } from '../../../lib/queryKeys'; // TODO: We should render contextual bar components in this view diff --git a/apps/meteor/client/views/omnichannel/directory/calls/contextualBar/VoipInfo.tsx b/apps/meteor/client/views/omnichannel/directory/calls/contextualBar/VoipInfo.tsx index e171c8ffc21b0..38b6f6888cad4 100644 --- a/apps/meteor/client/views/omnichannel/directory/calls/contextualBar/VoipInfo.tsx +++ b/apps/meteor/client/views/omnichannel/directory/calls/contextualBar/VoipInfo.tsx @@ -1,13 +1,6 @@ import type { IVoipRoom } from '@rocket.chat/core-typings'; import { Box, Icon, Chip, ButtonGroup } from '@rocket.chat/fuselage'; import { UserAvatar } from '@rocket.chat/ui-avatar'; -import moment from 'moment'; -import type { ReactElement } from 'react'; -import { useMemo } from 'react'; -import { useTranslation } from 'react-i18next'; - -import { InfoField } from './InfoField'; -import { VoipInfoCallButton } from './VoipInfoCallButton'; import { ContextualbarIcon, ContextualbarHeader, @@ -16,7 +9,14 @@ import { ContextualbarScrollableContent, ContextualbarFooter, ContextualbarDialog, -} from '../../../../../components/Contextualbar'; +} from '@rocket.chat/ui-client'; +import moment from 'moment'; +import type { ReactElement } from 'react'; +import { useMemo } from 'react'; +import { useTranslation } from 'react-i18next'; + +import { InfoField } from './InfoField'; +import { VoipInfoCallButton } from './VoipInfoCallButton'; import { InfoPanel, InfoPanelField, InfoPanelLabel, InfoPanelText } from '../../../../../components/InfoPanel'; import { UserStatus } from '../../../../../components/UserStatus'; import { useIsCallReady } from '../../../../../contexts/CallContext'; diff --git a/apps/meteor/client/views/omnichannel/directory/chats/ChatInfo/ChatInfo.tsx b/apps/meteor/client/views/omnichannel/directory/chats/ChatInfo/ChatInfo.tsx index 03e633e68eb86..3b126d2d29ae4 100644 --- a/apps/meteor/client/views/omnichannel/directory/chats/ChatInfo/ChatInfo.tsx +++ b/apps/meteor/client/views/omnichannel/directory/chats/ChatInfo/ChatInfo.tsx @@ -1,6 +1,7 @@ import type { IOmnichannelRoom, IVisitor } from '@rocket.chat/core-typings'; import { Box, Margins, Tag, Button, ButtonGroup } from '@rocket.chat/fuselage'; import { useEffectEvent } from '@rocket.chat/fuselage-hooks'; +import { ContextualbarScrollableContent, ContextualbarFooter } from '@rocket.chat/ui-client'; import type { IRouterPaths } from '@rocket.chat/ui-contexts'; import { useToastMessageDispatch, @@ -17,7 +18,6 @@ import { useMemo } from 'react'; import DepartmentField from './DepartmentField'; import VisitorClientInfo from './VisitorClientInfo'; -import { ContextualbarScrollableContent, ContextualbarFooter } from '../../../../../components/Contextualbar'; import { InfoPanelField, InfoPanelLabel, InfoPanelText } from '../../../../../components/InfoPanel'; import MarkdownText from '../../../../../components/MarkdownText'; import { useFormatDateAndTime } from '../../../../../hooks/useFormatDateAndTime'; diff --git a/apps/meteor/client/views/omnichannel/directory/chats/ChatInfo/ChatsContextualBar.tsx b/apps/meteor/client/views/omnichannel/directory/chats/ChatInfo/ChatsContextualBar.tsx index 4cf51237c5740..8d2c017025aaf 100644 --- a/apps/meteor/client/views/omnichannel/directory/chats/ChatInfo/ChatsContextualBar.tsx +++ b/apps/meteor/client/views/omnichannel/directory/chats/ChatInfo/ChatsContextualBar.tsx @@ -1,16 +1,16 @@ -import { useRoute, useRouteParameter, useRoomToolbox } from '@rocket.chat/ui-contexts'; -import { useMemo } from 'react'; -import { useTranslation } from 'react-i18next'; - -import ChatInfo from './ChatInfo'; -import RoomEdit from './RoomEdit'; import { ContextualbarHeader, ContextualbarIcon, ContextualbarTitle, ContextualbarClose, ContextualbarDialog, -} from '../../../../../components/Contextualbar'; +} from '@rocket.chat/ui-client'; +import { useRoute, useRouteParameter, useRoomToolbox } from '@rocket.chat/ui-contexts'; +import { useMemo } from 'react'; +import { useTranslation } from 'react-i18next'; + +import ChatInfo from './ChatInfo'; +import RoomEdit from './RoomEdit'; import { useRoom } from '../../../../room/contexts/RoomContext'; const PATH = 'live'; diff --git a/apps/meteor/client/views/omnichannel/directory/chats/ChatInfo/RoomEdit/RoomEdit.tsx b/apps/meteor/client/views/omnichannel/directory/chats/ChatInfo/RoomEdit/RoomEdit.tsx index 79d95c9d092b1..553e4d72c497a 100644 --- a/apps/meteor/client/views/omnichannel/directory/chats/ChatInfo/RoomEdit/RoomEdit.tsx +++ b/apps/meteor/client/views/omnichannel/directory/chats/ChatInfo/RoomEdit/RoomEdit.tsx @@ -1,13 +1,12 @@ import type { ILivechatVisitor, IOmnichannelRoom, Serialized } from '@rocket.chat/core-typings'; import { Field, FieldLabel, FieldRow, TextInput, ButtonGroup, Button } from '@rocket.chat/fuselage'; -import { CustomFieldsForm } from '@rocket.chat/ui-client'; +import { CustomFieldsForm, ContextualbarContent, ContextualbarFooter, ContextualbarScrollableContent } from '@rocket.chat/ui-client'; import { useToastMessageDispatch, useTranslation, useEndpoint } from '@rocket.chat/ui-contexts'; import { useQueryClient } from '@tanstack/react-query'; import { useCallback, useId } from 'react'; import { useController, useForm } from 'react-hook-form'; import { hasAtLeastOnePermission } from '../../../../../../../app/authorization/client'; -import { ContextualbarContent, ContextualbarFooter, ContextualbarScrollableContent } from '../../../../../../components/Contextualbar'; import { roomsQueryKeys } from '../../../../../../lib/queryKeys'; import { SlaPoliciesSelect, PrioritiesSelect } from '../../../../additionalForms'; import Tags from '../../../../components/Tags'; diff --git a/apps/meteor/client/views/omnichannel/directory/chats/ChatsFiltersContextualBar.tsx b/apps/meteor/client/views/omnichannel/directory/chats/ChatsFiltersContextualBar.tsx index fb687d07f39cd..f3da774979314 100644 --- a/apps/meteor/client/views/omnichannel/directory/chats/ChatsFiltersContextualBar.tsx +++ b/apps/meteor/client/views/omnichannel/directory/chats/ChatsFiltersContextualBar.tsx @@ -1,11 +1,4 @@ import { Button, ButtonGroup, Field, FieldLabel, FieldRow, InputBox, Select, TextInput } from '@rocket.chat/fuselage'; -import { useEndpoint, usePermission } from '@rocket.chat/ui-contexts'; -import { useQuery } from '@tanstack/react-query'; -import { format } from 'date-fns'; -import { useId } from 'react'; -import { Controller, useForm } from 'react-hook-form'; -import { useTranslation } from 'react-i18next'; - import { ContextualbarHeader, ContextualbarIcon, @@ -14,7 +7,14 @@ import { ContextualbarScrollableContent, ContextualbarFooter, ContextualbarDialog, -} from '../../../../components/Contextualbar'; +} from '@rocket.chat/ui-client'; +import { useEndpoint, usePermission } from '@rocket.chat/ui-contexts'; +import { useQuery } from '@tanstack/react-query'; +import { format } from 'date-fns'; +import { useId } from 'react'; +import { Controller, useForm } from 'react-hook-form'; +import { useTranslation } from 'react-i18next'; + import { useHasLicenseModule } from '../../../../hooks/useHasLicenseModule'; import { CurrentChatTags } from '../../additionalForms'; import AutoCompleteUnits from '../../additionalForms/AutoCompleteUnits'; diff --git a/apps/meteor/client/views/omnichannel/priorities/PriorityList.tsx b/apps/meteor/client/views/omnichannel/priorities/PriorityList.tsx index c94df4e3091cc..b40ca1cadea1f 100644 --- a/apps/meteor/client/views/omnichannel/priorities/PriorityList.tsx +++ b/apps/meteor/client/views/omnichannel/priorities/PriorityList.tsx @@ -1,15 +1,15 @@ -import type { ReactElement } from 'react'; -import { useTranslation } from 'react-i18next'; - -import type { PriorityFormData } from './PriorityEditForm'; -import PriorityEditFormWithData from './PriorityEditFormWithData'; import { ContextualbarTitle, ContextualbarHeader, ContextualbarClose, ContextualbarScrollableContent, ContextualbarDialog, -} from '../../../components/Contextualbar'; +} from '@rocket.chat/ui-client'; +import type { ReactElement } from 'react'; +import { useTranslation } from 'react-i18next'; + +import type { PriorityFormData } from './PriorityEditForm'; +import PriorityEditFormWithData from './PriorityEditFormWithData'; type PriorityListProps = { context: 'edit'; diff --git a/apps/meteor/client/views/omnichannel/slaPolicies/SlaEdit.tsx b/apps/meteor/client/views/omnichannel/slaPolicies/SlaEdit.tsx index 0e90e93510b7b..a7ffcc96d66ec 100644 --- a/apps/meteor/client/views/omnichannel/slaPolicies/SlaEdit.tsx +++ b/apps/meteor/client/views/omnichannel/slaPolicies/SlaEdit.tsx @@ -1,12 +1,11 @@ import type { IOmnichannelServiceLevelAgreements, Serialized } from '@rocket.chat/core-typings'; import { Field, FieldLabel, FieldRow, FieldError, TextInput, Button, Margins, Box, NumberInput } from '@rocket.chat/fuselage'; import { useEffectEvent } from '@rocket.chat/fuselage-hooks'; +import { ContextualbarScrollableContent } from '@rocket.chat/ui-client'; import { useToastMessageDispatch, useRoute, useTranslation, useEndpoint } from '@rocket.chat/ui-contexts'; import type { ReactElement } from 'react'; import { useController, useForm } from 'react-hook-form'; -import { ContextualbarScrollableContent } from '../../../components/Contextualbar'; - type SlaEditProps = { isNew?: boolean; slaId?: string; diff --git a/apps/meteor/client/views/omnichannel/slaPolicies/SlaPage.tsx b/apps/meteor/client/views/omnichannel/slaPolicies/SlaPage.tsx index c8d88832600e8..878d0cff654db 100644 --- a/apps/meteor/client/views/omnichannel/slaPolicies/SlaPage.tsx +++ b/apps/meteor/client/views/omnichannel/slaPolicies/SlaPage.tsx @@ -1,5 +1,6 @@ import { Button, ButtonGroup } from '@rocket.chat/fuselage'; import { useEffectEvent } from '@rocket.chat/fuselage-hooks'; +import { ContextualbarTitle, ContextualbarHeader, ContextualbarClose, ContextualbarDialog } from '@rocket.chat/ui-client'; import { useRouteParameter, useRoute } from '@rocket.chat/ui-contexts'; import { useRef, useCallback } from 'react'; import { useTranslation } from 'react-i18next'; @@ -7,7 +8,6 @@ import { useTranslation } from 'react-i18next'; import SlaEditWithData from './SlaEditWithData'; import SlaNew from './SlaNew'; import SlaTable from './SlaTable'; -import { ContextualbarTitle, ContextualbarHeader, ContextualbarClose, ContextualbarDialog } from '../../../components/Contextualbar'; import { Page, PageHeader, PageContent } from '../../../components/Page'; const SlaPage = () => { diff --git a/apps/meteor/client/views/omnichannel/tags/TagEdit.tsx b/apps/meteor/client/views/omnichannel/tags/TagEdit.tsx index 43c4935742781..4b515b0ab2bac 100644 --- a/apps/meteor/client/views/omnichannel/tags/TagEdit.tsx +++ b/apps/meteor/client/views/omnichannel/tags/TagEdit.tsx @@ -1,6 +1,13 @@ import type { ILivechatDepartment, ILivechatTag, Serialized } from '@rocket.chat/core-typings'; import { Field, FieldLabel, FieldRow, FieldError, TextInput, Button, ButtonGroup, FieldGroup, Box } from '@rocket.chat/fuselage'; import { useEffectEvent } from '@rocket.chat/fuselage-hooks'; +import { + ContextualbarScrollableContent, + ContextualbarFooter, + ContextualbarTitle, + ContextualbarHeader, + ContextualbarClose, +} from '@rocket.chat/ui-client'; import { useToastMessageDispatch, useMethod } from '@rocket.chat/ui-contexts'; import { useQueryClient } from '@tanstack/react-query'; import { useId } from 'react'; @@ -8,13 +15,6 @@ import { useForm, Controller } from 'react-hook-form'; import { useTranslation } from 'react-i18next'; import { useRemoveTag } from './useRemoveTag'; -import { - ContextualbarScrollableContent, - ContextualbarFooter, - ContextualbarTitle, - ContextualbarHeader, - ContextualbarClose, -} from '../../../components/Contextualbar'; import AutoCompleteDepartmentMultiple from '../components/AutoCompleteDepartmentMultiple'; type TagEditPayload = { diff --git a/apps/meteor/client/views/omnichannel/tags/TagEditWithData.tsx b/apps/meteor/client/views/omnichannel/tags/TagEditWithData.tsx index 91e01edb95573..ca61811fe4573 100644 --- a/apps/meteor/client/views/omnichannel/tags/TagEditWithData.tsx +++ b/apps/meteor/client/views/omnichannel/tags/TagEditWithData.tsx @@ -1,12 +1,12 @@ import type { ILivechatTag } from '@rocket.chat/core-typings'; import { Callout } from '@rocket.chat/fuselage'; +import { ContextualbarSkeletonBody } from '@rocket.chat/ui-client'; import { useEndpoint } from '@rocket.chat/ui-contexts'; import { useQuery } from '@tanstack/react-query'; import { useTranslation } from 'react-i18next'; import TagEdit from './TagEdit'; import TagEditWithDepartmentData from './TagEditWithDepartmentData'; -import { ContextualbarSkeletonBody } from '../../../components/Contextualbar'; const TagEditWithData = ({ tagId, onClose }: { tagId: ILivechatTag['_id']; onClose: () => void }) => { const { t } = useTranslation(); diff --git a/apps/meteor/client/views/omnichannel/tags/TagEditWithDepartmentData.tsx b/apps/meteor/client/views/omnichannel/tags/TagEditWithDepartmentData.tsx index bd160adebdbbf..ae0ae162deccd 100644 --- a/apps/meteor/client/views/omnichannel/tags/TagEditWithDepartmentData.tsx +++ b/apps/meteor/client/views/omnichannel/tags/TagEditWithDepartmentData.tsx @@ -1,10 +1,10 @@ import type { ILivechatTag } from '@rocket.chat/core-typings'; import { Callout } from '@rocket.chat/fuselage'; +import { ContextualbarSkeletonBody } from '@rocket.chat/ui-client'; import { useTranslation, useEndpoint } from '@rocket.chat/ui-contexts'; import { useQuery } from '@tanstack/react-query'; import TagEdit from './TagEdit'; -import { ContextualbarSkeletonBody } from '../../../components/Contextualbar'; const TagEditWithDepartmentData = ({ tagData, onClose }: { tagData: ILivechatTag; onClose: () => void }) => { const t = useTranslation(); diff --git a/apps/meteor/client/views/omnichannel/tags/TagsPage.tsx b/apps/meteor/client/views/omnichannel/tags/TagsPage.tsx index 54df44a96de5b..562ee0d2f18b2 100644 --- a/apps/meteor/client/views/omnichannel/tags/TagsPage.tsx +++ b/apps/meteor/client/views/omnichannel/tags/TagsPage.tsx @@ -1,11 +1,11 @@ import { Button, ButtonGroup } from '@rocket.chat/fuselage'; import { useEffectEvent } from '@rocket.chat/fuselage-hooks'; +import { ContextualbarDialog } from '@rocket.chat/ui-client'; import { useRouter, useTranslation, useRouteParameter } from '@rocket.chat/ui-contexts'; import TagEdit from './TagEdit'; import TagEditWithData from './TagEditWithData'; import TagsTable from './TagsTable'; -import { ContextualbarDialog } from '../../../components/Contextualbar'; import { Page, PageHeader, PageContent } from '../../../components/Page'; const TagsPage = () => { diff --git a/apps/meteor/client/views/omnichannel/triggers/EditTrigger.tsx b/apps/meteor/client/views/omnichannel/triggers/EditTrigger.tsx index 405e1c74f7d6a..131fe4358374e 100644 --- a/apps/meteor/client/views/omnichannel/triggers/EditTrigger.tsx +++ b/apps/meteor/client/views/omnichannel/triggers/EditTrigger.tsx @@ -1,5 +1,12 @@ import { type ILivechatTrigger, type ILivechatTriggerAction, type Serialized } from '@rocket.chat/core-typings'; import { FieldGroup, Button, ButtonGroup, Field, FieldLabel, FieldRow, FieldError, TextInput, ToggleSwitch } from '@rocket.chat/fuselage'; +import { + ContextualbarScrollableContent, + ContextualbarTitle, + ContextualbarFooter, + ContextualbarHeader, + ContextualbarClose, +} from '@rocket.chat/ui-client'; import { useToastMessageDispatch, useEndpoint } from '@rocket.chat/ui-contexts'; import { useMutation, useQueryClient } from '@tanstack/react-query'; import { useId, useMemo } from 'react'; @@ -8,13 +15,6 @@ import { useTranslation } from 'react-i18next'; import { ConditionForm } from './ConditionForm'; import { ActionForm } from './actions/ActionForm'; -import { - ContextualbarScrollableContent, - ContextualbarTitle, - ContextualbarFooter, - ContextualbarHeader, - ContextualbarClose, -} from '../../../components/Contextualbar'; export type TriggersPayload = { name: string; diff --git a/apps/meteor/client/views/omnichannel/triggers/EditTriggerWithData.tsx b/apps/meteor/client/views/omnichannel/triggers/EditTriggerWithData.tsx index c0573a3cb397e..ca16fec36ab80 100644 --- a/apps/meteor/client/views/omnichannel/triggers/EditTriggerWithData.tsx +++ b/apps/meteor/client/views/omnichannel/triggers/EditTriggerWithData.tsx @@ -1,11 +1,11 @@ import type { ILivechatTrigger } from '@rocket.chat/core-typings'; import { Callout } from '@rocket.chat/fuselage'; +import { ContextualbarSkeletonBody } from '@rocket.chat/ui-client'; import { useEndpoint } from '@rocket.chat/ui-contexts'; import { useQuery } from '@tanstack/react-query'; import { useTranslation } from 'react-i18next'; import EditTrigger from './EditTrigger'; -import { ContextualbarSkeletonBody } from '../../../components/Contextualbar'; const EditTriggerWithData = ({ triggerId, onClose }: { triggerId: ILivechatTrigger['_id']; onClose: () => void }) => { const { t } = useTranslation(); diff --git a/apps/meteor/client/views/omnichannel/triggers/TriggersPage.tsx b/apps/meteor/client/views/omnichannel/triggers/TriggersPage.tsx index f9225e533f1bd..5d5d4b044c0ed 100644 --- a/apps/meteor/client/views/omnichannel/triggers/TriggersPage.tsx +++ b/apps/meteor/client/views/omnichannel/triggers/TriggersPage.tsx @@ -1,12 +1,12 @@ import { Button } from '@rocket.chat/fuselage'; import { useEffectEvent } from '@rocket.chat/fuselage-hooks'; +import { ContextualbarDialog } from '@rocket.chat/ui-client'; import { useRouteParameter, useRouter } from '@rocket.chat/ui-contexts'; import { useTranslation } from 'react-i18next'; import EditTrigger from './EditTrigger'; import EditTriggerWithData from './EditTriggerWithData'; import TriggersTable from './TriggersTable'; -import { ContextualbarDialog } from '../../../components/Contextualbar'; import { Page, PageHeader, PageContent } from '../../../components/Page'; const TriggersPage = () => { diff --git a/apps/meteor/client/views/omnichannel/units/UnitEdit.tsx b/apps/meteor/client/views/omnichannel/units/UnitEdit.tsx index cd39c58a48c51..77cab5e92af63 100644 --- a/apps/meteor/client/views/omnichannel/units/UnitEdit.tsx +++ b/apps/meteor/client/views/omnichannel/units/UnitEdit.tsx @@ -8,18 +8,18 @@ import type { import type { SelectOption } from '@rocket.chat/fuselage'; import { FieldError, Field, TextInput, Button, Select, ButtonGroup, FieldGroup, Box, FieldLabel, FieldRow } from '@rocket.chat/fuselage'; import { useEffectEvent } from '@rocket.chat/fuselage-hooks'; -import { useToastMessageDispatch, useTranslation, useEndpoint } from '@rocket.chat/ui-contexts'; -import { useQueryClient } from '@tanstack/react-query'; -import { useId, useMemo } from 'react'; -import { useForm, Controller } from 'react-hook-form'; - import { ContextualbarScrollableContent, ContextualbarFooter, ContextualbarTitle, ContextualbarHeader, ContextualbarClose, -} from '../../../components/Contextualbar'; +} from '@rocket.chat/ui-client'; +import { useToastMessageDispatch, useTranslation, useEndpoint } from '@rocket.chat/ui-contexts'; +import { useQueryClient } from '@tanstack/react-query'; +import { useId, useMemo } from 'react'; +import { useForm, Controller } from 'react-hook-form'; + import AutoCompleteDepartmentMultiple from '../components/AutoCompleteDepartmentMultiple'; import AutoCompleteMonitors from '../components/AutoCompleteMonitors'; diff --git a/apps/meteor/client/views/omnichannel/units/UnitEditWithData.tsx b/apps/meteor/client/views/omnichannel/units/UnitEditWithData.tsx index 67a76d2026e36..72b73148f6e44 100644 --- a/apps/meteor/client/views/omnichannel/units/UnitEditWithData.tsx +++ b/apps/meteor/client/views/omnichannel/units/UnitEditWithData.tsx @@ -1,12 +1,12 @@ import type { IOmnichannelBusinessUnit } from '@rocket.chat/core-typings'; import { Callout } from '@rocket.chat/fuselage'; +import { ContextualbarSkeletonBody } from '@rocket.chat/ui-client'; import { useEndpoint } from '@rocket.chat/ui-contexts'; import { useQuery } from '@tanstack/react-query'; import { useTranslation } from 'react-i18next'; import UnitEdit from './UnitEdit'; import { useRemoveUnit } from './useRemoveUnit'; -import { ContextualbarSkeletonBody } from '../../../components/Contextualbar'; const UnitEditWithData = ({ unitId, onClose }: { unitId: IOmnichannelBusinessUnit['_id']; onClose: () => void }) => { const { t } = useTranslation(); diff --git a/apps/meteor/client/views/omnichannel/units/UnitsPage.tsx b/apps/meteor/client/views/omnichannel/units/UnitsPage.tsx index 4dad68fd7553a..2efd31e6a9a53 100644 --- a/apps/meteor/client/views/omnichannel/units/UnitsPage.tsx +++ b/apps/meteor/client/views/omnichannel/units/UnitsPage.tsx @@ -1,11 +1,11 @@ import { Button, ButtonGroup } from '@rocket.chat/fuselage'; import { useEffectEvent } from '@rocket.chat/fuselage-hooks'; +import { ContextualbarDialog } from '@rocket.chat/ui-client'; import { useTranslation, useRouteParameter, useRouter } from '@rocket.chat/ui-contexts'; import UnitEdit from './UnitEdit'; import UnitEditWithData from './UnitEditWithData'; import UnitsTable from './UnitsTable'; -import { ContextualbarDialog } from '../../../components/Contextualbar'; import { Page, PageHeader, PageContent } from '../../../components/Page'; const UnitsPage = () => { diff --git a/apps/meteor/client/views/outlookCalendar/OutlookEventsList/OutlookEventsList.tsx b/apps/meteor/client/views/outlookCalendar/OutlookEventsList/OutlookEventsList.tsx index f8386bcbbf18e..ae7819b422552 100644 --- a/apps/meteor/client/views/outlookCalendar/OutlookEventsList/OutlookEventsList.tsx +++ b/apps/meteor/client/views/outlookCalendar/OutlookEventsList/OutlookEventsList.tsx @@ -1,12 +1,7 @@ import { Box, States, StatesIcon, StatesTitle, StatesSubtitle, ButtonGroup, Button, Throbber } from '@rocket.chat/fuselage'; import { useResizeObserver } from '@rocket.chat/fuselage-hooks'; -import { VirtualizedScrollbars } from '@rocket.chat/ui-client'; -import { useTranslation, useUser } from '@rocket.chat/ui-contexts'; -import type { ReactElement } from 'react'; -import { Virtuoso } from 'react-virtuoso'; - -import OutlookEventItem from './OutlookEventItem'; import { + VirtualizedScrollbars, ContextualbarHeader, ContextualbarIcon, ContextualbarTitle, @@ -14,7 +9,12 @@ import { ContextualbarContent, ContextualbarFooter, ContextualbarDialog, -} from '../../../components/Contextualbar'; +} from '@rocket.chat/ui-client'; +import { useTranslation, useUser } from '@rocket.chat/ui-contexts'; +import type { ReactElement } from 'react'; +import { Virtuoso } from 'react-virtuoso'; + +import OutlookEventItem from './OutlookEventItem'; import { getErrorMessage } from '../../../lib/errorHandling'; import { useOutlookAuthentication } from '../hooks/useOutlookAuthentication'; import { useMutationOutlookCalendarSync, useOutlookCalendarListForToday } from '../hooks/useOutlookCalendarList'; diff --git a/apps/meteor/client/views/outlookCalendar/OutlookSettingsList/OutlookSettingsList.tsx b/apps/meteor/client/views/outlookCalendar/OutlookSettingsList/OutlookSettingsList.tsx index aec5c39dd632f..3f250a33310ac 100644 --- a/apps/meteor/client/views/outlookCalendar/OutlookSettingsList/OutlookSettingsList.tsx +++ b/apps/meteor/client/views/outlookCalendar/OutlookSettingsList/OutlookSettingsList.tsx @@ -1,9 +1,4 @@ import { ButtonGroup, Button } from '@rocket.chat/fuselage'; -import { useTranslation, useUserPreference, useEndpoint, useToastMessageDispatch } from '@rocket.chat/ui-contexts'; -import type { ReactElement } from 'react'; -import { useCallback } from 'react'; - -import OutlookSettingItem from './OutlookSettingItem'; import { ContextualbarHeader, ContextualbarIcon, @@ -12,7 +7,12 @@ import { ContextualbarContent, ContextualbarFooter, ContextualbarDialog, -} from '../../../components/Contextualbar'; +} from '@rocket.chat/ui-client'; +import { useTranslation, useUserPreference, useEndpoint, useToastMessageDispatch } from '@rocket.chat/ui-contexts'; +import type { ReactElement } from 'react'; +import { useCallback } from 'react'; + +import OutlookSettingItem from './OutlookSettingItem'; import { useOutlookAuthentication, useOutlookAuthenticationMutationLogout } from '../hooks/useOutlookAuthentication'; type OutlookSettingsListProps = { diff --git a/apps/meteor/client/views/room/Room.tsx b/apps/meteor/client/views/room/Room.tsx index 0bdb971b8b1c8..7ea00c277e42c 100644 --- a/apps/meteor/client/views/room/Room.tsx +++ b/apps/meteor/client/views/room/Room.tsx @@ -1,4 +1,4 @@ -import { FeaturePreview, FeaturePreviewOff, FeaturePreviewOn } from '@rocket.chat/ui-client'; +import { FeaturePreview, FeaturePreviewOff, FeaturePreviewOn, ContextualbarSkeleton } from '@rocket.chat/ui-client'; import { useTranslation, useSetting, useRoomToolbox } from '@rocket.chat/ui-contexts'; import type { ReactElement } from 'react'; import { createElement, lazy, memo, Suspense } from 'react'; @@ -17,7 +17,6 @@ import RoomLayout from './layout/RoomLayout'; import ChatProvider from './providers/ChatProvider'; import { DateListProvider } from './providers/DateListProvider'; import { SelectedMessagesProvider } from './providers/SelectedMessagesProvider'; -import { ContextualbarSkeleton } from '../../components/Contextualbar'; const UiKitContextualBar = lazy(() => import('./contextualBar/uikit/UiKitContextualBar')); diff --git a/apps/meteor/client/views/room/contextualBar/AutoTranslate/AutoTranslate.stories.tsx b/apps/meteor/client/views/room/contextualBar/AutoTranslate/AutoTranslate.stories.tsx index 0c355d6bdd0b0..2a11bc599fa83 100644 --- a/apps/meteor/client/views/room/contextualBar/AutoTranslate/AutoTranslate.stories.tsx +++ b/apps/meteor/client/views/room/contextualBar/AutoTranslate/AutoTranslate.stories.tsx @@ -1,7 +1,7 @@ +import { Contextualbar } from '@rocket.chat/ui-client'; import type { Meta, StoryFn } from '@storybook/react'; import AutoTranslate from './AutoTranslate'; -import { Contextualbar } from '../../../../components/Contextualbar'; export default { component: AutoTranslate, diff --git a/apps/meteor/client/views/room/contextualBar/AutoTranslate/AutoTranslate.tsx b/apps/meteor/client/views/room/contextualBar/AutoTranslate/AutoTranslate.tsx index 27b5a83776255..dda8849af7c2e 100644 --- a/apps/meteor/client/views/room/contextualBar/AutoTranslate/AutoTranslate.tsx +++ b/apps/meteor/client/views/room/contextualBar/AutoTranslate/AutoTranslate.tsx @@ -1,8 +1,5 @@ import { Callout, FieldGroup, Field, FieldLabel, FieldRow, ToggleSwitch, Select } from '@rocket.chat/fuselage'; import type { SelectOption } from '@rocket.chat/fuselage'; -import type { ReactElement, ChangeEvent } from 'react'; -import { useTranslation } from 'react-i18next'; - import { ContextualbarClose, ContextualbarTitle, @@ -10,7 +7,10 @@ import { ContextualbarIcon, ContextualbarContent, ContextualbarDialog, -} from '../../../../components/Contextualbar'; +} from '@rocket.chat/ui-client'; +import type { ReactElement, ChangeEvent } from 'react'; +import { useTranslation } from 'react-i18next'; + import { useRoom } from '../../contexts/RoomContext'; type AutoTranslateProps = { diff --git a/apps/meteor/client/views/room/contextualBar/Discussions/DiscussionsList.tsx b/apps/meteor/client/views/room/contextualBar/Discussions/DiscussionsList.tsx index 457a538703667..fec702118669f 100644 --- a/apps/meteor/client/views/room/contextualBar/Discussions/DiscussionsList.tsx +++ b/apps/meteor/client/views/room/contextualBar/Discussions/DiscussionsList.tsx @@ -1,15 +1,8 @@ import type { IDiscussionMessage } from '@rocket.chat/core-typings'; import { Box, Icon, TextInput, Callout, Throbber } from '@rocket.chat/fuselage'; import { useResizeObserver, useAutoFocus } from '@rocket.chat/fuselage-hooks'; -import { VirtualizedScrollbars } from '@rocket.chat/ui-client'; -import { useSetting } from '@rocket.chat/ui-contexts'; -import type { ChangeEvent, MouseEvent, RefObject } from 'react'; -import { useCallback } from 'react'; -import { useTranslation } from 'react-i18next'; -import { Virtuoso } from 'react-virtuoso'; - -import DiscussionsListRow from './DiscussionsListRow'; import { + VirtualizedScrollbars, ContextualbarHeader, ContextualbarIcon, ContextualbarContent, @@ -18,7 +11,14 @@ import { ContextualbarTitle, ContextualbarSection, ContextualbarDialog, -} from '../../../../components/Contextualbar'; +} from '@rocket.chat/ui-client'; +import { useSetting } from '@rocket.chat/ui-contexts'; +import type { ChangeEvent, MouseEvent, RefObject } from 'react'; +import { useCallback } from 'react'; +import { useTranslation } from 'react-i18next'; +import { Virtuoso } from 'react-virtuoso'; + +import DiscussionsListRow from './DiscussionsListRow'; import { goToRoomById } from '../../../../lib/utils/goToRoomById'; type DiscussionsListProps = { diff --git a/apps/meteor/client/views/room/contextualBar/ExportMessages/ExportMessages.stories.tsx b/apps/meteor/client/views/room/contextualBar/ExportMessages/ExportMessages.stories.tsx index a419cd05ffc8d..b01754beccb21 100644 --- a/apps/meteor/client/views/room/contextualBar/ExportMessages/ExportMessages.stories.tsx +++ b/apps/meteor/client/views/room/contextualBar/ExportMessages/ExportMessages.stories.tsx @@ -1,7 +1,7 @@ +import { Contextualbar } from '@rocket.chat/ui-client'; import type { Meta, StoryFn } from '@storybook/react'; import ExportMessages from './index'; -import { Contextualbar } from '../../../../components/Contextualbar'; export default { component: ExportMessages, diff --git a/apps/meteor/client/views/room/contextualBar/ExportMessages/ExportMessages.tsx b/apps/meteor/client/views/room/contextualBar/ExportMessages/ExportMessages.tsx index dd5e9a82c60ee..df5f8a4d900de 100644 --- a/apps/meteor/client/views/room/contextualBar/ExportMessages/ExportMessages.tsx +++ b/apps/meteor/client/views/room/contextualBar/ExportMessages/ExportMessages.tsx @@ -15,6 +15,15 @@ import { Callout, } from '@rocket.chat/fuselage'; import { useAutoFocus } from '@rocket.chat/fuselage-hooks'; +import { + ContextualbarHeader, + ContextualbarScrollableContent, + ContextualbarIcon, + ContextualbarTitle, + ContextualbarClose, + ContextualbarFooter, + ContextualbarDialog, +} from '@rocket.chat/ui-client'; import { usePermission, useRoomToolbox } from '@rocket.chat/ui-contexts'; import { useContext, useEffect, useId, useMemo } from 'react'; import { Controller, useForm } from 'react-hook-form'; @@ -24,15 +33,6 @@ import { useDownloadExportMutation } from './useDownloadExportMutation'; import { useExportMessagesAsPDFMutation } from './useExportMessagesAsPDFMutation'; import { useRoomExportMutation } from './useRoomExportMutation'; import { validateEmail } from '../../../../../lib/emailValidator'; -import { - ContextualbarHeader, - ContextualbarScrollableContent, - ContextualbarIcon, - ContextualbarTitle, - ContextualbarClose, - ContextualbarFooter, - ContextualbarDialog, -} from '../../../../components/Contextualbar'; import UserAutoCompleteMultiple from '../../../../components/UserAutoCompleteMultiple'; import { roomCoordinator } from '../../../../lib/rooms/roomCoordinator'; import { SelectedMessageContext, useCountSelected } from '../../MessageList/contexts/SelectedMessagesContext'; 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 655f9a5f64a15..59c198f669c17 100644 --- a/apps/meteor/client/views/room/contextualBar/Info/EditRoomInfo/EditRoomInfo.tsx +++ b/apps/meteor/client/views/room/contextualBar/Info/EditRoomInfo/EditRoomInfo.tsx @@ -23,6 +23,15 @@ import { AccordionItem, } from '@rocket.chat/fuselage'; import { useEffectEvent } from '@rocket.chat/fuselage-hooks'; +import { + ContextualbarHeader, + ContextualbarBack, + ContextualbarTitle, + ContextualbarClose, + ContextualbarScrollableContent, + ContextualbarFooter, + ContextualbarDialog, +} from '@rocket.chat/ui-client'; import type { TranslationKey } from '@rocket.chat/ui-contexts'; import { useSetting, useTranslation, useToastMessageDispatch, useEndpoint } from '@rocket.chat/ui-contexts'; import { useQueryClient } from '@tanstack/react-query'; @@ -34,15 +43,6 @@ import type { EditRoomInfoFormData } from './useEditRoomInitialValues'; import { useEditRoomInitialValues } from './useEditRoomInitialValues'; import { useEditRoomPermissions } from './useEditRoomPermissions'; import { MessageTypesValues } from '../../../../../../app/lib/lib/MessageTypes'; -import { - ContextualbarHeader, - ContextualbarBack, - ContextualbarTitle, - ContextualbarClose, - ContextualbarScrollableContent, - ContextualbarFooter, - ContextualbarDialog, -} from '../../../../../components/Contextualbar'; import RawText from '../../../../../components/RawText'; import RoomAvatarEditor from '../../../../../components/avatar/RoomAvatarEditor'; import { msToTimeUnit, TIMEUNIT } from '../../../../../lib/convertTimeUnit'; diff --git a/apps/meteor/client/views/room/contextualBar/Info/RoomInfo/RoomInfo.stories.tsx b/apps/meteor/client/views/room/contextualBar/Info/RoomInfo/RoomInfo.stories.tsx index 03a8e0a71447f..4090fddacc82e 100644 --- a/apps/meteor/client/views/room/contextualBar/Info/RoomInfo/RoomInfo.stories.tsx +++ b/apps/meteor/client/views/room/contextualBar/Info/RoomInfo/RoomInfo.stories.tsx @@ -1,10 +1,10 @@ import type { RoomType } from '@rocket.chat/core-typings'; import { mockAppRoot } from '@rocket.chat/mock-providers'; +import { Contextualbar } from '@rocket.chat/ui-client'; import type { Meta, StoryFn } from '@storybook/react'; import RoomInfo from './RoomInfo'; import FakeRoomProvider from '../../../../../../tests/mocks/client/FakeRoomProvider'; -import { Contextualbar } from '../../../../../components/Contextualbar'; export default { component: RoomInfo, diff --git a/apps/meteor/client/views/room/contextualBar/Info/RoomInfo/RoomInfo.tsx b/apps/meteor/client/views/room/contextualBar/Info/RoomInfo/RoomInfo.tsx index 23b2c1eaf2b66..d0b0d0a1484b2 100644 --- a/apps/meteor/client/views/room/contextualBar/Info/RoomInfo/RoomInfo.tsx +++ b/apps/meteor/client/views/room/contextualBar/Info/RoomInfo/RoomInfo.tsx @@ -1,11 +1,8 @@ import type { IRoom } from '@rocket.chat/core-typings'; import { Box, Callout, IconButton } from '@rocket.chat/fuselage'; import { RoomAvatar } from '@rocket.chat/ui-avatar'; -import { GenericMenu } from '@rocket.chat/ui-client'; -import { useTranslation } from 'react-i18next'; - -import RoomInfoActions from './RoomInfoActions'; import { + GenericMenu, ContextualbarHeader, ContextualbarScrollableContent, ContextualbarBack, @@ -13,7 +10,10 @@ import { ContextualbarClose, ContextualbarTitle, ContextualbarDialog, -} from '../../../../../components/Contextualbar'; +} from '@rocket.chat/ui-client'; +import { useTranslation } from 'react-i18next'; + +import RoomInfoActions from './RoomInfoActions'; import { InfoPanel, InfoPanelActionGroup, diff --git a/apps/meteor/client/views/room/contextualBar/KeyboardShortcuts/KeyboardShortcuts.stories.tsx b/apps/meteor/client/views/room/contextualBar/KeyboardShortcuts/KeyboardShortcuts.stories.tsx index 1d41fb8067e7e..b55570bf34b71 100644 --- a/apps/meteor/client/views/room/contextualBar/KeyboardShortcuts/KeyboardShortcuts.stories.tsx +++ b/apps/meteor/client/views/room/contextualBar/KeyboardShortcuts/KeyboardShortcuts.stories.tsx @@ -1,7 +1,7 @@ +import { Contextualbar } from '@rocket.chat/ui-client'; import type { Meta, StoryFn } from '@storybook/react'; import KeyboardShortcutsWithData from './KeyboardShortcutsWithData'; -import { Contextualbar } from '../../../../components/Contextualbar'; export default { component: KeyboardShortcutsWithData, diff --git a/apps/meteor/client/views/room/contextualBar/KeyboardShortcuts/KeyboardShortcuts.tsx b/apps/meteor/client/views/room/contextualBar/KeyboardShortcuts/KeyboardShortcuts.tsx index 2be84ad0d8855..9bc40f2ebb645 100644 --- a/apps/meteor/client/views/room/contextualBar/KeyboardShortcuts/KeyboardShortcuts.tsx +++ b/apps/meteor/client/views/room/contextualBar/KeyboardShortcuts/KeyboardShortcuts.tsx @@ -1,8 +1,3 @@ -import type { ReactElement } from 'react'; -import { memo } from 'react'; -import { useTranslation } from 'react-i18next'; - -import KeyboardShortcutSection from './KeyboardShortcutSection'; import { ContextualbarHeader, ContextualbarIcon, @@ -10,7 +5,12 @@ import { ContextualbarClose, ContextualbarScrollableContent, ContextualbarDialog, -} from '../../../../components/Contextualbar'; +} from '@rocket.chat/ui-client'; +import type { ReactElement } from 'react'; +import { memo } from 'react'; +import { useTranslation } from 'react-i18next'; + +import KeyboardShortcutSection from './KeyboardShortcutSection'; const KeyboardShortcuts = ({ handleClose }: { handleClose: () => void }): ReactElement => { const { t } = useTranslation(); diff --git a/apps/meteor/client/views/room/contextualBar/MessageListTab.tsx b/apps/meteor/client/views/room/contextualBar/MessageListTab.tsx index 8205ff700fc22..16c83d3cacf16 100644 --- a/apps/meteor/client/views/room/contextualBar/MessageListTab.tsx +++ b/apps/meteor/client/views/room/contextualBar/MessageListTab.tsx @@ -2,15 +2,8 @@ import type { IMessage } from '@rocket.chat/core-typings'; import { Box, MessageDivider, Throbber } from '@rocket.chat/fuselage'; import type { Keys as IconName } from '@rocket.chat/icons'; import { MessageTypes } from '@rocket.chat/message-types'; -import { VirtualizedScrollbars } from '@rocket.chat/ui-client'; -import { useUserPreference, useRoomToolbox } from '@rocket.chat/ui-contexts'; -import type { UseQueryResult } from '@tanstack/react-query'; -import type { ReactElement, ReactNode } from 'react'; -import { useCallback } from 'react'; -import { Virtuoso } from 'react-virtuoso'; - -import type { MessageActionContext } from '../../../../app/ui-utils/client/lib/MessageAction'; import { + VirtualizedScrollbars, ContextualbarContent, ContextualbarHeader, ContextualbarIcon, @@ -18,7 +11,14 @@ import { ContextualbarClose, ContextualbarEmptyContent, ContextualbarDialog, -} from '../../../components/Contextualbar'; +} from '@rocket.chat/ui-client'; +import { useUserPreference, useRoomToolbox } from '@rocket.chat/ui-contexts'; +import type { UseQueryResult } from '@tanstack/react-query'; +import type { ReactElement, ReactNode } from 'react'; +import { useCallback } from 'react'; +import { Virtuoso } from 'react-virtuoso'; + +import type { MessageActionContext } from '../../../../app/ui-utils/client/lib/MessageAction'; import RoomMessage from '../../../components/message/variants/RoomMessage'; import SystemMessage from '../../../components/message/variants/SystemMessage'; import { useFormatDate } from '../../../hooks/useFormatDate'; diff --git a/apps/meteor/client/views/room/contextualBar/MessageSearchTab/MessageSearchTab.tsx b/apps/meteor/client/views/room/contextualBar/MessageSearchTab/MessageSearchTab.tsx index 3dfcd5a2c318b..3f2978113f889 100644 --- a/apps/meteor/client/views/room/contextualBar/MessageSearchTab/MessageSearchTab.tsx +++ b/apps/meteor/client/views/room/contextualBar/MessageSearchTab/MessageSearchTab.tsx @@ -1,11 +1,4 @@ import { Callout } from '@rocket.chat/fuselage'; -import { useRoomToolbox } from '@rocket.chat/ui-contexts'; -import { useState } from 'react'; -import { useTranslation } from 'react-i18next'; - -import MessageSearch from './components/MessageSearch'; -import MessageSearchForm from './components/MessageSearchForm'; -import { useMessageSearchProviderQuery } from './hooks/useMessageSearchProviderQuery'; import { ContextualbarClose, ContextualbarContent, @@ -14,7 +7,14 @@ import { ContextualbarIcon, ContextualbarSection, ContextualbarDialog, -} from '../../../../components/Contextualbar'; +} from '@rocket.chat/ui-client'; +import { useRoomToolbox } from '@rocket.chat/ui-contexts'; +import { useState } from 'react'; +import { useTranslation } from 'react-i18next'; + +import MessageSearch from './components/MessageSearch'; +import MessageSearchForm from './components/MessageSearchForm'; +import { useMessageSearchProviderQuery } from './hooks/useMessageSearchProviderQuery'; const MessageSearchTab = () => { const providerQuery = useMessageSearchProviderQuery(); diff --git a/apps/meteor/client/views/room/contextualBar/MessageSearchTab/components/MessageSearch.tsx b/apps/meteor/client/views/room/contextualBar/MessageSearchTab/components/MessageSearch.tsx index 9b3a5883fb77e..d1c9d787560c1 100644 --- a/apps/meteor/client/views/room/contextualBar/MessageSearchTab/components/MessageSearch.tsx +++ b/apps/meteor/client/views/room/contextualBar/MessageSearchTab/components/MessageSearch.tsx @@ -1,12 +1,11 @@ import { Box, MessageDivider } from '@rocket.chat/fuselage'; import { MessageTypes } from '@rocket.chat/message-types'; -import { VirtualizedScrollbars } from '@rocket.chat/ui-client'; +import { VirtualizedScrollbars, ContextualbarEmptyContent } from '@rocket.chat/ui-client'; import { useSetting, useTranslation, useUserPreference } from '@rocket.chat/ui-contexts'; import type { ReactElement } from 'react'; import { Fragment, memo, useState } from 'react'; import { Virtuoso } from 'react-virtuoso'; -import { ContextualbarEmptyContent } from '../../../../../components/Contextualbar'; import RoomMessage from '../../../../../components/message/variants/RoomMessage'; import SystemMessage from '../../../../../components/message/variants/SystemMessage'; import { useFormatDate } from '../../../../../hooks/useFormatDate'; diff --git a/apps/meteor/client/views/room/contextualBar/NotificationPreferences/NotificationPreferences.stories.tsx b/apps/meteor/client/views/room/contextualBar/NotificationPreferences/NotificationPreferences.stories.tsx index d12cca4468d86..07fc1f52eb956 100644 --- a/apps/meteor/client/views/room/contextualBar/NotificationPreferences/NotificationPreferences.stories.tsx +++ b/apps/meteor/client/views/room/contextualBar/NotificationPreferences/NotificationPreferences.stories.tsx @@ -1,8 +1,8 @@ +import { Contextualbar } from '@rocket.chat/ui-client'; import { action } from '@storybook/addon-actions'; import type { Meta, StoryFn } from '@storybook/react'; import NotificationsPreferences from './NotificationPreferences'; -import { Contextualbar } from '../../../../components/Contextualbar'; export default { component: NotificationsPreferences, diff --git a/apps/meteor/client/views/room/contextualBar/NotificationPreferences/NotificationPreferences.tsx b/apps/meteor/client/views/room/contextualBar/NotificationPreferences/NotificationPreferences.tsx index 0ab1921136bc6..0ed2955659e1b 100644 --- a/apps/meteor/client/views/room/contextualBar/NotificationPreferences/NotificationPreferences.tsx +++ b/apps/meteor/client/views/room/contextualBar/NotificationPreferences/NotificationPreferences.tsx @@ -1,10 +1,5 @@ import type { SelectOption } from '@rocket.chat/fuselage'; import { Button, ButtonGroup } from '@rocket.chat/fuselage'; -import type { ReactElement } from 'react'; -import { useFormContext } from 'react-hook-form'; -import { useTranslation } from 'react-i18next'; - -import NotificationPreferencesForm from './NotificationPreferencesForm'; import { ContextualbarHeader, ContextualbarIcon, @@ -13,7 +8,12 @@ import { ContextualbarScrollableContent, ContextualbarFooter, ContextualbarDialog, -} from '../../../../components/Contextualbar'; +} from '@rocket.chat/ui-client'; +import type { ReactElement } from 'react'; +import { useFormContext } from 'react-hook-form'; +import { useTranslation } from 'react-i18next'; + +import NotificationPreferencesForm from './NotificationPreferencesForm'; type NotificationPreferencesProps = { handleClose: () => void; diff --git a/apps/meteor/client/views/room/contextualBar/OTR/OTR.stories.tsx b/apps/meteor/client/views/room/contextualBar/OTR/OTR.stories.tsx index ad6ceeb5a7dee..f83c68a60035d 100644 --- a/apps/meteor/client/views/room/contextualBar/OTR/OTR.stories.tsx +++ b/apps/meteor/client/views/room/contextualBar/OTR/OTR.stories.tsx @@ -1,8 +1,8 @@ +import { Contextualbar } from '@rocket.chat/ui-client'; import type { Meta, StoryFn } from '@storybook/react'; import OTR from './OTR'; import { OtrRoomState } from '../../../../../app/otr/lib/OtrRoomState'; -import { Contextualbar } from '../../../../components/Contextualbar'; export default { component: OTR, diff --git a/apps/meteor/client/views/room/contextualBar/OTR/OTR.tsx b/apps/meteor/client/views/room/contextualBar/OTR/OTR.tsx index 2936a03c6a568..096f80c8a310a 100644 --- a/apps/meteor/client/views/room/contextualBar/OTR/OTR.tsx +++ b/apps/meteor/client/views/room/contextualBar/OTR/OTR.tsx @@ -1,11 +1,5 @@ import type { IUser } from '@rocket.chat/core-typings'; import { Box, Button, Callout, Throbber } from '@rocket.chat/fuselage'; -import type { MouseEventHandler, ReactElement } from 'react'; -import { useTranslation } from 'react-i18next'; - -import OTREstablished from './components/OTREstablished'; -import OTRStates from './components/OTRStates'; -import { OtrRoomState } from '../../../../../app/otr/lib/OtrRoomState'; import { ContextualbarHeader, ContextualbarIcon, @@ -13,7 +7,13 @@ import { ContextualbarClose, ContextualbarScrollableContent, ContextualbarDialog, -} from '../../../../components/Contextualbar'; +} from '@rocket.chat/ui-client'; +import type { MouseEventHandler, ReactElement } from 'react'; +import { useTranslation } from 'react-i18next'; + +import OTREstablished from './components/OTREstablished'; +import OTRStates from './components/OTRStates'; +import { OtrRoomState } from '../../../../../app/otr/lib/OtrRoomState'; import { useRoom } from '../../contexts/RoomContext'; type OTRProps = { diff --git a/apps/meteor/client/views/room/contextualBar/PruneMessages/PruneMessages.stories.tsx b/apps/meteor/client/views/room/contextualBar/PruneMessages/PruneMessages.stories.tsx index e735ce7884476..fe83afc561191 100644 --- a/apps/meteor/client/views/room/contextualBar/PruneMessages/PruneMessages.stories.tsx +++ b/apps/meteor/client/views/room/contextualBar/PruneMessages/PruneMessages.stories.tsx @@ -1,8 +1,8 @@ +import { Contextualbar } from '@rocket.chat/ui-client'; import type { Meta, StoryFn } from '@storybook/react'; import { FormProvider, useForm } from 'react-hook-form'; import PruneMessages from './PruneMessages'; -import { Contextualbar } from '../../../../components/Contextualbar'; export default { component: PruneMessages, diff --git a/apps/meteor/client/views/room/contextualBar/PruneMessages/PruneMessages.tsx b/apps/meteor/client/views/room/contextualBar/PruneMessages/PruneMessages.tsx index 5e4102fd6eb7e..a0089d2875598 100644 --- a/apps/meteor/client/views/room/contextualBar/PruneMessages/PruneMessages.tsx +++ b/apps/meteor/client/views/room/contextualBar/PruneMessages/PruneMessages.tsx @@ -1,9 +1,4 @@ import { Field, FieldLabel, FieldRow, ButtonGroup, Button, CheckBox, Callout } from '@rocket.chat/fuselage'; -import { useId, type ReactElement } from 'react'; -import { useFormContext, Controller } from 'react-hook-form'; -import { useTranslation } from 'react-i18next'; - -import PruneMessagesDateTimeRow from './PruneMessagesDateTimeRow'; import { ContextualbarHeader, ContextualbarIcon, @@ -12,7 +7,12 @@ import { ContextualbarFooter, ContextualbarClose, ContextualbarDialog, -} from '../../../../components/Contextualbar'; +} from '@rocket.chat/ui-client'; +import { useId, type ReactElement } from 'react'; +import { useFormContext, Controller } from 'react-hook-form'; +import { useTranslation } from 'react-i18next'; + +import PruneMessagesDateTimeRow from './PruneMessagesDateTimeRow'; import UserAutoCompleteMultiple from '../../../../components/UserAutoCompleteMultiple'; type PruneMessagesProps = { diff --git a/apps/meteor/client/views/room/contextualBar/RoomFiles/RoomFiles.stories.tsx b/apps/meteor/client/views/room/contextualBar/RoomFiles/RoomFiles.stories.tsx index 8ab4feef60963..bae5571abf330 100644 --- a/apps/meteor/client/views/room/contextualBar/RoomFiles/RoomFiles.stories.tsx +++ b/apps/meteor/client/views/room/contextualBar/RoomFiles/RoomFiles.stories.tsx @@ -1,8 +1,8 @@ +import { Contextualbar } from '@rocket.chat/ui-client'; import { action } from '@storybook/addon-actions'; import type { Meta, StoryFn } from '@storybook/react'; import RoomFiles from './RoomFiles'; -import { Contextualbar } from '../../../../components/Contextualbar'; export default { component: RoomFiles, diff --git a/apps/meteor/client/views/room/contextualBar/RoomFiles/RoomFiles.tsx b/apps/meteor/client/views/room/contextualBar/RoomFiles/RoomFiles.tsx index 7f6b73480675e..851ced24d8664 100644 --- a/apps/meteor/client/views/room/contextualBar/RoomFiles/RoomFiles.tsx +++ b/apps/meteor/client/views/room/contextualBar/RoomFiles/RoomFiles.tsx @@ -1,16 +1,8 @@ import type { IUpload, IUploadWithUser } from '@rocket.chat/core-typings'; import type { SelectOption } from '@rocket.chat/fuselage'; import { Box, Icon, TextInput, Select, Throbber, ContextualbarSection } from '@rocket.chat/fuselage'; -import { VirtualizedScrollbars } from '@rocket.chat/ui-client'; -import type { ChangeEvent } from 'react'; -import { useMemo } from 'react'; -import { useTranslation } from 'react-i18next'; -import { Virtuoso } from 'react-virtuoso'; - -import RoomFileItemWrapper from './RoomFileItemWrapper'; -import RoomFilesListWrapper from './RoomFilesListWrapper'; -import FileItem from './components/FileItem'; import { + VirtualizedScrollbars, ContextualbarHeader, ContextualbarIcon, ContextualbarTitle, @@ -18,7 +10,15 @@ import { ContextualbarContent, ContextualbarEmptyContent, ContextualbarDialog, -} from '../../../../components/Contextualbar'; +} from '@rocket.chat/ui-client'; +import type { ChangeEvent } from 'react'; +import { useMemo } from 'react'; +import { useTranslation } from 'react-i18next'; +import { Virtuoso } from 'react-virtuoso'; + +import RoomFileItemWrapper from './RoomFileItemWrapper'; +import RoomFilesListWrapper from './RoomFilesListWrapper'; +import FileItem from './components/FileItem'; type RoomFilesProps = { loading: boolean; diff --git a/apps/meteor/client/views/room/contextualBar/RoomFiles/components/FileItem.stories.tsx b/apps/meteor/client/views/room/contextualBar/RoomFiles/components/FileItem.stories.tsx index 8f6aa504a5dc1..27fa12c8cc9f6 100644 --- a/apps/meteor/client/views/room/contextualBar/RoomFiles/components/FileItem.stories.tsx +++ b/apps/meteor/client/views/room/contextualBar/RoomFiles/components/FileItem.stories.tsx @@ -1,7 +1,7 @@ +import { Contextualbar } from '@rocket.chat/ui-client'; import type { Meta, StoryFn } from '@storybook/react'; import FileItem from './FileItem'; -import { Contextualbar } from '../../../../../components/Contextualbar'; export default { component: FileItem, diff --git a/apps/meteor/client/views/room/contextualBar/RoomMembers/AddUsers/AddUsers.stories.tsx b/apps/meteor/client/views/room/contextualBar/RoomMembers/AddUsers/AddUsers.stories.tsx index 7097ad96f6778..bd7fc832a759d 100644 --- a/apps/meteor/client/views/room/contextualBar/RoomMembers/AddUsers/AddUsers.stories.tsx +++ b/apps/meteor/client/views/room/contextualBar/RoomMembers/AddUsers/AddUsers.stories.tsx @@ -1,7 +1,7 @@ +import { Contextualbar } from '@rocket.chat/ui-client'; import type { Meta, StoryFn } from '@storybook/react'; import AddUsers from './AddUsers'; -import { Contextualbar } from '../../../../../components/Contextualbar'; export default { component: AddUsers, 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 1d48abd75a962..25af33b5b3d10 100644 --- a/apps/meteor/client/views/room/contextualBar/RoomMembers/AddUsers/AddUsers.tsx +++ b/apps/meteor/client/views/room/contextualBar/RoomMembers/AddUsers/AddUsers.tsx @@ -2,13 +2,6 @@ import type { IRoom } from '@rocket.chat/core-typings'; import { isRoomFederated, isRoomNativeFederated } from '@rocket.chat/core-typings'; import { Field, FieldError, FieldLabel, Button, ButtonGroup, FieldGroup } from '@rocket.chat/fuselage'; import { useEffectEvent } from '@rocket.chat/fuselage-hooks'; -import { useToastMessageDispatch, useMethod, useRoomToolbox } from '@rocket.chat/ui-contexts'; -import { useId } from 'react'; -import type { ReactElement } from 'react'; -import { Controller, useForm } from 'react-hook-form'; -import { useTranslation } from 'react-i18next'; - -import { useAddMatrixUsers } from './AddMatrixUsers/useAddMatrixUsers'; import { ContextualbarHeader, ContextualbarBack, @@ -17,7 +10,14 @@ import { ContextualbarScrollableContent, ContextualbarFooter, ContextualbarDialog, -} from '../../../../../components/Contextualbar'; +} from '@rocket.chat/ui-client'; +import { useToastMessageDispatch, useMethod, useRoomToolbox } from '@rocket.chat/ui-contexts'; +import { useId } from 'react'; +import type { ReactElement } from 'react'; +import { Controller, useForm } from 'react-hook-form'; +import { useTranslation } from 'react-i18next'; + +import { useAddMatrixUsers } from './AddMatrixUsers/useAddMatrixUsers'; import UserAutoCompleteMultiple from '../../../../../components/UserAutoCompleteMultiple'; import UserAutoCompleteMultipleFederated from '../../../../../components/UserAutoCompleteMultiple/UserAutoCompleteMultipleFederated'; import { useRoom } from '../../../contexts/RoomContext'; diff --git a/apps/meteor/client/views/room/contextualBar/RoomMembers/InviteUsers/InviteUsers.stories.tsx b/apps/meteor/client/views/room/contextualBar/RoomMembers/InviteUsers/InviteUsers.stories.tsx index 21e1a5f39c358..10d3feaa5e6b7 100644 --- a/apps/meteor/client/views/room/contextualBar/RoomMembers/InviteUsers/InviteUsers.stories.tsx +++ b/apps/meteor/client/views/room/contextualBar/RoomMembers/InviteUsers/InviteUsers.stories.tsx @@ -1,11 +1,11 @@ import { mockAppRoot } from '@rocket.chat/mock-providers'; +import { Contextualbar } from '@rocket.chat/ui-client'; import type { Meta, StoryFn } from '@storybook/react'; import InviteUsers from './InviteUsers'; import InviteUsersEdit from './InviteUsersEdit'; import InviteUsersError from './InviteUsersError'; import InviteUsersLoading from './InviteUsersLoading'; -import { Contextualbar } from '../../../../../components/Contextualbar'; import { links } from '../../../../../lib/links'; export default { diff --git a/apps/meteor/client/views/room/contextualBar/RoomMembers/InviteUsers/InviteUsersWrapper.tsx b/apps/meteor/client/views/room/contextualBar/RoomMembers/InviteUsers/InviteUsersWrapper.tsx index 611941ad4033a..5678f159d538b 100644 --- a/apps/meteor/client/views/room/contextualBar/RoomMembers/InviteUsers/InviteUsersWrapper.tsx +++ b/apps/meteor/client/views/room/contextualBar/RoomMembers/InviteUsers/InviteUsersWrapper.tsx @@ -1,6 +1,3 @@ -import type { ReactElement } from 'react'; -import { useTranslation } from 'react-i18next'; - import { ContextualbarHeader, ContextualbarTitle, @@ -8,7 +5,9 @@ import { ContextualbarClose, ContextualbarScrollableContent, ContextualbarDialog, -} from '../../../../../components/Contextualbar'; +} from '@rocket.chat/ui-client'; +import type { ReactElement } from 'react'; +import { useTranslation } from 'react-i18next'; type InviteUsersWrapperProps = { children: ReactElement; diff --git a/apps/meteor/client/views/room/contextualBar/RoomMembers/RoomMembers.stories.tsx b/apps/meteor/client/views/room/contextualBar/RoomMembers/RoomMembers.stories.tsx index d7aed0515c6de..01b49187d7b5b 100644 --- a/apps/meteor/client/views/room/contextualBar/RoomMembers/RoomMembers.stories.tsx +++ b/apps/meteor/client/views/room/contextualBar/RoomMembers/RoomMembers.stories.tsx @@ -1,9 +1,9 @@ import { UserStatus } from '@rocket.chat/core-typings'; +import { Contextualbar } from '@rocket.chat/ui-client'; import { action } from '@storybook/addon-actions'; import type { Meta, StoryFn } from '@storybook/react'; import RoomMembers from './RoomMembers'; -import { Contextualbar } from '../../../../components/Contextualbar'; export default { component: RoomMembers, diff --git a/apps/meteor/client/views/room/contextualBar/RoomMembers/RoomMembers.tsx b/apps/meteor/client/views/room/contextualBar/RoomMembers/RoomMembers.tsx index dd337bb26040a..c3827cb5dfa52 100644 --- a/apps/meteor/client/views/room/contextualBar/RoomMembers/RoomMembers.tsx +++ b/apps/meteor/client/views/room/contextualBar/RoomMembers/RoomMembers.tsx @@ -2,15 +2,8 @@ import type { IRoom, IUser, IRole } from '@rocket.chat/core-typings'; import type { SelectOption } from '@rocket.chat/fuselage'; import { Box, Icon, TextInput, Select, Throbber, ButtonGroup, Button, Callout } from '@rocket.chat/fuselage'; import { useAutoFocus, useDebouncedCallback } from '@rocket.chat/fuselage-hooks'; -import { VirtualizedScrollbars } from '@rocket.chat/ui-client'; -import { useTranslation, useSetting } from '@rocket.chat/ui-contexts'; -import type { ReactElement, FormEventHandler, ComponentProps, MouseEvent, ElementType } from 'react'; -import { useMemo } from 'react'; -import { GroupedVirtuoso } from 'react-virtuoso'; - -import { MembersListDivider } from './MembersListDivider'; -import RoomMembersRow from './RoomMembersRow'; import { + VirtualizedScrollbars, ContextualbarHeader, ContextualbarIcon, ContextualbarTitle, @@ -20,7 +13,14 @@ import { ContextualbarEmptyContent, ContextualbarSection, ContextualbarDialog, -} from '../../../../components/Contextualbar'; +} from '@rocket.chat/ui-client'; +import { useTranslation, useSetting } from '@rocket.chat/ui-contexts'; +import type { ReactElement, FormEventHandler, ComponentProps, MouseEvent, ElementType } from 'react'; +import { useMemo } from 'react'; +import { GroupedVirtuoso } from 'react-virtuoso'; + +import { MembersListDivider } from './MembersListDivider'; +import RoomMembersRow from './RoomMembersRow'; import InfiniteListAnchor from '../../../../components/InfiniteListAnchor'; export type RoomMemberUser = Pick & { roles?: IRole['_id'][] }; diff --git a/apps/meteor/client/views/room/contextualBar/Threads/Thread.tsx b/apps/meteor/client/views/room/contextualBar/Threads/Thread.tsx index 1cc2bf08cd2c1..158f4468f1cb7 100644 --- a/apps/meteor/client/views/room/contextualBar/Threads/Thread.tsx +++ b/apps/meteor/client/views/room/contextualBar/Threads/Thread.tsx @@ -2,6 +2,16 @@ import type { IMessage } from '@rocket.chat/core-typings'; import { css } from '@rocket.chat/css-in-js'; import { Box, ModalBackdrop, Skeleton } from '@rocket.chat/fuselage'; import { useLocalStorage } from '@rocket.chat/fuselage-hooks'; +import { + Contextualbar, + ContextualbarHeader, + ContextualbarAction, + ContextualbarActions, + ContextualbarClose, + ContextualbarBack, + ContextualbarInnerContent, + ContextualbarDialog, +} from '@rocket.chat/ui-client'; import { useLayoutContextualBarExpanded, useToastMessageDispatch, @@ -15,16 +25,6 @@ import ThreadSkeleton from './components/ThreadSkeleton'; import ThreadTitle from './components/ThreadTitle'; import { useThreadMainMessageQuery } from './hooks/useThreadMainMessageQuery'; import { useToggleFollowingThreadMutation } from './hooks/useToggleFollowingThreadMutation'; -import { - Contextualbar, - ContextualbarHeader, - ContextualbarAction, - ContextualbarActions, - ContextualbarClose, - ContextualbarBack, - ContextualbarInnerContent, - ContextualbarDialog, -} from '../../../../components/Contextualbar'; import { useGoToThreadList } from '../../hooks/useGoToThreadList'; import ChatProvider from '../../providers/ChatProvider'; diff --git a/apps/meteor/client/views/room/contextualBar/Threads/ThreadList.tsx b/apps/meteor/client/views/room/contextualBar/Threads/ThreadList.tsx index 1c9355c39d69f..4f1b41d1ac48e 100644 --- a/apps/meteor/client/views/room/contextualBar/Threads/ThreadList.tsx +++ b/apps/meteor/client/views/room/contextualBar/Threads/ThreadList.tsx @@ -1,15 +1,8 @@ import type { IMessage, IThreadMainMessage } from '@rocket.chat/core-typings'; import { Box, Icon, TextInput, Select, Callout, Throbber } from '@rocket.chat/fuselage'; import { useResizeObserver, useAutoFocus, useLocalStorage, useDebouncedValue } from '@rocket.chat/fuselage-hooks'; -import { VirtualizedScrollbars } from '@rocket.chat/ui-client'; -import { useTranslation, useUserId, useRoomToolbox } from '@rocket.chat/ui-contexts'; -import type { FormEvent, ReactElement } from 'react'; -import { useMemo, useState, useCallback } from 'react'; -import { Virtuoso } from 'react-virtuoso'; - -import ThreadListItem from './components/ThreadListItem'; -import { useThreadsList } from './hooks/useThreadsList'; import { + VirtualizedScrollbars, ContextualbarClose, ContextualbarContent, ContextualbarHeader, @@ -18,7 +11,14 @@ import { ContextualbarEmptyContent, ContextualbarSection, ContextualbarDialog, -} from '../../../../components/Contextualbar'; +} from '@rocket.chat/ui-client'; +import { useTranslation, useUserId, useRoomToolbox } from '@rocket.chat/ui-contexts'; +import type { FormEvent, ReactElement } from 'react'; +import { useMemo, useState, useCallback } from 'react'; +import { Virtuoso } from 'react-virtuoso'; + +import ThreadListItem from './components/ThreadListItem'; +import { useThreadsList } from './hooks/useThreadsList'; import { useRecordList } from '../../../../hooks/lists/useRecordList'; import { AsyncStatePhase } from '../../../../lib/asyncState'; import { getErrorMessage } from '../../../../lib/errorHandling'; diff --git a/apps/meteor/client/views/room/contextualBar/Threads/components/ThreadChat.tsx b/apps/meteor/client/views/room/contextualBar/Threads/components/ThreadChat.tsx index ab792eef7e28a..2fe5a96eace7b 100644 --- a/apps/meteor/client/views/room/contextualBar/Threads/components/ThreadChat.tsx +++ b/apps/meteor/client/views/room/contextualBar/Threads/components/ThreadChat.tsx @@ -1,12 +1,12 @@ import type { IMessage, IThreadMainMessage } from '@rocket.chat/core-typings'; import { isEditedMessage } from '@rocket.chat/core-typings'; import { Box, CheckBox, Field, FieldLabel, FieldRow } from '@rocket.chat/fuselage'; +import { ContextualbarContent } from '@rocket.chat/ui-client'; import { useMethod, useTranslation, useUserPreference, useRoomToolbox } from '@rocket.chat/ui-contexts'; import { useState, useEffect, useCallback, useId } from 'react'; import ThreadMessageList from './ThreadMessageList'; import { callbacks } from '../../../../../../lib/callbacks'; -import { ContextualbarContent } from '../../../../../components/Contextualbar'; import MessageListErrorBoundary from '../../../MessageList/MessageListErrorBoundary'; import DropTargetOverlay from '../../../body/DropTargetOverlay'; import { useFileUploadDropTarget } from '../../../body/hooks/useFileUploadDropTarget'; diff --git a/apps/meteor/client/views/room/contextualBar/Threads/components/ThreadTitle.tsx b/apps/meteor/client/views/room/contextualBar/Threads/components/ThreadTitle.tsx index e1a6d03798a58..441dad1ee3aaa 100644 --- a/apps/meteor/client/views/room/contextualBar/Threads/components/ThreadTitle.tsx +++ b/apps/meteor/client/views/room/contextualBar/Threads/components/ThreadTitle.tsx @@ -1,7 +1,7 @@ import type { IThreadMainMessage } from '@rocket.chat/core-typings'; +import { ContextualbarTitle } from '@rocket.chat/ui-client'; import { useMemo } from 'react'; -import { ContextualbarTitle } from '../../../../../components/Contextualbar'; import { useNormalizedThreadTitleHtml } from '../hooks/useNormalizedThreadTitleHtml'; type ThreadTitleProps = { diff --git a/apps/meteor/client/views/room/contextualBar/UserInfo/UserInfoWithData.tsx b/apps/meteor/client/views/room/contextualBar/UserInfo/UserInfoWithData.tsx index 22170ac1a1451..7e28c0b4eada7 100644 --- a/apps/meteor/client/views/room/contextualBar/UserInfo/UserInfoWithData.tsx +++ b/apps/meteor/client/views/room/contextualBar/UserInfo/UserInfoWithData.tsx @@ -1,13 +1,5 @@ import type { IUser, IRoom } from '@rocket.chat/core-typings'; import { Callout } from '@rocket.chat/fuselage'; -import { useEndpoint, useRolesDescription } from '@rocket.chat/ui-contexts'; -import { useQuery } from '@tanstack/react-query'; -import type { ReactElement } from 'react'; -import { useMemo } from 'react'; -import { useTranslation } from 'react-i18next'; - -import UserInfoActions from './UserInfoActions'; -import { getUserEmailAddress } from '../../../../../lib/getUserEmailAddress'; import { ContextualbarHeader, ContextualbarBack, @@ -16,7 +8,15 @@ import { ContextualbarClose, ContextualbarContent, ContextualbarDialog, -} from '../../../../components/Contextualbar'; +} from '@rocket.chat/ui-client'; +import { useEndpoint, useRolesDescription } from '@rocket.chat/ui-contexts'; +import { useQuery } from '@tanstack/react-query'; +import type { ReactElement } from 'react'; +import { useMemo } from 'react'; +import { useTranslation } from 'react-i18next'; + +import UserInfoActions from './UserInfoActions'; +import { getUserEmailAddress } from '../../../../../lib/getUserEmailAddress'; import { FormSkeleton } from '../../../../components/Skeleton'; import { UserCardRole } from '../../../../components/UserCard'; import { UserInfo } from '../../../../components/UserInfo'; diff --git a/apps/meteor/client/views/room/contextualBar/VideoConference/VideoConfList/VideoConfList.tsx b/apps/meteor/client/views/room/contextualBar/VideoConference/VideoConfList/VideoConfList.tsx index bb89e8e988b8f..24bb0cfc7395c 100644 --- a/apps/meteor/client/views/room/contextualBar/VideoConference/VideoConfList/VideoConfList.tsx +++ b/apps/meteor/client/views/room/contextualBar/VideoConference/VideoConfList/VideoConfList.tsx @@ -1,13 +1,8 @@ import type { VideoConference } from '@rocket.chat/core-typings'; import { Box, States, StatesIcon, StatesTitle, StatesSubtitle, Throbber } from '@rocket.chat/fuselage'; import { useResizeObserver } from '@rocket.chat/fuselage-hooks'; -import { VirtualizedScrollbars } from '@rocket.chat/ui-client'; -import type { ReactElement } from 'react'; -import { useTranslation } from 'react-i18next'; -import { Virtuoso } from 'react-virtuoso'; - -import VideoConfListItem from './VideoConfListItem'; import { + VirtualizedScrollbars, ContextualbarHeader, ContextualbarIcon, ContextualbarTitle, @@ -15,7 +10,12 @@ import { ContextualbarContent, ContextualbarEmptyContent, ContextualbarDialog, -} from '../../../../../components/Contextualbar'; +} from '@rocket.chat/ui-client'; +import type { ReactElement } from 'react'; +import { useTranslation } from 'react-i18next'; +import { Virtuoso } from 'react-virtuoso'; + +import VideoConfListItem from './VideoConfListItem'; import { getErrorMessage } from '../../../../../lib/errorHandling'; type VideoConfListProps = { diff --git a/apps/meteor/client/views/room/contextualBar/uikit/UiKitContextualBar.tsx b/apps/meteor/client/views/room/contextualBar/uikit/UiKitContextualBar.tsx index 4236e735c782d..419e02734e6d4 100644 --- a/apps/meteor/client/views/room/contextualBar/uikit/UiKitContextualBar.tsx +++ b/apps/meteor/client/views/room/contextualBar/uikit/UiKitContextualBar.tsx @@ -6,13 +6,6 @@ import { contextualBarParser, UiKitContext, } from '@rocket.chat/fuselage-ui-kit'; -import { useRoomToolbox } from '@rocket.chat/ui-contexts'; -import type * as UiKit from '@rocket.chat/ui-kit'; -import { BlockContext } from '@rocket.chat/ui-kit'; -import type { FormEvent, UIEvent } from 'react'; -import { memo } from 'react'; - -import { getURL } from '../../../../../app/utils/client'; import { ContextualbarHeader, ContextualbarTitle, @@ -20,7 +13,14 @@ import { ContextualbarDialog, ContextualbarScrollableContent, ContextualbarFooter, -} from '../../../../components/Contextualbar'; +} from '@rocket.chat/ui-client'; +import { useRoomToolbox } from '@rocket.chat/ui-contexts'; +import type * as UiKit from '@rocket.chat/ui-kit'; +import { BlockContext } from '@rocket.chat/ui-kit'; +import type { FormEvent, UIEvent } from 'react'; +import { memo } from 'react'; + +import { getURL } from '../../../../../app/utils/client'; import { preventSyntheticEvent } from '../../../../lib/utils/preventSyntheticEvent'; import { useContextualBarContextValue } from '../../../../uikit/hooks/useContextualBarContextValue'; import { useUiKitActionManager } from '../../../../uikit/hooks/useUiKitActionManager'; diff --git a/apps/meteor/client/views/teams/contextualBar/channels/TeamsChannels.tsx b/apps/meteor/client/views/teams/contextualBar/channels/TeamsChannels.tsx index c254599d73615..b8130950dd3d4 100644 --- a/apps/meteor/client/views/teams/contextualBar/channels/TeamsChannels.tsx +++ b/apps/meteor/client/views/teams/contextualBar/channels/TeamsChannels.tsx @@ -2,14 +2,8 @@ import type { IRoom } from '@rocket.chat/core-typings'; import type { SelectOption } from '@rocket.chat/fuselage'; import { Box, Icon, TextInput, Select, Throbber, ButtonGroup, Button } from '@rocket.chat/fuselage'; import { useEffectEvent, useAutoFocus, useDebouncedCallback } from '@rocket.chat/fuselage-hooks'; -import { VirtualizedScrollbars } from '@rocket.chat/ui-client'; -import type { ChangeEvent, Dispatch, SetStateAction, SyntheticEvent } from 'react'; -import { useMemo } from 'react'; -import { useTranslation } from 'react-i18next'; -import { Virtuoso } from 'react-virtuoso'; - -import TeamsChannelItem from './TeamsChannelItem'; import { + VirtualizedScrollbars, ContextualbarHeader, ContextualbarIcon, ContextualbarTitle, @@ -19,7 +13,13 @@ import { ContextualbarEmptyContent, ContextualbarSection, ContextualbarDialog, -} from '../../../../components/Contextualbar'; +} from '@rocket.chat/ui-client'; +import type { ChangeEvent, Dispatch, SetStateAction, SyntheticEvent } from 'react'; +import { useMemo } from 'react'; +import { useTranslation } from 'react-i18next'; +import { Virtuoso } from 'react-virtuoso'; + +import TeamsChannelItem from './TeamsChannelItem'; import InfiniteListAnchor from '../../../../components/InfiniteListAnchor'; type TeamsChannelsProps = { diff --git a/apps/meteor/client/views/teams/contextualBar/info/TeamsInfo.stories.tsx b/apps/meteor/client/views/teams/contextualBar/info/TeamsInfo.stories.tsx index 2a9d2aa22ee52..d4ac74b0f891c 100644 --- a/apps/meteor/client/views/teams/contextualBar/info/TeamsInfo.stories.tsx +++ b/apps/meteor/client/views/teams/contextualBar/info/TeamsInfo.stories.tsx @@ -1,8 +1,8 @@ import type { IRoom } from '@rocket.chat/core-typings'; +import { Contextualbar } from '@rocket.chat/ui-client'; import type { Meta, StoryFn } from '@storybook/react'; import TeamsInfo from './TeamsInfo'; -import { Contextualbar } from '../../../../components/Contextualbar'; const room = { _id: 'awdawd', diff --git a/apps/meteor/client/views/teams/contextualBar/info/TeamsInfo.tsx b/apps/meteor/client/views/teams/contextualBar/info/TeamsInfo.tsx index 232ed78756425..a1043cb8de34d 100644 --- a/apps/meteor/client/views/teams/contextualBar/info/TeamsInfo.tsx +++ b/apps/meteor/client/views/teams/contextualBar/info/TeamsInfo.tsx @@ -1,19 +1,19 @@ import type { IRoom } from '@rocket.chat/core-typings'; import { Box, Button, Callout, IconButton } from '@rocket.chat/fuselage'; import { RoomAvatar } from '@rocket.chat/ui-avatar'; -import { GenericMenu } from '@rocket.chat/ui-client'; -import type { ReactElement } from 'react'; -import { useTranslation } from 'react-i18next'; - -import { useTeamActions } from './useTeamActions'; import { + GenericMenu, ContextualbarHeader, ContextualbarIcon, ContextualbarTitle, ContextualbarClose, ContextualbarScrollableContent, ContextualbarDialog, -} from '../../../../components/Contextualbar'; +} from '@rocket.chat/ui-client'; +import type { ReactElement } from 'react'; +import { useTranslation } from 'react-i18next'; + +import { useTeamActions } from './useTeamActions'; import { InfoPanel, InfoPanelAction, diff --git a/apps/meteor/jest.config.ts b/apps/meteor/jest.config.ts index bb6cb59d6b282..07cc07a4bccca 100644 --- a/apps/meteor/jest.config.ts +++ b/apps/meteor/jest.config.ts @@ -21,6 +21,7 @@ export default { '^react($|/.+)': '/node_modules/react$1', '^react-dom($|/.+)': '/node_modules/react-dom$1', '^react-i18next($|/.+)': '/node_modules/react-i18next$1', + '^@rocket.chat/(.+)': '/node_modules/@rocket.chat/$1', '^@tanstack/(.+)': '/node_modules/@tanstack/$1', '^meteor/(.*)': '/tests/mocks/client/meteor.ts', }, diff --git a/packages/ui-client/package.json b/packages/ui-client/package.json index b0895d09e049a..30dbb3a0945f3 100644 --- a/packages/ui-client/package.json +++ b/packages/ui-client/package.json @@ -52,6 +52,7 @@ "jest": "~30.2.0", "overlayscrollbars": "^2.11.4", "overlayscrollbars-react": "^0.5.6", + "re-resizable": "^6.10.1", "react": "~18.3.1", "react-dom": "~18.3.1", "react-hook-form": "~7.45.4", @@ -69,6 +70,7 @@ "@rocket.chat/ui-contexts": "workspace:^", "overlayscrollbars": "*", "overlayscrollbars-react": "*", + "re-resizable": "*", "react": "*", "react-i18next": "*" }, diff --git a/apps/meteor/client/components/Contextualbar/Contextualbar.tsx b/packages/ui-client/src/components/Contextualbar/Contextualbar.tsx similarity index 95% rename from apps/meteor/client/components/Contextualbar/Contextualbar.tsx rename to packages/ui-client/src/components/Contextualbar/Contextualbar.tsx index 7325fe129b342..f8fd734f43f5a 100644 --- a/apps/meteor/client/components/Contextualbar/Contextualbar.tsx +++ b/packages/ui-client/src/components/Contextualbar/Contextualbar.tsx @@ -1,8 +1,9 @@ import { ContextualbarV2, Contextualbar as ContextualbarComponent } from '@rocket.chat/fuselage'; -import { FeaturePreview, FeaturePreviewOff, FeaturePreviewOn } from '@rocket.chat/ui-client'; import type { ComponentProps } from 'react'; import { forwardRef, memo } from 'react'; +import { FeaturePreview, FeaturePreviewOff, FeaturePreviewOn } from '../FeaturePreview'; + const Contextualbar = forwardRef>(function Contextualbar(props, ref) { return ( diff --git a/apps/meteor/client/components/Contextualbar/ContextualbarAction.tsx b/packages/ui-client/src/components/Contextualbar/ContextualbarAction.tsx similarity index 95% rename from apps/meteor/client/components/Contextualbar/ContextualbarAction.tsx rename to packages/ui-client/src/components/Contextualbar/ContextualbarAction.tsx index a8d0fbd04e61f..9981d5046adec 100644 --- a/apps/meteor/client/components/Contextualbar/ContextualbarAction.tsx +++ b/packages/ui-client/src/components/Contextualbar/ContextualbarAction.tsx @@ -1,8 +1,9 @@ import { ContextualbarAction as ContextualbarActionComponent, ContextualbarV2Action } from '@rocket.chat/fuselage'; -import { FeaturePreview, FeaturePreviewOff, FeaturePreviewOn } from '@rocket.chat/ui-client'; import type { ComponentProps } from 'react'; import { memo } from 'react'; +import { FeaturePreview, FeaturePreviewOff, FeaturePreviewOn } from '../FeaturePreview'; + const ContextualbarAction = (props: ComponentProps) => ( diff --git a/apps/meteor/client/components/Contextualbar/ContextualbarActions.tsx b/packages/ui-client/src/components/Contextualbar/ContextualbarActions.tsx similarity index 95% rename from apps/meteor/client/components/Contextualbar/ContextualbarActions.tsx rename to packages/ui-client/src/components/Contextualbar/ContextualbarActions.tsx index a90626827cdee..35438a90eff07 100644 --- a/apps/meteor/client/components/Contextualbar/ContextualbarActions.tsx +++ b/packages/ui-client/src/components/Contextualbar/ContextualbarActions.tsx @@ -1,8 +1,9 @@ import { ContextualbarV2Actions, ContextualbarActions as ContextualbarActionsComponent } from '@rocket.chat/fuselage'; -import { FeaturePreview, FeaturePreviewOff, FeaturePreviewOn } from '@rocket.chat/ui-client'; import type { ComponentProps } from 'react'; import { memo } from 'react'; +import { FeaturePreview, FeaturePreviewOff, FeaturePreviewOn } from '../FeaturePreview'; + const ContextualbarActions = (props: ComponentProps) => ( diff --git a/apps/meteor/client/components/Contextualbar/ContextualbarBack.tsx b/packages/ui-client/src/components/Contextualbar/ContextualbarBack.tsx similarity index 100% rename from apps/meteor/client/components/Contextualbar/ContextualbarBack.tsx rename to packages/ui-client/src/components/Contextualbar/ContextualbarBack.tsx diff --git a/apps/meteor/client/components/Contextualbar/ContextualbarButton.tsx b/packages/ui-client/src/components/Contextualbar/ContextualbarButton.tsx similarity index 95% rename from apps/meteor/client/components/Contextualbar/ContextualbarButton.tsx rename to packages/ui-client/src/components/Contextualbar/ContextualbarButton.tsx index 62562f265cb4c..d3f230f32db04 100644 --- a/apps/meteor/client/components/Contextualbar/ContextualbarButton.tsx +++ b/packages/ui-client/src/components/Contextualbar/ContextualbarButton.tsx @@ -1,8 +1,9 @@ import { ContextualbarV2Button, ContextualbarButton as ContextualbarButtonComponent } from '@rocket.chat/fuselage'; -import { FeaturePreview, FeaturePreviewOff, FeaturePreviewOn } from '@rocket.chat/ui-client'; import type { ComponentProps } from 'react'; import { memo } from 'react'; +import { FeaturePreview, FeaturePreviewOff, FeaturePreviewOn } from '../FeaturePreview'; + const ContextualbarButton = (props: ComponentProps) => ( diff --git a/apps/meteor/client/components/Contextualbar/ContextualbarClose.tsx b/packages/ui-client/src/components/Contextualbar/ContextualbarClose.tsx similarity index 100% rename from apps/meteor/client/components/Contextualbar/ContextualbarClose.tsx rename to packages/ui-client/src/components/Contextualbar/ContextualbarClose.tsx diff --git a/apps/meteor/client/components/Contextualbar/ContextualbarContent.tsx b/packages/ui-client/src/components/Contextualbar/ContextualbarContent.tsx similarity index 96% rename from apps/meteor/client/components/Contextualbar/ContextualbarContent.tsx rename to packages/ui-client/src/components/Contextualbar/ContextualbarContent.tsx index ebaecc789725e..3952ee5d164ae 100644 --- a/apps/meteor/client/components/Contextualbar/ContextualbarContent.tsx +++ b/packages/ui-client/src/components/Contextualbar/ContextualbarContent.tsx @@ -1,8 +1,9 @@ import { ContextualbarV2Content, ContextualbarContent as ContextualbarContentComponent } from '@rocket.chat/fuselage'; -import { FeaturePreview, FeaturePreviewOff, FeaturePreviewOn } from '@rocket.chat/ui-client'; import type { ComponentProps } from 'react'; import { forwardRef, memo } from 'react'; +import { FeaturePreview, FeaturePreviewOff, FeaturePreviewOn } from '../FeaturePreview'; + const ContextualbarContent = forwardRef>( function ContextualbarContent(props, ref) { return ( diff --git a/apps/meteor/client/components/Contextualbar/ContextualbarDialog.tsx b/packages/ui-client/src/components/Contextualbar/ContextualbarDialog.tsx similarity index 98% rename from apps/meteor/client/components/Contextualbar/ContextualbarDialog.tsx rename to packages/ui-client/src/components/Contextualbar/ContextualbarDialog.tsx index d3b0554f4147f..5e90e1ffcb7e9 100644 --- a/apps/meteor/client/components/Contextualbar/ContextualbarDialog.tsx +++ b/packages/ui-client/src/components/Contextualbar/ContextualbarDialog.tsx @@ -1,10 +1,10 @@ -import { FeaturePreview, FeaturePreviewOff, FeaturePreviewOn } from '@rocket.chat/ui-client'; import { useLayoutSizes, useLayoutContextualBarPosition, useRoomToolbox } from '@rocket.chat/ui-contexts'; import type { ComponentProps } from 'react'; import { useCallback, useRef } from 'react'; import type { AriaDialogProps } from 'react-aria'; import { FocusScope, useDialog } from 'react-aria'; +import { FeaturePreview, FeaturePreviewOff, FeaturePreviewOn } from '../FeaturePreview'; import Contextualbar from './Contextualbar'; import ContextualbarResizable from './ContextualbarResizable'; diff --git a/apps/meteor/client/components/Contextualbar/ContextualbarEmptyContent.tsx b/packages/ui-client/src/components/Contextualbar/ContextualbarEmptyContent.tsx similarity index 96% rename from apps/meteor/client/components/Contextualbar/ContextualbarEmptyContent.tsx rename to packages/ui-client/src/components/Contextualbar/ContextualbarEmptyContent.tsx index 63be25a395e99..55d1aecf16ee5 100644 --- a/apps/meteor/client/components/Contextualbar/ContextualbarEmptyContent.tsx +++ b/packages/ui-client/src/components/Contextualbar/ContextualbarEmptyContent.tsx @@ -1,8 +1,9 @@ import { ContextualbarV2EmptyContent, ContextualbarEmptyContent as ContextualbarEmptyContentComponent } from '@rocket.chat/fuselage'; -import { FeaturePreview, FeaturePreviewOff, FeaturePreviewOn } from '@rocket.chat/ui-client'; import type { ComponentProps } from 'react'; import { forwardRef, memo } from 'react'; +import { FeaturePreview, FeaturePreviewOff, FeaturePreviewOn } from '../FeaturePreview'; + const ContextualbarEmptyContent = forwardRef>( function ContextualbarEmptyContent(props, ref) { return ( diff --git a/apps/meteor/client/components/Contextualbar/ContextualbarFooter.tsx b/packages/ui-client/src/components/Contextualbar/ContextualbarFooter.tsx similarity index 96% rename from apps/meteor/client/components/Contextualbar/ContextualbarFooter.tsx rename to packages/ui-client/src/components/Contextualbar/ContextualbarFooter.tsx index b8f6c60265812..9c002bbbb5223 100644 --- a/apps/meteor/client/components/Contextualbar/ContextualbarFooter.tsx +++ b/packages/ui-client/src/components/Contextualbar/ContextualbarFooter.tsx @@ -1,8 +1,9 @@ import { ContextualbarV2Footer, ContextualbarFooter as ContextualbarFooterComponent } from '@rocket.chat/fuselage'; -import { FeaturePreview, FeaturePreviewOff, FeaturePreviewOn } from '@rocket.chat/ui-client'; import type { ComponentProps } from 'react'; import { forwardRef, memo } from 'react'; +import { FeaturePreview, FeaturePreviewOff, FeaturePreviewOn } from '../FeaturePreview'; + const ContextualbarFooter = forwardRef>( function ContextualbarFooter(props, ref) { return ( diff --git a/apps/meteor/client/components/Contextualbar/ContextualbarHeader.tsx b/packages/ui-client/src/components/Contextualbar/ContextualbarHeader.tsx similarity index 96% rename from apps/meteor/client/components/Contextualbar/ContextualbarHeader.tsx rename to packages/ui-client/src/components/Contextualbar/ContextualbarHeader.tsx index 5d289b18dbdae..55830ec976030 100644 --- a/apps/meteor/client/components/Contextualbar/ContextualbarHeader.tsx +++ b/packages/ui-client/src/components/Contextualbar/ContextualbarHeader.tsx @@ -1,8 +1,9 @@ import { ContextualbarV2Header, ContextualbarHeader as ContextualbarHeaderComponent } from '@rocket.chat/fuselage'; -import { FeaturePreview, FeaturePreviewOff, FeaturePreviewOn } from '@rocket.chat/ui-client'; import type { ComponentPropsWithoutRef, ReactNode } from 'react'; import { memo } from 'react'; +import { FeaturePreview, FeaturePreviewOff, FeaturePreviewOn } from '../FeaturePreview'; + type ContextualbarHeaderProps = { expanded?: boolean; children: ReactNode; diff --git a/apps/meteor/client/components/Contextualbar/ContextualbarIcon.tsx b/packages/ui-client/src/components/Contextualbar/ContextualbarIcon.tsx similarity index 95% rename from apps/meteor/client/components/Contextualbar/ContextualbarIcon.tsx rename to packages/ui-client/src/components/Contextualbar/ContextualbarIcon.tsx index 488e4e536b89b..b2a42d00af9b3 100644 --- a/apps/meteor/client/components/Contextualbar/ContextualbarIcon.tsx +++ b/packages/ui-client/src/components/Contextualbar/ContextualbarIcon.tsx @@ -1,8 +1,9 @@ import { ContextualbarV2Icon, ContextualbarIcon as ContextualbarIconComponent } from '@rocket.chat/fuselage'; -import { FeaturePreview, FeaturePreviewOff, FeaturePreviewOn } from '@rocket.chat/ui-client'; import type { ComponentProps } from 'react'; import { memo } from 'react'; +import { FeaturePreview, FeaturePreviewOff, FeaturePreviewOn } from '../FeaturePreview'; + const ContextualbarIcon = (props: ComponentProps) => ( diff --git a/apps/meteor/client/components/Contextualbar/ContextualbarInnerContent.tsx b/packages/ui-client/src/components/Contextualbar/ContextualbarInnerContent.tsx similarity index 100% rename from apps/meteor/client/components/Contextualbar/ContextualbarInnerContent.tsx rename to packages/ui-client/src/components/Contextualbar/ContextualbarInnerContent.tsx diff --git a/apps/meteor/client/components/Contextualbar/ContextualbarResizable.tsx b/packages/ui-client/src/components/Contextualbar/ContextualbarResizable.tsx similarity index 95% rename from apps/meteor/client/components/Contextualbar/ContextualbarResizable.tsx rename to packages/ui-client/src/components/Contextualbar/ContextualbarResizable.tsx index 36e2863df2f7b..1680d1faff866 100644 --- a/apps/meteor/client/components/Contextualbar/ContextualbarResizable.tsx +++ b/packages/ui-client/src/components/Contextualbar/ContextualbarResizable.tsx @@ -20,7 +20,7 @@ const ContextualbarResizable = ({ defaultWidth, children, ...props }: Contextual return ( { + onResize={(_e: any, _dir: any, elRef: HTMLElement) => { setContextualbarWidth(elRef.style.width); }} defaultSize={{ diff --git a/apps/meteor/client/components/Contextualbar/ContextualbarScrollableContent.tsx b/packages/ui-client/src/components/Contextualbar/ContextualbarScrollableContent.tsx similarity index 85% rename from apps/meteor/client/components/Contextualbar/ContextualbarScrollableContent.tsx rename to packages/ui-client/src/components/Contextualbar/ContextualbarScrollableContent.tsx index d5145eaf97c46..e00b1e12e655f 100644 --- a/apps/meteor/client/components/Contextualbar/ContextualbarScrollableContent.tsx +++ b/packages/ui-client/src/components/Contextualbar/ContextualbarScrollableContent.tsx @@ -1,8 +1,10 @@ import { Margins } from '@rocket.chat/fuselage'; -import { FeaturePreview, FeaturePreviewOff, FeaturePreviewOn, PageScrollableContent } from '@rocket.chat/ui-client'; import type { ComponentProps } from 'react'; import { forwardRef, memo } from 'react'; +import { FeaturePreview, FeaturePreviewOff, FeaturePreviewOn } from '../FeaturePreview'; +import { PageScrollableContent } from '../Page'; + const ContextualbarScrollableContent = forwardRef>( function ContextualbarScrollableContent({ children, ...props }, ref) { return ( diff --git a/apps/meteor/client/components/Contextualbar/ContextualbarSection.tsx b/packages/ui-client/src/components/Contextualbar/ContextualbarSection.tsx similarity index 96% rename from apps/meteor/client/components/Contextualbar/ContextualbarSection.tsx rename to packages/ui-client/src/components/Contextualbar/ContextualbarSection.tsx index 0226d214f8257..0928197a5d91e 100644 --- a/apps/meteor/client/components/Contextualbar/ContextualbarSection.tsx +++ b/packages/ui-client/src/components/Contextualbar/ContextualbarSection.tsx @@ -1,8 +1,9 @@ import { ContextualbarV2Section, ContextualbarSection as ContextualbarSectionComponent } from '@rocket.chat/fuselage'; -import { FeaturePreview, FeaturePreviewOff, FeaturePreviewOn } from '@rocket.chat/ui-client'; import type { ComponentProps } from 'react'; import { forwardRef, memo } from 'react'; +import { FeaturePreview, FeaturePreviewOff, FeaturePreviewOn } from '../FeaturePreview'; + const ContextualbarSection = forwardRef>( function ContextualbarSection(props, ref) { return ( diff --git a/apps/meteor/client/components/Contextualbar/ContextualbarSkeleton.tsx b/packages/ui-client/src/components/Contextualbar/ContextualbarSkeleton.tsx similarity index 100% rename from apps/meteor/client/components/Contextualbar/ContextualbarSkeleton.tsx rename to packages/ui-client/src/components/Contextualbar/ContextualbarSkeleton.tsx diff --git a/apps/meteor/client/components/Contextualbar/ContextualbarSkeletonBody.tsx b/packages/ui-client/src/components/Contextualbar/ContextualbarSkeletonBody.tsx similarity index 100% rename from apps/meteor/client/components/Contextualbar/ContextualbarSkeletonBody.tsx rename to packages/ui-client/src/components/Contextualbar/ContextualbarSkeletonBody.tsx diff --git a/apps/meteor/client/components/Contextualbar/ContextualbarTitle.tsx b/packages/ui-client/src/components/Contextualbar/ContextualbarTitle.tsx similarity index 95% rename from apps/meteor/client/components/Contextualbar/ContextualbarTitle.tsx rename to packages/ui-client/src/components/Contextualbar/ContextualbarTitle.tsx index d0570641de39d..78a5f4d89bf3a 100644 --- a/apps/meteor/client/components/Contextualbar/ContextualbarTitle.tsx +++ b/packages/ui-client/src/components/Contextualbar/ContextualbarTitle.tsx @@ -1,7 +1,8 @@ import { ContextualbarV2Title, ContextualbarTitle as ContextualbarTitleComponent } from '@rocket.chat/fuselage'; -import { FeaturePreview, FeaturePreviewOff, FeaturePreviewOn } from '@rocket.chat/ui-client'; import type { ComponentProps } from 'react'; +import { FeaturePreview, FeaturePreviewOff, FeaturePreviewOn } from '../FeaturePreview'; + const ContextualbarTitle = (props: ComponentProps) => ( diff --git a/apps/meteor/client/components/Contextualbar/index.ts b/packages/ui-client/src/components/Contextualbar/index.ts similarity index 100% rename from apps/meteor/client/components/Contextualbar/index.ts rename to packages/ui-client/src/components/Contextualbar/index.ts diff --git a/packages/ui-client/src/components/index.ts b/packages/ui-client/src/components/index.ts index 47dedde3779c2..f802de9b79d02 100644 --- a/packages/ui-client/src/components/index.ts +++ b/packages/ui-client/src/components/index.ts @@ -12,6 +12,7 @@ export * from './Header'; export * from './HeaderV2'; export * from './MultiSelectCustom/MultiSelectCustom'; export * from './FeaturePreview'; +export * from './Contextualbar'; export { default as AnnouncementBanner } from './AnnouncementBanner'; export { default as UserAutoComplete } from './UserAutoComplete'; export * from './GenericMenu'; diff --git a/yarn.lock b/yarn.lock index c351fc51022b2..a8b24edc70dc6 100644 --- a/yarn.lock +++ b/yarn.lock @@ -10310,6 +10310,7 @@ __metadata: jest: "npm:~30.2.0" overlayscrollbars: "npm:^2.11.4" overlayscrollbars-react: "npm:^0.5.6" + re-resizable: "npm:^6.10.1" react: "npm:~18.3.1" react-dom: "npm:~18.3.1" react-hook-form: "npm:~7.45.4" @@ -10326,6 +10327,7 @@ __metadata: "@rocket.chat/ui-contexts": "workspace:^" overlayscrollbars: "*" overlayscrollbars-react: "*" + re-resizable: "*" react: "*" react-i18next: "*" languageName: unknown