opensource/galaxy
3
0
Fork 0
mirror of https://github.com/galaxyproject/galaxy.git synced 2026-10-25 10:24:38 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #12087 from OlegZharkov/fix_filter_on_search

Browse Source 
[21.05] fix library search filter
This commit is contained in:
Marius van den Beek
2021-06-02 18:49:29 +02:00
committed by GitHub
parent 99048b6768 3ba6230c3a
commit 65254bcc89
2 changed files with 16 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
client/src/components/Libraries/LibraryFolder/TopToolbar/FolderTopBar.vue
+5 -1
View File
@@ -271,7 +271,11 @@ export default {
async getSelected() {
if (this.isAllSelectedMode) {
this.$emit("setBusy", true);
const selected = await this.services.getFilteredFolderContents(this.folder_id, this.unselected);
const selected = await this.services.getFilteredFolderContents(
this.folder_id,
this.unselected,
this.$parent.search_text
);
this.$emit("setBusy", false);
return selected;
} else {
client/src/components/Libraries/LibraryFolder/services.js
+11 -4
View File
@@ -8,8 +8,11 @@ export class Services {
}
async getFolderContents(id, include_deleted, limit, offset, search_text = false) {
search_text = search_text ? `&search_text=${encodeURI(search_text.trim())}` : "";
const url = `${this.root}api/folders/${id}/contents?include_deleted=${include_deleted}&limit=${limit}&offset=${offset}${search_text}`;
const url = `${
this.root
}api/folders/${id}/contents?include_deleted=${include_deleted}&limit=${limit}&offset=${offset}${this.getSearchQuery(
search_text
)}`;
try {
const response = await axios.get(url);
return response.data;
@@ -18,13 +21,17 @@ export class Services {
}
}
async getFilteredFolderContents(id, excluded) {
const contents = await axios.get(`${this.root}api/folders/${id}/contents`);
async getFilteredFolderContents(id, excluded, search_text) {
const contents = await axios.get(`${this.root}api/folders/${id}/contents?${this.getSearchQuery(search_text)}`);
return contents.data.folder_contents.filter((item) => {
return !excluded.some((exc) => exc.id === item.id);
});
}
getSearchQuery(search_text) {
return search_text ? `&search_text=${encodeURI(search_text.trim())}` : "";
}
updateFolder(item, onSucess, onError) {
const url = `${this.root}api/folders/${item.id}`;
try {