Browse Source

#90

feature/090
みてるぞ 20 hours ago
parent
commit
638dccad6d
18 changed files with 259 additions and 55 deletions
  1. +63
    -0
      backend/app/controllers/application_controller.rb
  2. +7
    -3
      backend/app/controllers/deerjikists_controller.rb
  3. +6
    -4
      backend/app/controllers/materials_controller.rb
  4. +4
    -2
      backend/app/controllers/nico_tags_controller.rb
  5. +9
    -9
      backend/app/controllers/posts_controller.rb
  6. +5
    -4
      backend/app/controllers/preview_controller.rb
  7. +6
    -4
      backend/app/controllers/tag_children_controller.rb
  8. +8
    -10
      backend/app/controllers/tags_controller.rb
  9. +1
    -1
      backend/app/controllers/theatre_comments_controller.rb
  10. +2
    -2
      backend/app/controllers/users_controller.rb
  11. +10
    -6
      backend/app/controllers/wiki_pages_controller.rb
  12. +47
    -0
      backend/spec/requests/error_responses_spec.rb
  13. +30
    -4
      frontend/src/components/PostEditForm.tsx
  14. +6
    -3
      frontend/src/components/PostFormTagsArea.tsx
  15. +8
    -2
      frontend/src/components/PostOriginalCreatedTimeField.tsx
  16. +17
    -0
      frontend/src/components/common/FieldError.tsx
  17. +30
    -0
      frontend/src/lib/apiErrors.ts
  18. +0
    -1
      frontend/src/pages/posts/PostDetailPage.tsx

+ 63
- 0
backend/app/controllers/application_controller.rb View File

@@ -1,4 +1,7 @@
class ApplicationController < ActionController::API class ApplicationController < ActionController::API
rescue_from ActiveRecord::RecordInvalid, with: :render_record_invalid
rescue_from ActiveRecord::RecordNotUnique, with: :render_record_not_unique

before_action :reject_banned_ip_address! before_action :reject_banned_ip_address!
before_action :authenticate_user before_action :authenticate_user
before_action :reject_banned_user! before_action :reject_banned_user!
@@ -25,6 +28,42 @@ class ApplicationController < ActionController::API
end end
end end


def render_bad_request message = 'リクエストが不正です.', field: nil, code: :bad_request
render_error(:bad_request, message, field:, code:)
end

def render_unprocessable_entity message = '入力を確認してください.', field: nil, code: :invalid
render_error(:unprocessable_entity, message, field:, code:)
end

def render_error status, message, field: nil, code: status
error = { code: code.to_s, message: }
error[:field] = field.to_s if field.present?

render json: { errors: [error] }, status:
end

def render_model_errors record, status: :unprocessable_entity
errors =
record.errors.map do |error|
{ code: error.type.to_s,
field: error.attribute.to_s,
message: error.full_message }
end

errors = [{ code: 'invalid', message: '入力を確認してください.' }] if errors.empty?

render json: { errors: }, status:
end

def render_record_invalid error
render_model_errors(error.record)
end

def render_record_not_unique _error = nil
render_unprocessable_entity('既に存在してゐます.', code: :taken)
end

def reject_banned_ip_address! def reject_banned_ip_address!
ip_address = IpAddress.find_by(ip_address: IPAddr.new(request.remote_ip).hton) ip_address = IpAddress.find_by(ip_address: IPAddr.new(request.remote_ip).hton)
return unless ip_address&.banned? return unless ip_address&.banned?
@@ -37,4 +76,28 @@ class ApplicationController < ActionController::API


head :forbidden head :forbidden
end end

def render_validation_error record = nil, fields: { }, base: []
errors = { }

if record
record.errors.messages.each do |attr, messages|
errors[attr] ||= []
errors[attr].concat(messages)
end
end

fields.each do |attr, messages|
errors[attr] ||= []
errors[attr].concat(Array(messages))
end

base_errors = Array(base) - Array(errors.delete(:base))

render json: { type: 'validation_error',
message: '入力内容を確認してください.',
errors:,
base_errors: },
status: :unprocessable_entity
end
end end

+ 7
- 3
backend/app/controllers/deerjikists_controller.rb View File

@@ -2,7 +2,8 @@ class DeerjikistsController < ApplicationController
def show def show
platform = params[:platform].to_s.strip platform = params[:platform].to_s.strip
code = params[:code].to_s.strip code = params[:code].to_s.strip
return head :bad_request if platform.blank? || code.blank?
return render_bad_request('platform は必須です.', field: :platform) if platform.blank?
return render_bad_request('code は必須です.', field: :code) if code.blank?


