Client: fix open documents from recent tab

This commit is contained in:
Viktor Fomin 2023-12-13 13:16:02 +03:00
parent b015415d31
commit a6920f3aa5
2 changed files with 20 additions and 13 deletions

View File

@ -2093,7 +2093,7 @@ class FilesActionStore {
const { enablePlugins } = this.authStore.settingsStore;
const { isLoading, setIsSectionFilterLoading } = this.clientLoadingStore;
const { isRecycleBinFolder } = this.treeFoldersStore;
const { isRecycleBinFolder, isRecentTab } = this.treeFoldersStore;
const { setMediaViewerData } = this.mediaViewerDataStore;
const { setConvertDialogVisible, setConvertItem } = this.dialogsStore;
@ -2113,7 +2113,15 @@ class FilesActionStore {
const canWebEdit = item.viewAccessibility?.WebEdit;
const canViewedDocs = item.viewAccessibility?.WebView;
const { id, viewUrl, providerKey, fileStatus, encrypted, isFolder } = item;
const {
id,
viewUrl,
providerKey,
fileStatus,
encrypted,
isFolder,
webUrl,
} = item;
if (encrypted && isPrivacyFolder) return checkProtocol(item.id, true);
if (isRecycleBinFolder || isLoading) return;
@ -2172,7 +2180,12 @@ class FilesActionStore {
? !item.security.FillForms
: !item.security.Edit;
return openDocEditor(id, providerKey, tab, null, isPreview);
const shareWebUrl = new URL(webUrl);
const shareKey = isRecentTab
? getObjectByLocation(shareWebUrl)?.share
: "";
return openDocEditor(id, providerKey, tab, null, isPreview, shareKey);
}
if (isMediaOrImage) {

View File

@ -3594,7 +3594,8 @@ class FilesStore {
providerKey = null,
tab = null,
url = null,
preview = false
preview = false,
shareKey = null
) => {
const foundIndex = this.files.findIndex((x) => x.id === id);
const file = foundIndex !== -1 ? this.files[foundIndex] : undefined;
@ -3611,16 +3612,9 @@ class FilesStore {
}
const isPrivacy = this.treeFoldersStore.isPrivacyFolder;
const share = shareKey ? shareKey : this.publicRoomStore.publicRoomKey;
return openEditor(
id,
providerKey,
tab,
url,
isPrivacy,
preview,
this.publicRoomStore.publicRoomKey
);
return openEditor(id, providerKey, tab, url, isPrivacy, preview, share);
};
createThumbnails = async (files = null) => {