Merge pull request #7542 from aignatov-bio/ai-sci-10685-change-global-search-columns-order

Change global results order [SCI-10685]

app/javascript/vue/global_search/groups/assets.vue

@@ -15,10 +15,13 @@
           <LinkTemplate :url="row.attributes.parent.url" :icon="row.attributes.icon" :value="row.attributes.file_name"/>
           <CellTemplate :label="i18n.t('search.index.created_at')" :value="row.attributes.created_at"/>
           <CellTemplate :label=" i18n.t('search.index.updated_at')" :value="row.attributes.updated_at"/>
-          <CellTemplate :label="i18n.t('search.index.team')" :url="row.attributes.team.url" :value="row.attributes.team.name"/>
           <CellTemplate :label="i18n.t(`search.index.${row.attributes.parent.type}`)" :url="row.attributes.parent.url" :value="labelName(row.attributes.parent)"/>
-          <CellTemplate :label="i18n.t('search.index.experiment')" :visible="!!row.attributes.experiment.name"
+          <CellTemplate v-if="row.attributes.repository.name" :label="i18n.t(`search.index.repository`)"
+                        :url="row.attributes.repository.url" :value="labelName(row.attributes.repository)"/>
+          <CellTemplate v-else-if="row.attributes.experiment.name" :label="i18n.t(`search.index.experiment`)"
                         :url="row.attributes.experiment.url" :value="labelName(row.attributes.experiment)"/>
+          <div v-else></div>
+          <CellTemplate :label="i18n.t('search.index.team')" :url="row.attributes.team.url" :value="row.attributes.team.name"/>
         </div>
       </div>
       <div v-if="viewAll">

app/javascript/vue/global_search/groups/experiments.vue

@@ -15,8 +15,8 @@
           <LinkTemplate :url="row.attributes.url" :value="labelName({ name: row.attributes.name, archived: row.attributes.archived})"/>
           <CellTemplate :label="i18n.t('search.index.id')" :value="row.attributes.code"/>
           <CellTemplate :label="i18n.t('search.index.created_at')" :value="row.attributes.created_at"/>
-          <CellTemplate :label="i18n.t('search.index.team')" :url="row.attributes.team.url" :value="row.attributes.team.name"/>
           <CellTemplate :label="i18n.t('search.index.project')" :url="row.attributes.project.url" :value="labelName(row.attributes.project)"/>
+          <CellTemplate :label="i18n.t('search.index.team')" :url="row.attributes.team.url" :value="row.attributes.team.name"/>
         </div>
       </div>
       <div v-if="viewAll">

app/javascript/vue/global_search/groups/folders.vue

@@ -14,9 +14,9 @@
           <hr class="col-span-4 w-full m-0" v-if="index > 0">
           <LinkTemplate :url="row.attributes.url"  :value="labelName({ name: row.attributes.name, archived: row.attributes.archived})"/>
           <CellTemplate :label="i18n.t('search.index.created_at')" :value="row.attributes.created_at"/>
-          <CellTemplate :label="i18n.t('search.index.team')" :url="row.attributes.team.url" :value="row.attributes.team.name"/>
           <CellTemplate :label="i18n.t('search.index.folder')" :visible="row.attributes.parent_folder"
                         :url="row.attributes.parent_folder?.url" :value="labelName(row.attributes.parent_folder)"/>
+          <CellTemplate :label="i18n.t('search.index.team')" :url="row.attributes.team.url" :value="row.attributes.team.name"/>
         </div>
       </div>
       <div v-if="viewAll">

app/javascript/vue/global_search/groups/my_module_protocols.vue

@@ -16,9 +16,9 @@
           <CellTemplate :label="i18n.t('search.index.id')" :value="row.attributes.code"/>
           <CellTemplate :label="i18n.t('search.index.created_at')" :value="row.attributes.created_at"/>
           <CellTemplate :label="i18n.t('search.index.updated_at')" :value="row.attributes.updated_at"/>
-          <CellTemplate :label="i18n.t('search.index.team')" :url="row.attributes.team.url" :value="row.attributes.team.name"/>
           <CellTemplate :label="i18n.t('search.index.task')" :url="row.attributes.my_module.url" :value="labelName(row.attributes.my_module)"/>
           <CellTemplate :label="i18n.t('search.index.experiment')" :url="row.attributes.experiment.url" :value="labelName(row.attributes.experiment)"/>
+          <CellTemplate :label="i18n.t('search.index.team')" :url="row.attributes.team.url" :value="row.attributes.team.name"/>
         </div>
       </div>
       <div v-if="viewAll">

app/javascript/vue/global_search/groups/my_modules.vue

@@ -16,8 +16,8 @@
           <CellTemplate :label="i18n.t('search.index.id')" :value="row.attributes.code"/>
           <CellTemplate :label="i18n.t('search.index.created_at')" :value="row.attributes.created_at"/>
           <CellTemplate :label="i18n.t('search.index.updated_at')" :value="row.attributes.updated_at"/>
-          <CellTemplate :label="i18n.t('search.index.team')" :url="row.attributes.team.url" :value="row.attributes.team.name"/>
           <CellTemplate :label="i18n.t('search.index.experiment')" :url="row.attributes.experiment.url" :value="labelName(row.attributes.experiment)"/>