deerjikist = Deerjikist deerjikist = Deerjikist
.joins(:tag) .joins(:tag)
@@ -22,7 +23,9 @@ class DeerjikistsController < ApplicationController
platform = params[:platform].to_s.strip platform = params[:platform].to_s.strip
code = params[:code].to_s.strip code = params[:code].to_s.strip
tag_id = params[:tag_id].to_i tag_id = params[:tag_id].to_i
return head :bad_request if platform.blank? || code.blank? || tag_id <= 0
return render_bad_request('platform は必須です.', field: :platform) if platform.blank?
return render_bad_request('code は必須です.', field: :code) if code.blank?
return render_bad_request('tag_id が不正です.', field: :tag_id) if tag_id <= 0


deerjikist = Deerjikist.find_or_initialize_by(platform:, code:).tap do |d| deerjikist = Deerjikist.find_or_initialize_by(platform:, code:).tap do |d|
d.tag_id = tag_id d.tag_id = tag_id
@@ -38,7 +41,8 @@ class DeerjikistsController < ApplicationController


platform = params[:platform].to_s.strip platform = params[:platform].to_s.strip
code = params[:code].to_s.strip code = params[:code].to_s.strip
return head :bad_request if platform.blank? || code.blank?
return render_bad_request('platform は必須です.', field: :platform) if platform.blank?
return render_bad_request('code は必須です.', field: :code) if code.blank?


Deerjikist.find([platform, code]).destroy! Deerjikist.find([platform, code]).destroy!




+ 6
- 4
backend/app/controllers/materials_controller.rb View File

@@ -40,7 +40,8 @@ class MaterialsController < ApplicationController
tag_name_raw = params[:tag].to_s.strip tag_name_raw = params[:tag].to_s.strip
file = params[:file] file = params[:file]
url = params[:url].to_s.strip.presence url = params[:url].to_s.strip.presence
return head :bad_request if tag_name_raw.blank? || (file.blank? && url.blank?)
return render_bad_request('タグは必須です.', field: :tag) if tag_name_raw.blank?
return render_bad_request('ファイルまたは URL は必須です.') if file.blank? && url.blank?


tag_name = TagName.find_undiscard_or_create_by!(name: tag_name_raw) tag_name = TagName.find_undiscard_or_create_by!(name: tag_name_raw)
tag = tag_name.tag tag = tag_name.tag
@@ -54,7 +55,7 @@ class MaterialsController < ApplicationController
if material.save if material.save
render json: MaterialRepr.base(material, host: request.base_url), status: :created render json: MaterialRepr.base(material, host: request.base_url), status: :created
else else
render json: { errors: material.errors.full_messages }, status: :unprocessable_entity
render_model_errors(material)
end end
end end


@@ -68,7 +69,8 @@ class MaterialsController < ApplicationController
tag_name_raw = params[:tag].to_s.strip tag_name_raw = params[:tag].to_s.strip
file = params[:file] file = params[:file]
url = params[:url].to_s.strip.presence url = params[:url].to_s.strip.presence
return head :bad_request if tag_name_raw.blank? || (file.blank? && url.blank?)
return render_bad_request('タグは必須です.', field: :tag) if tag_name_raw.blank?
return render_bad_request('ファイルまたは URL は必須です.') if file.blank? && url.blank?


tag_name = TagName.find_undiscard_or_create_by!(name: tag_name_raw) tag_name = TagName.find_undiscard_or_create_by!(name: tag_name_raw)
tag = tag_name.tag tag = tag_name.tag
@@ -84,7 +86,7 @@ class MaterialsController < ApplicationController
if material.save if material.save
render json: MaterialRepr.base(material, host: request.base_url) render json: MaterialRepr.base(material, host: request.base_url)
else else
render json: { errors: material.errors.full_messages }, status: :unprocessable_entity
render_model_errors(material)
end end
end end




+ 4
- 2
backend/app/controllers/nico_tags_controller.rb View File

@@ -30,12 +30,14 @@ class NicoTagsController < ApplicationController
id = params[:id].to_i id = params[:id].to_i


tag = Tag.find(id) tag = Tag.find(id)
return head :bad_request unless tag.nico?
return render_bad_request('ニコニコ・タグを指定してください.', field: :id) unless tag.nico?


