scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-12-27 02:04:33 +08:00
Code Issues Projects Releases Packages Wiki Activity

Refactor repository column base controller

Browse source
This commit is contained in:
Mojca Lorber 2020-05-28 12:18:46 +02:00
parent c673e27109
commit 285280827a
17 changed files with 36 additions and 147 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/controllers/repository_columns/asset_columns_controller.rb
View file

@ -1,7 +1,7 @@
# frozen_string_literal: true
module RepositoryColumns
class AssetColumnsController < BaseColumnsController
class AssetColumnsController < RepositoryColumnsController
include InputSanitizeHelper
before_action :load_column, only: :update
before_action :check_create_permissions, only: :create

28
app/controllers/repository_columns/base_columns_controller.rb
View file

@ -1,28 +0,0 @@
# frozen_string_literal: true
module RepositoryColumns
class BaseColumnsController < ApplicationController
include InputSanitizeHelper
before_action :load_repository
private
def load_repository
@repository = Repository.accessible_by_teams(current_team).find_by(id: params[:repository_id])
render_404 unless @repository
end
def load_column
@repository_column = @repository.repository_columns.find_by(id: params[:id])
render_404 unless @repository_column
end
def check_create_permissions
render_403 unless can_create_repository_columns?(@repository)
end
def check_manage_permissions
render_403 unless can_manage_repository_column?(@repository_column)
end
end
end

2
app/controllers/repository_columns/checklist_columns_controller.rb
View file

@ -1,7 +1,7 @@
# frozen_string_literal: true
module RepositoryColumns
class ChecklistColumnsController < BaseColumnsController
class ChecklistColumnsController < RepositoryColumnsController
before_action :load_column, only: %i(update items)
before_action :check_create_permissions, only: :create
before_action :check_manage_permissions, only: :update

2
app/controllers/repository_columns/date_time_columns_controller.rb
View file

@ -1,7 +1,7 @@
# frozen_string_literal: true
module RepositoryColumns
class DateTimeColumnsController < BaseColumnsController
class DateTimeColumnsController < RepositoryColumnsController
include InputSanitizeHelper
before_action :load_column, only: :update
before_action :check_create_permissions, only: :create

2
app/controllers/repository_columns/list_columns_controller.rb
View file

@ -1,7 +1,7 @@
# frozen_string_literal: true
module RepositoryColumns
class ListColumnsController < BaseColumnsController
class ListColumnsController < RepositoryColumnsController
before_action :load_column, only: %i(update items)
before_action :check_create_permissions, only: :create
before_action :check_manage_permissions, only: :update

2
app/controllers/repository_columns/number_columns_controller.rb
View file

@ -1,7 +1,7 @@
# frozen_string_literal: true
module RepositoryColumns
class NumberColumnsController < BaseColumnsController
class NumberColumnsController < RepositoryColumnsController
include InputSanitizeHelper
before_action :load_column, only: :update
before_action :check_create_permissions, only: :create

2
app/controllers/repository_columns/status_columns_controller.rb
View file

@ -1,7 +1,7 @@
# frozen_string_literal: true
module RepositoryColumns
class StatusColumnsController < BaseColumnsController
class StatusColumnsController < RepositoryColumnsController
include InputSanitizeHelper
before_action :load_column, only: %i(update items)
before_action :check_create_permissions, only: :create

2
app/controllers/repository_columns/text_columns_controller.rb
View file

@ -1,7 +1,7 @@
# frozen_string_literal: true
module RepositoryColumns
class TextColumnsController < BaseColumnsController
class TextColumnsController < RepositoryColumnsController
include InputSanitizeHelper
before_action :load_column, only: :update
before_action :check_create_permissions, only: :create

41
app/controllers/repository_columns_controller.rb
View file

