scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2025-11-09 16:01:30 +08:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #7554 from aignatov-bio/ai-sci-10702-fixes-for-global-search

Browse source 
Small fixes for global search [SCI-10702][SCI-10701][SCI-10703]
This commit is contained in:
aignatov-bio 2024-05-15 12:21:43 +02:00 • committed by GitHub
commit 0dbf6ce4b1
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/javascript/vue/navigation/quick_search.vue
View file

@ -305,7 +305,7 @@ export default {
});
},
searchValue() {
window.open(`${this.searchUrl}?q=${this.searchQuery}&teams[]=${this.currentTeam}`, '_self');
window.open(`${this.searchUrl}?q=${this.searchQuery}&teams[]=${this.currentTeam}&include_archived=true`, '_self');
},
focusHistoryItem(event) {
if (this.focusedHistoryItem === null && (event.key === 'ArrowDown' || event.key === 'ArrowUp')) {

3
app/javascript/vue/navigation/top_menu.vue
View file

@ -9,6 +9,7 @@
</div>
<QuickSearch
v-if="user"
:key="globalSearchKey"
:class="{'hidden': hideSearch}"
:quickSearchUrl="quickSearchUrl"
:searchUrl="searchUrl"
@ -109,6 +110,7 @@ export default {
userMenu: null,
unseenNotificationsCount: 0,
hideSearch: false,
globalSearchKey: 0
};
},
created() {
@ -120,6 +122,7 @@ export default {
this.checkUnseenNotifications();
this.refreshCurrentTeam();
this.hideSearch = !!document.getElementById('GlobalSearch');
this.globalSearchKey += 1;
});
// Track name update in user profile settings

5
app/serializers/concerns/breadcrumbs_helper.rb
View file

@ -26,7 +26,8 @@ module BreadcrumbsHelper
end
when Result
parent = subject.my_module
url = my_module_results_path(subject.my_module)
view_mode = subject.archived? ? 'archived' : 'active'
url = my_module_results_path(subject.my_module, view_mode:)
when ProjectFolder
parent = subject.team
url = project_folder_path(subject)
@ -56,7 +57,7 @@ module BreadcrumbsHelper
url = projects_path(team: subject.id)
end
breadcrumbs << { name: subject.name, url: url } if subject.name.present?
breadcrumbs << { name: subject.name, url: } if subject.name.present?
if parent
generate_breadcrumbs(parent, breadcrumbs)