日報・ブログのタブを修正する

app/controllers/reports_controller.rb

@@ -16,6 +16,7 @@ class ReportsController < ApplicationController # rubocop:todo Metrics/ClassLeng
   def index
     @reports = Report.list.page(params[:page]).per(PAGER_NUMBER)
     @reports = @reports.joins(:practices).where(practices: { id: params[:practice_id] }) if params[:practice_id].present?
+    @reports = @reports.unchecked.not_wip if params[:unchecked].present? && admin_or_mentor_login?
   end
 
   def show

app/helpers/page_tabs/reports_helper.rb

@@ -4,8 +4,7 @@ module PageTabs
   module ReportsHelper
     def report_page_tabs(active_tab:)
       tabs = []
-      tabs << { name: '日報', link: reports_path }
-      tabs << { name: '未チェックの日報', link: reports_unchecked_index_path, badge: Cache.unchecked_report_count } if staff_login?
+      tabs << { name: '日報', link: reports_path, badge: admin_or_mentor_login? ? Cache.unchecked_report_count.presence : nil }
       tabs << { name: 'みんなのブログ', link: external_entries_path }
       render PageTabsComponent.new(tabs:, active_tab:)
     end

app/views/application/_global_nav.slim

@@ -14,8 +14,7 @@ nav.global-nav
               i.fa-solid.fa-book
             .global-nav-links__link-label プラクティス
         li.global-nav-links__item
-          - report_link = admin_or_mentor_login? ? reports_unchecked_index_path : reports_path
-          = link_to report_link, class: "global-nav-links__link #{current_link(/^reports/)}" do
+          = link_to reports_path, class: "global-nav-links__link #{current_link(/^(reports|external_entries)/)}" do
             .global-nav-links__link-icon
               i.fa-solid.fa-pen
             - if admin_or_mentor_login? && Cache.unchecked_report_count.positive?

app/views/external_entries/index.html.slim

@@ -1,26 +1,29 @@
-- title 'みんなのブログ'
+- content_for :title, 'みんなのブログ'
 - set_meta_tags description: 'みんなのブログ一覧ページです。'
 
-header.page-header
-  .container
-    .page-header__inner
-      .page-header__start
-        .page-header__title
-          | 日報・ブログ
-      .page-header__end
-        = render 'reports/new_report'
-
 = report_page_tabs(active_tab: 'みんなのブログ')
 
-- if current_user.feed_url.blank?
-  .a-page-notice.is-danger
-    .container.is-lg
-      .a-page-notice__inner
-        p
-          | #{current_user.login_name}さんのブログは
-          | まだ登録されていません。
-          = link_to edit_current_user_path(anchor: 'form-blog-feed') do
-            | ブログのフィード URL の登録
-          | をしてください。
+main.page-main
+  header.page-main-header
+    .container
+      .page-main-header__inner
+        .page-main-header__start
+          h1.page-main-header__title
+            | みんなのブログ
+        .page-main-header__end
+          .page-header-actions
+
+  hr.a-border
+
+  - if current_user.feed_url.blank?
+    .a-page-notice.is-danger
+      .container.is-lg
+        .a-page-notice__inner
+          p
+            | #{current_user.login_name}さんのブログは
+            | まだ登録されていません。
+            = link_to edit_current_user_path(anchor: 'form-blog-feed') do
+              | ブログのフィード URL の登録
+            | をしてください。
 
 = render('external_entries')

app/views/reports/index.html.slim

@@ -1,25 +1,37 @@
-- title '日報'
+- content_for :title, '日報'
 - set_meta_tags description: '日報の一覧ページです。'
 
-header.page-header
-  .container
-    .page-header__inner
-      .page-header__start
-        .page-header__title
-          | 日報・ブログ
-      .page-header__end
-        = render 'reports/new_report'
-
 = report_page_tabs(active_tab: '日報')
 
-.page-main
-  nav.page-filter.form
-    .container.is-md
-      = form_with url: reports_path, local: true, method: 'get'
-      .form-item.is-inline-md-up
-        = label_tag :practice_id, 'プラクティスで絞り込む', class: 'a-form-label'
-        = select_tag :practice_id, options_from_collection_for_select(@current_user_practice.sorted_practices, :id, :title, selected: params[:practice_id]), include_blank: '全ての日報を表示', onchange: 'this.form.submit()', id: 'js-choices-single-select'
+main.page-main
+  header.page-main-header
+    .container
+      .page-main-header__inner
+        .page-main-header__start
+          h1.page-main-header__title
+            | 日報
+        .page-main-header__end
+          .page-header-actions
+            ul.page-header-actions__items
+              li.page-header-actions__item
+                = render 'reports/new_report'
+
   hr.a-border
