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

Web: Files: removed useless api requests

Browse Source
This commit is contained in:
Nikita Gopienko 2021-01-18 18:52:08 +03:00
parent f025c06299
commit 4d54aa766e
2 changed files with 20 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
products/ASC.Files/Client/src/App.js
View File

@ -5,11 +5,7 @@ import Home from "./components/pages/Home";
import DocEditor from "./components/pages/DocEditor";
import Settings from "./components/pages/Settings";
import VersionHistory from "./components/pages/VersionHistory";
import {
fetchTreeFolders,
fetchThirdPartyCapabilities,
fetchThirdPartyProviders,
} from "./store/files/actions";
import { fetchTreeFolders } from "./store/files/actions";
import config from "../package.json";
import {
@ -66,8 +62,6 @@ class App extends React.Component {
getModules,
getPortalCultures,
fetchTreeFolders,
fetchThirdPartyCapabilities,
fetchThirdPartyProviders,
setIsLoaded,
getIsEncryptionSupport,
getEncryptionKeys,
@ -96,9 +90,7 @@ class App extends React.Component {
getPortalSettings(),
getModules(),
getPortalCultures(),
fetchTreeFolders(),
fetchThirdPartyCapabilities(),
fetchThirdPartyProviders()
fetchTreeFolders()
);
if (isDesktop) {
requests.push(getIsEncryptionSupport(), getEncryptionKeys());
@ -231,8 +223,6 @@ const mapDispatchToProps = (dispatch) => {
getModules: () => getModules(dispatch),
getPortalCultures: () => getPortalCultures(dispatch),
fetchTreeFolders: () => dispatch(fetchTreeFolders()),
fetchThirdPartyCapabilities: () => fetchThirdPartyCapabilities(dispatch),
fetchThirdPartyProviders: () => dispatch(fetchThirdPartyProviders()),
setIsLoaded: () => dispatch(setIsLoaded(true)),
getIsEncryptionSupport: () => getIsEncryptionSupport(dispatch),
getEncryptionKeys: () => getEncryptionKeys(dispatch),

29
products/ASC.Files/Client/src/store/files/actions.js
View File

@ -779,7 +779,24 @@ export function getFilesSettings() {
if (Object.keys(settingsTree).length === 0) {
return api.files
.getSettingsFiles()
.then((settings) => dispatch(setFilesSettings(settings)))
.then((settings) => {
dispatch(setFilesSettings(settings));
if (settings.enableThirdParty) {
return axios
.all([
api.files.getThirdPartyCapabilities(),
api.files.getThirdPartyList(),
])
.then(([capabilities, providers]) => {
for (let item of capabilities) {
item.splice(1, 1);
}
dispatch(setThirdPartyCapabilities(capabilities));
dispatch(setThirdPartyProviders(providers));
});
}
})
.catch(() => setIsErrorSettings(true));
} else {
return Promise.resolve(settingsTree);
@ -1688,16 +1705,6 @@ export function itemOperationToFolder(
};
}
export function fetchThirdPartyCapabilities(dispatch) {
return files.getThirdPartyCapabilities().then((data) => {
for (let item of data) {
item.splice(1, 1);
}
dispatch(setThirdPartyCapabilities(data));
});
}
export function fetchThirdPartyProviders() {
return (dispatch) => {
files.getThirdPartyList().then((data) => {