+          <CellTemplate :label="i18n.t('search.index.team')" :url="row.attributes.team.url" :value="row.attributes.team.name"/>
         </div>
       </div>
       <div v-if="viewAll">

app/javascript/vue/global_search/groups/projects.vue

@@ -15,9 +15,9 @@
           <LinkTemplate :url="row.attributes.url" :value="labelName({ name: row.attributes.name, archived: row.attributes.archived})"/>
           <CellTemplate :label="i18n.t('search.index.id')" :value="row.attributes.code"/>
           <CellTemplate :label="i18n.t('search.index.created_at')" :value="row.attributes.created_at"/>
-          <CellTemplate :label="i18n.t('search.index.team')" :url="row.attributes.team.url" :value="row.attributes.team.name"/>
           <CellTemplate :label="i18n.t('search.index.folder')" :visible="row.attributes.folder"
                         :url="row.attributes.folder?.url" :value="labelName(row.attributes.folder)"/>
+          <CellTemplate :label="i18n.t('search.index.team')" :url="row.attributes.team.url" :value="row.attributes.team.name"/>
         </div>
       </div>
       <div v-if="viewAll">

app/javascript/vue/global_search/groups/reports.vue

@@ -17,8 +17,8 @@
           <CellTemplate :label="i18n.t('search.index.created_at')" :value="row.attributes.created_at"/>
           <CellTemplate :label="i18n.t('search.index.updated_at')" :value="row.attributes.updated_at"/>
           <CellTemplate :label="i18n.t('search.index.created_by')" :avatar="row.attributes.created_by.avatar_url" :value="row.attributes.created_by.name"/>
-          <CellTemplate :label="i18n.t('search.index.team')" :url="row.attributes.team.url" :value="row.attributes.team.name"/>
           <CellTemplate :label="i18n.t('search.index.project')" :url="row.attributes.project.url" :value="labelName(row.attributes.project)"/>
+          <CellTemplate :label="i18n.t('search.index.team')" :url="row.attributes.team.url" :value="row.attributes.team.name"/>
         </div>
       </div>
       <div v-if="viewAll">

app/javascript/vue/global_search/groups/repository_rows.vue

@@ -16,8 +16,8 @@
           <CellTemplate :label="i18n.t('search.index.id')" :value="row.attributes.code"/>
           <CellTemplate :label="i18n.t('search.index.created_at')" :value="row.attributes.created_at"/>
           <CellTemplate :label="i18n.t('search.index.created_by')" :avatar="row.attributes.created_by.avatar_url" :value="row.attributes.created_by.name"/>
-          <CellTemplate :label="i18n.t('search.index.team')" :url="row.attributes.team.url" :value="row.attributes.team.name"/>
           <CellTemplate :label="i18n.t('search.index.repository')" :url="row.attributes.repository.url" :value="labelName(row.attributes.repository)"/>
+          <CellTemplate :label="i18n.t('search.index.team')" :url="row.attributes.team.url" :value="row.attributes.team.name"/>
         </div>
       </div>
       <div v-if="viewAll">

app/javascript/vue/global_search/groups/results.vue

@@ -15,9 +15,9 @@
           <LinkTemplate :url="row.attributes.url" :value="labelName({ name: row.attributes.name, archived: row.attributes.archived})"/>
           <CellTemplate :label="i18n.t('search.index.created_at')" :value="row.attributes.created_at"/>
           <CellTemplate :label="i18n.t('search.index.updated_at')" :value="row.attributes.updated_at"/>
-          <CellTemplate :label="i18n.t('search.index.team')" :url="row.attributes.team.url" :value="row.attributes.team.name"/>
           <CellTemplate :label="i18n.t('search.index.task')" :url="row.attributes.my_module.url" :value="labelName(row.attributes.my_module)"/>
           <CellTemplate :label="i18n.t('search.index.experiment')" :url="row.attributes.experiment.url" :value="labelName(row.attributes.experiment)"/>
+          <CellTemplate :label="i18n.t('search.index.team')" :url="row.attributes.team.url" :value="row.attributes.team.name"/>
         </div>
       </div>
       <div v-if="viewAll">

app/serializers/global_search/asset_serializer.rb

@@ -4,7 +4,7 @@ module GlobalSearch
   class AssetSerializer < ActiveModel::Serializer
     include Rails.application.routes.url_helpers
     include FileIconsHelper
-    attributes :id, :file_name, :icon, :created_at, :updated_at, :team, :parent, :experiment
+    attributes :id, :file_name, :icon, :created_at, :updated_at, :team, :parent, :experiment, :repository
 
     def file_name
       object.render_file_name
@@ -40,6 +40,20 @@ module GlobalSearch
       }
     end
 
+    def repository
+      parent = object.parent
+
+      return { name: '' } unless parent.is_a?(RepositoryCell)
+
+      archived = parent.repository_row.archived?
+
+      {
+        name: parent.repository_row.repository.name,
+        url: repository_path(id: parent.repository_row.repository_id, archived: archived),
+        archived: archived
+      }
+    end
+
     def parent
       parent = object.parent
       if parent.is_a?(Result) && object.my_module