IlyaSobolev/DocSpace-client
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #202 from ONLYOFFICE/feature/refactoring-auth-store

Browse Source 
Feature/refactoring auth store
This commit is contained in:
Alexey Safronov 2024-02-02 00:10:07 +04:00 committed by GitHub
commit dccdb6c7f1
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
415 changed files with 4700 additions and 4304 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
packages/client/src/Client.jsx
View File

@ -161,7 +161,15 @@ const ClientContent = (props) => {
};
const Client = inject(
({ auth, clientLoadingStore, filesStore, peopleStore, pluginStore }) => {
({
authStore,
clientLoadingStore,
filesStore,
peopleStore,
pluginStore,
userStore,
settingsStore,
}) => {
const {
frameConfig,
isFrame,
@ -172,11 +180,11 @@ const Client = inject(
enablePlugins,
isDesktopClientInit,
setIsDesktopClientInit,
} = auth.settingsStore;
} = settingsStore;
if (!auth.userStore.user) return;
if (!userStore.user) return;
const { isVisitor } = auth.userStore.user;
const { isVisitor } = userStore.user;
const {
isLoading,
@ -195,11 +203,11 @@ const Client = inject(
setIsDesktopClientInit,
isFrame,
showMenu: frameConfig?.showMenu,
user: auth.userStore.user,
isAuthenticated: auth.isAuthenticated,
user: userStore.user,
isAuthenticated: authStore.isAuthenticated,
encryptionKeys: encryptionKeys,
isEncryption: isEncryptionSupport,
isLoaded: auth.isLoaded && clientLoadingStore.isLoaded,
isLoaded: authStore.isLoaded && clientLoadingStore.isLoaded,
setIsLoaded: clientLoadingStore.setIsLoaded,
withMainButton,
setIsFilterLoading: setIsSectionFilterLoading,

3
packages/client/src/DocspaceLogo/index.js
View File

@ -36,8 +36,7 @@ const DocspaceLogo = (props) => {
);
};
export default inject(({ auth }) => {
const { settingsStore } = auth;
export default inject(({ settingsStore }) => {
const { whiteLabelLogoUrls, theme } = settingsStore;
return {

10
packages/client/src/HOCs/withBadges.js
View File

@ -169,13 +169,15 @@ export default function withBadges(WrappedComponent) {
return inject(
(
{
auth,
authStore,
treeFoldersStore,
filesActionsStore,
versionHistoryStore,
dialogsStore,
filesStore,
publicRoomStore,
userStore,
settingsStore,
},
{ item }
) => {
@ -187,7 +189,7 @@ export default function withBadges(WrappedComponent) {
isRecentTab,
} = treeFoldersStore;
const { markAsRead, setPinAction, setMuteAction } = filesActionsStore;
const { isTabletView, isDesktopClient, theme } = auth.settingsStore;
const { isTabletView, isDesktopClient, theme } = settingsStore;
const { setIsVerHistoryPanel, fetchFileVersions } = versionHistoryStore;
const {
setNewFilesPanelVisible,
@ -204,8 +206,8 @@ export default function withBadges(WrappedComponent) {
return {
isArchiveFolderRoot,
theme,
isAdmin: auth.isAdmin,
isVisitor: auth?.userStore?.user?.isVisitor || !auth?.userStore?.user,
isAdmin: authStore.isAdmin,
isVisitor: userStore?.user?.isVisitor || !userStore?.user,
isTrashFolder: isRecycleBinFolder,
isPrivacyFolder,
homepage: config.homepage,

12
packages/client/src/HOCs/withContent.js
View File

@ -112,10 +112,11 @@ export default function withContent(WrappedContent) {
{
filesStore,
treeFoldersStore,
auth,
settingsStore,
dialogsStore,
uploadDataStore,
publicRoomStore,
userStore,
},
{ item }
) => {
@ -140,10 +141,8 @@ export default function withContent(WrappedContent) {
const { isRecycleBinFolder, isPrivacyFolder, isArchiveFolder } =
treeFoldersStore;
const { replaceFileStream, setEncryptionAccess } = auth;
const { culture, personal, folderFormValidation, isDesktopClient } =
auth.settingsStore;
settingsStore;
const {
setConvertPasswordDialogVisible,
@ -166,12 +165,11 @@ export default function withContent(WrappedContent) {
isArchiveFolder,
openDocEditor,
renameFolder,
replaceFileStream,
setEncryptionAccess,
setIsLoading,
updateFile,
viewAs,
viewer: auth.userStore.user,
viewer: userStore.user,
setConvertPasswordDialogVisible,
setConvertItem,
setFormCreationInfo,

4
packages/client/src/HOCs/withFileActions.js
View File

@ -329,7 +329,7 @@ export default function withFileActions(WrappedFileItem) {
return inject(
(
{
auth,
settingsStore,
filesActionsStore,
dialogsStore,
treeFoldersStore,
@ -469,7 +469,7 @@ export default function withFileActions(WrappedFileItem) {
withShiftSelect,
setSelection,
currentDeviceType: auth.settingsStore.currentDeviceType,
currentDeviceType: settingsStore.currentDeviceType,
isDisabledDropItem,
};
}

14
packages/client/src/HOCs/withHotkeys.js
View File

@ -379,15 +379,17 @@ const withHotkeys = (Component) => {
return inject(
({
auth,
settingsStore,
filesStore,
dialogsStore,
settingsStore,
filesSettingsStore,
filesActionsStore,
hotkeyStore,
mediaViewerDataStore,
treeFoldersStore,
selectedFolderStore,
userStore,
currentTariffStatusStore,
}) => {
const {
setSelected,
@ -435,10 +437,10 @@ const withHotkeys = (Component) => {
} = filesActionsStore;
const { visible: mediaViewerIsVisible } = mediaViewerDataStore;
const { setHotkeyPanelVisible } = auth.settingsStore;
const { isGracePeriod } = auth.currentTariffStatusStore;
const { setHotkeyPanelVisible } = settingsStore;
const { isGracePeriod } = currentTariffStatusStore;
const isVisitor = auth.userStore.user?.isVisitor;
const isVisitor = userStore.user?.isVisitor;
const {
isFavoritesFolder,
@ -458,7 +460,7 @@ const withHotkeys = (Component) => {
setHotkeyPanelVisible,
setDeleteDialogVisible,
setSelectFileDialogVisible,
confirmDelete: settingsStore.confirmDelete,
confirmDelete: filesSettingsStore.confirmDelete,
deleteAction,
isAvailableOption,

7
packages/client/src/HOCs/withLoader.js
View File

@ -51,23 +51,24 @@ const withLoader = (WrappedComponent) => (Loader) => {
return inject(
({
auth,
authStore,
filesStore,
peopleStore,
clientLoadingStore,
publicRoomStore,
settingsStore,
}) => {
const { viewAs, isLoadingFilesFind, isInit } = filesStore;
const { viewAs: accountsViewAs } = peopleStore;
const { firstLoad, isLoading, showBodyLoader } = clientLoadingStore;
const { settingsStore } = auth;
const { setIsBurgerLoading } = settingsStore;
const { isPublicRoom } = publicRoomStore;
return {
firstLoad: isPublicRoom ? false : firstLoad,
isLoaded: isPublicRoom ? true : auth.isLoaded,
isLoaded: isPublicRoom ? true : authStore.isLoaded,
isLoading,
viewAs,
setIsBurgerLoading,

20
packages/client/src/HOCs/withLoading.js
View File

@ -107,14 +107,14 @@ const withLoading = (WrappedComponent) => {
setting === "language-and-time-zone"
? isLoadedCustomizationSettingLngTZSettings
: setting === "welcome-page-settings"
? isLoadedCustomizationSettingWelcomePageSettings
: setting === "dns-settings"
? isLoadedCustomizationSettingDNSSettings
: setting === "portal-renaming"
? isLoadedCustomizationSettingPortalRenaming
: viewMobile
? isLoadedCustomizationNavbarSettings
: isLoadedCustomizationSettings;
? isLoadedCustomizationSettingWelcomePageSettings
: setting === "dns-settings"
? isLoadedCustomizationSettingDNSSettings
: setting === "portal-renaming"
? isLoadedCustomizationSettingPortalRenaming
: viewMobile
? isLoadedCustomizationNavbarSettings
: isLoadedCustomizationSettings;
return (
<WrappedComponent
@ -125,7 +125,7 @@ const withLoading = (WrappedComponent) => {
);
};
return inject(({ common, auth }) => {
return inject(({ common, settingsStore }) => {
const {
isLoadedArticleBody,
isLoadedSectionHeader,
@ -139,7 +139,7 @@ const withLoading = (WrappedComponent) => {
} = common;
const { isBurgerLoading, setIsBurgerLoading, enablePortalRename } =
auth.settingsStore;
settingsStore;
return {
isLoadedArticleBody,

3
packages/client/src/HOCs/withPeopleContent.js
View File

@ -135,8 +135,7 @@ export default function withContent(WrappedContent) {
);
};
return inject(({ auth, peopleStore }, { item }) => {
const { userStore, settingsStore } = auth;
return inject(({ settingsStore, peopleStore, userStore }, { item }) => {
const { theme, standalone } = settingsStore;
const { selectGroup } = peopleStore.selectedGroupStore;

10
packages/client/src/HOCs/withQuickButtons.js
View File

@ -120,12 +120,14 @@ export default function withQuickButtons(WrappedComponent) {
return inject(
({
auth,
authStore,
settingsStore,
filesActionsStore,
dialogsStore,
publicRoomStore,
treeFoldersStore,
filesStore,
infoPanelStore,
}) => {
const { lockFileAction, setFavoriteAction, onSelectItem } =
filesActionsStore;
@ -143,11 +145,11 @@ export default function withQuickButtons(WrappedComponent) {
isTrashFolder || isArchiveFolderRoot || isPersonalFolderRoot;
const { isPublicRoom } = publicRoomStore;
const { getPrimaryFileLink, setShareChanged } = auth.infoPanelStore;
const { getPrimaryFileLink, setShareChanged } = infoPanelStore;
return {
theme: auth.settingsStore.theme,
isAdmin: auth.isAdmin,
theme: settingsStore.theme,
isAdmin: authStore.isAdmin,
lockFileAction,
setFavoriteAction,
onSelectItem,

161
packages/client/src/Shell.jsx
View File

@ -407,98 +407,101 @@ const Shell = ({ items = [], page = "home", ...rest }) => {
);
};
const ShellWrapper = inject(({ auth, backup, clientLoadingStore }) => {
const { i18n } = useTranslation();
const ShellWrapper = inject(
({ authStore, settingsStore, backup, clientLoadingStore, userStore }) => {
const { i18n } = useTranslation();
const { init, isLoaded, settingsStore, setProductVersion, language } = auth;
const { init, isLoaded, setProductVersion, language } = authStore;
const {
personal,
roomsMode,
isDesktopClient,
firebaseHelper,
setModuleInfo,
setCheckedMaintenance,
setMaintenanceExist,
setSnackbarExist,
socketHelper,
setTheme,
whiteLabelLogoUrls,
standalone,
currentDeviceType,
isFrame,
frameConfig,
} = settingsStore;
const {
personal,
roomsMode,
isDesktopClient,
firebaseHelper,
setModuleInfo,
setCheckedMaintenance,
setMaintenanceExist,
setSnackbarExist,
socketHelper,
setTheme,
whiteLabelLogoUrls,
standalone,
currentDeviceType,
isFrame,
frameConfig,
} = settingsStore;
const isBase = settingsStore.theme.isBase;
const { setPreparationPortalDialogVisible } = backup;
const isBase = settingsStore.theme.isBase;
const { setPreparationPortalDialogVisible } = backup;
const userTheme = isDesktopClient
? auth?.userStore?.user?.theme
? auth?.userStore?.user?.theme
: window.RendererProcessVariable?.theme?.type === "dark"
? "Dark"
: "Base"
: auth?.userStore?.user?.theme;
const userTheme = isDesktopClient
? userStore?.user?.theme
? userStore?.user?.theme
: window.RendererProcessVariable?.theme?.type === "dark"
? "Dark"
: "Base"
: userStore?.user?.theme;
return {
loadBaseInfo: async () => {
await init(false, i18n);
return {
loadBaseInfo: async () => {
await init(false, i18n);
setModuleInfo(config.homepage, "home");
setProductVersion(config.version);
setModuleInfo(config.homepage, "home");
setProductVersion(config.version);
if (isDesktopClient) {
document.body.classList.add("desktop");
}
},
language,
isLoaded,
if (isDesktopClient) {
document.body.classList.add("desktop");
}
},
language,
isLoaded,
isDesktop: isDesktopClient,
FirebaseHelper: firebaseHelper,
personal,
setCheckedMaintenance,
setMaintenanceExist,
socketHelper,
setPreparationPortalDialogVisible,
isBase,
setTheme,
roomsMode,
setSnackbarExist,
userTheme: isFrame ? frameConfig?.theme : userTheme,
userId: auth?.userStore?.user?.id,
whiteLabelLogoUrls,
standalone,
currentDeviceType,
isDesktop: isDesktopClient,
FirebaseHelper: firebaseHelper,
personal,
setCheckedMaintenance,
setMaintenanceExist,
socketHelper,
setPreparationPortalDialogVisible,
isBase,
setTheme,
roomsMode,
setSnackbarExist,
userTheme: isFrame ? frameConfig?.theme : userTheme,
userId: userStore?.user?.id,
whiteLabelLogoUrls,
standalone,
currentDeviceType,
showArticleLoader: clientLoadingStore.showArticleLoader,
};
})(observer(Shell));
const ThemeProviderWrapper = inject(({ auth, loginStore }) => {
const { settingsStore } = auth;
let currentColorScheme = false;
const { theme } = settingsStore;
const { i18n } = useTranslation();
if (loginStore) {
currentColorScheme = loginStore.currentColorScheme;
} else if (auth) {
currentColorScheme = settingsStore.currentColorScheme || false;
showArticleLoader: clientLoadingStore.showArticleLoader,
};
}
)(observer(Shell));
const { timezone } = settingsStore;
const ThemeProviderWrapper = inject(
({ authStore, settingsStore, loginStore }) => {
let currentColorScheme = false;
const { theme } = settingsStore;
const { i18n } = useTranslation();
window.theme = theme;
window.timezone = timezone;
if (loginStore) {
currentColorScheme = loginStore.currentColorScheme;
} else if (authStore) {
currentColorScheme = settingsStore.currentColorScheme || false;
}
return {
theme: { ...theme, interfaceDirection: i18n.dir() },
currentColorScheme,
timezone,
};
})(observer(ThemeProvider));
const { timezone } = settingsStore;
window.theme = theme;
window.timezone = timezone;
return {
theme: { ...theme, interfaceDirection: i18n.dir() },
currentColorScheme,
timezone,
};
}
)(observer(ThemeProvider));
export default () => (
<MobxProvider {...store}>

4
packages/client/src/components/Article/Body/AccountsItem.js
View File

@ -29,8 +29,8 @@ const PureAccountsItem = ({ showText, isActive, onClick, t }) => {
const AccountsItem = withTranslation(["Common"])(PureAccountsItem);
export default inject(({ auth }) => {
const { showText } = auth.settingsStore;
export default inject(({ settingsStore }) => {
const { showText } = settingsStore;
return {
showText,

3
packages/client/src/components/Article/Body/BonusItem.js
View File

@ -36,8 +36,7 @@ const BonusItem = ({ showText, toggleArticleOpen }) => {
);
};
export default inject(({ auth }) => {
const { settingsStore } = auth;
export default inject(({ settingsStore }) => {
const { showText, toggleArticleOpen } = settingsStore;
return {
showText,

18
packages/client/src/components/Article/Body/Items.js
View File

@ -384,7 +384,7 @@ Items.propTypes = {
export default inject(
({
auth,
authStore,
treeFoldersStore,
selectedFolderStore,
filesStore,
@ -392,13 +392,11 @@ export default inject(
uploadDataStore,
dialogsStore,
clientLoadingStore,
userStore,
settingsStore,
}) => {
const {
settingsStore,
isCommunity,
isPaymentPageAvailable,
currentDeviceType,
} = auth;
const { isCommunity, isPaymentPageAvailable, currentDeviceType } =
authStore;
const { showText, docSpace } = settingsStore;
const {
@ -429,9 +427,9 @@ export default inject(
const { setEmptyTrashDialogVisible } = dialogsStore;
return {
isAdmin: auth.isAdmin,
isVisitor: auth.userStore.user.isVisitor,
isCollaborator: auth.userStore.user.isCollaborator,
isAdmin: authStore.isAdmin,
isVisitor: userStore.user.isVisitor,
isCollaborator: userStore.user.isCollaborator,
myId: myFolderId,
commonId: commonFolderId,
isPrivacy: isPrivacyFolder,

4
packages/client/src/components/Article/Body/SettingsItem.js
View File

@ -28,8 +28,8 @@ const SettingsItem = withTranslation(["FilesSettings", "Common"])(
PureSettingsItem
);
export default inject(({ auth }) => {
export default inject(({ settingsStore }) => {
return {
showText: auth.settingsStore.showText,
showText: settingsStore.showText,
};
})(observer(SettingsItem));

7
packages/client/src/components/Article/Body/index.js
View File

@ -264,12 +264,13 @@ const ArticleBodyContent = (props) => {
export default inject(
({
auth,
settingsStore,
filesStore,
treeFoldersStore,
dialogsStore,
selectedFolderStore,
clientLoadingStore,
userStore,
}) => {
const { clearFiles, setSelection } = filesStore;
const {
@ -302,13 +303,13 @@ export default inject(
theme,
setIsBurgerLoading,
currentDeviceType,
} = auth.settingsStore;
} = settingsStore;
return {
toggleArticleOpen,
showText,
showArticleLoader,
isVisitor: auth.userStore.user.isVisitor,
isVisitor: userStore.user.isVisitor,
setNewFilesPanelVisible,

4
packages/client/src/components/Article/Header/index.js
View File

@ -9,9 +9,9 @@ const ArticleHeaderContent = ({ currentModuleName }) => {
return <>{currentModuleName}</>;
};
export default inject(({ auth }) => {
export default inject(({ authStore }) => {
return {
currentModuleName: (auth.product && auth.product.title) || "",
currentModuleName: (authStore.product && authStore.product.title) || "",
};
})(
withTranslation([])(

36
packages/client/src/components/Article/MainButton/index.js
View File

@ -42,28 +42,30 @@ const StyledButton = styled(Button)`
opacity: ${(props) => (props.isDisabled ? 0.6 : 1)};
background-color: ${({ $currentColorScheme }) =>
$currentColorScheme.main.accent} !important;
background: ${({ $currentColorScheme }) => $currentColorScheme.main.accent};
border: ${({ $currentColorScheme }) => $currentColorScheme.main.accent};
$currentColorScheme.main?.accent} !important;
background: ${({ $currentColorScheme }) => $currentColorScheme.main?.accent};
border: ${({ $currentColorScheme }) => $currentColorScheme.main?.accent};
${(props) =>
!props.isDisabled &&
css`
:hover {
background-color: ${({ $currentColorScheme }) =>
$currentColorScheme.main.accent};
$currentColorScheme.main?.accent};
opacity: 0.85;
background: ${({ $currentColorScheme }) =>
$currentColorScheme.main.accent};
border: ${({ $currentColorScheme }) => $currentColorScheme.main.accent};
$currentColorScheme.main?.accent};
border: ${({ $currentColorScheme }) =>
$currentColorScheme.main?.accent};
}
:active {
background-color: ${({ $currentColorScheme }) =>
$currentColorScheme.main.accent};
$currentColorScheme.main?.accent};
background: ${({ $currentColorScheme }) =>
$currentColorScheme.main.accent};
border: ${({ $currentColorScheme }) => $currentColorScheme.main.accent};
$currentColorScheme.main?.accent};
border: ${({ $currentColorScheme }) =>
$currentColorScheme.main?.accent};
opacity: 1;
filter: brightness(90%);
cursor: pointer;
@ -71,7 +73,7 @@ const StyledButton = styled(Button)`
`}
.button-content {
color: ${({ $currentColorScheme }) => $currentColorScheme.text.accent};
color: ${({ $currentColorScheme }) => $currentColorScheme.text?.accent};
position: relative;
display: flex;
justify-content: space-between;
@ -587,7 +589,7 @@ const ArticleMainButtonContent = (props) => {
export default inject(
({
auth,
settingsStore,
filesStore,
dialogsStore,
uploadDataStore,
@ -597,6 +599,8 @@ export default inject(
oformsStore,
pluginStore,
versionHistoryStore,
userStore,
currentTariffStatusStore,
}) => {
const { showArticleLoader } = clientLoadingStore;
const { mainButtonMobileVisible } = filesStore;
@ -621,15 +625,15 @@ export default inject(
} = dialogsStore;
const { enablePlugins, currentColorScheme, currentDeviceType } =
auth.settingsStore;
settingsStore;
const { isVisible: versionHistoryPanelVisible } = versionHistoryStore;
const security = selectedFolderStore.security;
const currentFolderId = selectedFolderStore.id;
const { isAdmin, isOwner } = auth.userStore.user;
const { isGracePeriod } = auth.currentTariffStatusStore;
const { isAdmin, isOwner } = userStore.user;
const { isGracePeriod } = currentTariffStatusStore;
const { setOformFromFolderId, oformsFilter } = oformsStore;
const { mainButtonItemsList } = pluginStore;
@ -637,8 +641,8 @@ export default inject(
return {
isGracePeriod,
setInviteUsersWarningDialogVisible,
showText: auth.settingsStore.showText,
isMobileArticle: auth.settingsStore.isMobileArticle,
showText: settingsStore.showText,
isMobileArticle: settingsStore.isMobileArticle,
showArticleLoader,
isPrivacy: isPrivacyFolder,

22
packages/client/src/components/ArticleWrapper/index.tsx
View File

@ -8,20 +8,26 @@ const ArticleWrapper = (props: ArticleProps) => {
};
export default inject(
({ auth, uploadDataStore, profileActionsStore, dialogsStore }: any) => {
({
authStore,
uploadDataStore,
profileActionsStore,
dialogsStore,
userStore,
bannerStore,
currentTariffStatusStore,
currentQuotaStore,
settingsStore,
}: any) => {
const {
settingsStore,
userStore,
isLiveChatAvailable,
bannerStore,
currentQuotaStore,
isPaymentPageAvailable,
isTeamTrainingAlertAvailable,
isSubmitToGalleryAlertAvailable,
currentTariffStatusStore,
isEnterprise,
} = auth;
} = authStore;
const { getActions, getUserRole, onProfileClick } = profileActionsStore;
@ -138,4 +144,4 @@ export default inject(
isAdmin,
};
}
)(observer(Article));
)(observer(ArticleWrapper));

4
packages/client/src/components/BreakpointWarning/BreakpointWarning.js
View File

@ -43,8 +43,8 @@ const BreakpointWarning = ({
);
};
export default inject(({ auth }) => {
export default inject(({ settingsStore }) => {
return {
theme: auth.settingsStore.theme,
theme: settingsStore.theme,
};
})(observer(withTranslation(["Settings"])(BreakpointWarning)));

4
packages/client/src/components/EmptyContainer/EmptyFilterContainer.js
View File

@ -91,7 +91,7 @@ const EmptyFilterContainer = ({
export default inject(
({
auth,
settingsStore,
filesStore,
selectedFolderStore,
treeFoldersStore,
@ -110,7 +110,7 @@ export default inject(
isArchiveFolder,
isRoomsFolder,
setClearSearch: filesStore.setClearSearch,
theme: auth.settingsStore.theme,
theme: settingsStore.theme,
isPublicRoom,
publicRoomKey,

4
packages/client/src/components/EmptyContainer/EmptyFolderContainer.js
View File

@ -62,7 +62,7 @@ const EmptyFolderContainer = ({
export default inject(
({
auth,
settingsStore,
accessRightsStore,
selectedFolderStore,
clientLoadingStore,
@ -84,7 +84,7 @@ export default inject(
roomType,
canCreateFiles,
isArchiveFolderRoot,
theme: auth.settingsStore.theme,
theme: settingsStore.theme,
isEmptyPage,
};
}

6
packages/client/src/components/EmptyContainer/RoomNoAccessContainer.js
View File

@ -83,19 +83,19 @@ const RoomNoAccessContainer = (props) => {
);
};
export default inject(({ auth, filesStore, clientLoadingStore }) => {
export default inject(({ settingsStore, filesStore, clientLoadingStore }) => {
const { setIsSectionFilterLoading } = clientLoadingStore;
const setIsLoading = (param) => {
setIsSectionFilterLoading(param);
};
const { isEmptyPage } = filesStore;
const { isFrame } = auth.settingsStore;
const { isFrame, theme } = settingsStore;
return {
setIsLoading,
isEmptyPage,
theme: auth.settingsStore.theme,
theme,
isFrame,
};
})(withTranslation(["Files"])(observer(RoomNoAccessContainer)));

9
packages/client/src/components/EmptyContainer/RootFolderContainer.js
View File

@ -332,14 +332,15 @@ const RootFolderContainer = (props) => {
export default inject(
({
auth,
settingsStore,
filesStore,
treeFoldersStore,
selectedFolderStore,
clientLoadingStore,
userStore,
}) => {
const { isDesktopClient, isEncryptionSupport, organizationName, theme } =
auth.settingsStore;
settingsStore;
const { setIsSectionFilterLoading } = clientLoadingStore;
@ -356,8 +357,8 @@ export default inject(
theme,
isPrivacyFolder,
isDesktop: isDesktopClient,
isVisitor: auth?.userStore?.user?.isVisitor,
isCollaborator: auth?.userStore?.user?.isCollaborator,
isVisitor: userStore?.user?.isVisitor,
isCollaborator: userStore?.user?.isCollaborator,
isEncryptionSupport,
organizationName,
privacyInstructions,

7
packages/client/src/components/EmptyContainer/index.js
View File

@ -88,17 +88,18 @@ const EmptyContainer = ({
export default inject(
({
auth,
settingsStore,
filesStore,
dialogsStore,
selectedFolderStore,
clientLoadingStore,
currentTariffStatusStore,
}) => {
const { isErrorRoomNotAvailable, isFiltered } = filesStore;
const { isLoading } = clientLoadingStore;
const { isGracePeriod } = auth.currentTariffStatusStore;
const { isGracePeriod } = currentTariffStatusStore;
const { setInviteUsersWarningDialogVisible } = dialogsStore;
@ -108,7 +109,7 @@ export default inject(
isErrorRoomNotAvailable;
return {
theme: auth.settingsStore.theme,
theme: settingsStore.theme,
isFiltered,
isLoading,

4
packages/client/src/components/EmptyContainer/sub-components/CommonButtons.js
View File

@ -229,12 +229,12 @@ const CommonButtons = (props) => {
export default inject(
({
auth,
accessRightsStore,
treeFoldersStore,
selectedFolderStore,
contextOptionsStore,
clientLoadingStore,
settingsStore,
}) => {
const {
navigationPath,
@ -277,7 +277,7 @@ export default inject(
onClickInviteUsers,
folderId,
theme: auth.settingsStore.theme,
theme: settingsStore.theme,
isArchiveFolderRoot,
};
}

4
packages/client/src/components/FilesPanels/index.js
View File

@ -199,7 +199,7 @@ const Panels = (props) => {
export default inject(
({
auth,
settingsStore,
dialogsStore,
uploadDataStore,
versionHistoryStore,
@ -253,7 +253,7 @@ export default inject(
const { uploadPanelVisible } = uploadDataStore;
const { isVisible: versionHistoryPanelVisible } = versionHistoryStore;
const { hotkeyPanelVisible } = auth.settingsStore;
const { hotkeyPanelVisible } = settingsStore;
const { confirmDialogIsLoading } = createEditRoomStore;
const {

4
packages/client/src/components/FilesSelector/FilesSelectorWrapper.tsx
View File

@ -6,11 +6,11 @@ import store from "client/store";
import FilesSelector from "./";
import i18n from "./i18n";
import { FilesSelectorProps } from "./FilesSelector.types";
const { auth: authStore, settingsStore } = store;
const { authStore, filesSettingsStore } = store;
const FilesSelectorWrapper = (props: FilesSelectorProps) => {
React.useEffect(() => {
const { setFilesSettings } = settingsStore;
const { setFilesSettings } = filesSettingsStore;
const { settings } = props;
authStore.init(true);
settings && setFilesSettings(settings);

10
packages/client/src/components/FilesSelector/index.tsx
View File

@ -633,13 +633,14 @@ const FilesSelector = ({
export default inject(
(
{
auth,
settingsStore,
selectedFolderStore,
filesActionsStore,
uploadDataStore,
treeFoldersStore,
dialogsStore,
filesStore,
infoPanelStore,
}: any,
{ isCopy, isRestoreAll, isMove, isRestore, isPanelVisible, id }: any
) => {
@ -667,10 +668,9 @@ export default inject(
setBackupToPublicRoomVisible,
} = dialogsStore;
const { setIsMobileHidden: setInfoPanelIsMobileHidden } =
auth.infoPanelStore;
const { setIsMobileHidden: setInfoPanelIsMobileHidden } = infoPanelStore;
const { theme, socketHelper, currentDeviceType } = auth.settingsStore;
const { theme, socketHelper, currentDeviceType } = settingsStore;
const socketSubscribesId = socketHelper.socketSubscribers;
@ -684,7 +684,7 @@ export default inject(
} = filesStore;
const { getIcon } = filesSettingsStore;
const { isVisible: infoPanelIsVisible, selection: infoPanelSelection } =
auth.infoPanelStore;
infoPanelStore;
const selections =
isMove || isCopy || isRestoreAll || isRestore

64
packages/client/src/components/GlobalEvents/ChangeUserTypeEvent.js
View File

@ -138,36 +138,38 @@ const ChangeUserTypeEvent = ({
);
};
export default inject(({ auth, dialogsStore, peopleStore }) => {
const {
changeUserTypeDialogVisible: visible,
setChangeUserTypeDialogVisible: setVisible,
} = dialogsStore;
const { isRoomAdmin, infoPanelStore } = auth;
const { setInfoPanelSelection } = infoPanelStore;
const { dialogStore, filterStore, usersStore } = peopleStore;
export default inject(
({ authStore, dialogsStore, peopleStore, infoPanelStore }) => {
const {
changeUserTypeDialogVisible: visible,
setChangeUserTypeDialogVisible: setVisible,
} = dialogsStore;
const { isRoomAdmin } = authStore;
const { setInfoPanelSelection } = infoPanelStore;
const { dialogStore, filterStore, usersStore } = peopleStore;
const { data: peopleDialogData } = dialogStore;
const { filter: peopleFilter } = filterStore;
const {
updateUserType,
getUsersList,
getPeopleListItem,
needResetUserSelection,
} = usersStore;
const { setSelected } = peopleStore.selectionStore;
return {
isRoomAdmin,
needResetUserSelection,
getPeopleListItem,
setInfoPanelSelection,
setSelected,
const { data: peopleDialogData } = dialogStore;
const { filter: peopleFilter } = filterStore;
const {
updateUserType,
getUsersList,
getPeopleListItem,
needResetUserSelection,
} = usersStore;
const { setSelected } = peopleStore.selectionStore;
return {
isRoomAdmin,
needResetUserSelection,
getPeopleListItem,
setInfoPanelSelection,
setSelected,
visible,
setVisible,
peopleDialogData,
peopleFilter,
updateUserType,
getUsersList,
};
})(observer(ChangeUserTypeEvent));
visible,
setVisible,
peopleDialogData,
peopleFilter,
updateUserType,
getUsersList,
};
}
)(observer(ChangeUserTypeEvent));

35
packages/client/src/components/GlobalEvents/CreateEvent.js
View File

@ -1,11 +1,11 @@
import React from "react";
import { inject, observer } from "mobx-react";
import { useTranslation } from "react-i18next";
import api from "@docspace/shared/api";
import { toastr } from "@docspace/shared/components/toast";
import { combineUrl } from "@docspace/shared/utils/combineUrl";
import { setEncryptionAccess } from "SRC_DIR/helpers/desktop";
import config from "PACKAGE_FILE";
import { getTitleWithoutExtension } from "SRC_DIR/helpers/filesUtils";
@ -43,9 +43,6 @@ const CreateEvent = ({
setConvertPasswordDialogVisible,
setFormCreationInfo,
replaceFileStream,
setEncryptionAccess,
setEventDialogVisible,
eventDialogVisible,
keepNewFileName,
@ -248,14 +245,11 @@ const CreateEvent = ({
if (!encryptedFile) return Promise.resolve();
toastr.info(t("Translations:EncryptedFileSaving"));
return replaceFileStream(
file.id,
encryptedFile,
true,
false
).then(
() => open && openDocEditor(file.id, file.providerKey, tab)
);
return api.files
.updateFileStream(file.id, encryptedFile, true, false)
.then(
() => open && openDocEditor(file.id, file.providerKey, tab)
);
});
}
@ -296,7 +290,7 @@ const CreateEvent = ({
export default inject(
({
auth,
settingsStore,
filesStore,
filesActionsStore,
selectedFolderStore,
@ -304,8 +298,9 @@ export default inject(
uploadDataStore,
dialogsStore,
oformsStore,
settingsStore,
filesSettingsStore,
clientLoadingStore,
currentTariffStatusStore,
}) => {
const { setIsSectionBodyLoading } = clientLoadingStore;
@ -332,10 +327,7 @@ export default inject(
const { id: parentId } = selectedFolderStore;
const { replaceFileStream, setEncryptionAccess, currentTariffStatusStore } =
auth;
const { isDesktopClient } = auth.settingsStore;
const { isDesktopClient } = settingsStore;
const { setPortalTariff } = currentTariffStatusStore;
@ -346,7 +338,7 @@ export default inject(
eventDialogVisible,
} = dialogsStore;
const { keepNewFileName } = settingsStore;
const { keepNewFileName } = filesSettingsStore;
return {
setPortalTariff,
@ -375,9 +367,6 @@ export default inject(
setConvertPasswordDialogVisible,
setFormCreationInfo,
replaceFileStream,
setEncryptionAccess,
keepNewFileName,
};
}

6
packages/client/src/components/GlobalEvents/CreateRoomEvent.js
View File

@ -84,13 +84,13 @@ export default inject(
tagsStore,
dialogsStore,
settingsStore,
filesSettingsStore,
}) => {
const { fetchTags } = tagsStore;
const { deleteThirdParty, fetchThirdPartyProviders } =
settingsStore.thirdPartyStore;
const { enableThirdParty } = settingsStore;
filesSettingsStore.thirdPartyStore;
const { enableThirdParty } = filesSettingsStore;
const {
createRoomConfirmDialogVisible,

11
packages/client/src/components/GlobalEvents/EditRoomEvent.js
View File

@ -237,13 +237,14 @@ const EditRoomEvent = ({
export default inject(
({
auth,
settingsStore,
filesStore,
tagsStore,
filesActionsStore,
selectedFolderStore,
dialogsStore,
settingsStore,
filesSettingsStore,
infoPanelStore,
}) => {
const {
editRoom,
@ -269,10 +270,10 @@ export default inject(
updateLogoPathsCacheBreaker,
} = selectedFolderStore;
const { updateCurrentFolder, changeRoomOwner } = filesActionsStore;
const { getThirdPartyIcon } = settingsStore.thirdPartyStore;
const { getThirdPartyIcon } = filesSettingsStore.thirdPartyStore;
const { setCreateRoomDialogVisible } = dialogsStore;
const { withPaging } = auth.settingsStore;
const { updateInfoPanelSelection } = auth.infoPanelStore;
const { withPaging } = settingsStore;
const { updateInfoPanelSelection } = infoPanelStore;
return {
addActiveItems,
setActiveFolders,

4
packages/client/src/components/GlobalEvents/index.js
View File

@ -238,8 +238,8 @@ const GlobalEvents = ({ enablePlugins, eventListenerItemsList }) => {
];
};
export default inject(({ auth, pluginStore }) => {
const { enablePlugins } = auth.settingsStore;
export default inject(({ settingsStore, pluginStore }) => {
const { enablePlugins } = settingsStore;
const { eventListenerItemsList } = pluginStore;

6
packages/client/src/components/GlobalEvents/sub-components/Dialog.js
View File

@ -186,9 +186,9 @@ const Dialog = ({
);
};
export default inject(({ auth, settingsStore }) => {
const { folderFormValidation } = auth.settingsStore;
const { keepNewFileName, setKeepNewFileName } = settingsStore;
export default inject(({ settingsStore, filesSettingsStore }) => {
const { folderFormValidation } = settingsStore;
const { keepNewFileName, setKeepNewFileName } = filesSettingsStore;
return { folderFormValidation, keepNewFileName, setKeepNewFileName };
})(observer(Dialog));

4
packages/client/src/components/Layout/index.js
View File

@ -227,9 +227,9 @@ Layout.propTypes = {
setIsTabletView: PropTypes.func,
};
export default inject(({ auth, bannerStore }) => {
export default inject(({ settingsStore }) => {
const { isTabletView, setIsTabletView, setWindowWidth, isFrame } =
auth.settingsStore;
settingsStore;
return {
isTabletView,
setIsTabletView,

6
packages/client/src/components/Main/index.js
View File

@ -100,10 +100,10 @@ const Main = (props) => {
Main.displayName = "Main";
export default inject(({ auth }) => {
const { isBannerVisible } = auth.bannerStore;
export default inject(({ settingsStore, bannerStore }) => {
const { isBannerVisible } = bannerStore;
const { mainBarVisible, isFrame } = auth.settingsStore;
const { mainBarVisible, isFrame } = settingsStore;
return {
mainBarVisible,
isBannerVisible,

70
packages/client/src/components/MainBar/Bar.js
View File

@ -294,50 +294,52 @@ const Bar = (props) => {
) : null;
};
export default inject(({ auth, profileActionsStore }) => {
const { user, withActivationBar, sendActivationLink } = auth.userStore;
export default inject(
({ settingsStore, profileActionsStore, userStore, currentQuotaStore }) => {
const { user, withActivationBar, sendActivationLink } = userStore;
const { onPaymentsClick } = profileActionsStore;
const { onPaymentsClick } = profileActionsStore;
const {
maxCountRoomsByQuota,
usedRoomsCount,
const {
maxCountRoomsByQuota,
usedRoomsCount,
maxTotalSizeByQuota,
usedTotalStorageSizeCount,
maxTotalSizeByQuota,
usedTotalStorageSizeCount,
maxCountManagersByQuota,
addedManagersCount,
maxCountManagersByQuota,
addedManagersCount,
showRoomQuotaBar,
showStorageQuotaBar,
showUserQuotaBar,
} = auth.currentQuotaStore;
showRoomQuotaBar,
showStorageQuotaBar,
showUserQuotaBar,
} = currentQuotaStore;
const { currentColorScheme, setMainBarVisible } = auth.settingsStore;
const { currentColorScheme, setMainBarVisible } = settingsStore;
return {
isAdmin: user?.isAdmin,
userEmail: user?.email,
withActivationBar,
sendActivationLink,
return {
isAdmin: user?.isAdmin,
userEmail: user?.email,
withActivationBar,
sendActivationLink,
onPaymentsClick,
onPaymentsClick,
maxCountRoomsByQuota,
usedRoomsCount,
maxCountRoomsByQuota,
usedRoomsCount,
maxTotalSizeByQuota,
usedTotalStorageSizeCount,
maxTotalSizeByQuota,
usedTotalStorageSizeCount,
maxCountManagersByQuota,
addedManagersCount,
maxCountManagersByQuota,
addedManagersCount,
showRoomQuotaBar,
showStorageQuotaBar,
showUserQuotaBar,
showRoomQuotaBar,
showStorageQuotaBar,
showUserQuotaBar,
currentColorScheme,
setMainBarVisible,
};
})(withTranslation(["Profile", "Common"])(observer(Bar)));
currentColorScheme,
setMainBarVisible,
};
}
)(withTranslation(["Profile", "Common"])(observer(Bar)));

38
packages/client/src/components/MainBar/index.js
View File

@ -57,20 +57,26 @@ const MainBar = ({
);
};
export default inject(({ auth, clientLoadingStore, filesStore }) => {
const { currentTariffStatusStore, settingsStore } = auth;
const { checkedMaintenance, setMaintenanceExist, snackbarExist, isFrame } =
settingsStore;
const { isNotPaidPeriod } = currentTariffStatusStore;
const { firstLoad } = clientLoadingStore;
const { isInit } = filesStore;
export default inject(
({
settingsStore,
clientLoadingStore,
filesStore,
currentTariffStatusStore,
}) => {
const { checkedMaintenance, setMaintenanceExist, snackbarExist, isFrame } =
settingsStore;
const { isNotPaidPeriod } = currentTariffStatusStore;
const { firstLoad } = clientLoadingStore;
const { isInit } = filesStore;
return {
firstLoad: firstLoad && isInit,
checkedMaintenance,
snackbarExist,
setMaintenanceExist,
isNotPaidPeriod,
isFrame,
};
})(observer(MainBar));
return {
firstLoad: firstLoad && isInit,
checkedMaintenance,
snackbarExist,
setMaintenanceExist,
isNotPaidPeriod,
isFrame,
};
}
)(observer(MainBar));

4
packages/client/src/components/NavMenu/index.js
View File

@ -208,8 +208,8 @@ NavMenu.defaultProps = {
isDesktop: false,
};
const NavMenuWrapper = inject(({ auth }) => {
const { settingsStore, isAuthenticated, isLoaded, language } = auth;
const NavMenuWrapper = inject(({ authStore, settingsStore }) => {
const { isAuthenticated, isLoaded, language } = authStore;
const {
isDesktopClient: isDesktop,
frameConfig,

4
packages/client/src/components/NavMenu/sub-components/header-nav.js
View File

@ -75,8 +75,8 @@ HeaderNav.propTypes = {
isAuthenticated: PropTypes.bool,
};
export default inject(({ auth, profileActionsStore }) => {
const { userStore, isAuthenticated } = auth;
export default inject(({ authStore, profileActionsStore, userStore }) => {
const { isAuthenticated } = authStore;
const { user, userIsUpdate, setUserIsUpdate } = userStore;
const { getActions } = profileActionsStore;

4
packages/client/src/components/NavMenu/sub-components/header-unauth.js
View File

@ -91,8 +91,8 @@ HeaderUnAuth.propTypes = {
isLoaded: PropTypes.bool,
};
export default inject(({ auth }) => {
const { settingsStore, isAuthenticated, isLoaded } = auth;
export default inject(({ authStore, settingsStore }) => {
const { isAuthenticated, isLoaded } = authStore;
const { enableAdmMess, wizardToken, logoUrl, theme } = settingsStore;
return {

10
packages/client/src/components/NavMenu/sub-components/header.js
View File

@ -335,17 +335,14 @@ HeaderComponent.propTypes = {
needNavMenu: PropTypes.bool,
};
export default inject(({ auth }) => {
export default inject(({ settingsStore, authStore }) => {
const {
settingsStore,
userStore,
isLoaded,
isAuthenticated,
isAdmin,
version,
} = auth;
} = authStore;
const {
logoUrl,
defaultPage,
@ -355,9 +352,6 @@ export default inject(({ auth }) => {
toggleArticleOpen,
} = settingsStore;
//TODO: restore when chat will complete -> const mainModules = availableModules.filter((m) => !m.isolateMode);
const { user } = userStore;
return {
theme,
isPersonal,

4
packages/client/src/components/NavMenu/sub-components/nav-logo-item.js
View File

@ -42,6 +42,6 @@ NavLogoItem.propTypes = {
logoUrl: PropTypes.string,
};
export default inject(({ auth }) => ({
logoUrl: auth.settingsStore.logoUrl,
export default inject(({ settingsStore }) => ({
logoUrl: settingsStore.logoUrl,
}))(observer(NavLogoItem));

4
packages/client/src/components/NavMenu/sub-components/profile-menu.js
View File

@ -237,8 +237,8 @@ ProfileMenu.propTypes = {
clickOutsideAction: PropTypes.func,
};
export default inject(({ auth }) => {
const { isBannerVisible } = auth.bannerStore;
export default inject(({ bannerStore }) => {
const { isBannerVisible } = bannerStore;
return { isBannerVisible };
})(observer(withTheme(ProfileMenu)));

46
packages/client/src/components/PeopleArticle/Body/index.js
View File

@ -131,29 +131,31 @@ const BodyContent = withTranslation(["Article"])(
withLoader(ArticleBodyContent)(<ArticleFolderLoader />)
);
export default inject(({ auth, peopleStore }) => {
const { settingsStore, setDocumentTitle, isAdmin } = auth;
const { customNames, showText, toggleArticleOpen } = settingsStore;
const { groupsStore, selectedGroupStore, filterStore } = peopleStore;
const { filter } = filterStore;
const { groups } = groupsStore;
const { groupsCaption } = customNames;
const { selectedGroup, selectGroup } = selectedGroupStore;
const selectedKey = selectedGroup ? selectedGroup : "root";
export default inject(
({ authStore, settingsStore, peopleStore, userStore }) => {
const { setDocumentTitle, isAdmin } = authStore;
const { customNames, showText, toggleArticleOpen } = settingsStore;
const { groupsStore, selectedGroupStore, filterStore } = peopleStore;
const { filter } = filterStore;
const { groups } = groupsStore;
const { groupsCaption } = customNames;
const { selectedGroup, selectGroup } = selectedGroupStore;
const selectedKey = selectedGroup ? selectedGroup : "root";
return {
setDocumentTitle,
return {
setDocumentTitle,
isVisitor: auth.userStore.user.isVisitor,
isAdmin,
groups,
groupsCaption,
selectedKey,
selectGroup,
isVisitor: userStore.user.isVisitor,
isAdmin,
groups,
groupsCaption,
selectedKey,
selectGroup,
filter,
filter,
showText,
toggleArticleOpen,
};
})(observer(BodyContent));
showText,
toggleArticleOpen,
};
}
)(observer(BodyContent));

13
packages/client/src/components/PeopleArticle/MainButton/index.js
View File

@ -113,19 +113,18 @@ const ArticleMainButtonContent = (props) => {
);
};
export default inject(({ auth }) => {
const { userCaption, guestCaption, groupCaption } =
auth.settingsStore.customNames;
export default inject(({ authStore, settingsStore }) => {
const { userCaption, guestCaption, groupCaption } = settingsStore.customNames;
return {
isAdmin: auth.isAdmin,
isAdmin: authStore.isAdmin,
homepage: config.homepage,
userCaption,
guestCaption,
groupCaption,
toggleShowText: auth.settingsStore.toggleShowText,
isMobileArticle: auth.settingsStore.isMobileArticle,
showText: auth.settingsStore.showText,
toggleShowText: settingsStore.toggleShowText,
isMobileArticle: settingsStore.isMobileArticle,
showText: settingsStore.showText,
};
})(
withTranslation(["Article", "Common", "PeopleTranslations"])(

15
packages/client/src/components/Section/index.tsx
View File

@ -11,8 +11,15 @@ const SectionWrapper = ({
};
export default inject(
({ auth, dialogsStore }: { auth: any; dialogsStore: any }) => {
const { settingsStore } = auth;
({
settingsStore,
dialogsStore,
infoPanelStore,
}: {
settingsStore: any;
dialogsStore: any;
infoPanelStore: any;
}) => {
const {
isDesktopClient: isDesktop,
currentDeviceType,
@ -24,7 +31,7 @@ export default inject(
} = settingsStore;
const { isVisible, isMobileHidden, setIsVisible, getCanDisplay } =
auth.infoPanelStore;
infoPanelStore;
const { createRoomDialogVisible, invitePanelOptions } = dialogsStore;
@ -33,7 +40,7 @@ export default inject(
const anotherDialogOpen =
createRoomDialogVisible || invitePanelOptions.visible;
const { isScrollLocked: isInfoPanelScrollLocked } = auth.infoPanelStore;
const { isScrollLocked: isInfoPanelScrollLocked } = infoPanelStore;
return {
isDesktop,

4
packages/client/src/components/SharedButton.js
View File

@ -52,9 +52,9 @@ const SharedButton = ({
);
};
export default inject(({ auth, filesActionsStore, dialogsStore }) => {
export default inject(({ settingsStore, filesActionsStore, dialogsStore }) => {
return {
theme: auth.settingsStore.theme,
theme: settingsStore.theme,
onSelectItem: filesActionsStore.onSelectItem,
setSharingPanelVisible: dialogsStore.setSharingPanelVisible,
};

6
packages/client/src/components/SmartBanner/index.js
View File

@ -83,9 +83,9 @@ const ReactSmartBanner = (props) => {
);
};
export default inject(({ auth }) => {
export default inject(({ bannerStore }) => {
return {
isBannerVisible: auth.bannerStore.isBannerVisible,
setIsBannerVisible: auth.bannerStore.setIsBannerVisible,
isBannerVisible: bannerStore.isBannerVisible,
setIsBannerVisible: bannerStore.setIsBannerVisible,
};
})(observer(ReactSmartBanner));

27
packages/client/src/components/StandaloneComponents/BenefitsContainer.js
View File

@ -82,20 +82,17 @@ const BenefitsContainer = ({ isTrial, isEnterprise }) => {
);
};
export default inject(({ auth }) => {
const {
paymentQuotasStore,
export default inject(
({ authStore, currentQuotaStore, paymentQuotasStore }) => {
const { isEnterprise } = authStore;
currentQuotaStore,
isEnterprise,
} = auth;
const { portalPaymentQuotasFeatures } = paymentQuotasStore;
const { portalPaymentQuotasFeatures } = paymentQuotasStore;
const { isTrial } = currentQuotaStore;
return {
features: portalPaymentQuotasFeatures,
isTrial,
isEnterprise,
};
})(observer(BenefitsContainer));
const { isTrial } = currentQuotaStore;
return {
features: portalPaymentQuotasFeatures,
isTrial,
isEnterprise,
};
}
)(observer(BenefitsContainer));

4
packages/client/src/components/StandaloneComponents/ContactContainer.js
View File

@ -123,8 +123,8 @@ const ContactContainer = (props) => {
);
};
export default inject(({ auth, payments }) => {
const { settingsStore, isCommunity } = auth;
export default inject(({ authStore, settingsStore, payments }) => {
const { isCommunity } = authStore;
const { helpUrl, salesEmail } = payments;
const { theme } = settingsStore;
return { helpUrl, salesEmail, theme, isCommunity };

61
packages/client/src/components/TariffBar/index.js
View File

@ -101,35 +101,40 @@ const TariffBar = ({
);
};
export default inject(({ auth }) => {
const {
export default inject(
({
authStore,
settingsStore,
currentQuotaStore,
isPaymentPageAvailable,
currentTariffStatusStore,
isEnterprise,
} = auth;
const { isFreeTariff, isNonProfit, isTrial } = currentQuotaStore;
const {
isGracePeriod,
isLicenseExpiring,
isLicenseDateExpired,
paymentDate,
trialDaysLeft,
} = currentTariffStatusStore;
const { standalone } = settingsStore;
}) => {
const {
isPaymentPageAvailable,
return {
isEnterprise,
isNonProfit,
isGracePeriod,
isFreeTariff,
isPaymentPageAvailable,
isLicenseExpiring,
isLicenseDateExpired,
isTrial,
standalone,
paymentDate,
trialDaysLeft,
};
})(observer(TariffBar));
isEnterprise,
} = authStore;
const { isFreeTariff, isNonProfit, isTrial } = currentQuotaStore;
const {
isGracePeriod,
isLicenseExpiring,
isLicenseDateExpired,
paymentDate,
trialDaysLeft,
} = currentTariffStatusStore;
const { standalone } = settingsStore;
return {
isEnterprise,
isNonProfit,
isGracePeriod,
isFreeTariff,
isPaymentPageAvailable,
isLicenseExpiring,
isLicenseDateExpired,
isTrial,
standalone,
paymentDate,
trialDaysLeft,
};
}
)(observer(TariffBar));

6
packages/client/src/components/dialogs/BackupCodesDialog/index.js
View File

@ -6,6 +6,7 @@ import { Button } from "@docspace/shared/components/button";
import { Text } from "@docspace/shared/components/text";
import { Link } from "@docspace/shared/components/link";
import { toastr } from "@docspace/shared/components/toast";
import { getTfaNewBackupCodes } from "@docspace/shared/api/settings";
import { withTranslation } from "react-i18next";
import ModalDialogContainer from "../ModalDialogContainer";
@ -35,9 +36,9 @@ class BackupCodesDialogComponent extends React.Component {
}
getNewBackupCodes = async () => {
const { getNewBackupCodes, setBackupCodes } = this.props;
const { setBackupCodes } = this.props;
try {
const newCodes = await getNewBackupCodes();
const newCodes = await getTfaNewBackupCodes();
setBackupCodes(newCodes);
} catch (e) {
toastr.error(e);
@ -146,7 +147,6 @@ const BackupCodesDialog = withTranslation(
BackupCodesDialog.propTypes = {
visible: PropTypes.bool.isRequired,
onClose: PropTypes.func.isRequired,
getNewBackupCodes: PropTypes.func.isRequired,
backupCodes: PropTypes.array.isRequired,
backupCodesCount: PropTypes.number.isRequired,
setBackupCodes: PropTypes.func.isRequired,

6
packages/client/src/components/dialogs/ChangeEmailDialog/index.js
View File

@ -220,15 +220,15 @@ ChangeEmailDialog.propTypes = {
user: PropTypes.object.isRequired,
};
export default inject(({ auth, peopleStore }) => {
export default inject(({ settingsStore, peopleStore, userStore }) => {
const { updateProfile } = peopleStore.targetUserStore;
const { updateProfileInUsers } = peopleStore.usersStore;
const { user: profile } = auth.userStore;
const { user: profile } = userStore;
return {
updateProfile,
updateProfileInUsers,
isTabletView: auth.settingsStore.isTabletView,
isTabletView: settingsStore.isTabletView,
profile,
};
})(observer(ChangeEmailDialog));

4
packages/client/src/components/dialogs/ChangeNameDialog/index.js
View File

@ -173,12 +173,12 @@ const ChangeNameDialog = (props) => {
);
};
export default inject(({ peopleStore, auth }) => {
export default inject(({ peopleStore, settingsStore }) => {
const { updateProfile } = peopleStore.targetUserStore;
const { updateProfileInUsers } = peopleStore.usersStore;
const { userNameRegex } = auth.settingsStore;
const { userNameRegex } = settingsStore;
return { updateProfile, updateProfileInUsers, userNameRegex };
})(observer(ChangeNameDialog));

6
packages/client/src/components/dialogs/ChangePasswordDialog/index.js
View File

@ -83,7 +83,7 @@ class ChangePasswordDialogComponent extends React.Component {
type="page"
href={`mailto:${email}`}
noHover
color={currentColorScheme.main.accent}
color={currentColorScheme.main?.accent}
title={email}
>
{{ email }}
@ -118,8 +118,8 @@ class ChangePasswordDialogComponent extends React.Component {
}
}
const ChangePasswordDialog = inject(({ auth }) => ({
currentColorScheme: auth.settingsStore.currentColorScheme,
const ChangePasswordDialog = inject(({ settingsStore }) => ({
currentColorScheme: settingsStore.currentColorScheme,
}))(
observer(
withTranslation(["ChangePasswordDialog", "Common"])(

6
packages/client/src/components/dialogs/ChangePortalOwnerDialog/StyledDialog.js
View File

@ -160,12 +160,12 @@ const StyledSelectedOwner = styled.div`
box-sizing: border-box;
background: ${({ currentColorScheme }) => currentColorScheme.main.accent};
background: ${({ currentColorScheme }) => currentColorScheme.main?.accent};
border-radius: 16px;
.text {
color: ${({ currentColorScheme }) => currentColorScheme.text.accent};
color: ${({ currentColorScheme }) => currentColorScheme.text?.accent};
font-weight: 600;
font-size: ${(props) => props.theme.getCorrectFontSize("13px")};
@ -180,7 +180,7 @@ const StyledSelectedOwner = styled.div`
cursor: pointer;
path {
fill: ${({ currentColorScheme }) => currentColorScheme.text.accent};
fill: ${({ currentColorScheme }) => currentColorScheme.text?.accent};
}
}
}

6
packages/client/src/components/dialogs/ChangePortalOwnerDialog/index.js
View File

@ -229,9 +229,9 @@ const ChangePortalOwnerDialog = ({
);
};
export default inject(({ auth, setup }) => {
const { displayName, avatar, id } = auth.userStore.user;
const { currentColorScheme } = auth.settingsStore;
export default inject(({ setup, userStore, settingsStore }) => {
const { displayName, avatar, id } = userStore.user;
const { currentColorScheme } = settingsStore;
const { sendOwnerChange } = setup;
return { displayName, avatar, id, sendOwnerChange, currentColorScheme };

4
packages/client/src/components/dialogs/ChangePricingPlanDialog/index.js
View File

@ -106,9 +106,9 @@ ChangePricingPlanDialog.propTypes = {
onClose: PropTypes.func.isRequired,
};
export default inject(({ auth, payments }) => {
export default inject(({ payments, currentQuotaStore }) => {
const { managersCount, allowedStorageSizeByQuota } = payments;
const { currentQuotaStore } = auth;
const { addedManagersCount, usedTotalStorageSizeCount } = currentQuotaStore;
return {
managersCount,

5
packages/client/src/components/dialogs/ChangeUserStatusDialog/index.js
View File

@ -170,14 +170,13 @@ ChangeUserStatusDialog.propTypes = {
userIDs: PropTypes.arrayOf(PropTypes.string).isRequired,
};
export default inject(({ peopleStore, auth }) => {
export default inject(({ peopleStore, infoPanelStore }) => {
const setSelected = peopleStore.selectionStore.setSelected;
const { getPeopleListItem, updateUserStatus, needResetUserSelection } =
peopleStore.usersStore;
const { setInfoPanelSelection, isVisible: infoPanelVisible } =
auth.infoPanelStore;
const { setInfoPanelSelection, isVisible: infoPanelVisible } = infoPanelStore;
return {
needResetUserSelection,

90
packages/client/src/components/dialogs/ConflictResolveDialog/index.js
View File

@ -317,51 +317,53 @@ const ConflictResolveDialog = (props) => {
);
};
export default inject(({ auth, dialogsStore, uploadDataStore, filesStore }) => {
const {
conflictResolveDialogVisible: visible,
setConflictResolveDialogVisible,
conflictResolveDialogData,
conflictResolveDialogItems: items,
setMoveToPanelVisible,
setRestorePanelVisible,
setRestoreAllPanelVisible,
setCopyPanelVisible,
setMoveToPublicRoomVisible,
} = dialogsStore;
export default inject(
({ settingsStore, dialogsStore, uploadDataStore, filesStore }) => {
const {
conflictResolveDialogVisible: visible,
setConflictResolveDialogVisible,
conflictResolveDialogData,
conflictResolveDialogItems: items,
setMoveToPanelVisible,
setRestorePanelVisible,
setRestoreAllPanelVisible,
setCopyPanelVisible,
setMoveToPublicRoomVisible,
} = dialogsStore;
const { itemOperationToFolder, handleFilesUpload } = uploadDataStore;
const {
activeFiles,
activeFolders,
setActiveFiles,
setActiveFolders,
updateActiveFiles,
setSelected,
} = filesStore;
const { settingsStore } = auth;
const { theme } = settingsStore;
return {
theme,
items,
visible,
conflictResolveDialogData,
setConflictResolveDialogVisible,
itemOperationToFolder,
activeFiles,
activeFolders,
setActiveFiles,
setActiveFolders,
updateActiveFiles,
setSelected,
setMoveToPanelVisible,
setRestorePanelVisible,
setRestoreAllPanelVisible,
setCopyPanelVisible,
setMoveToPublicRoomVisible,
handleFilesUpload,
};
})(
const { itemOperationToFolder, handleFilesUpload } = uploadDataStore;
const {
activeFiles,
activeFolders,
setActiveFiles,
setActiveFolders,
updateActiveFiles,
setSelected,
} = filesStore;
const { theme } = settingsStore;
return {
theme,
items,
visible,
conflictResolveDialogData,
setConflictResolveDialogVisible,
itemOperationToFolder,
activeFiles,
activeFolders,
setActiveFiles,
setActiveFolders,
updateActiveFiles,
setSelected,
setMoveToPanelVisible,
setRestorePanelVisible,
setRestoreAllPanelVisible,
setCopyPanelVisible,
setMoveToPublicRoomVisible,
handleFilesUpload,
};
}
)(
withTranslation(["ConflictResolveDialog", "Common"])(
observer(ConflictResolveDialog)
)

12
packages/client/src/components/dialogs/ConnectDialog/index.js
View File

@ -380,14 +380,20 @@ const ConnectDialog = withTranslation([
])(PureConnectDialogContainer);
export default inject(
({ auth, settingsStore, selectedFolderStore, dialogsStore, backup }) => {
({
settingsStore,
filesSettingsStore,
selectedFolderStore,
dialogsStore,
backup,
}) => {
const {
providers,
saveThirdParty,
openConnectWindow,
fetchThirdPartyProviders,
} = settingsStore.thirdPartyStore;
const { personal, folderFormValidation } = auth.settingsStore;
} = filesSettingsStore.thirdPartyStore;
const { personal, folderFormValidation } = settingsStore;
const { id, folders } = selectedFolderStore;
const {

4
packages/client/src/components/dialogs/ConvertDialog/index.js
View File

@ -149,7 +149,7 @@ export default inject(
uploadDataStore,
treeFoldersStore,
dialogsStore,
settingsStore,
filesSettingsStore,
selectedFolderStore,
}) => {
const {
@ -161,7 +161,7 @@ export default inject(
const { convertUploadedFiles, convertFile, setIsConvertSingleFile } =
uploadDataStore;
const { storeOriginalFiles, setStoreOriginal, hideConfirmConvert } =
settingsStore;
filesSettingsStore;
const { id: folderId } = selectedFolderStore;
const {
convertDialogVisible: visible,

10
packages/client/src/components/dialogs/ConvertPasswordDialog/index.js
View File

@ -258,7 +258,13 @@ const ConvertPasswordDialog = withTranslation([
])(ConvertPasswordDialogComponent);
export default inject(
({ filesStore, filesActionsStore, auth, dialogsStore, uploadDataStore }) => {
({
filesStore,
filesActionsStore,
settingsStore,
dialogsStore,
uploadDataStore,
}) => {
const {
convertPasswordDialogVisible: visible,
setConvertPasswordDialogVisible,
@ -268,7 +274,7 @@ export default inject(
const { copyAsAction, fileCopyAs } = uploadDataStore;
const { setPasswordEntryProcess } = filesStore;
const { completeAction } = filesActionsStore;
const { settingsStore } = auth;
const { isTabletView, isDesktopClient } = settingsStore;
return {

8
packages/client/src/components/dialogs/CreateEditRoomDialog/sub-components/ChangeRoomOwner/index.js
View File

@ -46,7 +46,7 @@ const ChangeRoomOwner = ({
type="action"
fontWeight={600}
fontSize="13px"
color={currentColorScheme.main.accent}
color={currentColorScheme.main?.accent}
onClick={onOwnerChange}
>
{t("Common:ChangeButton")}
@ -55,7 +55,7 @@ const ChangeRoomOwner = ({
);
};
export default inject(({ auth, dialogsStore }) => ({
currentUserId: auth.userStore.user.id,
currentColorScheme: auth.settingsStore.currentColorScheme,
export default inject(({ settingsStore, userStore }) => ({
currentUserId: userStore.user.id,
currentColorScheme: settingsStore.currentColorScheme,
}))(withTranslation(["Common"])(ChangeRoomOwner));

4
packages/client/src/components/dialogs/CreateEditRoomDialog/sub-components/SetRoomParams.js
View File

@ -197,9 +197,9 @@ const SetRoomParams = ({
);
};
export default inject(({ auth, dialogsStore }) => {
export default inject(({ settingsStore, dialogsStore }) => {
const { setChangeRoomOwnerIsVisible } = dialogsStore;
const { folderFormValidation } = auth.settingsStore;
const { folderFormValidation } = settingsStore;
return {
folderFormValidation,

124
packages/client/src/components/dialogs/CreateEditRoomDialog/sub-components/ThirdPartyStorage/index.js
View File

@ -55,7 +55,7 @@ const ThirdPartyStorage = ({
href="/portal-settings/integration/third-party-services"
type="page"
noHover
color={currentColorScheme.main.accent}
color={currentColorScheme.main?.accent}
>
{t("Translations:ThirdPartyTitle")}
</Link>
@ -137,73 +137,75 @@ const ThirdPartyStorage = ({
);
};
export default inject(({ auth, settingsStore, dialogsStore }) => {
const { currentColorScheme } = auth.settingsStore;
export default inject(
({ authStore, settingsStore, filesSettingsStore, dialogsStore }) => {
const { currentColorScheme } = settingsStore;
const { openConnectWindow, saveThirdParty, deleteThirdParty } =
settingsStore.thirdPartyStore;
const { openConnectWindow, saveThirdParty, deleteThirdParty } =
filesSettingsStore.thirdPartyStore;
const {
setConnectItem,
setConnectDialogVisible,
setRoomCreation,
saveThirdpartyResponse,
setSaveThirdpartyResponse,
} = dialogsStore;
const {
setConnectItem,
setConnectDialogVisible,
setRoomCreation,
saveThirdpartyResponse,
setSaveThirdpartyResponse,
} = dialogsStore;
const thirdPartyStore = settingsStore.thirdPartyStore;
const thirdPartyStore = filesSettingsStore.thirdPartyStore;
const connectItems = [
thirdPartyStore.googleConnectItem,
thirdPartyStore.boxConnectItem,
thirdPartyStore.dropboxConnectItem,
thirdPartyStore.oneDriveConnectItem,
thirdPartyStore.nextCloudConnectItem && [
...thirdPartyStore.nextCloudConnectItem,
"Nextcloud",
],
thirdPartyStore.kDriveConnectItem,
thirdPartyStore.yandexConnectItem,
thirdPartyStore.ownCloudConnectItem && [
...thirdPartyStore.ownCloudConnectItem,
"ownCloud",
],
thirdPartyStore.webDavConnectItem,
thirdPartyStore.sharePointConnectItem,
]
.map(
(item) =>
item && {
id: item[0],
className: `storage_${item[0].toLowerCase()}`,
providerKey: item[0],
isOauth: item.length > 1 && item[0] !== "WebDav",
oauthHref: item.length > 1 && item[0] !== "WebDav" ? item[1] : "",
...(item[0] === "WebDav" && {
category: item[item.length - 1],
}),
}
)
.filter((item) => !!item);
const connectItems = [
thirdPartyStore.googleConnectItem,
thirdPartyStore.boxConnectItem,
thirdPartyStore.dropboxConnectItem,
thirdPartyStore.oneDriveConnectItem,
thirdPartyStore.nextCloudConnectItem && [
...thirdPartyStore.nextCloudConnectItem,
"Nextcloud",
],
thirdPartyStore.kDriveConnectItem,
thirdPartyStore.yandexConnectItem,
thirdPartyStore.ownCloudConnectItem && [
...thirdPartyStore.ownCloudConnectItem,
"ownCloud",
],
thirdPartyStore.webDavConnectItem,
thirdPartyStore.sharePointConnectItem,
]
.map(
(item) =>
item && {
id: item[0],
className: `storage_${item[0].toLowerCase()}`,
providerKey: item[0],
isOauth: item.length > 1 && item[0] !== "WebDav",
oauthHref: item.length > 1 && item[0] !== "WebDav" ? item[1] : "",
...(item[0] === "WebDav" && {
category: item[item.length - 1],
}),
}
)
.filter((item) => !!item);
const { isRoomAdmin } = auth;
const { isRoomAdmin } = authStore;
return {
connectItems,
return {
connectItems,
setConnectDialogVisible,
setRoomCreation,
setConnectDialogVisible,
setRoomCreation,
saveThirdParty,
deleteThirdParty,
saveThirdParty,
deleteThirdParty,
saveThirdpartyResponse,
setSaveThirdpartyResponse,
saveThirdpartyResponse,
setSaveThirdpartyResponse,
openConnectWindow,
setConnectItem,
getOAuthToken,
currentColorScheme,
isRoomAdmin,
};
})(observer(ThirdPartyStorage));
openConnectWindow,
setConnectItem,
getOAuthToken,
currentColorScheme,
isRoomAdmin,
};
}
)(observer(ThirdPartyStorage));

8
packages/client/src/components/dialogs/DataReassignmentDialog/index.js
View File

@ -248,7 +248,7 @@ const DataReassignmentDialog = ({
);
};
export default inject(({ auth, peopleStore, setup }) => {
export default inject(({ settingsStore, peopleStore, setup, userStore }) => {
const {
setDataReassignmentDialogVisible,
dataReassignmentDeleteProfile,
@ -256,7 +256,7 @@ export default inject(({ auth, peopleStore, setup }) => {
isDeletingUserWithReassignment,
setIsDeletingUserWithReassignment,
} = peopleStore.dialogStore;
const { currentColorScheme, dataReassignmentUrl } = auth.settingsStore;
const { currentColorScheme, dataReassignmentUrl } = settingsStore;
const { setSelected } = peopleStore.selectionStore;
const {
dataReassignment,
@ -264,13 +264,13 @@ export default inject(({ auth, peopleStore, setup }) => {
dataReassignmentTerminate,
} = setup;
const { user: currentUser } = peopleStore.authStore.userStore;
const { user: currentUser } = userStore;
const { getUsersList, needResetUserSelection } = peopleStore.usersStore;
return {
setDataReassignmentDialogVisible,
theme: auth.settingsStore.theme,
theme: settingsStore.theme,
currentColorScheme,
dataReassignment,
currentUser,

2
packages/client/src/components/dialogs/DeleteDialog/index.js
View File

@ -266,7 +266,7 @@ const DeleteDialog = withTranslation([
])(DeleteDialogComponent);
export default inject(
({ filesStore, dialogsStore, filesActionsStore, treeFoldersStore, auth }) => {
({ filesStore, dialogsStore, filesActionsStore, treeFoldersStore }) => {
const {
selection,
isLoading,

40
packages/client/src/components/dialogs/DeleteLinkDialog/index.js
View File

@ -120,23 +120,25 @@ const DeleteLinkDialog = withTranslation(["Common", "Files"])(
DeleteLinkDialogComponent
);
export default inject(({ auth, dialogsStore, publicRoomStore, filesStore }) => {
const { infoPanelSelection } = auth.infoPanelStore;
const {
deleteLinkDialogVisible: visible,
setDeleteLinkDialogVisible: setIsVisible,
linkParams,
} = dialogsStore;
const { editExternalLink, deleteExternalLink } = publicRoomStore;
export default inject(
({ dialogsStore, publicRoomStore, filesStore, infoPanelStore }) => {
const { infoPanelSelection } = infoPanelStore;
const {
deleteLinkDialogVisible: visible,
setDeleteLinkDialogVisible: setIsVisible,
linkParams,
} = dialogsStore;
const { editExternalLink, deleteExternalLink } = publicRoomStore;
return {
visible,
setIsVisible,
roomId: infoPanelSelection.id,
link: linkParams.link,
editExternalLink,
deleteExternalLink,
isPublicRoomType: infoPanelSelection.roomType === RoomsType.PublicRoom,
setRoomShared: filesStore.setRoomShared,
};
})(observer(DeleteLinkDialog));
return {
visible,
setIsVisible,
roomId: infoPanelSelection.id,
link: linkParams.link,
editExternalLink,
deleteExternalLink,
isPublicRoomType: infoPanelSelection.roomType === RoomsType.PublicRoom,
setRoomShared: filesStore.setRoomShared,
};
}
)(observer(DeleteLinkDialog));

4
packages/client/src/components/dialogs/DeleteProfileEverDialog/sub-components/BodyComponent.js
View File

@ -89,8 +89,8 @@ const BodyComponent = (props) => {
);
};
export default inject(({ peopleStore }) => {
export default inject(({ userStore }) => {
return {
userPerformedDeletion: peopleStore.authStore.userStore.user,
userPerformedDeletion: userStore.user,
};
})(observer(BodyComponent));

4
packages/client/src/components/dialogs/DeleteSelfProfileDialog/index.js
View File

@ -89,8 +89,8 @@ class DeleteSelfProfileDialogComponent extends React.Component {
}
}
const DeleteSelfProfileDialog = inject(({ auth }) => ({
theme: auth.settingsStore.theme,
const DeleteSelfProfileDialog = inject(({ settingsStore }) => ({
theme: settingsStore.theme,
}))(
observer(
withTranslation(["DeleteSelfProfileDialog", "Common"])(

4
packages/client/src/components/dialogs/DeleteThirdPartyDialog/index.js
View File

@ -111,13 +111,13 @@ const DeleteThirdPartyDialog = (props) => {
export default inject(
({
filesStore,
settingsStore,
filesSettingsStore,
dialogsStore,
selectedFolderStore,
backup,
}) => {
const { providers, setThirdPartyProviders, deleteThirdParty } =
settingsStore.thirdPartyStore;
filesSettingsStore.thirdPartyStore;
const { setIsLoading } = filesStore;
const { selectedThirdPartyAccount: backupConnectionItem } = backup;
const {

3
packages/client/src/components/dialogs/DialogsWrapper/index.js
View File

@ -31,8 +31,7 @@ const DialogsWrapper = (props) => {
);
};
export default inject(({ auth, profileActionsStore }) => {
const { settingsStore } = auth;
export default inject(({ settingsStore, profileActionsStore }) => {
const { personal, buildVersionInfo } = settingsStore;
const {
isAboutDialogVisible,

4
packages/client/src/components/dialogs/DownloadDialog/DownloadRow.js
View File

@ -103,8 +103,8 @@ const DownloadRow = (props) => {
);
};
export default inject(({ settingsStore }) => {
const { getIcon, getFolderIcon } = settingsStore;
export default inject(({ filesSettingsStore }) => {
const { getIcon, getFolderIcon } = filesSettingsStore;
return {
getIcon,

12
packages/client/src/components/dialogs/DownloadDialog/index.js
View File

@ -396,10 +396,16 @@ const DownloadDialog = withTranslation([
])(DownloadDialogComponent);
export default inject(
({ auth, filesStore, dialogsStore, filesActionsStore, settingsStore }) => {
({
filesStore,
dialogsStore,
filesActionsStore,
filesSettingsStore,
settingsStore,
}) => {
const { sortedFiles, setSelected } = filesStore;
const { extsConvertible } = settingsStore;
const { theme } = auth.settingsStore;
const { extsConvertible } = filesSettingsStore;
const { theme } = settingsStore;
const { downloadDialogVisible: visible, setDownloadDialogVisible } =
dialogsStore;

46
packages/client/src/components/dialogs/InviteUsersWarningDialog/index.js
View File

@ -125,25 +125,31 @@ const InviteUsersWarningDialog = (props) => {
);
};
export default inject(({ auth, dialogsStore }) => {
const { isPaymentPageAvailable } = auth;
const { dueDate, delayDueDate, isGracePeriod } =
auth.currentTariffStatusStore;
const { currentTariffPlanTitle } = auth.currentQuotaStore;
export default inject(
({
authStore,
dialogsStore,
currentTariffStatusStore,
currentQuotaStore,
}) => {
const { isPaymentPageAvailable } = authStore;
const { dueDate, delayDueDate, isGracePeriod } = currentTariffStatusStore;
const { currentTariffPlanTitle } = currentQuotaStore;
const {
inviteUsersWarningDialogVisible,
setInviteUsersWarningDialogVisible,
} = dialogsStore;
const {
inviteUsersWarningDialogVisible,
setInviteUsersWarningDialogVisible,
} = dialogsStore;
return {
isPaymentPageAvailable,
currentTariffPlanTitle,
language: auth.language,
visible: inviteUsersWarningDialogVisible,
setIsVisible: setInviteUsersWarningDialogVisible,
dueDate,
delayDueDate,
isGracePeriod,
};
})(observer(withTranslation(["Payments", "Common"])(InviteUsersWarningDialog)));
return {
isPaymentPageAvailable,
currentTariffPlanTitle,
language: authStore.language,
visible: inviteUsersWarningDialogVisible,
setIsVisible: setInviteUsersWarningDialogVisible,
dueDate,
delayDueDate,
isGracePeriod,
};
}
)(observer(withTranslation(["Payments", "Common"])(InviteUsersWarningDialog)));

4
packages/client/src/components/dialogs/LeaveRoomDialog/index.js
View File

@ -82,7 +82,7 @@ const LeaveRoomDialog = (props) => {
export default inject(
({
auth,
userStore,
dialogsStore,
filesStore,
selectedFolderStore,
@ -93,7 +93,7 @@ export default inject(
setLeaveRoomDialogVisible: setIsVisible,
setChangeRoomOwnerIsVisible,
} = dialogsStore;
const { user } = auth.userStore;
const { user } = userStore;
const { selection, bufferSelection } = filesStore;
const selections = selection.length ? selection : [bufferSelection];

8
packages/client/src/components/dialogs/ReportDialog/index.js
View File

@ -160,13 +160,13 @@ const ReportDialog = (props) => {
);
};
export default inject(({ auth }) => {
const { user, currentDeviceType } = auth.userStore;
const { firebaseHelper } = auth.settingsStore;
export default inject(({ authStore, settingsStore, userStore }) => {
const { user } = userStore;
const { firebaseHelper } = settingsStore;
return {
user,
version: auth.version,
version: authStore.version,
FirebaseHelper: firebaseHelper,
};
})(observer(ReportDialog));

4
packages/client/src/components/dialogs/SettingsPluginDialog/index.js
View File

@ -117,7 +117,7 @@ const SettingsPluginDialog = ({
);
};
export default inject(({ auth, pluginStore }) => {
export default inject(({ settingsStore, pluginStore }) => {
const {
pluginList,
settingsPluginDialogVisible,
@ -129,7 +129,7 @@ export default inject(({ auth, pluginStore }) => {
updatePlugin,
} = pluginStore;
const { pluginOptions } = auth.settingsStore;
const { pluginOptions } = settingsStore;
const { pluginName } = currentSettingsDialogPlugin;

14
packages/client/src/components/dialogs/SubmitToFormGallery/index.js
View File

@ -124,7 +124,7 @@ const SubmitToFormGallery = ({
Learn how to create perfect forms and increase your chance to get
approval in our
<Link
color={currentColorScheme.main.accent}
color={currentColorScheme.main?.accent}
href="https://www.onlyoffice.com/blog/2022/07/when-design-matters-how-to-create-beautiful-forms-with-oforms"
type={"page"}
target={"_blank"}
@ -190,13 +190,19 @@ const SubmitToFormGallery = ({
};
export default inject(
({ auth, accessRightsStore, dialogsStore, settingsStore, oformsStore }) => ({
({
accessRightsStore,
dialogsStore,
settingsStore,
filesSettingsStore,
oformsStore,
}) => ({
visible: dialogsStore.submitToGalleryDialogVisible,
setVisible: dialogsStore.setSubmitToGalleryDialogVisible,
formItem: dialogsStore.formItem,
setFormItem: dialogsStore.setFormItem,
getIcon: settingsStore.getIcon,
currentColorScheme: auth.settingsStore.currentColorScheme,
getIcon: filesSettingsStore.getIcon,
currentColorScheme: settingsStore.currentColorScheme,
canSubmitToFormGallery: accessRightsStore.canSubmitToFormGallery,
submitToFormGallery: oformsStore.submitToFormGallery,
})

4
packages/client/src/components/panels/AddUsersPanel/index.js
View File

@ -314,9 +314,9 @@ AddUsersPanel.propTypes = {
onClose: PropTypes.func,
};
export default inject(({ auth }) => {
export default inject(({ settingsStore }) => {
return {
theme: auth.settingsStore.theme,
theme: settingsStore.theme,
};
})(
observer(

4
packages/client/src/components/panels/ChangeOwnerPanel/index.js
View File

@ -131,7 +131,7 @@ const ChangeOwnerPanel = withTranslation(["ChangeOwnerPanel", "Common"])(
);
export default inject(
({ auth, filesStore, dialogsStore, clientLoadingStore }) => {
({ settingsStore, filesStore, dialogsStore, clientLoadingStore }) => {
const {
selection,
bufferSelection,
@ -144,7 +144,7 @@ export default inject(
const { ownerPanelVisible, setChangeOwnerPanelVisible } = dialogsStore;
return {
theme: auth.settingsStore.theme,
theme: settingsStore.theme,
selection: selection.length ? selection : [bufferSelection],
isLoading: clientLoadingStore.isLoading,
visible: ownerPanelVisible,

5
packages/client/src/components/panels/ChangeRoomOwnerPanel/index.js
View File

@ -138,18 +138,19 @@ const ChangeRoomOwner = (props) => {
export default inject(
({
auth,
settingsStore,
dialogsStore,
filesStore,
selectedFolderStore,
filesActionsStore,
userStore,
infoPanelStore,
}) => {
const {
changeRoomOwnerIsVisible,
setChangeRoomOwnerIsVisible,
changeRoomOwnerData,
} = dialogsStore;
const { settingsStore, userStore, infoPanelStore } = auth;
const { selection, bufferSelection } = filesStore;
const { currentDeviceType } = settingsStore;
const { updateInfoPanelSelection } = infoPanelStore;

83
packages/client/src/components/panels/EditLinkPanel/index.js
View File

@ -270,45 +270,54 @@ const EditLinkPanel = (props) => {
: editLinkPanelComponent;
};
export default inject(({ auth, dialogsStore, publicRoomStore }) => {
const { infoPanelSelection } = auth.infoPanelStore;
const {
editLinkPanelIsVisible,
setEditLinkPanelIsVisible,
unsavedChangesDialogVisible,
setUnsavedChangesDialog,
linkParams,
} = dialogsStore;
const { externalLinks, editExternalLink, setExternalLink } = publicRoomStore;
const { isEdit } = linkParams;
export default inject(
({
authStore,
settingsStore,
dialogsStore,
publicRoomStore,
infoPanelStore,
}) => {
const { infoPanelSelection } = infoPanelStore;
const {
editLinkPanelIsVisible,
setEditLinkPanelIsVisible,
unsavedChangesDialogVisible,
setUnsavedChangesDialog,
linkParams,
} = dialogsStore;
const { externalLinks, editExternalLink, setExternalLink } =
publicRoomStore;
const { isEdit } = linkParams;
const linkId = linkParams?.link?.sharedTo?.id;
const link = externalLinks.find((l) => l?.sharedTo?.id === linkId);
const linkId = linkParams?.link?.sharedTo?.id;
const link = externalLinks.find((l) => l?.sharedTo?.id === linkId);
const shareLink = link?.sharedTo?.shareLink;
const isPublic = infoPanelSelection?.roomType === RoomsType.PublicRoom;
const shareLink = link?.sharedTo?.shareLink;
const isPublic = infoPanelSelection?.roomType === RoomsType.PublicRoom;
return {
visible: editLinkPanelIsVisible,
setIsVisible: setEditLinkPanelIsVisible,
isEdit,
linkId: link?.sharedTo?.id,
editExternalLink,
roomId: infoPanelSelection.id,
setExternalLink,
isLocked: !!link?.sharedTo?.password,
password: link?.sharedTo?.password ?? "",
date: link?.sharedTo?.expirationDate,
isDenyDownload: link?.sharedTo?.denyDownload ?? false,
shareLink,
externalLinks,
unsavedChangesDialogVisible,
setUnsavedChangesDialog,
link,
language: auth.language,
isPublic,
currentDeviceType: auth.settingsStore.currentDeviceType,
};
})(
return {
visible: editLinkPanelIsVisible,
setIsVisible: setEditLinkPanelIsVisible,
isEdit,
linkId: link?.sharedTo?.id,
editExternalLink,
roomId: infoPanelSelection.id,
setExternalLink,
isLocked: !!link?.sharedTo?.password,
password: link?.sharedTo?.password ?? "",
date: link?.sharedTo?.expirationDate,
isDenyDownload: link?.sharedTo?.denyDownload ?? false,
shareLink,
externalLinks,
unsavedChangesDialogVisible,
setUnsavedChangesDialog,
link,
language: authStore.language,
isPublic,
currentDeviceType: settingsStore.currentDeviceType,
};
}
)(
withTranslation(["SharingPanel", "Common", "Files"])(observer(EditLinkPanel))
);

4
packages/client/src/components/panels/EmbeddingPanel/index.js
View File

@ -84,10 +84,10 @@ const EmbeddingPanelComponent = (props) => {
: embeddingPanelComponent;
};
export default inject(({ dialogsStore, auth }) => {
export default inject(({ dialogsStore, settingsStore }) => {
const { embeddingPanelIsVisible, setEmbeddingPanelIsVisible, linkParams } =
dialogsStore;
const { currentDeviceType } = auth.settingsStore;
const { currentDeviceType } = settingsStore;
return {
visible: embeddingPanelIsVisible,

7
packages/client/src/components/panels/HotkeysPanel/index.js
View File

@ -149,15 +149,14 @@ const HotkeyPanel = ({
HotkeyPanel.defaultProps = { theme: Base };
export default inject(({ auth, publicRoomStore }) => {
const { hotkeyPanelVisible, setHotkeyPanelVisible, theme } =
auth.settingsStore;
export default inject(({ settingsStore, publicRoomStore, userStore }) => {
const { hotkeyPanelVisible, setHotkeyPanelVisible, theme } = settingsStore;
return {
visible: hotkeyPanelVisible,
setHotkeyPanelVisible,
theme,
isVisitor: auth?.userStore?.user?.isVisitor || publicRoomStore.isPublicRoom,
isVisitor: userStore?.user?.isVisitor || publicRoomStore.isPublicRoom,
};
})(
withTranslation(["HotkeysPanel", "Article", "Common", "Files"])(

115
packages/client/src/components/panels/InvitePanel/index.js
View File

@ -463,64 +463,73 @@ const InvitePanel = ({
: invitePanelComponent;
};
export default inject(({ auth, peopleStore, filesStore, dialogsStore }) => {
const { theme, currentDeviceType } = auth.settingsStore;
export default inject(
({
settingsStore,
peopleStore,
filesStore,
dialogsStore,
infoPanelStore,
}) => {
const { theme, currentDeviceType } = settingsStore;
const { getUsersByQuery, inviteUsers, getUsersList } = peopleStore.usersStore;
const { filter } = peopleStore.filterStore;
const {
setIsMobileHidden: setInfoPanelIsMobileHidden,
updateInfoPanelSelection,
addInfoPanelMembers,
} = auth.infoPanelStore;
const { getUsersByQuery, inviteUsers, getUsersList } =
peopleStore.usersStore;
const { filter } = peopleStore.filterStore;
const {
setIsMobileHidden: setInfoPanelIsMobileHidden,
updateInfoPanelSelection,
addInfoPanelMembers,
} = infoPanelStore;
const {
getPortalInviteLinks,
userLink,
guestLink,
adminLink,
collaboratorLink,
} = peopleStore.inviteLinksStore;
const {
getPortalInviteLinks,
userLink,
guestLink,
adminLink,
collaboratorLink,
} = peopleStore.inviteLinksStore;
const {
inviteItems,
invitePanelOptions,
setInviteItems,
setInvitePanelOptions,
setInviteLanguage,
} = dialogsStore;
const {
inviteItems,
invitePanelOptions,
setInviteItems,
setInvitePanelOptions,
setInviteLanguage,
} = dialogsStore;
const { getFolderInfo, setRoomSecurity, getRoomSecurityInfo, folders } =
filesStore;
const { getFolderInfo, setRoomSecurity, getRoomSecurityInfo, folders } =
filesStore;
return {
folders,
setInviteLanguage,
getUsersByQuery,
getRoomSecurityInfo,
inviteItems,
roomId: invitePanelOptions.roomId,
setInviteItems,
setInvitePanelOptions,
setRoomSecurity,
theme,
visible: invitePanelOptions.visible,
defaultAccess: invitePanelOptions.defaultAccess,
getFolderInfo,
getPortalInviteLinks,
userLink,
guestLink,
adminLink,
collaboratorLink,
inviteUsers,
setInfoPanelIsMobileHidden,
updateInfoPanelSelection,
addInfoPanelMembers,
getUsersList,
filter,
currentDeviceType,
};
})(
return {
folders,
setInviteLanguage,
getUsersByQuery,
getRoomSecurityInfo,
inviteItems,
roomId: invitePanelOptions.roomId,
setInviteItems,
setInvitePanelOptions,
setRoomSecurity,
theme,
visible: invitePanelOptions.visible,
defaultAccess: invitePanelOptions.defaultAccess,
getFolderInfo,
getPortalInviteLinks,
userLink,
guestLink,
adminLink,
collaboratorLink,
inviteUsers,
setInfoPanelIsMobileHidden,
updateInfoPanelSelection,
addInfoPanelMembers,
getUsersList,
filter,
currentDeviceType,
};
}
)(
withTranslation([
"InviteDialog",
"SharingPanel",

4
packages/client/src/components/panels/InvitePanel/sub-components/AccessSelector.js
View File

@ -106,8 +106,8 @@ const AccessSelector = ({
);
};
export default inject(({ auth }) => {
const { standalone } = auth.settingsStore;
export default inject(({ settingsStore }) => {
const { standalone } = settingsStore;
return {
standalone,

4
packages/client/src/components/panels/InvitePanel/sub-components/ExternalLinks.js
View File

@ -230,8 +230,8 @@ const ExternalLinks = ({
);
};
export default inject(({ auth, dialogsStore, filesStore }) => {
const { isOwner } = auth.userStore.user;
export default inject(({ userStore, dialogsStore, filesStore }) => {
const { isOwner } = userStore.user;
const { invitePanelOptions } = dialogsStore;
const { setInvitationLinks } = filesStore;
const { roomId, hideSelector, defaultAccess } = invitePanelOptions;

5
packages/client/src/components/panels/InvitePanel/sub-components/InviteInput.js
View File

@ -456,8 +456,8 @@ const InviteInput = ({
);
};
export default inject(({ auth, dialogsStore }) => {
const { isOwner } = auth.userStore.user;
export default inject(({ settingsStore, dialogsStore, userStore }) => {
const { isOwner } = userStore.user;
const {
invitePanelOptions,
setInviteItems,
@ -465,7 +465,6 @@ export default inject(({ auth, dialogsStore }) => {
setInviteLanguage,
culture,
} = dialogsStore;
const { settingsStore } = auth;
return {
language: settingsStore.culture,

2
packages/client/src/components/panels/InvitePanel/sub-components/Item.js
View File

@ -18,7 +18,7 @@ import {
StyledDeleteIcon,
StyledInviteUserBody,
} from "../StyledInvitePanel";
import { filterUserRoleOptions } from "SRC_DIR/helpers/utils";
import { filterUserRoleOptions } from "SRC_DIR/helpers";
import AccessSelector from "./AccessSelector";
const Item = ({

4
packages/client/src/components/panels/InvitePanel/sub-components/ItemsList.js
View File

@ -155,9 +155,9 @@ const ItemsList = ({
);
};
export default inject(({ auth, dialogsStore }) => {
export default inject(({ userStore, dialogsStore }) => {
const { setInviteItems, inviteItems, changeInviteItem } = dialogsStore;
const { isOwner } = auth.userStore.user;
const { isOwner } = userStore.user;
return {
setInviteItems,

12
packages/client/src/components/panels/NewFilesPanel/index.js
View File

@ -338,13 +338,13 @@ const NewFilesPanel = (props) => {
export default inject(
({
auth,
settingsStore,
filesStore,
mediaViewerDataStore,
filesActionsStore,
selectedFolderStore,
dialogsStore,
settingsStore,
filesSettingsStore,
clientLoadingStore,
pluginStore,
}) => {
@ -358,7 +358,7 @@ export default inject(
const { playlist, setMediaViewerData, setCurrentItem } =
mediaViewerDataStore;
const { getIcon, getFolderIcon } = settingsStore;
const { getIcon, getFolderIcon } = filesSettingsStore;
const { markAsRead } = filesActionsStore;
const { id: currentFolderId } = selectedFolderStore;
@ -373,7 +373,7 @@ export default inject(
return {
fileItemsList,
enablePlugins: auth.settingsStore.enablePlugins,
enablePlugins: settingsStore.enablePlugins,
visible,
newFiles,
newFilesIds,
@ -387,11 +387,11 @@ export default inject(
getFolderIcon,
markAsRead,
setNewFilesPanelVisible,
theme: auth.settingsStore.theme,
theme: settingsStore.theme,
hasNew,
refreshFiles,
setIsLoading,
currentDeviceType: auth.settingsStore.currentDeviceType,
currentDeviceType: settingsStore.currentDeviceType,
};
}
)(

2
packages/client/src/components/panels/SharingDialog/index.js
View File

@ -13,7 +13,7 @@ import { Scrollbar } from "@docspace/shared/components/scrollbar";
import Share from "SRC_DIR/pages/Home/InfoPanel/Body/views/Share";
import store from "client/store";
const { auth: authStore } = store;
const { authStore } = store;
const StyledWrapper = styled.div`
${NoUserSelect}

11
packages/client/src/components/panels/UploadPanel/FileRow.js
View File

@ -400,7 +400,12 @@ class FileRow extends Component {
}
export default inject(
(
{ auth, uploadDataStore, mediaViewerDataStore, settingsStore },
{
filesSettingsStore,
uploadDataStore,
mediaViewerDataStore,
settingsStore,
},
{ item }
) => {
let ext;
@ -425,8 +430,8 @@ export default inject(
name = splitted.join(".");
const { personal, theme } = auth.settingsStore;
const { canViewedDocs, getIconSrc, isArchive } = settingsStore;
const { personal, theme } = settingsStore;
const { canViewedDocs, getIconSrc, isArchive } = filesSettingsStore;
const {
uploaded,
cancelCurrentUpload,

4
packages/client/src/components/panels/UploadPanel/SubComponents/ShareButton.js
View File

@ -32,7 +32,7 @@ const ShareButton = (props) => {
};
export default inject(
({ auth, dialogsStore, uploadDataStore }, { uniqueId }) => {
({ settingsStore, dialogsStore, uploadDataStore }, { uniqueId }) => {
const { setSharingPanelVisible } = dialogsStore;
const { selectUploadedFile, getUploadedFile } = uploadDataStore;
@ -41,7 +41,7 @@ export default inject(
return {
uploadedFile,
theme: auth.settingsStore.theme,
theme: settingsStore.theme,
setSharingPanelVisible,
selectUploadedFile,

4
packages/client/src/components/panels/UploadPanel/index.js
View File

@ -157,7 +157,7 @@ const UploadPanel = withTranslation(["UploadPanel", "Files"])(
withLoader(UploadPanelComponent)(<Loaders.DialogAsideLoader isPanel />)
);
export default inject(({ auth, uploadDataStore }) => {
export default inject(({ settingsStore, uploadDataStore }) => {
const {
uploaded,
converted,
@ -190,6 +190,6 @@ export default inject(({ auth, uploadDataStore }) => {
isUploading,
isUploadingAndConversion,
theme: auth.settingsStore.theme,
theme: settingsStore.theme,
};
})(observer(UploadPanel));

55
packages/client/src/components/panels/VersionHistoryPanel/index.js
View File

@ -110,29 +110,36 @@ VersionHistoryPanel.propTypes = {
fileId: PropTypes.string,
};
export default inject(({ auth, clientLoadingStore, versionHistoryStore }) => {
const { isTabletView, currentDeviceType } = auth.settingsStore;
const { isLoading } = clientLoadingStore;
const { setIsMobileHidden: setInfoPanelIsMobileHidden } = auth.infoPanelStore;
const {
fileId,
versions,
setIsVerHistoryPanel,
isVisible: visible,
showProgressBar,
} = versionHistoryStore;
export default inject(
({
settingsStore,
clientLoadingStore,
versionHistoryStore,
infoPanelStore,
}) => {
const { isTabletView, currentDeviceType } = settingsStore;
const { isLoading } = clientLoadingStore;
const { setIsMobileHidden: setInfoPanelIsMobileHidden } = infoPanelStore;
const {
fileId,
versions,
setIsVerHistoryPanel,
isVisible: visible,
showProgressBar,
} = versionHistoryStore;
return {
isTabletView,
homepage: config.homepage,
isLoading,
fileId,
versions,
visible,
showProgressBar,
return {
isTabletView,
homepage: config.homepage,
isLoading,
fileId,
versions,
visible,
showProgressBar,
setIsVerHistoryPanel,
setInfoPanelIsMobileHidden,
currentDeviceType,
};
})(observer(VersionHistoryPanel));
setIsVerHistoryPanel,
setInfoPanelIsMobileHidden,
currentDeviceType,
};
}
)(observer(VersionHistoryPanel));

Some files were not shown because too many files have changed in this diff Show More