linked_tag_names = params[:tags].to_s.split linked_tag_names = params[:tags].to_s.split
linked_tags = Tag.normalise_tags!(linked_tag_names, with_tagme: false, linked_tags = Tag.normalise_tags!(linked_tag_names, with_tagme: false,
with_no_deerjikist: false) with_no_deerjikist: false)
return head :bad_request if linked_tags.any? { |t| t.nico? }
if linked_tags.any? { |t| t.nico? }
return render_bad_request('ニコニコ・タグ同士は連携できません.', field: :tags)
end


ApplicationRecord.transaction do ApplicationRecord.transaction do
TagVersioning.record_tag_snapshots!(linked_tags, created_by_user: current_user) TagVersioning.record_tag_snapshots!(linked_tags, created_by_user: current_user)


+ 9
- 9
backend/app/controllers/posts_controller.rb View File

@@ -148,11 +148,11 @@ class PostsController < ApplicationController
post.reload post.reload
render json: PostRepr.base(post), status: :created render json: PostRepr.base(post), status: :created
rescue Tag::NicoTagNormalisationError rescue Tag::NicoTagNormalisationError
head :bad_request
render_bad_request('ニコニコ・タグは直接指定できません.', field: :tags)
rescue ArgumentError => e rescue ArgumentError => e
render json: { errors: [e.message] }, status: :unprocessable_entity
render_unprocessable_entity(e.message)
rescue ActiveRecord::RecordInvalid => e rescue ActiveRecord::RecordInvalid => e
render json: { errors: e.record.errors.full_messages }, status: :unprocessable_entity
render_model_errors(e.record)
end end


def viewed def viewed
@@ -175,10 +175,10 @@ class PostsController < ApplicationController


force = bool?(:force) force = bool?(:force)
merge = bool?(:merge) merge = bool?(:merge)
return head :bad_request if force && merge
return render_bad_request('force と merge は同時に指定できません.') if force && merge


base_version_no = parse_base_version_no base_version_no = parse_base_version_no
return head :bad_request if !(force) && !(base_version_no)
return render_bad_request('base_version_no は必須です.', field: :base_version_no) if !(force) && !(base_version_no)


title = params[:title].presence title = params[:title].presence
tag_names = params[:tags].to_s.split tag_names = params[:tags].to_s.split
@@ -238,11 +238,11 @@ class PostsController < ApplicationController
json['tags'] = build_tag_tree_for(post.tags) json['tags'] = build_tag_tree_for(post.tags)
render json:, status: :ok render json:, status: :ok
rescue Tag::NicoTagNormalisationError rescue Tag::NicoTagNormalisationError
head :bad_request
render_bad_request('ニコニコ・タグは直接指定できません.', field: :tags)
rescue ArgumentError => e rescue ArgumentError => e
render json: { errors: [e.message] }, status: :unprocessable_entity
render_validation_error(fields: { parent_post_ids: [e.message] })
rescue ActiveRecord::RecordInvalid => e rescue ActiveRecord::RecordInvalid => e
render json: { errors: e.record.errors.full_messages }, status: :unprocessable_entity
render_validation_error(e.record)
end end


def changes def changes
@@ -416,7 +416,7 @@ class PostsController < ApplicationController


def sync_parent_posts! post, parent_post_ids def sync_parent_posts! post, parent_post_ids
if parent_post_ids.include?(post.id) if parent_post_ids.include?(post.id)
post.errors.add(:base, '自分自身を親投稿にはできません.')
post.errors.add(:parent_post_ids, '自分自身を親投稿にはできません.')
raise ActiveRecord::RecordInvalid, post raise ActiveRecord::RecordInvalid, post
end end




+ 5
- 4
backend/app/controllers/preview_controller.rb View File

@@ -4,7 +4,7 @@ class PreviewController < ApplicationController
return head :unauthorized unless current_user return head :unauthorized unless current_user


url = params[:url] url = params[:url]
return head :bad_request unless url.present?
return render_bad_request('URL は必須です.', field: :url) unless url.present?


