scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2025-12-16 05:42:13 +08:00
Code Issues Projects Releases Packages Wiki Activity

Add archived tag to global search result object names [SCI-10585]

Browse source
This commit is contained in:
wandji20 2024-04-11 12:45:29 +01:00
parent d24f3b76a8
commit 83dbd89f04
21 changed files with 74 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/controllers/search_controller.rb
View file

@ -167,7 +167,7 @@ class SearchController < ApplicationController
}
return
when 'assets'
@asset_search_count = fetch_cached_count(Protocol)
@asset_search_count = fetch_cached_count(Asset)
search_assets
includes = [{ step: { protocol: { my_module: :experiment } } }, { result: { my_module: :experiment } }, :team]
results = if params[:preview] == 'true'

4
app/javascript/vue/global_search/groups/assets.vue
View file

@ -33,14 +33,14 @@
<div class="h-full py-2 px-4 grid grid-cols-[auto_1fr] items-center gap-1 text-xs border-0 border-b border-solid border-sn-light-grey">
<b class="shrink-0">{{ i18n.t(`search.index.${row.attributes.parent.type}`) }}:</b>
<a target="_blank" :href="row.attributes.parent.url" class="shrink-0 overflow-hidden">
<StringWithEllipsis class="w-full" :text="row.attributes.parent.name"></StringWithEllipsis>
<StringWithEllipsis class="w-full" :text="labelName(row.attributes.parent)"></StringWithEllipsis>
</a>
</div>
<div class="s h-full py-2 px-4 grid grid-cols-[auto_1fr] items-center gap-1 text-xs border-0 border-b border-solid border-sn-light-grey"
:class="{ 'invisible': !row.attributes.experiment.name }">
<b class="shrink-0">{{ i18n.t('search.index.experiment') }}:</b>
<a target="_blank" :href="row.attributes.experiment.url" class="shrink-0 overflow-hidden">
<StringWithEllipsis class="w-full" :text="row.attributes.experiment.name"></StringWithEllipsis>
<StringWithEllipsis class="w-full" :text="labelName(row.attributes.experiment)"></StringWithEllipsis>
</a>
</div>
</template>

6
app/javascript/vue/global_search/groups/experiments.vue
View file

@ -12,7 +12,9 @@
<div class="grid grid-cols-[auto_80px_auto_auto_auto] items-center">
<template v-for="row in preparedResults" :key="row.id">
<a :href="row.attributes.url" target="_blank" class="h-full py-2 px-4 overflow-hidden font-bold border-0 border-b border-solid border-sn-light-grey">
<StringWithEllipsis class="w-full" :text="row.attributes.name"></StringWithEllipsis>
<StringWithEllipsis class="w-full"
:text="labelName({ name: row.attributes.name, archived: row.attributes.archived})">
</StringWithEllipsis>
</a>
<div class="h-full py-2 px-4 flex items-center gap-1 text-xs border-0 border-b border-solid border-sn-light-grey">
<b class="shrink-0">{{ i18n.t('search.index.id') }}:</b>
@ -32,7 +34,7 @@
<div class="grid grid-cols-[auto_1fr] items-center gap-1 text-xs w-full">
<b class="shrink-0">{{ i18n.t('search.index.project') }}:</b>
<a :href="row.attributes.project.url" target="_blank" class="shrink-0 overflow-hidden">
<StringWithEllipsis class="w-full" :text="row.attributes.project.name"></StringWithEllipsis>
<StringWithEllipsis class="w-full" :text="labelName(row.attributes.project)"></StringWithEllipsis>
</a>
</div>
</div>

6
app/javascript/vue/global_search/groups/folders.vue
View file

