Release 2024-06-12 08:05:58 +0000

app/controllers/api/bookmarks_controller.rb

@@ -7,6 +7,7 @@ def index
     per = params[:per] || PAGER_NUMBER
     bookmarks = Bookmark.where(user: current_user).order(created_at: :desc).preload(bookmarkable: :user)
     @bookmarks = Kaminari.paginate_array(bookmarks).page(params[:page]).per(per)
+    @unpaged_bookmarks = bookmarks
     return unless params[:bookmarkable_id] && params[:bookmarkable_type]
 
     @bookmarks = Bookmark.where(

app/controllers/current_user/bookmarks_controller.rb

@@ -4,9 +4,4 @@ class CurrentUser::BookmarksController < ApplicationController
   def index
     @user = current_user
   end
-
-  def destroy
-    Bookmark.find(params[:id]).destroy
-    redirect_to root_path, notice: 'Bookmarkを削除しました。'
-  end
 end

app/controllers/external_entries_controller.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
 class ExternalEntriesController < ApplicationController
-  def index; end
+  def index
+    @external_entries = ExternalEntry.with_avatar.order(published_at: :desc).page(params[:page])
+  end
 end

app/controllers/home_controller.rb

@@ -42,10 +42,11 @@ def display_dashboard
     @completed_learnings = current_user.learnings.where(status: 3).includes(:practice).order(updated_at: :desc)
     @inactive_students = User.with_attached_avatar.inactive_students_and_trainees.order(last_activity_at: :desc)
     @job_seeking_users = User.with_attached_avatar.job_seeking.includes(:reports, :products, :works, :course, :company)
-    @collegue_trainees = current_user.collegue_trainees&.with_attached_avatar&.includes(:reports, :products, :comments)
-    collegue_trainees_reports = Report.with_avatar.where(wip: false).where(user: current_user.collegue_trainees&.with_attached_avatar)
+    @collegue_trainees = current_user.collegue_trainees.with_attached_avatar.includes(:reports, :products, :comments)
+    collegue_trainees_reports = Report.with_avatar.where(wip: false).where(user: current_user.collegue_trainees.with_attached_avatar)
     @collegue_trainees_recent_reports = collegue_trainees_reports.order(reported_on: :desc).limit(10)
     @recent_reports = Report.with_avatar.where(wip: false).order(reported_on: :desc, created_at: :desc).limit(10)
+    @collegues = current_user.collegues_other_than_self
   end
 
   def display_events_on_dashboard

app/controllers/request_retirements_controller.rb

@@ -0,0 +1,44 @@
+# frozen_string_literal: true
+
+class RequestRetirementsController < ApplicationController
+  before_action :set_request_retirement, only: %i[show]
+  before_action :deny_not_requester, only: %i[show]
+
+  def new
+    @request_retirement = RequestRetirement.new
+  end
+
+  def show; end
+
+  def create
+    @request_retirement = RequestRetirement.new(request_retirement_params)
+    @request_retirement.user = current_user
+    @request_retirement.target_user = User.find(request_retirement_params[:target_user_id])
+
+    if @request_retirement.save
+      UserMailer.request_retirement(@request_retirement).deliver_now
+      redirect_to request_retirement_url(@request_retirement)
+    else
+      render :new, status: :unprocessable_entity
+    end
+  end
+
+  private
+
+  def set_request_retirement
+    @request_retirement = RequestRetirement.find(params[:id])
+  end
+
+  def request_retirement_params
+    params.require(:request_retirement)
+          .permit(:target_user_id,
+                  :reason,
+                  :keep_data)
+  end
+
+  def deny_not_requester
+    return if @request_retirement.user == current_user
+
+    redirect_to root_path, alert: '退会申請をしたユーザーのみが閲覧可能です'
+  end
+end

app/javascript/components/BookmarksInDashboard.jsx

@@ -0,0 +1,153 @@
+import React, { useState } from 'react'
+import useSWR, { useSWRConfig } from 'swr'
+import fetcher from '../fetcher'
+import Bootcamp from '../bootcamp'
+import UserIcon from './UserIcon'
+import { toast } from '../toast_react'
+
+export default function BookmarksInDashboard() {
+  const [editable, setEditable] = useState(false)
+  const per = 5
+  const bookmarksUrl = `/api/bookmarks.json?&per=${per}`
+
+  const { data, error } = useSWR(bookmarksUrl, fetcher)
+  if (error) return <>エラーが発生しました。</>
+  if (!data) return <>ロード中…</>
+
+  if (data.unpagedBookmarks.length === 0) {
+    const bookmarksDomNode = document.getElementById('bookmarks-in-dashboard')
+    bookmarksDomNode.classList.add('hidden')
+  }
+
+  return (
+    <div className="a-card">
+      <header className="card-header is-sm">
+        <h2 className="card-header__title">最新のブックマーク</h2>
+        <div className="card-header__action">
+          <EditButton editable={editable} setEditable={setEditable} />
+          <span></span>
+        </div>
+      </header>
+      <hr className="a-border-tint" />
+      <div className="card-list">
+        {data.bookmarks.map((bookmark) => {
+          return (
+            <Bookmark
+              key={bookmark.id}
+              bookmark={bookmark}
+              editable={editable}
+              bookmarksUrl={bookmarksUrl}
+            />
+          )
+        })}
+      </div>
+      <footer className="card-footer">
+        <div className="card-footer__footer-link">
+          <a
+            href={`current_user/bookmarks`}
+            className="card-footer__footer-text-link">
+            全てのブックマーク（{data.unpagedBookmarks.length}）
+          </a>
+        </div>
+      </footer>
+    </div>
+  )
+}
+
+const EditButton = ({ editable, setEditable }) => {
+  return (
+    <>
+      <label
+        className="a-form-label is-sm is-inline spec-bookmark-edit"
+        htmlFor="card-list-tools__action">
+        編集
+      </label>
+      <label className="a-on-off-checkbox is-sm">
+        <input
+          id="card-list-tools__action"
+          name="card-list-tools__action"
+          type="checkbox"
+          onChange={() => setEditable(!editable)}
+          checked={editable}
+        />
+        <span id="spec-edit-mode" />
+      </label>
+    </>
+  )
+}
+
+const Bookmark = ({ bookmark, editable, bookmarksUrl }) => {
+  const date = bookmark.reported_on || bookmark.created_at
+  const createdAt = Bootcamp.iso8601ToFullTime(date)
+  const { mutate } = useSWRConfig()
+  const afterDelete = (id) => {
+    Bootcamp.delete(`/api/bookmarks/${id}.json`)
+      .then((_response) => {
+        mutate(bookmarksUrl)
+        toast('Bookmarkを削除しました。')
+      })
+      .catch((error) => {
+        console.warn(error)
+      })
+  }
+
+  return (
+    <div className={'card-list-item is-' + bookmark.bookmark_class_name}>
+      <div className="card-list-item__inner">
+        {bookmark.modelName === 'Talk' ? (
+          <div className="card-list-item__user">
+            <UserIcon user={bookmark.user} blockClassSuffix="card-list-item" />
+          </div>
+        ) : (
+          <div className="card-list-item__label">{bookmark.modelNameI18n}</div>
+        )}
+        <div className="card-list-item__rows">
+          <div className="card-list-item__row">
+            <div className="card-list-item-title">
+              <div className="card-list-item-title__title">
+                <a
+                  href={bookmark.url}
+                  className="card-list-item-title__link a-text-link">
+                  {bookmark.title}
+                </a>
+              </div>
+            </div>
+          </div>
+          {bookmark.modelName !== 'Talk' && (
+            <div>
+              <div className="card-list-item__row">
+                <div className="card-list-item-meta">
+                  <div className="card-list-item-meta__item">
+                    <a href={bookmark.authorUrl} className="a-user-name">
+                      {bookmark.authorLoginName}({bookmark.authorNameKana})
+                    </a>
+                  </div>
+                  <div className="card-list-item-meta__item">
+                    <time className="a-meta" dateTime={bookmark.updated_at}>
+                      {createdAt}
+                    </time>
+                  </div>
+                </div>
+              </div>
+            </div>
+          )}
+        </div>
+        {editable && (
+          <DeleteButton id={bookmark.id} afterDelete={afterDelete} />
+        )}
+      </div>
+    </div>
+  )
+}
+
+const DeleteButton = ({ id, afterDelete }) => {
+  return (
+    <div className="card-list-item__option">
+      <div
+        className="card-list-item__option js-bookmark-delete-button a-button is-sm is-primary"
+        onClick={() => afterDelete(id)}>
+        削除
+      </div>
+    </div>
+  )
+}

app/javascript/components/Reports.jsx

@@ -136,19 +136,11 @@ const NoReports = ({ unchecked }) => {
             </p>
           </>
         ) : (
-          <div className="card-list a-card">
-            <div className="card-body">
-              <div className="card__description">
-                <div className="o-empty-message">
-                  <div className="o-empty-message__icon">
-                    <i className="fa-regular fa-sad-tear" />
-                  </div>
-                  <p className="o-empty-message__text">
-                    日報はまだありません。
-                  </p>
-                </div>
-              </div>
+          <div className="o-empty-message">
+            <div className="o-empty-message__icon">
+              <i className="fa-regular fa-sad-tear" />
             </div>
+            <p className="o-empty-message__text">日報はまだありません。</p>
           </div>
         )}
       </div>