diff --git a/apps/meteor/client/components/message/helpers/followSyle.ts b/apps/meteor/client/components/message/helpers/followSyle.ts deleted file mode 100644 index 84bdd1b06df6d..0000000000000 --- a/apps/meteor/client/components/message/helpers/followSyle.ts +++ /dev/null @@ -1,12 +0,0 @@ -import { css } from '@rocket.chat/css-in-js'; - -export const anchor = 'rcx-contextual-message__follow'; - -export const followStyle = css` - & .${anchor} { - opacity: 0; - } - .${anchor}:focus, &:hover .${anchor}, &:focus .${anchor} { - opacity: 1; - } -`; diff --git a/apps/meteor/client/hooks/useFormatNumber.ts b/apps/meteor/client/hooks/useFormatNumber.ts deleted file mode 100644 index 2e1041c95dfa9..0000000000000 --- a/apps/meteor/client/hooks/useFormatNumber.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { useLanguage } from '@rocket.chat/ui-contexts'; -import { useCallback } from 'react'; - -export const useFormatNumber = (options?: Intl.NumberFormatOptions) => { - const language = useLanguage(); - return useCallback( - (value: number) => { - try { - return new Intl.NumberFormat(language, options).format(value); - } catch (_error) { - return value; - } - }, - [language, options], - ); -}; diff --git a/apps/meteor/client/lib/tracker.ts b/apps/meteor/client/lib/tracker.ts deleted file mode 100644 index 2e4e6aab89f4a..0000000000000 --- a/apps/meteor/client/lib/tracker.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { Tracker } from 'meteor/tracker'; - -export const asReactiveSource = (subscribe: (cb: () => void) => () => void, getSnapshot: () => T) => { - if (!Tracker.active) { - return getSnapshot(); - } - - const computation = Tracker.currentComputation; - const unsubscribe = subscribe(() => computation?.invalidate()); - - computation?.onInvalidate(() => { - unsubscribe(); - }); - - return getSnapshot(); -}; diff --git a/apps/meteor/client/lib/utils/domEvents.ts b/apps/meteor/client/lib/utils/domEvents.ts deleted file mode 100644 index 058b67b99cd57..0000000000000 --- a/apps/meteor/client/lib/utils/domEvents.ts +++ /dev/null @@ -1,33 +0,0 @@ -export const delegate = ({ - parent = document, - eventName, - elementSelector, - listener, -}: { - parent?: Document | Element; - eventName: string; - elementSelector: string; - listener: (this: Element, e: Event, currentTarget: Element) => void; -}): (() => void) => { - const effectiveListener = function (this: Document | Element, e: Event): void { - // loop parent nodes from the target to the delegation node - for (let { target } = e; target && target instanceof Element && target !== this; target = target.parentNode) { - if (target.matches(elementSelector)) { - listener.call(target, e, target); - break; - } - } - }; - - parent.addEventListener(eventName, effectiveListener, false); - - return (): void => { - parent.removeEventListener(eventName, effectiveListener, false); - }; -}; - -export const triggerClick = (target: EventTarget | null): void => { - const clickEvent = document.createEvent('HTMLEvents'); - clickEvent.initEvent('click', true, false); - target?.dispatchEvent(clickEvent); -}; diff --git a/apps/meteor/client/providers/EmojiPickerProvider/EmojiPickerProvider.tsx b/apps/meteor/client/providers/EmojiPickerProvider/EmojiPickerProvider.tsx index 70ed30697649b..0fcb5ae6e1a4e 100644 --- a/apps/meteor/client/providers/EmojiPickerProvider/EmojiPickerProvider.tsx +++ b/apps/meteor/client/providers/EmojiPickerProvider/EmojiPickerProvider.tsx @@ -5,7 +5,7 @@ import { useState, useCallback, useMemo, useSyncExternalStore } from 'react'; import { useUpdateCustomEmoji } from './useUpdateCustomEmoji'; import { emoji, getFrequentEmoji, createEmojiListByCategorySubscription } from '../../../app/emoji/client'; import { EmojiPickerContext } from '../../contexts/EmojiPickerContext'; -import EmojiPicker from '../../views/composer/EmojiPicker/EmojiPicker'; +import EmojiPicker from '../../views/composer/EmojiPicker'; const DEFAULT_ITEMS_LIMIT = 90; diff --git a/apps/meteor/client/sidebarv2/header/hooks/useDropdownVisibility.ts b/apps/meteor/client/sidebarv2/header/hooks/useDropdownVisibility.ts deleted file mode 100644 index 390486d1727de..0000000000000 --- a/apps/meteor/client/sidebarv2/header/hooks/useDropdownVisibility.ts +++ /dev/null @@ -1,38 +0,0 @@ -import { useToggle, useOutsideClick } from '@rocket.chat/fuselage-hooks'; -import type { RefObject } from 'react'; -import { useCallback } from 'react'; - -/** - * useDropdownVisibility - * is used to control the visibility of a dropdown - * also checks if the user clicked outside the dropdown, but ignores if the click was on the anchor - * @param {Object} props - * @param {Object} props.reference - The reference where the dropdown will be attached to - * @param {Object} props.target - The target, the dropdown itself - * @returns {Object} - * @returns {Boolean} isVisible - The visibility of the dropdown - * @returns {Function} toggle - The function to toggle the dropdown - */ - -export const useDropdownVisibility = ({ - reference, - target, -}: { - reference: RefObject; - target: RefObject; -}): { - isVisible: boolean; - toggle: (state?: boolean) => void; -} => { - const [isVisible, toggle] = useToggle(false); - - useOutsideClick( - [target, reference], - useCallback(() => toggle(false), [toggle]), - ); - - return { - isVisible, - toggle, - }; -}; diff --git a/apps/meteor/client/views/marketplace/helpers/installApp.ts b/apps/meteor/client/views/marketplace/helpers/installApp.ts deleted file mode 100644 index e1d1256d16e25..0000000000000 --- a/apps/meteor/client/views/marketplace/helpers/installApp.ts +++ /dev/null @@ -1,20 +0,0 @@ -import type { App, AppPermission } from '@rocket.chat/core-typings'; - -import { handleAPIError } from './handleAPIError'; -import { warnAppInstall } from './warnAppInstall'; -import { AppClientOrchestratorInstance } from '../../../apps/orchestrator'; - -type installAppProps = App & { - permissionsGranted?: AppPermission[]; -}; - -export const installApp = async ({ id, name, marketplaceVersion, permissionsGranted }: installAppProps): Promise => { - try { - const { status } = await AppClientOrchestratorInstance.installApp(id, marketplaceVersion, permissionsGranted); - if (status) { - warnAppInstall(name, status); - } - } catch (error) { - handleAPIError(error); - } -}; diff --git a/apps/meteor/client/views/marketplace/helpers/marketplaceActions.ts b/apps/meteor/client/views/marketplace/helpers/marketplaceActions.ts deleted file mode 100644 index afdfa0bec9d8f..0000000000000 --- a/apps/meteor/client/views/marketplace/helpers/marketplaceActions.ts +++ /dev/null @@ -1,8 +0,0 @@ -import { installApp } from './installApp'; -import { updateApp } from './updateApp'; - -export const marketplaceActions = { - purchase: installApp, - install: installApp, - update: updateApp, -}; diff --git a/apps/meteor/client/views/marketplace/helpers/updateApp.ts b/apps/meteor/client/views/marketplace/helpers/updateApp.ts deleted file mode 100644 index d6d558b157300..0000000000000 --- a/apps/meteor/client/views/marketplace/helpers/updateApp.ts +++ /dev/null @@ -1,20 +0,0 @@ -import type { App, AppPermission } from '@rocket.chat/core-typings'; - -import { handleAPIError } from './handleAPIError'; -import { warnStatusChange } from './warnStatusChange'; -import { AppClientOrchestratorInstance } from '../../../apps/orchestrator'; - -type updateAppProps = App & { - permissionsGranted?: AppPermission[]; -}; - -export const updateApp = async ({ id, name, marketplaceVersion, permissionsGranted }: updateAppProps): Promise => { - try { - const { status } = await AppClientOrchestratorInstance.updateApp(id, marketplaceVersion, permissionsGranted); - if (status) { - warnStatusChange(name, status); - } - } catch (error) { - handleAPIError(error); - } -}; diff --git a/apps/meteor/client/views/omnichannel/agents/AgentsPage.tsx b/apps/meteor/client/views/omnichannel/agents/AgentsPage.tsx index 320a3b5f6fa2a..06470aa6d290a 100644 --- a/apps/meteor/client/views/omnichannel/agents/AgentsPage.tsx +++ b/apps/meteor/client/views/omnichannel/agents/AgentsPage.tsx @@ -5,7 +5,7 @@ import { useTranslation } from 'react-i18next'; import AgentEditWithData from './AgentEditWithData'; import AgentInfo from './AgentInfo'; -import AgentsTable from './AgentsTable/AgentsTable'; +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/contactInfo/ContactInfo/ContactInfo.tsx b/apps/meteor/client/views/omnichannel/contactInfo/ContactInfo/ContactInfo.tsx index 933439a926469..a68e4ee48949e 100644 --- a/apps/meteor/client/views/omnichannel/contactInfo/ContactInfo/ContactInfo.tsx +++ b/apps/meteor/client/views/omnichannel/contactInfo/ContactInfo/ContactInfo.tsx @@ -15,7 +15,7 @@ import { import { useFormatDate } from '../../../../hooks/useFormatDate'; import { useContactRoute } from '../../hooks/useContactRoute'; import { useValidCustomFields } from '../hooks/useValidCustomFields'; -import ContactInfoChannels from '../tabs/ContactInfoChannels/ContactInfoChannels'; +import ContactInfoChannels from '../tabs/ContactInfoChannels'; import ContactInfoDetails from '../tabs/ContactInfoDetails'; import ContactInfoHistory from '../tabs/ContactInfoHistory'; diff --git a/apps/meteor/client/views/omnichannel/directory/hooks/useContactRoute.ts b/apps/meteor/client/views/omnichannel/directory/hooks/useContactRoute.ts deleted file mode 100644 index 21de6c8f379f1..0000000000000 --- a/apps/meteor/client/views/omnichannel/directory/hooks/useContactRoute.ts +++ /dev/null @@ -1,45 +0,0 @@ -import type { RouteParameters } from '@rocket.chat/ui-contexts'; -import { useRouter } from '@rocket.chat/ui-contexts'; -import { useCallback, useEffect } from 'react'; - -export const useContactRoute = () => { - const { navigate, getRouteParameters, getRouteName } = useRouter(); - const currentRouteName = getRouteName(); - const currentParams = getRouteParameters(); - - const handleNavigate = useCallback( - (params: RouteParameters) => { - if (!currentRouteName) { - return; - } - - if (currentRouteName === 'omnichannel-directory') { - return navigate({ - name: currentRouteName, - params: { - ...currentParams, - tab: 'contacts', - ...params, - }, - }); - } - - navigate({ - name: currentRouteName, - params: { - ...currentParams, - ...params, - }, - }); - }, - [navigate, currentParams, currentRouteName], - ); - - useEffect(() => { - if (!currentParams.context) { - handleNavigate({ context: 'info' }); - } - }, [currentParams.context, handleNavigate]); - - return handleNavigate; -}; diff --git a/apps/meteor/client/views/omnichannel/queueList/hooks/useQuery.ts b/apps/meteor/client/views/omnichannel/queueList/hooks/useQuery.ts deleted file mode 100644 index 9d296e31991c0..0000000000000 --- a/apps/meteor/client/views/omnichannel/queueList/hooks/useQuery.ts +++ /dev/null @@ -1,52 +0,0 @@ -import type { ILivechatAgent, ILivechatDepartment } from '@rocket.chat/core-typings'; -import { useMemo } from 'react'; - -type useQueryType = ( - debouncedParams: { - servedBy: string; - status: string; - departmentId: ILivechatDepartment['_id']; - itemsPerPage: number; - current: number; - }, - debouncedSort: [string, 'asc' | 'desc'], -) => { - agentId?: ILivechatAgent['_id']; - includeOfflineAgents?: 'true' | 'false'; - departmentId?: ILivechatAgent['_id']; - offset: number; - count: number; - sort: string; -}; - -const sortDir = (sortDir: string): number => (sortDir === 'asc' ? 1 : -1); - -export const useQuery: useQueryType = ({ servedBy, status, departmentId, itemsPerPage, current }, [column, direction]) => - useMemo(() => { - const query: { - agentId?: string; - includeOfflineAgents?: 'true' | 'false'; - departmentId?: string; - sort: string; - count: number; - offset: number; - } = { - sort: JSON.stringify({ - [column]: sortDir(direction), - }), - count: itemsPerPage, - offset: current, - }; - - if (status !== 'online') { - query.includeOfflineAgents = 'true'; - } - if (servedBy) { - query.agentId = servedBy; - } - if (departmentId) { - query.departmentId = departmentId; - } - - return query; - }, [column, direction, itemsPerPage, current, status, servedBy, departmentId]); diff --git a/apps/meteor/client/views/room/RoomOpener.tsx b/apps/meteor/client/views/room/RoomOpener.tsx index 4fc72933022b2..2a8577214f7c8 100644 --- a/apps/meteor/client/views/room/RoomOpener.tsx +++ b/apps/meteor/client/views/room/RoomOpener.tsx @@ -6,8 +6,8 @@ import { lazy, Suspense } from 'react'; import { useTranslation } from 'react-i18next'; import NotSubscribedRoom from './NotSubscribedRoom'; +import RoomSidepanel from './RoomSidepanel'; import RoomSkeleton from './RoomSkeleton'; -import RoomSidepanel from './Sidepanel/RoomSidepanel'; import { useOpenRoom } from './hooks/useOpenRoom'; import { FeaturePreviewSidePanelNavigation } from '../../components/FeaturePreviewSidePanelNavigation'; import { Header } from '../../components/Header'; diff --git a/apps/meteor/client/views/room/RoomOpenerEmbedded.tsx b/apps/meteor/client/views/room/RoomOpenerEmbedded.tsx index 1b58a9d1c318f..95275be740383 100644 --- a/apps/meteor/client/views/room/RoomOpenerEmbedded.tsx +++ b/apps/meteor/client/views/room/RoomOpenerEmbedded.tsx @@ -8,8 +8,8 @@ import { lazy, Suspense, useEffect } from 'react'; import { useTranslation } from 'react-i18next'; import NotSubscribedRoom from './NotSubscribedRoom'; +import RoomSidepanel from './RoomSidepanel'; import RoomSkeleton from './RoomSkeleton'; -import RoomSidepanel from './Sidepanel/RoomSidepanel'; import { useOpenRoom } from './hooks/useOpenRoom'; import { CachedChatSubscription } from '../../../app/models/client'; import { LegacyRoomManager } from '../../../app/ui-utils/client'; diff --git a/apps/meteor/client/views/room/Sidepanel/RoomSidepanel.tsx b/apps/meteor/client/views/room/RoomSidepanel/RoomSidepanel.tsx similarity index 100% rename from apps/meteor/client/views/room/Sidepanel/RoomSidepanel.tsx rename to apps/meteor/client/views/room/RoomSidepanel/RoomSidepanel.tsx diff --git a/apps/meteor/client/views/room/Sidepanel/RoomSidepanelListWrapper.tsx b/apps/meteor/client/views/room/RoomSidepanel/RoomSidepanelListWrapper.tsx similarity index 100% rename from apps/meteor/client/views/room/Sidepanel/RoomSidepanelListWrapper.tsx rename to apps/meteor/client/views/room/RoomSidepanel/RoomSidepanelListWrapper.tsx diff --git a/apps/meteor/client/views/room/Sidepanel/RoomSidepanelLoading.tsx b/apps/meteor/client/views/room/RoomSidepanel/RoomSidepanelLoading.tsx similarity index 100% rename from apps/meteor/client/views/room/Sidepanel/RoomSidepanelLoading.tsx rename to apps/meteor/client/views/room/RoomSidepanel/RoomSidepanelLoading.tsx diff --git a/apps/meteor/client/views/room/Sidepanel/SidepanelItem/RoomSidepanelItem.tsx b/apps/meteor/client/views/room/RoomSidepanel/SidepanelItem/RoomSidepanelItem.tsx similarity index 100% rename from apps/meteor/client/views/room/Sidepanel/SidepanelItem/RoomSidepanelItem.tsx rename to apps/meteor/client/views/room/RoomSidepanel/SidepanelItem/RoomSidepanelItem.tsx diff --git a/apps/meteor/client/views/room/Sidepanel/SidepanelItem/index.ts b/apps/meteor/client/views/room/RoomSidepanel/SidepanelItem/index.ts similarity index 100% rename from apps/meteor/client/views/room/Sidepanel/SidepanelItem/index.ts rename to apps/meteor/client/views/room/RoomSidepanel/SidepanelItem/index.ts diff --git a/apps/meteor/client/views/room/Sidepanel/hooks/useItemData.tsx b/apps/meteor/client/views/room/RoomSidepanel/hooks/useItemData.tsx similarity index 100% rename from apps/meteor/client/views/room/Sidepanel/hooks/useItemData.tsx rename to apps/meteor/client/views/room/RoomSidepanel/hooks/useItemData.tsx diff --git a/apps/meteor/client/views/room/Sidepanel/hooks/useTeamslistChildren.ts b/apps/meteor/client/views/room/RoomSidepanel/hooks/useTeamslistChildren.ts similarity index 100% rename from apps/meteor/client/views/room/Sidepanel/hooks/useTeamslistChildren.ts rename to apps/meteor/client/views/room/RoomSidepanel/hooks/useTeamslistChildren.ts diff --git a/apps/meteor/client/views/room/Sidepanel/index.ts b/apps/meteor/client/views/room/RoomSidepanel/index.ts similarity index 100% rename from apps/meteor/client/views/room/Sidepanel/index.ts rename to apps/meteor/client/views/room/RoomSidepanel/index.ts diff --git a/apps/meteor/server/startup/migrations/v302.ts b/apps/meteor/server/startup/migrations/v302.ts deleted file mode 100644 index d3b9d71888892..0000000000000 --- a/apps/meteor/server/startup/migrations/v302.ts +++ /dev/null @@ -1,9 +0,0 @@ -import { upsertPermissions } from '../../../app/authorization/server/functions/upsertPermissions'; -import { addMigration } from '../../lib/migrations'; - -addMigration({ - version: 302, - async up() { - await upsertPermissions(); - }, -}); diff --git a/ee/packages/ui-theming/src/helpers/convertToCss.ts b/ee/packages/ui-theming/src/helpers/convertToCss.ts deleted file mode 100644 index c3fd479cf2b3d..0000000000000 --- a/ee/packages/ui-theming/src/helpers/convertToCss.ts +++ /dev/null @@ -1,4 +0,0 @@ -export const convertToCss = (values: Record, selector = ':root') => - `${selector} {\n${Object.entries(values) - .map(([name, color]) => `--rcx-color-${name}: ${color};`) - .join('\n')}\n}`; diff --git a/ee/packages/ui-theming/src/helpers/filterOnlyChangedColors.ts b/ee/packages/ui-theming/src/helpers/filterOnlyChangedColors.ts deleted file mode 100644 index b7ce433f091da..0000000000000 --- a/ee/packages/ui-theming/src/helpers/filterOnlyChangedColors.ts +++ /dev/null @@ -1,4 +0,0 @@ -export const filterOnlyChangedColors = ( - originalValues: Record, - newValues: Record, -): Record => Object.fromEntries(Object.entries(newValues).filter(([key, value]) => value !== originalValues[key])); diff --git a/ee/packages/ui-theming/src/helpers/hasChanges.ts b/ee/packages/ui-theming/src/helpers/hasChanges.ts deleted file mode 100644 index c8512289b908c..0000000000000 --- a/ee/packages/ui-theming/src/helpers/hasChanges.ts +++ /dev/null @@ -1,4 +0,0 @@ -import { filterOnlyChangedColors } from './filterOnlyChangedColors'; - -export const hasChanges = (originalValues: Record, newValues: Record): boolean => - Object.entries(filterOnlyChangedColors(originalValues, newValues)).length > 0; diff --git a/ee/packages/ui-theming/src/helpers/isHexColor.ts b/ee/packages/ui-theming/src/helpers/isHexColor.ts deleted file mode 100644 index 9790440c81747..0000000000000 --- a/ee/packages/ui-theming/src/helpers/isHexColor.ts +++ /dev/null @@ -1 +0,0 @@ -export const isHexColor = (hex: string): boolean => typeof hex === 'string' && hex.length === 6 && !isNaN(Number(`0x${hex}`)); diff --git a/ee/packages/ui-theming/src/helpers/isLightColor.ts b/ee/packages/ui-theming/src/helpers/isLightColor.ts deleted file mode 100644 index d51c904c54b4a..0000000000000 --- a/ee/packages/ui-theming/src/helpers/isLightColor.ts +++ /dev/null @@ -1,8 +0,0 @@ -export const isLightColor = (color: string): boolean => { - const hex = color.replace('#', ''); - const r = parseInt(hex.substring(0, 0 + 2), 16); - const g = parseInt(hex.substring(2, 2 + 2), 16); - const b = parseInt(hex.substring(4, 4 + 2), 16); - const brightness = (r * 299 + g * 587 + b * 114) / 1000; - return brightness > 155; -}; diff --git a/ee/packages/ui-theming/src/helpers/sidebarConvertToCss.ts b/ee/packages/ui-theming/src/helpers/sidebarConvertToCss.ts deleted file mode 100644 index d5996e676c9a5..0000000000000 --- a/ee/packages/ui-theming/src/helpers/sidebarConvertToCss.ts +++ /dev/null @@ -1,4 +0,0 @@ -export const sidebarConvertToCss = (values: Record, selector = ':root', prefix = 'sidebar-color') => - `${selector} {\n${Object.entries(values) - .map(([name, color]) => `--rcx-${prefix}-${name}: ${color};`) - .join('\n')}\n}`; diff --git a/ee/packages/ui-theming/src/hooks/useThemeMode.ts b/ee/packages/ui-theming/src/hooks/useThemeMode.ts index ca60d7845d4aa..72a5cb0e78390 100644 --- a/ee/packages/ui-theming/src/hooks/useThemeMode.ts +++ b/ee/packages/ui-theming/src/hooks/useThemeMode.ts @@ -8,7 +8,6 @@ import { useCallback, useState } from 'react'; * @param defaultThemeMode The default theme mode to use if the user has not set any. * @returns [currentThemeMode, setThemeMode, resolvedThemeMode] */ - export const useThemeMode = (): [ThemeMode, (value: ThemeMode) => () => void, Themes] => { const themeMode = useUserPreference('themeAppearence') || 'auto'; @@ -34,5 +33,6 @@ export const useThemeMode = (): [ThemeMode, (value: ThemeMode) => () => void, Th } return 'light'; }; + return [themeMode, setTheme, useTheme()]; }; diff --git a/packages/core-typings/src/IMethodConnection.ts b/packages/core-typings/src/IMethodConnection.ts new file mode 100644 index 0000000000000..5da92394bc361 --- /dev/null +++ b/packages/core-typings/src/IMethodConnection.ts @@ -0,0 +1,7 @@ +export interface IMethodConnection { + id: string; + close(fn: (...args: any[]) => void): void; + onClose(fn: (...args: any[]) => void): void; + clientAddress: string; + httpHeaders: Record; +} diff --git a/packages/core-typings/src/IMethodThisType.ts b/packages/core-typings/src/IMethodThisType.ts deleted file mode 100644 index bf1b9a99a7f6c..0000000000000 --- a/packages/core-typings/src/IMethodThisType.ts +++ /dev/null @@ -1,16 +0,0 @@ -export interface IMethodConnection { - id: string; - close(fn: (...args: any[]) => void): void; - onClose(fn: (...args: any[]) => void): void; - clientAddress: string; - httpHeaders: Record; -} - -export interface IMethodThisType { - isSimulation: boolean; - userId: string | null; - connection: IMethodConnection | null; - setUserId(userId: string): void; - unblock(): void; - twoFactorChecked: boolean | undefined; -} diff --git a/packages/core-typings/src/IMethodType.ts b/packages/core-typings/src/IMethodType.ts deleted file mode 100644 index 7a9b116a429c2..0000000000000 --- a/packages/core-typings/src/IMethodType.ts +++ /dev/null @@ -1,5 +0,0 @@ -import type { IMethodThisType } from './IMethodThisType'; - -export interface IMethodType { - [key: string]: (this: IMethodThisType, ...args: any[]) => any; -} diff --git a/packages/core-typings/src/index.ts b/packages/core-typings/src/index.ts index 289935f548961..69cd0bbce6c3f 100644 --- a/packages/core-typings/src/index.ts +++ b/packages/core-typings/src/index.ts @@ -75,7 +75,7 @@ export * from './IOembed'; export * from './IEmailInbox'; export * from './ILoginServiceConfiguration'; export * from './ISocketConnection'; -export * from './IMethodThisType'; +export * from './IMethodConnection'; export * from './IPassword'; export * from './IBaseData'; export * from './IOAuthApps'; @@ -85,8 +85,6 @@ export * from './IOAuthRefreshToken'; export * from './ISmarshHistory'; export * from './IReport'; -// export * from './IMethodConnection'; - export * from './ldap'; // TODO: move to separated package diff --git a/packages/fuselage-ui-kit/src/blocks/VideoConferenceBlock/index.ts b/packages/fuselage-ui-kit/src/blocks/VideoConferenceBlock/index.ts new file mode 100644 index 0000000000000..b22586cb0999a --- /dev/null +++ b/packages/fuselage-ui-kit/src/blocks/VideoConferenceBlock/index.ts @@ -0,0 +1 @@ +export { default } from './VideoConferenceBlock'; diff --git a/packages/fuselage-ui-kit/src/blocks/VideoConferenceBlock/index.tsx b/packages/fuselage-ui-kit/src/blocks/VideoConferenceBlock/index.tsx deleted file mode 100644 index bbd942c7d3feb..0000000000000 --- a/packages/fuselage-ui-kit/src/blocks/VideoConferenceBlock/index.tsx +++ /dev/null @@ -1,3 +0,0 @@ -import VideoConferenceBlock from './VideoConferenceBlock'; - -export default VideoConferenceBlock; diff --git a/packages/fuselage-ui-kit/src/elements/ContextElement/ContextElement.tsx b/packages/fuselage-ui-kit/src/elements/ContextElement/ContextElement.tsx deleted file mode 100644 index e06da198d3026..0000000000000 --- a/packages/fuselage-ui-kit/src/elements/ContextElement/ContextElement.tsx +++ /dev/null @@ -1,15 +0,0 @@ -import { Box } from '@rocket.chat/fuselage'; -import type * as UiKit from '@rocket.chat/ui-kit'; - -import { ContextElementItem } from './ContextElementItem'; -import type { BlockProps } from '../../utils/BlockProps'; - -type ContextElementProps = BlockProps; - -export const ContextElement = ({ block, surfaceRenderer, className }: ContextElementProps) => ( - - {block.elements.map((element, i) => ( - - ))} - -); diff --git a/packages/fuselage-ui-kit/src/elements/ContextElement/ContextElementItem.tsx b/packages/fuselage-ui-kit/src/elements/ContextElement/ContextElementItem.tsx deleted file mode 100644 index 3642525ad48b8..0000000000000 --- a/packages/fuselage-ui-kit/src/elements/ContextElement/ContextElementItem.tsx +++ /dev/null @@ -1,34 +0,0 @@ -import { Box } from '@rocket.chat/fuselage'; -import type * as UiKit from '@rocket.chat/ui-kit'; -import { BlockContext, ElementType } from '@rocket.chat/ui-kit'; - -import type { BlockProps } from '../../utils/BlockProps'; - -type ContextElementProps = BlockProps; - -type ContextElementItemProps = { - element: ContextElementProps['block']['elements'][number]; - surfaceRenderer: ContextElementProps['surfaceRenderer']; - index: number; -}; - -export const ContextElementItem = ({ element, surfaceRenderer, index }: ContextElementItemProps) => { - const renderedElement = surfaceRenderer.renderContext(element, BlockContext.CONTEXT, undefined, index); - - if (!renderedElement) { - return null; - } - - switch (element.type) { - case ElementType.PLAIN_TEXT: - case ElementType.MARKDOWN: - return ( - - {renderedElement} - - ); - - default: - return <>{renderedElement}; - } -}; diff --git a/packages/fuselage-ui-kit/src/elements/ContextElement/index.ts b/packages/fuselage-ui-kit/src/elements/ContextElement/index.ts deleted file mode 100644 index 65f71e66c9bf1..0000000000000 --- a/packages/fuselage-ui-kit/src/elements/ContextElement/index.ts +++ /dev/null @@ -1 +0,0 @@ -export * from './ContextElement'; diff --git a/packages/fuselage-ui-kit/src/surfaces/FuselageMessageSurfaceRenderer.tsx b/packages/fuselage-ui-kit/src/surfaces/FuselageMessageSurfaceRenderer.tsx index 0365a61d84f4c..b125b0d7d792c 100644 --- a/packages/fuselage-ui-kit/src/surfaces/FuselageMessageSurfaceRenderer.tsx +++ b/packages/fuselage-ui-kit/src/surfaces/FuselageMessageSurfaceRenderer.tsx @@ -2,7 +2,7 @@ import * as UiKit from '@rocket.chat/ui-kit'; import type { ReactElement } from 'react'; import { FuselageSurfaceRenderer, renderTextObject } from './FuselageSurfaceRenderer'; -import VideoConferenceBlock from '../blocks/VideoConferenceBlock/VideoConferenceBlock'; +import VideoConferenceBlock from '../blocks/VideoConferenceBlock'; import { AppIdProvider } from '../contexts/AppIdContext'; export class FuselageMessageSurfaceRenderer extends FuselageSurfaceRenderer { diff --git a/packages/gazzodown/src/elements/Timestamp/ErrorBoundary.tsx b/packages/gazzodown/src/elements/Timestamp/ErrorBoundary.tsx deleted file mode 100644 index a659adec2aa70..0000000000000 --- a/packages/gazzodown/src/elements/Timestamp/ErrorBoundary.tsx +++ /dev/null @@ -1,26 +0,0 @@ -import { Component, ReactNode } from 'react'; - -interface ErrorBoundaryProps { - fallback: ReactNode; - children: ReactNode; -} - -export class ErrorBoundary extends Component { - constructor(props: ErrorBoundaryProps) { - super(props); - this.state = { hasError: false }; - } - - static getDerivedStateFromError(): { hasError: boolean } { - return { hasError: true }; - } - - render(): ReactNode { - if (this.state.hasError) { - // You can render any custom fallback UI - return this.props.fallback; - } - - return this.props.children; - } -} diff --git a/packages/livechat/.storybook/helpers.tsx b/packages/livechat/.storybook/helpers.tsx index b6b4caf98dc3e..0e5c0407ed38a 100644 --- a/packages/livechat/.storybook/helpers.tsx +++ b/packages/livechat/.storybook/helpers.tsx @@ -2,10 +2,10 @@ import { action } from '@storybook/addon-actions'; import type { Decorator } from '@storybook/preact'; import { loremIpsum as originalLoremIpsum } from 'lorem-ipsum'; -import { ScreenContext } from '../src/components/Screen/ScreenProvider'; import gazzoAvatar from './assets/gazzo.jpg'; import martinAvatar from './assets/martin.jpg'; import tassoAvatar from './assets/tasso.jpg'; +import { ScreenContext } from '../src/components/Screen/ScreenProvider'; export const screenDecorator: Decorator = (storyFn) => (
diff --git a/packages/livechat/package.json b/packages/livechat/package.json index 2118c532bdbd5..2d11daeb367fd 100644 --- a/packages/livechat/package.json +++ b/packages/livechat/package.json @@ -17,6 +17,7 @@ "build": "cross-env TS_NODE_PROJECT=\"tsconfig.webpack.json\" webpack-cli --mode production", "dev": "yarn build", "start": "cross-env TS_NODE_PROJECT=\"tsconfig.webpack.json\" webpack-dev-server --mode development", + "lint": "yarn run eslint && yarn run stylelint", "eslint": "eslint --ext .js,.jsx,.ts,.tsx .", "stylelint": "stylelint 'src/**/*.scss'", "storybook": "storybook dev -p 9001 -c .storybook", @@ -43,7 +44,6 @@ "@storybook/theming": "^8.6.14", "@types/babel__core": "^7", "@types/crypto-js": "~4.2.2", - "@types/markdown-it": "^14.1.2", "@types/mini-css-extract-plugin": "~2.5.1", "@types/react": "~18.3.23", "@types/webpack-env": "~1.18.8", @@ -111,7 +111,6 @@ "emoji-mart": "^3.0.1", "history": "~5.3.0", "i18next": "~23.4.9", - "markdown-it": "^14.1.0", "mem": "^8.1.1", "path-to-regexp": "^6.3.0", "preact": "~10.25.4", diff --git a/packages/livechat/src/components/Alert/index.tsx b/packages/livechat/src/components/Alert/index.tsx index 4ae35d4e2fb6a..e95306f6dae78 100644 --- a/packages/livechat/src/components/Alert/index.tsx +++ b/packages/livechat/src/components/Alert/index.tsx @@ -3,9 +3,9 @@ import { useCallback, useEffect } from 'preact/hooks'; import type { JSXInternal } from 'preact/src/jsx'; import { useTranslation } from 'react-i18next'; +import styles from './styles.scss'; import { createClassName } from '../../helpers/createClassName'; import CloseIcon from '../../icons/close.svg'; -import styles from './styles.scss'; type AlertProps = { id?: string; diff --git a/packages/livechat/src/components/App/index.tsx b/packages/livechat/src/components/App/index.tsx index 7d93dc9ae0cb9..a3256717a0ac3 100644 --- a/packages/livechat/src/components/App/index.tsx +++ b/packages/livechat/src/components/App/index.tsx @@ -1,10 +1,10 @@ import { parse } from 'query-string'; +import App from './App'; import ConnectionStatusProvider from '../../providers/ConnectionStatusProvider'; import SDKProvider from '../../providers/SDKProvider'; import ServerProvider from '../../providers/ServerProvider'; import { Provider as StoreProvider, Consumer as StoreConsumer } from '../../store'; -import App from './App'; export const host = window.SERVER_URL ?? parse(window.location.search).serverUrl ?? (process.env.NODE_ENV === 'development' ? 'http://localhost:3000' : null); diff --git a/packages/livechat/src/components/Avatar/index.tsx b/packages/livechat/src/components/Avatar/index.tsx index f112ef70937f6..1cfd930a935b6 100644 --- a/packages/livechat/src/components/Avatar/index.tsx +++ b/packages/livechat/src/components/Avatar/index.tsx @@ -1,8 +1,8 @@ import { Component } from 'preact'; import type { CSSProperties } from 'preact/compat'; -import { createClassName } from '../../helpers/createClassName'; import styles from './styles.scss'; +import { createClassName } from '../../helpers/createClassName'; type AvatarProps = { small?: boolean; diff --git a/packages/livechat/src/components/Button/index.tsx b/packages/livechat/src/components/Button/index.tsx index 337e433592833..20303561fe3e8 100644 --- a/packages/livechat/src/components/Button/index.tsx +++ b/packages/livechat/src/components/Button/index.tsx @@ -3,8 +3,8 @@ import type { CSSProperties } from 'preact/compat'; import type { JSXInternal } from 'preact/src/jsx'; import { useTranslation } from 'react-i18next'; -import { createClassName } from '../../helpers/createClassName'; import styles from './styles.scss'; +import { createClassName } from '../../helpers/createClassName'; const handleMouseUp: JSXInternal.EventHandler> = ({ target }) => (target as HTMLButtonElement)?.blur(); diff --git a/packages/livechat/src/components/ButtonGroup/index.tsx b/packages/livechat/src/components/ButtonGroup/index.tsx index 039e28407dfb2..11896a4533f66 100644 --- a/packages/livechat/src/components/ButtonGroup/index.tsx +++ b/packages/livechat/src/components/ButtonGroup/index.tsx @@ -2,8 +2,8 @@ import type { ComponentChildren } from 'preact'; import { cloneElement, isValidElement, toChildArray } from 'preact'; import { memo } from 'preact/compat'; -import { createClassName } from '../../helpers/createClassName'; import styles from './styles.scss'; +import { createClassName } from '../../helpers/createClassName'; export const ButtonGroup = memo(({ children, full = false }: { children: ComponentChildren; full?: boolean }) => (
diff --git a/packages/livechat/src/components/Calls/CallIFrame.tsx b/packages/livechat/src/components/Calls/CallIFrame.tsx index 8c06e5af31e5a..fd195f7a187d2 100644 --- a/packages/livechat/src/components/Calls/CallIFrame.tsx +++ b/packages/livechat/src/components/Calls/CallIFrame.tsx @@ -1,10 +1,10 @@ import { useEffect } from 'preact/hooks'; +import { CallStatus } from './CallStatus'; +import styles from './styles.scss'; import { getConnectionBaseUrl } from '../../helpers/baseUrl'; import { createClassName } from '../../helpers/createClassName'; import store from '../../store'; -import { CallStatus } from './CallStatus'; -import styles from './styles.scss'; export const CallIframe = () => { const { token, room, incomingCallAlert, ongoingCall } = store.state; diff --git a/packages/livechat/src/components/Composer/ComposerAction/index.tsx b/packages/livechat/src/components/Composer/ComposerAction/index.tsx index 059d47e2bf8d7..1c68b92b295c1 100644 --- a/packages/livechat/src/components/Composer/ComposerAction/index.tsx +++ b/packages/livechat/src/components/Composer/ComposerAction/index.tsx @@ -2,8 +2,8 @@ import type { ComponentChildren } from 'preact'; import type { CSSProperties } from 'preact/compat'; import { memo } from 'preact/compat'; -import { createClassName } from '../../../helpers/createClassName'; import styles from './styles.scss'; +import { createClassName } from '../../../helpers/createClassName'; type ComposerActionProps = { text: string; diff --git a/packages/livechat/src/components/Composer/ComposerActions/index.tsx b/packages/livechat/src/components/Composer/ComposerActions/index.tsx index f6b0cb8acca74..d47ed1743e28d 100644 --- a/packages/livechat/src/components/Composer/ComposerActions/index.tsx +++ b/packages/livechat/src/components/Composer/ComposerActions/index.tsx @@ -2,8 +2,8 @@ import type { ComponentChildren } from 'preact'; import type { CSSProperties } from 'preact/compat'; import { memo } from 'preact/compat'; -import { createClassName } from '../../../helpers/createClassName'; import styles from './styles.scss'; +import { createClassName } from '../../../helpers/createClassName'; type ComposerActionsProps = { className?: string; diff --git a/packages/livechat/src/components/Composer/index.tsx b/packages/livechat/src/components/Composer/index.tsx index aa00055688ea8..75d89f2fd7229 100644 --- a/packages/livechat/src/components/Composer/index.tsx +++ b/packages/livechat/src/components/Composer/index.tsx @@ -1,11 +1,12 @@ +import DOMPurify from 'dompurify'; import type { ComponentChildren } from 'preact'; import { Component } from 'preact'; import type { CSSProperties } from 'preact/compat'; +import styles from './styles.scss'; import { createClassName } from '../../helpers/createClassName'; import { parse } from '../../helpers/parse'; -import DOMPurify from 'dompurify'; -import styles from './styles.scss'; + const findLastTextNode = (node: Node): Node | null => { if (node.nodeType === Node.TEXT_NODE) { return node; diff --git a/packages/livechat/src/components/FilesDropTarget/index.tsx b/packages/livechat/src/components/FilesDropTarget/index.tsx index 7a4d0959d54cf..89e0ea5184e35 100644 --- a/packages/livechat/src/components/FilesDropTarget/index.tsx +++ b/packages/livechat/src/components/FilesDropTarget/index.tsx @@ -1,8 +1,8 @@ import type { ComponentChildren, Ref } from 'preact'; import { useState, type CSSProperties, type ChangeEvent, type TargetedEvent } from 'preact/compat'; -import { createClassName } from '../../helpers/createClassName'; import styles from './styles.scss'; +import { createClassName } from '../../helpers/createClassName'; const escapeForRegExp = (string: string) => string.replace(/[.*+?^${}()|[\]\\]/g, '\\$&'); diff --git a/packages/livechat/src/components/Form/DateInput/index.tsx b/packages/livechat/src/components/Form/DateInput/index.tsx index 97ce3ec74f869..e55cc689ffb60 100644 --- a/packages/livechat/src/components/Form/DateInput/index.tsx +++ b/packages/livechat/src/components/Form/DateInput/index.tsx @@ -2,8 +2,8 @@ import type { Ref } from 'preact'; import { memo, type TargetedEvent } from 'preact/compat'; import type { JSXInternal } from 'preact/src/jsx'; -import { createClassName } from '../../../helpers/createClassName'; import styles from './styles.scss'; +import { createClassName } from '../../../helpers/createClassName'; type DateInputProps = { name?: string; diff --git a/packages/livechat/src/components/Form/FormField/index.tsx b/packages/livechat/src/components/Form/FormField/index.tsx index e28d81b2aa490..678df9af23e25 100644 --- a/packages/livechat/src/components/Form/FormField/index.tsx +++ b/packages/livechat/src/components/Form/FormField/index.tsx @@ -2,8 +2,8 @@ import type { ComponentChildren } from 'preact'; import { cloneElement } from 'preact'; import type { JSXInternal } from 'preact/src/jsx'; -import { createClassName } from '../../../helpers/createClassName'; import styles from './styles.scss'; +import { createClassName } from '../../../helpers/createClassName'; type FormFieldProps = { required?: boolean; diff --git a/packages/livechat/src/components/Form/FormScrollShadow/index.tsx b/packages/livechat/src/components/Form/FormScrollShadow/index.tsx index 912e6007fe0f7..c9b37e6df61ad 100644 --- a/packages/livechat/src/components/Form/FormScrollShadow/index.tsx +++ b/packages/livechat/src/components/Form/FormScrollShadow/index.tsx @@ -1,8 +1,8 @@ import type { ComponentChildren, RefObject } from 'preact'; import { useEffect, useState } from 'preact/hooks'; -import { createClassName } from '../../../helpers/createClassName'; import styles from './styles.scss'; +import { createClassName } from '../../../helpers/createClassName'; export const FormScrollShadow = ({ topRef, diff --git a/packages/livechat/src/components/Form/MultilineTextInput/index.tsx b/packages/livechat/src/components/Form/MultilineTextInput/index.tsx index 655c2c4056e15..18d35f2656e01 100644 --- a/packages/livechat/src/components/Form/MultilineTextInput/index.tsx +++ b/packages/livechat/src/components/Form/MultilineTextInput/index.tsx @@ -2,8 +2,8 @@ import type { Ref } from 'preact'; import type { TargetedEvent } from 'preact/compat'; import type { JSXInternal } from 'preact/src/jsx'; -import { createClassName } from '../../../helpers/createClassName'; import styles from './styles.scss'; +import { createClassName } from '../../../helpers/createClassName'; type MultilineTextInputProps = { rows?: number; diff --git a/packages/livechat/src/components/Form/PasswordInput/index.tsx b/packages/livechat/src/components/Form/PasswordInput/index.tsx index 02f69530ee651..89db787f8ced4 100644 --- a/packages/livechat/src/components/Form/PasswordInput/index.tsx +++ b/packages/livechat/src/components/Form/PasswordInput/index.tsx @@ -2,8 +2,8 @@ import type { Ref } from 'preact'; import type { TargetedEvent } from 'preact/compat'; import type { JSXInternal } from 'preact/src/jsx'; -import { createClassName } from '../../../helpers/createClassName'; import styles from './styles.scss'; +import { createClassName } from '../../../helpers/createClassName'; type PasswordInputProps = { name?: string; diff --git a/packages/livechat/src/components/Form/SelectInput/index.tsx b/packages/livechat/src/components/Form/SelectInput/index.tsx index 3646b0147f3f5..90edd6197ab68 100644 --- a/packages/livechat/src/components/Form/SelectInput/index.tsx +++ b/packages/livechat/src/components/Form/SelectInput/index.tsx @@ -2,9 +2,9 @@ import type { ComponentChild, Ref } from 'preact'; import type { TargetedEvent } from 'preact/compat'; import type { JSXInternal } from 'preact/src/jsx'; +import styles from './styles.scss'; import { createClassName } from '../../../helpers/createClassName'; import ArrowIcon from '../../../icons/arrowDown.svg'; -import styles from './styles.scss'; type SelectInputProps = { name?: string; diff --git a/packages/livechat/src/components/Form/TextInput/index.tsx b/packages/livechat/src/components/Form/TextInput/index.tsx index 48f708a26ec7a..52029c380de61 100644 --- a/packages/livechat/src/components/Form/TextInput/index.tsx +++ b/packages/livechat/src/components/Form/TextInput/index.tsx @@ -2,8 +2,8 @@ import type { Ref } from 'preact'; import type { TargetedEvent } from 'preact/compat'; import type { JSXInternal } from 'preact/src/jsx'; -import { createClassName } from '../../../helpers/createClassName'; import styles from './styles.scss'; +import { createClassName } from '../../../helpers/createClassName'; type TextInputProps = { name?: string; diff --git a/packages/livechat/src/components/Header/index.tsx b/packages/livechat/src/components/Header/index.tsx index d92525482d684..beaabcf705280 100644 --- a/packages/livechat/src/components/Header/index.tsx +++ b/packages/livechat/src/components/Header/index.tsx @@ -2,9 +2,9 @@ import type { ComponentChildren, Ref } from 'preact'; import { toChildArray } from 'preact'; import type { JSXInternal } from 'preact/src/jsx'; +import styles from './styles.scss'; import { type Theme } from '../../Theme'; import { createClassName } from '../../helpers/createClassName'; -import styles from './styles.scss'; type HeaderProps = { children?: ComponentChildren; diff --git a/packages/livechat/src/components/Messages/MessageAvatars/index.tsx b/packages/livechat/src/components/Messages/MessageAvatars/index.tsx index 202fc08d14fe7..f19e03202fd07 100644 --- a/packages/livechat/src/components/Messages/MessageAvatars/index.tsx +++ b/packages/livechat/src/components/Messages/MessageAvatars/index.tsx @@ -1,9 +1,9 @@ import type { CSSProperties } from 'preact/compat'; import { memo } from 'preact/compat'; +import styles from './styles.scss'; import { createClassName } from '../../../helpers/createClassName'; import { Avatar } from '../../Avatar'; -import styles from './styles.scss'; type MessageAvatarsProps = { avatarResolver: (username: string) => string | undefined; diff --git a/packages/livechat/src/components/Messages/MessageBlocks/index.tsx b/packages/livechat/src/components/Messages/MessageBlocks/index.tsx index d08b2360ebc2f..6664b03921bb1 100644 --- a/packages/livechat/src/components/Messages/MessageBlocks/index.tsx +++ b/packages/livechat/src/components/Messages/MessageBlocks/index.tsx @@ -1,10 +1,10 @@ import { memo, useCallback } from 'preact/compat'; +import styles from './styles.scss'; import { createClassName } from '../../../helpers/createClassName'; import { triggerAction, UIKitIncomingInteractionType, UIKitIncomingInteractionContainerType } from '../../../lib/uiKit'; import { renderMessageBlocks } from '../../uiKit'; import Surface from '../../uiKit/message/Surface'; -import styles from './styles.scss'; type MessageBlocksProps = { blocks?: unknown[]; diff --git a/packages/livechat/src/components/Messages/MessageBubble/index.tsx b/packages/livechat/src/components/Messages/MessageBubble/index.tsx index fe86938a4f5a7..a9fd426c3af39 100644 --- a/packages/livechat/src/components/Messages/MessageBubble/index.tsx +++ b/packages/livechat/src/components/Messages/MessageBubble/index.tsx @@ -2,8 +2,8 @@ import type { ComponentChildren } from 'preact'; import type { CSSProperties } from 'preact/compat'; import { memo } from 'preact/compat'; -import { createClassName } from '../../../helpers/createClassName'; import styles from './styles.scss'; +import { createClassName } from '../../../helpers/createClassName'; type MessageBubbleProps = { inverse?: boolean; diff --git a/packages/livechat/src/components/Messages/MessageContainer/index.tsx b/packages/livechat/src/components/Messages/MessageContainer/index.tsx index 1c3e604d04531..b143fc5f5e5cd 100644 --- a/packages/livechat/src/components/Messages/MessageContainer/index.tsx +++ b/packages/livechat/src/components/Messages/MessageContainer/index.tsx @@ -2,8 +2,8 @@ import type { ComponentChildren } from 'preact'; import type { CSSProperties } from 'preact/compat'; import { memo } from 'preact/compat'; -import { createClassName } from '../../../helpers/createClassName'; import styles from './styles.scss'; +import { createClassName } from '../../../helpers/createClassName'; type MessageContainerProps = { id?: string; diff --git a/packages/livechat/src/components/Messages/MessageContent/index.tsx b/packages/livechat/src/components/Messages/MessageContent/index.tsx index 2a4750f54cb43..ba43276b95a3a 100644 --- a/packages/livechat/src/components/Messages/MessageContent/index.tsx +++ b/packages/livechat/src/components/Messages/MessageContent/index.tsx @@ -2,8 +2,8 @@ import type { ComponentChildren } from 'preact'; import type { CSSProperties } from 'preact/compat'; import { memo } from 'preact/compat'; -import { createClassName } from '../../../helpers/createClassName'; import styles from './styles.scss'; +import { createClassName } from '../../../helpers/createClassName'; type MessageContentProps = { reverse?: boolean; diff --git a/packages/livechat/src/components/Messages/MessageSeparator/index.tsx b/packages/livechat/src/components/Messages/MessageSeparator/index.tsx index 1cfdeb2fa93d1..42b69a5e7200a 100644 --- a/packages/livechat/src/components/Messages/MessageSeparator/index.tsx +++ b/packages/livechat/src/components/Messages/MessageSeparator/index.tsx @@ -3,8 +3,8 @@ import type { CSSProperties } from 'preact/compat'; import { memo } from 'preact/compat'; import { withTranslation } from 'react-i18next'; -import { createClassName } from '../../../helpers/createClassName'; import styles from './styles.scss'; +import { createClassName } from '../../../helpers/createClassName'; type MessageSeparatorProps = { date?: string; diff --git a/packages/livechat/src/components/Messages/MessageText/index.tsx b/packages/livechat/src/components/Messages/MessageText/index.tsx index fd0251ba21764..c2c5bf2e09720 100644 --- a/packages/livechat/src/components/Messages/MessageText/index.tsx +++ b/packages/livechat/src/components/Messages/MessageText/index.tsx @@ -1,11 +1,11 @@ import { memo } from 'preact/compat'; import type { JSXInternal } from 'preact/src/jsx'; +import styles from './styles.scss'; import { createClassName } from '../../../helpers/createClassName'; import isBigEmoji from '../../../lib/emoji/isBigEmoji'; import shortnameToUnicode from '../../../lib/emoji/shortnameToUnicode'; import MarkdownBlock from '../../MarkdownBlock'; -import styles from './styles.scss'; type MessageTextProps = { text: string; diff --git a/packages/livechat/src/components/Messages/MessageText/markdown.ts b/packages/livechat/src/components/Messages/MessageText/markdown.ts deleted file mode 100644 index df65ff195568c..0000000000000 --- a/packages/livechat/src/components/Messages/MessageText/markdown.ts +++ /dev/null @@ -1,90 +0,0 @@ -import type { Renderer } from 'markdown-it'; -import MarkdownIt from 'markdown-it'; - -const md = new MarkdownIt({ - html: true, - breaks: true, - linkify: true, - typographer: true, -}); - -const defaultRender = md.renderer.rules.link_open || ((tokens, idx, options, _env, self) => self.renderToken(tokens, idx, options)); - -md.renderer.rules.link_open = (tokens, idx, options, env, self) => { - const targetAttrIndex = tokens[idx].attrIndex('target'); - const relAttrIndex = tokens[idx].attrIndex('rel'); - - if (targetAttrIndex < 0) { - tokens[idx].attrPush(['target', '_blank']); - } else { - const { attrs } = tokens[idx]; - - if (attrs) { - attrs[targetAttrIndex][1] = '_blank'; - } - } - - if (relAttrIndex < 0) { - tokens[idx].attrPush(['rel', 'noopener noreferrer']); - } else { - const { attrs } = tokens[idx]; - - if (attrs) { - attrs[relAttrIndex][1] = 'noopener noreferrer'; - } - } - - return defaultRender(tokens, idx, options, env, self); -}; - -md.use((md) => { - const renderStrong: Renderer.RenderRule = (tokens, idx, opts, _, slf) => { - const token = tokens[idx]; - if (token.markup === '*') { - token.tag = 'strong'; - } - return slf.renderToken(tokens, idx, opts); - }; - - md.renderer.rules.em_open = renderStrong; - md.renderer.rules.em_close = renderStrong; -}); - -md.use((md) => { - md.inline.ruler.push('strikethrough', (state, silent) => { - const marker = state.src.charCodeAt(state.pos); - - if (silent) { - return false; - } - - if (marker !== 0x7e /* ~ */) { - return false; - } - - const scanned = state.scanDelims(state.pos, true); - - const ch = String.fromCharCode(marker); - - const len = scanned.length; - for (let i = 0; i < len; i += 1) { - const token = state.push('text', '', 0); - token.content = ch; - - state.delimiters.push({ - marker, - length: 0, - token: state.tokens.length - 1, - end: -1, - open: scanned.can_open, - close: scanned.can_close, - }); - } - - state.pos += scanned.length; - - return true; - }); -}); - -export const renderMarkdown = (...args: Parameters) => md.render(...args); diff --git a/packages/livechat/src/components/Messages/MessageTime/index.tsx b/packages/livechat/src/components/Messages/MessageTime/index.tsx index aaed2e3eb6214..762e712802f70 100644 --- a/packages/livechat/src/components/Messages/MessageTime/index.tsx +++ b/packages/livechat/src/components/Messages/MessageTime/index.tsx @@ -5,8 +5,8 @@ import type { CSSProperties } from 'preact/compat'; import { memo } from 'preact/compat'; import { withTranslation } from 'react-i18next'; -import { createClassName } from '../../../helpers/createClassName'; import styles from './styles.scss'; +import { createClassName } from '../../../helpers/createClassName'; const parseDate = (ts: number, t: TFunction) => { const timestamp = new Date(ts).toISOString(); diff --git a/packages/livechat/src/components/Messages/TypingDots/index.tsx b/packages/livechat/src/components/Messages/TypingDots/index.tsx index bd28dae56fb90..6c4508e39db42 100644 --- a/packages/livechat/src/components/Messages/TypingDots/index.tsx +++ b/packages/livechat/src/components/Messages/TypingDots/index.tsx @@ -1,7 +1,7 @@ import type { CSSProperties } from 'preact/compat'; -import { createClassName } from '../../../helpers/createClassName'; import styles from './styles.scss'; +import { createClassName } from '../../../helpers/createClassName'; type TypingDotsProps = { text: string; diff --git a/packages/livechat/src/components/Modal/manager.js b/packages/livechat/src/components/Modal/manager.js index c9a31cb5201f4..87a143e670701 100644 --- a/packages/livechat/src/components/Modal/manager.js +++ b/packages/livechat/src/components/Modal/manager.js @@ -1,5 +1,5 @@ -import store from '../../store'; import Modal from './component'; +import store from '../../store'; export default { confirm(props = {}) { diff --git a/packages/livechat/src/components/Modal/stories.tsx b/packages/livechat/src/components/Modal/stories.tsx index 2397bb2b39718..6daa1e54f887a 100644 --- a/packages/livechat/src/components/Modal/stories.tsx +++ b/packages/livechat/src/components/Modal/stories.tsx @@ -2,8 +2,8 @@ import { action } from '@storybook/addon-actions'; import type { Meta, StoryFn } from '@storybook/preact'; import type { ComponentProps } from 'preact'; -import { loremIpsum } from '../../../.storybook/helpers'; import Modal from './component'; +import { loremIpsum } from '../../../.storybook/helpers'; export default { title: 'Components/Modal', diff --git a/packages/livechat/src/components/Popover/index.js b/packages/livechat/src/components/Popover/index.js index 9bf8f23632636..e26de41c1cbe8 100644 --- a/packages/livechat/src/components/Popover/index.js +++ b/packages/livechat/src/components/Popover/index.js @@ -1,8 +1,8 @@ import { Component, createContext } from 'preact'; +import styles from './styles.scss'; import { createClassName } from '../../helpers/createClassName'; import { normalizeDOMRect } from '../../helpers/normalizeDOMRect'; -import styles from './styles.scss'; const PopoverContext = createContext(); diff --git a/packages/livechat/src/components/Tooltip/index.js b/packages/livechat/src/components/Tooltip/index.js index 3b2d36f3609a5..b16907c51430f 100644 --- a/packages/livechat/src/components/Tooltip/index.js +++ b/packages/livechat/src/components/Tooltip/index.js @@ -1,7 +1,7 @@ import { cloneElement, Component, createContext, toChildArray } from 'preact'; -import { createClassName } from '../../helpers/createClassName'; import styles from './styles.scss'; +import { createClassName } from '../../helpers/createClassName'; const getPositioningStyle = (placement, { left, top, right, bottom }) => { switch (placement) { diff --git a/packages/livechat/src/components/uiKit/message/ImageElement/index.tsx b/packages/livechat/src/components/uiKit/message/ImageElement/index.tsx index 1c8f698c2bc8e..320467818eeec 100644 --- a/packages/livechat/src/components/uiKit/message/ImageElement/index.tsx +++ b/packages/livechat/src/components/uiKit/message/ImageElement/index.tsx @@ -1,8 +1,8 @@ import * as uikit from '@rocket.chat/ui-kit'; import { memo } from 'preact/compat'; -import { createClassName } from '../../../../helpers/createClassName'; import styles from './styles.scss'; +import { createClassName } from '../../../../helpers/createClassName'; type ImageElementProps = uikit.ImageElement & { context: uikit.BlockContext; diff --git a/packages/livechat/src/components/uiKit/message/Mrkdwn/index.tsx b/packages/livechat/src/components/uiKit/message/Mrkdwn/index.tsx index 74a84d15fbd0f..1a23bd19e2b4c 100644 --- a/packages/livechat/src/components/uiKit/message/Mrkdwn/index.tsx +++ b/packages/livechat/src/components/uiKit/message/Mrkdwn/index.tsx @@ -1,9 +1,9 @@ import { memo } from 'preact/compat'; +import styles from './styles.scss'; import { createClassName } from '../../../../helpers/createClassName'; import shortnameToUnicode from '../../../../lib/emoji/shortnameToUnicode'; import MarkdownBlock from '../../../MarkdownBlock'; -import styles from './styles.scss'; const Mrkdwn = ({ text /* , verbatim = false */ }: { text: string }) => { return ( diff --git a/packages/livechat/src/components/uiKit/message/PlainText/index.tsx b/packages/livechat/src/components/uiKit/message/PlainText/index.tsx index e5cb6986359f4..4fa7adf90af32 100644 --- a/packages/livechat/src/components/uiKit/message/PlainText/index.tsx +++ b/packages/livechat/src/components/uiKit/message/PlainText/index.tsx @@ -1,9 +1,9 @@ import { memo } from 'preact/compat'; +import styles from './styles.scss'; import { createClassName } from '../../../../helpers/createClassName'; import shortnameToUnicode from '../../../../lib/emoji/shortnameToUnicode'; import MarkdownBlock from '../../../MarkdownBlock'; -import styles from './styles.scss'; const PlainText = ({ text, emoji = false }: { text: string; emoji?: boolean }) => { return ( diff --git a/packages/livechat/src/components/uiKit/message/SectionBlock.stories.tsx b/packages/livechat/src/components/uiKit/message/SectionBlock.stories.tsx index 5dba685e87c7b..23c656a425d7b 100644 --- a/packages/livechat/src/components/uiKit/message/SectionBlock.stories.tsx +++ b/packages/livechat/src/components/uiKit/message/SectionBlock.stories.tsx @@ -2,9 +2,9 @@ import { action } from '@storybook/addon-actions'; import type { Meta } from '@storybook/preact'; import { renderMessageBlocks } from '.'; +import Surface from './Surface'; import { accessoryImage } from '../../../../.storybook/helpers'; import { PopoverContainer } from '../../Popover'; -import Surface from './Surface'; export default { title: 'UiKit/Message/Section block', diff --git a/packages/livechat/src/helpers/asyncForEach.ts b/packages/livechat/src/helpers/asyncForEach.ts deleted file mode 100644 index a48cc7b8a6cc0..0000000000000 --- a/packages/livechat/src/helpers/asyncForEach.ts +++ /dev/null @@ -1,6 +0,0 @@ -export const asyncForEach = async (array: T[], callback: (item: T, index: number, array: T[]) => Promise) => { - for (let index = 0; index < array.length; index++) { - // eslint-disable-next-line no-await-in-loop - await callback(array[index], index, array); - } -}; diff --git a/packages/livechat/src/routes/Chat/stories.tsx b/packages/livechat/src/routes/Chat/stories.tsx index 12d4e7758a5e7..54e5168e5bd74 100644 --- a/packages/livechat/src/routes/Chat/stories.tsx +++ b/packages/livechat/src/routes/Chat/stories.tsx @@ -2,8 +2,8 @@ import { action } from '@storybook/addon-actions'; import type { Meta, StoryFn } from '@storybook/preact'; import type { ComponentProps } from 'preact'; -import { avatarResolver, beepAudio, screenDecorator } from '../../../.storybook/helpers'; import Chat from './component'; +import { avatarResolver, beepAudio, screenDecorator } from '../../../.storybook/helpers'; const now = new Date(Date.parse('2021-01-01T00:00:00.000Z')); diff --git a/packages/livechat/src/routes/ChatFinished/component.tsx b/packages/livechat/src/routes/ChatFinished/component.tsx index f657df85a429a..4f46f1ddc6c01 100644 --- a/packages/livechat/src/routes/ChatFinished/component.tsx +++ b/packages/livechat/src/routes/ChatFinished/component.tsx @@ -1,11 +1,11 @@ import { withTranslation } from 'react-i18next'; +import styles from './styles.scss'; import { Button } from '../../components/Button'; import { ButtonGroup } from '../../components/ButtonGroup'; import Screen from '../../components/Screen'; import { createClassName } from '../../helpers/createClassName'; import Triggers from '../../lib/triggers'; -import styles from './styles.scss'; type ChatFinishedProps = { title: string; diff --git a/packages/livechat/src/routes/ChatFinished/container.tsx b/packages/livechat/src/routes/ChatFinished/container.tsx index b19481fb221d4..536371001eb0a 100644 --- a/packages/livechat/src/routes/ChatFinished/container.tsx +++ b/packages/livechat/src/routes/ChatFinished/container.tsx @@ -1,11 +1,11 @@ import type { TFunction } from 'i18next'; import type { FunctionalComponent } from 'preact'; -import { route } from 'preact-router'; import { useContext } from 'preact/hooks'; +import { route } from 'preact-router'; import { withTranslation } from 'react-i18next'; -import { StoreContext } from '../../store'; import ChatFinished from './component'; +import { StoreContext } from '../../store'; const ChatFinishedContainer: FunctionalComponent<{ path: string; t: TFunction }> = ({ ref, t }) => { const { diff --git a/packages/livechat/src/routes/ChatFinished/stories.tsx b/packages/livechat/src/routes/ChatFinished/stories.tsx index 956a40ac338ff..5d9644bcfba1a 100644 --- a/packages/livechat/src/routes/ChatFinished/stories.tsx +++ b/packages/livechat/src/routes/ChatFinished/stories.tsx @@ -2,8 +2,8 @@ import { action } from '@storybook/addon-actions'; import type { Meta, StoryFn } from '@storybook/preact'; import type { ComponentProps } from 'preact'; -import { loremIpsum, screenDecorator } from '../../../.storybook/helpers'; import ChatFinished from './component'; +import { loremIpsum, screenDecorator } from '../../../.storybook/helpers'; export default { title: 'Routes/ChatFinished', diff --git a/packages/livechat/src/routes/GDPRAgreement/component.tsx b/packages/livechat/src/routes/GDPRAgreement/component.tsx index b18988baafd52..a545aa10f39ea 100644 --- a/packages/livechat/src/routes/GDPRAgreement/component.tsx +++ b/packages/livechat/src/routes/GDPRAgreement/component.tsx @@ -2,12 +2,12 @@ import type { TFunction } from 'i18next'; import { Component } from 'preact'; import { Trans, withTranslation } from 'react-i18next'; +import styles from './styles.scss'; import { Button } from '../../components/Button'; import { ButtonGroup } from '../../components/ButtonGroup'; import MarkdownBlock from '../../components/MarkdownBlock'; import Screen from '../../components/Screen'; import { createClassName } from '../../helpers/createClassName'; -import styles from './styles.scss'; type GDPRProps = { title: string; diff --git a/packages/livechat/src/routes/GDPRAgreement/container.tsx b/packages/livechat/src/routes/GDPRAgreement/container.tsx index 8dcbb83009b23..b85fb5692dc39 100644 --- a/packages/livechat/src/routes/GDPRAgreement/container.tsx +++ b/packages/livechat/src/routes/GDPRAgreement/container.tsx @@ -1,11 +1,11 @@ import type { TFunction } from 'i18next'; import type { FunctionalComponent } from 'preact'; -import { route } from 'preact-router'; import { useContext } from 'preact/hooks'; +import { route } from 'preact-router'; import { withTranslation } from 'react-i18next'; -import { StoreContext } from '../../store'; import GDPRAgreement from './component'; +import { StoreContext } from '../../store'; const GDPRContainer: FunctionalComponent<{ t: TFunction }> = ({ ref, t }) => { const { config: { messages: { dataProcessingConsentText: consentText = '' } = {} } = {}, dispatch } = useContext(StoreContext); diff --git a/packages/livechat/src/routes/GDPRAgreement/stories.tsx b/packages/livechat/src/routes/GDPRAgreement/stories.tsx index 0e1c4bb3f63ab..5e318948f1823 100644 --- a/packages/livechat/src/routes/GDPRAgreement/stories.tsx +++ b/packages/livechat/src/routes/GDPRAgreement/stories.tsx @@ -2,8 +2,8 @@ import { action } from '@storybook/addon-actions'; import type { Meta, StoryFn } from '@storybook/preact'; import type { ComponentProps } from 'preact'; -import { screenDecorator } from '../../../.storybook/helpers'; import GDPRAgreement from './component'; +import { screenDecorator } from '../../../.storybook/helpers'; export default { title: 'Routes/GDPRAgreement', diff --git a/packages/livechat/src/routes/LeaveMessage/stories.tsx b/packages/livechat/src/routes/LeaveMessage/stories.tsx index a380505d5f1df..87020ec634b64 100644 --- a/packages/livechat/src/routes/LeaveMessage/stories.tsx +++ b/packages/livechat/src/routes/LeaveMessage/stories.tsx @@ -1,8 +1,8 @@ import type { Meta, StoryFn } from '@storybook/preact'; import type { ComponentProps } from 'preact'; -import { screenDecorator } from '../../../.storybook/helpers'; import LeaveMessage from './index'; +import { screenDecorator } from '../../../.storybook/helpers'; export default { title: 'Routes/Leave a message', diff --git a/packages/livechat/src/routes/SwitchDepartment/stories.tsx b/packages/livechat/src/routes/SwitchDepartment/stories.tsx index f0b1f21a637ce..e22479c39c5cd 100644 --- a/packages/livechat/src/routes/SwitchDepartment/stories.tsx +++ b/packages/livechat/src/routes/SwitchDepartment/stories.tsx @@ -2,8 +2,8 @@ import { action } from '@storybook/addon-actions'; import type { Meta, StoryFn } from '@storybook/preact'; import type { ComponentProps } from 'preact'; -import { screenDecorator } from '../../../.storybook/helpers'; import SwitchDepartment from './index'; +import { screenDecorator } from '../../../.storybook/helpers'; export default { title: 'Routes/SwitchDepartment', diff --git a/packages/livechat/src/routes/TriggerMessage/component.tsx b/packages/livechat/src/routes/TriggerMessage/component.tsx index 86e65f1d11e09..160ed47fb4f9f 100644 --- a/packages/livechat/src/routes/TriggerMessage/component.tsx +++ b/packages/livechat/src/routes/TriggerMessage/component.tsx @@ -3,12 +3,12 @@ import type { RefObject } from 'preact'; import { Component, createRef } from 'preact'; import { withTranslation } from 'react-i18next'; +import styles from './styles.scss'; import Screen from '../../components/Screen'; import type { ScreenContextValue } from '../../components/Screen/ScreenProvider'; import { createClassName } from '../../helpers/createClassName'; import { parentCall } from '../../lib/parentCall'; import type { StoreState } from '../../store'; -import styles from './styles.scss'; type TriggerMessageProps = { title: string; diff --git a/packages/livechat/src/routes/TriggerMessage/container.tsx b/packages/livechat/src/routes/TriggerMessage/container.tsx index 98510e512f2d9..0d4e40b523c00 100644 --- a/packages/livechat/src/routes/TriggerMessage/container.tsx +++ b/packages/livechat/src/routes/TriggerMessage/container.tsx @@ -1,13 +1,13 @@ import type { FunctionalComponent } from 'preact'; -import { route } from 'preact-router'; import { useContext, useEffect } from 'preact/hooks'; +import { route } from 'preact-router'; +import TriggerMessage from './component'; import { ScreenContext } from '../../components/Screen/ScreenProvider'; import { canRenderMessage } from '../../helpers/canRenderMessage'; import { formatAgent } from '../../helpers/formatAgent'; import { parentCall } from '../../lib/parentCall'; import { StoreContext } from '../../store'; -import TriggerMessage from './component'; export const TriggerMessageContainer: FunctionalComponent<{ path: string }> = ({ ref }) => { const { messages, agent, unread } = useContext(StoreContext); diff --git a/packages/livechat/src/routes/TriggerMessage/stories.tsx b/packages/livechat/src/routes/TriggerMessage/stories.tsx index 217a44966758e..d0eb6500c4cc3 100644 --- a/packages/livechat/src/routes/TriggerMessage/stories.tsx +++ b/packages/livechat/src/routes/TriggerMessage/stories.tsx @@ -2,8 +2,8 @@ import { action } from '@storybook/addon-actions'; import type { Meta, StoryFn } from '@storybook/preact'; import type { ComponentProps } from 'preact'; -import { screenDecorator } from '../../../.storybook/helpers'; import TriggerMessage from './component'; +import { screenDecorator } from '../../../.storybook/helpers'; const now = new Date(Date.parse('2021-01-01T00:00:00.000Z')); diff --git a/packages/mock-providers/src/MockedUiKitActionManager.tsx b/packages/mock-providers/src/MockedUiKitActionManager.tsx deleted file mode 100644 index e69de29bb2d1d..0000000000000 diff --git a/packages/rest-typings/src/v1/dm/DmKickProps.ts b/packages/rest-typings/src/v1/dm/DmKickProps.ts deleted file mode 100644 index 16dbd696906eb..0000000000000 --- a/packages/rest-typings/src/v1/dm/DmKickProps.ts +++ /dev/null @@ -1,27 +0,0 @@ -import type { JSONSchemaType } from 'ajv'; -import Ajv from 'ajv'; - -const ajv = new Ajv({ - coerceTypes: true, -}); - -type DmKickProps = { - roomId: string; - userId: string; -}; - -const DmKickPropsSchema: JSONSchemaType = { - type: 'object', - properties: { - roomId: { - type: 'string', - }, - userId: { - type: 'string', - }, - }, - required: ['roomId', 'userId'], - additionalProperties: false, -}; - -export const isDmKickProps = ajv.compile(DmKickPropsSchema); diff --git a/packages/ui-kit/src/blocks/InputElement.ts b/packages/ui-kit/src/blocks/InputElement.ts deleted file mode 100644 index 82cc3f051ccb9..0000000000000 --- a/packages/ui-kit/src/blocks/InputElement.ts +++ /dev/null @@ -1,5 +0,0 @@ -import type { SelectElement } from './SelectElement'; -import type { DatePickerElement } from './elements/DatePickerElement'; -import type { PlainTextInputElement } from './elements/PlainTextInputElement'; - -export type InputElement = DatePickerElement | SelectElement | PlainTextInputElement; diff --git a/packages/ui-kit/src/blocks/SelectElement.ts b/packages/ui-kit/src/blocks/SelectElement.ts deleted file mode 100644 index 3c018afd9ba93..0000000000000 --- a/packages/ui-kit/src/blocks/SelectElement.ts +++ /dev/null @@ -1,18 +0,0 @@ -import type { ChannelsSelectElement } from './elements/ChannelsSelectElement'; -import type { ConversationsSelectElement } from './elements/ConversationsSelectElement'; -import type { MultiChannelsSelectElement } from './elements/MultiChannelsSelectElement'; -import type { MultiConversationsSelectElement } from './elements/MultiConversationsSelectElement'; -import type { MultiStaticSelectElement } from './elements/MultiStaticSelectElement'; -import type { MultiUsersSelectElement } from './elements/MultiUsersSelectElement'; -import type { StaticSelectElement } from './elements/StaticSelectElement'; -import type { UsersSelectElement } from './elements/UsersSelectElement'; - -export type SelectElement = - | ChannelsSelectElement - | ConversationsSelectElement - | MultiChannelsSelectElement - | MultiConversationsSelectElement - | MultiStaticSelectElement - | MultiUsersSelectElement - | StaticSelectElement - | UsersSelectElement; diff --git a/packages/ui-voip/src/components/VoipPopup/components/index.ts b/packages/ui-voip/src/components/VoipPopup/components/index.ts deleted file mode 100644 index 1f6bfd56b1d47..0000000000000 --- a/packages/ui-voip/src/components/VoipPopup/components/index.ts +++ /dev/null @@ -1,4 +0,0 @@ -export { default as VoipPopupContainer } from './VoipPopupContainer'; -export { default as VoipPopupHeader } from './VoipPopupHeader'; -export { default as VoipPopupContent } from './VoipPopupContent'; -export { default as VoipPopupFooter } from './VoipPopupFooter'; diff --git a/packages/ui-voip/src/components/VoipPopup/views/index.ts b/packages/ui-voip/src/components/VoipPopup/views/index.ts deleted file mode 100644 index 4f9f47cfb31dd..0000000000000 --- a/packages/ui-voip/src/components/VoipPopup/views/index.ts +++ /dev/null @@ -1,5 +0,0 @@ -export { default as DialerView } from './VoipDialerView'; -export { default as ErrorView } from './VoipErrorView'; -export { default as VoipIncomingView } from './VoipIncomingView'; -export { default as VoipOutgoingView } from './VoipOutgoingView'; -export { default as VoipOngoingView } from './VoipOngoingView'; diff --git a/packages/ui-voip/src/components/VoipPopupDraggable/VoipPopupDraggable.tsx b/packages/ui-voip/src/components/VoipPopupDraggable/VoipPopupDraggable.tsx index fe0d15ce8f3e8..123fd9e2af795 100644 --- a/packages/ui-voip/src/components/VoipPopupDraggable/VoipPopupDraggable.tsx +++ b/packages/ui-voip/src/components/VoipPopupDraggable/VoipPopupDraggable.tsx @@ -1,7 +1,7 @@ import { useLayoutEffect } from 'react'; import { useDraggable } from './DraggableCore'; -import VoipPopup from '../VoipPopup/VoipPopup'; +import VoipPopup from '../VoipPopup'; import type { PositionOffsets } from '../VoipPopup/components/VoipPopupContainer'; type VoipPopupDraggableProps = { diff --git a/yarn.lock b/yarn.lock index 59be015cfb7e8..7182f52d910ba 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7744,7 +7744,6 @@ __metadata: "@storybook/theming": "npm:^8.6.14" "@types/babel__core": "npm:^7" "@types/crypto-js": "npm:~4.2.2" - "@types/markdown-it": "npm:^14.1.2" "@types/mini-css-extract-plugin": "npm:~2.5.1" "@types/react": "npm:~18.3.23" "@types/webpack-env": "npm:~1.18.8" @@ -7774,7 +7773,6 @@ __metadata: if-env: "npm:^1.0.4" image-webpack-loader: "npm:~8.1.0" lorem-ipsum: "npm:^2.0.8" - markdown-it: "npm:^14.1.0" mem: "npm:^8.1.1" mini-css-extract-plugin: "npm:~2.9.2" npm-run-all: "npm:^4.1.5" @@ -11734,13 +11732,6 @@ __metadata: languageName: node linkType: hard -"@types/linkify-it@npm:^5": - version: 5.0.0 - resolution: "@types/linkify-it@npm:5.0.0" - checksum: 10/c3919044d4876f9d71d037e861745cd2485c95ac8c36a4fa67b132d4e60eb1d067e123cc7965c9cf5110eea351517d767f0d306af5e9147d6d0af87bc374ddcf - languageName: node - linkType: hard - "@types/lodash.clonedeep@npm:^4.5.9": version: 4.5.9 resolution: "@types/lodash.clonedeep@npm:4.5.9" @@ -11801,16 +11792,6 @@ __metadata: languageName: node linkType: hard -"@types/markdown-it@npm:^14.1.2": - version: 14.1.2 - resolution: "@types/markdown-it@npm:14.1.2" - dependencies: - "@types/linkify-it": "npm:^5" - "@types/mdurl": "npm:^2" - checksum: 10/ca2f239c8d59610b9f936fd40261a6ccf2fa1ae27a21816c031e5712542dcf9ee01e2fe29b31118df90716e11ade54e47d92a498e9b6488800e77ca8827255a2 - languageName: node - linkType: hard - "@types/marked@npm:^4.3.2": version: 4.3.2 resolution: "@types/marked@npm:4.3.2" @@ -11827,13 +11808,6 @@ __metadata: languageName: node linkType: hard -"@types/mdurl@npm:^2": - version: 2.0.0 - resolution: "@types/mdurl@npm:2.0.0" - checksum: 10/78746e96c655ceed63db06382da466fd52c7e9dc54d60b12973dfdd110cae06b9439c4b90e17bb8d4461109184b3ea9f3e9f96b3e4bf4aa9fe18b6ac35f283c8 - languageName: node - linkType: hard - "@types/mdx@npm:^2.0.0": version: 2.0.13 resolution: "@types/mdx@npm:2.0.13"