From 3c58b8473d86f33b7542b6bcf403a3465f0449d1 Mon Sep 17 00:00:00 2001 From: Martin Artnik Date: Tue, 25 Jul 2023 09:56:55 +0200 Subject: [PATCH 01/13] Fix icon in stock consume modal [SCI-8915] --- .../repositories/_consume_stock_modal_content.html.erb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/views/my_modules/repositories/_consume_stock_modal_content.html.erb b/app/views/my_modules/repositories/_consume_stock_modal_content.html.erb index dbd5d7f63..8a2801f38 100644 --- a/app/views/my_modules/repositories/_consume_stock_modal_content.html.erb +++ b/app/views/my_modules/repositories/_consume_stock_modal_content.html.erb @@ -1,5 +1,5 @@ -<%= form_with url: update_consumption_my_module_repository_path(@my_module, @repository, module_row_id: @module_repository_row), - method: :post, +<%= form_with url: update_consumption_my_module_repository_path(@my_module, @repository, module_row_id: @module_repository_row), + method: :post, html: { data: { remote: true } } do |f| %>
- +
<%= t('repository_stock_values.manage_modal.new_stock') %> From 9393f3cc0fd01b7b4f5c955460ca5859272a2099 Mon Sep 17 00:00:00 2001 From: Anton Date: Tue, 25 Jul 2023 11:11:55 +0200 Subject: [PATCH 02/13] Fix navigator console errors [SCI-8890] --- app/javascript/vue/navigation/navigator_item.vue | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/app/javascript/vue/navigation/navigator_item.vue b/app/javascript/vue/navigation/navigator_item.vue index 4b4e1e7c0..d26879934 100644 --- a/app/javascript/vue/navigation/navigator_item.vue +++ b/app/javascript/vue/navigation/navigator_item.vue @@ -63,9 +63,14 @@ export default { }, computed: { hasChildren: function() { - return !this.item.disabled && (this.item.has_children || this.children.length > 0); + if (this.item.disabled) return false; + if (this.item.has_children) return true; + if (this.children && this.children.length > 0) return true; + return false }, sortedMenuItems: function() { + if (!this.children) return []; + return this.children.sort((a, b) => { if (a.name.toLowerCase() < b.name.toLowerCase()) { return -1; From 96be284a9856cc877ade7bed2d720956d5025575 Mon Sep 17 00:00:00 2001 From: Martin Artnik Date: Tue, 25 Jul 2023 11:29:46 +0200 Subject: [PATCH 03/13] Fix oveflowing RTE content [SCI-8916] --- app/assets/stylesheets/my_modules/protocols/index.scss | 1 + app/assets/stylesheets/my_modules/results/index.scss | 4 ++++ app/assets/stylesheets/protocols/protocol.scss | 4 ++++ 3 files changed, 9 insertions(+) diff --git a/app/assets/stylesheets/my_modules/protocols/index.scss b/app/assets/stylesheets/my_modules/protocols/index.scss index 0c14895fa..34f19bf5e 100644 --- a/app/assets/stylesheets/my_modules/protocols/index.scss +++ b/app/assets/stylesheets/my_modules/protocols/index.scss @@ -419,6 +419,7 @@ .task-notes-content { margin-left: 10px; + overflow-x: scroll; .form-group.has-error { border: 1px solid $brand-danger; diff --git a/app/assets/stylesheets/my_modules/results/index.scss b/app/assets/stylesheets/my_modules/results/index.scss index 9168c36aa..693b2db5a 100644 --- a/app/assets/stylesheets/my_modules/results/index.scss +++ b/app/assets/stylesheets/my_modules/results/index.scss @@ -72,6 +72,10 @@ margin-left: 4.25em !important; } + .ql-editor { + overflow-x: scroll; + } + .result-icon { @include font-main; background: $color-concrete; diff --git a/app/assets/stylesheets/protocols/protocol.scss b/app/assets/stylesheets/protocols/protocol.scss index 626662ec2..cb89f2186 100644 --- a/app/assets/stylesheets/protocols/protocol.scss +++ b/app/assets/stylesheets/protocols/protocol.scss @@ -268,6 +268,10 @@ } } +#protocol-description-container { + overflow-x: scroll; +} + .delete-steps-modal { .btn { float: initial; From 7dd7566080b02933dc6a8b16f223ae59b7d881ed Mon Sep 17 00:00:00 2001 From: Martin Artnik Date: Tue, 25 Jul 2023 12:21:35 +0200 Subject: [PATCH 04/13] Fix updating repository checklist to a blank one [SCI-8921] --- .../javascripts/repositories/renderers/columns/checklist.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/assets/javascripts/repositories/renderers/columns/checklist.js b/app/assets/javascripts/repositories/renderers/columns/checklist.js index 58b798d04..98e488faf 100644 --- a/app/assets/javascripts/repositories/renderers/columns/checklist.js +++ b/app/assets/javascripts/repositories/renderers/columns/checklist.js @@ -48,7 +48,8 @@ var ChecklistColumnHelper = (function() { optionClass: 'checkbox-icon', selectAppearance: 'simple', onChange: function() { - $hiddenField.val(JSON.stringify(dropdownSelector.getValues('#' + select))); + let currentValues = dropdownSelector.getValues('#' + select); + $hiddenField.val(currentValues.length ? JSON.stringify(currentValues) : null); } }); } From 026e96652b702e65911d3e0a4ecd783d0e33377d Mon Sep 17 00:00:00 2001 From: Alex Kriuchykhin Date: Tue, 25 Jul 2023 13:37:45 +0200 Subject: [PATCH 05/13] Fix team name escaping in inventories export modal [SCI-8922] (#5859) --- app/assets/javascripts/repositories/index.js | 11 ----------- app/controllers/repositories_controller.rb | 1 + app/services/toolbars/repositories_service.rb | 2 +- .../repositories/_export_repositories_modal.html.erb | 3 ++- 4 files changed, 4 insertions(+), 13 deletions(-) diff --git a/app/assets/javascripts/repositories/index.js b/app/assets/javascripts/repositories/index.js index ef298dda6..354dd74ea 100644 --- a/app/assets/javascripts/repositories/index.js +++ b/app/assets/javascripts/repositories/index.js @@ -162,20 +162,9 @@ }).on('shown.bs.modal', '#export-repositories-modal', function() { if (!CHECKBOX_SELECTOR) return; - const selectedInventoriesCount = CHECKBOX_SELECTOR.selectedRows.length; - const firstDescription = $(this).find('.description-p1'); - const teamName = firstDescription.data('team-name'); const exportButton = $(this).find('#export-repositories-modal-submit'); const exportURL = exportButton.data('export-url'); - firstDescription.html(I18n.t( - 'repositories.index.modal_export.description_p1_html', - { - team_name: teamName, - count: selectedInventoriesCount - } - )); - exportButton.on('click', function() { $.ajax({ url: exportURL, diff --git a/app/controllers/repositories_controller.rb b/app/controllers/repositories_controller.rb index a7f6024d9..2977f1828 100644 --- a/app/controllers/repositories_controller.rb +++ b/app/controllers/repositories_controller.rb @@ -208,6 +208,7 @@ class RepositoriesController < ApplicationController html: render_to_string( partial: 'export_repositories_modal', locals: { team_name: current_team.name, + counter: params[:counter].to_i, export_limit: TeamZipExport.exports_limit, num_of_requests_left: current_user.exports_left - 1 }, formats: :html diff --git a/app/services/toolbars/repositories_service.rb b/app/services/toolbars/repositories_service.rb index 584cd947b..fa88a79dd 100644 --- a/app/services/toolbars/repositories_service.rb +++ b/app/services/toolbars/repositories_service.rb @@ -63,7 +63,7 @@ module Toolbars label: I18n.t('libraries.index.buttons.export'), button_id: 'exportRepoBtn', icon: 'sn-icon sn-icon-export', - path: export_modal_team_repositories_path(@current_team), + path: export_modal_team_repositories_path(@current_team, counter: @repositories.length), type: 'remote-modal' } end diff --git a/app/views/repositories/_export_repositories_modal.html.erb b/app/views/repositories/_export_repositories_modal.html.erb index 62786815a..79a07c7a9 100644 --- a/app/views/repositories/_export_repositories_modal.html.erb +++ b/app/views/repositories/_export_repositories_modal.html.erb @@ -11,7 +11,8 @@

<%= t('repositories.index.modal_export.title') %>

-

+

+ <%= t('repositories.index.modal_export.description_p1_html', team_name: team_name, count: counter) %>

<%= t('repositories.index.modal_export.description_alert') %>

<%= t('repositories.index.modal_export.description_p2') %>

From 8fd46e7932ee13ced99dcac6da420e8cee9b0d16 Mon Sep 17 00:00:00 2001 From: Martin Artnik Date: Tue, 25 Jul 2023 14:24:25 +0200 Subject: [PATCH 06/13] Don't show scrollbars when not needed [SCI-8916] --- app/assets/stylesheets/my_modules/protocols/index.scss | 2 +- app/assets/stylesheets/my_modules/results/index.scss | 2 +- app/assets/stylesheets/protocols/protocol.scss | 2 +- app/assets/stylesheets/steps/components/text.scss | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/assets/stylesheets/my_modules/protocols/index.scss b/app/assets/stylesheets/my_modules/protocols/index.scss index 34f19bf5e..ccdee0028 100644 --- a/app/assets/stylesheets/my_modules/protocols/index.scss +++ b/app/assets/stylesheets/my_modules/protocols/index.scss @@ -419,7 +419,7 @@ .task-notes-content { margin-left: 10px; - overflow-x: scroll; + overflow-x: auto; .form-group.has-error { border: 1px solid $brand-danger; diff --git a/app/assets/stylesheets/my_modules/results/index.scss b/app/assets/stylesheets/my_modules/results/index.scss index 693b2db5a..4a3ab522f 100644 --- a/app/assets/stylesheets/my_modules/results/index.scss +++ b/app/assets/stylesheets/my_modules/results/index.scss @@ -73,7 +73,7 @@ } .ql-editor { - overflow-x: scroll; + overflow-x: auto; } .result-icon { diff --git a/app/assets/stylesheets/protocols/protocol.scss b/app/assets/stylesheets/protocols/protocol.scss index cb89f2186..2d7e68221 100644 --- a/app/assets/stylesheets/protocols/protocol.scss +++ b/app/assets/stylesheets/protocols/protocol.scss @@ -269,7 +269,7 @@ } #protocol-description-container { - overflow-x: scroll; + overflow-x: auto; } .delete-steps-modal { diff --git a/app/assets/stylesheets/steps/components/text.scss b/app/assets/stylesheets/steps/components/text.scss index b79bfa881..2a7edcdbc 100644 --- a/app/assets/stylesheets/steps/components/text.scss +++ b/app/assets/stylesheets/steps/components/text.scss @@ -22,7 +22,7 @@ } .view-text-element { - overflow-x: scroll; + overflow-x: auto; pointer-events: initial; a { From 4858f41b3e631237b93d7199d014e968b2588321 Mon Sep 17 00:00:00 2001 From: Soufiane Date: Tue, 25 Jul 2023 14:35:17 +0200 Subject: [PATCH 07/13] Remove user_team related tests [SCI-8815] (#5860) --- .../users/registrations_controller.rb | 6 -- features/step_definitions/shared_steps.rb | 5 -- features/step_definitions/team_steps.rb | 1 - .../controllers/user_teams_controller_spec.rb | 88 ------------------- spec/factories/user_teams.rb | 17 ---- .../generate_user_assignments_job.rb | 2 - .../propagate_assignment_job_spec.rb | 7 -- spec/models/team_spec.rb | 1 - spec/models/user_spec.rb | 17 ---- spec/models/user_team_spec.rb | 36 -------- spec/models/views/datatables/teams_spec.rb | 1 - .../projects_json_export_controller_spec.rb | 1 - .../api/service/protocols_controller_spec.rb | 1 - .../api/service/steps_controller_spec.rb | 1 - .../api/v1/step_texts_controller_spec.rb | 1 - .../v1/task_assignments_controller_spec.rb | 1 - .../project_json_export_service_spec.rb | 1 - 17 files changed, 187 deletions(-) delete mode 100644 spec/controllers/user_teams_controller_spec.rb delete mode 100644 spec/factories/user_teams.rb delete mode 100644 spec/models/user_team_spec.rb diff --git a/app/controllers/users/registrations_controller.rb b/app/controllers/users/registrations_controller.rb index 2940c8481..69be6c2c8 100644 --- a/app/controllers/users/registrations_controller.rb +++ b/app/controllers/users/registrations_controller.rb @@ -131,9 +131,6 @@ class Users::RegistrationsController < Devise::RegistrationsController @team.created_by = resource # set created_by for oraganization @team.save - # Add this user to the team as owner - UserTeam.create(user: resource, team: @team, role: :admin) - # set current team to new user resource.current_team_id = @team.id resource.save @@ -171,9 +168,6 @@ class Users::RegistrationsController < Devise::RegistrationsController @team.created_by = @user # set created_by for team @team.save! - # Add this user to the team as owner - UserTeam.create(user: @user, team: @team, role: :admin) - # set current team to new user @user.current_team_id = @team.id @user.save! diff --git a/features/step_definitions/shared_steps.rb b/features/step_definitions/shared_steps.rb index cfff97f38..cc0d6d3ac 100644 --- a/features/step_definitions/shared_steps.rb +++ b/features/step_definitions/shared_steps.rb @@ -6,7 +6,6 @@ Given(/^the following users are registered:$/) do |table| team_role = hash.delete 'role' user = FactoryBot.create(:user, hash) team = FactoryBot.create(:team, name: team_name, users: [user]) - UserTeam.where(user: user, team: team).first.update role: team_role User.find_by(email: hash.fetch('email')).confirm end end @@ -87,7 +86,6 @@ end Given(/^Templates project exists for the "([^"]*)" team$/) do |team_name| team = Team.find_by(name: team_name) - user = team.user_teams.where(role: :admin).take.user TemplatesService.new.schedule_creation_for_user(user) end Given(/^I'm on the projects page of "([^"]*)" team$/) do |team_name| @@ -99,9 +97,6 @@ end Given(/^"([^"]*)" is in "([^"]*)" team as a "([^"]*)"$/) do |user_email, team_name, role| team = Team.find_by(name: team_name) user = User.find_by(email: user_email) - FactoryBot.create(:user_team, user: user, - team: team, role: - UserTeam.roles.fetch(role)) end Then(/^I attach a "([^"]*)" file to "([^"]*)" field$/) do |file, field_id| diff --git a/features/step_definitions/team_steps.rb b/features/step_definitions/team_steps.rb index d0e9264f8..4ce1cbf79 100644 --- a/features/step_definitions/team_steps.rb +++ b/features/step_definitions/team_steps.rb @@ -40,7 +40,6 @@ Given('the following users are registered with teams:') do |table| team = Team.find_by(name: row[:team]) team ||= FactoryBot.create(:team, name: row[:team]) user = FactoryBot.create(:user, row.slice('name', 'email')) - FactoryBot.create(:user_team, user: user, team: team, role: row[:role]) end end diff --git a/spec/controllers/user_teams_controller_spec.rb b/spec/controllers/user_teams_controller_spec.rb deleted file mode 100644 index e92587719..000000000 --- a/spec/controllers/user_teams_controller_spec.rb +++ /dev/null @@ -1,88 +0,0 @@ -# frozen_string_literal: true - -require 'rails_helper' - -describe Users::Settings::UserTeamsController, type: :controller do - login_user - - let(:user) { subject.current_user } - let(:team) { create :team, created_by: user } - let!(:user_team) { create :user_team, :admin, user: user, team: team } - let(:another_user) { create :user } - let!(:another_user_team) do - create :user_team, :normal_user, user: another_user, team: team - end - describe 'DELETE destroy' do - let(:params) do - { - id: another_user_team.id - } - end - let(:action) { delete :destroy, params: params, format: :json } - - context 'when inviting existing user not in the team' do - it 'calls create activity for inviting user' do - expect(Activities::CreateActivityService) - .to(receive(:call) - .with(hash_including(activity_type: :remove_user_from_team))) - - action - end - - it 'adds activity in DB' do - expect { action } - .to(change { Activity.count }) - end - - it 'remove user_team record from DB' do - expect { action } - .to(change { UserTeam.count }) - end - end - - context 'when user leaving team by himself' do - it 'calls create activity for user leaving' do - params_leave = { id: another_user_team.id, leave: true } - expect(Activities::CreateActivityService) - .to(receive(:call) - .with(hash_including(activity_type: :user_leave_team))) - - delete :destroy, params: params_leave, format: :json - end - - it 'adds activity in DB' do - params_leave = { id: another_user_team.id, leave: true } - expect { delete :destroy, params: params_leave, format: :json } - .to(change { Activity.count }) - end - end - end - - describe 'PUT update' do - let(:params) do - { - id: another_user_team.id, - user_team: { - role: 'admin' - } - } - end - let(:action) { put :update, params: params, format: :json } - - context 'when updating user role in the team' do - it 'calls create activity for updating role' do - expect(Activities::CreateActivityService) - .to(receive(:call) - .with(hash_including(activity_type: - :change_users_role_on_team))) - - action - end - - it 'adds activity in DB' do - expect { action } - .to(change { Activity.count }) - end - end - end -end diff --git a/spec/factories/user_teams.rb b/spec/factories/user_teams.rb deleted file mode 100644 index bb5b9c3b6..000000000 --- a/spec/factories/user_teams.rb +++ /dev/null @@ -1,17 +0,0 @@ -# frozen_string_literal: true - -FactoryBot.define do - factory :user_team do - user - team - trait :admin do - role { 'admin' } - end - trait :guest do - role { 'guest' } - end - trait :normal_user do # default enum by DB - role { 'normal_user' } - end - end -end diff --git a/spec/jobs/user_assignments/generate_user_assignments_job.rb b/spec/jobs/user_assignments/generate_user_assignments_job.rb index c70c233c7..8a07f1b91 100644 --- a/spec/jobs/user_assignments/generate_user_assignments_job.rb +++ b/spec/jobs/user_assignments/generate_user_assignments_job.rb @@ -14,10 +14,8 @@ module UserAssignments before(:each) do available_roles = [owner_role, viewer_role, technician_role] - create :user_team, :admin, user: user_two, team: team create :user_assignment, user: user_two, assignable: project, user_role: viewer_role, assigned_by: user_one - create :user_team, :admin, user: user_three, team: team create :user_assignment, user: user_three, assignable: project, user_role: technician_role, assigned_by: user_one end diff --git a/spec/jobs/user_assignments/propagate_assignment_job_spec.rb b/spec/jobs/user_assignments/propagate_assignment_job_spec.rb index 5d260313d..5b654f2ed 100644 --- a/spec/jobs/user_assignments/propagate_assignment_job_spec.rb +++ b/spec/jobs/user_assignments/propagate_assignment_job_spec.rb @@ -16,13 +16,6 @@ module UserAssignments let!(:my_module_one) { create :my_module, experiment: experiment_one, created_by: experiment_one.created_by } let!(:my_module_two) { create :my_module, experiment: experiment_two, created_by: experiment_two.created_by } - - before do - [user_one, user_two].each do |user| - create :user_team, :admin, user: user, team: team - end - end - describe 'perform' do it 'propagates the user assignments to project child object' do expect { diff --git a/spec/models/team_spec.rb b/spec/models/team_spec.rb index 829edd752..3184b9f81 100644 --- a/spec/models/team_spec.rb +++ b/spec/models/team_spec.rb @@ -26,7 +26,6 @@ describe Team, type: :model do describe 'Relations' do it { should belong_to(:created_by).class_name('User').optional } it { should belong_to(:last_modified_by).class_name('User').optional } - it { should have_many :user_teams } it { should have_many :users } it { should have_many :projects } it { should have_many :protocols } diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb index 18fc48490..461e24c60 100644 --- a/spec/models/user_spec.rb +++ b/spec/models/user_spec.rb @@ -46,7 +46,6 @@ describe User, type: :model do end describe 'Relations' do - it { should have_many :user_teams } it { should have_many :teams } it { should have_many :user_projects } it { should have_many :projects } @@ -85,7 +84,6 @@ describe User, type: :model do it { should have_many :tokens } it { should have_many :modified_tags } it { should have_many :assigned_user_my_modules } - it { should have_many :assigned_user_teams } it { should have_many :assigned_user_projects } it { should have_many :added_protocols } it { should have_many :archived_protocols } @@ -149,21 +147,6 @@ describe User, type: :model do end end - describe 'teams_data should return a list of teams' do - # needs persistence because is testing a sql query - let(:team) { create :team } - let(:user_one) do - create :user, email: 'user1@asdf.com', current_team_id: team.id - end - let(:user_two) { create :user, email: 'user2@asdf.com' } - - it 'should return correct number of team members' do - create :user_team, team: team, user: user_one - create :user_team, team: team, user: user_two - expect(user_one.datatables_teams.first.members).to eq 2 - end - end - describe 'user settings' do it { is_expected.to respond_to(:time_zone) } it { is_expected.to respond_to(:assignments_notification) } diff --git a/spec/models/user_team_spec.rb b/spec/models/user_team_spec.rb deleted file mode 100644 index 18fa61ead..000000000 --- a/spec/models/user_team_spec.rb +++ /dev/null @@ -1,36 +0,0 @@ -# frozen_string_literal: true - -require 'rails_helper' - -describe UserTeam, type: :model do - let(:user_team) { build :user_team } - - it 'is valid' do - expect(user_team).to be_valid - end - - it 'should be of class UserTeam' do - expect(subject.class).to eq UserTeam - end - - describe 'Database table' do - it { should have_db_column :role } - it { should have_db_column :user_id } - it { should have_db_column :team_id } - it { should have_db_column :created_at } - it { should have_db_column :updated_at } - it { should have_db_column :assigned_by_id } - end - - describe 'Relations' do - it { should belong_to :user } - it { should belong_to :team } - it { should belong_to(:assigned_by).class_name('User').optional } - end - - describe 'Validations' do - it { should validate_presence_of :role } - it { should validate_presence_of :user } - it { should validate_presence_of :team } - end -end diff --git a/spec/models/views/datatables/teams_spec.rb b/spec/models/views/datatables/teams_spec.rb index 0e6fabdde..e51fc2610 100644 --- a/spec/models/views/datatables/teams_spec.rb +++ b/spec/models/views/datatables/teams_spec.rb @@ -8,7 +8,6 @@ RSpec.describe Views::Datatables::DatatablesTeam, type: :model do it { should have_db_column :name } it { should have_db_column :members } it { should have_db_column :role } - it { should have_db_column :user_team_id } it { should have_db_column :user_id } it { should have_db_column :can_be_left } end diff --git a/spec/requests/api/service/projects_json_export_controller_spec.rb b/spec/requests/api/service/projects_json_export_controller_spec.rb index 61a69e042..24ee86ca0 100644 --- a/spec/requests/api/service/projects_json_export_controller_spec.rb +++ b/spec/requests/api/service/projects_json_export_controller_spec.rb @@ -6,7 +6,6 @@ RSpec.describe "Api::Service::ProjectsJsonExportController", type: :request do before :all do @user = create(:user) @team = create(:team, created_by: @user) - create(:user_team, user: @user, team: @team, role: 1) @accessible_project = create(:project, name: Faker::Name.unique.name, created_by: @user, team: @team) @accessible_experiment = create(:experiment, created_by: @user, diff --git a/spec/requests/api/service/protocols_controller_spec.rb b/spec/requests/api/service/protocols_controller_spec.rb index a9bd8cd37..27d93dbcf 100644 --- a/spec/requests/api/service/protocols_controller_spec.rb +++ b/spec/requests/api/service/protocols_controller_spec.rb @@ -6,7 +6,6 @@ RSpec.describe "Api::Service::ProtocolsController", type: :request do before :all do @user = create(:user) @team = create(:team, created_by: @user) - create(:user_team, user: @user, team: @team, role: 2) @project = create(:project, name: Faker::Name.unique.name, created_by: @user, team: @team) @experiment = create(:experiment, created_by: @user, last_modified_by: @user, project: @project, created_by: @user) diff --git a/spec/requests/api/service/steps_controller_spec.rb b/spec/requests/api/service/steps_controller_spec.rb index 112866962..d1cc5332e 100644 --- a/spec/requests/api/service/steps_controller_spec.rb +++ b/spec/requests/api/service/steps_controller_spec.rb @@ -6,7 +6,6 @@ RSpec.describe "Api::Service::StepsController", type: :request do before :all do @user = create(:user) @team = create(:team, created_by: @user) - create(:user_team, user: @user, team: @team, role: 2) @project = create(:project, name: Faker::Name.unique.name, created_by: @user, team: @team) @experiment = create(:experiment, created_by: @user, last_modified_by: @user, project: @project, created_by: @user) diff --git a/spec/requests/api/v1/step_texts_controller_spec.rb b/spec/requests/api/v1/step_texts_controller_spec.rb index c43989c1c..d37d7480f 100644 --- a/spec/requests/api/v1/step_texts_controller_spec.rb +++ b/spec/requests/api/v1/step_texts_controller_spec.rb @@ -11,7 +11,6 @@ RSpec.describe 'Api::V1::StepTextsController', type: :request do @task = @experiment.my_modules.first @protocol = create(:protocol, my_module: @task) @step = create(:step, protocol: @protocol) - create(:user_team, user: @user, team: @team) @valid_headers = { 'Authorization': 'Bearer ' + generate_token(@user.id), diff --git a/spec/requests/api/v1/task_assignments_controller_spec.rb b/spec/requests/api/v1/task_assignments_controller_spec.rb index 65f46f32b..6c34cbb7e 100644 --- a/spec/requests/api/v1/task_assignments_controller_spec.rb +++ b/spec/requests/api/v1/task_assignments_controller_spec.rb @@ -7,7 +7,6 @@ RSpec.describe 'Api::V1::TaskAssignmentsController', type: :request do @user = create(:user) @user_second = create(:user) @team = create(:team, created_by: @user) - create(:user_team, user: @user, team: @team, role: 1) @owner_role = UserRole.find_by(name: I18n.t('user_roles.predefined.owner')) @project = create(:project, name: Faker::Name.unique.name, created_by: @user, team: @team) diff --git a/spec/services/project_json_export_service_spec.rb b/spec/services/project_json_export_service_spec.rb index f1cf88998..91f035cf3 100644 --- a/spec/services/project_json_export_service_spec.rb +++ b/spec/services/project_json_export_service_spec.rb @@ -4,7 +4,6 @@ describe ProjectsJsonExportService do before :all do @user = create(:user) @team = create(:team, created_by: @user) - create(:user_team, user: @user, team: @team, role: 1) @accessible_project_1 = create(:project, name: Faker::Name.unique.name, created_by: @user, team: @team) @accessible_project_2 = create(:project, name: Faker::Name.unique.name, created_by: @user, team: @team) From fa5cad935fda829f6686547dd508b86653accddb Mon Sep 17 00:00:00 2001 From: Martin Artnik Date: Tue, 25 Jul 2023 14:36:57 +0200 Subject: [PATCH 08/13] Highlight code after saving result [SCI-8926] --- app/assets/javascripts/results/result_texts.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/assets/javascripts/results/result_texts.js b/app/assets/javascripts/results/result_texts.js index 38ac50000..b400c6620 100644 --- a/app/assets/javascripts/results/result_texts.js +++ b/app/assets/javascripts/results/result_texts.js @@ -1,4 +1,4 @@ -/* global TinyMCE Results Comments animateSpinner initFormSubmitLinks */ +/* global TinyMCE Results Comments animateSpinner initFormSubmitLinks Prism */ (function() { 'use strict'; @@ -82,6 +82,7 @@ TinyMCE.destroyAll(); Comments.init(); initNewReslutText(); + Prism.highlightAllUnder(newResult.get(0)); }); $form.on('ajax:error', function(e, xhr) { var data = xhr.responseJSON; From d840d2ab054620248d6527ef41dca79670719374 Mon Sep 17 00:00:00 2001 From: Giga Chubinidze Date: Wed, 26 Jul 2023 02:32:10 +0400 Subject: [PATCH 09/13] CSS: Inventory columns with dropdowns on smaller screens [SCI-8923] --- app/assets/stylesheets/repositories.scss | 2 +- app/assets/stylesheets/repository/repository_toolbar.scss | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/app/assets/stylesheets/repositories.scss b/app/assets/stylesheets/repositories.scss index 5a9e7a10e..a259483e6 100644 --- a/app/assets/stylesheets/repositories.scss +++ b/app/assets/stylesheets/repositories.scss @@ -445,7 +445,7 @@ background: $color-white; color: $color-silver-chalice; display: none; - z-index: 1000; + z-index: 1; .repository-save-changes-link { cursor: pointer; diff --git a/app/assets/stylesheets/repository/repository_toolbar.scss b/app/assets/stylesheets/repository/repository_toolbar.scss index cc3b500fa..52d9e871b 100644 --- a/app/assets/stylesheets/repository/repository_toolbar.scss +++ b/app/assets/stylesheets/repository/repository_toolbar.scss @@ -9,7 +9,6 @@ height: 3.5rem; justify-content: space-between; padding-bottom: 1rem; - z-index: 99; .view-switch, From ca503401fe6a0f9f13665d21eed03cc2d57ce45a Mon Sep 17 00:00:00 2001 From: Martin Artnik Date: Wed, 26 Jul 2023 16:05:03 +0200 Subject: [PATCH 10/13] Fix loading of column order if no sizes are present [SCI-8934] --- app/assets/javascripts/repositories/repository_datatable.js | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/app/assets/javascripts/repositories/repository_datatable.js b/app/assets/javascripts/repositories/repository_datatable.js index 42ec8b9ac..0b5a17802 100644 --- a/app/assets/javascripts/repositories/repository_datatable.js +++ b/app/assets/javascripts/repositories/repository_datatable.js @@ -565,7 +565,7 @@ var RepositoryDatatable = (function(global) { saveState(state); }, stateLoadCallback: (state) => { - if (!TABLE.ColSizes) return; + if (!TABLE.ColSizes || TABLE.ColSizes.length === 0) return; let colSizes = TABLE.ColSizes; @@ -754,8 +754,6 @@ var RepositoryDatatable = (function(global) { }); }, stateSaveCallback: function(_, data) { - if (Object.keys(colSizeMap).length === 0) return true; - let colSizes = []; for (let i = 0; i < data.ColReorder.length; i += 1) { From 51e72307ccb8d57d3dd5c0aef0ae8e0d089a938f Mon Sep 17 00:00:00 2001 From: Giga Chubinidze Date: Thu, 27 Jul 2023 00:38:11 +0400 Subject: [PATCH 11/13] CSS: Calendars header fix [SCI-8933] --- app/assets/stylesheets/shared/datetime_picker.scss | 4 ---- 1 file changed, 4 deletions(-) diff --git a/app/assets/stylesheets/shared/datetime_picker.scss b/app/assets/stylesheets/shared/datetime_picker.scss index 42196dc44..88d52ba74 100644 --- a/app/assets/stylesheets/shared/datetime_picker.scss +++ b/app/assets/stylesheets/shared/datetime_picker.scss @@ -9,10 +9,6 @@ font-size: 13px; } - .datepicker thead th { - padding: 8px 6px !important; - } - .timepicker-picker { padding: 0 60px; From 51e983af3e9da0b2d9e85431c441097743728b1e Mon Sep 17 00:00:00 2001 From: artoscinote <85488244+artoscinote@users.noreply.github.com> Date: Thu, 27 Jul 2023 10:46:08 +0200 Subject: [PATCH 12/13] Bump version to 1.28.0 --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 3bae5204b..cfc730712 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.27.3 +1.28.0 From be87b80b3e4a8dbdab19ae7108b911d878bee679 Mon Sep 17 00:00:00 2001 From: Soufiane Date: Fri, 28 Jul 2023 15:31:53 +0200 Subject: [PATCH 13/13] Whitelist Recaptcha in CSP [SCI-8941] (#5884) --- config/initializers/extends.rb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/config/initializers/extends.rb b/config/initializers/extends.rb index ce4f89aca..42d4b14d6 100644 --- a/config/initializers/extends.rb +++ b/config/initializers/extends.rb @@ -556,6 +556,8 @@ class Extends newrelic.com *.newrelic.com *.nr-data.net + www.recaptcha.net/ + www.gstatic.com/recaptcha/ ) end