Release 2025-02-02 02:43:35 +0000

.circleci/config.yml

@@ -1,9 +1,9 @@
 version: 2.1
 
 orbs:
-  ruby: circleci/ruby@2.1.0
-  node: circleci/node@5.1.0
-  browser-tools: circleci/browser-tools@1.4.7
+  ruby: circleci/ruby@2.3.1
+  node: circleci/node@7.0.0
+  browser-tools: circleci/browser-tools@1.5.0
 jobs:
   build:
     docker:
@@ -67,10 +67,15 @@ jobs:
     parallelism: 3
     steps:
       - checkout
-      - run: sudo apt-get update # TODO: remove it https://github.com/CircleCI-Public/browser-tools-orb/issues/75#issuecomment-1641031119
       - browser-tools/install-chrome:
           replace-existing: true
+          chrome-version: 130.0.6723.116
       - browser-tools/install-chromedriver
+      - run:
+          command: |
+            google-chrome --version
+            chromedriver --version
+          name: Check install
       - ruby/install-deps:
           clean-bundle: true
       - node/install:

Gemfile.lock

@@ -263,7 +263,7 @@ GEM
     listen (3.8.0)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
-    loofah (2.21.4)
+    loofah (2.23.1)
       crass (~> 1.0.2)
       nokogiri (>= 1.12.0)
     mail (2.8.1)
@@ -306,11 +306,11 @@ GEM
     netrc (0.11.0)
     newspaper (0.2.0)
     nio4r (2.7.3)
-    nokogiri (1.16.5-arm64-darwin)
+    nokogiri (1.16.8-arm64-darwin)
       racc (~> 1.4)
-    nokogiri (1.16.5-x86_64-darwin)
+    nokogiri (1.16.8-x86_64-darwin)
       racc (~> 1.4)
-    nokogiri (1.16.5-x86_64-linux)
+    nokogiri (1.16.8-x86_64-linux)
       racc (~> 1.4)
     oauth (1.1.0)
       oauth-tty (~> 1.0, >= 1.0.1)
@@ -367,7 +367,7 @@ GEM
     puma (6.4.3)
       nio4r (~> 2.0)
     raabro (1.4.0)
-    racc (1.7.3)
+    racc (1.8.1)
     rack (2.2.8.1)
     rack-cors (2.0.2)
       rack (>= 2.0.0)
@@ -403,9 +403,9 @@ GEM
       activesupport (>= 5.0.0)
       minitest
       nokogiri (>= 1.6)
-    rails-html-sanitizer (1.6.0)
+    rails-html-sanitizer (1.6.1)
       loofah (~> 2.21)
-      nokogiri (~> 1.14)
+      nokogiri (>= 1.15.7, != 1.16.7, != 1.16.6, != 1.16.5, != 1.16.4, != 1.16.3, != 1.16.2, != 1.16.1, != 1.16.0.rc1, != 1.16.0)
     rails-i18n (6.0.0)
       i18n (>= 0.7, < 2)
       railties (>= 6.0.0, < 7)

app/components/products/product_checker_component.html.slim

@@ -0,0 +1,18 @@
+- if !@checker_id || @checker_id == @current_user_id
+  button.a-button.is-block.is-sm.check-product-button[
+    id='check-product-button'
+    class=(@checker_id ? 'is-warning' : 'is-secondary')
+    data-product-id=@product_id
+    data-current-user-id=@current_user_id
+    data-url='/api/products/checker'
+    data-method=(@checker_id ? 'DELETE' : 'PATCH')
+    data-token=form_authenticity_token
+  ]
+    i.fas class=(@checker_id ? 'fa-times' : 'fa-hand-paper')
+    = button_label
+- else
+  .a-button.is-sm.is-block.card-list-item__assignee-button.is-only-mentor
+    span.card-list-item__assignee-image
+      = image_tag @checker_avatar, class: "a-user-icon", width: 20, height: 20
+    span.card-list-item__assignee-name
+      = @checker_name

app/components/products/product_checker_component.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+class Products::ProductCheckerComponent < ViewComponent::Base
+  def initialize(checker_id:, checker_name:, current_user_id:, product_id:, checker_avatar:)
+    @checker_id = checker_id
+    @checker_name = checker_name
+    @current_user_id = current_user_id
+    @product_id = product_id
+    @checker_avatar = checker_avatar
+  end
+
+  def button_label
+    @checker_id ? '担当から外れる' : '担当する'
+  end
+end