@ -12,7 +12,9 @@
<div class="grid grid-cols-[auto_auto_auto_auto] items-center">
<template v-for="row in preparedResults" :key="row.id" class="hover:bg-sn-super-light-grey">
<a target="_blank" :href="row.attributes.url" class="h-full py-2 px-4 overflow-hidden font-bold border-0 border-b border-solid border-sn-light-grey">
<StringWithEllipsis class="w-full" :text="row.attributes.name"></StringWithEllipsis>
<StringWithEllipsis class="w-full"
:text="labelName({ name: row.attributes.name, archived: row.attributes.archived})">
</StringWithEllipsis>
</a>
<div class="h-full py-2 px-4 flex items-center gap-1 text-xs border-0 border-b border-solid border-sn-light-grey">
<b class="shrink-0">{{ i18n.t('search.index.created_at') }}:</b>
@ -29,7 +31,7 @@
<div class="grid grid-cols-[auto_1fr] items-center gap-1 text-xs w-full">
<b class="shrink-0">{{ i18n.t('search.index.folder') }}:</b>
<a :href="row.attributes.parent_folder.url" target="_blank" class="shrink-0 overflow-hidden">
<StringWithEllipsis class="w-full" :text="row.attributes.parent_folder.name"></StringWithEllipsis>
<StringWithEllipsis class="w-full" :text="labelName(row.attributes.parent_folder)"></StringWithEllipsis>
</a>
</div>
</template>

8
app/javascript/vue/global_search/groups/my_module_protocols.vue
View file

@ -12,7 +12,9 @@
<div class="grid grid-cols-[auto_80px_auto_auto_auto_auto_auto] items-center">
<template v-for="row in preparedResults" :key="row.id">
<a :href="row.attributes.url" target="_blank" class="h-full py-2 px-4 overflow-hidden font-bold border-0 border-b border-solid border-sn-light-grey">
<StringWithEllipsis class="w-full" :text="row.attributes.name"></StringWithEllipsis>
<StringWithEllipsis class="w-full"
:text="labelName({ name: row.attributes.name, archived: row.attributes.archived})">
</StringWithEllipsis>
</a>
<div class="h-full py-2 px-4 flex items-center gap-1 text-xs border-0 border-b border-solid border-sn-light-grey">
<b class="shrink-0">{{ i18n.t('search.index.id') }}:</b>
@ -35,14 +37,14 @@
<div class="h-full py-2 px-4 grid grid-cols-[auto_1fr] items-center gap-1 text-xs border-0 border-b border-solid border-sn-light-grey">
<b class="shrink-0">{{ i18n.t('search.index.task') }}:</b>
<a :href="row.attributes.my_module.url" class="shrink-0 overflow-hidden" target="_blank">
<StringWithEllipsis class="w-full" :text="row.attributes.my_module.name"></StringWithEllipsis>
<StringWithEllipsis class="w-full" :text="labelName(row.attributes.my_module)"></StringWithEllipsis>
</a>
</div>
<div class="h-full py-2 px-4 border-0 border-b border-solid border-sn-light-grey">
<div class="grid grid-cols-[auto_1fr] items-center gap-1 text-xs w-full">
<b class="shrink-0">{{ i18n.t('search.index.experiment') }}:</b>
<a :href="row.attributes.experiment.url" class="shrink-0 overflow-hidden" target="_blank">
<StringWithEllipsis class="w-full" :text="row.attributes.experiment.name"></StringWithEllipsis>
<StringWithEllipsis class="w-full" :text="labelName(row.attributes.experiment)"></StringWithEllipsis>
</a>
</div>
</div>

6
app/javascript/vue/global_search/groups/my_modules.vue
View file

@ -12,7 +12,9 @@
<div class="grid grid-cols-[auto_80px_auto_auto_auto_auto] items-center">
<template v-for="row in preparedResults" :key="row.id">
<a :href="row.attributes.url" target="_blank" class="h-full py-2 px-4 overflow-hidden font-bold border-0 border-b border-solid border-sn-light-grey">
<StringWithEllipsis class="w-full" :text="row.attributes.name"></StringWithEllipsis>
<StringWithEllipsis class="w-full"
:text="labelName({ name: row.attributes.name, archived: row.attributes.archived})">
</StringWithEllipsis>
</a>
<div class="h-full py-2 px-4 flex items-center gap-1 text-xs border-0 border-b border-solid border-sn-light-grey">
<b class="shrink-0">{{ i18n.t('search.index.id') }}:</b>
@ -36,7 +38,7 @@
<div class="grid grid-cols-[auto_1fr] items-center gap-1 text-xs w-full">
<b class="shrink-0">{{ i18n.t('search.index.experiment') }}:</b>
<a :href="row.attributes.experiment.url" class="shrink-0 overflow-hidden" target="_blank">
<StringWithEllipsis class="w-full" :text="row.attributes.experiment.name"></StringWithEllipsis>
<StringWithEllipsis class="w-full" :text="labelName(row.attributes.experiment)"></StringWithEllipsis>
</a>
</div>
</div>

