web: files: move files setting fetching to store

This commit is contained in:
Vladislav Makhov 2021-06-03 14:29:30 +03:00
parent bdaeb27fd1
commit 6f5c5d2524
3 changed files with 16 additions and 11 deletions

View File

@ -75,7 +75,7 @@ const PureTreeSettings = ({
isLoading,
setSelectedNode,
setExpandSettingsTree,
getFilesSettings,
setSelectedFolder,
//selectedFolder,
history,
@ -87,11 +87,9 @@ const PureTreeSettings = ({
useEffect(() => {
setIsLoading(true);
getFilesSettings().then(() => {
setIsLoading(false);
setSelectedNode([setting]);
});
}, [getFilesSettings, setting, setIsLoading, setSelectedNode]);
setSelectedNode([setting]);
setIsLoading(false);
}, [setting, setIsLoading, setSelectedNode]);
useEffect(() => {
const { setting } = match.params;
@ -221,7 +219,6 @@ export default inject(
const { setSelectedFolder } = selectedFolderStore;
const { selectedTreeNode, setSelectedNode } = treeFoldersStore;
const {
getFilesSettings,
enableThirdParty,
expandedSetting,
setExpandSettingsTree,
@ -238,7 +235,6 @@ export default inject(
setIsLoading,
setSelectedFolder,
setSelectedNode,
getFilesSettings,
setExpandSettingsTree,
};
}

View File

@ -24,6 +24,7 @@ class FilesStore {
selectedFolderStore;
treeFoldersStore;
formatsStore;
filesSettingsStore;
isLoaded = false;
isLoading = false;
@ -51,7 +52,8 @@ class FilesStore {
fileActionStore,
selectedFolderStore,
treeFoldersStore,
formatsStore
formatsStore,
filesSettingsStore
) {
const pathname = window.location.pathname.toLowerCase();
this.isEditor = pathname.indexOf("doceditor") !== -1;
@ -64,6 +66,7 @@ class FilesStore {
this.selectedFolderStore = selectedFolderStore;
this.treeFoldersStore = treeFoldersStore;
this.formatsStore = formatsStore;
this.filesSettingsStore = filesSettingsStore;
}
setIsLoaded = (isLoaded) => {
@ -120,6 +123,7 @@ class FilesStore {
if (this.isInit) return;
const { isAuthenticated } = this.authStore;
const { getFilesSettings } = this.filesSettingsStore;
const {
getPortalCultures,
@ -150,6 +154,7 @@ class FilesStore {
requests.push(getIsEncryptionSupport(), getEncryptionKeys());
}
}
requests.push(getFilesSettings());
return Promise.all(requests).then(() => (this.isInit = true));
};

View File

@ -25,6 +25,9 @@ const formatsStore = new FormatsStore(
docserviceStore
);
const treeFoldersStore = new TreeFoldersStore(selectedFolderStore);
const settingsStore = new SettingsStore(thirdPartyStore, treeFoldersStore);
const filesStore = new FilesStore(
store.auth,
store.auth.settingsStore,
@ -32,10 +35,11 @@ const filesStore = new FilesStore(
fileActionStore,
selectedFolderStore,
treeFoldersStore,
formatsStore
formatsStore,
settingsStore
);
const mediaViewerDataStore = new MediaViewerDataStore(filesStore);
const settingsStore = new SettingsStore(thirdPartyStore, treeFoldersStore);
const secondaryProgressDataStore = new SecondaryProgressDataStore();
const primaryProgressDataStore = new PrimaryProgressDataStore();
const uploadDataStore = new UploadDataStore(