From ab35c4e49760f9f32e383a136fff06a3cdfa7cb0 Mon Sep 17 00:00:00 2001 From: Ilya Oleshko Date: Tue, 27 Jun 2023 12:42:16 +0300 Subject: [PATCH] Web: Client: FilesStore: Added getRooms by filter action. Added getRooms method to SDK --- packages/client/src/pages/Home/index.js | 16 ++++++++++++++-- packages/client/src/store/FilesStore.js | 11 +++++++++-- public/scripts/api.js | 4 ++++ 3 files changed, 27 insertions(+), 4 deletions(-) diff --git a/packages/client/src/pages/Home/index.js b/packages/client/src/pages/Home/index.js index ef950c3eaf..9d70432267 100644 --- a/packages/client/src/pages/Home/index.js +++ b/packages/client/src/pages/Home/index.js @@ -413,6 +413,7 @@ class PureHome extends React.Component { removeTagsFromRoom, loadCurrentUser, updateProfileCulture, + getRooms, } = this.props; const eventData = typeof e.data === "string" ? JSON.parse(e.data) : e.data; @@ -451,6 +452,11 @@ class PureHome extends React.Component { case "getUserInfo": res = await loadCurrentUser(); break; + case "getRooms": + { + res = await getRooms(data); + } + break; case "openModal": { const { type, options } = data; @@ -713,6 +719,7 @@ export default inject( setIsPreview, addTagsToRoom, removeTagsFromRoom, + getRooms, } = filesStore; const { updateProfileCulture } = peopleStore.targetUserStore; @@ -750,8 +757,12 @@ export default inject( setItemsSelectionTitle, } = secondaryProgressDataStore; - const { setUploadPanelVisible, startUpload, uploaded, converted } = - uploadDataStore; + const { + setUploadPanelVisible, + startUpload, + uploaded, + converted, + } = uploadDataStore; const { uploadEmptyFolders } = filesActionsStore; @@ -871,6 +882,7 @@ export default inject( loadCurrentUser, user, updateProfileCulture, + getRooms, }; } )(withRouter(observer(Home))); diff --git a/packages/client/src/store/FilesStore.js b/packages/client/src/store/FilesStore.js index 3a4bbd8f7f..7d73b69218 100644 --- a/packages/client/src/store/FilesStore.js +++ b/packages/client/src/store/FilesStore.js @@ -555,8 +555,8 @@ class FilesStore { this.isPreview = predicate; }; - setTempFilter = (filser) => { - this.tempFilter = filser; + setTempFilter = (filter) => { + this.tempFilter = filter; }; setHighlightFile = (highlightFile) => { @@ -3482,6 +3482,13 @@ class FilesStore { get roomsForDelete() { return this.folders.filter((f) => f.security.Delete); } + + getRooms = async (filter) => { + let newFilter = RoomsFilter.getDefault(); + Object.assign(newFilter, filter); + + return await api.rooms.getRooms(newFilter); + }; } export default FilesStore; diff --git a/public/scripts/api.js b/public/scripts/api.js index 29e36b1689..9ca06eb2b0 100644 --- a/public/scripts/api.js +++ b/public/scripts/api.js @@ -345,6 +345,10 @@ return this.#getMethodPromise("getList"); } + getRooms(filter) { + return this.#getMethodPromise("getRooms", filter); + } + getUserInfo() { return this.#getMethodPromise("getUserInfo"); }