From d5ea8ccdecb99e827a915fc45188f1f938c11f28 Mon Sep 17 00:00:00 2001 From: Timofey Boyko <55255132+TimofeyBoyko@users.noreply.github.com> Date: Tue, 4 Apr 2023 17:37:21 +0300 Subject: [PATCH] Web: remove useless withRouter and change import from 'react-router' to 'react-router-dom' --- .../components/Article/Body/AccountsItem.js | 2 +- .../components/Article/Body/SettingsItem.js | 2 +- .../src/components/Article/Body/index.js | 11 +-- .../components/Article/MainButton/index.js | 2 +- packages/client/src/components/MainBar/Bar.js | 3 +- .../client/src/components/NavMenu/index.js | 2 +- .../NavMenu/sub-components/header-nav.js | 27 +++--- .../components/PeopleArticle/Body/index.js | 2 +- .../PeopleArticle/MainButton/index.js | 9 +- .../components/dialogs/ArchiveDialog/index.js | 4 +- .../dialogs/ChangeUserStatusDialog/index.js | 27 +++--- .../dialogs/ConflictResolveDialog/index.js | 7 +- .../components/dialogs/ConvertDialog/index.js | 17 +--- .../components/dialogs/DeleteDialog/index.js | 26 ++--- .../dialogs/DeleteProfileEverDialog/index.js | 2 +- .../dialogs/DeleteThirdPartyDialog/index.js | 14 +-- .../dialogs/DeleteUsersDialog/index.js | 19 ++-- .../dialogs/DownloadDialog/index.js | 18 +--- .../dialogs/EmptyTrashDialog/index.js | 9 +- .../dialogs/InviteUsersWarningDialog/index.js | 9 +- .../dialogs/ResetApplicationDialog/index.js | 2 +- .../dialogs/SendInviteDialog/index.js | 13 +-- .../panels/ChangeOwnerPanel/index.js | 12 +-- .../components/panels/NewFilesPanel/index.js | 21 ++-- .../panels/OperationsPanel/index.js | 4 +- packages/client/src/helpers/confirmRoute.js | 3 +- .../client/src/pages/About/AboutHeader.js | 2 +- .../Section/Body/RowView/SimpleUserRow.js | 3 +- .../Section/Body/RowView/userContent.js | 13 +-- .../Section/Body/TableView/TableRow.js | 3 +- .../AccountsHome/Section/Filter/index.js | 56 +++++------ .../AccountsHome/Section/Header/index.js | 95 +++++++++---------- .../client/src/pages/AccountsHome/index.js | 19 +--- .../Confirm/sub-components/activateEmail.js | 4 +- .../Confirm/sub-components/activateUser.js | 7 +- .../src/pages/Confirm/sub-components/auth.js | 3 +- .../Confirm/sub-components/changeEmail.js | 3 +- .../Confirm/sub-components/changeOwner.js | 7 +- .../Confirm/sub-components/changePassword.js | 7 +- .../Confirm/sub-components/changePhone.js | 6 +- .../Confirm/sub-components/continuePortal.js | 2 +- .../Confirm/sub-components/createUser.js | 13 +-- .../sub-components/deactivatePortal.js | 11 +-- .../Confirm/sub-components/profileRemove.js | 7 +- .../Confirm/sub-components/removePortal.js | 11 +-- .../Confirm/sub-components/tfaActivation.js | 2 +- .../pages/Confirm/sub-components/tfaAuth.js | 2 +- .../src/pages/Home/InfoPanel/Body/index.js | 3 +- .../src/pages/Home/MediaViewer/index.js | 8 +- .../Section/Body/RowsView/FilesRowContent.js | 7 +- .../Section/Body/RowsView/SimpleFilesRow.js | 3 +- .../Home/Section/Body/TableView/TableRow.js | 5 +- .../Home/Section/Body/TilesView/FileTile.js | 5 +- .../Body/TilesView/FilesTileContent.js | 7 +- .../src/pages/Home/Section/Body/index.js | 7 +- .../src/pages/Home/Section/Filter/index.js | 26 +++-- .../src/pages/Home/Section/Header/index.js | 37 ++------ packages/client/src/pages/Home/index.js | 11 +-- packages/client/src/pages/My/index.js | 25 ++--- .../Layout/Article/Body/index.js | 2 +- .../Layout/Section/Header/index.js | 2 +- .../categories/common/appearance.js | 34 +++---- .../categories/common/customization-navbar.js | 12 +-- .../categories/common/customization.js | 5 +- .../PortalSettings/categories/common/index.js | 2 +- .../categories/data-management/index.js | 9 +- .../categories/delete-data/index.js | 2 +- .../delete-data/portalDeactivation.js | 3 +- .../categories/delete-data/portalDeletion.js | 3 +- .../categories/integration/index.js | 2 +- .../categories/payments/ContactContainer.js | 3 +- .../categories/payments/PaymentContainer.js | 3 +- .../categories/payments/index.js | 3 +- .../security/access-portal/adminMessage.js | 2 +- .../security/access-portal/index.js | 3 +- .../security/access-portal/ipSecurity.js | 2 +- .../security/access-portal/mobileView.js | 2 +- .../access-portal/passwordStrength.js | 9 +- .../security/access-portal/sessionLifetime.js | 2 +- .../categories/security/access-portal/tfa.js | 2 +- .../security/access-portal/trustedMail.js | 2 +- .../audit-trail/TableView/TableRow.js | 3 +- .../categories/security/audit-trail/index.js | 3 +- .../categories/security/index.js | 2 +- .../login-history/TableView/TableRow.js | 3 +- .../security/login-history/index.js | 3 +- .../security/sub-components/modules.js | 5 +- .../client/src/pages/PortalSettings/index.js | 45 +++++++-- .../src/pages/PrivateRoomsPage/index.js | 2 +- .../src/pages/Profile/Section/Body/index.js | 2 +- .../src/pages/Profile/Section/Header/index.js | 2 +- packages/client/src/pages/Profile/index.js | 60 ++++++------ .../src/pages/Settings/Section/Body/index.js | 2 +- .../VersionHistory/Section/Body/VersionRow.js | 7 +- .../VersionHistory/Section/Body/index.js | 12 +-- .../VersionHistory/Section/Header/index.js | 1 - .../client/src/pages/VersionHistory/index.js | 16 +--- packages/client/src/pages/Wizard/index.js | 2 +- .../Article/sub-components/article-header.js | 2 +- .../sub-components/article-payment-alert.js | 5 +- .../Article/sub-components/article-profile.js | 21 ++-- 101 files changed, 382 insertions(+), 612 deletions(-) diff --git a/packages/client/src/components/Article/Body/AccountsItem.js b/packages/client/src/components/Article/Body/AccountsItem.js index be1e934145..3567f4dbd4 100644 --- a/packages/client/src/components/Article/Body/AccountsItem.js +++ b/packages/client/src/components/Article/Body/AccountsItem.js @@ -1,6 +1,6 @@ import CatalogAccountsReactSvgUrl from "PUBLIC_DIR/images/catalog.accounts.react.svg?url"; import React from "react"; -import { withRouter } from "react-router"; +import { withRouter } from "react-router-dom"; import CatalogItem from "@docspace/components/catalog-item"; import { inject, observer } from "mobx-react"; import { withTranslation } from "react-i18next"; diff --git a/packages/client/src/components/Article/Body/SettingsItem.js b/packages/client/src/components/Article/Body/SettingsItem.js index c7fff41f0a..5923835bc6 100644 --- a/packages/client/src/components/Article/Body/SettingsItem.js +++ b/packages/client/src/components/Article/Body/SettingsItem.js @@ -1,6 +1,6 @@ import CatalogSettingsReactSvgUrl from "PUBLIC_DIR/images/catalog.settings.react.svg?url"; import React from "react"; -import { withRouter } from "react-router"; +import { withRouter } from "react-router-dom"; import CatalogItem from "@docspace/components/catalog-item"; import { inject, observer } from "mobx-react"; import { withTranslation } from "react-i18next"; diff --git a/packages/client/src/components/Article/Body/index.js b/packages/client/src/components/Article/Body/index.js index 6b497f393d..7f773676f7 100644 --- a/packages/client/src/components/Article/Body/index.js +++ b/packages/client/src/components/Article/Body/index.js @@ -1,7 +1,7 @@ import React from "react"; import styled from "styled-components"; import { inject, observer } from "mobx-react"; -import { withRouter } from "react-router"; + import { setDocumentTitle } from "@docspace/client/src/helpers/filesUtils"; import config from "PACKAGE_FILE"; import { RoomSearchArea } from "@docspace/common/constants"; @@ -70,9 +70,6 @@ const ArticleBodyContent = (props) => { fetchRooms, setAlreadyFetchingRooms, - - homepage, - history, } = props; if (filesIsLoading) return; @@ -238,9 +235,7 @@ export default inject( }; } )( - withRouter( - withTranslation([])( - withLoader(observer(ArticleBodyContent))() - ) + withTranslation([])( + withLoader(observer(ArticleBodyContent))() ) ); diff --git a/packages/client/src/components/Article/MainButton/index.js b/packages/client/src/components/Article/MainButton/index.js index eea4197b1a..00ac8dc2f9 100644 --- a/packages/client/src/components/Article/MainButton/index.js +++ b/packages/client/src/components/Article/MainButton/index.js @@ -20,7 +20,7 @@ import MainButton from "@docspace/components/main-button"; import { withTranslation } from "react-i18next"; import Loaders from "@docspace/common/components/Loaders"; import { encryptionUploadDialog } from "../../../helpers/desktop"; -import { withRouter } from "react-router"; +import { withRouter } from "react-router-dom"; import MobileView from "./MobileView"; import { combineUrl } from "@docspace/common/utils"; diff --git a/packages/client/src/components/MainBar/Bar.js b/packages/client/src/components/MainBar/Bar.js index 62380281dc..fe0a38dc02 100644 --- a/packages/client/src/components/MainBar/Bar.js +++ b/packages/client/src/components/MainBar/Bar.js @@ -2,7 +2,6 @@ import React, { useEffect, useState } from "react"; import { inject, observer } from "mobx-react"; import difference from "lodash/difference"; import { withTranslation } from "react-i18next"; -import { withRouter } from "react-router"; import { ADS_TIMEOUT } from "@docspace/client/src/helpers/filesConstants"; @@ -337,4 +336,4 @@ export default inject(({ auth, profileActionsStore }) => { currentColorScheme, setMainBarVisible, }; -})(withTranslation(["Profile", "Common"])(withRouter(observer(Bar)))); +})(withTranslation(["Profile", "Common"])(observer(Bar))); diff --git a/packages/client/src/components/NavMenu/index.js b/packages/client/src/components/NavMenu/index.js index 2d0c0af9bb..190d99599a 100644 --- a/packages/client/src/components/NavMenu/index.js +++ b/packages/client/src/components/NavMenu/index.js @@ -8,7 +8,7 @@ import Header from "./sub-components/header"; import HeaderNav from "./sub-components/header-nav"; import HeaderUnAuth from "./sub-components/header-unauth"; import { I18nextProvider, withTranslation } from "react-i18next"; -import { withRouter } from "react-router"; +import { withRouter } from "react-router-dom"; import Loaders from "@docspace/common/components/Loaders"; import { LayoutContextConsumer } from "../Layout/context"; diff --git a/packages/client/src/components/NavMenu/sub-components/header-nav.js b/packages/client/src/components/NavMenu/sub-components/header-nav.js index 9194502d8b..c8ce05adf5 100644 --- a/packages/client/src/components/NavMenu/sub-components/header-nav.js +++ b/packages/client/src/components/NavMenu/sub-components/header-nav.js @@ -5,7 +5,6 @@ import ProfileActions from "./profile-actions"; import { useTranslation } from "react-i18next"; import { tablet, mobile } from "@docspace/components/utils/device"; import { inject, observer } from "mobx-react"; -import { withRouter } from "react-router"; import { isMobile, isMobileOnly } from "react-device-detect"; const StyledNav = styled.nav` @@ -80,18 +79,16 @@ HeaderNav.propTypes = { isAuthenticated: PropTypes.bool, }; -export default withRouter( - inject(({ auth, profileActionsStore }) => { - const { userStore, isAuthenticated } = auth; - const { user, userIsUpdate, setUserIsUpdate } = userStore; - const { getActions } = profileActionsStore; +export default inject(({ auth, profileActionsStore }) => { + const { userStore, isAuthenticated } = auth; + const { user, userIsUpdate, setUserIsUpdate } = userStore; + const { getActions } = profileActionsStore; - return { - user, - isAuthenticated, - userIsUpdate, - setUserIsUpdate, - getActions, - }; - })(observer(HeaderNav)) -); + return { + user, + isAuthenticated, + userIsUpdate, + setUserIsUpdate, + getActions, + }; +})(observer(HeaderNav)); diff --git a/packages/client/src/components/PeopleArticle/Body/index.js b/packages/client/src/components/PeopleArticle/Body/index.js index 92d375f971..380412928e 100644 --- a/packages/client/src/components/PeopleArticle/Body/index.js +++ b/packages/client/src/components/PeopleArticle/Body/index.js @@ -6,7 +6,7 @@ import Filter from "@docspace/common/api/people/filter"; import Loaders from "@docspace/common/components/Loaders"; import { inject, observer } from "mobx-react"; import { getSelectedGroup } from "../../../helpers/people-helpers"; -import { withRouter } from "react-router"; +import { withRouter } from "react-router-dom"; import { isMobile } from "@docspace/components/utils/device"; import { isMobileOnly } from "react-device-detect"; import config from "PACKAGE_FILE"; diff --git a/packages/client/src/components/PeopleArticle/MainButton/index.js b/packages/client/src/components/PeopleArticle/MainButton/index.js index 39344997d0..71e160d82a 100644 --- a/packages/client/src/components/PeopleArticle/MainButton/index.js +++ b/packages/client/src/components/PeopleArticle/MainButton/index.js @@ -6,7 +6,7 @@ import AddGuestReactSvgUrl from "PUBLIC_DIR/images/add.guest.react.svg?url"; import AddEmployeeReactSvgUrl from "ASSETS/images/add.employee.react.svg?url"; import React from "react"; //import PropTypes from "prop-types"; -import { withRouter } from "react-router"; +import { withRouter } from "react-router-dom"; import MainButton from "@docspace/components/main-button"; import InviteDialog from "../../dialogs/InviteDialog/index"; import { withTranslation } from "react-i18next"; @@ -160,11 +160,8 @@ class ArticleMainButtonContent extends React.Component { export default withRouter( inject(({ auth }) => { - const { - userCaption, - guestCaption, - groupCaption, - } = auth.settingsStore.customNames; + const { userCaption, guestCaption, groupCaption } = + auth.settingsStore.customNames; return { isAdmin: auth.isAdmin, diff --git a/packages/client/src/components/dialogs/ArchiveDialog/index.js b/packages/client/src/components/dialogs/ArchiveDialog/index.js index 8409b4aad3..890075ada0 100644 --- a/packages/client/src/components/dialogs/ArchiveDialog/index.js +++ b/packages/client/src/components/dialogs/ArchiveDialog/index.js @@ -1,6 +1,6 @@ import React, { useEffect } from "react"; import styled from "styled-components"; -import { withRouter } from "react-router"; + import ModalDialogContainer from "../ModalDialogContainer"; import Text from "@docspace/components/text"; import Button from "@docspace/components/button"; @@ -168,4 +168,4 @@ export default inject( items, }; } -)(withRouter(observer(ArchiveDialog))); +)(observer(ArchiveDialog)); diff --git a/packages/client/src/components/dialogs/ChangeUserStatusDialog/index.js b/packages/client/src/components/dialogs/ChangeUserStatusDialog/index.js index aefaad219b..51855e3826 100644 --- a/packages/client/src/components/dialogs/ChangeUserStatusDialog/index.js +++ b/packages/client/src/components/dialogs/ChangeUserStatusDialog/index.js @@ -1,5 +1,4 @@ import React, { memo } from "react"; -import { withRouter } from "react-router"; import PropTypes from "prop-types"; import ModalDialog from "@docspace/components/modal-dialog"; @@ -135,23 +134,21 @@ ChangeUserStatusDialog.propTypes = { userIDs: PropTypes.arrayOf(PropTypes.string).isRequired, }; -export default withRouter( - inject(({ peopleStore, auth }) => { - const setSelected = peopleStore.selectionStore.setSelected; +export default inject(({ peopleStore, auth }) => { + const setSelected = peopleStore.selectionStore.setSelected; - const { getPeopleListItem, updateUserStatus } = peopleStore.usersStore; + const { getPeopleListItem, updateUserStatus } = peopleStore.usersStore; - const { setSelection, isVisible: infoPanelVisible } = auth.infoPanelStore; + const { setSelection, isVisible: infoPanelVisible } = auth.infoPanelStore; - return { - updateUserStatus, + return { + updateUserStatus, - setSelected, + setSelected, - getPeopleListItem, + getPeopleListItem, - setSelection, - infoPanelVisible, - }; - })(observer(ChangeUserStatusDialog)) -); + setSelection, + infoPanelVisible, + }; +})(observer(ChangeUserStatusDialog)); diff --git a/packages/client/src/components/dialogs/ConflictResolveDialog/index.js b/packages/client/src/components/dialogs/ConflictResolveDialog/index.js index 4eb0f01f76..5ce72c5706 100644 --- a/packages/client/src/components/dialogs/ConflictResolveDialog/index.js +++ b/packages/client/src/components/dialogs/ConflictResolveDialog/index.js @@ -1,5 +1,4 @@ import React, { useState } from "react"; -import { withRouter } from "react-router"; import ModalDialog from "@docspace/components/modal-dialog"; import RadioButtonGroup from "@docspace/components/radio-button-group"; import Button from "@docspace/components/button"; @@ -282,9 +281,7 @@ export default inject(({ auth, dialogsStore, uploadDataStore, filesStore }) => { setCopyPanelVisible, }; })( - withRouter( - withTranslation(["ConflictResolveDialog", "Common"])( - observer(ConflictResolveDialog) - ) + withTranslation(["ConflictResolveDialog", "Common"])( + observer(ConflictResolveDialog) ) ); diff --git a/packages/client/src/components/dialogs/ConvertDialog/index.js b/packages/client/src/components/dialogs/ConvertDialog/index.js index ea75584397..f21d48e5e8 100644 --- a/packages/client/src/components/dialogs/ConvertDialog/index.js +++ b/packages/client/src/components/dialogs/ConvertDialog/index.js @@ -1,5 +1,4 @@ import React, { useState, useEffect } from "react"; -import { withRouter } from "react-router"; import ModalDialogContainer from "../ModalDialogContainer"; import ModalDialog from "@docspace/components/modal-dialog"; import Button from "@docspace/components/button"; @@ -157,16 +156,10 @@ export default inject( isFavoritesFolder, isShareFolder, } = treeFoldersStore; - const { - convertUploadedFiles, - convertFile, - setIsConvertSingleFile, - } = uploadDataStore; - const { - storeOriginalFiles, - setStoreOriginal, - hideConfirmConvert, - } = settingsStore; + const { convertUploadedFiles, convertFile, setIsConvertSingleFile } = + uploadDataStore; + const { storeOriginalFiles, setStoreOriginal, hideConfirmConvert } = + settingsStore; const { id: folderId } = selectedFolderStore; const { convertDialogVisible: visible, @@ -191,4 +184,4 @@ export default inject( setIsConvertSingleFile, }; } -)(withRouter(observer(ConvertDialog))); +)(observer(ConvertDialog)); diff --git a/packages/client/src/components/dialogs/DeleteDialog/index.js b/packages/client/src/components/dialogs/DeleteDialog/index.js index a27f3b2a47..2d5bfaf399 100644 --- a/packages/client/src/components/dialogs/DeleteDialog/index.js +++ b/packages/client/src/components/dialogs/DeleteDialog/index.js @@ -1,5 +1,4 @@ import React, { useEffect } from "react"; -import { withRouter } from "react-router"; import ModalDialog from "@docspace/components/modal-dialog"; import { StyledDeleteDialog } from "./StyledDeleteDialog"; import Button from "@docspace/components/button"; @@ -214,23 +213,12 @@ const DeleteDialog = withTranslation([ export default inject( ({ filesStore, dialogsStore, filesActionsStore, treeFoldersStore, auth }) => { - const { - selection, - isLoading, - bufferSelection, - setBufferSelection, - } = filesStore; - const { - deleteAction, - unsubscribeAction, - deleteRoomsAction, - } = filesActionsStore; - const { - isPrivacyFolder, - isRecycleBinFolder, - isPersonalRoom, - isRoom, - } = treeFoldersStore; + const { selection, isLoading, bufferSelection, setBufferSelection } = + filesStore; + const { deleteAction, unsubscribeAction, deleteRoomsAction } = + filesActionsStore; + const { isPrivacyFolder, isRecycleBinFolder, isPersonalRoom, isRoom } = + treeFoldersStore; const { deleteDialogVisible: visible, @@ -268,4 +256,4 @@ export default inject( isRoom, }; } -)(withRouter(observer(DeleteDialog))); +)(observer(DeleteDialog)); diff --git a/packages/client/src/components/dialogs/DeleteProfileEverDialog/index.js b/packages/client/src/components/dialogs/DeleteProfileEverDialog/index.js index 806caef238..ebb95e9cbe 100644 --- a/packages/client/src/components/dialogs/DeleteProfileEverDialog/index.js +++ b/packages/client/src/components/dialogs/DeleteProfileEverDialog/index.js @@ -1,5 +1,5 @@ import React from "react"; -import { withRouter } from "react-router"; +import { withRouter } from "react-router-dom"; import PropTypes from "prop-types"; import Button from "@docspace/components/button"; diff --git a/packages/client/src/components/dialogs/DeleteThirdPartyDialog/index.js b/packages/client/src/components/dialogs/DeleteThirdPartyDialog/index.js index de38cfee41..f5b7237741 100644 --- a/packages/client/src/components/dialogs/DeleteThirdPartyDialog/index.js +++ b/packages/client/src/components/dialogs/DeleteThirdPartyDialog/index.js @@ -1,5 +1,4 @@ import React, { useState } from "react"; -import { withRouter } from "react-router"; import ModalDialog from "@docspace/components/modal-dialog"; import Button from "@docspace/components/button"; import { withTranslation } from "react-i18next"; @@ -104,11 +103,8 @@ export default inject( selectedFolderStore, backup, }) => { - const { - providers, - setThirdPartyProviders, - deleteThirdParty, - } = settingsStore.thirdPartyStore; + const { providers, setThirdPartyProviders, deleteThirdParty } = + settingsStore.thirdPartyStore; const { fetchFiles } = filesStore; const { selectedThirdPartyAccount: backupConnectionItem } = backup; const { @@ -132,9 +128,7 @@ export default inject( }; } )( - withRouter( - withTranslation(["DeleteThirdPartyDialog", "Common", "Translations"])( - observer(DeleteThirdPartyDialog) - ) + withTranslation(["DeleteThirdPartyDialog", "Common", "Translations"])( + observer(DeleteThirdPartyDialog) ) ); diff --git a/packages/client/src/components/dialogs/DeleteUsersDialog/index.js b/packages/client/src/components/dialogs/DeleteUsersDialog/index.js index d77f13d412..05e8264824 100644 --- a/packages/client/src/components/dialogs/DeleteUsersDialog/index.js +++ b/packages/client/src/components/dialogs/DeleteUsersDialog/index.js @@ -1,5 +1,4 @@ import React, { memo } from "react"; -import { withRouter } from "react-router"; import PropTypes from "prop-types"; import Button from "@docspace/components/button"; @@ -160,13 +159,11 @@ DeleteUsersDialog.propTypes = { removeUser: PropTypes.func.isRequired, }; -export default withRouter( - inject(({ peopleStore, auth }) => ({ - filter: peopleStore.filterStore.filter, - removeUser: peopleStore.usersStore.removeUser, - selectedUsers: peopleStore.selectionStore.selection, - setSelected: peopleStore.selectionStore.setSelected, - userIds: peopleStore.selectionStore.getUsersToRemoveIds, - theme: auth.settingsStore.theme, - }))(observer(DeleteUsersDialog)) -); +export default inject(({ peopleStore, auth }) => ({ + filter: peopleStore.filterStore.filter, + removeUser: peopleStore.usersStore.removeUser, + selectedUsers: peopleStore.selectionStore.selection, + setSelected: peopleStore.selectionStore.setSelected, + userIds: peopleStore.selectionStore.getUsersToRemoveIds, + theme: auth.settingsStore.theme, +}))(observer(DeleteUsersDialog)); diff --git a/packages/client/src/components/dialogs/DownloadDialog/index.js b/packages/client/src/components/dialogs/DownloadDialog/index.js index 0ef895a17c..ce0ccc7fef 100644 --- a/packages/client/src/components/dialogs/DownloadDialog/index.js +++ b/packages/client/src/components/dialogs/DownloadDialog/index.js @@ -1,5 +1,4 @@ import React from "react"; -import { withRouter } from "react-router"; import { withTranslation, Trans } from "react-i18next"; import { inject, observer } from "mobx-react"; import { StyledDownloadDialog } from "./StyledDownloadDialog"; @@ -12,13 +11,8 @@ import DownloadContent from "./DownloadContent"; class DownloadDialogComponent extends React.Component { constructor(props) { super(props); - const { - documents, - spreadsheets, - presentations, - masterForms, - other, - } = this.props.sortedFiles; + const { documents, spreadsheets, presentations, masterForms, other } = + this.props.sortedFiles; this.state = { documents: { @@ -404,10 +398,8 @@ export default inject( const { extsConvertible } = settingsStore; const { theme } = auth.settingsStore; - const { - downloadDialogVisible: visible, - setDownloadDialogVisible, - } = dialogsStore; + const { downloadDialogVisible: visible, setDownloadDialogVisible } = + dialogsStore; const { downloadFiles } = filesActionsStore; @@ -422,4 +414,4 @@ export default inject( theme, }; } -)(withRouter(observer(DownloadDialog))); +)(observer(DownloadDialog)); diff --git a/packages/client/src/components/dialogs/EmptyTrashDialog/index.js b/packages/client/src/components/dialogs/EmptyTrashDialog/index.js index 450b66c132..da3aed64b4 100644 --- a/packages/client/src/components/dialogs/EmptyTrashDialog/index.js +++ b/packages/client/src/components/dialogs/EmptyTrashDialog/index.js @@ -1,6 +1,5 @@ import React, { useEffect } from "react"; import styled from "styled-components"; -import { withRouter } from "react-router"; import ModalDialogContainer from "../ModalDialogContainer"; import Text from "@docspace/components/text"; import Button from "@docspace/components/button"; @@ -113,10 +112,8 @@ export default inject( const { isArchiveFolder } = treeFoldersStore; - const { - emptyTrashDialogVisible: visible, - setEmptyTrashDialogVisible, - } = dialogsStore; + const { emptyTrashDialogVisible: visible, setEmptyTrashDialogVisible } = + dialogsStore; return { isLoading, @@ -130,4 +127,4 @@ export default inject( isArchiveFolder, }; } -)(withRouter(observer(EmptyTrashDialog))); +)(observer(EmptyTrashDialog)); diff --git a/packages/client/src/components/dialogs/InviteUsersWarningDialog/index.js b/packages/client/src/components/dialogs/InviteUsersWarningDialog/index.js index fb27239101..de222d46e0 100644 --- a/packages/client/src/components/dialogs/InviteUsersWarningDialog/index.js +++ b/packages/client/src/components/dialogs/InviteUsersWarningDialog/index.js @@ -1,7 +1,7 @@ import React, { useState, useEffect } from "react"; import { inject, observer } from "mobx-react"; import { withTranslation, Trans } from "react-i18next"; -import { withRouter } from "react-router"; +import { withRouter } from "react-router-dom"; import moment from "moment"; import { combineUrl } from "@docspace/common/utils"; import ModalDialog from "@docspace/components/modal-dialog"; @@ -132,11 +132,8 @@ const InviteUsersWarningDialog = (props) => { export default inject(({ auth, dialogsStore }) => { const { isPaymentPageAvailable } = auth; - const { - dueDate, - delayDueDate, - isGracePeriod, - } = auth.currentTariffStatusStore; + const { dueDate, delayDueDate, isGracePeriod } = + auth.currentTariffStatusStore; const { currentTariffPlanTitle } = auth.currentQuotaStore; const { diff --git a/packages/client/src/components/dialogs/ResetApplicationDialog/index.js b/packages/client/src/components/dialogs/ResetApplicationDialog/index.js index d258a942e9..7d55f60420 100644 --- a/packages/client/src/components/dialogs/ResetApplicationDialog/index.js +++ b/packages/client/src/components/dialogs/ResetApplicationDialog/index.js @@ -4,7 +4,7 @@ import ModalDialog from "@docspace/components/modal-dialog"; import Button from "@docspace/components/button"; import Text from "@docspace/components/text"; import { withTranslation } from "react-i18next"; -import { withRouter } from "react-router"; +import { withRouter } from "react-router-dom"; import ModalDialogContainer from "../ModalDialogContainer"; import toastr from "@docspace/components/toast/toastr"; diff --git a/packages/client/src/components/dialogs/SendInviteDialog/index.js b/packages/client/src/components/dialogs/SendInviteDialog/index.js index d699cbad72..fd4a826d38 100644 --- a/packages/client/src/components/dialogs/SendInviteDialog/index.js +++ b/packages/client/src/components/dialogs/SendInviteDialog/index.js @@ -1,5 +1,4 @@ import React, { memo } from "react"; -import { withRouter } from "react-router"; import PropTypes from "prop-types"; import ModalDialog from "@docspace/components/modal-dialog"; @@ -166,10 +165,8 @@ SendInviteDialog.propTypes = { setSelected: PropTypes.func.isRequired, }; -export default withRouter( - inject(({ peopleStore }) => ({ - selectedUsers: peopleStore.selectionStore.selection, - setSelected: peopleStore.selectionStore.setSelected, - userIds: peopleStore.selectionStore.getUsersToInviteIds, - }))(observer(SendInviteDialog)) -); +export default inject(({ peopleStore }) => ({ + selectedUsers: peopleStore.selectionStore.selection, + setSelected: peopleStore.selectionStore.setSelected, + userIds: peopleStore.selectionStore.getUsersToInviteIds, +}))(observer(SendInviteDialog)); diff --git a/packages/client/src/components/panels/ChangeOwnerPanel/index.js b/packages/client/src/components/panels/ChangeOwnerPanel/index.js index d3d6805f16..56f35ea02b 100644 --- a/packages/client/src/components/panels/ChangeOwnerPanel/index.js +++ b/packages/client/src/components/panels/ChangeOwnerPanel/index.js @@ -1,5 +1,4 @@ import React from "react"; -import { withRouter } from "react-router"; import Backdrop from "@docspace/components/backdrop"; import Heading from "@docspace/components/heading"; import Aside from "@docspace/components/aside"; @@ -29,13 +28,8 @@ class ChangeOwnerComponent extends React.Component { onOwnerChange = () => { const { owner } = this.state; - const { - selection, - setFolder, - setFile, - setIsLoading, - setFilesOwner, - } = this.props; + const { selection, setFolder, setFile, setIsLoading, setFilesOwner } = + this.props; const folderIds = []; const fileIds = []; const selectedItem = selection[0]; @@ -162,4 +156,4 @@ export default inject(({ auth, filesStore, dialogsStore }) => { setFilesOwner, setBufferSelection, }; -})(withRouter(observer(ChangeOwnerPanel))); +})(observer(ChangeOwnerPanel)); diff --git a/packages/client/src/components/panels/NewFilesPanel/index.js b/packages/client/src/components/panels/NewFilesPanel/index.js index 8d78e7da59..bed5a22860 100644 --- a/packages/client/src/components/panels/NewFilesPanel/index.js +++ b/packages/client/src/components/panels/NewFilesPanel/index.js @@ -1,5 +1,4 @@ import React from "react"; -import { withRouter } from "react-router"; import Backdrop from "@docspace/components/backdrop"; import Link from "@docspace/components/link"; import Loader from "@docspace/components/loader"; @@ -94,11 +93,8 @@ class NewFilesPanel extends React.Component { const { id, extension: fileExst } = e.target.dataset; - const { - /* updateFolderBadge, */ markAsRead, - newFiles, - refreshFiles, - } = this.props; + const { /* updateFolderBadge, */ markAsRead, newFiles, refreshFiles } = + this.props; const readingFiles = this.state.readingFiles; const fileIds = fileExst ? [id] : []; @@ -332,11 +328,8 @@ export default inject( refreshFiles, } = filesStore; //const { updateRootBadge } = treeFoldersStore; - const { - playlist, - setMediaViewerData, - setCurrentItem, - } = mediaViewerDataStore; + const { playlist, setMediaViewerData, setCurrentItem } = + mediaViewerDataStore; const { getIcon, getFolderIcon } = settingsStore; const { markAsRead } = filesActionsStore; const { pathParts, id: currentFolderId } = selectedFolderStore; @@ -379,9 +372,7 @@ export default inject( }; } )( - withRouter( - withTranslation(["NewFilesPanel", "Common"])( - withLoader(observer(NewFilesPanel))() - ) + withTranslation(["NewFilesPanel", "Common"])( + withLoader(observer(NewFilesPanel))() ) ); diff --git a/packages/client/src/components/panels/OperationsPanel/index.js b/packages/client/src/components/panels/OperationsPanel/index.js index df92571c41..0a58a1f431 100644 --- a/packages/client/src/components/panels/OperationsPanel/index.js +++ b/packages/client/src/components/panels/OperationsPanel/index.js @@ -1,5 +1,5 @@ import React, { useState, useEffect } from "react"; -import { withRouter } from "react-router"; + import { withTranslation } from "react-i18next"; import { inject, observer } from "mobx-react"; import toastr from "@docspace/components/toast/toastr"; @@ -246,4 +246,4 @@ export default inject( thirdPartyMoveDialogVisible, }; } -)(withRouter(observer(OperationsPanel))); +)(observer(OperationsPanel)); diff --git a/packages/client/src/helpers/confirmRoute.js b/packages/client/src/helpers/confirmRoute.js index 9cf9d6bdbe..90d6637b37 100644 --- a/packages/client/src/helpers/confirmRoute.js +++ b/packages/client/src/helpers/confirmRoute.js @@ -1,7 +1,6 @@ import React from "react"; import { Route } from "react-router-dom"; import { ValidationResult } from "./../helpers/constants"; -import { withRouter } from "react-router"; import Loader from "@docspace/components/loader"; import Section from "@docspace/common/components/Section"; import { checkConfirmLink } from "@docspace/common/api/user"; //TODO: Move AuthStore @@ -133,4 +132,4 @@ export default inject(({ auth }) => { isAuthenticated, logout, }; -})(observer(withRouter(ConfirmRoute))); +})(observer(ConfirmRoute)); diff --git a/packages/client/src/pages/About/AboutHeader.js b/packages/client/src/pages/About/AboutHeader.js index 9e167b7d2b..a15b80ca07 100644 --- a/packages/client/src/pages/About/AboutHeader.js +++ b/packages/client/src/pages/About/AboutHeader.js @@ -2,7 +2,7 @@ import React from "react"; import styled from "styled-components"; import { withTranslation } from "react-i18next"; -import { withRouter } from "react-router"; +import { withRouter } from "react-router-dom"; import Headline from "@docspace/common/components/Headline"; import IconButton from "@docspace/components/icon-button"; import { tablet } from "@docspace/components/utils/device"; diff --git a/packages/client/src/pages/AccountsHome/Section/Body/RowView/SimpleUserRow.js b/packages/client/src/pages/AccountsHome/Section/Body/RowView/SimpleUserRow.js index 60ae18595e..f390687481 100644 --- a/packages/client/src/pages/AccountsHome/Section/Body/RowView/SimpleUserRow.js +++ b/packages/client/src/pages/AccountsHome/Section/Body/RowView/SimpleUserRow.js @@ -1,6 +1,5 @@ import React from "react"; import styled, { css } from "styled-components"; -import { withRouter } from "react-router"; import { isMobile } from "react-device-detect"; import Row from "@docspace/components/row"; @@ -142,4 +141,4 @@ const SimpleUserRow = (props) => { ); }; -export default withRouter(withContent(SimpleUserRow)); +export default withContent(SimpleUserRow); diff --git a/packages/client/src/pages/AccountsHome/Section/Body/RowView/userContent.js b/packages/client/src/pages/AccountsHome/Section/Body/RowView/userContent.js index 878e415093..1aaa10260a 100644 --- a/packages/client/src/pages/AccountsHome/Section/Body/RowView/userContent.js +++ b/packages/client/src/pages/AccountsHome/Section/Body/RowView/userContent.js @@ -1,6 +1,5 @@ import React from "react"; import styled, { css } from "styled-components"; -import { withRouter } from "react-router"; import { isTablet } from "react-device-detect"; import { withTranslation } from "react-i18next"; @@ -40,14 +39,8 @@ const UserContent = ({ t, theme, }) => { - const { - displayName, - email, - statusType, - role, - isVisitor, - isCollaborator, - } = item; + const { displayName, email, statusType, role, isVisitor, isCollaborator } = + item; const nameColor = statusType === "pending" || statusType === "disabled" @@ -120,4 +113,4 @@ const UserContent = ({ ); }; -export default withTranslation(["People", "Common"])(withRouter(UserContent)); +export default withTranslation(["People", "Common"])(UserContent); diff --git a/packages/client/src/pages/AccountsHome/Section/Body/TableView/TableRow.js b/packages/client/src/pages/AccountsHome/Section/Body/TableView/TableRow.js index 00805e173a..87e6eabdce 100644 --- a/packages/client/src/pages/AccountsHome/Section/Body/TableView/TableRow.js +++ b/packages/client/src/pages/AccountsHome/Section/Body/TableView/TableRow.js @@ -1,6 +1,5 @@ import React from "react"; import styled from "styled-components"; -import { withRouter } from "react-router"; import { withTranslation } from "react-i18next"; import TableRow from "@docspace/components/table-container/TableRow"; @@ -429,5 +428,5 @@ const PeopleTableRow = (props) => { }; export default withTranslation(["People", "Common", "Settings"])( - withRouter(withContent(PeopleTableRow)) + withContent(PeopleTableRow) ); diff --git a/packages/client/src/pages/AccountsHome/Section/Filter/index.js b/packages/client/src/pages/AccountsHome/Section/Filter/index.js index 85f195492a..cc9e517cca 100644 --- a/packages/client/src/pages/AccountsHome/Section/Filter/index.js +++ b/packages/client/src/pages/AccountsHome/Section/Filter/index.js @@ -1,6 +1,5 @@ import React from "react"; import { inject, observer } from "mobx-react"; -import { withRouter } from "react-router"; import { withTranslation } from "react-i18next"; import { isMobileOnly } from "react-device-detect"; import find from "lodash/find"; @@ -474,38 +473,31 @@ const SectionFilterContent = ({ ); }; -export default withRouter( - inject(({ auth, peopleStore }) => { - const { - loadingStore, - filterStore, - usersStore, - groupsStore, - viewAs, - } = peopleStore; - const { userStore, isLoaded, isAdmin } = auth; - const { user } = userStore; - const { groups } = groupsStore; - const { getUsersList: fetchPeople } = usersStore; - const { filter } = filterStore; - const { setIsLoading } = loadingStore; +export default inject(({ auth, peopleStore }) => { + const { loadingStore, filterStore, usersStore, groupsStore, viewAs } = + peopleStore; + const { userStore, isLoaded, isAdmin } = auth; + const { user } = userStore; + const { groups } = groupsStore; + const { getUsersList: fetchPeople } = usersStore; + const { filter } = filterStore; + const { setIsLoading } = loadingStore; - return { - isLoaded, - isAdmin, - user, - groups, - fetchPeople, - filter, - setIsLoading, - viewAs, - }; - })( - observer( - withLayoutSize( - withTranslation(["People", "Common", "PeopleTranslations"])( - withPeopleLoader(SectionFilterContent)() - ) + return { + isLoaded, + isAdmin, + user, + groups, + fetchPeople, + filter, + setIsLoading, + viewAs, + }; +})( + observer( + withLayoutSize( + withTranslation(["People", "Common", "PeopleTranslations"])( + withPeopleLoader(SectionFilterContent)() ) ) ) diff --git a/packages/client/src/pages/AccountsHome/Section/Header/index.js b/packages/client/src/pages/AccountsHome/Section/Header/index.js index 8e212d5811..0c8fb2d07c 100644 --- a/packages/client/src/pages/AccountsHome/Section/Header/index.js +++ b/packages/client/src/pages/AccountsHome/Section/Header/index.js @@ -10,7 +10,6 @@ import { inject, observer } from "mobx-react"; import { withTranslation } from "react-i18next"; import { isMobile, isMobileOnly } from "react-device-detect"; import styled, { css } from "styled-components"; -import { withRouter } from "react-router"; import Headline from "@docspace/common/components/Headline"; import Loaders from "@docspace/common/components/Loaders"; import DropDownItem from "@docspace/components/drop-down-item"; @@ -363,62 +362,54 @@ const SectionHeaderContent = (props) => { ); }; -export default withRouter( - inject(({ auth, peopleStore, dialogsStore }) => { - const { - setIsVisible: setInfoPanelIsVisible, - isVisible: isInfoPanelVisible, - } = auth.infoPanelStore; +export default inject(({ auth, peopleStore, dialogsStore }) => { + const { setIsVisible: setInfoPanelIsVisible, isVisible: isInfoPanelVisible } = + auth.infoPanelStore; - const { - setInvitePanelOptions, - setInviteUsersWarningDialogVisible, - } = dialogsStore; + const { setInvitePanelOptions, setInviteUsersWarningDialogVisible } = + dialogsStore; - const { isOwner, isAdmin } = auth.userStore.user; - const { isGracePeriod } = auth.currentTariffStatusStore; + const { isOwner, isAdmin } = auth.userStore.user; + const { isGracePeriod } = auth.currentTariffStatusStore; - const { selectionStore, headerMenuStore, getHeaderMenu } = peopleStore; + const { selectionStore, headerMenuStore, getHeaderMenu } = peopleStore; - const { - isHeaderVisible, - isHeaderIndeterminate, - isHeaderChecked, - cbMenuItems, - getMenuItemId, - getCheckboxItemLabel, - } = headerMenuStore; + const { + isHeaderVisible, + isHeaderIndeterminate, + isHeaderChecked, + cbMenuItems, + getMenuItemId, + getCheckboxItemLabel, + } = headerMenuStore; - const { setSelected } = selectionStore; + const { setSelected } = selectionStore; - return { - setSelected, - isHeaderVisible, - isHeaderIndeterminate, - isHeaderChecked, - getHeaderMenu, - cbMenuItems, - getMenuItemId, - getCheckboxItemLabel, - setInfoPanelIsVisible, - isInfoPanelVisible, - isOwner, - isAdmin, - setInvitePanelOptions, - isGracePeriod, - setInviteUsersWarningDialogVisible, - }; - })( - withTranslation([ - "People", - "Common", - "PeopleTranslations", - "Files", - "ChangeUserTypeDialog", - ])( - withPeopleLoader(observer(SectionHeaderContent))( - - ) - ) + return { + setSelected, + isHeaderVisible, + isHeaderIndeterminate, + isHeaderChecked, + getHeaderMenu, + cbMenuItems, + getMenuItemId, + getCheckboxItemLabel, + setInfoPanelIsVisible, + isInfoPanelVisible, + isOwner, + isAdmin, + setInvitePanelOptions, + isGracePeriod, + setInviteUsersWarningDialogVisible, + }; +})( + withTranslation([ + "People", + "Common", + "PeopleTranslations", + "Files", + "ChangeUserTypeDialog", + ])( + withPeopleLoader(observer(SectionHeaderContent))() ) ); diff --git a/packages/client/src/pages/AccountsHome/index.js b/packages/client/src/pages/AccountsHome/index.js index 268db31857..e62f7e2f40 100644 --- a/packages/client/src/pages/AccountsHome/index.js +++ b/packages/client/src/pages/AccountsHome/index.js @@ -1,7 +1,7 @@ import React, { useEffect } from "react"; import { inject, observer } from "mobx-react"; import PropTypes from "prop-types"; -import { withRouter } from "react-router"; +import { withRouter } from "react-router-dom"; import { withTranslation } from "react-i18next"; import { isMobile } from "react-device-detect"; @@ -140,23 +140,14 @@ export default inject( const { settingsStore, currentTariffStatusStore } = auth; const { setPortalTariff } = currentTariffStatusStore; const { showCatalog, withPaging } = settingsStore; - const { - usersStore, - selectedGroupStore, - loadingStore, - viewAs, - } = peopleStore; + const { usersStore, selectedGroupStore, loadingStore, viewAs } = + peopleStore; const { getUsersList } = usersStore; const { selectedGroup } = selectedGroupStore; const { setSelectedNode } = treeFoldersStore; const { onClickBack } = filesActionsStore; - const { - isLoading, - setIsLoading, - setIsRefresh, - firstLoad, - setFirstLoad, - } = loadingStore; + const { isLoading, setIsLoading, setIsRefresh, firstLoad, setFirstLoad } = + loadingStore; return { setPortalTariff, diff --git a/packages/client/src/pages/Confirm/sub-components/activateEmail.js b/packages/client/src/pages/Confirm/sub-components/activateEmail.js index b420952375..61ab3f8110 100644 --- a/packages/client/src/pages/Confirm/sub-components/activateEmail.js +++ b/packages/client/src/pages/Confirm/sub-components/activateEmail.js @@ -1,5 +1,4 @@ import React from "react"; -import { withRouter } from "react-router"; import PropTypes from "prop-types"; import Loader from "@docspace/components/loader"; import Section from "@docspace/common/components/Section"; @@ -57,7 +56,6 @@ class ActivateEmail extends React.PureComponent { ActivateEmail.propTypes = { location: PropTypes.object.isRequired, - history: PropTypes.object.isRequired, }; const ActivateEmailForm = (props) => (
@@ -73,4 +71,4 @@ export default inject(({ auth }) => { logout, updateEmailActivationStatus: userStore.updateEmailActivationStatus, }; -})(withRouter(observer(ActivateEmailForm))); +})(observer(ActivateEmailForm)); diff --git a/packages/client/src/pages/Confirm/sub-components/activateUser.js b/packages/client/src/pages/Confirm/sub-components/activateUser.js index 8dc74d1280..94c6dc54c9 100644 --- a/packages/client/src/pages/Confirm/sub-components/activateUser.js +++ b/packages/client/src/pages/Confirm/sub-components/activateUser.js @@ -1,5 +1,4 @@ import React, { useState } from "react"; -import { withRouter } from "react-router"; import { withTranslation } from "react-i18next"; import Text from "@docspace/components/text"; import TextInput from "@docspace/components/text-input"; @@ -266,9 +265,7 @@ export default inject(({ auth }) => { login: auth.login, }; })( - withRouter( - withTranslation(["Confirm", "Common", "Wizard"])( - withLoader(observer(ActivateUserForm)) - ) + withTranslation(["Confirm", "Common", "Wizard"])( + withLoader(observer(ActivateUserForm)) ) ); diff --git a/packages/client/src/pages/Confirm/sub-components/auth.js b/packages/client/src/pages/Confirm/sub-components/auth.js index cb5534015f..d3839110ff 100644 --- a/packages/client/src/pages/Confirm/sub-components/auth.js +++ b/packages/client/src/pages/Confirm/sub-components/auth.js @@ -1,5 +1,4 @@ import React, { useEffect } from "react"; -import { withRouter } from "react-router"; import Loader from "@docspace/components/loader"; import Section from "@docspace/common/components/Section"; import { loginWithConfirmKey } from "@docspace/common/api/user"; @@ -35,4 +34,4 @@ const AuthPage = (props) => (
); -export default withRouter(AuthPage); +export default AuthPage; diff --git a/packages/client/src/pages/Confirm/sub-components/changeEmail.js b/packages/client/src/pages/Confirm/sub-components/changeEmail.js index 9ab9988530..c1ecc65b8f 100644 --- a/packages/client/src/pages/Confirm/sub-components/changeEmail.js +++ b/packages/client/src/pages/Confirm/sub-components/changeEmail.js @@ -1,5 +1,4 @@ import React from "react"; -import { withRouter } from "react-router"; import PropTypes from "prop-types"; import { inject, observer } from "mobx-react"; import Loader from "@docspace/components/loader"; @@ -92,4 +91,4 @@ export default inject(({ auth }) => { changeEmail: userStore.changeEmail, defaultPage: settingsStore.defaultPage, }; -})(observer(withRouter(ChangeEmailForm))); +})(observer(ChangeEmailForm)); diff --git a/packages/client/src/pages/Confirm/sub-components/changeOwner.js b/packages/client/src/pages/Confirm/sub-components/changeOwner.js index 9ea69926db..30ec95930f 100644 --- a/packages/client/src/pages/Confirm/sub-components/changeOwner.js +++ b/packages/client/src/pages/Confirm/sub-components/changeOwner.js @@ -1,5 +1,4 @@ import React from "react"; -import { withRouter } from "react-router"; import { withTranslation } from "react-i18next"; import Text from "@docspace/components/text"; import Button from "@docspace/components/button"; @@ -60,9 +59,5 @@ export default inject(({ auth }) => ({ greetingTitle: auth.settingsStore.greetingSettings, defaultPage: auth.settingsStore.defaultPage, }))( - withRouter( - withTranslation(["Confirm", "Common"])( - withLoader(observer(ChangeOwnerForm)) - ) - ) + withTranslation(["Confirm", "Common"])(withLoader(observer(ChangeOwnerForm))) ); diff --git a/packages/client/src/pages/Confirm/sub-components/changePassword.js b/packages/client/src/pages/Confirm/sub-components/changePassword.js index c773454dfa..d702819fe1 100644 --- a/packages/client/src/pages/Confirm/sub-components/changePassword.js +++ b/packages/client/src/pages/Confirm/sub-components/changePassword.js @@ -1,5 +1,4 @@ import React, { useState, useEffect } from "react"; -import { withRouter } from "react-router"; import { withTranslation } from "react-i18next"; import Text from "@docspace/components/text"; import PasswordInput from "@docspace/components/password-input"; @@ -191,9 +190,7 @@ export default inject(({ auth, setup }) => { getSettings, }; })( - withRouter( - withTranslation(["Confirm", "Common", "Wizard"])( - withLoader(observer(ChangePasswordForm)) - ) + withTranslation(["Confirm", "Common", "Wizard"])( + withLoader(observer(ChangePasswordForm)) ) ); diff --git a/packages/client/src/pages/Confirm/sub-components/changePhone.js b/packages/client/src/pages/Confirm/sub-components/changePhone.js index 2fc569a57f..9d4b7494b5 100644 --- a/packages/client/src/pages/Confirm/sub-components/changePhone.js +++ b/packages/client/src/pages/Confirm/sub-components/changePhone.js @@ -1,5 +1,5 @@ import React, { useState } from "react"; -import { withRouter } from "react-router"; + import { withTranslation } from "react-i18next"; import Text from "@docspace/components/text"; import TextInput from "@docspace/components/text-input"; @@ -64,6 +64,4 @@ const ChangePhoneForm = (props) => { export default inject(({ auth }) => ({ greetingTitle: auth.settingsStore.greetingSettings, -}))( - withRouter(withTranslation("Confirm")(withLoader(observer(ChangePhoneForm)))) -); +}))(withTranslation("Confirm")(withLoader(observer(ChangePhoneForm)))); diff --git a/packages/client/src/pages/Confirm/sub-components/continuePortal.js b/packages/client/src/pages/Confirm/sub-components/continuePortal.js index 80a0f08412..8b158bcfda 100644 --- a/packages/client/src/pages/Confirm/sub-components/continuePortal.js +++ b/packages/client/src/pages/Confirm/sub-components/continuePortal.js @@ -1,5 +1,5 @@ import React, { useState } from "react"; -import { withRouter } from "react-router"; +import { withRouter } from "react-router-dom"; import { Trans, withTranslation } from "react-i18next"; import { inject, observer } from "mobx-react"; import Text from "@docspace/components/text"; diff --git a/packages/client/src/pages/Confirm/sub-components/createUser.js b/packages/client/src/pages/Confirm/sub-components/createUser.js index 5b40846413..09abc8e256 100644 --- a/packages/client/src/pages/Confirm/sub-components/createUser.js +++ b/packages/client/src/pages/Confirm/sub-components/createUser.js @@ -1,6 +1,5 @@ import SsoReactSvgUrl from "PUBLIC_DIR/images/sso.react.svg?url"; import React, { useEffect, useState, useCallback } from "react"; -import { withRouter } from "react-router"; import { withTranslation } from "react-i18next"; import PropTypes from "prop-types"; import { createUser, signupOAuth } from "@docspace/common/api/people"; @@ -314,9 +313,8 @@ const CreateUserForm = (props) => { if (!providersData[item.provider]) return; if (index > 1) return; - const { icon, label, iconOptions, className } = providersData[ - item.provider - ]; + const { icon, label, iconOptions, className } = + providersData[item.provider]; return (
@@ -640,7 +638,6 @@ const CreateUserForm = (props) => { CreateUserForm.propTypes = { location: PropTypes.object.isRequired, - history: PropTypes.object.isRequired, }; export default inject(({ auth }) => { @@ -677,9 +674,7 @@ export default inject(({ auth }) => { capabilities, }; })( - withRouter( - withTranslation(["Confirm", "Common", "Wizard"])( - withLoader(observer(CreateUserForm)) - ) + withTranslation(["Confirm", "Common", "Wizard"])( + withLoader(observer(CreateUserForm)) ) ); diff --git a/packages/client/src/pages/Confirm/sub-components/deactivatePortal.js b/packages/client/src/pages/Confirm/sub-components/deactivatePortal.js index 47d9686cc4..1a9e4aec94 100644 --- a/packages/client/src/pages/Confirm/sub-components/deactivatePortal.js +++ b/packages/client/src/pages/Confirm/sub-components/deactivatePortal.js @@ -1,5 +1,5 @@ import React, { useState } from "react"; -import { withRouter } from "react-router"; +import { withRouter } from "react-router-dom"; import { Trans, withTranslation } from "react-i18next"; import { inject, observer } from "mobx-react"; import Text from "@docspace/components/text"; @@ -20,13 +20,8 @@ import FormWrapper from "@docspace/components/form-wrapper"; import DocspaceLogo from "../../../DocspaceLogo"; const DeactivatePortal = (props) => { - const { - t, - greetingTitle, - linkData, - history, - companyInfoSettingsData, - } = props; + const { t, greetingTitle, linkData, history, companyInfoSettingsData } = + props; const [isDeactivate, setIsDeactivate] = useState(false); const url = companyInfoSettingsData?.site diff --git a/packages/client/src/pages/Confirm/sub-components/profileRemove.js b/packages/client/src/pages/Confirm/sub-components/profileRemove.js index f1a94ab025..db0b29fdca 100644 --- a/packages/client/src/pages/Confirm/sub-components/profileRemove.js +++ b/packages/client/src/pages/Confirm/sub-components/profileRemove.js @@ -1,5 +1,4 @@ import React, { useState } from "react"; -import { withRouter } from "react-router"; import { withTranslation } from "react-i18next"; import Text from "@docspace/components/text"; import Button from "@docspace/components/button"; @@ -91,8 +90,4 @@ export default inject(({ auth }) => ({ greetingTitle: auth.settingsStore.greetingSettings, theme: auth.settingsStore.theme, logout: auth.logout, -}))( - withRouter( - withTranslation("Confirm")(withLoader(observer(ProfileRemoveForm))) - ) -); +}))(withTranslation("Confirm")(withLoader(observer(ProfileRemoveForm)))); diff --git a/packages/client/src/pages/Confirm/sub-components/removePortal.js b/packages/client/src/pages/Confirm/sub-components/removePortal.js index 4bacbcf0e2..79333425fd 100644 --- a/packages/client/src/pages/Confirm/sub-components/removePortal.js +++ b/packages/client/src/pages/Confirm/sub-components/removePortal.js @@ -1,5 +1,5 @@ import React, { useState } from "react"; -import { withRouter } from "react-router"; +import { withRouter } from "react-router-dom"; import { withTranslation } from "react-i18next"; import { inject, observer } from "mobx-react"; import Text from "@docspace/components/text"; @@ -19,13 +19,8 @@ import FormWrapper from "@docspace/components/form-wrapper"; import DocspaceLogo from "../../../DocspaceLogo"; const RemovePortal = (props) => { - const { - t, - greetingTitle, - linkData, - history, - companyInfoSettingsData, - } = props; + const { t, greetingTitle, linkData, history, companyInfoSettingsData } = + props; const [isRemoved, setIsRemoved] = useState(false); const url = companyInfoSettingsData?.site diff --git a/packages/client/src/pages/Confirm/sub-components/tfaActivation.js b/packages/client/src/pages/Confirm/sub-components/tfaActivation.js index b03ed33edf..9892808976 100644 --- a/packages/client/src/pages/Confirm/sub-components/tfaActivation.js +++ b/packages/client/src/pages/Confirm/sub-components/tfaActivation.js @@ -1,5 +1,5 @@ import React, { useCallback, useEffect, useState } from "react"; -import { withRouter } from "react-router"; +import { withRouter } from "react-router-dom"; import { Trans, withTranslation } from "react-i18next"; import styled from "styled-components"; import Button from "@docspace/components/button"; diff --git a/packages/client/src/pages/Confirm/sub-components/tfaAuth.js b/packages/client/src/pages/Confirm/sub-components/tfaAuth.js index e08c7d13fd..e0719e1711 100644 --- a/packages/client/src/pages/Confirm/sub-components/tfaAuth.js +++ b/packages/client/src/pages/Confirm/sub-components/tfaAuth.js @@ -1,5 +1,5 @@ import React, { useEffect, useState } from "react"; -import { withRouter } from "react-router"; +import { withRouter } from "react-router-dom"; import { withTranslation } from "react-i18next"; import styled from "styled-components"; import Button from "@docspace/components/button"; diff --git a/packages/client/src/pages/Home/InfoPanel/Body/index.js b/packages/client/src/pages/Home/InfoPanel/Body/index.js index e2b58b564d..72f71becb1 100644 --- a/packages/client/src/pages/Home/InfoPanel/Body/index.js +++ b/packages/client/src/pages/Home/InfoPanel/Body/index.js @@ -1,5 +1,4 @@ import React, { useState, useEffect, useCallback } from "react"; -import { withRouter } from "react-router"; import { inject, observer } from "mobx-react"; import ViewHelper from "./helpers/ViewHelper"; @@ -207,4 +206,4 @@ export default inject(({ auth, selectedFolderStore, oformsStore }) => { isRootFolder, gallerySelected, }; -})(withRouter(observer(InfoPanelBodyContent))); +})(observer(InfoPanelBodyContent)); diff --git a/packages/client/src/pages/Home/MediaViewer/index.js b/packages/client/src/pages/Home/MediaViewer/index.js index 58ac3eb69d..702b503322 100644 --- a/packages/client/src/pages/Home/MediaViewer/index.js +++ b/packages/client/src/pages/Home/MediaViewer/index.js @@ -1,9 +1,8 @@ import React, { useEffect } from "react"; import { inject, observer } from "mobx-react"; import { withTranslation } from "react-i18next"; -import { withRouter } from "react-router"; +import { withRouter } from "react-router-dom"; import queryString from "query-string"; -import history from "@docspace/common/history"; import MediaViewer from "@docspace/common/components/MediaViewer"; const FilesMediaViewer = (props) => { @@ -50,6 +49,7 @@ const FilesMediaViewer = (props) => { resetUrl, firstLoad, setSelection, + history, } = props; useEffect(() => { @@ -97,7 +97,7 @@ const FilesMediaViewer = (props) => { const onChangeUrl = (id) => { const url = "/products/files/#preview/" + id; setCurrentId(id); - window.history.pushState(null, null, url); + history.push(url); }; const resetSelection = () => { @@ -169,7 +169,7 @@ const FilesMediaViewer = (props) => { const targetFile = files.find((item) => item.id === currentMediaFileId); if (targetFile) setBufferSelection(targetFile); - window.history.replaceState(null, null, url); + history.replace(url); }; return ( diff --git a/packages/client/src/pages/Home/Section/Body/RowsView/FilesRowContent.js b/packages/client/src/pages/Home/Section/Body/RowsView/FilesRowContent.js index 9183e45923..0b17e068f0 100644 --- a/packages/client/src/pages/Home/Section/Body/RowsView/FilesRowContent.js +++ b/packages/client/src/pages/Home/Section/Body/RowsView/FilesRowContent.js @@ -1,6 +1,5 @@ import React, { useCallback } from "react"; import { inject, observer } from "mobx-react"; -import { withRouter } from "react-router"; import { withTranslation } from "react-i18next"; import styled from "styled-components"; import { isMobile, isTablet, isMobileOnly } from "react-device-detect"; @@ -182,10 +181,8 @@ export default inject(({ auth, treeFoldersStore }) => { return { theme: auth.settingsStore.theme, isTrashFolder: isRecycleBinFolder }; })( observer( - withRouter( - withTranslation(["Files", "Translations"])( - withContent(withBadges(FilesRowContent)) - ) + withTranslation(["Files", "Translations"])( + withContent(withBadges(FilesRowContent)) ) ) ); diff --git a/packages/client/src/pages/Home/Section/Body/RowsView/SimpleFilesRow.js b/packages/client/src/pages/Home/Section/Body/RowsView/SimpleFilesRow.js index df0874cd27..418362b95d 100644 --- a/packages/client/src/pages/Home/Section/Body/RowsView/SimpleFilesRow.js +++ b/packages/client/src/pages/Home/Section/Body/RowsView/SimpleFilesRow.js @@ -4,7 +4,6 @@ import { withTranslation } from "react-i18next"; import DragAndDrop from "@docspace/components/drag-and-drop"; import Row from "@docspace/components/row"; import FilesRowContent from "./FilesRowContent"; -import { withRouter } from "react-router-dom"; import { isTablet, isMobile } from "react-device-detect"; import withFileActions from "../../../../../HOCs/withFileActions"; @@ -366,5 +365,5 @@ const SimpleFilesRow = (props) => { }; export default withTranslation(["Files", "Translations", "InfoPanel"])( - withRouter(withFileActions(withQuickButtons(SimpleFilesRow))) + withFileActions(withQuickButtons(SimpleFilesRow)) ); diff --git a/packages/client/src/pages/Home/Section/Body/TableView/TableRow.js b/packages/client/src/pages/Home/Section/Body/TableView/TableRow.js index 686000d186..35c48e8f00 100644 --- a/packages/client/src/pages/Home/Section/Body/TableView/TableRow.js +++ b/packages/client/src/pages/Home/Section/Body/TableView/TableRow.js @@ -1,5 +1,4 @@ import React, { useState } from "react"; -import { withRouter } from "react-router"; import withContent from "../../../../../HOCs/withContent"; import withBadges from "../../../../../HOCs/withBadges"; import withQuickButtons from "../../../../../HOCs/withQuickButtons"; @@ -170,7 +169,5 @@ const FilesTableRow = (props) => { }; export default withTranslation(["Files", "Common", "InfoPanel"])( - withRouter( - withFileActions(withContent(withQuickButtons(withBadges(FilesTableRow)))) - ) + withFileActions(withContent(withQuickButtons(withBadges(FilesTableRow)))) ); diff --git a/packages/client/src/pages/Home/Section/Body/TilesView/FileTile.js b/packages/client/src/pages/Home/Section/Body/TilesView/FileTile.js index 3b90886a73..4e6687d45e 100644 --- a/packages/client/src/pages/Home/Section/Body/TilesView/FileTile.js +++ b/packages/client/src/pages/Home/Section/Body/TilesView/FileTile.js @@ -6,7 +6,6 @@ import DragAndDrop from "@docspace/components/drag-and-drop"; import Tile from "./sub-components/Tile"; import FilesTileContent from "./FilesTileContent"; -import { withRouter } from "react-router-dom"; import withFileActions from "../../../../../HOCs/withFileActions"; import withQuickButtons from "../../../../../HOCs/withQuickButtons"; @@ -172,8 +171,6 @@ export default inject( } )( withTranslation(["Files", "InfoPanel"])( - withRouter( - withFileActions(withBadges(withQuickButtons(observer(FileTile)))) - ) + withFileActions(withBadges(withQuickButtons(observer(FileTile)))) ) ); diff --git a/packages/client/src/pages/Home/Section/Body/TilesView/FilesTileContent.js b/packages/client/src/pages/Home/Section/Body/TilesView/FilesTileContent.js index 47bc4e121f..938ff2be9e 100644 --- a/packages/client/src/pages/Home/Section/Body/TilesView/FilesTileContent.js +++ b/packages/client/src/pages/Home/Section/Body/TilesView/FilesTileContent.js @@ -1,6 +1,5 @@ import React from "react"; import { inject, observer } from "mobx-react"; -import { withRouter } from "react-router"; import { withTranslation } from "react-i18next"; import styled, { css } from "styled-components"; @@ -117,10 +116,8 @@ export default inject(({ auth, treeFoldersStore }) => { return { theme: auth.settingsStore.theme, isRooms }; })( observer( - withRouter( - withTranslation(["Files", "Translations"])( - withContent(withBadges(FilesTileContent)) - ) + withTranslation(["Files", "Translations"])( + withContent(withBadges(FilesTileContent)) ) ) ); diff --git a/packages/client/src/pages/Home/Section/Body/index.js b/packages/client/src/pages/Home/Section/Body/index.js index 079428c7fe..690b41d6e1 100644 --- a/packages/client/src/pages/Home/Section/Body/index.js +++ b/packages/client/src/pages/Home/Section/Body/index.js @@ -1,5 +1,4 @@ import React, { useEffect } from "react"; -import { withRouter } from "react-router"; import { withTranslation } from "react-i18next"; import { isMobile, isMobileOnly } from "react-device-detect"; @@ -328,9 +327,7 @@ export default inject( }; } )( - withRouter( - withTranslation(["Files", "Common", "Translations"])( - withLoader(withHotkeys(observer(SectionBodyContent)))() - ) + withTranslation(["Files", "Common", "Translations"])( + withLoader(withHotkeys(observer(SectionBodyContent)))() ) ); diff --git a/packages/client/src/pages/Home/Section/Filter/index.js b/packages/client/src/pages/Home/Section/Filter/index.js index b820abe7ba..0cafacf9d1 100644 --- a/packages/client/src/pages/Home/Section/Filter/index.js +++ b/packages/client/src/pages/Home/Section/Filter/index.js @@ -3,7 +3,6 @@ import ViewTilesReactSvgUrl from "PUBLIC_DIR/images/view-tiles.react.svg?url"; import React, { useCallback, useEffect } from "react"; import { inject, observer } from "mobx-react"; import { isMobile } from "react-device-detect"; -import { withRouter } from "react-router"; import { withTranslation } from "react-i18next"; import { isMobileOnly } from "react-device-detect"; import find from "lodash/find"; @@ -1444,9 +1443,10 @@ const SectionFilterContent = ({ } }; - useEffect(() => (!!isLoadedFilter ? showLoader() : hideLoader()), [ - isLoadedFilter, - ]); + useEffect( + () => (!!isLoadedFilter ? showLoader() : hideLoader()), + [isLoadedFilter] + ); if (!isLoadedFilter) { return ; @@ -1569,15 +1569,13 @@ export default inject( }; } )( - withRouter( - withLayoutSize( - withTranslation([ - "Files", - "Settings", - "Common", - "Translations", - "InfoPanel", - ])(withLoader(observer(SectionFilterContent))()) - ) + withLayoutSize( + withTranslation([ + "Files", + "Settings", + "Common", + "Translations", + "InfoPanel", + ])(withLoader(observer(SectionFilterContent))()) ) ); diff --git a/packages/client/src/pages/Home/Section/Header/index.js b/packages/client/src/pages/Home/Section/Header/index.js index 6651ccd7d8..98fa4d9ced 100644 --- a/packages/client/src/pages/Home/Section/Header/index.js +++ b/packages/client/src/pages/Home/Section/Header/index.js @@ -24,7 +24,7 @@ import CatalogTrashReactSvgUrl from "PUBLIC_DIR/images/catalog.trash.react.svg?u import React from "react"; import copy from "copy-to-clipboard"; import styled, { css } from "styled-components"; -import { withRouter } from "react-router"; +import { withRouter } from "react-router-dom"; import toastr from "@docspace/components/toast/toastr"; import Loaders from "@docspace/common/components/Loaders"; import { withTranslation } from "react-i18next"; @@ -159,13 +159,8 @@ class SectionHeaderContent extends React.Component { }; getContextOptionsPlus = () => { - const { - t, - isPrivacyFolder, - isRoomsFolder, - enablePlugins, - security, - } = this.props; + const { t, isPrivacyFolder, isRoomsFolder, enablePlugins, security } = + this.props; const options = isRoomsFolder ? [ @@ -599,12 +594,8 @@ class SectionHeaderContent extends React.Component { }; getMenuItems = () => { - const { - t, - cbMenuItems, - getCheckboxItemLabel, - getCheckboxItemId, - } = this.props; + const { t, cbMenuItems, getCheckboxItemLabel, getCheckboxItemId } = + this.props; const checkboxOptions = ( <> {cbMenuItems.map((key) => { @@ -631,12 +622,8 @@ class SectionHeaderContent extends React.Component { }; onClickFolder = (id, isRootRoom) => { - const { - setSelectedNode, - setIsLoading, - fetchFiles, - moveToRoomsPage, - } = this.props; + const { setSelectedNode, setIsLoading, fetchFiles, moveToRoomsPage } = + this.props; if (isRootRoom) { return moveToRoomsPage(); @@ -841,14 +828,8 @@ export default inject( const { setIsVisible, isVisible } = auth.infoPanelStore; - const { - title, - id, - roomType, - pathParts, - navigationPath, - security, - } = selectedFolderStore; + const { title, id, roomType, pathParts, navigationPath, security } = + selectedFolderStore; const selectedFolder = { ...selectedFolderStore }; diff --git a/packages/client/src/pages/Home/index.js b/packages/client/src/pages/Home/index.js index ae1b8cb301..ae7d73640c 100644 --- a/packages/client/src/pages/Home/index.js +++ b/packages/client/src/pages/Home/index.js @@ -1,6 +1,5 @@ import React from "react"; //import PropTypes from "prop-types"; -import { withRouter } from "react-router"; import { isMobile } from "react-device-detect"; import axios from "axios"; import toastr from "@docspace/components/toast/toastr"; @@ -661,12 +660,8 @@ export default inject( itemsSelectionTitle, } = secondaryProgressDataStore; - const { - setUploadPanelVisible, - startUpload, - uploaded, - converted, - } = uploadDataStore; + const { setUploadPanelVisible, startUpload, uploaded, converted } = + uploadDataStore; const { uploadEmptyFolders } = filesActionsStore; @@ -772,4 +767,4 @@ export default inject( isLoadedEmptyPage, }; } -)(withRouter(observer(Home))); +)(observer(Home)); diff --git a/packages/client/src/pages/My/index.js b/packages/client/src/pages/My/index.js index e1470f6e23..e5227b0014 100644 --- a/packages/client/src/pages/My/index.js +++ b/packages/client/src/pages/My/index.js @@ -5,7 +5,6 @@ import PeopleStore from "../../store/PeopleStore"; import PropTypes from "prop-types"; import Section from "@docspace/common/components/Section"; import toastr from "@docspace/components/toast/toastr"; -import { withRouter } from "react-router"; import { Provider as PeopleProvider, inject, observer } from "mobx-react"; import { I18nextProvider, withTranslation } from "react-i18next"; @@ -89,25 +88,21 @@ class My extends React.Component { My.propTypes = { fetchProfile: PropTypes.func.isRequired, - history: PropTypes.object.isRequired, match: PropTypes.object.isRequired, profile: PropTypes.object, language: PropTypes.string, }; -const MyProfile = withRouter( - inject(({ auth, peopleStore }) => ({ - setDocumentTitle: auth.setDocumentTitle, - language: auth.language, - resetProfile: peopleStore.targetUserStore.resetTargetUser, - fetchProfile: peopleStore.targetUserStore.getTargetUser, - profile: peopleStore.targetUserStore.targetUser, - setLoadedProfile: peopleStore.loadingStore.setLoadedProfile, - setIsLoading: peopleStore.loadingStore.setIsLoading, - setFirstLoad: peopleStore.loadingStore.setFirstLoad, - }))(withTranslation(["Profile", "ProfileAction"])(observer(My))) -); - +const MyProfile = inject(({ auth, peopleStore }) => ({ + setDocumentTitle: auth.setDocumentTitle, + language: auth.language, + resetProfile: peopleStore.targetUserStore.resetTargetUser, + fetchProfile: peopleStore.targetUserStore.getTargetUser, + profile: peopleStore.targetUserStore.targetUser, + setLoadedProfile: peopleStore.loadingStore.setLoadedProfile, + setIsLoading: peopleStore.loadingStore.setIsLoading, + setFirstLoad: peopleStore.loadingStore.setFirstLoad, +}))(withTranslation(["Profile", "ProfileAction"])(observer(My))); const peopleStore = new PeopleStore(); export default ({ i18n, ...rest }) => { diff --git a/packages/client/src/pages/PortalSettings/Layout/Article/Body/index.js b/packages/client/src/pages/PortalSettings/Layout/Article/Body/index.js index 76d6b5b818..c67035f8d9 100644 --- a/packages/client/src/pages/PortalSettings/Layout/Article/Body/index.js +++ b/packages/client/src/pages/PortalSettings/Layout/Article/Body/index.js @@ -1,5 +1,5 @@ import React from "react"; -import { withRouter } from "react-router"; +import { withRouter } from "react-router-dom"; import { inject, observer } from "mobx-react"; import { withTranslation } from "react-i18next"; diff --git a/packages/client/src/pages/PortalSettings/Layout/Section/Header/index.js b/packages/client/src/pages/PortalSettings/Layout/Section/Header/index.js index e92026075e..5d2b72024e 100644 --- a/packages/client/src/pages/PortalSettings/Layout/Section/Header/index.js +++ b/packages/client/src/pages/PortalSettings/Layout/Section/Header/index.js @@ -4,7 +4,7 @@ import ActionsHeaderTouchReactSvgUrl from "PUBLIC_DIR/images/actions.header.touc import React from "react"; import { inject, observer } from "mobx-react"; import styled, { css } from "styled-components"; -import { withRouter } from "react-router"; +import { withRouter } from "react-router-dom"; import { withTranslation } from "react-i18next"; import Headline from "@docspace/common/components/Headline"; import IconButton from "@docspace/components/icon-button"; diff --git a/packages/client/src/pages/PortalSettings/categories/common/appearance.js b/packages/client/src/pages/PortalSettings/categories/common/appearance.js index dfb06abd10..ecb89ea8e8 100644 --- a/packages/client/src/pages/PortalSettings/categories/common/appearance.js +++ b/packages/client/src/pages/PortalSettings/categories/common/appearance.js @@ -1,7 +1,6 @@ import CheckWhiteSvgUrl from "PUBLIC_DIR/images/check.white.svg?url"; import React, { useState, useEffect, useCallback, useMemo } from "react"; import { withTranslation } from "react-i18next"; -import { withRouter } from "react-router"; import toastr from "@docspace/components/toast/toastr"; import { inject, observer } from "mobx-react"; import Button from "@docspace/components/button"; @@ -50,19 +49,16 @@ const Appearance = (props) => { const [showColorSchemeDialog, setShowColorSchemeDialog] = useState(false); - const [headerColorSchemeDialog, setHeaderColorSchemeDialog] = useState( - headerEditTheme - ); + const [headerColorSchemeDialog, setHeaderColorSchemeDialog] = + useState(headerEditTheme); const [currentColorAccent, setCurrentColorAccent] = useState(null); const [currentColorButtons, setCurrentColorButtons] = useState(null); - const [openHexColorPickerAccent, setOpenHexColorPickerAccent] = useState( - false - ); - const [openHexColorPickerButtons, setOpenHexColorPickerButtons] = useState( - false - ); + const [openHexColorPickerAccent, setOpenHexColorPickerAccent] = + useState(false); + const [openHexColorPickerButtons, setOpenHexColorPickerButtons] = + useState(false); const [appliedColorAccent, setAppliedColorAccent] = useState( defaultAppliedColorAccent @@ -71,12 +67,10 @@ const Appearance = (props) => { defaultAppliedColorButtons ); - const [changeCurrentColorAccent, setChangeCurrentColorAccent] = useState( - false - ); - const [changeCurrentColorButtons, setChangeCurrentColorButtons] = useState( - false - ); + const [changeCurrentColorAccent, setChangeCurrentColorAccent] = + useState(false); + const [changeCurrentColorButtons, setChangeCurrentColorButtons] = + useState(false); const [viewMobile, setViewMobile] = useState(false); @@ -172,7 +166,7 @@ const Appearance = (props) => { useEffect(() => { if (!currentColorScheme) return; - + setAppliedColorButtons(defaultAppliedColorButtons); setAppliedColorAccent(defaultAppliedColorAccent); }, [ @@ -787,8 +781,4 @@ export default inject(({ auth }) => { deleteAppearanceTheme, theme, }; -})( - withTranslation(["Profile", "Common", "Settings"])( - withRouter(observer(Appearance)) - ) -); +})(withTranslation(["Profile", "Common", "Settings"])(observer(Appearance))); diff --git a/packages/client/src/pages/PortalSettings/categories/common/customization-navbar.js b/packages/client/src/pages/PortalSettings/categories/common/customization-navbar.js index 93e6f6f3ad..2221dbde5a 100644 --- a/packages/client/src/pages/PortalSettings/categories/common/customization-navbar.js +++ b/packages/client/src/pages/PortalSettings/categories/common/customization-navbar.js @@ -7,11 +7,11 @@ import Link from "@docspace/components/link"; import { combineUrl } from "@docspace/common/utils"; import { inject, observer } from "mobx-react"; import withCultureNames from "@docspace/common/hoc/withCultureNames"; -import history from "@docspace/common/history"; + import { Base } from "@docspace/components/themes"; import LoaderCustomizationNavbar from "./sub-components/loaderCustomizationNavbar"; import { StyledArrowRightIcon } from "./Customization/StyledSettings"; -import { withRouter } from "react-router"; +import { withRouter } from "react-router-dom"; import Badge from "@docspace/components/badge"; const StyledComponent = styled.div` @@ -68,6 +68,7 @@ const CustomizationNavbar = ({ isLoadedPage, isSettingPaid, currentColorScheme, + history, }) => { const isLoadedSetting = isLoaded && tReady; useEffect(() => { @@ -196,11 +197,8 @@ const CustomizationNavbar = ({ }; export default inject(({ auth, common }) => { - const { - helpUrlCommonSettings, - theme, - currentColorScheme, - } = auth.settingsStore; + const { helpUrlCommonSettings, theme, currentColorScheme } = + auth.settingsStore; const { isLoaded, setIsLoadedCustomizationNavbar } = common; return { theme, diff --git a/packages/client/src/pages/PortalSettings/categories/common/customization.js b/packages/client/src/pages/PortalSettings/categories/common/customization.js index ee61a30db7..c4000b9985 100644 --- a/packages/client/src/pages/PortalSettings/categories/common/customization.js +++ b/packages/client/src/pages/PortalSettings/categories/common/customization.js @@ -11,7 +11,6 @@ import CustomizationNavbar from "./customization-navbar"; import { Base } from "@docspace/components/themes"; import { setDocumentTitle } from "SRC_DIR/helpers/utils"; import LoaderDescriptionCustomization from "./sub-components/loaderDescriptionCustomization"; -import { withRouter } from "react-router"; import withLoading from "SRC_DIR/HOCs/withLoading"; import StyledSettingsSeparator from "SRC_DIR/pages/PortalSettings/StyledSettingsSeparator"; @@ -115,7 +114,5 @@ export default inject(({ common }) => { setIsLoadedCustomization, }; })( - withLoading( - withRouter(withTranslation(["Settings", "Common"])(observer(Customization))) - ) + withLoading(withTranslation(["Settings", "Common"])(observer(Customization))) ); diff --git a/packages/client/src/pages/PortalSettings/categories/common/index.js b/packages/client/src/pages/PortalSettings/categories/common/index.js index c24e0aa6e6..22300e89be 100644 --- a/packages/client/src/pages/PortalSettings/categories/common/index.js +++ b/packages/client/src/pages/PortalSettings/categories/common/index.js @@ -1,6 +1,6 @@ import React, { useEffect, useState } from "react"; import Submenu from "@docspace/components/submenu"; -import { withRouter } from "react-router"; +import { withRouter } from "react-router-dom"; import { withTranslation } from "react-i18next"; import { combineUrl } from "@docspace/common/utils"; import config from "PACKAGE_FILE"; diff --git a/packages/client/src/pages/PortalSettings/categories/data-management/index.js b/packages/client/src/pages/PortalSettings/categories/data-management/index.js index 84478a8a91..7702847de9 100644 --- a/packages/client/src/pages/PortalSettings/categories/data-management/index.js +++ b/packages/client/src/pages/PortalSettings/categories/data-management/index.js @@ -1,5 +1,5 @@ import React, { useEffect, useState } from "react"; -import { withRouter } from "react-router"; +import { withRouter } from "react-router-dom"; import { withTranslation, Trans } from "react-i18next"; import { inject, observer } from "mobx-react"; @@ -120,11 +120,8 @@ export default inject(({ auth, setup, backup }) => { const { settingsStore, currentTariffStatusStore } = auth; const { isNotPaidPeriod } = currentTariffStatusStore; const { toDefault } = backup; - const { - helpUrlCreatingBackup, - isTabletView, - currentColorScheme, - } = settingsStore; + const { helpUrlCreatingBackup, isTabletView, currentColorScheme } = + settingsStore; const buttonSize = isTabletView ? "normal" : "small"; return { diff --git a/packages/client/src/pages/PortalSettings/categories/delete-data/index.js b/packages/client/src/pages/PortalSettings/categories/delete-data/index.js index 97c03cf568..a83a6681f3 100644 --- a/packages/client/src/pages/PortalSettings/categories/delete-data/index.js +++ b/packages/client/src/pages/PortalSettings/categories/delete-data/index.js @@ -1,6 +1,6 @@ import React, { useState, useEffect } from "react"; import { withTranslation } from "react-i18next"; -import { withRouter } from "react-router"; +import { withRouter } from "react-router-dom"; import Submenu from "@docspace/components/submenu"; import { inject, observer } from "mobx-react"; import PortalDeactivationSection from "./portalDeactivation"; diff --git a/packages/client/src/pages/PortalSettings/categories/delete-data/portalDeactivation.js b/packages/client/src/pages/PortalSettings/categories/delete-data/portalDeactivation.js index 874e0b602f..6d26e49339 100644 --- a/packages/client/src/pages/PortalSettings/categories/delete-data/portalDeactivation.js +++ b/packages/client/src/pages/PortalSettings/categories/delete-data/portalDeactivation.js @@ -1,5 +1,4 @@ import React, { useEffect, useState } from "react"; -import { withRouter } from "react-router"; import { withTranslation } from "react-i18next"; import { inject } from "mobx-react"; import Text from "@docspace/components/text"; @@ -68,4 +67,4 @@ export default inject(({ auth }) => { getPortalOwner, owner, }; -})(withTranslation("Settings")(withRouter(PortalDeactivation))); +})(withTranslation("Settings")(PortalDeactivation)); diff --git a/packages/client/src/pages/PortalSettings/categories/delete-data/portalDeletion.js b/packages/client/src/pages/PortalSettings/categories/delete-data/portalDeletion.js index 27dbf99b20..3b0af2afee 100644 --- a/packages/client/src/pages/PortalSettings/categories/delete-data/portalDeletion.js +++ b/packages/client/src/pages/PortalSettings/categories/delete-data/portalDeletion.js @@ -1,5 +1,4 @@ import React, { useEffect, useState } from "react"; -import { withRouter } from "react-router"; import { withTranslation } from "react-i18next"; import { inject } from "mobx-react"; import Text from "@docspace/components/text"; @@ -87,4 +86,4 @@ export default inject(({ auth }) => { getPortalOwner, owner, }; -})(withTranslation(["Settings", "Common"])(withRouter(PortalDeletion))); +})(withTranslation(["Settings", "Common"])(PortalDeletion)); diff --git a/packages/client/src/pages/PortalSettings/categories/integration/index.js b/packages/client/src/pages/PortalSettings/categories/integration/index.js index 16fb23e960..0afdc9bab1 100644 --- a/packages/client/src/pages/PortalSettings/categories/integration/index.js +++ b/packages/client/src/pages/PortalSettings/categories/integration/index.js @@ -1,6 +1,6 @@ import React, { useEffect, useState } from "react"; import Submenu from "@docspace/components/submenu"; -import { withRouter } from "react-router"; +import { withRouter } from "react-router-dom"; import { withTranslation } from "react-i18next"; import { inject, observer } from "mobx-react"; import { combineUrl } from "@docspace/common/utils"; diff --git a/packages/client/src/pages/PortalSettings/categories/payments/ContactContainer.js b/packages/client/src/pages/PortalSettings/categories/payments/ContactContainer.js index f1d7ccfa6c..c729afa274 100644 --- a/packages/client/src/pages/PortalSettings/categories/payments/ContactContainer.js +++ b/packages/client/src/pages/PortalSettings/categories/payments/ContactContainer.js @@ -1,6 +1,5 @@ import React from "react"; import styled from "styled-components"; -import { withRouter } from "react-router"; import { useTranslation } from "react-i18next"; import { inject, observer } from "mobx-react"; import { ColorTheme, ThemeType } from "@docspace/common/components/ColorTheme"; @@ -40,4 +39,4 @@ export default inject(({ payments, auth }) => { salesEmail, theme: auth.settingsStore.theme, }; -})(withRouter(observer(ContactContainer))); +})(observer(ContactContainer)); diff --git a/packages/client/src/pages/PortalSettings/categories/payments/PaymentContainer.js b/packages/client/src/pages/PortalSettings/categories/payments/PaymentContainer.js index 3c46f9a354..41f143f449 100644 --- a/packages/client/src/pages/PortalSettings/categories/payments/PaymentContainer.js +++ b/packages/client/src/pages/PortalSettings/categories/payments/PaymentContainer.js @@ -1,7 +1,6 @@ import HelpReactSvgUrl from "PUBLIC_DIR/images/help.react.svg?url"; import React from "react"; import styled, { css } from "styled-components"; -import { withRouter } from "react-router"; import { Trans } from "react-i18next"; import { inject, observer } from "mobx-react"; @@ -370,4 +369,4 @@ export default inject(({ auth, payments }) => { portalTariffStatus, portalPaymentQuotas, }; -})(withRouter(observer(PaymentContainer))); +})(observer(PaymentContainer)); diff --git a/packages/client/src/pages/PortalSettings/categories/payments/index.js b/packages/client/src/pages/PortalSettings/categories/payments/index.js index fb7f0fe573..2cf0ee7400 100644 --- a/packages/client/src/pages/PortalSettings/categories/payments/index.js +++ b/packages/client/src/pages/PortalSettings/categories/payments/index.js @@ -1,5 +1,4 @@ import React, { useEffect } from "react"; -import { withRouter } from "react-router"; import PropTypes from "prop-types"; import { inject, observer } from "mobx-react"; import moment from "moment"; @@ -58,4 +57,4 @@ export default inject(({ auth, payments }) => { isLoadedTariffStatus, isLoadedCurrentQuota, }; -})(withRouter(observer(PaymentsPage))); +})(observer(PaymentsPage)); diff --git a/packages/client/src/pages/PortalSettings/categories/security/access-portal/adminMessage.js b/packages/client/src/pages/PortalSettings/categories/security/access-portal/adminMessage.js index 665e93c6a7..e2d82fbfcb 100644 --- a/packages/client/src/pages/PortalSettings/categories/security/access-portal/adminMessage.js +++ b/packages/client/src/pages/PortalSettings/categories/security/access-portal/adminMessage.js @@ -1,6 +1,6 @@ import React, { useState, useEffect } from "react"; import styled from "styled-components"; -import { withRouter } from "react-router"; +import { withRouter } from "react-router-dom"; import { withTranslation } from "react-i18next"; import { inject, observer } from "mobx-react"; import RadioButtonGroup from "@docspace/components/radio-button-group"; diff --git a/packages/client/src/pages/PortalSettings/categories/security/access-portal/index.js b/packages/client/src/pages/PortalSettings/categories/security/access-portal/index.js index ee3a37abe5..cb8a34ff37 100644 --- a/packages/client/src/pages/PortalSettings/categories/security/access-portal/index.js +++ b/packages/client/src/pages/PortalSettings/categories/security/access-portal/index.js @@ -1,5 +1,4 @@ import React, { useEffect, useState } from "react"; -import { withRouter } from "react-router"; import { withTranslation } from "react-i18next"; import Text from "@docspace/components/text"; import { setDocumentTitle } from "SRC_DIR/helpers/utils"; @@ -95,4 +94,4 @@ const AccessPortal = (props) => { export default inject(({ auth }) => { const { helpLink, currentColorScheme } = auth.settingsStore; return { helpLink, currentColorScheme }; -})(withTranslation("Settings")(withRouter(observer(AccessPortal)))); +})(withTranslation("Settings")(observer(AccessPortal))); diff --git a/packages/client/src/pages/PortalSettings/categories/security/access-portal/ipSecurity.js b/packages/client/src/pages/PortalSettings/categories/security/access-portal/ipSecurity.js index 823a861d81..c969fa0dc2 100644 --- a/packages/client/src/pages/PortalSettings/categories/security/access-portal/ipSecurity.js +++ b/packages/client/src/pages/PortalSettings/categories/security/access-portal/ipSecurity.js @@ -1,6 +1,6 @@ import React, { useState, useEffect } from "react"; import styled from "styled-components"; -import { withRouter } from "react-router"; +import { withRouter } from "react-router-dom"; import { withTranslation } from "react-i18next"; import { inject, observer } from "mobx-react"; import Text from "@docspace/components/text"; diff --git a/packages/client/src/pages/PortalSettings/categories/security/access-portal/mobileView.js b/packages/client/src/pages/PortalSettings/categories/security/access-portal/mobileView.js index b07f32f6c6..5692a11e61 100644 --- a/packages/client/src/pages/PortalSettings/categories/security/access-portal/mobileView.js +++ b/packages/client/src/pages/PortalSettings/categories/security/access-portal/mobileView.js @@ -1,5 +1,5 @@ import React, { useEffect } from "react"; -import { withRouter } from "react-router"; +import { withRouter } from "react-router-dom"; import { withTranslation } from "react-i18next"; import { setDocumentTitle } from "SRC_DIR/helpers/utils"; import { MainContainer } from "../StyledSecurity"; diff --git a/packages/client/src/pages/PortalSettings/categories/security/access-portal/passwordStrength.js b/packages/client/src/pages/PortalSettings/categories/security/access-portal/passwordStrength.js index 2fdd132604..c114ed59b9 100644 --- a/packages/client/src/pages/PortalSettings/categories/security/access-portal/passwordStrength.js +++ b/packages/client/src/pages/PortalSettings/categories/security/access-portal/passwordStrength.js @@ -1,6 +1,6 @@ import React, { useState, useEffect } from "react"; import styled from "styled-components"; -import { withRouter } from "react-router"; +import { withRouter } from "react-router-dom"; import { withTranslation } from "react-i18next"; import { inject, observer } from "mobx-react"; import Box from "@docspace/components/box"; @@ -257,11 +257,8 @@ const PasswordStrength = (props) => { }; export default inject(({ auth, setup }) => { - const { - setPortalPasswordSettings, - passwordSettings, - helpLink, - } = auth.settingsStore; + const { setPortalPasswordSettings, passwordSettings, helpLink } = + auth.settingsStore; const { initSettings, isInit } = setup; return { diff --git a/packages/client/src/pages/PortalSettings/categories/security/access-portal/sessionLifetime.js b/packages/client/src/pages/PortalSettings/categories/security/access-portal/sessionLifetime.js index d3814d0bc7..d1c90da10f 100644 --- a/packages/client/src/pages/PortalSettings/categories/security/access-portal/sessionLifetime.js +++ b/packages/client/src/pages/PortalSettings/categories/security/access-portal/sessionLifetime.js @@ -1,6 +1,6 @@ import React, { useState, useEffect } from "react"; import styled from "styled-components"; -import { withRouter } from "react-router"; +import { withRouter } from "react-router-dom"; import { withTranslation } from "react-i18next"; import { inject, observer } from "mobx-react"; import RadioButtonGroup from "@docspace/components/radio-button-group"; diff --git a/packages/client/src/pages/PortalSettings/categories/security/access-portal/tfa.js b/packages/client/src/pages/PortalSettings/categories/security/access-portal/tfa.js index 16f497d9ad..bd35877672 100644 --- a/packages/client/src/pages/PortalSettings/categories/security/access-portal/tfa.js +++ b/packages/client/src/pages/PortalSettings/categories/security/access-portal/tfa.js @@ -1,6 +1,6 @@ import React, { useState, useEffect } from "react"; import styled from "styled-components"; -import { withRouter } from "react-router"; +import { withRouter } from "react-router-dom"; import { withTranslation } from "react-i18next"; import { inject, observer } from "mobx-react"; import RadioButtonGroup from "@docspace/components/radio-button-group"; diff --git a/packages/client/src/pages/PortalSettings/categories/security/access-portal/trustedMail.js b/packages/client/src/pages/PortalSettings/categories/security/access-portal/trustedMail.js index e464b1bcf0..e1d13c5e96 100644 --- a/packages/client/src/pages/PortalSettings/categories/security/access-portal/trustedMail.js +++ b/packages/client/src/pages/PortalSettings/categories/security/access-portal/trustedMail.js @@ -1,6 +1,6 @@ import React, { useState, useEffect } from "react"; import styled from "styled-components"; -import { withRouter } from "react-router"; +import { withRouter } from "react-router-dom"; import { withTranslation } from "react-i18next"; import { inject, observer } from "mobx-react"; import Text from "@docspace/components/text"; diff --git a/packages/client/src/pages/PortalSettings/categories/security/audit-trail/TableView/TableRow.js b/packages/client/src/pages/PortalSettings/categories/security/audit-trail/TableView/TableRow.js index 2c89624ce6..34b10dfebb 100644 --- a/packages/client/src/pages/PortalSettings/categories/security/audit-trail/TableView/TableRow.js +++ b/packages/client/src/pages/PortalSettings/categories/security/audit-trail/TableView/TableRow.js @@ -1,5 +1,4 @@ import React from "react"; -import { withRouter } from "react-router"; import TableRow from "@docspace/components/table-container/TableRow"; import TableCell from "@docspace/components/table-container/TableCell"; import Text from "@docspace/components/text"; @@ -101,4 +100,4 @@ const PeopleTableRow = (props) => { ); }; -export default withRouter(PeopleTableRow); +export default PeopleTableRow; diff --git a/packages/client/src/pages/PortalSettings/categories/security/audit-trail/index.js b/packages/client/src/pages/PortalSettings/categories/security/audit-trail/index.js index 154a1d77a5..551629bcf2 100644 --- a/packages/client/src/pages/PortalSettings/categories/security/audit-trail/index.js +++ b/packages/client/src/pages/PortalSettings/categories/security/audit-trail/index.js @@ -1,5 +1,4 @@ import React, { useEffect } from "react"; -import { withRouter } from "react-router"; import { withTranslation } from "react-i18next"; import { setDocumentTitle } from "SRC_DIR/helpers/utils"; import { inject } from "mobx-react"; @@ -112,4 +111,4 @@ export default inject(({ setup, auth }) => { isAuditAvailable, isLoadingDownloadReport, }; -})(withTranslation("Settings")(withRouter(AuditTrail))); +})(withTranslation("Settings")(AuditTrail)); diff --git a/packages/client/src/pages/PortalSettings/categories/security/index.js b/packages/client/src/pages/PortalSettings/categories/security/index.js index 6eb33f8232..8d2345298c 100644 --- a/packages/client/src/pages/PortalSettings/categories/security/index.js +++ b/packages/client/src/pages/PortalSettings/categories/security/index.js @@ -1,6 +1,6 @@ import React, { useEffect, useState } from "react"; import Submenu from "@docspace/components/submenu"; -import { withRouter } from "react-router"; +import { withRouter } from "react-router-dom"; import { withTranslation } from "react-i18next"; import { inject, observer } from "mobx-react"; import { combineUrl } from "@docspace/common/utils"; diff --git a/packages/client/src/pages/PortalSettings/categories/security/login-history/TableView/TableRow.js b/packages/client/src/pages/PortalSettings/categories/security/login-history/TableView/TableRow.js index e2eea8554d..55b0e72dbb 100644 --- a/packages/client/src/pages/PortalSettings/categories/security/login-history/TableView/TableRow.js +++ b/packages/client/src/pages/PortalSettings/categories/security/login-history/TableView/TableRow.js @@ -1,5 +1,4 @@ import React from "react"; -import { withRouter } from "react-router"; import TableRow from "@docspace/components/table-container/TableRow"; import TableCell from "@docspace/components/table-container/TableCell"; import Text from "@docspace/components/text"; @@ -81,4 +80,4 @@ const PeopleTableRow = (props) => { ); }; -export default withRouter(PeopleTableRow); +export default PeopleTableRow; diff --git a/packages/client/src/pages/PortalSettings/categories/security/login-history/index.js b/packages/client/src/pages/PortalSettings/categories/security/login-history/index.js index 48b8169f74..ec4bfba0ae 100644 --- a/packages/client/src/pages/PortalSettings/categories/security/login-history/index.js +++ b/packages/client/src/pages/PortalSettings/categories/security/login-history/index.js @@ -1,5 +1,4 @@ import React, { useEffect } from "react"; -import { withRouter } from "react-router"; import { withTranslation } from "react-i18next"; import { setDocumentTitle } from "SRC_DIR/helpers/utils"; import { inject } from "mobx-react"; @@ -110,4 +109,4 @@ export default inject(({ setup, auth }) => { getLoginHistoryReport, isAuditAvailable, }; -})(withTranslation("Settings")(withRouter(LoginHistory))); +})(withTranslation("Settings")(LoginHistory)); diff --git a/packages/client/src/pages/PortalSettings/categories/security/sub-components/modules.js b/packages/client/src/pages/PortalSettings/categories/security/sub-components/modules.js index c43761a5f2..54457ff754 100644 --- a/packages/client/src/pages/PortalSettings/categories/security/sub-components/modules.js +++ b/packages/client/src/pages/PortalSettings/categories/security/sub-components/modules.js @@ -1,5 +1,4 @@ import React, { Component } from "react"; -import { withRouter } from "react-router"; import { withTranslation } from "react-i18next"; import styled from "styled-components"; import Text from "@docspace/components/text"; @@ -117,6 +116,4 @@ class PureModulesSettings extends Component { } } -export default withTranslation(["Settings", "Common"])( - withRouter(PureModulesSettings) -); +export default withTranslation(["Settings", "Common"])(PureModulesSettings); diff --git a/packages/client/src/pages/PortalSettings/index.js b/packages/client/src/pages/PortalSettings/index.js index 8618c3f70c..2d18d3eb64 100644 --- a/packages/client/src/pages/PortalSettings/index.js +++ b/packages/client/src/pages/PortalSettings/index.js @@ -1,6 +1,5 @@ import React, { lazy, Suspense, useEffect } from "react"; import { Route, Switch, Redirect } from "react-router-dom"; -import { withRouter } from "react-router"; import Layout from "./Layout"; import { combineUrl } from "@docspace/common/utils"; import Panels from "../../components/FilesPanels"; @@ -24,7 +23,9 @@ const SessionLifetimePage = lazy(() => import("./categories/security/access-portal/sessionLifetime") ); -const CustomizationSettings = lazy(() => import("./categories/common/index.js")); +const CustomizationSettings = lazy(() => + import("./categories/common/index.js") +); const DeveloperTools = lazy(() => import("./categories/developer-tools/index.js") @@ -179,19 +180,43 @@ const Settings = () => { - + - + - - + + - - + + @@ -200,11 +225,11 @@ const Settings = () => { - + ); }; -export default withRouter(Settings); +export default Settings; diff --git a/packages/client/src/pages/PrivateRoomsPage/index.js b/packages/client/src/pages/PrivateRoomsPage/index.js index 1d4468c323..76a7a0945e 100644 --- a/packages/client/src/pages/PrivateRoomsPage/index.js +++ b/packages/client/src/pages/PrivateRoomsPage/index.js @@ -8,7 +8,7 @@ import Loader from "@docspace/components/loader"; import Section from "@docspace/common/components/Section"; import { smallTablet, tablet } from "@docspace/components/utils/device"; import { I18nextProvider, Trans, withTranslation } from "react-i18next"; -import { withRouter } from "react-router"; +import { withRouter } from "react-router-dom"; import { isMobile } from "react-device-detect"; //import { setDocumentTitle } from "@docspace/client/src/helpers/filesUtils"; import i18n from "./i18n"; diff --git a/packages/client/src/pages/Profile/Section/Body/index.js b/packages/client/src/pages/Profile/Section/Body/index.js index 0ff26989df..1a37bd2df1 100644 --- a/packages/client/src/pages/Profile/Section/Body/index.js +++ b/packages/client/src/pages/Profile/Section/Body/index.js @@ -1,6 +1,6 @@ import React, { useEffect, useState } from "react"; import styled from "styled-components"; -import { withRouter } from "react-router"; +import { withRouter } from "react-router-dom"; import { withTranslation } from "react-i18next"; import { inject, observer } from "mobx-react"; diff --git a/packages/client/src/pages/Profile/Section/Header/index.js b/packages/client/src/pages/Profile/Section/Header/index.js index c0173c6d1f..556a62f975 100644 --- a/packages/client/src/pages/Profile/Section/Header/index.js +++ b/packages/client/src/pages/Profile/Section/Header/index.js @@ -6,7 +6,7 @@ import ArrowPathReactSvgUrl from "PUBLIC_DIR/images/arrow.path.react.svg?url"; import VerticalDotsReactSvgUrl from "PUBLIC_DIR/images/vertical-dots.react.svg?url"; import React, { useState } from "react"; import { withTranslation } from "react-i18next"; -import { withRouter } from "react-router"; +import { withRouter } from "react-router-dom"; import { inject, observer } from "mobx-react"; import IconButton from "@docspace/components/icon-button"; diff --git a/packages/client/src/pages/Profile/index.js b/packages/client/src/pages/Profile/index.js index 292131ca47..83b0ebcb5a 100644 --- a/packages/client/src/pages/Profile/index.js +++ b/packages/client/src/pages/Profile/index.js @@ -9,7 +9,6 @@ import { SectionFooterContent, } from "./Section"; -import { withRouter } from "react-router"; import withCultureNames from "@docspace/common/hoc/withCultureNames"; import { inject, observer } from "mobx-react"; import { withTranslation } from "react-i18next"; @@ -109,40 +108,35 @@ class Profile extends React.Component { Profile.propTypes = { fetchProfile: PropTypes.func.isRequired, - history: PropTypes.object.isRequired, match: PropTypes.object.isRequired, profile: PropTypes.object, language: PropTypes.string, }; -export default withRouter( - inject(({ auth, peopleStore, treeFoldersStore }) => { - const { setDocumentTitle, language } = auth; - const { targetUserStore, loadingStore } = peopleStore; - const { - getTargetUser: fetchProfile, - targetUser: profile, - isEditTargetUser, - setIsEditTargetUser, - } = targetUserStore; - const { setFirstLoad, setIsLoading, setLoadedProfile } = loadingStore; - const { selectedTreeNode, setSelectedNode } = treeFoldersStore; - return { - setDocumentTitle, - language, - fetchProfile, - profile, - setFirstLoad, - setIsLoading, - isEditTargetUser, - setIsEditTargetUser, - setLoadedProfile, - showCatalog: auth.settingsStore.showCatalog, - selectedTreeNode, - setSelectedNode, - isVisitor: auth.userStore.user.isVisitor, - }; - })( - observer(withTranslation(["Profile", "Common"])(withCultureNames(Profile))) - ) -); +export default inject(({ auth, peopleStore, treeFoldersStore }) => { + const { setDocumentTitle, language } = auth; + const { targetUserStore, loadingStore } = peopleStore; + const { + getTargetUser: fetchProfile, + targetUser: profile, + isEditTargetUser, + setIsEditTargetUser, + } = targetUserStore; + const { setFirstLoad, setIsLoading, setLoadedProfile } = loadingStore; + const { selectedTreeNode, setSelectedNode } = treeFoldersStore; + return { + setDocumentTitle, + language, + fetchProfile, + profile, + setFirstLoad, + setIsLoading, + isEditTargetUser, + setIsEditTargetUser, + setLoadedProfile, + showCatalog: auth.settingsStore.showCatalog, + selectedTreeNode, + setSelectedNode, + isVisitor: auth.userStore.user.isVisitor, + }; +})(observer(withTranslation(["Profile", "Common"])(withCultureNames(Profile)))); diff --git a/packages/client/src/pages/Settings/Section/Body/index.js b/packages/client/src/pages/Settings/Section/Body/index.js index 859a68b362..54be39579e 100644 --- a/packages/client/src/pages/Settings/Section/Body/index.js +++ b/packages/client/src/pages/Settings/Section/Body/index.js @@ -1,7 +1,7 @@ import React, { useCallback } from "react"; import { useTranslation } from "react-i18next"; import styled, { css } from "styled-components"; -import { withRouter } from "react-router"; +import { withRouter } from "react-router-dom"; import Error520 from "client/Error520"; import { inject, observer } from "mobx-react"; import { combineUrl } from "@docspace/common/utils"; diff --git a/packages/client/src/pages/VersionHistory/Section/Body/VersionRow.js b/packages/client/src/pages/VersionHistory/Section/Body/VersionRow.js index 36e7160c28..547c5c502d 100644 --- a/packages/client/src/pages/VersionHistory/Section/Body/VersionRow.js +++ b/packages/client/src/pages/VersionHistory/Section/Body/VersionRow.js @@ -7,7 +7,6 @@ import Textarea from "@docspace/components/textarea"; import Button from "@docspace/components/button"; import ModalDialog from "@docspace/components/modal-dialog"; import { withTranslation } from "react-i18next"; -import { withRouter } from "react-router"; import VersionBadge from "./VersionBadge"; import { StyledVersionRow } from "./StyledVersionHistory"; import ExternalLinkIcon from "PUBLIC_DIR/images/external.link.react.svg"; @@ -249,9 +248,7 @@ export default inject(({ auth, versionHistoryStore, selectedFolderStore }) => { canChangeVersionFileHistory, }; })( - withRouter( - withTranslation(["VersionHistory", "Common", "Translations"])( - observer(VersionRow) - ) + withTranslation(["VersionHistory", "Common", "Translations"])( + observer(VersionRow) ) ); diff --git a/packages/client/src/pages/VersionHistory/Section/Body/index.js b/packages/client/src/pages/VersionHistory/Section/Body/index.js index 304d5499d1..a079935b40 100644 --- a/packages/client/src/pages/VersionHistory/Section/Body/index.js +++ b/packages/client/src/pages/VersionHistory/Section/Body/index.js @@ -1,5 +1,5 @@ import React, { memo } from "react"; -import { withRouter } from "react-router"; + import Loaders from "@docspace/common/components/Loaders"; import VersionRow from "./VersionRow"; import { inject, observer } from "mobx-react"; @@ -138,12 +138,8 @@ class SectionBodyContent extends React.Component { export default inject(({ auth, filesStore, versionHistoryStore }) => { const { setFirstLoad, setIsLoading, isLoading } = filesStore; - const { - versions, - fetchFileVersions, - fileId, - fileSecurity, - } = versionHistoryStore; + const { versions, fetchFileVersions, fileId, fileSecurity } = + versionHistoryStore; return { culture: auth.settingsStore.culture, @@ -155,4 +151,4 @@ export default inject(({ auth, filesStore, versionHistoryStore }) => { setIsLoading, fetchFileVersions, }; -})(withRouter(observer(SectionBodyContent))); +})(observer(SectionBodyContent)); diff --git a/packages/client/src/pages/VersionHistory/Section/Header/index.js b/packages/client/src/pages/VersionHistory/Section/Header/index.js index 5057a1126d..2a59ecf777 100644 --- a/packages/client/src/pages/VersionHistory/Section/Header/index.js +++ b/packages/client/src/pages/VersionHistory/Section/Header/index.js @@ -1,7 +1,6 @@ import ArrowPathReactSvgUrl from "PUBLIC_DIR/images/arrow.path.react.svg?url"; import React from "react"; import styled, { css } from "styled-components"; -import { withRouter } from "react-router"; import Headline from "@docspace/common/components/Headline"; import IconButton from "@docspace/components/icon-button"; import { desktop } from "@docspace/components/utils/device"; diff --git a/packages/client/src/pages/VersionHistory/index.js b/packages/client/src/pages/VersionHistory/index.js index 5fd00e773b..9b219fc6a3 100644 --- a/packages/client/src/pages/VersionHistory/index.js +++ b/packages/client/src/pages/VersionHistory/index.js @@ -1,6 +1,5 @@ import React from "react"; -import PropTypes from "prop-types"; -import { withRouter } from "react-router"; + import Section from "@docspace/common/components/Section"; import Loaders from "@docspace/common/components/Loaders"; import { withTranslation } from "react-i18next"; @@ -43,17 +42,12 @@ class PureVersionHistory extends React.Component { const VersionHistory = withTranslation("VersionHistory")(PureVersionHistory); -VersionHistory.propTypes = { - history: PropTypes.object.isRequired, -}; +VersionHistory.propTypes = {}; export default inject(({ auth, filesStore, versionHistoryStore }) => { const { filter, isLoading } = filesStore; - const { - setIsVerHistoryPanel, - versions, - showProgressBar, - } = versionHistoryStore; + const { setIsVerHistoryPanel, versions, showProgressBar } = + versionHistoryStore; return { isTabletView: auth.settingsStore.isTabletView, @@ -64,4 +58,4 @@ export default inject(({ auth, filesStore, versionHistoryStore }) => { setIsVerHistoryPanel, }; -})(withRouter(observer(VersionHistory))); +})(observer(VersionHistory)); diff --git a/packages/client/src/pages/Wizard/index.js b/packages/client/src/pages/Wizard/index.js index 5b94933f0e..cfc6899983 100644 --- a/packages/client/src/pages/Wizard/index.js +++ b/packages/client/src/pages/Wizard/index.js @@ -1,7 +1,7 @@ import React, { useState, useRef, useEffect } from "react"; import axios from "axios"; import { useTranslation } from "react-i18next"; -import { withRouter } from "react-router"; +import { withRouter } from "react-router-dom"; import { inject, observer } from "mobx-react"; import { isMobileOnly } from "react-device-detect"; diff --git a/packages/common/components/Article/sub-components/article-header.js b/packages/common/components/Article/sub-components/article-header.js index a09f079273..ab1b81364f 100644 --- a/packages/common/components/Article/sub-components/article-header.js +++ b/packages/common/components/Article/sub-components/article-header.js @@ -1,6 +1,6 @@ import React from "react"; import PropTypes from "prop-types"; -import { useHistory } from "react-router"; +import { useHistory } from "react-router-dom"; import Loaders from "@docspace/common/components/Loaders"; import { isTablet as isTabletUtils } from "@docspace/components/utils/device"; import { Link } from "react-router-dom"; diff --git a/packages/common/components/Article/sub-components/article-payment-alert.js b/packages/common/components/Article/sub-components/article-payment-alert.js index 70e06186bf..2482246e8e 100644 --- a/packages/common/components/Article/sub-components/article-payment-alert.js +++ b/packages/common/components/Article/sub-components/article-payment-alert.js @@ -1,13 +1,13 @@ import React, { useCallback, useEffect } from "react"; import { inject, observer } from "mobx-react"; -import { withRouter } from "react-router"; +import { withRouter } from "react-router-dom"; import { useTranslation, Trans } from "react-i18next"; import Text from "@docspace/components/text"; import ArrowRightIcon from "PUBLIC_DIR/images/arrow.right.react.svg"; import { StyledArticlePaymentAlert } from "../styled-article"; import styled from "styled-components"; import { combineUrl } from "@docspace/common/utils"; -import history from "@docspace/common/history"; + import Loaders from "../../Loaders"; const StyledArrowRightIcon = styled(ArrowRightIcon)` @@ -31,6 +31,7 @@ const ArticlePaymentAlert = ({ currentTariffPlanTitle, toggleArticleOpen, tariffPlanTitle, + history, }) => { const { t, ready } = useTranslation("Common"); diff --git a/packages/common/components/Article/sub-components/article-profile.js b/packages/common/components/Article/sub-components/article-profile.js index c562e7a46a..7eaea9d8ea 100644 --- a/packages/common/components/Article/sub-components/article-profile.js +++ b/packages/common/components/Article/sub-components/article-profile.js @@ -1,6 +1,5 @@ import React, { useState, useRef } from "react"; import { inject, observer } from "mobx-react"; -import { withRouter } from "react-router"; import { useTranslation } from "react-i18next"; import Avatar from "@docspace/components/avatar"; import Text from "@docspace/components/text"; @@ -106,15 +105,13 @@ const ArticleProfile = (props) => { ); }; -export default withRouter( - inject(({ auth, profileActionsStore }) => { - const { getActions, getUserRole, onProfileClick } = profileActionsStore; +export default inject(({ auth, profileActionsStore }) => { + const { getActions, getUserRole, onProfileClick } = profileActionsStore; - return { - onProfileClick, - user: auth.userStore.user, - getUserRole, - getActions, - }; - })(observer(ArticleProfile)) -); + return { + onProfileClick, + user: auth.userStore.user, + getUserRole, + getActions, + }; +})(observer(ArticleProfile));