6
app/javascript/vue/global_search/groups/projects.vue
View file

@ -12,7 +12,9 @@
<div class="grid grid-cols-[auto_80px_auto_auto_auto] items-center">
<template v-for="row in preparedResults" :key="row.id">
<a :href="row.attributes.url" class="h-full py-2 px-4 overflow-hidden font-bold border-0 border-b border-solid border-sn-light-grey">
<StringWithEllipsis class="w-full" :text="row.attributes.name"></StringWithEllipsis>
<StringWithEllipsis class="w-full"
:text="labelName({ name: row.attributes.name, archived: row.attributes.archived})">
</StringWithEllipsis>
</a>
<div class="h-full py-2 px-4 flex items-center gap-1 text-xs border-0 border-b border-solid border-sn-light-grey">
<b class="shrink-0">{{ i18n.t('search.index.id') }}:</b>
@ -33,7 +35,7 @@
<div class="grid grid-cols-[auto_1fr] items-center gap-1 text-xs w-full">
<b class="shrink-0">{{ i18n.t('search.index.folder') }}:</b>
<a :href="row.attributes.folder.url" class="shrink-0 overflow-hidden">
<StringWithEllipsis class="w-full" :text="row.attributes.folder.name"></StringWithEllipsis>
<StringWithEllipsis class="w-full" :text="labelName(row.attributes.folder)"></StringWithEllipsis>
</a>
</div>
</template>

4
app/javascript/vue/global_search/groups/protocols.vue
View file

@ -12,7 +12,9 @@
<div class="grid grid-cols-[auto_110px_auto_auto_auto_auto] items-center">
<template v-for="row in preparedResults" :key="row.id">
<a :href="row.attributes.url" class="h-full py-2 px-4 overflow-hidden font-bold border-0 border-b border-solid border-sn-light-grey">
<StringWithEllipsis class="w-full" :text="row.attributes.name"></StringWithEllipsis>
<StringWithEllipsis class="w-full"
:text="labelName({ name: row.attributes.name, archived: row.attributes.archived})">
</StringWithEllipsis>
</a>
<div class="h-full py-2 px-4 flex items-center gap-1 text-xs border-0 border-b border-solid border-sn-light-grey">
<b class="shrink-0">{{ i18n.t('search.index.id') }}:</b>

2
app/javascript/vue/global_search/groups/reports.vue
View file

@ -42,7 +42,7 @@
<div class="h-full py-2 px-4 grid grid-cols-[auto_1fr] items-center gap-1 text-xs border-0 border-b border-solid border-sn-light-grey">
<b class="shrink-0">{{ i18n.t('search.index.project') }}:</b>
<a target="_blank" :href="row.attributes.project.url" class="shrink-0 overflow-hidden">
<StringWithEllipsis class="w-full" :text="row.attributes.project.name"></StringWithEllipsis>
<StringWithEllipsis class="w-full" :text="labelName(row.attributes.project)"></StringWithEllipsis>
</a>
</div>
</template>

6
app/javascript/vue/global_search/groups/repository_rows.vue
View file

@ -12,7 +12,9 @@
<div class="grid grid-cols-[auto_110px_auto_auto_auto_auto] items-center">
<template v-for="row in preparedResults" :key="row.id">
<a :href="row.attributes.url" class="h-full py-2 px-4 overflow-hidden font-bold border-0 border-b border-solid border-sn-light-grey">
<StringWithEllipsis class="w-full" :text="row.attributes.name"></StringWithEllipsis>
<StringWithEllipsis class="w-full"
:text="labelName({ name: row.attributes.name, archived: row.attributes.archived})">
</StringWithEllipsis>
</a>
<div class="h-full py-2 px-4 flex items-center gap-1 text-xs border-0 border-b border-solid border-sn-light-grey">
<b class="shrink-0">{{ i18n.t('search.index.id') }}:</b>
@ -36,7 +38,7 @@
<div class="h-full py-2 px-4 grid grid-cols-[auto_1fr] items-center gap-1 text-xs border-0 border-b border-solid border-sn-light-grey">
<b class="shrink-0">{{ i18n.t('search.index.repository') }}:</b>
<a :href="row.attributes.repository.url" class="shrink-0 overflow-hidden">
<StringWithEllipsis class="w-full" :text="row.attributes.repository.name"></StringWithEllipsis>
<StringWithEllipsis class="w-full" :text="labelName(row.attributes.repository)"></StringWithEllipsis>
</a>
</div>
</template>

