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

Web: Files: Store: Fixed displaying move context option

Browse Source
This commit is contained in:
Ilya Oleshko 2021-05-05 17:20:24 +03:00
parent 3365d1a1dc
commit f96369f293
2 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
products/ASC.Files/Client/src/pages/Home/Section/Header/index.js
View File

@ -402,7 +402,6 @@ class SectionHeaderContent extends React.Component {
disabled:
isFavoritesFolder ||
isRecentFolder ||
isShareFolder ||
!isAccessedSelected ||
!selectionCount ||
isThirdPartySelection,
@ -597,7 +596,7 @@ export default inject(
isPrivacyFolder,
isFavoritesFolder,
isRecentFolder,
shareFolder: isShareFolder,
isShareFolder,
} = treeFoldersStore;
const { setAction } = fileActionStore;
const {

25
products/ASC.Files/Client/src/store/FilesStore.js
View File

@ -374,7 +374,7 @@ class FilesStore {
const isFavorite = item.fileStatus === 32 || item.fileStatus === 34;
const isFullAccess = item.access < 2;
const withoutShare = false; //TODO: need this prop
const isThirdPartyItem = item.providerKey;
const isThirdPartyItem = !!item.providerKey;
const hasNew = item.new > 0;
const canConvert = false; //TODO: fix of added convert check;
const isEncrypted = item.encrypted;
@ -388,12 +388,14 @@ class FilesStore {
isCommon,
isShare,
isFavoritesFolder,
isThirdPartyFolder,
isMyFolder,
} = this.treeFoldersStore;
const isShareFolder = isCommon(item.rootFolderType);
const isCommonFolder = isShare(item.rootFolderType);
const { isRootFolder } = this.selectedFolderStore;
const isThirdPartyFolder = item.providerKey && isRootFolder;
const isShareFolder = isShare(item.rootFolderType);
const isCommonFolder = isCommon(item.rootFolderType);
const { isDesktopClient } = this.settingsStore;
@ -698,6 +700,14 @@ class FilesStore {
folderOptions = this.removeOptions(folderOptions, ["unsubscribe"]);
}
if (isThirdPartyFolder) {
folderOptions = this.removeOptions(folderOptions, ["move-to"]);
} else {
folderOptions = this.removeOptions(folderOptions, [
"change-thirdparty-info",
]);
}
if (isThirdPartyItem) {
folderOptions = this.removeOptions(folderOptions, ["owner-change"]);
@ -712,10 +722,7 @@ class FilesStore {
]);
}
folderOptions = this.removeOptions(folderOptions, [
"remove",
"move-to",
]);
folderOptions = this.removeOptions(folderOptions, ["remove"]);
if (!item) {
//For damaged items