[TL-4694] add buttons for sending vacancy to moderation and to archive

app/controllers/web/account/vacancies_controller.rb

@@ -35,7 +35,6 @@ def update
     authorize @vacancy
     vacancy = @vacancy.becomes(Web::Account::VacancyForm)
     if vacancy.update(params[:vacancy])
-      change_visibility(@vacancy)
       f(:success)
       redirect_to account_vacancies_path
     else
@@ -45,11 +44,15 @@ def update
     end
   end
 
-  def destroy; end
-
-  private
+  def archive
+    vacancy = current_user.vacancies.find params[:id]
+    vacancy.archive!
+  end
 
-  def change_visibility(vacancy)
-    vacancy.archive! if params[:archive]
+  def send_to_moderate
+    vacancy = current_user.vacancies.find params[:id]
+    vacancy.send_to_moderate!
   end
+
+  def destroy; end
 end

app/models/vacancy.rb

@@ -105,7 +105,7 @@ class Vacancy < ApplicationRecord
     end
 
     event :archive do
-      transitions to: :archived
+      transitions from: %i[idle on_moderate published], to: :archived
     end
 
     event :restore do

app/views/web/account/vacancies/_actions.html.slim

@@ -0,0 +1,6 @@
+.fs-5 = t('.additional_actions')
+.row.mt-3
+    .col-auto.d-flex.mb-3
+        .me-3 = link_to t('.archive'), archive_account_vacancy_path(vacancy), method: :patch, class: class_names('btn btn-success', disabled: !vacancy.may_archive?), data: { confirm: 'Are you sure?' }
+    .col-auto.mb-3
+        .me-3 = link_to t('.send_to_moderate'), send_to_moderate_account_vacancy_path(vacancy), method: :patch, class: class_names('btn btn-danger', disabled: !vacancy.may_send_to_moderate?), data: { confirm: 'Are you sure?' }

app/views/web/account/vacancies/_form.html.slim

@@ -50,9 +50,7 @@
   .mb-3
     = f.input :direction_list, input_html: { value: f.object.direction_list.to_s }
   .row.mt-5
-    .col-sm.d-flex.mb-3
-      .me-3 = f.button :submit, class: 'btn-primary'
-      - if local_assigns.fetch(:show_archive_button, false)
-        .me-3 = f.button :submit, t('.archive'), data: { confirm: t('confirm') }, class: 'btn-outline-primary', name: 'archive'
-    .col-sm.d-flex.justify-content-end.mb-3
+    .col-auto.d-flex.mb-3
+      = f.button :submit, class: 'btn-primary'
+    .col-auto.mb-3
       = link_to t('.cancel'), url_for(:back), class: 'btn btn-outline-secondary'

app/views/web/account/vacancies/edit.html.slim

@@ -5,4 +5,5 @@
   .alert.alert-secondary
     = t('.vacancy_archived')
 
-= render 'form', vacancy: @vacancy, url: account_vacancy_path(@vacancy), show_archive_button: [email protected]?
+= render 'form', vacancy: @vacancy, url: account_vacancy_path(@vacancy)
+= render 'actions', vacancy: @vacancy, url: account_vacancy_path(@vacancy)

app/views/web/account/vacancies/new.html.slim

@@ -1,4 +1,4 @@
 - content_for :header do
   = t('.header')
 
-= render 'form', vacancy: @vacancy, url: account_vacancies_path, show_archive_button: false
+= render 'form', vacancy: @vacancy, url: account_vacancies_path

config/locales/en.views.yml

@@ -226,6 +226,7 @@ en:
       vacancies:
         form:
           archive: Archive
+          send_to_moderate: Send to moderate
           cancel: Cancel
         new:
           header: New vacancy
@@ -235,6 +236,10 @@ en:
         index:
           resume: Look for candidates in the Resume section
           header: My vacancies
+        actions: 
+          archive: Archive
+          send_to_moderate: Send to moderate
+          additional_actions: Additional actions
       resumes:
         new:
           info_for_user: Please note that if you plan to look for a job abroad, create a resume in the English version of the site

config/locales/ru.helpers.yml

@@ -3,5 +3,7 @@ ru:
     submit:
       create: Создать
       update: Изменить
+      archive: Архивировать
+      send_to_moderate: Отправить на модерацию
       web_lead_form:
         create: Получить консультацию

config/locales/ru.views.yml

@@ -324,6 +324,7 @@ ru:
       vacancies:
         form: 
           archive: В архив
+          send_to_moderate: На модерацию
           cancel: Отмена
         new:
           header: Новая вакансия
@@ -333,6 +334,10 @@ ru:
         index:
           resume: Ищите кандидатов в разделе Резюме
           header: Мои вакансии
+        actions: 
+          archive: В архив
+          send_to_moderate: На модерацию
+          additional_actions: Дополнительные действия
       resumes:
         new:
           info_for_user: Обращаем ваше внимание если вы планируете искать работу в России и СНГ, создавайте резюме в русскоязычной версии сайта

config/routes.rb

@@ -73,7 +73,12 @@
 
       namespace :account do
         resources :resumes
-        resources :vacancies
+        resources :vacancies do
+          member do
+            patch :archive
+            patch :send_to_moderate
+          end
+        end
         resources :notifications, only: %i[index update]
         resource :newsletters, only: %i[edit update]
         resource :profile, only: %i[edit update destroy]

test/controllers/web/account/vacancies_controller_test.rb

@@ -36,10 +36,24 @@ class Web::Account::VacanciesControllerTest < ActionDispatch::IntegrationTest
     assert { vacancy }
   end
 
-  test '#edit' do
-    vacancy = vacancies(:one)
-    get edit_account_vacancy_path(vacancy)
+  test '#archive' do
+    vacancy = vacancies(:state_idle)
+    patch archive_account_vacancy_path(vacancy)
+    assert_response :success
+
+    vacancy.reload
+
+    assert { vacancy.archived? }
+  end
+
+  test '#send_to_moderate' do
+    vacancy = vacancies(:state_idle)
+    patch send_to_moderate_account_vacancy_path(vacancy)
     assert_response :success
+
+    vacancy.reload
+
+    assert { vacancy.on_moderate? }
   end
 
   test 'can not edit a posted job' do

test/fixtures/vacancies.yml

@@ -140,3 +140,11 @@ over_month_old:
   title: Фронтендер
   salary_to: 2000
   published_at: <%= 2.month.ago.to_fs(:db) %>
+
+state_idle:
+  <<: *DEFAULTS
+  title: Черновик
+  state: idle
+  salary_from: 1000
+  salary_to: 2000
+  salary_currency: rub