Client:Sort:Added sorting saving when opening rooms and folders.
This commit is contained in:
parent
4f12114124
commit
cd72e9d699
@ -1459,6 +1459,23 @@ class FilesActionStore {
|
|||||||
|
|
||||||
filter.folder = id;
|
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);
|
const url = getCategoryUrl(categoryType, id);
|
||||||
|
|
||||||
window.DocSpace.navigate(`${url}?${filter.toUrlParams()}`, { state });
|
window.DocSpace.navigate(`${url}?${filter.toUrlParams()}`, { state });
|
||||||
@ -2334,7 +2351,8 @@ class FilesActionStore {
|
|||||||
onMarkAsRead = (item) => this.markAsRead([], [`${item.id}`], item);
|
onMarkAsRead = (item) => this.markAsRead([], [`${item.id}`], item);
|
||||||
|
|
||||||
openFileAction = (item, t, e) => {
|
openFileAction = (item, t, e) => {
|
||||||
const { openDocEditor, isPrivacyFolder, setSelection } = this.filesStore;
|
const { openDocEditor, isPrivacyFolder, setSelection, categoryType } =
|
||||||
|
this.filesStore;
|
||||||
const { currentDeviceType } = this.settingsStore;
|
const { currentDeviceType } = this.settingsStore;
|
||||||
const { fileItemsList } = this.pluginStore;
|
const { fileItemsList } = this.pluginStore;
|
||||||
const { enablePlugins } = this.settingsStore;
|
const { enablePlugins } = this.settingsStore;
|
||||||
@ -2384,6 +2402,30 @@ class FilesActionStore {
|
|||||||
);
|
);
|
||||||
|
|
||||||
const filter = FilesFilter.getDefault();
|
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;
|
filter.folder = id;
|
||||||
|
|
||||||
const url = `${path}?${filter.toUrlParams()}`;
|
const url = `${path}?${filter.toUrlParams()}`;
|
||||||
@ -2605,6 +2647,11 @@ class FilesActionStore {
|
|||||||
|
|
||||||
const filter = FilesFilter.getDefault();
|
const filter = FilesFilter.getDefault();
|
||||||
|
|
||||||
|
const filterObj = FilesFilter.getFilter(window.location);
|
||||||
|
|
||||||
|
filter.sortBy = filterObj.sortBy;
|
||||||
|
filter.sortOrder = filterObj.sortOrder;
|
||||||
|
|
||||||
filter.folder = id;
|
filter.folder = id;
|
||||||
|
|
||||||
const categoryType = getCategoryType(window.DocSpace.location);
|
const categoryType = getCategoryType(window.DocSpace.location);
|
||||||
|
Loading…
Reference in New Issue
Block a user