app/components/products/product_component.html.slim

@@ -0,0 +1,156 @@
+.card-list-item.has-assigned class=(@product.wip ? 'is-wip' : '')
+  .card-list-item__inner
+    - if @display_user_icon
+      .card-list-item__user
+        = link_to user_url(@product.user), class: "card-list-item__user-link" do
+          span class=["a-user-role", role_class]
+            = image_tag @product.user.avatar_url,
+              class: "card-list-item__user-icon a-user-icon",
+              title: @product.user.icon_title,
+              alt: @product.user.icon_title
+
+    .card-list-item__rows
+      .card-list-item__row
+        .card-list-item-title
+          - if not_responded_sign?
+            .card-list-item__notresponded
+          .card-list-item-title__start
+            - if @product.wip
+              .a-list-item-badge.is-wip
+                span WIP
+          h2.card-list-item-title__title itemprop='name'
+            - @product.title
+            = link_to practice_title,
+              product_url(@product),
+              class: "card-list-item-title__link a-text-link js-unconfirmed-link",
+              itemprop: "url"
+
+      .card-list-item__row
+        .card-list-item-meta
+          .card-list-item-meta__items
+            .card-list-item-meta__item
+              = link_to @product.user.long_name, user_url(@product.user), class: "a-user-name"
+
+      .card-list-item__row
+        .card-list-item-meta
+          .card-list-item-meta__items
+            - if @product.wip
+              .card-list-item-meta__item
+                .a-meta
+                  | 提出物作成中
+            - elsif @product.published_at
+              .card-list-item-meta__item
+                time.a-meta
+                  span.a-meta__label
+                    | 提出
+                  = l(@product.published_at)
+            - else
+              .card-list-item-meta__item
+                time.a-meta
+                  span.a-meta__label
+                    | 提出
+                  = l(@product.created_at)
+
+            .card-list-item-meta__item
+              - if @product.updated_at
+                time.a-meta
+                  span.a-meta__label
+                    | 更新
+                  = l(@product.updated_at)
+
+            - if @display_until_next_elapsed_days && elapsed_days < @reply_deadline_days
+              time.a-meta
+                span.a-meta__label
+                  | 次の経過日数まで
+                - if until_next_elapsed_days < 1
+                  | 1時間未満
+                - else
+                  | 約#{until_next_elapsed_days}時間
+
+      - if @product.comments.size > 0
+        hr.card-list-item__row-separator
+        .card-list-item__row
+          .card-list-item-meta
+            .card-list-item-meta__items
+              .card-list-item-meta__item
+                .a-meta コメント（#{@product.comments.size}）
+              .card-list-item-meta__item
+                .card-list-item__user-icons
+                  - @product.commented_users.distinct.each do |user|
+                    a.card-list-item__user-icons-icon href=user_path(user)
+                      = image_tag user.avatar_url,
+                        class: "a-user-icon #{role_class}",
+                        title: user.icon_title,
+                        alt: user.icon_title
+
+              - if @product.self_last_commented_at && @product.mentor_last_commented_at
+                .card-list-item-meta__item
+                  - if @product.self_last_commented_at > @product.mentor_last_commented_at
+                    time.a-meta
+                      | 〜 #{l(@product.self_last_commented_at)}（
+                      strong 提出者
+                      | ）
+                  - else
+                    time.a-meta
+                      | 〜 #{l(@product.mentor_last_commented_at)}（メンター）
+              - elsif @product.self_last_commented_at || @product.mentor_last_commented_at
+                .card-list-item-meta__item
+                  - if @product.self_last_commented_at
+                    time.a-meta
+                      | 〜 #{l(@product.self_last_commented_at)}（
+                      strong 提出者
+                      | ）
+                  - else
+                    time.a-meta
+                      | 〜 #{l(@product.mentor_last_commented_at)}（メンター）
+
+
+      - if (@is_mentor || @is_admin) && @product.user.primary_role == 'trainee'
+        .card-list-item__row
+          .card-list-item-meta__items
+            .card-list-item-meta__item
+              - if @product.user.training_ends_on
+                time.a-meta dateTime=@product.user.training_ends_on
+                  span.a-meta__label
+                    | 研修終了日
+                  span.a-meta__value
+                    = l(@product.user.training_ends_on)
+                  - case @product.user.training_remaining_days
+                  - when 0
+                    span.a-meta__value.is-danger
+                      | （本日研修最終日）
+                  - when ..-1
+                    span.a-meta__value
+                      | （研修終了）
+                  - when 1..6
+                    span.a-meta__value.is-danger
+                      | （あと#{@product.user.training_remaining_days}日）
+                  - else
+                    span.a-meta__value
+                      | （あと#{@product.user.training_remaining_days}日）
+              - else
+                .a-meta
+                  span.a-meta__label
+                    | 研修終了日
+                  span.a-meta__value
+                    | 未入力
+
+      - if @is_mentor && @product.checks.size == 0
+        .card-list-item__row.is-only-mentor
+          .card-list-item__assignee
+            = render(Products::ProductCheckerComponent.new( \
+              checker_id: @product.checker_id,
+              checker_name: @product.checker_name,
+              checker_avatar: @product.checker_avatar,
+              current_user_id: @current_user_id,
+              product_id: @product.id))
+
+    - if @product.checks.size > 0
+      .stamp.stamp-approve
+        h2.stamp__content.is-title
+          | 確認済
+        time.stamp__content.is-created-at
+          = last_checked_at
+        .stamp__content.is-user-name
+          .stamp__content-inner
+            = last_checked_user_login_name

