products.vueの不要コードの削除・整理

unconfirmed_links_open_button.vueを参照していたが、
既にReactに置き換えられており使用されていないため。

app/javascript/products.js

@@ -7,20 +7,16 @@ document.addEventListener('DOMContentLoaded', () => {
   const products = document.querySelector(selector)
   if (products) {
     const title = products.getAttribute('data-title')
-    const selectedTab = products.getAttribute('data-selected-tab')
     const isMentor = products.getAttribute('data-mentor-login')
     const currentUserId = Number(products.getAttribute('data-current-user-id'))
-    const checkerId = products.getAttribute('data-checker-id')
     new Vue({
       store,
       render: (h) =>
         h(Products, {
           props: {
             title: title,
-            selectedTab: selectedTab,
             isMentor: isMentor === 'true',
-            currentUserId: currentUserId,
-            checkerId: checkerId
+            currentUserId: currentUserId
           }
         })
     }).$mount(selector)

app/javascript/products.vue

@@ -1,10 +1,6 @@
 <template lang="pug">
 .page-content.is-products(v-if='!loaded')
-  .page-body__columns(v-if='isUnassigned')
-    .page-body__column.is-main
-      loadingListPlaceholder
-    nav.page-body__column.is-sub
-  div(v-else)
+  div
     loadingListPlaceholder
 
 .o-empty-message(v-else-if='products.length === 0')
@@ -19,73 +15,6 @@
   p.o-empty-message__text
     | 5日経過した提出物はありません
 
-//- 未アサイン
-.page-content.is-products(v-else-if='isUnassigned')
-  .page-body__columns
-    .page-body__column.is-main
-      template(v-for='product_n_days_passed in productsGroupedByElapsedDays') <!-- product_n_days_passedはn日経過の提出物 -->
-        .a-card(
-          v-if='!isDashboard || (isDashboard && product_n_days_passed.elapsed_days >= 5)')
-          //- TODO 以下を共通化する
-          //- prettier-ignore: need space between v-if and id
-          header.card-header.a-elapsed-days(
-            v-if='product_n_days_passed.elapsed_days === 0', id='0days-elapsed'
-          )
-            h2.card-header__title
-              | 今日提出
-              span.card-header__count(v-if='selectedTab === "unassigned"')
-                | （{{ countProductsGroupedBy(product_n_days_passed) }}）
-          //- prettier-ignore: need space between v-else-if and id
-          header.card-header.a-elapsed-days.is-reply-warning(
-            v-else-if='product_n_days_passed.elapsed_days === 5', id='5days-elapsed'
-          )
-            h2.card-header__title
-              | {{ product_n_days_passed.elapsed_days }}日経過
-              span.card-header__count(v-if='selectedTab === "unassigned"')
-                | （{{ countProductsGroupedBy(product_n_days_passed) }}）
-          //- prettier-ignore: need space between v-else-if and id
-          header.card-header.a-elapsed-days.is-reply-alert(
-            v-else-if='product_n_days_passed.elapsed_days === 6', id='6days-elapsed'
-          )
-            h2.card-header__title
-              | {{ product_n_days_passed.elapsed_days }}日経過
-              span.card-header__count(v-if='selectedTab === "unassigned"')
-                | （{{ countProductsGroupedBy(product_n_days_passed) }}）
-          //- prettier-ignore: need space between v-else-if and id
-          header.card-header.a-elapsed-days.is-reply-deadline(
-            v-else-if='product_n_days_passed.elapsed_days === 7', id='7days-elapsed'
-          )
-            h2.card-header__title
-              | {{ product_n_days_passed.elapsed_days }}日以上経過
-              span.card-header__count(v-if='selectedTab === "unassigned"')
-                | （{{ countProductsGroupedBy(product_n_days_passed) }}）
-          header.card-header.a-elapsed-days(
-            v-else,
-            :id='elapsedDaysId(product_n_days_passed.elapsed_days)')
-            h2.card-header__title
-              | {{ product_n_days_passed.elapsed_days }}日経過
-              span.card-header__count(v-if='selectedTab === "unassigned"')
-                | （{{ countProductsGroupedBy(product_n_days_passed) }}）
-          //- 共通化ここまで
-
-          .card-list
-            .card-list__items
-              product(
-                v-for='product in product_n_days_passed.products',
-                :key='product.id',
-                :product='product',
-                :currentUserId='currentUserId',
-                :isMentor='isMentor',
-                :display-user-icon='displayUserIcon')
-      .under-cards(v-if='isDashboard')
-      unconfirmed-links-open-button(
-        v-if='isMentor && selectedTab != "all" && !isDashboard',
-        :label='`${unconfirmedLinksName}の提出物を一括で開く`')
-    elapsedDays(
-      v-if='!isDashboard && selectedTab === "unassigned"',
-      :productsGroupedByElapsedDays='productsGroupedByElapsedDays',
-      :countProductsGroupedBy='countProductsGroupedBy')
-
 //- ダッシュボード
 div(v-else-if='isDashboard')
   template(v-for='product_n_days_passed in productsGroupedByElapsedDays') <!-- product_n_days_passedはn日経過の提出物 -->
@@ -98,38 +27,38 @@ div(v-else-if='isDashboard')
       )
         h2.card-header__title
           | 今日提出
-          span.card-header__count(v-if='selectedTab === "unassigned"')
+          span.card-header__count
             | （{{ countProductsGroupedBy(product_n_days_passed) }}）
       //- prettier-ignore: need space between v-else-if and id
       header.card-header.a-elapsed-days.is-reply-warning(
         v-else-if='product_n_days_passed.elapsed_days === 5', id='5days-elapsed'
       )
         h2.card-header__title
           | {{ product_n_days_passed.elapsed_days }}日経過
-          span.card-header__count(v-if='selectedTab === "unassigned"')
+          span.card-header__count
             | （{{ countProductsGroupedBy(product_n_days_passed) }}）
       //- prettier-ignore: need space between v-else-if and id
       header.card-header.a-elapsed-days.is-reply-alert(
         v-else-if='product_n_days_passed.elapsed_days === 6', id='6days-elapsed'
       )
         h2.card-header__title
           | {{ product_n_days_passed.elapsed_days }}日経過
-          span.card-header__count(v-if='selectedTab === "unassigned"')
+          span.card-header__count
             | （{{ countProductsGroupedBy(product_n_days_passed) }}）
       //- prettier-ignore: need space between v-else-if and id
       header.card-header.a-elapsed-days.is-reply-deadline(
         v-else-if='product_n_days_passed.elapsed_days === 7', id='7days-elapsed'
       )
         h2.card-header__title
           | {{ product_n_days_passed.elapsed_days }}日以上経過
-          span.card-header__count(v-if='selectedTab === "unassigned"')
+          span.card-header__count
             | （{{ countProductsGroupedBy(product_n_days_passed) }}）
       header.card-header.a-elapsed-days(
         v-else,
         :id='elapsedDaysId(product_n_days_passed.elapsed_days)')
         h2.card-header__title
           | {{ product_n_days_passed.elapsed_days }}日経過
-          span.card-header__count(v-if='selectedTab === "unassigned"')
+          span.card-header__count
             | （{{ countProductsGroupedBy(product_n_days_passed) }}）
       //- 共通化ここまで
 
@@ -155,95 +84,38 @@ div(v-else-if='isDashboard')
         href='/products/unassigned#4days-elapsed',
         v-else)
         | <strong>{{ countAlmostPassed5days() }}件</strong>の提出物が、<br>8時間以内に5日経過に到達します。
-
-//- 全て, 未完了
-.page-content.is-products(v-else)
-  nav.pagination(v-if='totalPages > 1')
-    pager(v-bind='pagerProps')
-  .a-card
-    .card-list
-      .card-list__items
-        product(
-          v-for='product in products',
-          :key='product.id',
-          :product='product',
-          :currentUserId='currentUserId',
-          :isMentor='isMentor',
-          :display-user-icon='displayUserIcon')
-      unconfirmed-links-open-button(
-        v-if='isMentor && selectedTab != "all" && !isDashboard',
-        :label='`${unconfirmedLinksName}の提出物を一括で開く`')
-  nav.pagination(v-if='totalPages > 1')
-    pager(v-bind='pagerProps')
 </template>
 
 <script>
 import CSRF from 'csrf'
 import Product from 'product.vue'
-import UnconfirmedLinksOpenButton from 'unconfirmed_links_open_button.vue'
 import LoadingListPlaceholder from 'loading-list-placeholder.vue'
-import Pager from 'pager.vue'
-import ElapsedDays from 'elapsed_days.vue'
 
 export default {
   components: {
     product: Product,
-    'unconfirmed-links-open-button': UnconfirmedLinksOpenButton,
-    loadingListPlaceholder: LoadingListPlaceholder,
-    pager: Pager,
-    elapsedDays: ElapsedDays
+    loadingListPlaceholder: LoadingListPlaceholder
   },
   props: {
     title: { type: String, required: true },
-    selectedTab: { type: String, required: true },
     isMentor: { type: Boolean, required: true },
     currentUserId: { type: Number, required: true },
-    checkerId: { type: String, required: false, default: null },
     displayUserIcon: { type: Boolean, default: true }
   },
   data() {
     return {
       products: [],
-      totalPages: 0,
-      currentPage: Number(this.getPageValueFromParameter()) || 1,
       loaded: false,
-      productsGroupedByElapsedDays: null,
-      params: this.getParams()
+      productsGroupedByElapsedDays: null
     }
   },
   computed: {
     url() {
-      return (
-        '/api/products' +
-        (this.selectedTab === 'all'
-          ? ''
-          : '/' + this.selectedTab.replace('-', '_')) +
-        `?page=${this.currentPage}` +
-        (this.checkerId ? `&checker_id=${this.checkerId}` : '') +
-        (this.params.target ? `&target=${this.params.target}` : '')
-      )
-    },
-    unconfirmedLinksName() {
-      return {
-        unchecked: '未完了',
-        'self-assigned': '自分の担当',
-        unassigned: '未アサイン'
-      }[this.selectedTab]
-    },
-    pagerProps() {
-      return {
-        initialPageNumber: this.currentPage,
-        pageCount: this.totalPages,
-        pageRange: 5,
-        clickHandle: this.paginateClickCallback
-      }
+      return '/api/products/unassigned'
     },
     isDashboard() {
       return location.pathname === '/'
     },
-    isUnassigned() {
-      return location.pathname === '/products/unassigned'
-    },
     isNotProduct5daysElapsed() {
       const elapsedDays = []
       this.productsGroupedByElapsedDays.forEach((h) => {
@@ -254,7 +126,6 @@ export default {
   },
   created() {
     window.onpopstate = () => {
-      this.currentPage = Number(this.getPageValueFromParameter()) || 1
       this.getProductsPerPage()
     }
     this.getProductsPerPage()
@@ -275,15 +146,10 @@ export default {
           return response.json()
         })
         .then((json) => {
-          if (
-            location.pathname === '/products/unassigned' ||
-            location.pathname === '/products/unchecked' ||
-            location.pathname === '/'
-          ) {
+          if (location.pathname === '/') {
             this.productsGroupedByElapsedDays =
               json.products_grouped_by_elapsed_days
           }
-          this.totalPages = json.total_pages
           this.products = []
           json.products.forEach((product) => {
             this.products.push(product)
@@ -301,43 +167,6 @@ export default {
           console.warn(error)
         })
     },
-    getPageValueFromParameter() {
-      const url = location.href
-      const results = url.match(/\?page=(\d+)/)
-      if (!results) return null
-      return results[1]
-    },
-    paginateClickCallback(pageNumber) {
-      this.currentPage = pageNumber
-      this.getProductsPerPage()
-      history.pushState(null, null, this.newUrl(pageNumber))
-      window.scrollTo(0, 0)
-    },
-    newUrl(pageNumber) {
-      const params = new URL(location.origin).searchParams
-      if (pageNumber !== 1) params.set('page', pageNumber)
-      if (this.params.target) params.set('target', this.params.target)
-      if (this.params.checker_id)
-        params.set('checker_id', this.params.checker_id)
-      if (
-        params.get('page') ||
-        params.get('target') ||
-        params.get('checker_id')
-      )
-        return `${location.pathname}?${params}`
-      return location.pathname
-    },
-    getParams() {
-      const params = {}
-      location.search
-        .slice(1)
-        .split('&')
-        .forEach((query) => {
-          const queryArr = query.split('=')
-          params[queryArr[0]] = queryArr[1]
-        })
-      return params
-    },
     getElementNdaysPassed(elapsedDays) {
       const element = this.productsGroupedByElapsedDays.find(
         (el) => el.elapsed_days === elapsedDays

app/views/home/_mentor_dashboard.html.slim

@@ -9,7 +9,7 @@
                 h2.dashboard-category__title
                   | 提出物状況
             .dashboard-category__body
-              #js-products(data-title="#{title}" data-selected-tab="unassigned" data-mentor-login="#{mentor_login?}" data-current-user-id="#{current_user.id}")
+              #js-products(data-title="#{title}" data-mentor-login="#{mentor_login?}" data-current-user-id="#{current_user.id}")
       .dashboard-contents__col.is-main
         .dashboard-contents__categories
           .dashboard-category