From 85602ab457dca35bafc7b344075f03a3682841e3 Mon Sep 17 00:00:00 2001 From: Tasso Evangelista Date: Thu, 4 Jan 2024 20:03:50 -0300 Subject: [PATCH] Upgrade Fuselage --- package.json | 9 ++- src/ui/components/AboutDialog/index.tsx | 6 +- .../components/DownloadsManagerView/index.tsx | 9 +-- .../ServersView/UnsupportedServer.tsx | 2 +- src/ui/components/SettingsView/GeneralTab.tsx | 2 +- .../components/SettingsView/SettingsView.tsx | 1 - .../SettingsView/features/FlashFrame.tsx | 12 +++- .../features/HardwareAcceleration.tsx | 13 ++-- .../features/InternalVideoChatWindow.tsx | 13 ++-- .../SettingsView/features/MenuBar.tsx | 12 +++- .../SettingsView/features/MinimizeOnClose.tsx | 13 ++-- .../SettingsView/features/NTLMCredentials.tsx | 13 ++-- .../SettingsView/features/ReportErrors.tsx | 13 ++-- .../SettingsView/features/SideBar.tsx | 12 +++- .../SettingsView/features/TrayIcon.tsx | 12 +++- .../SupportedVersionDialog/index.tsx | 1 - yarn.lock | 66 +++++++++---------- 17 files changed, 119 insertions(+), 90 deletions(-) diff --git a/package.json b/package.json index dbc305f5b..3482a3555 100644 --- a/package.json +++ b/package.json @@ -49,16 +49,15 @@ }, "dependencies": { "@bugsnag/js": "~7.22.3", - "@emotion/css": "^11.7.1", - "@emotion/react": "^11.7.1", - "@emotion/styled": "^11.6.0", + "@emotion/css": "~11.11.2", + "@emotion/react": "~11.11.3", + "@emotion/styled": "~11.11.0", "@ewsjs/xhr": "^2.0.1", "@rocket.chat/css-in-js": "~0.31.25", - "@rocket.chat/fuselage": "~0.36.0", + "@rocket.chat/fuselage": "~0.42.0", "@rocket.chat/fuselage-hooks": "~0.32.1", "@rocket.chat/fuselage-polyfills": "~0.31.25", "@rocket.chat/icons": "~0.32.0", - "abort-controller": "^3.0.0", "axios": "^1.4.0", "dotenv": "~16.3.1", "electron-dl": "~3.5.1", diff --git a/src/ui/components/AboutDialog/index.tsx b/src/ui/components/AboutDialog/index.tsx index b8a6c6354..1d4089ce8 100644 --- a/src/ui/components/AboutDialog/index.tsx +++ b/src/ui/components/AboutDialog/index.tsx @@ -174,15 +174,15 @@ export const AboutDialog = () => { + + {t('dialog.about.checkUpdatesOnStart')} + - - {t('dialog.about.checkUpdatesOnStart')} - diff --git a/src/ui/components/DownloadsManagerView/index.tsx b/src/ui/components/DownloadsManagerView/index.tsx index e3b3eb02e..5593be8c0 100644 --- a/src/ui/components/DownloadsManagerView/index.tsx +++ b/src/ui/components/DownloadsManagerView/index.tsx @@ -2,7 +2,6 @@ import { Box, SearchInput, Icon, - Button, Pagination, Scrollable, IconButton, @@ -252,13 +251,11 @@ const DownloadsManagerView = () => { /> - + /> diff --git a/src/ui/components/ServersView/UnsupportedServer.tsx b/src/ui/components/ServersView/UnsupportedServer.tsx index 8b862e5cf..d891fce5a 100644 --- a/src/ui/components/ServersView/UnsupportedServer.tsx +++ b/src/ui/components/ServersView/UnsupportedServer.tsx @@ -33,7 +33,7 @@ const UnsupportedServer = ({ return ( ( - + diff --git a/src/ui/components/SettingsView/SettingsView.tsx b/src/ui/components/SettingsView/SettingsView.tsx index cd1c9b809..541c349fa 100644 --- a/src/ui/components/SettingsView/SettingsView.tsx +++ b/src/ui/components/SettingsView/SettingsView.tsx @@ -25,7 +25,6 @@ export const SettingsView = () => { > { [dispatch] ); + const isFlashFrameEnabledId = useId(); + return ( - - + {process.platform !== 'darwin' ? t('settings.options.flashFrame.title') : t('settings.options.flashFrame.titleDarwin')} + {process.platform === 'linux' && ( { [dispatch] ); + const isHardwareAccelerationEnabledId = useId(); + return ( + + {t('settings.options.hardwareAcceleration.title')} + - - {t('settings.options.hardwareAcceleration.title')} - diff --git a/src/ui/components/SettingsView/features/InternalVideoChatWindow.tsx b/src/ui/components/SettingsView/features/InternalVideoChatWindow.tsx index 797686e4c..a88661309 100644 --- a/src/ui/components/SettingsView/features/InternalVideoChatWindow.tsx +++ b/src/ui/components/SettingsView/features/InternalVideoChatWindow.tsx @@ -6,7 +6,7 @@ import { FieldHint, } from '@rocket.chat/fuselage'; import type { ChangeEvent } from 'react'; -import { useCallback } from 'react'; +import { useCallback, useId } from 'react'; import { useTranslation, Trans } from 'react-i18next'; import { useDispatch, useSelector } from 'react-redux'; import type { Dispatch } from 'redux'; @@ -39,17 +39,20 @@ export const InternalVideoChatWindow = ( [dispatch] ); + const isInternalVideoChatWindowEnabledId = useId(); + return ( + + {t('settings.options.internalVideoChatWindow.title')} + - - {t('settings.options.internalVideoChatWindow.title')} - {process.mas ? ( diff --git a/src/ui/components/SettingsView/features/MenuBar.tsx b/src/ui/components/SettingsView/features/MenuBar.tsx index 0512921f3..e0258f4c6 100644 --- a/src/ui/components/SettingsView/features/MenuBar.tsx +++ b/src/ui/components/SettingsView/features/MenuBar.tsx @@ -6,7 +6,7 @@ import { FieldHint, } from '@rocket.chat/fuselage'; import type { ChangeEvent } from 'react'; -import { useCallback } from 'react'; +import { useCallback, useId } from 'react'; import { useTranslation } from 'react-i18next'; import { useDispatch, useSelector } from 'react-redux'; import type { Dispatch } from 'redux'; @@ -36,13 +36,19 @@ export const MenuBar = (props: MenuBarProps) => { [dispatch] ); + const isMenuBarEnabledId = useId(); + return ( - - + {t('settings.options.menubar.title')} + {t('settings.options.menubar.description')} diff --git a/src/ui/components/SettingsView/features/MinimizeOnClose.tsx b/src/ui/components/SettingsView/features/MinimizeOnClose.tsx index 4e29ff75b..d96ed731d 100644 --- a/src/ui/components/SettingsView/features/MinimizeOnClose.tsx +++ b/src/ui/components/SettingsView/features/MinimizeOnClose.tsx @@ -6,7 +6,7 @@ import { FieldHint, } from '@rocket.chat/fuselage'; import type { ChangeEvent } from 'react'; -import { useCallback } from 'react'; +import { useCallback, useId } from 'react'; import { useTranslation } from 'react-i18next'; import { useDispatch, useSelector } from 'react-redux'; import type { Dispatch } from 'redux'; @@ -39,17 +39,20 @@ export const MinimizeOnClose = (props: MinimizeOnCloseProps) => { [dispatch] ); + const isMinimizeOnCloseEnabledId = useId(); + return ( + + {t('settings.options.minimizeOnClose.title')} + - - {t('settings.options.minimizeOnClose.title')} - diff --git a/src/ui/components/SettingsView/features/NTLMCredentials.tsx b/src/ui/components/SettingsView/features/NTLMCredentials.tsx index 14eba1de2..52ad13ae3 100644 --- a/src/ui/components/SettingsView/features/NTLMCredentials.tsx +++ b/src/ui/components/SettingsView/features/NTLMCredentials.tsx @@ -7,7 +7,7 @@ import { ToggleSwitch, } from '@rocket.chat/fuselage'; import type { FocusEvent } from 'react'; -import { useCallback, type ChangeEvent } from 'react'; +import { useCallback, type ChangeEvent, useId } from 'react'; import { useTranslation } from 'react-i18next'; import { useDispatch, useSelector } from 'react-redux'; import type { Dispatch } from 'redux'; @@ -54,16 +54,19 @@ export const NTLMCredentials = (props: NTLMCredentialsProps) => { [dispatch] ); + const isNTLMCredentialsEnabledId = useId(); + return ( + + {t('settings.options.ntlmCredentials.title')} + - - {t('settings.options.ntlmCredentials.title')} - diff --git a/src/ui/components/SettingsView/features/ReportErrors.tsx b/src/ui/components/SettingsView/features/ReportErrors.tsx index 95c590d9b..a4b00b29d 100644 --- a/src/ui/components/SettingsView/features/ReportErrors.tsx +++ b/src/ui/components/SettingsView/features/ReportErrors.tsx @@ -6,7 +6,7 @@ import { FieldHint, } from '@rocket.chat/fuselage'; import type { ChangeEvent } from 'react'; -import { useCallback } from 'react'; +import { useCallback, useId } from 'react'; import { useTranslation } from 'react-i18next'; import { useDispatch, useSelector } from 'react-redux'; import type { Dispatch } from 'redux'; @@ -36,17 +36,20 @@ export const ReportErrors = (props: ReportErrorsProps) => { [dispatch] ); + const isReportEnabledId = useId(); + return ( + + {t('settings.options.report.title')} + - - {t('settings.options.report.title')} - {process.mas ? ( diff --git a/src/ui/components/SettingsView/features/SideBar.tsx b/src/ui/components/SettingsView/features/SideBar.tsx index c6bd050e1..302d8432d 100644 --- a/src/ui/components/SettingsView/features/SideBar.tsx +++ b/src/ui/components/SettingsView/features/SideBar.tsx @@ -6,7 +6,7 @@ import { FieldHint, } from '@rocket.chat/fuselage'; import type { ChangeEvent } from 'react'; -import { useCallback } from 'react'; +import { useCallback, useId } from 'react'; import { useTranslation } from 'react-i18next'; import { useDispatch, useSelector } from 'react-redux'; import type { Dispatch } from 'redux'; @@ -36,13 +36,19 @@ export const SideBar = (props: SideBarProps) => { [dispatch] ); + const isSideBarEnabledId = useId(); + return ( - - + {t('settings.options.sidebar.title')} + {t('settings.options.sidebar.description')} diff --git a/src/ui/components/SettingsView/features/TrayIcon.tsx b/src/ui/components/SettingsView/features/TrayIcon.tsx index de7cf07e2..24352ae0a 100644 --- a/src/ui/components/SettingsView/features/TrayIcon.tsx +++ b/src/ui/components/SettingsView/features/TrayIcon.tsx @@ -6,7 +6,7 @@ import { FieldHint, } from '@rocket.chat/fuselage'; import type { ChangeEvent } from 'react'; -import { useCallback } from 'react'; +import { useCallback, useId } from 'react'; import { useTranslation } from 'react-i18next'; import { useDispatch, useSelector } from 'react-redux'; import type { Dispatch } from 'redux'; @@ -36,13 +36,19 @@ export const TrayIcon = (props: TrayIconProps) => { [dispatch] ); + const isTrayIconEnabledId = useId(); + return ( - - + {t('settings.options.trayIcon.title')} + {t('settings.options.trayIcon.description')} diff --git a/src/ui/components/SupportedVersionDialog/index.tsx b/src/ui/components/SupportedVersionDialog/index.tsx index 1e0a968fa..786dff863 100644 --- a/src/ui/components/SupportedVersionDialog/index.tsx +++ b/src/ui/components/SupportedVersionDialog/index.tsx @@ -87,7 +87,6 @@ export const SupportedVersionDialog = () => { useEffect(() => { checkServerVersion(); - console.log('checkServerVersion'); // eslint-disable-next-line react-hooks/exhaustive-deps }, [server?.supportedVersions, server?.lastPath, currentView]); diff --git a/yarn.lock b/yarn.lock index d885123ab..e4bd30d6c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2174,16 +2174,16 @@ __metadata: languageName: node linkType: hard -"@emotion/css@npm:^11.7.1": - version: 11.11.0 - resolution: "@emotion/css@npm:11.11.0" +"@emotion/css@npm:~11.11.2": + version: 11.11.2 + resolution: "@emotion/css@npm:11.11.2" dependencies: "@emotion/babel-plugin": "npm:^11.11.0" "@emotion/cache": "npm:^11.11.0" "@emotion/serialize": "npm:^1.1.2" "@emotion/sheet": "npm:^1.2.2" "@emotion/utils": "npm:^1.2.1" - checksum: b91edf91e4a7391c836f3facbad4e497bd0cfa8701d742e19c8abe79b3a468c99c15dd13b3828a3fe96f9d937ba3a177eeb33117a8ef1e5f0cde34f42c05feef + checksum: 718f758575f05e3610cdef9bdcfcdf17eae1992616c7cc85e29a24ff3b4d3da9968cc1c253a510874c056c22dc73b6b12bd759be9943e20141e0603a3cb35630 languageName: node linkType: hard @@ -2210,14 +2210,14 @@ __metadata: languageName: node linkType: hard -"@emotion/react@npm:^11.7.1": - version: 11.11.0 - resolution: "@emotion/react@npm:11.11.0" +"@emotion/react@npm:~11.11.3": + version: 11.11.3 + resolution: "@emotion/react@npm:11.11.3" dependencies: "@babel/runtime": "npm:^7.18.3" "@emotion/babel-plugin": "npm:^11.11.0" "@emotion/cache": "npm:^11.11.0" - "@emotion/serialize": "npm:^1.1.2" + "@emotion/serialize": "npm:^1.1.3" "@emotion/use-insertion-effect-with-fallbacks": "npm:^1.0.1" "@emotion/utils": "npm:^1.2.1" "@emotion/weak-memoize": "npm:^0.3.1" @@ -2227,7 +2227,7 @@ __metadata: peerDependenciesMeta: "@types/react": optional: true - checksum: c326e8befc9c09c416f2c0c9d99c6b5b5632774d31bee911ebe619e8d21fef237c2efa0923b4a983f4ef3865ab394154be02b496146859dc48c8b55d98dc3493 + checksum: f7b98557b7d5236296dda48c2fc8a6cde4af7399758496e9f710f85a80c7d66fee1830966caabd7b237601bfdaca4e1add8c681d1ae4cc3d497fe88958d541c4 languageName: node linkType: hard @@ -2244,6 +2244,19 @@ __metadata: languageName: node linkType: hard +"@emotion/serialize@npm:^1.1.3": + version: 1.1.3 + resolution: "@emotion/serialize@npm:1.1.3" + dependencies: + "@emotion/hash": "npm:^0.9.1" + "@emotion/memoize": "npm:^0.8.1" + "@emotion/unitless": "npm:^0.8.1" + "@emotion/utils": "npm:^1.2.1" + csstype: "npm:^3.0.2" + checksum: 48d88923663273ae70359bc1a1f30454136716cbe0ddd9664be08e257ce56acedab911f125b627627358e37c9f450bbac3ea09b534ef42f9f67325d47b1e2a7b + languageName: node + linkType: hard + "@emotion/sheet@npm:^1.2.2": version: 1.2.2 resolution: "@emotion/sheet@npm:1.2.2" @@ -2251,7 +2264,7 @@ __metadata: languageName: node linkType: hard -"@emotion/styled@npm:^11.6.0": +"@emotion/styled@npm:~11.11.0": version: 11.11.0 resolution: "@emotion/styled@npm:11.11.0" dependencies: @@ -5021,9 +5034,9 @@ __metadata: languageName: node linkType: hard -"@rocket.chat/fuselage@npm:~0.36.0": - version: 0.36.0 - resolution: "@rocket.chat/fuselage@npm:0.36.0" +"@rocket.chat/fuselage@npm:~0.42.0": + version: 0.42.0 + resolution: "@rocket.chat/fuselage@npm:0.42.0" dependencies: "@rocket.chat/css-in-js": "npm:^0.31.25" "@rocket.chat/css-supports": "npm:^0.31.25" @@ -5041,7 +5054,7 @@ __metadata: react: ^17.0.2 react-dom: ^17.0.2 react-virtuoso: 1.2.4 - checksum: dbd139da9ee56ed2cc71295326de86743c9034e94129b7623809b499bae75ca3ecc793067bb9aa37acfacb363e189ae4ba203fe38d8149460f1013f8b3f75ebc + checksum: 1d650b947006b0d70f8d83ae74e96ffdc7dd26c045b52b877935a49c917df0fc02832f8b47d5f6052c836c17bc4aeee7a6adc0d258c35040ca76e9de2b387615 languageName: node linkType: hard @@ -6034,15 +6047,6 @@ __metadata: languageName: node linkType: hard -"abort-controller@npm:^3.0.0": - version: 3.0.0 - resolution: "abort-controller@npm:3.0.0" - dependencies: - event-target-shim: "npm:^5.0.0" - checksum: ed84af329f1828327798229578b4fe03a4dd2596ba304083ebd2252666bdc1d7647d66d0b18704477e1f8aa315f055944aa6e859afebd341f12d0a53c37b4b40 - languageName: node - linkType: hard - "acorn-globals@npm:^7.0.0": version: 7.0.1 resolution: "acorn-globals@npm:7.0.1" @@ -9146,13 +9150,6 @@ __metadata: languageName: node linkType: hard -"event-target-shim@npm:^5.0.0": - version: 5.0.1 - resolution: "event-target-shim@npm:5.0.1" - checksum: 49ff46c3a7facbad3decb31f597063e761785d7fdb3920d4989d7b08c97a61c2f51183e2f3a03130c9088df88d4b489b1b79ab632219901f184f85158508f4c8 - languageName: node - linkType: hard - "ews-javascript-api@npm:~0.13.2": version: 0.13.2 resolution: "ews-javascript-api@npm:0.13.2" @@ -14293,16 +14290,16 @@ __metadata: "@babel/preset-react": "npm:~7.23.3" "@babel/preset-typescript": "npm:~7.23.3" "@bugsnag/js": "npm:~7.22.3" - "@emotion/css": "npm:^11.7.1" - "@emotion/react": "npm:^11.7.1" - "@emotion/styled": "npm:^11.6.0" + "@emotion/css": "npm:~11.11.2" + "@emotion/react": "npm:~11.11.3" + "@emotion/styled": "npm:~11.11.0" "@ewsjs/xhr": "npm:^2.0.1" "@fiahfy/icns-convert": "npm:^0.0.12" "@fiahfy/ico-convert": "npm:^0.0.12" "@kayahr/jest-electron-runner": "npm:~29.10.0" "@rocket.chat/css-in-js": "npm:~0.31.25" "@rocket.chat/eslint-config": "npm:~0.6.0" - "@rocket.chat/fuselage": "npm:~0.36.0" + "@rocket.chat/fuselage": "npm:~0.42.0" "@rocket.chat/fuselage-hooks": "npm:~0.32.1" "@rocket.chat/fuselage-polyfills": "npm:~0.31.25" "@rocket.chat/icons": "npm:~0.32.0" @@ -14325,7 +14322,6 @@ __metadata: "@types/stylis": "npm:~4.2.5" "@typescript-eslint/eslint-plugin": "npm:~5.60.1" "@typescript-eslint/parser": "npm:~5.60.1" - abort-controller: "npm:^3.0.0" axios: "npm:^1.4.0" builtin-modules: "npm:^3.2.0" chokidar: "npm:^3.5.3"