unless url.start_with?(/http(s)?:\/\//) unless url.start_with?(/http(s)?:\/\//)
url = 'http://' + url url = 'http://' + url
@@ -16,7 +16,7 @@ class PreviewController < ApplicationController


render json: { title: title } render json: { title: title }
rescue => e rescue => e
render json: { error: e.message }, status: :bad_request
render_bad_request(e.message, field: :url)
end end


def thumbnail def thumbnail
@@ -25,7 +25,7 @@ class PreviewController < ApplicationController
return head :unauthorized unless current_user return head :unauthorized unless current_user


url = params[:url] url = params[:url]
return head :bad_request if url.blank?
return render_bad_request('URL は必須です.', field: :url) if url.blank?


unless url.start_with?(/http(s)?:\/\//) unless url.start_with?(/http(s)?:\/\//)
url = 'http://' + url url = 'http://' + url
@@ -40,7 +40,8 @@ class PreviewController < ApplicationController
File.delete(path) rescue nil File.delete(path) rescue nil
send_file image.path, type: 'image/png', disposition: 'inline' send_file image.path, type: 'image/png', disposition: 'inline'
else else
render json: { error: 'Failed to generate thumbnail' }, status: :internal_server_error
render_error(:internal_server_error, 'サムネールを生成できませんでした.',
code: :thumbnail_generation_failed)
end end
end end
end end

+ 6
- 4
backend/app/controllers/tag_children_controller.rb View File

@@ -5,11 +5,12 @@ class TagChildrenController < ApplicationController


parent_id = params[:parent_id] parent_id = params[:parent_id]
child_id = params[:child_id] child_id = params[:child_id]
return head :bad_request if parent_id.blank? || child_id.blank?
return render_bad_request('parent_id は必須です.', field: :parent_id) if parent_id.blank?
return render_bad_request('child_id は必須です.', field: :child_id) if child_id.blank?


parent = Tag.find(parent_id) parent = Tag.find(parent_id)
child = Tag.find(child_id) child = Tag.find(child_id)
return head :bad_request if parent.nico? || child.nico?
return render_bad_request('ニコニコ・タグの階層は変更できません.') if parent.nico? || child.nico?


ApplicationRecord.transaction do ApplicationRecord.transaction do
TagVersioning.ensure_snapshot!(child, created_by_user: current_user) TagVersioning.ensure_snapshot!(child, created_by_user: current_user)
@@ -27,11 +28,12 @@ class TagChildrenController < ApplicationController


parent_id = params[:parent_id] parent_id = params[:parent_id]
child_id = params[:child_id] child_id = params[:child_id]
return head :bad_request if parent_id.blank? || child_id.blank?
return render_bad_request('parent_id は必須です.', field: :parent_id) if parent_id.blank?
return render_bad_request('child_id は必須です.', field: :child_id) if child_id.blank?


parent = Tag.find(parent_id) parent = Tag.find(parent_id)
child = Tag.find(child_id) child = Tag.find(child_id)
return head :bad_request if parent.nico? || child.nico?
return render_bad_request('ニコニコ・タグの階層は変更できません.') if parent.nico? || child.nico?


ApplicationRecord.transaction do ApplicationRecord.transaction do
TagVersioning.ensure_snapshot!(child, created_by_user: current_user) TagVersioning.ensure_snapshot!(child, created_by_user: current_user)


+ 8
- 10
backend/app/controllers/tags_controller.rb View File

@@ -168,7 +168,7 @@ class TagsController < ApplicationController


def show_by_name def show_by_name
name = params[:name].to_s.strip name = params[:name].to_s.strip
return head :bad_request if name.blank?
return render_bad_request('name は必須です.', field: :name) if name.blank?


tag = Tag.joins(:tag_name) tag = Tag.joins(:tag_name)
.includes(:tag_name, :materials, tag_name: :wiki_page) .includes(:tag_name, :materials, tag_name: :wiki_page)
@@ -192,7 +192,7 @@ class TagsController < ApplicationController


def deerjikists_by_name def deerjikists_by_name
name = params[:name].to_s.strip name = params[:name].to_s.strip
return head :bad_request if name.blank?
return render_bad_request('name は必須です.', field: :name) if name.blank?


tag = Tag.joins(:tag_name) tag = Tag.joins(:tag_name)
.includes(:tag_name, tag_name: :wiki_page) .includes(:tag_name, tag_name: :wiki_page)
@@ -228,7 +228,7 @@ class TagsController < ApplicationController


def materials_by_name def materials_by_name
name = params[:name].to_s.strip name = params[:name].to_s.strip
return head :bad_request if name.blank?
return render_bad_request('name は必須です.', field: :name) if name.blank?


tag = Tag.joins(:tag_name) tag = Tag.joins(:tag_name)
.includes(:tag_name, :materials, tag_name: :wiki_page) .includes(:tag_name, :materials, tag_name: :wiki_page)
@@ -247,17 +247,16 @@ class TagsController < ApplicationController


name = params[:name].to_s.strip name = params[:name].to_s.strip
category = params[:category].to_s.strip category = params[:category].to_s.strip
return head :unprocessable_entity if name.blank? || category.blank?
return render_unprocessable_entity('名前は必須です.', field: :name) if name.blank?
return render_unprocessable_entity('カテゴリは必須です.', field: :category) if category.blank?


if name != tag.name && if name != tag.name &&
tag.in?([Tag.tagme, Tag.bot, Tag.no_deerjikist, Tag.video, Tag.niconico]) tag.in?([Tag.tagme, Tag.bot, Tag.no_deerjikist, Tag.video, Tag.niconico])
return render json: { error: 'システム・タグの名称は変更できません.' },
status: :unprocessable_entity
return render_unprocessable_entity('システム・タグの名称は変更できません.', field: :name)
end end


if tag.nico? || category == 'nico' if tag.nico? || category == 'nico'
return render json: { error: 'ニコタグは変更できません.' },
status: :unprocessable_entity
return render_unprocessable_entity('ニコタグは変更できません.', field: :category)
end end


alias_names = params[:aliases].to_s.split.uniq alias_names = params[:aliases].to_s.split.uniq
@@ -302,8 +301,7 @@ class TagsController < ApplicationController
tag = Tag.find(params[:id]) tag = Tag.find(params[:id])


if tag.nico? || (category.present? && category == 'nico') if tag.nico? || (category.present? && category == 'nico')
return render json: { error: 'ニコタグは変更できません.' },
status: :unprocessable_entity
return render_unprocessable_entity('ニコタグは変更できません.', field: :category)
end end


ApplicationRecord.transaction do ApplicationRecord.transaction do


+ 1
- 1
backend/app/controllers/theatre_comments_controller.rb View File

@@ -15,7 +15,7 @@ class TheatreCommentsController < ApplicationController
return head :unauthorized unless current_user return head :unauthorized unless current_user


content = params[:content] content = params[:content]
return head :unprocessable_entity if content.blank?
return render_unprocessable_entity('本文は必須です.', field: :content) if content.blank?


theatre = Theatre.find_by(id: params[:theatre_id]) theatre = Theatre.find_by(id: params[:theatre_id])
return head :not_found unless theatre return head :not_found unless theatre


+ 2
- 2
backend/app/controllers/users_controller.rb View File

@@ -42,12 +42,12 @@ class UsersController < ApplicationController
return head :unauthorized if user&.id != params[:id].to_i return head :unauthorized if user&.id != params[:id].to_i


name = params[:name] name = params[:name]
return head :bad_request if name.blank?
return render_bad_request('名前は必須です.', field: :name) if name.blank?


if user.update(name:) if user.update(name:)
render json: user.slice(:id, :name, :inheritance_code, :role), status: :ok render json: user.slice(:id, :name, :inheritance_code, :role), status: :ok
else else
render json: user.errors, status: :unprocessable_entity
render_model_errors(user)
end end
end end




+ 10
- 6
backend/app/controllers/wiki_pages_controller.rb View File

@@ -46,7 +46,7 @@ class WikiPagesController < ApplicationController


def diff def diff
id = params[:id] id = params[:id]
return head :bad_request if id.blank?
return render_bad_request('id は必須です.', field: :id) if id.blank?


from = params[:from].presence from = params[:from].presence
to = params[:to].presence to = params[:to].presence
@@ -56,7 +56,7 @@ class WikiPagesController < ApplicationController
from_rev = from && page.wiki_revisions.find(from) from_rev = from && page.wiki_revisions.find(from)
to_rev = to ? page.wiki_revisions.find(to) : page.current_revision to_rev = to ? page.wiki_revisions.find(to) : page.current_revision
if ((from_rev && !(from_rev.content?)) || !(to_rev&.content?)) if ((from_rev && !(from_rev.content?)) || !(to_rev&.content?))
return head :unprocessable_entity
return render_unprocessable_entity('差分を表示できない版です.')
end end


diffs = Diff::LCS.sdiff(from_rev&.body&.lines || [], to_rev.body.lines) diffs = Diff::LCS.sdiff(from_rev&.body&.lines || [], to_rev.body.lines)
@@ -89,7 +89,8 @@ class WikiPagesController < ApplicationController
body = params[:body].to_s body = params[:body].to_s
message = params[:message].presence message = params[:message].presence


return head :unprocessable_entity if title.blank? || body.blank?
return render_unprocessable_entity('タイトルは必須です.', field: :title) if title.blank?
return render_unprocessable_entity('本文は必須です.', field: :body) if body.blank?


tag_name = TagName.find_undiscard_or_create_by!(name: title) tag_name = TagName.find_undiscard_or_create_by!(name: title)


@@ -101,8 +102,10 @@ class WikiPagesController < ApplicationController
message:) message:)


