コミットを比較
6 コミット
| 作成者 | SHA1 | 日付 | |
|---|---|---|---|
| 316809bf1c | |||
| 32cb6f1d33 | |||
| 18cae51182 | |||
| a07cab97f3 | |||
| bbf14e3067 | |||
| d3f2b009bc |
@@ -84,14 +84,12 @@ cd frontend
|
|||||||
npm run dev
|
npm run dev
|
||||||
npm run build
|
npm run build
|
||||||
npm run lint
|
npm run lint
|
||||||
npm run test
|
|
||||||
npm run test:run
|
|
||||||
npm run preview
|
npm run preview
|
||||||
```
|
```
|
||||||
|
|
||||||
`npm run build` runs `tsc -b && vite build`, then `postbuild` runs `node scripts/generate-sitemap.js`.
|
`npm run build` runs `tsc -b && vite build`, then `postbuild` runs `node scripts/generate-sitemap.js`.
|
||||||
|
|
||||||
`npm run test` runs Vitest in watch mode. Use `npm run test:run` for a non-watch frontend test run.
|
Do not write or report `npm test` as a repository command unless a `test` script is added to `frontend/package.json`.
|
||||||
|
|
||||||
## Coding style
|
## Coding style
|
||||||
|
|
||||||
@@ -124,49 +122,13 @@ npm run preview
|
|||||||
- Keep page-level code under `frontend/src/pages` and shared UI/feature code under `frontend/src/components` unless existing patterns point elsewhere.
|
- Keep page-level code under `frontend/src/pages` and shared UI/feature code under `frontend/src/components` unless existing patterns point elsewhere.
|
||||||
- Match existing Tailwind, component, and import alias conventions.
|
- Match existing Tailwind, component, and import alias conventions.
|
||||||
|
|
||||||
### Frontend TSX style
|
|
||||||
|
|
||||||
- Preserve the local TSX formatting style. Do not normalize TSX to common Prettier-style React formatting unless explicitly asked.
|
|
||||||
- Prefer `const` arrow functions for TypeScript/TSX component and helper declarations.
|
|
||||||
- Put two blank lines before and after top-level `const` function declarations, unless imports, exports, or file boundaries make that awkward.
|
|
||||||
- In TSX, indent nested tag attributes with one tab relative to the tag line. With the project tab width, this visually appears as 4 spaces.
|
|
||||||
- Keep a tag's closing marker on the same line as the final prop when the tag spans multiple lines. Do not put `/>` or `>` on its own line unless the existing surrounding code does so.
|
|
||||||
- Keep JSX closing parentheses in the existing compact style, for example `</div>)` rather than moving `)` onto a separate line.
|
|
||||||
|
|
||||||
Preferred:
|
|
||||||
|
|
||||||
```tsx
|
|
||||||
const PostFormTagsArea: FC<Props> = ({ tags, setTags, errors, ...rest }) => {
|
|
||||||
return (
|
|
||||||
<TextArea
|
|
||||||
{...rest}
|
|
||||||
ref={ref}
|
|
||||||
value={tags}
|
|
||||||
invalid={errors && errors.length > 0}
|
|
||||||
onChange={ev => setTags (ev.target.value)}/>)
|
|
||||||
}
|
|
||||||
```
|
|
||||||
|
|
||||||
Avoid:
|
|
||||||
|
|
||||||
```tsx
|
|
||||||
function PostFormTagsArea ({ tags, setTags }: Props) {
|
|
||||||
return (
|
|
||||||
<TextArea
|
|
||||||
value={tags}
|
|
||||||
onChange={ev => setTags (ev.target.value)}
|
|
||||||
/>
|
|
||||||
)
|
|
||||||
}
|
|
||||||
```
|
|
||||||
|
|
||||||
## Codex workflow
|
## Codex workflow
|
||||||
|
|
||||||
- First inspect existing patterns; do not invent new architecture when a local convention exists.
|
- First inspect existing patterns; do not invent new architecture when a local convention exists.
|
||||||
- Keep changes scoped to the requested issue.
|
- Keep changes scoped to the requested issue.
|
||||||
- Do not scan or summarize dependency/generated/runtime directories such as `node_modules`, `dist`, `tmp`, `log`, and `storage` unless explicitly needed.
|
- Do not scan or summarize dependency/generated/runtime directories such as `node_modules`, `dist`, `tmp`, `log`, and `storage` unless explicitly needed.
|
||||||
- Before touching wiki, tag, versioning, BAN, IP BAN, or authentication behavior, inspect the related request specs and service objects.
|
- Before touching wiki, tag, versioning, BAN, IP BAN, or authentication behavior, inspect the related request specs and service objects.
|
||||||
- If frontend code changes, run the existing frontend verification commands that apply: `npm run build`, `npm run lint`, and `npm run test:run`.
|
- If frontend code changes, run the existing frontend verification commands that apply: `npm run build` and `npm run lint`.
|
||||||
- If backend code changes, run the relevant RSpec command; for broad backend changes, run `bundle exec rspec`.
|
- If backend code changes, run the relevant RSpec command; for broad backend changes, run `bundle exec rspec`.
|
||||||
- If a verification command cannot be run or fails, report the exact command and failure.
|
- If a verification command cannot be run or fails, report the exact command and failure.
|
||||||
|
|
||||||
|
|||||||
@@ -1,7 +1,4 @@
|
|||||||
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!
|
||||||
@@ -28,27 +25,6 @@ class ApplicationController < ActionController::API
|
|||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
def render_bad_request message = 'リクエストが不正です.'
|
|
||||||
render json: { type: 'bad_request',
|
|
||||||
message:,
|
|
||||||
errors: { },
|
|
||||||
base_errors: [message] },
|
|
||||||
status: :bad_request
|
|
||||||
end
|
|
||||||
|
|
||||||
def render_unprocessable_entity message = '入力を確認してください.', field: nil
|
|
||||||
render_validation_error(fields: field ? { field => [message] } : { },
|
|
||||||
base: field ? [] : [message])
|
|
||||||
end
|
|
||||||
|
|
||||||
def render_record_invalid error
|
|
||||||
render_validation_error error.record
|
|
||||||
end
|
|
||||||
|
|
||||||
def render_record_not_unique _error = nil
|
|
||||||
render_validation_error base: ['すでに存在してゐます.']
|
|
||||||
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?
|
||||||
@@ -61,28 +37,4 @@ class ApplicationController < ActionController::API
|
|||||||
|
|
||||||
head :forbidden
|
head :forbidden
|
||||||
end
|
end
|
||||||
|
|
||||||
def render_validation_error record = nil, fields: { }, base: [], status: :unprocessable_entity
|
|
||||||
errors = { }
|
|
||||||
|
|
||||||
if record
|
|
||||||
record.errors.each do |error|
|
|
||||||
errors[error.attribute] ||= []
|
|
||||||
errors[error.attribute] << error.message
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
fields.each do |attr, messages|
|
|
||||||
errors[attr.to_sym] ||= []
|
|
||||||
errors[attr.to_sym].concat(Array(messages))
|
|
||||||
end
|
|
||||||
|
|
||||||
base_errors = Array(base) + Array(errors.delete(:base))
|
|
||||||
|
|
||||||
render json: { type: 'validation_error',
|
|
||||||
message: '入力内容を確認してください.',
|
|
||||||
errors:,
|
|
||||||
base_errors: },
|
|
||||||
status:
|
|
||||||
end
|
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -2,8 +2,7 @@ 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 render_bad_request('platform は必須です.') if platform.blank?
|
return head :bad_request if platform.blank? || code.blank?
|
||||||
return render_bad_request('code は必須です.') if code.blank?
|
|
||||||
|
|
||||||
deerjikist = Deerjikist
|
deerjikist = Deerjikist
|
||||||
.joins(:tag)
|
.joins(:tag)
|
||||||
@@ -23,9 +22,7 @@ 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 render_bad_request('platform は必須です.') if platform.blank?
|
return head :bad_request if platform.blank? || code.blank? || tag_id <= 0
|
||||||
return render_bad_request('code は必須です.') if code.blank?
|
|
||||||
return render_bad_request('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
|
||||||
@@ -41,8 +38,7 @@ 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 render_bad_request('platform は必須です.') if platform.blank?
|
return head :bad_request if platform.blank? || code.blank?
|
||||||
return render_bad_request('code は必須です.') if code.blank?
|
|
||||||
|
|
||||||
Deerjikist.find([platform, code]).destroy!
|
Deerjikist.find([platform, code]).destroy!
|
||||||
|
|
||||||
|
|||||||
@@ -40,11 +40,7 @@ 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 render_unprocessable_entity('タグは必須です.', field: :tag) if tag_name_raw.blank?
|
return head :bad_request if tag_name_raw.blank? || (file.blank? && url.blank?)
|
||||||
if file.blank? && url.blank?
|
|
||||||
return render_validation_error fields: { file: ['ファイルまたは URL は必須です.'],
|
|
||||||
url: ['ファイルまたは URL は必須です.'] }
|
|
||||||
end
|
|
||||||
|
|
||||||
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
|
||||||
@@ -58,7 +54,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_validation_error material
|
render json: { errors: material.errors.full_messages }, status: :unprocessable_entity
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
@@ -72,11 +68,7 @@ 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 render_unprocessable_entity('タグは必須です.', field: :tag) if tag_name_raw.blank?
|
return head :bad_request if tag_name_raw.blank? || (file.blank? && url.blank?)
|
||||||
if file.blank? && url.blank?
|
|
||||||
return render_validation_error fields: { file: ['ファイルまたは URL は必須です.'],
|
|
||||||
url: ['ファイルまたは URL は必須です.'] }
|
|
||||||
end
|
|
||||||
|
|
||||||
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
|
||||||
@@ -92,7 +84,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_validation_error material
|
render json: { errors: material.errors.full_messages }, status: :unprocessable_entity
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|||||||
@@ -30,14 +30,12 @@ class NicoTagsController < ApplicationController
|
|||||||
id = params[:id].to_i
|
id = params[:id].to_i
|
||||||
|
|
||||||
tag = Tag.find(id)
|
tag = Tag.find(id)
|
||||||
return render_bad_request('ニコニコ・タグを指定してください.') unless tag.nico?
|
return head :bad_request 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)
|
||||||
if linked_tags.any? { |t| t.nico? }
|
return head :bad_request if linked_tags.any? { |t| t.nico? }
|
||||||
return render_unprocessable_entity('ニコニコ・タグ同士は連携できません.', 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)
|
||||||
|
|||||||
@@ -44,7 +44,7 @@ class PostsController < ApplicationController
|
|||||||
filtered_posts
|
filtered_posts
|
||||||
.joins("LEFT JOIN (#{ pt_max_sql }) pt_max ON pt_max.post_id = posts.id")
|
.joins("LEFT JOIN (#{ pt_max_sql }) pt_max ON pt_max.post_id = posts.id")
|
||||||
.reselect('posts.*', Arel.sql("#{ updated_at_all_sql } AS updated_at_all"))
|
.reselect('posts.*', Arel.sql("#{ updated_at_all_sql } AS updated_at_all"))
|
||||||
.preload(:uploaded_user, tags: [:deerjikists, :materials, { tag_name: :wiki_page }])
|
.preload(tags: [:deerjikists, :materials, { tag_name: :wiki_page }])
|
||||||
.with_attached_thumbnail
|
.with_attached_thumbnail
|
||||||
|
|
||||||
q = q.where('posts.url LIKE ?', "%#{ url }%") if url
|
q = q.where('posts.url LIKE ?', "%#{ url }%") if url
|
||||||
@@ -95,9 +95,7 @@ class PostsController < ApplicationController
|
|||||||
end
|
end
|
||||||
|
|
||||||
def random
|
def random
|
||||||
post = filtered_posts.preload(:uploaded_user,
|
post = filtered_posts.preload(tags: [:deerjikists, :materials, { tag_name: :wiki_page }])
|
||||||
tags: [:deerjikists, :materials, { tag_name: :wiki_page }])
|
|
||||||
.with_attached_thumbnail
|
|
||||||
.order('RAND()')
|
.order('RAND()')
|
||||||
.first
|
.first
|
||||||
return head :not_found unless post
|
return head :not_found unless post
|
||||||
@@ -106,24 +104,12 @@ class PostsController < ApplicationController
|
|||||||
end
|
end
|
||||||
|
|
||||||
def show
|
def show
|
||||||
post =
|
post = Post.includes(tags: [:deerjikists, :materials, { tag_name: :wiki_page }]).find_by(id: params[:id])
|
||||||
Post
|
|
||||||
.includes(:uploaded_user, tags: [:deerjikists, :materials, { tag_name: :wiki_page }])
|
|
||||||
.with_attached_thumbnail
|
|
||||||
.find_by(id: params[:id])
|
|
||||||
return head :not_found unless post
|
return head :not_found unless post
|
||||||
|
|
||||||
parent_posts = post.parents.with_attached_thumbnail.order(:id).to_a
|
render json: PostRepr.base(post, current_user)
|
||||||
child_posts = post.children.with_attached_thumbnail.order(:id).to_a
|
.merge(tags: build_tag_tree_for(post.tags),
|
||||||
sibling_posts = sibling_posts_by_parent(parent_posts.map(&:id))
|
related: PostRepr.many(post.related(limit: 20)))
|
||||||
related = post.related(limit: 20).to_a
|
|
||||||
|
|
||||||
render json: PostRepr.detail(post, current_user,
|
|
||||||
parent_posts:,
|
|
||||||
child_posts:,
|
|
||||||
sibling_posts:,
|
|
||||||
related:)
|
|
||||||
.merge(tags: build_tag_tree_for(post.tags))
|
|
||||||
end
|
end
|
||||||
|
|
||||||
def create
|
def create
|
||||||
@@ -162,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
|
||||||
render_validation_error fields: { tags: 'ニコニコ・タグは直接指定できません.' }
|
head :bad_request
|
||||||
rescue ArgumentError => e
|
rescue ArgumentError => e
|
||||||
render_validation_error fields: { parent_post_ids: [e.message] }
|
render json: { errors: [e.message] }, status: :unprocessable_entity
|
||||||
rescue ActiveRecord::RecordInvalid => e
|
rescue ActiveRecord::RecordInvalid => e
|
||||||
render_post_form_record_invalid e.record
|
render json: { errors: e.record.errors.full_messages }, status: :unprocessable_entity
|
||||||
end
|
end
|
||||||
|
|
||||||
def viewed
|
def viewed
|
||||||
@@ -189,10 +175,10 @@ class PostsController < ApplicationController
|
|||||||
|
|
||||||
force = bool?(:force)
|
force = bool?(:force)
|
||||||
merge = bool?(:merge)
|
merge = bool?(:merge)
|
||||||
return render_bad_request('force と merge は同時に指定できません.') if force && merge
|
return head :bad_request if force && merge
|
||||||
|
|
||||||
base_version_no = parse_base_version_no
|
base_version_no = parse_base_version_no
|
||||||
return render_bad_request('base_version_no は必須です.') if !(force) && !(base_version_no)
|
return head :bad_request 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
|
||||||
@@ -252,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
|
||||||
render_validation_error fields: { tags: ['ニコニコ・タグは直接指定できません.'] }
|
head :bad_request
|
||||||
rescue ArgumentError => e
|
rescue ArgumentError => e
|
||||||
render_validation_error fields: { parent_post_ids: [e.message] }
|
render json: { errors: [e.message] }, status: :unprocessable_entity
|
||||||
rescue ActiveRecord::RecordInvalid => e
|
rescue ActiveRecord::RecordInvalid => e
|
||||||
render_post_form_record_invalid e.record
|
render json: { errors: e.record.errors.full_messages }, status: :unprocessable_entity
|
||||||
end
|
end
|
||||||
|
|
||||||
def changes
|
def changes
|
||||||
@@ -399,7 +385,7 @@ class PostsController < ApplicationController
|
|||||||
return nil unless tag
|
return nil unless tag
|
||||||
|
|
||||||
if path.include?(tag_id)
|
if path.include?(tag_id)
|
||||||
return TagRepr.inline(tag).merge(children: [])
|
return TagRepr.base(tag).merge(children: [])
|
||||||
end
|
end
|
||||||
|
|
||||||
if memo.key?(tag_id)
|
if memo.key?(tag_id)
|
||||||
@@ -411,26 +397,12 @@ class PostsController < ApplicationController
|
|||||||
|
|
||||||
children = child_ids.filter_map { |cid| build_node.(cid, new_path) }
|
children = child_ids.filter_map { |cid| build_node.(cid, new_path) }
|
||||||
|
|
||||||
memo[tag_id] = TagRepr.inline(tag).merge(children:)
|
memo[tag_id] = TagRepr.base(tag).merge(children:)
|
||||||
end
|
end
|
||||||
|
|
||||||
root_ids.filter_map { |id| build_node.call(id, []) }
|
root_ids.filter_map { |id| build_node.call(id, []) }
|
||||||
end
|
end
|
||||||
|
|
||||||
def sibling_posts_by_parent parent_post_ids
|
|
||||||
return { } if parent_post_ids.blank?
|
|
||||||
|
|
||||||
implications =
|
|
||||||
PostImplication
|
|
||||||
.where(parent_post_id: parent_post_ids)
|
|
||||||
.includes(post: { thumbnail_attachment: :blob })
|
|
||||||
.order(:parent_post_id, :post_id)
|
|
||||||
|
|
||||||
implications.group_by(&:parent_post_id).transform_values { |items|
|
|
||||||
items.map(&:post)
|
|
||||||
}
|
|
||||||
end
|
|
||||||
|
|
||||||
def parse_parent_post_ids
|
def parse_parent_post_ids
|
||||||
raise ArgumentError, 'parent_post_ids は必須です.' unless params.key?(:parent_post_ids)
|
raise ArgumentError, 'parent_post_ids は必須です.' unless params.key?(:parent_post_ids)
|
||||||
|
|
||||||
@@ -444,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 :parent_post_ids, '自分自身を親投稿にはできません.'
|
post.errors.add(:base, '自分自身を親投稿にはできません.')
|
||||||
raise ActiveRecord::RecordInvalid, post
|
raise ActiveRecord::RecordInvalid, post
|
||||||
end
|
end
|
||||||
|
|
||||||
@@ -452,8 +424,7 @@ class PostsController < ApplicationController
|
|||||||
missing_ids = parent_post_ids - existing_ids
|
missing_ids = parent_post_ids - existing_ids
|
||||||
|
|
||||||
if missing_ids.present?
|
if missing_ids.present?
|
||||||
post.errors.add :parent_post_ids,
|
post.errors.add(:base, "存在しない親投稿 ID があります: #{ missing_ids.join(' ') }")
|
||||||
"存在しない親投稿 ID があります: #{ missing_ids.join(' ') }"
|
|
||||||
raise ActiveRecord::RecordInvalid, post
|
raise ActiveRecord::RecordInvalid, post
|
||||||
end
|
end
|
||||||
|
|
||||||
@@ -669,14 +640,4 @@ class PostsController < ApplicationController
|
|||||||
|
|
||||||
merged.uniq.sort
|
merged.uniq.sort
|
||||||
end
|
end
|
||||||
|
|
||||||
def render_post_form_record_invalid record
|
|
||||||
if record.is_a?(TagName) || record.is_a?(Tag)
|
|
||||||
render_validation_error fields: { tags: record.errors.full_messages.map { |message|
|
|
||||||
"タグ名 “#{ record.name }”: #{ message }"
|
|
||||||
} }
|
|
||||||
else
|
|
||||||
render_validation_error record
|
|
||||||
end
|
|
||||||
end
|
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -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 render_bad_request('URL は必須です.') unless url.present?
|
return head :bad_request 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_bad_request(e.message)
|
render json: { error: e.message }, status: :bad_request
|
||||||
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 render_bad_request('URL は必須です.') if url.blank?
|
return head :bad_request if url.blank?
|
||||||
|
|
||||||
unless url.start_with?(/http(s)?:\/\//)
|
unless url.start_with?(/http(s)?:\/\//)
|
||||||
url = 'http://' + url
|
url = 'http://' + url
|
||||||
@@ -40,11 +40,7 @@ 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: { type: 'internal_server_error',
|
render json: { error: 'Failed to generate thumbnail' }, status: :internal_server_error
|
||||||
message: 'サムネールを生成できませんでした.',
|
|
||||||
errors: { },
|
|
||||||
base_errors: ['サムネールを生成できませんでした.'] },
|
|
||||||
status: :internal_server_error
|
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -5,12 +5,11 @@ class TagChildrenController < ApplicationController
|
|||||||
|
|
||||||
parent_id = params[:parent_id]
|
parent_id = params[:parent_id]
|
||||||
child_id = params[:child_id]
|
child_id = params[:child_id]
|
||||||
return render_bad_request('parent_id は必須です.') if parent_id.blank?
|
return head :bad_request if parent_id.blank? || child_id.blank?
|
||||||
return render_bad_request('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 render_bad_request('ニコニコ・タグの階層は変更できません.') if parent.nico? || child.nico?
|
return head :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)
|
||||||
@@ -28,12 +27,11 @@ class TagChildrenController < ApplicationController
|
|||||||
|
|
||||||
parent_id = params[:parent_id]
|
parent_id = params[:parent_id]
|
||||||
child_id = params[:child_id]
|
child_id = params[:child_id]
|
||||||
return render_bad_request('parent_id は必須です.') if parent_id.blank?
|
return head :bad_request if parent_id.blank? || child_id.blank?
|
||||||
return render_bad_request('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 render_bad_request('ニコニコ・タグの階層は変更できません.') if parent.nico? || child.nico?
|
return head :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)
|
||||||
|
|||||||
@@ -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 render_bad_request('name は必須です.') if name.blank?
|
return head :bad_request 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 render_bad_request('name は必須です.') if name.blank?
|
return head :bad_request 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)
|
||||||
@@ -214,24 +214,21 @@ class TagsController < ApplicationController
|
|||||||
|
|
||||||
ApplicationRecord.transaction do
|
ApplicationRecord.transaction do
|
||||||
tag.deerjikists = []
|
tag.deerjikists = []
|
||||||
params[:_json].each.with_index do |item, i|
|
params[:_json].each do
|
||||||
platform = item[:platform]
|
platform = _1[:platform]
|
||||||
code = normalise_deerjikist_code(platform, item[:code])
|
code = normalise_deerjikist_code(platform, _1[:code])
|
||||||
deerjikist = Deerjikist.find_or_initialize_by(platform:, code:)
|
deerjikist = Deerjikist.find_or_initialize_by(platform:, code:)
|
||||||
deerjikist.tag = tag
|
deerjikist.tag = tag
|
||||||
render_deerjikist_form_record_invalid(deerjikist, i) unless deerjikist.save
|
deerjikist.save!
|
||||||
raise ActiveRecord::Rollback if performed?
|
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
return if performed?
|
|
||||||
|
|
||||||
render json: DeerjikistRepr.many(tag.reload.deerjikists)
|
render json: DeerjikistRepr.many(tag.reload.deerjikists)
|
||||||
end
|
end
|
||||||
|
|
||||||
def materials_by_name
|
def materials_by_name
|
||||||
name = params[:name].to_s.strip
|
name = params[:name].to_s.strip
|
||||||
return render_bad_request('name は必須です.') if name.blank?
|
return head :bad_request 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)
|
||||||
@@ -250,16 +247,17 @@ 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 render_unprocessable_entity('名前は必須です.', field: :name) if name.blank?
|
return head :unprocessable_entity if name.blank? || category.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_unprocessable_entity('システム・タグの名称は変更できません.', field: :name)
|
return render json: { error: 'システム・タグの名称は変更できません.' },
|
||||||
|
status: :unprocessable_entity
|
||||||
end
|
end
|
||||||
|
|
||||||
if tag.nico? || category == 'nico'
|
if tag.nico? || category == 'nico'
|
||||||
return render_unprocessable_entity('ニコタグは変更できません.', field: :category)
|
return render json: { error: 'ニコタグは変更できません.' },
|
||||||
|
status: :unprocessable_entity
|
||||||
end
|
end
|
||||||
|
|
||||||
alias_names = params[:aliases].to_s.split.uniq
|
alias_names = params[:aliases].to_s.split.uniq
|
||||||
@@ -304,7 +302,8 @@ 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_unprocessable_entity('ニコタグは変更できません.', field: :category)
|
return render json: { error: 'ニコタグは変更できません.' },
|
||||||
|
status: :unprocessable_entity
|
||||||
end
|
end
|
||||||
|
|
||||||
ApplicationRecord.transaction do
|
ApplicationRecord.transaction do
|
||||||
@@ -438,23 +437,4 @@ class TagsController < ApplicationController
|
|||||||
rescue
|
rescue
|
||||||
nil
|
nil
|
||||||
end
|
end
|
||||||
|
|
||||||
def render_deerjikist_form_record_invalid deerjikist, index
|
|
||||||
fields = { }
|
|
||||||
|
|
||||||
deerjikist.errors.each do |error|
|
|
||||||
field =
|
|
||||||
case error.attribute
|
|
||||||
when :platform, :code
|
|
||||||
"deerjikists.#{ index }.#{ error.attribute }"
|
|
||||||
else
|
|
||||||
:deerjikists
|
|
||||||
end
|
|
||||||
|
|
||||||
fields[field] ||= []
|
|
||||||
fields[field] << error.full_message
|
|
||||||
end
|
|
||||||
|
|
||||||
render_validation_error fields:
|
|
||||||
end
|
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -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 render_unprocessable_entity('本文は必須です.', field: :content) if content.blank?
|
return head :unprocessable_entity 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
|
||||||
|
|||||||
@@ -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 render_unprocessable_entity('名前は必須です.', field: :name) if name.blank?
|
return head :bad_request 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_validation_error user
|
render json: user.errors, status: :unprocessable_entity
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|||||||
@@ -46,7 +46,7 @@ class WikiPagesController < ApplicationController
|
|||||||
|
|
||||||
def diff
|
def diff
|
||||||
id = params[:id]
|
id = params[:id]
|
||||||
return render_bad_request('id は必須です.') if id.blank?
|
return head :bad_request 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 render_unprocessable_entity('差分を表示できない版です.')
|
return head :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,8 +89,7 @@ class WikiPagesController < ApplicationController
|
|||||||
body = params[:body].to_s
|
body = params[:body].to_s
|
||||||
message = params[:message].presence
|
message = params[:message].presence
|
||||||
|
|
||||||
return render_unprocessable_entity('タイトルは必須です.', field: :title) if title.blank?
|
return head :unprocessable_entity if title.blank? || body.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)
|
||||||
|
|
||||||
@@ -102,10 +101,8 @@ class WikiPagesController < ApplicationController
|
|||||||
message:)
|
message:)
|
||||||
|
|
||||||
render json: WikiPageRepr.base(page), status: :created
|
render json: WikiPageRepr.base(page), status: :created
|
||||||
rescue ActiveRecord::RecordInvalid => e
|
rescue ActiveRecord::RecordInvalid, ActiveRecord::RecordNotUnique
|
||||||
render_validation_error e.record
|
head :unprocessable_entity
|
||||||
rescue ActiveRecord::RecordNotUnique
|
|
||||||
render_record_not_unique
|
|
||||||
end
|
end
|
||||||
|
|
||||||
def update
|
def update
|
||||||
@@ -115,8 +112,7 @@ class WikiPagesController < ApplicationController
|
|||||||
title = params[:title]&.strip
|
title = params[:title]&.strip
|
||||||
body = params[:body].to_s
|
body = params[:body].to_s
|
||||||
|
|
||||||
return render_unprocessable_entity('タイトルは必須です.', field: :title) if title.blank?
|
return head :unprocessable_entity if title.blank? || body.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
|
||||||
|
|||||||
@@ -94,7 +94,7 @@ class Post < ApplicationRecord
|
|||||||
return if !(f) || !(b)
|
return if !(f) || !(b)
|
||||||
|
|
||||||
if f >= b
|
if f >= b
|
||||||
errors.add :original_created_at, 'オリジナルの作成日時の順番がをかしぃです.'
|
errors.add :original_created_before, 'オリジナルの作成日時の順番がをかしぃです.'
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|||||||
@@ -2,65 +2,20 @@
|
|||||||
|
|
||||||
|
|
||||||
module PostRepr
|
module PostRepr
|
||||||
BASE_FIELDS = [
|
BASE = { include: { tags: TagRepr::BASE, uploaded_user: UserRepr::BASE },
|
||||||
:id,
|
methods: [:parent_posts, :child_posts, :sibling_posts] }.freeze
|
||||||
:version_no,
|
|
||||||
:url,
|
|
||||||
:title,
|
|
||||||
:thumbnail_base,
|
|
||||||
:original_created_from,
|
|
||||||
:original_created_before,
|
|
||||||
:created_at,
|
|
||||||
:updated_at
|
|
||||||
].freeze
|
|
||||||
|
|
||||||
module_function
|
module_function
|
||||||
|
|
||||||
def base post, current_user = nil
|
def base post, current_user = nil
|
||||||
json = common(post)
|
json = post.as_json(BASE)
|
||||||
json['tags'] = tag_json(post.tags)
|
return json.merge(viewed: false) unless current_user
|
||||||
json['uploaded_user'] = post.uploaded_user && UserRepr.base(post.uploaded_user)
|
|
||||||
json['viewed'] = current_user ? current_user.viewed?(post) : false
|
|
||||||
json
|
|
||||||
end
|
|
||||||
|
|
||||||
def detail post, current_user = nil, parent_posts: [], child_posts: [],
|
viewed = current_user.viewed?(post)
|
||||||
sibling_posts: { }, related: []
|
json.merge(viewed:)
|
||||||
base(post, current_user).merge(
|
|
||||||
'parent_posts' => cards(parent_posts),
|
|
||||||
'child_posts' => cards(child_posts),
|
|
||||||
'sibling_posts' => sibling_posts.transform_keys(&:to_s).transform_values { |posts|
|
|
||||||
cards(posts)
|
|
||||||
},
|
|
||||||
'related' => cards(related))
|
|
||||||
end
|
|
||||||
|
|
||||||
def card post
|
|
||||||
common(post).merge('parent_posts' => [], 'child_posts' => [])
|
|
||||||
end
|
|
||||||
|
|
||||||
def cards posts
|
|
||||||
posts.map { |post| card(post) }
|
|
||||||
end
|
end
|
||||||
|
|
||||||
def many posts, current_user = nil
|
def many posts, current_user = nil
|
||||||
posts.map { |p| base(p, current_user) }
|
posts.map { |p| base(p, current_user) }
|
||||||
end
|
end
|
||||||
|
|
||||||
def common post
|
|
||||||
BASE_FIELDS.to_h { |field| [field.to_s, post.public_send(field)] }
|
|
||||||
.merge('thumbnail' => thumbnail_url(post))
|
|
||||||
end
|
|
||||||
|
|
||||||
def tag_json tags
|
|
||||||
tags.map { |tag| TagRepr.inline(tag) }
|
|
||||||
end
|
|
||||||
|
|
||||||
def thumbnail_url post
|
|
||||||
return nil unless post.thumbnail.attached?
|
|
||||||
|
|
||||||
Rails.application.routes.url_helpers.rails_blob_url(post.thumbnail, only_path: false)
|
|
||||||
rescue
|
|
||||||
nil
|
|
||||||
end
|
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -12,9 +12,5 @@ module TagRepr
|
|||||||
parents: tag.parents.map { _1.as_json(BASE) })
|
parents: tag.parents.map { _1.as_json(BASE) })
|
||||||
end
|
end
|
||||||
|
|
||||||
def inline tag
|
|
||||||
tag.as_json(BASE).merge(aliases: [], parents: [])
|
|
||||||
end
|
|
||||||
|
|
||||||
def many(tags) = tags.map { |t| base(t) }
|
def many(tags) = tags.map { |t| base(t) }
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -1,47 +0,0 @@
|
|||||||
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
|
|
||||||
@@ -57,23 +57,6 @@ RSpec.describe 'Posts API', type: :request do
|
|||||||
post_write_params({ base_version_no: base_version.version_no }.merge(params))
|
post_write_params({ base_version_no: base_version.version_no }.merge(params))
|
||||||
end
|
end
|
||||||
|
|
||||||
def count_sql_queries
|
|
||||||
count = 0
|
|
||||||
|
|
||||||
callback = lambda do |_name, _started, _finished, _id, payload|
|
|
||||||
next if payload[:cached]
|
|
||||||
next if ['SCHEMA', 'TRANSACTION'].include?(payload[:name])
|
|
||||||
|
|
||||||
count += 1
|
|
||||||
end
|
|
||||||
|
|
||||||
ActiveSupport::Notifications.subscribed(callback, 'sql.active_record') do
|
|
||||||
yield
|
|
||||||
end
|
|
||||||
|
|
||||||
count
|
|
||||||
end
|
|
||||||
|
|
||||||
let!(:tag_name) { TagName.create!(name: 'spec_tag') }
|
let!(:tag_name) { TagName.create!(name: 'spec_tag') }
|
||||||
let!(:tag) { Tag.create!(tag_name: tag_name, category: :general) }
|
let!(:tag) { Tag.create!(tag_name: tag_name, category: :general) }
|
||||||
|
|
||||||
@@ -575,59 +558,6 @@ RSpec.describe 'Posts API', type: :request do
|
|||||||
expect(sibling_ids).to include(sibling_post.id)
|
expect(sibling_ids).to include(sibling_post.id)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
it 'does not issue a query per tag or related post' do
|
|
||||||
user = create_member_user!
|
|
||||||
|
|
||||||
tags =
|
|
||||||
15.times.map do |i|
|
|
||||||
tag_name = TagName.create!(name: "show_query_tag_#{ i }")
|
|
||||||
tag = Tag.create!(tag_name:, category: :general)
|
|
||||||
TagName.create!(name: "show_query_alias_#{ i }", canonical: tag_name)
|
|
||||||
PostTag.create!(post: post_record, tag:)
|
|
||||||
tag
|
|
||||||
end
|
|
||||||
|
|
||||||
tags.each_cons(2) do |parent_tag, child_tag|
|
|
||||||
TagImplication.create!(parent_tag:, tag: child_tag)
|
|
||||||
end
|
|
||||||
|
|
||||||
parent_post = Post.create!(
|
|
||||||
title: 'query parent post',
|
|
||||||
url: 'https://example.com/query-parent-post'
|
|
||||||
)
|
|
||||||
sibling_post = Post.create!(
|
|
||||||
title: 'query sibling post',
|
|
||||||
url: 'https://example.com/query-sibling-post'
|
|
||||||
)
|
|
||||||
child_post = Post.create!(
|
|
||||||
title: 'query child post',
|
|
||||||
url: 'https://example.com/query-child-post'
|
|
||||||
)
|
|
||||||
|
|
||||||
PostImplication.create!(post: post_record, parent_post:)
|
|
||||||
PostImplication.create!(post: sibling_post, parent_post:)
|
|
||||||
PostImplication.create!(post: child_post, parent_post: post_record)
|
|
||||||
|
|
||||||
20.times do |i|
|
|
||||||
related_post = Post.create!(
|
|
||||||
title: "query related post #{ i }",
|
|
||||||
url: "https://example.com/query-related-post-#{ i }"
|
|
||||||
)
|
|
||||||
PostSimilarity.create!(post: post_record,
|
|
||||||
target_post: related_post,
|
|
||||||
cos: 1.0 - (i / 100.0))
|
|
||||||
end
|
|
||||||
|
|
||||||
query_count =
|
|
||||||
count_sql_queries do
|
|
||||||
get "/posts/#{ post_record.id }",
|
|
||||||
headers: { 'X-Transfer-Code' => user.inheritance_code }
|
|
||||||
end
|
|
||||||
|
|
||||||
expect(response).to have_http_status(:ok)
|
|
||||||
expect(query_count).to be <= 45
|
|
||||||
end
|
|
||||||
end
|
end
|
||||||
|
|
||||||
context 'when post does not exist' do
|
context 'when post does not exist' do
|
||||||
|
|||||||
+2
-3
@@ -18,13 +18,12 @@ npm install
|
|||||||
npm run dev
|
npm run dev
|
||||||
npm run build
|
npm run build
|
||||||
npm run lint
|
npm run lint
|
||||||
npm run test
|
npm test
|
||||||
npm run test:run
|
|
||||||
```
|
```
|
||||||
|
|
||||||
### Full verification
|
### Full verification
|
||||||
|
|
||||||
```sh
|
```sh
|
||||||
cd backend && bundle exec rspec
|
cd backend && bundle exec rspec
|
||||||
cd ../frontend && npm run test:run && npm run build && npm run lint
|
cd ../frontend && npm run build && npm run lint
|
||||||
```
|
```
|
||||||
|
|||||||
@@ -5,7 +5,7 @@ import reactRefresh from 'eslint-plugin-react-refresh'
|
|||||||
import tseslint from 'typescript-eslint'
|
import tseslint from 'typescript-eslint'
|
||||||
|
|
||||||
export default tseslint.config(
|
export default tseslint.config(
|
||||||
{ ignores: ['dist', 'tailwind.config.js'] },
|
{ ignores: ['dist'] },
|
||||||
{
|
{
|
||||||
extends: [js.configs.recommended, ...tseslint.configs.recommended],
|
extends: [js.configs.recommended, ...tseslint.configs.recommended],
|
||||||
files: ['**/*.{ts,tsx}'],
|
files: ['**/*.{ts,tsx}'],
|
||||||
|
|||||||
生成ファイル
+39
-1138
ファイル差分が大きすぎるため省略します
差分を読込み
+1
-9
@@ -8,8 +8,6 @@
|
|||||||
"build": "tsc -b && vite build",
|
"build": "tsc -b && vite build",
|
||||||
"postbuild": "node scripts/generate-sitemap.js",
|
"postbuild": "node scripts/generate-sitemap.js",
|
||||||
"lint": "eslint .",
|
"lint": "eslint .",
|
||||||
"test": "vitest",
|
|
||||||
"test:run": "vitest run",
|
|
||||||
"preview": "vite preview"
|
"preview": "vite preview"
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
@@ -47,10 +45,6 @@
|
|||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@eslint/js": "^9.25.0",
|
"@eslint/js": "^9.25.0",
|
||||||
"@tailwindcss/typography": "^0.5.19",
|
"@tailwindcss/typography": "^0.5.19",
|
||||||
"@testing-library/dom": "^10.4.1",
|
|
||||||
"@testing-library/jest-dom": "^6.9.1",
|
|
||||||
"@testing-library/react": "^16.3.2",
|
|
||||||
"@testing-library/user-event": "^14.6.1",
|
|
||||||
"@types/axios": "^0.14.4",
|
"@types/axios": "^0.14.4",
|
||||||
"@types/markdown-it": "^14.1.2",
|
"@types/markdown-it": "^14.1.2",
|
||||||
"@types/mdx": "^2.0.13",
|
"@types/mdx": "^2.0.13",
|
||||||
@@ -64,13 +58,11 @@
|
|||||||
"eslint-plugin-react-hooks": "^5.2.0",
|
"eslint-plugin-react-hooks": "^5.2.0",
|
||||||
"eslint-plugin-react-refresh": "^0.4.19",
|
"eslint-plugin-react-refresh": "^0.4.19",
|
||||||
"globals": "^16.0.0",
|
"globals": "^16.0.0",
|
||||||
"jsdom": "^26.1.0",
|
|
||||||
"postcss": "^8.5.3",
|
"postcss": "^8.5.3",
|
||||||
"tailwindcss": "^3.4.13",
|
"tailwindcss": "^3.4.13",
|
||||||
"typescript": "~5.8.3",
|
"typescript": "~5.8.3",
|
||||||
"typescript-eslint": "^8.30.1",
|
"typescript-eslint": "^8.30.1",
|
||||||
"vite": "^6.3.5",
|
"vite": "^6.3.5"
|
||||||
"vitest": "^4.1.5"
|
|
||||||
},
|
},
|
||||||
"description": "This template provides a minimal setup to get React working in Vite with HMR and some ESLint rules.",
|
"description": "This template provides a minimal setup to get React working in Vite with HMR and some ESLint rules.",
|
||||||
"main": "eslint.config.js",
|
"main": "eslint.config.js",
|
||||||
|
|||||||
+2
-4
@@ -93,7 +93,7 @@ const PostDetailRoute = ({ user }: { user: User | null }) => {
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
const App: FC = () => {
|
export default (() => {
|
||||||
const [user, setUser] = useState<User | null> (null)
|
const [user, setUser] = useState<User | null> (null)
|
||||||
const [status, setStatus] = useState (200)
|
const [status, setStatus] = useState (200)
|
||||||
|
|
||||||
@@ -156,6 +156,4 @@ const App: FC = () => {
|
|||||||
</DialogueProvider>
|
</DialogueProvider>
|
||||||
</BrowserRouter>
|
</BrowserRouter>
|
||||||
</>)
|
</>)
|
||||||
}
|
}) satisfies FC
|
||||||
|
|
||||||
export default App
|
|
||||||
|
|||||||
@@ -19,7 +19,7 @@ type Props = {
|
|||||||
sp?: boolean }
|
sp?: boolean }
|
||||||
|
|
||||||
|
|
||||||
const DraggableDroppableTagRow: FC<Props> = ({ tag, nestLevel, pathKey, parentTagId, suppressClickRef, sp }) => {
|
export default (({ tag, nestLevel, pathKey, parentTagId, suppressClickRef, sp }: Props) => {
|
||||||
const dndId = `tag-node:${ pathKey }`
|
const dndId = `tag-node:${ pathKey }`
|
||||||
|
|
||||||
const downPosRef = useRef<{ x: number; y: number } | null> (null)
|
const downPosRef = useRef<{ x: number; y: number } | null> (null)
|
||||||
@@ -96,6 +96,4 @@ const DraggableDroppableTagRow: FC<Props> = ({ tag, nestLevel, pathKey, parentTa
|
|||||||
<TagLink tag={tag} nestLevel={nestLevel}/>
|
<TagLink tag={tag} nestLevel={nestLevel}/>
|
||||||
</motion.div>
|
</motion.div>
|
||||||
</div>)
|
</div>)
|
||||||
}
|
}) satisfies FC<Props>
|
||||||
|
|
||||||
export default DraggableDroppableTagRow
|
|
||||||
|
|||||||
@@ -1,32 +0,0 @@
|
|||||||
import { render, screen } from '@testing-library/react'
|
|
||||||
import { HelmetProvider } from 'react-helmet-async'
|
|
||||||
import { describe, expect, it } from 'vitest'
|
|
||||||
|
|
||||||
import ErrorScreen from '@/components/ErrorScreen'
|
|
||||||
|
|
||||||
describe ('ErrorScreen', () => {
|
|
||||||
it.each ([
|
|
||||||
[403, '権限ないよ(笑)'],
|
|
||||||
[404, 'ページないよ(笑)'],
|
|
||||||
[500, '鯖でエラー出たって(嘲笑)'],
|
|
||||||
[503, '鯖死んでるよ(泣)'],
|
|
||||||
]) ('renders status %s', (status, message) => {
|
|
||||||
render (
|
|
||||||
<HelmetProvider>
|
|
||||||
<ErrorScreen status={status}/>
|
|
||||||
</HelmetProvider>,
|
|
||||||
)
|
|
||||||
|
|
||||||
expect (screen.getByText (String (status))).toBeInTheDocument ()
|
|
||||||
expect (screen.getByText (message)).toBeInTheDocument ()
|
|
||||||
expect (screen.getByAltText ('逃げたギター')).toBeInTheDocument ()
|
|
||||||
})
|
|
||||||
|
|
||||||
it ('throws for unsupported statuses', () => {
|
|
||||||
expect (() => render (
|
|
||||||
<HelmetProvider>
|
|
||||||
<ErrorScreen status={418}/>
|
|
||||||
</HelmetProvider>,
|
|
||||||
)).toThrow ()
|
|
||||||
})
|
|
||||||
})
|
|
||||||
@@ -10,7 +10,7 @@ import type { FC } from 'react'
|
|||||||
type Props = { status: number }
|
type Props = { status: number }
|
||||||
|
|
||||||
|
|
||||||
const ErrorScreen: FC<Props> = ({ status }) => {
|
export default (({ status }: Props) => {
|
||||||
const [message, rightMsg, leftMsg]: [string, string, string] = (() => {
|
const [message, rightMsg, leftMsg]: [string, string, string] = (() => {
|
||||||
switch (status)
|
switch (status)
|
||||||
{
|
{
|
||||||
@@ -58,6 +58,4 @@ const ErrorScreen: FC<Props> = ({ status }) => {
|
|||||||
<p className="mr-[-.5em]">{message}</p>
|
<p className="mr-[-.5em]">{message}</p>
|
||||||
</div>
|
</div>
|
||||||
</MainArea>)
|
</MainArea>)
|
||||||
}
|
}) satisfies FC<Props>
|
||||||
|
|
||||||
export default ErrorScreen
|
|
||||||
|
|||||||
@@ -31,7 +31,7 @@ const setChildrenById = (
|
|||||||
}))
|
}))
|
||||||
|
|
||||||
|
|
||||||
const MaterialSidebar: FC = () => {
|
export default (() => {
|
||||||
const [tags, setTags] = useState<TagWithDepth[]> ([])
|
const [tags, setTags] = useState<TagWithDepth[]> ([])
|
||||||
const [openTags, setOpenTags] = useState<Record<number, boolean>> ({ })
|
const [openTags, setOpenTags] = useState<Record<number, boolean>> ({ })
|
||||||
const [tagFetchedFlags, setTagFetchedFlags] = useState<Record<number, boolean>> ({ })
|
const [tagFetchedFlags, setTagFetchedFlags] = useState<Record<number, boolean>> ({ })
|
||||||
@@ -94,6 +94,4 @@ const MaterialSidebar: FC = () => {
|
|||||||
{renderTags (tags)}
|
{renderTags (tags)}
|
||||||
</ul>
|
</ul>
|
||||||
</SidebarComponent>)
|
</SidebarComponent>)
|
||||||
}
|
}) satisfies FC
|
||||||
|
|
||||||
export default MaterialSidebar
|
|
||||||
|
|||||||
@@ -1,11 +1,9 @@
|
|||||||
import type { FC } from 'react'
|
import type { FC } from 'react'
|
||||||
|
|
||||||
|
|
||||||
const MenuSeparator: FC = () => (
|
export default (() => (
|
||||||
<>
|
<>
|
||||||
<span className="hidden md:inline flex items-center px-2">|</span>
|
<span className="hidden md:inline flex items-center px-2">|</span>
|
||||||
<hr className="block md:hidden w-full opacity-25
|
<hr className="block md:hidden w-full opacity-25
|
||||||
border-t border-black dark:border-white"/>
|
border-t border-black dark:border-white"/>
|
||||||
</>)
|
</>)) satisfies FC
|
||||||
|
|
||||||
export default MenuSeparator
|
|
||||||
|
|||||||
@@ -1,69 +0,0 @@
|
|||||||
import { fireEvent, render, screen, waitFor } from '@testing-library/react'
|
|
||||||
import { describe, expect, it, vi } from 'vitest'
|
|
||||||
|
|
||||||
import PostEditForm from '@/components/PostEditForm'
|
|
||||||
import { buildPost, buildTag } from '@/test/factories'
|
|
||||||
|
|
||||||
const postsApi = vi.hoisted (() => ({
|
|
||||||
updatePost: vi.fn (),
|
|
||||||
}))
|
|
||||||
|
|
||||||
const api = vi.hoisted (() => ({
|
|
||||||
isApiError: vi.fn (() => false),
|
|
||||||
}))
|
|
||||||
|
|
||||||
const toastApi = vi.hoisted (() => ({
|
|
||||||
toast: vi.fn (),
|
|
||||||
}))
|
|
||||||
|
|
||||||
vi.mock ('@/lib/posts', () => postsApi)
|
|
||||||
vi.mock ('@/lib/api', () => api)
|
|
||||||
vi.mock ('@/components/ui/use-toast', () => toastApi)
|
|
||||||
vi.mock ('@/components/dialogues/DialogueProvider', () => ({
|
|
||||||
useDialogue: () => ({
|
|
||||||
choice: vi.fn (),
|
|
||||||
}),
|
|
||||||
}))
|
|
||||||
|
|
||||||
describe ('PostEditForm', () => {
|
|
||||||
it ('submits edited post fields with the current base version', async () => {
|
|
||||||
const onSave = vi.fn ()
|
|
||||||
const post = buildPost ({
|
|
||||||
id: 8,
|
|
||||||
versionNo: 4,
|
|
||||||
title: 'old',
|
|
||||||
tags: [
|
|
||||||
buildTag ({ name: 'general-tag', category: 'general' }),
|
|
||||||
buildTag ({ id: 2, name: 'nico-tag', category: 'nico' }),
|
|
||||||
],
|
|
||||||
parentPosts: [buildPost ({ id: 2, title: 'parent' })],
|
|
||||||
})
|
|
||||||
postsApi.updatePost.mockResolvedValueOnce ({
|
|
||||||
...post,
|
|
||||||
versionNo: 5,
|
|
||||||
title: 'new',
|
|
||||||
tags: [buildTag ({ name: 'new-tag' })],
|
|
||||||
})
|
|
||||||
|
|
||||||
render (<PostEditForm post={post} onSave={onSave}/>)
|
|
||||||
|
|
||||||
const [title, parentIds] = screen.getAllByRole ('textbox')
|
|
||||||
fireEvent.change (title, { target: { value: 'new' } })
|
|
||||||
fireEvent.change (parentIds, { target: { value: '3 4' } })
|
|
||||||
fireEvent.submit (screen.getByRole ('button', { name: '更新' }).closest ('form')!)
|
|
||||||
|
|
||||||
await waitFor (() => {
|
|
||||||
expect (postsApi.updatePost).toHaveBeenCalledWith (
|
|
||||||
expect.objectContaining ({
|
|
||||||
id: 8,
|
|
||||||
title: 'new',
|
|
||||||
parentPostIds: '3 4',
|
|
||||||
tags: 'general-tag',
|
|
||||||
}),
|
|
||||||
{ baseVersionNo: 4 },
|
|
||||||
)
|
|
||||||
})
|
|
||||||
expect (onSave).toHaveBeenCalledWith (expect.objectContaining ({ versionNo: 5 }))
|
|
||||||
expect (toastApi.toast).toHaveBeenCalledWith ({ description: '更新しました.' })
|
|
||||||
})
|
|
||||||
})
|
|
||||||
@@ -2,23 +2,16 @@ 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 FormField from '@/components/common/FormField'
|
|
||||||
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 { updatePost } from '@/lib/posts'
|
import { updatePost } from '@/lib/posts'
|
||||||
import { inputClass } from '@/lib/utils'
|
|
||||||
import { useValidationErrors } from '@/lib/useValidationErrors'
|
|
||||||
|
|
||||||
import type { FC, FormEvent } from 'react'
|
import type { FC, FormEvent } from 'react'
|
||||||
|
|
||||||
import type { Post, Tag } from '@/types'
|
import type { Post, Tag } from '@/types'
|
||||||
|
|
||||||
type PostFormField =
|
|
||||||
'parentPostIds' | 'tags' | 'originalCreatedAt'
|
|
||||||
|
|
||||||
|
|
||||||
const tagsToStr = (tags: Tag[]): string => {
|
const tagsToStr = (tags: Tag[]): string => {
|
||||||
const result: Tag[] = []
|
const result: Tag[] = []
|
||||||
@@ -39,10 +32,8 @@ type Props = { post: Post
|
|||||||
onSave: (newPost: Post) => void }
|
onSave: (newPost: Post) => void }
|
||||||
|
|
||||||
|
|
||||||
const PostEditForm: FC<Props> = ({ post, onSave }) => {
|
export default (({ post, onSave }: Props) => {
|
||||||
const [disabled, setDisabled] = useState (false)
|
const [disabled, setDisabled] = useState (false)
|
||||||
const { baseErrors, fieldErrors, clearValidationErrors, applyValidationError } =
|
|
||||||
useValidationErrors<PostFormField> ()
|
|
||||||
const [originalCreatedBefore, setOriginalCreatedBefore] =
|
const [originalCreatedBefore, setOriginalCreatedBefore] =
|
||||||
useState<string | null> (post.originalCreatedBefore)
|
useState<string | null> (post.originalCreatedBefore)
|
||||||
const [originalCreatedFrom, setOriginalCreatedFrom] =
|
const [originalCreatedFrom, setOriginalCreatedFrom] =
|
||||||
@@ -55,8 +46,6 @@ 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>) => {
|
||||||
clearValidationErrors ()
|
|
||||||
|
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
const data = await updatePost (...args)
|
const data = await updatePost (...args)
|
||||||
@@ -73,18 +62,11 @@ const PostEditForm: FC<Props> = ({ post, onSave }) => {
|
|||||||
}
|
}
|
||||||
catch (e)
|
catch (e)
|
||||||
{
|
{
|
||||||
const response = isApiError<{ mergeable?: boolean }> (e) ? e.response : undefined
|
const response = (e as any)?.response
|
||||||
|
|
||||||
if (response?.status !== 409)
|
if (response?.status !== 409)
|
||||||
{
|
{
|
||||||
if (applyValidationError (e))
|
toast ({ description: '更新はできなかったよ……' })
|
||||||
{
|
|
||||||
toast ({ description: '更新はできなかったよ……' })
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
toast ({ title: '失敗……', description: '入力を確認してください.' })
|
|
||||||
|
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -139,38 +121,33 @@ const PostEditForm: FC<Props> = ({ post, onSave }) => {
|
|||||||
|
|
||||||
return (
|
return (
|
||||||
<form onSubmit={handleSubmit} className="max-w-xl pt-2 space-y-4">
|
<form onSubmit={handleSubmit} className="max-w-xl pt-2 space-y-4">
|
||||||
<FieldError messages={baseErrors}/>
|
|
||||||
|
|
||||||
{/* タイトル */}
|
{/* タイトル */}
|
||||||
<FormField label="タイトル">
|
<div>
|
||||||
{({ invalid }) => (
|
<Label>タイトル</Label>
|
||||||
<input
|
<input
|
||||||
type="text"
|
type="text"
|
||||||
disabled={disabled}
|
disabled={disabled}
|
||||||
className={inputClass (invalid)}
|
className="w-full border rounded p-2"
|
||||||
value={title ?? ''}
|
value={title ?? ''}
|
||||||
onChange={ev => setTitle (ev.target.value)}/>)}
|
onChange={ev => setTitle (ev.target.value)}/>
|
||||||
</FormField>
|
</div>
|
||||||
|
|
||||||
{/* 親投稿 */}
|
{/* 親投稿 */}
|
||||||
<FormField label="親投稿" messages={fieldErrors.parentPostIds}>
|
<div>
|
||||||
{({ describedBy, invalid }) => (
|
<Label>親投稿</Label>
|
||||||
<input
|
<input
|
||||||
type="text"
|
type="text"
|
||||||
disabled={disabled}
|
disabled={disabled}
|
||||||
value={parentPostIds}
|
value={parentPostIds}
|
||||||
onChange={e => setParentPostIds (e.target.value)}
|
onChange={e => setParentPostIds (e.target.value)}
|
||||||
aria-describedby={describedBy}
|
className="w-full border p-2 rounded"/>
|
||||||
aria-invalid={invalid}
|
</div>
|
||||||
className={inputClass (invalid)}/>)}
|
|
||||||
</FormField>
|
|
||||||
|
|
||||||
{/* タグ */}
|
{/* タグ */}
|
||||||
<PostFormTagsArea
|
<PostFormTagsArea
|
||||||
disabled={disabled}
|
disabled={disabled}
|
||||||
tags={tags}
|
tags={tags}
|
||||||
setTags={setTags}
|
setTags={setTags}/>
|
||||||
errors={fieldErrors.tags}/>
|
|
||||||
|
|
||||||
{/* オリジナルの作成日時 */}
|
{/* オリジナルの作成日時 */}
|
||||||
<PostOriginalCreatedTimeField
|
<PostOriginalCreatedTimeField
|
||||||
@@ -178,14 +155,13 @@ const PostEditForm: FC<Props> = ({ post, onSave }) => {
|
|||||||
originalCreatedFrom={originalCreatedFrom}
|
originalCreatedFrom={originalCreatedFrom}
|
||||||
setOriginalCreatedFrom={setOriginalCreatedFrom}
|
setOriginalCreatedFrom={setOriginalCreatedFrom}
|
||||||
originalCreatedBefore={originalCreatedBefore}
|
originalCreatedBefore={originalCreatedBefore}
|
||||||
setOriginalCreatedBefore={setOriginalCreatedBefore}
|
setOriginalCreatedBefore={setOriginalCreatedBefore}/>
|
||||||
errors={fieldErrors.originalCreatedAt}/>
|
|
||||||
|
|
||||||
{/* 送信 */}
|
{/* 送信 */}
|
||||||
<Button type="submit" disabled={disabled}>
|
<Button
|
||||||
|
type="submit"
|
||||||
|
disabled={disabled}>
|
||||||
更新
|
更新
|
||||||
</Button>
|
</Button>
|
||||||
</form>)
|
</form>)
|
||||||
}
|
}) satisfies FC<Props>
|
||||||
|
|
||||||
export default PostEditForm
|
|
||||||
|
|||||||
@@ -1,63 +0,0 @@
|
|||||||
import { fireEvent, render, screen, waitFor } from '@testing-library/react'
|
|
||||||
import { beforeEach, describe, expect, it, vi } from 'vitest'
|
|
||||||
|
|
||||||
import PostEmbed from '@/components/PostEmbed'
|
|
||||||
import { buildPost } from '@/test/factories'
|
|
||||||
|
|
||||||
const dialogue = vi.hoisted (() => ({
|
|
||||||
confirm: vi.fn (),
|
|
||||||
}))
|
|
||||||
|
|
||||||
vi.mock ('@/components/dialogues/DialogueProvider', () => ({
|
|
||||||
useDialogue: () => dialogue,
|
|
||||||
}))
|
|
||||||
|
|
||||||
vi.mock ('@/components/NicoViewer', () => ({
|
|
||||||
default: ({ id }: { id: string }) => <div>Nico:{id}</div>,
|
|
||||||
}))
|
|
||||||
|
|
||||||
vi.mock ('react-youtube', () => ({
|
|
||||||
default: ({ videoId }: { videoId: string }) => <div>YouTube:{videoId}</div>,
|
|
||||||
}))
|
|
||||||
|
|
||||||
describe ('PostEmbed', () => {
|
|
||||||
beforeEach (() => {
|
|
||||||
vi.clearAllMocks ()
|
|
||||||
})
|
|
||||||
|
|
||||||
it ('embeds nicovideo watch URLs', () => {
|
|
||||||
render (<PostEmbed post={buildPost ({ url: 'https://www.nicovideo.jp/watch/sm12345' })}/>)
|
|
||||||
|
|
||||||
expect (screen.getByText ('Nico:sm12345')).toBeInTheDocument ()
|
|
||||||
})
|
|
||||||
|
|
||||||
it ('embeds x/twitter status URLs', () => {
|
|
||||||
render (<PostEmbed post={buildPost ({ url: 'https://x.com/someone/status/12345' })}/>)
|
|
||||||
|
|
||||||
expect (screen.getByRole ('link', { name: '@someone' })).toBeInTheDocument ()
|
|
||||||
})
|
|
||||||
|
|
||||||
it ('embeds youtube watch URLs', () => {
|
|
||||||
render (<PostEmbed post={buildPost ({ url: 'https://www.youtube.com/watch?v=abc123' })}/>)
|
|
||||||
|
|
||||||
expect (screen.getByText ('YouTube:abc123')).toBeInTheDocument ()
|
|
||||||
})
|
|
||||||
|
|
||||||
it ('asks before framing unknown external pages', async () => {
|
|
||||||
dialogue.confirm.mockResolvedValueOnce (true)
|
|
||||||
render (
|
|
||||||
<PostEmbed
|
|
||||||
post={buildPost ({ url: 'https://example.com/page', title: 'external' })}/>,
|
|
||||||
)
|
|
||||||
|
|
||||||
fireEvent.click (screen.getByRole ('link', { name: '外部ページを表示' }))
|
|
||||||
|
|
||||||
await waitFor (() => {
|
|
||||||
expect (dialogue.confirm).toHaveBeenCalled ()
|
|
||||||
})
|
|
||||||
expect (await screen.findByTitle ('external')).toHaveAttribute (
|
|
||||||
'src',
|
|
||||||
'https://example.com/page',
|
|
||||||
)
|
|
||||||
})
|
|
||||||
})
|
|
||||||
@@ -16,9 +16,8 @@ type Props = {
|
|||||||
onMetadataChange?: (meta: NiconicoMetadata) => void }
|
onMetadataChange?: (meta: NiconicoMetadata) => void }
|
||||||
|
|
||||||
|
|
||||||
const PostEmbed: FC<Props> = ({ ref, post, onLoadComplete, onMetadataChange }) => {
|
export default (({ ref, post, onLoadComplete, onMetadataChange }: Props) => {
|
||||||
const dialogue = useDialogue ()
|
const dialogue = useDialogue ()
|
||||||
const [framed, setFramed] = useState (false)
|
|
||||||
|
|
||||||
const url = new URL (post.url)
|
const url = new URL (post.url)
|
||||||
|
|
||||||
@@ -45,7 +44,7 @@ const PostEmbed: FC<Props> = ({ ref, post, onLoadComplete, onMetadataChange }) =
|
|||||||
case 'twitter.com':
|
case 'twitter.com':
|
||||||
case 'x.com':
|
case 'x.com':
|
||||||
{
|
{
|
||||||
const mUserId = url.pathname.match (/(?<=\/)[^/]+?(?=\/|$|\?)/)
|
const mUserId = url.pathname.match (/(?<=\/)[^\/]+?(?=\/|$|\?)/)
|
||||||
const mStatusId = url.pathname.match (/(?<=\/status\/)\d+?(?=\/|$|\?)/)
|
const mStatusId = url.pathname.match (/(?<=\/status\/)\d+?(?=\/|$|\?)/)
|
||||||
if (!(mUserId) || !(mStatusId))
|
if (!(mUserId) || !(mStatusId))
|
||||||
break
|
break
|
||||||
@@ -73,6 +72,8 @@ const PostEmbed: FC<Props> = ({ ref, post, onLoadComplete, onMetadataChange }) =
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const [framed, setFramed] = useState (false)
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<>
|
<>
|
||||||
{framed
|
{framed
|
||||||
@@ -100,6 +101,4 @@ const PostEmbed: FC<Props> = ({ ref, post, onLoadComplete, onMetadataChange }) =
|
|||||||
</a>
|
</a>
|
||||||
</div>)}
|
</div>)}
|
||||||
</>)
|
</>)
|
||||||
}
|
}) satisfies FC<Props>
|
||||||
|
|
||||||
export default PostEmbed
|
|
||||||
|
|||||||
@@ -1,34 +0,0 @@
|
|||||||
import { fireEvent, screen, waitFor } from '@testing-library/react'
|
|
||||||
import { describe, expect, it, vi } from 'vitest'
|
|
||||||
|
|
||||||
import PostFormTagsArea from '@/components/PostFormTagsArea'
|
|
||||||
import { buildTag } from '@/test/factories'
|
|
||||||
import { renderWithProviders } from '@/test/render'
|
|
||||||
|
|
||||||
const api = vi.hoisted (() => ({
|
|
||||||
apiGet: vi.fn (),
|
|
||||||
}))
|
|
||||||
|
|
||||||
vi.mock ('@/lib/api', () => api)
|
|
||||||
|
|
||||||
describe ('PostFormTagsArea', () => {
|
|
||||||
it ('updates text and fetches autocomplete for the selected token', async () => {
|
|
||||||
const setTags = vi.fn ()
|
|
||||||
api.apiGet.mockResolvedValueOnce ([buildTag ({ name: '虹夏', postCount: 3 })])
|
|
||||||
|
|
||||||
renderWithProviders (<PostFormTagsArea tags="虹" setTags={setTags}/>)
|
|
||||||
|
|
||||||
const textarea = screen.getByRole ('textbox')
|
|
||||||
fireEvent.focus (textarea)
|
|
||||||
fireEvent.select (textarea, { target: { selectionStart: 1, selectionEnd: 1 } })
|
|
||||||
fireEvent.change (textarea, { target: { value: '虹夏' } })
|
|
||||||
|
|
||||||
await waitFor (() => {
|
|
||||||
expect (api.apiGet).toHaveBeenCalledWith (
|
|
||||||
'/tags/autocomplete',
|
|
||||||
{ params: { q: '虹', nico: '0' } },
|
|
||||||
)
|
|
||||||
})
|
|
||||||
expect (setTags).toHaveBeenCalledWith ('虹夏')
|
|
||||||
})
|
|
||||||
})
|
|
||||||
@@ -3,7 +3,7 @@
|
|||||||
import { useRef, useState } from 'react'
|
import { useRef, useState } from 'react'
|
||||||
|
|
||||||
import TagSearchBox from '@/components/TagSearchBox'
|
import TagSearchBox from '@/components/TagSearchBox'
|
||||||
import FormField from '@/components/common/FormField'
|
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,11 +33,10 @@ 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, errors, ...rest }) => {
|
export default (({ tags, setTags, ...rest }: Props) => {
|
||||||
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 })
|
||||||
@@ -74,34 +73,28 @@ const PostFormTagsArea: FC<Props> = ({ tags, setTags, errors, ...rest }) => {
|
|||||||
}
|
}
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<FormField className="relative w-full" label="タグ" messages={errors}>
|
<div className="relative w-full">
|
||||||
{({ describedBy, invalid }) => (
|
<Label>タグ</Label>
|
||||||
<>
|
<TextArea
|
||||||
<TextArea
|
{...rest}
|
||||||
{...rest}
|
ref={ref}
|
||||||
ref={ref}
|
value={tags}
|
||||||
value={tags}
|
onChange={ev => setTags (ev.target.value)}
|
||||||
aria-describedby={describedBy}
|
onSelect={async (ev: SyntheticEvent<HTMLTextAreaElement>) => {
|
||||||
invalid={invalid}
|
const pos = (ev.target as HTMLTextAreaElement).selectionStart
|
||||||
onChange={ev => setTags (ev.target.value)}
|
await recompute (pos)
|
||||||
onSelect={async (ev: SyntheticEvent<HTMLTextAreaElement>) => {
|
}}
|
||||||
const pos = (ev.target as HTMLTextAreaElement).selectionStart
|
onFocus={() => setFocused (true)}
|
||||||
await recompute (pos)
|
onBlur={() => {
|
||||||
}}
|
setFocused (false)
|
||||||
onFocus={() => setFocused (true)}
|
setSuggestionsVsbl (false)
|
||||||
onBlur={() => {
|
}}/>
|
||||||
setFocused (false)
|
{focused && (
|
||||||
setSuggestionsVsbl (false)
|
<TagSearchBox
|
||||||
}}/>
|
suggestions={suggestionsVsbl && suggestions.length > 0
|
||||||
{focused && (
|
? suggestions
|
||||||
<TagSearchBox
|
: [] as Tag[]}
|
||||||
suggestions={suggestionsVsbl && suggestions.length > 0
|
activeIndex={-1}
|
||||||
? suggestions
|
onSelect={handleTagSelect}/>)}
|
||||||
: [] as Tag[]}
|
</div>)
|
||||||
activeIndex={-1}
|
}) satisfies FC<Props>
|
||||||
onSelect={handleTagSelect}/>)}
|
|
||||||
</>)}
|
|
||||||
</FormField>)
|
|
||||||
}
|
|
||||||
|
|
||||||
export default PostFormTagsArea
|
|
||||||
|
|||||||
@@ -1,44 +0,0 @@
|
|||||||
import { fireEvent, screen } from '@testing-library/react'
|
|
||||||
import { beforeEach, describe, expect, it, vi } from 'vitest'
|
|
||||||
|
|
||||||
import PostList from '@/components/PostList'
|
|
||||||
import { buildPost } from '@/test/factories'
|
|
||||||
import { renderWithProviders } from '@/test/render'
|
|
||||||
|
|
||||||
const prefetchers = vi.hoisted (() => ({
|
|
||||||
prefetchForURL: vi.fn (),
|
|
||||||
}))
|
|
||||||
|
|
||||||
vi.mock ('@/lib/prefetchers', () => prefetchers)
|
|
||||||
|
|
||||||
describe ('PostList', () => {
|
|
||||||
beforeEach (() => {
|
|
||||||
prefetchers.prefetchForURL.mockResolvedValue (undefined)
|
|
||||||
})
|
|
||||||
|
|
||||||
it ('renders post thumbnails as links to post details', () => {
|
|
||||||
renderWithProviders (
|
|
||||||
<PostList posts={[
|
|
||||||
buildPost ({ id: 1, title: 'First', thumbnail: 'first.jpg' }),
|
|
||||||
buildPost ({ id: 2, title: null, url: 'https://example.com/second' }),
|
|
||||||
]}/>,
|
|
||||||
)
|
|
||||||
|
|
||||||
expect (screen.getByRole ('link', { name: 'First' })).toHaveAttribute (
|
|
||||||
'href',
|
|
||||||
'/posts/1',
|
|
||||||
)
|
|
||||||
expect (
|
|
||||||
screen.getByRole ('link', { name: 'https://example.com/second' }),
|
|
||||||
).toHaveAttribute ('href', '/posts/2')
|
|
||||||
})
|
|
||||||
|
|
||||||
it ('calls the optional click handler', () => {
|
|
||||||
const onClick = vi.fn ()
|
|
||||||
renderWithProviders (<PostList posts={[buildPost ()]} onClick={onClick}/>)
|
|
||||||
|
|
||||||
fireEvent.click (screen.getByRole ('link', { name: 'テスト投稿' }))
|
|
||||||
|
|
||||||
expect (onClick).toHaveBeenCalledTimes (1)
|
|
||||||
})
|
|
||||||
})
|
|
||||||
@@ -14,7 +14,7 @@ type Props = { posts: Post[]
|
|||||||
onClick?: (event: MouseEvent<HTMLElement>) => void }
|
onClick?: (event: MouseEvent<HTMLElement>) => void }
|
||||||
|
|
||||||
|
|
||||||
const PostList: FC<Props> = ({ posts, onClick }) => {
|
export default (({ posts, onClick }: Props) => {
|
||||||
const location = useLocation ()
|
const location = useLocation ()
|
||||||
|
|
||||||
const setForLocationKey = useSharedTransitionStore (s => s.setForLocationKey)
|
const setForLocationKey = useSharedTransitionStore (s => s.setForLocationKey)
|
||||||
@@ -70,6 +70,4 @@ const PostList: FC<Props> = ({ posts, onClick }) => {
|
|||||||
</PrefetchLink>)
|
</PrefetchLink>)
|
||||||
})}
|
})}
|
||||||
</div>)
|
</div>)
|
||||||
}
|
}) satisfies FC<Props>
|
||||||
|
|
||||||
export default PostList
|
|
||||||
|
|||||||
@@ -1,63 +0,0 @@
|
|||||||
import { fireEvent, render, screen } from '@testing-library/react'
|
|
||||||
import { describe, expect, it, vi } from 'vitest'
|
|
||||||
|
|
||||||
import PostOriginalCreatedTimeField from '@/components/PostOriginalCreatedTimeField'
|
|
||||||
|
|
||||||
describe ('PostOriginalCreatedTimeField', () => {
|
|
||||||
it ('updates from and before values', () => {
|
|
||||||
const setFrom = vi.fn ()
|
|
||||||
const setBefore = vi.fn ()
|
|
||||||
|
|
||||||
render (
|
|
||||||
<PostOriginalCreatedTimeField
|
|
||||||
originalCreatedFrom={null}
|
|
||||||
setOriginalCreatedFrom={setFrom}
|
|
||||||
originalCreatedBefore={null}
|
|
||||||
setOriginalCreatedBefore={setBefore}/>,
|
|
||||||
)
|
|
||||||
|
|
||||||
const inputs = screen.getAllByDisplayValue ('')
|
|
||||||
fireEvent.change (inputs[0], { target: { value: '2026-01-02T03:04' } })
|
|
||||||
fireEvent.change (inputs[1], { target: { value: '2026-01-03T03:04' } })
|
|
||||||
|
|
||||||
expect (setFrom).toHaveBeenCalledWith (expect.any (String))
|
|
||||||
expect (setBefore).toHaveBeenCalledWith (expect.any (String))
|
|
||||||
})
|
|
||||||
|
|
||||||
it ('infers an exclusive before value on blur', () => {
|
|
||||||
const setBefore = vi.fn ()
|
|
||||||
|
|
||||||
render (
|
|
||||||
<PostOriginalCreatedTimeField
|
|
||||||
originalCreatedFrom={null}
|
|
||||||
setOriginalCreatedFrom={vi.fn ()}
|
|
||||||
originalCreatedBefore={null}
|
|
||||||
setOriginalCreatedBefore={setBefore}/>,
|
|
||||||
)
|
|
||||||
|
|
||||||
const input = screen.getAllByDisplayValue ('')[0]
|
|
||||||
fireEvent.blur (input, { target: { value: '2026-01-02T03:04' } })
|
|
||||||
|
|
||||||
expect (setBefore).toHaveBeenCalledWith (expect.any (String))
|
|
||||||
})
|
|
||||||
|
|
||||||
it ('resets both values', () => {
|
|
||||||
const setFrom = vi.fn ()
|
|
||||||
const setBefore = vi.fn ()
|
|
||||||
|
|
||||||
render (
|
|
||||||
<PostOriginalCreatedTimeField
|
|
||||||
originalCreatedFrom="2026-01-01T00:00:00Z"
|
|
||||||
setOriginalCreatedFrom={setFrom}
|
|
||||||
originalCreatedBefore="2026-01-02T00:00:00Z"
|
|
||||||
setOriginalCreatedBefore={setBefore}/>,
|
|
||||||
)
|
|
||||||
|
|
||||||
const buttons = screen.getAllByRole ('button', { name: 'リセット' })
|
|
||||||
fireEvent.click (buttons[0])
|
|
||||||
fireEvent.click (buttons[1])
|
|
||||||
|
|
||||||
expect (setFrom).toHaveBeenCalledWith (null)
|
|
||||||
expect (setBefore).toHaveBeenCalledWith (null)
|
|
||||||
})
|
|
||||||
})
|
|
||||||
@@ -1,5 +1,5 @@
|
|||||||
import DateTimeField from '@/components/common/DateTimeField'
|
import DateTimeField from '@/components/common/DateTimeField'
|
||||||
import FormField from '@/components/common/FormField'
|
import Label from '@/components/common/Label'
|
||||||
import { Button } from '@/components/ui/button'
|
import { Button } from '@/components/ui/button'
|
||||||
|
|
||||||
import type { FC } from 'react'
|
import type { FC } from 'react'
|
||||||
@@ -9,81 +9,66 @@ 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 }
|
||||||
errors?: string[] }
|
|
||||||
|
|
||||||
|
|
||||||
const PostOriginalCreatedTimeField: FC<Props> = (
|
export default (({ disabled,
|
||||||
{ disabled,
|
originalCreatedFrom,
|
||||||
originalCreatedFrom,
|
setOriginalCreatedFrom,
|
||||||
setOriginalCreatedFrom,
|
originalCreatedBefore,
|
||||||
originalCreatedBefore,
|
setOriginalCreatedBefore }: Props) => (
|
||||||
setOriginalCreatedBefore,
|
<div>
|
||||||
errors }: Props,
|
<Label>オリジナルの作成日時</Label>
|
||||||
) => (
|
<div className="my-1 flex">
|
||||||
<FormField label="オリジナルの作成日時" messages={errors}>
|
<div className="w-80">
|
||||||
{({ describedBy, invalid }) => (
|
<DateTimeField
|
||||||
<>
|
className="mr-2"
|
||||||
<div className="my-1 flex">
|
disabled={disabled ?? false}
|
||||||
<div className="w-80">
|
value={originalCreatedFrom ?? undefined}
|
||||||
<DateTimeField
|
onChange={setOriginalCreatedFrom}
|
||||||
className="mr-2"
|
onBlur={ev => {
|
||||||
disabled={disabled ?? false}
|
const v = ev.target.value
|
||||||
aria-describedby={describedBy}
|
if (!(v))
|
||||||
aria-invalid={invalid}
|
return
|
||||||
invalid={invalid}
|
|
||||||
value={originalCreatedFrom ?? undefined}
|
|
||||||
onChange={setOriginalCreatedFrom}
|
|
||||||
onBlur={ev => {
|
|
||||||
const v = ev.target.value
|
|
||||||
if (!(v))
|
|
||||||
return
|
|
||||||
|
|
||||||
const d = new Date (v)
|
const d = new Date (v)
|
||||||
if (d.getMinutes () === 0 && d.getHours () === 0)
|
if (d.getMinutes () === 0 && d.getHours () === 0)
|
||||||
d.setDate (d.getDate () + 1)
|
d.setDate (d.getDate () + 1)
|
||||||
else
|
else
|
||||||
d.setMinutes (d.getMinutes () + 1)
|
d.setMinutes (d.getMinutes () + 1)
|
||||||
setOriginalCreatedBefore (d.toISOString ())
|
setOriginalCreatedBefore (d.toISOString ())
|
||||||
}}/>
|
}}/>
|
||||||
以降
|
以降
|
||||||
</div>
|
</div>
|
||||||
<div>
|
<div>
|
||||||
<Button
|
<Button
|
||||||
className="bg-gray-600 text-white rounded"
|
className="bg-gray-600 text-white rounded"
|
||||||
disabled={disabled}
|
disabled={disabled}
|
||||||
onClick={() => {
|
onClick={() => {
|
||||||
setOriginalCreatedFrom (null)
|
setOriginalCreatedFrom (null)
|
||||||
}}>
|
}}>
|
||||||
リセット
|
リセット
|
||||||
</Button>
|
</Button>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
<div className="my-1 flex">
|
||||||
<div className="my-1 flex">
|
<div className="w-80">
|
||||||
<div className="w-80">
|
<DateTimeField
|
||||||
<DateTimeField
|
className="mr-2"
|
||||||
className="mr-2"
|
disabled={disabled}
|
||||||
disabled={disabled}
|
value={originalCreatedBefore ?? undefined}
|
||||||
aria-describedby={describedBy}
|
onChange={setOriginalCreatedBefore}/>
|
||||||
aria-invalid={invalid}
|
より前
|
||||||
invalid={invalid}
|
</div>
|
||||||
value={originalCreatedBefore ?? undefined}
|
<div>
|
||||||
onChange={setOriginalCreatedBefore}/>
|
<Button
|
||||||
より前
|
className="bg-gray-600 text-white rounded"
|
||||||
</div>
|
disabled={disabled}
|
||||||
<div>
|
onClick={() => {
|
||||||
<Button
|
setOriginalCreatedBefore (null)
|
||||||
className="bg-gray-600 text-white rounded"
|
}}>
|
||||||
disabled={disabled}
|
リセット
|
||||||
onClick={() => {
|
</Button>
|
||||||
setOriginalCreatedBefore (null)
|
</div>
|
||||||
}}>
|
</div>
|
||||||
リセット
|
</div>)) satisfies FC<Props>
|
||||||
</Button>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</>)}
|
|
||||||
</FormField>)
|
|
||||||
|
|
||||||
export default PostOriginalCreatedTimeField
|
|
||||||
|
|||||||
@@ -1,30 +0,0 @@
|
|||||||
import { render, screen } from '@testing-library/react'
|
|
||||||
import { afterEach, describe, expect, it } from 'vitest'
|
|
||||||
|
|
||||||
import RouteBlockerOverlay, { useOverlayStore } from '@/components/RouteBlockerOverlay'
|
|
||||||
|
|
||||||
describe ('RouteBlockerOverlay', () => {
|
|
||||||
afterEach (() => {
|
|
||||||
useOverlayStore.setState ({ active: false })
|
|
||||||
document.body.style.overflow = ''
|
|
||||||
document.body.removeAttribute ('aria-busy')
|
|
||||||
})
|
|
||||||
|
|
||||||
it ('renders nothing while inactive', () => {
|
|
||||||
useOverlayStore.setState ({ active: false })
|
|
||||||
|
|
||||||
const { container } = render (<RouteBlockerOverlay/>)
|
|
||||||
|
|
||||||
expect (container).toBeEmptyDOMElement ()
|
|
||||||
})
|
|
||||||
|
|
||||||
it ('renders a blocking progressbar and marks the body busy while active', () => {
|
|
||||||
useOverlayStore.setState ({ active: true })
|
|
||||||
|
|
||||||
render (<RouteBlockerOverlay/>)
|
|
||||||
|
|
||||||
expect (screen.getByRole ('progressbar', { name: 'Loading' })).toBeInTheDocument ()
|
|
||||||
expect (document.body).toHaveAttribute ('aria-busy', 'true')
|
|
||||||
expect (document.body.style.overflow).toBe ('hidden')
|
|
||||||
})
|
|
||||||
})
|
|
||||||
@@ -13,7 +13,7 @@ export const useOverlayStore = create<OverlayStore> (set => ({
|
|||||||
setActive: v => set ({ active: v }) }))
|
setActive: v => set ({ active: v }) }))
|
||||||
|
|
||||||
|
|
||||||
const RouteBlockerOverlay: FC = () => {
|
export default (() => {
|
||||||
const active = useOverlayStore (s => s.active)
|
const active = useOverlayStore (s => s.active)
|
||||||
|
|
||||||
useEffect (() => {
|
useEffect (() => {
|
||||||
@@ -43,6 +43,4 @@ const RouteBlockerOverlay: FC = () => {
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>)
|
</div>)
|
||||||
}
|
}) satisfies FC
|
||||||
|
|
||||||
export default RouteBlockerOverlay
|
|
||||||
|
|||||||
@@ -1,39 +0,0 @@
|
|||||||
import { screen } from '@testing-library/react'
|
|
||||||
import { describe, expect, it } from 'vitest'
|
|
||||||
|
|
||||||
import SortHeader from '@/components/SortHeader'
|
|
||||||
import { renderWithProviders } from '@/test/render'
|
|
||||||
|
|
||||||
describe ('SortHeader', () => {
|
|
||||||
it ('toggles the active sort direction and resets the page', () => {
|
|
||||||
renderWithProviders (
|
|
||||||
<SortHeader
|
|
||||||
by="title"
|
|
||||||
label="タイトル"
|
|
||||||
currentOrder="title:asc"
|
|
||||||
defaultDirection={{ title: 'asc' }}/>,
|
|
||||||
{ route: '/posts?tags=x&page=4&order=title%3Aasc' },
|
|
||||||
)
|
|
||||||
|
|
||||||
expect (screen.getByRole ('link', { name: 'タイトル ▲' })).toHaveAttribute (
|
|
||||||
'href',
|
|
||||||
'/posts?tags=x&page=1&order=title%3Adesc',
|
|
||||||
)
|
|
||||||
})
|
|
||||||
|
|
||||||
it ('uses default direction for inactive fields', () => {
|
|
||||||
renderWithProviders (
|
|
||||||
<SortHeader
|
|
||||||
by="updated_at"
|
|
||||||
label="更新"
|
|
||||||
currentOrder="title:desc"
|
|
||||||
defaultDirection={{ title: 'asc', updated_at: 'desc' }}/>,
|
|
||||||
{ route: '/posts?page=2' },
|
|
||||||
)
|
|
||||||
|
|
||||||
expect (screen.getByRole ('link', { name: '更新' })).toHaveAttribute (
|
|
||||||
'href',
|
|
||||||
'/posts?page=1&order=updated_at%3Adesc',
|
|
||||||
)
|
|
||||||
})
|
|
||||||
})
|
|
||||||
@@ -151,7 +151,7 @@ const DropSlot = ({ cat }: { cat: Category }) => {
|
|||||||
type Props = { post: Post; sp?: boolean }
|
type Props = { post: Post; sp?: boolean }
|
||||||
|
|
||||||
|
|
||||||
const TagDetailSidebar: FC<Props> = ({ post, sp }) => {
|
export default (({ post, sp }: Props) => {
|
||||||
sp = Boolean (sp)
|
sp = Boolean (sp)
|
||||||
|
|
||||||
const qc = useQueryClient ()
|
const qc = useQueryClient ()
|
||||||
@@ -376,6 +376,4 @@ const TagDetailSidebar: FC<Props> = ({ post, sp }) => {
|
|||||||
</DragOverlay>
|
</DragOverlay>
|
||||||
</DndContext>
|
</DndContext>
|
||||||
</SidebarComponent>)
|
</SidebarComponent>)
|
||||||
}
|
}) satisfies FC<Props>
|
||||||
|
|
||||||
export default TagDetailSidebar
|
|
||||||
|
|||||||
@@ -1,45 +0,0 @@
|
|||||||
import { screen } from '@testing-library/react'
|
|
||||||
import { describe, expect, it } from 'vitest'
|
|
||||||
|
|
||||||
import TagLink from '@/components/TagLink'
|
|
||||||
import { buildTag } from '@/test/factories'
|
|
||||||
import { renderWithProviders } from '@/test/render'
|
|
||||||
|
|
||||||
describe ('TagLink', () => {
|
|
||||||
it ('links tag names to post search and shows counts', () => {
|
|
||||||
renderWithProviders (
|
|
||||||
<TagLink tag={buildTag ({ name: '虹 夏', postCount: 4 })}/>,
|
|
||||||
)
|
|
||||||
|
|
||||||
expect (screen.getByRole ('link', { name: '虹 夏' })).toHaveAttribute (
|
|
||||||
'href',
|
|
||||||
'/posts?tags=%E8%99%B9+%E5%A4%8F',
|
|
||||||
)
|
|
||||||
expect (screen.getByText ('4')).toBeInTheDocument ()
|
|
||||||
})
|
|
||||||
|
|
||||||
it ('links wiki markers to the correct detail route', () => {
|
|
||||||
renderWithProviders (
|
|
||||||
<TagLink tag={buildTag ({ hasWiki: true, name: 'a/b' })}/>,
|
|
||||||
)
|
|
||||||
|
|
||||||
expect (screen.getByRole ('link', { name: '?' })).toHaveAttribute (
|
|
||||||
'href',
|
|
||||||
'/wiki/a%2Fb',
|
|
||||||
)
|
|
||||||
})
|
|
||||||
|
|
||||||
it ('renders aliases and non-link tags when requested', () => {
|
|
||||||
renderWithProviders (
|
|
||||||
<TagLink
|
|
||||||
tag={buildTag ({ matchedAlias: '別名', name: '正式名' })}
|
|
||||||
linkFlg={false}
|
|
||||||
withWiki={false}
|
|
||||||
withCount={false}/>,
|
|
||||||
)
|
|
||||||
|
|
||||||
expect (screen.getByText ('別名')).toBeInTheDocument ()
|
|
||||||
expect (screen.getByText ('正式名')).toBeInTheDocument ()
|
|
||||||
expect (screen.queryByRole ('link')).not.toBeInTheDocument ()
|
|
||||||
})
|
|
||||||
})
|
|
||||||
@@ -27,12 +27,12 @@ type Props =
|
|||||||
| PropsWithoutLink
|
| PropsWithoutLink
|
||||||
|
|
||||||
|
|
||||||
const TagLink: FC<Props> = ({ tag,
|
export default (({ tag,
|
||||||
nestLevel = 0,
|
nestLevel = 0,
|
||||||
linkFlg = true,
|
linkFlg = true,
|
||||||
withWiki = true,
|
withWiki = true,
|
||||||
withCount = true,
|
withCount = true,
|
||||||
...props }) => {
|
...props }: Props) => {
|
||||||
const spanClass = cn (
|
const spanClass = cn (
|
||||||
`text-${ TAG_COLOUR[tag.category] }-${ LIGHT_COLOUR_SHADE }`,
|
`text-${ TAG_COLOUR[tag.category] }-${ LIGHT_COLOUR_SHADE }`,
|
||||||
`dark:text-${ TAG_COLOUR[tag.category] }-${ DARK_COLOUR_SHADE }`)
|
`dark:text-${ TAG_COLOUR[tag.category] }-${ DARK_COLOUR_SHADE }`)
|
||||||
@@ -126,6 +126,4 @@ const TagLink: FC<Props> = ({ tag,
|
|||||||
{withCount && (
|
{withCount && (
|
||||||
<span className="ml-1">{tag.postCount}</span>)}
|
<span className="ml-1">{tag.postCount}</span>)}
|
||||||
</>)
|
</>)
|
||||||
}
|
}) satisfies FC<Props>
|
||||||
|
|
||||||
export default TagLink
|
|
||||||
|
|||||||
@@ -4,7 +4,6 @@ import { useEffect, useState } from 'react'
|
|||||||
import { useNavigate, useLocation } from 'react-router-dom'
|
import { useNavigate, useLocation } from 'react-router-dom'
|
||||||
|
|
||||||
import { apiGet } from '@/lib/api'
|
import { apiGet } from '@/lib/api'
|
||||||
import { inputClass } from '@/lib/utils'
|
|
||||||
|
|
||||||
import TagSearchBox from './TagSearchBox'
|
import TagSearchBox from './TagSearchBox'
|
||||||
|
|
||||||
@@ -13,7 +12,7 @@ import type { ChangeEvent, FC, KeyboardEvent } from 'react'
|
|||||||
import type { Tag } from '@/types'
|
import type { Tag } from '@/types'
|
||||||
|
|
||||||
|
|
||||||
const TagSearch: FC = () => {
|
export default (() => {
|
||||||
const location = useLocation ()
|
const location = useLocation ()
|
||||||
const navigate = useNavigate ()
|
const navigate = useNavigate ()
|
||||||
|
|
||||||
@@ -111,12 +110,9 @@ const TagSearch: FC = () => {
|
|||||||
onFocus={() => setSuggestionsVsbl (true)}
|
onFocus={() => setSuggestionsVsbl (true)}
|
||||||
onBlur={() => setSuggestionsVsbl (false)}
|
onBlur={() => setSuggestionsVsbl (false)}
|
||||||
onKeyDown={handleKeyDown}
|
onKeyDown={handleKeyDown}
|
||||||
className={inputClass (false,
|
className="w-full px-3 py-2 border rounded dark:border-gray-600 dark:bg-gray-800 dark:text-white"/>
|
||||||
'px-3 py-2 dark:border-gray-600 dark:bg-gray-800 dark:text-white')}/>
|
|
||||||
<TagSearchBox suggestions={suggestionsVsbl && suggestions.length ? suggestions : [] as Tag[]}
|
<TagSearchBox suggestions={suggestionsVsbl && suggestions.length ? suggestions : [] as Tag[]}
|
||||||
activeIndex={activeIndex}
|
activeIndex={activeIndex}
|
||||||
onSelect={handleTagSelect}/>
|
onSelect={handleTagSelect}/>
|
||||||
</div>)
|
</div>)
|
||||||
}
|
}) satisfies FC
|
||||||
|
|
||||||
export default TagSearch
|
|
||||||
|
|||||||
@@ -1,30 +0,0 @@
|
|||||||
import { fireEvent, screen } from '@testing-library/react'
|
|
||||||
import { describe, expect, it, vi } from 'vitest'
|
|
||||||
|
|
||||||
import TagSearchBox from '@/components/TagSearchBox'
|
|
||||||
import { buildTag } from '@/test/factories'
|
|
||||||
import { renderWithProviders } from '@/test/render'
|
|
||||||
|
|
||||||
describe ('TagSearchBox', () => {
|
|
||||||
it ('renders suggestions and selects tags on mouse down', () => {
|
|
||||||
const handleSelect = vi.fn ()
|
|
||||||
const tag = buildTag ({ id: 9, name: '候補', postCount: 2 })
|
|
||||||
|
|
||||||
renderWithProviders (
|
|
||||||
<TagSearchBox suggestions={[tag]} activeIndex={0} onSelect={handleSelect}/>,
|
|
||||||
)
|
|
||||||
|
|
||||||
fireEvent.mouseDown (screen.getByText ('候補'))
|
|
||||||
|
|
||||||
expect (handleSelect).toHaveBeenCalledWith (tag)
|
|
||||||
expect (screen.getByText ('2')).toBeInTheDocument ()
|
|
||||||
})
|
|
||||||
|
|
||||||
it ('renders nothing when suggestions are empty', () => {
|
|
||||||
const { container } = renderWithProviders (
|
|
||||||
<TagSearchBox suggestions={[]} activeIndex={-1} onSelect={vi.fn ()}/>,
|
|
||||||
)
|
|
||||||
|
|
||||||
expect (container).toBeEmptyDOMElement ()
|
|
||||||
})
|
|
||||||
})
|
|
||||||
@@ -10,7 +10,7 @@ type Props = { suggestions: Tag[]
|
|||||||
onSelect: (tag: Tag) => void }
|
onSelect: (tag: Tag) => void }
|
||||||
|
|
||||||
|
|
||||||
const TagSearchBox: FC<Props> = ({ suggestions, activeIndex, onSelect }) => {
|
export default (({ suggestions, activeIndex, onSelect }: Props) => {
|
||||||
if (suggestions.length === 0)
|
if (suggestions.length === 0)
|
||||||
return
|
return
|
||||||
|
|
||||||
@@ -26,6 +26,4 @@ const TagSearchBox: FC<Props> = ({ suggestions, activeIndex, onSelect }) => {
|
|||||||
<TagLink tag={tag} linkFlg={false} withWiki={false}/>
|
<TagLink tag={tag} linkFlg={false} withWiki={false}/>
|
||||||
</li>))}
|
</li>))}
|
||||||
</ul>)
|
</ul>)
|
||||||
}
|
}) satisfies FC<Props>
|
||||||
|
|
||||||
export default TagSearchBox
|
|
||||||
|
|||||||
@@ -19,7 +19,7 @@ type Props = { posts: Post[]
|
|||||||
onClick?: (event: MouseEvent<HTMLElement>) => void }
|
onClick?: (event: MouseEvent<HTMLElement>) => void }
|
||||||
|
|
||||||
|
|
||||||
const TagSidebar: FC<Props> = ({ posts, onClick }) => {
|
export default (({ posts, onClick }: Props) => {
|
||||||
const navigate = useNavigate ()
|
const navigate = useNavigate ()
|
||||||
|
|
||||||
const [tagsVsbl, setTagsVsbl] = useState (false)
|
const [tagsVsbl, setTagsVsbl] = useState (false)
|
||||||
@@ -126,6 +126,4 @@ const TagSidebar: FC<Props> = ({ posts, onClick }) => {
|
|||||||
{tagsVsbl ? '▲▲▲ タグ一覧を閉じる ▲▲▲' : '▼▼▼ タグ一覧を表示 ▼▼▼'}
|
{tagsVsbl ? '▲▲▲ タグ一覧を閉じる ▲▲▲' : '▼▼▼ タグ一覧を表示 ▼▼▼'}
|
||||||
</a>
|
</a>
|
||||||
</SidebarComponent>)
|
</SidebarComponent>)
|
||||||
}
|
}) satisfies FC<Props>
|
||||||
|
|
||||||
export default TagSidebar
|
|
||||||
|
|||||||
@@ -26,7 +26,7 @@ export const menuOutline = ({ tag, wikiId, user, pathName }: {
|
|||||||
pathName: string }): Menu => {
|
pathName: string }): Menu => {
|
||||||
const postCount = tag?.postCount ?? 0
|
const postCount = tag?.postCount ?? 0
|
||||||
|
|
||||||
const wikiPageFlg = Boolean (/^\/wiki\/(?!new|changes)[^/]+/.test (pathName) && wikiId)
|
const wikiPageFlg = Boolean (/^\/wiki\/(?!new|changes)[^\/]+/.test (pathName) && wikiId)
|
||||||
const wikiTitle = pathName.split ('/')[2] ?? ''
|
const wikiTitle = pathName.split ('/')[2] ?? ''
|
||||||
|
|
||||||
const tagFlg = /^\/tags\/\d+/.test (pathName)
|
const tagFlg = /^\/tags\/\d+/.test (pathName)
|
||||||
@@ -80,7 +80,7 @@ export const menuOutline = ({ tag, wikiId, user, pathName }: {
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
const TopNav: FC<Props> = ({ user }) => {
|
export default (({ user }: Props) => {
|
||||||
const location = useLocation ()
|
const location = useLocation ()
|
||||||
|
|
||||||
const dirRef = useRef<(-1) | 1> (1)
|
const dirRef = useRef<(-1) | 1> (1)
|
||||||
@@ -159,12 +159,12 @@ const TopNav: FC<Props> = ({ user }) => {
|
|||||||
useEffect (() => {
|
useEffect (() => {
|
||||||
const unsubscribe = WikiIdBus.subscribe (setWikiId)
|
const unsubscribe = WikiIdBus.subscribe (setWikiId)
|
||||||
return () => unsubscribe ()
|
return () => unsubscribe ()
|
||||||
}, [])
|
}, [activeIdx])
|
||||||
|
|
||||||
useEffect (() => {
|
useEffect (() => {
|
||||||
setMenuOpen (false)
|
setMenuOpen (false)
|
||||||
setOpenItemIdx (activeIdx)
|
setOpenItemIdx (activeIdx)
|
||||||
}, [activeIdx, location])
|
}, [location])
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<>
|
<>
|
||||||
@@ -433,6 +433,4 @@ const TopNav: FC<Props> = ({ user }) => {
|
|||||||
</motion.div>)}
|
</motion.div>)}
|
||||||
</AnimatePresence>
|
</AnimatePresence>
|
||||||
</>)
|
</>)
|
||||||
}
|
}) satisfies FC<Props>
|
||||||
|
|
||||||
export default TopNav
|
|
||||||
|
|||||||
@@ -1,29 +0,0 @@
|
|||||||
import { screen } from '@testing-library/react'
|
|
||||||
import { describe, expect, it } from 'vitest'
|
|
||||||
|
|
||||||
import TopNavUser from '@/components/TopNavUser'
|
|
||||||
import { buildUser } from '@/test/factories'
|
|
||||||
import { renderWithProviders } from '@/test/render'
|
|
||||||
|
|
||||||
describe ('TopNavUser', () => {
|
|
||||||
it ('renders nothing without a user', () => {
|
|
||||||
const { container } = renderWithProviders (<TopNavUser user={null}/>)
|
|
||||||
|
|
||||||
expect (container).toBeEmptyDOMElement ()
|
|
||||||
})
|
|
||||||
|
|
||||||
it ('links named users to settings', () => {
|
|
||||||
renderWithProviders (<TopNavUser user={buildUser ({ name: '山田' })}/>)
|
|
||||||
|
|
||||||
expect (screen.getByRole ('link', { name: '山田' })).toHaveAttribute (
|
|
||||||
'href',
|
|
||||||
'/users/settings',
|
|
||||||
)
|
|
||||||
})
|
|
||||||
|
|
||||||
it ('uses the anonymous display name', () => {
|
|
||||||
renderWithProviders (<TopNavUser user={buildUser ({ name: null })}/>)
|
|
||||||
|
|
||||||
expect (screen.getByRole ('link', { name: '名もなきニジラー' })).toBeInTheDocument ()
|
|
||||||
})
|
|
||||||
})
|
|
||||||
@@ -10,7 +10,7 @@ type Props = { user: User | null,
|
|||||||
sp?: boolean }
|
sp?: boolean }
|
||||||
|
|
||||||
|
|
||||||
const TopNavUser: FC<Props> = ({ user, sp }) => {
|
export default (({ user, sp }: Props) => {
|
||||||
if (!(user))
|
if (!(user))
|
||||||
return
|
return
|
||||||
|
|
||||||
@@ -28,6 +28,4 @@ const TopNavUser: FC<Props> = ({ user, sp }) => {
|
|||||||
{user.name || '名もなきニジラー'}
|
{user.name || '名もなきニジラー'}
|
||||||
</PrefetchLink>
|
</PrefetchLink>
|
||||||
</>)
|
</>)
|
||||||
}
|
}) satisfies FC<Props>
|
||||||
|
|
||||||
export default TopNavUser
|
|
||||||
|
|||||||
@@ -1,19 +0,0 @@
|
|||||||
import { render, screen } from '@testing-library/react'
|
|
||||||
import { describe, expect, it } from 'vitest'
|
|
||||||
|
|
||||||
import TwitterEmbed from '@/components/TwitterEmbed'
|
|
||||||
|
|
||||||
describe ('TwitterEmbed', () => {
|
|
||||||
it ('renders tweet and user links', () => {
|
|
||||||
render (<TwitterEmbed userId="user_name" statusId="12345"/>)
|
|
||||||
|
|
||||||
expect (screen.getByRole ('link', { name: '@user_name' })).toHaveAttribute (
|
|
||||||
'href',
|
|
||||||
'https://twitter.com/user_name?ref_src=twsrc%3Etfw',
|
|
||||||
)
|
|
||||||
expect (screen.getByRole ('link', { name: /\d/ })).toHaveAttribute (
|
|
||||||
'href',
|
|
||||||
'https://twitter.com/user_name/status/12345?ref_src=twsrc%5Etfw',
|
|
||||||
)
|
|
||||||
})
|
|
||||||
})
|
|
||||||
@@ -5,7 +5,7 @@ type Props = {
|
|||||||
statusId: string }
|
statusId: string }
|
||||||
|
|
||||||
|
|
||||||
const TwitterEmbed: FC<Props> = ({ userId, statusId }) => {
|
export default (({ userId, statusId }: Props) => {
|
||||||
const now = (new Date).toLocaleDateString ()
|
const now = (new Date).toLocaleDateString ()
|
||||||
|
|
||||||
return (
|
return (
|
||||||
@@ -18,6 +18,4 @@ const TwitterEmbed: FC<Props> = ({ userId, statusId }) => {
|
|||||||
</blockquote>
|
</blockquote>
|
||||||
<script async src="https://platform.twitter.com/widgets.js" charSet="utf-8"/>
|
<script async src="https://platform.twitter.com/widgets.js" charSet="utf-8"/>
|
||||||
</div>)
|
</div>)
|
||||||
}
|
}) satisfies FC<Props>
|
||||||
|
|
||||||
export default TwitterEmbed
|
|
||||||
|
|||||||
@@ -25,7 +25,7 @@ const mdComponents = { a: (({ href, children }) => (
|
|||||||
</a>))) } as const satisfies Components
|
</a>))) } as const satisfies Components
|
||||||
|
|
||||||
|
|
||||||
const WikiBody: FC<Props> = ({ title, body }) => {
|
export default (({ title, body }: Props) => {
|
||||||
const { data } = useQuery ({
|
const { data } = useQuery ({
|
||||||
enabled: Boolean (body),
|
enabled: Boolean (body),
|
||||||
queryKey: wikiKeys.index ({ }),
|
queryKey: wikiKeys.index ({ }),
|
||||||
@@ -39,6 +39,4 @@ const WikiBody: FC<Props> = ({ title, body }) => {
|
|||||||
<ReactMarkdown components={mdComponents} remarkPlugins={remarkPlugins}>
|
<ReactMarkdown components={mdComponents} remarkPlugins={remarkPlugins}>
|
||||||
{body || `このページは存在しません。[新規作成してください](/wiki/new?title=${ encodeURIComponent (title) })。`}
|
{body || `このページは存在しません。[新規作成してください](/wiki/new?title=${ encodeURIComponent (title) })。`}
|
||||||
</ReactMarkdown>)
|
</ReactMarkdown>)
|
||||||
}
|
}) satisfies FC<Props>
|
||||||
|
|
||||||
export default WikiBody
|
|
||||||
|
|||||||
@@ -1,27 +0,0 @@
|
|||||||
import { fireEvent, render, screen } from '@testing-library/react'
|
|
||||||
import { describe, expect, it, vi } from 'vitest'
|
|
||||||
|
|
||||||
import DateTimeField from '@/components/common/DateTimeField'
|
|
||||||
|
|
||||||
describe ('DateTimeField', () => {
|
|
||||||
it ('renders an ISO value as a datetime-local value', () => {
|
|
||||||
render (<DateTimeField aria-label="日時" value="2026-01-02T03:04:05.000Z"/>)
|
|
||||||
|
|
||||||
const input = screen.getByLabelText ('日時')
|
|
||||||
|
|
||||||
expect (input).toHaveValue ('2026-01-02T12:04')
|
|
||||||
})
|
|
||||||
|
|
||||||
it ('reports local changes as ISO strings and empty values as null', () => {
|
|
||||||
const handleChange = vi.fn ()
|
|
||||||
render (<DateTimeField aria-label="日時" onChange={handleChange}/>)
|
|
||||||
|
|
||||||
const input = screen.getByLabelText ('日時')
|
|
||||||
fireEvent.change (input, { target: { value: '2026-01-02T03:04' } })
|
|
||||||
fireEvent.change (input, { target: { value: '' } })
|
|
||||||
|
|
||||||
const first = handleChange.mock.calls[0]?.[0]
|
|
||||||
expect (new Date (first).getFullYear ()).toBe (2026)
|
|
||||||
expect (handleChange).toHaveBeenLastCalledWith (null)
|
|
||||||
})
|
|
||||||
})
|
|
||||||
@@ -22,11 +22,10 @@ type Props = Omit<ComponentPropsWithoutRef<'input'>, 'onChange'> & {
|
|||||||
value?: string
|
value?: string
|
||||||
onChange?: (isoUTC: string | null) => void
|
onChange?: (isoUTC: string | null) => void
|
||||||
className?: string
|
className?: string
|
||||||
onBlur?: (ev: FocusEvent<HTMLInputElement>) => void
|
onBlur?: (ev: FocusEvent<HTMLInputElement>) => void }
|
||||||
invalid?: boolean }
|
|
||||||
|
|
||||||
|
|
||||||
const DateTimeField: FC<Props> = ({ value, onChange, className, onBlur, invalid, ...rest }) => {
|
export default (({ value, onChange, className, onBlur, ...rest }: Props) => {
|
||||||
const [local, setLocal] = useState ('')
|
const [local, setLocal] = useState ('')
|
||||||
|
|
||||||
useEffect (() => {
|
useEffect (() => {
|
||||||
@@ -36,25 +35,13 @@ const DateTimeField: FC<Props> = ({ value, onChange, className, onBlur, invalid,
|
|||||||
return (
|
return (
|
||||||
<input
|
<input
|
||||||
{...rest}
|
{...rest}
|
||||||
className={cn ('border rounded p-2',
|
className={cn ('border rounded p-2', className)}
|
||||||
(invalid
|
|
||||||
? ['border-red-500 bg-red-50 text-red-900',
|
|
||||||
'focus:border-red-500 focus:outline-none',
|
|
||||||
'focus:ring-2 focus:ring-red-200',
|
|
||||||
'dark:border-red-500 dark:bg-red-950/30 dark:text-red-100']
|
|
||||||
: ['border-gray-300',
|
|
||||||
'focus:border-blue-500 focus:outline-none',
|
|
||||||
'focus:ring-2 focus:ring-blue-200']),
|
|
||||||
className)}
|
|
||||||
type="datetime-local"
|
type="datetime-local"
|
||||||
value={local}
|
value={local}
|
||||||
aria-invalid={invalid}
|
|
||||||
onChange={ev => {
|
onChange={ev => {
|
||||||
const v = ev.target.value
|
const v = ev.target.value
|
||||||
setLocal (v)
|
setLocal (v)
|
||||||
onChange?.(v ? (new Date (v)).toISOString () : null)
|
onChange?.(v ? (new Date (v)).toISOString () : null)
|
||||||
}}
|
}}
|
||||||
onBlur={onBlur}/>)
|
onBlur={onBlur}/>)
|
||||||
}
|
}) satisfies FC<Props>
|
||||||
|
|
||||||
export default DateTimeField
|
|
||||||
|
|||||||
@@ -1,18 +0,0 @@
|
|||||||
import type { FC } from 'react'
|
|
||||||
|
|
||||||
type Props = { id?: string
|
|
||||||
messages?: string[] }
|
|
||||||
|
|
||||||
|
|
||||||
export const FieldError: FC<Props> = ({ id, messages }: Props) => {
|
|
||||||
if (!(messages) || messages.length === 0)
|
|
||||||
return null
|
|
||||||
|
|
||||||
return (
|
|
||||||
<ul id={id} className="mt-1 space-y-1 text-red-700 dark:text-red-300">
|
|
||||||
{messages.map ((message, i) => <li key={i}>{message}</li>)}
|
|
||||||
</ul>)
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
export default FieldError
|
|
||||||
@@ -3,9 +3,7 @@ import type { FC, ReactNode } from 'react'
|
|||||||
type Props = { children: ReactNode }
|
type Props = { children: ReactNode }
|
||||||
|
|
||||||
|
|
||||||
const Form: FC<Props> = ({ children }) => (
|
export default (({ children }: Props) => (
|
||||||
<div className="max-w-xl mx-auto p-4 space-y-4">
|
<div className="max-w-xl mx-auto p-4 space-y-4">
|
||||||
{children}
|
{children}
|
||||||
</div>)
|
</div>)) satisfies FC<Props>
|
||||||
|
|
||||||
export default Form
|
|
||||||
|
|||||||
@@ -1,36 +0,0 @@
|
|||||||
import { useId } from 'react'
|
|
||||||
|
|
||||||
import FieldError from '@/components/common/FieldError'
|
|
||||||
import Label from '@/components/common/Label'
|
|
||||||
import { cn } from '@/lib/utils'
|
|
||||||
|
|
||||||
import type { FC, ReactNode } from 'react'
|
|
||||||
|
|
||||||
type FieldState = { describedBy?: string
|
|
||||||
invalid: boolean }
|
|
||||||
|
|
||||||
type Props = {
|
|
||||||
children: (state: FieldState) => ReactNode
|
|
||||||
checkBox?: { label: string
|
|
||||||
checked: boolean
|
|
||||||
onChange: (event: React.ChangeEvent<HTMLInputElement>) => void }
|
|
||||||
className?: string
|
|
||||||
label: ReactNode
|
|
||||||
messages?: string[] }
|
|
||||||
|
|
||||||
|
|
||||||
const FormField: FC<Props> = ({ children, checkBox, className, label, messages }: Props) => {
|
|
||||||
const id = useId ()
|
|
||||||
const invalid = messages != null && messages.length > 0
|
|
||||||
const errorId = invalid ? `${ id }-error` : undefined
|
|
||||||
|
|
||||||
return (
|
|
||||||
<div className={cn (className)}>
|
|
||||||
<Label checkBox={checkBox} invalid={invalid}>{label}</Label>
|
|
||||||
{children ({ describedBy: errorId, invalid })}
|
|
||||||
<FieldError id={errorId} messages={messages}/>
|
|
||||||
</div>)
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
export default FormField
|
|
||||||
@@ -1,26 +0,0 @@
|
|||||||
import { fireEvent, render, screen } from '@testing-library/react'
|
|
||||||
import { describe, expect, it, vi } from 'vitest'
|
|
||||||
|
|
||||||
import Label from '@/components/common/Label'
|
|
||||||
|
|
||||||
describe ('Label', () => {
|
|
||||||
it ('renders a plain label', () => {
|
|
||||||
render (<Label>名前</Label>)
|
|
||||||
|
|
||||||
expect (screen.getByText ('名前')).toBeInTheDocument ()
|
|
||||||
})
|
|
||||||
|
|
||||||
it ('renders and toggles the optional checkbox', () => {
|
|
||||||
const handleChange = vi.fn ()
|
|
||||||
|
|
||||||
render (
|
|
||||||
<Label checkBox={{ label: '不明', checked: false, onChange: handleChange }}>
|
|
||||||
日時
|
|
||||||
</Label>,
|
|
||||||
)
|
|
||||||
|
|
||||||
fireEvent.click (screen.getByRole ('checkbox', { name: '不明' }))
|
|
||||||
|
|
||||||
expect (handleChange).toHaveBeenCalledTimes (1)
|
|
||||||
})
|
|
||||||
})
|
|
||||||
@@ -1,39 +1,28 @@
|
|||||||
import React from 'react'
|
import React from 'react'
|
||||||
|
|
||||||
import { cn } from '@/lib/utils'
|
|
||||||
|
|
||||||
import type { FC } from 'react'
|
|
||||||
|
|
||||||
type Props = { children: React.ReactNode
|
type Props = { children: React.ReactNode
|
||||||
checkBox?: { label: string
|
checkBox?: { label: string
|
||||||
checked: boolean
|
checked: boolean
|
||||||
onChange: (event: React.ChangeEvent<HTMLInputElement>) => void }
|
onChange: (event: React.ChangeEvent<HTMLInputElement>) => void } }
|
||||||
invalid?: boolean }
|
|
||||||
|
|
||||||
|
|
||||||
const Label: FC<Props> = ({ children, checkBox, invalid }: Props) => {
|
export default ({ children, checkBox }: Props) => {
|
||||||
const labelClassName = cn ('block font-semibold mb-1',
|
|
||||||
invalid && 'text-red-700 dark:text-red-300')
|
|
||||||
|
|
||||||
if (!(checkBox))
|
if (!(checkBox))
|
||||||
{
|
{
|
||||||
return (
|
return (
|
||||||
<label className={labelClassName}>
|
<label className="block font-semibold mb-1">
|
||||||
{children}
|
{children}
|
||||||
</label>)
|
</label>)
|
||||||
}
|
}
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<div className="flex gap-2 mb-1">
|
<div className="flex gap-2 mb-1">
|
||||||
<label className="flex-1 block font-semibold">{children}</label>
|
<label className="flex-1 block font-semibold">{children}</label>
|
||||||
<label className="flex items-center block gap-1">
|
<label className="flex items-center block gap-1">
|
||||||
<input type="checkbox"
|
<input type="checkbox"
|
||||||
checked={checkBox.checked}
|
checked={checkBox.checked}
|
||||||
onChange={checkBox.onChange}/>
|
onChange={checkBox.onChange}/>
|
||||||
{checkBox.label}
|
{checkBox.label}
|
||||||
</label>
|
</label>
|
||||||
</div>)
|
</div>)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
export default Label
|
|
||||||
|
|||||||
@@ -1,15 +0,0 @@
|
|||||||
import { render, screen } from '@testing-library/react'
|
|
||||||
import { describe, expect, it } from 'vitest'
|
|
||||||
|
|
||||||
import PageTitle from '@/components/common/PageTitle'
|
|
||||||
|
|
||||||
|
|
||||||
describe ('PageTitle', () => {
|
|
||||||
it ('renders children as a level 1 heading', () => {
|
|
||||||
render (<PageTitle>Test title</PageTitle>)
|
|
||||||
|
|
||||||
const heading = screen.getByRole ('heading', { level: 1 })
|
|
||||||
|
|
||||||
expect (heading.textContent).toBe ('Test title')
|
|
||||||
})
|
|
||||||
})
|
|
||||||
@@ -1,13 +1,9 @@
|
|||||||
import React from 'react'
|
import React from 'react'
|
||||||
|
|
||||||
import type { FC } from 'react'
|
|
||||||
|
|
||||||
type Props = { children: React.ReactNode }
|
type Props = { children: React.ReactNode }
|
||||||
|
|
||||||
|
|
||||||
const PageTitle: FC<Props> = ({ children }) => (
|
export default ({ children }: Props) => (
|
||||||
<h1 className="text-2xl font-bold mb-2">
|
<h1 className="text-2xl font-bold mb-2">
|
||||||
{children}
|
{children}
|
||||||
</h1>)
|
</h1>)
|
||||||
|
|
||||||
export default PageTitle
|
|
||||||
|
|||||||
@@ -1,38 +0,0 @@
|
|||||||
import { screen } from '@testing-library/react'
|
|
||||||
import { describe, expect, it } from 'vitest'
|
|
||||||
|
|
||||||
import Pagination from '@/components/common/Pagination'
|
|
||||||
import { renderWithProviders } from '@/test/render'
|
|
||||||
|
|
||||||
describe ('Pagination', () => {
|
|
||||||
it ('builds page links while preserving existing query parameters', () => {
|
|
||||||
renderWithProviders (
|
|
||||||
<Pagination page={3} totalPages={5} siblingCount={1}/>,
|
|
||||||
{ route: '/posts?tags=abc&page=3' },
|
|
||||||
)
|
|
||||||
|
|
||||||
expect (screen.getByLabelText ('前のページ')).toHaveAttribute (
|
|
||||||
'href',
|
|
||||||
'/posts?tags=abc&page=2',
|
|
||||||
)
|
|
||||||
expect (screen.getByLabelText ('次のページ')).toHaveAttribute (
|
|
||||||
'href',
|
|
||||||
'/posts?tags=abc&page=4',
|
|
||||||
)
|
|
||||||
expect (screen.getByText ('3')).toHaveAttribute ('aria-current', 'page')
|
|
||||||
})
|
|
||||||
|
|
||||||
it ('does not render active previous and next controls at the edges', () => {
|
|
||||||
const { rerender } = renderWithProviders (
|
|
||||||
<Pagination page={1} totalPages={1}/>,
|
|
||||||
{ route: '/tags' },
|
|
||||||
)
|
|
||||||
|
|
||||||
expect (screen.queryByLabelText ('前のページ')).not.toBeInTheDocument ()
|
|
||||||
expect (screen.queryByLabelText ('次のページ')).not.toBeInTheDocument ()
|
|
||||||
|
|
||||||
rerender (<Pagination page={1} totalPages={2}/>)
|
|
||||||
|
|
||||||
expect (screen.getByLabelText ('次のページ')).toHaveAttribute ('href', '/tags?page=2')
|
|
||||||
})
|
|
||||||
})
|
|
||||||
@@ -48,7 +48,7 @@ const getPages = (
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
const Pagination: FC<Props> = ({ page, totalPages, siblingCount = 3 }) => {
|
export default (({ page, totalPages, siblingCount = 3 }) => {
|
||||||
const location = useLocation ()
|
const location = useLocation ()
|
||||||
|
|
||||||
const buildTo = (p: number) => {
|
const buildTo = (p: number) => {
|
||||||
@@ -124,6 +124,4 @@ const Pagination: FC<Props> = ({ page, totalPages, siblingCount = 3 }) => {
|
|||||||
</>)}
|
</>)}
|
||||||
</div>
|
</div>
|
||||||
</nav>)
|
</nav>)
|
||||||
}
|
}) satisfies FC<Props>
|
||||||
|
|
||||||
export default Pagination
|
|
||||||
|
|||||||
@@ -5,9 +5,7 @@ import type { ComponentPropsWithoutRef, FC } from 'react'
|
|||||||
type Props = ComponentPropsWithoutRef<'h2'>
|
type Props = ComponentPropsWithoutRef<'h2'>
|
||||||
|
|
||||||
|
|
||||||
const SectionTitle: FC<Props> = ({ children, className, ...rest }) => (
|
export default (({ children, className, ...rest }: Props) => (
|
||||||
<h2 {...rest} className={cn ('text-xl my-4', className)}>
|
<h2 {...rest} className={cn ('text-xl my-4', className)}>
|
||||||
{children}
|
{children}
|
||||||
</h2>)
|
</h2>)) satisfies FC<Props>
|
||||||
|
|
||||||
export default SectionTitle
|
|
||||||
|
|||||||
@@ -1,13 +1,9 @@
|
|||||||
import React from 'react'
|
import React from 'react'
|
||||||
|
|
||||||
import type { FC } from 'react'
|
|
||||||
|
|
||||||
type Props = { children: React.ReactNode }
|
type Props = { children: React.ReactNode }
|
||||||
|
|
||||||
|
|
||||||
const SubsectionTitle: FC<Props> = ({ children }) => (
|
export default ({ children }: Props) => (
|
||||||
<h3 className="my-2">
|
<h3 className="my-2">
|
||||||
{children}
|
{children}
|
||||||
</h3>)
|
</h3>)
|
||||||
|
|
||||||
export default SubsectionTitle
|
|
||||||
|
|||||||
@@ -1,23 +0,0 @@
|
|||||||
import { fireEvent, render, screen } from '@testing-library/react'
|
|
||||||
import { describe, expect, it } from 'vitest'
|
|
||||||
|
|
||||||
import TabGroup, { Tab } from '@/components/common/TabGroup'
|
|
||||||
|
|
||||||
describe ('TabGroup', () => {
|
|
||||||
it ('uses the init tab and switches tabs when clicked', () => {
|
|
||||||
render (
|
|
||||||
<TabGroup>
|
|
||||||
<Tab name="A">Alpha</Tab>
|
|
||||||
<Tab name="B" init>Beta</Tab>
|
|
||||||
</TabGroup>,
|
|
||||||
)
|
|
||||||
|
|
||||||
expect (screen.queryByText ('Alpha')).not.toBeInTheDocument ()
|
|
||||||
expect (screen.getByText ('Beta')).toBeInTheDocument ()
|
|
||||||
|
|
||||||
fireEvent.click (screen.getByText ('A'))
|
|
||||||
|
|
||||||
expect (screen.getByText ('Alpha')).toBeInTheDocument ()
|
|
||||||
expect (screen.queryByText ('Beta')).not.toBeInTheDocument ()
|
|
||||||
})
|
|
||||||
})
|
|
||||||
@@ -1,5 +1,3 @@
|
|||||||
import type { FC } from 'react'
|
|
||||||
|
|
||||||
import React, { useState } from 'react'
|
import React, { useState } from 'react'
|
||||||
import { cn } from '@/lib/utils'
|
import { cn } from '@/lib/utils'
|
||||||
|
|
||||||
@@ -12,7 +10,7 @@ type Props = { children: React.ReactNode }
|
|||||||
export const Tab = ({ children }: TabProps) => <>{children}</>
|
export const Tab = ({ children }: TabProps) => <>{children}</>
|
||||||
|
|
||||||
|
|
||||||
const TabGroup: FC<Props> = ({ children }) => {
|
export default ({ children }: Props) => {
|
||||||
const tabs = React.Children.toArray (children) as React.ReactElement<TabProps>[]
|
const tabs = React.Children.toArray (children) as React.ReactElement<TabProps>[]
|
||||||
|
|
||||||
const [current, setCurrent] = useState<number> (() => {
|
const [current, setCurrent] = useState<number> (() => {
|
||||||
@@ -39,5 +37,3 @@ const TabGroup: FC<Props> = ({ children }) => {
|
|||||||
</div>
|
</div>
|
||||||
</div>)
|
</div>)
|
||||||
}
|
}
|
||||||
|
|
||||||
export default TabGroup
|
|
||||||
|
|||||||
@@ -1,44 +0,0 @@
|
|||||||
import { fireEvent, render, screen, waitFor } from '@testing-library/react'
|
|
||||||
import { beforeEach, describe, expect, it, vi } from 'vitest'
|
|
||||||
|
|
||||||
import TagInput from '@/components/common/TagInput'
|
|
||||||
import { buildTag } from '@/test/factories'
|
|
||||||
|
|
||||||
const api = vi.hoisted (() => ({
|
|
||||||
apiGet: vi.fn (),
|
|
||||||
}))
|
|
||||||
|
|
||||||
vi.mock ('@/lib/api', () => api)
|
|
||||||
|
|
||||||
describe ('TagInput', () => {
|
|
||||||
beforeEach (() => {
|
|
||||||
vi.clearAllMocks ()
|
|
||||||
})
|
|
||||||
|
|
||||||
it ('updates value and fetches autocomplete for the last token', async () => {
|
|
||||||
const setValue = vi.fn ()
|
|
||||||
api.apiGet.mockResolvedValueOnce ([buildTag ({ name: '虹夏', postCount: 2 })])
|
|
||||||
|
|
||||||
render (<TagInput value="ぼっち 虹" setValue={setValue}/>)
|
|
||||||
|
|
||||||
fireEvent.change (screen.getByRole ('textbox'), { target: { value: 'ぼっち 虹夏' } })
|
|
||||||
|
|
||||||
await waitFor (() => {
|
|
||||||
expect (api.apiGet).toHaveBeenCalledWith (
|
|
||||||
'/tags/autocomplete',
|
|
||||||
{ params: { q: '虹夏' } },
|
|
||||||
)
|
|
||||||
})
|
|
||||||
expect (setValue).toHaveBeenCalledWith ('ぼっち 虹夏')
|
|
||||||
})
|
|
||||||
|
|
||||||
it ('does not fetch when the last token is blank', () => {
|
|
||||||
const setValue = vi.fn ()
|
|
||||||
render (<TagInput value="" setValue={setValue}/>)
|
|
||||||
|
|
||||||
fireEvent.change (screen.getByRole ('textbox'), { target: { value: ' ' } })
|
|
||||||
|
|
||||||
expect (api.apiGet).not.toHaveBeenCalled ()
|
|
||||||
expect (setValue).toHaveBeenCalledWith (' ')
|
|
||||||
})
|
|
||||||
})
|
|
||||||
@@ -2,7 +2,6 @@ import { useState } from 'react'
|
|||||||
|
|
||||||
import TagSearchBox from '@/components/TagSearchBox'
|
import TagSearchBox from '@/components/TagSearchBox'
|
||||||
import { apiGet } from '@/lib/api'
|
import { apiGet } from '@/lib/api'
|
||||||
import { inputClass } from '@/lib/utils'
|
|
||||||
|
|
||||||
import type { FC, ChangeEvent, KeyboardEvent } from 'react'
|
import type { FC, ChangeEvent, KeyboardEvent } from 'react'
|
||||||
|
|
||||||
@@ -10,13 +9,10 @@ import type { Tag } from '@/types'
|
|||||||
|
|
||||||
|
|
||||||
type Props = {
|
type Props = {
|
||||||
describedBy?: string
|
value: string
|
||||||
invalid?: boolean
|
setValue: (value: string) => void }
|
||||||
value: string
|
|
||||||
setValue: (value: string) => void }
|
|
||||||
|
|
||||||
|
export default (({ value, setValue }: Props) => {
|
||||||
const TagInput: FC<Props> = ({ describedBy, invalid, value, setValue }) => {
|
|
||||||
const [activeIndex, setActiveIndex] = useState (-1)
|
const [activeIndex, setActiveIndex] = useState (-1)
|
||||||
const [suggestions, setSuggestions] = useState<Tag[]> ([])
|
const [suggestions, setSuggestions] = useState<Tag[]> ([])
|
||||||
const [suggestionsVsbl, setSuggestionsVsbl] = useState (false)
|
const [suggestionsVsbl, setSuggestionsVsbl] = useState (false)
|
||||||
@@ -66,12 +62,9 @@ const TagInput: FC<Props> = ({ describedBy, invalid, value, setValue }) => {
|
|||||||
case 'Enter':
|
case 'Enter':
|
||||||
if (activeIndex < 0)
|
if (activeIndex < 0)
|
||||||
break
|
break
|
||||||
{
|
ev.preventDefault ()
|
||||||
ev.preventDefault ()
|
const selected = suggestions[activeIndex]
|
||||||
const selected = suggestions[activeIndex]
|
selected && handleTagSelect (selected)
|
||||||
if (selected)
|
|
||||||
handleTagSelect (selected)
|
|
||||||
}
|
|
||||||
break
|
break
|
||||||
|
|
||||||
case 'Escape':
|
case 'Escape':
|
||||||
@@ -89,20 +82,16 @@ const TagInput: FC<Props> = ({ describedBy, invalid, value, setValue }) => {
|
|||||||
<div className="relative">
|
<div className="relative">
|
||||||
<input
|
<input
|
||||||
type="text"
|
type="text"
|
||||||
aria-describedby={describedBy}
|
|
||||||
aria-invalid={invalid}
|
|
||||||
value={value}
|
value={value}
|
||||||
onChange={whenChanged}
|
onChange={whenChanged}
|
||||||
onFocus={() => setSuggestionsVsbl (true)}
|
onFocus={() => setSuggestionsVsbl (true)}
|
||||||
onBlur={() => setSuggestionsVsbl (false)}
|
onBlur={() => setSuggestionsVsbl (false)}
|
||||||
onKeyDown={handleKeyDown}
|
onKeyDown={handleKeyDown}
|
||||||
className={inputClass (invalid)}/>
|
className="w-full border p-2 rounded"/>
|
||||||
<TagSearchBox
|
<TagSearchBox
|
||||||
suggestions={
|
suggestions={
|
||||||
suggestionsVsbl && suggestions.length > 0 ? suggestions : [] as Tag[]}
|
suggestionsVsbl && suggestions.length > 0 ? suggestions : [] as Tag[]}
|
||||||
activeIndex={activeIndex}
|
activeIndex={activeIndex}
|
||||||
onSelect={handleTagSelect}/>
|
onSelect={handleTagSelect}/>
|
||||||
</div>)
|
</div>)
|
||||||
}
|
}) satisfies FC<Props>
|
||||||
|
|
||||||
export default TagInput
|
|
||||||
|
|||||||
@@ -1,25 +1,9 @@
|
|||||||
import { forwardRef } from 'react'
|
import { forwardRef } from 'react'
|
||||||
|
|
||||||
import { cn } from '@/lib/utils'
|
|
||||||
|
|
||||||
import type { TextareaHTMLAttributes } from 'react'
|
import type { TextareaHTMLAttributes } from 'react'
|
||||||
|
|
||||||
type Props = TextareaHTMLAttributes<HTMLTextAreaElement> & { invalid?: boolean }
|
type Props = TextareaHTMLAttributes<HTMLTextAreaElement>
|
||||||
|
|
||||||
|
|
||||||
export default forwardRef<HTMLTextAreaElement, Props> (
|
export default forwardRef<HTMLTextAreaElement, Props> (({ ...props }, ref) => (
|
||||||
({ className, invalid = false, ...props }, ref) => (
|
<textarea ref={ref} className="rounded border w-full p-2 h-32" {...props}/>))
|
||||||
<textarea
|
|
||||||
ref={ref}
|
|
||||||
aria-invalid={invalid}
|
|
||||||
className={cn ('rounded border w-full p-2 h-32',
|
|
||||||
(invalid
|
|
||||||
? ['border-red-500 bg-red-50 text-red-900',
|
|
||||||
'focus:border-red-500 focus:outline-none focus:ring-2',
|
|
||||||
'focus:ring-red-200',
|
|
||||||
'dark:border-red-500 dark:bg-red-950/30 dark:text-red-100']
|
|
||||||
: ['border-gray-300',
|
|
||||||
'focus:border-blue-500 focus:outline-none focus:ring-2',
|
|
||||||
'focus:ring-blue-200']),
|
|
||||||
className)}
|
|
||||||
{...props}/>))
|
|
||||||
|
|||||||
@@ -1,37 +0,0 @@
|
|||||||
import { createRef } from 'react'
|
|
||||||
import { render, screen } from '@testing-library/react'
|
|
||||||
import { describe, expect, it } from 'vitest'
|
|
||||||
|
|
||||||
import Form from '@/components/common/Form'
|
|
||||||
import SectionTitle from '@/components/common/SectionTitle'
|
|
||||||
import SubsectionTitle from '@/components/common/SubsectionTitle'
|
|
||||||
import TextArea from '@/components/common/TextArea'
|
|
||||||
|
|
||||||
describe ('common typography and form components', () => {
|
|
||||||
it ('renders Form children inside the standard container', () => {
|
|
||||||
render (<Form><span>Content</span></Form>)
|
|
||||||
|
|
||||||
expect (screen.getByText ('Content')).toBeInTheDocument ()
|
|
||||||
})
|
|
||||||
|
|
||||||
it ('renders SectionTitle as an h2', () => {
|
|
||||||
render (<SectionTitle>Section</SectionTitle>)
|
|
||||||
|
|
||||||
expect (screen.getByRole ('heading', { level: 2, name: 'Section' })).toBeInTheDocument ()
|
|
||||||
})
|
|
||||||
|
|
||||||
it ('renders SubsectionTitle as an h3', () => {
|
|
||||||
render (<SubsectionTitle>Subsection</SubsectionTitle>)
|
|
||||||
|
|
||||||
expect (screen.getByRole ('heading', { level: 3, name: 'Subsection' })).toBeInTheDocument ()
|
|
||||||
})
|
|
||||||
|
|
||||||
it ('forwards refs and props to TextArea', () => {
|
|
||||||
const ref = createRef<HTMLTextAreaElement> ()
|
|
||||||
|
|
||||||
render (<TextArea ref={ref} aria-label="Body" defaultValue="text"/>)
|
|
||||||
|
|
||||||
expect (ref.current).toBe (screen.getByLabelText ('Body'))
|
|
||||||
expect (screen.getByLabelText ('Body')).toHaveValue ('text')
|
|
||||||
})
|
|
||||||
})
|
|
||||||
@@ -57,7 +57,7 @@ let nextDialogueId = 1
|
|||||||
type Props = { children: ReactNode }
|
type Props = { children: ReactNode }
|
||||||
|
|
||||||
|
|
||||||
const DialogueProvider: FC<Props> = ({ children }) => {
|
export default (({ children }: Props) => {
|
||||||
const [queue, setQueue] = useState<DialogueRequest[]> ([])
|
const [queue, setQueue] = useState<DialogueRequest[]> ([])
|
||||||
|
|
||||||
const push = useCallback ((request: Omit<DialogueRequest, 'id'>) => {
|
const push = useCallback ((request: Omit<DialogueRequest, 'id'>) => {
|
||||||
@@ -174,7 +174,7 @@ const DialogueProvider: FC<Props> = ({ children }) => {
|
|||||||
</DialogContent>)}
|
</DialogContent>)}
|
||||||
</Dialog>
|
</Dialog>
|
||||||
</DialogueContext.Provider>)
|
</DialogueContext.Provider>)
|
||||||
}
|
}) satisfies FC<Props>
|
||||||
|
|
||||||
|
|
||||||
export const useDialogue = () => {
|
export const useDialogue = () => {
|
||||||
@@ -185,5 +185,3 @@ export const useDialogue = () => {
|
|||||||
|
|
||||||
return dialogue
|
return dialogue
|
||||||
}
|
}
|
||||||
|
|
||||||
export default DialogueProvider
|
|
||||||
|
|||||||
@@ -9,12 +9,10 @@ type Props = {
|
|||||||
className?: string }
|
className?: string }
|
||||||
|
|
||||||
|
|
||||||
const MainArea: FC<Props> = ({ children, className }) => (
|
export default (({ children, className }: Props) => (
|
||||||
<motion.main
|
<motion.main
|
||||||
transition={{ layout: { duration: .2, ease: 'easeOut' } }}
|
transition={{ layout: { duration: .2, ease: 'easeOut' } }}
|
||||||
className={cn ('flex-1 overflow-y-auto p-4', className)}
|
className={cn ('flex-1 overflow-y-auto p-4', className)}
|
||||||
layout="position">
|
layout="position">
|
||||||
{children}
|
{children}
|
||||||
</motion.main>)
|
</motion.main>)) satisfies FC<Props>
|
||||||
|
|
||||||
export default MainArea
|
|
||||||
|
|||||||
@@ -6,7 +6,7 @@ import type { FC, ReactNode } from 'react'
|
|||||||
type Props = { children: ReactNode }
|
type Props = { children: ReactNode }
|
||||||
|
|
||||||
|
|
||||||
const SidebarComponent: FC<Props> = ({ children }) => (
|
export default (({ children }: Props) => (
|
||||||
<motion.div
|
<motion.div
|
||||||
layout="position"
|
layout="position"
|
||||||
transition={{ layout: { duration: .2, ease: 'easeOut' } }}
|
transition={{ layout: { duration: .2, ease: 'easeOut' } }}
|
||||||
@@ -27,6 +27,4 @@ const SidebarComponent: FC<Props> = ({ children }) => (
|
|||||||
</Helmet>
|
</Helmet>
|
||||||
|
|
||||||
{children}
|
{children}
|
||||||
</motion.div>)
|
</motion.div>)) satisfies FC<Props>
|
||||||
|
|
||||||
export default SidebarComponent
|
|
||||||
|
|||||||
@@ -18,6 +18,13 @@ type ToasterToast = ToastProps & {
|
|||||||
action?: ToastActionElement
|
action?: ToastActionElement
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const actionTypes = {
|
||||||
|
ADD_TOAST: "ADD_TOAST",
|
||||||
|
UPDATE_TOAST: "UPDATE_TOAST",
|
||||||
|
DISMISS_TOAST: "DISMISS_TOAST",
|
||||||
|
REMOVE_TOAST: "REMOVE_TOAST",
|
||||||
|
} as const
|
||||||
|
|
||||||
let count = 0
|
let count = 0
|
||||||
|
|
||||||
function genId() {
|
function genId() {
|
||||||
@@ -25,21 +32,23 @@ function genId() {
|
|||||||
return count.toString()
|
return count.toString()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
type ActionType = typeof actionTypes
|
||||||
|
|
||||||
type Action =
|
type Action =
|
||||||
| {
|
| {
|
||||||
type: "ADD_TOAST"
|
type: ActionType["ADD_TOAST"]
|
||||||
toast: ToasterToast
|
toast: ToasterToast
|
||||||
}
|
}
|
||||||
| {
|
| {
|
||||||
type: "UPDATE_TOAST"
|
type: ActionType["UPDATE_TOAST"]
|
||||||
toast: Partial<ToasterToast>
|
toast: Partial<ToasterToast>
|
||||||
}
|
}
|
||||||
| {
|
| {
|
||||||
type: "DISMISS_TOAST"
|
type: ActionType["DISMISS_TOAST"]
|
||||||
toastId?: ToasterToast["id"]
|
toastId?: ToasterToast["id"]
|
||||||
}
|
}
|
||||||
| {
|
| {
|
||||||
type: "REMOVE_TOAST"
|
type: ActionType["REMOVE_TOAST"]
|
||||||
toastId?: ToasterToast["id"]
|
toastId?: ToasterToast["id"]
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -1,5 +1,3 @@
|
|||||||
import type { FC } from 'react'
|
|
||||||
|
|
||||||
import { useState } from 'react'
|
import { useState } from 'react'
|
||||||
|
|
||||||
import { useDialogue } from '@/components/dialogues/DialogueProvider'
|
import { useDialogue } from '@/components/dialogues/DialogueProvider'
|
||||||
@@ -20,7 +18,7 @@ type Props = { visible: boolean
|
|||||||
setUser: (user: User) => void }
|
setUser: (user: User) => void }
|
||||||
|
|
||||||
|
|
||||||
const InheritDialogue: FC<Props> = ({ visible, onVisibleChange, setUser }) => {
|
export default ({ visible, onVisibleChange, setUser }: Props) => {
|
||||||
const dialogue = useDialogue ()
|
const dialogue = useDialogue ()
|
||||||
|
|
||||||
const [inputCode, setInputCode] = useState ('')
|
const [inputCode, setInputCode] = useState ('')
|
||||||
@@ -70,5 +68,3 @@ const InheritDialogue: FC<Props> = ({ visible, onVisibleChange, setUser }) => {
|
|||||||
</DialogContent>
|
</DialogContent>
|
||||||
</Dialog>)
|
</Dialog>)
|
||||||
}
|
}
|
||||||
|
|
||||||
export default InheritDialogue
|
|
||||||
|
|||||||
@@ -1,5 +1,3 @@
|
|||||||
import type { FC } from 'react'
|
|
||||||
|
|
||||||
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 { Dialog,
|
import { Dialog,
|
||||||
@@ -19,7 +17,7 @@ type Props = { visible: boolean
|
|||||||
setUser: React.Dispatch<React.SetStateAction<User | null>> }
|
setUser: React.Dispatch<React.SetStateAction<User | null>> }
|
||||||
|
|
||||||
|
|
||||||
const UserCodeDialogue: FC<Props> = ({ visible, onVisibleChange, user, setUser }) => {
|
export default ({ visible, onVisibleChange, user, setUser }: Props) => {
|
||||||
const dialogue = useDialogue ()
|
const dialogue = useDialogue ()
|
||||||
|
|
||||||
const handleChange = async () => {
|
const handleChange = async () => {
|
||||||
@@ -71,5 +69,3 @@ const UserCodeDialogue: FC<Props> = ({ visible, onVisibleChange, user, setUser }
|
|||||||
</DialogContent>
|
</DialogContent>
|
||||||
</Dialog>)
|
</Dialog>)
|
||||||
}
|
}
|
||||||
|
|
||||||
export default UserCodeDialogue
|
|
||||||
|
|||||||
@@ -1,96 +0,0 @@
|
|||||||
import { beforeEach, describe, expect, it, vi } from 'vitest'
|
|
||||||
|
|
||||||
const mocks = vi.hoisted (() => {
|
|
||||||
const client = {
|
|
||||||
delete: vi.fn (),
|
|
||||||
get: vi.fn (),
|
|
||||||
patch: vi.fn (),
|
|
||||||
post: vi.fn (),
|
|
||||||
put: vi.fn (),
|
|
||||||
}
|
|
||||||
|
|
||||||
return {
|
|
||||||
client,
|
|
||||||
isAxiosError: vi.fn (),
|
|
||||||
}
|
|
||||||
})
|
|
||||||
|
|
||||||
vi.mock ('axios', () => ({
|
|
||||||
default: {
|
|
||||||
create: vi.fn (() => mocks.client),
|
|
||||||
isAxiosError: mocks.isAxiosError,
|
|
||||||
},
|
|
||||||
}))
|
|
||||||
|
|
||||||
vi.mock ('@/config', () => ({
|
|
||||||
API_BASE_URL: '/api',
|
|
||||||
}))
|
|
||||||
|
|
||||||
describe ('api helpers', () => {
|
|
||||||
beforeEach (() => {
|
|
||||||
vi.clearAllMocks ()
|
|
||||||
localStorage.clear ()
|
|
||||||
})
|
|
||||||
|
|
||||||
it ('adds the transfer code header and camelizes get responses', async () => {
|
|
||||||
localStorage.setItem ('user_code', 'abc123')
|
|
||||||
mocks.client.get.mockResolvedValueOnce ({
|
|
||||||
data: { post_id: 1, nested_value: { created_at: 'now' } },
|
|
||||||
})
|
|
||||||
|
|
||||||
const { apiGet } = await import ('@/lib/api')
|
|
||||||
const data = await apiGet<{ postId: number; nestedValue: { createdAt: string } }> (
|
|
||||||
'/posts/1',
|
|
||||||
{ headers: { 'X-Extra': '1' }, params: { page: 2 } },
|
|
||||||
)
|
|
||||||
|
|
||||||
expect (mocks.client.get).toHaveBeenCalledWith (
|
|
||||||
'/posts/1',
|
|
||||||
{
|
|
||||||
headers: { 'X-Transfer-Code': 'abc123', 'X-Extra': '1' },
|
|
||||||
params: { page: 2 },
|
|
||||||
},
|
|
||||||
)
|
|
||||||
expect (data).toEqual ({ postId: 1, nestedValue: { createdAt: 'now' } })
|
|
||||||
})
|
|
||||||
|
|
||||||
it ('passes an empty body for post-like requests when body is omitted', async () => {
|
|
||||||
mocks.client.patch.mockResolvedValueOnce ({ data: { ok_value: true } })
|
|
||||||
|
|
||||||
const { apiPatch } = await import ('@/lib/api')
|
|
||||||
const data = await apiPatch<{ okValue: boolean }> ('/posts/1')
|
|
||||||
|
|
||||||
expect (mocks.client.patch).toHaveBeenCalledWith (
|
|
||||||
'/posts/1',
|
|
||||||
{},
|
|
||||||
{ headers: { 'X-Transfer-Code': '' } },
|
|
||||||
)
|
|
||||||
expect (data.okValue).toBe (true)
|
|
||||||
})
|
|
||||||
|
|
||||||
it ('does not camelize blob responses', async () => {
|
|
||||||
const blob = new Blob (['csv'])
|
|
||||||
mocks.client.get.mockResolvedValueOnce ({ data: blob })
|
|
||||||
|
|
||||||
const { apiGet } = await import ('@/lib/api')
|
|
||||||
const data = await apiGet<Blob> ('/exports', { responseType: 'blob' })
|
|
||||||
|
|
||||||
expect (data).toBe (blob)
|
|
||||||
})
|
|
||||||
|
|
||||||
it ('delegates deletes and exposes axios error detection', async () => {
|
|
||||||
const err = new Error ('bad')
|
|
||||||
mocks.client.delete.mockResolvedValueOnce ({})
|
|
||||||
mocks.isAxiosError.mockReturnValueOnce (true)
|
|
||||||
|
|
||||||
const { apiDelete, isApiError } = await import ('@/lib/api')
|
|
||||||
await apiDelete ('/posts/1')
|
|
||||||
|
|
||||||
expect (mocks.client.delete).toHaveBeenCalledWith (
|
|
||||||
'/posts/1',
|
|
||||||
{ headers: { 'X-Transfer-Code': '' } },
|
|
||||||
)
|
|
||||||
expect (isApiError (err)).toBe (true)
|
|
||||||
expect (mocks.isAxiosError).toHaveBeenCalledWith (err)
|
|
||||||
})
|
|
||||||
})
|
|
||||||
@@ -28,7 +28,7 @@ const apiP = async <T> (
|
|||||||
const res = await client[method] (path, body ?? { }, withUserCode (opt))
|
const res = await client[method] (path, body ?? { }, withUserCode (opt))
|
||||||
if (opt?.responseType === 'blob')
|
if (opt?.responseType === 'blob')
|
||||||
return res.data as T
|
return res.data as T
|
||||||
return toCamel (res.data as Record<string, unknown>, { deep: true }) as T
|
return toCamel (res.data as any, { deep: true }) as T
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@@ -39,7 +39,7 @@ export const apiGet = async <T> (
|
|||||||
const res = await client.get (path, withUserCode (opt))
|
const res = await client.get (path, withUserCode (opt))
|
||||||
if (opt?.responseType === 'blob')
|
if (opt?.responseType === 'blob')
|
||||||
return res.data as T
|
return res.data as T
|
||||||
return toCamel (res.data as Record<string, unknown>, { deep: true }) as T
|
return toCamel (res.data as any, { deep: true }) as T
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@@ -72,5 +72,4 @@ export const apiDelete = async (
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
export const isApiError = <T = unknown> (err: unknown): err is AxiosError<T> =>
|
export const isApiError = (err: unknown): err is AxiosError => axios.isAxiosError (err)
|
||||||
axios.isAxiosError (err)
|
|
||||||
|
|||||||
@@ -1,31 +0,0 @@
|
|||||||
import toCamel from 'camelcase-keys'
|
|
||||||
|
|
||||||
import { isApiError } from '@/lib/api'
|
|
||||||
|
|
||||||
export type FieldErrors<T extends string = string> = Partial<Record<T, string[]>>
|
|
||||||
|
|
||||||
export type ValidationError<T extends string = string> =
|
|
||||||
{ message: string
|
|
||||||
fieldErrors: FieldErrors<T>
|
|
||||||
baseErrors: string[] }
|
|
||||||
|
|
||||||
type RawValidationError = { type?: string
|
|
||||||
message?: string
|
|
||||||
errors?: Record<string, string[]>
|
|
||||||
baseErrors?: string[] }
|
|
||||||
|
|
||||||
|
|
||||||
export const extractValidationError = <T extends string = string> (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<T>,
|
|
||||||
baseErrors: data.baseErrors ?? [] }
|
|
||||||
}
|
|
||||||
@@ -1,117 +0,0 @@
|
|||||||
import { beforeEach, describe, expect, it, vi } from 'vitest'
|
|
||||||
|
|
||||||
import { fetchPostChanges, fetchPosts, toggleViewedFlg, updatePost } from '@/lib/posts'
|
|
||||||
|
|
||||||
import type { FetchPostsParams } from '@/types'
|
|
||||||
|
|
||||||
const api = vi.hoisted (() => ({
|
|
||||||
apiDelete: vi.fn (),
|
|
||||||
apiGet: vi.fn (),
|
|
||||||
apiPost: vi.fn (),
|
|
||||||
apiPut: vi.fn (),
|
|
||||||
}))
|
|
||||||
|
|
||||||
vi.mock ('@/lib/api', () => api)
|
|
||||||
|
|
||||||
const baseParams: FetchPostsParams = {
|
|
||||||
url: '',
|
|
||||||
title: '',
|
|
||||||
tags: '',
|
|
||||||
match: 'all',
|
|
||||||
originalCreatedFrom: '',
|
|
||||||
originalCreatedTo: '',
|
|
||||||
createdFrom: '',
|
|
||||||
createdTo: '',
|
|
||||||
updatedFrom: '',
|
|
||||||
updatedTo: '',
|
|
||||||
page: 1,
|
|
||||||
limit: 20,
|
|
||||||
order: 'updated_at:desc',
|
|
||||||
}
|
|
||||||
|
|
||||||
describe ('posts API functions', () => {
|
|
||||||
beforeEach (() => {
|
|
||||||
vi.clearAllMocks ()
|
|
||||||
})
|
|
||||||
|
|
||||||
it ('maps post search parameters to backend snake_case names', async () => {
|
|
||||||
api.apiGet.mockResolvedValueOnce ({ posts: [], count: 0 })
|
|
||||||
|
|
||||||
await fetchPosts ({
|
|
||||||
...baseParams,
|
|
||||||
title: 'title',
|
|
||||||
tags: 'a b',
|
|
||||||
originalCreatedFrom: '2026-01-01',
|
|
||||||
updatedTo: '2026-02-01',
|
|
||||||
})
|
|
||||||
|
|
||||||
expect (api.apiGet).toHaveBeenCalledWith (
|
|
||||||
'/posts',
|
|
||||||
{
|
|
||||||
params: {
|
|
||||||
title: 'title',
|
|
||||||
tags: 'a b',
|
|
||||||
match: 'all',
|
|
||||||
original_created_from: '2026-01-01',
|
|
||||||
updated_to: '2026-02-01',
|
|
||||||
page: 1,
|
|
||||||
limit: 20,
|
|
||||||
order: 'updated_at:desc',
|
|
||||||
},
|
|
||||||
},
|
|
||||||
)
|
|
||||||
})
|
|
||||||
|
|
||||||
it ('updates posts with version and merge controls', async () => {
|
|
||||||
api.apiPut.mockResolvedValueOnce ({ id: 5 })
|
|
||||||
|
|
||||||
await updatePost (
|
|
||||||
{
|
|
||||||
id: 5,
|
|
||||||
title: 'new title',
|
|
||||||
tags: 'tag',
|
|
||||||
parentPostIds: '1 2',
|
|
||||||
originalCreatedFrom: null,
|
|
||||||
originalCreatedBefore: '2026-01-02T00:00:00Z',
|
|
||||||
},
|
|
||||||
{ baseVersionNo: 7, force: true, merge: false },
|
|
||||||
)
|
|
||||||
|
|
||||||
expect (api.apiPut).toHaveBeenCalledWith (
|
|
||||||
'/posts/5',
|
|
||||||
{
|
|
||||||
title: 'new title',
|
|
||||||
tags: 'tag',
|
|
||||||
parent_post_ids: '1 2',
|
|
||||||
original_created_from: null,
|
|
||||||
original_created_before: '2026-01-02T00:00:00Z',
|
|
||||||
},
|
|
||||||
{
|
|
||||||
params: {
|
|
||||||
base_version_no: '7',
|
|
||||||
force: '1',
|
|
||||||
merge: '0',
|
|
||||||
},
|
|
||||||
},
|
|
||||||
)
|
|
||||||
})
|
|
||||||
|
|
||||||
it ('uses the viewed endpoint method matching the requested state', async () => {
|
|
||||||
await toggleViewedFlg ('9', true)
|
|
||||||
await toggleViewedFlg ('9', false)
|
|
||||||
|
|
||||||
expect (api.apiPost).toHaveBeenCalledWith ('/posts/9/viewed')
|
|
||||||
expect (api.apiDelete).toHaveBeenCalledWith ('/posts/9/viewed')
|
|
||||||
})
|
|
||||||
|
|
||||||
it ('keeps optional post history filters out when blank', async () => {
|
|
||||||
api.apiGet.mockResolvedValueOnce ({ versions: [], count: 0 })
|
|
||||||
|
|
||||||
await fetchPostChanges ({ page: 2, limit: 50 })
|
|
||||||
|
|
||||||
expect (api.apiGet).toHaveBeenCalledWith (
|
|
||||||
'/posts/versions',
|
|
||||||
{ params: { page: 2, limit: 50 } },
|
|
||||||
)
|
|
||||||
})
|
|
||||||
})
|
|
||||||
@@ -1,112 +0,0 @@
|
|||||||
import { QueryClient } from '@tanstack/react-query'
|
|
||||||
import { beforeEach, describe, expect, it, vi } from 'vitest'
|
|
||||||
|
|
||||||
import { prefetchForURL } from '@/lib/prefetchers'
|
|
||||||
|
|
||||||
const postsApi = vi.hoisted (() => ({
|
|
||||||
fetchPost: vi.fn (),
|
|
||||||
fetchPostChanges: vi.fn (),
|
|
||||||
fetchPosts: vi.fn (),
|
|
||||||
}))
|
|
||||||
|
|
||||||
const tagsApi = vi.hoisted (() => ({
|
|
||||||
fetchTag: vi.fn (),
|
|
||||||
fetchTagByName: vi.fn (),
|
|
||||||
fetchTagChanges: vi.fn (),
|
|
||||||
fetchTags: vi.fn (),
|
|
||||||
}))
|
|
||||||
|
|
||||||
const wikiApi = vi.hoisted (() => ({
|
|
||||||
fetchWikiPage: vi.fn (),
|
|
||||||
fetchWikiPageByTitle: vi.fn (),
|
|
||||||
fetchWikiPages: vi.fn (),
|
|
||||||
}))
|
|
||||||
|
|
||||||
vi.mock ('@/lib/posts', () => postsApi)
|
|
||||||
vi.mock ('@/lib/tags', () => tagsApi)
|
|
||||||
vi.mock ('@/lib/wiki', () => wikiApi)
|
|
||||||
|
|
||||||
const qc = () => new QueryClient ({
|
|
||||||
defaultOptions: { queries: { retry: false } },
|
|
||||||
})
|
|
||||||
|
|
||||||
describe ('prefetchForURL', () => {
|
|
||||||
beforeEach (() => {
|
|
||||||
vi.clearAllMocks ()
|
|
||||||
postsApi.fetchPosts.mockResolvedValue ({ posts: [], count: 0 })
|
|
||||||
postsApi.fetchPost.mockResolvedValue ({ id: 1 })
|
|
||||||
postsApi.fetchPostChanges.mockResolvedValue ({ versions: [], count: 0 })
|
|
||||||
tagsApi.fetchTags.mockResolvedValue ({ tags: [], count: 0 })
|
|
||||||
tagsApi.fetchTag.mockResolvedValue ({ id: 1 })
|
|
||||||
tagsApi.fetchTagByName.mockResolvedValue (null)
|
|
||||||
tagsApi.fetchTagChanges.mockResolvedValue ({ versions: [], count: 0 })
|
|
||||||
wikiApi.fetchWikiPages.mockResolvedValue ([])
|
|
||||||
wikiApi.fetchWikiPage.mockResolvedValue ({ id: 1 })
|
|
||||||
wikiApi.fetchWikiPageByTitle.mockResolvedValue (null)
|
|
||||||
})
|
|
||||||
|
|
||||||
it ('prefetches post indexes from query parameters', async () => {
|
|
||||||
await prefetchForURL (
|
|
||||||
qc (),
|
|
||||||
'http://localhost/posts?tags=a+b&match=any&page=2&limit=5&order=title%3Aasc',
|
|
||||||
)
|
|
||||||
|
|
||||||
expect (postsApi.fetchPosts).toHaveBeenCalledWith (
|
|
||||||
expect.objectContaining ({
|
|
||||||
tags: 'a b',
|
|
||||||
match: 'any',
|
|
||||||
page: 2,
|
|
||||||
limit: 5,
|
|
||||||
order: 'title:asc',
|
|
||||||
}),
|
|
||||||
)
|
|
||||||
})
|
|
||||||
|
|
||||||
it ('prefetches post detail pages', async () => {
|
|
||||||
await prefetchForURL (qc (), 'http://localhost/posts/12')
|
|
||||||
|
|
||||||
expect (postsApi.fetchPost).toHaveBeenCalledWith ('12')
|
|
||||||
})
|
|
||||||
|
|
||||||
it ('prefetches tag indexes from query parameters', async () => {
|
|
||||||
await prefetchForURL (
|
|
||||||
qc (),
|
|
||||||
'http://localhost/tags?post=9&name=x&category=general&page=4&post_count_lte=10',
|
|
||||||
)
|
|
||||||
|
|
||||||
expect (tagsApi.fetchTags).toHaveBeenCalledWith (
|
|
||||||
expect.objectContaining ({
|
|
||||||
post: 9,
|
|
||||||
name: 'x',
|
|
||||||
category: 'general',
|
|
||||||
page: 4,
|
|
||||||
postCountLTE: 10,
|
|
||||||
}),
|
|
||||||
)
|
|
||||||
})
|
|
||||||
|
|
||||||
it ('prefetches wiki show pages and related tag/post data', async () => {
|
|
||||||
wikiApi.fetchWikiPageByTitle.mockResolvedValueOnce ({
|
|
||||||
id: 3,
|
|
||||||
title: 'Actual',
|
|
||||||
body: 'body',
|
|
||||||
})
|
|
||||||
|
|
||||||
await prefetchForURL (qc (), 'http://localhost/wiki/Alias')
|
|
||||||
|
|
||||||
expect (wikiApi.fetchWikiPageByTitle).toHaveBeenCalledWith ('Alias', { version: undefined })
|
|
||||||
expect (wikiApi.fetchWikiPage).toHaveBeenCalledWith ('3', {})
|
|
||||||
expect (tagsApi.fetchTagByName).toHaveBeenCalledWith ('Actual')
|
|
||||||
expect (postsApi.fetchPosts).toHaveBeenCalledWith (
|
|
||||||
expect.objectContaining ({ tags: 'Actual', limit: 8 }),
|
|
||||||
)
|
|
||||||
})
|
|
||||||
|
|
||||||
it ('ignores routes without a prefetcher', async () => {
|
|
||||||
await prefetchForURL (qc (), 'http://localhost/unknown')
|
|
||||||
|
|
||||||
expect (postsApi.fetchPosts).not.toHaveBeenCalled ()
|
|
||||||
expect (tagsApi.fetchTags).not.toHaveBeenCalled ()
|
|
||||||
expect (wikiApi.fetchWikiPages).not.toHaveBeenCalled ()
|
|
||||||
})
|
|
||||||
})
|
|
||||||
@@ -1,14 +0,0 @@
|
|||||||
import { describe, expect, it } from 'vitest'
|
|
||||||
|
|
||||||
import { postsKeys, tagsKeys, wikiKeys } from '@/lib/queryKeys'
|
|
||||||
|
|
||||||
describe ('query keys', () => {
|
|
||||||
it ('uses stable namespaces for posts, tags, and wiki', () => {
|
|
||||||
expect (postsKeys.show ('3')).toEqual (['posts', '3'])
|
|
||||||
expect (postsKeys.related ('3')).toEqual (['related', '3'])
|
|
||||||
expect (tagsKeys.deerjikists ('7')).toEqual (['tags', 'deerjikists', '7'])
|
|
||||||
expect (wikiKeys.show ('Title', { version: '2' })).toEqual (
|
|
||||||
['wiki', 'Title', { version: '2' }],
|
|
||||||
)
|
|
||||||
})
|
|
||||||
})
|
|
||||||
@@ -1,68 +0,0 @@
|
|||||||
import { describe, expect, it } from 'vitest'
|
|
||||||
|
|
||||||
import remarkWikiAutolink from '@/lib/remark-wiki-autolink'
|
|
||||||
|
|
||||||
import type { Root } from 'mdast'
|
|
||||||
|
|
||||||
describe ('remarkWikiAutolink', () => {
|
|
||||||
it ('links matching wiki page names and prefers longer matches', () => {
|
|
||||||
const tree: Root = {
|
|
||||||
type: 'root',
|
|
||||||
children: [{
|
|
||||||
type: 'paragraph',
|
|
||||||
children: [{ type: 'text', value: '虹夏 and 虹' }],
|
|
||||||
}],
|
|
||||||
}
|
|
||||||
|
|
||||||
remarkWikiAutolink (['虹', '虹夏']) (tree)
|
|
||||||
|
|
||||||
expect (tree.children[0]).toMatchObject ({
|
|
||||||
type: 'paragraph',
|
|
||||||
children: [
|
|
||||||
{
|
|
||||||
type: 'link',
|
|
||||||
url: '/wiki/%E8%99%B9%E5%A4%8F',
|
|
||||||
children: [{ type: 'text', value: '虹夏' }],
|
|
||||||
},
|
|
||||||
{ type: 'text', value: ' and ' },
|
|
||||||
{
|
|
||||||
type: 'link',
|
|
||||||
url: '/wiki/%E8%99%B9',
|
|
||||||
children: [{ type: 'text', value: '虹' }],
|
|
||||||
},
|
|
||||||
],
|
|
||||||
})
|
|
||||||
})
|
|
||||||
|
|
||||||
it ('does not link text inside existing links or code', () => {
|
|
||||||
const tree: Root = {
|
|
||||||
type: 'root',
|
|
||||||
children: [
|
|
||||||
{
|
|
||||||
type: 'paragraph',
|
|
||||||
children: [{
|
|
||||||
type: 'link',
|
|
||||||
url: '/existing',
|
|
||||||
children: [{ type: 'text', value: '虹' }],
|
|
||||||
}],
|
|
||||||
},
|
|
||||||
{
|
|
||||||
type: 'code',
|
|
||||||
value: '虹',
|
|
||||||
},
|
|
||||||
],
|
|
||||||
}
|
|
||||||
|
|
||||||
remarkWikiAutolink (['虹']) (tree)
|
|
||||||
|
|
||||||
expect (tree.children[0]).toMatchObject ({
|
|
||||||
type: 'paragraph',
|
|
||||||
children: [{
|
|
||||||
type: 'link',
|
|
||||||
url: '/existing',
|
|
||||||
children: [{ type: 'text', value: '虹' }],
|
|
||||||
}],
|
|
||||||
})
|
|
||||||
expect (tree.children[1]).toMatchObject ({ type: 'code', value: '虹' })
|
|
||||||
})
|
|
||||||
})
|
|
||||||
@@ -38,7 +38,7 @@ export default (pageNames: string[], basePath = '/wiki'): ((tree: Root) => void)
|
|||||||
let last = 0
|
let last = 0
|
||||||
const parts: RootContent[] = []
|
const parts: RootContent[] = []
|
||||||
|
|
||||||
while ((m = re.exec (value)) !== null)
|
while (m = re.exec (value))
|
||||||
{
|
{
|
||||||
const start = m.index
|
const start = m.index
|
||||||
const end = start + m[0].length
|
const end = start + m[0].length
|
||||||
@@ -70,7 +70,7 @@ export default (pageNames: string[], basePath = '/wiki'): ((tree: Root) => void)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
const maybeChidren = 'children' in node ? node.children : undefined
|
const maybeChidren = (node as any).children
|
||||||
if (Array.isArray (maybeChidren))
|
if (Array.isArray (maybeChidren))
|
||||||
{
|
{
|
||||||
const parent = node as Parent
|
const parent = node as Parent
|
||||||
|
|||||||
@@ -1,67 +0,0 @@
|
|||||||
import { beforeEach, describe, expect, it, vi } from 'vitest'
|
|
||||||
|
|
||||||
import { fetchTag, fetchTagByName, fetchTags } from '@/lib/tags'
|
|
||||||
|
|
||||||
import type { FetchTagsParams } from '@/types'
|
|
||||||
|
|
||||||
const api = vi.hoisted (() => ({
|
|
||||||
apiGet: vi.fn (),
|
|
||||||
}))
|
|
||||||
|
|
||||||
vi.mock ('@/lib/api', () => api)
|
|
||||||
|
|
||||||
const baseParams: FetchTagsParams = {
|
|
||||||
post: null,
|
|
||||||
name: '',
|
|
||||||
category: null,
|
|
||||||
postCountGTE: 0,
|
|
||||||
postCountLTE: null,
|
|
||||||
createdFrom: '',
|
|
||||||
createdTo: '',
|
|
||||||
updatedFrom: '',
|
|
||||||
updatedTo: '',
|
|
||||||
page: 1,
|
|
||||||
limit: 30,
|
|
||||||
order: 'updated_at:desc',
|
|
||||||
}
|
|
||||||
|
|
||||||
describe ('tags API functions', () => {
|
|
||||||
beforeEach (() => {
|
|
||||||
vi.clearAllMocks ()
|
|
||||||
})
|
|
||||||
|
|
||||||
it ('maps tag filters to backend parameters', async () => {
|
|
||||||
api.apiGet.mockResolvedValueOnce ({ tags: [], count: 0 })
|
|
||||||
|
|
||||||
await fetchTags ({
|
|
||||||
...baseParams,
|
|
||||||
name: '虹',
|
|
||||||
category: 'character',
|
|
||||||
postCountGTE: 10,
|
|
||||||
postCountLTE: 20,
|
|
||||||
})
|
|
||||||
|
|
||||||
expect (api.apiGet).toHaveBeenCalledWith (
|
|
||||||
'/tags',
|
|
||||||
{
|
|
||||||
params: {
|
|
||||||
name: '虹',
|
|
||||||
category: 'character',
|
|
||||||
post_count_gte: 10,
|
|
||||||
post_count_lte: 20,
|
|
||||||
page: 1,
|
|
||||||
limit: 30,
|
|
||||||
order: 'updated_at:desc',
|
|
||||||
},
|
|
||||||
},
|
|
||||||
)
|
|
||||||
})
|
|
||||||
|
|
||||||
it ('returns null when tag fetches fail', async () => {
|
|
||||||
api.apiGet.mockRejectedValueOnce (new Error ('missing'))
|
|
||||||
api.apiGet.mockRejectedValueOnce (new Error ('missing'))
|
|
||||||
|
|
||||||
await expect (fetchTag ('1')).resolves.toBeNull ()
|
|
||||||
await expect (fetchTagByName ('unknown')).resolves.toBeNull ()
|
|
||||||
})
|
|
||||||
})
|
|
||||||
@@ -1,28 +0,0 @@
|
|||||||
import { useState } from 'react'
|
|
||||||
|
|
||||||
import { extractValidationError } from '@/lib/apiErrors'
|
|
||||||
|
|
||||||
import type { FieldErrors } from '@/lib/apiErrors'
|
|
||||||
|
|
||||||
|
|
||||||
export const useValidationErrors = <T extends string> () => {
|
|
||||||
const [baseErrors, setBaseErrors] = useState<string[]> ([])
|
|
||||||
const [fieldErrors, setFieldErrors] = useState<FieldErrors<T>> ({ })
|
|
||||||
|
|
||||||
const clearValidationErrors = () => {
|
|
||||||
setBaseErrors ([])
|
|
||||||
setFieldErrors ({ })
|
|
||||||
}
|
|
||||||
|
|
||||||
const applyValidationError = (error: unknown): boolean => {
|
|
||||||
const validationError = extractValidationError<T> (error)
|
|
||||||
if (!(validationError))
|
|
||||||
return false
|
|
||||||
|
|
||||||
setBaseErrors (validationError.baseErrors)
|
|
||||||
setFieldErrors (validationError.fieldErrors)
|
|
||||||
return true
|
|
||||||
}
|
|
||||||
|
|
||||||
return { baseErrors, fieldErrors, clearValidationErrors, applyValidationError }
|
|
||||||
}
|
|
||||||
@@ -1,20 +0,0 @@
|
|||||||
import { describe, expect, it } from 'vitest'
|
|
||||||
|
|
||||||
import { canEditContent } from '@/lib/users'
|
|
||||||
|
|
||||||
import type { UserRole } from '@/types'
|
|
||||||
|
|
||||||
const userWithRole = (role: UserRole) => ({ role })
|
|
||||||
|
|
||||||
describe ('user permission helpers', () => {
|
|
||||||
it ('allows admins and members to edit content', () => {
|
|
||||||
expect (canEditContent (userWithRole ('admin'))).toBe (true)
|
|
||||||
expect (canEditContent (userWithRole ('member'))).toBe (true)
|
|
||||||
})
|
|
||||||
|
|
||||||
it ('does not allow guests or missing users to edit content', () => {
|
|
||||||
expect (canEditContent (userWithRole ('guest'))).toBe (false)
|
|
||||||
expect (canEditContent (null)).toBe (false)
|
|
||||||
expect (canEditContent (undefined)).toBe (false)
|
|
||||||
})
|
|
||||||
})
|
|
||||||
@@ -1,7 +0,0 @@
|
|||||||
import type { User, UserRole } from '@/types'
|
|
||||||
|
|
||||||
const CONTENT_EDITOR_ROLES: readonly UserRole[] = ['admin', 'member']
|
|
||||||
|
|
||||||
export const canEditContent = (
|
|
||||||
user: Pick<User, 'role'> | null | undefined,
|
|
||||||
): boolean => user != null && CONTENT_EDITOR_ROLES.includes (user.role)
|
|
||||||
@@ -1,28 +0,0 @@
|
|||||||
import { describe, expect, it } from 'vitest'
|
|
||||||
|
|
||||||
import { cn, originalCreatedAtString, toDate } from '@/lib/utils'
|
|
||||||
|
|
||||||
describe ('utils', () => {
|
|
||||||
it ('converts strings to dates and leaves date instances intact', () => {
|
|
||||||
const date = new Date ('2026-01-02T03:04:05Z')
|
|
||||||
|
|
||||||
expect (toDate ('2026-01-02T03:04:05Z')).toBeInstanceOf (Date)
|
|
||||||
expect (toDate (date)).toBe (date)
|
|
||||||
})
|
|
||||||
|
|
||||||
it ('merges conditional Tailwind classes', () => {
|
|
||||||
const hidden = false
|
|
||||||
|
|
||||||
expect (cn ('p-2', hidden && 'hidden', 'p-4')).toBe ('p-4')
|
|
||||||
})
|
|
||||||
|
|
||||||
it ('renders unknown original creation time ranges', () => {
|
|
||||||
expect (originalCreatedAtString (null, null)).toBe ('年月日不詳')
|
|
||||||
expect (
|
|
||||||
originalCreatedAtString (
|
|
||||||
'2026-01-01T00:00:00+09:00',
|
|
||||||
'2026-01-02T00:00:00+09:00',
|
|
||||||
),
|
|
||||||
).toContain ('時刻不詳')
|
|
||||||
})
|
|
||||||
})
|
|
||||||
@@ -71,15 +71,3 @@ export const originalCreatedAtString = (
|
|||||||
.join (' '))
|
.join (' '))
|
||||||
return rtn === '〜' ? '年月日不詳' : rtn
|
return rtn === '〜' ? '年月日不詳' : rtn
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
export const inputClass = (invalid?: boolean, className?: string): string =>
|
|
||||||
cn ('w-full rounded border p-2',
|
|
||||||
(invalid
|
|
||||||
? ['border-red-500 bg-red-50 text-red-900',
|
|
||||||
'placeholder:text-red-300',
|
|
||||||
'focus:border-red-500 focus:outline-none focus:ring-2 focus:ring-red-200',
|
|
||||||
'dark:border-red-500 dark:bg-red-950/30 dark:text-red-100']
|
|
||||||
: ['border-gray-300',
|
|
||||||
'focus:border-blue-500 focus:outline-none focus:ring-2 focus:ring-blue-200']),
|
|
||||||
className)
|
|
||||||
|
|||||||
@@ -1,48 +0,0 @@
|
|||||||
import { beforeEach, describe, expect, it, vi } from 'vitest'
|
|
||||||
|
|
||||||
import { fetchWikiPage, fetchWikiPageByTitle, fetchWikiPages } from '@/lib/wiki'
|
|
||||||
|
|
||||||
const api = vi.hoisted (() => ({
|
|
||||||
apiGet: vi.fn (),
|
|
||||||
}))
|
|
||||||
|
|
||||||
vi.mock ('@/lib/api', () => api)
|
|
||||||
|
|
||||||
describe ('wiki API functions', () => {
|
|
||||||
beforeEach (() => {
|
|
||||||
vi.clearAllMocks ()
|
|
||||||
})
|
|
||||||
|
|
||||||
it ('fetches wiki index and show pages with expected parameters', async () => {
|
|
||||||
api.apiGet.mockResolvedValueOnce ([])
|
|
||||||
api.apiGet.mockResolvedValueOnce ({ id: 1 })
|
|
||||||
|
|
||||||
await fetchWikiPages ({ title: '虹' })
|
|
||||||
await fetchWikiPage ('1', { version: '3' })
|
|
||||||
|
|
||||||
expect (api.apiGet).toHaveBeenNthCalledWith (
|
|
||||||
1,
|
|
||||||
'/wiki',
|
|
||||||
{ params: { title: '虹' } },
|
|
||||||
)
|
|
||||||
expect (api.apiGet).toHaveBeenNthCalledWith (
|
|
||||||
2,
|
|
||||||
'/wiki/1',
|
|
||||||
{ params: { version: '3' } },
|
|
||||||
)
|
|
||||||
})
|
|
||||||
|
|
||||||
it ('encodes title path segments and returns null on misses', async () => {
|
|
||||||
api.apiGet.mockResolvedValueOnce ({ id: 2 })
|
|
||||||
api.apiGet.mockRejectedValueOnce (new Error ('missing'))
|
|
||||||
|
|
||||||
await fetchWikiPageByTitle ('a/b c', { version: undefined })
|
|
||||||
await expect (fetchWikiPageByTitle ('missing', {})).resolves.toBeNull ()
|
|
||||||
|
|
||||||
expect (api.apiGet).toHaveBeenNthCalledWith (
|
|
||||||
1,
|
|
||||||
'/wiki/title/a%2Fb%20c',
|
|
||||||
{ params: { version: undefined } },
|
|
||||||
)
|
|
||||||
})
|
|
||||||
})
|
|
||||||
@@ -1,8 +1,4 @@
|
|||||||
import type { FC } from 'react'
|
|
||||||
|
|
||||||
import ErrorScreen from '@/components/ErrorScreen'
|
import ErrorScreen from '@/components/ErrorScreen'
|
||||||
|
|
||||||
|
|
||||||
const Forbidden: FC = () => <ErrorScreen status={403}/>
|
export default () => <ErrorScreen status={403}/>
|
||||||
|
|
||||||
export default Forbidden
|
|
||||||
|
|||||||
@@ -11,7 +11,7 @@ import type { FC } from 'react'
|
|||||||
import type { User } from '@/types'
|
import type { User } from '@/types'
|
||||||
|
|
||||||
|
|
||||||
const MorePage: FC = () => {
|
export default (() => {
|
||||||
const menu = menuOutline (
|
const menu = menuOutline (
|
||||||
{ tag: null, wikiId: null, user: { } as User, pathName: location.pathname })
|
{ tag: null, wikiId: null, user: { } as User, pathName: location.pathname })
|
||||||
|
|
||||||
@@ -43,6 +43,4 @@ const MorePage: FC = () => {
|
|||||||
</section>))}
|
</section>))}
|
||||||
</div>))}
|
</div>))}
|
||||||
</MainArea>)
|
</MainArea>)
|
||||||
}
|
}) satisfies FC
|
||||||
|
|
||||||
export default MorePage
|
|
||||||
|
|||||||
@@ -1,8 +1,4 @@
|
|||||||
import type { FC } from 'react'
|
|
||||||
|
|
||||||
import ErrorScreen from '@/components/ErrorScreen'
|
import ErrorScreen from '@/components/ErrorScreen'
|
||||||
|
|
||||||
|
|
||||||
const NotFound: FC = () => <ErrorScreen status={404}/>
|
export default () => <ErrorScreen status={404}/>
|
||||||
|
|
||||||
export default NotFound
|
|
||||||
|
|||||||
@@ -1,8 +1,4 @@
|
|||||||
import type { FC } from 'react'
|
|
||||||
|
|
||||||
import ErrorScreen from '@/components/ErrorScreen'
|
import ErrorScreen from '@/components/ErrorScreen'
|
||||||
|
|
||||||
|
|
||||||
const ServiceUnavailable: FC = () => <ErrorScreen status={503}/>
|
export default () => <ErrorScreen status={503}/>
|
||||||
|
|
||||||
export default ServiceUnavailable
|
|
||||||
|
|||||||
@@ -1,10 +1,9 @@
|
|||||||
import { useQuery, useQueryClient } from '@tanstack/react-query'
|
import { useQuery, useQueryClient } from '@tanstack/react-query'
|
||||||
import { useEffect, useMemo, useState } from 'react'
|
import { useEffect, useState } from 'react'
|
||||||
import { useParams } from 'react-router-dom'
|
import { useParams } from 'react-router-dom'
|
||||||
|
|
||||||
import TagLink from '@/components/TagLink'
|
import TagLink from '@/components/TagLink'
|
||||||
import FieldError from '@/components/common/FieldError'
|
import Label from '@/components/common/Label'
|
||||||
import FormField from '@/components/common/FormField'
|
|
||||||
import PageTitle from '@/components/common/PageTitle'
|
import PageTitle from '@/components/common/PageTitle'
|
||||||
import MainArea from '@/components/layout/MainArea'
|
import MainArea from '@/components/layout/MainArea'
|
||||||
import { toast } from '@/components/ui/use-toast'
|
import { toast } from '@/components/ui/use-toast'
|
||||||
@@ -12,18 +11,14 @@ import { PLATFORM_NAMES, PLATFORMS } from '@/consts'
|
|||||||
import { apiPut } from '@/lib/api'
|
import { apiPut } from '@/lib/api'
|
||||||
import { tagsKeys } from '@/lib/queryKeys'
|
import { tagsKeys } from '@/lib/queryKeys'
|
||||||
import { fetchDeerjikistsByTag } from '@/lib/tags'
|
import { fetchDeerjikistsByTag } from '@/lib/tags'
|
||||||
import { cn, inputClass } from '@/lib/utils'
|
import { cn } from '@/lib/utils'
|
||||||
import { useValidationErrors } from '@/lib/useValidationErrors'
|
|
||||||
|
|
||||||
import type { FC, FormEvent } from 'react'
|
import type { FC, FormEvent } from 'react'
|
||||||
|
|
||||||
import type { Deerjikist, Platform } from '@/types'
|
import type { Deerjikist, Platform } from '@/types'
|
||||||
|
|
||||||
type DeerjikistFormField =
|
|
||||||
'deerjikists' | `deerjikists.${ number }.platform` | `deerjikists.${ number }.code`
|
|
||||||
|
|
||||||
|
export default (() => {
|
||||||
const DeerjikistDetailPage: FC = () => {
|
|
||||||
const { id } = useParams ()
|
const { id } = useParams ()
|
||||||
const tagId = String (id ?? '')
|
const tagId = String (id ?? '')
|
||||||
const tagKey = tagsKeys.deerjikists (tagId)
|
const tagKey = tagsKeys.deerjikists (tagId)
|
||||||
@@ -31,19 +26,16 @@ const DeerjikistDetailPage: FC = () => {
|
|||||||
const { data: qData, isLoading: loading } =
|
const { data: qData, isLoading: loading } =
|
||||||
useQuery ({ queryKey: tagKey, queryFn: () => fetchDeerjikistsByTag (tagId) })
|
useQuery ({ queryKey: tagKey, queryFn: () => fetchDeerjikistsByTag (tagId) })
|
||||||
const tag = qData?.tag
|
const tag = qData?.tag
|
||||||
const deerjikists = useMemo (() => qData?.deerjikists ?? [], [qData])
|
const deerjikists = qData?.deerjikists ?? []
|
||||||
|
|
||||||
const [data, setData] =
|
const [data, setData] =
|
||||||
useState<(Omit<Deerjikist, 'platform'> & { platform: Platform | null })[]> ([])
|
useState<(Omit<Deerjikist, 'platform'> & { platform: Platform | null })[]> ([])
|
||||||
const [disabled, setDisabled] = useState (true)
|
const [disabled, setDisabled] = useState (true)
|
||||||
const { baseErrors, fieldErrors, clearValidationErrors, applyValidationError } =
|
|
||||||
useValidationErrors<DeerjikistFormField> ()
|
|
||||||
|
|
||||||
const qc = useQueryClient ()
|
const qc = useQueryClient ()
|
||||||
|
|
||||||
const handleSubmit = async (e: FormEvent) => {
|
const handleSubmit = async (e: FormEvent) => {
|
||||||
e.preventDefault ()
|
e.preventDefault ()
|
||||||
clearValidationErrors ()
|
|
||||||
|
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
@@ -54,9 +46,8 @@ const DeerjikistDetailPage: FC = () => {
|
|||||||
|
|
||||||
toast ({ description: '更新しました.' })
|
toast ({ description: '更新しました.' })
|
||||||
}
|
}
|
||||||
catch (e)
|
catch
|
||||||
{
|
{
|
||||||
applyValidationError (e)
|
|
||||||
toast ({ title: '更新失敗', description: '入力内容を確認してください.' })
|
toast ({ title: '更新失敗', description: '入力内容を確認してください.' })
|
||||||
}
|
}
|
||||||
finally
|
finally
|
||||||
@@ -85,9 +76,6 @@ const DeerjikistDetailPage: FC = () => {
|
|||||||
</PageTitle>
|
</PageTitle>
|
||||||
|
|
||||||
<form onSubmit={handleSubmit} className="my-4 space-y-2">
|
<form onSubmit={handleSubmit} className="my-4 space-y-2">
|
||||||
<FieldError messages={baseErrors}/>
|
|
||||||
<FieldError messages={fieldErrors.deerjikists}/>
|
|
||||||
|
|
||||||
{data.map ((datum, i) => (
|
{data.map ((datum, i) => (
|
||||||
<fieldset key={i} className="min-w-0 rounded-lg border border-gray-300
|
<fieldset key={i} className="min-w-0 rounded-lg border border-gray-300
|
||||||
dark:border-gray-700 p-4">
|
dark:border-gray-700 p-4">
|
||||||
@@ -103,16 +91,12 @@ const DeerjikistDetailPage: FC = () => {
|
|||||||
</legend>
|
</legend>
|
||||||
|
|
||||||
{/* プラットフォーム */}
|
{/* プラットフォーム */}
|
||||||
<FormField
|
<div>
|
||||||
label="プラットフォーム"
|
<Label>プラットフォーム</Label>
|
||||||
messages={fieldErrors[`deerjikists.${ i }.platform`]}>
|
|
||||||
{({ describedBy, invalid }) => (
|
|
||||||
<select
|
<select
|
||||||
|
className="w-full border p-2 rounded"
|
||||||
disabled={disabled}
|
disabled={disabled}
|
||||||
value={datum.platform ?? ''}
|
value={datum.platform ?? ''}
|
||||||
aria-describedby={describedBy}
|
|
||||||
aria-invalid={invalid}
|
|
||||||
className={inputClass (invalid)}
|
|
||||||
onChange={e => setData (prev => {
|
onChange={e => setData (prev => {
|
||||||
const rtn = [...prev]
|
const rtn = [...prev]
|
||||||
rtn[i] = { ...rtn[i],
|
rtn[i] = { ...rtn[i],
|
||||||
@@ -124,27 +108,23 @@ const DeerjikistDetailPage: FC = () => {
|
|||||||
<option key={p} value={p}>
|
<option key={p} value={p}>
|
||||||
{PLATFORM_NAMES[p]}
|
{PLATFORM_NAMES[p]}
|
||||||
</option>))}
|
</option>))}
|
||||||
</select>)}
|
</select>
|
||||||
</FormField>
|
</div>
|
||||||
|
|
||||||
{/* コード */}
|
{/* コード */}
|
||||||
<FormField
|
<div>
|
||||||
label="コード"
|
<Label>コード</Label>
|
||||||
messages={fieldErrors[`deerjikists.${ i }.code`]}>
|
|
||||||
{({ describedBy, invalid }) => (
|
|
||||||
<input
|
<input
|
||||||
type="text"
|
type="text"
|
||||||
disabled={disabled}
|
disabled={disabled}
|
||||||
|
className="w-full border p-2 rounded"
|
||||||
value={datum.code}
|
value={datum.code}
|
||||||
aria-describedby={describedBy}
|
|
||||||
aria-invalid={invalid}
|
|
||||||
className={inputClass (invalid)}
|
|
||||||
onChange={e => setData (prev => {
|
onChange={e => setData (prev => {
|
||||||
const rtn = [...prev]
|
const rtn = [...prev]
|
||||||
rtn[i] = { ...rtn[i], code: e.target.value }
|
rtn[i] = { ...rtn[i], code: e.target.value }
|
||||||
return rtn
|
return rtn
|
||||||
})}/>)}
|
})}/>
|
||||||
</FormField>
|
</div>
|
||||||
</fieldset>
|
</fieldset>
|
||||||
))}
|
))}
|
||||||
|
|
||||||
@@ -172,6 +152,4 @@ const DeerjikistDetailPage: FC = () => {
|
|||||||
</div>
|
</div>
|
||||||
)}
|
)}
|
||||||
</MainArea>)
|
</MainArea>)
|
||||||
}
|
}) satisfies FC
|
||||||
|
|
||||||
export default DeerjikistDetailPage
|
|
||||||
|
|||||||
@@ -1,26 +0,0 @@
|
|||||||
import { screen } from '@testing-library/react'
|
|
||||||
import { Route, Routes } from 'react-router-dom'
|
|
||||||
import { describe, expect, it, vi } from 'vitest'
|
|
||||||
|
|
||||||
import MaterialBasePage from '@/pages/materials/MaterialBasePage'
|
|
||||||
import { renderWithProviders } from '@/test/render'
|
|
||||||
|
|
||||||
vi.mock ('@/components/MaterialSidebar', () => ({
|
|
||||||
default: () => <aside>Material sidebar</aside>,
|
|
||||||
}))
|
|
||||||
|
|
||||||
describe ('MaterialBasePage', () => {
|
|
||||||
it ('renders the material sidebar and nested route outlet', () => {
|
|
||||||
renderWithProviders (
|
|
||||||
<Routes>
|
|
||||||
<Route path="/materials" element={<MaterialBasePage/>}>
|
|
||||||
<Route index element={<div>Outlet content</div>}/>
|
|
||||||
</Route>
|
|
||||||
</Routes>,
|
|
||||||
{ route: '/materials' },
|
|
||||||
)
|
|
||||||
|
|
||||||
expect (screen.getByText ('Material sidebar')).toBeInTheDocument ()
|
|
||||||
expect (screen.getByText ('Outlet content')).toBeInTheDocument ()
|
|
||||||
})
|
|
||||||
})
|
|
||||||
@@ -5,10 +5,8 @@ import MaterialSidebar from '@/components/MaterialSidebar'
|
|||||||
import type { FC } from 'react'
|
import type { FC } from 'react'
|
||||||
|
|
||||||
|
|
||||||
const MaterialBasePage: FC = () => (
|
export default (() => (
|
||||||
<div className="md:flex md:flex-1 overflow-y-auto md:overflow-y-hidden">
|
<div className="md:flex md:flex-1 overflow-y-auto md:overflow-y-hidden">
|
||||||
<MaterialSidebar/>
|
<MaterialSidebar/>
|
||||||
<Outlet/>
|
<Outlet/>
|
||||||
</div>)
|
</div>)) satisfies FC
|
||||||
|
|
||||||
export default MaterialBasePage
|
|
||||||
|
|||||||
変更されたファイルが多すぎるため,一部のファイルは表示されません さらに表示
新しい課題から参照
ユーザをブロックする