@ -2,18 +2,13 @@ class RepositoryColumnsController < ApplicationController
include InputSanitizeHelper
include RepositoryColumnsHelper
ACTIONS = %i(
create index_html create_html available_asset_type_columns available_columns
).freeze
before_action :load_vars,
except: ACTIONS
before_action :load_vars_nested,
only: ACTIONS
before_action :check_manage_permissions,
except: ACTIONS
before_action :load_repository
before_action :load_column, only: %i(edit destroy_html destroy)
before_action :check_create_permissions, only: :new
before_action :check_manage_permissions, only: %i(edit destroy_html destroy)
before_action :load_asset_type_columns, only: :available_asset_type_columns
def index_html
def index
render json: {
id: @repository.id,
html: render_to_string(
@ -22,7 +17,7 @@ class RepositoryColumnsController < ApplicationController
}
end
def create_html
def new
@repository_column = RepositoryColumn.new
respond_to do |format|
format.json do
@ -35,8 +30,12 @@ class RepositoryColumnsController < ApplicationController
end
end
def edit_html
render json: { html: render_to_string(partial: 'repository_columns/manage_column_modal_content.html.erb') }
def edit
render json: {
html: render_to_string(
partial: 'repository_columns/manage_column_modal_content.html.erb'
)
}
end
def destroy_html
@ -96,16 +95,14 @@ class RepositoryColumnsController < ApplicationController
include StringUtility
AvailableRepositoryColumn = Struct.new(:id, :name)
def load_vars
@repository = Repository.accessible_by_teams(current_team).find_by_id(params[:repository_id])
def load_repository
@repository = Repository.accessible_by_teams(current_team).find_by(id: params[:repository_id])
render_404 unless @repository
@repository_column = @repository.repository_columns.find_by_id(params[:id])
render_404 unless @repository_column
end
def load_vars_nested
@repository = Repository.accessible_by_teams(current_team).find_by_id(params[:repository_id])
render_404 unless @repository
def load_column
@repository_column = @repository.repository_columns.find_by(id: params[:id])
render_404 unless @repository_column
end
def load_asset_type_columns
@ -113,6 +110,10 @@ class RepositoryColumnsController < ApplicationController
@asset_columns = load_asset_columns(search_params[:q])
end
def check_create_permissions
render_403 unless can_create_repository_columns?(@repository)
end
def check_manage_permissions
render_403 unless can_manage_repository_column?(@repository_column)
end

2
app/views/my_modules/repository.html.erb
View file

@ -19,7 +19,7 @@
<div class="repo-datatables-buttons pull-right" style="display: inline;">
<button class="btn btn-secondary manage-repo-column-index"
data-modal-url="<%= repository_columns_index_html_path(@repository) %>"
data-modal-url="<%= repository_repository_columns_path(@repository) %>"
data-action="new">
<span class="fas fa-wrench"></span>&nbsp;<%= t('repositories.index.columns') %>
</button>

2
app/views/repositories/_repository_table.html.erb
View file

@ -39,7 +39,7 @@
class="repository-column"
id="<%= column.id %>"
data-type="<%= column.data_type %>"
data-edit-column-url="<%= repository_columns_edit_html_path(repository, column) %>"
data-edit-column-url="<%= edit_repository_repository_column_path(repository, column) %>"
data-destroy-column-url="<%= repository_columns_destroy_html_path(repository, column) %>"
data-editable-row="<%= can_manage_repository_column?(column) %>"
<% column.metadata.each do |k, v| %>

2
app/views/repositories/show.html.erb
View file

@ -45,7 +45,7 @@
</div>
<button class="btn btn-secondary manage-repo-column-index"
data-modal-url="<%= repository_columns_index_html_path(@repository) %>"
data-modal-url="<%= repository_repository_columns_path(@repository) %>"
data-action="new">
<span class="fas fa-wrench"></span>&nbsp;<%= t('repositories.index.columns') %>
</button>

4
app/views/repository_columns/_delete_column_modal_body.html.erb
View file

@ -1,7 +1,7 @@
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
<button class="btn icon-btn btn-light manage-repo-column-index back-to-column-modal"
data-modal-url="<%= repository_columns_index_html_path(@repository) %>"
data-modal-url="<%= repository_repository_columns_path(@repository) %>"
data-action="new">
<span class="fas fa-arrow-left"></span>
</button>
@ -23,7 +23,7 @@
</div>
<div class="modal-footer delete-footer">
<button class="btn btn-secondary manage-repo-column-index back-to-column-modal"
data-modal-url="<%= repository_columns_index_html_path(@repository) %>"
data-modal-url="<%= repository_repository_columns_path(@repository) %>"
data-action="new">
<%= t("general.cancel")%>
</button>

2
app/views/repository_columns/_manage_column_modal_content.html.erb
View file

@ -1,7 +1,7 @@
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
<button class="btn icon-btn btn-light manage-repo-column-index back-to-column-modal"
data-modal-url="<%= repository_columns_index_html_path(@repository) %>"
data-modal-url="<%= repository_repository_columns_path(@repository) %>"
data-action="new">
<span class="fas fa-arrow-left"></span>
</button>

2
app/views/repository_columns/_manage_column_modal_index.html.erb
View file

@ -15,7 +15,7 @@
<% if can_create_repository_columns?(@repository)%>
<button id="new-repo-column-modal"
class="btn btn-secondary manage-repo-column"
data-modal-url="<%= repository_columns_create_html_path(@repository) %>"
data-modal-url="<%= new_repository_repository_column_path(@repository) %>"
data-action="new">
<span class="fas fa-plus"></span>&nbsp;<%=t 'libraries.manange_modal_column_index.add_column' %>
</button>

13
config/routes.rb
View file

@ -617,20 +617,9 @@ Rails.application.routes.draw do
post 'copy_records',
to: 'repository_rows#copy_records',
defaults: { format: 'json' }
get 'repository_columns/:id/edit_html',
to: 'repository_columns#edit_html',
as: 'columns_edit_html'
get 'repository_columns/:id/destroy_html',
to: 'repository_columns#destroy_html',
as: 'columns_destroy_html'
get 'index_html',
to: 'repository_columns#index_html',
as: 'columns_index_html',
defaults: { format: 'json' }
get 'create_html',
to: 'repository_columns#create_html',
as: 'columns_create_html',
defaults: { format: 'json' }
get 'available_columns',
to: 'repository_columns#available_columns',
as: 'available_columns',
@ -638,7 +627,7 @@ Rails.application.routes.draw do
get :table_toolbar
get :status
resources :repository_columns, only: :destroy
resources :repository_columns, only: %i(index new edit destroy)
resources :repository_rows, only: %i(create show update) do
member do
get :assigned_task_list

73
spec/services/repository_columns/delete_column_service_spec.rb
View file

@ -1,73 +0,0 @@
# frozen_string_literal: true
require 'rails_helper'
describe RepositoryColumns::DeleteColumnService do
let(:user) { create :user }
let!(:user_team) { create :user_team, :admin, user: user, team: team }
let(:team) { create :team }
let(:repository) { create :repository, team: team }
let(:repository_column) { create :repository_column, :list_type }
context 'when deletes column' do
let(:service_call) do
RepositoryColumns::DeleteColumnService.call(user: user, team: team, column: repository_column)
end
it 'removes RepositoryColumn record' do
repository_column
expect { service_call }.to change { RepositoryColumn.count }.by(-1)
end
it 'adds Activity record' do
expect { service_call }.to(change { Activity.count }.by(1))
end
context 'when RepositoryColumn has RepositoryListItems' do
before do
3.times do
create(:repository_list_item, repository_column: repository_column)
end
end
it 'removes RepositoryListItem records as well' do
expect { service_call }.to(change { RepositoryListItem.count }.by(-3))
end
end
context 'when RepositoryColumn has RepositoryStatusItems' do
before do
3.times do
create(:repository_status_item, repository_column: repository_column)
end
end
it 'removes RepositoryStatusItem records as well' do
expect { service_call }.to(change { RepositoryStatusItem.count }.by(-3))
end
end
end
context 'when column cannot be deleted' do
let(:service_call) do
RepositoryColumns::DeleteColumnService.call(user: user, team: team, column: repository_column)
end
before do
allow_any_instance_of(RepositoryColumn).to receive(:destroy!).and_raise(ActiveRecord::RecordNotDestroyed)
end
it 'returns errors' do
expect(service_call.errors).to have_key(:repository_column)
end
it 'returns succeed false' do
expect(service_call.succeed?).to be_falsey
end
it 'does not add Activity record' do
expect { service_call }.not_to(change { Activity.count })
end
end
end