render json: WikiPageRepr.base(page), status: :created render json: WikiPageRepr.base(page), status: :created
rescue ActiveRecord::RecordInvalid, ActiveRecord::RecordNotUnique
head :unprocessable_entity
rescue ActiveRecord::RecordInvalid => e
render_model_errors(e.record)
rescue ActiveRecord::RecordNotUnique
render_record_not_unique
end end


def update def update
@@ -112,7 +115,8 @@ class WikiPagesController < ApplicationController
title = params[:title]&.strip title = params[:title]&.strip
body = params[:body].to_s body = params[:body].to_s


return head :unprocessable_entity if title.blank? || body.blank?
return render_unprocessable_entity('タイトルは必須です.', field: :title) if title.blank?
return render_unprocessable_entity('本文は必須です.', field: :body) if body.blank?


page = WikiPage.find(params[:id]) page = WikiPage.find(params[:id])
base_revision_id = params[:base_revision_id].presence base_revision_id = params[:base_revision_id].presence


+ 47
- 0
backend/spec/requests/error_responses_spec.rb View File

@@ -0,0 +1,47 @@
require 'rails_helper'

RSpec.describe 'error responses', type: :request do
describe 'manual input errors' do
it 'returns a stable errors array for bad requests' do
user = create(:user)
sign_in_as(user)

