From 10e607c2814dadd962cb32f460d4ad4d8288fb39 Mon Sep 17 00:00:00 2001 From: Mojca Lorber Date: Fri, 17 Jul 2020 14:48:45 +0200 Subject: [PATCH 001/163] Implement Status labels on a Task card --- app/assets/stylesheets/projects.scss | 8 ++-- app/assets/stylesheets/themes/scinote.scss | 38 +++++++++++++++++++ .../canvas/full_zoom/_my_module.html.erb | 3 ++ 3 files changed, 45 insertions(+), 4 deletions(-) diff --git a/app/assets/stylesheets/projects.scss b/app/assets/stylesheets/projects.scss index 19e9fa154..c9125f939 100644 --- a/app/assets/stylesheets/projects.scss +++ b/app/assets/stylesheets/projects.scss @@ -316,10 +316,10 @@ path, ._jsPlumb_endpoint { .module-large .tags-container, .module-medium .tags-container { - padding-top: 2px; + padding-top: 4px; div { - font-size: 22pt; + font-size: 20px; width: 4px; height: 0px; display: inline-block; @@ -335,9 +335,9 @@ path, ._jsPlumb_endpoint { } & span.badge { - margin-left: -8px; - margin-top: -10px; + margin-left: -12px; margin-right: 4px; + margin-top: -7px; } } diff --git a/app/assets/stylesheets/themes/scinote.scss b/app/assets/stylesheets/themes/scinote.scss index 56f9abf8e..629bed4c2 100644 --- a/app/assets/stylesheets/themes/scinote.scss +++ b/app/assets/stylesheets/themes/scinote.scss @@ -742,6 +742,44 @@ ul.double-line > li { } } +#canvas-container { + .panel-heading { + padding: 10px 15px 4px; + } + + .panel-body { + padding: 6px 15px; + + .status-label { + background-color: var(--state-color); + color: $color-white; + margin: 3px 0; + padding: 2px 8px; + white-space: nowrap; + width: fit-content; + } + } + + .panel-footer { + .nav > li > a { + padding: 6px 15px; + } + + .btn { + height: 30px; + } + + .badge-indicator { + background: transparent; + color: $color-silver-chalice; + font-size: 12px; + margin-left: 0; + padding: 0; + top: 0; + } + } +} + .panel-options { position: relative; bottom: 8px; diff --git a/app/views/canvas/full_zoom/_my_module.html.erb b/app/views/canvas/full_zoom/_my_module.html.erb index 314f8e38f..3f4ef6fa7 100644 --- a/app/views/canvas/full_zoom/_my_module.html.erb +++ b/app/views/canvas/full_zoom/_my_module.html.erb @@ -37,6 +37,9 @@ <% else %> <%= render partial: "my_modules/card_due_date_label.html.erb", locals: { my_module: my_module, format: :full_date } %> <% end %> +
+ Completed +
From 7fd004baa82182d0a5362946a315a00741264d35 Mon Sep 17 00:00:00 2001 From: Oleksii Kriuchykhin Date: Fri, 17 Jul 2020 18:04:09 +0200 Subject: [PATCH 002/163] Prepare database structure and relations for statuses phase one [SCI-4825] --- app/models/my_module.rb | 71 ++-- app/models/my_module_status.rb | 34 ++ app/models/my_module_status_condition.rb | 5 + .../my_module_status_conditions/active.rb | 10 + app/models/my_module_status_consequence.rb | 5 + .../change_activity.rb | 11 + app/models/my_module_status_flow.rb | 24 ++ app/models/my_module_status_implication.rb | 5 + .../read_only.rb | 10 + .../_my_module_samples_element.html.erb | 1 - config/locales/en.yml | 6 + ...20200713142353_create_task_flows_models.rb | 53 +++ db/structure.sql | 346 +++++++++++++++++- spec/factories/my_module_status_flows.rb | 12 + spec/factories/my_module_statuses.rb | 10 + spec/models/my_module_spec.rb | 1 + spec/models/my_module_status_flow_spec.rb | 49 +++ spec/models/my_module_status_spec.rb | 45 +++ 18 files changed, 661 insertions(+), 37 deletions(-) create mode 100644 app/models/my_module_status.rb create mode 100644 app/models/my_module_status_condition.rb create mode 100644 app/models/my_module_status_conditions/active.rb create mode 100644 app/models/my_module_status_consequence.rb create mode 100644 app/models/my_module_status_consequences/change_activity.rb create mode 100644 app/models/my_module_status_flow.rb create mode 100644 app/models/my_module_status_implication.rb create mode 100644 app/models/my_module_status_implications/read_only.rb create mode 100644 db/migrate/20200713142353_create_task_flows_models.rb create mode 100644 spec/factories/my_module_status_flows.rb create mode 100644 spec/factories/my_module_statuses.rb create mode 100644 spec/models/my_module_status_flow_spec.rb create mode 100644 spec/models/my_module_status_spec.rb diff --git a/app/models/my_module.rb b/app/models/my_module.rb index a96713711..a51059df4 100644 --- a/app/models/my_module.rb +++ b/app/models/my_module.rb @@ -7,6 +7,8 @@ class MyModule < ApplicationRecord enum state: Extends::TASKS_STATES before_create :create_blank_protocol + before_create :assign_default_status_flow + before_save :exec_status_consequences, if: :my_module_status_id_changed? auto_strip_attributes :name, :description, nullify: false validates :name, @@ -18,6 +20,9 @@ class MyModule < ApplicationRecord validates :my_module_group, presence: true, if: proc { |mm| !mm.my_module_group_id.nil? } validate :coordinates_uniqueness_check, if: :active? + validate :check_status_conditions, if: :my_module_status_id_changed? + validate :check_status_implications, unless: :my_module_status_id_changed? + belongs_to :created_by, foreign_key: 'created_by_id', class_name: 'User', @@ -36,6 +41,8 @@ class MyModule < ApplicationRecord optional: true belongs_to :experiment, inverse_of: :my_modules, touch: true belongs_to :my_module_group, inverse_of: :my_modules, optional: true + belongs_to :my_module_status, optional: true + delegate :my_module_status_flow, to: :my_module_status, allow_nil: true has_many :results, inverse_of: :my_module, dependent: :destroy has_many :my_module_tags, inverse_of: :my_module, dependent: :destroy has_many :tags, through: :my_module_tags @@ -373,40 +380,6 @@ class MyModule < ApplicationRecord final end - - # Generate the samples belonging to this module - # in JSON form, suitable for display in handsontable.js - def samples_json_hot(order) - data = [] - samples.order(created_at: order).each do |sample| - sample_json = [] - sample_json << sample.name - if sample.sample_type.present? - sample_json << sample.sample_type.name - else - sample_json << I18n.t("samples.table.no_type") - end - if sample.sample_group.present? - sample_json << sample.sample_group.name - else - sample_json << I18n.t("samples.table.no_group") - end - sample_json << I18n.l(sample.created_at, format: :full) - sample_json << sample.user.full_name - data << sample_json - end - - # Prepare column headers - headers = [ - I18n.t("samples.table.sample_name"), - I18n.t("samples.table.sample_type"), - I18n.t("samples.table.sample_group"), - I18n.t("samples.table.added_on"), - I18n.t("samples.table.added_by") - ] - { data: data, headers: headers } - end - # Generate the repository rows belonging to this module # in JSON form, suitable for display in handsontable.js def repository_json_hot(repository, order) @@ -558,4 +531,34 @@ class MyModule < ApplicationRecord errors.add(:position, I18n.t('activerecord.errors.models.my_module.attributes.position.not_unique')) end end + + def assign_default_status_flow + return unless MyModuleFlow.global.any? + + self.my_module_status = MyModuleFlow.global.first.initial_status + end + + def check_status_conditions + return if my_module_status.blank? + + my_module_status.my_module_status_conditions.each do |condition| + condition.call(self) + end + end + + def check_status_implications + return if my_module_status.blank? + + my_module_status.my_module_status_implications.each do |implication| + implication.call(self) + end + end + + def exec_status_consequences + return if my_module_status.blank? + + my_module_status.my_module_status_consequences.each do |consequence| + consequence.call(self) + end + end end diff --git a/app/models/my_module_status.rb b/app/models/my_module_status.rb new file mode 100644 index 000000000..44f9e4605 --- /dev/null +++ b/app/models/my_module_status.rb @@ -0,0 +1,34 @@ +# frozen_string_literal: true + +class MyModuleStatus < ApplicationRecord + has_many :my_modules, dependent: :nullify + has_many :my_module_status_conditions, dependent: :destroy + has_many :my_module_status_consequences, dependent: :destroy + has_many :my_module_status_implications, dependent: :destroy + belongs_to :my_module_status_flow + belongs_to :created_by, class_name: 'User', optional: true + belongs_to :last_modified_by, class_name: 'User', optional: true + has_one :next_status, class_name: 'MyModuleStatus', + foreign_key: 'previous_status_id', + inverse_of: :previous_status, + dependent: :nullify + belongs_to :previous_status, class_name: 'MyModuleStatus', inverse_of: :next_status, optional: true + + validates :name, presence: true, length: { minimum: Constants::NAME_MIN_LENGTH, maximum: Constants::NAME_MAX_LENGTH } + validates :color, presence: true + validates :description, length: { maximum: Constants::TEXT_MAX_LENGTH } + validates :next_status, uniqueness: true, if: -> { next_status.present? } + validates :previous_status, uniqueness: true, if: -> { previous_status.present? } + validate :next_in_same_flow, if: -> { next_status.present? } + validate :previous_in_same_flow, if: -> { previous_status.present? } + + private + + def next_in_same_flow + errors.add(:next_status, :different_flow) unless next_status.my_module_status_flow == my_module_status_flow + end + + def previous_in_same_flow + errors.add(:previous_status, :different_flow) unless previous_status.my_module_status_flow == my_module_status_flow + end +end diff --git a/app/models/my_module_status_condition.rb b/app/models/my_module_status_condition.rb new file mode 100644 index 000000000..7bc18740e --- /dev/null +++ b/app/models/my_module_status_condition.rb @@ -0,0 +1,5 @@ +# frozen_string_literal: true + +class MyModuleStatusCondition < ApplicationRecord + belongs_to :my_module_status +end diff --git a/app/models/my_module_status_conditions/active.rb b/app/models/my_module_status_conditions/active.rb new file mode 100644 index 000000000..887eaa739 --- /dev/null +++ b/app/models/my_module_status_conditions/active.rb @@ -0,0 +1,10 @@ +# frozen_string_literal: true + +# Just an example, to be replaced with an actual implementation +module MyModuleStatusConditions + class Active < MyModuleStatusCondition + def call(my_module) + my_module.errors.add(:status_conditions, 'MyModule should be active') unless my_module.active? + end + end +end diff --git a/app/models/my_module_status_consequence.rb b/app/models/my_module_status_consequence.rb new file mode 100644 index 000000000..4aa31924d --- /dev/null +++ b/app/models/my_module_status_consequence.rb @@ -0,0 +1,5 @@ +# frozen_string_literal: true + +class MyModuleStatusConsequence < ApplicationRecord + belongs_to :my_module_status +end diff --git a/app/models/my_module_status_consequences/change_activity.rb b/app/models/my_module_status_consequences/change_activity.rb new file mode 100644 index 000000000..3bc736f4d --- /dev/null +++ b/app/models/my_module_status_consequences/change_activity.rb @@ -0,0 +1,11 @@ +# frozen_string_literal: true + +# Just an example, to be replaced with an actual implementation +module MyModuleStatusConsequences + class ChangeActivity < MyModuleStatusConsequence + def call(my_module) + # Create new activity here + puts "State changed to #{my_module_status.name}} for #{my_module.name}" + end + end +end diff --git a/app/models/my_module_status_flow.rb b/app/models/my_module_status_flow.rb new file mode 100644 index 000000000..a4238deb3 --- /dev/null +++ b/app/models/my_module_status_flow.rb @@ -0,0 +1,24 @@ +# frozen_string_literal: true + +class MyModuleStatusFlow < ApplicationRecord + enum visibility: { global: 0, in_team: 1 } + + has_many :my_module_statuses, dependent: :destroy + belongs_to :team, optional: true + belongs_to :created_by, class_name: 'User', optional: true + belongs_to :last_modified_by, class_name: 'User', optional: true + + validates :visibility, presence: true + validates :team, presence: true, if: :in_team? + validates :name, uniqueness: { scope: :team_id, case_sensitive: false }, if: :in_team? + validates :name, presence: true, length: { minimum: Constants::NAME_MIN_LENGTH, maximum: Constants::NAME_MAX_LENGTH } + validates :description, length: { maximum: Constants::TEXT_MAX_LENGTH } + + def initial_status + my_module_statuses.find_by(previous_status: nil) + end + + def final_status + my_module_statuses.find_by(next_status: nil) + end +end diff --git a/app/models/my_module_status_implication.rb b/app/models/my_module_status_implication.rb new file mode 100644 index 000000000..a455500d9 --- /dev/null +++ b/app/models/my_module_status_implication.rb @@ -0,0 +1,5 @@ +# frozen_string_literal: true + +class MyModuleStatusImplication < ApplicationRecord + belongs_to :my_module_status +end diff --git a/app/models/my_module_status_implications/read_only.rb b/app/models/my_module_status_implications/read_only.rb new file mode 100644 index 000000000..2d69d2d4b --- /dev/null +++ b/app/models/my_module_status_implications/read_only.rb @@ -0,0 +1,10 @@ +# frozen_string_literal: true + +# Just an example, to be replaced with an actual implementation +module MyModuleStatusImplications + class ReadOnly < MyModuleStatusImplication + def call(my_module) + my_module.errors.add(:status_implication, 'Is read only') + end + end +end diff --git a/app/views/reports/elements/_my_module_samples_element.html.erb b/app/views/reports/elements/_my_module_samples_element.html.erb index 1fc6cb3cd..20de96eb7 100644 --- a/app/views/reports/elements/_my_module_samples_element.html.erb +++ b/app/views/reports/elements/_my_module_samples_element.html.erb @@ -1,7 +1,6 @@ <% if my_module.blank? and @my_module.present? then my_module = @my_module end %> <% if order.blank? and @order.present? then order = @order end %> <% timestamp = Time.current + 1.year - 1.days %> -<% samples_json = my_module.samples_json_hot(order) %>
" data-name="<%=t "projects.reports.elements.module_samples.sidebar_name" %>" data-icon-class="fas fa-tint">
diff --git a/config/locales/en.yml b/config/locales/en.yml index a6be79ce8..5be90d7b2 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -96,6 +96,12 @@ en: attributes: position: not_unique: "X and Y position has already been taken by another task in the experiment." + my_module_status: + attributes: + next_status: + different_flow: "Should belong to the same flow" + previous_status: + different_flow: "Should belong to the same flow" asset: attributes: file: diff --git a/db/migrate/20200713142353_create_task_flows_models.rb b/db/migrate/20200713142353_create_task_flows_models.rb new file mode 100644 index 000000000..af85aac31 --- /dev/null +++ b/db/migrate/20200713142353_create_task_flows_models.rb @@ -0,0 +1,53 @@ +# frozen_string_literal: true + +class CreateTaskFlowsModels < ActiveRecord::Migration[6.0] + def change + change_table :my_modules do |t| + t.references :my_module_status + end + + create_table :my_module_status_flows do |t| + t.string :name, null: false + t.string :description + t.integer :visibility, index: true, default: 0 + t.references :team + t.references :created_by, index: false, foreign_key: { to_table: :users } + t.references :last_modified_by, index: false, foreign_key: { to_table: :users } + + t.timestamps + end + + create_table :my_module_statuses do |t| + t.string :name, null: false + t.string :description + t.string :color, null: false + t.references :my_module_status_flow, index: true + t.references :previous_status, index: { unique: true }, foreign_key: { to_table: :my_module_statuses } + t.references :created_by, index: false, foreign_key: { to_table: :users } + t.references :last_modified_by, index: false, foreign_key: { to_table: :users } + + t.timestamps + end + + create_table :my_module_status_consequences do |t| + t.references :my_module_status + t.string :type + + t.timestamps + end + + create_table :my_module_status_conditions do |t| + t.references :my_module_status + t.string :type + + t.timestamps + end + + create_table :my_module_status_implications do |t| + t.references :my_module_status + t.string :type + + t.timestamps + end + end +end diff --git a/db/structure.sql b/db/structure.sql index 6e6f5630f..d27d11609 100644 --- a/db/structure.sql +++ b/db/structure.sql @@ -623,6 +623,175 @@ CREATE SEQUENCE public.my_module_repository_rows_id_seq ALTER SEQUENCE public.my_module_repository_rows_id_seq OWNED BY public.my_module_repository_rows.id; +-- +-- Name: my_module_status_conditions; Type: TABLE; Schema: public; Owner: - +-- + +CREATE TABLE public.my_module_status_conditions ( + id bigint NOT NULL, + my_module_status_id bigint, + type character varying, + created_at timestamp(6) without time zone NOT NULL, + updated_at timestamp(6) without time zone NOT NULL +); + + +-- +-- Name: my_module_status_conditions_id_seq; Type: SEQUENCE; Schema: public; Owner: - +-- + +CREATE SEQUENCE public.my_module_status_conditions_id_seq + START WITH 1 + INCREMENT BY 1 + NO MINVALUE + NO MAXVALUE + CACHE 1; + + +-- +-- Name: my_module_status_conditions_id_seq; Type: SEQUENCE OWNED BY; Schema: public; Owner: - +-- + +ALTER SEQUENCE public.my_module_status_conditions_id_seq OWNED BY public.my_module_status_conditions.id; + + +-- +-- Name: my_module_status_consequences; Type: TABLE; Schema: public; Owner: - +-- + +CREATE TABLE public.my_module_status_consequences ( + id bigint NOT NULL, + my_module_status_id bigint, + type character varying, + created_at timestamp(6) without time zone NOT NULL, + updated_at timestamp(6) without time zone NOT NULL +); + + +-- +-- Name: my_module_status_consequences_id_seq; Type: SEQUENCE; Schema: public; Owner: - +-- + +CREATE SEQUENCE public.my_module_status_consequences_id_seq + START WITH 1 + INCREMENT BY 1 + NO MINVALUE + NO MAXVALUE + CACHE 1; + + +-- +-- Name: my_module_status_consequences_id_seq; Type: SEQUENCE OWNED BY; Schema: public; Owner: - +-- + +ALTER SEQUENCE public.my_module_status_consequences_id_seq OWNED BY public.my_module_status_consequences.id; + + +-- +-- Name: my_module_status_flows; Type: TABLE; Schema: public; Owner: - +-- + +CREATE TABLE public.my_module_status_flows ( + id bigint NOT NULL, + name character varying NOT NULL, + description character varying, + visibility integer DEFAULT 0, + team_id bigint, + created_by_id bigint, + last_modified_by_id bigint, + created_at timestamp(6) without time zone NOT NULL, + updated_at timestamp(6) without time zone NOT NULL +); + + +-- +-- Name: my_module_status_flows_id_seq; Type: SEQUENCE; Schema: public; Owner: - +-- + +CREATE SEQUENCE public.my_module_status_flows_id_seq + START WITH 1 + INCREMENT BY 1 + NO MINVALUE + NO MAXVALUE + CACHE 1; + + +-- +-- Name: my_module_status_flows_id_seq; Type: SEQUENCE OWNED BY; Schema: public; Owner: - +-- + +ALTER SEQUENCE public.my_module_status_flows_id_seq OWNED BY public.my_module_status_flows.id; + + +-- +-- Name: my_module_status_implications; Type: TABLE; Schema: public; Owner: - +-- + +CREATE TABLE public.my_module_status_implications ( + id bigint NOT NULL, + my_module_status_id bigint, + type character varying, + created_at timestamp(6) without time zone NOT NULL, + updated_at timestamp(6) without time zone NOT NULL +); + + +-- +-- Name: my_module_status_implications_id_seq; Type: SEQUENCE; Schema: public; Owner: - +-- + +CREATE SEQUENCE public.my_module_status_implications_id_seq + START WITH 1 + INCREMENT BY 1 + NO MINVALUE + NO MAXVALUE + CACHE 1; + + +-- +-- Name: my_module_status_implications_id_seq; Type: SEQUENCE OWNED BY; Schema: public; Owner: - +-- + +ALTER SEQUENCE public.my_module_status_implications_id_seq OWNED BY public.my_module_status_implications.id; + + +-- +-- Name: my_module_statuses; Type: TABLE; Schema: public; Owner: - +-- + +CREATE TABLE public.my_module_statuses ( + id bigint NOT NULL, + name character varying NOT NULL, + description character varying, + color character varying NOT NULL, + my_module_status_flow_id bigint, + previous_status_id bigint, + created_by_id bigint, + last_modified_by_id bigint, + created_at timestamp(6) without time zone NOT NULL, + updated_at timestamp(6) without time zone NOT NULL +); + + +-- +-- Name: my_module_statuses_id_seq; Type: SEQUENCE; Schema: public; Owner: - +-- + +CREATE SEQUENCE public.my_module_statuses_id_seq + START WITH 1 + INCREMENT BY 1 + NO MINVALUE + NO MAXVALUE + CACHE 1; + + +-- +-- Name: my_module_statuses_id_seq; Type: SEQUENCE OWNED BY; Schema: public; Owner: - +-- + +ALTER SEQUENCE public.my_module_statuses_id_seq OWNED BY public.my_module_statuses.id; + + -- -- Name: my_module_tags; Type: TABLE; Schema: public; Owner: - -- @@ -681,7 +850,8 @@ CREATE TABLE public.my_modules ( experiment_id bigint DEFAULT 0 NOT NULL, state smallint DEFAULT 0, completed_on timestamp without time zone, - started_on timestamp without time zone + started_on timestamp without time zone, + my_module_status_id bigint ); @@ -2945,6 +3115,41 @@ ALTER TABLE ONLY public.my_module_groups ALTER COLUMN id SET DEFAULT nextval('pu ALTER TABLE ONLY public.my_module_repository_rows ALTER COLUMN id SET DEFAULT nextval('public.my_module_repository_rows_id_seq'::regclass); +-- +-- Name: my_module_status_conditions id; Type: DEFAULT; Schema: public; Owner: - +-- + +ALTER TABLE ONLY public.my_module_status_conditions ALTER COLUMN id SET DEFAULT nextval('public.my_module_status_conditions_id_seq'::regclass); + + +-- +-- Name: my_module_status_consequences id; Type: DEFAULT; Schema: public; Owner: - +-- + +ALTER TABLE ONLY public.my_module_status_consequences ALTER COLUMN id SET DEFAULT nextval('public.my_module_status_consequences_id_seq'::regclass); + + +-- +-- Name: my_module_status_flows id; Type: DEFAULT; Schema: public; Owner: - +-- + +ALTER TABLE ONLY public.my_module_status_flows ALTER COLUMN id SET DEFAULT nextval('public.my_module_status_flows_id_seq'::regclass); + + +-- +-- Name: my_module_status_implications id; Type: DEFAULT; Schema: public; Owner: - +-- + +ALTER TABLE ONLY public.my_module_status_implications ALTER COLUMN id SET DEFAULT nextval('public.my_module_status_implications_id_seq'::regclass); + + +-- +-- Name: my_module_statuses id; Type: DEFAULT; Schema: public; Owner: - +-- + +ALTER TABLE ONLY public.my_module_statuses ALTER COLUMN id SET DEFAULT nextval('public.my_module_statuses_id_seq'::regclass); + + -- -- Name: my_module_tags id; Type: DEFAULT; Schema: public; Owner: - -- @@ -3506,6 +3711,46 @@ ALTER TABLE ONLY public.my_module_repository_rows ADD CONSTRAINT my_module_repository_rows_pkey PRIMARY KEY (id); +-- +-- Name: my_module_status_conditions my_module_status_conditions_pkey; Type: CONSTRAINT; Schema: public; Owner: - +-- + +ALTER TABLE ONLY public.my_module_status_conditions + ADD CONSTRAINT my_module_status_conditions_pkey PRIMARY KEY (id); + + +-- +-- Name: my_module_status_consequences my_module_status_consequences_pkey; Type: CONSTRAINT; Schema: public; Owner: - +-- + +ALTER TABLE ONLY public.my_module_status_consequences + ADD CONSTRAINT my_module_status_consequences_pkey PRIMARY KEY (id); + + +-- +-- Name: my_module_status_flows my_module_status_flows_pkey; Type: CONSTRAINT; Schema: public; Owner: - +-- + +ALTER TABLE ONLY public.my_module_status_flows + ADD CONSTRAINT my_module_status_flows_pkey PRIMARY KEY (id); + + +-- +-- Name: my_module_status_implications my_module_status_implications_pkey; Type: CONSTRAINT; Schema: public; Owner: - +-- + +ALTER TABLE ONLY public.my_module_status_implications + ADD CONSTRAINT my_module_status_implications_pkey PRIMARY KEY (id); + + +-- +-- Name: my_module_statuses my_module_statuses_pkey; Type: CONSTRAINT; Schema: public; Owner: - +-- + +ALTER TABLE ONLY public.my_module_statuses + ADD CONSTRAINT my_module_statuses_pkey PRIMARY KEY (id); + + -- -- Name: my_module_tags my_module_tags_pkey; Type: CONSTRAINT; Schema: public; Owner: - -- @@ -4361,6 +4606,55 @@ CREATE INDEX index_my_module_ids_repository_row_ids ON public.my_module_reposito CREATE INDEX index_my_module_repository_rows_on_repository_row_id ON public.my_module_repository_rows USING btree (repository_row_id); +-- +-- Name: index_my_module_status_conditions_on_my_module_status_id; Type: INDEX; Schema: public; Owner: - +-- + +CREATE INDEX index_my_module_status_conditions_on_my_module_status_id ON public.my_module_status_conditions USING btree (my_module_status_id); + + +-- +-- Name: index_my_module_status_consequences_on_my_module_status_id; Type: INDEX; Schema: public; Owner: - +-- + +CREATE INDEX index_my_module_status_consequences_on_my_module_status_id ON public.my_module_status_consequences USING btree (my_module_status_id); + + +-- +-- Name: index_my_module_status_flows_on_team_id; Type: INDEX; Schema: public; Owner: - +-- + +CREATE INDEX index_my_module_status_flows_on_team_id ON public.my_module_status_flows USING btree (team_id); + + +-- +-- Name: index_my_module_status_flows_on_visibility; Type: INDEX; Schema: public; Owner: - +-- + +CREATE INDEX index_my_module_status_flows_on_visibility ON public.my_module_status_flows USING btree (visibility); + + +-- +-- Name: index_my_module_status_implications_on_my_module_status_id; Type: INDEX; Schema: public; Owner: - +-- + +CREATE INDEX index_my_module_status_implications_on_my_module_status_id ON public.my_module_status_implications USING btree (my_module_status_id); + + +-- +-- Name: index_my_module_statuses_on_my_module_status_flow_id; Type: INDEX; Schema: public; Owner: - +-- + +CREATE INDEX index_my_module_statuses_on_my_module_status_flow_id ON public.my_module_statuses USING btree (my_module_status_flow_id); + + +-- +-- Name: index_my_module_statuses_on_previous_status_id; Type: INDEX; Schema: public; Owner: - +-- + +CREATE UNIQUE INDEX index_my_module_statuses_on_previous_status_id ON public.my_module_statuses USING btree (previous_status_id); + + -- -- Name: index_my_module_tags_on_created_by_id; Type: INDEX; Schema: public; Owner: - -- @@ -4424,6 +4718,13 @@ CREATE INDEX index_my_modules_on_last_modified_by_id ON public.my_modules USING CREATE INDEX index_my_modules_on_my_module_group_id ON public.my_modules USING btree (my_module_group_id); +-- +-- Name: index_my_modules_on_my_module_status_id; Type: INDEX; Schema: public; Owner: - +-- + +CREATE INDEX index_my_modules_on_my_module_status_id ON public.my_modules USING btree (my_module_status_id); + + -- -- Name: index_my_modules_on_name; Type: INDEX; Schema: public; Owner: - -- @@ -6035,6 +6336,14 @@ ALTER TABLE ONLY public.oauth_access_grants ADD CONSTRAINT fk_rails_330c32d8d9 FOREIGN KEY (resource_owner_id) REFERENCES public.users(id); +-- +-- Name: my_module_statuses fk_rails_357ee33309; Type: FK CONSTRAINT; Schema: public; Owner: - +-- + +ALTER TABLE ONLY public.my_module_statuses + ADD CONSTRAINT fk_rails_357ee33309 FOREIGN KEY (last_modified_by_id) REFERENCES public.users(id); + + -- -- Name: experiments fk_rails_35ad21e487; Type: FK CONSTRAINT; Schema: public; Owner: - -- @@ -6539,6 +6848,14 @@ ALTER TABLE ONLY public.results ADD CONSTRAINT fk_rails_9be849c454 FOREIGN KEY (archived_by_id) REFERENCES public.users(id); +-- +-- Name: my_module_status_flows fk_rails_9c3936bd7a; Type: FK CONSTRAINT; Schema: public; Owner: - +-- + +ALTER TABLE ONLY public.my_module_status_flows + ADD CONSTRAINT fk_rails_9c3936bd7a FOREIGN KEY (last_modified_by_id) REFERENCES public.users(id); + + -- -- Name: repository_status_values fk_rails_9d357798c5; Type: FK CONSTRAINT; Schema: public; Owner: - -- @@ -6619,6 +6936,14 @@ ALTER TABLE ONLY public.repository_status_values ADD CONSTRAINT fk_rails_a3a2aede5b FOREIGN KEY (repository_status_item_id) REFERENCES public.repository_status_items(id); +-- +-- Name: my_module_statuses fk_rails_a3f7cd509a; Type: FK CONSTRAINT; Schema: public; Owner: - +-- + +ALTER TABLE ONLY public.my_module_statuses + ADD CONSTRAINT fk_rails_a3f7cd509a FOREIGN KEY (previous_status_id) REFERENCES public.my_module_statuses(id); + + -- -- Name: result_assets fk_rails_a418904d39; Type: FK CONSTRAINT; Schema: public; Owner: - -- @@ -6667,6 +6992,14 @@ ALTER TABLE ONLY public.repository_list_items ADD CONSTRAINT fk_rails_ace46bca57 FOREIGN KEY (repository_column_id) REFERENCES public.repository_columns(id); +-- +-- Name: my_module_statuses fk_rails_b024d15104; Type: FK CONSTRAINT; Schema: public; Owner: - +-- + +ALTER TABLE ONLY public.my_module_statuses + ADD CONSTRAINT fk_rails_b024d15104 FOREIGN KEY (created_by_id) REFERENCES public.users(id); + + -- -- Name: protocols fk_rails_b2c86b4f11; Type: FK CONSTRAINT; Schema: public; Owner: - -- @@ -6707,6 +7040,14 @@ ALTER TABLE ONLY public.repository_asset_values ADD CONSTRAINT fk_rails_bb983a4d66 FOREIGN KEY (created_by_id) REFERENCES public.users(id); +-- +-- Name: my_module_status_flows fk_rails_c19dc6b9e9; Type: FK CONSTRAINT; Schema: public; Owner: - +-- + +ALTER TABLE ONLY public.my_module_status_flows + ADD CONSTRAINT fk_rails_c19dc6b9e9 FOREIGN KEY (created_by_id) REFERENCES public.users(id); + + -- -- Name: sample_types fk_rails_c227b918b2; Type: FK CONSTRAINT; Schema: public; Owner: - -- @@ -7267,6 +7608,7 @@ INSERT INTO "schema_migrations" (version) VALUES ('20200331183640'), ('20200603125407'), ('20200604210943'), -('20200622155632'); +('20200622155632'), +('20200713142353'); diff --git a/spec/factories/my_module_status_flows.rb b/spec/factories/my_module_status_flows.rb new file mode 100644 index 000000000..1112c8dea --- /dev/null +++ b/spec/factories/my_module_status_flows.rb @@ -0,0 +1,12 @@ +# frozen_string_literal: true + +FactoryBot.define do + factory :my_module_status_flow do + name { Faker::Name.unique.name } + description { Faker::Lorem.sentence } + trait :in_team do + team { create :team } + visibility { :in_team } + end + end +end diff --git a/spec/factories/my_module_statuses.rb b/spec/factories/my_module_statuses.rb new file mode 100644 index 000000000..42a6d86eb --- /dev/null +++ b/spec/factories/my_module_statuses.rb @@ -0,0 +1,10 @@ +# frozen_string_literal: true + +FactoryBot.define do + factory :my_module_status do + name { Faker::Name.unique.name } + description { Faker::Lorem.sentence } + color { Faker::Color.hex_color } + my_module_status_flow + end +end diff --git a/spec/models/my_module_spec.rb b/spec/models/my_module_spec.rb index 2dcd8e920..805a4cfc9 100644 --- a/spec/models/my_module_spec.rb +++ b/spec/models/my_module_spec.rb @@ -36,6 +36,7 @@ describe MyModule, type: :model do it { should have_db_column :state } it { should have_db_column :completed_on } it { should have_db_column :started_on } + it { should have_db_column :my_module_status_flow_id } end describe 'Relations' do diff --git a/spec/models/my_module_status_flow_spec.rb b/spec/models/my_module_status_flow_spec.rb new file mode 100644 index 000000000..1c2976e4c --- /dev/null +++ b/spec/models/my_module_status_flow_spec.rb @@ -0,0 +1,49 @@ +# frozen_string_literal: true + +require 'rails_helper' + +describe MyModuleStatusFlow, type: :model do + let(:my_module_global_workflow) { build :my_module_status_flow } + let(:my_module_team_workflow) { build :my_module_status_flow, :in_team } + + it 'is valid' do + expect(my_module_global_workflow).to be_valid + end + + it 'should be of class MyModuleStatusFlow' do + expect(subject.class).to eq MyModuleStatusFlow + end + + describe 'Database table' do + it { should have_db_column :name } + it { should have_db_column :description } + it { should have_db_column :visibility } + it { should have_db_column :created_by_id } + it { should have_db_column :last_modified_by_id } + it { should have_db_column :created_at } + it { should have_db_column :updated_at } + end + + describe 'Relations' do + it { should have_many(:my_module_statuses).dependent(:destroy) } + end + + describe 'Validations' do + describe '#visibility' do + it { is_expected.to validate_presence_of :visibility } + end + + describe '#name' do + it { is_expected.to validate_length_of(:name).is_at_most(Constants::NAME_MAX_LENGTH) } + it { expect(my_module_team_workflow).to validate_uniqueness_of(:name).scoped_to(:team_id).case_insensitive } + end + + describe '#description' do + it { is_expected.to validate_length_of(:description).is_at_most(Constants::TEXT_MAX_LENGTH) } + end + + describe '#team' do + it { expect(my_module_team_workflow).to validate_presence_of :team } + end + end +end diff --git a/spec/models/my_module_status_spec.rb b/spec/models/my_module_status_spec.rb new file mode 100644 index 000000000..bdefb0c76 --- /dev/null +++ b/spec/models/my_module_status_spec.rb @@ -0,0 +1,45 @@ +# frozen_string_literal: true + +require 'rails_helper' + +describe MyModuleStatus, type: :model do + let(:my_module_status) { build :my_module_status } + + it 'is valid' do + expect(my_module_status).to be_valid + end + + it 'should be of class MyModuleStatus' do + expect(subject.class).to eq MyModuleStatus + end + + describe 'Database table' do + it { should have_db_column :name } + it { should have_db_column :description } + it { should have_db_column :color } + it { should have_db_column :my_module_status_flow_id } + it { should have_db_column :created_by_id } + it { should have_db_column :last_modified_by_id } + it { should have_db_column :previous_status_id } + it { should have_db_column :created_at } + it { should have_db_column :updated_at } + end + + describe 'Relations' do + it { should belong_to :my_module_status_flow } + it { should have_many(:my_modules).dependent(:nullify) } + it { should have_many(:my_module_status_conditions).dependent(:destroy) } + it { should have_many(:my_module_status_consequences).dependent(:destroy) } + it { should have_many(:my_module_status_implications).dependent(:destroy) } + end + + describe 'Validations' do + describe '#name' do + it { is_expected.to validate_length_of(:name).is_at_most(Constants::NAME_MAX_LENGTH) } + end + + describe '#description' do + it { is_expected.to validate_length_of(:description).is_at_most(Constants::TEXT_MAX_LENGTH) } + end + end +end From fa62b33a42dd1b65984d165152b9a1e5ce973a2a Mon Sep 17 00:00:00 2001 From: Oleksii Kriuchykhin Date: Tue, 21 Jul 2020 16:00:09 +0200 Subject: [PATCH 003/163] Add status implications checks to the permissions [SCI-4825] --- app/models/my_module.rb | 4 ++-- .../my_module_status_implications/read_only.rb | 1 + app/permissions/experiment.rb | 17 +++++++++++++++-- app/permissions/project.rb | 9 ++++++++- 4 files changed, 26 insertions(+), 5 deletions(-) diff --git a/app/models/my_module.rb b/app/models/my_module.rb index a51059df4..f682ee7d6 100644 --- a/app/models/my_module.rb +++ b/app/models/my_module.rb @@ -533,9 +533,9 @@ class MyModule < ApplicationRecord end def assign_default_status_flow - return unless MyModuleFlow.global.any? + return unless MyModuleStatusFlow.global.any? - self.my_module_status = MyModuleFlow.global.first.initial_status + self.my_module_status = MyModuleStatusFlow.global.first.initial_status end def check_status_conditions diff --git a/app/models/my_module_status_implications/read_only.rb b/app/models/my_module_status_implications/read_only.rb index 2d69d2d4b..df9c5a2a2 100644 --- a/app/models/my_module_status_implications/read_only.rb +++ b/app/models/my_module_status_implications/read_only.rb @@ -5,6 +5,7 @@ module MyModuleStatusImplications class ReadOnly < MyModuleStatusImplication def call(my_module) my_module.errors.add(:status_implication, 'Is read only') + false end end end diff --git a/app/permissions/experiment.rb b/app/permissions/experiment.rb index ec4909f27..327a75beb 100644 --- a/app/permissions/experiment.rb +++ b/app/permissions/experiment.rb @@ -25,7 +25,14 @@ Canaid::Permissions.register_for(Experiment) do # module: create, copy, reposition, create/update/delete connection, # assign/reassign/unassign tags can :manage_experiment do |user, experiment| - user.is_user_or_higher_of_project?(experiment.project) + user.is_user_or_higher_of_project?(experiment.project) && + MyModule.joins(:experiment).where(experiment: experiment).all? do |my_module| + if my_module.my_module_status + my_module.my_module_status.my_module_status_implications.all? { |implication| implication.call(my_module) } + else + true + end + end end # experiment: archive @@ -56,6 +63,7 @@ end Canaid::Permissions.register_for(MyModule) do # Module, its experiment and its project must be active for all the specified # permissions + # Also checking status implications %i(manage_module manage_users_in_module assign_repository_rows_to_module @@ -68,7 +76,12 @@ Canaid::Permissions.register_for(MyModule) do can perm do |_, my_module| my_module.active? && my_module.experiment.active? && - my_module.experiment.project.active? + my_module.experiment.project.active? && + (if my_module.my_module_status + my_module.my_module_status&.my_module_status_implications&.all? { |implication| implication.call(my_module) } + else + true + end) end end diff --git a/app/permissions/project.rb b/app/permissions/project.rb index 3747d438c..5b026e637 100644 --- a/app/permissions/project.rb +++ b/app/permissions/project.rb @@ -37,7 +37,14 @@ Canaid::Permissions.register_for(Project) do # project: update/delete, assign/reassign/unassign users can :manage_project do |user, project| - user.is_owner_of_project?(project) + user.is_owner_of_project?(project) && + MyModule.joins(experiment: :project).where(experiments: { project: project }).all? do |my_module| + if my_module.my_module_status + my_module.my_module_status.my_module_status_implications.all? { |implication| implication.call(my_module) } + else + true + end + end end # project: archive From 809e0c7d774e3452b7b03721a867bd8fbe386341 Mon Sep 17 00:00:00 2001 From: Oleksii Kriuchykhin Date: Tue, 21 Jul 2020 16:20:19 +0200 Subject: [PATCH 004/163] Fix tests for MyModule [SCI_4825] --- spec/models/my_module_spec.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spec/models/my_module_spec.rb b/spec/models/my_module_spec.rb index 805a4cfc9..9deb8281b 100644 --- a/spec/models/my_module_spec.rb +++ b/spec/models/my_module_spec.rb @@ -36,7 +36,7 @@ describe MyModule, type: :model do it { should have_db_column :state } it { should have_db_column :completed_on } it { should have_db_column :started_on } - it { should have_db_column :my_module_status_flow_id } + it { should have_db_column :my_module_status_id } end describe 'Relations' do From aacee14fc612cce377ad13a078e8fcca47f1e11f Mon Sep 17 00:00:00 2001 From: Urban Rotnik Date: Tue, 14 Jul 2020 11:24:33 +0200 Subject: [PATCH 005/163] Add Status button --- .../my_modules/protocols/index.scss | 34 +++++++++++++++++++ .../stylesheets/my_modules/status_flow.scss | 21 ++++++++++++ .../shared_styles/elements/dropdown.scss | 2 +- .../_state_button_complete.html.erb | 4 --- .../_state_button_uncomplete.html.erb | 4 --- app/views/my_modules/_state_buttons.html.erb | 32 +++++++++++++++-- app/views/my_modules/protocols.html.erb | 9 ++--- 7 files changed, 91 insertions(+), 15 deletions(-) create mode 100644 app/assets/stylesheets/my_modules/status_flow.scss delete mode 100644 app/views/my_modules/_state_button_complete.html.erb delete mode 100644 app/views/my_modules/_state_button_uncomplete.html.erb diff --git a/app/assets/stylesheets/my_modules/protocols/index.scss b/app/assets/stylesheets/my_modules/protocols/index.scss index c25da1795..e84703f3d 100644 --- a/app/assets/stylesheets/my_modules/protocols/index.scss +++ b/app/assets/stylesheets/my_modules/protocols/index.scss @@ -499,6 +499,26 @@ } } +.task-information { + column-gap: 1em; + display: grid; + grid-template-columns: auto max-content; + + .task-section-header { + grid-column: 1 / span 1; + } + + .task-details { + grid-column: 1 / span 1; + grid-row: 2 / span 1; + } + + .task-flows { + grid-column: 2 / span 1; + grid-row: 1 / span 2; + } +} + @media (max-width: 700px) { .my-module-protocol-status { .status-info-dropdown { @@ -514,4 +534,18 @@ } } } + + .task-information { + grid-template-columns: auto; + row-gap: .5em; + + .task-details { + grid-row: 3 / span 1; + } + + .task-flows { + grid-column: unset; + grid-row: 2 / span 1; + } + } } diff --git a/app/assets/stylesheets/my_modules/status_flow.scss b/app/assets/stylesheets/my_modules/status_flow.scss new file mode 100644 index 000000000..1f9e8bed4 --- /dev/null +++ b/app/assets/stylesheets/my_modules/status_flow.scss @@ -0,0 +1,21 @@ +// scss-lint:disable SelectorDepth +// scss-lint:disable NestingDepth +// scss-lint:disable SelectorFormat +// scss-lint:disable ImportantRule + +@import "constants"; +@import "mixins"; + +.content-pane.my-modules-protocols-index { + .status-flow-dropdown { + .dropdown-toggle { + color: $color-white; + text-align: left; + width: 15em; + + .caret { + margin: 8px 0; + } + } + } +} diff --git a/app/assets/stylesheets/shared_styles/elements/dropdown.scss b/app/assets/stylesheets/shared_styles/elements/dropdown.scss index e8043ced5..666e6eab1 100644 --- a/app/assets/stylesheets/shared_styles/elements/dropdown.scss +++ b/app/assets/stylesheets/shared_styles/elements/dropdown.scss @@ -12,7 +12,7 @@ border-color: $brand-focus; .caret { - transform: rotateX(180deg) + transform: rotateX(180deg); } } diff --git a/app/views/my_modules/_state_button_complete.html.erb b/app/views/my_modules/_state_button_complete.html.erb deleted file mode 100644 index 9ef59cff1..000000000 --- a/app/views/my_modules/_state_button_complete.html.erb +++ /dev/null @@ -1,4 +0,0 @@ - diff --git a/app/views/my_modules/_state_button_uncomplete.html.erb b/app/views/my_modules/_state_button_uncomplete.html.erb deleted file mode 100644 index bd4ca47aa..000000000 --- a/app/views/my_modules/_state_button_uncomplete.html.erb +++ /dev/null @@ -1,4 +0,0 @@ - \ No newline at end of file diff --git a/app/views/my_modules/_state_buttons.html.erb b/app/views/my_modules/_state_buttons.html.erb index b00ea460e..fdca3451e 100644 --- a/app/views/my_modules/_state_buttons.html.erb +++ b/app/views/my_modules/_state_buttons.html.erb @@ -1,5 +1,33 @@ -
- <% if can_complete_module?(@my_module) %> + +
+
Status
+
+ +
    +
  • + <%= t('my_modules.protocol.options_dropdown.load_from_repo') %> +
    • +
  • + <%= t('my_modules.protocol.options_dropdown.import') %> +
    • +
  • + <%= t('my_modules.protocol.options_dropdown.export') %> +
    • +
  • + <%= t('my_modules.protocol.options_dropdown.save_to_repo') %> +
    • +
+
+ <% if false && can_complete_module?(@my_module) %>
<% if !@my_module.completed? %>
diff --git a/app/views/my_modules/protocols.html.erb b/app/views/my_modules/protocols.html.erb index 0a985c580..81b0b2230 100644 --- a/app/views/my_modules/protocols.html.erb +++ b/app/views/my_modules/protocols.html.erb @@ -6,7 +6,7 @@
-
+

@@ -20,13 +20,14 @@

-
- <%= render partial: "my_modules/state_buttons.html.erb" %> -
+
<%= render partial: "my_module_details" %>
+
+ <%= render partial: "my_modules/state_buttons.html.erb" %> +
-
-
- - <%= t('my_modules.states.state_label') %> -
- - <%= render partial: "module_state_label.html.erb", - locals: { my_module: @my_module } %> - -
-
diff --git a/app/views/my_modules/_state_buttons.html.erb b/app/views/my_modules/_state_buttons.html.erb deleted file mode 100644 index fdca3451e..000000000 --- a/app/views/my_modules/_state_buttons.html.erb +++ /dev/null @@ -1,44 +0,0 @@ - -
-
Status
-
- -
    -
  • - <%= t('my_modules.protocol.options_dropdown.load_from_repo') %> -
    • -
  • - <%= t('my_modules.protocol.options_dropdown.import') %> -
    • -
  • - <%= t('my_modules.protocol.options_dropdown.export') %> -
    • -
  • - <%= t('my_modules.protocol.options_dropdown.save_to_repo') %> -
    • -
-
- <% if false && can_complete_module?(@my_module) %> -
- <% if !@my_module.completed? %> -
- <%= render 'my_modules/state_button_complete.html.erb' %> -
- <% else @my_module.completed? %> -
- <%= render 'my_modules/state_button_uncomplete.html.erb' %> -
- <% end %> -
- <% end %> - -
diff --git a/app/views/my_modules/protocols.html.erb b/app/views/my_modules/protocols.html.erb index 81b0b2230..a8ddfe7e0 100644 --- a/app/views/my_modules/protocols.html.erb +++ b/app/views/my_modules/protocols.html.erb @@ -23,10 +23,10 @@
- <%= render partial: "my_module_details" %> + <%= render partial: 'my_module_details' %>
- <%= render partial: "my_modules/state_buttons.html.erb" %> + <%= render partial: 'my_modules/status_flow/task_flow_button', locals: { my_module: @my_module } if @my_module.my_module_status_flow %>
@@ -119,9 +119,6 @@ <%= render partial: "protocols/import_export/import_elements.html.erb" %> - -<%= render partial: 'my_modules/complete_task_modal.html.erb' %> - <%= render partial: 'assets/wopi/create_wopi_file_modal.html.erb' %> diff --git a/app/views/my_modules/status_flow/_task_flow_button.html.erb b/app/views/my_modules/status_flow/_task_flow_button.html.erb new file mode 100644 index 000000000..744b7d7da --- /dev/null +++ b/app/views/my_modules/status_flow/_task_flow_button.html.erb @@ -0,0 +1,31 @@ +<% status = my_module.my_module_status %> +
Status
+
+ + +
diff --git a/config/locales/en.yml b/config/locales/en.yml index 5be90d7b2..f4644966e 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -650,12 +650,6 @@ en: import: "Import protocol" export: "Export protocol" save_to_repo: "Save to repository" - buttons: - complete: "Complete task" - uncomplete: "Uncomplete task" - complete_modal: - description: 'You have completed all steps in the task. Would you like to mark entire task as completed?' - leave_uncompleted: 'Leave task in progress' description: title: "Edit task %{module} description" label: "Description" @@ -2191,8 +2185,6 @@ en: assign_user_to_team: "%{assigned_user} was added as %{role} to team %{team} by %{assigned_by_user}." unassign_user_from_team: "%{unassigned_user} was removed from team %{team} by %{unassigned_by_user}." task_completed: "%{user} completed task %{module}. %{date} | Project: %{project} | Experiment: %{experiment}" - start_work_on_next_task: "%{user} has completed the task %{module}. You can now start working on the next task in the workflow." - start_work_on_next_task_message: "Project: %{project} | Experiment: %{experiment} | Task: %{my_module}" assets: head_title: diff --git a/config/locales/my_module_statuses/en.yml b/config/locales/my_module_statuses/en.yml new file mode 100644 index 000000000..59656ec9b --- /dev/null +++ b/config/locales/my_module_statuses/en.yml @@ -0,0 +1,5 @@ +en: + my_module_statuses: + update_status: + error: + no_permission: 'You dont have permission to change the status' diff --git a/config/routes.rb b/config/routes.rb index 063c5da22..40c4ada1a 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -18,28 +18,6 @@ Rails.application.routes.draw do root 'dashboards#show' - # # Client APP endpoints - # get '/settings', to: 'client_api/settings#index' - # get '/settings/*all', to: 'client_api/settings#index' - # - # namespace :client_api, defaults: { format: 'json' } do - # post '/premissions', to: 'permissions#status' - # %i(activities teams notifications users configurations).each do |path| - # draw path - # end - # end - - # Save sample table state - # post '/state_save/:team_id/:user_id', - # to: 'user_samples#save_samples_table_status', - # as: 'save_samples_table_status', - # defaults: { format: 'json' } - # - # post '/state_load/:team_id/:user_id', - # to: 'user_samples#load_samples_table_status', - # as: 'load_samples_table_status', - # defaults: { format: 'json' } - resources :activities, only: [:index] get 'forbidden', to: 'application#forbidden', as: 'forbidden' @@ -187,18 +165,7 @@ Rails.application.routes.draw do end end end - # resources :samples, only: [:new, :create] - # resources :sample_types, except: [:show, :new] do - # get 'sample_type_element', to: 'sample_types#sample_type_element' - # get 'destroy_confirmation', to: 'sample_types#destroy_confirmation' - # end - # resources :sample_groups, except: [:show, :new] do - # get 'sample_group_element', to: 'sample_groups#sample_group_element' - # get 'destroy_confirmation', to: 'sample_groups#destroy_confirmation' - # end - # resources :custom_fields, only: [:create, :edit, :update, :destroy] do - # get 'destroy_html' - # end + member do post 'parse_sheet', defaults: { format: 'json' } post 'export_repository', to: 'repositories#export_repository' @@ -425,11 +392,10 @@ Rails.application.routes.draw do patch 'protocol_description', to: 'my_modules#update_protocol_description', as: 'update_protocol_description' + patch 'state', to: 'my_modules#update_state', as: 'update_state' get 'protocols' # Protocols view for single module get 'results' # Results view for single module get 'archive' # Archive view for single module - get 'complete_my_module' - post 'toggle_task_state' end # Those routes are defined outside of member block diff --git a/spec/controllers/my_modules_controller_spec.rb b/spec/controllers/my_modules_controller_spec.rb index 288f1d8dc..dfd78dd4d 100644 --- a/spec/controllers/my_modules_controller_spec.rb +++ b/spec/controllers/my_modules_controller_spec.rb @@ -123,39 +123,75 @@ describe MyModulesController, type: :controller do end end - describe 'POST toggle_task_state' do - let(:action) { post :toggle_task_state, params: params, format: :json } - let(:params) { { id: my_module.id } } + describe 'PUT update_state' do + let(:action) { put :update_state, params: params, format: :json } + let(:my_module_id) { my_module.id } + let(:status_id) { 'some-state-id' } + let(:params) do + { id: my_module_id, + status_id: status_id} + end + let(:my_module_status_flow) { create :my_module_status_flow, :in_team, team: team} + let(:status1) {create :my_module_status, my_module_status_flow: my_module_status_flow} + let(:status2) {create :my_module_status, my_module_status_flow: my_module_status_flow} - context 'when completing task' do - let(:my_module) do - create :my_module, state: 'uncompleted', experiment: experiment + context 'when states updated' do + let(:status_id) { status2.id } + + before do + my_module.update(my_module_status: status1) end - it 'calls create activity for completing task' do - expect(Activities::CreateActivityService) - .to(receive(:call) - .with(hash_including(activity_type: :complete_task))) + it 'changes status' do action + + expect(my_module.reload.my_module_status.name).to be_eql(status2.name) + expect(response).to have_http_status 200 end end - context 'when uncompleting task' do - let(:my_module) do - create :my_module, state: 'completed', experiment: experiment + context 'when status not found' do + let(:status_id) { -1 } + + before do + my_module.update(my_module_status: status1) end - it 'calls create activity for uncompleting task' do - expect(Activities::CreateActivityService) - .to(receive(:call) - .with(hash_including(activity_type: :uncomplete_task))) + it 'renders 404' do action + + expect(response).to have_http_status 404 end end - it 'adds activity in DB' do - expect { action } - .to(change { Activity.count }) + context 'when my_module does not have assign flow yet' do + let(:status_id) { -1 } + + it 'renders 404' do + action + + expect(response).to have_http_status 404 + end + end + + context 'when user does not have permissions' do + it 'renders 403' do + # Remove user from project + UserProject.where(user: user, project: project).destroy_all + action + + expect(response).to have_http_status 403 + end + end + + context 'when my_module not found' do + let(:my_module_id) { -1 } + + it 'renders 404' do + action + + expect(response).to have_http_status 404 + end end end end From 6bb760c0a9006ececd44f59b0cc7d985b0a9cefb Mon Sep 17 00:00:00 2001 From: Urban Rotnik Date: Wed, 22 Jul 2020 16:50:10 +0200 Subject: [PATCH 007/163] Remove cucumber test for complete/uncomplete step --- app/models/my_module_status.rb | 2 +- features/protocol.feature | 13 ------------- 2 files changed, 1 insertion(+), 14 deletions(-) diff --git a/app/models/my_module_status.rb b/app/models/my_module_status.rb index f153c7fe2..2fc836a89 100644 --- a/app/models/my_module_status.rb +++ b/app/models/my_module_status.rb @@ -29,7 +29,7 @@ class MyModuleStatus < ApplicationRecord def final_status? my_module_status_flow.final_status == self end - + private def next_in_same_flow diff --git a/features/protocol.feature b/features/protocol.feature index 524cbed43..3009eaf27 100644 --- a/features/protocol.feature +++ b/features/protocol.feature @@ -105,16 +105,3 @@ Given default screen size2 And I fill in "I will go to Krn one day." in "#my_module_description_textarea" rich text editor field And I click element with css ".tinymce-save-button" Then I should see "I will go to Krn one day." - -@javascript - Scenario: Successful Complete task - Given I'm on the Protocols page of a "Experiment design" task - And I click "Complete task" button - Then I should see "Uncomplete task" - -@javascript - Scenario: Successful Uncomplete task - Given I'm on the Protocols page of a "Experiment design" task - And I click "Complete task" button - And I click "Uncomplete task" button - Then I should see "Complete task" From a0d19b5d984d022b0d9e6e925375c8c32a7492e9 Mon Sep 17 00:00:00 2001 From: aignatov-bio Date: Thu, 23 Jul 2020 14:24:30 +0200 Subject: [PATCH 008/163] Add new statuses to reports --- app/assets/stylesheets/reports.scss | 19 +++++- app/helpers/reports_helper.rb | 2 +- app/services/reports/docx/draw_my_module.rb | 49 ++++++++++----- .../elements/_my_module_element.html.erb | 60 ++++++++++--------- config/locales/en.yml | 1 + 5 files changed, 84 insertions(+), 47 deletions(-) diff --git a/app/assets/stylesheets/reports.scss b/app/assets/stylesheets/reports.scss index cd23ec5c8..75f0ae59c 100644 --- a/app/assets/stylesheets/reports.scss +++ b/app/assets/stylesheets/reports.scss @@ -279,10 +279,17 @@ label { .module-start-date, .module-due-date { - margin-left: 5px; white-space: nowrap; } + .module-status { + .status-block { + border-radius: $border-radius-tag; + color: $color-white; + padding: 2px 4px; + } + } + .module-tags { margin-left: 0; margin-top: 10px; @@ -387,6 +394,16 @@ label { &:hover > .report-element-body .step-name { color: $brand-primary; } + + .step-label-default { + @include font-h3; + color: $color-alto; + } + + .step-label-success { + @include font-h3; + color: $brand-success; + } } /* Step attachment style (table, asset or checklist) */ diff --git a/app/helpers/reports_helper.rb b/app/helpers/reports_helper.rb index f44f2b5f3..bcffe1a10 100644 --- a/app/helpers/reports_helper.rb +++ b/app/helpers/reports_helper.rb @@ -153,7 +153,7 @@ module ReportsHelper style = 'default' text = t('protocols.steps.uncompleted') end - "#{text}".html_safe + "[#{text}]".html_safe end # Fixes issues with avatar images in reports diff --git a/app/services/reports/docx/draw_my_module.rb b/app/services/reports/docx/draw_my_module.rb index 630ee3b81..b588dfa6d 100644 --- a/app/services/reports/docx/draw_my_module.rb +++ b/app/services/reports/docx/draw_my_module.rb @@ -13,17 +13,6 @@ module Reports::Docx::DrawMyModule @docx.p do text I18n.t('projects.reports.elements.module.user_time', timestamp: I18n.l(my_module.created_at, format: :full)), color: color[:gray] - text ' | ' - if my_module.due_date.present? - text I18n.t('projects.reports.elements.module.due_date', - due_date: I18n.l(my_module.due_date, format: :full)), color: color[:gray] - else - text I18n.t('projects.reports.elements.module.no_due_date'), color: color[:gray] - end - if my_module.completed? - text " #{I18n.t('my_modules.states.completed')}", bold: true, color: color[:green] - text " #{I18n.l(my_module.completed_on, format: :full)}", color: color[:gray] - end if my_module.archived? text ' | ' text I18n.t('search.index.archived'), color: color[:gray] @@ -33,11 +22,32 @@ module Reports::Docx::DrawMyModule scinote_url + Rails.application.routes.url_helpers.protocols_my_module_path(my_module), link_style end - if my_module.description.present? - html = custom_auto_link(my_module.description, team: @report_team) - html_to_word_converter(html) - else - @docx.p I18n.t 'projects.reports.elements.module.no_description' + + @docx.p do + if my_module.started_on.present? + text I18n.t('projects.reports.elements.module.started_on', + started_on: I18n.l(my_module.started_on, format: :full)) + else + text I18n.t('projects.reports.elements.module.no_due_date') + end + end + + @docx.p do + if my_module.due_date.present? + text I18n.t('projects.reports.elements.module.due_date', + due_date: I18n.l(my_module.due_date, format: :full)) + else + text I18n.t('projects.reports.elements.module.no_due_date') + end + end + + status = my_module.my_module_status + @docx.p do + text I18n.t('projects.reports.elements.module.status') + text ' ' + text "[#{status.name}]", color: status.color.delete('#') + text ' ' + text I18n.l(my_module.completed_on, format: :full) end @docx.p do @@ -53,6 +63,13 @@ module Reports::Docx::DrawMyModule end end + if my_module.description.present? + html = custom_auto_link(my_module.description, team: @report_team) + html_to_word_converter(html) + else + @docx.p I18n.t 'projects.reports.elements.module.no_description' + end + @docx.p subject['children'].each do |child| public_send("draw_#{child['type_of']}", child) diff --git a/app/views/reports/elements/_my_module_element.html.erb b/app/views/reports/elements/_my_module_element.html.erb index 88144b42d..dc5f748f2 100644 --- a/app/views/reports/elements/_my_module_element.html.erb +++ b/app/views/reports/elements/_my_module_element.html.erb @@ -24,36 +24,27 @@ <% end %>
-
- <% if my_module.started_on.present? %> - <%= t('projects.reports.elements.module.started_on', started_on: l(my_module.started_on, format: :full)) %> - <% else %> - <%=t "projects.reports.elements.module.no_start_date" %> - <% end %> -
-
- <% if my_module.due_date.present? %> - <%=t "projects.reports.elements.module.due_date", due_date: l(my_module.due_date, format: :full) %> - <% else %> - <%=t "projects.reports.elements.module.no_due_date" %> - <% end %> - <% if my_module.completed? %> - <%= t("my_modules.states.completed") %> - <%= l(my_module.completed_on, format: :full) %> - <% end %> -
-
-
-
- <% if my_module.description.present? %> - <%= custom_auto_link(my_module.prepare_for_report(:description, for_export_all), - team: current_team, - base64_encoded_imgs: for_export_all) %> - <% else %> - <%=t "projects.reports.elements.module.no_description" %> - <% end %> -
+

+ <% if my_module.started_on.present? %> + <%= t('projects.reports.elements.module.started_on', started_on: l(my_module.started_on, format: :full)) %> + <% else %> + <%=t "projects.reports.elements.module.no_start_date" %> + <% end %> +

+

+ <% if my_module.due_date.present? %> + <%=t "projects.reports.elements.module.due_date", due_date: l(my_module.due_date, format: :full) %> + <% else %> + <%=t "projects.reports.elements.module.no_due_date" %> + <% end %> +

+

+ <% status = my_module.my_module_status %> + <%=t "projects.reports.elements.module.status" %> + <%= status.name %> + <%= l(my_module.completed_on, format: :full) %> +

<%=t "projects.reports.elements.module.tags_header" %> @@ -70,6 +61,17 @@
<% end %>
+
+
+ <% if my_module.description.present? %> + <%= custom_auto_link(my_module.prepare_for_report(:description, for_export_all), + team: current_team, + base64_encoded_imgs: for_export_all) %> + <% else %> + <%=t "projects.reports.elements.module.no_description" %> + <% end %> +
+
<%= children if (defined? children and children.present?) %> diff --git a/config/locales/en.yml b/config/locales/en.yml index 5be90d7b2..6f589facb 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -519,6 +519,7 @@ en: module: user_time: "Task created on %{timestamp}." started_on: "Start date: %{started_on}" + status: "Status:" no_start_date: "No start date" due_date: "Due date: %{due_date}" no_due_date: "No due date" From 025378cd0e6827a7636b92866b0f0662c2a983ef Mon Sep 17 00:00:00 2001 From: Urban Rotnik Date: Thu, 23 Jul 2020 15:53:46 +0200 Subject: [PATCH 009/163] Fix translations and JS --- app/assets/javascripts/my_modules.js | 4 ++-- app/controllers/my_modules_controller.rb | 2 +- app/views/my_modules/protocols.html.erb | 2 +- .../my_modules/status_flow/_task_flow_button.html.erb | 8 ++++---- config/locales/my_module_statuses/en.yml | 7 ++++++- spec/controllers/my_modules_controller_spec.rb | 6 ++++-- 6 files changed, 18 insertions(+), 11 deletions(-) diff --git a/app/assets/javascripts/my_modules.js b/app/assets/javascripts/my_modules.js index d7777e6b1..562625293 100644 --- a/app/assets/javascripts/my_modules.js +++ b/app/assets/javascripts/my_modules.js @@ -235,8 +235,8 @@ function applyTaskStatusChangeCallBack() { $.ajax({ url: list.data('link-url'), type: 'PATCH', - contentType: 'application/json', - data: JSON.stringify({ status_id: item.data('state-id') }), + dataType: 'json', + data: { my_module: { status_id: item.data('state-id') } }, success: function(data) { container.html(data.content); animateSpinner(null, false); diff --git a/app/controllers/my_modules_controller.rb b/app/controllers/my_modules_controller.rb index d9c695a0b..3c23679ff 100644 --- a/app/controllers/my_modules_controller.rb +++ b/app/controllers/my_modules_controller.rb @@ -331,7 +331,7 @@ class MyModulesController < ApplicationController end def update_status_params - params.permit(:status_id) + params.require(:my_module).permit(:status_id) end def log_start_date_change_activity(start_date_changes) diff --git a/app/views/my_modules/protocols.html.erb b/app/views/my_modules/protocols.html.erb index a8ddfe7e0..736d54c9f 100644 --- a/app/views/my_modules/protocols.html.erb +++ b/app/views/my_modules/protocols.html.erb @@ -26,7 +26,7 @@ <%= render partial: 'my_module_details' %>
- <%= render partial: 'my_modules/status_flow/task_flow_button', locals: { my_module: @my_module } if @my_module.my_module_status_flow %> + <%= render partial: 'my_modules/status_flow/task_flow_button', locals: { my_module: @my_module } if @my_module.my_module_status_flow && can_change_my_module_flow_status?(@my_module) %>
diff --git a/app/views/my_modules/status_flow/_task_flow_button.html.erb b/app/views/my_modules/status_flow/_task_flow_button.html.erb index 744b7d7da..f4c7ceb41 100644 --- a/app/views/my_modules/status_flow/_task_flow_button.html.erb +++ b/app/views/my_modules/status_flow/_task_flow_button.html.erb @@ -1,5 +1,5 @@ <% status = my_module.my_module_status %> -
Status
+
<%= t('my_module_statuses.dropdown.status_label') %>
diff --git a/config/locales/my_module_statuses/en.yml b/config/locales/my_module_statuses/en.yml index 59656ec9b..e6ac1e5c2 100644 --- a/config/locales/my_module_statuses/en.yml +++ b/config/locales/my_module_statuses/en.yml @@ -1,5 +1,10 @@ en: my_module_statuses: + dropdown: + status_label: Status + move_label: Move to -> + return_label: Return to -> + view_flow_label: View task flow update_status: error: - no_permission: 'You dont have permission to change the status' + no_permission: You dont have permission to change the status diff --git a/spec/controllers/my_modules_controller_spec.rb b/spec/controllers/my_modules_controller_spec.rb index dfd78dd4d..68780086f 100644 --- a/spec/controllers/my_modules_controller_spec.rb +++ b/spec/controllers/my_modules_controller_spec.rb @@ -128,8 +128,10 @@ describe MyModulesController, type: :controller do let(:my_module_id) { my_module.id } let(:status_id) { 'some-state-id' } let(:params) do - { id: my_module_id, - status_id: status_id} + { + id: my_module_id, + my_module: { status_id: status_id } + } end let(:my_module_status_flow) { create :my_module_status_flow, :in_team, team: team} let(:status1) {create :my_module_status, my_module_status_flow: my_module_status_flow} From 6bd12e0397c5968d03b597af51dbd5d9960ac36d Mon Sep 17 00:00:00 2001 From: aignatov-bio Date: Wed, 22 Jul 2020 09:45:56 +0200 Subject: [PATCH 010/163] Add modal for status flow --- .../javascripts/my_modules/status_flow.js | 12 ++++ .../stylesheets/my_modules/status_flow.scss | 67 +++++++++++++++++++ .../my_module_status_flow_controller.rb | 15 +++++ .../modals/_status_flow_modal.html.erb | 14 ++++ .../modals/_status_flow_modal_body.html.erb | 22 ++++++ app/views/my_modules/protocols.html.erb | 4 ++ config/initializers/assets.rb | 1 + config/routes.rb | 3 + 8 files changed, 138 insertions(+) create mode 100644 app/assets/javascripts/my_modules/status_flow.js create mode 100644 app/controllers/my_module_status_flow_controller.rb create mode 100644 app/views/my_modules/modals/_status_flow_modal.html.erb create mode 100644 app/views/my_modules/modals/_status_flow_modal_body.html.erb diff --git a/app/assets/javascripts/my_modules/status_flow.js b/app/assets/javascripts/my_modules/status_flow.js new file mode 100644 index 000000000..0b0e27a18 --- /dev/null +++ b/app/assets/javascripts/my_modules/status_flow.js @@ -0,0 +1,12 @@ +/* global animateSpinner */ + +(function() { + $('#statusFlowModal').on('show.bs.modal', function() { + var $modalBody = $(this).find('.modal-body'); + animateSpinner($modalBody); + $.get($(this).data('status-flow-url'), function(result) { + animateSpinner($modalBody, false); + $modalBody.html(result.html); + }); + }); +}()); diff --git a/app/assets/stylesheets/my_modules/status_flow.scss b/app/assets/stylesheets/my_modules/status_flow.scss index fd4f85d7e..81e8a93f0 100644 --- a/app/assets/stylesheets/my_modules/status_flow.scss +++ b/app/assets/stylesheets/my_modules/status_flow.scss @@ -23,3 +23,70 @@ } } } + + +#statusFlowModal { + .status-flow { + padding: 2em; + + .status-container { + align-items: center; + display: grid; + grid-template-columns: 1fr min-content 1fr; + justify-content: space-around; + position: relative; + + .current-status { + @include font-small; + justify-self: end; + + .fas { + margin: 0 .5em; + } + } + + .status-block { + border-radius: $border-radius-tag; + color: $color-white; + font-weight: bold; + line-height: 1em; + padding: .5em; + white-space: nowrap; + } + + .status-comment { + @include font-small; + color: $color-silver-chalice; + padding-left: .5em; + } + } + + .connector { + background: $color-black; + height: 2em; + margin: 0 auto; + position: relative; + width: 2px; + + &:before, + &:after { + border-left: .2em solid transparent; + border-right: .2em solid transparent; + content: ''; + display: block; + margin-left: -.1em; + position: absolute; + } + + &:before { + border-top: .2em solid $color-black; + top: 0; + } + + &:after { + border-bottom: .2em solid $color-black; + bottom: 0; + } + } + } +} diff --git a/app/controllers/my_module_status_flow_controller.rb b/app/controllers/my_module_status_flow_controller.rb new file mode 100644 index 000000000..e6507e421 --- /dev/null +++ b/app/controllers/my_module_status_flow_controller.rb @@ -0,0 +1,15 @@ +# frozen_string_literal: true + +class MyModuleStatusFlowController < ApplicationController + def show + my_module_status_flow = [ + { name: 'Not started', color: '#406d86', current_status: false, status_comment: nil }, + { name: 'In progress', color: '#0065ff', current_status: true, status_comment: nil }, + { name: 'Completed', color: '#00b900', current_status: false, status_comment: nil }, + { name: 'In review', color: '#ff4500', current_status: false, status_comment: 'Requiers signature' }, + { name: 'Done', color: '#0ecdc0', current_status: false, status_comment: nil } + ] + + render json: { html: render_to_string(partial: 'my_modules/modals/status_flow_modal_body.html.erb', locals: { status_flow: my_module_status_flow }) } + end +end diff --git a/app/views/my_modules/modals/_status_flow_modal.html.erb b/app/views/my_modules/modals/_status_flow_modal.html.erb new file mode 100644 index 000000000..39852bad4 --- /dev/null +++ b/app/views/my_modules/modals/_status_flow_modal.html.erb @@ -0,0 +1,14 @@ + diff --git a/app/views/my_modules/modals/_status_flow_modal_body.html.erb b/app/views/my_modules/modals/_status_flow_modal_body.html.erb new file mode 100644 index 000000000..71782df1a --- /dev/null +++ b/app/views/my_modules/modals/_status_flow_modal_body.html.erb @@ -0,0 +1,22 @@ +
+ <% status_flow.each_with_index do |status, i| %> + + <% unless i.zero? %> +
+ <% end %> + +
+
+ <% if status[:current_status] %> + Current status + <% end %> +
+
+ <%= status[:name] %> +
+
<%= status[:status_comment] %>
+
+ <% end %> + + + diff --git a/app/views/my_modules/protocols.html.erb b/app/views/my_modules/protocols.html.erb index 736d54c9f..4d78e7578 100644 --- a/app/views/my_modules/protocols.html.erb +++ b/app/views/my_modules/protocols.html.erb @@ -119,10 +119,14 @@ <%= render partial: "protocols/import_export/import_elements.html.erb" %> + +<%= render partial: 'my_modules/modals/status_flow_modal.html.erb' %> + <%= render partial: 'assets/wopi/create_wopi_file_modal.html.erb' %> <%= stylesheet_link_tag 'datatables' %> <%= javascript_include_tag("my_modules/protocols") %> +<%= javascript_include_tag("my_modules/status_flow") %> <%= javascript_pack_tag 'emoji_button' %> <%= javascript_include_tag("my_modules/repositories") %> diff --git a/config/initializers/assets.rb b/config/initializers/assets.rb index 188732aef..0ac23b04a 100644 --- a/config/initializers/assets.rb +++ b/config/initializers/assets.rb @@ -34,6 +34,7 @@ Rails.application.config.assets.precompile += Rails.application.config.assets.precompile += %w(my_modules/activities.js) Rails.application.config.assets.precompile += %w(my_modules/protocols.js) Rails.application.config.assets.precompile += %w(my_modules/repositories.js) +Rails.application.config.assets.precompile += %w(my_modules/status_flow.js) Rails.application.config.assets.precompile += %w(my_modules/protocols/protocol_status_bar.js) Rails.application.config.assets.precompile += %w(my_modules/results.js) diff --git a/config/routes.rb b/config/routes.rb index 40c4ada1a..cd5d35305 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -341,6 +341,9 @@ Rails.application.routes.draw do get :index_old end end + + resource :status_flow, controller: :my_module_status_flow, only: :show + resources :my_module_comments, path: '/comments', only: [:index, :create, :edit, :update, :destroy] From 9f7efe606877f65a1945ec8c56a78d03cdb8653e Mon Sep 17 00:00:00 2001 From: aignatov-bio Date: Wed, 22 Jul 2020 11:39:34 +0200 Subject: [PATCH 011/163] Add backend for status flow show --- .../my_module_status_flow_controller.rb | 26 ++++++++++++------- .../modals/_status_flow_modal.html.erb | 4 +-- .../modals/_status_flow_modal_body.html.erb | 6 ++--- config/locales/en.yml | 4 +++ 4 files changed, 26 insertions(+), 14 deletions(-) diff --git a/app/controllers/my_module_status_flow_controller.rb b/app/controllers/my_module_status_flow_controller.rb index e6507e421..e44fbc587 100644 --- a/app/controllers/my_module_status_flow_controller.rb +++ b/app/controllers/my_module_status_flow_controller.rb @@ -1,15 +1,23 @@ # frozen_string_literal: true class MyModuleStatusFlowController < ApplicationController - def show - my_module_status_flow = [ - { name: 'Not started', color: '#406d86', current_status: false, status_comment: nil }, - { name: 'In progress', color: '#0065ff', current_status: true, status_comment: nil }, - { name: 'Completed', color: '#00b900', current_status: false, status_comment: nil }, - { name: 'In review', color: '#ff4500', current_status: false, status_comment: 'Requiers signature' }, - { name: 'Done', color: '#0ecdc0', current_status: false, status_comment: nil } - ] + before_action :load_my_module + before_action :check_view_permissions - render json: { html: render_to_string(partial: 'my_modules/modals/status_flow_modal_body.html.erb', locals: { status_flow: my_module_status_flow }) } + def show + my_module_statuses = @my_module.my_module_status_flow.my_module_statuses + render json: { html: render_to_string(partial: 'my_modules/modals/status_flow_modal_body.html.erb', + locals: { my_module_statuses: my_module_statuses }) } + end + + private + + def load_my_module + @my_module = MyModule.find_by(id: params[:my_module_id]) + render_404 unless @my_module + end + + def check_view_permissions + render_403 unless can_read_experiment?(@my_module.experiment) end end diff --git a/app/views/my_modules/modals/_status_flow_modal.html.erb b/app/views/my_modules/modals/_status_flow_modal.html.erb index 39852bad4..bd16bfc96 100644 --- a/app/views/my_modules/modals/_status_flow_modal.html.erb +++ b/app/views/my_modules/modals/_status_flow_modal.html.erb @@ -3,11 +3,11 @@
-

Task status flow

+

<%= t('my_modules.modals.status_flow_modal.title', status_flow: @my_module.my_module_status_flow.name) %>

- +
diff --git a/app/views/my_modules/modals/_status_flow_modal_body.html.erb b/app/views/my_modules/modals/_status_flow_modal_body.html.erb index 71782df1a..49724efd7 100644 --- a/app/views/my_modules/modals/_status_flow_modal_body.html.erb +++ b/app/views/my_modules/modals/_status_flow_modal_body.html.erb @@ -1,5 +1,5 @@
- <% status_flow.each_with_index do |status, i| %> + <% my_module_statuses.each_with_index do |status, i| %> <% unless i.zero? %>
@@ -7,8 +7,8 @@
- <% if status[:current_status] %> - Current status + <% if status.id == @my_module.my_module_status_id %> + <%= t('my_modules.modals.status_flow_modal.current_status') %> <% end %>
diff --git a/config/locales/en.yml b/config/locales/en.yml index f4644966e..98a96762b 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -823,6 +823,10 @@ en: assign_and_unassign_from_task_and_downstream_html: "Successfully assigned %{assigned_items} and unassigned %{unassigned_items} item(s) from the task and downstream tasks." update_error: "There was an error in updating your item(s)." modals: + status_flow_modal: + title: "Task status flow: %{status_flow}" + current_status: "Current status" + done: "Done" update_repository_record: title: "Update %{repository_name} items to %{my_module_name} task" message: "Do you want to update %{size} items only from this task, or update them from this task & downstream tasks in the workflow also?" From 968249c6d8f2b1f661a36c41f790620ac61ae0af Mon Sep 17 00:00:00 2001 From: aignatov-bio Date: Thu, 23 Jul 2020 15:02:43 +0200 Subject: [PATCH 012/163] Fix tests --- app/views/my_modules/protocols.html.erb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/app/views/my_modules/protocols.html.erb b/app/views/my_modules/protocols.html.erb index 4d78e7578..6a89c4c32 100644 --- a/app/views/my_modules/protocols.html.erb +++ b/app/views/my_modules/protocols.html.erb @@ -120,7 +120,9 @@ <%= render partial: "protocols/import_export/import_elements.html.erb" %> -<%= render partial: 'my_modules/modals/status_flow_modal.html.erb' %> +<% if @my_module.my_module_status_flow %> + <%= render partial: 'my_modules/modals/status_flow_modal.html.erb' %> +<% end %> <%= render partial: 'assets/wopi/create_wopi_file_modal.html.erb' %> From 68fc6ec58af9f60dff44fb3521d07359067388c4 Mon Sep 17 00:00:00 2001 From: aignatov-bio Date: Mon, 27 Jul 2020 16:36:21 +0200 Subject: [PATCH 013/163] Add sorting my module statuses --- .../javascripts/my_modules/status_flow.js | 4 ++++ .../my_module_status_flow_controller.rb | 2 +- app/models/my_module_status.rb | 17 +++++++++++++++++ .../status_flow/_task_flow_button.html.erb | 10 +++++----- 4 files changed, 27 insertions(+), 6 deletions(-) diff --git a/app/assets/javascripts/my_modules/status_flow.js b/app/assets/javascripts/my_modules/status_flow.js index 0b0e27a18..bc283d47b 100644 --- a/app/assets/javascripts/my_modules/status_flow.js +++ b/app/assets/javascripts/my_modules/status_flow.js @@ -1,6 +1,10 @@ /* global animateSpinner */ (function() { + $('.task-flows').on('click', '#viewTaskFlow', function() { + $('#statusFlowModal').modal('show'); + }); + $('#statusFlowModal').on('show.bs.modal', function() { var $modalBody = $(this).find('.modal-body'); animateSpinner($modalBody); diff --git a/app/controllers/my_module_status_flow_controller.rb b/app/controllers/my_module_status_flow_controller.rb index e44fbc587..eb738f8db 100644 --- a/app/controllers/my_module_status_flow_controller.rb +++ b/app/controllers/my_module_status_flow_controller.rb @@ -5,7 +5,7 @@ class MyModuleStatusFlowController < ApplicationController before_action :check_view_permissions def show - my_module_statuses = @my_module.my_module_status_flow.my_module_statuses + my_module_statuses = @my_module.my_module_status_flow.my_module_statuses.sort_by_position render json: { html: render_to_string(partial: 'my_modules/modals/status_flow_modal_body.html.erb', locals: { my_module_statuses: my_module_statuses }) } end diff --git a/app/models/my_module_status.rb b/app/models/my_module_status.rb index 2fc836a89..101606c40 100644 --- a/app/models/my_module_status.rb +++ b/app/models/my_module_status.rb @@ -30,6 +30,23 @@ class MyModuleStatus < ApplicationRecord my_module_status_flow.final_status == self end + def self.sort_by_position(order = :asc) + ordered_statuses, statuses = all.to_a.partition { |i| i.previous_status_id.nil? } + + return [] if ordered_statuses.empty? + + until statuses.empty? + next_element, statuses = statuses.partition { |i| ordered_statuses.last.id == i.previous_status_id } + if next_element.empty? + break + else + ordered_statuses.concat(next_element) + end + end + ordered_statuses = ordered_statuses.reverse if order == :desc + ordered_statuses + end + private def next_in_same_flow diff --git a/app/views/my_modules/status_flow/_task_flow_button.html.erb b/app/views/my_modules/status_flow/_task_flow_button.html.erb index f4c7ceb41..0978b99b6 100644 --- a/app/views/my_modules/status_flow/_task_flow_button.html.erb +++ b/app/views/my_modules/status_flow/_task_flow_button.html.erb @@ -6,7 +6,7 @@ data-toggle="dropdown" aria-haspopup="true" aria-expanded="true" - style="<%= "background-color: ##{status.color}" %>;"> + style="<%= "background-color: #{status.color}" %>;"> <%= status.name %> @@ -14,18 +14,18 @@ <% unless status.initial_status? %> <% previous_s = status.previous_status %>
  • - <%= t 'my_module_statuses.dropdown.return_label' %> "><%= previous_s.name %> + <%= t 'my_module_statuses.dropdown.return_label' %> "><%= previous_s.name %>
    • <% end %> <% unless status.final_status? %> <% next_s = status.next_status %>
  • - <%= t('my_module_statuses.dropdown.move_label') %> "><%= next_s.name %> + <%= t('my_module_statuses.dropdown.move_label') %> "><%= next_s.name %>
    • <% end %> -
  • - <%= t('my_module_statuses.dropdown.view_flow_label') %> +
  • + <%= t('my_module_statuses.dropdown.view_flow_label') %>
    • From b644950e4e85df0501276dc262f109ded4e405c2 Mon Sep 17 00:00:00 2001 From: aignatov-bio Date: Tue, 28 Jul 2020 09:53:35 +0200 Subject: [PATCH 014/163] Fix I18n markup --- app/services/reports/docx/draw_my_module.rb | 8 +++----- .../reports/elements/_my_module_element.html.erb | 15 +++++++-------- 2 files changed, 10 insertions(+), 13 deletions(-) diff --git a/app/services/reports/docx/draw_my_module.rb b/app/services/reports/docx/draw_my_module.rb index b588dfa6d..cf1889102 100644 --- a/app/services/reports/docx/draw_my_module.rb +++ b/app/services/reports/docx/draw_my_module.rb @@ -46,12 +46,10 @@ module Reports::Docx::DrawMyModule text I18n.t('projects.reports.elements.module.status') text ' ' text "[#{status.name}]", color: status.color.delete('#') - text ' ' - text I18n.l(my_module.completed_on, format: :full) end @docx.p do - text I18n.t 'projects.reports.elements.module.tags_header' + text I18n.t('projects.reports.elements.module.tags_header') if tags.any? my_module.tags.each do |tag| text ' ' @@ -59,7 +57,7 @@ module Reports::Docx::DrawMyModule end else text ' ' - text I18n.t 'projects.reports.elements.module.no_tags' + text I18n.t('projects.reports.elements.module.no_tags') end end @@ -67,7 +65,7 @@ module Reports::Docx::DrawMyModule html = custom_auto_link(my_module.description, team: @report_team) html_to_word_converter(html) else - @docx.p I18n.t 'projects.reports.elements.module.no_description' + @docx.p I18n.t('projects.reports.elements.module.no_description') end @docx.p diff --git a/app/views/reports/elements/_my_module_element.html.erb b/app/views/reports/elements/_my_module_element.html.erb index dc5f748f2..0f2527762 100644 --- a/app/views/reports/elements/_my_module_element.html.erb +++ b/app/views/reports/elements/_my_module_element.html.erb @@ -6,7 +6,7 @@
    - <%=t "projects.reports.elements.module.user_time", timestamp: l(timestamp, format: :full) %> + <%= t("projects.reports.elements.module.user_time", timestamp: l(timestamp, format: :full)) %>
    <%= render partial: "reports/elements/element_controls.html.erb", locals: { show_sort: true } %> @@ -29,25 +29,24 @@ <% if my_module.started_on.present? %> <%= t('projects.reports.elements.module.started_on', started_on: l(my_module.started_on, format: :full)) %> <% else %> - <%=t "projects.reports.elements.module.no_start_date" %> + <%= t("projects.reports.elements.module.no_start_date") %> <% end %>

    <% if my_module.due_date.present? %> - <%=t "projects.reports.elements.module.due_date", due_date: l(my_module.due_date, format: :full) %> + <%= t("projects.reports.elements.module.due_date", due_date: l(my_module.due_date, format: :full)) %> <% else %> - <%=t "projects.reports.elements.module.no_due_date" %> + <%= t("projects.reports.elements.module.no_due_date") %> <% end %>

    <% status = my_module.my_module_status %> <%=t "projects.reports.elements.module.status" %> <%= status.name %> - <%= l(my_module.completed_on, format: :full) %>

    - <%=t "projects.reports.elements.module.tags_header" %> + <%= t("projects.reports.elements.module.tags_header") %>
    <% if my_module.tags.any? %> <% my_module.tags.each do |tag| %> @@ -57,7 +56,7 @@ <% end %> <% else %>
    - <%=t "projects.reports.elements.module.no_tags" %> + <%= t("projects.reports.elements.module.no_tags") %>
    <% end %>
    @@ -68,7 +67,7 @@ team: current_team, base64_encoded_imgs: for_export_all) %> <% else %> - <%=t "projects.reports.elements.module.no_description" %> + <%= t("projects.reports.elements.module.no_description") %> <% end %>
    From f09ead703c43f478ad8c7d764d8fd083e63e4ca3 Mon Sep 17 00:00:00 2001 From: aignatov-bio Date: Tue, 28 Jul 2020 09:54:47 +0200 Subject: [PATCH 015/163] Fix markup --- app/views/reports/elements/_my_module_element.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/reports/elements/_my_module_element.html.erb b/app/views/reports/elements/_my_module_element.html.erb index 0f2527762..e8afd6bcb 100644 --- a/app/views/reports/elements/_my_module_element.html.erb +++ b/app/views/reports/elements/_my_module_element.html.erb @@ -41,7 +41,7 @@

    <% status = my_module.my_module_status %> - <%=t "projects.reports.elements.module.status" %> + <%= t("projects.reports.elements.module.status") %> <%= status.name %>

    From 536367362c27ee15ef19c105ec5abb0341f657f3 Mon Sep 17 00:00:00 2001 From: aignatov-bio Date: Fri, 31 Jul 2020 10:59:10 +0200 Subject: [PATCH 016/163] Add statuses to dashboard filters --- .../javascripts/dashboard/current_tasks.js | 18 +++++++----------- .../javascripts/sitewide/dropdown_selector.js | 19 +++++++++++++++---- .../dashboard/current_tasks_controller.rb | 2 +- app/views/dashboards/_current_tasks.html.erb | 17 +++++++++++++---- config/locales/dashboard/en.yml | 6 +++++- 5 files changed, 41 insertions(+), 21 deletions(-) diff --git a/app/assets/javascripts/dashboard/current_tasks.js b/app/assets/javascripts/dashboard/current_tasks.js index 88bbf0a97..7c295925e 100644 --- a/app/assets/javascripts/dashboard/current_tasks.js +++ b/app/assets/javascripts/dashboard/current_tasks.js @@ -3,7 +3,7 @@ var DasboardCurrentTasksWidget = (function() { var sortFilter = '.curent-tasks-filters .sort-filter'; - var viewFilter = '.curent-tasks-filters .view-filter'; + var statusFilter = '.curent-tasks-filters .view-filter'; var projectFilter = '.curent-tasks-filters .project-filter'; var experimentFilter = '.curent-tasks-filters .experiment-filter'; @@ -36,7 +36,7 @@ var DasboardCurrentTasksWidget = (function() { params.project_id = dropdownSelector.getValues(projectFilter); params.experiment_id = dropdownSelector.getValues(experimentFilter); params.sort = dropdownSelector.getValues(sortFilter); - params.view = dropdownSelector.getValues(viewFilter); + params.statuses = dropdownSelector.getValues(statusFilter); params.query = $('.current-tasks-widget .task-search-field').val(); params.mode = $('.current-tasks-navbar .active').data('mode'); return params; @@ -48,7 +48,7 @@ var DasboardCurrentTasksWidget = (function() { return dropdownSelector.getValues(experimentFilter) || dropdownSelector.getValues(projectFilter) || $('.current-tasks-widget .task-search-field').val().length > 0 - || dropdownSelector.getValues(viewFilter) !== 'uncompleted'; + || dropdownSelector.getValues(statusFilter) !== 'uncompleted'; } function loadCurrentTasksList(newList) { @@ -57,7 +57,7 @@ var DasboardCurrentTasksWidget = (function() { project_id: dropdownSelector.getValues(projectFilter), experiment_id: dropdownSelector.getValues(experimentFilter), sort: dropdownSelector.getValues(sortFilter), - view: dropdownSelector.getValues(viewFilter), + statuses: dropdownSelector.getValues(statusFilter), query: $('.current-tasks-widget .task-search-field').val(), mode: $('.current-tasks-navbar .active').data('mode') }; @@ -85,7 +85,6 @@ var DasboardCurrentTasksWidget = (function() { e.stopPropagation(); e.preventDefault(); dropdownSelector.selectValue(sortFilter, 'date_asc'); - dropdownSelector.selectValue(viewFilter, 'uncompleted'); dropdownSelector.clearData(projectFilter); dropdownSelector.clearData(experimentFilter); }); @@ -98,12 +97,9 @@ var DasboardCurrentTasksWidget = (function() { disableSearch: true }); - dropdownSelector.init(viewFilter, { - noEmptyOption: true, - singleSelect: true, - closeOnSelect: true, + dropdownSelector.init(statusFilter, { selectAppearance: 'simple', - disableSearch: true + optionClass: 'checkbox-icon' }); dropdownSelector.init(projectFilter, { @@ -143,7 +139,7 @@ var DasboardCurrentTasksWidget = (function() { e.stopPropagation(); e.preventDefault(); dropdownSelector.closeDropdown(sortFilter); - dropdownSelector.closeDropdown(viewFilter); + dropdownSelector.closeDropdown(statusFilter); dropdownSelector.closeDropdown(projectFilter); dropdownSelector.closeDropdown(experimentFilter); }); diff --git a/app/assets/javascripts/sitewide/dropdown_selector.js b/app/assets/javascripts/sitewide/dropdown_selector.js index da29489a9..4c045dbe4 100644 --- a/app/assets/javascripts/sitewide/dropdown_selector.js +++ b/app/assets/javascripts/sitewide/dropdown_selector.js @@ -179,9 +179,20 @@ var dropdownSelector = (function() { } // Add selected option to value - function addSelectedOption(selector, container) { - setData(selector, [convertOptionToJson($(selector).find('option:selected')[0])], true); + function addSelectedOptions(selector, container) { + var selectedOptions = []; + $.each($(selector).find('option:selected'), function(i, option) { + selectedOptions.push(convertOptionToJson(option)); + if (selector.data('config').singleSelect) return false; + return true; + }); + + if (!selectedOptions.length) return false; + + setData(selector, selectedOptions, true); + return true; } + // // Prepare custom dropdown icon function prepareCustomDropdownIcon(config) { @@ -422,8 +433,8 @@ var dropdownSelector = (function() { } // Select default value - if (config.noEmptyOption && config.singleSelect) { - addSelectedOption(selectElement, dropdownContainer); + if (!selectElement.data('ajax-url')) { + addSelectedOptions(selectElement, dropdownContainer); } // Enable simple mode for dropdown selector diff --git a/app/controllers/dashboard/current_tasks_controller.rb b/app/controllers/dashboard/current_tasks_controller.rb index d6be71484..72143d06e 100644 --- a/app/controllers/dashboard/current_tasks_controller.rb +++ b/app/controllers/dashboard/current_tasks_controller.rb @@ -25,7 +25,7 @@ module Dashboard tasks = tasks.left_outer_joins(:user_my_modules).where(user_my_modules: { user_id: current_user.id }) end - tasks = filter_by_state(tasks) + #tasks = filter_by_state(tasks) case task_filters[:sort] when 'date_desc' diff --git a/app/views/dashboards/_current_tasks.html.erb b/app/views/dashboards/_current_tasks.html.erb index 5d3dde5ee..c09d0366a 100644 --- a/app/views/dashboards/_current_tasks.html.erb +++ b/app/views/dashboards/_current_tasks.html.erb @@ -19,9 +19,18 @@
    - " + data-select-multiple-all-selected="<%= t("dashboard.current_tasks.filter.statuses.all_selected") %>" + data-select-multiple-name="<%= t("dashboard.current_tasks.filter.statuses.selected") %>" + multiple + > + <% MyModuleStatusFlow.find_each do |status_flow| %> + <% status_flow.my_module_statuses.each do |status| %> + + <% end %> + <% end %>
    @@ -79,4 +88,4 @@

    <%= I18n.t('dashboard.current_tasks.no_tasks.search_result.title') %>

    - \ No newline at end of file + diff --git a/config/locales/dashboard/en.yml b/config/locales/dashboard/en.yml index 1c1aab5e2..c6567e128 100644 --- a/config/locales/dashboard/en.yml +++ b/config/locales/dashboard/en.yml @@ -13,7 +13,11 @@ en: date_asc: "Due Date" atoz: "From A to Z" ztoa: "From Z to A" - display: "Display" + display: "Display statuses" + statuses: + placeholder: "Select statuses" + all_selected: "All selected" + selected: "selected" uncompleted_tasks: "Tasks in progress" completed_tasks: "Tasks completed" project: "Project" From e221d960e75f646b6c7c8783a1d2271e1bdb0f61 Mon Sep 17 00:00:00 2001 From: Urban Rotnik Date: Tue, 4 Aug 2020 15:07:22 +0200 Subject: [PATCH 017/163] Revert "Merge pull request #2767 from aignatov-bio/ai-sci-4899-add-new-statuses-filters-on-dashboard" This reverts commit 8b6d57058c3d9b32a0697e0b67203557273bec78, reversing changes made to 957ac92669907b4eb9e8ec2bb25ee2d9c71ee378. --- .../javascripts/dashboard/current_tasks.js | 18 +++++++++++------- .../javascripts/sitewide/dropdown_selector.js | 19 ++++--------------- .../dashboard/current_tasks_controller.rb | 2 +- app/views/dashboards/_current_tasks.html.erb | 17 ++++------------- config/locales/dashboard/en.yml | 6 +----- 5 files changed, 21 insertions(+), 41 deletions(-) diff --git a/app/assets/javascripts/dashboard/current_tasks.js b/app/assets/javascripts/dashboard/current_tasks.js index 7c295925e..88bbf0a97 100644 --- a/app/assets/javascripts/dashboard/current_tasks.js +++ b/app/assets/javascripts/dashboard/current_tasks.js @@ -3,7 +3,7 @@ var DasboardCurrentTasksWidget = (function() { var sortFilter = '.curent-tasks-filters .sort-filter'; - var statusFilter = '.curent-tasks-filters .view-filter'; + var viewFilter = '.curent-tasks-filters .view-filter'; var projectFilter = '.curent-tasks-filters .project-filter'; var experimentFilter = '.curent-tasks-filters .experiment-filter'; @@ -36,7 +36,7 @@ var DasboardCurrentTasksWidget = (function() { params.project_id = dropdownSelector.getValues(projectFilter); params.experiment_id = dropdownSelector.getValues(experimentFilter); params.sort = dropdownSelector.getValues(sortFilter); - params.statuses = dropdownSelector.getValues(statusFilter); + params.view = dropdownSelector.getValues(viewFilter); params.query = $('.current-tasks-widget .task-search-field').val(); params.mode = $('.current-tasks-navbar .active').data('mode'); return params; @@ -48,7 +48,7 @@ var DasboardCurrentTasksWidget = (function() { return dropdownSelector.getValues(experimentFilter) || dropdownSelector.getValues(projectFilter) || $('.current-tasks-widget .task-search-field').val().length > 0 - || dropdownSelector.getValues(statusFilter) !== 'uncompleted'; + || dropdownSelector.getValues(viewFilter) !== 'uncompleted'; } function loadCurrentTasksList(newList) { @@ -57,7 +57,7 @@ var DasboardCurrentTasksWidget = (function() { project_id: dropdownSelector.getValues(projectFilter), experiment_id: dropdownSelector.getValues(experimentFilter), sort: dropdownSelector.getValues(sortFilter), - statuses: dropdownSelector.getValues(statusFilter), + view: dropdownSelector.getValues(viewFilter), query: $('.current-tasks-widget .task-search-field').val(), mode: $('.current-tasks-navbar .active').data('mode') }; @@ -85,6 +85,7 @@ var DasboardCurrentTasksWidget = (function() { e.stopPropagation(); e.preventDefault(); dropdownSelector.selectValue(sortFilter, 'date_asc'); + dropdownSelector.selectValue(viewFilter, 'uncompleted'); dropdownSelector.clearData(projectFilter); dropdownSelector.clearData(experimentFilter); }); @@ -97,9 +98,12 @@ var DasboardCurrentTasksWidget = (function() { disableSearch: true }); - dropdownSelector.init(statusFilter, { + dropdownSelector.init(viewFilter, { + noEmptyOption: true, + singleSelect: true, + closeOnSelect: true, selectAppearance: 'simple', - optionClass: 'checkbox-icon' + disableSearch: true }); dropdownSelector.init(projectFilter, { @@ -139,7 +143,7 @@ var DasboardCurrentTasksWidget = (function() { e.stopPropagation(); e.preventDefault(); dropdownSelector.closeDropdown(sortFilter); - dropdownSelector.closeDropdown(statusFilter); + dropdownSelector.closeDropdown(viewFilter); dropdownSelector.closeDropdown(projectFilter); dropdownSelector.closeDropdown(experimentFilter); }); diff --git a/app/assets/javascripts/sitewide/dropdown_selector.js b/app/assets/javascripts/sitewide/dropdown_selector.js index 4c045dbe4..da29489a9 100644 --- a/app/assets/javascripts/sitewide/dropdown_selector.js +++ b/app/assets/javascripts/sitewide/dropdown_selector.js @@ -179,20 +179,9 @@ var dropdownSelector = (function() { } // Add selected option to value - function addSelectedOptions(selector, container) { - var selectedOptions = []; - $.each($(selector).find('option:selected'), function(i, option) { - selectedOptions.push(convertOptionToJson(option)); - if (selector.data('config').singleSelect) return false; - return true; - }); - - if (!selectedOptions.length) return false; - - setData(selector, selectedOptions, true); - return true; + function addSelectedOption(selector, container) { + setData(selector, [convertOptionToJson($(selector).find('option:selected')[0])], true); } - // // Prepare custom dropdown icon function prepareCustomDropdownIcon(config) { @@ -433,8 +422,8 @@ var dropdownSelector = (function() { } // Select default value - if (!selectElement.data('ajax-url')) { - addSelectedOptions(selectElement, dropdownContainer); + if (config.noEmptyOption && config.singleSelect) { + addSelectedOption(selectElement, dropdownContainer); } // Enable simple mode for dropdown selector diff --git a/app/controllers/dashboard/current_tasks_controller.rb b/app/controllers/dashboard/current_tasks_controller.rb index 72143d06e..d6be71484 100644 --- a/app/controllers/dashboard/current_tasks_controller.rb +++ b/app/controllers/dashboard/current_tasks_controller.rb @@ -25,7 +25,7 @@ module Dashboard tasks = tasks.left_outer_joins(:user_my_modules).where(user_my_modules: { user_id: current_user.id }) end - #tasks = filter_by_state(tasks) + tasks = filter_by_state(tasks) case task_filters[:sort] when 'date_desc' diff --git a/app/views/dashboards/_current_tasks.html.erb b/app/views/dashboards/_current_tasks.html.erb index c09d0366a..5d3dde5ee 100644 --- a/app/views/dashboards/_current_tasks.html.erb +++ b/app/views/dashboards/_current_tasks.html.erb @@ -19,18 +19,9 @@
    - + +
    @@ -88,4 +79,4 @@

    <%= I18n.t('dashboard.current_tasks.no_tasks.search_result.title') %>

    - + \ No newline at end of file diff --git a/config/locales/dashboard/en.yml b/config/locales/dashboard/en.yml index c6567e128..1c1aab5e2 100644 --- a/config/locales/dashboard/en.yml +++ b/config/locales/dashboard/en.yml @@ -13,11 +13,7 @@ en: date_asc: "Due Date" atoz: "From A to Z" ztoa: "From Z to A" - display: "Display statuses" - statuses: - placeholder: "Select statuses" - all_selected: "All selected" - selected: "selected" + display: "Display" uncompleted_tasks: "Tasks in progress" completed_tasks: "Tasks completed" project: "Project" From 02a4da1a55ffa272522e759888a97d71c1c14cf2 Mon Sep 17 00:00:00 2001 From: Oleksii Kriuchykhin Date: Thu, 6 Aug 2020 10:50:11 +0200 Subject: [PATCH 018/163] Add task status to export all [SCI-4829] --- app/models/my_module.rb | 4 ++-- app/services/model_exporters/experiment_exporter.rb | 1 + app/services/team_importer.rb | 9 ++++++++- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/app/models/my_module.rb b/app/models/my_module.rb index 537999eb8..feadc9a00 100644 --- a/app/models/my_module.rb +++ b/app/models/my_module.rb @@ -8,7 +8,7 @@ class MyModule < ApplicationRecord before_create :create_blank_protocol before_validation :set_completed_on, if: :state_changed? - before_create :assign_default_status_flow + before_validation :assign_default_status_flow before_save :exec_status_consequences, if: :my_module_status_id_changed? auto_strip_attributes :name, :description, nullify: false @@ -527,7 +527,7 @@ class MyModule < ApplicationRecord end def assign_default_status_flow - return unless MyModuleStatusFlow.global.any? + return unless my_module_status.blank? || MyModuleStatusFlow.global.any? self.my_module_status = MyModuleStatusFlow.global.first.initial_status end diff --git a/app/services/model_exporters/experiment_exporter.rb b/app/services/model_exporters/experiment_exporter.rb index 51a19898d..eebd9e838 100644 --- a/app/services/model_exporters/experiment_exporter.rb +++ b/app/services/model_exporters/experiment_exporter.rb @@ -52,6 +52,7 @@ module ModelExporters def my_module(my_module) { my_module: my_module, + my_module_status_name: my_module.my_module_status&.name, outputs: my_module.outputs, my_module_tags: my_module.my_module_tags, task_comments: my_module.task_comments, diff --git a/app/services/team_importer.rb b/app/services/team_importer.rb index badc1f8de..2e951e03c 100644 --- a/app/services/team_importer.rb +++ b/app/services/team_importer.rb @@ -646,7 +646,7 @@ class TeamImporter def create_my_modules(my_modules_json, experiment, user_id = nil) puts('Creating my_modules...') my_modules_json.each do |my_module_json| - my_module = MyModule.new(my_module_json['my_module']) + my_module = MyModule.new(my_module_json['my_module'].except('my_module_status_name')) orig_my_module_id = my_module.id my_module.id = nil my_module.my_module_group_id = @@ -658,6 +658,13 @@ class TeamImporter my_module.archived_by_id = find_user(my_module.archived_by_id) my_module.restored_by_id = find_user(my_module.restored_by_id) my_module.experiment = experiment + + # Find matching status from default flow + default_flow = MyModuleStatusFlow.global.first + status = default_flow.my_module_statuses.find_by(name: my_module_json['my_module']['my_module_status_name']) + status ||= default_flow.initial_status + my_module.my_module_status = status + my_module.save! @my_module_mappings[orig_my_module_id] = my_module.id @my_module_counter += 1 From 56ff4e77024b8143e3a777558a86982b582cc24b Mon Sep 17 00:00:00 2001 From: aignatov-bio Date: Mon, 10 Aug 2020 09:10:56 +0200 Subject: [PATCH 019/163] Add new statuses to dashboard --- .../javascripts/dashboard/current_tasks.js | 19 +- .../stylesheets/dashboard/current_tasks.scss | 204 +++++++----------- .../dashboard/current_tasks_controller.rb | 45 ++-- app/models/my_module.rb | 10 - app/views/dashboards/_current_tasks.html.erb | 8 +- config/locales/dashboard/en.yml | 3 +- 6 files changed, 112 insertions(+), 177 deletions(-) diff --git a/app/assets/javascripts/dashboard/current_tasks.js b/app/assets/javascripts/dashboard/current_tasks.js index 88bbf0a97..b5954d4a2 100644 --- a/app/assets/javascripts/dashboard/current_tasks.js +++ b/app/assets/javascripts/dashboard/current_tasks.js @@ -1,4 +1,4 @@ -/* global dropdownSelector I18n animateSpinner PerfectSb InfiniteScroll */ +/* global dropdownSelector animateSpinner PerfectSb InfiniteScroll */ /* eslint-disable no-param-reassign */ var DasboardCurrentTasksWidget = (function() { @@ -11,15 +11,14 @@ var DasboardCurrentTasksWidget = (function() { $.each(json.data, (i, task) => { var currentTaskItem = `
    ${task.project}/${task.experiment}
    -
    -
    ${task.name}
    -
    - ${I18n.t('dashboard.current_tasks.due_date', { date: task.due_date })} -
    -
    -
    -
    ${task.state.text}
    -
    +
    ${task.name}
    +
    + + ${task.due_date.text} + +
    +
    + ${task.status_name}
    `; $(container).append(currentTaskItem); diff --git a/app/assets/stylesheets/dashboard/current_tasks.scss b/app/assets/stylesheets/dashboard/current_tasks.scss index ae83941f0..38a171da5 100644 --- a/app/assets/stylesheets/dashboard/current_tasks.scss +++ b/app/assets/stylesheets/dashboard/current_tasks.scss @@ -133,28 +133,33 @@ } } - .current-tasks-list { - display: flex; - flex-direction: column; + .current-tasks-list-wrapper { height: 100%; overflow-y: auto; - padding: 0 10px; position: relative; + } + + .current-tasks-list { + align-items: center; + display: grid; + grid-template-columns: auto max-content max-content; + padding: 0 1em; &.disabled { pointer-events: none; } .current-task-item { - border-bottom: $border-tertiary; color: $color-volcano; - padding: 6px; + display: contents; text-decoration: none; .current-task-breadcrumbs { @include font-small; color: $color-silver-chalice; + grid-column: 1 / span 3; line-height: 14px; + margin-top: .5em; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; @@ -166,39 +171,54 @@ } } - .item-row { - display: flex; + .row-border { + border-bottom: $border-tertiary; + height: 32px; + line-height: 24px; + padding-bottom: 8px; + } - .task-name { - flex-grow: 1; - font-size: $font-size-base; - font-weight: bold; - overflow: hidden; - padding-right: 10px; - text-overflow: ellipsis; - white-space: nowrap; + .task-name { + flex-grow: 1; + font-size: $font-size-base; + font-weight: bold; + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; + } + + .task-due-date { + flex-basis: 280px; + flex-shrink: 0; + padding: 0 2em 0 1em; + + .fas { + padding: 4px; } - .task-due-date { - flex-basis: 280px; - flex-shrink: 0; - font-size: 14px; + &.overdue { + color: $brand-danger; + } - .fas { - padding: 4px; - } + &.day-prior { + color: $brand-warning; + } - &.overdue { - color: $brand-danger; - } + &.completed { + color: $brand-success; + } + } - &.day-prior { - color: $brand-warning; - } + .task-status-container { + grid-column: 3; + text-align: right; - &.completed { - color: $brand-success; - } + .task-status { + @include font-small; + border-radius: $border-radius-tag; + color: $color-white; + font-weight: bold; + padding: .25em .5em; } } @@ -207,93 +227,6 @@ } } } - - .task-progress-container { - height: 20px; - max-width: 250px; - min-width: 150px; - position: relative; - width: 100%; - - &::after { - @include font-small; - @include font-awesome; - content: ""; - line-height: 18px; - position: absolute; - right: 8px; - top: 1px; - } - - .task-progress { - background: $brand-focus-light; - border: $border-tertiary; - border-radius: $border-radius-tag; - display: flex; - height: 20px; - position: relative; - - &::after { - background: $color-white; - content: ""; - height: 18px; - width: 100%; - } - } - - .task-progress-label { - @include font-small; - font-weight: bold; - height: 20px; - left: 0; - line-height: 20px; - padding-left: 8px; - position: absolute; - top: 0; - width: calc(100% - 30px); - } - - &.overdue { - .task-progress { - background: $brand-danger-light; - } - - .task-progress-label { - color: $brand-danger; - } - - &::after { - color: $brand-danger; - content: $font-fas-exclamation-triangle; - } - } - - &.day-prior { - .task-progress-label { - color: $brand-warning; - } - } - - &.completed { - .task-progress { - outline: $border-success; - } - - .task-progress, - .task-progress::after { - background: $brand-success-light; - } - - .task-progress-label { - color: $brand-success; - } - - &::after { - color: $brand-success; - content: $font-fas-check; - } - } - } } @media (max-width: 1500px) { @@ -370,22 +303,33 @@ } .current-tasks-list { + grid-template-columns: auto; + .current-task-item { - .item-row { - flex-wrap: wrap; - .task-due-date { - @include font-small; + .current-task-breadcrumbs { + grid-column: 1; + } - .fas { - display: none; - } + .task-name { + border: 0; + padding: 0; + height: 1.5em; + } + + .task-due-date { + @include font-small; + border: 0; + padding-left: 0; + + .fas { + display: none; } + } - .task-progress-container { - flex-basis: 100%; - max-width: none; - } + .task-status-container { + grid-column: 1; + text-align: left; } } } diff --git a/app/controllers/dashboard/current_tasks_controller.rb b/app/controllers/dashboard/current_tasks_controller.rb index d6be71484..76fbcb1d3 100644 --- a/app/controllers/dashboard/current_tasks_controller.rb +++ b/app/controllers/dashboard/current_tasks_controller.rb @@ -41,7 +41,9 @@ module Dashboard end page = (params[:page] || 1).to_i - tasks = tasks.with_step_statistics.search_by_name(current_user, current_team, task_filters[:query]) + tasks = tasks.search_by_name(current_user, current_team, task_filters[:query]) + .joins(:my_module_status) + .select('my_modules.*', 'my_module_statuses.name as status_name', 'my_module_statuses.color as status_color') .preload(experiment: :project).page(page).per(Constants::INFINITE_SCROLL_LIMIT) tasks_list = tasks.map do |task| @@ -50,9 +52,9 @@ module Dashboard experiment: escape_input(task.experiment.name), project: escape_input(task.experiment.project.name), name: escape_input(task.name), - due_date: task.due_date.present? ? I18n.l(task.due_date, format: :full_date) : nil, - state: task_state(task), - steps_precentage: task.steps_completed_percentage } + due_date: prepare_due_date(task), + status_color: task.status_color, + status_name: task.status_name } end render json: { data: tasks_list, next_page: tasks.next_page } @@ -90,29 +92,26 @@ module Dashboard private - def task_state(task) - if task.state == 'completed' - task_state_class = task.state - task_state_text = t('dashboard.current_tasks.progress_bar.completed') - else - task_state_text = t('dashboard.current_tasks.progress_bar.in_progress') - task_state_class = 'day-prior' if task.is_one_day_prior? - if task.is_overdue? - task_state_text = t('dashboard.current_tasks.progress_bar.overdue') - task_state_class = 'overdue' - end - if task.steps_total.positive? - task_state_text += t('dashboard.current_tasks.progress_bar.completed_steps', - steps: task.steps_completed, total_steps: task.steps_total) - end - end - { text: task_state_text, class: task_state_class } - end - def filter_by_state(tasks) tasks.where(my_modules: { state: task_filters[:view] }) end + def prepare_due_date(task) + if task.due_date.present? + due_date_formatted = I18n.l(task.due_date, format: :full_date) + if task.is_overdue? + return { state: 'overdue', text: I18n.t('dashboard.current_tasks.due_date_overdue_html', + date: due_date_formatted) } + elsif task.is_one_day_prior? + return { state: 'day-prior', text: I18n.t('dashboard.current_tasks.due_date_html', + date: due_date_formatted) } + end + + return { state: '', text: I18n.t('dashboard.current_tasks.due_date_html', date: due_date_formatted) } + end + { state: nil, text: nil } + end + def task_filters params.permit(:project_id, :experiment_id, :mode, :view, :sort, :query, :page) end diff --git a/app/models/my_module.rb b/app/models/my_module.rb index f682ee7d6..143208e80 100644 --- a/app/models/my_module.rb +++ b/app/models/my_module.rb @@ -81,16 +81,6 @@ class MyModule < ApplicationRecord end) scope :workflow_ordered, -> { order(workflow_order: :asc) } scope :uncomplete, -> { where(state: 'uncompleted') } - scope :with_step_statistics, (lambda do - left_outer_joins(protocols: :steps) - .group(:id) - .select('my_modules.*') - .select('COUNT(steps.id) AS steps_total') - .select('COUNT(steps.id) FILTER (where steps.completed = true) AS steps_completed') - .select('CASE COUNT(steps.id) WHEN 0 THEN 0 ELSE'\ - '((COUNT(steps.id) FILTER (where steps.completed = true)) * 100 / COUNT(steps.id)) '\ - 'END AS steps_completed_percentage') - end) # A module takes this much space in canvas (x, y) in database WIDTH = 30 diff --git a/app/views/dashboards/_current_tasks.html.erb b/app/views/dashboards/_current_tasks.html.erb index 5d3dde5ee..9f4208d69 100644 --- a/app/views/dashboards/_current_tasks.html.erb +++ b/app/views/dashboards/_current_tasks.html.erb @@ -58,8 +58,10 @@
    -
    +
    +
    +
    @@ -79,4 +81,4 @@

    <%= I18n.t('dashboard.current_tasks.no_tasks.search_result.title') %>

    - \ No newline at end of file + diff --git a/config/locales/dashboard/en.yml b/config/locales/dashboard/en.yml index 1c1aab5e2..843057b41 100644 --- a/config/locales/dashboard/en.yml +++ b/config/locales/dashboard/en.yml @@ -29,7 +29,8 @@ en: title: "Your Team has no tasks at the moment." search_result: title: "No results." - due_date: "Due date: %{date}" + due_date_html: "Due date: %{date}" + due_date_overdue_html: "Due date: %{date} (overdue)" progress_bar: in_progress: "In progress" overdue: "Overdue" From 5360db76be333cddae5a89320d4656655e2f148d Mon Sep 17 00:00:00 2001 From: aignatov-bio Date: Wed, 12 Aug 2020 13:54:05 +0200 Subject: [PATCH 020/163] Fix dropdrown selector --- .../javascripts/sitewide/dropdown_selector.js | 17 ++++++++++++++--- app/views/dashboards/_current_tasks.html.erb | 17 +++++++++++++---- 2 files changed, 27 insertions(+), 7 deletions(-) diff --git a/app/assets/javascripts/sitewide/dropdown_selector.js b/app/assets/javascripts/sitewide/dropdown_selector.js index da29489a9..9497c6b69 100644 --- a/app/assets/javascripts/sitewide/dropdown_selector.js +++ b/app/assets/javascripts/sitewide/dropdown_selector.js @@ -179,8 +179,19 @@ var dropdownSelector = (function() { } // Add selected option to value - function addSelectedOption(selector, container) { - setData(selector, [convertOptionToJson($(selector).find('option:selected')[0])], true); + function addSelectedOptions(selector, container) { + var selectedOptions = []; + var optionSelector = selector.data('config').noEmptyOption ? 'option:selected' : 'option[data-selected=true]'; + $.each($(selector).find(optionSelector), function(i, option) { + selectedOptions.push(convertOptionToJson(option)); + if (selector.data('config').singleSelect) return false; + return true; + }); + + if (!selectedOptions.length) return false; + + setData(selector, selectedOptions, true); + return true; } // Prepare custom dropdown icon @@ -422,7 +433,7 @@ var dropdownSelector = (function() { } // Select default value - if (config.noEmptyOption && config.singleSelect) { + if (!selectElement.data('ajax-url')) { addSelectedOption(selectElement, dropdownContainer); } diff --git a/app/views/dashboards/_current_tasks.html.erb b/app/views/dashboards/_current_tasks.html.erb index 99d278056..00ebc0873 100644 --- a/app/views/dashboards/_current_tasks.html.erb +++ b/app/views/dashboards/_current_tasks.html.erb @@ -20,9 +20,18 @@
    - " + data-select-multiple-all-selected="<%= t("dashboard.current_tasks.filter.statuses.all_selected") %>" + data-select-multiple-name="<%= t("dashboard.current_tasks.filter.statuses.selected") %>" + multiple + > + <% MyModuleStatusFlow.find_each do |status_flow| %> + <% status_flow.my_module_statuses.each do |status| %> + + <% end %> + <% end %>
    @@ -80,4 +89,4 @@

    <%= I18n.t('dashboard.current_tasks.no_tasks.search_result.title') %>

    - \ No newline at end of file + From fdb2e46700f5fac1b717804e71b3d93a46f82df9 Mon Sep 17 00:00:00 2001 From: aignatov-bio Date: Thu, 13 Aug 2020 12:51:33 +0200 Subject: [PATCH 021/163] Add consequence for repository snapshotting --- .../repository_snapshot.rb | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 app/models/my_module_status_consequences/repository_snapshot.rb diff --git a/app/models/my_module_status_consequences/repository_snapshot.rb b/app/models/my_module_status_consequences/repository_snapshot.rb new file mode 100644 index 000000000..c32da1d50 --- /dev/null +++ b/app/models/my_module_status_consequences/repository_snapshot.rb @@ -0,0 +1,11 @@ +# frozen_string_literal: true + +module MyModuleStatusConsequences + class RepositorySnapshot < MyModuleStatusConsequence + def call(my_module) + my_module.assigned_repositories.each do |repo| + repo.provision_snapshot(my_module) + end + end + end +end From 059c8c88d9f4811e84f80a90d60122cb6cd5bdfc Mon Sep 17 00:00:00 2001 From: Mojca Lorber Date: Thu, 20 Aug 2020 14:12:45 +0200 Subject: [PATCH 022/163] Fix css for modal-body --- app/assets/stylesheets/themes/scinote.scss | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/app/assets/stylesheets/themes/scinote.scss b/app/assets/stylesheets/themes/scinote.scss index fff2c85c3..939c77875 100644 --- a/app/assets/stylesheets/themes/scinote.scss +++ b/app/assets/stylesheets/themes/scinote.scss @@ -133,6 +133,14 @@ body { font-size: $font-size-small; } +.modal-body { + font-size: $font-size-base; + + label { + @include font-small; + } +} + .jumbotron { background-color: inherit; } From e6e47f5106924966bfab3e06d41c061c48d1610d Mon Sep 17 00:00:00 2001 From: Oleksii Kriuchykhin Date: Fri, 21 Aug 2020 11:58:12 +0200 Subject: [PATCH 023/163] Fix failing tests [SCI-4829] --- app/models/my_module.rb | 2 +- app/services/team_importer.rb | 9 ++++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/app/models/my_module.rb b/app/models/my_module.rb index feadc9a00..26c5a198a 100644 --- a/app/models/my_module.rb +++ b/app/models/my_module.rb @@ -527,7 +527,7 @@ class MyModule < ApplicationRecord end def assign_default_status_flow - return unless my_module_status.blank? || MyModuleStatusFlow.global.any? + return if my_module_status.present? || MyModuleStatusFlow.global.blank? self.my_module_status = MyModuleStatusFlow.global.first.initial_status end diff --git a/app/services/team_importer.rb b/app/services/team_importer.rb index 2e951e03c..2f2efd55e 100644 --- a/app/services/team_importer.rb +++ b/app/services/team_importer.rb @@ -661,9 +661,12 @@ class TeamImporter # Find matching status from default flow default_flow = MyModuleStatusFlow.global.first - status = default_flow.my_module_statuses.find_by(name: my_module_json['my_module']['my_module_status_name']) - status ||= default_flow.initial_status - my_module.my_module_status = status + + if default_flow.present? + status = default_flow.my_module_statuses.find_by(name: my_module_json['my_module']['my_module_status_name']) + status ||= default_flow.initial_status + my_module.my_module_status = status + end my_module.save! @my_module_mappings[orig_my_module_id] = my_module.id From e0f7e181f662393602ab4f339f1b03e1c4d3e247 Mon Sep 17 00:00:00 2001 From: Oleksii Kriuchykhin Date: Fri, 21 Aug 2020 13:12:14 +0200 Subject: [PATCH 024/163] Fix user deletion script [SCI-4829] --- app/services/user_data_deletion.rb | 2 -- 1 file changed, 2 deletions(-) diff --git a/app/services/user_data_deletion.rb b/app/services/user_data_deletion.rb index c9cd0e5c4..21d11aa66 100644 --- a/app/services/user_data_deletion.rb +++ b/app/services/user_data_deletion.rb @@ -1,7 +1,6 @@ class UserDataDeletion def self.delete_team_data(team) ActiveRecord::Base.logger = Logger.new(STDOUT) - Step.skip_callback(:destroy, :after, :cascade_after_destroy) team.transaction do # Destroy tiny_mce_assets if team.tiny_mce_assets.present? @@ -86,7 +85,6 @@ class UserDataDeletion team.destroy! # raise ActiveRecord::Rollback end - Step.set_callback(:destroy, :after, :cascade_after_destroy) end def self.destroy_protocol(protocol) From 4a837951dbbefc0b5fa0be8d19eee5fe7b541a29 Mon Sep 17 00:00:00 2001 From: aignatov-bio Date: Tue, 25 Aug 2020 15:02:25 +0200 Subject: [PATCH 025/163] Update variable name --- .../my_module_status_consequences/repository_snapshot.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/models/my_module_status_consequences/repository_snapshot.rb b/app/models/my_module_status_consequences/repository_snapshot.rb index c32da1d50..6ad7c3aec 100644 --- a/app/models/my_module_status_consequences/repository_snapshot.rb +++ b/app/models/my_module_status_consequences/repository_snapshot.rb @@ -3,8 +3,8 @@ module MyModuleStatusConsequences class RepositorySnapshot < MyModuleStatusConsequence def call(my_module) - my_module.assigned_repositories.each do |repo| - repo.provision_snapshot(my_module) + my_module.assigned_repositories.each do |repository| + repository.provision_snapshot(my_module) end end end From a5fb873d1919a95834df7955b6180bafd4e23d5e Mon Sep 17 00:00:00 2001 From: Urban Rotnik Date: Tue, 18 Aug 2020 13:06:05 +0200 Subject: [PATCH 026/163] Add default workflow --- app/models/my_module_status_flow.rb | 18 ++++++++++++++++++ config/initializers/extends.rb | 8 ++++++++ db/seeds.rb | 2 ++ spec/models/my_module_status_flow_spec.rb | 17 +++++++++++++++++ 4 files changed, 45 insertions(+) diff --git a/app/models/my_module_status_flow.rb b/app/models/my_module_status_flow.rb index 2dbb3e019..2cd6e422d 100644 --- a/app/models/my_module_status_flow.rb +++ b/app/models/my_module_status_flow.rb @@ -21,4 +21,22 @@ class MyModuleStatusFlow < ApplicationRecord def final_status my_module_statuses.left_outer_joins(:next_status).find_by('next_statuses_my_module_statuses.id': nil) end + + def self.ensure_default + return if MyModuleStatusFlow.global.any? + + status_flow = MyModuleStatusFlow.create!(name: Extends::DEFAULT_FLOW_NAME, visibility: :global) + prev_id = nil + Extends::DEFAULT_FLOW_STATUSES.each do |status| + new_status = MyModuleStatus.create!(my_module_status_flow: status_flow, + name: status[:name], + color: status[:color], + previous_status_id: prev_id) + prev_id = new_status.id + + status[:conditions]&.each { |condition| condition.constantize.create!(my_module_status: new_status) } + status[:implications]&.each { |implication| implication.constantize.create!(my_module_status: new_status) } + status[:consequences]&.each { |consequence| consequence.constantize.create!(my_module_status: new_status) } + end + end end diff --git a/config/initializers/extends.rb b/config/initializers/extends.rb index 0caf096d8..25f7c4064 100644 --- a/config/initializers/extends.rb +++ b/config/initializers/extends.rb @@ -317,4 +317,12 @@ class Extends }.freeze DASHBOARD_BLACKLIST_ACTIVITY_TYPES = %i(export_protocol_in_repository copy_protocol_in_repository).freeze + + DEFAULT_FLOW_NAME = 'SciNote Free default task flow' + + DEFAULT_FLOW_STATUSES = [ + { name: 'Not started', color: '#406d86' }, + { name: 'In progress', color: '#0065ff' }, + { name: 'Completed', color: '#00b900' } + ] end diff --git a/db/seeds.rb b/db/seeds.rb index 5f9f93555..ae67f6d2d 100644 --- a/db/seeds.rb +++ b/db/seeds.rb @@ -1,5 +1,7 @@ include UsersGenerator +MyModuleStatusFlow.ensure_default + if User.count.zero? if ENV['ADMIN_NAME'].present? && ENV['ADMIN_EMAIL'].present? && diff --git a/spec/models/my_module_status_flow_spec.rb b/spec/models/my_module_status_flow_spec.rb index 1c2976e4c..cb83f6d02 100644 --- a/spec/models/my_module_status_flow_spec.rb +++ b/spec/models/my_module_status_flow_spec.rb @@ -46,4 +46,21 @@ describe MyModuleStatusFlow, type: :model do it { expect(my_module_team_workflow).to validate_presence_of :team } end end + + describe 'self.ensure_default' do + context 'when there is no global flow' do + it 'adds new global workflow' do + expect { described_class.ensure_default } + .to change { MyModuleStatusFlow.global.count }.by(1).and(change { MyModuleStatus.count }.by(3)) + end + end + + context 'when there is global flow' do + it 'adds new global workflow' do + described_class.ensure_default + + expect { described_class.ensure_default }.not_to(change { MyModuleStatusFlow.global.count }) + end + end + end end From bc4c18e585bf1d6c303069b95c858fddd090ff73 Mon Sep 17 00:00:00 2001 From: Oleksii Kriuchykhin Date: Thu, 27 Aug 2020 11:33:26 +0200 Subject: [PATCH 027/163] Add secondary-navigation-title-name data hook [SCI-4859] --- app/views/shared/_secondary_navigation.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/shared/_secondary_navigation.html.erb b/app/views/shared/_secondary_navigation.html.erb index 11e4d9b8b..1b2ea3abf 100644 --- a/app/views/shared/_secondary_navigation.html.erb +++ b/app/views/shared/_secondary_navigation.html.erb @@ -130,7 +130,7 @@ -

    +

    <% if @inline_editable_title_config.present? %> <%= render partial: "shared/inline_editing", locals: { From c07ebe90fa3245097279fd87138c5f7648e7b7cb Mon Sep 17 00:00:00 2001 From: aignatov-bio Date: Thu, 27 Aug 2020 11:30:55 +0200 Subject: [PATCH 028/163] Add migration for task states --- .../javascripts/dashboard/current_tasks.js | 16 ++++++---------- .../javascripts/sitewide/dropdown_selector.js | 2 +- .../dashboard/current_tasks_controller.rb | 2 +- config/locales/dashboard/en.yml | 6 +++++- db/migrate/20200826143431_migrate_task_status.rb | 11 +++++++++++ db/structure.sql | 5 ++++- 6 files changed, 28 insertions(+), 14 deletions(-) create mode 100644 db/migrate/20200826143431_migrate_task_status.rb diff --git a/app/assets/javascripts/dashboard/current_tasks.js b/app/assets/javascripts/dashboard/current_tasks.js index b5954d4a2..0cf83b3e6 100644 --- a/app/assets/javascripts/dashboard/current_tasks.js +++ b/app/assets/javascripts/dashboard/current_tasks.js @@ -3,7 +3,7 @@ var DasboardCurrentTasksWidget = (function() { var sortFilter = '.curent-tasks-filters .sort-filter'; - var viewFilter = '.curent-tasks-filters .view-filter'; + var statusFilter = '.curent-tasks-filters .view-filter'; var projectFilter = '.curent-tasks-filters .project-filter'; var experimentFilter = '.curent-tasks-filters .experiment-filter'; @@ -35,7 +35,7 @@ var DasboardCurrentTasksWidget = (function() { params.project_id = dropdownSelector.getValues(projectFilter); params.experiment_id = dropdownSelector.getValues(experimentFilter); params.sort = dropdownSelector.getValues(sortFilter); - params.view = dropdownSelector.getValues(viewFilter); + params.statuses = dropdownSelector.getValues(statusFilter); params.query = $('.current-tasks-widget .task-search-field').val(); params.mode = $('.current-tasks-navbar .active').data('mode'); return params; @@ -47,7 +47,6 @@ var DasboardCurrentTasksWidget = (function() { return dropdownSelector.getValues(experimentFilter) || dropdownSelector.getValues(projectFilter) || $('.current-tasks-widget .task-search-field').val().length > 0 - || dropdownSelector.getValues(viewFilter) !== 'uncompleted'; } function loadCurrentTasksList(newList) { @@ -56,7 +55,7 @@ var DasboardCurrentTasksWidget = (function() { project_id: dropdownSelector.getValues(projectFilter), experiment_id: dropdownSelector.getValues(experimentFilter), sort: dropdownSelector.getValues(sortFilter), - view: dropdownSelector.getValues(viewFilter), + statuses: dropdownSelector.getValues(statusFilter), query: $('.current-tasks-widget .task-search-field').val(), mode: $('.current-tasks-navbar .active').data('mode') }; @@ -97,12 +96,9 @@ var DasboardCurrentTasksWidget = (function() { disableSearch: true }); - dropdownSelector.init(viewFilter, { - noEmptyOption: true, - singleSelect: true, - closeOnSelect: true, + dropdownSelector.init(statusFilter, { selectAppearance: 'simple', - disableSearch: true + optionClass: 'checkbox-icon' }); dropdownSelector.init(projectFilter, { @@ -142,7 +138,7 @@ var DasboardCurrentTasksWidget = (function() { e.stopPropagation(); e.preventDefault(); dropdownSelector.closeDropdown(sortFilter); - dropdownSelector.closeDropdown(viewFilter); + dropdownSelector.closeDropdown(statusFilter); dropdownSelector.closeDropdown(projectFilter); dropdownSelector.closeDropdown(experimentFilter); }); diff --git a/app/assets/javascripts/sitewide/dropdown_selector.js b/app/assets/javascripts/sitewide/dropdown_selector.js index 9497c6b69..f4d7ef7ae 100644 --- a/app/assets/javascripts/sitewide/dropdown_selector.js +++ b/app/assets/javascripts/sitewide/dropdown_selector.js @@ -434,7 +434,7 @@ var dropdownSelector = (function() { // Select default value if (!selectElement.data('ajax-url')) { - addSelectedOption(selectElement, dropdownContainer); + addSelectedOptions(selectElement, dropdownContainer); } // Enable simple mode for dropdown selector diff --git a/app/controllers/dashboard/current_tasks_controller.rb b/app/controllers/dashboard/current_tasks_controller.rb index 3da93e6cf..8d28d0cec 100644 --- a/app/controllers/dashboard/current_tasks_controller.rb +++ b/app/controllers/dashboard/current_tasks_controller.rb @@ -25,7 +25,7 @@ module Dashboard tasks = tasks.left_outer_joins(:user_my_modules).where(user_my_modules: { user_id: current_user.id }) end - tasks = filter_by_state(tasks) + # tasks = filter_by_state(tasks) case task_filters[:sort] when 'start_date' diff --git a/config/locales/dashboard/en.yml b/config/locales/dashboard/en.yml index 0d2ba5749..e102ed33e 100644 --- a/config/locales/dashboard/en.yml +++ b/config/locales/dashboard/en.yml @@ -14,7 +14,11 @@ en: due_date: "Due date" atoz: "From A to Z" ztoa: "From Z to A" - display: "Display" + display: "Display statuses" + statuses: + placeholder: "Select statuses" + all_selected: "All selected" + selected: "selected" uncompleted_tasks: "Tasks in progress" completed_tasks: "Tasks completed" project: "Project" diff --git a/db/migrate/20200826143431_migrate_task_status.rb b/db/migrate/20200826143431_migrate_task_status.rb new file mode 100644 index 000000000..99d7c5e6d --- /dev/null +++ b/db/migrate/20200826143431_migrate_task_status.rb @@ -0,0 +1,11 @@ +# frozen_string_literal: true + +class MigrateTaskStatus < ActiveRecord::Migration[6.0] + def up + in_progress_status = execute("SELECT id FROM my_module_statuses WHERE name = 'In progress' LIMIT 1")[0]&['id'] + completed_status = execute("SELECT id FROM my_module_statuses WHERE name = 'Completed' LIMIT 1")[0]&['id'] + + execute "UPDATE my_modules SET my_module_status_id = #{in_progress_status} WHERE state = 0" + execute "UPDATE my_modules SET my_module_status_id = #{completed_status} WHERE state = 1" + end +end diff --git a/db/structure.sql b/db/structure.sql index 1efe7eb1c..64b55a4aa 100644 --- a/db/structure.sql +++ b/db/structure.sql @@ -7625,4 +7625,7 @@ INSERT INTO "schema_migrations" (version) VALUES ('20200622155632'), ('20200709142830'), ('20200713142353'), -('20200714082503'); +('20200714082503'), +('20200826143431'); + + From 6229ba6041883a3a645e52b164773d0d1374ad82 Mon Sep 17 00:00:00 2001 From: aignatov-bio Date: Thu, 27 Aug 2020 12:13:13 +0200 Subject: [PATCH 029/163] Add morkflow generator --- .../dashboard/current_tasks_controller.rb | 8 ++------ .../20200826143431_migrate_task_status.rb | 17 +++++++++++++---- 2 files changed, 15 insertions(+), 10 deletions(-) diff --git a/app/controllers/dashboard/current_tasks_controller.rb b/app/controllers/dashboard/current_tasks_controller.rb index 8d28d0cec..0cf31fdda 100644 --- a/app/controllers/dashboard/current_tasks_controller.rb +++ b/app/controllers/dashboard/current_tasks_controller.rb @@ -25,7 +25,7 @@ module Dashboard tasks = tasks.left_outer_joins(:user_my_modules).where(user_my_modules: { user_id: current_user.id }) end - # tasks = filter_by_state(tasks) + tasks = tasks.where(my_module_status_id: task_filters[:statuses]) case task_filters[:sort] when 'start_date' @@ -92,10 +92,6 @@ module Dashboard private - def filter_by_state(tasks) - tasks.where(my_modules: { state: task_filters[:view] }) - end - def prepare_due_date(task) if task.due_date.present? due_date_formatted = I18n.l(task.due_date, format: :full_date) @@ -113,7 +109,7 @@ module Dashboard end def task_filters - params.permit(:project_id, :experiment_id, :mode, :view, :sort, :query, :page) + params.permit(:project_id, :experiment_id, :mode, :sort, :query, :page, statuses: []) end def load_project diff --git a/db/migrate/20200826143431_migrate_task_status.rb b/db/migrate/20200826143431_migrate_task_status.rb index 99d7c5e6d..e75b9de62 100644 --- a/db/migrate/20200826143431_migrate_task_status.rb +++ b/db/migrate/20200826143431_migrate_task_status.rb @@ -2,10 +2,19 @@ class MigrateTaskStatus < ActiveRecord::Migration[6.0] def up - in_progress_status = execute("SELECT id FROM my_module_statuses WHERE name = 'In progress' LIMIT 1")[0]&['id'] - completed_status = execute("SELECT id FROM my_module_statuses WHERE name = 'Completed' LIMIT 1")[0]&['id'] + MyModuleStatusFlow.ensure_default - execute "UPDATE my_modules SET my_module_status_id = #{in_progress_status} WHERE state = 0" - execute "UPDATE my_modules SET my_module_status_id = #{completed_status} WHERE state = 1" + in_progress_status = execute("SELECT id FROM my_module_statuses WHERE name = 'In progress' LIMIT 1").to_a[0] + completed_status = execute("SELECT id FROM my_module_statuses WHERE name = 'Completed' LIMIT 1").to_a[0] + + if in_progress_status + execute("UPDATE my_modules + SET my_module_status_id = #{in_progress_status['id']} WHERE state = 0") + end + + if completed_status + execute("UPDATE my_modules + SET my_module_status_id = #{completed_status['id']} WHERE state = 1") + end end end From 6fefd4d94571103a5f921862595c3790df7888c4 Mon Sep 17 00:00:00 2001 From: Mojca Lorber Date: Tue, 18 Aug 2020 16:27:07 +0200 Subject: [PATCH 030/163] Add factories for new task flows models --- spec/controllers/assets_controller_spec.rb | 4 +++- spec/controllers/canvas_controller_spec.rb | 18 ++++++++++-------- .../my_module_comments_controller_spec.rb | 4 +++- .../my_module_repositories_controller_spec.rb | 10 ++++++---- .../my_module_tags_controller_spec.rb | 4 +++- spec/controllers/my_modules_controller_spec.rb | 14 +++++++------- spec/controllers/protocols_controller_spec.rb | 4 +++- .../result_assets_controller_spec.rb | 4 +++- .../result_comments_controller_spec.rb | 4 +++- .../result_tables_controller_spec.rb | 4 +++- .../result_texts_controller_spec.rb | 4 +++- spec/controllers/results_controller_spec.rb | 4 +++- .../step_comments_controller_spec.rb | 4 +++- spec/controllers/steps_controller_spec.rb | 4 +++- spec/controllers/tags_controller_spec.rb | 4 +++- .../user_my_modules_controller_spec.rb | 4 +++- spec/controllers/wopi_controller_spec.rb | 4 +++- spec/factories/my_module_status_conditions.rb | 7 +++++++ .../factories/my_module_status_consequences.rb | 7 +++++++ spec/factories/my_module_status_flows.rb | 5 +++++ .../factories/my_module_status_implications.rb | 7 +++++++ spec/factories/my_module_statuses.rb | 15 +++++++++++++++ spec/factories/my_modules.rb | 1 + .../smart_annotations/html_preview_spec.rb | 4 +++- .../smart_annotations/permission_eval_spec.rb | 4 +++- .../smart_annotations/text_preview_spec.rb | 4 +++- 26 files changed, 116 insertions(+), 36 deletions(-) create mode 100644 spec/factories/my_module_status_conditions.rb create mode 100644 spec/factories/my_module_status_consequences.rb create mode 100644 spec/factories/my_module_status_implications.rb diff --git a/spec/controllers/assets_controller_spec.rb b/spec/controllers/assets_controller_spec.rb index a4a853bb8..ca063f71d 100644 --- a/spec/controllers/assets_controller_spec.rb +++ b/spec/controllers/assets_controller_spec.rb @@ -13,7 +13,9 @@ describe AssetsController, type: :controller do create :project, team: team, user_projects: [user_project] end let(:experiment) { create :experiment, project: project } - let(:my_module) { create :my_module, name: 'test task', experiment: experiment } + let(:my_module_status_flow) { create :my_module_status_flow, :with_statuses } + let(:status) { create :my_module_status, my_module_status_flow: my_module_status_flow } + let(:my_module) { create :my_module, name: 'test task', experiment: experiment, my_module_status: status } let(:protocol) do create :protocol, my_module: my_module, team: team, added_by: user end diff --git a/spec/controllers/canvas_controller_spec.rb b/spec/controllers/canvas_controller_spec.rb index 749363002..d89aef75c 100644 --- a/spec/controllers/canvas_controller_spec.rb +++ b/spec/controllers/canvas_controller_spec.rb @@ -16,6 +16,8 @@ describe CanvasController do end let(:experiment) { create :experiment, project: project } let(:experiment2) { create :experiment, project: project } + let(:my_module_status_flow) { create :my_module_status_flow, :with_statuses } + let(:status) { create :my_module_status, my_module_status_flow: my_module_status_flow } # Idea of this "end to end" test is to put a lot "work" on method `@experiment.udpate_canvas` and controller actipn # update also. We've implemented some unit tests on `.update_canvas` itself, but behaviour is tightly coupled with @@ -34,14 +36,14 @@ describe CanvasController do # Setup environment for "big change" request # Tasks in DB - let!(:task1) { create :my_module, x: 0, y: 1, experiment: experiment } - let!(:task2) { create :my_module, x: 0, y: 2, experiment: experiment } - let!(:task3) { create :my_module, x: 0, y: 3, experiment: experiment } - let!(:task4) { create :my_module, x: 0, y: 4, experiment: experiment } - let!(:task5) { create :my_module, x: 0, y: 5, experiment: experiment } - let!(:task6) { create :my_module, x: 0, y: 6, experiment: experiment } - let!(:task7) { create :my_module, x: 0, y: 7, experiment: experiment } - let!(:task8) { create :my_module, x: 0, y: 8, experiment: experiment } + let!(:task1) { create :my_module, x: 0, y: 1, experiment: experiment, my_module_status: status } + let!(:task2) { create :my_module, x: 0, y: 2, experiment: experiment, my_module_status: status } + let!(:task3) { create :my_module, x: 0, y: 3, experiment: experiment, my_module_status: status } + let!(:task4) { create :my_module, x: 0, y: 4, experiment: experiment, my_module_status: status } + let!(:task5) { create :my_module, x: 0, y: 5, experiment: experiment, my_module_status: status } + let!(:task6) { create :my_module, x: 0, y: 6, experiment: experiment, my_module_status: status } + let!(:task7) { create :my_module, x: 0, y: 7, experiment: experiment, my_module_status: status } + let!(:task8) { create :my_module, x: 0, y: 8, experiment: experiment, my_module_status: status } let!(:step_on_task5) { create :step, name: 'task5_step', protocol: task5.protocol } let!(:step_on_task6) { create :step, name: 'task6_step', protocol: task6.protocol } diff --git a/spec/controllers/my_module_comments_controller_spec.rb b/spec/controllers/my_module_comments_controller_spec.rb index 2734e3418..c90b6cebf 100644 --- a/spec/controllers/my_module_comments_controller_spec.rb +++ b/spec/controllers/my_module_comments_controller_spec.rb @@ -13,7 +13,9 @@ describe MyModuleCommentsController, type: :controller do create :user_project, :normal_user, user: user, project: project end let(:experiment) { create :experiment, project: project } - let(:my_module) { create :my_module, experiment: experiment } + let(:my_module_status_flow) { create :my_module_status_flow, :with_statuses } + let(:status) { create :my_module_status, my_module_status_flow: my_module_status_flow } + let(:my_module) { create :my_module, experiment: experiment, my_module_status: status } let(:task_comment) { create :task_comment, user: user, my_module: my_module } describe 'POST create' do diff --git a/spec/controllers/my_module_repositories_controller_spec.rb b/spec/controllers/my_module_repositories_controller_spec.rb index 87a910655..16f187d1e 100644 --- a/spec/controllers/my_module_repositories_controller_spec.rb +++ b/spec/controllers/my_module_repositories_controller_spec.rb @@ -20,7 +20,9 @@ describe MyModuleRepositoriesController, type: :controller do create :repository_row, created_by: user, repository: repository end let(:experiment) { create :experiment, project: project } - let(:my_module) { create :my_module, experiment: experiment } + let(:my_module_status_flow) { create :my_module_status_flow, :with_statuses } + let(:status) { create :my_module_status, my_module_status_flow: my_module_status_flow } + let(:my_module) { create :my_module, experiment: experiment, my_module_status: status } describe 'PUT update (assign repository records)' do let(:params) do @@ -55,7 +57,7 @@ describe MyModuleRepositoriesController, type: :controller do rows_to_assign: [repository_row.id], downstream: true } 3.times do |_i| - child_module = create :my_module, experiment: experiment + child_module = create :my_module, experiment: experiment, my_module_status: status Connection.create(output_id: parent_my_module.id, input_id: child_module.id) end expect { put :update, params: params_downstream, format: :json } @@ -104,7 +106,7 @@ describe MyModuleRepositoriesController, type: :controller do rows_to_unassign: [repository_row.id], downstream: true } 3.times do |_i| - child_module = create :my_module, experiment: experiment + child_module = create :my_module, experiment: experiment, my_module_status: status Connection.create(output_id: parent_my_module.id, input_id: child_module.id) create :mm_repository_row, repository_row: repository_row, my_module: child_module, @@ -162,7 +164,7 @@ describe MyModuleRepositoriesController, type: :controller do rows_to_unassign: [repository_row_2.id], downstream: true } 3.times do |_i| - child_module = create :my_module, experiment: experiment + child_module = create :my_module, experiment: experiment, my_module_status: status Connection.create(output_id: parent_my_module.id, input_id: child_module.id) create :mm_repository_row, repository_row: repository_row_2, my_module: child_module, diff --git a/spec/controllers/my_module_tags_controller_spec.rb b/spec/controllers/my_module_tags_controller_spec.rb index ca6cb549c..c64e43172 100644 --- a/spec/controllers/my_module_tags_controller_spec.rb +++ b/spec/controllers/my_module_tags_controller_spec.rb @@ -13,7 +13,9 @@ describe MyModuleTagsController, type: :controller do create :user_project, :normal_user, user: user, project: project end let(:experiment) { create :experiment, project: project } - let(:my_module) { create :my_module, experiment: experiment } + let(:my_module_status_flow) { create :my_module_status_flow, :with_statuses } + let(:status) { create :my_module_status, my_module_status_flow: my_module_status_flow } + let(:my_module) { create :my_module, experiment: experiment, my_module_status: status } describe 'POST create' do let(:tag) { create :tag, project: project } diff --git a/spec/controllers/my_modules_controller_spec.rb b/spec/controllers/my_modules_controller_spec.rb index 68780086f..55d0b0cfa 100644 --- a/spec/controllers/my_modules_controller_spec.rb +++ b/spec/controllers/my_modules_controller_spec.rb @@ -17,7 +17,10 @@ describe MyModulesController, type: :controller do create :repository_row, created_by: user, repository: repository end let(:experiment) { create :experiment, project: project } - let(:my_module) { create :my_module, experiment: experiment } + let(:my_module_status_flow) { create :my_module_status_flow, :with_statuses, :in_team, team: team } + let(:status1) { create :my_module_status, my_module_status_flow: my_module_status_flow } + let(:status2) { create :my_module_status, my_module_status_flow: my_module_status_flow } + let(:my_module) { create :my_module, experiment: experiment, my_module_status: status1 } describe 'PUT update' do let(:action) { put :update, params: params, format: :json } @@ -25,7 +28,7 @@ describe MyModulesController, type: :controller do context 'when restoring task from archive' do let(:params) { { id: my_module.id, my_module: { archived: false } } } let(:my_module) do - create :my_module, archived: true, experiment: experiment + create :my_module, archived: true, experiment: experiment, my_module_status: status1 end it 'calls create activity for restoring task from archive' do @@ -83,7 +86,7 @@ describe MyModulesController, type: :controller do context 'when deleting due_date' do let(:params) { { id: my_module.id, my_module: { due_date: '' } } } let(:my_module) do - create :my_module, :with_due_date, experiment: experiment + create :my_module, :with_due_date, experiment: experiment, my_module_status: status1 end it 'calls create activity for removing due date' do @@ -105,7 +108,7 @@ describe MyModulesController, type: :controller do { id: my_module.id, my_module: { due_date: '02/21/2019 23:59' } } end let(:my_module) do - create :my_module, :with_due_date, experiment: experiment + create :my_module, :with_due_date, experiment: experiment, my_module_status: status1 end it 'calls create activity for changing due date' do @@ -133,9 +136,6 @@ describe MyModulesController, type: :controller do my_module: { status_id: status_id } } end - let(:my_module_status_flow) { create :my_module_status_flow, :in_team, team: team} - let(:status1) {create :my_module_status, my_module_status_flow: my_module_status_flow} - let(:status2) {create :my_module_status, my_module_status_flow: my_module_status_flow} context 'when states updated' do let(:status_id) { status2.id } diff --git a/spec/controllers/protocols_controller_spec.rb b/spec/controllers/protocols_controller_spec.rb index f48fa94c6..f6020f9bd 100644 --- a/spec/controllers/protocols_controller_spec.rb +++ b/spec/controllers/protocols_controller_spec.rb @@ -13,7 +13,9 @@ describe ProtocolsController, type: :controller do create :user_project, :normal_user, user: user, project: project end let(:experiment) { create :experiment, project: project } - let(:my_module) { create :my_module, experiment: experiment } + let(:my_module_status_flow) { create :my_module_status_flow, :with_statuses } + let(:status) { create :my_module_status, my_module_status_flow: my_module_status_flow } + let(:my_module) { create :my_module, experiment: experiment, my_module_status: status } describe 'POST create' do let(:action) { post :create, params: params, format: :json } diff --git a/spec/controllers/result_assets_controller_spec.rb b/spec/controllers/result_assets_controller_spec.rb index a396c923b..f428054fc 100644 --- a/spec/controllers/result_assets_controller_spec.rb +++ b/spec/controllers/result_assets_controller_spec.rb @@ -12,7 +12,9 @@ describe ResultAssetsController, type: :controller do create :project, team: team, user_projects: [user_project] end let(:experiment) { create :experiment, project: project } - let(:task) { create :my_module, name: 'test task', experiment: experiment } + let(:my_module_status_flow) { create :my_module_status_flow, :with_statuses } + let(:status) { create :my_module_status, my_module_status_flow: my_module_status_flow } + let(:task) { create :my_module, name: 'test task', experiment: experiment, my_module_status: status } let(:result) do create :result, name: 'test result', my_module: task, user: user end diff --git a/spec/controllers/result_comments_controller_spec.rb b/spec/controllers/result_comments_controller_spec.rb index bee9c7673..3e5fedf50 100644 --- a/spec/controllers/result_comments_controller_spec.rb +++ b/spec/controllers/result_comments_controller_spec.rb @@ -12,7 +12,9 @@ describe ResultCommentsController, type: :controller do create :project, team: team, user_projects: [user_project] end let(:experiment) { create :experiment, project: project } - let(:task) { create :my_module, name: 'test task', experiment: experiment } + let(:my_module_status_flow) { create :my_module_status_flow, :with_statuses } + let(:status) { create :my_module_status, my_module_status_flow: my_module_status_flow } + let(:task) { create :my_module, name: 'test task', experiment: experiment, my_module_status: status } let(:result) do create :result, name: 'test result', my_module: task, user: user end diff --git a/spec/controllers/result_tables_controller_spec.rb b/spec/controllers/result_tables_controller_spec.rb index 86cb4306d..e15c946b9 100644 --- a/spec/controllers/result_tables_controller_spec.rb +++ b/spec/controllers/result_tables_controller_spec.rb @@ -12,7 +12,9 @@ describe ResultTablesController, type: :controller do create :project, team: team, user_projects: [user_project] end let(:experiment) { create :experiment, project: project } - let(:task) { create :my_module, name: 'test task', experiment: experiment } + let(:my_module_status_flow) { create :my_module_status_flow, :with_statuses } + let(:status) { create :my_module_status, my_module_status_flow: my_module_status_flow } + let(:task) { create :my_module, name: 'test task', experiment: experiment, my_module_status: status } let(:result) do create :result, name: 'test result', my_module: task, user: user end diff --git a/spec/controllers/result_texts_controller_spec.rb b/spec/controllers/result_texts_controller_spec.rb index d6db5c56c..9e9c38a77 100644 --- a/spec/controllers/result_texts_controller_spec.rb +++ b/spec/controllers/result_texts_controller_spec.rb @@ -12,7 +12,9 @@ describe ResultTextsController, type: :controller do create :project, team: team, user_projects: [user_project] end let(:experiment) { create :experiment, project: project } - let(:task) { create :my_module, name: 'test task', experiment: experiment } + let(:my_module_status_flow) { create :my_module_status_flow, :with_statuses } + let(:status) { create :my_module_status, my_module_status_flow: my_module_status_flow } + let(:task) { create :my_module, name: 'test task', experiment: experiment, my_module_status: status } let(:result) do create :result, name: 'test result', my_module: task, user: user end diff --git a/spec/controllers/results_controller_spec.rb b/spec/controllers/results_controller_spec.rb index 91905cf1b..ac82ac92e 100644 --- a/spec/controllers/results_controller_spec.rb +++ b/spec/controllers/results_controller_spec.rb @@ -12,7 +12,9 @@ describe ResultsController, type: :controller do create :project, team: team, user_projects: [user_project] end let(:experiment) { create :experiment, project: project } - let(:task) { create :my_module, name: 'test task', experiment: experiment } + let(:my_module_status_flow) { create :my_module_status_flow, :with_statuses } + let(:status) { create :my_module_status, my_module_status_flow: my_module_status_flow } + let(:task) { create :my_module, name: 'test task', experiment: experiment, my_module_status: status } let(:result) do create :result, name: 'test result', my_module: task, user: user end diff --git a/spec/controllers/step_comments_controller_spec.rb b/spec/controllers/step_comments_controller_spec.rb index f88138ec3..6fbf9f854 100644 --- a/spec/controllers/step_comments_controller_spec.rb +++ b/spec/controllers/step_comments_controller_spec.rb @@ -13,7 +13,9 @@ describe StepCommentsController, type: :controller do create :user_project, :normal_user, user: user, project: project end let(:experiment) { create :experiment, project: project } - let(:my_module) { create :my_module, experiment: experiment } + let(:my_module_status_flow) { create :my_module_status_flow, :with_statuses } + let(:status) { create :my_module_status, my_module_status_flow: my_module_status_flow } + let(:my_module) { create :my_module, experiment: experiment, my_module_status: status } let(:protocol) do create :protocol, my_module: my_module, team: team, added_by: user end diff --git a/spec/controllers/steps_controller_spec.rb b/spec/controllers/steps_controller_spec.rb index 8a81d65db..270772e1b 100644 --- a/spec/controllers/steps_controller_spec.rb +++ b/spec/controllers/steps_controller_spec.rb @@ -13,7 +13,9 @@ describe StepsController, type: :controller do create :user_project, :normal_user, user: user, project: project end let(:experiment) { create :experiment, project: project } - let(:my_module) { create :my_module, experiment: experiment } + let(:my_module_status_flow) { create :my_module_status_flow, :with_statuses } + let(:status) { create :my_module_status, my_module_status_flow: my_module_status_flow } + let(:my_module) { create :my_module, experiment: experiment, my_module_status: status } let(:protocol) do create :protocol, my_module: my_module, team: team, added_by: user end diff --git a/spec/controllers/tags_controller_spec.rb b/spec/controllers/tags_controller_spec.rb index d4833cb6c..5782a5abd 100644 --- a/spec/controllers/tags_controller_spec.rb +++ b/spec/controllers/tags_controller_spec.rb @@ -13,7 +13,9 @@ describe TagsController, type: :controller do create :user_project, :normal_user, user: user, project: project end let(:experiment) { create :experiment, project: project } - let(:my_module) { create :my_module, experiment: experiment } + let(:my_module_status_flow) { create :my_module_status_flow, :with_statuses } + let(:status) { create :my_module_status, my_module_status_flow: my_module_status_flow } + let(:my_module) { create :my_module, experiment: experiment, my_module_status: status } let(:tag) { create :tag, project: project } describe 'POST create' do diff --git a/spec/controllers/user_my_modules_controller_spec.rb b/spec/controllers/user_my_modules_controller_spec.rb index 2652b58e9..f099d7c69 100644 --- a/spec/controllers/user_my_modules_controller_spec.rb +++ b/spec/controllers/user_my_modules_controller_spec.rb @@ -13,7 +13,9 @@ describe UserMyModulesController, type: :controller do create :user_project, :owner, user: user, project: project end let(:experiment) { create :experiment, project: project } - let(:my_module) { create :my_module, experiment: experiment } + let(:my_module_status_flow) { create :my_module_status_flow, :with_statuses } + let(:status) { create :my_module_status, my_module_status_flow: my_module_status_flow } + let(:my_module) { create :my_module, experiment: experiment, my_module_status: status } describe 'POST create' do let(:action) { post :create, params: params, format: :json } diff --git a/spec/controllers/wopi_controller_spec.rb b/spec/controllers/wopi_controller_spec.rb index 6fe951b74..02a0517ae 100644 --- a/spec/controllers/wopi_controller_spec.rb +++ b/spec/controllers/wopi_controller_spec.rb @@ -14,7 +14,9 @@ describe WopiController, type: :controller do create :project, team: team, user_projects: [user_project] end let(:experiment) { create :experiment, project: project } - let(:my_module) { create :my_module, name: 'test task', experiment: experiment } + let(:my_module_status_flow) { create :my_module_status_flow, :with_statuses } + let(:status) { create :my_module_status, my_module_status_flow: my_module_status_flow } + let(:my_module) { create :my_module, name: 'test task', experiment: experiment, my_module_status: status } let(:result) do create :result, name: 'test result', my_module: my_module, user: user end diff --git a/spec/factories/my_module_status_conditions.rb b/spec/factories/my_module_status_conditions.rb new file mode 100644 index 000000000..84105c5ec --- /dev/null +++ b/spec/factories/my_module_status_conditions.rb @@ -0,0 +1,7 @@ +# frozen_string_literal: true + +FactoryBot.define do + factory :my_module_status_condition do + my_module_status + end +end diff --git a/spec/factories/my_module_status_consequences.rb b/spec/factories/my_module_status_consequences.rb new file mode 100644 index 000000000..41da03dda --- /dev/null +++ b/spec/factories/my_module_status_consequences.rb @@ -0,0 +1,7 @@ +# frozen_string_literal: true + +FactoryBot.define do + factory :my_module_status_consequence do + my_module_status + end +end diff --git a/spec/factories/my_module_status_flows.rb b/spec/factories/my_module_status_flows.rb index 1112c8dea..682edb190 100644 --- a/spec/factories/my_module_status_flows.rb +++ b/spec/factories/my_module_status_flows.rb @@ -8,5 +8,10 @@ FactoryBot.define do team { create :team } visibility { :in_team } end + trait :with_statuses do + after(:create) do |flow| + create_list :my_module_status, 3, my_module_status_flow: flow + end + end end end diff --git a/spec/factories/my_module_status_implications.rb b/spec/factories/my_module_status_implications.rb new file mode 100644 index 000000000..31c820934 --- /dev/null +++ b/spec/factories/my_module_status_implications.rb @@ -0,0 +1,7 @@ +# frozen_string_literal: true + +FactoryBot.define do + factory :my_module_status_implication do + my_module_status + end +end diff --git a/spec/factories/my_module_statuses.rb b/spec/factories/my_module_statuses.rb index 42a6d86eb..c43b95b53 100644 --- a/spec/factories/my_module_statuses.rb +++ b/spec/factories/my_module_statuses.rb @@ -6,5 +6,20 @@ FactoryBot.define do description { Faker::Lorem.sentence } color { Faker::Color.hex_color } my_module_status_flow + trait :with_consequence do + after(:create) do |status| + create :my_module_status_consequence, my_module_status: status + end + end + trait :with_conditions do + after(:create) do |status| + create :my_module_status_condition, my_module_status: status + end + end + trait :with_implications do + after(:create) do |status| + create :my_module_status_implication, my_module_status: status + end + end end end diff --git a/spec/factories/my_modules.rb b/spec/factories/my_modules.rb index d002ed7db..dd5659f75 100644 --- a/spec/factories/my_modules.rb +++ b/spec/factories/my_modules.rb @@ -7,6 +7,7 @@ FactoryBot.define do sequence(:x) { |n| n } workflow_order { MyModule.where(experiment_id: experiment.id).count + 1 } experiment + my_module_status my_module_group { create :my_module_group, experiment: experiment } trait :with_tag do tags { create_list :tag, 3, project: experiment.project } diff --git a/spec/services/smart_annotations/html_preview_spec.rb b/spec/services/smart_annotations/html_preview_spec.rb index 3be100148..eced9e305 100644 --- a/spec/services/smart_annotations/html_preview_spec.rb +++ b/spec/services/smart_annotations/html_preview_spec.rb @@ -12,7 +12,9 @@ describe SmartAnnotations::HtmlPreview do created_by: user, last_modified_by: user end - let(:task) { create :my_module, name: 'task', experiment: experiment } + let(:my_module_status_flow) { create :my_module_status_flow, :with_statuses } + let(:status) { create :my_module_status, my_module_status_flow: my_module_status_flow } + let(:task) { create :my_module, name: 'task', experiment: experiment, my_module_status: status } describe 'Project annotations with type prj' do it 'returns a html snippet' do diff --git a/spec/services/smart_annotations/permission_eval_spec.rb b/spec/services/smart_annotations/permission_eval_spec.rb index deac79a04..3d064b560 100644 --- a/spec/services/smart_annotations/permission_eval_spec.rb +++ b/spec/services/smart_annotations/permission_eval_spec.rb @@ -17,7 +17,9 @@ describe SmartAnnotations::PermissionEval do created_by: user, last_modified_by: user end - let(:task) { create :my_module, name: 'task', experiment: experiment } + let(:my_module_status_flow) { create :my_module_status_flow, :with_statuses } + let(:status) { create :my_module_status, my_module_status_flow: my_module_status_flow } + let(:task) { create :my_module, name: 'task', experiment: experiment, my_module_status: status } let(:repository) { create :repository, team: team, created_by: user } let(:repository_item) { create :repository_row, repository: repository } diff --git a/spec/services/smart_annotations/text_preview_spec.rb b/spec/services/smart_annotations/text_preview_spec.rb index 41ad34c9b..f0035cc6a 100644 --- a/spec/services/smart_annotations/text_preview_spec.rb +++ b/spec/services/smart_annotations/text_preview_spec.rb @@ -12,7 +12,9 @@ describe SmartAnnotations::TextPreview do created_by: user, last_modified_by: user end - let(:task) { create :my_module, name: 'task', experiment: experiment } + let(:my_module_status_flow) { create :my_module_status_flow, :with_statuses } + let(:status) { create :my_module_status, my_module_status_flow: my_module_status_flow } + let(:task) { create :my_module, name: 'task', experiment: experiment, my_module_status: status } describe 'Project annotations' do it 'returns a text snippet' do From fb8f69c3e49239a815bb935986771006b9f31d00 Mon Sep 17 00:00:00 2001 From: Urban Rotnik Date: Thu, 27 Aug 2020 13:26:17 +0200 Subject: [PATCH 031/163] Revert controllers spec --- spec/controllers/assets_controller_spec.rb | 4 +-- spec/controllers/canvas_controller_spec.rb | 18 ++++++------- .../my_module_comments_controller_spec.rb | 4 +-- .../my_module_repositories_controller_spec.rb | 10 +++---- .../my_module_tags_controller_spec.rb | 4 +-- .../controllers/my_modules_controller_spec.rb | 27 +++++++------------ spec/controllers/protocols_controller_spec.rb | 4 +-- .../result_assets_controller_spec.rb | 4 +-- .../result_comments_controller_spec.rb | 4 +-- .../result_tables_controller_spec.rb | 4 +-- .../result_texts_controller_spec.rb | 4 +-- spec/controllers/results_controller_spec.rb | 4 +-- .../step_comments_controller_spec.rb | 4 +-- spec/controllers/steps_controller_spec.rb | 4 +-- spec/controllers/tags_controller_spec.rb | 4 +-- .../user_my_modules_controller_spec.rb | 4 +-- spec/controllers/wopi_controller_spec.rb | 4 +-- spec/factories/my_module_status_conditions.rb | 2 +- .../my_module_status_consequences.rb | 2 +- .../my_module_status_implications.rb | 2 +- spec/factories/my_modules.rb | 4 ++- .../smart_annotations/html_preview_spec.rb | 4 +-- .../smart_annotations/permission_eval_spec.rb | 4 +-- .../smart_annotations/text_preview_spec.rb | 4 +-- 24 files changed, 45 insertions(+), 88 deletions(-) diff --git a/spec/controllers/assets_controller_spec.rb b/spec/controllers/assets_controller_spec.rb index ca063f71d..a4a853bb8 100644 --- a/spec/controllers/assets_controller_spec.rb +++ b/spec/controllers/assets_controller_spec.rb @@ -13,9 +13,7 @@ describe AssetsController, type: :controller do create :project, team: team, user_projects: [user_project] end let(:experiment) { create :experiment, project: project } - let(:my_module_status_flow) { create :my_module_status_flow, :with_statuses } - let(:status) { create :my_module_status, my_module_status_flow: my_module_status_flow } - let(:my_module) { create :my_module, name: 'test task', experiment: experiment, my_module_status: status } + let(:my_module) { create :my_module, name: 'test task', experiment: experiment } let(:protocol) do create :protocol, my_module: my_module, team: team, added_by: user end diff --git a/spec/controllers/canvas_controller_spec.rb b/spec/controllers/canvas_controller_spec.rb index d89aef75c..749363002 100644 --- a/spec/controllers/canvas_controller_spec.rb +++ b/spec/controllers/canvas_controller_spec.rb @@ -16,8 +16,6 @@ describe CanvasController do end let(:experiment) { create :experiment, project: project } let(:experiment2) { create :experiment, project: project } - let(:my_module_status_flow) { create :my_module_status_flow, :with_statuses } - let(:status) { create :my_module_status, my_module_status_flow: my_module_status_flow } # Idea of this "end to end" test is to put a lot "work" on method `@experiment.udpate_canvas` and controller actipn # update also. We've implemented some unit tests on `.update_canvas` itself, but behaviour is tightly coupled with @@ -36,14 +34,14 @@ describe CanvasController do # Setup environment for "big change" request # Tasks in DB - let!(:task1) { create :my_module, x: 0, y: 1, experiment: experiment, my_module_status: status } - let!(:task2) { create :my_module, x: 0, y: 2, experiment: experiment, my_module_status: status } - let!(:task3) { create :my_module, x: 0, y: 3, experiment: experiment, my_module_status: status } - let!(:task4) { create :my_module, x: 0, y: 4, experiment: experiment, my_module_status: status } - let!(:task5) { create :my_module, x: 0, y: 5, experiment: experiment, my_module_status: status } - let!(:task6) { create :my_module, x: 0, y: 6, experiment: experiment, my_module_status: status } - let!(:task7) { create :my_module, x: 0, y: 7, experiment: experiment, my_module_status: status } - let!(:task8) { create :my_module, x: 0, y: 8, experiment: experiment, my_module_status: status } + let!(:task1) { create :my_module, x: 0, y: 1, experiment: experiment } + let!(:task2) { create :my_module, x: 0, y: 2, experiment: experiment } + let!(:task3) { create :my_module, x: 0, y: 3, experiment: experiment } + let!(:task4) { create :my_module, x: 0, y: 4, experiment: experiment } + let!(:task5) { create :my_module, x: 0, y: 5, experiment: experiment } + let!(:task6) { create :my_module, x: 0, y: 6, experiment: experiment } + let!(:task7) { create :my_module, x: 0, y: 7, experiment: experiment } + let!(:task8) { create :my_module, x: 0, y: 8, experiment: experiment } let!(:step_on_task5) { create :step, name: 'task5_step', protocol: task5.protocol } let!(:step_on_task6) { create :step, name: 'task6_step', protocol: task6.protocol } diff --git a/spec/controllers/my_module_comments_controller_spec.rb b/spec/controllers/my_module_comments_controller_spec.rb index c90b6cebf..2734e3418 100644 --- a/spec/controllers/my_module_comments_controller_spec.rb +++ b/spec/controllers/my_module_comments_controller_spec.rb @@ -13,9 +13,7 @@ describe MyModuleCommentsController, type: :controller do create :user_project, :normal_user, user: user, project: project end let(:experiment) { create :experiment, project: project } - let(:my_module_status_flow) { create :my_module_status_flow, :with_statuses } - let(:status) { create :my_module_status, my_module_status_flow: my_module_status_flow } - let(:my_module) { create :my_module, experiment: experiment, my_module_status: status } + let(:my_module) { create :my_module, experiment: experiment } let(:task_comment) { create :task_comment, user: user, my_module: my_module } describe 'POST create' do diff --git a/spec/controllers/my_module_repositories_controller_spec.rb b/spec/controllers/my_module_repositories_controller_spec.rb index 16f187d1e..87a910655 100644 --- a/spec/controllers/my_module_repositories_controller_spec.rb +++ b/spec/controllers/my_module_repositories_controller_spec.rb @@ -20,9 +20,7 @@ describe MyModuleRepositoriesController, type: :controller do create :repository_row, created_by: user, repository: repository end let(:experiment) { create :experiment, project: project } - let(:my_module_status_flow) { create :my_module_status_flow, :with_statuses } - let(:status) { create :my_module_status, my_module_status_flow: my_module_status_flow } - let(:my_module) { create :my_module, experiment: experiment, my_module_status: status } + let(:my_module) { create :my_module, experiment: experiment } describe 'PUT update (assign repository records)' do let(:params) do @@ -57,7 +55,7 @@ describe MyModuleRepositoriesController, type: :controller do rows_to_assign: [repository_row.id], downstream: true } 3.times do |_i| - child_module = create :my_module, experiment: experiment, my_module_status: status + child_module = create :my_module, experiment: experiment Connection.create(output_id: parent_my_module.id, input_id: child_module.id) end expect { put :update, params: params_downstream, format: :json } @@ -106,7 +104,7 @@ describe MyModuleRepositoriesController, type: :controller do rows_to_unassign: [repository_row.id], downstream: true } 3.times do |_i| - child_module = create :my_module, experiment: experiment, my_module_status: status + child_module = create :my_module, experiment: experiment Connection.create(output_id: parent_my_module.id, input_id: child_module.id) create :mm_repository_row, repository_row: repository_row, my_module: child_module, @@ -164,7 +162,7 @@ describe MyModuleRepositoriesController, type: :controller do rows_to_unassign: [repository_row_2.id], downstream: true } 3.times do |_i| - child_module = create :my_module, experiment: experiment, my_module_status: status + child_module = create :my_module, experiment: experiment Connection.create(output_id: parent_my_module.id, input_id: child_module.id) create :mm_repository_row, repository_row: repository_row_2, my_module: child_module, diff --git a/spec/controllers/my_module_tags_controller_spec.rb b/spec/controllers/my_module_tags_controller_spec.rb index c64e43172..ca6cb549c 100644 --- a/spec/controllers/my_module_tags_controller_spec.rb +++ b/spec/controllers/my_module_tags_controller_spec.rb @@ -13,9 +13,7 @@ describe MyModuleTagsController, type: :controller do create :user_project, :normal_user, user: user, project: project end let(:experiment) { create :experiment, project: project } - let(:my_module_status_flow) { create :my_module_status_flow, :with_statuses } - let(:status) { create :my_module_status, my_module_status_flow: my_module_status_flow } - let(:my_module) { create :my_module, experiment: experiment, my_module_status: status } + let(:my_module) { create :my_module, experiment: experiment } describe 'POST create' do let(:tag) { create :tag, project: project } diff --git a/spec/controllers/my_modules_controller_spec.rb b/spec/controllers/my_modules_controller_spec.rb index 55d0b0cfa..5d98262ea 100644 --- a/spec/controllers/my_modules_controller_spec.rb +++ b/spec/controllers/my_modules_controller_spec.rb @@ -17,10 +17,7 @@ describe MyModulesController, type: :controller do create :repository_row, created_by: user, repository: repository end let(:experiment) { create :experiment, project: project } - let(:my_module_status_flow) { create :my_module_status_flow, :with_statuses, :in_team, team: team } - let(:status1) { create :my_module_status, my_module_status_flow: my_module_status_flow } - let(:status2) { create :my_module_status, my_module_status_flow: my_module_status_flow } - let(:my_module) { create :my_module, experiment: experiment, my_module_status: status1 } + let(:my_module) { create :my_module, experiment: experiment } describe 'PUT update' do let(:action) { put :update, params: params, format: :json } @@ -28,7 +25,7 @@ describe MyModulesController, type: :controller do context 'when restoring task from archive' do let(:params) { { id: my_module.id, my_module: { archived: false } } } let(:my_module) do - create :my_module, archived: true, experiment: experiment, my_module_status: status1 + create :my_module, archived: true, experiment: experiment end it 'calls create activity for restoring task from archive' do @@ -86,7 +83,7 @@ describe MyModulesController, type: :controller do context 'when deleting due_date' do let(:params) { { id: my_module.id, my_module: { due_date: '' } } } let(:my_module) do - create :my_module, :with_due_date, experiment: experiment, my_module_status: status1 + create :my_module, :with_due_date, experiment: experiment end it 'calls create activity for removing due date' do @@ -108,7 +105,7 @@ describe MyModulesController, type: :controller do { id: my_module.id, my_module: { due_date: '02/21/2019 23:59' } } end let(:my_module) do - create :my_module, :with_due_date, experiment: experiment, my_module_status: status1 + create :my_module, :with_due_date, experiment: experiment end it 'calls create activity for changing due date' do @@ -137,17 +134,17 @@ describe MyModulesController, type: :controller do } end - context 'when states updated' do - let(:status_id) { status2.id } + before(:all) do + MyModuleStatusFlow.ensure_default + end - before do - my_module.update(my_module_status: status1) - end + context 'when states updated' do + let(:status_id) { my_module.my_module_status.next_status.id } it 'changes status' do action - expect(my_module.reload.my_module_status.name).to be_eql(status2.name) + expect(my_module.reload.my_module_status.id).to be_eql(status_id) expect(response).to have_http_status 200 end end @@ -155,10 +152,6 @@ describe MyModulesController, type: :controller do context 'when status not found' do let(:status_id) { -1 } - before do - my_module.update(my_module_status: status1) - end - it 'renders 404' do action diff --git a/spec/controllers/protocols_controller_spec.rb b/spec/controllers/protocols_controller_spec.rb index f6020f9bd..f48fa94c6 100644 --- a/spec/controllers/protocols_controller_spec.rb +++ b/spec/controllers/protocols_controller_spec.rb @@ -13,9 +13,7 @@ describe ProtocolsController, type: :controller do create :user_project, :normal_user, user: user, project: project end let(:experiment) { create :experiment, project: project } - let(:my_module_status_flow) { create :my_module_status_flow, :with_statuses } - let(:status) { create :my_module_status, my_module_status_flow: my_module_status_flow } - let(:my_module) { create :my_module, experiment: experiment, my_module_status: status } + let(:my_module) { create :my_module, experiment: experiment } describe 'POST create' do let(:action) { post :create, params: params, format: :json } diff --git a/spec/controllers/result_assets_controller_spec.rb b/spec/controllers/result_assets_controller_spec.rb index f428054fc..a396c923b 100644 --- a/spec/controllers/result_assets_controller_spec.rb +++ b/spec/controllers/result_assets_controller_spec.rb @@ -12,9 +12,7 @@ describe ResultAssetsController, type: :controller do create :project, team: team, user_projects: [user_project] end let(:experiment) { create :experiment, project: project } - let(:my_module_status_flow) { create :my_module_status_flow, :with_statuses } - let(:status) { create :my_module_status, my_module_status_flow: my_module_status_flow } - let(:task) { create :my_module, name: 'test task', experiment: experiment, my_module_status: status } + let(:task) { create :my_module, name: 'test task', experiment: experiment } let(:result) do create :result, name: 'test result', my_module: task, user: user end diff --git a/spec/controllers/result_comments_controller_spec.rb b/spec/controllers/result_comments_controller_spec.rb index 3e5fedf50..bee9c7673 100644 --- a/spec/controllers/result_comments_controller_spec.rb +++ b/spec/controllers/result_comments_controller_spec.rb @@ -12,9 +12,7 @@ describe ResultCommentsController, type: :controller do create :project, team: team, user_projects: [user_project] end let(:experiment) { create :experiment, project: project } - let(:my_module_status_flow) { create :my_module_status_flow, :with_statuses } - let(:status) { create :my_module_status, my_module_status_flow: my_module_status_flow } - let(:task) { create :my_module, name: 'test task', experiment: experiment, my_module_status: status } + let(:task) { create :my_module, name: 'test task', experiment: experiment } let(:result) do create :result, name: 'test result', my_module: task, user: user end diff --git a/spec/controllers/result_tables_controller_spec.rb b/spec/controllers/result_tables_controller_spec.rb index e15c946b9..86cb4306d 100644 --- a/spec/controllers/result_tables_controller_spec.rb +++ b/spec/controllers/result_tables_controller_spec.rb @@ -12,9 +12,7 @@ describe ResultTablesController, type: :controller do create :project, team: team, user_projects: [user_project] end let(:experiment) { create :experiment, project: project } - let(:my_module_status_flow) { create :my_module_status_flow, :with_statuses } - let(:status) { create :my_module_status, my_module_status_flow: my_module_status_flow } - let(:task) { create :my_module, name: 'test task', experiment: experiment, my_module_status: status } + let(:task) { create :my_module, name: 'test task', experiment: experiment } let(:result) do create :result, name: 'test result', my_module: task, user: user end diff --git a/spec/controllers/result_texts_controller_spec.rb b/spec/controllers/result_texts_controller_spec.rb index 9e9c38a77..d6db5c56c 100644 --- a/spec/controllers/result_texts_controller_spec.rb +++ b/spec/controllers/result_texts_controller_spec.rb @@ -12,9 +12,7 @@ describe ResultTextsController, type: :controller do create :project, team: team, user_projects: [user_project] end let(:experiment) { create :experiment, project: project } - let(:my_module_status_flow) { create :my_module_status_flow, :with_statuses } - let(:status) { create :my_module_status, my_module_status_flow: my_module_status_flow } - let(:task) { create :my_module, name: 'test task', experiment: experiment, my_module_status: status } + let(:task) { create :my_module, name: 'test task', experiment: experiment } let(:result) do create :result, name: 'test result', my_module: task, user: user end diff --git a/spec/controllers/results_controller_spec.rb b/spec/controllers/results_controller_spec.rb index ac82ac92e..91905cf1b 100644 --- a/spec/controllers/results_controller_spec.rb +++ b/spec/controllers/results_controller_spec.rb @@ -12,9 +12,7 @@ describe ResultsController, type: :controller do create :project, team: team, user_projects: [user_project] end let(:experiment) { create :experiment, project: project } - let(:my_module_status_flow) { create :my_module_status_flow, :with_statuses } - let(:status) { create :my_module_status, my_module_status_flow: my_module_status_flow } - let(:task) { create :my_module, name: 'test task', experiment: experiment, my_module_status: status } + let(:task) { create :my_module, name: 'test task', experiment: experiment } let(:result) do create :result, name: 'test result', my_module: task, user: user end diff --git a/spec/controllers/step_comments_controller_spec.rb b/spec/controllers/step_comments_controller_spec.rb index 6fbf9f854..f88138ec3 100644 --- a/spec/controllers/step_comments_controller_spec.rb +++ b/spec/controllers/step_comments_controller_spec.rb @@ -13,9 +13,7 @@ describe StepCommentsController, type: :controller do create :user_project, :normal_user, user: user, project: project end let(:experiment) { create :experiment, project: project } - let(:my_module_status_flow) { create :my_module_status_flow, :with_statuses } - let(:status) { create :my_module_status, my_module_status_flow: my_module_status_flow } - let(:my_module) { create :my_module, experiment: experiment, my_module_status: status } + let(:my_module) { create :my_module, experiment: experiment } let(:protocol) do create :protocol, my_module: my_module, team: team, added_by: user end diff --git a/spec/controllers/steps_controller_spec.rb b/spec/controllers/steps_controller_spec.rb index 270772e1b..8a81d65db 100644 --- a/spec/controllers/steps_controller_spec.rb +++ b/spec/controllers/steps_controller_spec.rb @@ -13,9 +13,7 @@ describe StepsController, type: :controller do create :user_project, :normal_user, user: user, project: project end let(:experiment) { create :experiment, project: project } - let(:my_module_status_flow) { create :my_module_status_flow, :with_statuses } - let(:status) { create :my_module_status, my_module_status_flow: my_module_status_flow } - let(:my_module) { create :my_module, experiment: experiment, my_module_status: status } + let(:my_module) { create :my_module, experiment: experiment } let(:protocol) do create :protocol, my_module: my_module, team: team, added_by: user end diff --git a/spec/controllers/tags_controller_spec.rb b/spec/controllers/tags_controller_spec.rb index 5782a5abd..d4833cb6c 100644 --- a/spec/controllers/tags_controller_spec.rb +++ b/spec/controllers/tags_controller_spec.rb @@ -13,9 +13,7 @@ describe TagsController, type: :controller do create :user_project, :normal_user, user: user, project: project end let(:experiment) { create :experiment, project: project } - let(:my_module_status_flow) { create :my_module_status_flow, :with_statuses } - let(:status) { create :my_module_status, my_module_status_flow: my_module_status_flow } - let(:my_module) { create :my_module, experiment: experiment, my_module_status: status } + let(:my_module) { create :my_module, experiment: experiment } let(:tag) { create :tag, project: project } describe 'POST create' do diff --git a/spec/controllers/user_my_modules_controller_spec.rb b/spec/controllers/user_my_modules_controller_spec.rb index f099d7c69..2652b58e9 100644 --- a/spec/controllers/user_my_modules_controller_spec.rb +++ b/spec/controllers/user_my_modules_controller_spec.rb @@ -13,9 +13,7 @@ describe UserMyModulesController, type: :controller do create :user_project, :owner, user: user, project: project end let(:experiment) { create :experiment, project: project } - let(:my_module_status_flow) { create :my_module_status_flow, :with_statuses } - let(:status) { create :my_module_status, my_module_status_flow: my_module_status_flow } - let(:my_module) { create :my_module, experiment: experiment, my_module_status: status } + let(:my_module) { create :my_module, experiment: experiment } describe 'POST create' do let(:action) { post :create, params: params, format: :json } diff --git a/spec/controllers/wopi_controller_spec.rb b/spec/controllers/wopi_controller_spec.rb index 02a0517ae..6fe951b74 100644 --- a/spec/controllers/wopi_controller_spec.rb +++ b/spec/controllers/wopi_controller_spec.rb @@ -14,9 +14,7 @@ describe WopiController, type: :controller do create :project, team: team, user_projects: [user_project] end let(:experiment) { create :experiment, project: project } - let(:my_module_status_flow) { create :my_module_status_flow, :with_statuses } - let(:status) { create :my_module_status, my_module_status_flow: my_module_status_flow } - let(:my_module) { create :my_module, name: 'test task', experiment: experiment, my_module_status: status } + let(:my_module) { create :my_module, name: 'test task', experiment: experiment } let(:result) do create :result, name: 'test result', my_module: my_module, user: user end diff --git a/spec/factories/my_module_status_conditions.rb b/spec/factories/my_module_status_conditions.rb index 84105c5ec..f17ea865a 100644 --- a/spec/factories/my_module_status_conditions.rb +++ b/spec/factories/my_module_status_conditions.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true FactoryBot.define do - factory :my_module_status_condition do + factory :active_condition, class: 'MyModuleStatusConditions::Active' do my_module_status end end diff --git a/spec/factories/my_module_status_consequences.rb b/spec/factories/my_module_status_consequences.rb index 41da03dda..a6b04ae4f 100644 --- a/spec/factories/my_module_status_consequences.rb +++ b/spec/factories/my_module_status_consequences.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true FactoryBot.define do - factory :my_module_status_consequence do + factory :change_activity_consequence, class: 'MyModuleStatusConsequences::ChangeActivity' do my_module_status end end diff --git a/spec/factories/my_module_status_implications.rb b/spec/factories/my_module_status_implications.rb index 31c820934..de83e719e 100644 --- a/spec/factories/my_module_status_implications.rb +++ b/spec/factories/my_module_status_implications.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true FactoryBot.define do - factory :my_module_status_implication do + factory :read_only_implication, class: 'MyModuleStatusImplications::ReadOnly' do my_module_status end end diff --git a/spec/factories/my_modules.rb b/spec/factories/my_modules.rb index dd5659f75..bbf187198 100644 --- a/spec/factories/my_modules.rb +++ b/spec/factories/my_modules.rb @@ -7,7 +7,6 @@ FactoryBot.define do sequence(:x) { |n| n } workflow_order { MyModule.where(experiment_id: experiment.id).count + 1 } experiment - my_module_status my_module_group { create :my_module_group, experiment: experiment } trait :with_tag do tags { create_list :tag, 3, project: experiment.project } @@ -15,5 +14,8 @@ FactoryBot.define do trait :with_due_date do due_date { Faker::Time.between(from: Date.today, to: Date.today + 10.days) } end + trait :with_status do + my_module_status + end end end diff --git a/spec/services/smart_annotations/html_preview_spec.rb b/spec/services/smart_annotations/html_preview_spec.rb index eced9e305..3be100148 100644 --- a/spec/services/smart_annotations/html_preview_spec.rb +++ b/spec/services/smart_annotations/html_preview_spec.rb @@ -12,9 +12,7 @@ describe SmartAnnotations::HtmlPreview do created_by: user, last_modified_by: user end - let(:my_module_status_flow) { create :my_module_status_flow, :with_statuses } - let(:status) { create :my_module_status, my_module_status_flow: my_module_status_flow } - let(:task) { create :my_module, name: 'task', experiment: experiment, my_module_status: status } + let(:task) { create :my_module, name: 'task', experiment: experiment } describe 'Project annotations with type prj' do it 'returns a html snippet' do diff --git a/spec/services/smart_annotations/permission_eval_spec.rb b/spec/services/smart_annotations/permission_eval_spec.rb index 3d064b560..deac79a04 100644 --- a/spec/services/smart_annotations/permission_eval_spec.rb +++ b/spec/services/smart_annotations/permission_eval_spec.rb @@ -17,9 +17,7 @@ describe SmartAnnotations::PermissionEval do created_by: user, last_modified_by: user end - let(:my_module_status_flow) { create :my_module_status_flow, :with_statuses } - let(:status) { create :my_module_status, my_module_status_flow: my_module_status_flow } - let(:task) { create :my_module, name: 'task', experiment: experiment, my_module_status: status } + let(:task) { create :my_module, name: 'task', experiment: experiment } let(:repository) { create :repository, team: team, created_by: user } let(:repository_item) { create :repository_row, repository: repository } diff --git a/spec/services/smart_annotations/text_preview_spec.rb b/spec/services/smart_annotations/text_preview_spec.rb index f0035cc6a..41ad34c9b 100644 --- a/spec/services/smart_annotations/text_preview_spec.rb +++ b/spec/services/smart_annotations/text_preview_spec.rb @@ -12,9 +12,7 @@ describe SmartAnnotations::TextPreview do created_by: user, last_modified_by: user end - let(:my_module_status_flow) { create :my_module_status_flow, :with_statuses } - let(:status) { create :my_module_status, my_module_status_flow: my_module_status_flow } - let(:task) { create :my_module, name: 'task', experiment: experiment, my_module_status: status } + let(:task) { create :my_module, name: 'task', experiment: experiment } describe 'Project annotations' do it 'returns a text snippet' do From 581cd69963153b2eb525227ef2b2526ace83cc7c Mon Sep 17 00:00:00 2001 From: Urban Rotnik Date: Tue, 4 Aug 2020 16:40:06 +0200 Subject: [PATCH 032/163] Add activities for status change --- app/controllers/my_modules_controller.rb | 10 ++++++---- config/initializers/extends.rb | 13 +++++++++---- config/locales/global_activities/en.yml | 2 ++ spec/controllers/my_modules_controller_spec.rb | 4 ++++ 4 files changed, 21 insertions(+), 8 deletions(-) diff --git a/app/controllers/my_modules_controller.rb b/app/controllers/my_modules_controller.rb index efa55a7b1..47340ec25 100644 --- a/app/controllers/my_modules_controller.rb +++ b/app/controllers/my_modules_controller.rb @@ -266,13 +266,15 @@ class MyModulesController < ApplicationController new_status = @my_module.my_module_status_flow.my_module_statuses.find_by(id: update_status_params[:status_id]) return render_404 unless new_status + old_status_id = @my_module.my_module_status_id @my_module.update(my_module_status: new_status) - render json: { content: render_to_string( - partial: 'my_modules/status_flow/task_flow_button.html.erb', - locals: { my_module: @my_module }) - }, status: :ok + 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) + render json: { content: render_to_string( + partial: 'my_modules/status_flow/task_flow_button.html.erb', locals: { my_module: @my_module } + ) }, status: :ok end private diff --git a/config/initializers/extends.rb b/config/initializers/extends.rb index 25f7c4064..1a72da2c7 100644 --- a/config/initializers/extends.rb +++ b/config/initializers/extends.rb @@ -143,8 +143,11 @@ class Extends step: nil } - ACTIVITY_MESSAGE_ITEMS_TYPES = ACTIVITY_SUBJECT_TYPES + %w(User Tag RepositoryColumn RepositoryRow Step - Asset TinyMceAsset Repository RepositorySnapshot).freeze + ACTIVITY_MESSAGE_ITEMS_TYPES = + ACTIVITY_SUBJECT_TYPES + %w( + User Tag RepositoryColumn RepositoryRow Step Asset TinyMceAsset Repository MyModuleStatus RepositorySnapshot + ).freeze + ACTIVITY_TYPES = { create_project: 0, @@ -288,13 +291,15 @@ class Extends archive_inventory: 144, restore_inventory: 145, export_inventory_items_assigned_to_task: 146, - export_inventory_snapshot_items_assigned_to_task: 147 + export_inventory_snapshot_items_assigned_to_task: 147, + change_status_on_task_flow: 148 # 149, 150, 151 in AdddOn! } ACTIVITY_GROUPS = { projects: [*0..7, 32, 33, 34, 95, 108, 65, 109], task_results: [23, 26, 25, 42, 24, 40, 41, 99, 110, 122, 116, 128], - task: [8, 58, 9, 59, *10..14, 35, 36, 37, 53, 54, *60..63, 138, 139, 140, 64, *66..69, 106, 126, 120, 132], + task: [8, 58, 9, 59, *10..14, 35, 36, 37, 53, 54, *60..63, 138, 139, 140, 64, 66, 106, 126, 120, 132, + *146..148], task_protocol: [15, 22, 16, 18, 19, 20, 21, 17, 38, 39, 100, 111, 45, 46, 47, 121, 124, 115, 118, 127, 130, 137], task_inventory: [55, 56], experiment: [*27..31, 57], diff --git a/config/locales/global_activities/en.yml b/config/locales/global_activities/en.yml index 0ab5de4c1..4003537e1 100644 --- a/config/locales/global_activities/en.yml +++ b/config/locales/global_activities/en.yml @@ -175,6 +175,7 @@ en: protocol_description_in_task_edited_html: "%{user} edited protocol description on task %{my_module}." export_inventory_items_assigned_to_task_html: "%{user} exported inventory item(s) assigned to task %{my_module} from inventory %{repository}: Live version." export_inventory_snapshot_items_assigned_to_task_html: "%{user} exported inventory item(s) assigned to task %{my_module} from inventory %{repository_snapshot}: Snapshot of %{created_at}." + change_status_on_task_flow_html: "%{user} changed status from %{my_module_status_old} to %{my_module_status_new} for task %{my_module}." activity_name: create_project: "Project created" @@ -315,6 +316,7 @@ en: protocol_description_in_task_edited: "Protocol description in task edited" export_inventory_items_assigned_to_task: "Task-assigned inventory items exported (live version)" export_inventory_snapshot_items_assigned_to_task: "Task-assigned inventory items exported (snapshot)" + change_status_on_task_flow: "Task status changed" activity_group: projects: "Projects" diff --git a/spec/controllers/my_modules_controller_spec.rb b/spec/controllers/my_modules_controller_spec.rb index 5d98262ea..b407cdb5c 100644 --- a/spec/controllers/my_modules_controller_spec.rb +++ b/spec/controllers/my_modules_controller_spec.rb @@ -147,6 +147,10 @@ describe MyModulesController, type: :controller do expect(my_module.reload.my_module_status.id).to be_eql(status_id) expect(response).to have_http_status 200 end + + it 'creates activity' do + expect { action }.to(change { Activity.all.count }.by(1)) + end end context 'when status not found' do From 9ff5e8bd7da36aedf6e3c53f56406ee5fe30a1b1 Mon Sep 17 00:00:00 2001 From: aignatov-bio Date: Tue, 1 Sep 2020 11:07:02 +0200 Subject: [PATCH 033/163] Add task state change error handling and validation --- app/assets/javascripts/my_modules.js | 2 +- app/controllers/my_modules_controller.rb | 21 ++++++++++----------- app/models/my_module.rb | 12 ++++++++++++ config/locales/en.yml | 4 +++- 4 files changed, 26 insertions(+), 13 deletions(-) diff --git a/app/assets/javascripts/my_modules.js b/app/assets/javascripts/my_modules.js index 562625293..e1661534f 100644 --- a/app/assets/javascripts/my_modules.js +++ b/app/assets/javascripts/my_modules.js @@ -246,7 +246,7 @@ function applyTaskStatusChangeCallBack() { if (e.status === 403) { HelperModule.flashAlertMsg(I18n.t('my_module_statuses.update_status.error.no_permission'), 'danger'); } else if (e.status === 422) { - HelperModule.flashAlertMsg(e.errors, 'danger'); + HelperModule.flashAlertMsg(e.responseJSON.errors, 'danger'); } else { HelperModule.flashAlertMsg('error', 'danger'); } diff --git a/app/controllers/my_modules_controller.rb b/app/controllers/my_modules_controller.rb index 47340ec25..838debbd4 100644 --- a/app/controllers/my_modules_controller.rb +++ b/app/controllers/my_modules_controller.rb @@ -263,18 +263,17 @@ class MyModulesController < ApplicationController end def update_state - new_status = @my_module.my_module_status_flow.my_module_statuses.find_by(id: update_status_params[:status_id]) - return render_404 unless new_status - old_status_id = @my_module.my_module_status_id - @my_module.update(my_module_status: new_status) - - 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) - - render json: { content: render_to_string( - partial: 'my_modules/status_flow/task_flow_button.html.erb', locals: { my_module: @my_module } - ) }, status: :ok + if @my_module.update(my_module_status_id: update_status_params[:status_id]) + 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) + render json: { content: render_to_string( + partial: 'my_modules/status_flow/task_flow_button.html.erb', + locals: { my_module: @my_module } + ) }, status: :ok + else + render json: { errors: @my_module.errors.messages.values.flatten.join('\n') }, status: :unprocessable_entity + end end private diff --git a/app/models/my_module.rb b/app/models/my_module.rb index 57361e5eb..eb5370bb4 100644 --- a/app/models/my_module.rb +++ b/app/models/my_module.rb @@ -22,6 +22,7 @@ class MyModule < ApplicationRecord validate :coordinates_uniqueness_check, if: :active? validates :completed_on, presence: true, if: proc { |mm| mm.completed? } + validate :check_status_order, if: :my_module_status_id_changed? validate :check_status_conditions, if: :my_module_status_id_changed? validate :check_status_implications, unless: :my_module_status_id_changed? @@ -538,6 +539,17 @@ class MyModule < ApplicationRecord end end + def check_status_order + return if my_module_status.blank? + + original_status = MyModuleStatus.find(my_module_status_id_was) + + unless original_status.next_status == my_module_status || original_status.previous_status == my_module_status + errors.add(:my_module_status_id, + I18n.t('activerecord.errors.models.my_module.attributes.my_module_status_id.not_correct_order')) + end + end + def exec_status_consequences return if my_module_status.blank? diff --git a/config/locales/en.yml b/config/locales/en.yml index 15f75aac9..cf208033a 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -108,8 +108,10 @@ en: same_team: "Inventory can't be shared to the same team as it belongs to" my_module: attributes: + my_module_status_id: + not_correct_order: "Status can be changed only on next or previous status." position: - not_unique: "X and Y position has already been taken by another task in the experiment." + not_unique: "X and Y position has already been taken by another task in the experiment." my_module_status: attributes: next_status: From ce84c1546ba50d49b4f729daa7519346c88f7408 Mon Sep 17 00:00:00 2001 From: aignatov-bio Date: Tue, 1 Sep 2020 12:31:14 +0200 Subject: [PATCH 034/163] Fix tests --- app/models/my_module.rb | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/app/models/my_module.rb b/app/models/my_module.rb index eb5370bb4..2654a8fad 100644 --- a/app/models/my_module.rb +++ b/app/models/my_module.rb @@ -540,11 +540,12 @@ class MyModule < ApplicationRecord end def check_status_order - return if my_module_status.blank? + return unless my_module_status_id_was - original_status = MyModuleStatus.find(my_module_status_id_was) + original_status = my_module_status_flow.my_module_statuses.find_by(id: my_module_status_id_was) - unless original_status.next_status == my_module_status || original_status.previous_status == my_module_status + unless my_module_status && + (original_status.next_status == my_module_status || original_status.previous_status == my_module_status) errors.add(:my_module_status_id, I18n.t('activerecord.errors.models.my_module.attributes.my_module_status_id.not_correct_order')) end From 5148902d9333871b072f7c8b787b8e91ec19d6c5 Mon Sep 17 00:00:00 2001 From: Urban Rotnik Date: Tue, 1 Sep 2020 13:37:57 +0200 Subject: [PATCH 035/163] Fix error on edit experiment --- app/views/canvas/edit/_my_module.html.erb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/views/canvas/edit/_my_module.html.erb b/app/views/canvas/edit/_my_module.html.erb index 228a8a405..62e9b3132 100644 --- a/app/views/canvas/edit/_my_module.html.erb +++ b/app/views/canvas/edit/_my_module.html.erb @@ -36,7 +36,7 @@ <%= t('experiments.canvas.edit.move_module') %> <% end %> - <% if module_group.my_modules.all? { |my_module| can_move_module?(my_module) } %> + <% if module_group&.my_modules&.all? { |my_module| can_move_module?(my_module) } %>
  • <%= t('experiments.canvas.edit.move_module_group') %>
    • @@ -46,7 +46,7 @@ <%= t('experiments.canvas.edit.delete_module') %> <% end %> - <% if module_group.my_modules.all? { |my_module| can_archive_module?(my_module) } %> + <% if module_group&.my_modules&.all? { |my_module| can_archive_module?(my_module) } %>
  • <%= t('experiments.canvas.edit.delete_module_group') %>
    • From e1229f5606fe30a86075069ce8186ea8c469967c Mon Sep 17 00:00:00 2001 From: aignatov-bio Date: Tue, 1 Sep 2020 14:49:58 +0200 Subject: [PATCH 036/163] Fix test and status validations --- app/controllers/my_modules_controller.rb | 1 + app/models/my_module.rb | 13 ++++++------- spec/controllers/my_modules_controller_spec.rb | 15 ++++++++------- 3 files changed, 15 insertions(+), 14 deletions(-) diff --git a/app/controllers/my_modules_controller.rb b/app/controllers/my_modules_controller.rb index 838debbd4..9ab0b5730 100644 --- a/app/controllers/my_modules_controller.rb +++ b/app/controllers/my_modules_controller.rb @@ -267,6 +267,7 @@ class MyModulesController < ApplicationController if @my_module.update(my_module_status_id: update_status_params[:status_id]) 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) + render json: { content: render_to_string( partial: 'my_modules/status_flow/task_flow_button.html.erb', locals: { my_module: @my_module } diff --git a/app/models/my_module.rb b/app/models/my_module.rb index 2654a8fad..9a9210e6d 100644 --- a/app/models/my_module.rb +++ b/app/models/my_module.rb @@ -7,8 +7,9 @@ class MyModule < ApplicationRecord enum state: Extends::TASKS_STATES before_create :create_blank_protocol + before_create :assign_default_status_flow before_validation :set_completed_on, if: :state_changed? - before_validation :assign_default_status_flow + before_save :exec_status_consequences, if: :my_module_status_id_changed? auto_strip_attributes :name, :description, nullify: false @@ -22,7 +23,7 @@ class MyModule < ApplicationRecord validate :coordinates_uniqueness_check, if: :active? validates :completed_on, presence: true, if: proc { |mm| mm.completed? } - validate :check_status_order, if: :my_module_status_id_changed? + validate :check_status, if: :my_module_status_id_changed? validate :check_status_conditions, if: :my_module_status_id_changed? validate :check_status_implications, unless: :my_module_status_id_changed? @@ -539,13 +540,11 @@ class MyModule < ApplicationRecord end end - def check_status_order + def check_status return unless my_module_status_id_was - original_status = my_module_status_flow.my_module_statuses.find_by(id: my_module_status_id_was) - - unless my_module_status && - (original_status.next_status == my_module_status || original_status.previous_status == my_module_status) + original_status = MyModuleStatus.find_by(id: my_module_status_id_was) + unless my_module_status && [original_status.next_status, original_status.previous_status].include?(my_module_status) errors.add(:my_module_status_id, I18n.t('activerecord.errors.models.my_module.attributes.my_module_status_id.not_correct_order')) end diff --git a/spec/controllers/my_modules_controller_spec.rb b/spec/controllers/my_modules_controller_spec.rb index b407cdb5c..7d4666e20 100644 --- a/spec/controllers/my_modules_controller_spec.rb +++ b/spec/controllers/my_modules_controller_spec.rb @@ -153,23 +153,24 @@ describe MyModulesController, type: :controller do end end - context 'when status not found' do + context 'when status not exist' do let(:status_id) { -1 } - it 'renders 404' do + it 'renders 422' do + my_module.my_module_status_flow action - expect(response).to have_http_status 404 + expect(response).to have_http_status 422 end end - context 'when my_module does not have assign flow yet' do - let(:status_id) { -1 } + context 'when status not correct' do + let(:status_id) { my_module.my_module_status.next_status.next_status.id } - it 'renders 404' do + it 'renders 422' do action - expect(response).to have_http_status 404 + expect(response).to have_http_status 422 end end From ed5869ff8e796a8303febb21bdb63534e79c03f2 Mon Sep 17 00:00:00 2001 From: Urban Rotnik Date: Tue, 1 Sep 2020 14:56:48 +0200 Subject: [PATCH 037/163] Show status on task card --- app/assets/stylesheets/themes/scinote.scss | 3 +++ app/views/canvas/full_zoom/_my_module.html.erb | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/app/assets/stylesheets/themes/scinote.scss b/app/assets/stylesheets/themes/scinote.scss index 939c77875..ff1fec8cc 100644 --- a/app/assets/stylesheets/themes/scinote.scss +++ b/app/assets/stylesheets/themes/scinote.scss @@ -762,7 +762,10 @@ ul.double-line > li { background-color: var(--state-color); color: $color-white; margin: 3px 0; + max-width: 100%; + overflow: hidden; padding: 2px 8px; + text-overflow: ellipsis; white-space: nowrap; width: fit-content; } diff --git a/app/views/canvas/full_zoom/_my_module.html.erb b/app/views/canvas/full_zoom/_my_module.html.erb index 3f4ef6fa7..af2f9385d 100644 --- a/app/views/canvas/full_zoom/_my_module.html.erb +++ b/app/views/canvas/full_zoom/_my_module.html.erb @@ -37,8 +37,8 @@ <% else %> <%= render partial: "my_modules/card_due_date_label.html.erb", locals: { my_module: my_module, format: :full_date } %> <% end %> -
    - Completed +
    + <%= my_module.my_module_status.name %>
    From 68f31ce7ecfab56803ced585ced98a3c36d8c722 Mon Sep 17 00:00:00 2001 From: aignatov-bio Date: Thu, 20 Aug 2020 15:49:48 +0200 Subject: [PATCH 038/163] Add api endpoints for workflows --- app/controllers/api/v1/base_controller.rb | 4 +++ app/controllers/api/v1/tasks_controller.rb | 2 +- .../api/v1/workflow_statuses_controller.rb | 16 +++++++++++ .../api/v1/workflows_controller.rb | 20 ++++++++++++++ app/serializers/api/v1/task_serializer.rb | 27 ++++++++++++++++++- app/serializers/api/v1/workflow_serializer.rb | 11 ++++++++ .../api/v1/workflow_status_serializer.rb | 11 ++++++++ config/routes.rb | 4 +++ 8 files changed, 93 insertions(+), 2 deletions(-) create mode 100644 app/controllers/api/v1/workflow_statuses_controller.rb create mode 100644 app/controllers/api/v1/workflows_controller.rb create mode 100644 app/serializers/api/v1/workflow_serializer.rb create mode 100644 app/serializers/api/v1/workflow_status_serializer.rb diff --git a/app/controllers/api/v1/base_controller.rb b/app/controllers/api/v1/base_controller.rb index 79d5a0ea8..70acc12e4 100644 --- a/app/controllers/api/v1/base_controller.rb +++ b/app/controllers/api/v1/base_controller.rb @@ -201,6 +201,10 @@ module Api @checklist_item = @checklist.checklist_items.find(params.require(key)) raise PermissionError.new(Protocol, :read) unless can_read_protocol_in_module?(@step.protocol) end + + def load_workflow(key = :workflow_id) + @workflow = MyModuleStatusFlow.find(params.require(key)) + end end end end diff --git a/app/controllers/api/v1/tasks_controller.rb b/app/controllers/api/v1/tasks_controller.rb index ac4696d82..f0bd91bf0 100644 --- a/app/controllers/api/v1/tasks_controller.rb +++ b/app/controllers/api/v1/tasks_controller.rb @@ -59,7 +59,7 @@ module Api def task_params raise TypeError unless params.require(:data).require(:type) == 'tasks' - params.require(:data).require(:attributes).permit(%i(name x y description state)) + params.require(:data).require(:attributes).permit(%i(name x y description state my_module_status_id)) end def load_task_for_managing diff --git a/app/controllers/api/v1/workflow_statuses_controller.rb b/app/controllers/api/v1/workflow_statuses_controller.rb new file mode 100644 index 000000000..6114d0c25 --- /dev/null +++ b/app/controllers/api/v1/workflow_statuses_controller.rb @@ -0,0 +1,16 @@ +# frozen_string_literal: true + +module Api + module V1 + class WorkflowStatusesController < BaseController + before_action only: :index do + load_workflow(:workflow_id) + end + + def index + statuses = @workflow.my_module_statuses + render jsonapi: statuses, each_serializer: WorkflowStatusSerializer + end + end + end +end diff --git a/app/controllers/api/v1/workflows_controller.rb b/app/controllers/api/v1/workflows_controller.rb new file mode 100644 index 000000000..dfb5e7618 --- /dev/null +++ b/app/controllers/api/v1/workflows_controller.rb @@ -0,0 +1,20 @@ +# frozen_string_literal: true + +module Api + module V1 + class WorkflowsController < BaseController + before_action only: :show do + load_workflow(:id) + end + + def index + workflows = MyModuleStatusFlow.all + render jsonapi: workflows, each_serializer: WorkflowSerializer + end + + def show + render jsonapi: @workflow, serializer: WorkflowSerializer + end + end + end +end diff --git a/app/serializers/api/v1/task_serializer.rb b/app/serializers/api/v1/task_serializer.rb index 6064c2a66..cf99f2535 100644 --- a/app/serializers/api/v1/task_serializer.rb +++ b/app/serializers/api/v1/task_serializer.rb @@ -8,7 +8,8 @@ module Api include InputSanitizeHelper type :tasks - attributes :id, :name, :started_on, :due_date, :description, :state, :archived + attributes :id, :name, :started_on, :due_date, :description, :state, :archived, :status_id, :status_name, + :prev_status_id, :prev_status_name, :next_status_id, :next_status_name has_many :output_tasks, key: :outputs, serializer: TaskSerializer, class_name: 'MyModule' @@ -16,6 +17,30 @@ module Api serializer: TaskSerializer, class_name: 'MyModule' + def status_id + object.my_module_status_id + end + + def status_name + object.my_module_status.name + end + + def prev_status_id + object.my_module_status.previous_status&.id + end + + def prev_status_name + object.my_module_status.previous_status&.name + end + + def next_status_id + object.my_module_status.next_status&.id + end + + def next_status_name + object.my_module_status.next_status&.name + end + def output_tasks object.my_modules end diff --git a/app/serializers/api/v1/workflow_serializer.rb b/app/serializers/api/v1/workflow_serializer.rb new file mode 100644 index 000000000..8488ceb4c --- /dev/null +++ b/app/serializers/api/v1/workflow_serializer.rb @@ -0,0 +1,11 @@ +# frozen_string_literal: true + +module Api + module V1 + class WorkflowSerializer < ActiveModel::Serializer + type :workflows + + attributes :id, :name, :description, :visibility, :team_id + end + end +end diff --git a/app/serializers/api/v1/workflow_status_serializer.rb b/app/serializers/api/v1/workflow_status_serializer.rb new file mode 100644 index 000000000..a20e8fa49 --- /dev/null +++ b/app/serializers/api/v1/workflow_status_serializer.rb @@ -0,0 +1,11 @@ +# frozen_string_literal: true + +module Api + module V1 + class WorkflowStatusSerializer < ActiveModel::Serializer + type :workflow_statuses + + attributes :id, :name, :description, :color, :previous_status_id + end + end +end diff --git a/config/routes.rb b/config/routes.rb index 91fd52b44..7096518ab 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -707,6 +707,10 @@ Rails.application.routes.draw do path: 'identities', as: :identities end + + resources :workflows, only: %i(index show) do + resources :workflow_statuses, path: :statuses, only: %i(index) + end end end end From d57eb68f939d58ef0fb37d1ce16fd2e6fec27ddb Mon Sep 17 00:00:00 2001 From: Mojca Lorber Date: Tue, 1 Sep 2020 16:25:30 +0200 Subject: [PATCH 039/163] Fix tables header corners --- app/assets/stylesheets/extend/datatable.scss | 8 ++++++-- app/assets/stylesheets/shared/datatable.scss | 4 ++++ 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/app/assets/stylesheets/extend/datatable.scss b/app/assets/stylesheets/extend/datatable.scss index 1da42d628..2230c42e2 100644 --- a/app/assets/stylesheets/extend/datatable.scss +++ b/app/assets/stylesheets/extend/datatable.scss @@ -8,10 +8,9 @@ word-break: initial; thead { - background-color: $color-concrete; - tr { th { + background-color: $color-concrete; border-bottom: 2px solid $color-white; border-left: 2px solid $color-white; font-weight: bold; @@ -31,6 +30,11 @@ &:first-child { border-left: 0; + border-top-left-radius: 4px; + } + + &:last-child { + border-top-right-radius: 4px; } } diff --git a/app/assets/stylesheets/shared/datatable.scss b/app/assets/stylesheets/shared/datatable.scss index 514492f86..1d2089e38 100644 --- a/app/assets/stylesheets/shared/datatable.scss +++ b/app/assets/stylesheets/shared/datatable.scss @@ -87,4 +87,8 @@ margin-right: .5em; } } + + table > tbody > tr:first-child > td { + border-top: 0; + } } From 4c7312faf9df45149e3c6751a93c2d5b0b2aa8f6 Mon Sep 17 00:00:00 2001 From: aignatov-bio Date: Wed, 2 Sep 2020 11:43:00 +0200 Subject: [PATCH 040/163] Add tests for new workflow endpoints --- app/controllers/api/v1/tasks_controller.rb | 1 + config/routes.rb | 4 +- .../v1/workflow_statuses_controller_spec.rb | 28 +++++++++++ .../api/v1/workflows_controller_spec.rb | 50 +++++++++++++++++++ 4 files changed, 81 insertions(+), 2 deletions(-) create mode 100644 spec/requests/api/v1/workflow_statuses_controller_spec.rb create mode 100644 spec/requests/api/v1/workflows_controller_spec.rb diff --git a/app/controllers/api/v1/tasks_controller.rb b/app/controllers/api/v1/tasks_controller.rb index f0bd91bf0..acdcede83 100644 --- a/app/controllers/api/v1/tasks_controller.rb +++ b/app/controllers/api/v1/tasks_controller.rb @@ -16,6 +16,7 @@ module Api def index tasks = @experiment.my_modules + .includes(:my_module_status, :my_modules, :my_module_antecessors) .page(params.dig(:page, :number)) .per(params.dig(:page, :size)) diff --git a/config/routes.rb b/config/routes.rb index 7096518ab..d6fa03bd2 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,6 +1,6 @@ Rails.application.routes.draw do use_doorkeeper do - skip_controllers :applications, :authorized_applications, :token_info + #skip_controllers :applications, :authorized_applications, :token_info end # Addons @@ -633,7 +633,7 @@ Rails.application.routes.draw do namespace :api, defaults: { format: 'json' } do get 'health', to: 'api#health' get 'status', to: 'api#status' - if Rails.configuration.x.core_api_v1_enabled + if Rails.configuration.x.core_api_v1_enabled || true namespace :v1 do resources :teams, only: %i(index show) do resources :inventories, diff --git a/spec/requests/api/v1/workflow_statuses_controller_spec.rb b/spec/requests/api/v1/workflow_statuses_controller_spec.rb new file mode 100644 index 000000000..8bf8e2a9c --- /dev/null +++ b/spec/requests/api/v1/workflow_statuses_controller_spec.rb @@ -0,0 +1,28 @@ +# frozen_string_literal: true + +require 'rails_helper' + +RSpec.describe 'Api::V1::WrokflowsController', type: :request do + before :all do + @user = create(:user) + @teams = create_list(:team, 2, created_by: @user) + create(:user_team, user: @user, team: @teams.first, role: 2) + @valid_headers = + { 'Authorization': 'Bearer ' + generate_token(@user.id) } + MyModuleStatusFlow.ensure_default + end + + describe 'GET workflow statuses, #index' do + it 'Response with correct workflow statuses' do + hash_body = nil + get api_v1_workflow_workflow_statuses_path(workflow_id: MyModuleStatusFlow.first.id), headers: @valid_headers + expect { hash_body = json }.not_to raise_exception + expect(hash_body[:data]).to match( + ActiveModelSerializers::SerializableResource + .new(MyModuleStatusFlow.first.my_module_statuses, + each_serializer: Api::V1::WorkflowStatusSerializer) + .as_json[:data] + ) + end + end +end diff --git a/spec/requests/api/v1/workflows_controller_spec.rb b/spec/requests/api/v1/workflows_controller_spec.rb new file mode 100644 index 000000000..c0c9a405c --- /dev/null +++ b/spec/requests/api/v1/workflows_controller_spec.rb @@ -0,0 +1,50 @@ +# frozen_string_literal: true + +require 'rails_helper' + +RSpec.describe 'Api::V1::WrokflowsController', type: :request do + before :all do + @user = create(:user) + @teams = create_list(:team, 2, created_by: @user) + create(:user_team, user: @user, team: @teams.first, role: 2) + @valid_headers = + { 'Authorization': 'Bearer ' + generate_token(@user.id) } + MyModuleStatusFlow.ensure_default + end + + describe 'GET workflows, #index' do + it 'Response with correct workflows' do + hash_body = nil + get api_v1_workflows_path, headers: @valid_headers + expect { hash_body = json }.not_to raise_exception + expect(hash_body[:data]).to match( + ActiveModelSerializers::SerializableResource + .new(MyModuleStatusFlow.all, + each_serializer: Api::V1::WorkflowSerializer) + .as_json[:data] + ) + end + end + + describe 'GET worflow, #show' do + it 'When valid request' do + hash_body = nil + get api_v1_workflow_path(id: MyModuleStatusFlow.all.first), headers: @valid_headers + expect { hash_body = json }.not_to raise_exception + expect(hash_body[:data]).to match( + ActiveModelSerializers::SerializableResource + .new(MyModuleStatusFlow.all.first, + serializer: Api::V1::WorkflowSerializer) + .as_json[:data] + ) + end + + it 'When invalid request, non existing workflow' do + hash_body = nil + get api_v1_workflow_path(id: -1), headers: @valid_headers + expect(response).to have_http_status(404) + expect { hash_body = json }.not_to raise_exception + expect(hash_body['errors'][0]).to include('status': 404) + end + end +end From 634dd2ae5ec9a0884d2ab35887d62f612a38f068 Mon Sep 17 00:00:00 2001 From: Mojca Lorber Date: Wed, 2 Sep 2020 12:00:52 +0200 Subject: [PATCH 041/163] Add css variable --- app/assets/stylesheets/extend/datatable.scss | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/assets/stylesheets/extend/datatable.scss b/app/assets/stylesheets/extend/datatable.scss index 2230c42e2..ef49f5e1d 100644 --- a/app/assets/stylesheets/extend/datatable.scss +++ b/app/assets/stylesheets/extend/datatable.scss @@ -30,11 +30,11 @@ &:first-child { border-left: 0; - border-top-left-radius: 4px; + border-top-left-radius: $border-radius-default; } &:last-child { - border-top-right-radius: 4px; + border-top-right-radius: $border-radius-default; } } From 9a8e53c4bc5995cae4a59c5fbe344ed9d698f84e Mon Sep 17 00:00:00 2001 From: aignatov-bio <47317017+aignatov-bio@users.noreply.github.com> Date: Wed, 2 Sep 2020 12:08:43 +0200 Subject: [PATCH 042/163] Fix routes --- config/routes.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config/routes.rb b/config/routes.rb index d6fa03bd2..7096518ab 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,6 +1,6 @@ Rails.application.routes.draw do use_doorkeeper do - #skip_controllers :applications, :authorized_applications, :token_info + skip_controllers :applications, :authorized_applications, :token_info end # Addons @@ -633,7 +633,7 @@ Rails.application.routes.draw do namespace :api, defaults: { format: 'json' } do get 'health', to: 'api#health' get 'status', to: 'api#status' - if Rails.configuration.x.core_api_v1_enabled || true + if Rails.configuration.x.core_api_v1_enabled namespace :v1 do resources :teams, only: %i(index show) do resources :inventories, From 257329ce803ae7b3bcfdefd9d9b939e674c464cd Mon Sep 17 00:00:00 2001 From: aignatov-bio Date: Wed, 2 Sep 2020 15:41:07 +0200 Subject: [PATCH 043/163] Fix css for status flows --- .../stylesheets/dashboard/current_tasks.scss | 21 ++++--- .../my_modules/protocols/index.scss | 2 +- .../stylesheets/my_modules/status_flow.scss | 55 ++++++++++++++++++- app/assets/stylesheets/projects.scss | 1 + app/assets/stylesheets/themes/scinote.scss | 2 +- .../modals/_status_flow_modal.html.erb | 2 +- .../status_flow/_task_flow_button.html.erb | 12 +++- config/locales/en.yml | 2 +- config/locales/my_module_statuses/en.yml | 4 +- 9 files changed, 81 insertions(+), 20 deletions(-) diff --git a/app/assets/stylesheets/dashboard/current_tasks.scss b/app/assets/stylesheets/dashboard/current_tasks.scss index 38a171da5..6b25cf08e 100644 --- a/app/assets/stylesheets/dashboard/current_tasks.scss +++ b/app/assets/stylesheets/dashboard/current_tasks.scss @@ -142,7 +142,7 @@ .current-tasks-list { align-items: center; display: grid; - grid-template-columns: auto max-content max-content; + grid-template-columns: 1fr max-content max-content; padding: 0 1em; &.disabled { @@ -157,9 +157,9 @@ .current-task-breadcrumbs { @include font-small; color: $color-silver-chalice; - grid-column: 1 / span 3; - line-height: 14px; - margin-top: .5em; + grid-column: span 3; + line-height: 1em; + padding: .5em .5em .25em; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; @@ -179,21 +179,19 @@ } .task-name { - flex-grow: 1; font-size: $font-size-base; font-weight: bold; overflow: hidden; + padding: 0 .5em; text-overflow: ellipsis; white-space: nowrap; } .task-due-date { - flex-basis: 280px; - flex-shrink: 0; padding: 0 2em 0 1em; .fas { - padding: 4px; + padding: .25em; } &.overdue { @@ -211,6 +209,7 @@ .task-status-container { grid-column: 3; + padding: 0 .5em; text-align: right; .task-status { @@ -222,7 +221,7 @@ } } - &:hover { + &:hover > * { background: $color-concrete; } } @@ -309,6 +308,7 @@ .current-task-breadcrumbs { grid-column: 1; + padding-left: 0; } .task-name { @@ -320,8 +320,10 @@ .task-due-date { @include font-small; border: 0; + height: 24px; padding-left: 0; + .fas { display: none; } @@ -330,6 +332,7 @@ .task-status-container { grid-column: 1; text-align: left; + padding-left: 0; } } } diff --git a/app/assets/stylesheets/my_modules/protocols/index.scss b/app/assets/stylesheets/my_modules/protocols/index.scss index bde9da234..03b8f1520 100644 --- a/app/assets/stylesheets/my_modules/protocols/index.scss +++ b/app/assets/stylesheets/my_modules/protocols/index.scss @@ -506,7 +506,7 @@ .task-information { column-gap: 1em; display: grid; - grid-template-columns: auto max-content; + grid-template-columns: auto minmax(max-content, 18em); .task-section-header { grid-column: 1 / span 1; diff --git a/app/assets/stylesheets/my_modules/status_flow.scss b/app/assets/stylesheets/my_modules/status_flow.scss index 81e8a93f0..c297f8ddc 100644 --- a/app/assets/stylesheets/my_modules/status_flow.scss +++ b/app/assets/stylesheets/my_modules/status_flow.scss @@ -11,15 +11,63 @@ .dropdown-toggle { color: $color-white; text-align: left; - width: 15em; + width: 100%; .caret { margin: 8px 0; } } - .dropdown-menu > li { - line-height: 35px; + &.open .dropdown-menu{ + align-items: center; + display: grid; + grid-template-columns: max-content min-content minmax(0, auto); + padding: .5em 0; + + li { + display: contents; + + > * { + cursor: pointer; + line-height: 2em; + padding: .5em 1em; + } + + &:hover > *{ + background: $color-concrete; + } + } + + .fa-long-arrow-alt-right { + color: $color-silver-chalice; + padding: .5em 0; + } + + .status-container { + display: flex; + } + + .status-name { + border-radius: $border-radius-tag; + color: $color-white; + display: inline-block; + font-weight: bold; + line-height: 1em; + max-width: 100%; + overflow: hidden; + padding: .5em; + text-overflow: ellipsis; + white-space: nowrap; + } + + + #viewTaskFlow { + cursor: pointer; + display: list-item; + grid-column: span 3; + line-height: 2em; + padding: .5em 1em; + } } } } @@ -46,6 +94,7 @@ } .status-block { + @include font-button; border-radius: $border-radius-tag; color: $color-white; font-weight: bold; diff --git a/app/assets/stylesheets/projects.scss b/app/assets/stylesheets/projects.scss index c9125f939..99324fa85 100644 --- a/app/assets/stylesheets/projects.scss +++ b/app/assets/stylesheets/projects.scss @@ -237,6 +237,7 @@ path, ._jsPlumb_endpoint { .panel-body .due-date-link { color: $color-emperor; + display: block; } .panel-body .due-date-label { diff --git a/app/assets/stylesheets/themes/scinote.scss b/app/assets/stylesheets/themes/scinote.scss index ff1fec8cc..16b499b5f 100644 --- a/app/assets/stylesheets/themes/scinote.scss +++ b/app/assets/stylesheets/themes/scinote.scss @@ -761,13 +761,13 @@ ul.double-line > li { .status-label { background-color: var(--state-color); color: $color-white; + display: inline-block; margin: 3px 0; max-width: 100%; overflow: hidden; padding: 2px 8px; text-overflow: ellipsis; white-space: nowrap; - width: fit-content; } } diff --git a/app/views/my_modules/modals/_status_flow_modal.html.erb b/app/views/my_modules/modals/_status_flow_modal.html.erb index bd16bfc96..3289bd22f 100644 --- a/app/views/my_modules/modals/_status_flow_modal.html.erb +++ b/app/views/my_modules/modals/_status_flow_modal.html.erb @@ -3,7 +3,7 @@
    -

    <%= t('my_modules.modals.status_flow_modal.title', status_flow: @my_module.my_module_status_flow.name) %>

    +

    <%= t('my_modules.modals.status_flow_modal.title') %>

    diff --git a/app/views/my_modules/status_flow/_task_flow_button.html.erb b/app/views/my_modules/status_flow/_task_flow_button.html.erb index 0978b99b6..b9f24819f 100644 --- a/app/views/my_modules/status_flow/_task_flow_button.html.erb +++ b/app/views/my_modules/status_flow/_task_flow_button.html.erb @@ -14,14 +14,22 @@ <% unless status.initial_status? %> <% previous_s = status.previous_status %>
  • - <%= t 'my_module_statuses.dropdown.return_label' %> "><%= previous_s.name %> + <%= t('my_module_statuses.dropdown.return_label') %> + +
    +
    "><%= previous_s.name %>
    +
    • <% end %> <% unless status.final_status? %> <% next_s = status.next_status %>
  • - <%= t('my_module_statuses.dropdown.move_label') %> "><%= next_s.name %> + <%= t('my_module_statuses.dropdown.move_label') %> + +
    +
    "><%= next_s.name %>
    +
    • <% end %>
  • diff --git a/config/locales/en.yml b/config/locales/en.yml index 15f75aac9..4d48a3ed4 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -840,7 +840,7 @@ en: update_error: "There was an error in updating your item(s)." modals: status_flow_modal: - title: "Task status flow: %{status_flow}" + title: "Task status flow" current_status: "Current status" done: "Done" update_repository_record: diff --git a/config/locales/my_module_statuses/en.yml b/config/locales/my_module_statuses/en.yml index e6ac1e5c2..c98376236 100644 --- a/config/locales/my_module_statuses/en.yml +++ b/config/locales/my_module_statuses/en.yml @@ -2,8 +2,8 @@ en: my_module_statuses: dropdown: status_label: Status - move_label: Move to -> - return_label: Return to -> + move_label: Move to + return_label: Return to view_flow_label: View task flow update_status: error: From 06d75fb07e87a66ea054693c108ec948c7950c40 Mon Sep 17 00:00:00 2001 From: Mojca Lorber Date: Wed, 2 Sep 2020 18:04:37 +0200 Subject: [PATCH 044/163] Change step checklist and table edit mode --- app/assets/stylesheets/steps.scss | 10 ++++++++ app/views/steps/_form_checklists.html.erb | 31 ++++++++++++----------- app/views/steps/_form_tables.html.erb | 25 ++++++++++-------- config/locales/en.yml | 2 -- 4 files changed, 41 insertions(+), 27 deletions(-) diff --git a/app/assets/stylesheets/steps.scss b/app/assets/stylesheets/steps.scss index df9d1872f..42e3335cb 100644 --- a/app/assets/stylesheets/steps.scss +++ b/app/assets/stylesheets/steps.scss @@ -20,6 +20,16 @@ } } } + + .checklist-name-container, + .table-name-container { + align-items: center; + display: flex; + + .remove-container { + padding-top: 10px; + } + } } #steps { diff --git a/app/views/steps/_form_checklists.html.erb b/app/views/steps/_form_checklists.html.erb index e30b1324b..abe957e14 100644 --- a/app/views/steps/_form_checklists.html.erb +++ b/app/views/steps/_form_checklists.html.erb @@ -1,20 +1,21 @@
    -
    - - <%= t("protocols.steps.new.checklist_panel_title") %> -
    - <%= ff.remove_nested_fields_link do %> - - <% end %> -
    -
    - <%= ff.smart_text_area :name, - label: t('protocols.steps.new.checklist_name'), - class: 'checklist_name', - autofocus: true, - placeholder: t('protocols.steps.new.checklist_name_placeholder'), - data: { 'atwho-edit' => '' } %> +
    +
    + <%= ff.smart_text_area :name, + label: t('protocols.steps.new.checklist_name'), + class: 'checklist_name', + autofocus: true, + single_line: true, + placeholder: t('protocols.steps.new.checklist_name_placeholder'), + data: { 'atwho-edit' => '' } %> +
    +
    + <%= ff.remove_nested_fields_link do %> + + <% end %> +
    +
    <%= ff.label t("protocols.steps.new.checklist_items") %>
      <%= ff.nested_fields_for :checklist_items, ordered_checklist_items(ff.object) do |chkItems| %> diff --git a/app/views/steps/_form_tables.html.erb b/app/views/steps/_form_tables.html.erb index 57ad56ddb..8e7e89168 100644 --- a/app/views/steps/_form_tables.html.erb +++ b/app/views/steps/_form_tables.html.erb @@ -1,15 +1,20 @@
      -
      - - <%= t("protocols.steps.new.table_panel_title") %> -
      - <%= ff.remove_nested_fields_link do %> - - <% end %> -
      -
      - <%= ff.smart_text_area :name, label: t("protocols.steps.new.table_name"), class: "table_name", autofocus: true, placeholder: t("protocols.steps.new.table_name_placeholder") %> +
      +
      + <%= ff.smart_text_area :name, + label: t("protocols.steps.new.table_name"), + class: "table_name", + autofocus: true, + single_line: true, + placeholder: t("protocols.steps.new.table_name_placeholder") %> +
      +
      + <%= ff.remove_nested_fields_link do %> + + <% end %> +
      +
      <%= ff.hidden_field(:contents, value: ff.object.contents_utf_8, class: "hot-contents" ) %>
      diff --git a/config/locales/en.yml b/config/locales/en.yml index 15f75aac9..323164da2 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -2134,14 +2134,12 @@ en: name_placeholder: "mRNA sequencing" description: "Description" description_placeholder: "Write what should be done here ..." - checklist_panel_title: "Checklist" checklist_name: "Checklist name" checklist_name_placeholder: "Checklist name" checklist_items: "Items" checklist_item_placeholder: "Task" checklist_add_item: "Add item" add_checklist: "Add checklist" - table_panel_title: "Table" table_name: "Table title" table_name_placeholder: "Table title" add_table: "Add table" From 5cb497b61d53205c495f322a59cda7ad16d5514d Mon Sep 17 00:00:00 2001 From: aignatov-bio Date: Thu, 3 Sep 2020 09:49:00 +0200 Subject: [PATCH 045/163] Split params validation to create and update --- app/controllers/api/v1/tasks_controller.rb | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/app/controllers/api/v1/tasks_controller.rb b/app/controllers/api/v1/tasks_controller.rb index acdcede83..b3b28bb85 100644 --- a/app/controllers/api/v1/tasks_controller.rb +++ b/app/controllers/api/v1/tasks_controller.rb @@ -30,7 +30,7 @@ module Api def create raise PermissionError.new(MyModule, :create) unless can_manage_experiment?(@experiment) - my_module = @experiment.my_modules.create!(task_params) + my_module = @experiment.my_modules.create!(task_params_create) render jsonapi: my_module, serializer: TaskSerializer, rte_rendering: render_rte?, @@ -38,7 +38,7 @@ module Api end def update - @task.assign_attributes(task_params) + @task.assign_attributes(task_params_update) if @task.changed? && @task.save! render jsonapi: @task, serializer: TaskSerializer, status: :ok @@ -57,7 +57,13 @@ module Api private - def task_params + def task_params_create + raise TypeError unless params.require(:data).require(:type) == 'tasks' + + params.require(:data).require(:attributes).permit(%i(name x y description state)) + end + + def task_params_update raise TypeError unless params.require(:data).require(:type) == 'tasks' params.require(:data).require(:attributes).permit(%i(name x y description state my_module_status_id)) From 8b1e11a314b62a79667e9c4c402dcce78e453314 Mon Sep 17 00:00:00 2001 From: aignatov-bio Date: Thu, 3 Sep 2020 14:19:28 +0200 Subject: [PATCH 046/163] Add conditions_fulfilled? method --- app/models/my_module_status.rb | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/app/models/my_module_status.rb b/app/models/my_module_status.rb index 101606c40..c35506760 100644 --- a/app/models/my_module_status.rb +++ b/app/models/my_module_status.rb @@ -47,6 +47,14 @@ class MyModuleStatus < ApplicationRecord ordered_statuses end + def conditions_fulfilled?(my_module) + my_module_status_conditions.each do |condition| + condition.call(my_module) + end + + my_module.errors.blank? + end + private def next_in_same_flow From d85703113a57d4f7081d50eef4c14cb79adb9170 Mon Sep 17 00:00:00 2001 From: aignatov-bio Date: Thu, 3 Sep 2020 14:34:34 +0200 Subject: [PATCH 047/163] Add front-end checks --- .../stylesheets/my_modules/status_flow.scss | 6 ++++ .../status_flow/_task_flow_button.html.erb | 36 +++++++++++-------- 2 files changed, 28 insertions(+), 14 deletions(-) diff --git a/app/assets/stylesheets/my_modules/status_flow.scss b/app/assets/stylesheets/my_modules/status_flow.scss index c297f8ddc..d82ce3ef7 100644 --- a/app/assets/stylesheets/my_modules/status_flow.scss +++ b/app/assets/stylesheets/my_modules/status_flow.scss @@ -60,6 +60,12 @@ white-space: nowrap; } + .error-message { + @include font-small; + color: $color-silver-chalice; + grid-column: span 3; + padding: .5em 1em; + } #viewTaskFlow { cursor: pointer; diff --git a/app/views/my_modules/status_flow/_task_flow_button.html.erb b/app/views/my_modules/status_flow/_task_flow_button.html.erb index b9f24819f..4be942264 100644 --- a/app/views/my_modules/status_flow/_task_flow_button.html.erb +++ b/app/views/my_modules/status_flow/_task_flow_button.html.erb @@ -13,24 +13,32 @@
      - <% if can_create_protocols_in_repository?(@current_team) %>
        @@ -80,14 +79,14 @@
      <% end %> -
      - @@ -97,7 +96,7 @@ <%= t("protocols.index.archive.description") %>
      - @@ -140,4 +139,3 @@ <%= javascript_include_tag "assets/wopi/create_wopi_file" %> <%= javascript_include_tag "protocols/index" %> <%= javascript_include_tag "protocols/steps" %> - From 7668e1641942b75bf1e33ad126a7bd386c730a09 Mon Sep 17 00:00:00 2001 From: Oleksii Kriuchykhin Date: Fri, 4 Sep 2020 11:47:45 +0200 Subject: [PATCH 050/163] Enable CORS for PWA [SCI-4979] --- Gemfile | 1 + Gemfile.lock | 3 +++ config/initializers/cors.rb | 28 +++++++++++++++++++--------- 3 files changed, 23 insertions(+), 9 deletions(-) diff --git a/Gemfile b/Gemfile index d3a99ea73..048738060 100644 --- a/Gemfile +++ b/Gemfile @@ -37,6 +37,7 @@ gem 'jsonapi-renderer', '~> 0.2.2' gem 'jwt', '~> 1.5' gem 'kaminari' gem 'rack-attack' +gem 'rack-cors' # JS datetime library, requirement of datetime picker gem 'momentjs-rails', '~> 2.17.1' diff --git a/Gemfile.lock b/Gemfile.lock index faf79f603..e37f96a75 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -411,6 +411,8 @@ GEM rack (2.2.3) rack-attack (6.1.0) rack (>= 1.0, < 3) + rack-cors (1.1.1) + rack (>= 2.0.0) rack-proxy (0.6.5) rack rack-test (1.1.0) @@ -668,6 +670,7 @@ DEPENDENCIES pry-rails puma rack-attack + rack-cors rails (~> 6.0.0) rails-controller-testing rails_12factor diff --git a/config/initializers/cors.rb b/config/initializers/cors.rb index 3b1c1b5ed..3b9603bfa 100644 --- a/config/initializers/cors.rb +++ b/config/initializers/cors.rb @@ -5,12 +5,22 @@ # Read more: https://github.com/cyu/rack-cors -# Rails.application.config.middleware.insert_before 0, Rack::Cors do -# allow do -# origins 'example.com' -# -# resource '*', -# headers: :any, -# methods: [:get, :post, :put, :patch, :delete, :options, :head] -# end -# end +if ENV['SCINOTE_PWA_DOMAIN_NAME'].present? + Rails.application.config.middleware.insert_before 0, Rack::Cors do + allow do + origins ENV['SCINOTE_PWA_DOMAIN_NAME'] + + resource '/oauth/token', + headers: :any, + methods: %i(post) + + resource '/rails/active_storage/*', + headers: :any, + methods: %i(get post options head) + + resource '/api/*', + headers: :any, + methods: %i(get post put patch delete options head) + end + end +end From 57e92c21351065675c47bee206d85fc1ca30175a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 4 Sep 2020 11:33:56 +0000 Subject: [PATCH 051/163] Bump node-sass from 4.12.0 to 4.13.1 Bumps [node-sass](https://github.com/sass/node-sass) from 4.12.0 to 4.13.1. - [Release notes](https://github.com/sass/node-sass/releases) - [Changelog](https://github.com/sass/node-sass/blob/master/CHANGELOG.md) - [Commits](https://github.com/sass/node-sass/compare/v4.12.0...v4.13.1) Signed-off-by: dependabot[bot] --- package.json | 2 +- yarn.lock | 18 +++++++++--------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/package.json b/package.json index 8bd80ed99..29c6a78c9 100644 --- a/package.json +++ b/package.json @@ -75,7 +75,7 @@ "moment": "^2.22.2", "moment-timezone": "^0.5.21", "node-gyp": "^3.8.0", - "node-sass": "^4.9.2", + "node-sass": "^4.13.1", "path-complete-extname": "^0.1.0", "postcss-loader": "^2.1.6", "postcss-smart-import": "^0.7.6", diff --git a/yarn.lock b/yarn.lock index 2ae39f6be..597c7d1b3 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5698,10 +5698,10 @@ lodash.uniq@^4.5.0: resolved "https://registry.yarnpkg.com/lodash.uniq/-/lodash.uniq-4.5.0.tgz#d0225373aeb652adc1bc82e4945339a842754773" integrity sha1-0CJTc662Uq3BvILklFM5qEJ1R3M= -"lodash@>=3.5 <5", lodash@^4.0.0, lodash@^4.17.10, lodash@^4.17.11, lodash@^4.17.19, lodash@^4.17.4, lodash@^4.17.5, lodash@^4.2.1, lodash@^4.3.0, lodash@~4.17.10: - version "4.17.19" - resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.19.tgz#e48ddedbe30b3321783c5b4301fbd353bc1e4a4b" - integrity sha512-JNvd8XER9GQX0v2qJgsaN/mzFCNA5BRe/j8JN9d+tWyGLSodKQHKFicdwNYzWwI3wjRnaKPsGj1XkBjx/F96DQ== +"lodash@>=3.5 <5", lodash@^4.0.0, lodash@^4.17.10, lodash@^4.17.11, lodash@^4.17.15, lodash@^4.17.19, lodash@^4.17.4, lodash@^4.17.5, lodash@^4.2.1, lodash@^4.3.0, lodash@~4.17.10: + version "4.17.20" + resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.20.tgz#b44a9b6297bcb698f1c51a3545a2b3b368d59c52" + integrity sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA== loglevel-colored-level-prefix@^1.0.0: version "1.0.0" @@ -6258,10 +6258,10 @@ node-releases@^1.1.23: dependencies: semver "^5.3.0" -node-sass@^4.12.0, node-sass@^4.9.2: - version "4.12.0" - resolved "https://registry.yarnpkg.com/node-sass/-/node-sass-4.12.0.tgz#0914f531932380114a30cc5fa4fa63233a25f017" - integrity sha512-A1Iv4oN+Iel6EPv77/HddXErL2a+gZ4uBeZUy+a8O35CFYTXhgA8MgLCWBtwpGZdCvTvQ9d+bQxX/QC36GDPpQ== +node-sass@^4.12.0, node-sass@^4.13.1: + version "4.13.1" + resolved "https://registry.yarnpkg.com/node-sass/-/node-sass-4.13.1.tgz#9db5689696bb2eec2c32b98bfea4c7a2e992d0a3" + integrity sha512-TTWFx+ZhyDx1Biiez2nB0L3YrCZ/8oHagaDalbuBSlqXgUPsdkUSzJsVxeDO9LtPB49+Fh3WQl3slABo6AotNw== dependencies: async-foreach "^0.1.3" chalk "^1.1.1" @@ -6270,7 +6270,7 @@ node-sass@^4.12.0, node-sass@^4.9.2: get-stdin "^4.0.1" glob "^7.0.3" in-publish "^2.0.0" - lodash "^4.17.11" + lodash "^4.17.15" meow "^3.7.0" mkdirp "^0.5.1" nan "^2.13.2" From 9dac4079f8bf2ccec8080b28d594f1258c304173 Mon Sep 17 00:00:00 2001 From: Mojca Lorber Date: Fri, 4 Sep 2020 14:43:30 +0200 Subject: [PATCH 052/163] Replace old arrow with new one and remove redundant javascript for arrow collapsing --- .../javascripts/global_activities/index.js | 11 -------- app/assets/javascripts/my_modules/results.js | 25 ----------------- .../protocols/external_protocols_tab.js | 4 --- app/assets/javascripts/protocols/steps.js.erb | 24 ----------------- .../javascripts/results/result_assets.js | 1 - .../javascripts/results/result_tables.js.erb | 1 - .../javascripts/results/result_texts.js | 1 - .../javascripts/sitewide/drag_n_drop.js | 1 - app/assets/stylesheets/global_activities.scss | 27 +++++++++---------- app/assets/stylesheets/steps.scss | 8 ++++++ app/assets/stylesheets/themes/scinote.scss | 9 +++++++ .../global_activities/_activity_list.html.erb | 2 +- .../global_activities/_top_pane.html.erb | 4 +-- app/views/my_modules/_result.html.erb | 2 +- .../my_modules/activities/_top_pane.html.erb | 4 +-- .../_import_json_protocol_p_desc.html.erb | 2 +- .../_import_json_protocol_s_desc.html.erb | 2 +- .../import_export/_preview_templates.html.erb | 2 +- app/views/steps/_step.html.erb | 2 +- 19 files changed, 40 insertions(+), 92 deletions(-) diff --git a/app/assets/javascripts/global_activities/index.js b/app/assets/javascripts/global_activities/index.js index 0f4331703..4efc1e2e1 100644 --- a/app/assets/javascripts/global_activities/index.js +++ b/app/assets/javascripts/global_activities/index.js @@ -14,16 +14,6 @@ }); } - function initExpandCollapseButton() { - $('.ga-activities-list').on('hidden.bs.collapse', function(ev) { - $(ev.target.dataset.buttonLink) - .find('.fas').removeClass('fa-chevron-down').addClass('fa-chevron-right'); - }); - $('.ga-activities-list').on('shown.bs.collapse', function(ev) { - $(ev.target.dataset.buttonLink) - .find('.fas').removeClass('fa-chevron-right').addClass('fa-chevron-down'); - }); - } function initShowMoreButton() { var moreButton = $('.btn-more-activities'); moreButton.on('click', function(ev) { @@ -70,6 +60,5 @@ } initExpandCollapseAllButtons(); - initExpandCollapseButton(); initShowMoreButton(); }()); diff --git a/app/assets/javascripts/my_modules/results.js b/app/assets/javascripts/my_modules/results.js index da0cfa181..0483d0a49 100644 --- a/app/assets/javascripts/my_modules/results.js +++ b/app/assets/javascripts/my_modules/results.js @@ -47,17 +47,6 @@ }); } - function applyCollapseLinkCallBack() { - $('.panel-collapse') - .on('shown.bs.collapse hidden.bs.collapse', function() { - var collapseIcon = $(this).closest('.panel').find('.collapse-result-icon'); - var collapsed = $(this).closest('.panel').find('.result-panel-collapse-link').hasClass('collapsed'); - // Toggle collapse button - collapseIcon.toggleClass('fa-caret-up', !collapsed); - collapseIcon.toggleClass('fa-caret-down', collapsed); - }); - } - // Toggle editing buttons function toggleResultEditButtons(show) { if (show) { @@ -80,10 +69,6 @@ // Expand all results function expandAllResults() { $('.result .panel-collapse').collapse('show'); - $(document).find('span.collapse-result-icon').each(function() { - $(this).addClass('fa-caret-up'); - $(this).removeClass('fa-caret-down'); - }); $(document).find('div.step-result-hot-table').each(function() { renderTable(this); }); @@ -91,10 +76,6 @@ function expandResult(result) { $('.panel-collapse', result).collapse('show'); - $(result).find('span.collapse-result-icon').each(function() { - $(this).addClass('fa-caret-up'); - $(this).removeClass('fa-caret-down'); - }); renderTable($(result).find('div.step-result-hot-table')); animateSpinner(null, false); } @@ -135,7 +116,6 @@ $.each($('#results').find('.result'), function() { initFormSubmitLinks($(this)); ResultAssets.applyEditResultAssetCallback(); - applyCollapseLinkCallBack(); applyCreateWopiFileCallback(); toggleResultEditButtons(true); FilePreviewModal.init(); @@ -208,15 +188,11 @@ function init() { initHandsOnTables($(document)); expandAllResults(); - applyCollapseLinkCallBack(); applyCreateWopiFileCallback(); $(function() { $('#results-collapse-btn').click(function() { $('.result .panel-collapse').collapse('hide'); - $(document).find('span.collapse-result-icon') - .addClass('fa-caret-down') - .removeClass('fa-caret-square-up'); }); $('#results-expand-btn').click(expandAllResults); @@ -233,7 +209,6 @@ let publicAPI = Object.freeze({ init: init, initHandsOnTables: initHandsOnTables, - applyCollapseLinkCallBack: applyCollapseLinkCallBack, toggleResultEditButtons: toggleResultEditButtons, expandResult: expandResult, processResult: processResult, diff --git a/app/assets/javascripts/protocols/external_protocols_tab.js b/app/assets/javascripts/protocols/external_protocols_tab.js index 239658666..5fcac32bf 100644 --- a/app/assets/javascripts/protocols/external_protocols_tab.js +++ b/app/assets/javascripts/protocols/external_protocols_tab.js @@ -176,10 +176,6 @@ function expandAllSteps() { $(document).find("[data-role='step-hot-table']").each(function() { renderTable($(this)); }); - $(document).find('span.collapse-step-icon').each(function() { - $(this).addClass('fa-caret-square-up'); - $(this).removeClass('fa-caret-square-down'); - }); } function handleFormSubmit(modal) { diff --git a/app/assets/javascripts/protocols/steps.js.erb b/app/assets/javascripts/protocols/steps.js.erb index 8f96b177b..4c159b644 100644 --- a/app/assets/javascripts/protocols/steps.js.erb +++ b/app/assets/javascripts/protocols/steps.js.erb @@ -191,18 +191,6 @@ }); } - function applyCollapseLinkCallBack() { - $(".step-panel-collapse-link") - .on("ajax:success", function() { - var collapseIcon = $(this).find(".collapse-step-icon"); - var collapsed = $(this).hasClass("collapsed"); - // Toggle collapse button - collapseIcon.toggleClass("fa-chevron-up", !collapsed); - collapseIcon.toggleClass("fa-chevron-down", collapsed); - - }); - } - function formCallback($form) { $form .on("fields_added.nested_form_fields", function(e, param) { @@ -386,7 +374,6 @@ applyStepCompletedCallBack(); applyEditCallBack(); applyMoveStepCallBack(); - applyCollapseLinkCallBack(); initDeleteStep(); TinyMCE.highlight(); } @@ -647,17 +634,10 @@ $(document).find("[data-role='step-hot-table']").each(function() { renderTable($(this)); }); - $(document).find("span.collapse-step-icon").each(function() { - $(this).addClass("fa-chevron-up"); - $(this).removeClass("fa-chevron-down"); - }); } function expandStep(step) { $('.panel-collapse', step).collapse('show'); - $(step).find("span.collapse-step-icon") - .addClass("fa-chevron-up") - .removeClass("fa-chevron-down"); $(step).find("div.step-result-hot-table").each(function() { renderTable($(this)); }); @@ -705,10 +685,6 @@ $(function () { $("[data-action='collapse-steps']").click(function () { $('.step .panel-collapse').collapse('hide'); - $(document).find("span.collapse-step-icon").each(function() { - $(this).addClass("fa-chevron-down"); - $(this).removeClass("fa-chevron-up"); - }); }); $("[data-action='expand-steps']").click(expandAllSteps); }); diff --git a/app/assets/javascripts/results/result_assets.js b/app/assets/javascripts/results/result_assets.js index fdb266a35..d8b92a117 100644 --- a/app/assets/javascripts/results/result_assets.js +++ b/app/assets/javascripts/results/result_assets.js @@ -68,7 +68,6 @@ initFormSubmitLinks($newResult); $(this).remove(); applyEditResultAssetCallback(); - Results.applyCollapseLinkCallBack(); Results.toggleResultEditButtons(true); Results.expandResult($newResult); diff --git a/app/assets/javascripts/results/result_tables.js.erb b/app/assets/javascripts/results/result_tables.js.erb index 96f09a49f..45a97dd37 100644 --- a/app/assets/javascripts/results/result_tables.js.erb +++ b/app/assets/javascripts/results/result_tables.js.erb @@ -47,7 +47,6 @@ $(this).remove(); applyEditResultTableCallback(); - Results.applyCollapseLinkCallBack(); Results.initHandsOnTables($result); Results.toggleResultEditButtons(true); Results.expandResult($result); diff --git a/app/assets/javascripts/results/result_texts.js b/app/assets/javascripts/results/result_texts.js index 3df90f7a4..1645e9b9c 100644 --- a/app/assets/javascripts/results/result_texts.js +++ b/app/assets/javascripts/results/result_texts.js @@ -73,7 +73,6 @@ initFormSubmitLinks(newResult); $(this).remove(); applyEditResultTextCallback(); - Results.applyCollapseLinkCallBack(); Results.toggleResultEditButtons(true); Results.expandResult(newResult); TinyMCE.destroyAll(); diff --git a/app/assets/javascripts/sitewide/drag_n_drop.js b/app/assets/javascripts/sitewide/drag_n_drop.js index 09fb99043..07a69637e 100644 --- a/app/assets/javascripts/sitewide/drag_n_drop.js +++ b/app/assets/javascripts/sitewide/drag_n_drop.js @@ -434,7 +434,6 @@ $.each($('[data-container="new-reports"]').find('.result'), function() { initFormSubmitLinks($(this)); ResultAssets.applyEditResultAssetCallback(); - Results.applyCollapseLinkCallBack(); Results.toggleResultEditButtons(true); FilePreviewModal.init(); Comments.init(); diff --git a/app/assets/stylesheets/global_activities.scss b/app/assets/stylesheets/global_activities.scss index 1846f77b3..fc99ed398 100644 --- a/app/assets/stylesheets/global_activities.scss +++ b/app/assets/stylesheets/global_activities.scss @@ -169,20 +169,6 @@ .date-container { flex-shrink: 0; padding-right: 20px; - - .activities-group-expand-button { - user-select: none; - - &:hover, - &:visited, - &:focus { - text-decoration: none; - } - - .fas { - margin-right: 3px; - } - } } .date-activities { @@ -197,11 +183,24 @@ .activities-group-expand-button { color: $color-emperor; + user-select: none; + + &:hover, + &:visited, + &:focus { + text-decoration: none; + } .fas { display: inline-block; + margin-right: 3px; + text-align: center; width: 10px; } + + &:not(.collapsed) .fas { + @include rotate(90deg); + } } .activity-card { diff --git a/app/assets/stylesheets/steps.scss b/app/assets/stylesheets/steps.scss index df9d1872f..6075d1b10 100644 --- a/app/assets/stylesheets/steps.scss +++ b/app/assets/stylesheets/steps.scss @@ -40,6 +40,14 @@ } } + .step-panel-collapse-link { + padding-left: 5px; + + &:not(.collapsed) .fas { + @include rotate(90deg); + } + } + .complete-step-btn { display: inline-block; } diff --git a/app/assets/stylesheets/themes/scinote.scss b/app/assets/stylesheets/themes/scinote.scss index 16b499b5f..3debd7a92 100644 --- a/app/assets/stylesheets/themes/scinote.scss +++ b/app/assets/stylesheets/themes/scinote.scss @@ -1161,6 +1161,15 @@ ul.content-activities { .result-panel-collapse-link { text-decoration: none; + + &:not(.collapsed) .fas { + @include rotate(90deg); + } + + .fas { + margin-right: 7px; + text-align: center; + } } .row { diff --git a/app/views/global_activities/_activity_list.html.erb b/app/views/global_activities/_activity_list.html.erb index b28c27f73..ab3ac734d 100644 --- a/app/views/global_activities/_activity_list.html.erb +++ b/app/views/global_activities/_activity_list.html.erb @@ -7,7 +7,7 @@ data-toggle="collapse" data-turbolinks="false" data-target="#activities-group-<%= date %>"> - + <%= l(Time.parse(date), format: :full_date) %>
      diff --git a/app/views/global_activities/_top_pane.html.erb b/app/views/global_activities/_top_pane.html.erb index 1d167efa1..b4586d2e1 100644 --- a/app/views/global_activities/_top_pane.html.erb +++ b/app/views/global_activities/_top_pane.html.erb @@ -4,10 +4,10 @@
      - <%= t('activities.index.expand_all') %> + <%= t('activities.index.expand_all') %> - <%= t('activities.index.collapse_all') %> + <%= t('activities.index.collapse_all') %>
      diff --git a/app/views/my_modules/_result.html.erb b/app/views/my_modules/_result.html.erb index b15b189e6..85a4a734c 100644 --- a/app/views/my_modules/_result.html.erb +++ b/app/views/my_modules/_result.html.erb @@ -33,7 +33,7 @@ <% end %>
      - + <%= result.name %> | <%= t('my_modules.results.published_on', timestamp: l(result.created_at, format: :full), user: h(result.user.full_name)).html_safe %> diff --git a/app/views/my_modules/activities/_top_pane.html.erb b/app/views/my_modules/activities/_top_pane.html.erb index 9f21f690d..8d7c9535b 100644 --- a/app/views/my_modules/activities/_top_pane.html.erb +++ b/app/views/my_modules/activities/_top_pane.html.erb @@ -1,10 +1,10 @@
      - <%= t('activities.index.expand_all') %> + <%= t('activities.index.expand_all') %> - <%= t('activities.index.collapse_all') %> + <%= t('activities.index.collapse_all') %>
      diff --git a/app/views/protocols/import_export/_import_json_protocol_p_desc.html.erb b/app/views/protocols/import_export/_import_json_protocol_p_desc.html.erb index 30a47f2f8..48f0b1981 100644 --- a/app/views/protocols/import_export/_import_json_protocol_p_desc.html.erb +++ b/app/views/protocols/import_export/_import_json_protocol_p_desc.html.erb @@ -7,7 +7,7 @@     - + <%= 'Protocol info' %>
      diff --git a/app/views/protocols/import_export/_import_json_protocol_s_desc.html.erb b/app/views/protocols/import_export/_import_json_protocol_s_desc.html.erb index 39d87645c..3959ccdf3 100644 --- a/app/views/protocols/import_export/_import_json_protocol_s_desc.html.erb +++ b/app/views/protocols/import_export/_import_json_protocol_s_desc.html.erb @@ -13,7 +13,7 @@     - + <% title = nil %> <% get_components(step).each do |comp| # finding section (title of step) %> <% if comp['type_id'] == 6 %> diff --git a/app/views/protocols/import_export/_preview_templates.html.erb b/app/views/protocols/import_export/_preview_templates.html.erb index d0351ebc9..fe50a4689 100644 --- a/app/views/protocols/import_export/_preview_templates.html.erb +++ b/app/views/protocols/import_export/_preview_templates.html.erb @@ -7,7 +7,7 @@     - +
      diff --git a/app/views/steps/_step.html.erb b/app/views/steps/_step.html.erb index bfbfadd56..c54db9a00 100644 --- a/app/views/steps/_step.html.erb +++ b/app/views/steps/_step.html.erb @@ -8,7 +8,7 @@ href="#step-panel-<%= step.id || step.position %>" data-toggle="collapse" data-remote="true"> - + <%= step.position + 1 %>. From dea75553a3ebe2b94c0e3a84acb21498079dd099 Mon Sep 17 00:00:00 2001 From: Oleksii Kriuchykhin Date: Mon, 7 Sep 2020 10:44:00 +0200 Subject: [PATCH 053/163] Fix handling of duplicated step positions [SCI-4880] --- app/assets/javascripts/protocols/steps.js.erb | 27 ++------ app/controllers/steps_controller.rb | 26 +++----- app/models/step.rb | 66 ++++++++++++++++--- app/views/steps/_step.html.erb | 2 +- 4 files changed, 74 insertions(+), 47 deletions(-) diff --git a/app/assets/javascripts/protocols/steps.js.erb b/app/assets/javascripts/protocols/steps.js.erb index b6d58275c..24263347d 100644 --- a/app/assets/javascripts/protocols/steps.js.erb +++ b/app/assets/javascripts/protocols/steps.js.erb @@ -166,27 +166,14 @@ if ($.isEmptyObject(data)) return; let $step = $(this).closest('.step'); - let stepUpPosition = data.step_up_position; - let stepDownPosition = data.step_down_position; - let $stepDown, $stepUp; + let steps = $('#steps').find('.step'); + $('#steps').append($.map(data.steps_order, function(step_data) { + let step = $('#steps').find(`.step[data-id=${step_data.id}]`); + step.find('.step-number').html(`${step_data.position + 1}.`); + return step; + })); - switch ($(this).data('direction')) { - case 'up': - $stepDown = $step.prev('.step'); - $stepUp = $step; - break; - case 'down': - $stepDown = $step; - $stepUp = $step.next('.step'); - } - - // Switch position of top and bottom steps - if (!_.isUndefined($stepDown) && !_.isUndefined($stepUp)) { - $stepDown.insertAfter($stepUp); - $stepDown.find('.step-number').html(`${stepDownPosition + 1}.`); - $stepUp.find('.step-number').html(`${stepUpPosition + 1}.`); - $('html, body').animate({ scrollTop: $step.offset().top - window.innerHeight / 2 }); - } + $('html, body').animate({ scrollTop: $step.offset().top - window.innerHeight / 2 }); if (typeof refreshProtocolStatusBar === 'function') refreshProtocolStatusBar(); }); diff --git a/app/controllers/steps_controller.rb b/app/controllers/steps_controller.rb index ddec42b89..b6fa6c8e5 100644 --- a/app/controllers/steps_controller.rb +++ b/app/controllers/steps_controller.rb @@ -354,16 +354,11 @@ class StepsController < ApplicationController def move_up respond_to do |format| format.json do - if @step.protocol.steps.minimum(:position) != @step.position - @step.update!(position: @step.position - 1) + @step.move_up - render json: { - step_up_position: @step.position, - step_down_position: @step.position + 1 - } - else - render json: {} - end + render json: { + steps_order: @protocol.steps.order(:position).select(:id, :position) + } end end end @@ -371,16 +366,11 @@ class StepsController < ApplicationController def move_down respond_to do |format| format.json do - if @step.protocol.steps.maximum(:position) != @step.position - @step.update!(position: @step.position + 1) + @step.move_down - render json: { - step_up_position: @step.position - 1, - step_down_position: @step.position - } - else - render json: {} - end + render json: { + steps_order: @protocol.steps.order(:position).select(:id, :position) + } end end end diff --git a/app/models/step.rb b/app/models/step.rb index bf40e18c7..797cc30ba 100644 --- a/app/models/step.rb +++ b/app/models/step.rb @@ -13,10 +13,10 @@ class Step < ApplicationRecord validates :completed, inclusion: { in: [true, false] } validates :user, :protocol, presence: true validates :completed_on, presence: true, if: proc { |s| s.completed? } + validates :position, uniqueness: { scope: :protocol }, if: :position_changed? before_validation :set_completed_on, if: :completed_changed? before_save :set_last_modified_by - around_save :adjust_positions_on_save, if: :position_changed? before_destroy :cascade_before_destroy after_destroy :adjust_positions_after_destroy @@ -124,25 +124,75 @@ class Step < ApplicationRecord end end + def move_up + return if position.zero? + + move_in_protocol(:up) + end + + def move_down + return if position == protocol.steps.count - 1 + + move_in_protocol(:down) + end + private - def adjust_positions_on_save - step_to_swap = protocol.steps.find_by(position: position) + def move_in_protocol(direction) + transaction do + adjust_duplicated_step_positions - return yield unless step_to_swap + case direction + when :up + new_position = position - 1 + when :down + new_position = position + 1 + else + return + end - position_to_swap = position_was - step_to_swap.position = -1 - yield - step_to_swap.update!(position: position_to_swap) + step_to_swap = protocol.steps.find_by(position: new_position) + position_to_swap = position + + if step_to_swap + step_to_swap.update!(position: -1) + update!(position: new_position) + step_to_swap.update!(position: position_to_swap) + else + update!(position: new_position) + end + end end def adjust_positions_after_destroy + adjust_duplicated_step_positions protocol.steps.where('position > ?', position).find_each do |step| step.update!(position: step.position - 1) end end + def adjust_duplicated_step_positions + duplicated_steps = protocol.steps.where(position: position) + return unless duplicated_steps.size > 1 + + # Shifting following steps + next_steps = protocol.steps.where(position: (position + 1)..).order(:position) + if next_steps.present? + shift_by = duplicated_steps.size - next_steps.first.position + position + if shift_by.positive? + next_steps.reverse_each do |step| + step.update!(position: step.position + shift_by) + end + end + end + + # Re-index duplicated positions + duplicated_steps.each_with_index do |step, i| + step.update!(position: step.position + i) + end + reload + end + def cascade_before_destroy assets.each(&:destroy) tables.each(&:destroy) diff --git a/app/views/steps/_step.html.erb b/app/views/steps/_step.html.erb index 6374a6824..0f3912868 100644 --- a/app/views/steps/_step.html.erb +++ b/app/views/steps/_step.html.erb @@ -1,6 +1,6 @@ <% preview = (defined?(preview) ? preview : false) %> <% import = (defined?(import) ? import : false) %> -
      "> +
      " data-id="<%= step.id %>">
      From f2ffe17636440f6b7fe62d692c6eaf798b341d54 Mon Sep 17 00:00:00 2001 From: aignatov-bio Date: Mon, 7 Sep 2020 13:05:26 +0200 Subject: [PATCH 054/163] Skip implications for my_module canvas position update --- app/models/my_module.rb | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/app/models/my_module.rb b/app/models/my_module.rb index 9a9210e6d..921011232 100644 --- a/app/models/my_module.rb +++ b/app/models/my_module.rb @@ -25,7 +25,13 @@ class MyModule < ApplicationRecord validate :check_status, if: :my_module_status_id_changed? validate :check_status_conditions, if: :my_module_status_id_changed? - validate :check_status_implications, unless: :my_module_status_id_changed? + validate :check_status_implications, unless: proc { |mm| + mm.my_module_status_id_changed? || + mm.x_changed? || + mm.y_changed? || + mm.my_module_group_id_changed? || + mm.workflow_order_changed? + } belongs_to :created_by, foreign_key: 'created_by_id', From ea845040aa42093a385b002ebd361e31e6d79112 Mon Sep 17 00:00:00 2001 From: Oleksii Kriuchykhin Date: Mon, 7 Sep 2020 13:49:11 +0200 Subject: [PATCH 055/163] Fix missing step edit button [SCI-4880] --- app/views/steps/_step.html.erb | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/app/views/steps/_step.html.erb b/app/views/steps/_step.html.erb index 0f3912868..da82f786f 100644 --- a/app/views/steps/_step.html.erb +++ b/app/views/steps/_step.html.erb @@ -66,6 +66,13 @@ data: { action: 'move-step', direction: :down }) do %> <% end %> + <%= link_to(edit_step_path(step), + title: t('protocols.steps.options.edit_title'), + class: 'btn btn-light icon-btn', + remote: true, + data: { action: 'edit-step' }) do %> + + <% end %> <%= link_to(step_path(step), title: t('protocols.steps.options.delete_title'), method: :delete, From 3150a36a64bfd0e276740df31b75ef64d300caef Mon Sep 17 00:00:00 2001 From: Oleksii Kriuchykhin Date: Mon, 7 Sep 2020 14:54:49 +0200 Subject: [PATCH 056/163] Fix canvas edit mode [SCI-4880] --- app/views/canvas/edit/_my_module.html.erb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/views/canvas/edit/_my_module.html.erb b/app/views/canvas/edit/_my_module.html.erb index 228a8a405..62e9b3132 100644 --- a/app/views/canvas/edit/_my_module.html.erb +++ b/app/views/canvas/edit/_my_module.html.erb @@ -36,7 +36,7 @@ <%= t('experiments.canvas.edit.move_module') %> <% end %> - <% if module_group.my_modules.all? { |my_module| can_move_module?(my_module) } %> + <% if module_group&.my_modules&.all? { |my_module| can_move_module?(my_module) } %>
    • <%= t('experiments.canvas.edit.move_module_group') %>
      • @@ -46,7 +46,7 @@ <%= t('experiments.canvas.edit.delete_module') %> <% end %> - <% if module_group.my_modules.all? { |my_module| can_archive_module?(my_module) } %> + <% if module_group&.my_modules&.all? { |my_module| can_archive_module?(my_module) } %>
    • <%= t('experiments.canvas.edit.delete_module_group') %>
      • From 492d25f9b3d637b5d2e671db5815c5e84f1e1d47 Mon Sep 17 00:00:00 2001 From: aignatov-bio Date: Mon, 7 Sep 2020 14:44:47 +0200 Subject: [PATCH 057/163] Add description for conditions --- app/models/my_module_status.rb | 8 ++++++++ app/models/my_module_status_conditions/active.rb | 4 ++++ .../my_modules/modals/_status_flow_modal_body.html.erb | 4 +++- 3 files changed, 15 insertions(+), 1 deletion(-) diff --git a/app/models/my_module_status.rb b/app/models/my_module_status.rb index 101606c40..6d720ea43 100644 --- a/app/models/my_module_status.rb +++ b/app/models/my_module_status.rb @@ -47,6 +47,14 @@ class MyModuleStatus < ApplicationRecord ordered_statuses end + def conditions_descriptions + descriptions = [] + my_module_status_conditions.each do |condition| + descriptions.push(condition.description) + end + descriptions + end + private def next_in_same_flow diff --git a/app/models/my_module_status_conditions/active.rb b/app/models/my_module_status_conditions/active.rb index 887eaa739..38f63bbee 100644 --- a/app/models/my_module_status_conditions/active.rb +++ b/app/models/my_module_status_conditions/active.rb @@ -6,5 +6,9 @@ module MyModuleStatusConditions def call(my_module) my_module.errors.add(:status_conditions, 'MyModule should be active') unless my_module.active? end + + def description + 'MyModule should be active' + end end end diff --git a/app/views/my_modules/modals/_status_flow_modal_body.html.erb b/app/views/my_modules/modals/_status_flow_modal_body.html.erb index 49724efd7..119b9e310 100644 --- a/app/views/my_modules/modals/_status_flow_modal_body.html.erb +++ b/app/views/my_modules/modals/_status_flow_modal_body.html.erb @@ -14,7 +14,9 @@
      <%= status[:name] %>
      -
      <%= status[:status_comment] %>
      +
      + <%= status.next_status&.conditions_descriptions&.join(' ') %> +
      <% end %> From 7e9ef9496f962cc614ae6aea7d03f51c56ed210c Mon Sep 17 00:00:00 2001 From: Mojca Lorber Date: Mon, 7 Sep 2020 18:30:54 +0200 Subject: [PATCH 058/163] Update smart annotation appearance in the text --- app/assets/stylesheets/themes/scinote.scss | 8 ++-- .../smart_annotations/html_preview.rb | 38 ++++++++----------- 2 files changed, 19 insertions(+), 27 deletions(-) diff --git a/app/assets/stylesheets/themes/scinote.scss b/app/assets/stylesheets/themes/scinote.scss index 42f54a018..91c62a7b2 100644 --- a/app/assets/stylesheets/themes/scinote.scss +++ b/app/assets/stylesheets/themes/scinote.scss @@ -1804,12 +1804,12 @@ th.custom-field .modal-tooltiptext { } .sa-type { - border: 1px solid $color-emperor; - border-radius: 4px; + font-size: 10px; font-weight: 600; - padding: 0 2px; + padding-left: 2px; text-decoration: none; - text-transform: capitalize; + text-transform: uppercase; + vertical-align: super; &:hover { text-decoration: none; diff --git a/app/services/smart_annotations/html_preview.rb b/app/services/smart_annotations/html_preview.rb index 7a547379b..206a18d4e 100644 --- a/app/services/smart_annotations/html_preview.rb +++ b/app/services/smart_annotations/html_preview.rb @@ -13,47 +13,39 @@ module SmartAnnotations def generate_prj_snippet(_, object) if object.archived? - return "Prj #{object.name}" \ - "#{I18n.t('atwho.res.archived')}" + return "Prj" \ + "#{object.name}#{I18n.t('atwho.res.archived')}" end - "Prj " \ - "#{object.name}" + "Prj#{object.name}" end def generate_exp_snippet(_, object) if object.archived? - return "Exp " \ - "#{object.name} #{I18n.t('atwho.res.archived')}" + return "" \ + "Exp#{object.name} #{I18n.t('atwho.res.archived')}" end - "Exp " \ - "#{object.name}" + "Exp#{object.name}" end def generate_tsk_snippet(_, object) if object.archived? - return "Tsk #{object.name} #{I18n.t('atwho.res.archived')}" + return "Tsk#{object.name} #{I18n.t('atwho.res.archived')}" end - "Tsk " \ "" \ - "#{object.name}" + "Tsk#{object.name}" end def generate_rep_item_snippet(name, object) if object repository_name = fetch_repository_name(object) - link = if object.archived? + if object.archived? + return "#{trim_repository_name(repository_name)} " \ "#{object.name} #{I18n.t('atwho.res.archived')}" - else - "#{object.name}" - end - - return "#{trim_repository_name(repository_name)} " + link + else + return "#{trim_repository_name(repository_name)}#{object.name}" + end end "Inv " \ "#{name} #{I18n.t('atwho.res.deleted')}" From 0eb81065b3a163ab729159c8ffecdb1d629d5bdf Mon Sep 17 00:00:00 2001 From: Mojca Lorber Date: Tue, 8 Sep 2020 09:39:15 +0200 Subject: [PATCH 059/163] Fix tests --- spec/services/smart_annotations/html_preview_spec.rb | 12 ++++++------ spec/services/smart_annotations/tag_to_html_spec.rb | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/spec/services/smart_annotations/html_preview_spec.rb b/spec/services/smart_annotations/html_preview_spec.rb index 3be100148..8be773a22 100644 --- a/spec/services/smart_annotations/html_preview_spec.rb +++ b/spec/services/smart_annotations/html_preview_spec.rb @@ -18,8 +18,8 @@ describe SmartAnnotations::HtmlPreview do it 'returns a html snippet' do snippet = subject.html(nil, 'prj', project) expect(snippet).to eq( - "Prj " \ - "my project" + "" \ + "Prjmy project" ) end end @@ -28,8 +28,8 @@ describe SmartAnnotations::HtmlPreview do it 'returns a html snippet' do snippet = subject.html(nil, 'exp', experiment) expect(snippet).to eq( - "Exp " \ - "my experiment" + "" \ + "Expmy experiment" ) end end @@ -38,8 +38,8 @@ describe SmartAnnotations::HtmlPreview do it 'returns a html snippet' do snippet = subject.html(nil, 'tsk', task) expect(snippet).to eq( - "Tsk " \ - "task" + "" \ + "Tsktask" ) end end diff --git a/spec/services/smart_annotations/tag_to_html_spec.rb b/spec/services/smart_annotations/tag_to_html_spec.rb index 05104dec4..f96a7bf2c 100644 --- a/spec/services/smart_annotations/tag_to_html_spec.rb +++ b/spec/services/smart_annotations/tag_to_html_spec.rb @@ -17,8 +17,8 @@ describe SmartAnnotations::TagToHtml do describe 'Parsed text' do it 'returns a existing string with smart annotation' do expect(subject.html).to eq( - "My annotation of Prj "\ - "my project" + "My annotation of " \ + "Prjmy project" ) end end From bd1d6a772b90deabbb16fdfce5dc5e81c971a541 Mon Sep 17 00:00:00 2001 From: aignatov-bio Date: Wed, 2 Sep 2020 16:49:59 +0200 Subject: [PATCH 060/163] Add completed/uncompleted methods to my_module --- .../dashboard/current_tasks_controller.rb | 6 +++++- app/helpers/my_modules_helper.rb | 4 +--- app/models/my_module.rb | 18 +++++++++++------- .../my_modules/_card_due_date_label.html.erb | 1 - app/views/my_modules/_due_date_label.html.erb | 1 - config/locales/dashboard/en.yml | 6 +----- 6 files changed, 18 insertions(+), 18 deletions(-) diff --git a/app/controllers/dashboard/current_tasks_controller.rb b/app/controllers/dashboard/current_tasks_controller.rb index 0cf31fdda..808e07dea 100644 --- a/app/controllers/dashboard/current_tasks_controller.rb +++ b/app/controllers/dashboard/current_tasks_controller.rb @@ -25,7 +25,7 @@ module Dashboard tasks = tasks.left_outer_joins(:user_my_modules).where(user_my_modules: { user_id: current_user.id }) end - tasks = tasks.where(my_module_status_id: task_filters[:statuses]) + tasks = tasks.where(my_module_status_id: task_filters[:statuses]) case task_filters[:sort] when 'start_date' @@ -93,6 +93,10 @@ module Dashboard private def prepare_due_date(task) + if task.completed? + return { state: '', text: I18n.t('dashboard.current_tasks.completed_on_html', + date: I18n.l(task.completed_on, format: :full_date)) } + end if task.due_date.present? due_date_formatted = I18n.l(task.due_date, format: :full_date) if task.is_overdue? diff --git a/app/helpers/my_modules_helper.rb b/app/helpers/my_modules_helper.rb index a0a5112c0..b7477a1d1 100644 --- a/app/helpers/my_modules_helper.rb +++ b/app/helpers/my_modules_helper.rb @@ -35,11 +35,9 @@ module MyModulesHelper def get_task_alert_color(my_module) alert = '' - if !my_module.completed? + unless my_module.completed? alert = ' alert-yellow' if my_module.is_one_day_prior? alert = ' alert-red' if my_module.is_overdue? - elsif my_module.completed? - alert = ' alert-green' end alert end diff --git a/app/models/my_module.rb b/app/models/my_module.rb index 9a9210e6d..5da374b3f 100644 --- a/app/models/my_module.rb +++ b/app/models/my_module.rb @@ -4,11 +4,9 @@ class MyModule < ApplicationRecord include SearchableByNameModel include TinyMceImages - enum state: Extends::TASKS_STATES - before_create :create_blank_protocol before_create :assign_default_status_flow - before_validation :set_completed_on, if: :state_changed? + before_validation :set_completed_on, if: :my_module_status_id_changed? before_save :exec_status_consequences, if: :my_module_status_id_changed? @@ -84,7 +82,7 @@ class MyModule < ApplicationRecord Time.current.utc + 1.day) end) scope :workflow_ordered, -> { order(workflow_order: :asc) } - scope :uncomplete, -> { where(state: 'uncompleted') } + scope :uncomplete, -> { where(completed_on: nil) } # A module takes this much space in canvas (x, y) in database WIDTH = 30 @@ -152,6 +150,14 @@ class MyModule < ApplicationRecord !experiment.archived? && experiment.navigable? end + def completed? + my_module_status.final_status? && !completed_on.blank? + end + + def uncompleted? + !completed? + end + # Removes assigned samples from module and connections with other # modules. def archive(current_user) @@ -503,9 +509,7 @@ class MyModule < ApplicationRecord private def set_completed_on - return if completed? && completed_on.present? - - self.completed_on = completed? ? DateTime.now : nil + self.completed_on = my_module_status.final_status? ? DateTime.now : nil end def create_blank_protocol diff --git a/app/views/my_modules/_card_due_date_label.html.erb b/app/views/my_modules/_card_due_date_label.html.erb index 25bc6447c..c2ede221d 100644 --- a/app/views/my_modules/_card_due_date_label.html.erb +++ b/app/views/my_modules/_card_due_date_label.html.erb @@ -2,7 +2,6 @@ <%= t('my_modules.states.completed') %> <%= l(my_module.completed_on, format: :full_date) %> - <% elsif my_module.is_one_day_prior? %> <%= t('my_modules.states.due_soon') %> diff --git a/app/views/my_modules/_due_date_label.html.erb b/app/views/my_modules/_due_date_label.html.erb index d8f1835d2..9a54ad951 100644 --- a/app/views/my_modules/_due_date_label.html.erb +++ b/app/views/my_modules/_due_date_label.html.erb @@ -2,7 +2,6 @@ <% if my_module.completed? %> <%= t('my_modules.states.completed') %> <%= l(my_module.completed_on, format: :full) %> - <% elsif my_module.is_one_day_prior? %> <%= t('my_modules.states.due_soon') %> <%= l(my_module.due_date, format: :full) %> diff --git a/config/locales/dashboard/en.yml b/config/locales/dashboard/en.yml index e102ed33e..ac8a1808b 100644 --- a/config/locales/dashboard/en.yml +++ b/config/locales/dashboard/en.yml @@ -36,11 +36,7 @@ en: title: "No results." due_date_html: "Due date: %{date}" due_date_overdue_html: "Due date: %{date} (overdue)" - progress_bar: - in_progress: "In progress" - overdue: "Overdue" - completed_steps: ": %{steps} / %{total_steps}" - completed: "Completed" + completed_on_html: "Completed on: %{date}" calendar: due_on: Due on dow: From ee333a982a8ccab34857644b331458d2c2e3c187 Mon Sep 17 00:00:00 2001 From: aignatov-bio Date: Thu, 3 Sep 2020 11:41:00 +0200 Subject: [PATCH 061/163] Revert back state logic --- app/models/my_module.rb | 27 +++++++++++++++++---------- 1 file changed, 17 insertions(+), 10 deletions(-) diff --git a/app/models/my_module.rb b/app/models/my_module.rb index 5da374b3f..457e329ce 100644 --- a/app/models/my_module.rb +++ b/app/models/my_module.rb @@ -4,10 +4,13 @@ class MyModule < ApplicationRecord include SearchableByNameModel include TinyMceImages + enum state: Extends::TASKS_STATES + before_create :create_blank_protocol before_create :assign_default_status_flow - before_validation :set_completed_on, if: :my_module_status_id_changed? + before_validation :set_completed, if: :my_module_status_id_changed? + before_validation :set_completed_on, if: :state_changed? before_save :exec_status_consequences, if: :my_module_status_id_changed? auto_strip_attributes :name, :description, nullify: false @@ -150,14 +153,6 @@ class MyModule < ApplicationRecord !experiment.archived? && experiment.navigable? end - def completed? - my_module_status.final_status? && !completed_on.blank? - end - - def uncompleted? - !completed? - end - # Removes assigned samples from module and connections with other # modules. def archive(current_user) @@ -508,8 +503,20 @@ class MyModule < ApplicationRecord private + def set_completed + if my_module_status.final_status? + self.state = 'completed' + else + self.state = 'uncompleted' + end + + set_completed_on + end + def set_completed_on - self.completed_on = my_module_status.final_status? ? DateTime.now : nil + return if completed? && completed_on.present? + + self.completed_on = completed? ? DateTime.now : nil end def create_blank_protocol From 0be99c12c2c9219cd82c5fd96a40db7ccd95bdfc Mon Sep 17 00:00:00 2001 From: aignatov-bio Date: Thu, 3 Sep 2020 11:44:12 +0200 Subject: [PATCH 062/163] revert changes --- app/models/my_module.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/models/my_module.rb b/app/models/my_module.rb index 457e329ce..6e77e44e8 100644 --- a/app/models/my_module.rb +++ b/app/models/my_module.rb @@ -85,7 +85,7 @@ class MyModule < ApplicationRecord Time.current.utc + 1.day) end) scope :workflow_ordered, -> { order(workflow_order: :asc) } - scope :uncomplete, -> { where(completed_on: nil) } + scope :uncomplete, -> { where(state: 'uncompleted') } # A module takes this much space in canvas (x, y) in database WIDTH = 30 From e1255bf942b11d35662ff724e8b1877e19d36907 Mon Sep 17 00:00:00 2001 From: aignatov-bio Date: Tue, 8 Sep 2020 09:50:26 +0200 Subject: [PATCH 063/163] Remove duplicate action --- app/models/my_module.rb | 2 -- 1 file changed, 2 deletions(-) diff --git a/app/models/my_module.rb b/app/models/my_module.rb index 6e77e44e8..640676c04 100644 --- a/app/models/my_module.rb +++ b/app/models/my_module.rb @@ -509,8 +509,6 @@ class MyModule < ApplicationRecord else self.state = 'uncompleted' end - - set_completed_on end def set_completed_on From dd347aa834e295c394bf08a488720f1b1b53b436 Mon Sep 17 00:00:00 2001 From: Oleksii Kriuchykhin Date: Tue, 8 Sep 2020 11:48:06 +0200 Subject: [PATCH 064/163] Improve step reposition after deletion [SCI-4880] --- app/models/protocol.rb | 2 +- app/models/step.rb | 31 +++++++++++-------------------- 2 files changed, 12 insertions(+), 21 deletions(-) diff --git a/app/models/protocol.rb b/app/models/protocol.rb index 88f8b6e99..96a9269ea 100644 --- a/app/models/protocol.rb +++ b/app/models/protocol.rb @@ -659,7 +659,7 @@ class Protocol < ApplicationRecord def destroy_contents # Calculate total space taken by the protocol st = space_taken - steps.destroy_all + steps.order(position: :desc).destroy_all # Release space taken by the step team.release_space(st) diff --git a/app/models/step.rb b/app/models/step.rb index 797cc30ba..90eb0cd38 100644 --- a/app/models/step.rb +++ b/app/models/step.rb @@ -140,7 +140,7 @@ class Step < ApplicationRecord def move_in_protocol(direction) transaction do - adjust_duplicated_step_positions + re_index_following_steps case direction when :up @@ -165,32 +165,23 @@ class Step < ApplicationRecord end def adjust_positions_after_destroy - adjust_duplicated_step_positions - protocol.steps.where('position > ?', position).find_each do |step| + re_index_following_steps + protocol.steps.where('position > ?', position).order(:position).each do |step| step.update!(position: step.position - 1) end end - def adjust_duplicated_step_positions - duplicated_steps = protocol.steps.where(position: position) - return unless duplicated_steps.size > 1 - - # Shifting following steps - next_steps = protocol.steps.where(position: (position + 1)..).order(:position) - if next_steps.present? - shift_by = duplicated_steps.size - next_steps.first.position + position - if shift_by.positive? - next_steps.reverse_each do |step| - step.update!(position: step.position + shift_by) - end - end + def re_index_following_steps + steps = protocol.steps.where(position: position..).order(:position).where.not(id: id) + i = position + steps.each do |step| + i += 1 + step.position = i end - # Re-index duplicated positions - duplicated_steps.each_with_index do |step, i| - step.update!(position: step.position + i) + steps.reverse_each do |step| + step.save! if step.position_changed? end - reload end def cascade_before_destroy From 4083ed17554b2a8e7823498a29d7ac3aa5b068e0 Mon Sep 17 00:00:00 2001 From: aignatov-bio Date: Tue, 8 Sep 2020 14:52:23 +0200 Subject: [PATCH 065/163] Fix tests --- app/models/my_module.rb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/models/my_module.rb b/app/models/my_module.rb index 640676c04..e7f64f625 100644 --- a/app/models/my_module.rb +++ b/app/models/my_module.rb @@ -504,6 +504,8 @@ class MyModule < ApplicationRecord private def set_completed + return if my_module_status.blank? + if my_module_status.final_status? self.state = 'completed' else From 97db1e0e1cf4002aa3635c621eea38c6e563de48 Mon Sep 17 00:00:00 2001 From: aignatov-bio Date: Tue, 8 Sep 2020 14:57:26 +0200 Subject: [PATCH 066/163] Fix tests --- spec/requests/api/v1/tasks_controller_spec.rb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/spec/requests/api/v1/tasks_controller_spec.rb b/spec/requests/api/v1/tasks_controller_spec.rb index abeb9619e..99dabb623 100644 --- a/spec/requests/api/v1/tasks_controller_spec.rb +++ b/spec/requests/api/v1/tasks_controller_spec.rb @@ -4,6 +4,8 @@ require 'rails_helper' RSpec.describe 'Api::V1::TasksController', type: :request do before :all do + MyModuleStatusFlow.ensure_default + @user = create(:user) @teams = create_list(:team, 2, created_by: @user) create(:user_team, user: @user, team: @teams.first, role: 2) From f4712194994fcae02e8f55cf936f0175dcd77f56 Mon Sep 17 00:00:00 2001 From: Oleksii Kriuchykhin Date: Tue, 8 Sep 2020 15:05:36 +0200 Subject: [PATCH 067/163] Bump version to 1.19.7 --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 2a4feaf54..98adfe8e1 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.19.6 +1.19.7 From d9b691103c2dfe8fadb1399c5a42151def3847a9 Mon Sep 17 00:00:00 2001 From: Urban Rotnik Date: Tue, 8 Sep 2020 15:42:30 +0200 Subject: [PATCH 068/163] Add permission error message --- app/assets/javascripts/my_modules.js | 30 ++++++++++++++++--- .../javascripts/my_modules/protocols.js | 8 +++-- .../javascripts/my_modules/repositories.js | 6 +++- app/assets/javascripts/protocols/steps.js.erb | 24 ++++++++++++--- .../javascripts/shared/inline_editing.js | 5 +++- app/assets/javascripts/sitewide/comments.js | 11 +++++-- app/assets/javascripts/sitewide/tiny_mce.js | 5 +++- app/controllers/my_module_tags_controller.rb | 4 +-- app/controllers/my_modules_controller.rb | 3 +- app/controllers/protocols_controller.rb | 2 +- app/controllers/steps_controller.rb | 2 +- app/controllers/tags_controller.rb | 7 +++++ config/locales/en.yml | 1 + 13 files changed, 87 insertions(+), 21 deletions(-) diff --git a/app/assets/javascripts/my_modules.js b/app/assets/javascripts/my_modules.js index e1661534f..df1f41535 100644 --- a/app/assets/javascripts/my_modules.js +++ b/app/assets/javascripts/my_modules.js @@ -45,6 +45,11 @@ function updateStartDate() { data: { my_module: { started_on: val } }, success: function(result) { $('#startDateLabelContainer').html(result.start_date_label); + }, + error: function(response) { + if (response.status === 403) { + HelperModule.flashAlertMsg(I18n.t('general.no_permissions'), 'danger'); + } } }); } @@ -66,6 +71,11 @@ function updateDueDate() { data: { my_module: { due_date: val } }, success: function(result) { $('#dueDateLabelContainer').html(result.due_date_label); + }, + error: function(response) { + if (response.status === 403) { + HelperModule.flashAlertMsg(I18n.t('general.no_permissions'), 'danger'); + } } }); } @@ -239,7 +249,7 @@ function applyTaskStatusChangeCallBack() { data: { my_module: { status_id: item.data('state-id') } }, success: function(data) { container.html(data.content); - animateSpinner(null, false); + location.reload(); }, error: function(e) { animateSpinner(null, false); @@ -291,8 +301,11 @@ function initTagsSelector() { if (lastTagId > 0) { newTag = { my_module_tag: { tag_id: lastTagId } }; $.post(selectElement.data('update-module-tags-url'), newTag) - .fail(function() { + .fail(function(r) { dropdownSelector.removeValue(myModuleTagsSelector, lastTagId, '', true); + if (r.status === 403) { + HelperModule.flashAlertMsg(I18n.t('general.no_permissions'), 'danger'); + } }); } else { newTag = { @@ -313,12 +326,21 @@ function initTagsSelector() { color: result.tag.color } }, true); + }).fail(function() { + dropdownSelector.removeValue(myModuleTagsSelector, lastTagId, '', true); }); } }, onUnSelect: (id) => { - $.post(`${$(myModuleTagsSelector).data('update-module-tags-url')}/${id}/destroy_by_tag_id`); - dropdownSelector.closeDropdown(myModuleTagsSelector); + $.post(`${$(myModuleTagsSelector).data('update-module-tags-url')}/${id}/destroy_by_tag_id`) + .success(function() { + dropdownSelector.closeDropdown(myModuleTagsSelector); + }) + .fail(function(r) { + if (r.status === 403) { + HelperModule.flashAlertMsg(I18n.t('general.no_permissions'), 'danger'); + } + }); } }).getContainer(myModuleTagsSelector).addClass('my-module-tags-container'); } diff --git a/app/assets/javascripts/my_modules/protocols.js b/app/assets/javascripts/my_modules/protocols.js index aeadf3a6e..3a9fe0ec4 100644 --- a/app/assets/javascripts/my_modules/protocols.js +++ b/app/assets/javascripts/my_modules/protocols.js @@ -362,10 +362,12 @@ function loadFromRepository() { location.reload(); }, error: function(ev) { - // Display error message in alert() - alert(ev.responseJSON.message); + if (ev.status === 403) { + HelperModule.flashAlertMsg(I18n.t('general.no_permissions'), 'danger'); + } else { + alert(ev.responseJSON.message); + } - // Hide modal modal.modal('hide'); } }); diff --git a/app/assets/javascripts/my_modules/repositories.js b/app/assets/javascripts/my_modules/repositories.js index 467b6be52..ce2286846 100644 --- a/app/assets/javascripts/my_modules/repositories.js +++ b/app/assets/javascripts/my_modules/repositories.js @@ -636,8 +636,12 @@ var MyModuleRepositories = (function() { renderFullViewAssignButtons(); }, error: function(data) { + if (data.status === 403) { + HelperModule.flashAlertMsg(I18n.t('general.no_permissions'), 'danger'); + } else { + HelperModule.flashAlertMsg(data.responseJSON.flash, 'danger'); + } UPDATE_REPOSITORY_MODAL.modal('hide'); - HelperModule.flashAlertMsg(data.responseJSON.flash, 'danger'); SELECTED_ROWS = {}; FULL_VIEW_TABLE.ajax.reload(null, false); } diff --git a/app/assets/javascripts/protocols/steps.js.erb b/app/assets/javascripts/protocols/steps.js.erb index 8f96b177b..11e5c67c6 100644 --- a/app/assets/javascripts/protocols/steps.js.erb +++ b/app/assets/javascripts/protocols/steps.js.erb @@ -94,8 +94,10 @@ button.find("button").html(' ' + data.new_title); } }, - error: function (data) { - console.log ("error"); + error: function(response) { + if (response.status === 403) { + HelperModule.flashAlertMsg(I18n.t('general.no_permissions'), 'danger'); + } } }); }); @@ -157,6 +159,11 @@ tinyMCE.editors.step_description_textarea.remove(); TinyMCE.init('#step_description_textarea'); }); + }) + .on("ajax:error", function(e, xhr) { + if (xhr.status === 403) { + HelperModule.flashAlertMsg(I18n.t('general.no_permissions'), 'danger'); + } }); } @@ -165,6 +172,7 @@ $("[data-action='move-step']").off("ajax:success"); $("[data-action='move-step']") .on("ajax:success", function(e, data) { + console.log('movearound') var $step = $(this).closest(".step"); var stepUpPosition = data.step_up_position; var stepDownPosition = data.step_down_position; @@ -188,6 +196,11 @@ } if (typeof refreshProtocolStatusBar === 'function') refreshProtocolStatusBar(); + }) + .on("ajax:error", function(e, xhr) { + if (xhr.status === 403) { + HelperModule.flashAlertMsg(I18n.t('general.no_permissions'), 'danger'); + } }); } @@ -517,8 +530,11 @@ }); }, - error: function() { - newStepHandler(); + error: function(request) { + if (request.status === 403) { + HelperModule.flashAlertMsg(I18n.t('general.no_permissions'), 'danger'); + animateSpinner(null, false); + } } }) }); diff --git a/app/assets/javascripts/shared/inline_editing.js b/app/assets/javascripts/shared/inline_editing.js index b35631245..31a451869 100644 --- a/app/assets/javascripts/shared/inline_editing.js +++ b/app/assets/javascripts/shared/inline_editing.js @@ -1,5 +1,5 @@ /* eslint no-unused-vars: ["error", { "varsIgnorePattern": "initInlineEditing" }]*/ -/* global SmartAnnotation */ +/* global SmartAnnotation HelperModule I18n */ var inlineEditing = (function() { const SIDEBAR_ITEM_TYPES = ['project', 'experiment', 'my_module', 'repository']; @@ -103,6 +103,9 @@ var inlineEditing = (function() { }, error: function(response) { var error = response.responseJSON[fieldToUpdate]; + if (response.status === 403) { + HelperModule.flashAlertMsg(I18n.t('general.no_permissions'), 'danger'); + } if (!error) error = response.responseJSON.errors[fieldToUpdate]; container.addClass('error'); container.find('.error-block').html(error.join(', ')); diff --git a/app/assets/javascripts/sitewide/comments.js b/app/assets/javascripts/sitewide/comments.js index f05db26c7..bf65005b1 100644 --- a/app/assets/javascripts/sitewide/comments.js +++ b/app/assets/javascripts/sitewide/comments.js @@ -1,4 +1,4 @@ -/* global inlineEditing PerfectScrollbar */ +/* global inlineEditing PerfectScrollbar HelperModule I18n */ /* eslint-disable no-restricted-globals, no-alert */ var Comments = (function() { function changeCounter(comment, value) { @@ -49,7 +49,11 @@ var Comments = (function() { $this.closest('.comment-container').remove(); }, error: (error) => { - alert(error.responseJSON.errors.message); + if (error.status === 403) { + HelperModule.flashAlertMsg(I18n.t('general.no_permissions'), 'danger'); + } else { + alert(error.responseJSON.errors.message); + } } }); } @@ -85,6 +89,9 @@ var Comments = (function() { $el.find('textarea').focus().blur(); }) .error((error) => { + if (error.status === 403) { + HelperModule.flashAlertMsg(I18n.t('general.no_permissions'), 'danger'); + } errorField.html(error.responseJSON.errors.message); newButton.disable = false; }); diff --git a/app/assets/javascripts/sitewide/tiny_mce.js b/app/assets/javascripts/sitewide/tiny_mce.js index 042c1c6ef..20adaf09b 100644 --- a/app/assets/javascripts/sitewide/tiny_mce.js +++ b/app/assets/javascripts/sitewide/tiny_mce.js @@ -1,4 +1,4 @@ -/* global _ hljs tinyMCE SmartAnnotation I18n GLOBAL_CONSTANTS */ +/* global _ hljs tinyMCE SmartAnnotation I18n GLOBAL_CONSTANTS HelperModule */ /* eslint-disable no-unused-vars */ var TinyMCE = (function() { @@ -278,6 +278,9 @@ var TinyMCE = (function() { var model = editor.getElement().dataset.objectType; $(this).renderFormErrors(model, data.responseJSON); editor.setProgressState(0); + if (data.status === 403) { + HelperModule.flashAlertMsg(I18n.t('general.no_permissions'), 'danger'); + } }); // Init Cancel button diff --git a/app/controllers/my_module_tags_controller.rb b/app/controllers/my_module_tags_controller.rb index ed8253bc4..cfce58d2f 100644 --- a/app/controllers/my_module_tags_controller.rb +++ b/app/controllers/my_module_tags_controller.rb @@ -3,7 +3,7 @@ class MyModuleTagsController < ApplicationController before_action :load_vars, except: :canvas_index before_action :check_view_permissions, only: :index - before_action :check_manage_permissions, only: %i(create index_edit destroy) + before_action :check_manage_permissions, only: %i(create index_edit destroy destroy_by_tag_id) def index_edit @my_module_tags = @my_module.my_module_tags.order(:id) @@ -155,7 +155,7 @@ class MyModuleTagsController < ApplicationController end def check_manage_permissions - render_403 unless can_manage_tags?(@my_module.experiment.project) + render_403 unless can_manage_module?(@my_module) end def init_gui diff --git a/app/controllers/my_modules_controller.rb b/app/controllers/my_modules_controller.rb index 9ab0b5730..5ea2599e5 100644 --- a/app/controllers/my_modules_controller.rb +++ b/app/controllers/my_modules_controller.rb @@ -10,7 +10,8 @@ class MyModulesController < ApplicationController before_action :load_vars before_action :load_projects_tree, only: %i(protocols results activities archive) before_action :check_archive_and_restore_permissions, only: %i(update) - before_action :check_manage_permissions, only: %i(description due_date update_description update_protocol_description) + before_action :check_manage_permissions, only: %i(description due_date update_description update + update_protocol_description) before_action :check_view_permissions, except: %i(update update_description update_protocol_description toggle_task_state) before_action :check_update_state_permissions, only: :update_state diff --git a/app/controllers/protocols_controller.rb b/app/controllers/protocols_controller.rb index 28f3a27e4..1eaa2b9b3 100644 --- a/app/controllers/protocols_controller.rb +++ b/app/controllers/protocols_controller.rb @@ -1140,7 +1140,7 @@ class ProtocolsController < ApplicationController @source = Protocol.find_by_id(params[:source_id]) render_403 unless @protocol.present? && @source.present? && - (can_manage_protocol_in_module?(@protocol) || + (can_manage_protocol_in_module?(@protocol) && can_read_protocol_in_repository?(@source)) end diff --git a/app/controllers/steps_controller.rb b/app/controllers/steps_controller.rb index 25b6c4459..fcd52c50e 100644 --- a/app/controllers/steps_controller.rb +++ b/app/controllers/steps_controller.rb @@ -10,7 +10,7 @@ class StepsController < ApplicationController before_action :convert_table_contents_to_utf8, only: %i(create update) before_action :check_view_permissions, only: %i(show update_view_state) - before_action :check_manage_permissions, only: %i(new create edit update destroy move_up move_down) + before_action :check_manage_permissions, only: %i(new create edit update destroy move_up move_down toggle_step_state) before_action :check_complete_and_checkbox_permissions, only: %i(toggle_step_state checklistitem_state) def new diff --git a/app/controllers/tags_controller.rb b/app/controllers/tags_controller.rb index 6fb0cb8b7..756ca32c4 100644 --- a/app/controllers/tags_controller.rb +++ b/app/controllers/tags_controller.rb @@ -2,6 +2,7 @@ class TagsController < ApplicationController before_action :load_vars, only: [:create, :update, :destroy] before_action :load_vars_nested, only: [:update, :destroy] before_action :check_manage_permissions, only: %i(create update destroy) + before_action :check_manage_my_module_permissions, only: %i(create) def create @tag = Tag.new(tag_params) @@ -153,6 +154,12 @@ class TagsController < ApplicationController end end + def check_manage_my_module_permissions + my_module = MyModule.find_by id: params[:my_module_id] + + render_403 if my_module && !can_manage_module?(my_module) + end + def check_manage_permissions render_403 unless can_manage_tags?(@project) end diff --git a/config/locales/en.yml b/config/locales/en.yml index c87270817..12b9c7d28 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -2381,6 +2381,7 @@ en: busy: "The server is still processing your request. If you leave this page, the changes will be lost! Are you sure you want to continue?" no_name: "(no name)" error: "An error has occurred, please try again later." + no_permissions: "You don't have permission" filter: "Filter:" no_teams: title: "Your dashboard is empty!" From c628fb25982d51f7c526bdfd97a4fd155ddae94e Mon Sep 17 00:00:00 2001 From: Urban Rotnik Date: Tue, 8 Sep 2020 16:10:24 +0200 Subject: [PATCH 069/163] Remove duplicated notes section in reports --- .../reports/elements/_my_module_element.html.erb | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/app/views/reports/elements/_my_module_element.html.erb b/app/views/reports/elements/_my_module_element.html.erb index 3c8a54732..8ab0595e0 100644 --- a/app/views/reports/elements/_my_module_element.html.erb +++ b/app/views/reports/elements/_my_module_element.html.erb @@ -44,18 +44,6 @@ <% end %>
      -
      -
      - <% if my_module.description.present? %> - <%= custom_auto_link(my_module.prepare_for_report(:description, for_export_all), - team: current_team, - simple_format: false, - base64_encoded_imgs: for_export_all) %> - <% else %> - <%=t "projects.reports.elements.module.no_description" %> - <% end %> -
      -

      <% if my_module.started_on.present? %> <%= t('projects.reports.elements.module.started_on', started_on: l(my_module.started_on, format: :full)) %> @@ -96,9 +84,10 @@ <% if my_module.description.present? %> <%= custom_auto_link(my_module.prepare_for_report(:description, for_export_all), team: current_team, + simple_format: false, base64_encoded_imgs: for_export_all) %> <% else %> - <%= t("projects.reports.elements.module.no_description") %> + <%= t("projects.reports.elements.module.no_description") %> <% end %>

      From 9a5905baf2123264f1df4ec02a212602e2d3841b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 8 Sep 2020 14:22:28 +0000 Subject: [PATCH 070/163] Bump http-proxy from 1.17.0 to 1.18.1 Bumps [http-proxy](https://github.com/http-party/node-http-proxy) from 1.17.0 to 1.18.1. - [Release notes](https://github.com/http-party/node-http-proxy/releases) - [Changelog](https://github.com/http-party/node-http-proxy/blob/master/CHANGELOG.md) - [Commits](https://github.com/http-party/node-http-proxy/compare/1.17.0...1.18.1) Signed-off-by: dependabot[bot] --- yarn.lock | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/yarn.lock b/yarn.lock index 597c7d1b3..7a880be43 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3587,10 +3587,10 @@ etag@~1.8.1: resolved "https://registry.yarnpkg.com/etag/-/etag-1.8.1.tgz#41ae2eeb65efa62268aebfea83ac7d79299b0887" integrity sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc= -eventemitter3@^3.0.0: - version "3.1.2" - resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-3.1.2.tgz#2d3d48f9c346698fce83a85d7d664e98535df6e7" - integrity sha512-tvtQIeLVHjDkJYnzf2dgVMxfuSGJeM/7UCG17TT4EumTfNtF+0nebF/4zWOIkCreAbtNqhGEboB6BWrwqNaw4Q== +eventemitter3@^4.0.0: + version "4.0.7" + resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-4.0.7.tgz#2de9b68f6528d5644ef5c59526a1b4a07306169f" + integrity sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw== events@^3.0.0: version "3.0.0" @@ -4023,11 +4023,9 @@ follow-redirects@1.5.10: debug "=3.1.0" follow-redirects@^1.0.0: - version "1.7.0" - resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.7.0.tgz#489ebc198dc0e7f64167bd23b03c4c19b5784c76" - integrity sha512-m/pZQy4Gj287eNy94nivy5wchN3Kp+Q5WgUPNy5lJSZ3sgkVKSYV/ZChMAQVIgx1SqfZ2zBZtPA2YlXIWxxJOQ== - dependencies: - debug "^3.2.6" + version "1.13.0" + resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.13.0.tgz#b42e8d93a2a7eea5ed88633676d6597bc8e384db" + integrity sha512-aq6gF1BEKje4a9i9+5jimNFIpq4Q1WiwBToeRK5NvZBd/TRsmW8BsJfOEGkr76TbOyPVD3OVDN910EcUNtRYEA== for-in@^0.1.3: version "0.1.8" @@ -4636,11 +4634,11 @@ http-proxy-middleware@^0.19.1: micromatch "^3.1.10" http-proxy@^1.17.0: - version "1.17.0" - resolved "https://registry.yarnpkg.com/http-proxy/-/http-proxy-1.17.0.tgz#7ad38494658f84605e2f6db4436df410f4e5be9a" - integrity sha512-Taqn+3nNvYRfJ3bGvKfBSRwy1v6eePlm3oc/aWVxZp57DQr5Eq3xhKJi7Z4hZpS8PC3H4qI+Yly5EmFacGuA/g== + version "1.18.1" + resolved "https://registry.yarnpkg.com/http-proxy/-/http-proxy-1.18.1.tgz#401541f0534884bbf95260334e72f88ee3976549" + integrity sha512-7mz/721AbnJwIVbnaSv1Cz3Am0ZLT/UBwkC92VlxhXv/k/BBQfM2fXElQNC27BVGr0uwUpplYPQM9LnaBMR5NQ== dependencies: - eventemitter3 "^3.0.0" + eventemitter3 "^4.0.0" follow-redirects "^1.0.0" requires-port "^1.0.0" From bdb3caf5cff4a84b742a1cfd93471ccaea593a4b Mon Sep 17 00:00:00 2001 From: aignatov-bio Date: Wed, 9 Sep 2020 08:50:24 +0200 Subject: [PATCH 071/163] Add i18n --- app/assets/stylesheets/my_modules/status_flow.scss | 1 + app/models/my_module_status.rb | 8 -------- app/models/my_module_status_conditions/active.rb | 4 ++-- .../my_modules/modals/_status_flow_modal_body.html.erb | 2 +- config/locales/my_module_statuses/en.yml | 3 +++ 5 files changed, 7 insertions(+), 11 deletions(-) diff --git a/app/assets/stylesheets/my_modules/status_flow.scss b/app/assets/stylesheets/my_modules/status_flow.scss index c297f8ddc..cd81fe619 100644 --- a/app/assets/stylesheets/my_modules/status_flow.scss +++ b/app/assets/stylesheets/my_modules/status_flow.scss @@ -81,6 +81,7 @@ align-items: center; display: grid; grid-template-columns: 1fr min-content 1fr; + grid-template-rows: 28px; justify-content: space-around; position: relative; diff --git a/app/models/my_module_status.rb b/app/models/my_module_status.rb index 6d720ea43..101606c40 100644 --- a/app/models/my_module_status.rb +++ b/app/models/my_module_status.rb @@ -47,14 +47,6 @@ class MyModuleStatus < ApplicationRecord ordered_statuses end - def conditions_descriptions - descriptions = [] - my_module_status_conditions.each do |condition| - descriptions.push(condition.description) - end - descriptions - end - private def next_in_same_flow diff --git a/app/models/my_module_status_conditions/active.rb b/app/models/my_module_status_conditions/active.rb index 38f63bbee..68c00aa7f 100644 --- a/app/models/my_module_status_conditions/active.rb +++ b/app/models/my_module_status_conditions/active.rb @@ -4,11 +4,11 @@ module MyModuleStatusConditions class Active < MyModuleStatusCondition def call(my_module) - my_module.errors.add(:status_conditions, 'MyModule should be active') unless my_module.active? + my_module.errors.add(:status_conditions, I18n.t('my_module_statuses.conditions.error.my_module_not_active')) unless my_module.active? end def description - 'MyModule should be active' + I18n.t('my_module_statuses.conditions.error.my_module_not_active') end end end diff --git a/app/views/my_modules/modals/_status_flow_modal_body.html.erb b/app/views/my_modules/modals/_status_flow_modal_body.html.erb index 119b9e310..03b50c316 100644 --- a/app/views/my_modules/modals/_status_flow_modal_body.html.erb +++ b/app/views/my_modules/modals/_status_flow_modal_body.html.erb @@ -15,7 +15,7 @@ <%= status[:name] %>
      - <%= status.next_status&.conditions_descriptions&.join(' ') %> + <%= status.next_status&.my_module_status_conditions&.collect(&:description)&.join('
      ')&.html_safe %>
      <% end %> diff --git a/config/locales/my_module_statuses/en.yml b/config/locales/my_module_statuses/en.yml index c98376236..473214a0b 100644 --- a/config/locales/my_module_statuses/en.yml +++ b/config/locales/my_module_statuses/en.yml @@ -8,3 +8,6 @@ en: update_status: error: no_permission: You dont have permission to change the status + conditions: + error: + my_module_not_active: 'Task should be active' From ea1510bcddb099125f820bbbe4808c0d3c4d7709 Mon Sep 17 00:00:00 2001 From: Mojca Lorber Date: Wed, 9 Sep 2020 10:27:32 +0200 Subject: [PATCH 072/163] Fix quotes --- app/assets/javascripts/reports/reports_datatable.js.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/assets/javascripts/reports/reports_datatable.js.erb b/app/assets/javascripts/reports/reports_datatable.js.erb index c446e1c0c..b7bf5a208 100644 --- a/app/assets/javascripts/reports/reports_datatable.js.erb +++ b/app/assets/javascripts/reports/reports_datatable.js.erb @@ -120,7 +120,7 @@ editReportButton.removeClass("disabled hidden"); deleteReportsButton.removeClass("disabled hidden"); } else { - editReportButton.removeClass('hidden').addClass('disabled'); + editReportButton.removeClass("hidden").addClass("disabled"); deleteReportsButton.removeClass("disabled hidden"); } } From 90665861491e97ea30fbe7b705475c01dd84a726 Mon Sep 17 00:00:00 2001 From: Urban Rotnik Date: Wed, 9 Sep 2020 10:46:21 +0200 Subject: [PATCH 073/163] Fix duedate for PDF and DOCX --- app/services/reports/docx/draw_my_module.rb | 3 +++ .../elements/_my_module_element.html.erb | 25 +++++-------------- 2 files changed, 9 insertions(+), 19 deletions(-) diff --git a/app/services/reports/docx/draw_my_module.rb b/app/services/reports/docx/draw_my_module.rb index 04edfeccf..1f38b7435 100644 --- a/app/services/reports/docx/draw_my_module.rb +++ b/app/services/reports/docx/draw_my_module.rb @@ -46,6 +46,9 @@ module Reports::Docx::DrawMyModule text I18n.t('projects.reports.elements.module.status') text ' ' text "[#{status.name}]", color: status.color.delete('#') + if my_module.completed? + text " #{I18n.t('my_modules.states.completed')} #{I18n.l(my_module.completed_on, format: :full)}" + end end @docx.p do diff --git a/app/views/reports/elements/_my_module_element.html.erb b/app/views/reports/elements/_my_module_element.html.erb index 8ab0595e0..5bc476dbe 100644 --- a/app/views/reports/elements/_my_module_element.html.erb +++ b/app/views/reports/elements/_my_module_element.html.erb @@ -24,25 +24,6 @@ <% end %>

    • - -
    - <% if my_module.started_on.present? %> - <%= t('projects.reports.elements.module.started_on', started_on: l(my_module.started_on, format: :full)) %> - <% else %> - <%=t "projects.reports.elements.module.no_start_date" %> - <% end %> -
    -
    - <% if my_module.due_date.present? %> - <%=t "projects.reports.elements.module.due_date", due_date: l(my_module.due_date, format: :full) %> - <% else %> - <%=t "projects.reports.elements.module.no_due_date" %> - <% end %> - <% if my_module.completed? %> - <%= t("my_modules.states.completed") %> - <%= l(my_module.completed_on, format: :full) %> - <% end %> -

    <% if my_module.started_on.present? %> @@ -62,6 +43,12 @@ <% status = my_module.my_module_status %> <%= t("projects.reports.elements.module.status") %> <%= status.name %> + <% if my_module.completed? %> + + <%= t("my_modules.states.completed") %> + <%= l(my_module.completed_on, format: :full) %> + + <% end %>

    From 7763d116340e0e7d762f99ca5e604e2469c3cd37 Mon Sep 17 00:00:00 2001 From: aignatov-bio Date: Wed, 9 Sep 2020 11:24:54 +0200 Subject: [PATCH 074/163] Fix markup --- app/views/my_modules/modals/_status_flow_modal_body.html.erb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/app/views/my_modules/modals/_status_flow_modal_body.html.erb b/app/views/my_modules/modals/_status_flow_modal_body.html.erb index 03b50c316..6bae8c0dc 100644 --- a/app/views/my_modules/modals/_status_flow_modal_body.html.erb +++ b/app/views/my_modules/modals/_status_flow_modal_body.html.erb @@ -15,7 +15,9 @@ <%= status[:name] %>
    - <%= status.next_status&.my_module_status_conditions&.collect(&:description)&.join('
    ')&.html_safe %> + <% status.next_status&.my_module_status_conditions&.each do |condition| %> + <%= condition.description %>
    + <% end %>
    <% end %> From aa88b6bdb4c924f84a82b1c5b3ba380b0ddc41f0 Mon Sep 17 00:00:00 2001 From: Urban Rotnik Date: Wed, 9 Sep 2020 11:26:43 +0200 Subject: [PATCH 075/163] Move redirect to controller --- app/assets/javascripts/my_modules.js | 9 ++------- app/assets/javascripts/my_modules/protocols.js | 6 +++--- app/assets/javascripts/my_modules/repositories.js | 6 +++--- app/assets/javascripts/protocols/steps.js.erb | 8 ++++---- app/controllers/my_modules_controller.rb | 5 +---- 5 files changed, 13 insertions(+), 21 deletions(-) diff --git a/app/assets/javascripts/my_modules.js b/app/assets/javascripts/my_modules.js index df1f41535..48f129796 100644 --- a/app/assets/javascripts/my_modules.js +++ b/app/assets/javascripts/my_modules.js @@ -245,12 +245,7 @@ function applyTaskStatusChangeCallBack() { $.ajax({ url: list.data('link-url'), type: 'PATCH', - dataType: 'json', data: { my_module: { status_id: item.data('state-id') } }, - success: function(data) { - container.html(data.content); - location.reload(); - }, error: function(e) { animateSpinner(null, false); if (e.status === 403) { @@ -301,9 +296,9 @@ function initTagsSelector() { if (lastTagId > 0) { newTag = { my_module_tag: { tag_id: lastTagId } }; $.post(selectElement.data('update-module-tags-url'), newTag) - .fail(function(r) { + .fail(function(response) { dropdownSelector.removeValue(myModuleTagsSelector, lastTagId, '', true); - if (r.status === 403) { + if (response.status === 403) { HelperModule.flashAlertMsg(I18n.t('general.no_permissions'), 'danger'); } }); diff --git a/app/assets/javascripts/my_modules/protocols.js b/app/assets/javascripts/my_modules/protocols.js index 3a9fe0ec4..76a7db020 100644 --- a/app/assets/javascripts/my_modules/protocols.js +++ b/app/assets/javascripts/my_modules/protocols.js @@ -361,11 +361,11 @@ function loadFromRepository() { // Simply reload page location.reload(); }, - error: function(ev) { - if (ev.status === 403) { + error: function(response) { + if (response.status === 403) { HelperModule.flashAlertMsg(I18n.t('general.no_permissions'), 'danger'); } else { - alert(ev.responseJSON.message); + alert(response.responseJSON.message); } modal.modal('hide'); diff --git a/app/assets/javascripts/my_modules/repositories.js b/app/assets/javascripts/my_modules/repositories.js index ce2286846..98828ba70 100644 --- a/app/assets/javascripts/my_modules/repositories.js +++ b/app/assets/javascripts/my_modules/repositories.js @@ -635,11 +635,11 @@ var MyModuleRepositories = (function() { updateFullViewRowsCount(data.rows_count); renderFullViewAssignButtons(); }, - error: function(data) { - if (data.status === 403) { + error: function(response) { + if (response.status === 403) { HelperModule.flashAlertMsg(I18n.t('general.no_permissions'), 'danger'); } else { - HelperModule.flashAlertMsg(data.responseJSON.flash, 'danger'); + HelperModule.flashAlertMsg(response.responseJSON.flash, 'danger'); } UPDATE_REPOSITORY_MODAL.modal('hide'); SELECTED_ROWS = {}; diff --git a/app/assets/javascripts/protocols/steps.js.erb b/app/assets/javascripts/protocols/steps.js.erb index 11e5c67c6..15dc0e7a4 100644 --- a/app/assets/javascripts/protocols/steps.js.erb +++ b/app/assets/javascripts/protocols/steps.js.erb @@ -160,8 +160,8 @@ TinyMCE.init('#step_description_textarea'); }); }) - .on("ajax:error", function(e, xhr) { - if (xhr.status === 403) { + .on("ajax:error", function(e, response) { + if (response.status === 403) { HelperModule.flashAlertMsg(I18n.t('general.no_permissions'), 'danger'); } }); @@ -530,8 +530,8 @@ }); }, - error: function(request) { - if (request.status === 403) { + error: function(response) { + if (response.status === 403) { HelperModule.flashAlertMsg(I18n.t('general.no_permissions'), 'danger'); animateSpinner(null, false); } diff --git a/app/controllers/my_modules_controller.rb b/app/controllers/my_modules_controller.rb index 5ea2599e5..cd3b5c275 100644 --- a/app/controllers/my_modules_controller.rb +++ b/app/controllers/my_modules_controller.rb @@ -269,10 +269,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) - render json: { content: render_to_string( - partial: 'my_modules/status_flow/task_flow_button.html.erb', - locals: { my_module: @my_module } - ) }, status: :ok + return redirect_to protocols_my_module_path(@my_module) else render json: { errors: @my_module.errors.messages.values.flatten.join('\n') }, status: :unprocessable_entity end From f4a13a73cbfacfa754b3d5baea0323191422c58f Mon Sep 17 00:00:00 2001 From: aignatov-bio Date: Fri, 4 Sep 2020 16:48:53 +0200 Subject: [PATCH 076/163] Refactor smart annotation front-end --- .../javascripts/sitewide/atwho_res.js.erb | 254 ++++-------------- .../shared/my_modules_list_partial.scss | 2 + .../stylesheets/shared/smart_annotation.scss | 43 +++ .../elements/bootstrap_tabs.scss | 28 ++ app/assets/stylesheets/themes/scinote.scss | 161 ----------- app/controllers/at_who_controller.rb | 33 +-- app/utilities/smart_annotation.rb | 67 +---- app/views/layouts/application.html.erb | 2 +- .../_experiment_items.html.erb | 3 + .../shared/smart_annotation/_footer.html.erb | 0 .../shared/smart_annotation/_menu.html.erb | 25 ++ .../_my_module_items.html.erb | 28 ++ .../smart_annotation/_project_items.html.erb | 3 + .../_repository_items.html.erb | 5 + config/routes.rb | 2 +- 15 files changed, 217 insertions(+), 439 deletions(-) create mode 100644 app/assets/stylesheets/shared/smart_annotation.scss create mode 100644 app/assets/stylesheets/shared_styles/elements/bootstrap_tabs.scss create mode 100644 app/views/shared/smart_annotation/_experiment_items.html.erb create mode 100644 app/views/shared/smart_annotation/_footer.html.erb create mode 100644 app/views/shared/smart_annotation/_menu.html.erb create mode 100644 app/views/shared/smart_annotation/_my_module_items.html.erb create mode 100644 app/views/shared/smart_annotation/_project_items.html.erb create mode 100644 app/views/shared/smart_annotation/_repository_items.html.erb diff --git a/app/assets/javascripts/sitewide/atwho_res.js.erb b/app/assets/javascripts/sitewide/atwho_res.js.erb index 1005daade..2cc0a2067 100644 --- a/app/assets/javascripts/sitewide/atwho_res.js.erb +++ b/app/assets/javascripts/sitewide/atwho_res.js.erb @@ -33,13 +33,13 @@ var SmartAnnotation = (function() { var FilterTypeEnum = Object.freeze({ USER: {tag: "users", dataUrl: $(document.body).attr('data-atwho-users-url')}, - TASK: {tag: "tsk", + TASK: {tag: "sa-tasks", dataUrl: $(document.body).attr('data-atwho-task-url')}, - PROJECT: {tag: "prj", + PROJECT: {tag: "sa-projects", dataUrl: $(document.body).attr('data-atwho-project-url')}, - EXPERIMENT: {tag: "exp", + EXPERIMENT: {tag: "sa-experiments", dataUrl: $(document.body).attr('data-atwho-experiment-url')}, - REPOSITORY: {tag: "rep", + REPOSITORY: {tag: "sa-repositories", dataUrl: $(document.body).attr('data-atwho-rep-items-url')}, MENU: {tag: "menu", dataUrl: $(document.body).attr('data-atwho-menu-items')} @@ -94,11 +94,7 @@ var SmartAnnotation = (function() { } function _generateInputTag(value, li) { - var res = ''; - res += '[#' + li.attr('data-name'); - res += '~' + li.attr('data-type'); - res += '~' + li.attr('data-id') + ']'; - return res; + return `[#${li.attr('data-name')}~${li.attr('data-type')}~${li.attr('data-id')}]`; } // initialise dropdown dismiss button @@ -110,86 +106,19 @@ var SmartAnnotation = (function() { }); } - // Initialize or update dropdown header buttons - function updateHeaderButtons(query, filterType) { - var $currentAtWho = $('.atwho-view[style]'); - initDismissButton($currentAtWho); - - // Update the selected filter button when changing smart annotation type - $currentAtWho.find('[data-filter]') - .removeClass('btn-primary') - .addClass('btn-default'); - if(filterType.tag === 'rep') { - $currentAtWho.find('[data-rep-id="' + filterType.repository_id + '"]') - .removeClass('btn-default') - .addClass('btn-primary'); - } else { - $currentAtWho.find('[data-filter="' + filterType.tag + '"]') - .removeClass('btn-default') - .addClass('btn-primary'); - } - - // Update the selected filter button when clicking on one of them - $currentAtWho.find('[data-filter]').off() - .on('click', function(e) { - if($(this).hasClass('btn-primary')) { - return; - } - var $selectedBtn = $(this); - var $prevBtn = $selectedBtn.closest('.atwho-header-res') - .children('.btn-primary'); - $selectedBtn.removeClass('btn-default').addClass('btn-primary'); - $prevBtn.removeClass('btn-primary').addClass('btn-default'); - - // Updates query and dropdown elements; focuses input - $(field).click().focus(); - }); - } - // Generates suggestion dropdown filter function generateFilterMenu(active, res_data) { + var menu = ''; var rep_buttons = ''; $.ajax({ async: false, dataType: 'json', url: $(document.body).attr('data-atwho-repositories-url'), success: function(data) { - $.each(data['repositories'], function(id, name) { - if(defaultRepId === undefined){ - defaultRepId = id; - } - rep_buttons += ''; - }); + menu = data.html } }); - var header = '
    ' + - '' + - '' + - '' + - rep_buttons + - '
    ' + - '' + - '
    ' + - '
    ' + - '
    ' + - '<%= I18n.t("atwho.users.navigate_1") %> ' + - '<%= I18n.t("atwho.users.navigate_2") %>' + - '
    ' + - '
    <%= I18n.t("atwho.users.confirm_1") %> ' + - '<%= I18n.t("atwho.users.confirm_2") %>' + - '
    ' + - '
    ' + - '<%= I18n.t("atwho.users.dismiss_1") %> ' + - '<%= I18n.t("atwho.users.dismiss_2") %>' + - '
    ' + - '
    ' + - '
    '; - - return header; + return menu; } function noResultsTemplate() { @@ -201,80 +130,7 @@ var SmartAnnotation = (function() { // Generates resources list items function generateTemplate(map) { - var res = ''; - res += '
  • '; - switch(map.type) { - case 'tsk': - res += '' + map.type + ''; - break; - case 'prj': - res += '' + map.type + ''; - break; - case 'exp': - res += '' + map.type + ''; - break; - case 'rep_item': - res += '' + - map.repository_tag + ''; - break; - } - - res += ' '; - res += ''; - res += truncateLongString(map.name, - <%= Constants::NAME_TRUNCATION_LENGTH %>); - res += ''; - if(map.archived) { - res += '<%= I18n.t("atwho.res.archived") %>'; - } else { - res += ''; - } - res += ' '; - - switch (map.type) { - case 'tsk': - - res += '< ' + map.experimentName + - ' < ' + map.projectName + ''; - break; - case 'exp': - res += '< ' + map.projectName + ''; - break; - case 'sam': - res += '' + map.description + ''; - break; - } - - res += '
    • '; - return res; - } - - /** - * Hackish wrapper function to make AtWho work when switching between - * multiple AtWho instances (e.g. from # to task#). - * - * Prevents second execution of AtWho update callback, triggered when user - * switches to different AtWho instance (e.g. from # to task#), which causes - * both of them to be called. In such case, AtWhO modal needs to be - * rerendered. - */ - function atWhoSwitchHack(filterTypeTag, remoteFilterCb) { - if(atWhoUpdating || (!$(field).length && _.isUndefined(filterTypeTag))) { - setTimeout(function() { - $(field).click(); - }, 100); - return; - } - - atWhoUpdating = true; - setTimeout(function() { - remoteFilterCb(); - atWhoUpdating = false; - }, 100); + return map.name; } function atWhoSettings(at, defaultFilterType) { @@ -283,61 +139,35 @@ var SmartAnnotation = (function() { callbacks: { remoteFilter: function(query, callback) { var $currentAtWho = $('.atwho-view[style]'); - var filterTypeTag = $currentAtWho - .find('.btn-primary') - .data('filter'); + var filterType; + var params = { query: query }; + filterType = FilterTypeEnum[$currentAtWho.find('.tab-pane.active').data('object-type')] + console.log(filterType) + if (!filterType) { + callback([{no_results: 1}]); + return false + } - atWhoSwitchHack(filterTypeTag, function() { - var filterType; - if (_.isUndefined(filterTypeTag)) { - // Switched smart annotation type (i.e. changed input) - filterType = defaultFilterType; + if(filterType.tag === 'sa-repositories') { + let repositoryTab = $currentAtWho.find('[data-object-type="REPOSITORY"]') + let activeRepository = repositoryTab.find('.btn-primary'); + if (activeRepository.length) { + params['repository_id'] = activeRepository.data('object-id') + } + + } + $.getJSON(filterType.dataUrl, params, function(data) { + // Updates dropdown + if (data.res.length < 1) { + callback([{no_results: 1}]); } else { - // Switched filtering type (i.e. different filter button - // pressed; works also for specific annotation types, e.g. - // task#, and coverts to the correct annotation type on confirm) - $.each(FilterTypeEnum, function(k, v) { - if (v.tag == filterTypeTag) { - filterType = FilterTypeEnum[k]; - return false; - } - }); - } - if (prevAt != at) { - // Switching smart annotation type (i.e. chaned input) - - prevAt = at; - filterType = defaultFilterType; - // Hide current AtWho - $currentAtWho.removeAttr("style"); + callback(data.res); } - var params = { query: query }; - - if(filterType.tag === 'rep') { - params.repository_id = $currentAtWho - .find('.btn-primary') - .data('rep-id'); - if(params.repository_id === undefined) { - params.repository_id = defaultRepId; - } - filterType.repository_id = params.repository_id; + if (data.repository) { + $currentAtWho.find(`.repository-object[data-object-id="${data.repository}"]`) + .addClass('btn-primary').removeClass('btn-light') } - - $.getJSON( - filterType.dataUrl, - params, - function(data) { - // Updates dropdown - if (data.res.length < 1) { - callback([{no_results: 1}]); - } else { - callback(data.res); - } - - updateHeaderButtons(query, filterType); - } - ); }); }, sorter: function(query, items, _searchKey) { @@ -380,6 +210,24 @@ var SmartAnnotation = (function() { function init() { $(field) + .on("shown.atwho", function() { + var $currentAtWho = $('.atwho-view[style]'); + $currentAtWho.find('.tab-button').off().on('shown.bs.tab', function() { + $(field).click().focus(); + $(this).closest('.nav-tabs').find('.tab-button').removeClass('active'); + $(this).addClass('active'); + }) + $currentAtWho.find('.repository-object').off().on('click', function() { + $(this).parent().find('.repository-object').removeClass('btn-primary').addClass('btn-light'); + $(this).addClass('btn-primary').removeClass('btn-light'); + $(field).click().focus(); + }) + + if ($currentAtWho.find('.tab-pane.active').length == 0) { + let filterType = DEFAULT_SEARCH_FILTER; + $currentAtWho.find(`.${filterType.tag}`).click(); + } + }) .on("reposition.atwho", function(event, flag, query) { let inputFieldLeft = query.$inputor.offset().left; if (inputFieldLeft > $(window).width()) { diff --git a/app/assets/stylesheets/shared/my_modules_list_partial.scss b/app/assets/stylesheets/shared/my_modules_list_partial.scss index 7a6858940..1370e154c 100644 --- a/app/assets/stylesheets/shared/my_modules_list_partial.scss +++ b/app/assets/stylesheets/shared/my_modules_list_partial.scss @@ -49,6 +49,8 @@ } .task-link { + color: $brand-primary; + cursor: pointer; line-height: 24px; overflow: hidden; text-overflow: ellipsis; diff --git a/app/assets/stylesheets/shared/smart_annotation.scss b/app/assets/stylesheets/shared/smart_annotation.scss new file mode 100644 index 000000000..ec3d4bdba --- /dev/null +++ b/app/assets/stylesheets/shared/smart_annotation.scss @@ -0,0 +1,43 @@ +.atwho-view { + background: $color_white; + border-radius: $border-radius-default; + box-shadow: $flyout-shadow; + display: none; + left: 0; + margin-top: 18px; + max-width: 700px; + min-width: 600px; + overflow: auto; + position: absolute; + top: 0; + z-index: 11110 !important; + + .atwho-header-res { + .nav-tabs { + margin-bottom: 0; + } + + .rep-tab.active { + border-bottom: $border-default; + display: flex; + padding: .25em; + } + } + + .atwho-view-ul { + padding: .25em; + } +} + +.sa-type { + font-size: 10px; + font-weight: 600; + padding-left: 2px; + text-decoration: none; + text-transform: uppercase; + vertical-align: super; + + &:hover { + text-decoration: none; + } +} diff --git a/app/assets/stylesheets/shared_styles/elements/bootstrap_tabs.scss b/app/assets/stylesheets/shared_styles/elements/bootstrap_tabs.scss new file mode 100644 index 000000000..e4d2cb402 --- /dev/null +++ b/app/assets/stylesheets/shared_styles/elements/bootstrap_tabs.scss @@ -0,0 +1,28 @@ +.sci-nav-tabs { + border-bottom: $border-default; + display: flex; + + a { + color: $color-volcano; + padding: .5em; + position: relative; + + &:hover { + text-decoration: none; + } + + &.active { + color: initial; + + &::after { + content: ''; + background: $brand-primary; + bottom: 0; + height: .25em; + left: 0; + position:absolute; + width: 100%; + } + } + } +} diff --git a/app/assets/stylesheets/themes/scinote.scss b/app/assets/stylesheets/themes/scinote.scss index 91c62a7b2..0b15e8a3a 100644 --- a/app/assets/stylesheets/themes/scinote.scss +++ b/app/assets/stylesheets/themes/scinote.scss @@ -1654,167 +1654,6 @@ th.custom-field .modal-tooltiptext { // AtWho (smart annotations) // -.atwho-view { - position: absolute; - top: 0; - left: 0; - display: none; - margin-top: 18px; - background: $color-white; - color: $color-black; - border: 1px solid $color-emperor; - border-radius: 3px; - box-shadow: 0 0 5px $color-gainsboro; - max-width: 800px; - min-width: 700px; - overflow: auto; - z-index: 11110 !important; - - small { - font-size: smaller; - color: $color-emperor; - font-weight: normal; - } - - strong { - color: $brand-primary; - } - - .cur { - background: $brand-primary; - color: $color-white; - - small { - color: $color-white; - } - - strong { - color: $color-white; - font: bold; - } - - .res-description { - color: $color-white; - } - - .res-type { - border-color: $color-white; - } - } - - ul { - list-style: none; - padding: 0; - margin: auto; - - li { - align-items: center; - border-bottom: 1px solid $color-emperor; - cursor: pointer; - display: flex; - padding: 5px 10px; - - .global-avatar-container { - margin-right: 5px; - } - } - } -} -// - -.atwho-header-res { - background-color: $color-concrete; - border-bottom: 1px solid $color-emperor; - display: flex; - flex-wrap: wrap; - padding: 3px 5px; - - .btn { - border-radius: 4px; - margin: 5px; - padding: 3px; - } - - .btn-default { - background-color: transparent; - } - - .title-user { - padding-top: 4px; - } - - .help { - margin-left: auto; - margin-right: 15px; - order: 99; - padding: 4px; - white-space: nowrap; - - div { - display: inline; - font-size: smaller; - margin-left: 15px; - } - - strong { - color: $color-black; - } - } - - .dismiss { - color: $color-emperor; - position: absolute; - right: 5px; - top: 5px; - } - - .dismiss:hover { - color: $color-black; - cursor: pointer; - } -} - - -.atwho-li-res { - - .fa-tint { - margin-left: 5px; - margin-right: 5px; - } - - .res-type { - border: 1px solid $color-black; - border-radius: 4px; - font-weight: 600; - margin-left: 5px; - margin-right: 5px; - padding: 0 2px; - text-transform: capitalize; - } - - .res-name { - font-weight: 600; - margin-right: 5px; - } - - .res-description { - color: $color-emperor; - font-size: 10px; - } -} - -.sa-type { - font-size: 10px; - font-weight: 600; - padding-left: 2px; - text-decoration: none; - text-transform: uppercase; - vertical-align: super; - - &:hover { - text-decoration: none; - } -} .atwho-user-container { align-items: center; diff --git a/app/controllers/at_who_controller.rb b/app/controllers/at_who_controller.rb index c3468e9e9..0904ccaf3 100644 --- a/app/controllers/at_who_controller.rb +++ b/app/controllers/at_who_controller.rb @@ -32,7 +32,7 @@ class AtWhoController < ApplicationController end def rep_items - repository = Repository.find_by_id(params[:repository_id]) + repository = Repository.find_by_id(params[:repository_id]) || Repository.active.accessible_by_teams(@team).first items = if repository && can_read_repository?(repository) SmartAnnotation.new(current_user, current_team, @query) @@ -43,25 +43,20 @@ class AtWhoController < ApplicationController respond_to do |format| format.json do render json: { - res: items, + res: [render_to_string(partial: 'shared/smart_annotation/repository_items.html.erb', locals: { + repository_rows: items + })], + repository: repository.id, status: :ok } end end end - def repositories + def menu repositories = Repository.active.accessible_by_teams(@team) - respond_to do |format| - format.json do - render json: { - repositories: repositories.map do |r| - [r.id, escape_input(r.name.truncate(Constants::ATWHO_REP_NAME_LIMIT))] - end.to_h, - status: :ok - } - end - end + render json: { html: render_to_string({ partial: "shared/smart_annotation/menu.html.erb", + locals: { repositories: repositories } }) } end def projects @@ -69,7 +64,9 @@ class AtWhoController < ApplicationController respond_to do |format| format.json do render json: { - res: res.projects, + res: [render_to_string(partial: 'shared/smart_annotation/project_items.html.erb', locals: { + projects: res.projects + })], status: :ok } end @@ -81,7 +78,9 @@ class AtWhoController < ApplicationController respond_to do |format| format.json do render json: { - res: res.experiments, + res: [render_to_string(partial: 'shared/smart_annotation/experiment_items.html.erb', locals: { + experiments: res.experiments + })], status: :ok } end @@ -93,7 +92,9 @@ class AtWhoController < ApplicationController respond_to do |format| format.json do render json: { - res: res.my_modules, + res: [render_to_string(partial: 'shared/smart_annotation/my_module_items.html.erb', locals: { + my_modules: res.my_modules + })], status: :ok } end diff --git a/app/utilities/smart_annotation.rb b/app/utilities/smart_annotation.rb index 56e6d2aaa..3293cdd76 100644 --- a/app/utilities/smart_annotation.rb +++ b/app/utilities/smart_annotation.rb @@ -12,67 +12,21 @@ class SmartAnnotation def my_modules # Search tasks - res = MyModule - .search(@current_user, false, @query, 1, @current_team) - .limit(Constants::ATWHO_SEARCH_LIMIT) - - modules_list = [] - res.each do |my_module_res| - my_mod = {} - my_mod['id'] = my_module_res.id.base62_encode - my_mod['name'] = sanitize(my_module_res.name) - my_mod['archived'] = my_module_res.archived - my_mod['experimentName'] = truncate( - sanitize(my_module_res.experiment.name, - length: Constants::NAME_TRUNCATION_LENGTH) - ) - my_mod['projectName'] = truncate( - sanitize(my_module_res.experiment.project.name, - length: Constants::NAME_TRUNCATION_LENGTH) - ) - my_mod['type'] = 'tsk' - - modules_list << my_mod - end - modules_list + task_ids = MyModule.search(@current_user, false, @query, 1, @current_team) + .limit(Constants::ATWHO_SEARCH_LIMIT).pluck(:id) + MyModule.where(id: task_ids) end def projects # Search projects - res = Project - .search(@current_user, false, @query, 1, @current_team) - .limit(Constants::ATWHO_SEARCH_LIMIT) - - projects_list = [] - res.each do |project_res| - prj = {} - prj['id'] = project_res.id.base62_encode - prj['name'] = sanitize(project_res.name) - prj['type'] = 'prj' - projects_list << prj - end - projects_list + Project.search(@current_user, false, @query, 1, @current_team) + .limit(Constants::ATWHO_SEARCH_LIMIT) end def experiments # Search experiments - res = Experiment - .search(@current_user, false, @query, 1, @current_team) - .limit(Constants::ATWHO_SEARCH_LIMIT) - - experiments_list = [] - res.each do |experiment_res| - exp = {} - exp['id'] = experiment_res.id.base62_encode - exp['name'] = sanitize(experiment_res.name) - exp['type'] = 'exp' - exp['projectName'] = truncate( - sanitize(experiment_res.project.name, - length: Constants::NAME_TRUNCATION_LENGTH) - ) - experiments_list << exp - end - experiments_list + Experiment.search(@current_user, false, @query, 1, @current_team) + .limit(Constants::ATWHO_SEARCH_LIMIT) end def samples @@ -122,10 +76,9 @@ class SmartAnnotation repository_tag.downcase! res.each do |rep_row| rep_item = {} - rep_item['id'] = rep_row.id.base62_encode - rep_item['name'] = sanitize(rep_row.name) - rep_item['repository_tag'] = repository_tag - rep_item['type'] = 'rep_item' + rep_item[:id] = rep_row.id.base62_encode + rep_item[:name] = sanitize(rep_row.name) + rep_item[:repository_tag] = repository_tag rep_items_list << rep_item end rep_items_list diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 0fa7b6fba..94e1ccacf 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -34,7 +34,7 @@ data-atwho-task-url="<%= atwho_my_modules_team_path(current_team) %>" data-atwho-project-url="<%= atwho_projects_team_path(current_team) %>" data-atwho-experiment-url="<%= atwho_experiments_team_path(current_team) %>" - data-atwho-repositories-url="<%= atwho_repositories_team_path(current_team) %>" + data-atwho-repositories-url="<%= atwho_menu_team_path(current_team) %>" data-atwho-rep-items-url="<%= atwho_rep_items_team_path(current_team) %>" data-atwho-menu-items="<%= atwho_menu_items_team_path(current_team) %>" <% end %> diff --git a/app/views/shared/smart_annotation/_experiment_items.html.erb b/app/views/shared/smart_annotation/_experiment_items.html.erb new file mode 100644 index 000000000..f06fc0b36 --- /dev/null +++ b/app/views/shared/smart_annotation/_experiment_items.html.erb @@ -0,0 +1,3 @@ +<% experiments.each do |experiment| %> +
  • <%= experiment.name %>
    • +<% end %> diff --git a/app/views/shared/smart_annotation/_footer.html.erb b/app/views/shared/smart_annotation/_footer.html.erb new file mode 100644 index 000000000..e69de29bb diff --git a/app/views/shared/smart_annotation/_menu.html.erb b/app/views/shared/smart_annotation/_menu.html.erb new file mode 100644 index 000000000..83fdd526c --- /dev/null +++ b/app/views/shared/smart_annotation/_menu.html.erb @@ -0,0 +1,25 @@ +<% at_who_key = SecureRandom.hex %> +
    +
    + PROJECTS + EXPERIMENTS + TASKS + INVENTORIES +
    +
    +
    +
    +
    +
    + <% if repositories.length > 1 %> +
    + <% repositories.each do |repository| %> + + <% end %> +
    + <% end %> +
    +
    +
    diff --git a/app/views/shared/smart_annotation/_my_module_items.html.erb b/app/views/shared/smart_annotation/_my_module_items.html.erb new file mode 100644 index 000000000..dc96cc892 --- /dev/null +++ b/app/views/shared/smart_annotation/_my_module_items.html.erb @@ -0,0 +1,28 @@ +
    + <% grouped_by_prj_exp(my_modules).each do |task_group| %> +
    +
    + <% if task_group[:project_archived]%> + <%= t('general.archived') %> + <% end %> + <%= task_group[:project_name] %> + / + <% if task_group[:experiment_archived] %> + <%= t('general.archived') %> + <% end %> + <%= task_group[:experiment_name] %> +
    +
    + <% task_group[:tasks].each do |task| %> +
    + <%= draw_custom_icon('task-icon') %> + <% if task.archived %> + <%= t('general.archived') %> + <% end %> +
  • <%= task.name %>
    • +
    + <% end %> +
    +
    + <% end %> +
    diff --git a/app/views/shared/smart_annotation/_project_items.html.erb b/app/views/shared/smart_annotation/_project_items.html.erb new file mode 100644 index 000000000..d87b0f511 --- /dev/null +++ b/app/views/shared/smart_annotation/_project_items.html.erb @@ -0,0 +1,3 @@ +<% projects.each do |project| %> +
  • <%= project.name %>
    • +<% end %> diff --git a/app/views/shared/smart_annotation/_repository_items.html.erb b/app/views/shared/smart_annotation/_repository_items.html.erb new file mode 100644 index 000000000..5c4ec430b --- /dev/null +++ b/app/views/shared/smart_annotation/_repository_items.html.erb @@ -0,0 +1,5 @@ +<% repository_rows.each do |row| %> +
  • + [<%= row[:repository_tag] %>] <%= row[:name] %> +
    • +<% end %> diff --git a/config/routes.rb b/config/routes.rb index 8e603000e..577445bee 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -207,7 +207,7 @@ Rails.application.routes.draw do get 'export_projects_modal' # Used for atwho (smart annotations) get 'atwho_users', to: 'at_who#users' - get 'atwho_repositories', to: 'at_who#repositories' + get 'atwho_menu', to: 'at_who#menu' get 'atwho_rep_items', to: 'at_who#rep_items' get 'atwho_projects', to: 'at_who#projects' get 'atwho_experiments', to: 'at_who#experiments' From 661220890ff8ae4a8527aa8f289c876371fcad76 Mon Sep 17 00:00:00 2001 From: aignatov-bio Date: Mon, 7 Sep 2020 10:46:51 +0200 Subject: [PATCH 077/163] Update error handling --- .../javascripts/sitewide/atwho_res.js.erb | 26 ++++++------------- .../stylesheets/shared/smart_annotation.scss | 19 +++++++++++++- .../_experiment_items.html.erb | 4 +++ .../shared/smart_annotation/_footer.html.erb | 1 + .../_my_module_items.html.erb | 6 ++++- .../smart_annotation/_no_results.html.erb | 3 +++ .../smart_annotation/_project_items.html.erb | 4 +++ .../_repository_items.html.erb | 4 +++ config/initializers/constants.rb | 2 +- config/locales/en.yml | 7 +---- 10 files changed, 49 insertions(+), 27 deletions(-) create mode 100644 app/views/shared/smart_annotation/_no_results.html.erb diff --git a/app/assets/javascripts/sitewide/atwho_res.js.erb b/app/assets/javascripts/sitewide/atwho_res.js.erb index 2cc0a2067..b6a5f447d 100644 --- a/app/assets/javascripts/sitewide/atwho_res.js.erb +++ b/app/assets/javascripts/sitewide/atwho_res.js.erb @@ -55,11 +55,7 @@ var SmartAnnotation = (function() { function _templateEval(_tpl, map) { var res; try { - if (map.no_results) { - res = noResultsTemplate(); - } else { - res = generateTemplate(map); - } + res = generateTemplate(map); } catch (_error) { res = ''; } @@ -122,10 +118,9 @@ var SmartAnnotation = (function() { } function noResultsTemplate() { - var res = '
    '; - res += '<%= I18n.t("atwho.no_results") %>'; - res += '
    '; - return res; + return `
    + <%= I18n.t("atwho.no_results") %> +
    `; } // Generates resources list items @@ -142,9 +137,8 @@ var SmartAnnotation = (function() { var filterType; var params = { query: query }; filterType = FilterTypeEnum[$currentAtWho.find('.tab-pane.active').data('object-type')] - console.log(filterType) if (!filterType) { - callback([{no_results: 1}]); + callback([{name: noResultsTemplate()}]); return false } @@ -157,12 +151,7 @@ var SmartAnnotation = (function() { } $.getJSON(filterType.dataUrl, params, function(data) { - // Updates dropdown - if (data.res.length < 1) { - callback([{no_results: 1}]); - } else { - callback(data.res); - } + callback(data.res); if (data.repository) { $currentAtWho.find(`.repository-object[data-object-id="${data.repository}"]`) @@ -178,7 +167,8 @@ var SmartAnnotation = (function() { return _templateEval(_tpl, map); }, highlighter: function(li, query) { - return _matchHighlighter(li, query, true); + //return _matchHighlighter(li, query, true); + return li; }, beforeInsert: function(value, li) { return _generateInputTag(value, li); diff --git a/app/assets/stylesheets/shared/smart_annotation.scss b/app/assets/stylesheets/shared/smart_annotation.scss index ec3d4bdba..fe5c8f9b7 100644 --- a/app/assets/stylesheets/shared/smart_annotation.scss +++ b/app/assets/stylesheets/shared/smart_annotation.scss @@ -1,7 +1,7 @@ .atwho-view { background: $color_white; border-radius: $border-radius-default; - box-shadow: $flyout-shadow; + box-shadow: $modal-shadow; display: none; left: 0; margin-top: 18px; @@ -25,8 +25,25 @@ } .atwho-view-ul { + margin: 0; padding: .25em; } + + .atwho-footer { + @include font-small; + border-top: $border-default; + color: $color-silver-chalice; + margin-left: -.25em; + padding: .5em; + width: calc(100% + .5em); + white-space: pre; + } + + .atwho-scroll-container { + max-height: 200px; + overflow-y: auto; + position: relative; + } } .sa-type { diff --git a/app/views/shared/smart_annotation/_experiment_items.html.erb b/app/views/shared/smart_annotation/_experiment_items.html.erb index f06fc0b36..c497c43a1 100644 --- a/app/views/shared/smart_annotation/_experiment_items.html.erb +++ b/app/views/shared/smart_annotation/_experiment_items.html.erb @@ -1,3 +1,7 @@ <% experiments.each do |experiment| %>
  • <%= experiment.name %>
    • <% end %> +<% if experiments.empty? %> + <%= render partial: 'shared/smart_annotation/no_results.html.erb' %> +<% end %> +<%= render partial: 'shared/smart_annotation/footer.html.erb' %> diff --git a/app/views/shared/smart_annotation/_footer.html.erb b/app/views/shared/smart_annotation/_footer.html.erb index e69de29bb..6cff1b510 100644 --- a/app/views/shared/smart_annotation/_footer.html.erb +++ b/app/views/shared/smart_annotation/_footer.html.erb @@ -0,0 +1 @@ +
    <%= I18n.t("atwho.users.help") %>
    diff --git a/app/views/shared/smart_annotation/_my_module_items.html.erb b/app/views/shared/smart_annotation/_my_module_items.html.erb index dc96cc892..107b917f6 100644 --- a/app/views/shared/smart_annotation/_my_module_items.html.erb +++ b/app/views/shared/smart_annotation/_my_module_items.html.erb @@ -1,4 +1,4 @@ -
    +
    <% grouped_by_prj_exp(my_modules).each do |task_group| %>
    @@ -26,3 +26,7 @@
    <% end %>
    +<% if my_modules.empty? %> + <%= render partial: 'shared/smart_annotation/no_results.html.erb' %> +<% end %> +<%= render partial: 'shared/smart_annotation/footer.html.erb' %> diff --git a/app/views/shared/smart_annotation/_no_results.html.erb b/app/views/shared/smart_annotation/_no_results.html.erb new file mode 100644 index 000000000..bea2b1c43 --- /dev/null +++ b/app/views/shared/smart_annotation/_no_results.html.erb @@ -0,0 +1,3 @@ +
    + <%= t("atwho.no_results") %> +
    diff --git a/app/views/shared/smart_annotation/_project_items.html.erb b/app/views/shared/smart_annotation/_project_items.html.erb index d87b0f511..c953211c8 100644 --- a/app/views/shared/smart_annotation/_project_items.html.erb +++ b/app/views/shared/smart_annotation/_project_items.html.erb @@ -1,3 +1,7 @@ <% projects.each do |project| %>
  • <%= project.name %>
    • <% end %> +<% if projects.empty? %> + <%= render partial: 'shared/smart_annotation/no_results.html.erb' %> +<% end %> +<%= render partial: 'shared/smart_annotation/footer.html.erb' %> diff --git a/app/views/shared/smart_annotation/_repository_items.html.erb b/app/views/shared/smart_annotation/_repository_items.html.erb index 5c4ec430b..719feafb0 100644 --- a/app/views/shared/smart_annotation/_repository_items.html.erb +++ b/app/views/shared/smart_annotation/_repository_items.html.erb @@ -3,3 +3,7 @@ [<%= row[:repository_tag] %>] <%= row[:name] %> <% end %> +<% if repository_rows.empty? %> + <%= render partial: 'shared/smart_annotation/no_results.html.erb' %> +<% end %> +<%= render partial: 'shared/smart_annotation/footer.html.erb' %> diff --git a/config/initializers/constants.rb b/config/initializers/constants.rb index cccf47c52..8dd6687e6 100644 --- a/config/initializers/constants.rb +++ b/config/initializers/constants.rb @@ -61,7 +61,7 @@ class Constants # Maximum number of users that can be invited in a single action INVITE_USERS_LIMIT = 20 # Maximum nr. of search results for atwho (smart annotations) - ATWHO_SEARCH_LIMIT = 5 + ATWHO_SEARCH_LIMIT = 10 # Max characters for repository name in Atwho modal ATWHO_REP_NAME_LIMIT = 16 # Results limited query/display elements for pages diff --git a/config/locales/en.yml b/config/locales/en.yml index c1d851eda..846563897 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -2278,12 +2278,7 @@ en: no_results: "No results found" users: title: "People" - navigate_1: "up/down" - navigate_2: "to navigate" - confirm_1: "enter/tab" - confirm_2: "to confirm" - dismiss_1: "esc" - dismiss_2: "to dismiss" + help: "Navigate: ↑ ↓ • Submit: Enter / Tab • Dismiss: Esc" popover_html: "Team: %{team}
    Role: %{role}
    Joined: %{time}" res: archived: "(archived)" From 45a09e5a3cecf35de5038e4d82135e7f0e380164 Mon Sep 17 00:00:00 2001 From: Urban Rotnik Date: Wed, 9 Sep 2020 12:04:43 +0200 Subject: [PATCH 078/163] Fix tests --- app/controllers/my_modules_controller.rb | 5 +++-- spec/controllers/my_modules_controller_spec.rb | 1 - spec/controllers/protocols_controller_spec.rb | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/controllers/my_modules_controller.rb b/app/controllers/my_modules_controller.rb index cd3b5c275..2f1d9c4ff 100644 --- a/app/controllers/my_modules_controller.rb +++ b/app/controllers/my_modules_controller.rb @@ -10,8 +10,7 @@ class MyModulesController < ApplicationController before_action :load_vars before_action :load_projects_tree, only: %i(protocols results activities archive) before_action :check_archive_and_restore_permissions, only: %i(update) - before_action :check_manage_permissions, only: %i(description due_date update_description update - update_protocol_description) + before_action :check_manage_permissions, only: %i(description due_date update_description update_protocol_description) before_action :check_view_permissions, except: %i(update update_description update_protocol_description toggle_task_state) before_action :check_update_state_permissions, only: :update_state @@ -128,6 +127,8 @@ class MyModulesController < ApplicationController log_activity(:restore_module) end else + render_403 && return unless can_manage_module?(@my_module) + saved = @my_module.save if saved if description_changed diff --git a/spec/controllers/my_modules_controller_spec.rb b/spec/controllers/my_modules_controller_spec.rb index 7d4666e20..cdfc4e474 100644 --- a/spec/controllers/my_modules_controller_spec.rb +++ b/spec/controllers/my_modules_controller_spec.rb @@ -145,7 +145,6 @@ describe MyModulesController, type: :controller do action expect(my_module.reload.my_module_status.id).to be_eql(status_id) - expect(response).to have_http_status 200 end it 'creates activity' do diff --git a/spec/controllers/protocols_controller_spec.rb b/spec/controllers/protocols_controller_spec.rb index f48fa94c6..912f65880 100644 --- a/spec/controllers/protocols_controller_spec.rb +++ b/spec/controllers/protocols_controller_spec.rb @@ -211,7 +211,7 @@ describe ProtocolsController, type: :controller do let(:protocol_source) do create :protocol, :in_public_repository, team: team, added_by: user end - let(:protocol) { create :protocol, team: team, added_by: user } + let(:protocol) { create :protocol, team: team, added_by: user, my_module: my_module } let(:action) { put :load_from_repository, params: params, format: :json } let(:params) do { source_id: protocol_source.id, id: protocol.id } From 8b10cde6b447b148d9e84d766d4477453e7f2e71 Mon Sep 17 00:00:00 2001 From: Urban Rotnik Date: Wed, 9 Sep 2020 13:51:11 +0200 Subject: [PATCH 079/163] Fix DeepScan error --- app/assets/javascripts/my_modules.js | 1 - 1 file changed, 1 deletion(-) diff --git a/app/assets/javascripts/my_modules.js b/app/assets/javascripts/my_modules.js index 48f129796..940d4ed99 100644 --- a/app/assets/javascripts/my_modules.js +++ b/app/assets/javascripts/my_modules.js @@ -240,7 +240,6 @@ function applyTaskStatusChangeCallBack() { $('.task-flows').on('click', '#dropdownTaskFlowList > li[data-state-id]', function() { var list = $('#dropdownTaskFlowList'); var item = $(this); - var container = list.closest('.task-flows'); animateSpinner(); $.ajax({ url: list.data('link-url'), From 7a86bb47c54040b4a3b369c03c0963fb953cf5f1 Mon Sep 17 00:00:00 2001 From: aignatov-bio Date: Wed, 9 Sep 2020 14:17:19 +0200 Subject: [PATCH 080/163] Add styling and highligh --- .../javascripts/sitewide/atwho_res.js.erb | 80 ++++--------------- .../stylesheets/shared/smart_annotation.scss | 50 +++++++++++- app/helpers/experiments_helper.rb | 17 ++++ app/utilities/smart_annotation.rb | 16 ++-- .../_experiment_items.html.erb | 26 ++++-- .../_my_module_items.html.erb | 35 +++----- .../smart_annotation/_project_items.html.erb | 17 ++-- .../_repository_items.html.erb | 19 +++-- 8 files changed, 144 insertions(+), 116 deletions(-) create mode 100644 app/helpers/experiments_helper.rb diff --git a/app/assets/javascripts/sitewide/atwho_res.js.erb b/app/assets/javascripts/sitewide/atwho_res.js.erb index b6a5f447d..82c571af9 100644 --- a/app/assets/javascripts/sitewide/atwho_res.js.erb +++ b/app/assets/javascripts/sitewide/atwho_res.js.erb @@ -49,63 +49,26 @@ var SmartAnnotation = (function() { DEFAULT_SEARCH_FILTER = FilterTypeEnum.REPOSITORY, atWhoUpdating = false; - var defaultRepId; + function _matchHighlighter(html, query, filterType) { + var $html = $(html); + var $li_text = $html.find('.item-text'); - // helper methods for AtWho callback - function _templateEval(_tpl, map) { - var res; - try { - res = generateTemplate(map); - } catch (_error) { - res = ''; - } - return res; - } + if ($li_text.length === 0 || !query) return html; - function _matchHighlighter(li, query, filterType) { - var $li, re; + $.each($li_text, function(i, item) { + $(item).html($(item).text().replace(new RegExp(query, 'gi'), '$&')); + }) - function highlight(el, sel, re) { - var prevVal, newVal; - prevVal = el.find(sel).html(); - newVal = prevVal.replace(re, '$&'); - el.find(sel).html(newVal); - } - - if (!query || $(li).data('no-results')) { - return li; - } - - $li = $(li); - re = new RegExp(query, 'gi'); - // search_filter is not passed for the user - if(filterType) { - highlight($li, '[data-val=name]', re); - } else { - highlight($li, '[data-val=full-name]', re); - highlight($li, '[data-val=email]', re); - } - - return $li[0].outerHTML + return $html; } function _generateInputTag(value, li) { return `[#${li.attr('data-name')}~${li.attr('data-type')}~${li.attr('data-id')}]`; } - // initialise dropdown dismiss button - function initDismissButton($currentAtWho) { - $currentAtWho.find('.dismiss').off('click') - .on('click', function() { - $(field).atwho('destroy'); - init(); - }); - } - // Generates suggestion dropdown filter function generateFilterMenu(active, res_data) { var menu = ''; - var rep_buttons = ''; $.ajax({ async: false, dataType: 'json', @@ -117,17 +80,6 @@ var SmartAnnotation = (function() { return menu; } - function noResultsTemplate() { - return `
    - <%= I18n.t("atwho.no_results") %> -
    `; - } - - // Generates resources list items - function generateTemplate(map) { - return map.name; - } - function atWhoSettings(at, defaultFilterType) { return { at: at, @@ -138,7 +90,7 @@ var SmartAnnotation = (function() { var params = { query: query }; filterType = FilterTypeEnum[$currentAtWho.find('.tab-pane.active').data('object-type')] if (!filterType) { - callback([{name: noResultsTemplate()}]); + callback([{name: ''}]); return false } @@ -159,15 +111,11 @@ var SmartAnnotation = (function() { } }); }, - sorter: function(query, items, _searchKey) { - // Sorting is already done on server-side - return items; - }, - tplEval: function(_tpl, map) { - return _templateEval(_tpl, map); + tplEval: function(_tpl, items) { + return items.name; }, highlighter: function(li, query) { - //return _matchHighlighter(li, query, true); + return _matchHighlighter(li, query, true); return li; }, beforeInsert: function(value, li) { @@ -258,7 +206,7 @@ var SmartAnnotation = (function() { var res; try { if (map.no_results) { - res = noResultsTemplate(); + res = ''; } else { res = ''; res += '
  • -
  • <%= experiment.name %>
    • -<% end %> -<% if experiments.empty? %> - <%= render partial: 'shared/smart_annotation/no_results.html.erb' %> -<% end %> +
    + <% grouped_by_prj(experiments).each do |experiment_group| %> +
    +
    + <%= experiment_group[:project_name] %> +
    +
    + <% experiment_group[:experiments].each do |experiment| %> +
  • + Exp + <%= experiment.name %> +
    • + <% end %> +
    +
    + <% end %> + <% if experiments.empty? %> + <%= render partial: 'shared/smart_annotation/no_results.html.erb' %> + <% end %> +
    <%= render partial: 'shared/smart_annotation/footer.html.erb' %> diff --git a/app/views/shared/smart_annotation/_my_module_items.html.erb b/app/views/shared/smart_annotation/_my_module_items.html.erb index 107b917f6..816b2321a 100644 --- a/app/views/shared/smart_annotation/_my_module_items.html.erb +++ b/app/views/shared/smart_annotation/_my_module_items.html.erb @@ -1,32 +1,23 @@ -
    +
    <% grouped_by_prj_exp(my_modules).each do |task_group| %> -
    -
    - <% if task_group[:project_archived]%> - <%= t('general.archived') %> - <% end %> - <%= task_group[:project_name] %> +
    +
    + <%= task_group[:project_name] %> / - <% if task_group[:experiment_archived] %> - <%= t('general.archived') %> - <% end %> - <%= task_group[:experiment_name] %> + <%= task_group[:experiment_name] %>
    -
    +
    <% task_group[:tasks].each do |task| %> -
    - <%= draw_custom_icon('task-icon') %> - <% if task.archived %> - <%= t('general.archived') %> - <% end %> -
  • <%= task.name %>
    • -
    +
  • + Tsk + <%= task.name %> +
    • <% end %>
    <% end %> + <% if my_modules.empty? %> + <%= render partial: 'shared/smart_annotation/no_results.html.erb' %> + <% end %>
    -<% if my_modules.empty? %> - <%= render partial: 'shared/smart_annotation/no_results.html.erb' %> -<% end %> <%= render partial: 'shared/smart_annotation/footer.html.erb' %> diff --git a/app/views/shared/smart_annotation/_project_items.html.erb b/app/views/shared/smart_annotation/_project_items.html.erb index c953211c8..19b83369f 100644 --- a/app/views/shared/smart_annotation/_project_items.html.erb +++ b/app/views/shared/smart_annotation/_project_items.html.erb @@ -1,7 +1,12 @@ -<% projects.each do |project| %> -
  • <%= project.name %>
    • -<% end %> -<% if projects.empty? %> - <%= render partial: 'shared/smart_annotation/no_results.html.erb' %> -<% end %> +
    + <% projects.each do |project| %> +
  • + Prj + <%= project.name %> +
    • + <% end %> + <% if projects.empty? %> + <%= render partial: 'shared/smart_annotation/no_results.html.erb' %> + <% end %> +
    <%= render partial: 'shared/smart_annotation/footer.html.erb' %> diff --git a/app/views/shared/smart_annotation/_repository_items.html.erb b/app/views/shared/smart_annotation/_repository_items.html.erb index 719feafb0..390f3ae68 100644 --- a/app/views/shared/smart_annotation/_repository_items.html.erb +++ b/app/views/shared/smart_annotation/_repository_items.html.erb @@ -1,9 +1,12 @@ -<% repository_rows.each do |row| %> -
  • - [<%= row[:repository_tag] %>] <%= row[:name] %> -
    • -<% end %> -<% if repository_rows.empty? %> - <%= render partial: 'shared/smart_annotation/no_results.html.erb' %> -<% end %> +
    + <% repository_rows.each do |row| %> +
  • + <%= row[:repository_tag] %> + <%= row[:name] %> +
    • + <% end %> + <% if repository_rows.empty? %> + <%= render partial: 'shared/smart_annotation/no_results.html.erb' %> + <% end %> +
    <%= render partial: 'shared/smart_annotation/footer.html.erb' %> From eeb8f4a97a4595fcdd73f08b6742054264eae585 Mon Sep 17 00:00:00 2001 From: Mojca Lorber Date: Wed, 9 Sep 2020 14:32:37 +0200 Subject: [PATCH 081/163] Disable 'complete step' button on locked task --- app/assets/stylesheets/steps.scss | 4 ++++ app/views/steps/_step.html.erb | 38 +++++++++++++++---------------- 2 files changed, 22 insertions(+), 20 deletions(-) diff --git a/app/assets/stylesheets/steps.scss b/app/assets/stylesheets/steps.scss index 4bd261b5b..5d06c251c 100644 --- a/app/assets/stylesheets/steps.scss +++ b/app/assets/stylesheets/steps.scss @@ -60,6 +60,10 @@ .complete-step-btn { display: inline-block; + + &.disabled { + pointer-events: none; + } } .step-heading { diff --git a/app/views/steps/_step.html.erb b/app/views/steps/_step.html.erb index c54db9a00..251a8a23e 100644 --- a/app/views/steps/_step.html.erb +++ b/app/views/steps/_step.html.erb @@ -27,26 +27,24 @@
    - <% if can_complete_or_checkbox_step?(@protocol) && !(preview) %> - <% if step.completed? %> -
    - -
    - <% else %> -
    - -
    - <% end %> + <% if step.completed? %> +
    + +
    + <% else %> +
    + +
    <% end %> <% if (can_manage_protocol_in_module?(@protocol) || From 78c9394b1f8303061df58f4d709f1ed48fa7df94 Mon Sep 17 00:00:00 2001 From: Urban Rotnik Date: Wed, 9 Sep 2020 14:33:25 +0200 Subject: [PATCH 082/163] Fix aligment due date and status on canvas card --- app/views/canvas/full_zoom/_my_module.html.erb | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/app/views/canvas/full_zoom/_my_module.html.erb b/app/views/canvas/full_zoom/_my_module.html.erb index af2f9385d..6a4b27cfc 100644 --- a/app/views/canvas/full_zoom/_my_module.html.erb +++ b/app/views/canvas/full_zoom/_my_module.html.erb @@ -29,14 +29,16 @@
    - <% if !my_module.completed? && can_manage_module?(my_module) %> - <%= link_to due_date_my_module_path(my_module, format: :json), remote: true, - class: "due-date-link due-date-refresh" do %> +
    + <% if !my_module.completed? && can_manage_module?(my_module) %> + <%= link_to due_date_my_module_path(my_module, format: :json), remote: true, + class: "due-date-link due-date-refresh" do %> + <%= render partial: "my_modules/card_due_date_label.html.erb", locals: { my_module: my_module, format: :full_date } %> + <% end %> + <% else %> <%= render partial: "my_modules/card_due_date_label.html.erb", locals: { my_module: my_module, format: :full_date } %> <% end %> - <% else %> - <%= render partial: "my_modules/card_due_date_label.html.erb", locals: { my_module: my_module, format: :full_date } %> - <% end %> +
    <%= my_module.my_module_status.name %>
    From d055d6e241687278d1b4fd01c7573ad8d232fad9 Mon Sep 17 00:00:00 2001 From: Mojca Lorber Date: Wed, 9 Sep 2020 14:43:12 +0200 Subject: [PATCH 083/163] Fix quotes again --- .../javascripts/reports/reports_datatable.js.erb | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/app/assets/javascripts/reports/reports_datatable.js.erb b/app/assets/javascripts/reports/reports_datatable.js.erb index b7bf5a208..ec578f0bb 100644 --- a/app/assets/javascripts/reports/reports_datatable.js.erb +++ b/app/assets/javascripts/reports/reports_datatable.js.erb @@ -114,14 +114,14 @@ var editReportButton = $('#edit-report-btn'); var deleteReportsButton = $('#delete-reports-btn'); if (CHECKED_REPORTS.length === 0) { - editReportButton.addClass("disabled hidden"); - deleteReportsButton.addClass("disabled hidden"); + editReportButton.addClass('disabled hidden'); + deleteReportsButton.addClass('disabled hidden'); } else if (CHECKED_REPORTS.length === 1) { - editReportButton.removeClass("disabled hidden"); - deleteReportsButton.removeClass("disabled hidden"); + editReportButton.removeClass('disabled hidden'); + deleteReportsButton.removeClass('disabled hidden'); } else { - editReportButton.removeClass("hidden").addClass("disabled"); - deleteReportsButton.removeClass("disabled hidden"); + editReportButton.removeClass('hidden').addClass('disabled'); + deleteReportsButton.removeClass('disabled hidden'); } } From 18426b90be75edae734fc1d6f91e87d5885c1275 Mon Sep 17 00:00:00 2001 From: aignatov-bio Date: Thu, 10 Sep 2020 13:40:52 +0200 Subject: [PATCH 084/163] Disable button when condition not fullfield --- .../stylesheets/my_modules/status_flow.scss | 13 ++++- app/models/my_module_status.rb | 2 + .../status_flow/_task_flow_button.html.erb | 48 ++++++++++--------- 3 files changed, 39 insertions(+), 24 deletions(-) diff --git a/app/assets/stylesheets/my_modules/status_flow.scss b/app/assets/stylesheets/my_modules/status_flow.scss index 26740cb5e..0d26ea384 100644 --- a/app/assets/stylesheets/my_modules/status_flow.scss +++ b/app/assets/stylesheets/my_modules/status_flow.scss @@ -21,7 +21,7 @@ &.open .dropdown-menu{ align-items: center; display: grid; - grid-template-columns: max-content min-content minmax(0, auto); + grid-template-columns: minmax(0, auto) 12px minmax(0, auto); padding: .5em 0; li { @@ -36,6 +36,14 @@ &:hover > *{ background: $color-concrete; } + + &.disabled { + pointer-events: none; + + .status-name { + background: $color-alto !important; + } + } } .fa-long-arrow-alt-right { @@ -64,7 +72,8 @@ @include font-small; color: $color-silver-chalice; grid-column: span 3; - padding: .5em 1em; + line-height: 1em; + padding: 0em 1em .5em; } #viewTaskFlow { diff --git a/app/models/my_module_status.rb b/app/models/my_module_status.rb index c35506760..4cc745fee 100644 --- a/app/models/my_module_status.rb +++ b/app/models/my_module_status.rb @@ -48,6 +48,8 @@ class MyModuleStatus < ApplicationRecord end def conditions_fulfilled?(my_module) + my_module.errors.clear + my_module_status_conditions.each do |condition| condition.call(my_module) end diff --git a/app/views/my_modules/status_flow/_task_flow_button.html.erb b/app/views/my_modules/status_flow/_task_flow_button.html.erb index 4be942264..2eb509377 100644 --- a/app/views/my_modules/status_flow/_task_flow_button.html.erb +++ b/app/views/my_modules/status_flow/_task_flow_button.html.erb @@ -13,32 +13,36 @@