8
app/javascript/vue/global_search/groups/results.vue
View file

@ -12,7 +12,9 @@
<div class="grid grid-cols-[auto_auto_auto_auto_auto_auto] items-center">
<template v-for="row in preparedResults" :key="row.id">
<a :href="row.attributes.url" target="_blank" class="h-full py-2 px-4 overflow-hidden font-bold border-0 border-b border-solid border-sn-light-grey">
<StringWithEllipsis class="w-full" :text="row.attributes.name"></StringWithEllipsis>
<StringWithEllipsis class="w-full"
:text="labelName({ name: row.attributes.name, archived: row.attributes.archived})">
</StringWithEllipsis>
</a>
<div class="h-full py-2 px-4 flex items-center gap-1 text-xs border-0 border-b border-solid border-sn-light-grey max-w-[200px]">
<b class="shrink-0">{{ i18n.t('search.index.created_at') }}:</b>
@ -31,14 +33,14 @@
<div class="h-full py-2 px-4 grid grid-cols-[auto_1fr] items-center gap-1 text-xs border-0 border-b border-solid border-sn-light-grey">
<b class="shrink-0">{{ i18n.t('search.index.task') }}:</b>
<a :href="row.attributes.my_module.url" class="shrink-0 overflow-hidden" target="_blank">
<StringWithEllipsis class="w-full" :text="row.attributes.my_module.name"></StringWithEllipsis>
<StringWithEllipsis class="w-full" :text="labelName(row.attributes.my_module)"></StringWithEllipsis>
</a>
</div>
<div class="h-full py-2 px-4 border-0 border-b border-solid border-sn-light-grey">
<div class="grid grid-cols-[auto_1fr] items-center gap-1 text-xs w-full">
<b class="shrink-0">{{ i18n.t('search.index.experiment') }}:</b>
<a :href="row.attributes.experiment.url" class="shrink-0 overflow-hidden" target="_blank">
<StringWithEllipsis class="w-full" :text="row.attributes.experiment.name"></StringWithEllipsis>
<StringWithEllipsis class="w-full" :text="labelName(row.attributes.experiment)"></StringWithEllipsis>
</a>
</div>
</div>

7
app/javascript/vue/global_search/groups/search_mixin.js
View file