put "/users/#{ user.id }", params: { name: ' ' }

expect(response).to have_http_status(:bad_request)
expect(json.fetch('errors')).to contain_exactly(
include('code' => 'bad_request',
'field' => 'name',
'message' => be_present))
end

it 'returns a stable errors array for unprocessable requests' do
member = create(:user, :member)
tag = create(:tag, :general, name: 'error_response_tag')
sign_in_as(member)

patch "/tags/#{ tag.id }", params: { category: 'nico' }

expect(response).to have_http_status(:unprocessable_entity)
expect(json.fetch('errors')).to contain_exactly(
include('code' => 'invalid',
'field' => 'category',
'message' => be_present))
end
end

describe 'model validation errors' do
it 'returns field, code, and message for model errors' do
user = create(:user)
sign_in_as(user)

put "/users/#{ user.id }", params: { name: 'a' * 256 }

expect(response).to have_http_status(:unprocessable_entity)
expect(json.fetch('errors')).to include(
include('code' => 'too_long',
'field' => 'name',
'message' => be_present))
end
end
end

+ 30
- 4
frontend/src/components/PostEditForm.tsx View File

@@ -2,17 +2,23 @@ import { useEffect, useState } from 'react'


import PostFormTagsArea from '@/components/PostFormTagsArea' import PostFormTagsArea from '@/components/PostFormTagsArea'
import PostOriginalCreatedTimeField from '@/components/PostOriginalCreatedTimeField' import PostOriginalCreatedTimeField from '@/components/PostOriginalCreatedTimeField'
import FieldError from '@/components/common/FieldError'
import Label from '@/components/common/Label' import Label from '@/components/common/Label'
import { useDialogue } from '@/components/dialogues/DialogueProvider' import { useDialogue } from '@/components/dialogues/DialogueProvider'
import { Button } from '@/components/ui/button' import { Button } from '@/components/ui/button'
import { toast } from '@/components/ui/use-toast' import { toast } from '@/components/ui/use-toast'
import { isApiError } from '@/lib/api' import { isApiError } from '@/lib/api'
import { extractValidationError } from '@/lib/apiErrors'
import { updatePost } from '@/lib/posts' import { updatePost } from '@/lib/posts'


import type { FC, FormEvent } from 'react' import type { FC, FormEvent } from 'react'


import type { FieldErrors } from '@/lib/apiErrors'
import type { Post, Tag } from '@/types' import type { Post, Tag } from '@/types'


type PostFormField =
'parentPostId' | 'tags' | 'originalCreatedFrom' | 'originalCreatedBefore'