+
+  - if admin_or_mentor_login?
+    nav.pill-nav
+      ul.pill-nav__items
+        li.pill-nav__item
+          = link_to '全て', reports_path, class: "pill-nav__item-link#{' is-active' unless params[:unchecked]}"
+        li.pill-nav__item
+          = link_to '未チェック', reports_path(unchecked: true), class: "pill-nav__item-link#{' is-active' if params[:unchecked]}"
+  - if params[:unchecked].blank?
+    nav.page-filter.form.pb-0
+      .container.is-md
+        = form_with url: reports_path, local: true, method: :get do
+        .form-item.is-inline-md-up
+          = label_tag :practice_id, 'プラクティスで絞り込む', class: 'a-form-label'
+          = select_tag :practice_id, options_from_collection_for_select(@current_user_practice.sorted_practices, :id, :title, selected: params[:practice_id]), include_blank: '全ての日報を表示', onchange: 'this.form.submit()', id: 'js-choices-single-select'
   .page-body
     - if @reports.empty?
       .o-empty-message

config/routes/reports.rb

@@ -1,11 +1,7 @@
 # frozen_string_literal: true
 
 Rails.application.routes.draw do
-  namespace :reports do
-    resources :unchecked, only: %i(index)
-  end
-
   resources :reports do
-    resources :checks, only: %i[create destroy]
+    resources :checks, only: [:create, :destroy]
   end
 end

test/system/external_entries_test.rb

@@ -22,4 +22,16 @@ class ExternalEntriesTest < ApplicationSystemTestCase
       end
     end
   end
+
+  test 'does not show "New Report" button on External Entries page' do
+    visit_with_auth external_entries_url, 'komagata'
+    assert_no_link '日報作成'
+    assert_no_selector 'a.btn', text: '日報作成'
+  end
+
+  test 'does not show "New Report" button on External Entries page for general user' do
+    visit_with_auth external_entries_url, 'muryou'
+    assert_no_link '日報作成'
+    assert_no_selector 'a.btn', text: '日報作成'
+  end
 end

test/system/reports_practice_filter_test.rb

@@ -0,0 +1,42 @@
+# frozen_string_literal: true
+
+require 'application_system_test_case'
+
+class ReportsPracticeFilterTest < ApplicationSystemTestCase
+  setup do
+    @user = users(:kimura)
+    @practice1 = practices(:practice1)
+    @practice2 = practices(:practice2)
+    @report1 = Report.create!(
+      user: @user,
+      title: 'レポート1',
+      description: 'テスト用レポート1',
+      reported_on: Time.zone.today
+    )
+    @report1.practices << @practice1
+
+    @report2 = Report.create!(
+      user: @user,
+      title: 'レポート2',
+      description: 'テスト用レポート2',
+      reported_on: Time.zone.today - 1.day
+    )
+    @report2.practices << @practice2
+
+    visit login_path
+    fill_in 'メールアドレス', with: @user.email
+    fill_in 'パスワード', with: 'testtest'
+    click_button 'ログイン'
+  end
+
+  test 'GET filter by practice works' do
+    visit reports_path(practice_id: @practice1.id)
+    assert_text 'レポート1', wait: 5
+    assert_no_text 'レポート2', wait: 5
+  end
+
+  test 'practice filter is hidden when unchecked parameter is present' do
+    visit reports_path(unchecked: true)
+    assert_no_selector 'select#js-choices-single-select', wait: 5
+  end
+end

test/system/reports_test.rb

@@ -657,12 +657,6 @@ def wait_for_watch_change
     end
   end
 
-  test 'mentors can see reports page if products published_at is nil' do
-    visit_with_auth '/reports/unchecked', 'mentormentaro'
-    click_link 'テストのnippou'
-    assert_text '今日は1時間学習しました。'
-  end
-
   test 'open new report with a past date' do
     visit_with_auth '/reports/new?reported_on=2022-1-1', 'komagata'
     assert_equal '2022-01-01', find('#report_reported_on').value

test/system/searchables_test.rb

@@ -186,7 +186,10 @@ class SearchablesTest < ApplicationSystemTestCase
   end
 
   test 'show icon and go profile page when click icon' do
-    reset_avatar(users(:komagata))
+    user = users(:komagata)
+    reset_avatar(user)
+    user.reload
+    assert user.avatar.attached?, 'アバターのテスト用フィクスチャがアタッチできませんでした（komagata）'
     visit_with_auth '/', 'hatsuno'
     find('.js-modal-search-shown-trigger').click
     within('form[name=search]') do