Skip to content

Commit 5219815

Browse files
tassoevanMartinSchoeler
authored andcommitted
chore: Merge client omnichannel directories (#37369)
1 parent 1cc6e89 commit 5219815

File tree

326 files changed

+440
-447
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

326 files changed

+440
-447
lines changed

apps/meteor/client/NavBarV2/NavBarControls/NavBarControlsMenu.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import { GenericMenu } from '@rocket.chat/ui-client';
44
import type { HTMLAttributes } from 'react';
55
import { useTranslation } from 'react-i18next';
66

7-
import { useOmnichannelEnabled } from '../../hooks/omnichannel/useOmnichannelEnabled';
7+
import { useOmnichannelEnabled } from '../../views/omnichannel/hooks/useOmnichannelEnabled';
88

99
type NavBarControlsMenuProps = Omit<HTMLAttributes<HTMLElement>, 'is'> & {
1010
omnichannelItems: GenericMenuItemProps[];

apps/meteor/client/NavBarV2/NavBarOmnichannelGroup/NavBarOmnichannelGroup.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import NavBarItemOmnichannelContact from './NavBarItemOmnichannelContact';
77
import NavBarItemOmnichannelLivechatToggle from './NavBarItemOmnichannelLivechatToggle';
88
import NavBarItemOmnichannelQueue from './NavBarItemOmnichannelQueue';
99
import { useIsCallEnabled, useIsCallReady } from '../../contexts/CallContext';
10-
import { useOmnichannelEnabled } from '../../hooks/omnichannel/useOmnichannelEnabled';
10+
import { useOmnichannelEnabled } from '../../views/omnichannel/hooks/useOmnichannelEnabled';
1111

1212
const NavBarOmnichannelGroup = () => {
1313
const { t } = useTranslation();

apps/meteor/client/NavBarV2/NavBarOmnichannelGroup/hooks/useOmnichannelLivechatToggle.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import type { Keys } from '@rocket.chat/icons';
33
import { useEndpoint, useToastMessageDispatch } from '@rocket.chat/ui-contexts';
44
import { useTranslation } from 'react-i18next';
55

6-
import { useOmnichannelAgentAvailable } from '../../../hooks/omnichannel/useOmnichannelAgentAvailable';
6+
import { useOmnichannelAgentAvailable } from '../../../views/omnichannel/hooks/useOmnichannelAgentAvailable';
77

88
export const useOmnichannelLivechatToggle = () => {
99
const { t } = useTranslation();

apps/meteor/client/NavBarV2/NavBarOmnichannelGroup/hooks/useOmnichannelQueueAction.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import type { Keys } from '@rocket.chat/icons';
22
import { useCurrentRoutePath, useRouter } from '@rocket.chat/ui-contexts';
33
import { useTranslation } from 'react-i18next';
44

5-
import { useOmnichannelShowQueueLink } from '../../../hooks/omnichannel/useOmnichannelShowQueueLink';
5+
import { useOmnichannelShowQueueLink } from '../../../views/omnichannel/hooks/useOmnichannelShowQueueLink';
66

77
export const useOmnichannelQueueAction = () => {
88
const { t } = useTranslation();

apps/meteor/client/NavBarV2/NavBarPagesGroup/hooks/useCreateNewItems.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ import { useTranslation, useSetting, useAtLeastOnePermission } from '@rocket.cha
33

44
import { useCreateRoomModal } from './useCreateRoomModal';
55
import CreateDiscussion from '../../../components/CreateDiscussion';
6-
import { useOutboundMessageAccess } from '../../../components/Omnichannel/OutboundMessage/hooks';
7-
import { useOutboundMessageModal } from '../../../components/Omnichannel/OutboundMessage/modals';
6+
import { useOutboundMessageAccess } from '../../../views/omnichannel/components/outboundMessage/hooks';
7+
import { useOutboundMessageModal } from '../../../views/omnichannel/components/outboundMessage/modals';
88
import CreateChannelModal from '../actions/CreateChannelModal';
99
import CreateDirectMessage from '../actions/CreateDirectMessage';
1010
import CreateTeamModal from '../actions/CreateTeamModal';

apps/meteor/client/NavBarV2/NavBarPagesGroup/hooks/useSortModeItems.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import { useTranslation } from 'react-i18next';
77
import {
88
OmnichannelSortingDisclaimer,
99
useOmnichannelSortingDisclaimer,
10-
} from '../../../components/Omnichannel/OmnichannelSortingDisclaimer';
10+
} from '../../../views/omnichannel/components/OmnichannelSortingDisclaimer';
1111

1212
export const useSortModeItems = (): GenericMenuItemProps[] => {
1313
const { t } = useTranslation();

apps/meteor/client/hooks/omnichannel/useOmnichannel.ts

Lines changed: 0 additions & 6 deletions
This file was deleted.

apps/meteor/client/hooks/useRoomMenuActions.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import { useLeaveRoomAction } from './menuActions/useLeaveRoom';
88
import { useToggleFavoriteAction } from './menuActions/useToggleFavoriteAction';
99
import { useToggleReadAction } from './menuActions/useToggleReadAction';
1010
import { useHideRoomAction } from './useHideRoomAction';
11-
import { useOmnichannelPrioritiesMenu } from '../omnichannel/hooks/useOmnichannelPrioritiesMenu';
11+
import { useOmnichannelPrioritiesMenu } from '../views/omnichannel/hooks/useOmnichannelPrioritiesMenu';
1212

1313
type RoomMenuActionsProps = {
1414
rid: string;

apps/meteor/client/main.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,6 @@ import('@rocket.chat/fuselage-polyfills')
77
.then(() => import('./ecdh'))
88
.then(() => import('./importPackages'))
99
.then(() => import('./startup'))
10-
.then(() => import('./omnichannel'))
11-
.then(() => Promise.all([import('./views/admin'), import('./views/marketplace'), import('./views/account')]));
10+
.then(() =>
11+
Promise.all([import('./views/omnichannel'), import('./views/admin'), import('./views/marketplace'), import('./views/account')]),
12+
);

apps/meteor/client/omnichannel/routes.ts

Lines changed: 0 additions & 62 deletions
This file was deleted.

0 commit comments

Comments
 (0)