@@ -105,7 +119,6 @@ export default {
default: () => []
},
viewRenders: {
- type: Array,
required: true
},
currentViewRender: {
@@ -184,6 +197,9 @@ export default {
},
applyFilters(filters) {
this.$emit('applyFilters', filters);
+ },
+ handleEvent(event) {
+ this.$emit('toolbar:action', { name: event });
}
}
};
diff --git a/app/models/protocol.rb b/app/models/protocol.rb
index d3c08b196..061259a98 100644
--- a/app/models/protocol.rb
+++ b/app/models/protocol.rb
@@ -160,6 +160,7 @@ class Protocol < ApplicationRecord
dependent: :destroy
has_many :protocol_keywords, through: :protocol_protocol_keywords
has_many :steps, inverse_of: :protocol, dependent: :destroy
+ has_many :users, through: :user_assignments
def self.search(user,
include_archived,
diff --git a/app/serializers/lists/protocol_serializer.rb b/app/serializers/lists/protocol_serializer.rb
new file mode 100644
index 000000000..0599a2900
--- /dev/null
+++ b/app/serializers/lists/protocol_serializer.rb
@@ -0,0 +1,104 @@
+# frozen_string_literal: true
+
+module Lists
+ class ProtocolSerializer < ActiveModel::Serializer
+ include Canaid::Helpers::PermissionsHelper
+ include Rails.application.routes.url_helpers
+
+ attributes :name, :code, :keywords, :linked_tasks, :nr_of_versions, :assigned_users, :published_by,
+ :published_on, :updated_at, :archived_by, :archived_on, :urls, :default_public_user_role_id,
+ :hidden, :top_level_assignable, :has_draft, :team
+
+ def keywords
+ object.protocol_keywords.map(&:name)
+ end
+
+ def team
+ object.team.name
+ end
+
+ def linked_tasks
+ object.nr_of_linked_tasks
+ end
+
+ def assigned_users
+ object.user_assignments.map do |ua|
+ {
+ avatar: avatar_path(ua.user, :icon_small),
+ full_name: ua.user_name_with_role
+ }
+ end
+ end
+
+ def has_draft
+ if object.in_repository_published_original? || object.in_repository_published_version?
+ parent = object.parent || object
+ parent.draft.present?
+ else
+ object.in_repository_draft?
+ end
+ end
+
+ def published_by
+ object.published_by&.full_name
+ end
+
+ def published_on
+ I18n.l(object.published_on, format: :full) if object.published_on
+ end
+
+ def updated_at
+ I18n.l(object.updated_at, format: :full) if object.updated_at
+ end
+
+ def archived_by
+ object.archived_by&.full_name
+ end
+
+ def archived_on
+ I18n.l(object.archived_on, format: :full) if object.archived_on
+ end
+
+ delegate :default_public_user_role_id, to: :object
+
+ def hidden
+ object.hidden?
+ end
+
+ def top_level_assignable
+ true
+ end
+
+ def urls
+ urls_list = {
+ show_access: access_permissions_protocol_path(object),
+ versions_list: versions_list_protocol_path(object),
+ linked_my_modules: linked_children_protocol_path(object.parent || object),
+ versions_modal: versions_modal_protocol_path(object.parent || object)
+ }
+
+ if can_read_protocol_in_repository?(object)
+ urls_list[:show] = if object.in_repository_published_original? && object.latest_published_version.present?
+ protocol_path(object.latest_published_version)
+ else
+ protocol_path(object)
+ end
+ end
+
+ if has_draft
+ object.initial_draft? ? object : object.draft
+ urls_list[:show_draft] = protocol_path(object)
+ end
+
+ if can_manage_protocol_users?(object)
+ urls_list[:update_access] = access_permissions_protocol_path(object)
+ urls_list[:new_access] = new_access_permissions_protocol_path(id: object.id)
+ urls_list[:create_access] = access_permissions_protocols_path(id: object.id)
+ urls_list[:default_public_user_role_path] =
+ update_default_public_user_role_access_permissions_protocol_path(object)
+ end
+
+ urls_list
+ end
+ end
+end
diff --git a/app/serializers/protocol_draft_serializer.rb b/app/serializers/protocol_draft_serializer.rb
new file mode 100644
index 000000000..a1ff68af6
--- /dev/null
+++ b/app/serializers/protocol_draft_serializer.rb
@@ -0,0 +1,43 @@
+# frozen_string_literal: true
+
+class ProtocolDraftSerializer < ActiveModel::Serializer
+ include Rails.application.routes.url_helpers
+ include Canaid::Helpers::PermissionsHelper
+
+ attributes :id, :previous_number, :modified_on, :modified_by, :comment, :urls
+
+ def previous_number
+ object.previous_version&.version_number
+ end
+
+ def modified_on
+ I18n.l(object.updated_at, format: :full_date) if object.updated_at
+ end
+
+ def modified_by
+ object.last_modified_by&.full_name
+ end
+
+ def comment
+ object.version_comment
+ end
+
+ def urls
+ current_user = scope
+ urls_list = {
+ show: protocol_path(object)
+ }
+
+ urls_list[:publish] = publish_protocol_path(object) if can_publish_protocol_in_repository?(current_user, object)
+ if can_delete_protocol_draft_in_repository?(current_user, object)
+ urls_list[:destroy] = destroy_draft_protocol_path(object)
+ end
+
+ if can_manage_protocol_draft_in_repository?(current_user, object) &&
+ can_publish_protocol_in_repository?(current_user, object)
+ urls_list[:comment] = update_version_comment_protocol_path(object)
+ end
+
+ urls_list
+ end
+end
diff --git a/app/serializers/protocol_serializer.rb b/app/serializers/protocol_serializer.rb
index 43ca8f485..152df37ce 100644
--- a/app/serializers/protocol_serializer.rb
+++ b/app/serializers/protocol_serializer.rb
@@ -96,7 +96,9 @@ class ProtocolSerializer < ActiveModel::Serializer
save_as_draft_url: save_as_draft_url,
versions_modal_url: versions_modal_url,
version_comment_url: version_comment_url,
- print_protocol_url: print_protocol_url
+ print_protocol_url: print_protocol_url,
+ versions_modal: versions_modal_protocol_path(object.parent || object),
+ redirect_to_protocols: protocols_path
}
end
diff --git a/app/serializers/protocol_version_serializer.rb b/app/serializers/protocol_version_serializer.rb
new file mode 100644
index 000000000..e68ea890a
--- /dev/null
+++ b/app/serializers/protocol_version_serializer.rb
@@ -0,0 +1,36 @@
+# frozen_string_literal: true
+
+class ProtocolVersionSerializer < ActiveModel::Serializer
+ include Rails.application.routes.url_helpers
+ include Canaid::Helpers::PermissionsHelper
+
+ attributes :id, :number, :published_on, :published_by, :comment, :urls
+
+ def urls
+ current_user = scope
+ urls_list = {
+ show: protocol_path(object)
+ }
+ if can_save_protocol_version_as_draft?(current_user, object)
+ urls_list[:save_as_draft] = save_as_draft_protocol_path(object)
+ end
+
+ urls_list
+ end
+
+ def number
+ object.version_number
+ end
+
+ def published_on
+ I18n.l(object.published_on, format: :full_date) if object.published_on
+ end
+
+ def published_by
+ object.published_by&.full_name
+ end
+
+ def comment
+ object.version_comment
+ end
+end
diff --git a/app/serializers/user_assignment_serializer.rb b/app/serializers/user_assignment_serializer.rb
index 83a53b9b0..e5feed91a 100644
--- a/app/serializers/user_assignment_serializer.rb
+++ b/app/serializers/user_assignment_serializer.rb
@@ -47,6 +47,8 @@ class UserAssignmentSerializer < ActiveModel::Serializer
parent.user_assignments.find_by(user: object.user)
when Experiment
parent_assignment(parent.permission_parent)
+ when Team
+ object
end
end
diff --git a/app/services/lists/protocols_service.rb b/app/services/lists/protocols_service.rb
new file mode 100644
index 000000000..65e8812ee
--- /dev/null
+++ b/app/services/lists/protocols_service.rb
@@ -0,0 +1,88 @@
+# frozen_string_literal: true
+
+module Lists
+ class ProtocolsService < BaseService
+ PREFIXED_ID_SQL = "('#{Protocol::ID_PREFIX}' || COALESCE(\"protocols\".\"parent_id\", \"protocols\".\"id\"))".freeze
+
+ private
+
+ def fetch_records
+ @records = @raw_data.preload(:parent, :latest_published_version, :draft,
+ :protocol_keywords, user_assignments: %i(user user_role))
+ .joins("LEFT OUTER JOIN protocols protocol_versions " \
+ "ON protocol_versions.protocol_type = #{
+ Protocol.protocol_types[:in_repository_published_version]} " \
+ "AND protocol_versions.parent_id = protocols.parent_id")
+ .joins("LEFT OUTER JOIN protocols self_linked_task_protocols " \
+ "ON self_linked_task_protocols.protocol_type = #{
+ Protocol.protocol_types[:linked]} " \
+ "AND self_linked_task_protocols.parent_id = protocols.id")
+ .joins("LEFT OUTER JOIN protocols parent_linked_task_protocols " \
+ "ON parent_linked_task_protocols.protocol_type = #{
+ Protocol.protocol_types[:linked]} " \
+ "AND parent_linked_task_protocols.parent_id = protocols.parent_id")
+ .joins("LEFT OUTER JOIN protocols version_linked_task_protocols " \
+ "ON version_linked_task_protocols.protocol_type = #{
+ Protocol.protocol_types[:linked]} " \
+ "AND version_linked_task_protocols.parent_id = protocol_versions.id " \
+ "AND version_linked_task_protocols.parent_id != protocols.id")
+ .joins('LEFT OUTER JOIN "protocol_protocol_keywords" ' \
+ 'ON "protocol_protocol_keywords"."protocol_id" = "protocols"."id"')
+ .joins('LEFT OUTER JOIN "protocol_keywords" ' \
+ 'ON "protocol_protocol_keywords"."protocol_keyword_id" = "protocol_keywords"."id"')
+ .joins('LEFT OUTER JOIN "users" "archived_users"
+ ON "archived_users"."id" = "protocols"."archived_by_id"')
+ .joins('LEFT OUTER JOIN "users" ON "users"."id" = "protocols"."published_by_id"')
+ .joins('LEFT OUTER JOIN "user_assignments" "all_user_assignments" ' \
+ 'ON "all_user_assignments"."assignable_type" = \'Protocol\' ' \
+ 'AND "all_user_assignments"."assignable_id" = "protocols"."id"')
+ .group('"protocols"."id"')
+ .select(
+ '"protocols".*',
+ 'COALESCE("protocols"."parent_id", "protocols"."id") AS adjusted_parent_id',
+ 'STRING_AGG(DISTINCT("protocol_keywords"."name"), \', \') AS "protocol_keywords_str"',
+ "CASE WHEN protocols.protocol_type = #{Protocol.protocol_types[:in_repository_draft]} " \
+ "THEN 0 ELSE COUNT(DISTINCT(\"protocol_versions\".\"id\")) + 1 " \
+ "END AS nr_of_versions",
+ '(COUNT(DISTINCT("self_linked_task_protocols"."id")) + ' \
+ 'COUNT(DISTINCT("parent_linked_task_protocols"."id")) + ' \
+ 'COUNT(DISTINCT("version_linked_task_protocols"."id"))) AS nr_of_linked_tasks',
+ 'COUNT(DISTINCT("all_user_assignments"."id")) AS "nr_of_assigned_users"',
+ 'MAX("users"."full_name") AS "full_username_str"', # "Hack" to get single username
+ 'MAX("archived_users"."full_name") AS "archived_full_username_str"'
+ )
+
+ view_mode = @params[:view_mode] || 'active'
+
+ @records = @records.archived if view_mode == 'archived'
+ @records = @records.active if view_mode == 'active'
+ end
+
+ def filter_records
+ return if @params[:search].blank?
+
+ @records = @records.where(
+ "LOWER(\"protocols\".\"name\") LIKE :search OR
+ LOWER(\"protocol_keywords\".\"name\") LIKE :search OR
+ LOWER(#{PREFIXED_ID_SQL}) LIKE :search",
+ search: "%#{@params[:search].to_s.downcase}%"
+ )
+ end
+
+ def sortable_columns
+ @sortable_columns ||= {
+ name: 'name',
+ parent_id: 'adjusted_parent_id',
+ versions: 'nr_of_versions',
+ keywords: 'protocol_keywords_str',
+ linked_tasks: 'nr_of_linked_tasks',
+ assigned_users: 'nr_of_assigned_users',
+ published_by: 'full_username_str',
+ published_on: 'published_on',
+ udpated_at: 'updated_at',
+ archived_by: 'archived_full_username_str',
+ archived_on: 'archived_on'
+ }
+ end
+ end
+end
diff --git a/app/services/toolbars/protocols_service.rb b/app/services/toolbars/protocols_service.rb
index be922a145..58661d74b 100644
--- a/app/services/toolbars/protocols_service.rb
+++ b/app/services/toolbars/protocols_service.rb
@@ -39,8 +39,7 @@ module Toolbars
name: 'versions',
label: I18n.t('protocols.index.toolbar.versions'),
icon: 'sn-icon sn-icon-versions',
- button_id: 'protocolVersions',
- type: :legacy
+ type: :emit
}
end
@@ -55,29 +54,18 @@ module Toolbars
label: I18n.t('protocols.index.toolbar.duplicate'),
icon: 'sn-icon sn-icon-duplicate',
path: clone_protocols_path,
- type: :request,
- request_method: :post
+ type: :emit
}
end
def access_action
return unless @single
- protocol = @protocols.first
-
- path = if can_manage_protocol_users?(protocol)
- edit_access_permissions_protocol_path(protocol)
- else
- access_permissions_protocol_path(protocol)
- end
-
{
name: 'access',
label: I18n.t('protocols.index.toolbar.access'),
icon: 'sn-icon sn-icon-project-member-access',
- button_class: 'access-btn',
- path: path,
- type: 'remote-modal'
+ type: :emit
}
end
@@ -91,7 +79,7 @@ module Toolbars
label: I18n.t('protocols.index.toolbar.export'),
icon: 'sn-icon sn-icon-export',
path: export_protocols_path(protocol_ids: @protocols.pluck(:id)),
- type: :download
+ type: :emit
}
end
@@ -103,8 +91,7 @@ module Toolbars
label: I18n.t('protocols.index.toolbar.archive'),
icon: 'sn-icon sn-icon-archive',
path: archive_protocols_path,
- type: :request,
- request_method: :post
+ type: :emit
}
end
@@ -112,12 +99,11 @@ module Toolbars
return unless @protocols.all? { |p| can_restore_protocol_in_repository?(p) }
{
- name: 'archive',
+ name: 'restore',
label: I18n.t('protocols.index.toolbar.restore'),
icon: 'sn-icon sn-icon-restore',
path: restore_protocols_path,
- type: :request,
- request_method: :post
+ type: :emit
}
end
end
diff --git a/app/views/protocols/index.html.erb b/app/views/protocols/index.html.erb
index aae0fdf1a..22a9ba984 100644
--- a/app/views/protocols/index.html.erb
+++ b/app/views/protocols/index.html.erb
@@ -25,42 +25,54 @@