app/components/products/product_component.rb

@@ -0,0 +1,44 @@
+# frozen_string_literal: true
+
+class Products::ProductComponent < ViewComponent::Base
+  def initialize(product:, is_mentor:, is_admin:, current_user_id:, reply_deadline_days:, display_until_next_elapsed_days: false, display_user_icon: true) # rubocop:disable Metrics/ParameterLists
+    @product = product
+    @is_mentor = is_mentor
+    @is_admin = is_admin
+    @current_user_id = current_user_id
+    @reply_deadline_days = reply_deadline_days
+    @display_until_next_elapsed_days = display_until_next_elapsed_days
+    @display_user_icon = display_user_icon
+  end
+
+  def role_class
+    "is-#{@product.user.primary_role}"
+  end
+
+  def practice_title
+    "#{@product.practice.title}の提出物"
+  end
+
+  def not_responded_sign?
+    @product.comments.empty? ||
+      (@product.self_last_commented_at &&
+        (!@product.mentor_last_commented_at || @product.self_last_commented_at > @product.mentor_last_commented_at))
+  end
+
+  def until_next_elapsed_days
+    ((elapsed_days.ceil - elapsed_days) * 24).floor
+  end
+
+  def elapsed_days
+    time = @product.published_at || @product.created_at
+    ((Time.zone.now - time) / 1.day).to_f
+  end
+
+  def last_checked_at
+    l(@product.checks.last.created_at.to_date, format: :short)
+  end
+
+  def last_checked_user_login_name
+    @product.checks.last.user.login_name
+  end
+end

app/components/products/unassigned_products_component.html.slim

@@ -0,0 +1,32 @@
+.products
+  - filtered_products_grouped_by_elapsed_days.each do |elapsed_days, products|
+    .a-card.h-auto
+      header.card-header.a-elapsed-days class=elapsed_days_class(elapsed_days) id=elapsed_days_id(elapsed_days)
+        h2.card-header__title
+          = elapsed_days_text(elapsed_days)
+          span.card-header__count
+            | （#{count_products_grouped_by(products)}）
+      .card-list
+        .card-list__items
+          - products.each do |product|
+            = render(Products::ProductComponent.new( \
+              product:,
+              is_mentor: @is_mentor,
+              is_admin: @is_admin,
+              current_user_id: @current_user_id,
+              reply_deadline_days: @reply_deadline_days,
+              display_until_next_elapsed_days: true))
+
+.under-cards
+  .under-cards__links.mt-4.text-center.leading-normal.text-sm
+    = link_to "/products/unassigned##{@reply_warning_days - 1}days-elapsed",
+      class: "divide-indigo-800 block p-3 border rounded border-solid text-indigo-800 a-hover-link hover:bg-black" do
+      - if count_almost_passed_reply_warning_days > 0
+        strong = count_almost_passed_reply_warning_days
+        | 件の提出物が、
+        br
+        | 8時間以内に#{@reply_warning_days}日経過に到達します。
+      - else
+        | しばらく#{@reply_warning_days}日経過に到達する
+        br
+        | 提出物はありません。