@ -3,7 +3,7 @@ import StringWithEllipsis from '../../shared/string_with_ellipsis.vue';
import SortFlyout from './sort_flyout.vue';
import Loader from '../loader.vue';
import NoSearchResult from '../no_search_result.vue';
/* global GLOBAL_CONSTANTS */
/* global GLOBAL_CONSTANTS I18n */
export default {
props: {
@ -89,6 +89,11 @@ export default {
}
},
methods: {
labelName(object) {
if (!object.archived) return object.name;
return `${I18n.t('labels.archived')} ${object.name}`;
},
handleScroll() {
if (this.loading || !this.selected) return;

15
app/serializers/global_search/asset_serializer.rb
View file

@ -31,7 +31,8 @@ module GlobalSearch
{
name: object.my_module.experiment.name,
url: my_modules_experiment_path(id: object.my_module.experiment.id, search: object.my_module.code)
url: my_modules_experiment_path(id: object.my_module.experiment.id, search: object.my_module.code),
archived: object.my_module.experiment.archived?
}
end
@ -40,22 +41,28 @@ module GlobalSearch
if parent.is_a?(Result) && object.my_module
parent_type = 'task'
parent_name = object.my_module.name
parent_url = my_module_results_path(my_module_id: object.my_module.id)
parent_archived = parent.archived?
view_mode = parent_archived ? 'archived' : 'active'
parent_url = my_module_results_path(my_module_id: object.my_module.id, view_mode: view_mode)
elsif parent.is_a?(Step) && object.my_module
parent_type = 'task'
parent_name = object.my_module.name
parent_archived = object.my_module.archived?
parent_url = protocols_my_module_path(object.my_module.id)
elsif parent.is_a?(Step)
parent_type = 'protocol_template'
parent_name = parent.protocol.name || I18n.t('search.index.untitled_protocol')
parent_url = protocol_path(parent.protocol_id)
parent_archived = parent.protocol.archived?
elsif parent.is_a?(RepositoryCell)
parent_type = 'inventory_item'
parent_name = parent.repository_row.name
parent_url = repository_repository_rows_path(repository_id: parent.repository_row.repository_id)
parent_archived = parent.repository_row.archived?
parent_url =
repository_path(id: parent.repository_row.repository_id, repository_row_id: parent.repository_row.id)
end
{ name: parent_name, url: parent_url, type: parent_type }
{ name: parent_name, url: parent_url, type: parent_type, archived: parent_archived }
end
end
end

3
app/serializers/global_search/experiment_serializer.rb
View file

@ -16,7 +16,8 @@ module GlobalSearch
def project
{
name: object.project.name,
url: project_experiments_path(project_id: object.project.id)
url: project_experiments_path(project_id: object.project.id),
archived: object.project.archived?
}
end

6
app/serializers/global_search/my_module_protocol_serializer.rb
View file

@ -20,14 +20,16 @@ module GlobalSearch
def experiment
{
name: object.my_module.experiment.name,
url: my_modules_experiment_path(object.my_module.experiment.id)
url: my_modules_experiment_path(object.my_module.experiment.id),
archived: object.my_module.experiment.archived?
}
end
def my_module
{
name: object.my_module.name,
url: protocols_my_module_path(object.my_module.id)
url: protocols_my_module_path(object.my_module.id),
archived: object.my_module.archived?
}
end

3
app/serializers/global_search/my_module_serializer.rb
View file

@ -16,7 +16,8 @@ module GlobalSearch
def experiment
{
name: object.experiment.name,
url: my_modules_experiment_path(object.experiment.id)
url: my_modules_experiment_path(object.experiment.id),
archived: object.experiment.archived?
}
end

3
app/serializers/global_search/project_folder_serializer.rb
View file

@ -25,7 +25,8 @@ module GlobalSearch
if object.parent_folder_id?
{
name: object.parent_folder.name,
url: project_folder_path(object.parent_folder.id)
url: project_folder_path(object.parent_folder.id),
archived: object.parent_folder.archived?
}
end
end

3
app/serializers/global_search/project_serializer.rb
View file

@ -24,7 +24,8 @@ class GlobalSearch::ProjectSerializer < ActiveModel::Serializer
if object.project_folder
{
name: object.project_folder.name,
url: project_folder_path(object.project_folder)
url: project_folder_path(object.project_folder),
archived: object.project_folder.archived?
}
end
end

3
app/serializers/global_search/report_serializer.rb
View file

@ -16,7 +16,8 @@ module GlobalSearch
def project
{
name: object.project.name,
url: project_experiments_path(project_id: object.project.id)
url: project_experiments_path(project_id: object.project.id),
archived: object.project.archived?
}
end

3
app/serializers/global_search/repository_row_serializer.rb
View file

@ -27,7 +27,8 @@ module GlobalSearch
def repository
{
name: object.repository.name,
url: repository_path(object.repository)
url: repository_path(object.repository),
archived: object.repository.archived
}
end

6
app/serializers/global_search/result_serializer.rb
View file

@ -16,14 +16,16 @@ module GlobalSearch
def experiment
{
name: object.my_module.experiment.name,
url: my_modules_experiment_path(object.my_module.experiment.id)
url: my_modules_experiment_path(object.my_module.experiment.id),
archived: object.my_module.experiment.archived?
}
end
def my_module
{
name: object.my_module.name,
url: protocols_my_module_path(object.my_module.id)
url: protocols_my_module_path(object.my_module.id),
archived: object.my_module.archived?
}
end