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

Add filtering for project/experiment filter for assignable tasks [SCI-8442] (#5441)

Browse source 
* Remove object without  edit permission in P/E/T filters [SCI-8442]

* Leave only experiments and projects with active tasks [SCI-8442]
This commit is contained in:
Soufiane 2023-05-24 10:47:27 +02:00 • committed by GitHub
parent c7fcd0a52f
commit f21dc998b9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
8 changed files with 109 additions and 57 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
app/assets/stylesheets/shared/select.scss
View file

@ -92,6 +92,11 @@
padding: .5em;
}
.sn-select__no-options {
color: var(--sn-grey);
padding: .5em;
}
.sn-select__option:hover {
background: var(--sn-blue);
color: var(--sn-white);

15
app/controllers/experiments_controller.rb
View file

@ -445,12 +445,23 @@ class ExperimentsController < ApplicationController
end
def experiment_filter
project = Project.readable_by_user(current_user).find_by(id: params[:project_id])
readable_experiments = Experiment.readable_by_user(current_user)
managable_active_my_modules = MyModule.managable_by_user(current_user).active
project = Project.readable_by_user(current_user)
.joins(experiments: :my_modules)
.where(experiments: { id: readable_experiments })
.where(my_modules: { id: managable_active_my_modules })
.find_by(id: params[:project_id])
return render_404 if project.blank?
experiments = project.experiments
.readable_by_user(current_user)
.joins(:my_modules)
.where(experiments: { id: readable_experiments })
.where(my_modules: { id: managable_active_my_modules })
.search(current_user, false, params[:query], 1, current_team)
.distinct
.pluck(:id, :name)
return render plain: [].to_json if experiments.blank?

74
app/controllers/my_modules_controller.rb
View file

@ -74,13 +74,13 @@ class MyModulesController < ApplicationController
def show
respond_to do |format|
format.json {
render :json => {
:html => render_to_string({
:partial => "show.html.erb"
})
format.json do
render json: {
html: render_to_string({
partial: 'show.html.erb'
})
}
}
end
end
end
@ -88,15 +88,15 @@ class MyModulesController < ApplicationController
def description
respond_to do |format|
format.html
format.json {
format.json do
render json: {
html: render_to_string({
partial: "description.html.erb"
}),
partial: 'description.html.erb'
}),
title: t('my_modules.description.title',
module: escape_input(@my_module.name))
}
}
end
end
end
@ -164,13 +164,13 @@ class MyModulesController < ApplicationController
respond_to do |format|
format.html
format.json {
render :json => {
:html => render_to_string({
:partial => "activities.html.erb"
})
format.json do
render json: {
html: render_to_string({
partial: 'activities.html.erb'
})
}
}
end
end
end
@ -178,15 +178,15 @@ class MyModulesController < ApplicationController
def due_date
respond_to do |format|
format.html
format.json {
format.json do
render json: {
html: render_to_string({
partial: "due_date.html.erb"
}),
partial: 'due_date.html.erb'
}),
title: t('my_modules.due_date.title',
module: escape_input(@my_module.name))
}
}
end
end
end
@ -198,21 +198,13 @@ class MyModulesController < ApplicationController
start_date_changes = @my_module.changes[:started_on]
due_date_changes = @my_module.changes[:due_date]
if @my_module.completed_on_changed? && !can_complete_my_module?(@my_module)
render_403 && return
end
render_403 && return if @my_module.completed_on_changed? && !can_complete_my_module?(@my_module)
if description_changed && !can_update_my_module_description?(@my_module)
render_403 && return
end
render_403 && return if description_changed && !can_update_my_module_description?(@my_module)
if start_date_changes.present? && !can_update_my_module_start_date?(@my_module)
render_403 && return
end
render_403 && return if start_date_changes.present? && !can_update_my_module_start_date?(@my_module)
if due_date_changes.present? && !can_update_my_module_start_date?(@my_module)
render_403 && return
end
render_403 && return if due_date_changes.present? && !can_update_my_module_start_date?(@my_module)
if @my_module.archived_changed?(from: false, to: true)
saved = @my_module.archive(current_user)
@ -273,7 +265,7 @@ class MyModulesController < ApplicationController
else
format.json do
render json: @my_module.errors,
status: :unprocessable_entity
status: :unprocessable_entity
end
end
end
@ -281,6 +273,7 @@ class MyModulesController < ApplicationController
def update_description
render_403 && return unless can_update_my_module_description?(@my_module)
old_description = @my_module.description
respond_to do |format|
format.json do
@ -414,7 +407,7 @@ class MyModulesController < ApplicationController
log_activity(:change_status_on_task_flow, @my_module, my_module_status_old: old_status_id,
my_module_status_new: @my_module.my_module_status.id)
return redirect_to protocols_my_module_path(@my_module)
redirect_to protocols_my_module_path(@my_module)
else
render json: { errors: @my_module.errors.messages.values.flatten.join('\n') }, status: :unprocessable_entity
end
@ -457,11 +450,20 @@ class MyModulesController < ApplicationController
end
def my_module_filter
experiment = Experiment.readable_by_user(current_user).find_by(id: params[:experiment_id])
readable_experiments = Experiment.readable_by_user(current_user)
managable_active_my_modules = MyModule.managable_by_user(current_user).active
experiment = Experiment.readable_by_user(current_user)
.joins(:my_modules)
.where(experiments: { id: readable_experiments })
.where(my_modules: { id: managable_active_my_modules })
.find_by(id: params[:experiment_id])
return render_404 if experiment.blank?
my_modules = experiment.my_modules
.readable_by_user(current_user)
.where(my_modules: { id: managable_active_my_modules })
.distinct
.search(current_user, false, params[:query], 1, current_team)
.pluck(:id, :name)

