- <%= bootstrap_form_for [@project, @up], remote: true, format: :json, html: { class: 'add-user-form' } do |f| %>
+ <%= bootstrap_form_for [@project, @new_user_project], remote: true, format: :json, html: { class: 'add-user-form' } do |f| %>
<%= hidden_field_tag :project_id, @project.id %>
<%= collection_select(:user_project, :user_id, @unassigned_users, :id, :full_name, {}, { class: 'selectpicker' }) %>
diff --git a/app/views/users/settings/teams/show.html.erb b/app/views/users/settings/teams/show.html.erb
index 9b3e4cb10..4893123ed 100644
--- a/app/views/users/settings/teams/show.html.erb
+++ b/app/views/users/settings/teams/show.html.erb
@@ -44,7 +44,9 @@
<%= t("users.settings.teams.edit.header_created_by") %>
- <%= t("users.settings.teams.edit.header_created_by_name_email", name: team_created_by(@team).name, email: team_created_by(@team).email) %>
+
+ <%= t('users.settings.teams.edit.header_created_by_name_email', name: @team.created_by.full_name, email: @team.created_by.email) if @team.created_by %>
+
diff --git a/config/initializers/constants.rb b/config/initializers/constants.rb
index 8dd6687e6..30a4a4cfb 100644
--- a/config/initializers/constants.rb
+++ b/config/initializers/constants.rb
@@ -318,7 +318,7 @@ class Constants
WHITELISTED_ATTRIBUTES = [
'href', 'src', 'width', 'height', 'alt', 'cite', 'datetime', 'title',
- 'class', 'name', 'xml:lang', 'abbr', 'style', 'target', :data, 'border'
+ 'class', 'name', 'xml:lang', 'abbr', 'style', 'target', :data, 'border', 'contenteditable'
].freeze
WHITELISTED_CSS_ATTRIBUTES = {
diff --git a/config/routes.rb b/config/routes.rb
index 140ddf079..51f2e4426 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -637,8 +637,7 @@ Rails.application.routes.draw do
if Rails.configuration.x.core_api_v1_enabled
namespace :v1 do
resources :teams, only: %i(index show) do
- resources :inventories,
- only: %i(index create show update destroy) do
+ resources :inventories, only: %i(index create show update destroy) do
resources :inventory_columns,
only: %i(index create show update destroy),
path: 'columns',
@@ -667,13 +666,10 @@ Rails.application.routes.draw do
end
end
resources :projects, only: %i(index show create update) do
- resources :user_projects, only: %i(index show),
- path: 'users', as: :users
- resources :project_comments, only: %i(index show),
- path: 'comments', as: :comments
+ resources :user_projects, only: %i(index show create update destroy), path: 'users', as: :users
+ resources :project_comments, only: %i(index show), path: 'comments', as: :comments
get 'activities', to: 'projects#activities'
- resources :reports, only: %i(index show),
- path: 'reports', as: :reports
+ resources :reports, only: %i(index show), path: 'reports', as: :reports
resources :experiments, only: %i(index show create update) do
resources :task_groups, only: %i(index show)
resources :connections, only: %i(index show)
@@ -688,12 +684,15 @@ Rails.application.routes.draw do
path: 'tags',
as: :tags
resources :protocols, only: %i(index show) do
- resources :steps do
+ resources :steps, only: %i(index show create update destroy) do
resources :assets, only: %i(index show create), path: 'attachments'
- resources :checklists, path: 'checklists' do
- resources :checklist_items, as: :items, path: 'items'
+ resources :checklists, only: %i(index show create update destroy), path: 'checklists' do
+ resources :checklist_items,
+ only: %i(index show create update destroy),
+ as: :items,
+ path: 'items'
end
- resources :tables, path: 'tables'
+ resources :tables, only: %i(index show create update destroy), path: 'tables'
end
end
resources :results, only: %i(index create show update)
diff --git a/package.json b/package.json
index 29c6a78c9..f6156a50d 100644
--- a/package.json
+++ b/package.json
@@ -51,6 +51,7 @@
"@babel/preset-env": "^7.0.0",
"@babel/preset-react": "^7.0.0",
"@fortawesome/fontawesome-free": "^5.2.0",
+ "@joeattardi/emoji-button": "^2.5.4",
"@rails/webpacker": "^4.0.7",
"autoprefixer": "^7.2.6",
"axios": "0.18.1",
@@ -62,7 +63,6 @@
"compression-webpack-plugin": "^1.1.11",
"croppie": "^2.6.4",
"css-loader": "2.1.1",
- "@joeattardi/emoji-button": "^2.5.4",
"extract-text-webpack-plugin": "^3.0.2",
"fabric": "1.6.7",
"file-loader": "^4.0.0",
@@ -110,6 +110,7 @@
"tui-color-picker": "^2.2.0",
"tui-image-editor": "git://github.com/biosistemika/tui.image-editor",
"twemoji": "^12.1.4",
+ "typeface-lato": "^0.0.75",
"webpack": "^4.35.2",
"webpack-cli": "^3.3.5",
"webpack-manifest-plugin": "^1.3.2",
diff --git a/spec/requests/api/v1/user_projects_controller_spec.rb b/spec/requests/api/v1/user_projects_controller_spec.rb
new file mode 100644
index 000000000..48448facb
--- /dev/null
+++ b/spec/requests/api/v1/user_projects_controller_spec.rb
@@ -0,0 +1,273 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+RSpec.describe "Api::V1::UserProjectsController", type: :request do
+ before :all do
+ @user = create(:user)
+ @another_user = create(:user)
+ @team = create(:team, created_by: @user)
+ create(:user_team, user: @user, team: @team, role: :normal_user)
+ create(:user_team, user: @another_user, team: @team, role: :normal_user)
+ @own_project = create(:project, name: Faker::Name.unique.name, created_by: @user, team: @team)
+ @invalid_project =
+ create(:project, name: Faker::Name.unique.name, created_by: @another_user, team: @team, visibility: :hidden)
+ create(:user_project, role: :owner, user: @user, project: @own_project)
+
+ @valid_headers = { 'Authorization': 'Bearer ' + generate_token(@user.id) }
+ end
+
+ describe 'GET user_projects, #index' do
+ it 'Response with correct user project roles' do
+ hash_body = nil
+ get api_v1_team_project_users_path(team_id: @team.id, project_id: @own_project.id),
+ headers: @valid_headers
+ expect { hash_body = json }.not_to raise_exception
+ expect(hash_body[:data]).to match(
+ ActiveModelSerializers::SerializableResource
+ .new(@own_project.user_projects, each_serializer: Api::V1::UserProjectSerializer)
+ .as_json[:data]
+ )
+ end
+
+ it 'When invalid request, user in not an owner of the project' do
+ hash_body = nil
+ get api_v1_team_project_users_path(team_id: @team.id, project_id: @invalid_project.id),
+ headers: @valid_headers
+ expect(response).to have_http_status(403)
+ expect { hash_body = json }.not_to raise_exception
+ expect(hash_body['errors'][0]).to include('status': 403)
+ end
+
+ it 'When invalid request, non existing project' do
+ hash_body = nil
+ get api_v1_team_project_users_path(team_id: @team.id, project_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
+
+ describe 'GET user_project, #show' do
+ it 'When valid request, user can read project users' do
+ hash_body = nil
+ get api_v1_team_project_user_path(
+ team_id: @team.id, project_id: @own_project.id, id: @own_project.user_projects.first.id
+ ), headers: @valid_headers
+ expect { hash_body = json }.not_to raise_exception
+ expect(hash_body[:data]).to match(
+ ActiveModelSerializers::SerializableResource
+ .new(@own_project.user_projects.first, serializer: Api::V1::UserProjectSerializer)
+ .as_json[:data]
+ )
+ end
+
+ it 'When invalid request, user in not member of the project' do
+ hash_body = nil
+ get api_v1_team_project_user_path(
+ team_id: @team.id, project_id: @invalid_project.id, id: -1
+ ), headers: @valid_headers
+ expect(response).to have_http_status(403)
+ expect { hash_body = json }.not_to raise_exception
+ expect(hash_body['errors'][0]).to include('status': 403)
+ end
+
+ it 'When invalid request, non existing project' do
+ hash_body = nil
+ get api_v1_team_project_user_path(team_id: @team.id, project_id: -1, 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
+
+ describe 'POST user_project, #create' do
+ before :all do
+ @valid_headers['Content-Type'] = 'application/json'
+ end
+
+ let(:action) do
+ post(api_v1_team_project_users_path(team_id: @team.id, project_id: @own_project.id),
+ params: request_body.to_json, headers: @valid_headers)
+ end
+
+ context 'when has valid params' do
+ let(:request_body) do
+ {
+ data: {
+ type: 'user_projects',
+ attributes: {
+ user_id: @another_user.id,
+ role: 'normal_user'
+ }
+ }
+ }
+ end
+
+ it 'creates new user_project' do
+ expect { action }.to change { UserProject.count }.by(1)
+ end
+
+ it 'returns status 201' do
+ action
+
+ expect(response).to have_http_status 201
+ end
+
+ it 'returns well formated response' do
+ action
+
+ expect(json).to match(
+ hash_including(
+ data: hash_including(
+ type: 'user_projects',
+ attributes: hash_including(role: 'normal_user'),
+ relationships: hash_including(user: hash_including(data: hash_including(id: @another_user.id.to_s)))
+ )
+ )
+ )
+ end
+ end
+
+ context 'when has missing param' do
+ let(:request_body) do
+ {
+ data: {
+ type: 'user_projects',
+ attributes: {}
+ }
+ }
+ end
+
+ it 'renders 400' do
+ action
+
+ expect(response).to have_http_status(400)
+ end
+ end
+
+ context 'when user is not an owner of the project' do
+ let(:request_body) do
+ {
+ data: {
+ type: 'user_projects',
+ attributes: {
+ user_id: @another_user.id,
+ role: 'normal_user'
+ }
+ }
+ }
+ end
+
+ it 'renders 403' do
+ post(
+ api_v1_team_project_users_path(
+ team_id: @invalid_project.team.id,
+ project_id: @invalid_project.id
+ ),
+ params: request_body.to_json,
+ headers: @valid_headers
+ )
+
+ expect(response).to have_http_status(403)
+ end
+ end
+ end
+
+ describe 'PATCH user_project, #update' do
+ before :all do
+ @valid_headers['Content-Type'] = 'application/json'
+ @user_project = create(:user_project, role: :normal_user, user: @another_user, project: @own_project)
+ end
+
+ let(:action) do
+ patch(
+ api_v1_team_project_user_path(
+ team_id: @own_project.team.id,
+ project_id: @own_project.id,
+ id: @user_project.id
+ ),
+ params: request_body.to_json,
+ headers: @valid_headers
+ )
+ end
+
+ context 'when has valid params' do
+ let(:request_body) do
+ {
+ data: {
+ type: 'user_projects',
+ attributes: {
+ role: :technician
+ }
+ }
+ }
+ end
+
+ it 'returns status 200' do
+ action
+
+ expect(response).to have_http_status 200
+ end
+
+ it 'returns well formated response' do
+ action
+
+ expect(json).to match(
+ hash_including(
+ data: hash_including(
+ type: 'user_projects',
+ attributes: hash_including(role: 'technician')
+ )
+ )
+ )
+ end
+ end
+
+ context 'when has missing param' do
+ let(:request_body) do
+ {
+ data: {
+ type: 'user_projects',
+ attributes: {
+ }
+ }
+ }
+ end
+
+ it 'renders 400' do
+ action
+
+ expect(response).to have_http_status(400)
+ end
+ end
+
+ context 'when user is not an owner of the project' do
+ let(:request_body) do
+ {
+ data: {
+ type: 'user_projects',
+ attributes: {
+ role: :technician
+ }
+ }
+ }
+ end
+
+ it 'renders 403' do
+ user_project = create(:user_project, role: :normal_user, user: @another_user, project: @invalid_project)
+ patch(
+ api_v1_team_project_user_path(
+ team_id: @invalid_project.team.id,
+ project_id: @invalid_project.id,
+ id: user_project.id
+ ),
+ params: request_body.to_json,
+ headers: @valid_headers
+ )
+
+ expect(response).to have_http_status(403)
+ end
+ end
+ end
+end
diff --git a/yarn.lock b/yarn.lock
index 597c7d1b3..efcafef82 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"
@@ -9768,6 +9766,11 @@ typedarray@^0.0.6:
resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
integrity sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=
+typeface-lato@^0.0.75:
+ version "0.0.75"
+ resolved "https://registry.yarnpkg.com/typeface-lato/-/typeface-lato-0.0.75.tgz#8aa11c5611dc38416837c089b265a2abd1f7dd31"
+ integrity sha512-iA5uJD4PSTyIE4BDiSOexQeXkDkiJuX4Hu3wh3saJ06EB2TvJayab1Lbbmqq2je/LQv7KCQZHZmC0k4hedd8sw==
+
typescript-eslint-parser@^16.0.0:
version "16.0.1"
resolved "https://registry.yarnpkg.com/typescript-eslint-parser/-/typescript-eslint-parser-16.0.1.tgz#b40681c7043b222b9772748b700a000b241c031b"