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

Merge branch 'hotfix/campaigns-banner' of github.com:ONLYOFFICE/AppServer into hotfix/campaigns-banner

Browse Source
This commit is contained in:
Dmitry Sychugov 2022-02-08 14:57:55 +05:00
commit 455f4c0aec
2 changed files with 22 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -281,6 +281,7 @@ class FilesStore {
setFiles = (files) => {
const { socketHelper } = this.settingsStore;
if (files.length === 0 && this.files.length === 0) return;
if (this.files?.length > 0) {
socketHelper.emit({
@ -300,6 +301,7 @@ class FilesStore {
};
setFolders = (folders) => {
if (folders.length === 0 && this.folders.length === 0) return;
this.folders = folders;
};
@ -892,7 +894,7 @@ class FilesStore {
!(
isRecentFolder ||
isFavoritesFolder ||
(isMyFolder && (this.filter.filterType || this.filter.search))
(isMyFolder && (this.filterType || this.filterSearch))
)
) {
fileOptions = this.removeOptions(fileOptions, ["open-location"]);
@ -1104,10 +1106,6 @@ class FilesStore {
]);
}
if (!(isMyFolder && (this.filter.filterType || this.filter.search))) {
folderOptions = this.removeOptions(folderOptions, ["open-location"]);
}
return folderOptions;
}
};
@ -1184,13 +1182,8 @@ class FilesStore {
canShareOwnerChange = (item) => {
const userId = this.userStore.user && this.userStore.user.id;
const isCommonFolder =
this.treeFoldersStore.commonFolder &&
this.selectedFolderStore.pathParts &&
this.treeFoldersStore.commonFolder.id ===
this.selectedFolderStore.pathParts[0];
if (item.providerKey || !isCommonFolder) {
if (item.providerKey || !this.hasCommonFolder) {
return false;
} else if (this.authStore.isAdmin) {
return true;
@ -1267,6 +1260,15 @@ class FilesStore {
return this.isHeaderVisible && this.selection.length === items.length;
}
get hasCommonFolder() {
return (
this.treeFoldersStore.commonFolder &&
this.selectedFolderStore.pathParts &&
this.treeFoldersStore.commonFolder.id ===
this.selectedFolderStore.pathParts[0]
);
}
setFirsElemChecked = (checked) => {
this.firstElemChecked = checked;
};
@ -1313,6 +1315,14 @@ class FilesStore {
});
};
get filterType() {
return this.filter.filterType;
}
get filterSearch() {
return this.filter.search;
}
get filesList() {
const { mediaViewersFormatsStore, iconFormatsStore } = this.formatsStore;
const { getIcon } = iconFormatsStore;

2
products/ASC.Files/Server/DocStore

@ -1 +1 @@
Subproject commit 2bb4d878b42e8c648dd44fed7d445163772551fa
Subproject commit b9a3b81a255ccaa6f174e7ad2dd3bf4d4911aa8f