const tagsToStr = (tags: Tag[]): string => { const tagsToStr = (tags: Tag[]): string => {
const result: Tag[] = [] const result: Tag[] = []
@@ -34,7 +40,9 @@ type Props = { post: Post




const PostEditForm: FC<Props> = ({ post, onSave }) => { const PostEditForm: FC<Props> = ({ post, onSave }) => {
const [baseErrors, setBaseErrors] = useState<string[]> ([])
const [disabled, setDisabled] = useState (false) const [disabled, setDisabled] = useState (false)
const [fieldErrors, setFieldErrors] = useState<FieldErrors> ({ })
const [originalCreatedBefore, setOriginalCreatedBefore] = const [originalCreatedBefore, setOriginalCreatedBefore] =
useState<string | null> (post.originalCreatedBefore) useState<string | null> (post.originalCreatedBefore)
const [originalCreatedFrom, setOriginalCreatedFrom] = const [originalCreatedFrom, setOriginalCreatedFrom] =
@@ -47,6 +55,9 @@ const PostEditForm: FC<Props> = ({ post, onSave }) => {
const dialogue = useDialogue () const dialogue = useDialogue ()


const update = async (...args: Parameters<typeof updatePost>) => { const update = async (...args: Parameters<typeof updatePost>) => {
setFieldErrors ({ })
setBaseErrors ([])

try try
{ {
const data = await updatePost (...args) const data = await updatePost (...args)
@@ -67,7 +78,18 @@ const PostEditForm: FC<Props> = ({ post, onSave }) => {


if (response?.status !== 409) if (response?.status !== 409)
{ {
toast ({ description: '更新はできなかったよ……' })
const validationError = extractValidationError (e)

if (validationError)
{
setFieldErrors (validationError.fieldErrors)
setBaseErrors (validationError.baseErrors)
toast ({ description: '更新はできなかったよ……' })
return
}

toast ({ title: '失敗……', description: '入力を確認してください.' })

return return
} }


@@ -142,13 +164,15 @@ const PostEditForm: FC<Props> = ({ post, onSave }) => {
value={parentPostIds} value={parentPostIds}
onChange={e => setParentPostIds (e.target.value)} onChange={e => setParentPostIds (e.target.value)}
className="w-full border p-2 rounded"/> className="w-full border p-2 rounded"/>
<FieldError messages={fieldErrors.url}/>
</div> </div>


{/* タグ */} {/* タグ */}
<PostFormTagsArea <PostFormTagsArea
disabled={disabled} disabled={disabled}
tags={tags} tags={tags}
setTags={setTags}/>
setTags={setTags}
errors={fieldErrors.tags}/>


{/* オリジナルの作成日時 */} {/* オリジナルの作成日時 */}
<PostOriginalCreatedTimeField <PostOriginalCreatedTimeField
@@ -156,7 +180,9 @@ const PostEditForm: FC<Props> = ({ post, onSave }) => {
originalCreatedFrom={originalCreatedFrom} originalCreatedFrom={originalCreatedFrom}
setOriginalCreatedFrom={setOriginalCreatedFrom} setOriginalCreatedFrom={setOriginalCreatedFrom}
originalCreatedBefore={originalCreatedBefore} originalCreatedBefore={originalCreatedBefore}
setOriginalCreatedBefore={setOriginalCreatedBefore}/>
setOriginalCreatedBefore={setOriginalCreatedBefore}
fromErrors={fieldErrors.originalCreatedFrom}
beforeErrors={fieldErrors.originalCreatedBefore}/>


{/* 送信 */} {/* 送信 */}
<Button <Button
@@ -167,4 +193,4 @@ const PostEditForm: FC<Props> = ({ post, onSave }) => {
</form>) </form>)
} }


export default PostEditForm
export default PostEditForm

+ 6
- 3
frontend/src/components/PostFormTagsArea.tsx View File

@@ -3,6 +3,7 @@
import { useRef, useState } from 'react' import { useRef, useState } from 'react'


import TagSearchBox from '@/components/TagSearchBox' import TagSearchBox from '@/components/TagSearchBox'
import FieldError from '@/components/common/FieldError'
import Label from '@/components/common/Label' import Label from '@/components/common/Label'
import TextArea from '@/components/common/TextArea' import TextArea from '@/components/common/TextArea'
import { apiGet } from '@/lib/api' import { apiGet } from '@/lib/api'
@@ -33,10 +34,11 @@ const replaceToken = (value: string, start: number, end: number, text: string) =


type Props = Omit<ComponentPropsWithoutRef<'textarea'>, 'value' | 'onChange' | 'onBlur'> & { type Props = Omit<ComponentPropsWithoutRef<'textarea'>, 'value' | 'onChange' | 'onBlur'> & {
tags: string tags: string
setTags: (tags: string) => void }
setTags: (tags: string) => void
errors?: string[] }




const PostFormTagsArea: FC<Props> = ({ tags, setTags, ...rest }) => {
const PostFormTagsArea: FC<Props> = ({ tags, setTags, errors, ...rest }) => {
const ref = useRef<HTMLTextAreaElement> (null) const ref = useRef<HTMLTextAreaElement> (null)


const [bounds, setBounds] = useState<{ start: number; end: number }> ({ start: 0, end: 0 }) const [bounds, setBounds] = useState<{ start: number; end: number }> ({ start: 0, end: 0 })
@@ -96,7 +98,8 @@ const PostFormTagsArea: FC<Props> = ({ tags, setTags, ...rest }) => {
: [] as Tag[]} : [] as Tag[]}
activeIndex={-1} activeIndex={-1}
onSelect={handleTagSelect}/>)} onSelect={handleTagSelect}/>)}
<FieldError messages={errors}/>
</div>) </div>)
} }


export default PostFormTagsArea
export default PostFormTagsArea

+ 8
- 2
frontend/src/components/PostOriginalCreatedTimeField.tsx View File

@@ -9,7 +9,9 @@ type Props = {
originalCreatedFrom: string | null originalCreatedFrom: string | null
setOriginalCreatedFrom: (x: string | null) => void setOriginalCreatedFrom: (x: string | null) => void
originalCreatedBefore: string | null originalCreatedBefore: string | null
setOriginalCreatedBefore: (x: string | null) => void }
setOriginalCreatedBefore: (x: string | null) => void
fromErrors?: string[]
beforeErrors?: string[] }




const PostOriginalCreatedTimeField: FC<Props> = ({ disabled, const PostOriginalCreatedTimeField: FC<Props> = ({ disabled,
@@ -19,6 +21,7 @@ const PostOriginalCreatedTimeField: FC<Props> = ({ disabled,
setOriginalCreatedBefore }) => ( setOriginalCreatedBefore }) => (
<div> <div>
<Label>オリジナルの作成日時</Label> <Label>オリジナルの作成日時</Label>

<div className="my-1 flex"> <div className="my-1 flex">
<div className="w-80"> <div className="w-80">
<DateTimeField <DateTimeField
@@ -51,6 +54,8 @@ const PostOriginalCreatedTimeField: FC<Props> = ({ disabled,
</Button> </Button>
</div> </div>
</div> </div>
<FieldError messages={fromErrors}/>

<div className="my-1 flex"> <div className="my-1 flex">
<div className="w-80"> <div className="w-80">
<DateTimeField <DateTimeField
@@ -71,6 +76,7 @@ const PostOriginalCreatedTimeField: FC<Props> = ({ disabled,
</Button> </Button>
</div> </div>
</div> </div>
<FieldError messages={beforeErrors}/>
</div>) </div>)


export default PostOriginalCreatedTimeField
export default PostOriginalCreatedTimeField

+ 17
- 0
frontend/src/components/common/FieldError.tsx View File

@@ -0,0 +1,17 @@
import type { FC } from 'react'

type Props = { messages?: string[] }


export const FieldError: FC<Props> = ({ messages }: Props) => {
if (!(messages?.length))
return null

return (
<ul className="mt-1 space-y-1 text-red-600 dark:text-red-400">
{messages.map ((message, i) => <li key={i}>{message}</li>)}
</ul>)
}


export default FieldError

+ 30
- 0
frontend/src/lib/apiErrors.ts View File

@@ -0,0 +1,30 @@
import toCamel from 'camelcase-keys'

import { isApiError } from '@/lib/api'

export type FieldErrors = Partial<Record<string, string[]>>

export type ValidationError = { message: string
fieldErrors: FieldErrors
baseErrors: string[] }

type RawValidationError = { type?: string
message?: string
errors?: Record<string, string[]>
baseErrors?: string[] }


export const extractValidationError = (err: unknown) => {
if (!(isApiError (err)) || err.response?.status !== 422)
return null

const data = toCamel ((err.response.data ?? { }) as Record<string, unknown>,
{ deep: true }) as RawValidationError

if (data.type !== 'validation_error' && !(data.errors))
return null

return { message: data.message ?? '入力内容を確認してください.',
fieldErrors: (data.errors ?? { }) as FieldErrors,
baseErrors: data.baseErrors ?? [] }
}

+ 0
- 1
frontend/src/pages/posts/PostDetailPage.tsx View File

@@ -3,7 +3,6 @@ import { motion } from 'framer-motion'
import { useEffect, useRef, useState } from 'react' import { useEffect, useRef, useState } from 'react'
import { Helmet } from 'react-helmet-async' import { Helmet } from 'react-helmet-async'
import { useParams } from 'react-router-dom' import { useParams } from 'react-router-dom'

import PostEditForm from '@/components/PostEditForm' import PostEditForm from '@/components/PostEditForm'
import PostEmbed from '@/components/PostEmbed' import PostEmbed from '@/components/PostEmbed'
import PostList from '@/components/PostList' import PostList from '@/components/PostList'


Loading…
Cancel
Save