Merge pull request #6261 from fjordllc/feature/reports-vue-to-react

show画面でページネーションが表示されないように修正しました
fjordllc · Feb 25, 2023 · e65d60a · e65d60a
2 parents ac8ef02 + 4690fc2
commit e65d60a
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/app/javascript/components/Reports.jsx b/app/javascript/components/Reports.jsx
@@ -8,7 +8,7 @@ import Pagination from './Pagination'
 import PracticeFilterDropdown from './PracticeFilterDropdown'
 import UnconfirmedLink from './UnconfirmedLink'
 
-export default function Reports({ all = false, userId = '', practices = false, unchecked = false, displayUserIcon = true, companyId = '', practiceId = '' }) {
+export default function Reports({ all = false, userId = '', practices = false, unchecked = false, displayUserIcon = true, companyId = '', practiceId = '', displayPagination = true }) {
   const per = 20
   const neighbours = 4
   const defaultPage = parseInt(queryString.parse(location.search).page) || 1
@@ -73,7 +73,7 @@ export default function Reports({ all = false, userId = '', practices = false, u
             />
           )}
           <div className="page-content reports">
-            {data.totalPages > 1 && (
+            {data.totalPages > 1 && displayPagination && (
               <Pagination
                 sum={data.totalPages * per}
                 per={per}
@@ -99,7 +99,7 @@ export default function Reports({ all = false, userId = '', practices = false, u
             {unchecked && (
               <UnconfirmedLink label={'未チェックの日報を一括で開く'} />
             )}
-            {data.totalPages > 1 && (
+            {data.totalPages > 1 && displayPagination && (
               <Pagination
                 sum={data.totalPages * per}
                 per={per}

diff --git a/app/views/reports/show.html.slim b/app/views/reports/show.html.slim
@@ -154,7 +154,7 @@
                     | 提出物
             .side-tabs-contents
               .side-tabs-contents__item#side-tabs-content-1
-                = react_component('Reports', userId: @report.user.id, displayUserIcon: false)
+                = react_component('Reports', userId: @report.user.id, displayUserIcon: false, displayPagination: false)
               .side-tabs-contents__item#side-tabs-content-2.is-only-mentor
                 .user-info
                   = render 'users/user_secret_attributes', user: @report.user
@@ -174,7 +174,7 @@
                           .o-empty-message__text
                             | 提出物はまだありません。
         - else
-          = react_component('Reports', userId: @report.user.id, displayUserIcon: false)
+          = react_component('Reports', userId: @report.user.id, displayUserIcon: false, displayPagination: false)
 
 - if flash[:notify_help] && flash[:celebrate_report_count]
     = render '/shared/modal', id: 'modal-notify-help', modal_title: '🎉 おめでとう！', auto_show: true

diff --git a/app/views/talks/show.html.slim b/app/views/talks/show.html.slim
@@ -86,4 +86,4 @@
                                   class: 'a-button is-sm is-danger is-block'
                 div(data-vue="UserMentorMemo" data-vue-user-id:number="#{@user.id}" data-vue-products-mode:boolean="#{true}")
               .side-tabs-contents__item#side-tabs-content-2
-                = react_component('Reports', userId: @user.id, displayUserIcon: false)
+                = react_component('Reports', userId: @user.id, displayUserIcon: false, displayPagination: false)