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

Client:Sort:Added sorting saving when opening rooms and folders.

Browse Source
This commit is contained in:
Vlada Gazizova 2024-07-30 11:17:32 +03:00
parent 4f12114124
commit cd72e9d699
1 changed files with 48 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
packages/client/src/store/FilesActionsStore.js
View File

@ -1459,6 +1459,23 @@ class FilesActionStore {
filter.folder = id;
if (isRoom) {
const key =
categoryType === CategoryType.Archive
? `UserFilterArchiveRoom=${this.userStore.user?.id}`
: `UserFilterSharedRoom=${this.userStore.user?.id}`;
const filterStorageSharedRoom =
this.userStore.user?.id && localStorage.getItem(key);
if (filterStorageSharedRoom) {
const splitFilter = filterStorageSharedRoom.split(",");
filter.sortBy = splitFilter[0];
filter.sortOrder = splitFilter[1];
}
}
const url = getCategoryUrl(categoryType, id);
window.DocSpace.navigate(`${url}?${filter.toUrlParams()}`, { state });
@ -2334,7 +2351,8 @@ class FilesActionStore {
onMarkAsRead = (item) => this.markAsRead([], [`${item.id}`], item);
openFileAction = (item, t, e) => {
const { openDocEditor, isPrivacyFolder, setSelection } = this.filesStore;
const { openDocEditor, isPrivacyFolder, setSelection, categoryType } =
this.filesStore;
const { currentDeviceType } = this.settingsStore;
const { fileItemsList } = this.pluginStore;
const { enablePlugins } = this.settingsStore;
@ -2384,6 +2402,30 @@ class FilesActionStore {
);
const filter = FilesFilter.getDefault();
const filterObj = FilesFilter.getFilter(window.location);
if (isRoom) {
const key =
categoryType === CategoryType.Archive
? `UserFilterArchiveRoom=${this.userStore.user?.id}`
: `UserFilterSharedRoom=${this.userStore.user?.id}`;
const filterStorageSharedRoom =
this.userStore.user?.id && localStorage.getItem(key);
if (filterStorageSharedRoom) {
const splitFilter = filterStorageSharedRoom.split(",");
filter.sortBy = splitFilter[0];
filter.sortOrder = splitFilter[1];
}
} else {
// For the document section at all levels there is one sorting
filter.sortBy = filterObj.sortBy;
filter.sortOrder = filterObj.sortOrder;
}
filter.folder = id;
const url = `${path}?${filter.toUrlParams()}`;
@ -2605,6 +2647,11 @@ class FilesActionStore {
const filter = FilesFilter.getDefault();
const filterObj = FilesFilter.getFilter(window.location);
filter.sortBy = filterObj.sortBy;
filter.sortOrder = filterObj.sortOrder;
filter.folder = id;
const categoryType = getCategoryType(window.DocSpace.location);