scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2025-10-07 20:40:26 +08:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #5661 from okriuchykhin/ok_SCI_8710

Browse source 
Fix breadcrumbs for archived view mode [SCI-8710]
This commit is contained in:
artoscinote 2023-06-23 09:50:03 +02:00 • committed by GitHub
commit f1876b4f59
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
9 changed files with 40 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
app/controllers/concerns/breadcrumbs.rb
View file

@ -12,17 +12,23 @@ module Breadcrumbs
@breadcrumbs_items = []
folders = helpers.tree_ordered_parent_folders(current_folder)
archived_branch = project&.archived? ||
current_folder&.archived? ||
(!project && params[:view_mode] == 'archived')
@breadcrumbs_items.push({
label: t('projects.index.breadcrumbs_root'),
url: projects_path(view_mode: project&.archived? ? :archived : :active),
archived: project&.archived? || (!project && params[:view_mode] == 'archived')
url: projects_path(view_mode: archived_branch ? :archived : :active),
archived: archived_branch
})
folders&.each do |project_folder|
archived_branch = project_folder.archived_branch?
@breadcrumbs_items.push({
label: project_folder.name,
url: project_folder_path(project_folder)
url: project_folder_path(project_folder,
view_mode: archived_branch ? :archived : :active),
archived: archived_branch
})
end

16
app/controllers/navigator/base_controller.rb
View file

@ -21,7 +21,7 @@ module Navigator
{
id: folder.code,
name: folder.name,
url: projects_path(project_folder_id: folder.id, view_mode: archived ? 'archived' : 'active'),
url: project_folder_path(folder, view_mode: archived ? 'archived' : 'active'),
archived: folder.archived,
type: :folder,
has_children: folder.has_children,
@ -173,27 +173,31 @@ module Navigator
my_modules
end
def build_folder_tree(folder, children, archived = false)
def build_folder_tree(folder, children)
archived = params[:archived] == 'true'
tree = fetch_projects(folder.parent_folder, archived).map { |i| project_serializer(i, archived) } +
fetch_project_folders(folder.parent_folder, archived).map { |i| folder_serializer(i, archived) }
tree.find { |i| i[:id] == folder.code }[:children] = children
tree = build_folder_tree(folder.parent_folder, tree, archived) if folder.parent_folder.present?
tree = build_folder_tree(folder.parent_folder, tree) if folder.parent_folder.present?
tree
end
def project_level_branch(object = nil, archived = false)
def project_level_branch(object = nil)
archived = params[:archived] == 'true'
fetch_projects(object, archived)
.map { |i| project_serializer(i, archived) } +
fetch_project_folders(object, archived)
.map { |i| folder_serializer(i, archived) }
end
def experiment_level_branch(object, archived = false)
def experiment_level_branch(object)
archived = params[:archived] == 'true'
fetch_experiments(object, archived)
.map { |i| experiment_serializer(i, archived) }
end
def my_module_level_branch(experiment, archived = false)
def my_module_level_branch(experiment)
archived = params[:archived] == 'true'
fetch_my_modules(experiment, archived)
.map { |i| my_module_serializer(i, archived) }
end

8
app/controllers/navigator/experiments_controller.rb
View file

@ -6,16 +6,16 @@ module Navigator
before_action :check_read_permissions
def show
my_modules = my_module_level_branch(@experiment, params[:archived] == 'true')
my_modules = my_module_level_branch(@experiment)
render json: { items: my_modules }
end
def tree
my_modules = my_module_level_branch(@experiment, params[:archived] == 'true')
experiments = experiment_level_branch(@experiment, params[:archived] == 'true')
my_modules = my_module_level_branch(@experiment)
experiments = experiment_level_branch(@experiment)
experiments.find { |i| i[:id] == @experiment.code }[:children] = my_modules
tree = project_level_branch(@experiment.project, params[:archived] == 'true')
tree = project_level_branch(@experiment.project)
tree.find { |i| i[:id] == @experiment.project.code }[:children] = experiments
tree = build_folder_tree(@experiment.project.project_folder, tree) if @experiment.project.project_folder

6
app/controllers/navigator/my_modules_controller.rb
View file

@ -6,11 +6,11 @@ module Navigator
before_action :check_read_permissions
def tree
my_modules = my_module_level_branch(@experiment, params[:archived] == 'true')
experiments = experiment_level_branch(@experiment, params[:archived] == 'true')
my_modules = my_module_level_branch(@experiment)
experiments = experiment_level_branch(@experiment)
experiments.find { |i| i[:id] == @experiment.code }[:children] = my_modules
tree = project_level_branch(@experiment.project, params[:archived] == 'true')
tree = project_level_branch(@experiment.project)
tree.find { |i| i[:id] == @experiment.project.code }[:children] = experiments
tree = build_folder_tree(@experiment.project.project_folder, tree) if @experiment.project.project_folder

4
app/controllers/navigator/project_folders_controller.rb
View file

@ -5,12 +5,12 @@ module Navigator
before_action :load_project_folder
def show
folder = project_level_branch(@project_folder, params[:archived] == 'true')
folder = project_level_branch(@project_folder)
render json: { items: folder }
end
def tree
tree = project_level_branch(@project_folder, params[:archived] == 'true')
tree = project_level_branch(@project_folder)
tree = build_folder_tree(@project_folder, tree)
render json: { items: tree }
end

6
app/controllers/navigator/projects_controller.rb
View file

@ -6,17 +6,17 @@ module Navigator
before_action :check_read_permissions, except: :index
def index
project_and_folders = project_level_branch(nil, params[:archived] == 'true')
project_and_folders = project_level_branch(nil)
render json: { items: project_and_folders }
end
def show
experiments = experiment_level_branch(@project, params[:archived] == 'true')
experiments = experiment_level_branch(@project)
render json: { items: experiments }
end
def tree
tree = project_level_branch(@project, params[:archived] == 'true')
tree = project_level_branch(@project)
tree = build_folder_tree(@project.project_folder, tree) if @project.project_folder

2
app/controllers/repositories_controller.rb
View file

@ -571,7 +571,7 @@ class RepositoriesController < ApplicationController
def set_breadcrumbs_items
@breadcrumbs_items = []
archived_branch = params[:archived] == 'true' || @repository&.archived?
archived_branch = @repository&.archived? || (!@repository && params[:archived] == 'true')
@breadcrumbs_items.push({
label: t('breadcrumbs.inventories'),

7
app/models/project_folder.rb
View file

@ -97,6 +97,13 @@ class ProjectFolder < ApplicationRecord
Project.where(project_folder: ProjectFolder.inner_folders(team, self) + [self])
end
def archived_branch?
return false if active? && parent_folder.blank?
return true if archived?
parent_folder.present? && parent_folder.archived_branch?
end
private
def inherit_team_from_parent_folder

2
app/views/projects/index/_folder_card.html.erb
View file

@ -12,7 +12,7 @@
<span class="sci-checkbox-label"></span>
</div>
</div>
<%= link_to project_folder_path(folder),
<%= link_to folder.archived_branch? ? project_folder_path(folder, view_mode: :archived) : project_folder_path(folder),
class: 'project-folder-link',
data: {
projects_cards_url: project_folder_cards_url(folder),