Skip to content

Commit a3b3474

Browse files
MartinSchoelerdougfabristassoevan
authored
chore: bump fuselage packages (RocketChat#37420)
Co-authored-by: Douglas Fabris <devfabris@gmail.com> Co-authored-by: Tasso Evangelista <tasso.evangelista@rocket.chat>
1 parent 58e9f9e commit a3b3474

24 files changed

Lines changed: 448 additions & 131 deletions

File tree

‎apps/meteor/client/NavBarV2/NavBarControls/NavBarControlsSection.tsx‎

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,26 @@
1-
import { NavBarSection, NavBarGroup, NavBarDivider } from '@rocket.chat/fuselage';
1+
import { NavBarSection, NavBarGroup } from '@rocket.chat/fuselage';
22
import { useUser, useLayout } from '@rocket.chat/ui-contexts';
3+
import { useMediaCallAction } from '@rocket.chat/ui-voip';
34
import { useTranslation } from 'react-i18next';
45

56
import NavBarControlsWithData from './NavBarControlsWithData';
7+
import { useOmnichannelEnabled } from '../../views/omnichannel/hooks/useOmnichannelEnabled';
68
import NavBarOmnichannelGroup from '../NavBarOmnichannelGroup';
79
import { NavBarItemLoginPage, NavBarItemAdministrationMenu, UserMenu } from '../NavBarSettingsToolbar';
810
import NavBarVoipGroup from '../NavBarVoipGroup';
911

1012
const NavBarControlsSection = () => {
1113
const { t } = useTranslation();
1214
const user = useUser();
13-
1415
const { isMobile } = useLayout();
1516

17+
const showOmnichannel = useOmnichannelEnabled();
18+
const callAction = useMediaCallAction();
19+
1620
if (isMobile) {
1721
return (
1822
<NavBarSection>
19-
<NavBarControlsWithData />
20-
<NavBarDivider />
23+
{(showOmnichannel || callAction) && <NavBarControlsWithData />}
2124
<NavBarGroup aria-label={t('Workspace_and_user_preferences')}>
2225
<NavBarItemAdministrationMenu />
2326
{user ? <UserMenu user={user} /> : <NavBarItemLoginPage />}
@@ -28,8 +31,8 @@ const NavBarControlsSection = () => {
2831

2932
return (
3033
<NavBarSection>
31-
<NavBarVoipGroup />
32-
<NavBarOmnichannelGroup />
34+
{callAction && <NavBarVoipGroup />}
35+
{showOmnichannel && <NavBarOmnichannelGroup />}
3336
<NavBarGroup aria-label={t('Workspace_and_user_preferences')}>
3437
<NavBarItemAdministrationMenu />
3538
{user ? <UserMenu user={user} /> : <NavBarItemLoginPage />}

‎apps/meteor/client/NavBarV2/NavBarNavigation.tsx‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,12 @@ const NavbarNavigation = () => {
1616
<NavBarSearch />
1717
</FocusScope>
1818
{!isMobile && (
19-
<NavBarGroup aria-label={t('History_navigation')}>
20-
<NavBarItem title={t('Back_in_history')} onClick={() => navigate(-1)} icon='chevron-right' small />
21-
<NavBarItem title={t('Forward_in_history')} onClick={() => navigate(1)} icon='chevron-left' small />
22-
</NavBarGroup>
19+
<Box mie={8}>
20+
<NavBarGroup aria-label={t('History_navigation')}>
21+
<NavBarItem title={t('Back_in_history')} onClick={() => navigate(-1)} icon='chevron-right' small />
22+
<NavBarItem title={t('Forward_in_history')} onClick={() => navigate(1)} icon='chevron-left' small />
23+
</NavBarGroup>
24+
</Box>
2325
)}
2426
</Box>
2527
);

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

Lines changed: 8 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { NavBarDivider, NavBarGroup } from '@rocket.chat/fuselage';
1+
import { NavBarGroup } from '@rocket.chat/fuselage';
22
import { useTranslation } from 'react-i18next';
33

44
import NavBarItemOmniChannelCallDialPad from './NavBarItemOmniChannelCallDialPad';
@@ -7,30 +7,21 @@ 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 '../../views/omnichannel/hooks/useOmnichannelEnabled';
1110

1211
const NavBarOmnichannelGroup = () => {
1312
const { t } = useTranslation();
14-
const showOmnichannel = useOmnichannelEnabled();
1513

1614
const isCallEnabled = useIsCallEnabled();
1715
const isCallReady = useIsCallReady();
1816

19-
if (!showOmnichannel) {
20-
return null;
21-
}
22-
2317
return (
24-
<>
25-
<NavBarGroup aria-label={t('Omnichannel')}>
26-
<NavBarItemOmnichannelQueue />
27-
{isCallReady && <NavBarItemOmniChannelCallDialPad />}
28-
<NavBarItemOmnichannelContact />
29-
{isCallEnabled && <NavBarItemOmnichannelCallToggle />}
30-
<NavBarItemOmnichannelLivechatToggle />
31-
</NavBarGroup>
32-
<NavBarDivider />
33-
</>
18+
<NavBarGroup aria-label={t('Omnichannel')}>
19+
<NavBarItemOmnichannelQueue />
20+
{isCallReady && <NavBarItemOmniChannelCallDialPad />}
21+
<NavBarItemOmnichannelContact />
22+
{isCallEnabled && <NavBarItemOmnichannelCallToggle />}
23+
<NavBarItemOmnichannelLivechatToggle />
24+
</NavBarGroup>
3425
);
3526
};
3627

‎apps/meteor/client/NavBarV2/NavBarPagesSection.tsx‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { NavBarDivider, NavBarGroup, NavBarSection } from '@rocket.chat/fuselage';
1+
import { NavBarGroup, NavBarSection } from '@rocket.chat/fuselage';
22
import { useLayout } from '@rocket.chat/ui-contexts';
33

44
import NavBarPagesGroup from './NavBarPagesGroup';
@@ -14,7 +14,6 @@ const NavBarPagesSection = () => {
1414
<NavBarGroup>
1515
<SidebarTogglerV2 />
1616
</NavBarGroup>
17-
<NavBarDivider />
1817
</>
1918
)}
2019
<NavBarPagesGroup />

‎apps/meteor/client/NavBarV2/NavBarVoipGroup/NavBarVoipGroup.tsx‎

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { NavBarDivider, NavBarGroup, NavBarItem } from '@rocket.chat/fuselage';
1+
import { NavBarGroup, NavBarItem } from '@rocket.chat/fuselage';
22
import { useMediaCallAction } from '@rocket.chat/ui-voip';
33
import { useTranslation } from 'react-i18next';
44

@@ -11,12 +11,9 @@ const NavBarVoipGroup = () => {
1111
}
1212

1313
return (
14-
<>
15-
<NavBarGroup aria-label={t('Voice_Call')}>
16-
<NavBarItem title={callAction.title} icon={callAction.icon} onClick={() => callAction.action()} />;
17-
</NavBarGroup>
18-
<NavBarDivider />
19-
</>
14+
<NavBarGroup aria-label={t('Voice_Call')}>
15+
<NavBarItem title={callAction.title} icon={callAction.icon} onClick={() => callAction.action()} />
16+
</NavBarGroup>
2017
);
2118
};
2219

‎apps/meteor/client/views/omnichannel/components/AutoCompleteDepartmentMultiple.tsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { CheckOption, Option, PaginatedMultiSelectFiltered } from '@rocket.chat/fuselage';
22
import type { PaginatedMultiSelectOption } from '@rocket.chat/fuselage';
33
import { useDebouncedValue } from '@rocket.chat/fuselage-hooks';
4-
import type { ComponentProps, ReactElement } from 'react';
4+
import type { ComponentProps, ComponentPropsWithoutRef, ReactElement } from 'react';
55
import { memo, useMemo, useState } from 'react';
66
import { useTranslation } from 'react-i18next';
77

@@ -53,7 +53,7 @@ const AutoCompleteDepartmentMultiple = ({
5353
return [...departmentsItems, ...pending];
5454
}, [departmentsItems, value]);
5555

56-
const renderItem = ({ label, value, ...props }: ComponentProps<typeof Option>): ReactElement => {
56+
const renderItem = ({ label, value, ...props }: ComponentPropsWithoutRef<typeof Option>): ReactElement => {
5757
if (withCheckbox) {
5858
return (
5959
<CheckOption

‎apps/meteor/client/views/omnichannel/components/AutoCompleteMonitors.tsx‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
1+
import type { Option } from '@rocket.chat/fuselage';
12
import { CheckOption, PaginatedMultiSelectFiltered } from '@rocket.chat/fuselage';
23
import { useDebouncedValue } from '@rocket.chat/fuselage-hooks';
3-
import type { ComponentProps, ReactElement } from 'react';
4+
import type { ComponentProps, ComponentPropsWithoutRef, ReactElement } from 'react';
45
import { memo, useMemo, useState } from 'react';
56
import { useTranslation } from 'react-i18next';
67

@@ -31,7 +32,7 @@ const AutoCompleteMonitors = ({ value = [], onBlur, onChange, ...props }: AutoCo
3132
endReached={() => fetchNextPage()}
3233
onBlur={onBlur}
3334
onChange={onChange}
34-
renderItem={({ label, value, ...props }) => (
35+
renderItem={({ label, value, ...props }: ComponentPropsWithoutRef<typeof Option>) => (
3536
<CheckOption {...props} label={label} selected={value ? selectedValues.has(value) : false} />
3637
)}
3738
/>

‎apps/meteor/ee/server/services/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
"ws": "~8.18.3"
4949
},
5050
"devDependencies": {
51-
"@rocket.chat/icons": "~0.44.0",
51+
"@rocket.chat/icons": "^0.45.0",
5252
"@types/cookie": "^0.5.4",
5353
"@types/cookie-parser": "^1.4.9",
5454
"@types/ejson": "^2.2.2",

‎apps/meteor/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -254,7 +254,7 @@
254254
"@rocket.chat/federation-matrix": "workspace:^",
255255
"@rocket.chat/federation-sdk": "0.3.0",
256256
"@rocket.chat/freeswitch": "workspace:^",
257-
"@rocket.chat/fuselage": "~0.66.4",
257+
"@rocket.chat/fuselage": "^0.68.1",
258258
"@rocket.chat/fuselage-forms": "~0.1.0",
259259
"@rocket.chat/fuselage-hooks": "~0.37.2",
260260
"@rocket.chat/fuselage-polyfills": "~0.31.25",

‎apps/uikit-playground/package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,13 @@
1818
"@lezer/highlight": "^1.2.1",
1919
"@rocket.chat/core-typings": "workspace:^",
2020
"@rocket.chat/css-in-js": "~0.31.25",
21-
"@rocket.chat/fuselage": "~0.66.4",
21+
"@rocket.chat/fuselage": "^0.68.1",
2222
"@rocket.chat/fuselage-hooks": "~0.37.2",
2323
"@rocket.chat/fuselage-polyfills": "~0.31.25",
2424
"@rocket.chat/fuselage-toastbar": "^0.35.0",
2525
"@rocket.chat/fuselage-tokens": "~0.33.2",
2626
"@rocket.chat/fuselage-ui-kit": "workspace:~",
27-
"@rocket.chat/icons": "~0.44.0",
27+
"@rocket.chat/icons": "^0.45.0",
2828
"@rocket.chat/logo": "~0.32.3",
2929
"@rocket.chat/styled": "~0.32.0",
3030
"@rocket.chat/ui-avatar": "workspace:^",

0 commit comments

Comments
 (0)