30
app/controllers/projects_controller.rb
View file

@ -10,6 +10,7 @@ class ProjectsController < ApplicationController
include Breadcrumbs
attr_reader :current_folder
helper_method :current_folder
before_action :switch_team_with_param, only: :index
@ -105,8 +106,15 @@ class ProjectsController < ApplicationController
end
def project_filter
readable_experiments = Experiment.readable_by_user(current_user)
managable_active_my_modules = MyModule.managable_by_user(current_user).active
projects = Project.readable_by_user(current_user)
.joins(experiments: :my_modules)
.where(experiments: { id: readable_experiments })
.where(my_modules: { id: managable_active_my_modules })
.search(current_user, false, params[:query], 1, current_team)
.distinct
.pluck(:id, :name)
return render plain: [].to_json if projects.blank?
@ -211,9 +219,7 @@ class ProjectsController < ApplicationController
# Redirect URL for archive view is different as for other views.
if project_params[:archived] == 'false'
# The project should be restored
unless @project.archived
@project.restore(current_user)
end
@project.restore(current_user) unless @project.archived
elsif @project.archived
# The project should be archived
@project.archive(current_user)
@ -339,17 +345,17 @@ class ProjectsController < ApplicationController
def notifications
@modules = @project
.assigned_modules(current_user)
.order(due_date: :desc)
.assigned_modules(current_user)
.order(due_date: :desc)
respond_to do |format|
#format.html
format.json {
render :json => {
:html => render_to_string({
:partial => "notifications.html.erb"
})
# format.html
format.json do
render json: {
html: render_to_string({
partial: 'notifications.html.erb'
})
}
}
end
end
end

7
app/javascript/vue/assign_items_to_tasks_modal/container.vue
View file

@ -95,9 +95,10 @@
ref="tasksSelector"
@change="changeTask"
:options="tasks"
:placeholder="
:placeholder="tasksSelectorPlaceholder"
:no-options-placeholder="
i18n.t(
'repositories.modal_assign_items_to_task.body.task_select.disabled_placeholder'
'repositories.modal_assign_items_to_task.body.task_select.no_options_placeholder'
)
"
:searchPlaceholder="
@ -162,8 +163,8 @@ export default {
});
});
$(this.$refs.modal).on("hidden.bs.modal", () => {
this.resetSelectors();
this.$emit("close");
});
},

20
app/javascript/vue/shared/select.vue
View file

@ -7,9 +7,22 @@
<span class="sn-select__caret caret"></span>
</slot>
<div ref="optionsContainer" class="sn-select__options" :style="optionPositionStyle">
<div v-for="option in options" :key="option[0]" @click="setValue(option[0])" class="sn-select__option">
{{ option[1] }}
</div>
<template v-if="options.length">
<div
v-for="option in options"
:key="option[0]" @click="setValue(option[0])"
class="sn-select__option"
>
{{ option[1] }}
</div>
</template>
<template v-else>
<div
class="sn-select__no-options"
>
{{ this.noOptionsPlaceholder }}
</div>
</template>
</div>
</div>
</template>
@ -22,6 +35,7 @@
options: { type: Array, default: () => [] },
initialValue: { type: [String, Number] },
placeholder: { type: String },
noOptionsPlaceholder: { type: String },
disabled: { type: Boolean, default: false }
},
data() {

14
app/javascript/vue/shared/select_search.vue
View file

@ -1,5 +1,16 @@
<template>
<Select class="sn-select--search" :value="value" :options="currentOptions" :placeholder="placeholder" v-bind:disabled="disabled" @change="change" @blur="blur" @open="open" @close="close">
<Select
class="sn-select--search"
:value="value"
:options="currentOptions"
:placeholder="placeholder"
:noOptionsPlaceholder="noOptionsPlaceholder"
v-bind:disabled="disabled"
@change="change"
@blur="blur"
@open="open"
@close="close"
>
<input ref="focusElement" v-model="query" type="text" class="sn-select__search-input" :placeholder="searchPlaceholder" />
<span class="sn-select__value">{{ valueLabel || (placeholder || i18n.t('general.select')) }}</span>
<span class="sn-select__caret caret"></span>
@ -17,6 +28,7 @@
optionsUrl: { type: String },
placeholder: { type: String },
searchPlaceholder: { type: String },
noOptionsPlaceholder: { type: String },
disabled: { type: Boolean }
},
components: { Select },

1
config/locales/en.yml
View file

@ -1996,6 +1996,7 @@ en:
label: "Task"
placeholder: "Enter Task name"
disabled_placeholder: "Select Experiment to enable Task"
no_options_placeholder: "No tasks available to assign items"
assign:
text: "Assign to this task"
flash_all_assignments_success: "Successfully assigned %{count} item(s) to the task."