diff --git a/app/helpers/page_tabs/users_helper.rb b/app/helpers/page_tabs/users_helper.rb index 95b85f151d5..a13786ecd98 100644 --- a/app/helpers/page_tabs/users_helper.rb +++ b/app/helpers/page_tabs/users_helper.rb @@ -14,7 +14,7 @@ def user_page_tabs(user, active_tab:) tabs << { name: '質問', link: user_questions_path(user), count: user.questions.length } tabs << { name: '回答', link: user_answers_path(user), count: user.answers.length } tabs << { name: 'イベント', link: user_events_path(user), count: user.participate_events.length } - if Rails.env.in? %w[development test] + if Switchlet.enabled?(:micro_report) && (admin_or_mentor_login? || (Rails.env.in? %w[development test])) tabs << { name: '分報', link: "#{user_micro_reports_path(user, page: user.latest_micro_report_page)}#latest-micro-report", count: user.micro_reports.length } diff --git a/app/views/application/_global_nav.slim b/app/views/application/_global_nav.slim index 2fc3daf3988..579411f7588 100644 --- a/app/views/application/_global_nav.slim +++ b/app/views/application/_global_nav.slim @@ -71,3 +71,9 @@ nav.global-nav .global-nav__item-count.a-notification-count.is-only-mentor = Talk.action_uncompleted.count .global-nav-links__link-label 相談 + - if Switchlet.enabled?(:micro_report) && (admin_or_mentor_login? || (Rails.env.in? %w[development test])) + li.global-nav-links__item + = link_to "#{user_micro_reports_path(current_user, page: current_user.latest_micro_report_page)}#latest-micro-report", class: "global-nav-links__link #{current_link(/micro_reports/)}" do + .global-nav-links__link-icon + i.fa-solid.fa-clock + .global-nav-links__link-label 分報 diff --git a/test/system/user/micro_reports_test.rb b/test/system/user/micro_reports_test.rb index 3d601de4f1d..6f9fd503ef2 100644 --- a/test/system/user/micro_reports_test.rb +++ b/test/system/user/micro_reports_test.rb @@ -3,12 +3,16 @@ require 'application_system_test_case' class MicroReportsTest < ApplicationSystemTestCase + setup do + Switchlet.enable!(:micro_report) + end + test 'show all micro reports of the target user' do visit_with_auth user_micro_reports_path(users(:hajime)), 'hatsuno' assert_text '分報 (3)' assert_text '最初の分報' assert_text '2つ目の分報' - assert_text '最初の分報' + assert_text '最新の分報' end test 'micro reports are ordered by created_at asc' do