コミットを比較
15 コミット
| 作成者 | SHA1 | 日付 | |
|---|---|---|---|
| b0cce4b7ee | |||
| 40cc3b2c0c | |||
| 61ab4744bd | |||
| ca92c62049 | |||
| 4e3fb6bef7 | |||
| 3a9ac8af32 | |||
| 7bc9ee1e68 | |||
| 95b4db1fc2 | |||
| 4117bdd31e | |||
| fecbb4b354 | |||
| d0ea329887 | |||
| 3b29c3e10e | |||
| 518c5fa0f2 | |||
| 4cc2dc5441 | |||
| 6a57dc53bf |
@@ -266,45 +266,38 @@ const value =
|
|||||||
《当用漢字による書きかえ》; prefer original forms such as `編輯`.
|
《当用漢字による書きかえ》; prefer original forms such as `編輯`.
|
||||||
- For user-facing Japanese ellipses, prefer `……` over ASCII `...`.
|
- For user-facing Japanese ellipses, prefer `……` over ASCII `...`.
|
||||||
|
|
||||||
### Frontend TypeScript and TSX style
|
### Frontend TSX style
|
||||||
|
|
||||||
- The delimiter-placement and line-breaking rules in this section apply to
|
- Preserve the local TSX formatting style.
|
||||||
both plain TypeScript `.ts` and TSX `.tsx`, unless a bullet explicitly says
|
|
||||||
it is JSX- or React-specific.
|
|
||||||
- Preserve the local TypeScript and TSX formatting style.
|
|
||||||
- Do not normalize TSX to common Prettier-style React formatting unless
|
- Do not normalize TSX to common Prettier-style React formatting unless
|
||||||
explicitly asked.
|
explicitly asked.
|
||||||
- Treat TypeScript and TSX formatting rules as hard constraints, not
|
- Treat TSX formatting rules as hard constraints, not preferences. Before
|
||||||
preferences. Before finishing a TypeScript or TSX edit, inspect the edited
|
finishing a TSX edit, inspect the edited hunks for closing `)`, `]`, and `}`
|
||||||
hunks for closing `)`, `]`, and `}` placement and fix violations instead of
|
placement and fix violations instead of relying on formatter defaults.
|
||||||
relying on formatter defaults.
|
- After every TSX edit, perform a style-only self-review of the edited hunks
|
||||||
- After every TypeScript or TSX edit, perform a style-only self-review of the
|
before running verification or reporting completion. The task is not complete
|
||||||
edited hunks before running verification or reporting completion. The task is
|
while any edited TSX hunk violates these local formatting rules.
|
||||||
not complete while any edited TypeScript or TSX hunk violates these local
|
- The TSX self-review must classify every edited leading or trailing `)`, `]`,
|
||||||
formatting rules.
|
and `}` by syntax role before deciding whether it is valid. Do not apply a
|
||||||
- The TypeScript/TSX self-review must classify every edited leading or trailing
|
rule by glyph alone. A closing `)` for a function parameter list is different
|
||||||
`)`, `]`, and `}` by syntax role before deciding whether it is valid. Do not
|
from a closing `)` for a function call. A closing `}` for a block is different
|
||||||
apply a rule by glyph alone. A closing `)` for a function parameter list is
|
from a closing `}` for an object, type literal, import list, or destructuring
|
||||||
different from a closing `)` for a function call. A closing `}` for a block
|
pattern.
|
||||||
is different from a closing `}` for an object, type literal, import list, or
|
- The TSX self-review must confirm there are no common Prettier-style React
|
||||||
destructuring pattern.
|
component declarations with a multi-line destructured parameter.
|
||||||
- The TSX-specific self-review must confirm there are no common Prettier-style
|
- The TSX self-review must confirm multi-line function declaration parameter
|
||||||
React component declarations with a multi-line destructured parameter.
|
`)` placement follows the detailed parameter-list rules below.
|
||||||
- The TypeScript/TSX self-review must confirm multi-line function declaration
|
- The TSX self-review must confirm call-expression `)` is never at the
|
||||||
parameter `)` placement follows the detailed parameter-list rules below.
|
|
||||||
- The TypeScript/TSX self-review must confirm call-expression `)` is never at
|
|
||||||
the beginning of a line.
|
|
||||||
- The TypeScript/TSX self-review must confirm
|
|
||||||
object/type/import/destructuring `}` is not at the beginning of a line.
|
|
||||||
- The TypeScript/TSX self-review must confirm multi-line
|
|
||||||
function/lambda/callback/block `}` is on its own line and never at the end
|
|
||||||
of the previous line.
|
|
||||||
- The TypeScript/TSX self-review must confirm array `]` is not at the
|
|
||||||
beginning of a line.
|
beginning of a line.
|
||||||
- The TSX-specific self-review must confirm JSX closing markers and closing
|
- The TSX self-review must confirm object/type/import/destructuring `}` is not
|
||||||
parentheses keep the surrounding compact style.
|
at the beginning of a line.
|
||||||
- The TypeScript/TSX self-review must confirm leading indentation follows
|
- The TSX self-review must confirm multi-line function/lambda/callback/block
|
||||||
4-space logical indentation with tabs only as leading 8-space compression.
|
`}` is on its own line and never at the end of the previous line.
|
||||||
|
- The TSX self-review must confirm array `]` is not at the beginning of a line.
|
||||||
|
- The TSX self-review must confirm JSX closing markers and closing parentheses
|
||||||
|
keep the surrounding compact style.
|
||||||
|
- The TSX self-review must confirm leading indentation follows 4-space logical
|
||||||
|
indentation with tabs only as leading 8-space compression.
|
||||||
- Prefer `const` arrow functions for TypeScript/TSX component and helper declarations.
|
- Prefer `const` arrow functions for TypeScript/TSX component and helper declarations.
|
||||||
- Put two blank lines before and after top-level `const` function
|
- Put two blank lines before and after top-level `const` function
|
||||||
declarations, unless imports, exports, or file boundaries make that awkward.
|
declarations, unless imports, exports, or file boundaries make that awkward.
|
||||||
@@ -362,37 +355,6 @@ const value =
|
|||||||
- Do not use a leading semicolon for expression statements such as
|
- Do not use a leading semicolon for expression statements such as
|
||||||
`;([...]).forEach(...)`; rewrite the expression to avoid ASI hazards
|
`;([...]).forEach(...)`; rewrite the expression to avoid ASI hazards
|
||||||
explicitly, for example with `void`.
|
explicitly, for example with `void`.
|
||||||
- Do not insert `void` mechanically before ordinary event-handler or callback
|
|
||||||
calls merely because the callee returns a `Promise`. If the surrounding code
|
|
||||||
already uses a plain expression statement such as
|
|
||||||
`onClick={() => requestActiveTab ('theme')}`, preserve that style unless a
|
|
||||||
local rule or type requirement truly forces `void`. Adding unnecessary
|
|
||||||
`void` is a medium-severity style violation.
|
|
||||||
- When fixing formatting, never change operator binding, evaluation order,
|
|
||||||
tuple/comma behaviour, or any other expression structure. A formatting pass
|
|
||||||
that changes how `!==`, `??`, `?:`, `&&`, `||`, or `,` binds is a capital
|
|
||||||
offence.
|
|
||||||
- In TypeScript and TSX, do not mechanically verticalise short call tails,
|
|
||||||
short object literals, or short callback bodies that already fit the local
|
|
||||||
line-length and delimiter rules. Expanding compact local code without a
|
|
||||||
readability need is a minor style violation.
|
|
||||||
- In TypeScript and TSX, treat short object literals, short returned objects,
|
|
||||||
short typed object shapes, and short function-call object arguments as
|
|
||||||
compact associative syntax by default. If they fit locally, keep the opening
|
|
||||||
`{` on the same line as the first property and keep the closing `}` on the
|
|
||||||
same line as the final property. Do not explode them into vertical
|
|
||||||
Prettier-style blocks without a concrete readability or line-length reason.
|
|
||||||
- In TypeScript and TSX, when a compact associative form is broken across two
|
|
||||||
lines, keep the opening `{` with the first property and the closing `}` with
|
|
||||||
the final property. A shape like `{\n key: value,\n}` is wrong even when
|
|
||||||
line length would permit it.
|
|
||||||
- In TypeScript and TSX, when a short call such as `apiGet<...> (...)`,
|
|
||||||
`apiPatch<...> (...)`, `setState (...)`, `updateClientSettings (...)`, or
|
|
||||||
`window.dispatchEvent (...)` already fits within the local style, do not
|
|
||||||
add extra vertical layers around the object argument or callback body.
|
|
||||||
- In TypeScript and TSX, after editing a file, inspect the file tail and
|
|
||||||
remove meaningless blank lines before `export default` or the end of file.
|
|
||||||
A stray empty line before `export default` is a minor style offence.
|
|
||||||
- Use correct British English spelling for new identifiers, filenames,
|
- Use correct British English spelling for new identifiers, filenames,
|
||||||
component names, helper names, comments, and developer-facing prose unless
|
component names, helper names, comments, and developer-facing prose unless
|
||||||
editing an already established American-English API that must keep its
|
editing an already established American-English API that must keep its
|
||||||
@@ -411,168 +373,6 @@ const value =
|
|||||||
- For this repository, prefer names such as `BehaviourSettingsSection.tsx`, not
|
- For this repository, prefer names such as `BehaviourSettingsSection.tsx`, not
|
||||||
`BehaviorSettingsSection.tsx`.
|
`BehaviorSettingsSection.tsx`.
|
||||||
|
|
||||||
### Additional style offences and penalties
|
|
||||||
|
|
||||||
Use this section for recurrent failure modes that are easy to miss when
|
|
||||||
applying the delimiter rules mechanically.
|
|
||||||
|
|
||||||
#### Unnecessary `void` before ordinary callbacks
|
|
||||||
|
|
||||||
Bad:
|
|
||||||
|
|
||||||
```ts
|
|
||||||
onClick={() => void requestActiveTab ('theme')}
|
|
||||||
```
|
|
||||||
|
|
||||||
Good:
|
|
||||||
|
|
||||||
```ts
|
|
||||||
onClick={() => requestActiveTab ('theme')}
|
|
||||||
```
|
|
||||||
|
|
||||||
Penalty: medium-severity offence. The code still works, but it pollutes the
|
|
||||||
local style and usually signals that the edit was made mechanically rather than
|
|
||||||
by reading the surrounding code.
|
|
||||||
|
|
||||||
#### Formatting that changes expression structure
|
|
||||||
|
|
||||||
Bad:
|
|
||||||
|
|
||||||
```ts
|
|
||||||
const hasUnsavedChanges =
|
|
||||||
serialiseThemeDraft (draftThemeSlots)
|
|
||||||
!== (serialiseThemeDraft (savedThemeSlots),
|
|
||||||
draftActiveThemeMode !== savedThemeMode)
|
|
||||||
```
|
|
||||||
|
|
||||||
Good:
|
|
||||||
|
|
||||||
```ts
|
|
||||||
const hasUnsavedChanges =
|
|
||||||
serialiseThemeDraft (draftThemeSlots)
|
|
||||||
!== serialiseThemeDraft (savedThemeSlots)
|
|
||||||
|| draftThemeMode !== savedThemeMode
|
|
||||||
```
|
|
||||||
|
|
||||||
Penalty: capital offence. Formatting must never corrupt the meaning of an
|
|
||||||
expression.
|
|
||||||
|
|
||||||
#### Mechanical vertical expansion of compact local code
|
|
||||||
|
|
||||||
Bad:
|
|
||||||
|
|
||||||
```ts
|
|
||||||
const nextState = {
|
|
||||||
open,
|
|
||||||
activeTab }
|
|
||||||
|
|
||||||
setDirtyStates (
|
|
||||||
current => ({
|
|
||||||
current,
|
|
||||||
key: value }),
|
|
||||||
)
|
|
||||||
```
|
|
||||||
|
|
||||||
Good:
|
|
||||||
|
|
||||||
```ts
|
|
||||||
const nextState = { open, activeTab }
|
|
||||||
|
|
||||||
setDirtyStates (
|
|
||||||
current => ({
|
|
||||||
current,
|
|
||||||
key: value }))
|
|
||||||
```
|
|
||||||
|
|
||||||
Penalty: minor offence when semantics stay intact. It is not necessarily
|
|
||||||
broken, but it ignores the repository's compact associative style.
|
|
||||||
|
|
||||||
#### Prettier-style exploded object literals that should stay compact
|
|
||||||
|
|
||||||
Bad:
|
|
||||||
|
|
||||||
```ts
|
|
||||||
const next = {
|
|
||||||
enabled: keyboard?.enabled !== false,
|
|
||||||
bindings: normaliseKeyboardBindings (keyboard?.bindings),
|
|
||||||
}
|
|
||||||
```
|
|
||||||
|
|
||||||
Good:
|
|
||||||
|
|
||||||
```ts
|
|
||||||
const next = {
|
|
||||||
enabled: keyboard?.enabled !== false,
|
|
||||||
bindings: normaliseKeyboardBindings (keyboard?.bindings) }
|
|
||||||
```
|
|
||||||
|
|
||||||
Also good when short enough:
|
|
||||||
|
|
||||||
```ts
|
|
||||||
const next = { enabled: keyboard?.enabled !== false,
|
|
||||||
bindings: normaliseKeyboardBindings (keyboard?.bindings) }
|
|
||||||
```
|
|
||||||
|
|
||||||
Rule: for compact associative syntax, keep `{` with the first property and `}`
|
|
||||||
with the final property unless line length truly forces a different shape.
|
|
||||||
Do not mechanically apply the common Prettier block form.
|
|
||||||
Penalty: medium-severity offence. The code still runs, but it violates a core
|
|
||||||
repository formatting habit that must be preserved consistently.
|
|
||||||
|
|
||||||
#### Exploded object arguments inside short calls
|
|
||||||
|
|
||||||
Bad:
|
|
||||||
|
|
||||||
```ts
|
|
||||||
updateClientSettings (settings => ({
|
|
||||||
...settings,
|
|
||||||
keyboard: next,
|
|
||||||
}))
|
|
||||||
```
|
|
||||||
|
|
||||||
Good:
|
|
||||||
|
|
||||||
```ts
|
|
||||||
updateClientSettings (settings => ({
|
|
||||||
...settings,
|
|
||||||
keyboard: next }))
|
|
||||||
```
|
|
||||||
|
|
||||||
Rule: a call-expression closing `)` must not drift onto its own line, and a
|
|
||||||
short object argument should not be exploded more than necessary. Keep the
|
|
||||||
callback's returned object compact when it fits.
|
|
||||||
Penalty: medium-severity offence. This usually means the edit was formatted
|
|
||||||
mechanically instead of by reading the local style.
|
|
||||||
|
|
||||||
#### Stray blank line before `export default`
|
|
||||||
|
|
||||||
Bad:
|
|
||||||
|
|
||||||
```ts
|
|
||||||
const Component: FC = () => {
|
|
||||||
return <div/>
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
export default Component
|
|
||||||
```
|
|
||||||
|
|
||||||
Good:
|
|
||||||
|
|
||||||
```ts
|
|
||||||
const Component: FC = () => {
|
|
||||||
return <div/>
|
|
||||||
}
|
|
||||||
|
|
||||||
export default Component
|
|
||||||
```
|
|
||||||
|
|
||||||
Rule: do not leave an extra empty line between the last top-level declaration
|
|
||||||
and `export default` unless some surrounding file structure genuinely requires
|
|
||||||
visual separation.
|
|
||||||
Penalty: minor offence. It is small, but it is easy to avoid and should not
|
|
||||||
recur.
|
|
||||||
|
|
||||||
### Frontend delimiter decision table
|
### Frontend delimiter decision table
|
||||||
|
|
||||||
Use this table before accepting any edited TypeScript or TSX hunk. The table is
|
Use this table before accepting any edited TypeScript or TSX hunk. The table is
|
||||||
@@ -605,7 +405,6 @@ import { Button, Card } from '@/components/ui'
|
|||||||
Rule: named-binding `}` is associative-array-style syntax. It must not be alone
|
Rule: named-binding `}` is associative-array-style syntax. It must not be alone
|
||||||
at the beginning of a line. Prefer keeping `{` with the first binding and `}`
|
at the beginning of a line. Prefer keeping `{` with the first binding and `}`
|
||||||
with the final binding when this fits the line limit.
|
with the final binding when this fits the line limit.
|
||||||
Penalty: capital offence. This is one of the core associative-brace rules.
|
|
||||||
|
|
||||||
#### Type literals
|
#### Type literals
|
||||||
|
|
||||||
@@ -628,8 +427,6 @@ type Props = {
|
|||||||
|
|
||||||
Rule: type-literal `}` is not a block close. It must stay on the same line as
|
Rule: type-literal `}` is not a block close. It must stay on the same line as
|
||||||
the final property unless that would break the hard line limit.
|
the final property unless that would break the hard line limit.
|
||||||
Penalty: capital offence. Mistaking a type-literal `}` for a block `}` is one
|
|
||||||
of the recurring death-class errors.
|
|
||||||
|
|
||||||
#### Object literals
|
#### Object literals
|
||||||
|
|
||||||
@@ -670,8 +467,6 @@ const value = useMemo (() => ({
|
|||||||
Rule: object-literal `}` is associative-array-style syntax. It must not be on a
|
Rule: object-literal `}` is associative-array-style syntax. It must not be on a
|
||||||
line by itself. Keep it with the final property, and keep call `)` off the
|
line by itself. Keep it with the final property, and keep call `)` off the
|
||||||
beginning of a line.
|
beginning of a line.
|
||||||
Penalty: capital offence. Wrong object-literal `}` placement and wrong call
|
|
||||||
`)` placement are both death-class violations here.
|
|
||||||
|
|
||||||
#### Destructuring parameters
|
#### Destructuring parameters
|
||||||
|
|
||||||
@@ -702,8 +497,6 @@ that spans multiple lines, do not use the Prettier-style `= ({ ... }) =>`
|
|||||||
shape. Put the function parameter list on its own lines. The destructuring `}`
|
shape. Put the function parameter list on its own lines. The destructuring `}`
|
||||||
stays with the final binding. The parameter-list `)` is then allowed and
|
stays with the final binding. The parameter-list `)` is then allowed and
|
||||||
required at the beginning of its own line.
|
required at the beginning of its own line.
|
||||||
Penalty: capital offence. This pattern is a primary source of repeated TSX
|
|
||||||
style regressions.
|
|
||||||
|
|
||||||
#### Inline typed destructuring parameter
|
#### Inline typed destructuring parameter
|
||||||
|
|
||||||
@@ -731,8 +524,6 @@ const RouteTransitionWrapper = ({ user, setUser }: {
|
|||||||
Rule: this is not a separately split parameter-list block. The line break is
|
Rule: this is not a separately split parameter-list block. The line break is
|
||||||
inside the inline type. Keep the type-literal `}` and parameter-list `)` on the
|
inside the inline type. Keep the type-literal `}` and parameter-list `)` on the
|
||||||
same line as the final type property.
|
same line as the final type property.
|
||||||
Penalty: capital offence. Misclassifying this case means the delimiter review
|
|
||||||
has failed at the syntax-role level.
|
|
||||||
|
|
||||||
#### Multi-line normal parameter list
|
#### Multi-line normal parameter list
|
||||||
|
|
||||||
@@ -760,8 +551,6 @@ const updateDraft = <Key extends keyof Settings,> (
|
|||||||
Rule: when the parameter list itself is split across multiple parameter lines,
|
Rule: when the parameter list itself is split across multiple parameter lines,
|
||||||
the closing parameter `)` goes at the beginning of its own line before `=>` or
|
the closing parameter `)` goes at the beginning of its own line before `=>` or
|
||||||
the return type.
|
the return type.
|
||||||
Penalty: capital offence. This is the main allowed exception for a leading `)`,
|
|
||||||
so getting it wrong destroys the whole rule set.
|
|
||||||
|
|
||||||
#### Function and callback blocks
|
#### Function and callback blocks
|
||||||
|
|
||||||
@@ -790,8 +579,6 @@ const handleSave = () => {
|
|||||||
Rule: block `}` closes executable code, not associative data. Multi-line
|
Rule: block `}` closes executable code, not associative data. Multi-line
|
||||||
function, lambda, callback, `if`, `for`, `switch`, and similar block braces
|
function, lambda, callback, `if`, `for`, `switch`, and similar block braces
|
||||||
belong on their own line.
|
belong on their own line.
|
||||||
Penalty: capital offence. Confusing block `}` with associative `}` is a
|
|
||||||
death-class delimiter error.
|
|
||||||
|
|
||||||
#### Function and method calls
|
#### Function and method calls
|
||||||
|
|
||||||
@@ -815,8 +602,6 @@ const value = compute (
|
|||||||
Rule: call-expression `)` must not be at the beginning of a line. The exception
|
Rule: call-expression `)` must not be at the beginning of a line. The exception
|
||||||
for leading `)` applies only to function declaration parameter lists, never to
|
for leading `)` applies only to function declaration parameter lists, never to
|
||||||
calls.
|
calls.
|
||||||
Penalty: capital offence. A leading call `)` is one of the clearest death-class
|
|
||||||
violations in this codebase.
|
|
||||||
|
|
||||||
#### JSX closing markers
|
#### JSX closing markers
|
||||||
|
|
||||||
@@ -861,8 +646,6 @@ Good:
|
|||||||
|
|
||||||
Rule: keep `>` or `/>` with the final prop, and keep JSX closing parentheses in
|
Rule: keep `>` or `/>` with the final prop, and keep JSX closing parentheses in
|
||||||
the local compact form such as `</div>)`.
|
the local compact form such as `</div>)`.
|
||||||
Penalty: medium-severity offence. It is usually not semantically broken, but it
|
|
||||||
is a conspicuous TSX-style failure.
|
|
||||||
|
|
||||||
#### Arrays and tuples
|
#### Arrays and tuples
|
||||||
|
|
||||||
@@ -891,8 +674,6 @@ const items = [first, second]
|
|||||||
|
|
||||||
Rule: array and tuple `]` must not be at the beginning of a line. Keep it with
|
Rule: array and tuple `]` must not be at the beginning of a line. Keep it with
|
||||||
the final element unless that would break the hard line limit.
|
the final element unless that would break the hard line limit.
|
||||||
Penalty: capital offence. A leading `]` is forbidden by the same class of hard
|
|
||||||
delimiter rule as leading associative `}` and leading call `)`.
|
|
||||||
|
|
||||||
#### Single-line braces
|
#### Single-line braces
|
||||||
|
|
||||||
@@ -917,14 +698,11 @@ Good:
|
|||||||
|
|
||||||
Rule: JavaScript object braces on one line get one inner space. JSX expression
|
Rule: JavaScript object braces on one line get one inner space. JSX expression
|
||||||
braces do not get inner spaces.
|
braces do not get inner spaces.
|
||||||
Penalty: minor offence. This is not normally semantic breakage, but it still
|
|
||||||
counts as a style miss.
|
|
||||||
|
|
||||||
#### Final TypeScript/TSX self-review checklist
|
#### Final TSX self-review checklist
|
||||||
|
|
||||||
Before reporting completion after a TypeScript or TSX edit, check the edited
|
Before reporting completion after a TypeScript or TSX edit, check the edited
|
||||||
hunks line by line. Unless a step explicitly mentions JSX, it applies equally
|
hunks line by line:
|
||||||
to `.ts` and `.tsx`:
|
|
||||||
|
|
||||||
1. No import/export/type/object/destructuring `}` appears alone at the beginning
|
1. No import/export/type/object/destructuring `}` appears alone at the beginning
|
||||||
of a line.
|
of a line.
|
||||||
|
|||||||
@@ -89,13 +89,15 @@ class MaterialsController < ApplicationController
|
|||||||
|
|
||||||
begin
|
begin
|
||||||
Material.transaction do
|
Material.transaction do
|
||||||
tag = resolve_material_tag!(tag_name_raw)
|
tag_name = TagName.find_undiscard_or_create_by!(name: tag_name_raw)
|
||||||
|
tag = tag_name.tag
|
||||||
|
tag = Tag.create!(tag_name:, category: :material) unless tag
|
||||||
|
|
||||||
material = Material.new(tag:, url:,
|
material = Material.new(tag:, url:,
|
||||||
created_by_user: current_user,
|
created_by_user: current_user,
|
||||||
updated_by_user: current_user)
|
updated_by_user: current_user)
|
||||||
material.file.attach(uploaded_blob) if uploaded_blob
|
material.file.attach(uploaded_blob) if uploaded_blob
|
||||||
material.save!
|
material.save!
|
||||||
TagVersioning.record_tag_snapshot!(tag, created_by_user: current_user)
|
|
||||||
upsert_export_paths!(material)
|
upsert_export_paths!(material)
|
||||||
MaterialVersionRecorder.record!(material:, event_type: :create,
|
MaterialVersionRecorder.record!(material:, event_type: :create,
|
||||||
created_by_user: current_user)
|
created_by_user: current_user)
|
||||||
@@ -137,7 +139,10 @@ class MaterialsController < ApplicationController
|
|||||||
begin
|
begin
|
||||||
Material.transaction do
|
Material.transaction do
|
||||||
MaterialVersionRecorder.ensure_snapshot!(material, created_by_user: current_user)
|
MaterialVersionRecorder.ensure_snapshot!(material, created_by_user: current_user)
|
||||||
tag = resolve_material_tag!(tag_name_raw)
|
tag_name = TagName.find_undiscard_or_create_by!(name: tag_name_raw)
|
||||||
|
tag = tag_name.tag
|
||||||
|
tag = Tag.create!(tag_name:, category: :material) unless tag
|
||||||
|
|
||||||
material.assign_attributes(tag:, url:, updated_by_user: current_user)
|
material.assign_attributes(tag:, url:, updated_by_user: current_user)
|
||||||
if uploaded_blob
|
if uploaded_blob
|
||||||
material.file.attach(uploaded_blob)
|
material.file.attach(uploaded_blob)
|
||||||
@@ -145,7 +150,6 @@ class MaterialsController < ApplicationController
|
|||||||
material.file.detach
|
material.file.detach
|
||||||
end
|
end
|
||||||
material.save!
|
material.save!
|
||||||
TagVersioning.record_tag_snapshot!(tag, created_by_user: current_user)
|
|
||||||
upsert_export_paths!(material)
|
upsert_export_paths!(material)
|
||||||
MaterialVersionRecorder.record!(material:, event_type: :update,
|
MaterialVersionRecorder.record!(material:, event_type: :update,
|
||||||
created_by_user: current_user)
|
created_by_user: current_user)
|
||||||
@@ -236,12 +240,6 @@ class MaterialsController < ApplicationController
|
|||||||
nil
|
nil
|
||||||
end
|
end
|
||||||
|
|
||||||
def resolve_material_tag! tag_name_raw
|
|
||||||
tag_name = TagName.find_undiscard_or_create_by!(name: tag_name_raw)
|
|
||||||
tag = tag_name.tag
|
|
||||||
tag || Tag.create!(tag_name:, category: :material)
|
|
||||||
end
|
|
||||||
|
|
||||||
def material_index_needs_tag_name? filters
|
def material_index_needs_tag_name? filters
|
||||||
filters[:q].present? || filters[:sort] == 'tag_name'
|
filters[:q].present? || filters[:sort] == 'tag_name'
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -1,57 +1,50 @@
|
|||||||
class PreviewController < ApplicationController
|
class PreviewController < ApplicationController
|
||||||
before_action :require_member!
|
|
||||||
|
|
||||||
def title
|
def title
|
||||||
return render_bad_request('URL は必須です.') if params[:url].blank?
|
# TODO: # 既知サイトなら決まったフォーマットで title 取得するやぅに.
|
||||||
|
return head :unauthorized unless current_user
|
||||||
|
|
||||||
render json: { title: Preview::ThumbnailFetcher.title(params[:url]) }
|
url = params[:url]
|
||||||
rescue Preview::UrlSafety::UnsafeUrl => e
|
return render_bad_request('URL は必須です.') unless url.present?
|
||||||
|
|
||||||
|
unless url.start_with?(/http(s)?:\/\//)
|
||||||
|
url = 'http://' + url
|
||||||
|
end
|
||||||
|
|
||||||
|
html = URI.open(url, open_timeout: 5, read_timeout: 5).read
|
||||||
|
doc = Nokogiri::HTML.parse(html)
|
||||||
|
title = doc.at('title')&.text&.strip
|
||||||
|
|
||||||
|
render json: { title: title }
|
||||||
|
rescue => e
|
||||||
render_bad_request(e.message)
|
render_bad_request(e.message)
|
||||||
rescue Preview::HttpFetcher::FetchTimeout => e
|
|
||||||
render_preview_error(e.message, :gateway_timeout)
|
|
||||||
rescue Preview::HttpFetcher::ResponseTooLarge => e
|
|
||||||
render_preview_error(e.message, :payload_too_large)
|
|
||||||
rescue Preview::HttpFetcher::FetchFailed => e
|
|
||||||
render_preview_error(e.message, :bad_gateway)
|
|
||||||
end
|
end
|
||||||
|
|
||||||
def thumbnail
|
def thumbnail
|
||||||
return render_bad_request('URL は必須です.') if params[:url].blank?
|
# TODO: 既知ドメインであれば指定のアドレスからサムネールを取得するやぅにする.
|
||||||
|
|
||||||
image = MiniMagick::Image.read(Preview::ThumbnailFetcher.fetch(params[:url]))
|
|
||||||
image.auto_orient
|
|
||||||
image.resize '180x180>'
|
|
||||||
image.format 'png'
|
|
||||||
width, height = image.dimensions
|
|
||||||
raise Preview::ThumbnailFetcher::GenerationFailed, 'サムネール画像の変換に失敗しました.' if width > 180 || height > 180
|
|
||||||
|
|
||||||
send_data image.to_blob, type: 'image/png', disposition: 'inline'
|
|
||||||
rescue Preview::UrlSafety::UnsafeUrl => e
|
|
||||||
render_bad_request(e.message)
|
|
||||||
rescue Preview::HttpFetcher::FetchTimeout => e
|
|
||||||
render_preview_error(e.message, :gateway_timeout)
|
|
||||||
rescue Preview::HttpFetcher::ResponseTooLarge => e
|
|
||||||
render_preview_error(e.message, :payload_too_large)
|
|
||||||
rescue Preview::HttpFetcher::FetchFailed => e
|
|
||||||
render_preview_error(e.message, :bad_gateway)
|
|
||||||
rescue Preview::ThumbnailFetcher::GenerationFailed, MiniMagick::Error => e
|
|
||||||
render_unprocessable_entity(e.message)
|
|
||||||
end
|
|
||||||
|
|
||||||
private
|
|
||||||
|
|
||||||
def require_member!
|
|
||||||
return head :unauthorized unless current_user
|
return head :unauthorized unless current_user
|
||||||
return if current_user.gte_member?
|
|
||||||
|
|
||||||
head :forbidden
|
url = params[:url]
|
||||||
end
|
return render_bad_request('URL は必須です.') if url.blank?
|
||||||
|
|
||||||
def render_preview_error(message, status)
|
unless url.start_with?(/http(s)?:\/\//)
|
||||||
render json: { type: status.to_s,
|
url = 'http://' + url
|
||||||
message:,
|
end
|
||||||
errors: { },
|
|
||||||
base_errors: [message] },
|
path = Rails.root.join('tmp', "thumb_#{ SecureRandom.hex }.png")
|
||||||
status:
|
system("node #{ Rails.root }/lib/screenshot.js #{ Shellwords.escape(url) } #{ path }")
|
||||||
|
|
||||||
|
if File.exist?(path)
|
||||||
|
image = MiniMagick::Image.open(path)
|
||||||
|
image.resize '180x180'
|
||||||
|
File.delete(path) rescue nil
|
||||||
|
send_file image.path, type: 'image/png', disposition: 'inline'
|
||||||
|
else
|
||||||
|
render json: { type: 'internal_server_error',
|
||||||
|
message: 'サムネールを生成できませんでした.',
|
||||||
|
errors: { },
|
||||||
|
base_errors: ['サムネールを生成できませんでした.'] },
|
||||||
|
status: :internal_server_error
|
||||||
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -1,38 +0,0 @@
|
|||||||
class UserThemeSlotsController < ApplicationController
|
|
||||||
wrap_parameters false
|
|
||||||
|
|
||||||
def index
|
|
||||||
return head :unauthorized unless current_user
|
|
||||||
|
|
||||||
render json: current_user
|
|
||||||
.theme_slots
|
|
||||||
.order(:base_theme, :slot_no)
|
|
||||||
.map { |slot| slot.serializable_hash }
|
|
||||||
end
|
|
||||||
|
|
||||||
def update
|
|
||||||
return head :unauthorized unless current_user
|
|
||||||
|
|
||||||
base_theme = params[:base_theme].to_s
|
|
||||||
slot_no = params[:slot_no].to_i
|
|
||||||
tokens = params[:tokens]
|
|
||||||
|
|
||||||
unless UserThemeSlot::BASE_THEMES.include?(base_theme)
|
|
||||||
return render_validation_error fields: { base_theme: ['値が不正です.'] }
|
|
||||||
end
|
|
||||||
unless UserThemeSlot::SLOT_NOS.include?(slot_no)
|
|
||||||
return render_validation_error fields: { slot_no: ['値が不正です.'] }
|
|
||||||
end
|
|
||||||
unless tokens.is_a?(ActionController::Parameters) || tokens.is_a?(Hash)
|
|
||||||
return render_validation_error fields: { tokens: ['JSON object で指定してください.'] }
|
|
||||||
end
|
|
||||||
|
|
||||||
slot = UserThemeSlot.find_or_initialize_by(user: current_user,
|
|
||||||
base_theme:,
|
|
||||||
slot_no:)
|
|
||||||
slot.tokens = tokens.is_a?(ActionController::Parameters) ? tokens.to_unsafe_h : tokens
|
|
||||||
slot.save!
|
|
||||||
|
|
||||||
render json: slot.serializable_hash, status: :ok
|
|
||||||
end
|
|
||||||
end
|
|
||||||
@@ -57,9 +57,9 @@ class Post < ApplicationRecord
|
|||||||
|
|
||||||
attribute :version_no, :integer, default: 1
|
attribute :version_no, :integer, default: 1
|
||||||
|
|
||||||
before_validation :normalise_url, if: :will_save_change_to_url?
|
before_validation :normalise_url
|
||||||
|
|
||||||
validates :url, presence: true, uniqueness: true, length: { maximum: 768 }
|
validates :url, presence: true, uniqueness: true
|
||||||
validates :video_ms, numericality: { only_integer: true, greater_than: 0 }, allow_nil: true
|
validates :video_ms, numericality: { only_integer: true, greater_than: 0 }, allow_nil: true
|
||||||
|
|
||||||
validate :validate_original_created_range
|
validate :validate_original_created_range
|
||||||
@@ -180,7 +180,7 @@ class Post < ApplicationRecord
|
|||||||
|
|
||||||
u.host = u.host.downcase if u.host
|
u.host = u.host.downcase if u.host
|
||||||
u.path = u.path.sub(/\/\Z/, '') if u.path.present?
|
u.path = u.path.sub(/\/\Z/, '') if u.path.present?
|
||||||
self.url = PostUrlSanitisationRule.sanitise(u.to_s)
|
self.url = u.to_s
|
||||||
rescue URI::InvalidURIError
|
rescue URI::InvalidURIError
|
||||||
;
|
;
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -1,163 +0,0 @@
|
|||||||
class PostUrlSanitisationRule < ApplicationRecord
|
|
||||||
include Discard::Model
|
|
||||||
|
|
||||||
class InvalidUrlError < StandardError
|
|
||||||
attr_reader :invalid_rows
|
|
||||||
|
|
||||||
def initialize(invalid_rows)
|
|
||||||
@invalid_rows = invalid_rows
|
|
||||||
ids = invalid_rows.map { _1.fetch(:post_id) }.join(', ')
|
|
||||||
super("post URL sanitisation produced invalid URLs for posts #{ ids }")
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
class UrlConflictError < StandardError
|
|
||||||
attr_reader :conflicts
|
|
||||||
|
|
||||||
def initialize(conflicts)
|
|
||||||
@conflicts = conflicts
|
|
||||||
urls = conflicts.map { _1.fetch(:url) }.uniq.join(', ')
|
|
||||||
super("post URL sanitisation conflicts detected for #{ urls }")
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
self.primary_key = :priority
|
|
||||||
|
|
||||||
default_scope -> { kept }
|
|
||||||
|
|
||||||
validates :source_pattern, presence: true, uniqueness: true
|
|
||||||
|
|
||||||
validate :source_pattern_must_be_regexp
|
|
||||||
|
|
||||||
class << self
|
|
||||||
def sanitise(url) = sanitise_with_rules(url, rules)
|
|
||||||
|
|
||||||
def apply!
|
|
||||||
rewrites = nil
|
|
||||||
|
|
||||||
Post.transaction do
|
|
||||||
compiled_rules = rules
|
|
||||||
|
|
||||||
rewrites = Post.order(:id)
|
|
||||||
.lock('FOR UPDATE')
|
|
||||||
.pluck(:id, :url)
|
|
||||||
.map do |post_id, original_url|
|
|
||||||
{ post_id:,
|
|
||||||
original_url:,
|
|
||||||
sanitised_url: sanitise_with_rules(original_url, compiled_rules) }
|
|
||||||
end
|
|
||||||
|
|
||||||
invalid_rows = rewrites.filter { invalid_sanitised_url?(_1.fetch(:sanitised_url)) }
|
|
||||||
.map { { post_id: _1.fetch(:post_id),
|
|
||||||
original_url: _1.fetch(:original_url),
|
|
||||||
sanitised_url: _1.fetch(:sanitised_url) } }
|
|
||||||
raise InvalidUrlError.new(invalid_rows) if invalid_rows.present?
|
|
||||||
|
|
||||||
conflicts = build_conflicts(rewrites)
|
|
||||||
raise UrlConflictError.new(conflicts) if conflicts.present?
|
|
||||||
|
|
||||||
changed = rewrites.filter { _1.fetch(:original_url) != _1.fetch(:sanitised_url) }
|
|
||||||
return if changed.empty?
|
|
||||||
|
|
||||||
token = SecureRandom.hex(6)
|
|
||||||
|
|
||||||
changed.each do |row|
|
|
||||||
Post.where(id: row.fetch(:post_id))
|
|
||||||
.update_all(url: temporary_url_for(row.fetch(:post_id), token))
|
|
||||||
end
|
|
||||||
|
|
||||||
changed.each do |row|
|
|
||||||
Post.where(id: row.fetch(:post_id))
|
|
||||||
.update_all(url: row.fetch(:sanitised_url))
|
|
||||||
end
|
|
||||||
end
|
|
||||||
rescue ActiveRecord::RecordNotUnique => error
|
|
||||||
conflicts = build_persisted_conflicts(rewrites)
|
|
||||||
raise error if conflicts.empty?
|
|
||||||
|
|
||||||
raise UrlConflictError.new(conflicts), cause: error
|
|
||||||
end
|
|
||||||
|
|
||||||
private
|
|
||||||
|
|
||||||
def rules = kept.order(:priority).map { |r| [Regexp.new(r.source_pattern), r.replacement] }
|
|
||||||
|
|
||||||
def sanitise_with_rules(url, compiled_rules)
|
|
||||||
compiled_rules.reduce(url.dup) do |value, (pattern, replacement)|
|
|
||||||
value.sub(pattern, replacement)
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
def temporary_url_for(post_id, token) =
|
|
||||||
"https://post-url-sanitising.invalid/#{ token }/#{ post_id }"
|
|
||||||
|
|
||||||
def invalid_sanitised_url?(url)
|
|
||||||
return true if url.blank?
|
|
||||||
return true if url.length > 768
|
|
||||||
|
|
||||||
parsed = URI.parse(url)
|
|
||||||
return true if !(parsed in URI::HTTP)
|
|
||||||
return true if parsed.host.blank?
|
|
||||||
|
|
||||||
false
|
|
||||||
rescue URI::InvalidURIError
|
|
||||||
true
|
|
||||||
end
|
|
||||||
|
|
||||||
def build_conflicts(rewrites)
|
|
||||||
rewrites
|
|
||||||
.group_by { _1.fetch(:sanitised_url).downcase }
|
|
||||||
.values
|
|
||||||
.filter { _1.size > 1 }
|
|
||||||
.flatten
|
|
||||||
.map { { url: _1.fetch(:sanitised_url),
|
|
||||||
post_id: _1.fetch(:post_id),
|
|
||||||
original_url: _1.fetch(:original_url) } }
|
|
||||||
end
|
|
||||||
|
|
||||||
def build_persisted_conflicts(rewrites)
|
|
||||||
return [] if rewrites.blank?
|
|
||||||
|
|
||||||
target_rows = rewrites.filter { _1.fetch(:original_url) != _1.fetch(:sanitised_url) }
|
|
||||||
target_keys = target_rows.map { _1.fetch(:sanitised_url).downcase }.uniq
|
|
||||||
return [] if target_keys.empty?
|
|
||||||
|
|
||||||
target_pairs = target_rows.to_h do |row|
|
|
||||||
[row.fetch(:post_id), row.fetch(:sanitised_url).downcase]
|
|
||||||
end
|
|
||||||
|
|
||||||
persisted_rows = Post.order(:id)
|
|
||||||
.where('LOWER(url) IN (?)', target_keys)
|
|
||||||
.pluck(:id, :url)
|
|
||||||
.reject { |post_id, original_url| target_pairs[post_id] == original_url.downcase }
|
|
||||||
.map { |post_id, original_url|
|
|
||||||
{ url: original_url,
|
|
||||||
post_id:,
|
|
||||||
original_url:,
|
|
||||||
conflict_key: original_url.downcase }
|
|
||||||
}
|
|
||||||
|
|
||||||
target_conflicts = target_rows.map { { url: _1.fetch(:sanitised_url),
|
|
||||||
post_id: _1.fetch(:post_id),
|
|
||||||
original_url: _1.fetch(:original_url),
|
|
||||||
conflict_key: _1.fetch(:sanitised_url).downcase } }
|
|
||||||
|
|
||||||
(persisted_rows + target_conflicts)
|
|
||||||
.group_by { _1.fetch(:conflict_key) }
|
|
||||||
.values
|
|
||||||
.filter { _1.size > 1 }
|
|
||||||
.flatten
|
|
||||||
.map { _1.except(:conflict_key) }
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
private
|
|
||||||
|
|
||||||
def source_pattern_must_be_regexp
|
|
||||||
return if source_pattern.blank?
|
|
||||||
|
|
||||||
Regexp.new(source_pattern)
|
|
||||||
rescue RegexpError
|
|
||||||
errors.add :source_pattern, '変な正規表現だね〜(笑)'
|
|
||||||
end
|
|
||||||
end
|
|
||||||
@@ -8,7 +8,6 @@ class User < ApplicationRecord
|
|||||||
has_many :created_posts,
|
has_many :created_posts,
|
||||||
class_name: 'Post', foreign_key: :uploaded_user_id, dependent: :nullify
|
class_name: 'Post', foreign_key: :uploaded_user_id, dependent: :nullify
|
||||||
has_one :setting, dependent: :destroy
|
has_one :setting, dependent: :destroy
|
||||||
has_many :theme_slots, class_name: 'UserThemeSlot', dependent: :destroy
|
|
||||||
has_many :user_ips, dependent: :destroy
|
has_many :user_ips, dependent: :destroy
|
||||||
has_many :ip_addresses, through: :user_ips
|
has_many :ip_addresses, through: :user_ips
|
||||||
has_many :user_post_views, dependent: :destroy
|
has_many :user_post_views, dependent: :destroy
|
||||||
|
|||||||
@@ -1,27 +0,0 @@
|
|||||||
class UserThemeSlot < ApplicationRecord
|
|
||||||
BASE_THEMES = ['light', 'dark'].freeze
|
|
||||||
SLOT_NOS = [1, 2, 3].freeze
|
|
||||||
|
|
||||||
belongs_to :user
|
|
||||||
|
|
||||||
validates :user_id, presence: true
|
|
||||||
validates :base_theme, presence: true, inclusion: { in: BASE_THEMES }
|
|
||||||
validates :slot_no, presence: true, inclusion: { in: SLOT_NOS }
|
|
||||||
validates :tokens, presence: true
|
|
||||||
validates :user_id, uniqueness: { scope: [:base_theme, :slot_no] }
|
|
||||||
|
|
||||||
validate :tokens_must_be_object
|
|
||||||
|
|
||||||
def serializable_hash(options = nil)
|
|
||||||
hash = { only: [:base_theme, :slot_no, :tokens, :created_at, :updated_at] }
|
|
||||||
super(hash.merge(options || {}))
|
|
||||||
end
|
|
||||||
|
|
||||||
private
|
|
||||||
|
|
||||||
def tokens_must_be_object
|
|
||||||
return if tokens.is_a?(Hash)
|
|
||||||
|
|
||||||
errors.add(:tokens, 'は JSON object で指定してください.')
|
|
||||||
end
|
|
||||||
end
|
|
||||||
@@ -1,21 +0,0 @@
|
|||||||
module Preview
|
|
||||||
class HtmlMetadataExtractor
|
|
||||||
IMAGE_SELECTORS = [
|
|
||||||
'meta[property="og:image"]',
|
|
||||||
'meta[name="twitter:image"]',
|
|
||||||
'meta[name="thumbnail"]'
|
|
||||||
].freeze
|
|
||||||
|
|
||||||
def self.extract(response)
|
|
||||||
document = Nokogiri::HTML.parse(response.body)
|
|
||||||
image_url = IMAGE_SELECTORS.filter_map {
|
|
||||||
document.at_css(_1)&.[]('content')&.strip.presence
|
|
||||||
}.first
|
|
||||||
|
|
||||||
{ title: document.at_css('title')&.text&.strip,
|
|
||||||
image_url: image_url ? URI.join(response.url, image_url).to_s : nil }
|
|
||||||
rescue URI::InvalidURIError
|
|
||||||
{ title: document.at_css('title')&.text&.strip, image_url: nil }
|
|
||||||
end
|
|
||||||
end
|
|
||||||
end
|
|
||||||
@@ -1,122 +0,0 @@
|
|||||||
require 'net/http'
|
|
||||||
require 'json'
|
|
||||||
|
|
||||||
module Preview
|
|
||||||
class HttpFetcher
|
|
||||||
class FetchFailed < StandardError; end
|
|
||||||
class FetchTimeout < FetchFailed; end
|
|
||||||
class ResponseTooLarge < FetchFailed; end
|
|
||||||
|
|
||||||
MAX_REDIRECTS = 5
|
|
||||||
DEFAULT_MAX_BYTES = 5.megabytes
|
|
||||||
|
|
||||||
Response = Data.define(:body, :content_type, :url)
|
|
||||||
|
|
||||||
def self.fetch(raw_url, max_bytes: DEFAULT_MAX_BYTES, redirects: MAX_REDIRECTS)
|
|
||||||
uri, addresses = UrlSafety.validate(raw_url)
|
|
||||||
response = request(uri, addresses.first, max_bytes)
|
|
||||||
|
|
||||||
if response.is_a?(Net::HTTPRedirection)
|
|
||||||
location = response['location']
|
|
||||||
if redirects.zero?
|
|
||||||
log_failure(:redirect_limit,
|
|
||||||
url: uri.to_s,
|
|
||||||
redirects:,
|
|
||||||
location:,
|
|
||||||
content_type: response['content-type'],
|
|
||||||
content_length: response['content-length'])
|
|
||||||
raise FetchFailed, 'redirect が多すぎます.'
|
|
||||||
end
|
|
||||||
|
|
||||||
if location.blank?
|
|
||||||
log_failure(:blank_redirect_location,
|
|
||||||
url: uri.to_s,
|
|
||||||
redirects:,
|
|
||||||
content_type: response['content-type'],
|
|
||||||
content_length: response['content-length'])
|
|
||||||
raise FetchFailed, 'redirect 先が不正です.'
|
|
||||||
end
|
|
||||||
|
|
||||||
redirect_url =
|
|
||||||
begin
|
|
||||||
URI.join(uri, location).to_s
|
|
||||||
rescue URI::InvalidURIError => e
|
|
||||||
log_failure(:invalid_redirect_location,
|
|
||||||
url: uri.to_s,
|
|
||||||
redirects:,
|
|
||||||
location:,
|
|
||||||
error: e.class.name,
|
|
||||||
message: e.message)
|
|
||||||
raise FetchFailed, 'redirect 先が不正です.'
|
|
||||||
end
|
|
||||||
|
|
||||||
return fetch(redirect_url, max_bytes:, redirects: redirects - 1)
|
|
||||||
end
|
|
||||||
|
|
||||||
unless response.is_a?(Net::HTTPSuccess)
|
|
||||||
log_failure(:http_status,
|
|
||||||
url: uri.to_s,
|
|
||||||
code: response.code,
|
|
||||||
content_type: response['content-type'],
|
|
||||||
content_length: response['content-length'])
|
|
||||||
raise FetchFailed, "外部サーバーが HTTP #{ response.code } を返しました."
|
|
||||||
end
|
|
||||||
|
|
||||||
Response.new(response.body, response['content-type'].to_s, uri.to_s)
|
|
||||||
rescue Net::OpenTimeout, Net::ReadTimeout, Timeout::Error => e
|
|
||||||
log_failure(:timeout, url: uri&.to_s || raw_url, error: e.class.name, message: e.message)
|
|
||||||
raise FetchTimeout, e.message
|
|
||||||
rescue SocketError, SystemCallError, OpenSSL::SSL::SSLError, EOFError => e
|
|
||||||
log_failure(:network_error, url: uri&.to_s || raw_url, error: e.class.name, message: e.message)
|
|
||||||
raise FetchFailed, e.message
|
|
||||||
end
|
|
||||||
|
|
||||||
def self.request(uri, ip_address, max_bytes)
|
|
||||||
http = Net::HTTP.new(uri.host, uri.port)
|
|
||||||
http.ipaddr = ip_address
|
|
||||||
http.use_ssl = uri.scheme == 'https'
|
|
||||||
http.open_timeout = 5
|
|
||||||
http.read_timeout = 8
|
|
||||||
http.write_timeout = 5
|
|
||||||
|
|
||||||
request = Net::HTTP::Get.new(uri)
|
|
||||||
request['User-Agent'] = 'BTRC-Hub thumbnail preview'
|
|
||||||
request['Accept'] = 'text/html,image/*;q=0.9,*/*;q=0.1'
|
|
||||||
|
|
||||||
http.request(request) do |response|
|
|
||||||
length = response['content-length'].to_i
|
|
||||||
if length > max_bytes
|
|
||||||
log_failure(:response_too_large,
|
|
||||||
url: uri.to_s,
|
|
||||||
content_type: response['content-type'],
|
|
||||||
content_length: response['content-length'],
|
|
||||||
max_bytes:)
|
|
||||||
raise ResponseTooLarge, '外部データが大きすぎます.'
|
|
||||||
end
|
|
||||||
|
|
||||||
body = +''
|
|
||||||
response.read_body do |chunk|
|
|
||||||
body << chunk
|
|
||||||
next unless body.bytesize > max_bytes
|
|
||||||
|
|
||||||
log_failure(:response_too_large,
|
|
||||||
url: uri.to_s,
|
|
||||||
content_type: response['content-type'],
|
|
||||||
content_length: response['content-length'],
|
|
||||||
bytes_read: body.bytesize,
|
|
||||||
max_bytes:)
|
|
||||||
raise ResponseTooLarge, '外部データが大きすぎます.'
|
|
||||||
end
|
|
||||||
response.instance_variable_set(:@body, body)
|
|
||||||
response.instance_variable_set(:@read, true)
|
|
||||||
return response
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
def self.log_failure(reason, **payload)
|
|
||||||
Rails.logger.warn("preview_http_fetcher_failure #{ { reason:, **payload }.to_json }")
|
|
||||||
end
|
|
||||||
|
|
||||||
private_class_method :request, :log_failure
|
|
||||||
end
|
|
||||||
end
|
|
||||||
@@ -1,31 +0,0 @@
|
|||||||
module Preview
|
|
||||||
class KnownSiteExtractor
|
|
||||||
def self.thumbnail_url(uri)
|
|
||||||
youtube_thumbnail(uri)
|
|
||||||
end
|
|
||||||
|
|
||||||
def self.niconico_video_id(uri)
|
|
||||||
case uri.host&.downcase
|
|
||||||
when 'www.nicovideo.jp', 'nicovideo.jp'
|
|
||||||
uri.path[%r{\A/watch/(sm\d+)\z}, 1]
|
|
||||||
when 'nico.ms'
|
|
||||||
uri.path[%r{\A/(sm\d+)\z}, 1]
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
def self.youtube_thumbnail(uri)
|
|
||||||
id =
|
|
||||||
case uri.host&.downcase
|
|
||||||
when 'youtu.be'
|
|
||||||
uri.path.split('/').reject(&:blank?).first
|
|
||||||
when 'www.youtube.com', 'youtube.com', 'm.youtube.com'
|
|
||||||
uri.path == '/watch' ? URI.decode_www_form(uri.query.to_s).to_h['v'] : nil
|
|
||||||
end
|
|
||||||
return unless id&.match?(/\A[A-Za-z0-9_-]{6,20}\z/)
|
|
||||||
|
|
||||||
"https://i.ytimg.com/vi/#{ id }/hqdefault.jpg"
|
|
||||||
end
|
|
||||||
|
|
||||||
private_class_method :youtube_thumbnail
|
|
||||||
end
|
|
||||||
end
|
|
||||||
@@ -1,95 +0,0 @@
|
|||||||
module Preview
|
|
||||||
class ThumbnailFetcher
|
|
||||||
class GenerationFailed < StandardError; end
|
|
||||||
ALLOWED_IMAGE_CONTENT_TYPES = [
|
|
||||||
'image/jpeg', 'image/png', 'image/gif', 'image/webp'
|
|
||||||
].freeze
|
|
||||||
HTML_MAX_BYTES = 1.megabyte
|
|
||||||
NICONICO_XML_MAX_BYTES = 256.kilobytes
|
|
||||||
|
|
||||||
def self.fetch(raw_url)
|
|
||||||
uri, = UrlSafety.validate(raw_url)
|
|
||||||
|
|
||||||
known_url = KnownSiteExtractor.thumbnail_url(uri)
|
|
||||||
image = fetch_image_or_nil(known_url) if known_url
|
|
||||||
return image if image
|
|
||||||
|
|
||||||
niconico_url = niconico_thumbnail_url(uri)
|
|
||||||
image = fetch_image_or_nil(niconico_url) if niconico_url
|
|
||||||
return image if image
|
|
||||||
|
|
||||||
page = HttpFetcher.fetch(uri.to_s, max_bytes: HTML_MAX_BYTES)
|
|
||||||
metadata = HtmlMetadataExtractor.extract(page)
|
|
||||||
raise GenerationFailed, 'サムネール画像が見つかりませんでした.' if metadata[:image_url].blank?
|
|
||||||
|
|
||||||
fetch_image!(metadata[:image_url])
|
|
||||||
end
|
|
||||||
|
|
||||||
def self.title(raw_url)
|
|
||||||
uri, = UrlSafety.validate(raw_url)
|
|
||||||
HtmlMetadataExtractor.extract(
|
|
||||||
HttpFetcher.fetch(uri.to_s, max_bytes: HTML_MAX_BYTES))[:title]
|
|
||||||
end
|
|
||||||
|
|
||||||
def self.fetch_image_or_nil(url)
|
|
||||||
return nil if url.blank?
|
|
||||||
|
|
||||||
response = HttpFetcher.fetch(url)
|
|
||||||
return nil unless allowed_image_content_type?(response.content_type)
|
|
||||||
|
|
||||||
response.body
|
|
||||||
rescue HttpFetcher::FetchTimeout
|
|
||||||
raise
|
|
||||||
rescue HttpFetcher::FetchFailed
|
|
||||||
nil
|
|
||||||
end
|
|
||||||
|
|
||||||
def self.fetch_image!(url)
|
|
||||||
response = HttpFetcher.fetch(url)
|
|
||||||
unless allowed_image_content_type?(response.content_type)
|
|
||||||
raise GenerationFailed, 'サムネール画像が見つかりませんでした.'
|
|
||||||
end
|
|
||||||
|
|
||||||
response.body
|
|
||||||
rescue HttpFetcher::FetchTimeout
|
|
||||||
raise
|
|
||||||
rescue HttpFetcher::ResponseTooLarge
|
|
||||||
raise
|
|
||||||
rescue HttpFetcher::FetchFailed
|
|
||||||
raise GenerationFailed, 'サムネール画像を取得できませんでした.'
|
|
||||||
end
|
|
||||||
|
|
||||||
def self.niconico_thumbnail_url(uri)
|
|
||||||
video_id = KnownSiteExtractor.niconico_video_id(uri)
|
|
||||||
return nil if video_id.blank?
|
|
||||||
|
|
||||||
response = HttpFetcher.fetch("https://ext.nicovideo.jp/api/getthumbinfo/#{ video_id }",
|
|
||||||
max_bytes: NICONICO_XML_MAX_BYTES)
|
|
||||||
xml = Nokogiri::XML(response.body)
|
|
||||||
return nil unless xml.at_xpath('/nicovideo_thumb_response/@status')&.value == 'ok'
|
|
||||||
|
|
||||||
xml.at_xpath('//thumbnail_url')&.text&.strip.presence
|
|
||||||
rescue HttpFetcher::FetchFailed, HttpFetcher::FetchTimeout => e
|
|
||||||
Rails.logger.info("preview_niconico_getthumbinfo_fallback #{ { url: uri.to_s,
|
|
||||||
video_id:,
|
|
||||||
error: e.class.name,
|
|
||||||
message: e.message }.to_json }")
|
|
||||||
nil
|
|
||||||
rescue Nokogiri::XML::SyntaxError => e
|
|
||||||
Rails.logger.info("preview_niconico_getthumbinfo_fallback #{ { url: uri.to_s,
|
|
||||||
video_id:,
|
|
||||||
error: e.class.name,
|
|
||||||
message: e.message }.to_json }")
|
|
||||||
nil
|
|
||||||
end
|
|
||||||
|
|
||||||
def self.allowed_image_content_type?(content_type)
|
|
||||||
mime_type = content_type.to_s.split(';', 2).first.downcase.strip
|
|
||||||
ALLOWED_IMAGE_CONTENT_TYPES.include?(mime_type)
|
|
||||||
end
|
|
||||||
|
|
||||||
private_class_method :fetch_image_or_nil, :fetch_image!,
|
|
||||||
:niconico_thumbnail_url,
|
|
||||||
:allowed_image_content_type?
|
|
||||||
end
|
|
||||||
end
|
|
||||||
@@ -1,55 +0,0 @@
|
|||||||
require 'resolv'
|
|
||||||
require 'ipaddr'
|
|
||||||
require 'uri'
|
|
||||||
|
|
||||||
module Preview
|
|
||||||
class UrlSafety
|
|
||||||
class UnsafeUrl < StandardError; end
|
|
||||||
|
|
||||||
FORBIDDEN_NETWORKS = [
|
|
||||||
'0.0.0.0/8', '10.0.0.0/8', '100.64.0.0/10', '127.0.0.0/8',
|
|
||||||
'169.254.0.0/16', '172.16.0.0/12', '192.0.0.0/24',
|
|
||||||
'192.0.2.0/24', '192.168.0.0/16', '198.18.0.0/15',
|
|
||||||
'198.51.100.0/24', '203.0.113.0/24', '224.0.0.0/4',
|
|
||||||
'240.0.0.0/4', '::/128', '::1/128', 'fc00::/7', 'fe80::/10',
|
|
||||||
'ff00::/8', '2001:db8::/32', '::ffff:0:0/96'
|
|
||||||
].map { IPAddr.new(_1) }.freeze
|
|
||||||
|
|
||||||
def self.validate(raw_url)
|
|
||||||
value = raw_url.to_s.strip
|
|
||||||
if value.match?(/\A[a-z][a-z0-9+\-.]*:/i)
|
|
||||||
unless value.match?(/\Ahttps?:\/\//i)
|
|
||||||
raise UnsafeUrl, 'http または https の URL を指定してください.'
|
|
||||||
end
|
|
||||||
else
|
|
||||||
value = "http://#{ value }"
|
|
||||||
end
|
|
||||||
uri = URI.parse(value)
|
|
||||||
|
|
||||||
unless ['http', 'https'].include?(uri.scheme&.downcase) && uri.host.present?
|
|
||||||
raise UnsafeUrl, 'http または https の URL を指定してください.'
|
|
||||||
end
|
|
||||||
raise UnsafeUrl, 'userinfo つき URL は使用できません.' if uri.userinfo.present?
|
|
||||||
|
|
||||||
addresses = Resolv.getaddresses(uri.host)
|
|
||||||
raise UnsafeUrl, 'URL のホストを解決できません.' if addresses.empty?
|
|
||||||
|
|
||||||
parsed_addresses = addresses.map { IPAddr.new(_1) }
|
|
||||||
if parsed_addresses.any? { |address| forbidden?(address) }
|
|
||||||
raise UnsafeUrl, '安全でない接続先は使用できません.'
|
|
||||||
end
|
|
||||||
|
|
||||||
[uri, parsed_addresses.map(&:to_s)]
|
|
||||||
rescue Resolv::ResolvError
|
|
||||||
raise UnsafeUrl, 'URL のホストを解決できません.'
|
|
||||||
rescue URI::InvalidURIError, IPAddr::InvalidAddressError
|
|
||||||
raise UnsafeUrl, 'URL が不正です.'
|
|
||||||
end
|
|
||||||
|
|
||||||
def self.forbidden?(address)
|
|
||||||
FORBIDDEN_NETWORKS.any? { _1.include?(address) }
|
|
||||||
end
|
|
||||||
|
|
||||||
private_class_method :forbidden?
|
|
||||||
end
|
|
||||||
end
|
|
||||||
@@ -83,8 +83,6 @@ Rails.application.routes.draw do
|
|||||||
|
|
||||||
get 'users/settings', to: 'user_settings#show'
|
get 'users/settings', to: 'user_settings#show'
|
||||||
patch 'users/settings', to: 'user_settings#update'
|
patch 'users/settings', to: 'user_settings#update'
|
||||||
get 'users/theme_slots', to: 'user_theme_slots#index'
|
|
||||||
put 'users/theme_slots/:base_theme/:slot_no', to: 'user_theme_slots#update'
|
|
||||||
|
|
||||||
resources :users, only: [:create, :update] do
|
resources :users, only: [:create, :update] do
|
||||||
collection do
|
collection do
|
||||||
|
|||||||
@@ -1,22 +0,0 @@
|
|||||||
class CreateUserThemeSlots < ActiveRecord::Migration[8.0]
|
|
||||||
def change
|
|
||||||
create_table :user_theme_slots do |t|
|
|
||||||
t.references :user, null: false, foreign_key: true
|
|
||||||
t.string :base_theme, null: false
|
|
||||||
t.integer :slot_no, null: false
|
|
||||||
t.json :tokens, null: false
|
|
||||||
t.timestamps
|
|
||||||
end
|
|
||||||
|
|
||||||
add_index :user_theme_slots,
|
|
||||||
[:user_id, :base_theme, :slot_no],
|
|
||||||
unique: true,
|
|
||||||
name: 'index_user_theme_slots_on_user_theme_and_slot'
|
|
||||||
add_check_constraint :user_theme_slots,
|
|
||||||
"base_theme IN ('light', 'dark')",
|
|
||||||
name: 'user_theme_slots_base_theme_valid'
|
|
||||||
add_check_constraint :user_theme_slots,
|
|
||||||
'slot_no BETWEEN 1 AND 3',
|
|
||||||
name: 'user_theme_slots_slot_no_valid'
|
|
||||||
end
|
|
||||||
end
|
|
||||||
@@ -1,61 +0,0 @@
|
|||||||
class CreatePostUrlSanitisationRules < ActiveRecord::Migration[8.0]
|
|
||||||
class PostUrlSanitisationRule < ActiveRecord::Base
|
|
||||||
self.table_name = 'post_url_sanitisation_rules'
|
|
||||||
end
|
|
||||||
|
|
||||||
def up
|
|
||||||
create_table :post_url_sanitisation_rules, id: :integer, primary_key: :priority do |t|
|
|
||||||
t.string :source_pattern, null: false
|
|
||||||
t.string :replacement, null: false
|
|
||||||
t.timestamps
|
|
||||||
t.datetime :discarded_at
|
|
||||||
|
|
||||||
t.index :source_pattern, unique: true
|
|
||||||
t.index :discarded_at
|
|
||||||
end
|
|
||||||
|
|
||||||
now = Time.current
|
|
||||||
|
|
||||||
PostUrlSanitisationRule.insert_all!([
|
|
||||||
{ priority: 10,
|
|
||||||
source_pattern: '\Ahttps?://youtu\.be/([^/?#]+)(?:[?#].*)?\z',
|
|
||||||
replacement: 'https://www.youtube.com/watch?v=\1',
|
|
||||||
created_at: now,
|
|
||||||
updated_at: now },
|
|
||||||
{ priority: 20,
|
|
||||||
source_pattern: '\Ahttps?://(?:www\.|m\.)?youtube\.com/live/([^/?#]+)(?:[?#].*)?\z',
|
|
||||||
replacement: 'https://www.youtube.com/watch?v=\1',
|
|
||||||
created_at: now,
|
|
||||||
updated_at: now },
|
|
||||||
{ priority: 30,
|
|
||||||
source_pattern: '\Ahttps?://(?:www\.|m\.)?youtube\.com/shorts/([^/?#]+)(?:[?#].*)?\z',
|
|
||||||
replacement: 'https://www.youtube.com/watch?v=\1',
|
|
||||||
created_at: now,
|
|
||||||
updated_at: now },
|
|
||||||
{ priority: 40,
|
|
||||||
source_pattern: '\Ahttps?://(?:www\.|m\.)?youtube\.com/embed/([^/?#]+)(?:[?#].*)?\z',
|
|
||||||
replacement: 'https://www.youtube.com/watch?v=\1',
|
|
||||||
created_at: now,
|
|
||||||
updated_at: now },
|
|
||||||
{ priority: 50,
|
|
||||||
source_pattern:
|
|
||||||
'\Ahttps?://(?:www\.|m\.)?youtube\.com/watch\?(?:[^#&]+&)*v=([^&#]+)(?:[&#].*)?\z',
|
|
||||||
replacement: 'https://www.youtube.com/watch?v=\1',
|
|
||||||
created_at: now,
|
|
||||||
updated_at: now },
|
|
||||||
{ priority: 60,
|
|
||||||
source_pattern: '\Ahttps?://nico\.ms/([^/?#]+)(?:[?#].*)?\z',
|
|
||||||
replacement: 'https://www.nicovideo.jp/watch/\1',
|
|
||||||
created_at: now,
|
|
||||||
updated_at: now },
|
|
||||||
{ priority: 70,
|
|
||||||
source_pattern: '\Ahttps?://(?:www\.)?nicovideo\.jp/watch/([^?#/]+)(?:[?#].*)?\z',
|
|
||||||
replacement: 'https://www.nicovideo.jp/watch/\1',
|
|
||||||
created_at: now,
|
|
||||||
updated_at: now }])
|
|
||||||
end
|
|
||||||
|
|
||||||
def down
|
|
||||||
drop_table :post_url_sanitisation_rules
|
|
||||||
end
|
|
||||||
end
|
|
||||||
生成ファイル
+16
-40
@@ -10,7 +10,7 @@
|
|||||||
#
|
#
|
||||||
# It's strongly recommended that you check this file into your version control system.
|
# It's strongly recommended that you check this file into your version control system.
|
||||||
|
|
||||||
ActiveRecord::Schema[8.0].define(version: 2026_07_13_000000) do
|
ActiveRecord::Schema[8.0].define(version: 2026_07_04_000000) do
|
||||||
create_table "active_storage_attachments", charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
|
create_table "active_storage_attachments", charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
|
||||||
t.string "name", null: false
|
t.string "name", null: false
|
||||||
t.string "record_type", null: false
|
t.string "record_type", null: false
|
||||||
@@ -331,16 +331,6 @@ ActiveRecord::Schema[8.0].define(version: 2026_07_13_000000) do
|
|||||||
t.index ["tag_id"], name: "index_post_tags_on_tag_id"
|
t.index ["tag_id"], name: "index_post_tags_on_tag_id"
|
||||||
end
|
end
|
||||||
|
|
||||||
create_table "post_url_sanitisation_rules", primary_key: "priority", id: :integer, charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
|
|
||||||
t.string "source_pattern", null: false
|
|
||||||
t.string "replacement", null: false
|
|
||||||
t.datetime "created_at", null: false
|
|
||||||
t.datetime "updated_at", null: false
|
|
||||||
t.datetime "discarded_at"
|
|
||||||
t.index ["discarded_at"], name: "index_post_url_sanitisation_rules_on_discarded_at"
|
|
||||||
t.index ["source_pattern"], name: "index_post_url_sanitisation_rules_on_source_pattern", unique: true
|
|
||||||
end
|
|
||||||
|
|
||||||
create_table "post_versions", charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
|
create_table "post_versions", charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
|
||||||
t.bigint "post_id", null: false
|
t.bigint "post_id", null: false
|
||||||
t.integer "version_no", null: false
|
t.integer "version_no", null: false
|
||||||
@@ -393,19 +383,6 @@ ActiveRecord::Schema[8.0].define(version: 2026_07_13_000000) do
|
|||||||
t.index ["user_id"], name: "index_settings_on_user_id", unique: true
|
t.index ["user_id"], name: "index_settings_on_user_id", unique: true
|
||||||
end
|
end
|
||||||
|
|
||||||
create_table "wiki_assets", charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
|
|
||||||
t.bigint "wiki_page_id", null: false
|
|
||||||
t.integer "no", null: false
|
|
||||||
t.string "alt_text"
|
|
||||||
t.binary "sha256", limit: 32, null: false
|
|
||||||
t.bigint "created_by_user_id", null: false
|
|
||||||
t.datetime "created_at", null: false
|
|
||||||
t.datetime "updated_at", null: false
|
|
||||||
t.index ["created_by_user_id"], name: "index_wiki_assets_on_created_by_user_id"
|
|
||||||
t.index ["wiki_page_id", "no"], name: "index_wiki_assets_on_wiki_page_id_and_no", unique: true
|
|
||||||
t.index ["wiki_page_id", "sha256"], name: "index_wiki_assets_on_wiki_page_id_and_sha256", unique: true
|
|
||||||
end
|
|
||||||
|
|
||||||
create_table "tag_implications", charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
|
create_table "tag_implications", charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
|
||||||
t.bigint "tag_id", null: false
|
t.bigint "tag_id", null: false
|
||||||
t.bigint "parent_tag_id", null: false
|
t.bigint "parent_tag_id", null: false
|
||||||
@@ -451,9 +428,9 @@ ActiveRecord::Schema[8.0].define(version: 2026_07_13_000000) do
|
|||||||
t.string "event_type", null: false
|
t.string "event_type", null: false
|
||||||
t.string "name", null: false
|
t.string "name", null: false
|
||||||
t.string "category", null: false
|
t.string "category", null: false
|
||||||
|
t.datetime "deprecated_at"
|
||||||
t.text "aliases", null: false
|
t.text "aliases", null: false
|
||||||
t.text "parent_tag_ids", null: false
|
t.text "parent_tag_ids", null: false
|
||||||
t.datetime "deprecated_at"
|
|
||||||
t.datetime "created_at", null: false
|
t.datetime "created_at", null: false
|
||||||
t.bigint "created_by_user_id"
|
t.bigint "created_by_user_id"
|
||||||
t.index ["created_at"], name: "index_tag_versions_on_created_at"
|
t.index ["created_at"], name: "index_tag_versions_on_created_at"
|
||||||
@@ -466,10 +443,10 @@ ActiveRecord::Schema[8.0].define(version: 2026_07_13_000000) do
|
|||||||
create_table "tags", charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
|
create_table "tags", charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
|
||||||
t.bigint "tag_name_id", null: false
|
t.bigint "tag_name_id", null: false
|
||||||
t.string "category", default: "general", null: false
|
t.string "category", default: "general", null: false
|
||||||
t.datetime "deprecated_at"
|
|
||||||
t.datetime "created_at", null: false
|
t.datetime "created_at", null: false
|
||||||
t.datetime "updated_at", null: false
|
t.datetime "updated_at", null: false
|
||||||
t.integer "post_count", default: 0, null: false
|
t.integer "post_count", default: 0, null: false
|
||||||
|
t.datetime "deprecated_at"
|
||||||
t.datetime "discarded_at"
|
t.datetime "discarded_at"
|
||||||
t.integer "version_no", null: false
|
t.integer "version_no", null: false
|
||||||
t.index ["deprecated_at"], name: "index_tags_on_deprecated_at"
|
t.index ["deprecated_at"], name: "index_tags_on_deprecated_at"
|
||||||
@@ -591,19 +568,6 @@ ActiveRecord::Schema[8.0].define(version: 2026_07_13_000000) do
|
|||||||
t.index ["post_id"], name: "index_user_post_views_on_post_id"
|
t.index ["post_id"], name: "index_user_post_views_on_post_id"
|
||||||
end
|
end
|
||||||
|
|
||||||
create_table "user_theme_slots", charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
|
|
||||||
t.bigint "user_id", null: false
|
|
||||||
t.string "base_theme", null: false
|
|
||||||
t.integer "slot_no", null: false
|
|
||||||
t.json "tokens", null: false
|
|
||||||
t.datetime "created_at", null: false
|
|
||||||
t.datetime "updated_at", null: false
|
|
||||||
t.index ["user_id", "base_theme", "slot_no"], name: "index_user_theme_slots_on_user_theme_and_slot", unique: true
|
|
||||||
t.index ["user_id"], name: "index_user_theme_slots_on_user_id"
|
|
||||||
t.check_constraint "`base_theme` in (_utf8mb4'light',_utf8mb4'dark')", name: "user_theme_slots_base_theme_valid"
|
|
||||||
t.check_constraint "`slot_no` between 1 and 3", name: "user_theme_slots_slot_no_valid"
|
|
||||||
end
|
|
||||||
|
|
||||||
create_table "users", charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
|
create_table "users", charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
|
||||||
t.string "name"
|
t.string "name"
|
||||||
t.string "inheritance_code", limit: 64, null: false
|
t.string "inheritance_code", limit: 64, null: false
|
||||||
@@ -614,6 +578,19 @@ ActiveRecord::Schema[8.0].define(version: 2026_07_13_000000) do
|
|||||||
t.index ["banned_at"], name: "index_users_on_banned_at"
|
t.index ["banned_at"], name: "index_users_on_banned_at"
|
||||||
end
|
end
|
||||||
|
|
||||||
|
create_table "wiki_assets", charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
|
||||||
|
t.bigint "wiki_page_id", null: false
|
||||||
|
t.integer "no", null: false
|
||||||
|
t.string "alt_text"
|
||||||
|
t.binary "sha256", limit: 32, null: false
|
||||||
|
t.bigint "created_by_user_id", null: false
|
||||||
|
t.datetime "created_at", null: false
|
||||||
|
t.datetime "updated_at", null: false
|
||||||
|
t.index ["created_by_user_id"], name: "index_wiki_assets_on_created_by_user_id"
|
||||||
|
t.index ["wiki_page_id", "no"], name: "index_wiki_assets_on_wiki_page_id_and_no", unique: true
|
||||||
|
t.index ["wiki_page_id", "sha256"], name: "index_wiki_assets_on_wiki_page_id_and_sha256", unique: true
|
||||||
|
end
|
||||||
|
|
||||||
create_table "wiki_lines", charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
|
create_table "wiki_lines", charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
|
||||||
t.string "sha256", limit: 64, null: false
|
t.string "sha256", limit: 64, null: false
|
||||||
t.text "body", null: false
|
t.text "body", null: false
|
||||||
@@ -763,7 +740,6 @@ ActiveRecord::Schema[8.0].define(version: 2026_07_13_000000) do
|
|||||||
add_foreign_key "user_ips", "users"
|
add_foreign_key "user_ips", "users"
|
||||||
add_foreign_key "user_post_views", "posts"
|
add_foreign_key "user_post_views", "posts"
|
||||||
add_foreign_key "user_post_views", "users"
|
add_foreign_key "user_post_views", "users"
|
||||||
add_foreign_key "user_theme_slots", "users"
|
|
||||||
add_foreign_key "wiki_assets", "users", column: "created_by_user_id"
|
add_foreign_key "wiki_assets", "users", column: "created_by_user_id"
|
||||||
add_foreign_key "wiki_assets", "wiki_pages"
|
add_foreign_key "wiki_assets", "wiki_pages"
|
||||||
add_foreign_key "wiki_pages", "tag_names"
|
add_foreign_key "wiki_pages", "tag_names"
|
||||||
|
|||||||
@@ -8,43 +8,6 @@
|
|||||||
# MovieGenre.find_or_create_by!(name: genre_name)
|
# MovieGenre.find_or_create_by!(name: genre_name)
|
||||||
# end
|
# end
|
||||||
|
|
||||||
post_url_sanitisation_rules = [
|
|
||||||
{ priority: 10,
|
|
||||||
source_pattern: '\Ahttps?://youtu\.be/([^/?#]+)(?:[?#].*)?\z',
|
|
||||||
replacement: 'https://www.youtube.com/watch?v=\1' },
|
|
||||||
{ priority: 20,
|
|
||||||
source_pattern: '\Ahttps?://(?:www\.|m\.)?youtube\.com/live/([^/?#]+)(?:[?#].*)?\z',
|
|
||||||
replacement: 'https://www.youtube.com/watch?v=\1' },
|
|
||||||
{ priority: 30,
|
|
||||||
source_pattern: '\Ahttps?://(?:www\.|m\.)?youtube\.com/shorts/([^/?#]+)(?:[?#].*)?\z',
|
|
||||||
replacement: 'https://www.youtube.com/watch?v=\1' },
|
|
||||||
{ priority: 40,
|
|
||||||
source_pattern: '\Ahttps?://(?:www\.|m\.)?youtube\.com/embed/([^/?#]+)(?:[?#].*)?\z',
|
|
||||||
replacement: 'https://www.youtube.com/watch?v=\1' },
|
|
||||||
{ priority: 50,
|
|
||||||
source_pattern:
|
|
||||||
'\Ahttps?://(?:www\.|m\.)?youtube\.com/watch\?(?:[^#&]+&)*v=([^&#]+)(?:[&#].*)?\z',
|
|
||||||
replacement: 'https://www.youtube.com/watch?v=\1' },
|
|
||||||
{ priority: 60,
|
|
||||||
source_pattern: '\Ahttps?://nico\.ms/([^/?#]+)(?:[?#].*)?\z',
|
|
||||||
replacement: 'https://www.nicovideo.jp/watch/\1' },
|
|
||||||
{ priority: 70,
|
|
||||||
source_pattern: '\Ahttps?://(?:www\.)?nicovideo\.jp/watch/([^?#/]+)(?:[?#].*)?\z',
|
|
||||||
replacement: 'https://www.nicovideo.jp/watch/\1' }
|
|
||||||
]
|
|
||||||
|
|
||||||
post_url_sanitisation_rule_scope = PostUrlSanitisationRule.unscoped
|
|
||||||
|
|
||||||
post_url_sanitisation_rules.each do |attributes|
|
|
||||||
priority = attributes.fetch(:priority)
|
|
||||||
source_pattern = attributes.fetch(:source_pattern)
|
|
||||||
|
|
||||||
next if post_url_sanitisation_rule_scope.exists?(priority:)
|
|
||||||
next if post_url_sanitisation_rule_scope.exists?(source_pattern:)
|
|
||||||
|
|
||||||
post_url_sanitisation_rule_scope.create!(attributes)
|
|
||||||
end
|
|
||||||
|
|
||||||
material_sync_source_uri = ENV['MATERIAL_SYNC_SOURCE_URI']
|
material_sync_source_uri = ENV['MATERIAL_SYNC_SOURCE_URI']
|
||||||
material_sync_source_file_id = ENV['MATERIAL_SYNC_SOURCE_FILE_ID']
|
material_sync_source_file_id = ENV['MATERIAL_SYNC_SOURCE_FILE_ID']
|
||||||
|
|
||||||
|
|||||||
+1102
ファイル差分が大きすぎるため省略します
差分を読込み
@@ -0,0 +1,15 @@
|
|||||||
|
{
|
||||||
|
"name": "lib",
|
||||||
|
"version": "1.0.0",
|
||||||
|
"main": "screenshot.js",
|
||||||
|
"scripts": {
|
||||||
|
"test": "echo \"Error: no test specified\" && exit 1"
|
||||||
|
},
|
||||||
|
"keywords": [],
|
||||||
|
"author": "",
|
||||||
|
"license": "ISC",
|
||||||
|
"description": "",
|
||||||
|
"dependencies": {
|
||||||
|
"puppeteer": "^24.10.0"
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,18 @@
|
|||||||
|
const puppeteer = require ('puppeteer')
|
||||||
|
const fs = require ('fs')
|
||||||
|
|
||||||
|
|
||||||
|
void (async () => {
|
||||||
|
const url = process.argv[2]
|
||||||
|
const output = process.argv[3]
|
||||||
|
|
||||||
|
const browser = await puppeteer.launch ({
|
||||||
|
args: ['--no-sandbox', '--disable-setuid-sandbox'] })
|
||||||
|
|
||||||
|
const page = await browser.newPage ()
|
||||||
|
await page.setViewport ({ width: 960, height: 960 })
|
||||||
|
await page.goto (url, { waitUntil: 'networkidle2', timeout: 15000 })
|
||||||
|
|
||||||
|
await page.screenshot ({ path: output })
|
||||||
|
await browser.close ()
|
||||||
|
}) ()
|
||||||
@@ -1,65 +0,0 @@
|
|||||||
require 'rails_helper'
|
|
||||||
|
|
||||||
RSpec.describe 'database seeds' do
|
|
||||||
before do
|
|
||||||
PostUrlSanitisationRule.unscoped.delete_all
|
|
||||||
end
|
|
||||||
|
|
||||||
it 'registers the initial post URL sanitisation rules' do
|
|
||||||
load_seeds
|
|
||||||
|
|
||||||
urls = {
|
|
||||||
'https://youtu.be/abc123?si=share' => youtube_url('abc123'),
|
|
||||||
'https://www.youtube.com/live/abc123?t=10' => youtube_url('abc123'),
|
|
||||||
'https://youtube.com/shorts/abc123?feature=share' => youtube_url('abc123'),
|
|
||||||
'https://m.youtube.com/embed/abc123' => youtube_url('abc123'),
|
|
||||||
'https://youtube.com/watch?feature=share&v=abc123&t=10' => youtube_url('abc123'),
|
|
||||||
'https://nico.ms/sm123?from=share#fragment' => nico_url('sm123'),
|
|
||||||
'https://www.nicovideo.jp/watch/sm123?ref=share#fragment' => nico_url('sm123')
|
|
||||||
}
|
|
||||||
|
|
||||||
expect(PostUrlSanitisationRule.count).to eq(7)
|
|
||||||
urls.each do |url, canonical_url|
|
|
||||||
expect(PostUrlSanitisationRule.sanitise(url)).to eq(canonical_url)
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
it 'does not overwrite or restore an existing rule' do
|
|
||||||
rule = PostUrlSanitisationRule.create!(
|
|
||||||
priority: 10,
|
|
||||||
source_pattern: '\Ahttps://example\.com/custom\z',
|
|
||||||
replacement: 'https://example.com/replacement'
|
|
||||||
)
|
|
||||||
rule.discard!
|
|
||||||
original_attributes = rule.reload.attributes
|
|
||||||
|
|
||||||
2.times { load_seeds }
|
|
||||||
|
|
||||||
persisted_rule = PostUrlSanitisationRule.unscoped.find(10)
|
|
||||||
expect(persisted_rule.attributes).to eq(original_attributes)
|
|
||||||
expect(PostUrlSanitisationRule.unscoped.count).to eq(7)
|
|
||||||
end
|
|
||||||
|
|
||||||
it 'does not duplicate a rule moved to another priority' do
|
|
||||||
source_pattern = '\Ahttps?://youtu\.be/([^/?#]+)(?:[?#].*)?\z'
|
|
||||||
PostUrlSanitisationRule.create!(
|
|
||||||
priority: 80,
|
|
||||||
source_pattern:,
|
|
||||||
replacement: 'https://example.com/custom/\1'
|
|
||||||
)
|
|
||||||
|
|
||||||
load_seeds
|
|
||||||
|
|
||||||
rules = PostUrlSanitisationRule.unscoped
|
|
||||||
expect(rules.where(source_pattern:).count).to eq(1)
|
|
||||||
expect(rules.find(80).replacement).to eq('https://example.com/custom/\1')
|
|
||||||
end
|
|
||||||
|
|
||||||
def load_seeds
|
|
||||||
load Rails.root.join('db/seeds.rb')
|
|
||||||
end
|
|
||||||
|
|
||||||
def youtube_url(video_id) = "https://www.youtube.com/watch?v=#{ video_id }"
|
|
||||||
|
|
||||||
def nico_url(video_id) = "https://www.nicovideo.jp/watch/#{ video_id }"
|
|
||||||
end
|
|
||||||
@@ -1,68 +0,0 @@
|
|||||||
require 'rails_helper'
|
|
||||||
|
|
||||||
RSpec.describe Post, type: :model do
|
|
||||||
before do
|
|
||||||
PostUrlSanitisationRule.unscoped.delete_all
|
|
||||||
end
|
|
||||||
|
|
||||||
describe 'URL normalisation' do
|
|
||||||
it 'normalises the HTTP URL before applying sanitisation rules' do
|
|
||||||
PostUrlSanitisationRule.create!(
|
|
||||||
priority: 10,
|
|
||||||
source_pattern: '\\Ahttps://example\\.com/videos/([^/]+)\\z',
|
|
||||||
replacement: 'https://example.com/watch/\\1'
|
|
||||||
)
|
|
||||||
|
|
||||||
post = described_class.create!(
|
|
||||||
title: 'normalised URL',
|
|
||||||
url: ' https://EXAMPLE.com/videos/123/ '
|
|
||||||
)
|
|
||||||
|
|
||||||
expect(post.url).to eq('https://example.com/watch/123')
|
|
||||||
end
|
|
||||||
|
|
||||||
it 'does not normalise an unchanged URL when another attribute changes' do
|
|
||||||
post = create(:post)
|
|
||||||
post.update_column(:url, 'https://EXAMPLE.com/unchanged/')
|
|
||||||
|
|
||||||
post.update!(title: 'updated title')
|
|
||||||
|
|
||||||
expect(post.reload.url).to eq('https://EXAMPLE.com/unchanged/')
|
|
||||||
end
|
|
||||||
|
|
||||||
it 'validates the sanitised URL length' do
|
|
||||||
path = 'a' * 375
|
|
||||||
|
|
||||||
PostUrlSanitisationRule.create!(
|
|
||||||
priority: 10,
|
|
||||||
source_pattern: '\\Ahttps://example\\.com/(a+)\\z',
|
|
||||||
replacement: 'https://example.com/\\1\\1'
|
|
||||||
)
|
|
||||||
|
|
||||||
post = described_class.new(
|
|
||||||
title: 'long URL',
|
|
||||||
url: "https://example.com/#{ path }"
|
|
||||||
)
|
|
||||||
|
|
||||||
expect(post).to be_invalid
|
|
||||||
expect(post.errors.details.fetch(:url)).to include(
|
|
||||||
error: :too_long,
|
|
||||||
count: 768
|
|
||||||
)
|
|
||||||
end
|
|
||||||
|
|
||||||
it 'validates uniqueness after sanitisation' do
|
|
||||||
PostUrlSanitisationRule.create!(
|
|
||||||
priority: 10,
|
|
||||||
source_pattern: '\\Ahttps://example\\.com/alias\\z',
|
|
||||||
replacement: 'https://example.com/canonical'
|
|
||||||
)
|
|
||||||
create(:post, url: 'https://example.com/canonical')
|
|
||||||
|
|
||||||
post = described_class.new(title: 'duplicate URL', url: 'https://example.com/alias')
|
|
||||||
|
|
||||||
expect(post).to be_invalid
|
|
||||||
expect(post.errors.details.fetch(:url)).to include(error: :taken, value: post.url)
|
|
||||||
end
|
|
||||||
end
|
|
||||||
end
|
|
||||||
@@ -1,265 +0,0 @@
|
|||||||
require 'rails_helper'
|
|
||||||
|
|
||||||
RSpec.describe PostUrlSanitisationRule, type: :model do
|
|
||||||
before do
|
|
||||||
described_class.unscoped.delete_all
|
|
||||||
end
|
|
||||||
|
|
||||||
describe 'validations' do
|
|
||||||
it 'requires a source pattern' do
|
|
||||||
rule = described_class.new(priority: 10, source_pattern: nil, replacement: '')
|
|
||||||
|
|
||||||
expect(rule).to be_invalid
|
|
||||||
expect(rule.errors.details.fetch(:source_pattern)).to eq([{ error: :blank }])
|
|
||||||
end
|
|
||||||
|
|
||||||
it 'requires a unique source pattern' do
|
|
||||||
described_class.create!(priority: 10, source_pattern: 'source', replacement: 'first')
|
|
||||||
rule = described_class.new(
|
|
||||||
priority: 20,
|
|
||||||
source_pattern: 'source',
|
|
||||||
replacement: 'second'
|
|
||||||
)
|
|
||||||
|
|
||||||
expect(rule).to be_invalid
|
|
||||||
expect(rule.errors.details.fetch(:source_pattern)).to include(
|
|
||||||
error: :taken,
|
|
||||||
value: 'source'
|
|
||||||
)
|
|
||||||
end
|
|
||||||
|
|
||||||
it 'rejects an invalid regexp' do
|
|
||||||
rule = described_class.new(priority: 10, source_pattern: '[', replacement: '')
|
|
||||||
|
|
||||||
expect(rule).to be_invalid
|
|
||||||
expect(rule.errors[:source_pattern]).to include('変な正規表現だね〜(笑)')
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
describe '.sanitise' do
|
|
||||||
it 'applies each active rule once in priority order' do
|
|
||||||
described_class.create!(priority: 30, source_pattern: 'c', replacement: 'd')
|
|
||||||
described_class.create!(priority: 10, source_pattern: 'a', replacement: 'aa')
|
|
||||||
described_class.create!(priority: 20, source_pattern: 'aa', replacement: 'c')
|
|
||||||
discarded = described_class.create!(
|
|
||||||
priority: 5,
|
|
||||||
source_pattern: '.',
|
|
||||||
replacement: 'discarded'
|
|
||||||
)
|
|
||||||
discarded.discard!
|
|
||||||
|
|
||||||
expect(described_class.sanitise('a')).to eq('d')
|
|
||||||
end
|
|
||||||
|
|
||||||
it 'canonicalises the initial YouTube and Nico URL forms' do
|
|
||||||
create_initial_rules
|
|
||||||
|
|
||||||
urls = {
|
|
||||||
'https://youtu.be/abc123?si=share' => youtube_url('abc123'),
|
|
||||||
'https://www.youtube.com/live/abc123?t=10' => youtube_url('abc123'),
|
|
||||||
'https://youtube.com/shorts/abc123?feature=share' => youtube_url('abc123'),
|
|
||||||
'https://m.youtube.com/embed/abc123' => youtube_url('abc123'),
|
|
||||||
'https://youtube.com/watch?feature=share&v=abc123&t=10' => youtube_url('abc123'),
|
|
||||||
'https://nico.ms/sm123?from=share#fragment' => nico_url('sm123'),
|
|
||||||
'https://www.nicovideo.jp/watch/sm123?ref=share#fragment' => nico_url('sm123')
|
|
||||||
}
|
|
||||||
|
|
||||||
urls.each do |url, canonical_url|
|
|
||||||
expect(described_class.sanitise(url)).to eq(canonical_url)
|
|
||||||
end
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
describe '.apply!' do
|
|
||||||
it 'locks posts in ID order and updates through temporary URLs' do
|
|
||||||
first = create(:post, url: 'https://example.com/source/1')
|
|
||||||
second = create(:post, url: 'https://example.com/source/2')
|
|
||||||
create_source_rule
|
|
||||||
sql = capture_sql { described_class.apply! }
|
|
||||||
|
|
||||||
lock_sql = sql.find { _1.match?(/SELECT .*posts.*FOR UPDATE/i) }
|
|
||||||
expect(lock_sql).to match(/ORDER BY .*posts.*id.* ASC/i)
|
|
||||||
expect(sql.grep(/post-url-sanitising\.invalid/).size).to eq(2)
|
|
||||||
expect(first.reload.url).to eq('https://example.com/canonical/1')
|
|
||||||
expect(second.reload.url).to eq('https://example.com/canonical/2')
|
|
||||||
end
|
|
||||||
|
|
||||||
it 'loads and compiles rules only once' do
|
|
||||||
create(:post, url: 'https://example.com/source/1')
|
|
||||||
create(:post, url: 'https://example.com/source/2')
|
|
||||||
create_source_rule
|
|
||||||
|
|
||||||
expect(described_class).to receive(:rules).once.and_call_original
|
|
||||||
|
|
||||||
described_class.apply!
|
|
||||||
end
|
|
||||||
|
|
||||||
it 'does not change post versions, version_no, or updated_at' do
|
|
||||||
post = create(:post, url: 'https://example.com/source/1')
|
|
||||||
post.update_columns(version_no: 7, updated_at: 1.day.ago)
|
|
||||||
original_updated_at = post.reload.updated_at
|
|
||||||
create_source_rule
|
|
||||||
|
|
||||||
expect { described_class.apply! }.not_to change(PostVersion, :count)
|
|
||||||
|
|
||||||
post.reload
|
|
||||||
expect(post.url).to eq('https://example.com/canonical/1')
|
|
||||||
expect(post.version_no).to eq(7)
|
|
||||||
expect(post.updated_at).to eq(original_updated_at)
|
|
||||||
end
|
|
||||||
|
|
||||||
invalid_urls = {
|
|
||||||
'a blank URL' => '',
|
|
||||||
'an unparseable URL' => 'https://[',
|
|
||||||
'a non-HTTP URL' => 'ftp://example.com/file',
|
|
||||||
'an HTTP URL without a host' => 'https:/path'
|
|
||||||
}
|
|
||||||
|
|
||||||
invalid_urls.each do |description, sanitised_url|
|
|
||||||
it "rolls back every update when sanitisation produces #{ description }" do
|
|
||||||
valid_post = create(:post, url: 'https://example.com/source/1')
|
|
||||||
invalid_post = create(:post, url: 'https://example.com/invalid')
|
|
||||||
create_source_rule
|
|
||||||
described_class.create!(
|
|
||||||
priority: 20,
|
|
||||||
source_pattern: '\\Ahttps://example\\.com/invalid\\z',
|
|
||||||
replacement: sanitised_url
|
|
||||||
)
|
|
||||||
|
|
||||||
expect { described_class.apply! }
|
|
||||||
.to raise_error(described_class::InvalidUrlError) { |error|
|
|
||||||
expect(error.invalid_rows).to eq([
|
|
||||||
{ post_id: invalid_post.id,
|
|
||||||
original_url: 'https://example.com/invalid',
|
|
||||||
sanitised_url: }
|
|
||||||
])
|
|
||||||
}
|
|
||||||
expect(valid_post.reload.url).to eq('https://example.com/source/1')
|
|
||||||
expect(invalid_post.reload.url).to eq('https://example.com/invalid')
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
it 'rolls back every update when sanitisation produces a URL longer than 768 characters' do
|
|
||||||
path = 'a' * 375
|
|
||||||
original_url = "https://example.com/#{ path }"
|
|
||||||
sanitised_url = "https://example.com/#{ path }#{ path }"
|
|
||||||
valid_post = create(:post, url: 'https://example.com/source/1')
|
|
||||||
invalid_post = create(:post, url: original_url)
|
|
||||||
create_source_rule
|
|
||||||
described_class.create!(
|
|
||||||
priority: 20,
|
|
||||||
source_pattern: '\\Ahttps://example\\.com/(a+)\\z',
|
|
||||||
replacement: 'https://example.com/\\1\\1'
|
|
||||||
)
|
|
||||||
|
|
||||||
expect { described_class.apply! }
|
|
||||||
.to raise_error(described_class::InvalidUrlError) { |error|
|
|
||||||
expect(error.invalid_rows).to eq([
|
|
||||||
{ post_id: invalid_post.id,
|
|
||||||
original_url:,
|
|
||||||
sanitised_url: }
|
|
||||||
])
|
|
||||||
}
|
|
||||||
expect(valid_post.reload.url).to eq('https://example.com/source/1')
|
|
||||||
expect(invalid_post.reload.url).to eq(original_url)
|
|
||||||
end
|
|
||||||
|
|
||||||
it 'rejects sanitised URL collisions case-insensitively without changing posts' do
|
|
||||||
source = create(:post, url: 'https://example.com/source/Foo')
|
|
||||||
canonical = create(:post, url: 'https://example.com/canonical/foo')
|
|
||||||
create_source_rule
|
|
||||||
|
|
||||||
expect { described_class.apply! }
|
|
||||||
.to raise_error(described_class::UrlConflictError) { |error|
|
|
||||||
expect(error.conflicts).to contain_exactly(
|
|
||||||
{ url: 'https://example.com/canonical/Foo',
|
|
||||||
post_id: source.id,
|
|
||||||
original_url: 'https://example.com/source/Foo' },
|
|
||||||
{ url: 'https://example.com/canonical/foo',
|
|
||||||
post_id: canonical.id,
|
|
||||||
original_url: 'https://example.com/canonical/foo' }
|
|
||||||
)
|
|
||||||
}
|
|
||||||
expect(source.reload.url).to eq('https://example.com/source/Foo')
|
|
||||||
expect(canonical.reload.url).to eq('https://example.com/canonical/foo')
|
|
||||||
expect(Post.count).to eq(2)
|
|
||||||
end
|
|
||||||
|
|
||||||
it 'converts a persisted URL constraint race into UrlConflictError' do
|
|
||||||
post = create(:post, url: 'https://example.com/source/1')
|
|
||||||
create_source_rule
|
|
||||||
conflict = { url: 'https://example.com/canonical/1',
|
|
||||||
post_id: post.id,
|
|
||||||
original_url: post.url }
|
|
||||||
database_error = ActiveRecord::RecordNotUnique.new('duplicate URL')
|
|
||||||
allow_any_instance_of(ActiveRecord::Relation)
|
|
||||||
.to receive(:update_all).and_raise(database_error)
|
|
||||||
allow(described_class).to receive(:build_persisted_conflicts).and_return([conflict])
|
|
||||||
|
|
||||||
expect { described_class.apply! }
|
|
||||||
.to raise_error(described_class::UrlConflictError) { |error|
|
|
||||||
expect(error.conflicts).to eq([conflict])
|
|
||||||
expect(error.cause).to equal(database_error)
|
|
||||||
}
|
|
||||||
expect(post.reload.url).to eq('https://example.com/source/1')
|
|
||||||
end
|
|
||||||
|
|
||||||
it 're-raises an unidentified RecordNotUnique error' do
|
|
||||||
post = create(:post, url: 'https://example.com/source/1')
|
|
||||||
create_source_rule
|
|
||||||
database_error = ActiveRecord::RecordNotUnique.new('another unique constraint')
|
|
||||||
allow_any_instance_of(ActiveRecord::Relation)
|
|
||||||
.to receive(:update_all).and_raise(database_error)
|
|
||||||
allow(described_class).to receive(:build_persisted_conflicts).and_return([])
|
|
||||||
|
|
||||||
expect { described_class.apply! }.to raise_error(database_error)
|
|
||||||
expect(post.reload.url).to eq('https://example.com/source/1')
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
def capture_sql
|
|
||||||
statements = []
|
|
||||||
subscriber = lambda do |_name, _start, _finish, _id, payload|
|
|
||||||
binds = payload.fetch(:binds, []).map { _1.value_for_database.to_s }
|
|
||||||
statements << ([payload.fetch(:sql)] + binds).join(' ')
|
|
||||||
end
|
|
||||||
ActiveSupport::Notifications.subscribed(subscriber, 'sql.active_record') { yield }
|
|
||||||
statements
|
|
||||||
end
|
|
||||||
|
|
||||||
def create_source_rule
|
|
||||||
described_class.create!(
|
|
||||||
priority: 10,
|
|
||||||
source_pattern: '\\Ahttps://example\\.com/source/(.+)\\z',
|
|
||||||
replacement: 'https://example.com/canonical/\\1'
|
|
||||||
)
|
|
||||||
end
|
|
||||||
|
|
||||||
def create_initial_rules
|
|
||||||
rules = [
|
|
||||||
['\\Ahttps?://youtu\\.be/([^/?#]+)(?:[?#].*)?\\z', youtube_url('\\1')],
|
|
||||||
['\\Ahttps?://(?:www\\.|m\\.)?youtube\\.com/live/([^/?#]+)(?:[?#].*)?\\z',
|
|
||||||
youtube_url('\\1')],
|
|
||||||
['\\Ahttps?://(?:www\\.|m\\.)?youtube\\.com/shorts/([^/?#]+)(?:[?#].*)?\\z',
|
|
||||||
youtube_url('\\1')],
|
|
||||||
['\\Ahttps?://(?:www\\.|m\\.)?youtube\\.com/embed/([^/?#]+)(?:[?#].*)?\\z',
|
|
||||||
youtube_url('\\1')],
|
|
||||||
['\\Ahttps?://(?:www\\.|m\\.)?youtube\\.com/watch\\?(?:[^#&]+&)*' \
|
|
||||||
'v=([^&#]+)(?:[&#].*)?\\z', youtube_url('\\1')],
|
|
||||||
['\\Ahttps?://nico\\.ms/([^/?#]+)(?:[?#].*)?\\z', nico_url('\\1')],
|
|
||||||
['\\Ahttps?://(?:www\\.)?nicovideo\\.jp/watch/([^?#/]+)(?:[?#].*)?\\z',
|
|
||||||
nico_url('\\1')]
|
|
||||||
]
|
|
||||||
rules.each_with_index do |(source_pattern, replacement), index|
|
|
||||||
described_class.create!(
|
|
||||||
priority: (index + 1) * 10,
|
|
||||||
source_pattern:,
|
|
||||||
replacement:
|
|
||||||
)
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
def youtube_url(video_id) = "https://www.youtube.com/watch?v=#{ video_id }"
|
|
||||||
|
|
||||||
def nico_url(video_id) = "https://www.nicovideo.jp/watch/#{ video_id }"
|
|
||||||
end
|
|
||||||
@@ -1,34 +0,0 @@
|
|||||||
require 'rails_helper'
|
|
||||||
|
|
||||||
RSpec.describe Setting, type: :model do
|
|
||||||
it 'accepts the default typed user settings' do
|
|
||||||
setting = described_class.new({ user: create(:user) }.merge(described_class.defaults))
|
|
||||||
|
|
||||||
expect(setting).to be_valid
|
|
||||||
end
|
|
||||||
|
|
||||||
it 'requires one settings row per user' do
|
|
||||||
user = create(:user)
|
|
||||||
described_class.create!({ user: }.merge(described_class.defaults))
|
|
||||||
|
|
||||||
duplicate = described_class.new({ user: }.merge(described_class.defaults))
|
|
||||||
|
|
||||||
expect(duplicate).not_to be_valid
|
|
||||||
expect(duplicate.errors[:user_id]).to be_present
|
|
||||||
end
|
|
||||||
|
|
||||||
it 'validates enum-like settings columns' do
|
|
||||||
setting = described_class.new(
|
|
||||||
{ user: create(:user),
|
|
||||||
theme: 'neon',
|
|
||||||
auto_fetch_title: 'sometimes',
|
|
||||||
auto_fetch_thumbnail: 'sometimes',
|
|
||||||
wiki_editor_mode: 'sideways' })
|
|
||||||
|
|
||||||
expect(setting).not_to be_valid
|
|
||||||
expect(setting.errors[:theme]).to be_present
|
|
||||||
expect(setting.errors[:auto_fetch_title]).to be_present
|
|
||||||
expect(setting.errors[:auto_fetch_thumbnail]).to be_present
|
|
||||||
expect(setting.errors[:wiki_editor_mode]).to be_present
|
|
||||||
end
|
|
||||||
end
|
|
||||||
@@ -1,40 +0,0 @@
|
|||||||
require 'rails_helper'
|
|
||||||
|
|
||||||
RSpec.describe UserThemeSlot, type: :model do
|
|
||||||
it 'accepts a theme slot for one user, base theme, and slot number' do
|
|
||||||
slot = described_class.new(user: create(:user),
|
|
||||||
base_theme: 'light',
|
|
||||||
slot_no: 1,
|
|
||||||
tokens: { 'background' => '0 0% 100%' })
|
|
||||||
|
|
||||||
expect(slot).to be_valid
|
|
||||||
end
|
|
||||||
|
|
||||||
it 'requires unique slot numbers per user and base theme' do
|
|
||||||
user = create(:user)
|
|
||||||
described_class.create!(user:,
|
|
||||||
base_theme: 'dark',
|
|
||||||
slot_no: 2,
|
|
||||||
tokens: { 'background' => '222.2 84% 4.9%' })
|
|
||||||
|
|
||||||
duplicate = described_class.new(user:,
|
|
||||||
base_theme: 'dark',
|
|
||||||
slot_no: 2,
|
|
||||||
tokens: { 'background' => '0 0% 100%' })
|
|
||||||
|
|
||||||
expect(duplicate).not_to be_valid
|
|
||||||
expect(duplicate.errors[:user_id]).to be_present
|
|
||||||
end
|
|
||||||
|
|
||||||
it 'validates base theme, slot number, and token object shape' do
|
|
||||||
slot = described_class.new(user: create(:user),
|
|
||||||
base_theme: 'system',
|
|
||||||
slot_no: 4,
|
|
||||||
tokens: 'not-object')
|
|
||||||
|
|
||||||
expect(slot).not_to be_valid
|
|
||||||
expect(slot.errors[:base_theme]).to be_present
|
|
||||||
expect(slot.errors[:slot_no]).to be_present
|
|
||||||
expect(slot.errors[:tokens]).to be_present
|
|
||||||
end
|
|
||||||
end
|
|
||||||
@@ -287,25 +287,6 @@ RSpec.describe 'Materials API', type: :request do
|
|||||||
expect(json.dig('export_paths', 'legacy_drive')).to eq('伊地知ニジカ/created.png')
|
expect(json.dig('export_paths', 'legacy_drive')).to eq('伊地知ニジカ/created.png')
|
||||||
end
|
end
|
||||||
|
|
||||||
it 'creates a create tag_version for a newly created material tag' do
|
|
||||||
expect do
|
|
||||||
post '/materials', params: {
|
|
||||||
tag: 'material_create_versioned_tag',
|
|
||||||
file: dummy_upload(filename: 'created.png')
|
|
||||||
}
|
|
||||||
end.to change(TagVersion, :count).by(1)
|
|
||||||
|
|
||||||
expect(response).to have_http_status(:created)
|
|
||||||
|
|
||||||
tag = Tag.joins(:tag_name).find_by!(tag_names: { name: 'material_create_versioned_tag' })
|
|
||||||
version = tag.tag_versions.order(:version_no).last
|
|
||||||
|
|
||||||
expect(version.event_type).to eq('create')
|
|
||||||
expect(version.name).to eq('material_create_versioned_tag')
|
|
||||||
expect(version.category).to eq('material')
|
|
||||||
expect(version.created_by_user).to eq(member_user)
|
|
||||||
end
|
|
||||||
|
|
||||||
it 'snapshots attached file metadata and sha256' do
|
it 'snapshots attached file metadata and sha256' do
|
||||||
post '/materials', params: {
|
post '/materials', params: {
|
||||||
tag: 'material_create_file_version',
|
tag: 'material_create_file_version',
|
||||||
@@ -485,73 +466,6 @@ RSpec.describe 'Materials API', type: :request do
|
|||||||
expect(json.dig('tag', 'name')).to eq('material_update_new')
|
expect(json.dig('tag', 'name')).to eq('material_update_new')
|
||||||
end
|
end
|
||||||
|
|
||||||
it 'creates a create tag_version when update creates a new tag' do
|
|
||||||
expect do
|
|
||||||
put "/materials/#{ material.id }", params: {
|
|
||||||
tag: 'material_update_versioned_tag',
|
|
||||||
file: dummy_upload(filename: 'updated.png')
|
|
||||||
}
|
|
||||||
end.to change(Tag, :count).by(1)
|
|
||||||
.and change(TagName, :count).by(1)
|
|
||||||
.and change(TagVersion, :count).by(1)
|
|
||||||
|
|
||||||
expect(response).to have_http_status(:ok)
|
|
||||||
|
|
||||||
tag = Tag.joins(:tag_name).find_by!(tag_names: { name: 'material_update_versioned_tag' })
|
|
||||||
version = tag.tag_versions.order(:version_no).last
|
|
||||||
|
|
||||||
expect(version.event_type).to eq('create')
|
|
||||||
expect(version.name).to eq('material_update_versioned_tag')
|
|
||||||
expect(version.category).to eq('material')
|
|
||||||
expect(version.created_by_user).to eq(member_user)
|
|
||||||
end
|
|
||||||
|
|
||||||
it 'backfills a create tag_version for an existing material tag without history' do
|
|
||||||
existing_tag =
|
|
||||||
Tag.create!(tag_name: TagName.create!(name: 'material_update_existing_no_history'),
|
|
||||||
category: :material)
|
|
||||||
|
|
||||||
expect(existing_tag.tag_versions).to be_empty
|
|
||||||
|
|
||||||
expect do
|
|
||||||
put "/materials/#{ material.id }", params: {
|
|
||||||
tag: 'material_update_existing_no_history',
|
|
||||||
file: dummy_upload(filename: 'updated.png')
|
|
||||||
}
|
|
||||||
end.to change(TagVersion, :count).by(1)
|
|
||||||
|
|
||||||
expect(response).to have_http_status(:ok)
|
|
||||||
|
|
||||||
version = existing_tag.reload.tag_versions.order(:version_no).last
|
|
||||||
expect(version.event_type).to eq('create')
|
|
||||||
expect(version.name).to eq('material_update_existing_no_history')
|
|
||||||
expect(version.category).to eq('material')
|
|
||||||
expect(version.created_by_user).to eq(member_user)
|
|
||||||
end
|
|
||||||
|
|
||||||
it 'backfills a create tag_version for an existing character tag without history' do
|
|
||||||
existing_tag =
|
|
||||||
Tag.create!(tag_name: TagName.create!(name: 'material_update_character_no_history'),
|
|
||||||
category: :character)
|
|
||||||
|
|
||||||
expect(existing_tag.tag_versions).to be_empty
|
|
||||||
|
|
||||||
expect do
|
|
||||||
put "/materials/#{ material.id }", params: {
|
|
||||||
tag: 'material_update_character_no_history',
|
|
||||||
file: dummy_upload(filename: 'updated.png')
|
|
||||||
}
|
|
||||||
end.to change(TagVersion, :count).by(1)
|
|
||||||
|
|
||||||
expect(response).to have_http_status(:ok)
|
|
||||||
|
|
||||||
version = existing_tag.reload.tag_versions.order(:version_no).last
|
|
||||||
expect(version.event_type).to eq('create')
|
|
||||||
expect(version.name).to eq('material_update_character_no_history')
|
|
||||||
expect(version.category).to eq('character')
|
|
||||||
expect(version.created_by_user).to eq(member_user)
|
|
||||||
end
|
|
||||||
|
|
||||||
it 'detaches the existing file without purging blob when url replaces file' do
|
it 'detaches the existing file without purging blob when url replaces file' do
|
||||||
old_blob_id = material.file.blob.id
|
old_blob_id = material.file.blob.id
|
||||||
|
|
||||||
@@ -580,7 +494,6 @@ RSpec.describe 'Materials API', type: :request do
|
|||||||
it 'does not increase version for the same snapshot update' do
|
it 'does not increase version for the same snapshot update' do
|
||||||
MaterialVersionRecorder.record!(material:, event_type: :create,
|
MaterialVersionRecorder.record!(material:, event_type: :create,
|
||||||
created_by_user: member_user)
|
created_by_user: member_user)
|
||||||
TagVersioning.ensure_snapshot!(tag, created_by_user: member_user)
|
|
||||||
|
|
||||||
expect do
|
expect do
|
||||||
put "/materials/#{ material.id }", params: {
|
put "/materials/#{ material.id }", params: {
|
||||||
@@ -588,8 +501,6 @@ RSpec.describe 'Materials API', type: :request do
|
|||||||
}
|
}
|
||||||
end.not_to change(MaterialVersion, :count)
|
end.not_to change(MaterialVersion, :count)
|
||||||
|
|
||||||
expect(tag.reload.tag_versions.count).to eq(1)
|
|
||||||
|
|
||||||
expect(response).to have_http_status(:ok)
|
expect(response).to have_http_status(:ok)
|
||||||
expect(material.reload.version_no).to eq(1)
|
expect(material.reload.version_no).to eq(1)
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -1,46 +1,28 @@
|
|||||||
require 'rails_helper'
|
require "rails_helper"
|
||||||
|
|
||||||
|
|
||||||
RSpec.describe 'Preview', type: :request do
|
RSpec.describe "Preview", type: :request do
|
||||||
describe 'GET /preview/title' do
|
describe "GET /preview/title" do
|
||||||
it '401 unless logged in' do
|
it "401 unless logged in" do
|
||||||
sign_out
|
sign_out
|
||||||
get '/preview/title', params: { url: 'example.com' }
|
get "/preview/title", params: { url: "example.com" }
|
||||||
expect(response).to have_http_status(:unauthorized)
|
expect(response).to have_http_status(:unauthorized)
|
||||||
end
|
end
|
||||||
|
|
||||||
it '403 when logged in as guest' do
|
it "400 when url blank" do
|
||||||
sign_in_as(create(:user, :guest))
|
sign_in_as(create(:user))
|
||||||
get '/preview/title', params: { url: 'example.com' }
|
get "/preview/title", params: { url: "" }
|
||||||
expect(response).to have_http_status(:forbidden)
|
|
||||||
end
|
|
||||||
|
|
||||||
it '400 when url blank' do
|
|
||||||
sign_in_as(create(:user, :member))
|
|
||||||
get '/preview/title', params: { url: '' }
|
|
||||||
expect(response).to have_http_status(:bad_request)
|
expect(response).to have_http_status(:bad_request)
|
||||||
end
|
end
|
||||||
|
|
||||||
it 'returns parsed title' do
|
it "returns parsed title (stubbing URI.open)" do
|
||||||
sign_in_as(create(:user, :member))
|
sign_in_as(create(:user))
|
||||||
allow(Preview::ThumbnailFetcher)
|
fake_html = "<html><head><title> Hello </title></head></html>"
|
||||||
.to receive(:title)
|
allow(URI).to receive(:open).and_return(StringIO.new(fake_html))
|
||||||
.with('example.com')
|
|
||||||
.and_return('Hello')
|
|
||||||
|
|
||||||
get '/preview/title', params: { url: 'example.com' }
|
get "/preview/title", params: { url: "example.com" }
|
||||||
expect(response).to have_http_status(:ok)
|
expect(response).to have_http_status(:ok)
|
||||||
expect(json['title']).to eq('Hello')
|
expect(json["title"]).to eq("Hello")
|
||||||
end
|
|
||||||
|
|
||||||
it '413 when fetched response is too large' do
|
|
||||||
sign_in_as(create(:user, :member))
|
|
||||||
allow(Preview::ThumbnailFetcher)
|
|
||||||
.to receive(:title)
|
|
||||||
.and_raise(Preview::HttpFetcher::ResponseTooLarge, '外部データが大きすぎます.')
|
|
||||||
|
|
||||||
get '/preview/title', params: { url: 'example.com' }
|
|
||||||
expect(response).to have_http_status(:payload_too_large)
|
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -1,98 +0,0 @@
|
|||||||
require 'rails_helper'
|
|
||||||
|
|
||||||
RSpec.describe 'user settings', type: :request do
|
|
||||||
describe 'GET /users/settings' do
|
|
||||||
it 'requires a current user' do
|
|
||||||
sign_out
|
|
||||||
|
|
||||||
get '/users/settings'
|
|
||||||
|
|
||||||
expect(response).to have_http_status(:unauthorized)
|
|
||||||
end
|
|
||||||
|
|
||||||
it 'returns defaults and creates a missing settings row' do
|
|
||||||
user = create(:user)
|
|
||||||
sign_in_as(user)
|
|
||||||
|
|
||||||
expect {
|
|
||||||
get '/users/settings'
|
|
||||||
}.to change(Setting, :count).by(1)
|
|
||||||
|
|
||||||
expect(response).to have_http_status(:ok)
|
|
||||||
expect(json).to eq(
|
|
||||||
'theme' => 'system',
|
|
||||||
'auto_fetch_title' => 'manual',
|
|
||||||
'auto_fetch_thumbnail' => 'manual',
|
|
||||||
'wiki_editor_mode' => 'split')
|
|
||||||
expect(user.reload.setting).to be_present
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
describe 'PATCH /users/settings' do
|
|
||||||
it 'requires a current user' do
|
|
||||||
sign_out
|
|
||||||
|
|
||||||
patch '/users/settings', params: { theme: 'dark' }, as: :json
|
|
||||||
|
|
||||||
expect(response).to have_http_status(:unauthorized)
|
|
||||||
end
|
|
||||||
|
|
||||||
it 'updates multiple typed settings at once' do
|
|
||||||
user = create(:user)
|
|
||||||
sign_in_as(user)
|
|
||||||
|
|
||||||
patch '/users/settings',
|
|
||||||
params: {
|
|
||||||
theme: 'dark',
|
|
||||||
auto_fetch_title: 'auto',
|
|
||||||
auto_fetch_thumbnail: 'off',
|
|
||||||
wiki_editor_mode: 'preview' },
|
|
||||||
as: :json
|
|
||||||
|
|
||||||
expect(response).to have_http_status(:ok)
|
|
||||||
expect(json).to include(
|
|
||||||
'theme' => 'dark',
|
|
||||||
'auto_fetch_title' => 'auto',
|
|
||||||
'auto_fetch_thumbnail' => 'off',
|
|
||||||
'wiki_editor_mode' => 'preview')
|
|
||||||
expect(user.reload.setting).to have_attributes(
|
|
||||||
theme: 'dark',
|
|
||||||
auto_fetch_title: 'auto',
|
|
||||||
auto_fetch_thumbnail: 'off',
|
|
||||||
wiki_editor_mode: 'preview')
|
|
||||||
end
|
|
||||||
|
|
||||||
it 'does not treat Rails parameter wrapping as an editable setting' do
|
|
||||||
user = create(:user)
|
|
||||||
sign_in_as(user)
|
|
||||||
|
|
||||||
patch '/users/settings',
|
|
||||||
params: { theme: 'light', user_setting: { theme: 'dark' } },
|
|
||||||
as: :json
|
|
||||||
|
|
||||||
expect(response).to have_http_status(:ok)
|
|
||||||
expect(user.reload.setting.theme).to eq('light')
|
|
||||||
end
|
|
||||||
|
|
||||||
it 'returns validation_error for type mismatches' do
|
|
||||||
sign_in_as(create(:user))
|
|
||||||
|
|
||||||
patch '/users/settings', params: { theme: 1 }, as: :json
|
|
||||||
|
|
||||||
expect(response).to have_http_status(:unprocessable_entity)
|
|
||||||
expect(json).to include('type' => 'validation_error')
|
|
||||||
expect(json.fetch('errors')).to include(
|
|
||||||
'theme' => ['値の型が不正です.'])
|
|
||||||
end
|
|
||||||
|
|
||||||
it 'returns validation_error for invalid enum values' do
|
|
||||||
sign_in_as(create(:user))
|
|
||||||
|
|
||||||
patch '/users/settings', params: { theme: 'neon' }, as: :json
|
|
||||||
|
|
||||||
expect(response).to have_http_status(:unprocessable_entity)
|
|
||||||
expect(json).to include('type' => 'validation_error')
|
|
||||||
expect(json.fetch('errors').fetch('theme')).to be_present
|
|
||||||
end
|
|
||||||
end
|
|
||||||
end
|
|
||||||
@@ -1,104 +0,0 @@
|
|||||||
require 'rails_helper'
|
|
||||||
|
|
||||||
RSpec.describe 'user theme slots', type: :request do
|
|
||||||
describe 'GET /users/theme_slots' do
|
|
||||||
it 'requires a current user' do
|
|
||||||
sign_out
|
|
||||||
|
|
||||||
get '/users/theme_slots'
|
|
||||||
|
|
||||||
expect(response).to have_http_status(:unauthorized)
|
|
||||||
end
|
|
||||||
|
|
||||||
it 'returns only the current user slots in stable order' do
|
|
||||||
user = create(:user)
|
|
||||||
other_user = create(:user)
|
|
||||||
sign_in_as(user)
|
|
||||||
UserThemeSlot.create!(user:, base_theme: 'light', slot_no: 2, tokens: { 'a' => 1 })
|
|
||||||
UserThemeSlot.create!(user:, base_theme: 'dark', slot_no: 1, tokens: { 'b' => 2 })
|
|
||||||
UserThemeSlot.create!(user: other_user,
|
|
||||||
base_theme: 'dark',
|
|
||||||
slot_no: 3,
|
|
||||||
tokens: { 'c' => 3 })
|
|
||||||
|
|
||||||
get '/users/theme_slots'
|
|
||||||
|
|
||||||
expect(response).to have_http_status(:ok)
|
|
||||||
expect(json.map { |slot| [slot.fetch('base_theme'), slot.fetch('slot_no')] }).to eq(
|
|
||||||
[['dark', 1], ['light', 2]])
|
|
||||||
expect(json.map { |slot| slot.fetch('tokens') }).to eq(
|
|
||||||
[{ 'b' => 2 }, { 'a' => 1 }])
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
describe 'PUT /users/theme_slots/:base_theme/:slot_no' do
|
|
||||||
it 'requires a current user' do
|
|
||||||
sign_out
|
|
||||||
|
|
||||||
put '/users/theme_slots/light/1',
|
|
||||||
params: { tokens: { background: '0 0% 100%' } },
|
|
||||||
as: :json
|
|
||||||
|
|
||||||
expect(response).to have_http_status(:unauthorized)
|
|
||||||
end
|
|
||||||
|
|
||||||
it 'creates a theme slot' do
|
|
||||||
user = create(:user)
|
|
||||||
sign_in_as(user)
|
|
||||||
|
|
||||||
expect {
|
|
||||||
put '/users/theme_slots/light/1',
|
|
||||||
params: { tokens: { background: '0 0% 100%', tagColours: { nico: '#ffffff' } } },
|
|
||||||
as: :json
|
|
||||||
}.to change(UserThemeSlot, :count).by(1)
|
|
||||||
|
|
||||||
expect(response).to have_http_status(:ok)
|
|
||||||
expect(json).to include('base_theme' => 'light', 'slot_no' => 1)
|
|
||||||
expect(json.fetch('tokens')).to include(
|
|
||||||
'background' => '0 0% 100%',
|
|
||||||
'tagColours' => { 'nico' => '#ffffff' })
|
|
||||||
expect(user.theme_slots.find_by!(base_theme: 'light', slot_no: 1).tokens).to include(
|
|
||||||
'background' => '0 0% 100%')
|
|
||||||
end
|
|
||||||
|
|
||||||
it 'updates an existing theme slot instead of creating a duplicate' do
|
|
||||||
user = create(:user)
|
|
||||||
sign_in_as(user)
|
|
||||||
UserThemeSlot.create!(user:, base_theme: 'dark', slot_no: 2, tokens: { 'old' => true })
|
|
||||||
|
|
||||||
expect {
|
|
||||||
put '/users/theme_slots/dark/2',
|
|
||||||
params: { tokens: { background: '222.2 84% 4.9%' } },
|
|
||||||
as: :json
|
|
||||||
}.not_to change(UserThemeSlot, :count)
|
|
||||||
|
|
||||||
expect(response).to have_http_status(:ok)
|
|
||||||
expect(user.theme_slots.find_by!(base_theme: 'dark', slot_no: 2).tokens).to eq(
|
|
||||||
'background' => '222.2 84% 4.9%')
|
|
||||||
end
|
|
||||||
|
|
||||||
it 'rejects invalid path parameters and token shapes' do
|
|
||||||
sign_in_as(create(:user))
|
|
||||||
|
|
||||||
put '/users/theme_slots/system/4',
|
|
||||||
params: { tokens: 'not-object' },
|
|
||||||
as: :json
|
|
||||||
|
|
||||||
expect(response).to have_http_status(:unprocessable_entity)
|
|
||||||
expect(json.fetch('errors')).to include(
|
|
||||||
'base_theme' => ['値が不正です.'])
|
|
||||||
end
|
|
||||||
|
|
||||||
it 'rejects non-object tokens for valid slots' do
|
|
||||||
sign_in_as(create(:user))
|
|
||||||
|
|
||||||
put '/users/theme_slots/light/1',
|
|
||||||
params: { tokens: 'not-object' },
|
|
||||||
as: :json
|
|
||||||
|
|
||||||
expect(response).to have_http_status(:unprocessable_entity)
|
|
||||||
expect(json.fetch('errors')).to include(
|
|
||||||
'tokens' => ['JSON object で指定してください.'])
|
|
||||||
end
|
|
||||||
end
|
|
||||||
end
|
|
||||||
@@ -1,23 +0,0 @@
|
|||||||
require 'rails_helper'
|
|
||||||
|
|
||||||
RSpec.describe Preview::HttpFetcher do
|
|
||||||
describe '.fetch' do
|
|
||||||
it 'raises FetchFailed when redirect location is invalid' do
|
|
||||||
redirect = Net::HTTPFound.new('1.1', '302', 'Found')
|
|
||||||
redirect['location'] = 'http://[invalid'
|
|
||||||
|
|
||||||
allow(Preview::UrlSafety).to receive(:validate)
|
|
||||||
.with('https://example.com/page')
|
|
||||||
.and_return([URI.parse('https://example.com/page'), ['203.0.113.10']])
|
|
||||||
allow(described_class).to receive(:request)
|
|
||||||
.and_return(redirect)
|
|
||||||
allow(Rails.logger).to receive(:warn)
|
|
||||||
|
|
||||||
expect {
|
|
||||||
described_class.fetch('https://example.com/page')
|
|
||||||
}.to raise_error(Preview::HttpFetcher::FetchFailed)
|
|
||||||
expect(Rails.logger).to have_received(:warn)
|
|
||||||
.with(/invalid_redirect_location/)
|
|
||||||
end
|
|
||||||
end
|
|
||||||
end
|
|
||||||
@@ -1,51 +0,0 @@
|
|||||||
require 'rails_helper'
|
|
||||||
|
|
||||||
RSpec.describe Preview::ThumbnailFetcher do
|
|
||||||
describe '.fetch' do
|
|
||||||
it 'rejects svg thumbnails' do
|
|
||||||
page = Preview::HttpFetcher::Response.new(
|
|
||||||
'<meta property="og:image" content="https://example.com/thumb.svg">',
|
|
||||||
'text/html',
|
|
||||||
'https://example.com/page')
|
|
||||||
svg = Preview::HttpFetcher::Response.new(
|
|
||||||
'<svg></svg>',
|
|
||||||
'image/svg+xml',
|
|
||||||
'https://example.com/thumb.svg')
|
|
||||||
|
|
||||||
allow(Preview::UrlSafety).to receive(:validate)
|
|
||||||
.and_return([URI.parse('https://example.com/page'), ['203.0.113.10']])
|
|
||||||
allow(Preview::HttpFetcher).to receive(:fetch)
|
|
||||||
.with('https://example.com/page', max_bytes: described_class::HTML_MAX_BYTES)
|
|
||||||
.and_return(page)
|
|
||||||
allow(Preview::HttpFetcher).to receive(:fetch)
|
|
||||||
.with('https://example.com/thumb.svg')
|
|
||||||
.and_return(svg)
|
|
||||||
|
|
||||||
expect {
|
|
||||||
described_class.fetch('https://example.com/page')
|
|
||||||
}.to raise_error(Preview::ThumbnailFetcher::GenerationFailed)
|
|
||||||
end
|
|
||||||
|
|
||||||
it 'accepts allowed image content type with parameters' do
|
|
||||||
page = Preview::HttpFetcher::Response.new(
|
|
||||||
'<meta property="og:image" content="https://example.com/thumb.jpg">',
|
|
||||||
'text/html',
|
|
||||||
'https://example.com/page')
|
|
||||||
image = Preview::HttpFetcher::Response.new(
|
|
||||||
'jpeg-bytes',
|
|
||||||
'image/jpeg; charset=binary',
|
|
||||||
'https://example.com/thumb.jpg')
|
|
||||||
|
|
||||||
allow(Preview::UrlSafety).to receive(:validate)
|
|
||||||
.and_return([URI.parse('https://example.com/page'), ['203.0.113.10']])
|
|
||||||
allow(Preview::HttpFetcher).to receive(:fetch)
|
|
||||||
.with('https://example.com/page', max_bytes: described_class::HTML_MAX_BYTES)
|
|
||||||
.and_return(page)
|
|
||||||
allow(Preview::HttpFetcher).to receive(:fetch)
|
|
||||||
.with('https://example.com/thumb.jpg')
|
|
||||||
.and_return(image)
|
|
||||||
|
|
||||||
expect(described_class.fetch('https://example.com/page')).to eq('jpeg-bytes')
|
|
||||||
end
|
|
||||||
end
|
|
||||||
end
|
|
||||||
@@ -1,15 +0,0 @@
|
|||||||
require 'rails_helper'
|
|
||||||
|
|
||||||
RSpec.describe Preview::UrlSafety do
|
|
||||||
describe '.validate' do
|
|
||||||
it 'raises UnsafeUrl when DNS resolution fails' do
|
|
||||||
allow(Resolv).to receive(:getaddresses)
|
|
||||||
.with('missing.example')
|
|
||||||
.and_raise(Resolv::ResolvError)
|
|
||||||
|
|
||||||
expect {
|
|
||||||
described_class.validate('https://missing.example')
|
|
||||||
}.to raise_error(Preview::UrlSafety::UnsafeUrl)
|
|
||||||
end
|
|
||||||
end
|
|
||||||
end
|
|
||||||
@@ -62,7 +62,7 @@ RSpec.describe 'nico:export' do
|
|||||||
|
|
||||||
it 'deduplicates video ids' do
|
it 'deduplicates video ids' do
|
||||||
create_post('https://www.nicovideo.jp/watch/sm12345')
|
create_post('https://www.nicovideo.jp/watch/sm12345')
|
||||||
create_post('https://sp.nicovideo.jp/watch/sm12345')
|
create_post('https://www.nicovideo.jp/watch/sm12345?from=1')
|
||||||
|
|
||||||
expect(Open3).to receive(:capture3) do |_env, *args, **_kwargs|
|
expect(Open3).to receive(:capture3) do |_env, *args, **_kwargs|
|
||||||
expect(args.drop(3)).to eq(['sm12345'])
|
expect(args.drop(3)).to eq(['sm12345'])
|
||||||
|
|||||||
+28
-36
@@ -122,44 +122,37 @@ pass or the remaining failure is clearly blocked.
|
|||||||
if the class cannot be statically detected.
|
if the class cannot be statically detected.
|
||||||
- Do not introduce new UI libraries or production dependencies without approval.
|
- Do not introduce new UI libraries or production dependencies without approval.
|
||||||
|
|
||||||
## TypeScript and TSX formatting
|
## TSX formatting
|
||||||
|
|
||||||
- The delimiter-placement and line-breaking rules in this section apply to
|
|
||||||
both plain TypeScript `.ts` and TSX `.tsx`, unless a bullet explicitly says
|
|
||||||
it is JSX- or React-specific.
|
|
||||||
- Preserve compact TSX expression shapes such as inline ternary branches and
|
- Preserve compact TSX expression shapes such as inline ternary branches and
|
||||||
closing `</div>)` forms when nearby code uses them.
|
closing `</div>)` forms when nearby code uses them.
|
||||||
- Treat TypeScript and TSX formatting rules as hard constraints, not
|
- Treat TSX formatting rules as hard constraints, not preferences. Before
|
||||||
preferences. Before finishing a TypeScript or TSX edit, inspect the edited
|
finishing a TSX edit, inspect the edited hunks for closing `)`, `]`, and `}`
|
||||||
hunks for closing `)`, `]`, and `}` placement and fix violations instead of
|
placement and fix violations instead of relying on formatter defaults.
|
||||||
relying on formatter defaults.
|
- After every TSX edit, perform a style-only self-review of the edited hunks
|
||||||
- After every TypeScript or TSX edit, perform a style-only self-review of the
|
before running verification or reporting completion. The task is not complete
|
||||||
edited hunks before running verification or reporting completion. The task is
|
while any edited TSX hunk violates these local formatting rules.
|
||||||
not complete while any edited TypeScript or TSX hunk violates these local
|
- The TSX self-review must classify every edited leading or trailing `)`, `]`,
|
||||||
formatting rules.
|
and `}` by syntax role before deciding whether it is valid. Do not apply a
|
||||||
- The TypeScript/TSX self-review must classify every edited leading or trailing
|
rule by glyph alone. A closing `)` for a function parameter list is different
|
||||||
`)`, `]`, and `}` by syntax role before deciding whether it is valid. Do not
|
from a closing `)` for a function call. A closing `}` for a block is different
|
||||||
apply a rule by glyph alone. A closing `)` for a function parameter list is
|
from a closing `}` for an object, type literal, import list, or destructuring
|
||||||
different from a closing `)` for a function call. A closing `}` for a block
|
pattern.
|
||||||
is different from a closing `}` for an object, type literal, import list, or
|
- The TSX self-review must confirm there are no common Prettier-style React
|
||||||
destructuring pattern.
|
component declarations with a multi-line destructured parameter.
|
||||||
- The TSX-specific self-review must confirm there are no common Prettier-style
|
- The TSX self-review must confirm multi-line function declaration parameter
|
||||||
React component declarations with a multi-line destructured parameter.
|
`)` placement follows the detailed parameter-list rules below.
|
||||||
- The TypeScript/TSX self-review must confirm multi-line function declaration
|
- The TSX self-review must confirm call-expression `)` is never at the
|
||||||
parameter `)` placement follows the detailed parameter-list rules below.
|
|
||||||
- The TypeScript/TSX self-review must confirm call-expression `)` is never at
|
|
||||||
the beginning of a line.
|
|
||||||
- The TypeScript/TSX self-review must confirm
|
|
||||||
object/type/import/destructuring `}` is not at the beginning of a line.
|
|
||||||
- The TypeScript/TSX self-review must confirm multi-line
|
|
||||||
function/lambda/callback/block `}` is on its own line and never at the end
|
|
||||||
of the previous line.
|
|
||||||
- The TypeScript/TSX self-review must confirm array `]` is not at the
|
|
||||||
beginning of a line.
|
beginning of a line.
|
||||||
- The TSX-specific self-review must confirm JSX closing markers and closing
|
- The TSX self-review must confirm object/type/import/destructuring `}` is not
|
||||||
parentheses keep the surrounding compact style.
|
at the beginning of a line.
|
||||||
- The TypeScript/TSX self-review must confirm leading indentation follows
|
- The TSX self-review must confirm multi-line function/lambda/callback/block
|
||||||
4-space logical indentation with tabs only as leading 8-space compression.
|
`}` is on its own line and never at the end of the previous line.
|
||||||
|
- The TSX self-review must confirm array `]` is not at the beginning of a line.
|
||||||
|
- The TSX self-review must confirm JSX closing markers and closing parentheses
|
||||||
|
keep the surrounding compact style.
|
||||||
|
- The TSX self-review must confirm leading indentation follows 4-space logical
|
||||||
|
indentation with tabs only as leading 8-space compression.
|
||||||
- For long Tailwind `className` strings, wrap across lines only when needed.
|
- For long Tailwind `className` strings, wrap across lines only when needed.
|
||||||
- Keep continuation indentation aligned with the 4-space logical indentation
|
- Keep continuation indentation aligned with the 4-space logical indentation
|
||||||
rule, using tabs only as leading 8-space compression.
|
rule, using tabs only as leading 8-space compression.
|
||||||
@@ -222,8 +215,7 @@ pass or the remaining failure is clearly blocked.
|
|||||||
### Delimiter decision table
|
### Delimiter decision table
|
||||||
|
|
||||||
Use this table before accepting any edited TypeScript or TSX hunk. The table is
|
Use this table before accepting any edited TypeScript or TSX hunk. The table is
|
||||||
more authoritative than formatter habit. Unless a subsection explicitly
|
more authoritative than formatter habit.
|
||||||
mentions JSX, it applies equally to `.ts` and `.tsx`.
|
|
||||||
|
|
||||||
#### Import and export named bindings
|
#### Import and export named bindings
|
||||||
|
|
||||||
|
|||||||
+16
-79
@@ -1,5 +1,5 @@
|
|||||||
import { AnimatePresence, LayoutGroup, MotionConfig, motion } from 'framer-motion'
|
import { AnimatePresence, LayoutGroup, MotionConfig, motion } from 'framer-motion'
|
||||||
import { Fragment, useEffect, useMemo, useState } from 'react'
|
import { useEffect, useMemo, useState } from 'react'
|
||||||
import { BrowserRouter,
|
import { BrowserRouter,
|
||||||
Navigate,
|
Navigate,
|
||||||
Route,
|
Route,
|
||||||
@@ -12,18 +12,11 @@ import TopNav from '@/components/TopNav'
|
|||||||
import DialogueProvider from '@/components/dialogues/DialogueProvider'
|
import DialogueProvider from '@/components/dialogues/DialogueProvider'
|
||||||
import { Toaster } from '@/components/ui/toaster'
|
import { Toaster } from '@/components/ui/toaster'
|
||||||
import { apiPost, isApiError } from '@/lib/api'
|
import { apiPost, isApiError } from '@/lib/api'
|
||||||
import { applyClientAnimationMode,
|
import { applyClientAppearance,
|
||||||
applyClientAppearance,
|
|
||||||
type ClientAnimationMode,
|
|
||||||
fetchUserThemeSlots,
|
|
||||||
fetchUserSettings,
|
fetchUserSettings,
|
||||||
getClientThemeMode,
|
getClientThemeMode,
|
||||||
hasStoredClientThemeSelection,
|
|
||||||
normaliseUserThemeSlots,
|
|
||||||
setCachedUserThemeSlots,
|
|
||||||
seedClientThemeMode } from '@/lib/settings'
|
seedClientThemeMode } from '@/lib/settings'
|
||||||
import { useClientBehaviourSettings } from '@/lib/useClientBehaviourSettings'
|
import { useClientBehaviourSettings } from '@/lib/useClientBehaviourSettings'
|
||||||
import { UnsavedChangesGuardProvider } from '@/lib/useUnsavedChangesGuard'
|
|
||||||
|
|
||||||
import { KeyboardShortcutsProvider } from '@/lib/useKeyboardShortcuts'
|
import { KeyboardShortcutsProvider } from '@/lib/useKeyboardShortcuts'
|
||||||
import DeerjikistDetailPage from '@/pages/deerjikists/DeerjikistDetailPage'
|
import DeerjikistDetailPage from '@/pages/deerjikists/DeerjikistDetailPage'
|
||||||
@@ -62,51 +55,11 @@ import type { Dispatch, FC, SetStateAction } from 'react'
|
|||||||
import type { User } from '@/types'
|
import type { User } from '@/types'
|
||||||
|
|
||||||
|
|
||||||
const RouteTransitionWrapper = ({ animationMode, user, setUser }: {
|
const RouteTransitionWrapper = ({ user, setUser }: {
|
||||||
animationMode: ClientAnimationMode
|
|
||||||
user: User | null
|
user: User | null
|
||||||
setUser: Dispatch<SetStateAction<User | null>> }) => {
|
setUser: Dispatch<SetStateAction<User | null>> }) => {
|
||||||
const location = useLocation ()
|
const location = useLocation ()
|
||||||
|
|
||||||
if (animationMode === 'off')
|
|
||||||
{
|
|
||||||
return (
|
|
||||||
<Routes location={location}>
|
|
||||||
<Route path="/" element={<Navigate to="/posts" replace/>}/>
|
|
||||||
<Route path="/posts" element={<PostListPage/>}/>
|
|
||||||
<Route path="/posts/new" element={<PostNewPage user={user}/>}/>
|
|
||||||
<Route path="/posts/search" element={<PostSearchPage/>}/>
|
|
||||||
<Route path="/posts/:id" element={<PostDetailRoute user={user}/>}/>
|
|
||||||
<Route path="/posts/changes" element={<PostHistoryPage/>}/>
|
|
||||||
<Route path="/tags" element={<TagListPage/>}/>
|
|
||||||
<Route path="/tags/:id" element={<TagDetailPage/>}/>
|
|
||||||
<Route path="/tags/:id/deerjikists" element={<DeerjikistDetailPage/>}/>
|
|
||||||
<Route path="/tags/nico" element={<NicoTagListPage user={user}/>}/>
|
|
||||||
<Route path="/nico/tags" element={<NicoTagListPage user={user}/>}/>
|
|
||||||
<Route path="/tags/changes" element={<TagHistoryPage/>}/>
|
|
||||||
<Route path="/theatres/:id" element={<TheatreDetailPage user={user}/>}/>
|
|
||||||
<Route path="/materials" element={<MaterialBasePage/>}>
|
|
||||||
<Route index element={<MaterialListPage/>}/>
|
|
||||||
<Route path="changes" element={<MaterialHistoryPage/>}/>
|
|
||||||
<Route path="new" element={<MaterialNewPage/>}/>
|
|
||||||
<Route path="suppressions" element={<MaterialSyncSuppressionsPage/>}/>
|
|
||||||
<Route path=":id" element ={<MaterialDetailPage/>}/>
|
|
||||||
</Route>
|
|
||||||
<Route path="/wiki" element={<WikiSearchPage/>}/>
|
|
||||||
<Route path="/wiki/:title" element={<WikiDetailPage/>}/>
|
|
||||||
<Route path="/wiki/new" element={<WikiNewPage user={user}/>}/>
|
|
||||||
<Route path="/wiki/:id/edit" element={<WikiEditPage user={user}/>}/>
|
|
||||||
<Route path="/wiki/:id/diff" element={<WikiDiffPage/>}/>
|
|
||||||
<Route path="/wiki/changes" element={<WikiHistoryPage/>}/>
|
|
||||||
<Route path="/users/settings" element={<SettingPage user={user} setUser={setUser}/>}/>
|
|
||||||
<Route path="/settings" element={<Navigate to="/users/settings" replace/>}/>
|
|
||||||
<Route path="/tos" element={<TOSPage/>}/>
|
|
||||||
<Route path="/gekanator" element={<GekanatorPage user={user}/>}/>
|
|
||||||
<Route path="/more" element={<MorePage/>}/>
|
|
||||||
<Route path="*" element={<NotFound/>}/>
|
|
||||||
</Routes>)
|
|
||||||
}
|
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<AnimatePresence mode="wait">
|
<AnimatePresence mode="wait">
|
||||||
<Routes location={location}>
|
<Routes location={location}>
|
||||||
@@ -159,7 +112,6 @@ const App: FC = () => {
|
|||||||
const [status, setStatus] = useState (200)
|
const [status, setStatus] = useState (200)
|
||||||
const behaviourSettings = useClientBehaviourSettings ()
|
const behaviourSettings = useClientBehaviourSettings ()
|
||||||
const animationMode = behaviourSettings.animation ?? 'normal'
|
const animationMode = behaviourSettings.animation ?? 'normal'
|
||||||
const LayoutWrapper = animationMode === 'off' ? Fragment : LayoutGroup
|
|
||||||
|
|
||||||
const appLayoutTransition = useMemo (
|
const appLayoutTransition = useMemo (
|
||||||
() => (
|
() => (
|
||||||
@@ -185,10 +137,6 @@ const App: FC = () => {
|
|||||||
return () => mediaQuery.removeEventListener ('change', handleThemeChange)
|
return () => mediaQuery.removeEventListener ('change', handleThemeChange)
|
||||||
}, [])
|
}, [])
|
||||||
|
|
||||||
useEffect (() => {
|
|
||||||
applyClientAnimationMode (animationMode)
|
|
||||||
}, [animationMode])
|
|
||||||
|
|
||||||
useEffect (() => {
|
useEffect (() => {
|
||||||
const createUser = async () => {
|
const createUser = async () => {
|
||||||
const data = await apiPost<{ code: string; user: User }> ('/users')
|
const data = await apiPost<{ code: string; user: User }> ('/users')
|
||||||
@@ -227,18 +175,12 @@ const App: FC = () => {
|
|||||||
return
|
return
|
||||||
|
|
||||||
void (async () => {
|
void (async () => {
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
const [settings, themeSlots] = await Promise.all ([
|
const settings = await fetchUserSettings ()
|
||||||
fetchUserSettings (),
|
seedClientThemeMode (settings.theme)
|
||||||
fetchUserThemeSlots (),
|
applyClientAppearance ()
|
||||||
])
|
}
|
||||||
const storedThemeSlots = normaliseUserThemeSlots (themeSlots)
|
|
||||||
setCachedUserThemeSlots (storedThemeSlots)
|
|
||||||
if (!(hasStoredClientThemeSelection ()))
|
|
||||||
seedClientThemeMode (settings.theme)
|
|
||||||
applyClientAppearance ()
|
|
||||||
}
|
|
||||||
catch
|
catch
|
||||||
{
|
{
|
||||||
return
|
return
|
||||||
@@ -258,9 +200,8 @@ const App: FC = () => {
|
|||||||
{import.meta.env.DEV && <DevModeWatermark/>}
|
{import.meta.env.DEV && <DevModeWatermark/>}
|
||||||
|
|
||||||
<BrowserRouter>
|
<BrowserRouter>
|
||||||
<DialogueProvider>
|
<KeyboardShortcutsProvider>
|
||||||
<UnsavedChangesGuardProvider>
|
<DialogueProvider>
|
||||||
<KeyboardShortcutsProvider>
|
|
||||||
<MotionConfig
|
<MotionConfig
|
||||||
reducedMotion={
|
reducedMotion={
|
||||||
animationMode === 'normal'
|
animationMode === 'normal'
|
||||||
@@ -269,24 +210,20 @@ const App: FC = () => {
|
|||||||
? 'user'
|
? 'user'
|
||||||
: 'always'
|
: 'always'
|
||||||
}>
|
}>
|
||||||
<LayoutWrapper>
|
<LayoutGroup>
|
||||||
<motion.div
|
<motion.div
|
||||||
layout={animationMode === 'off' ? false : 'position'}
|
layout={animationMode === 'off' ? false : 'position'}
|
||||||
transition={{ layout: appLayoutTransition }}
|
transition={{ layout: appLayoutTransition }}
|
||||||
className="relative flex flex-col h-dvh w-full overflow-y-hidden">
|
className="relative flex flex-col h-dvh w-full overflow-y-hidden">
|
||||||
<TopNav user={user}/>
|
<TopNav user={user}/>
|
||||||
<RouteTransitionWrapper
|
<RouteTransitionWrapper user={user} setUser={setUser}/>
|
||||||
animationMode={animationMode}
|
|
||||||
user={user}
|
|
||||||
setUser={setUser}/>
|
|
||||||
</motion.div>
|
</motion.div>
|
||||||
</LayoutWrapper>
|
</LayoutGroup>
|
||||||
</MotionConfig>
|
</MotionConfig>
|
||||||
|
|
||||||
<Toaster/>
|
<Toaster/>
|
||||||
</KeyboardShortcutsProvider>
|
</DialogueProvider>
|
||||||
</UnsavedChangesGuardProvider>
|
</KeyboardShortcutsProvider>
|
||||||
</DialogueProvider>
|
|
||||||
</BrowserRouter>
|
</BrowserRouter>
|
||||||
</>)
|
</>)
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,75 +0,0 @@
|
|||||||
import { beforeEach, describe, expect, it, vi } from 'vitest'
|
|
||||||
|
|
||||||
import DraggableDroppableTagRow from '@/components/DraggableDroppableTagRow'
|
|
||||||
import { buildTag } from '@/test/factories'
|
|
||||||
import { renderWithProviders } from '@/test/render'
|
|
||||||
|
|
||||||
const dndKit = vi.hoisted (() => ({
|
|
||||||
useDraggable: vi.fn (),
|
|
||||||
useDroppable: vi.fn (),
|
|
||||||
}))
|
|
||||||
|
|
||||||
vi.mock ('@dnd-kit/core', () => dndKit)
|
|
||||||
|
|
||||||
const tag = buildTag ({ id: 7, name: 'ドラッグ元', postCount: 3 })
|
|
||||||
|
|
||||||
const renderRow = (activeDndId?: string) => {
|
|
||||||
renderWithProviders (
|
|
||||||
<DraggableDroppableTagRow
|
|
||||||
activeDndId={activeDndId}
|
|
||||||
tag={tag}
|
|
||||||
nestLevel={2}
|
|
||||||
pathKey="cat-general-7"
|
|
||||||
suppressClickRef={{ current: false }}/>,
|
|
||||||
)
|
|
||||||
}
|
|
||||||
|
|
||||||
const tagBody = (): HTMLElement => {
|
|
||||||
const link = document.querySelector<HTMLElement> ('a[title="ドラッグ元"]')
|
|
||||||
|
|
||||||
if (link == null)
|
|
||||||
throw new Error ('tag link not found')
|
|
||||||
|
|
||||||
const body = link.closest ('div')
|
|
||||||
|
|
||||||
if (body == null)
|
|
||||||
throw new Error ('tag body not found')
|
|
||||||
|
|
||||||
return body
|
|
||||||
}
|
|
||||||
|
|
||||||
describe ('DraggableDroppableTagRow', () => {
|
|
||||||
beforeEach (() => {
|
|
||||||
vi.clearAllMocks ()
|
|
||||||
dndKit.useDraggable.mockReturnValue ({
|
|
||||||
attributes: { 'aria-describedby': 'drag-source' },
|
|
||||||
listeners: { onPointerDown: vi.fn () },
|
|
||||||
setNodeRef: vi.fn (),
|
|
||||||
transform: null })
|
|
||||||
dndKit.useDroppable.mockReturnValue ({
|
|
||||||
isOver: false,
|
|
||||||
setNodeRef: vi.fn () })
|
|
||||||
})
|
|
||||||
|
|
||||||
it ('passes dndId through draggable data for active-row tracking', () => {
|
|
||||||
renderRow ()
|
|
||||||
|
|
||||||
expect (dndKit.useDraggable).toHaveBeenCalledWith (
|
|
||||||
expect.objectContaining ({
|
|
||||||
id: 'tag-node:cat-general-7',
|
|
||||||
data: expect.objectContaining ({
|
|
||||||
dndId: 'tag-node:cat-general-7',
|
|
||||||
nestLevel: 2,
|
|
||||||
tagId: 7 }) }))
|
|
||||||
})
|
|
||||||
|
|
||||||
it ('hides only the active drag source from the explicit active dnd id', () => {
|
|
||||||
renderRow ('tag-node:cat-general-7')
|
|
||||||
expect (tagBody ()).toHaveStyle ({ visibility: 'hidden' })
|
|
||||||
})
|
|
||||||
|
|
||||||
it ('keeps inactive tag rows visible while another tag is dragged', () => {
|
|
||||||
renderRow ('tag-node:other')
|
|
||||||
expect (tagBody ()).toHaveStyle ({ visibility: 'visible' })
|
|
||||||
})
|
|
||||||
})
|
|
||||||
@@ -4,8 +4,6 @@ import { motion } from 'framer-motion'
|
|||||||
import { useRef } from 'react'
|
import { useRef } from 'react'
|
||||||
|
|
||||||
import TagLink from '@/components/TagLink'
|
import TagLink from '@/components/TagLink'
|
||||||
import { clientAnimationTransition } from '@/lib/clientAnimation'
|
|
||||||
import { useClientBehaviourSettings } from '@/lib/useClientBehaviourSettings'
|
|
||||||
import { cn } from '@/lib/utils'
|
import { cn } from '@/lib/utils'
|
||||||
|
|
||||||
import type { CSSProperties, FC, MutableRefObject } from 'react'
|
import type { CSSProperties, FC, MutableRefObject } from 'react'
|
||||||
@@ -13,7 +11,6 @@ import type { CSSProperties, FC, MutableRefObject } from 'react'
|
|||||||
import type { Tag } from '@/types'
|
import type { Tag } from '@/types'
|
||||||
|
|
||||||
type Props = {
|
type Props = {
|
||||||
activeDndId?: string
|
|
||||||
tag: Tag
|
tag: Tag
|
||||||
nestLevel: number
|
nestLevel: number
|
||||||
pathKey: string
|
pathKey: string
|
||||||
@@ -22,21 +19,7 @@ type Props = {
|
|||||||
sp?: boolean }
|
sp?: boolean }
|
||||||
|
|
||||||
|
|
||||||
const DraggableDroppableTagRow: FC<Props> = ({
|
const DraggableDroppableTagRow: FC<Props> = ({ tag, nestLevel, pathKey, parentTagId, suppressClickRef, sp }) => {
|
||||||
activeDndId,
|
|
||||||
tag,
|
|
||||||
nestLevel,
|
|
||||||
pathKey,
|
|
||||||
parentTagId,
|
|
||||||
suppressClickRef,
|
|
||||||
sp,
|
|
||||||
}) => {
|
|
||||||
const behaviourSettings = useClientBehaviourSettings ()
|
|
||||||
const animationMode = behaviourSettings.animation ?? 'normal'
|
|
||||||
const layoutTransition = clientAnimationTransition (
|
|
||||||
animationMode,
|
|
||||||
{ normal: { duration: .2, ease: 'easeOut' as const } },
|
|
||||||
)
|
|
||||||
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)
|
||||||
@@ -62,23 +45,18 @@ const DraggableDroppableTagRow: FC<Props> = ({
|
|||||||
const { attributes,
|
const { attributes,
|
||||||
listeners,
|
listeners,
|
||||||
setNodeRef: setDragRef,
|
setNodeRef: setDragRef,
|
||||||
transform } = useDraggable ({ id: dndId,
|
transform,
|
||||||
data: { kind: 'tag',
|
isDragging: dragging } = useDraggable ({ id: dndId,
|
||||||
dndId,
|
data: { kind: 'tag',
|
||||||
tagId: tag.id,
|
tagId: tag.id,
|
||||||
parentTagId,
|
parentTagId } })
|
||||||
nestLevel } })
|
|
||||||
|
|
||||||
const { setNodeRef: setDropRef, isOver: over } = useDroppable ({
|
const { setNodeRef: setDropRef, isOver: over } = useDroppable ({
|
||||||
id: dndId,
|
id: dndId,
|
||||||
data: { kind: 'tag', tagId: tag.id } })
|
data: { kind: 'tag', tagId: tag.id } })
|
||||||
|
|
||||||
const activeDragging = activeDndId === dndId
|
|
||||||
const style: CSSProperties = { transform: CSS.Translate.toString (transform),
|
const style: CSSProperties = { transform: CSS.Translate.toString (transform),
|
||||||
visibility: activeDragging ? 'hidden' : 'visible' }
|
visibility: dragging ? 'hidden' : 'visible' }
|
||||||
const innerClassName = cn (
|
|
||||||
'inline-flex min-w-0 max-w-full items-baseline overflow-hidden',
|
|
||||||
sp && 'touch-pan-y')
|
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<div
|
<div
|
||||||
@@ -91,16 +69,12 @@ const DraggableDroppableTagRow: FC<Props> = ({
|
|||||||
return
|
return
|
||||||
const dx = e.clientX - p.x
|
const dx = e.clientX - p.x
|
||||||
const dy = e.clientY - p.y
|
const dy = e.clientY - p.y
|
||||||
|
|
||||||
if (dx * dx + dy * dy >= 9)
|
if (dx * dx + dy * dy >= 9)
|
||||||
armEatNextClick ()
|
armEatNextClick ()
|
||||||
}}
|
}}
|
||||||
onPointerUpCapture={() => {
|
onPointerUpCapture={() => {
|
||||||
downPosRef.current = null
|
downPosRef.current = null
|
||||||
}}
|
}}
|
||||||
onPointerCancelCapture={() => {
|
|
||||||
downPosRef.current = null
|
|
||||||
}}
|
|
||||||
onClickCapture={e => {
|
onClickCapture={e => {
|
||||||
if (suppressClickRef.current)
|
if (suppressClickRef.current)
|
||||||
{
|
{
|
||||||
@@ -108,35 +82,22 @@ const DraggableDroppableTagRow: FC<Props> = ({
|
|||||||
e.stopPropagation ()
|
e.stopPropagation ()
|
||||||
}
|
}
|
||||||
}}
|
}}
|
||||||
ref={setDropRef}
|
ref={node => {
|
||||||
|
setDragRef (node)
|
||||||
|
setDropRef (node)
|
||||||
|
}}
|
||||||
|
style={style}
|
||||||
className={cn (
|
className={cn (
|
||||||
'min-w-0 max-w-full overflow-hidden rounded select-none',
|
'min-w-0 max-w-full overflow-hidden rounded select-none',
|
||||||
sp && 'touch-pan-y',
|
|
||||||
over && 'ring-2 ring-offset-2')}
|
over && 'ring-2 ring-offset-2')}
|
||||||
>
|
{...attributes}
|
||||||
{activeDragging
|
{...listeners}>
|
||||||
? (
|
<motion.div
|
||||||
<div
|
className="flex min-w-0 max-w-full items-baseline overflow-hidden"
|
||||||
ref={setDragRef}
|
transition={{ layout: { duration: .2, ease: 'easeOut' } }}
|
||||||
style={style}
|
layoutId={`tag-${ sp ? 'sp-' : '' }${ tag.id }`}>
|
||||||
className={innerClassName}
|
<TagLink tag={tag} nestLevel={nestLevel}/>
|
||||||
{...attributes}
|
</motion.div>
|
||||||
{...listeners}>
|
|
||||||
<TagLink tag={tag} nestLevel={nestLevel}/>
|
|
||||||
</div>)
|
|
||||||
: (
|
|
||||||
<motion.div
|
|
||||||
ref={setDragRef}
|
|
||||||
style={style}
|
|
||||||
className={innerClassName}
|
|
||||||
{...attributes}
|
|
||||||
{...listeners}
|
|
||||||
transition={{ layout: layoutTransition }}
|
|
||||||
layoutId={animationMode === 'off'
|
|
||||||
? undefined
|
|
||||||
: `tag-${ sp ? 'sp-' : '' }${ tag.id }`}>
|
|
||||||
<TagLink tag={tag} nestLevel={nestLevel}/>
|
|
||||||
</motion.div>)}
|
|
||||||
</div>)
|
</div>)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -5,8 +5,6 @@ import { createPath, useNavigate } from 'react-router-dom'
|
|||||||
|
|
||||||
import { useOverlayStore } from '@/components/RouteBlockerOverlay'
|
import { useOverlayStore } from '@/components/RouteBlockerOverlay'
|
||||||
import { prefetchForURL } from '@/lib/prefetchers'
|
import { prefetchForURL } from '@/lib/prefetchers'
|
||||||
import { useClientBehaviourSettings } from '@/lib/useClientBehaviourSettings'
|
|
||||||
import { useUnsavedChangesGuard } from '@/lib/useUnsavedChangesGuard'
|
|
||||||
import { cn } from '@/lib/utils'
|
import { cn } from '@/lib/utils'
|
||||||
|
|
||||||
import type { AnchorHTMLAttributes, MouseEvent, TouchEvent } from 'react'
|
import type { AnchorHTMLAttributes, MouseEvent, TouchEvent } from 'react'
|
||||||
@@ -35,20 +33,10 @@ export default forwardRef<HTMLAnchorElement, Props> (({
|
|||||||
|
|
||||||
const navigate = useNavigate ()
|
const navigate = useNavigate ()
|
||||||
const qc = useQueryClient ()
|
const qc = useQueryClient ()
|
||||||
const behaviourSettings = useClientBehaviourSettings ()
|
|
||||||
const { confirmDiscardNavigation } = useUnsavedChangesGuard ()
|
|
||||||
const linkPreloadMode = behaviourSettings.linkPreload ?? 'intent'
|
|
||||||
const path = useMemo (
|
|
||||||
() => typeof to === 'string' ? to : createPath (to),
|
|
||||||
[to],
|
|
||||||
)
|
|
||||||
const url = useMemo (() => {
|
const url = useMemo (() => {
|
||||||
return (new URL (path, window.location.origin)).toString ()
|
const path = (typeof to === 'string') ? to : createPath (to)
|
||||||
}, [path])
|
return (new URL (path, location.origin)).toString ()
|
||||||
const nextPathname = useMemo (
|
}, [to])
|
||||||
() => (new URL (path, window.location.origin)).pathname,
|
|
||||||
[path],
|
|
||||||
)
|
|
||||||
const setOverlay = useOverlayStore (s => s.setActive)
|
const setOverlay = useOverlayStore (s => s.setActive)
|
||||||
|
|
||||||
const doPrefetch = async () => {
|
const doPrefetch = async () => {
|
||||||
@@ -66,15 +54,11 @@ export default forwardRef<HTMLAnchorElement, Props> (({
|
|||||||
|
|
||||||
const handleMouseEnter = async (ev: MouseEvent<HTMLAnchorElement>) => {
|
const handleMouseEnter = async (ev: MouseEvent<HTMLAnchorElement>) => {
|
||||||
onMouseEnter?.(ev)
|
onMouseEnter?.(ev)
|
||||||
if (ev.defaultPrevented || linkPreloadMode !== 'intent')
|
|
||||||
return
|
|
||||||
await doPrefetch ()
|
await doPrefetch ()
|
||||||
}
|
}
|
||||||
|
|
||||||
const handleTouchStart = async (ev: TouchEvent<HTMLAnchorElement>) => {
|
const handleTouchStart = async (ev: TouchEvent<HTMLAnchorElement>) => {
|
||||||
onTouchStart?.(ev)
|
onTouchStart?.(ev)
|
||||||
if (ev.defaultPrevented || linkPreloadMode !== 'intent')
|
|
||||||
return
|
|
||||||
await doPrefetch ()
|
await doPrefetch ()
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -93,13 +77,6 @@ export default forwardRef<HTMLAnchorElement, Props> (({
|
|||||||
|
|
||||||
ev.preventDefault ()
|
ev.preventDefault ()
|
||||||
|
|
||||||
if (nextPathname !== window.location.pathname)
|
|
||||||
{
|
|
||||||
const confirmed = await confirmDiscardNavigation ()
|
|
||||||
if (!(confirmed))
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
flushSync (() => {
|
flushSync (() => {
|
||||||
setOverlay (true)
|
setOverlay (true)
|
||||||
})
|
})
|
||||||
@@ -122,7 +99,7 @@ export default forwardRef<HTMLAnchorElement, Props> (({
|
|||||||
|
|
||||||
return (
|
return (
|
||||||
<a ref={ref}
|
<a ref={ref}
|
||||||
href={path}
|
href={typeof to === 'string' ? to : createPath (to)}
|
||||||
onMouseEnter={handleMouseEnter}
|
onMouseEnter={handleMouseEnter}
|
||||||
onTouchStart={handleTouchStart}
|
onTouchStart={handleTouchStart}
|
||||||
onClick={handleClick}
|
onClick={handleClick}
|
||||||
|
|||||||
@@ -1,4 +1,3 @@
|
|||||||
import { useClientBehaviourSettings } from '@/lib/useClientBehaviourSettings'
|
|
||||||
import { cn } from '@/lib/utils'
|
import { cn } from '@/lib/utils'
|
||||||
import { useEffect, useRef, useState } from 'react'
|
import { useEffect, useRef, useState } from 'react'
|
||||||
|
|
||||||
@@ -21,8 +20,6 @@ const MIN_MARQUEE_OVERFLOW_PX = 1
|
|||||||
const ResponsiveMarqueeText: FC<Props> = (
|
const ResponsiveMarqueeText: FC<Props> = (
|
||||||
{ text, className, truncateOnMobile = false, title },
|
{ text, className, truncateOnMobile = false, title },
|
||||||
) => {
|
) => {
|
||||||
const behaviourSettings = useClientBehaviourSettings ()
|
|
||||||
const animationMode = behaviourSettings.animation ?? 'normal'
|
|
||||||
const outerRef = useRef<HTMLSpanElement | null> (null)
|
const outerRef = useRef<HTMLSpanElement | null> (null)
|
||||||
const staticRef = useRef<HTMLSpanElement | null> (null)
|
const staticRef = useRef<HTMLSpanElement | null> (null)
|
||||||
const animatedRef = useRef<HTMLSpanElement | null> (null)
|
const animatedRef = useRef<HTMLSpanElement | null> (null)
|
||||||
@@ -101,7 +98,6 @@ const ResponsiveMarqueeText: FC<Props> = (
|
|||||||
const animated = animatedRef.current
|
const animated = animatedRef.current
|
||||||
const canMarquee = (
|
const canMarquee = (
|
||||||
active
|
active
|
||||||
&& animationMode !== 'off'
|
|
||||||
&& desktopMarqueeEnabled
|
&& desktopMarqueeEnabled
|
||||||
&& overflowPx >= MIN_MARQUEE_OVERFLOW_PX
|
&& overflowPx >= MIN_MARQUEE_OVERFLOW_PX
|
||||||
&& animated != null)
|
&& animated != null)
|
||||||
@@ -211,7 +207,7 @@ const ResponsiveMarqueeText: FC<Props> = (
|
|||||||
resetAnimated ()
|
resetAnimated ()
|
||||||
setMarqueeVisible (false)
|
setMarqueeVisible (false)
|
||||||
}
|
}
|
||||||
}, [active, animationMode, desktopMarqueeEnabled, overflowPx, text])
|
}, [active, desktopMarqueeEnabled, overflowPx, text])
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<span
|
<span
|
||||||
|
|||||||
@@ -1,13 +1,11 @@
|
|||||||
import { DndContext,
|
import { DndContext,
|
||||||
DragOverlay,
|
DragOverlay,
|
||||||
MeasuringStrategy,
|
|
||||||
MouseSensor,
|
MouseSensor,
|
||||||
TouchSensor,
|
TouchSensor,
|
||||||
pointerWithin,
|
|
||||||
useDroppable,
|
useDroppable,
|
||||||
useSensor,
|
useSensor,
|
||||||
useSensors } from '@dnd-kit/core'
|
useSensors } from '@dnd-kit/core'
|
||||||
import { restrictToWindowEdges, snapCenterToCursor } from '@dnd-kit/modifiers'
|
import { restrictToWindowEdges } from '@dnd-kit/modifiers'
|
||||||
import { useQueryClient } from '@tanstack/react-query'
|
import { useQueryClient } from '@tanstack/react-query'
|
||||||
import { motion } from 'framer-motion'
|
import { motion } from 'framer-motion'
|
||||||
import { useEffect, useMemo, useRef, useState } from 'react'
|
import { useEffect, useMemo, useRef, useState } from 'react'
|
||||||
@@ -22,28 +20,18 @@ import SidebarComponent from '@/components/layout/SidebarComponent'
|
|||||||
import { toast } from '@/components/ui/use-toast'
|
import { toast } from '@/components/ui/use-toast'
|
||||||
import { CATEGORIES, CATEGORY_NAMES } from '@/consts'
|
import { CATEGORIES, CATEGORY_NAMES } from '@/consts'
|
||||||
import { apiDelete, apiGet, apiPatch, apiPost } from '@/lib/api'
|
import { apiDelete, apiGet, apiPatch, apiPost } from '@/lib/api'
|
||||||
import { clientAnimationTransition } from '@/lib/clientAnimation'
|
|
||||||
import { postsKeys, tagsKeys } from '@/lib/queryKeys'
|
import { postsKeys, tagsKeys } from '@/lib/queryKeys'
|
||||||
import { useClientBehaviourSettings } from '@/lib/useClientBehaviourSettings'
|
|
||||||
import { dateString, originalCreatedAtString } from '@/lib/utils'
|
import { dateString, originalCreatedAtString } from '@/lib/utils'
|
||||||
|
|
||||||
import type { CollisionDetection, DragEndEvent } from '@dnd-kit/core'
|
import type { DragEndEvent } from '@dnd-kit/core'
|
||||||
import type { FC, MutableRefObject, ReactNode } from 'react'
|
import type { FC, MutableRefObject, ReactNode } from 'react'
|
||||||
|
|
||||||
import type { Category, Post, TagWithSections } from '@/types'
|
import type { Category, Post, TagWithSections } from '@/types'
|
||||||
|
|
||||||
type TagByCategory = { [key in Category]: TagWithSections[] }
|
type TagByCategory = { [key in Category]: TagWithSections[] }
|
||||||
|
|
||||||
const tagCollisionDetection: CollisionDetection = args => {
|
|
||||||
return pointerWithin (args)
|
|
||||||
}
|
|
||||||
|
|
||||||
const alwaysMeasureDroppables = {
|
|
||||||
droppable: { strategy: MeasuringStrategy.Always } } as const
|
|
||||||
|
|
||||||
|
|
||||||
const renderTagTree = (
|
const renderTagTree = (
|
||||||
activeDndId: string | undefined,
|
|
||||||
tag: TagWithSections,
|
tag: TagWithSections,
|
||||||
nestLevel: number,
|
nestLevel: number,
|
||||||
path: string,
|
path: string,
|
||||||
@@ -55,7 +43,6 @@ const renderTagTree = (
|
|||||||
const self = (
|
const self = (
|
||||||
<li key={key} className="mb-1">
|
<li key={key} className="mb-1">
|
||||||
<DraggableDroppableTagRow
|
<DraggableDroppableTagRow
|
||||||
activeDndId={activeDndId}
|
|
||||||
tag={tag}
|
tag={tag}
|
||||||
nestLevel={nestLevel}
|
nestLevel={nestLevel}
|
||||||
pathKey={key}
|
pathKey={key}
|
||||||
@@ -69,17 +56,11 @@ const renderTagTree = (
|
|||||||
...((tag.children
|
...((tag.children
|
||||||
?.sort ((a, b) => a.name < b.name ? -1 : 1)
|
?.sort ((a, b) => a.name < b.name ? -1 : 1)
|
||||||
.flatMap (child =>
|
.flatMap (child =>
|
||||||
renderTagTree (
|
renderTagTree (child, nestLevel + 1, key, suppressClickRef, tag.id, sp)))
|
||||||
activeDndId,
|
|
||||||
child,
|
|
||||||
nestLevel + 1,
|
|
||||||
key,
|
|
||||||
suppressClickRef,
|
|
||||||
tag.id,
|
|
||||||
sp)))
|
|
||||||
?? [])]
|
?? [])]
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
const isDescendant = (
|
const isDescendant = (
|
||||||
root: TagWithSections,
|
root: TagWithSections,
|
||||||
targetId: number,
|
targetId: number,
|
||||||
@@ -146,37 +127,6 @@ const buildTagByCategory = (post: Post): TagByCategory => {
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
const buildFlatTagByCategory = (
|
|
||||||
byCategory: TagByCategory,
|
|
||||||
): TagByCategory => {
|
|
||||||
const tagsTmp = { } as TagByCategory
|
|
||||||
const seen = new Set<number> ()
|
|
||||||
|
|
||||||
for (const category of CATEGORIES)
|
|
||||||
tagsTmp[category] = []
|
|
||||||
|
|
||||||
const visit = (tag: TagWithSections) => {
|
|
||||||
if (seen.has (tag.id))
|
|
||||||
return
|
|
||||||
|
|
||||||
seen.add (tag.id)
|
|
||||||
tagsTmp[tag.category].push ({ ...tag, children: [] })
|
|
||||||
|
|
||||||
for (const child of tag.children ?? [])
|
|
||||||
visit (child)
|
|
||||||
}
|
|
||||||
|
|
||||||
for (const category of CATEGORIES)
|
|
||||||
for (const tag of byCategory[category] ?? [])
|
|
||||||
visit (tag)
|
|
||||||
|
|
||||||
for (const category of CATEGORIES)
|
|
||||||
tagsTmp[category].sort ((tagA, tagB) => tagA.name < tagB.name ? -1 : 1)
|
|
||||||
|
|
||||||
return tagsTmp
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
const changeCategory = async (
|
const changeCategory = async (
|
||||||
tagId: number,
|
tagId: number,
|
||||||
category: Category): Promise<void> => {
|
category: Category): Promise<void> => {
|
||||||
@@ -195,47 +145,17 @@ const DropSlot = ({ cat }: { cat: Category }) => {
|
|||||||
</li>)
|
</li>)
|
||||||
}
|
}
|
||||||
|
|
||||||
const EmptyCategoryDropSection = (
|
|
||||||
{ cat, children }: { cat: Category
|
|
||||||
children: ReactNode }) => {
|
|
||||||
const { setNodeRef, isOver: over } = useDroppable ({
|
|
||||||
id: `slot:${ cat }`,
|
|
||||||
data: { kind: 'slot', cat } })
|
|
||||||
|
|
||||||
return (
|
|
||||||
<div ref={setNodeRef} className="my-3">
|
|
||||||
{children}
|
|
||||||
<ul>
|
|
||||||
<li className="h-1">
|
|
||||||
{over && <div className="h-0.5 w-full rounded bg-sky-400"/>}
|
|
||||||
</li>
|
|
||||||
</ul>
|
|
||||||
</div>)
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
type Props = {
|
type Props = {
|
||||||
className?: string
|
className?: string
|
||||||
post: Post
|
post: Post
|
||||||
sp?: boolean }
|
sp?: boolean }
|
||||||
|
|
||||||
type ActiveTagDrag = {
|
|
||||||
dndId: string
|
|
||||||
tagId: number
|
|
||||||
nestLevel: number }
|
|
||||||
|
|
||||||
|
|
||||||
const TagDetailSidebar: FC<Props> = ({ className, post, sp }) => {
|
const TagDetailSidebar: FC<Props> = ({ className, post, sp }) => {
|
||||||
sp = Boolean (sp)
|
sp = Boolean (sp)
|
||||||
|
|
||||||
const qc = useQueryClient ()
|
const qc = useQueryClient ()
|
||||||
const behaviourSettings = useClientBehaviourSettings ()
|
|
||||||
const tagRelationDisplay = behaviourSettings.tagRelationDisplay ?? 'grouped'
|
|
||||||
const animationMode = behaviourSettings.animation ?? 'normal'
|
|
||||||
const layoutTransition = clientAnimationTransition (
|
|
||||||
animationMode,
|
|
||||||
{ normal: { duration: .2, ease: 'easeOut' as const } },
|
|
||||||
)
|
|
||||||
|
|
||||||
const baseTags = useMemo<TagByCategory> (() => {
|
const baseTags = useMemo<TagByCategory> (() => {
|
||||||
const tagsTmp = { } as TagByCategory
|
const tagsTmp = { } as TagByCategory
|
||||||
@@ -253,15 +173,10 @@ const TagDetailSidebar: FC<Props> = ({ className, post, sp }) => {
|
|||||||
return tagsTmp
|
return tagsTmp
|
||||||
}, [post])
|
}, [post])
|
||||||
|
|
||||||
const [activeTagDrag, setActiveTagDrag] = useState<ActiveTagDrag | null> (null)
|
const [activeTagId, setActiveTagId] = useState<number | null> (null)
|
||||||
const [dragging, setDragging] = useState (false)
|
const [dragging, setDragging] = useState (false)
|
||||||
const [saving, setSaving] = useState (false)
|
const [saving, setSaving] = useState (false)
|
||||||
const [tags, setTags] = useState (baseTags)
|
const [tags, setTags] = useState (baseTags)
|
||||||
const flatTagsByCategory = useMemo<TagByCategory> (
|
|
||||||
() => buildFlatTagByCategory (tags),
|
|
||||||
[tags],
|
|
||||||
)
|
|
||||||
const activeDndId = activeTagDrag?.dndId
|
|
||||||
|
|
||||||
const suppressClickRef = useRef (false)
|
const suppressClickRef = useRef (false)
|
||||||
|
|
||||||
@@ -370,19 +285,9 @@ const TagDetailSidebar: FC<Props> = ({ className, post, sp }) => {
|
|||||||
<TagSearch/>
|
<TagSearch/>
|
||||||
<DndContext
|
<DndContext
|
||||||
sensors={sensors}
|
sensors={sensors}
|
||||||
collisionDetection={tagCollisionDetection}
|
|
||||||
measuring={alwaysMeasureDroppables}
|
|
||||||
onDragStart={e => {
|
onDragStart={e => {
|
||||||
if (e.active.data.current?.kind === 'tag')
|
if (e.active.data.current?.kind === 'tag')
|
||||||
{
|
setActiveTagId (e.active.data.current?.tagId ?? null)
|
||||||
const tagId = e.active.data.current?.tagId
|
|
||||||
const nestLevel = e.active.data.current?.nestLevel
|
|
||||||
const dndId = e.active.data.current?.dndId
|
|
||||||
setActiveTagDrag (
|
|
||||||
tagId == null || nestLevel == null || dndId == null
|
|
||||||
? null
|
|
||||||
: { dndId, tagId, nestLevel })
|
|
||||||
}
|
|
||||||
setDragging (true)
|
setDragging (true)
|
||||||
suppressClickRef.current = true
|
suppressClickRef.current = true
|
||||||
document.body.style.userSelect = 'none'
|
document.body.style.userSelect = 'none'
|
||||||
@@ -393,80 +298,38 @@ const TagDetailSidebar: FC<Props> = ({ className, post, sp }) => {
|
|||||||
suppressClickRef.current = false}, { capture: true, once: true })
|
suppressClickRef.current = false}, { capture: true, once: true })
|
||||||
}}
|
}}
|
||||||
onDragCancel={() => {
|
onDragCancel={() => {
|
||||||
setActiveTagDrag (null)
|
setActiveTagId (null)
|
||||||
setDragging (false)
|
setDragging (false)
|
||||||
document.body.style.userSelect = ''
|
document.body.style.userSelect = ''
|
||||||
suppressClickRef.current = false
|
suppressClickRef.current = false
|
||||||
}}
|
}}
|
||||||
onDragEnd={async e => {
|
onDragEnd={async e => {
|
||||||
setActiveTagDrag (null)
|
setActiveTagId (null)
|
||||||
setDragging (false)
|
setDragging (false)
|
||||||
await onDragEnd (e)
|
await onDragEnd (e)
|
||||||
document.body.style.userSelect = ''
|
document.body.style.userSelect = ''
|
||||||
}}
|
}}
|
||||||
modifiers={[restrictToWindowEdges]}>
|
modifiers={[restrictToWindowEdges]}>
|
||||||
{CATEGORIES.map ((cat: Category) => {
|
{CATEGORIES.map ((cat: Category) => ((tags[cat] ?? []).length > 0 || dragging) && (
|
||||||
const categoryTags =
|
<div className="my-3" key={cat}>
|
||||||
tagRelationDisplay === 'grouped'
|
|
||||||
? (tags[cat] ?? [])
|
|
||||||
: (flatTagsByCategory[cat] ?? [])
|
|
||||||
|
|
||||||
if (!(categoryTags.length > 0 || dragging))
|
|
||||||
return null
|
|
||||||
|
|
||||||
const sectionTitle = (
|
|
||||||
<SubsectionTitle>
|
<SubsectionTitle>
|
||||||
<motion.div
|
<motion.div
|
||||||
layoutId={animationMode === 'off'
|
layoutId={`tag-${ sp ? 'sp-' : '' }${ cat }`}
|
||||||
? undefined
|
transition={{ layout: { duration: .2, ease: 'easeOut' } }}>
|
||||||
: `tag-${ sp ? 'sp-' : '' }${ cat }`}
|
|
||||||
transition={{ layout: layoutTransition }}>
|
|
||||||
{CATEGORY_NAMES[cat]}
|
{CATEGORY_NAMES[cat]}
|
||||||
</motion.div>
|
</motion.div>
|
||||||
</SubsectionTitle>)
|
</SubsectionTitle>
|
||||||
|
|
||||||
if (!(categoryTags.length > 0))
|
<ul>
|
||||||
return (
|
{(tags[cat] ?? []).flatMap (tag => (
|
||||||
<EmptyCategoryDropSection cat={cat} key={cat}>
|
renderTagTree (tag, 0, `cat-${ cat }`, suppressClickRef, undefined, sp)))}
|
||||||
{sectionTitle}
|
<DropSlot cat={cat}/>
|
||||||
</EmptyCategoryDropSection>)
|
</ul>
|
||||||
|
</div>))}
|
||||||
return (
|
|
||||||
<div className="my-3" key={cat}>
|
|
||||||
{sectionTitle}
|
|
||||||
<ul>
|
|
||||||
{(tagRelationDisplay === 'grouped'
|
|
||||||
? (tags[cat] ?? []).flatMap (tag =>
|
|
||||||
renderTagTree (
|
|
||||||
activeDndId,
|
|
||||||
tag,
|
|
||||||
0,
|
|
||||||
`cat-${ cat }`,
|
|
||||||
suppressClickRef,
|
|
||||||
undefined,
|
|
||||||
sp,
|
|
||||||
),
|
|
||||||
)
|
|
||||||
: (flatTagsByCategory[cat] ?? []).map (tag => (
|
|
||||||
<li key={`flat-${ cat }-${ tag.id }`} className="mb-1">
|
|
||||||
<DraggableDroppableTagRow
|
|
||||||
activeDndId={activeDndId}
|
|
||||||
tag={tag}
|
|
||||||
nestLevel={0}
|
|
||||||
pathKey={`flat-${ cat }-${ tag.id }`}
|
|
||||||
suppressClickRef={suppressClickRef}
|
|
||||||
sp={sp}/>
|
|
||||||
</li>)))}
|
|
||||||
<DropSlot cat={cat}/>
|
|
||||||
</ul>
|
|
||||||
</div>)
|
|
||||||
})}
|
|
||||||
{post && (
|
{post && (
|
||||||
<motion.div
|
<motion.div
|
||||||
layoutId={animationMode === 'off'
|
layoutId={`post-info-${ sp }`}
|
||||||
? undefined
|
transition={{ layout: { duration: .2, ease: 'easeOut' } }}>
|
||||||
: `post-info-${ sp }`}
|
|
||||||
transition={{ layout: layoutTransition }}>
|
|
||||||
<SectionTitle>情報</SectionTitle>
|
<SectionTitle>情報</SectionTitle>
|
||||||
<ul>
|
<ul>
|
||||||
<li>Id.: {post.id}</li>
|
<li>Id.: {post.id}</li>
|
||||||
@@ -503,14 +366,11 @@ const TagDetailSidebar: FC<Props> = ({ className, post, sp }) => {
|
|||||||
</ul>
|
</ul>
|
||||||
</motion.div>)}
|
</motion.div>)}
|
||||||
|
|
||||||
<DragOverlay
|
<DragOverlay adjustScale={false}>
|
||||||
adjustScale={false}
|
|
||||||
modifiers={[snapCenterToCursor]}
|
|
||||||
dropAnimation={animationMode === 'off' ? null : undefined}>
|
|
||||||
<div className="pointer-events-none">
|
<div className="pointer-events-none">
|
||||||
{activeTagDrag != null && (() => {
|
{activeTagId != null && (() => {
|
||||||
const tag = findTag (tags, activeTagDrag.tagId)
|
const tag = findTag (tags, activeTagId)
|
||||||
return tag && <TagLink tag={tag} nestLevel={activeTagDrag.nestLevel}/>
|
return tag && <TagLink tag={tag}/>
|
||||||
}) ()}
|
}) ()}
|
||||||
</div>
|
</div>
|
||||||
</DragOverlay>
|
</DragOverlay>
|
||||||
|
|||||||
@@ -8,8 +8,6 @@ import SectionTitle from '@/components/common/SectionTitle'
|
|||||||
import SidebarComponent from '@/components/layout/SidebarComponent'
|
import SidebarComponent from '@/components/layout/SidebarComponent'
|
||||||
import { CATEGORIES } from '@/consts'
|
import { CATEGORIES } from '@/consts'
|
||||||
import { apiGet } from '@/lib/api'
|
import { apiGet } from '@/lib/api'
|
||||||
import { clientAnimationTransition } from '@/lib/clientAnimation'
|
|
||||||
import { useClientBehaviourSettings } from '@/lib/useClientBehaviourSettings'
|
|
||||||
|
|
||||||
import type { FC, MouseEvent } from 'react'
|
import type { FC, MouseEvent } from 'react'
|
||||||
|
|
||||||
@@ -23,13 +21,6 @@ type Props = { posts: Post[]
|
|||||||
|
|
||||||
const TagSidebar: FC<Props> = ({ posts, onClick }) => {
|
const TagSidebar: FC<Props> = ({ posts, onClick }) => {
|
||||||
const navigate = useNavigate ()
|
const navigate = useNavigate ()
|
||||||
const behaviourSettings = useClientBehaviourSettings ()
|
|
||||||
const animationMode = behaviourSettings.animation ?? 'normal'
|
|
||||||
const animationsOff = animationMode === 'off'
|
|
||||||
const layoutTransition = clientAnimationTransition (
|
|
||||||
animationMode,
|
|
||||||
{ normal: { duration: .2, ease: 'easeOut' as const } },
|
|
||||||
)
|
|
||||||
|
|
||||||
const [tagsVsbl, setTagsVsbl] = useState (false)
|
const [tagsVsbl, setTagsVsbl] = useState (false)
|
||||||
const [tags, setTags] = useState<TagByCategory> ({ })
|
const [tags, setTags] = useState<TagByCategory> ({ })
|
||||||
@@ -74,18 +65,12 @@ const TagSidebar: FC<Props> = ({ posts, onClick }) => {
|
|||||||
{CATEGORIES.flatMap (cat => cat in tags ? (
|
{CATEGORIES.flatMap (cat => cat in tags ? (
|
||||||
tags[cat].map (tag => (
|
tags[cat].map (tag => (
|
||||||
<li key={tag.id} className="mb-1 min-w-0 max-w-full overflow-hidden">
|
<li key={tag.id} className="mb-1 min-w-0 max-w-full overflow-hidden">
|
||||||
{animationsOff
|
<motion.div
|
||||||
? (
|
className="flex min-w-0 max-w-full items-baseline overflow-hidden"
|
||||||
<div className="flex min-w-0 max-w-full items-baseline overflow-hidden">
|
transition={{ layout: { duration: .2, ease: 'easeOut' } }}
|
||||||
<TagLink tag={tag} onClick={onClick}/>
|
layoutId={`tag-${ tag.id }`}>
|
||||||
</div>)
|
<TagLink tag={tag} onClick={onClick}/>
|
||||||
: (
|
</motion.div>
|
||||||
<motion.div
|
|
||||||
className="flex min-w-0 max-w-full items-baseline overflow-hidden"
|
|
||||||
transition={{ layout: layoutTransition }}
|
|
||||||
layoutId={`tag-${ tag.id }`}>
|
|
||||||
<TagLink tag={tag} onClick={onClick}/>
|
|
||||||
</motion.div>)}
|
|
||||||
</li>))) : [])}
|
</li>))) : [])}
|
||||||
</ul>
|
</ul>
|
||||||
<SectionTitle>関聯</SectionTitle>
|
<SectionTitle>関聯</SectionTitle>
|
||||||
@@ -118,25 +103,18 @@ const TagSidebar: FC<Props> = ({ posts, onClick }) => {
|
|||||||
{posts.length > 0 && TagBlock}
|
{posts.length > 0 && TagBlock}
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
{animationsOff
|
<AnimatePresence initial={false}>
|
||||||
? (
|
{tagsVsbl && (
|
||||||
tagsVsbl && (
|
<motion.div
|
||||||
<div className="md:hidden overflow-hidden">
|
key="sptags"
|
||||||
{posts.length > 0 && TagBlock}
|
className="md:hidden overflow-hidden"
|
||||||
</div>))
|
initial={{ height: 0 }}
|
||||||
: (
|
animate={{ height: 'auto' }}
|
||||||
<AnimatePresence initial={false}>
|
exit={{ height: 0 }}
|
||||||
{tagsVsbl && (
|
transition={{ duration: .2, ease: 'easeOut' }}>
|
||||||
<motion.div
|
{posts.length > 0 && TagBlock}
|
||||||
key="sptags"
|
</motion.div>)}
|
||||||
className="md:hidden overflow-hidden"
|
</AnimatePresence>
|
||||||
initial={{ height: 0 }}
|
|
||||||
animate={{ height: 'auto' }}
|
|
||||||
exit={{ height: 0 }}
|
|
||||||
transition={layoutTransition}>
|
|
||||||
{posts.length > 0 && TagBlock}
|
|
||||||
</motion.div>)}
|
|
||||||
</AnimatePresence>)}
|
|
||||||
|
|
||||||
<a href="#"
|
<a href="#"
|
||||||
className="md:hidden block my-2 text-center text-sm
|
className="md:hidden block my-2 text-center text-sm
|
||||||
|
|||||||
@@ -161,17 +161,13 @@ const TopNav: FC<Props> = ({ user }) => {
|
|||||||
visibleMenu.findIndex (item => location.pathname.startsWith (item.base || item.to))
|
visibleMenu.findIndex (item => location.pathname.startsWith (item.base || item.to))
|
||||||
const submenuHeight = moreVsbl ? 40 * moreMenu.length : (activeIdx < 0 ? 0 : 40)
|
const submenuHeight = moreVsbl ? 40 * moreMenu.length : (activeIdx < 0 ? 0 : 40)
|
||||||
const topNavTransition =
|
const topNavTransition =
|
||||||
animationsOff
|
reducedAnimations
|
||||||
? { duration: 0 }
|
? { duration: .08, ease: 'linear' as const }
|
||||||
: reducedAnimations
|
: { duration: .2, ease: 'easeOut' as const }
|
||||||
? { duration: .08, ease: 'linear' as const }
|
|
||||||
: { duration: .2, ease: 'easeOut' as const }
|
|
||||||
const opacityTransition =
|
const opacityTransition =
|
||||||
animationsOff
|
reducedAnimations
|
||||||
? { duration: 0 }
|
? { duration: .08 }
|
||||||
: reducedAnimations
|
: { duration: .12 }
|
||||||
? { duration: .08 }
|
|
||||||
: { duration: .12 }
|
|
||||||
const highlightTransitionClass =
|
const highlightTransitionClass =
|
||||||
animationsOff
|
animationsOff
|
||||||
? undefined
|
? undefined
|
||||||
@@ -212,11 +208,13 @@ const TopNav: FC<Props> = ({ user }) => {
|
|||||||
|
|
||||||
return (
|
return (
|
||||||
<>
|
<>
|
||||||
<nav className="top-nav-root px-3 flex justify-between items-center w-full">
|
<nav className="px-3 flex justify-between items-center w-full
|
||||||
|
bg-yellow-200 dark:bg-red-975 md:bg-yellow-50">
|
||||||
<div className="flex items-center gap-2 h-12">
|
<div className="flex items-center gap-2 h-12">
|
||||||
<PrefetchLink
|
<PrefetchLink
|
||||||
to="/posts"
|
to="/posts"
|
||||||
className="top-nav-brand-link mx-4 text-xl font-bold"
|
className="mx-4 text-xl font-bold text-pink-600 hover:text-pink-400
|
||||||
|
dark:text-pink-300 dark:hover:text-pink-100"
|
||||||
onClick={() => {
|
onClick={() => {
|
||||||
scroll (0, 0)
|
scroll (0, 0)
|
||||||
}}>
|
}}>
|
||||||
@@ -226,7 +224,7 @@ const TopNav: FC<Props> = ({ user }) => {
|
|||||||
<div ref={navRef} className="relative hidden md:flex h-12 items-center">
|
<div ref={navRef} className="relative hidden md:flex h-12 items-center">
|
||||||
<div aria-hidden
|
<div aria-hidden
|
||||||
className={cn ('absolute inset-y-0 h-12',
|
className={cn ('absolute inset-y-0 h-12',
|
||||||
'top-nav-highlight',
|
'bg-yellow-200 dark:bg-red-950',
|
||||||
highlightTransitionClass)}
|
highlightTransitionClass)}
|
||||||
style={{ width: hl.width,
|
style={{ width: hl.width,
|
||||||
transform: `translateX(${ hl.left }px)`,
|
transform: `translateX(${ hl.left }px)`,
|
||||||
@@ -248,7 +246,7 @@ const TopNav: FC<Props> = ({ user }) => {
|
|||||||
ref={(el: (HTMLAnchorElement | null)) => {
|
ref={(el: (HTMLAnchorElement | null)) => {
|
||||||
itemsRef.current[i] = el
|
itemsRef.current[i] = el
|
||||||
}}
|
}}
|
||||||
className={cn ('top-nav-menu-link relative z-10 flex h-full items-center px-5',
|
className={cn ('relative z-10 flex h-full items-center px-5',
|
||||||
(i === openItemIdx) && 'font-bold')}>
|
(i === openItemIdx) && 'font-bold')}>
|
||||||
{item.name}
|
{item.name}
|
||||||
</PrefetchLink>
|
</PrefetchLink>
|
||||||
@@ -263,7 +261,7 @@ const TopNav: FC<Props> = ({ user }) => {
|
|||||||
setMoreVsbl (true)
|
setMoreVsbl (true)
|
||||||
measure (-1)
|
measure (-1)
|
||||||
}}
|
}}
|
||||||
className={cn ('top-nav-menu-link relative z-10 flex h-full items-center px-5',
|
className={cn ('relative z-10 flex h-full items-center px-5',
|
||||||
(openItemIdx < 0 || moreVsbl) && 'font-bold')}>
|
(openItemIdx < 0 || moreVsbl) && 'font-bold')}>
|
||||||
その他 »
|
その他 »
|
||||||
</PrefetchLink>
|
</PrefetchLink>
|
||||||
@@ -274,7 +272,9 @@ const TopNav: FC<Props> = ({ user }) => {
|
|||||||
|
|
||||||
<button
|
<button
|
||||||
type="button"
|
type="button"
|
||||||
className="top-nav-mobile-toggle md:hidden ml-auto border-0 bg-transparent pr-4"
|
className="md:hidden ml-auto border-0 bg-transparent pr-4
|
||||||
|
text-pink-600 hover:text-pink-400
|
||||||
|
dark:text-pink-300 dark:hover:text-pink-100"
|
||||||
onClick={() => {
|
onClick={() => {
|
||||||
setMenuOpen (!(menuOpen))
|
setMenuOpen (!(menuOpen))
|
||||||
}}>
|
}}>
|
||||||
@@ -287,7 +287,8 @@ const TopNav: FC<Props> = ({ user }) => {
|
|||||||
key="submenu-shell"
|
key="submenu-shell"
|
||||||
{...(animationsOff ? { }
|
{...(animationsOff ? { }
|
||||||
: { layout: true })}
|
: { layout: true })}
|
||||||
className="relative z-20 hidden md:block overflow-hidden top-nav-submenu"
|
className="relative z-20 hidden md:block overflow-hidden
|
||||||
|
bg-yellow-200 dark:bg-red-950"
|
||||||
animate={{ height: submenuHeight }}
|
animate={{ height: submenuHeight }}
|
||||||
onMouseLeave={() => {
|
onMouseLeave={() => {
|
||||||
if (moreVsbl)
|
if (moreVsbl)
|
||||||
@@ -348,7 +349,7 @@ const TopNav: FC<Props> = ({ user }) => {
|
|||||||
to={subItem.to}
|
to={subItem.to}
|
||||||
target={subItem.to.slice (0, 2) === '//' ? '_blank' : undefined}
|
target={subItem.to.slice (0, 2) === '//' ? '_blank' : undefined}
|
||||||
onClick={() => setMoreVsbl (false)}
|
onClick={() => setMoreVsbl (false)}
|
||||||
className="top-nav-menu-link h-full flex items-center px-3">
|
className="h-full flex items-center px-3">
|
||||||
{subItem.name}
|
{subItem.name}
|
||||||
</PrefetchLink>
|
</PrefetchLink>
|
||||||
</motion.div>)))}
|
</motion.div>)))}
|
||||||
@@ -375,7 +376,7 @@ const TopNav: FC<Props> = ({ user }) => {
|
|||||||
target={item.to.slice (0, 2) === '//'
|
target={item.to.slice (0, 2) === '//'
|
||||||
? '_blank'
|
? '_blank'
|
||||||
: undefined}
|
: undefined}
|
||||||
className="top-nav-menu-link h-full flex items-center px-3">
|
className="h-full flex items-center px-3">
|
||||||
{item.name}
|
{item.name}
|
||||||
</PrefetchLink>
|
</PrefetchLink>
|
||||||
</div>)))}
|
</div>)))}
|
||||||
@@ -414,7 +415,7 @@ const TopNav: FC<Props> = ({ user }) => {
|
|||||||
target={item.to.slice (0, 2) === '//'
|
target={item.to.slice (0, 2) === '//'
|
||||||
? '_blank'
|
? '_blank'
|
||||||
: undefined}
|
: undefined}
|
||||||
className="top-nav-menu-link h-full flex items-center px-3">
|
className="h-full flex items-center px-3">
|
||||||
{item.name}
|
{item.name}
|
||||||
</PrefetchLink>
|
</PrefetchLink>
|
||||||
</motion.div>)))}
|
</motion.div>)))}
|
||||||
@@ -428,16 +429,16 @@ const TopNav: FC<Props> = ({ user }) => {
|
|||||||
? (
|
? (
|
||||||
menuOpen && (
|
menuOpen && (
|
||||||
<div
|
<div
|
||||||
className={cn ('top-nav-root top-nav-mobile-menu flex flex-col md:hidden',
|
className={cn ('flex flex-col md:hidden',
|
||||||
'items-start')}>
|
'bg-yellow-200 dark:bg-red-975 items-start')}>
|
||||||
<Separator/>
|
<Separator/>
|
||||||
{visibleMenu.map ((item, i) => (
|
{visibleMenu.map ((item, i) => (
|
||||||
<Fragment key={i}>
|
<Fragment key={i}>
|
||||||
<PrefetchLink
|
<PrefetchLink
|
||||||
to={i === openItemIdx ? item.to : '#'}
|
to={i === openItemIdx ? item.to : '#'}
|
||||||
className={cn ('top-nav-mobile-row w-full min-h-[40px] flex items-center pl-8',
|
className={cn ('w-full min-h-[40px] flex items-center pl-8',
|
||||||
((i === openItemIdx)
|
((i === openItemIdx)
|
||||||
&& 'top-nav-mobile-active font-bold'))}
|
&& 'font-bold bg-yellow-50 dark:bg-red-950'))}
|
||||||
onClick={(ev: MouseEvent<HTMLAnchorElement>) => {
|
onClick={(ev: MouseEvent<HTMLAnchorElement>) => {
|
||||||
if (i !== openItemIdx)
|
if (i !== openItemIdx)
|
||||||
{
|
{
|
||||||
@@ -449,7 +450,7 @@ const TopNav: FC<Props> = ({ user }) => {
|
|||||||
</PrefetchLink>
|
</PrefetchLink>
|
||||||
|
|
||||||
{i === openItemIdx && (
|
{i === openItemIdx && (
|
||||||
<div className="top-nav-submenu w-full">
|
<div className="w-full bg-yellow-50 dark:bg-red-950">
|
||||||
{item.subMenu
|
{item.subMenu
|
||||||
.filter (subItem => subItem.visible ?? true)
|
.filter (subItem => subItem.visible ?? true)
|
||||||
.map ((subItem, j) => (
|
.map ((subItem, j) => (
|
||||||
@@ -465,7 +466,7 @@ const TopNav: FC<Props> = ({ user }) => {
|
|||||||
target={subItem.to.slice (0, 2) === '//'
|
target={subItem.to.slice (0, 2) === '//'
|
||||||
? '_blank'
|
? '_blank'
|
||||||
: undefined}
|
: undefined}
|
||||||
className="top-nav-mobile-row w-full min-h-[36px] flex items-center pl-12">
|
className="w-full min-h-[36px] flex items-center pl-12">
|
||||||
{subItem.name}
|
{subItem.name}
|
||||||
</PrefetchLink>)))}
|
</PrefetchLink>)))}
|
||||||
</div>)}
|
</div>)}
|
||||||
@@ -475,9 +476,9 @@ const TopNav: FC<Props> = ({ user }) => {
|
|||||||
ref={(el: (HTMLAnchorElement | null)) => {
|
ref={(el: (HTMLAnchorElement | null)) => {
|
||||||
itemsRef.current[visibleMenu.length] = el
|
itemsRef.current[visibleMenu.length] = el
|
||||||
}}
|
}}
|
||||||
className={cn ('top-nav-mobile-row w-full min-h-[40px] flex items-center pl-8',
|
className={cn ('w-full min-h-[40px] flex items-center pl-8',
|
||||||
((openItemIdx < 0)
|
((openItemIdx < 0)
|
||||||
&& 'top-nav-mobile-active font-bold'))}>
|
&& 'font-bold bg-yellow-50 dark:bg-red-950'))}>
|
||||||
その他 »
|
その他 »
|
||||||
</PrefetchLink>
|
</PrefetchLink>
|
||||||
<TopNavUser user={user} sp/>
|
<TopNavUser user={user} sp/>
|
||||||
@@ -488,8 +489,8 @@ const TopNav: FC<Props> = ({ user }) => {
|
|||||||
{menuOpen && (
|
{menuOpen && (
|
||||||
<motion.div
|
<motion.div
|
||||||
key="spmenu"
|
key="spmenu"
|
||||||
className={cn ('top-nav-root top-nav-mobile-menu flex flex-col md:hidden',
|
className={cn ('flex flex-col md:hidden',
|
||||||
'items-start')}
|
'bg-yellow-200 dark:bg-red-975 items-start')}
|
||||||
variants={{ closed: { clipPath: 'inset(0 0 100% 0)',
|
variants={{ closed: { clipPath: 'inset(0 0 100% 0)',
|
||||||
height: 0 },
|
height: 0 },
|
||||||
open: { clipPath: 'inset(0 0 0% 0)',
|
open: { clipPath: 'inset(0 0 0% 0)',
|
||||||
@@ -503,9 +504,9 @@ const TopNav: FC<Props> = ({ user }) => {
|
|||||||
<Fragment key={i}>
|
<Fragment key={i}>
|
||||||
<PrefetchLink
|
<PrefetchLink
|
||||||
to={i === openItemIdx ? item.to : '#'}
|
to={i === openItemIdx ? item.to : '#'}
|
||||||
className={cn ('top-nav-mobile-row w-full min-h-[40px] flex items-center pl-8',
|
className={cn ('w-full min-h-[40px] flex items-center pl-8',
|
||||||
((i === openItemIdx)
|
((i === openItemIdx)
|
||||||
&& 'top-nav-mobile-active font-bold'))}
|
&& 'font-bold bg-yellow-50 dark:bg-red-950'))}
|
||||||
onClick={(ev: MouseEvent<HTMLAnchorElement>) => {
|
onClick={(ev: MouseEvent<HTMLAnchorElement>) => {
|
||||||
if (i !== openItemIdx)
|
if (i !== openItemIdx)
|
||||||
{
|
{
|
||||||
@@ -520,7 +521,7 @@ const TopNav: FC<Props> = ({ user }) => {
|
|||||||
{i === openItemIdx && (
|
{i === openItemIdx && (
|
||||||
<motion.div
|
<motion.div
|
||||||
key={`sp-sub-${ i }`}
|
key={`sp-sub-${ i }`}
|
||||||
className="top-nav-submenu w-full"
|
className="w-full bg-yellow-50 dark:bg-red-950"
|
||||||
variants={{ closed: { clipPath: 'inset(0 0 100% 0)',
|
variants={{ closed: { clipPath: 'inset(0 0 100% 0)',
|
||||||
height: 0,
|
height: 0,
|
||||||
opacity: 0 },
|
opacity: 0 },
|
||||||
@@ -546,7 +547,7 @@ const TopNav: FC<Props> = ({ user }) => {
|
|||||||
target={subItem.to.slice (0, 2) === '//'
|
target={subItem.to.slice (0, 2) === '//'
|
||||||
? '_blank'
|
? '_blank'
|
||||||
: undefined}
|
: undefined}
|
||||||
className="top-nav-mobile-row w-full min-h-[36px] flex items-center pl-12">
|
className="w-full min-h-[36px] flex items-center pl-12">
|
||||||
{subItem.name}
|
{subItem.name}
|
||||||
</PrefetchLink>)))}
|
</PrefetchLink>)))}
|
||||||
</motion.div>)}
|
</motion.div>)}
|
||||||
@@ -557,9 +558,9 @@ const TopNav: FC<Props> = ({ user }) => {
|
|||||||
ref={(el: (HTMLAnchorElement | null)) => {
|
ref={(el: (HTMLAnchorElement | null)) => {
|
||||||
itemsRef.current[visibleMenu.length] = el
|
itemsRef.current[visibleMenu.length] = el
|
||||||
}}
|
}}
|
||||||
className={cn ('top-nav-mobile-row w-full min-h-[40px] flex items-center pl-8',
|
className={cn ('w-full min-h-[40px] flex items-center pl-8',
|
||||||
((openItemIdx < 0)
|
((openItemIdx < 0)
|
||||||
&& 'top-nav-mobile-active font-bold'))}>
|
&& 'font-bold bg-yellow-50 dark:bg-red-950'))}>
|
||||||
その他 »
|
その他 »
|
||||||
</PrefetchLink>
|
</PrefetchLink>
|
||||||
<TopNavUser user={user} sp/>
|
<TopNavUser user={user} sp/>
|
||||||
|
|||||||
@@ -20,16 +20,4 @@ describe ('TabGroup', () => {
|
|||||||
expect (screen.getByText ('Alpha')).toBeInTheDocument ()
|
expect (screen.getByText ('Alpha')).toBeInTheDocument ()
|
||||||
expect (screen.queryByText ('Beta')).not.toBeInTheDocument ()
|
expect (screen.queryByText ('Beta')).not.toBeInTheDocument ()
|
||||||
})
|
})
|
||||||
|
|
||||||
it ('renders tabs as buttons and shows the right addon', () => {
|
|
||||||
render (
|
|
||||||
<TabGroup rightAddon={<span>件数 20</span>}>
|
|
||||||
<Tab name="広場">Plaza</Tab>
|
|
||||||
</TabGroup>,
|
|
||||||
)
|
|
||||||
|
|
||||||
expect (screen.getByRole ('button', { name: '広場' })).toBeInTheDocument ()
|
|
||||||
expect (screen.queryByRole ('link', { name: '広場' })).not.toBeInTheDocument ()
|
|
||||||
expect (screen.getByText ('件数 20')).toBeInTheDocument ()
|
|
||||||
})
|
|
||||||
})
|
})
|
||||||
|
|||||||
@@ -1,7 +1,5 @@
|
|||||||
import { motion } from 'framer-motion'
|
import { motion } from 'framer-motion'
|
||||||
|
|
||||||
import { clientAnimationTransition } from '@/lib/clientAnimation'
|
|
||||||
import { useClientBehaviourSettings } from '@/lib/useClientBehaviourSettings'
|
|
||||||
import { cn } from '@/lib/utils'
|
import { cn } from '@/lib/utils'
|
||||||
|
|
||||||
import type { FC, ReactNode } from 'react'
|
import type { FC, ReactNode } from 'react'
|
||||||
@@ -11,21 +9,12 @@ type Props = {
|
|||||||
className?: string }
|
className?: string }
|
||||||
|
|
||||||
|
|
||||||
const MainArea: FC<Props> = ({ children, className }) => {
|
const MainArea: FC<Props> = ({ children, className }) => (
|
||||||
const behaviourSettings = useClientBehaviourSettings ()
|
<motion.main
|
||||||
const animationMode = behaviourSettings.animation ?? 'normal'
|
transition={{ layout: { duration: .2, ease: 'easeOut' } }}
|
||||||
const layoutTransition = clientAnimationTransition (
|
className={cn ('flex-1 overflow-y-auto p-4', className)}
|
||||||
animationMode,
|
layout="position">
|
||||||
{ normal: { duration: .2, ease: 'easeOut' as const } },
|
{children}
|
||||||
)
|
</motion.main>)
|
||||||
|
|
||||||
return (
|
export default MainArea
|
||||||
<motion.main
|
|
||||||
transition={{ layout: layoutTransition }}
|
|
||||||
className={cn ('flex-1 overflow-y-auto p-4', className)}
|
|
||||||
layout={animationMode === 'off' ? false : 'position'}>
|
|
||||||
{children}
|
|
||||||
</motion.main>)
|
|
||||||
}
|
|
||||||
|
|
||||||
export default MainArea
|
|
||||||
@@ -1,8 +1,6 @@
|
|||||||
import { motion } from 'framer-motion'
|
import { motion } from 'framer-motion'
|
||||||
import { Helmet } from 'react-helmet-async'
|
import { Helmet } from 'react-helmet-async'
|
||||||
|
|
||||||
import { clientAnimationTransition } from '@/lib/clientAnimation'
|
|
||||||
import { useClientBehaviourSettings } from '@/lib/useClientBehaviourSettings'
|
|
||||||
import { cn } from '@/lib/utils'
|
import { cn } from '@/lib/utils'
|
||||||
|
|
||||||
import type { CSSProperties, FC, MouseEvent, PointerEvent, ReactNode } from 'react'
|
import type { CSSProperties, FC, MouseEvent, PointerEvent, ReactNode } from 'react'
|
||||||
@@ -70,12 +68,6 @@ const SidebarComponent: FC<Props> = ({
|
|||||||
sidebarKey,
|
sidebarKey,
|
||||||
side = 'left',
|
side = 'left',
|
||||||
}) => {
|
}) => {
|
||||||
const behaviourSettings = useClientBehaviourSettings ()
|
|
||||||
const animationMode = behaviourSettings.animation ?? 'normal'
|
|
||||||
const layoutTransition = clientAnimationTransition (
|
|
||||||
animationMode,
|
|
||||||
{ normal: { duration: .2, ease: 'easeOut' as const } },
|
|
||||||
)
|
|
||||||
const rootRef = useRef<HTMLDivElement | null> (null)
|
const rootRef = useRef<HTMLDivElement | null> (null)
|
||||||
const maxWidthRef = useRef (maxWidth)
|
const maxWidthRef = useRef (maxWidth)
|
||||||
const getContainerWidth = useCallback (() => {
|
const getContainerWidth = useCallback (() => {
|
||||||
@@ -313,8 +305,8 @@ const SidebarComponent: FC<Props> = ({
|
|||||||
return (
|
return (
|
||||||
<motion.div
|
<motion.div
|
||||||
ref={rootRef}
|
ref={rootRef}
|
||||||
layout={animationMode === 'off' ? false : 'position'}
|
layout="position"
|
||||||
transition={{ layout: layoutTransition }}
|
transition={{ layout: { duration: .2, ease: 'easeOut' } }}
|
||||||
style={style}
|
style={style}
|
||||||
className={cn (
|
className={cn (
|
||||||
'relative w-full md:w-[var(--sidebar-width)] md:shrink-0 md:h-full',
|
'relative w-full md:w-[var(--sidebar-width)] md:shrink-0 md:h-full',
|
||||||
|
|||||||
@@ -10,15 +10,10 @@ import type { FC, ReactNode } from 'react'
|
|||||||
import type { ClientAnimationMode,
|
import type { ClientAnimationMode,
|
||||||
ClientBehaviorSettings,
|
ClientBehaviorSettings,
|
||||||
ClientEmbedAutoLoadMode,
|
ClientEmbedAutoLoadMode,
|
||||||
ClientLinkPreloadMode,
|
ClientThumbnailMode } from '@/lib/settings'
|
||||||
ClientTagRelationDisplayMode } from '@/lib/settings'
|
|
||||||
|
|
||||||
type Props = {
|
type Props = {
|
||||||
sectionClassName: string
|
sectionClassName: string }
|
||||||
onDirtyStateChange?: (
|
|
||||||
dirty: boolean,
|
|
||||||
discard: () => void,
|
|
||||||
) => void }
|
|
||||||
|
|
||||||
type SegmentedOption<T extends string> = {
|
type SegmentedOption<T extends string> = {
|
||||||
value: T
|
value: T
|
||||||
@@ -30,9 +25,9 @@ type SegmentedControlProps<T extends string> = {
|
|||||||
onChange: (value: T) => void }
|
onChange: (value: T) => void }
|
||||||
|
|
||||||
type SettingBlockProps = {
|
type SettingBlockProps = {
|
||||||
title: string
|
title: string
|
||||||
description?: string
|
description: string
|
||||||
children: ReactNode }
|
children: ReactNode }
|
||||||
|
|
||||||
const animationOptions: SegmentedOption<ClientAnimationMode>[] = [
|
const animationOptions: SegmentedOption<ClientAnimationMode>[] = [
|
||||||
{ value: 'off', label: 'なし' },
|
{ value: 'off', label: 'なし' },
|
||||||
@@ -44,13 +39,11 @@ const embedAutoLoadOptions: SegmentedOption<ClientEmbedAutoLoadMode>[] = [
|
|||||||
{ value: 'manual', label: 'クリック時' },
|
{ value: 'manual', label: 'クリック時' },
|
||||||
{ value: 'auto', label: '自動' }]
|
{ value: 'auto', label: '自動' }]
|
||||||
|
|
||||||
const linkPreloadOptions: SegmentedOption<ClientLinkPreloadMode>[] = [
|
const thumbnailModeOptions: SegmentedOption<ClientThumbnailMode>[] = [
|
||||||
{ value: 'off', label: 'しない' },
|
{ value: 'off', label: '非表示' },
|
||||||
{ value: 'intent', label: 'する' }]
|
{ value: 'light', label: '軽量' },
|
||||||
|
{ value: 'normal', label: '通常' }]
|
||||||
|
|
||||||
const tagRelationDisplayOptions: SegmentedOption<ClientTagRelationDisplayMode>[] = [
|
|
||||||
{ value: 'flat', label: 'まとめない' },
|
|
||||||
{ value: 'grouped', label: 'まとめる' }]
|
|
||||||
|
|
||||||
const SegmentedControl = <T extends string,> (
|
const SegmentedControl = <T extends string,> (
|
||||||
{ value, options, onChange }: SegmentedControlProps<T>,
|
{ value, options, onChange }: SegmentedControlProps<T>,
|
||||||
@@ -70,8 +63,8 @@ const SegmentedControl = <T extends string,> (
|
|||||||
'transition-colors focus-visible:outline-none focus-visible:ring-2',
|
'transition-colors focus-visible:outline-none focus-visible:ring-2',
|
||||||
'focus-visible:ring-ring focus-visible:ring-offset-2',
|
'focus-visible:ring-ring focus-visible:ring-offset-2',
|
||||||
value === option.value
|
value === option.value
|
||||||
? 'bg-primary text-primary-foreground shadow-sm ring-1 ring-primary/40'
|
? 'bg-background text-foreground shadow-sm'
|
||||||
: 'bg-transparent text-muted-foreground hover:bg-background/70 hover:text-foreground',
|
: 'text-muted-foreground hover:bg-background/70 hover:text-foreground',
|
||||||
)}
|
)}
|
||||||
onClick={() => onChange (option.value)}>
|
onClick={() => onChange (option.value)}>
|
||||||
{option.label}
|
{option.label}
|
||||||
@@ -83,7 +76,7 @@ const SegmentedControl = <T extends string,> (
|
|||||||
const SettingBlock: FC<SettingBlockProps> = (
|
const SettingBlock: FC<SettingBlockProps> = (
|
||||||
{ title, description, children },
|
{ title, description, children },
|
||||||
) => (
|
) => (
|
||||||
<div className="space-y-3 rounded-xl px-4">
|
<div className="space-y-3 rounded-xl border border-border/70 bg-background/70 p-4">
|
||||||
<div className="space-y-1">
|
<div className="space-y-1">
|
||||||
<h3 className="text-sm font-semibold">{title}</h3>
|
<h3 className="text-sm font-semibold">{title}</h3>
|
||||||
<p className="text-sm text-muted-foreground">{description}</p>
|
<p className="text-sm text-muted-foreground">{description}</p>
|
||||||
@@ -92,10 +85,7 @@ const SettingBlock: FC<SettingBlockProps> = (
|
|||||||
</div>)
|
</div>)
|
||||||
|
|
||||||
|
|
||||||
const BehaviourSettingsSection: FC<Props> = (
|
const BehaviourSettingsSection: FC<Props> = ({ sectionClassName }) => {
|
||||||
{ sectionClassName,
|
|
||||||
onDirtyStateChange },
|
|
||||||
) => {
|
|
||||||
const [savedSettings, setSavedSettings] =
|
const [savedSettings, setSavedSettings] =
|
||||||
useState<ClientBehaviorSettings> (() => getClientBehaviorSettings ())
|
useState<ClientBehaviorSettings> (() => getClientBehaviorSettings ())
|
||||||
const [draftSettings, setDraftSettings] =
|
const [draftSettings, setDraftSettings] =
|
||||||
@@ -129,25 +119,21 @@ const BehaviourSettingsSection: FC<Props> = (
|
|||||||
setDraftSettings (savedSettings)
|
setDraftSettings (savedSettings)
|
||||||
}
|
}
|
||||||
|
|
||||||
useEffect (() => {
|
|
||||||
onDirtyStateChange?.(hasUnsavedChanges, handleDiscard)
|
|
||||||
|
|
||||||
return () => {
|
|
||||||
onDirtyStateChange?.(false, () => { })
|
|
||||||
}
|
|
||||||
}, [handleDiscard, hasUnsavedChanges, onDirtyStateChange])
|
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<section className={sectionClassName}>
|
<section className={sectionClassName}>
|
||||||
<div className="flex flex-wrap items-start justify-between gap-3">
|
<div className="flex flex-wrap items-start justify-between gap-3">
|
||||||
<div className="space-y-1">
|
<div className="space-y-1">
|
||||||
<h2 className="text-xl font-bold">動作</h2>
|
<h2 className="text-xl font-bold">動作</h2>
|
||||||
|
{hasUnsavedChanges && (
|
||||||
|
<p className="text-sm text-amber-700 dark:text-amber-300">
|
||||||
|
未保存の変更があります
|
||||||
|
</p>)}
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div className="flex flex-wrap gap-2">
|
<div className="flex flex-wrap gap-2">
|
||||||
<Button
|
<Button
|
||||||
type="button"
|
type="button"
|
||||||
variant="destructive"
|
variant="outline"
|
||||||
disabled={hasUnsavedChanges === false}
|
disabled={hasUnsavedChanges === false}
|
||||||
onClick={handleDiscard}>
|
onClick={handleDiscard}>
|
||||||
変更を破棄
|
変更を破棄
|
||||||
@@ -162,7 +148,9 @@ const BehaviourSettingsSection: FC<Props> = (
|
|||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div className="space-y-4">
|
<div className="space-y-4">
|
||||||
<SettingBlock title="アニメーション">
|
<SettingBlock
|
||||||
|
title="アニメーション"
|
||||||
|
description="画面遷移やレイアウト移動の動きを調整します。">
|
||||||
<SegmentedControl
|
<SegmentedControl
|
||||||
value={draftSettings.animation ?? 'normal'}
|
value={draftSettings.animation ?? 'normal'}
|
||||||
options={animationOptions}
|
options={animationOptions}
|
||||||
@@ -170,27 +158,22 @@ const BehaviourSettingsSection: FC<Props> = (
|
|||||||
</SettingBlock>
|
</SettingBlock>
|
||||||
|
|
||||||
<SettingBlock
|
<SettingBlock
|
||||||
title="リンク先の先読み"
|
title="埋め込み自動読込"
|
||||||
description="マウスを置いた時点でリンク先のデータを取得します。">
|
description="外部埋め込みを自動で読み込むかを切り替えます。">
|
||||||
<SegmentedControl
|
|
||||||
value={draftSettings.linkPreload ?? 'intent'}
|
|
||||||
options={linkPreloadOptions}
|
|
||||||
onChange={value => updateDraft ('linkPreload', value)}/>
|
|
||||||
</SettingBlock>
|
|
||||||
|
|
||||||
<SettingBlock title="タグの親子関係表示">
|
|
||||||
<SegmentedControl
|
|
||||||
value={draftSettings.tagRelationDisplay ?? 'grouped'}
|
|
||||||
options={tagRelationDisplayOptions}
|
|
||||||
onChange={value => updateDraft ('tagRelationDisplay', value)}/>
|
|
||||||
</SettingBlock>
|
|
||||||
|
|
||||||
<SettingBlock title="埋め込み自動読込">
|
|
||||||
<SegmentedControl
|
<SegmentedControl
|
||||||
value={draftSettings.embedAutoLoad ?? 'auto'}
|
value={draftSettings.embedAutoLoad ?? 'auto'}
|
||||||
options={embedAutoLoadOptions}
|
options={embedAutoLoadOptions}
|
||||||
onChange={value => updateDraft ('embedAutoLoad', value)}/>
|
onChange={value => updateDraft ('embedAutoLoad', value)}/>
|
||||||
</SettingBlock>
|
</SettingBlock>
|
||||||
|
|
||||||
|
<SettingBlock
|
||||||
|
title="サムネイル表示"
|
||||||
|
description="投稿一覧や詳細の画像表示を軽量化します。">
|
||||||
|
<SegmentedControl
|
||||||
|
value={draftSettings.thumbnailMode ?? 'normal'}
|
||||||
|
options={thumbnailModeOptions}
|
||||||
|
onChange={value => updateDraft ('thumbnailMode', value)}/>
|
||||||
|
</SettingBlock>
|
||||||
</div>
|
</div>
|
||||||
</section>)
|
</section>)
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -19,17 +19,10 @@ import type { FC } from 'react'
|
|||||||
|
|
||||||
type Props = {
|
type Props = {
|
||||||
sectionClassName: string
|
sectionClassName: string
|
||||||
onDirtyStateChange?: (
|
|
||||||
dirty: boolean,
|
|
||||||
discard: () => void,
|
|
||||||
) => void
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
const KeyboardSettingsSection: FC<Props> = (
|
const KeyboardSettingsSection: FC<Props> = ({ sectionClassName }) => {
|
||||||
{ sectionClassName,
|
|
||||||
onDirtyStateChange },
|
|
||||||
) => {
|
|
||||||
const {
|
const {
|
||||||
keyboardSettings,
|
keyboardSettings,
|
||||||
saveKeyboardSettings,
|
saveKeyboardSettings,
|
||||||
@@ -134,19 +127,15 @@ const KeyboardSettingsSection: FC<Props> = (
|
|||||||
setCapturingActionId (null)
|
setCapturingActionId (null)
|
||||||
}
|
}
|
||||||
|
|
||||||
useEffect (() => {
|
|
||||||
onDirtyStateChange?.(hasUnsavedChanges, handleDiscard)
|
|
||||||
|
|
||||||
return () => {
|
|
||||||
onDirtyStateChange?.(false, () => { })
|
|
||||||
}
|
|
||||||
}, [handleDiscard, hasUnsavedChanges, onDirtyStateChange])
|
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<section className={sectionClassName}>
|
<section className={sectionClassName}>
|
||||||
<div className="flex flex-wrap items-start justify-between gap-3">
|
<div className="flex flex-wrap items-start justify-between gap-3">
|
||||||
<div className="space-y-1">
|
<div className="space-y-1">
|
||||||
<h2 className="text-xl font-bold">キーボード</h2>
|
<h2 className="text-xl font-bold">キーボード</h2>
|
||||||
|
{hasUnsavedChanges && (
|
||||||
|
<p className="text-sm text-amber-700 dark:text-amber-300">
|
||||||
|
未保存の変更があります
|
||||||
|
</p>)}
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div className="flex flex-wrap gap-2">
|
<div className="flex flex-wrap gap-2">
|
||||||
@@ -163,7 +152,7 @@ const KeyboardSettingsSection: FC<Props> = (
|
|||||||
</Button>
|
</Button>
|
||||||
<Button
|
<Button
|
||||||
type="button"
|
type="button"
|
||||||
variant="destructive"
|
variant="outline"
|
||||||
disabled={!(hasUnsavedChanges)}
|
disabled={!(hasUnsavedChanges)}
|
||||||
onClick={handleDiscard}>
|
onClick={handleDiscard}>
|
||||||
変更を破棄
|
変更を破棄
|
||||||
@@ -202,8 +191,8 @@ const KeyboardSettingsSection: FC<Props> = (
|
|||||||
<th className="p-2 text-left">操作</th>
|
<th className="p-2 text-left">操作</th>
|
||||||
<th className="p-2 text-left">適用範囲</th>
|
<th className="p-2 text-left">適用範囲</th>
|
||||||
<th className="p-2 text-left">現在のキー</th>
|
<th className="p-2 text-left">現在のキー</th>
|
||||||
<th className="p-2 text-left"></th>
|
<th className="p-2 text-left">変更</th>
|
||||||
<th className="p-2 text-left"></th>
|
<th className="p-2 text-left">既定に戻す</th>
|
||||||
<th className="p-2 text-left">競合状態</th>
|
<th className="p-2 text-left">競合状態</th>
|
||||||
</tr>
|
</tr>
|
||||||
</thead>
|
</thead>
|
||||||
|
|||||||
@@ -0,0 +1,97 @@
|
|||||||
|
import { createContext, useContext, useEffect, useMemo, useState } from 'react'
|
||||||
|
|
||||||
|
import {
|
||||||
|
applyClientAppearance,
|
||||||
|
DEFAULT_USER_SETTINGS,
|
||||||
|
fetchUserSettings,
|
||||||
|
} from '@/lib/settings'
|
||||||
|
|
||||||
|
import type { Dispatch, FC, ReactNode, SetStateAction } from 'react'
|
||||||
|
|
||||||
|
import type { User } from '@/types'
|
||||||
|
import type { UserSettings } from '@/lib/settings'
|
||||||
|
|
||||||
|
type ContextValue = {
|
||||||
|
loaded: boolean
|
||||||
|
error: string | null
|
||||||
|
settings: UserSettings
|
||||||
|
setSettings: Dispatch<SetStateAction<UserSettings>> }
|
||||||
|
|
||||||
|
const UserSettingsContext = createContext<ContextValue | null> (null)
|
||||||
|
|
||||||
|
|
||||||
|
export const UserSettingsProvider: FC<{
|
||||||
|
children: ReactNode
|
||||||
|
user: User | null }> = ({ children, user }) => {
|
||||||
|
const [error, setError] = useState<string | null> (null)
|
||||||
|
const [loaded, setLoaded] = useState (false)
|
||||||
|
const [settings, setSettings] = useState<UserSettings> (DEFAULT_USER_SETTINGS)
|
||||||
|
|
||||||
|
useEffect (() => {
|
||||||
|
let cancelled = false
|
||||||
|
|
||||||
|
if (!(user))
|
||||||
|
{
|
||||||
|
setError (null)
|
||||||
|
setSettings (DEFAULT_USER_SETTINGS)
|
||||||
|
setLoaded (true)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
setLoaded (false)
|
||||||
|
setError (null)
|
||||||
|
|
||||||
|
void (async () => {
|
||||||
|
try
|
||||||
|
{
|
||||||
|
const next = await fetchUserSettings ()
|
||||||
|
if (!(cancelled))
|
||||||
|
{
|
||||||
|
setError (null)
|
||||||
|
setSettings (next)
|
||||||
|
setLoaded (true)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
catch
|
||||||
|
{
|
||||||
|
if (!(cancelled))
|
||||||
|
{
|
||||||
|
setError ('設定を読み込めませんでした.既定値で表示しています.')
|
||||||
|
setSettings (DEFAULT_USER_SETTINGS)
|
||||||
|
setLoaded (true)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}) ()
|
||||||
|
|
||||||
|
return () => {
|
||||||
|
cancelled = true
|
||||||
|
}
|
||||||
|
}, [user])
|
||||||
|
|
||||||
|
useEffect (() => {
|
||||||
|
void settings.theme
|
||||||
|
applyClientAppearance ()
|
||||||
|
}, [settings.theme])
|
||||||
|
|
||||||
|
const value = useMemo<ContextValue> (() => ({
|
||||||
|
error,
|
||||||
|
loaded,
|
||||||
|
settings,
|
||||||
|
setSettings,
|
||||||
|
}), [error, loaded, settings])
|
||||||
|
|
||||||
|
return (
|
||||||
|
<UserSettingsContext.Provider value={value}>
|
||||||
|
{children}
|
||||||
|
</UserSettingsContext.Provider>)
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
export const useUserSettings = (): ContextValue => {
|
||||||
|
const value = useContext (UserSettingsContext)
|
||||||
|
|
||||||
|
if (value == null)
|
||||||
|
throw new Error ('UserSettingsProvider is missing')
|
||||||
|
|
||||||
|
return value
|
||||||
|
}
|
||||||
+26
-83
@@ -34,14 +34,6 @@
|
|||||||
--input: 214.3 31.8% 91.4%;
|
--input: 214.3 31.8% 91.4%;
|
||||||
--ring: 222.2 84% 4.9%;
|
--ring: 222.2 84% 4.9%;
|
||||||
--theme-link: 221.2 83.2% 53.3%;
|
--theme-link: 221.2 83.2% 53.3%;
|
||||||
--top-nav-root-bg-mobile: #fef08a;
|
|
||||||
--top-nav-root-bg-desktop: #fefce8;
|
|
||||||
--top-nav-active-bg: #fef08a;
|
|
||||||
--top-nav-submenu-bg: #fef08a;
|
|
||||||
--top-nav-mobile-menu-bg: #fef08a;
|
|
||||||
--top-nav-mobile-active-bg: #fefce8;
|
|
||||||
--top-nav-brand-link: #db2777;
|
|
||||||
--top-nav-menu-link: #1d4ed8;
|
|
||||||
|
|
||||||
--tag-colour-deerjikist: #9f1239;
|
--tag-colour-deerjikist: #9f1239;
|
||||||
--tag-colour-deerjikist-hover: #b62a51;
|
--tag-colour-deerjikist-hover: #b62a51;
|
||||||
@@ -86,14 +78,6 @@
|
|||||||
--border: 217.2 32.6% 17.5%;
|
--border: 217.2 32.6% 17.5%;
|
||||||
--input: 217.2 32.6% 17.5%;
|
--input: 217.2 32.6% 17.5%;
|
||||||
--ring: 212.7 26.8% 83.9%;
|
--ring: 212.7 26.8% 83.9%;
|
||||||
--top-nav-root-bg-mobile: #230505;
|
|
||||||
--top-nav-root-bg-desktop: #230505;
|
|
||||||
--top-nav-active-bg: #450a0a;
|
|
||||||
--top-nav-submenu-bg: #450a0a;
|
|
||||||
--top-nav-mobile-menu-bg: #230505;
|
|
||||||
--top-nav-mobile-active-bg: #450a0a;
|
|
||||||
--top-nav-brand-link: #f9a8d4;
|
|
||||||
--top-nav-menu-link: #93c5fd;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
body
|
body
|
||||||
@@ -107,7 +91,7 @@
|
|||||||
}
|
}
|
||||||
a:hover
|
a:hover
|
||||||
{
|
{
|
||||||
color: color-mix(in oklab, hsl(var(--theme-link)), white 18%);
|
opacity: .85;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -127,6 +111,29 @@
|
|||||||
-moz-osx-font-smoothing: grayscale;
|
-moz-osx-font-smoothing: grayscale;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
:root[data-font-size='small']
|
||||||
|
{
|
||||||
|
font-size: 14px;
|
||||||
|
}
|
||||||
|
|
||||||
|
:root[data-font-size='normal']
|
||||||
|
{
|
||||||
|
font-size: 16px;
|
||||||
|
}
|
||||||
|
|
||||||
|
:root[data-font-size='large']
|
||||||
|
{
|
||||||
|
font-size: 18px;
|
||||||
|
}
|
||||||
|
|
||||||
|
:root[data-display-density='compact'] input,
|
||||||
|
:root[data-display-density='compact'] textarea,
|
||||||
|
:root[data-display-density='compact'] select,
|
||||||
|
:root[data-display-density='compact'] button
|
||||||
|
{
|
||||||
|
line-height: 1.25;
|
||||||
|
}
|
||||||
|
|
||||||
:root[data-animation='reduced'] *,
|
:root[data-animation='reduced'] *,
|
||||||
:root[data-animation='off'] *
|
:root[data-animation='off'] *
|
||||||
{
|
{
|
||||||
@@ -137,11 +144,9 @@
|
|||||||
:root[data-animation='off'] *::before,
|
:root[data-animation='off'] *::before,
|
||||||
:root[data-animation='off'] *::after
|
:root[data-animation='off'] *::after
|
||||||
{
|
{
|
||||||
animation-duration: 0ms !important;
|
animation-duration: 0.001ms !important;
|
||||||
animation-delay: 0ms !important;
|
|
||||||
animation-iteration-count: 1 !important;
|
animation-iteration-count: 1 !important;
|
||||||
transition-duration: 0ms !important;
|
transition-duration: 0.001ms !important;
|
||||||
transition-delay: 0ms !important;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
a
|
a
|
||||||
@@ -192,68 +197,6 @@ body
|
|||||||
color: var(--tag-link-hover-colour) !important;
|
color: var(--tag-link-hover-colour) !important;
|
||||||
}
|
}
|
||||||
|
|
||||||
.top-nav-root
|
|
||||||
{
|
|
||||||
background: var(--top-nav-root-bg-mobile);
|
|
||||||
}
|
|
||||||
|
|
||||||
@media (min-width: 768px)
|
|
||||||
{
|
|
||||||
.top-nav-root
|
|
||||||
{
|
|
||||||
background: var(--top-nav-root-bg-desktop);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
.top-nav-brand-link,
|
|
||||||
.top-nav-mobile-toggle
|
|
||||||
{
|
|
||||||
color: var(--top-nav-brand-link);
|
|
||||||
}
|
|
||||||
|
|
||||||
.top-nav-brand-link:hover,
|
|
||||||
.top-nav-mobile-toggle:hover
|
|
||||||
{
|
|
||||||
color: color-mix(in oklab, var(--top-nav-brand-link), white 18%);
|
|
||||||
}
|
|
||||||
|
|
||||||
.top-nav-menu-link,
|
|
||||||
.top-nav-mobile-row
|
|
||||||
{
|
|
||||||
color: var(--top-nav-menu-link);
|
|
||||||
}
|
|
||||||
|
|
||||||
.top-nav-menu-link:hover,
|
|
||||||
.top-nav-mobile-row:hover
|
|
||||||
{
|
|
||||||
color: color-mix(in oklab, var(--top-nav-menu-link), white 18%);
|
|
||||||
}
|
|
||||||
|
|
||||||
.top-nav-highlight
|
|
||||||
{
|
|
||||||
background: var(--top-nav-active-bg);
|
|
||||||
}
|
|
||||||
|
|
||||||
.top-nav-submenu
|
|
||||||
{
|
|
||||||
background: var(--top-nav-submenu-bg);
|
|
||||||
}
|
|
||||||
|
|
||||||
.top-nav-mobile-menu .top-nav-submenu
|
|
||||||
{
|
|
||||||
background: var(--top-nav-mobile-active-bg);
|
|
||||||
}
|
|
||||||
|
|
||||||
.top-nav-mobile-menu
|
|
||||||
{
|
|
||||||
background: var(--top-nav-mobile-menu-bg);
|
|
||||||
}
|
|
||||||
|
|
||||||
.top-nav-mobile-active
|
|
||||||
{
|
|
||||||
background: var(--top-nav-mobile-active-bg);
|
|
||||||
}
|
|
||||||
|
|
||||||
.tag-marquee__animated
|
.tag-marquee__animated
|
||||||
{
|
{
|
||||||
position: absolute;
|
position: absolute;
|
||||||
|
|||||||
@@ -1,22 +0,0 @@
|
|||||||
import { readFileSync } from 'node:fs'
|
|
||||||
import { resolve } from 'node:path'
|
|
||||||
|
|
||||||
import { describe, expect, it } from 'vitest'
|
|
||||||
|
|
||||||
|
|
||||||
const indexCss = readFileSync (
|
|
||||||
resolve (process.cwd (), 'src/index.css'),
|
|
||||||
'utf8')
|
|
||||||
const compactIndexCss = indexCss.replace (/\s+/g, ' ')
|
|
||||||
const mobileActiveRule = '.top-nav-mobile-active {'
|
|
||||||
+ ' background: var(--top-nav-mobile-active-bg); }'
|
|
||||||
const mobileSubmenuRule = '.top-nav-mobile-menu .top-nav-submenu {'
|
|
||||||
+ ' background: var(--top-nav-mobile-active-bg); }'
|
|
||||||
|
|
||||||
|
|
||||||
describe ('TopNav mobile menu colours', () => {
|
|
||||||
it ('uses one background variable for active rows and expanded submenus', () => {
|
|
||||||
expect (compactIndexCss).toContain (mobileActiveRule)
|
|
||||||
expect (compactIndexCss).toContain (mobileSubmenuRule)
|
|
||||||
})
|
|
||||||
})
|
|
||||||
@@ -1,34 +0,0 @@
|
|||||||
import type { Transition } from 'framer-motion'
|
|
||||||
|
|
||||||
import type { ClientAnimationMode } from '@/lib/settings'
|
|
||||||
|
|
||||||
type ClientAnimationTransitionOptions = {
|
|
||||||
normal: Transition
|
|
||||||
reduced?: Transition
|
|
||||||
off?: Transition }
|
|
||||||
|
|
||||||
|
|
||||||
export const clientAnimationsOff = (
|
|
||||||
animationMode: ClientAnimationMode,
|
|
||||||
): boolean =>
|
|
||||||
animationMode === 'off'
|
|
||||||
|
|
||||||
|
|
||||||
export const clientAnimationTransition = (
|
|
||||||
animationMode: ClientAnimationMode,
|
|
||||||
{ normal, reduced, off }: ClientAnimationTransitionOptions,
|
|
||||||
): Transition => {
|
|
||||||
if (animationMode === 'off')
|
|
||||||
return off ?? { duration: 0 }
|
|
||||||
|
|
||||||
if (animationMode === 'reduced')
|
|
||||||
return reduced ?? { duration: .08, ease: 'linear' as const }
|
|
||||||
|
|
||||||
return normal
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
export const clientScrollBehaviour = (
|
|
||||||
animationMode: ClientAnimationMode,
|
|
||||||
): ScrollBehavior =>
|
|
||||||
animationMode === 'off' ? 'auto' : 'smooth'
|
|
||||||
@@ -1,65 +0,0 @@
|
|||||||
import { describe, expect, it } from 'vitest'
|
|
||||||
|
|
||||||
import { DEFAULT_KEY_BINDINGS,
|
|
||||||
formatKeyBinding,
|
|
||||||
getConflictingShortcutActionIds,
|
|
||||||
isEditableEventTarget,
|
|
||||||
keyBindingFromKeyboardEvent,
|
|
||||||
resolveShortcutScope,
|
|
||||||
SHORTCUT_DEFINITIONS_BY_ID } from '@/lib/keyboardShortcuts'
|
|
||||||
|
|
||||||
describe ('keyboardShortcuts', () => {
|
|
||||||
it ('defines the default key bindings used by the settings screen', () => {
|
|
||||||
expect (SHORTCUT_DEFINITIONS_BY_ID['global.openShortcutHelp']).toMatchObject ({
|
|
||||||
label: 'ショートカット一覧を開く',
|
|
||||||
scope: 'global',
|
|
||||||
defaultBinding: { key: '?', shift: true } })
|
|
||||||
expect (DEFAULT_KEY_BINDINGS['global.focusSearch']).toEqual ({ key: '/' })
|
|
||||||
expect (DEFAULT_KEY_BINDINGS['navigation.posts']).toEqual ({ key: 'p' })
|
|
||||||
expect (DEFAULT_KEY_BINDINGS['pagination.next']).toEqual ({ key: 'ArrowRight' })
|
|
||||||
expect (DEFAULT_KEY_BINDINGS['settings.theme']).toEqual ({ key: '3' })
|
|
||||||
})
|
|
||||||
|
|
||||||
it ('formats key bindings for display', () => {
|
|
||||||
expect (formatKeyBinding ({ key: '?', shift: true })).toBe ('Shift + ?')
|
|
||||||
expect (formatKeyBinding ({ key: '/' })).toBe ('/')
|
|
||||||
expect (formatKeyBinding ({ key: 'p' })).toBe ('P')
|
|
||||||
expect (formatKeyBinding ({ key: 'ArrowRight' })).toBe ('ArrowRight')
|
|
||||||
expect (formatKeyBinding (null)).toBe ('未割当')
|
|
||||||
})
|
|
||||||
|
|
||||||
it ('normalises keyboard events without assigning space by default', () => {
|
|
||||||
const event = { key: 'P',
|
|
||||||
ctrlKey: false,
|
|
||||||
shiftKey: false,
|
|
||||||
altKey: false,
|
|
||||||
metaKey: false } as KeyboardEvent
|
|
||||||
|
|
||||||
expect (keyBindingFromKeyboardEvent (event)).toEqual ({ key: 'p' })
|
|
||||||
expect (DEFAULT_KEY_BINDINGS['pagination.next']).not.toEqual ({ key: ' ' })
|
|
||||||
})
|
|
||||||
|
|
||||||
it ('detects conflicting action bindings', () => {
|
|
||||||
const conflicts = getConflictingShortcutActionIds ({
|
|
||||||
...DEFAULT_KEY_BINDINGS,
|
|
||||||
'navigation.posts': { key: 'p' },
|
|
||||||
'navigation.tags': { key: 'p' } })
|
|
||||||
|
|
||||||
expect (conflicts.has ('navigation.posts')).toBe (true)
|
|
||||||
expect (conflicts.has ('navigation.tags')).toBe (true)
|
|
||||||
expect (conflicts.has ('navigation.wiki')).toBe (false)
|
|
||||||
})
|
|
||||||
|
|
||||||
it ('resolves route scopes and editable event targets', () => {
|
|
||||||
const input = document.createElement ('input')
|
|
||||||
const div = document.createElement ('div')
|
|
||||||
div.setAttribute ('role', 'textbox')
|
|
||||||
|
|
||||||
expect (resolveShortcutScope ('/posts/search')).toBe ('postSearch')
|
|
||||||
expect (resolveShortcutScope ('/users/settings')).toBe ('settings')
|
|
||||||
expect (resolveShortcutScope ('/materials/1')).toBe ('materials')
|
|
||||||
expect (isEditableEventTarget (input)).toBe (true)
|
|
||||||
expect (isEditableEventTarget (div)).toBe (true)
|
|
||||||
expect (isEditableEventTarget (document.createElement ('button'))).toBe (false)
|
|
||||||
})
|
|
||||||
})
|
|
||||||
@@ -17,9 +17,9 @@ export type ShortcutActionId =
|
|||||||
| 'pagination.next'
|
| 'pagination.next'
|
||||||
| 'pagination.previous'
|
| 'pagination.previous'
|
||||||
| 'settings.account'
|
| 'settings.account'
|
||||||
| 'settings.behavior'
|
|
||||||
| 'settings.theme'
|
| 'settings.theme'
|
||||||
| 'settings.keyboard'
|
| 'settings.keyboard'
|
||||||
|
| 'settings.behavior'
|
||||||
|
|
||||||
export type KeyBinding = {
|
export type KeyBinding = {
|
||||||
key: string
|
key: string
|
||||||
@@ -102,20 +102,20 @@ export const SHORTCUT_DEFINITIONS: ShortcutDefinition[] = [
|
|||||||
defaultBinding: { key: '1' },
|
defaultBinding: { key: '1' },
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
id: 'settings.behavior',
|
id: 'settings.theme',
|
||||||
label: '設定: 動作',
|
label: '設定: テーマ',
|
||||||
scope: 'settings',
|
scope: 'settings',
|
||||||
defaultBinding: { key: '2' },
|
defaultBinding: { key: '2' },
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
id: 'settings.theme',
|
id: 'settings.keyboard',
|
||||||
label: '設定: テーマ',
|
label: '設定: キーボード',
|
||||||
scope: 'settings',
|
scope: 'settings',
|
||||||
defaultBinding: { key: '3' },
|
defaultBinding: { key: '3' },
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
id: 'settings.keyboard',
|
id: 'settings.behavior',
|
||||||
label: '設定: キーボード',
|
label: '設定: 動作',
|
||||||
scope: 'settings',
|
scope: 'settings',
|
||||||
defaultBinding: { key: '4' },
|
defaultBinding: { key: '4' },
|
||||||
},
|
},
|
||||||
@@ -137,9 +137,9 @@ export const SHORTCUT_DEFINITIONS_BY_ID =
|
|||||||
'pagination.next': SHORTCUT_DEFINITIONS[6],
|
'pagination.next': SHORTCUT_DEFINITIONS[6],
|
||||||
'pagination.previous': SHORTCUT_DEFINITIONS[7],
|
'pagination.previous': SHORTCUT_DEFINITIONS[7],
|
||||||
'settings.account': SHORTCUT_DEFINITIONS[8],
|
'settings.account': SHORTCUT_DEFINITIONS[8],
|
||||||
'settings.behavior': SHORTCUT_DEFINITIONS[9],
|
'settings.theme': SHORTCUT_DEFINITIONS[9],
|
||||||
'settings.theme': SHORTCUT_DEFINITIONS[10],
|
'settings.keyboard': SHORTCUT_DEFINITIONS[10],
|
||||||
'settings.keyboard': SHORTCUT_DEFINITIONS[11],
|
'settings.behavior': SHORTCUT_DEFINITIONS[11],
|
||||||
},
|
},
|
||||||
)
|
)
|
||||||
|
|
||||||
@@ -159,9 +159,9 @@ export const DEFAULT_KEY_BINDINGS =
|
|||||||
'pagination.next': null,
|
'pagination.next': null,
|
||||||
'pagination.previous': null,
|
'pagination.previous': null,
|
||||||
'settings.account': null,
|
'settings.account': null,
|
||||||
'settings.behavior': null,
|
|
||||||
'settings.theme': null,
|
'settings.theme': null,
|
||||||
'settings.keyboard': null,
|
'settings.keyboard': null,
|
||||||
|
'settings.behavior': null,
|
||||||
},
|
},
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|||||||
@@ -1,112 +0,0 @@
|
|||||||
import { beforeEach, describe, expect, it, vi } from 'vitest'
|
|
||||||
|
|
||||||
import { applyClientAnimationMode,
|
|
||||||
applyThemeTokens,
|
|
||||||
buildThemeTokens,
|
|
||||||
CLIENT_SETTINGS_STORAGE_KEY,
|
|
||||||
DARK_THEME_TOKENS,
|
|
||||||
DEFAULT_POST_LIST_ORDER,
|
|
||||||
getClientListLimit,
|
|
||||||
getClientListOrder,
|
|
||||||
getClientThemeMode,
|
|
||||||
LIGHT_THEME_TOKENS,
|
|
||||||
loadClientSettings,
|
|
||||||
setClientListSettings,
|
|
||||||
setClientThemeAppearance } from '@/lib/settings'
|
|
||||||
|
|
||||||
import type { FetchPostsOrder } from '@/types'
|
|
||||||
|
|
||||||
const installMatchMedia = (matches: boolean) => {
|
|
||||||
Object.defineProperty (window, 'matchMedia', {
|
|
||||||
configurable: true,
|
|
||||||
value: vi.fn ().mockImplementation (() => ({
|
|
||||||
matches,
|
|
||||||
addEventListener: vi.fn (),
|
|
||||||
removeEventListener: vi.fn () })) })
|
|
||||||
}
|
|
||||||
|
|
||||||
describe ('settings', () => {
|
|
||||||
beforeEach (() => {
|
|
||||||
localStorage.clear ()
|
|
||||||
document.documentElement.removeAttribute ('data-animation')
|
|
||||||
document.documentElement.removeAttribute ('style')
|
|
||||||
document.documentElement.className = ''
|
|
||||||
installMatchMedia (false)
|
|
||||||
})
|
|
||||||
|
|
||||||
it ('stores list settings under the shared client settings key', () => {
|
|
||||||
setClientListSettings ('postSearch', {
|
|
||||||
limit: 50,
|
|
||||||
order: 'title:asc' })
|
|
||||||
|
|
||||||
expect (getClientListLimit ('postSearch')).toBe (50)
|
|
||||||
expect (getClientListOrder<FetchPostsOrder> ('postSearch')).toBe ('title:asc')
|
|
||||||
expect (JSON.parse (localStorage.getItem (CLIENT_SETTINGS_STORAGE_KEY) ?? '{}'))
|
|
||||||
.toMatchObject ({ lists: { postSearch: { limit: 50, order: 'title:asc' } } })
|
|
||||||
})
|
|
||||||
|
|
||||||
it ('ignores invalid list limits and keeps stored order strings', () => {
|
|
||||||
localStorage.setItem (
|
|
||||||
CLIENT_SETTINGS_STORAGE_KEY,
|
|
||||||
JSON.stringify ({ lists: { postList: { limit: 30, order: DEFAULT_POST_LIST_ORDER } } }))
|
|
||||||
|
|
||||||
expect (getClientListLimit ('postList')).toBeNull ()
|
|
||||||
expect (getClientListOrder<FetchPostsOrder> ('postList')).toBe (
|
|
||||||
DEFAULT_POST_LIST_ORDER)
|
|
||||||
})
|
|
||||||
|
|
||||||
it ('stores theme mode and light/dark slot selections in client settings', () => {
|
|
||||||
setClientThemeAppearance ({
|
|
||||||
themeMode: 'dark',
|
|
||||||
activeLightThemeSlotNo: 2,
|
|
||||||
activeDarkThemeSlotNo: 3 })
|
|
||||||
|
|
||||||
expect (getClientThemeMode ()).toBe ('dark')
|
|
||||||
expect (loadClientSettings ().appearance).toMatchObject ({
|
|
||||||
themeMode: 'dark',
|
|
||||||
activeLightThemeSlotNo: 2,
|
|
||||||
activeDarkThemeSlotNo: 3 })
|
|
||||||
})
|
|
||||||
|
|
||||||
it ('applies animation mode to the document dataset', () => {
|
|
||||||
applyClientAnimationMode ('off')
|
|
||||||
expect (document.documentElement.dataset.animation).toBe ('off')
|
|
||||||
|
|
||||||
applyClientAnimationMode ('reduced')
|
|
||||||
expect (document.documentElement.dataset.animation).toBe ('reduced')
|
|
||||||
|
|
||||||
applyClientAnimationMode ('normal')
|
|
||||||
expect (document.documentElement.dataset.animation).toBeUndefined ()
|
|
||||||
})
|
|
||||||
|
|
||||||
it ('normalises TopNav menu link tokens to complete CSS colours', () => {
|
|
||||||
const tokens = buildThemeTokens ('light', {
|
|
||||||
link: '221.2 83.2% 53.3%',
|
|
||||||
topNavMenuLink: '221.2 83.2% 53.3%' })
|
|
||||||
|
|
||||||
expect (tokens.link).toBe ('221.2 83.2% 53.3%')
|
|
||||||
expect (tokens.topNavMenuLink).toBe ('hsl(221.2 83.2% 53.3%)')
|
|
||||||
})
|
|
||||||
|
|
||||||
it ('derives TopNav colours without mixing mobile active backgrounds', () => {
|
|
||||||
const tokens = buildThemeTokens ('light', { })
|
|
||||||
|
|
||||||
expect (tokens.topNavMobileActiveBackground).toBe (
|
|
||||||
LIGHT_THEME_TOKENS.topNavRootBackgroundDesktop)
|
|
||||||
expect (tokens.topNavMobileActiveBackground).not.toBe (
|
|
||||||
tokens.topNavRootBackgroundMobile)
|
|
||||||
expect (buildThemeTokens ('dark', { }).topNavMobileActiveBackground).toBe (
|
|
||||||
DARK_THEME_TOKENS.topNavActiveBackground)
|
|
||||||
})
|
|
||||||
|
|
||||||
it ('sets shadcn tokens and TopNav tokens with their different value formats', () => {
|
|
||||||
const tokens = buildThemeTokens ('dark', { link: '213.1 93.9% 67.8%' })
|
|
||||||
|
|
||||||
applyThemeTokens (tokens)
|
|
||||||
|
|
||||||
expect (document.documentElement.style.getPropertyValue ('--theme-link')).toBe (
|
|
||||||
'213.1 93.9% 67.8%')
|
|
||||||
expect (document.documentElement.style.getPropertyValue ('--top-nav-menu-link')).toBe (
|
|
||||||
'hsl(213.1 93.9% 67.8%)')
|
|
||||||
})
|
|
||||||
})
|
|
||||||
+277
-884
ファイル差分が大きすぎるため省略します
差分を読込み
@@ -25,7 +25,6 @@ import {
|
|||||||
getEffectiveKeyBindings,
|
getEffectiveKeyBindings,
|
||||||
setClientKeyboardSettings,
|
setClientKeyboardSettings,
|
||||||
} from '@/lib/settings'
|
} from '@/lib/settings'
|
||||||
import { useUnsavedChangesGuard } from '@/lib/useUnsavedChangesGuard'
|
|
||||||
|
|
||||||
import type {
|
import type {
|
||||||
KeyBinding,
|
KeyBinding,
|
||||||
@@ -97,7 +96,6 @@ const focusSearchTarget = (): void => {
|
|||||||
export const KeyboardShortcutsProvider = ({ children }: PropsWithChildren) => {
|
export const KeyboardShortcutsProvider = ({ children }: PropsWithChildren) => {
|
||||||
const location = useLocation ()
|
const location = useLocation ()
|
||||||
const navigate = useNavigate ()
|
const navigate = useNavigate ()
|
||||||
const { confirmDiscardNavigation } = useUnsavedChangesGuard ()
|
|
||||||
|
|
||||||
const [keyboardSettings, setKeyboardSettingsState] =
|
const [keyboardSettings, setKeyboardSettingsState] =
|
||||||
useState<ClientKeyboardSettings> (() => getClientKeyboardSettings ())
|
useState<ClientKeyboardSettings> (() => getClientKeyboardSettings ())
|
||||||
@@ -148,13 +146,6 @@ export const KeyboardShortcutsProvider = ({ children }: PropsWithChildren) => {
|
|||||||
}
|
}
|
||||||
}, [])
|
}, [])
|
||||||
|
|
||||||
const guardedNavigate = useCallback ((path: string) => {
|
|
||||||
confirmDiscardNavigation ().then (confirmed => {
|
|
||||||
if (confirmed)
|
|
||||||
navigate (path)
|
|
||||||
})
|
|
||||||
}, [confirmDiscardNavigation, navigate])
|
|
||||||
|
|
||||||
const builtinHandlers = useMemo<ShortcutHandlers> (
|
const builtinHandlers = useMemo<ShortcutHandlers> (
|
||||||
() => ({
|
() => ({
|
||||||
'global.openShortcutHelp': () => {
|
'global.openShortcutHelp': () => {
|
||||||
@@ -163,16 +154,16 @@ export const KeyboardShortcutsProvider = ({ children }: PropsWithChildren) => {
|
|||||||
'global.focusSearch': () => {
|
'global.focusSearch': () => {
|
||||||
focusSearchTarget ()
|
focusSearchTarget ()
|
||||||
},
|
},
|
||||||
'navigation.posts': () => guardedNavigate ('/posts'),
|
'navigation.posts': () => navigate ('/posts'),
|
||||||
'navigation.tags': () => guardedNavigate ('/tags'),
|
'navigation.tags': () => navigate ('/tags'),
|
||||||
'navigation.materials': () => guardedNavigate ('/materials'),
|
'navigation.materials': () => navigate ('/materials'),
|
||||||
'navigation.wiki': () => guardedNavigate ('/wiki'),
|
'navigation.wiki': () => navigate ('/wiki'),
|
||||||
'settings.account': () => guardedNavigate ('/users/settings?tab=account'),
|
'settings.account': () => navigate ('/users/settings?tab=account'),
|
||||||
'settings.theme': () => guardedNavigate ('/users/settings?tab=theme'),
|
'settings.theme': () => navigate ('/users/settings?tab=theme'),
|
||||||
'settings.keyboard': () => guardedNavigate ('/users/settings?tab=keyboard'),
|
'settings.keyboard': () => navigate ('/users/settings?tab=keyboard'),
|
||||||
'settings.behavior': () => guardedNavigate ('/users/settings?tab=behavior'),
|
'settings.behavior': () => navigate ('/users/settings?tab=behavior'),
|
||||||
}),
|
}),
|
||||||
[guardedNavigate],
|
[navigate],
|
||||||
)
|
)
|
||||||
|
|
||||||
const availableActionIds = useMemo<Set<ShortcutActionId>> (
|
const availableActionIds = useMemo<Set<ShortcutActionId>> (
|
||||||
@@ -228,7 +219,7 @@ export const KeyboardShortcutsProvider = ({ children }: PropsWithChildren) => {
|
|||||||
return
|
return
|
||||||
|
|
||||||
const actionId = candidates[0].id
|
const actionId = candidates[0].id
|
||||||
const handler = mergedRegisteredHandlers[actionId] ?? builtinHandlers[actionId]
|
const handler = builtinHandlers[actionId] ?? mergedRegisteredHandlers[actionId]
|
||||||
|
|
||||||
if (handler == null)
|
if (handler == null)
|
||||||
return
|
return
|
||||||
@@ -291,27 +282,10 @@ export const useKeyboardShortcutSettings = (): KeyboardShortcutsContextValue =>
|
|||||||
|
|
||||||
export const useKeyboardShortcuts = (handlers: ShortcutHandlers): void => {
|
export const useKeyboardShortcuts = (handlers: ShortcutHandlers): void => {
|
||||||
const { registerHandlers } = useKeyboardShortcutSettings ()
|
const { registerHandlers } = useKeyboardShortcutSettings ()
|
||||||
const handlersRef = useRef (handlers)
|
|
||||||
const actionIdsKey = Object.keys (handlers).sort ().join ('|')
|
|
||||||
|
|
||||||
useEffect (() => {
|
|
||||||
handlersRef.current = handlers
|
|
||||||
}, [handlers])
|
|
||||||
|
|
||||||
const stableHandlers = useMemo<ShortcutHandlers> (() => {
|
|
||||||
return actionIdsKey.split ('|').filter (actionId => actionId !== '')
|
|
||||||
.reduce<ShortcutHandlers> ((nextHandlers, actionId) => {
|
|
||||||
const key = actionId as ShortcutActionId
|
|
||||||
nextHandlers[key] = () => {
|
|
||||||
handlersRef.current[key]?.()
|
|
||||||
}
|
|
||||||
return nextHandlers
|
|
||||||
}, { })
|
|
||||||
}, [actionIdsKey])
|
|
||||||
|
|
||||||
useEffect (
|
useEffect (
|
||||||
() => registerHandlers (stableHandlers),
|
() => registerHandlers (handlers),
|
||||||
[registerHandlers, stableHandlers],
|
[handlers, registerHandlers],
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -1,69 +0,0 @@
|
|||||||
import { createContext, useCallback, useContext, useMemo, useState } from 'react'
|
|
||||||
|
|
||||||
import { useDialogue } from '@/components/dialogues/DialogueProvider'
|
|
||||||
|
|
||||||
import type { FC, PropsWithChildren } from 'react'
|
|
||||||
|
|
||||||
type UnsavedChangesSource = {
|
|
||||||
dirty: boolean
|
|
||||||
discard: () => void | Promise<void> }
|
|
||||||
|
|
||||||
type UnsavedChangesGuardContextValue = {
|
|
||||||
hasUnsavedChanges: boolean
|
|
||||||
registerUnsavedChangesSource: (
|
|
||||||
source: UnsavedChangesSource | null,
|
|
||||||
) => void
|
|
||||||
confirmDiscardNavigation: () => Promise<boolean> }
|
|
||||||
|
|
||||||
const UnsavedChangesGuardContext =
|
|
||||||
createContext<UnsavedChangesGuardContextValue | null> (null)
|
|
||||||
|
|
||||||
|
|
||||||
export const UnsavedChangesGuardProvider: FC<PropsWithChildren> = ({ children }) => {
|
|
||||||
const dialogue = useDialogue ()
|
|
||||||
const [source, setSource] = useState<UnsavedChangesSource | null> (null)
|
|
||||||
|
|
||||||
const registerUnsavedChangesSource = useCallback ((
|
|
||||||
nextSource: UnsavedChangesSource | null,
|
|
||||||
) => {
|
|
||||||
setSource (nextSource)
|
|
||||||
}, [])
|
|
||||||
|
|
||||||
const confirmDiscardNavigation = useCallback (async (): Promise<boolean> => {
|
|
||||||
if (!(source?.dirty))
|
|
||||||
return true
|
|
||||||
|
|
||||||
const confirmed = await dialogue.confirm ({
|
|
||||||
title: '未保存の変更があります',
|
|
||||||
description: 'このまま移動すると、保存していない変更は失われます。',
|
|
||||||
cancelText: 'このページに残る',
|
|
||||||
confirmText: '変更を破棄して移動',
|
|
||||||
variant: 'danger' })
|
|
||||||
if (!(confirmed))
|
|
||||||
return false
|
|
||||||
|
|
||||||
await source.discard ()
|
|
||||||
return true
|
|
||||||
}, [dialogue, source])
|
|
||||||
|
|
||||||
const value = useMemo<UnsavedChangesGuardContextValue> (() => ({
|
|
||||||
hasUnsavedChanges: source?.dirty === true,
|
|
||||||
registerUnsavedChangesSource,
|
|
||||||
confirmDiscardNavigation,
|
|
||||||
}), [confirmDiscardNavigation, registerUnsavedChangesSource, source?.dirty])
|
|
||||||
|
|
||||||
return (
|
|
||||||
<UnsavedChangesGuardContext.Provider value={value}>
|
|
||||||
{children}
|
|
||||||
</UnsavedChangesGuardContext.Provider>)
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
export const useUnsavedChangesGuard = (): UnsavedChangesGuardContextValue => {
|
|
||||||
const context = useContext (UnsavedChangesGuardContext)
|
|
||||||
|
|
||||||
if (context == null)
|
|
||||||
throw new Error ('UnsavedChangesGuardProvider が必要です.')
|
|
||||||
|
|
||||||
return context
|
|
||||||
}
|
|
||||||
@@ -28,7 +28,6 @@ import {
|
|||||||
getClientGekanatorBackgroundMotion,
|
getClientGekanatorBackgroundMotion,
|
||||||
setClientGekanatorBackgroundMotion,
|
setClientGekanatorBackgroundMotion,
|
||||||
} from '@/lib/settings'
|
} from '@/lib/settings'
|
||||||
import { useClientBehaviourSettings } from '@/lib/useClientBehaviourSettings'
|
|
||||||
import { cn } from '@/lib/utils'
|
import { cn } from '@/lib/utils'
|
||||||
|
|
||||||
import type { FC } from 'react'
|
import type { FC } from 'react'
|
||||||
@@ -3678,8 +3677,6 @@ const expectedAnswerFor = (
|
|||||||
|
|
||||||
|
|
||||||
const GekanatorPage: FC<{ user: User | null }> = ({ user }) => {
|
const GekanatorPage: FC<{ user: User | null }> = ({ user }) => {
|
||||||
const behaviourSettings = useClientBehaviourSettings ()
|
|
||||||
const animationMode = behaviourSettings.animation ?? 'normal'
|
|
||||||
const storedGame = useMemo (loadStoredGame, [])
|
const storedGame = useMemo (loadStoredGame, [])
|
||||||
const hasStoredRestore = storedGame != null && isStoredPhase (storedGame.phase)
|
const hasStoredRestore = storedGame != null && isStoredPhase (storedGame.phase)
|
||||||
const queryClient = useQueryClient ()
|
const queryClient = useQueryClient ()
|
||||||
@@ -4072,12 +4069,9 @@ const GekanatorPage: FC<{ user: User | null }> = ({ user }) => {
|
|||||||
return reviewGuessedPostId === reviewCorrectPostId
|
return reviewGuessedPostId === reviewCorrectPostId
|
||||||
}) ()
|
}) ()
|
||||||
const effectiveBackgroundMotionMode = (() => {
|
const effectiveBackgroundMotionMode = (() => {
|
||||||
if (animationMode === 'off')
|
|
||||||
return 'off'
|
|
||||||
|
|
||||||
if (backgroundMotionMode === 'off')
|
if (backgroundMotionMode === 'off')
|
||||||
return 'off'
|
return 'off'
|
||||||
if (animationMode === 'reduced' || prefersReducedMotion)
|
if (prefersReducedMotion)
|
||||||
return 'calm'
|
return 'calm'
|
||||||
|
|
||||||
return backgroundMotionMode
|
return backgroundMotionMode
|
||||||
|
|||||||
@@ -9,18 +9,14 @@ import PageTitle from '@/components/common/PageTitle'
|
|||||||
import Pagination from '@/components/common/Pagination'
|
import Pagination from '@/components/common/Pagination'
|
||||||
import MainArea from '@/components/layout/MainArea'
|
import MainArea from '@/components/layout/MainArea'
|
||||||
import { SITE_TITLE } from '@/config'
|
import { SITE_TITLE } from '@/config'
|
||||||
import { clientScrollBehaviour } from '@/lib/clientAnimation'
|
|
||||||
import { fetchMaterialChanges } from '@/lib/materials'
|
import { fetchMaterialChanges } from '@/lib/materials'
|
||||||
import { materialsKeys } from '@/lib/queryKeys'
|
import { materialsKeys } from '@/lib/queryKeys'
|
||||||
import { useClientBehaviourSettings } from '@/lib/useClientBehaviourSettings'
|
|
||||||
import { dateString, inputClass } from '@/lib/utils'
|
import { dateString, inputClass } from '@/lib/utils'
|
||||||
|
|
||||||
import type { FC, FormEvent } from 'react'
|
import type { FC, FormEvent } from 'react'
|
||||||
|
|
||||||
|
|
||||||
const MaterialHistoryPage: FC = () => {
|
const MaterialHistoryPage: FC = () => {
|
||||||
const behaviourSettings = useClientBehaviourSettings ()
|
|
||||||
const animationMode = behaviourSettings.animation ?? 'normal'
|
|
||||||
const location = useLocation ()
|
const location = useLocation ()
|
||||||
const navigate = useNavigate ()
|
const navigate = useNavigate ()
|
||||||
const query = new URLSearchParams (location.search)
|
const query = new URLSearchParams (location.search)
|
||||||
@@ -59,9 +55,8 @@ const MaterialHistoryPage: FC = () => {
|
|||||||
const totalPages = data ? Math.ceil (data.count / limit) : 0
|
const totalPages = data ? Math.ceil (data.count / limit) : 0
|
||||||
|
|
||||||
useEffect (() => {
|
useEffect (() => {
|
||||||
document.querySelector ('table')?.scrollIntoView ({
|
document.querySelector ('table')?.scrollIntoView ({ behavior: 'smooth' })
|
||||||
behavior: clientScrollBehaviour (animationMode) })
|
}, [location.search])
|
||||||
}, [animationMode, location.search])
|
|
||||||
|
|
||||||
const handleSearch = (event: FormEvent) => {
|
const handleSearch = (event: FormEvent) => {
|
||||||
event.preventDefault ()
|
event.preventDefault ()
|
||||||
|
|||||||
@@ -12,12 +12,9 @@ import { useDialogue } from '@/components/dialogues/DialogueProvider'
|
|||||||
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'
|
||||||
import { SITE_TITLE } from '@/config'
|
import { SITE_TITLE } from '@/config'
|
||||||
import { clientAnimationTransition,
|
|
||||||
clientScrollBehaviour } from '@/lib/clientAnimation'
|
|
||||||
import { fetchPostChanges, updatePost } from '@/lib/posts'
|
import { fetchPostChanges, updatePost } from '@/lib/posts'
|
||||||
import { postsKeys, tagsKeys } from '@/lib/queryKeys'
|
import { postsKeys, tagsKeys } from '@/lib/queryKeys'
|
||||||
import { fetchTag } from '@/lib/tags'
|
import { fetchTag } from '@/lib/tags'
|
||||||
import { useClientBehaviourSettings } from '@/lib/useClientBehaviourSettings'
|
|
||||||
import { cn, dateString, originalCreatedAtString } from '@/lib/utils'
|
import { cn, dateString, originalCreatedAtString } from '@/lib/utils'
|
||||||
|
|
||||||
import type { FC, MouseEvent } from 'react'
|
import type { FC, MouseEvent } from 'react'
|
||||||
@@ -40,12 +37,6 @@ const renderDiff = (diff: { current: string | null; prev: string | null }) => (
|
|||||||
|
|
||||||
const PostHistoryPage: FC = () => {
|
const PostHistoryPage: FC = () => {
|
||||||
const dialogue = useDialogue ()
|
const dialogue = useDialogue ()
|
||||||
const behaviourSettings = useClientBehaviourSettings ()
|
|
||||||
const animationMode = behaviourSettings.animation ?? 'normal'
|
|
||||||
const layoutTransition = clientAnimationTransition (
|
|
||||||
animationMode,
|
|
||||||
{ normal: { duration: .2, ease: 'easeOut' as const } },
|
|
||||||
)
|
|
||||||
|
|
||||||
const location = useLocation ()
|
const location = useLocation ()
|
||||||
const query = new URLSearchParams (location.search)
|
const query = new URLSearchParams (location.search)
|
||||||
@@ -122,9 +113,8 @@ const PostHistoryPage: FC = () => {
|
|||||||
}
|
}
|
||||||
|
|
||||||
useEffect (() => {
|
useEffect (() => {
|
||||||
document.querySelector ('table')?.scrollIntoView ({
|
document.querySelector ('table')?.scrollIntoView ({ behavior: 'smooth' })
|
||||||
behavior: clientScrollBehaviour (animationMode) })
|
}, [location.search])
|
||||||
}, [animationMode, location.search])
|
|
||||||
|
|
||||||
const layoutIds: string[] = []
|
const layoutIds: string[] = []
|
||||||
|
|
||||||
@@ -208,8 +198,8 @@ const PostHistoryPage: FC = () => {
|
|||||||
rowSpan={rowsCnt}>
|
rowSpan={rowsCnt}>
|
||||||
<PrefetchLink to={`/posts/${ change.postId }`}>
|
<PrefetchLink to={`/posts/${ change.postId }`}>
|
||||||
<motion.div
|
<motion.div
|
||||||
layoutId={animationMode === 'off' ? undefined : layoutId}
|
layoutId={layoutId}
|
||||||
transition={{ layout: layoutTransition }}>
|
transition={{ layout: { duration: .2, ease: 'easeOut' } }}>
|
||||||
<img src={change.thumbnail.current
|
<img src={change.thumbnail.current
|
||||||
|| change.thumbnailBase.current
|
|| change.thumbnailBase.current
|
||||||
|| undefined}
|
|| undefined}
|
||||||
|
|||||||
@@ -1,10 +1,9 @@
|
|||||||
import { fireEvent, screen, waitFor } from '@testing-library/react'
|
import { fireEvent, screen, waitFor } from '@testing-library/react'
|
||||||
import { beforeEach, describe, expect, it, vi } from 'vitest'
|
import { describe, expect, it, vi } from 'vitest'
|
||||||
|
|
||||||
import PostListPage from '@/pages/posts/PostListPage'
|
import PostListPage from '@/pages/posts/PostListPage'
|
||||||
import { buildPost, buildTag, buildWikiPage } from '@/test/factories'
|
import { buildPost, buildTag, buildWikiPage } from '@/test/factories'
|
||||||
import { renderWithProviders } from '@/test/render'
|
import { renderWithProviders } from '@/test/render'
|
||||||
import { CLIENT_SETTINGS_STORAGE_KEY } from '@/lib/settings'
|
|
||||||
|
|
||||||
const postsApi = vi.hoisted (() => ({
|
const postsApi = vi.hoisted (() => ({
|
||||||
fetchPosts: vi.fn (),
|
fetchPosts: vi.fn (),
|
||||||
@@ -19,11 +18,6 @@ vi.mock ('@/lib/posts', () => postsApi)
|
|||||||
vi.mock ('@/lib/wiki', () => wikiApi)
|
vi.mock ('@/lib/wiki', () => wikiApi)
|
||||||
|
|
||||||
describe ('PostListPage', () => {
|
describe ('PostListPage', () => {
|
||||||
beforeEach (() => {
|
|
||||||
localStorage.clear ()
|
|
||||||
vi.clearAllMocks ()
|
|
||||||
})
|
|
||||||
|
|
||||||
it ('loads posts from the current query and renders the plaza tab', async () => {
|
it ('loads posts from the current query and renders the plaza tab', async () => {
|
||||||
const tag = buildTag ({ name: '虹夏' })
|
const tag = buildTag ({ name: '虹夏' })
|
||||||
postsApi.fetchPosts.mockResolvedValueOnce ({
|
postsApi.fetchPosts.mockResolvedValueOnce ({
|
||||||
@@ -42,7 +36,6 @@ describe ('PostListPage', () => {
|
|||||||
match: 'all',
|
match: 'all',
|
||||||
page: 2,
|
page: 2,
|
||||||
limit: 20,
|
limit: 20,
|
||||||
order: 'original_created_at:desc',
|
|
||||||
}),
|
}),
|
||||||
)
|
)
|
||||||
})
|
})
|
||||||
@@ -78,36 +71,4 @@ describe ('PostListPage', () => {
|
|||||||
'/wiki/%E8%99%B9%E5%A4%8F',
|
'/wiki/%E8%99%B9%E5%A4%8F',
|
||||||
)
|
)
|
||||||
})
|
})
|
||||||
|
|
||||||
it ('uses stored list limit but keeps the fixed plaza order', async () => {
|
|
||||||
localStorage.setItem (
|
|
||||||
CLIENT_SETTINGS_STORAGE_KEY,
|
|
||||||
JSON.stringify ({ lists: { postList: { limit: 50, order: 'title:asc' } } }))
|
|
||||||
postsApi.fetchPosts.mockResolvedValueOnce ({ posts: [], count: 0 })
|
|
||||||
|
|
||||||
renderWithProviders (<PostListPage/>, { route: '/posts' })
|
|
||||||
|
|
||||||
await waitFor (() => {
|
|
||||||
expect (postsApi.fetchPosts).toHaveBeenCalledWith (
|
|
||||||
expect.objectContaining ({
|
|
||||||
limit: 50,
|
|
||||||
order: 'original_created_at:desc',
|
|
||||||
}),
|
|
||||||
)
|
|
||||||
})
|
|
||||||
})
|
|
||||||
|
|
||||||
it ('updates the limit from the tab right addon and resets to page 1', async () => {
|
|
||||||
postsApi.fetchPosts.mockResolvedValue ({ posts: [], count: 0 })
|
|
||||||
|
|
||||||
renderWithProviders (<PostListPage/>, { route: '/posts?page=3' })
|
|
||||||
|
|
||||||
fireEvent.change (await screen.findByLabelText ('件数'), { target: { value: '100' } })
|
|
||||||
|
|
||||||
await waitFor (() => {
|
|
||||||
expect (postsApi.fetchPosts).toHaveBeenLastCalledWith (
|
|
||||||
expect.objectContaining ({ page: 1, limit: 100 }),
|
|
||||||
)
|
|
||||||
})
|
|
||||||
})
|
|
||||||
})
|
})
|
||||||
|
|||||||
@@ -30,12 +30,16 @@ describe ('PostNewPage', () => {
|
|||||||
expect (screen.getByText ('403')).toBeInTheDocument ()
|
expect (screen.getByText ('403')).toBeInTheDocument ()
|
||||||
})
|
})
|
||||||
|
|
||||||
it ('submits a new post with manual title and thumbnail fetch UI', async () => {
|
it ('submits a new post with manual title and thumbnail settings', async () => {
|
||||||
api.apiPost.mockResolvedValueOnce ({})
|
api.apiPost.mockResolvedValueOnce ({})
|
||||||
api.apiGet.mockResolvedValue ([])
|
api.apiGet.mockResolvedValue ([])
|
||||||
|
|
||||||
renderWithProviders (<PostNewPage user={buildUser ({ role: 'member' })}/>)
|
renderWithProviders (<PostNewPage user={buildUser ({ role: 'member' })}/>)
|
||||||
|
|
||||||
|
const checkboxes = screen.getAllByRole ('checkbox', { name: '自動' })
|
||||||
|
fireEvent.click (checkboxes[0])
|
||||||
|
fireEvent.click (checkboxes[1])
|
||||||
|
|
||||||
const textboxes = screen.getAllByRole ('textbox')
|
const textboxes = screen.getAllByRole ('textbox')
|
||||||
fireEvent.change (textboxes[0], { target: { value: 'https://example.com/post' } })
|
fireEvent.change (textboxes[0], { target: { value: 'https://example.com/post' } })
|
||||||
fireEvent.change (textboxes[1], { target: { value: '投稿タイトル' } })
|
fireEvent.change (textboxes[1], { target: { value: '投稿タイトル' } })
|
||||||
@@ -93,6 +97,10 @@ describe ('PostNewPage', () => {
|
|||||||
|
|
||||||
renderWithProviders (<PostNewPage user={buildUser ({ role: 'member' })}/>)
|
renderWithProviders (<PostNewPage user={buildUser ({ role: 'member' })}/>)
|
||||||
|
|
||||||
|
const checkboxes = screen.getAllByRole ('checkbox', { name: '自動' })
|
||||||
|
fireEvent.click (checkboxes[0])
|
||||||
|
fireEvent.click (checkboxes[1])
|
||||||
|
|
||||||
const textboxes = screen.getAllByRole ('textbox')
|
const textboxes = screen.getAllByRole ('textbox')
|
||||||
fireEvent.change (textboxes[0], { target: { value: 'https://example.com/post' } })
|
fireEvent.change (textboxes[0], { target: { value: 'https://example.com/post' } })
|
||||||
fireEvent.change (textboxes[1], { target: { value: '投稿タイトル' } })
|
fireEvent.change (textboxes[1], { target: { value: '投稿タイトル' } })
|
||||||
|
|||||||
@@ -4,7 +4,6 @@ import { beforeEach, describe, expect, it, vi } from 'vitest'
|
|||||||
import PostSearchPage from '@/pages/posts/PostSearchPage'
|
import PostSearchPage from '@/pages/posts/PostSearchPage'
|
||||||
import { buildPost, buildTag } from '@/test/factories'
|
import { buildPost, buildTag } from '@/test/factories'
|
||||||
import { renderWithProviders } from '@/test/render'
|
import { renderWithProviders } from '@/test/render'
|
||||||
import { CLIENT_SETTINGS_STORAGE_KEY } from '@/lib/settings'
|
|
||||||
|
|
||||||
const postsApi = vi.hoisted (() => ({
|
const postsApi = vi.hoisted (() => ({
|
||||||
fetchPosts: vi.fn (),
|
fetchPosts: vi.fn (),
|
||||||
@@ -19,7 +18,6 @@ vi.mock ('@/lib/api', () => api)
|
|||||||
|
|
||||||
describe ('PostSearchPage', () => {
|
describe ('PostSearchPage', () => {
|
||||||
beforeEach (() => {
|
beforeEach (() => {
|
||||||
localStorage.clear ()
|
|
||||||
vi.clearAllMocks ()
|
vi.clearAllMocks ()
|
||||||
api.apiGet.mockResolvedValue ([])
|
api.apiGet.mockResolvedValue ([])
|
||||||
})
|
})
|
||||||
@@ -42,7 +40,6 @@ describe ('PostSearchPage', () => {
|
|||||||
tags: 'x',
|
tags: 'x',
|
||||||
match: 'any',
|
match: 'any',
|
||||||
page: 2,
|
page: 2,
|
||||||
limit: 20,
|
|
||||||
}),
|
}),
|
||||||
)
|
)
|
||||||
})
|
})
|
||||||
@@ -84,41 +81,4 @@ describe ('PostSearchPage', () => {
|
|||||||
|
|
||||||
expect (await screen.findByText ('結果ないよ(笑)')).toBeInTheDocument ()
|
expect (await screen.findByText ('結果ないよ(笑)')).toBeInTheDocument ()
|
||||||
})
|
})
|
||||||
|
|
||||||
it ('uses URL limit before localStorage and stores the active list settings', async () => {
|
|
||||||
localStorage.setItem (
|
|
||||||
CLIENT_SETTINGS_STORAGE_KEY,
|
|
||||||
JSON.stringify ({ lists: { postSearch: { limit: 100, order: 'title:asc' } } }))
|
|
||||||
postsApi.fetchPosts.mockResolvedValueOnce ({ posts: [], count: 0 })
|
|
||||||
|
|
||||||
renderWithProviders (
|
|
||||||
<PostSearchPage/>,
|
|
||||||
{ route: '/posts/search?limit=50&order=created_at%3Adesc' },
|
|
||||||
)
|
|
||||||
|
|
||||||
await waitFor (() => {
|
|
||||||
expect (postsApi.fetchPosts).toHaveBeenCalledWith (
|
|
||||||
expect.objectContaining ({ limit: 50, order: 'created_at:desc' }),
|
|
||||||
)
|
|
||||||
})
|
|
||||||
expect (JSON.parse (localStorage.getItem (CLIENT_SETTINGS_STORAGE_KEY) ?? '{}'))
|
|
||||||
.toMatchObject ({ lists: { postSearch: { limit: 50, order: 'created_at:desc' } } })
|
|
||||||
})
|
|
||||||
|
|
||||||
it ('moves the compact limit control outside the search form and resets page on change', async () => {
|
|
||||||
postsApi.fetchPosts.mockResolvedValue ({ posts: [], count: 0 })
|
|
||||||
|
|
||||||
renderWithProviders (<PostSearchPage/>, { route: '/posts/search?page=4' })
|
|
||||||
|
|
||||||
const limitSelect = await screen.findByLabelText ('件数')
|
|
||||||
expect (limitSelect.closest ('form')).toBeNull ()
|
|
||||||
|
|
||||||
fireEvent.change (limitSelect, { target: { value: '100' } })
|
|
||||||
|
|
||||||
await waitFor (() => {
|
|
||||||
expect (postsApi.fetchPosts).toHaveBeenLastCalledWith (
|
|
||||||
expect.objectContaining ({ page: 1, limit: 100 }),
|
|
||||||
)
|
|
||||||
})
|
|
||||||
})
|
|
||||||
})
|
})
|
||||||
|
|||||||
@@ -14,8 +14,6 @@ import Pagination from '@/components/common/Pagination'
|
|||||||
import TagInput from '@/components/common/TagInput'
|
import TagInput from '@/components/common/TagInput'
|
||||||
import MainArea from '@/components/layout/MainArea'
|
import MainArea from '@/components/layout/MainArea'
|
||||||
import { SITE_TITLE } from '@/config'
|
import { SITE_TITLE } from '@/config'
|
||||||
import { clientAnimationTransition,
|
|
||||||
clientScrollBehaviour } from '@/lib/clientAnimation'
|
|
||||||
import { fetchPosts } from '@/lib/posts'
|
import { fetchPosts } from '@/lib/posts'
|
||||||
import { postsKeys } from '@/lib/queryKeys'
|
import { postsKeys } from '@/lib/queryKeys'
|
||||||
import {
|
import {
|
||||||
@@ -26,7 +24,6 @@ import {
|
|||||||
LIST_LIMIT_OPTIONS,
|
LIST_LIMIT_OPTIONS,
|
||||||
setClientListSettings,
|
setClientListSettings,
|
||||||
} from '@/lib/settings'
|
} from '@/lib/settings'
|
||||||
import { useClientBehaviourSettings } from '@/lib/useClientBehaviourSettings'
|
|
||||||
import { useKeyboardShortcuts } from '@/lib/useKeyboardShortcuts'
|
import { useKeyboardShortcuts } from '@/lib/useKeyboardShortcuts'
|
||||||
import { dateString, inputClass, originalCreatedAtString } from '@/lib/utils'
|
import { dateString, inputClass, originalCreatedAtString } from '@/lib/utils'
|
||||||
|
|
||||||
@@ -70,13 +67,6 @@ const parseOrder = (value: string | null): FetchPostsOrder | null => {
|
|||||||
|
|
||||||
|
|
||||||
const PostSearchPage: FC = () => {
|
const PostSearchPage: FC = () => {
|
||||||
const behaviourSettings = useClientBehaviourSettings ()
|
|
||||||
const animationMode = behaviourSettings.animation ?? 'normal'
|
|
||||||
const thumbnailTransition = clientAnimationTransition (
|
|
||||||
animationMode,
|
|
||||||
{ normal: { type: 'spring', stiffness: 500, damping: 40, mass: .5 },
|
|
||||||
reduced: { duration: .08, ease: 'linear' as const } },
|
|
||||||
)
|
|
||||||
const location = useLocation ()
|
const location = useLocation ()
|
||||||
|
|
||||||
const navigate = useNavigate ()
|
const navigate = useNavigate ()
|
||||||
@@ -151,11 +141,9 @@ const PostSearchPage: FC = () => {
|
|||||||
setUpdatedFrom (qUpdatedFrom)
|
setUpdatedFrom (qUpdatedFrom)
|
||||||
setUpdatedTo (qUpdatedTo)
|
setUpdatedTo (qUpdatedTo)
|
||||||
|
|
||||||
document.querySelector ('table')?.scrollIntoView ({
|
document.querySelector ('table')?.scrollIntoView ({ behavior: 'smooth' })
|
||||||
behavior: clientScrollBehaviour (animationMode) })
|
}, [location.search, qCreatedFrom, qCreatedTo, qMatch, qOriginalCreatedFrom,
|
||||||
}, [animationMode, location.search, qCreatedFrom, qCreatedTo, qMatch,
|
qOriginalCreatedTo, qTags, qTitle, qUpdatedFrom, qUpdatedTo, qURL])
|
||||||
qOriginalCreatedFrom, qOriginalCreatedTo, qTags, qTitle, qUpdatedFrom,
|
|
||||||
qUpdatedTo, qURL])
|
|
||||||
|
|
||||||
const search = async () => {
|
const search = async () => {
|
||||||
const qs = new URLSearchParams ()
|
const qs = new URLSearchParams ()
|
||||||
@@ -412,10 +400,11 @@ const PostSearchPage: FC = () => {
|
|||||||
<td className="p-2">
|
<td className="p-2">
|
||||||
<PrefetchLink to={`/posts/${ row.id }`} title={row.title || undefined}>
|
<PrefetchLink to={`/posts/${ row.id }`} title={row.title || undefined}>
|
||||||
<motion.div
|
<motion.div
|
||||||
layoutId={animationMode === 'off'
|
layoutId={`page-${ row.id }`}
|
||||||
? undefined
|
transition={{ type: 'spring',
|
||||||
: `page-${ row.id }`}
|
stiffness: 500,
|
||||||
transition={thumbnailTransition}>
|
damping: 40,
|
||||||
|
mass: .5 }}>
|
||||||
<img src={row.thumbnail || row.thumbnailBase || undefined}
|
<img src={row.thumbnail || row.thumbnailBase || undefined}
|
||||||
alt={row.title || row.url}
|
alt={row.title || row.url}
|
||||||
title={row.title || row.url || undefined}
|
title={row.title || row.url || undefined}
|
||||||
|
|||||||
@@ -6,7 +6,6 @@ import { dateString } from '@/lib/utils'
|
|||||||
import { buildTag, buildUser } from '@/test/factories'
|
import { buildTag, buildUser } from '@/test/factories'
|
||||||
import { renderWithProviders } from '@/test/render'
|
import { renderWithProviders } from '@/test/render'
|
||||||
|
|
||||||
import type { ReactNode } from 'react'
|
|
||||||
import type { NicoTag } from '@/types'
|
import type { NicoTag } from '@/types'
|
||||||
|
|
||||||
const api = vi.hoisted (() => ({
|
const api = vi.hoisted (() => ({
|
||||||
@@ -28,7 +27,6 @@ const scrollIntoView = vi.fn ()
|
|||||||
vi.mock ('@/lib/api', () => api)
|
vi.mock ('@/lib/api', () => api)
|
||||||
vi.mock ('@/components/ui/use-toast', () => toastApi)
|
vi.mock ('@/components/ui/use-toast', () => toastApi)
|
||||||
vi.mock ('@/components/dialogues/DialogueProvider', () => ({
|
vi.mock ('@/components/dialogues/DialogueProvider', () => ({
|
||||||
default: ({ children }: { children: ReactNode }) => <>{children}</>,
|
|
||||||
useDialogue: () => dialogue,
|
useDialogue: () => dialogue,
|
||||||
}))
|
}))
|
||||||
|
|
||||||
|
|||||||
@@ -17,10 +17,8 @@ import { toast } from '@/components/ui/use-toast'
|
|||||||
import { SITE_TITLE } from '@/config'
|
import { SITE_TITLE } from '@/config'
|
||||||
import { apiPut } from '@/lib/api'
|
import { apiPut } from '@/lib/api'
|
||||||
import { extractValidationError } from '@/lib/apiErrors'
|
import { extractValidationError } from '@/lib/apiErrors'
|
||||||
import { clientScrollBehaviour } from '@/lib/clientAnimation'
|
|
||||||
import { tagsKeys } from '@/lib/queryKeys'
|
import { tagsKeys } from '@/lib/queryKeys'
|
||||||
import { fetchNicoTags } from '@/lib/tags'
|
import { fetchNicoTags } from '@/lib/tags'
|
||||||
import { useClientBehaviourSettings } from '@/lib/useClientBehaviourSettings'
|
|
||||||
import { cn, dateString, inputClass } from '@/lib/utils'
|
import { cn, dateString, inputClass } from '@/lib/utils'
|
||||||
import { canEditContent } from '@/lib/users'
|
import { canEditContent } from '@/lib/users'
|
||||||
|
|
||||||
@@ -40,8 +38,6 @@ const setIf = (qs: URLSearchParams, key: string, value: string) => {
|
|||||||
|
|
||||||
|
|
||||||
const NicoTagListPage: FC<Props> = ({ user }) => {
|
const NicoTagListPage: FC<Props> = ({ user }) => {
|
||||||
const behaviourSettings = useClientBehaviourSettings ()
|
|
||||||
const animationMode = behaviourSettings.animation ?? 'normal'
|
|
||||||
const dialogue = useDialogue ()
|
const dialogue = useDialogue ()
|
||||||
const location = useLocation ()
|
const location = useLocation ()
|
||||||
const navigate = useNavigate ()
|
const navigate = useNavigate ()
|
||||||
@@ -156,9 +152,8 @@ const NicoTagListPage: FC<Props> = ({ user }) => {
|
|||||||
setLinkStatus (qLinkStatus)
|
setLinkStatus (qLinkStatus)
|
||||||
setEditingId (null)
|
setEditingId (null)
|
||||||
|
|
||||||
document.querySelector ('table')?.scrollIntoView ({
|
document.querySelector ('table')?.scrollIntoView ({ behavior: 'smooth' })
|
||||||
behavior: clientScrollBehaviour (animationMode) })
|
}, [location.search, qLinkedTag, qLinkStatus, qName])
|
||||||
}, [animationMode, location.search, qLinkedTag, qLinkStatus, qName])
|
|
||||||
|
|
||||||
useEffect (() => {
|
useEffect (() => {
|
||||||
if (!(data))
|
if (!(data))
|
||||||
|
|||||||
@@ -11,10 +11,8 @@ import { toast } from '@/components/ui/use-toast'
|
|||||||
import { SITE_TITLE } from '@/config'
|
import { SITE_TITLE } from '@/config'
|
||||||
import { CATEGORY_NAMES } from '@/consts'
|
import { CATEGORY_NAMES } from '@/consts'
|
||||||
import { apiPut } from '@/lib/api'
|
import { apiPut } from '@/lib/api'
|
||||||
import { clientScrollBehaviour } from '@/lib/clientAnimation'
|
|
||||||
import { postsKeys, tagsKeys } from '@/lib/queryKeys'
|
import { postsKeys, tagsKeys } from '@/lib/queryKeys'
|
||||||
import { fetchTagChanges } from '@/lib/tags'
|
import { fetchTagChanges } from '@/lib/tags'
|
||||||
import { useClientBehaviourSettings } from '@/lib/useClientBehaviourSettings'
|
|
||||||
import { cn, dateString } from '@/lib/utils'
|
import { cn, dateString } from '@/lib/utils'
|
||||||
|
|
||||||
import type { FC } from 'react'
|
import type { FC } from 'react'
|
||||||
@@ -45,8 +43,6 @@ const renderStateDiff = (diff: { current: string | null; prev: string | null })
|
|||||||
|
|
||||||
|
|
||||||
const TagHistoryPage: FC = () => {
|
const TagHistoryPage: FC = () => {
|
||||||
const behaviourSettings = useClientBehaviourSettings ()
|
|
||||||
const animationMode = behaviourSettings.animation ?? 'normal'
|
|
||||||
const location = useLocation ()
|
const location = useLocation ()
|
||||||
const query = new URLSearchParams (location.search)
|
const query = new URLSearchParams (location.search)
|
||||||
const id = query.get ('id')
|
const id = query.get ('id')
|
||||||
@@ -62,9 +58,8 @@ const TagHistoryPage: FC = () => {
|
|||||||
const qc = useQueryClient ()
|
const qc = useQueryClient ()
|
||||||
|
|
||||||
useEffect (() => {
|
useEffect (() => {
|
||||||
document.querySelector ('table')?.scrollIntoView ({
|
document.querySelector ('table')?.scrollIntoView ({ behavior: 'smooth' })
|
||||||
behavior: clientScrollBehaviour (animationMode) })
|
}, [location.search])
|
||||||
}, [animationMode, location.search])
|
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<MainArea>
|
<MainArea>
|
||||||
|
|||||||
@@ -1,10 +1,9 @@
|
|||||||
import { fireEvent, screen, waitFor } from '@testing-library/react'
|
import { fireEvent, screen, waitFor } from '@testing-library/react'
|
||||||
import { beforeEach, describe, expect, it, vi } from 'vitest'
|
import { describe, expect, it, vi } from 'vitest'
|
||||||
|
|
||||||
import TagListPage from '@/pages/tags/TagListPage'
|
import TagListPage from '@/pages/tags/TagListPage'
|
||||||
import { buildTag } from '@/test/factories'
|
import { buildTag } from '@/test/factories'
|
||||||
import { renderWithProviders } from '@/test/render'
|
import { renderWithProviders } from '@/test/render'
|
||||||
import { CLIENT_SETTINGS_STORAGE_KEY } from '@/lib/settings'
|
|
||||||
|
|
||||||
const tagsApi = vi.hoisted (() => ({
|
const tagsApi = vi.hoisted (() => ({
|
||||||
fetchTags: vi.fn (),
|
fetchTags: vi.fn (),
|
||||||
@@ -13,11 +12,6 @@ const tagsApi = vi.hoisted (() => ({
|
|||||||
vi.mock ('@/lib/tags', () => tagsApi)
|
vi.mock ('@/lib/tags', () => tagsApi)
|
||||||
|
|
||||||
describe ('TagListPage', () => {
|
describe ('TagListPage', () => {
|
||||||
beforeEach (() => {
|
|
||||||
localStorage.clear ()
|
|
||||||
vi.clearAllMocks ()
|
|
||||||
})
|
|
||||||
|
|
||||||
it ('loads tags from URL filters and renders the results table', async () => {
|
it ('loads tags from URL filters and renders the results table', async () => {
|
||||||
tagsApi.fetchTags.mockResolvedValueOnce ({
|
tagsApi.fetchTags.mockResolvedValueOnce ({
|
||||||
tags: [buildTag ({
|
tags: [buildTag ({
|
||||||
@@ -44,8 +38,6 @@ describe ('TagListPage', () => {
|
|||||||
name: '虹',
|
name: '虹',
|
||||||
category: 'character',
|
category: 'character',
|
||||||
page: 3,
|
page: 3,
|
||||||
limit: 20,
|
|
||||||
order: 'post_count:desc',
|
|
||||||
postCountGTE: 5,
|
postCountGTE: 5,
|
||||||
deprecated: true,
|
deprecated: true,
|
||||||
}),
|
}),
|
||||||
@@ -56,7 +48,7 @@ describe ('TagListPage', () => {
|
|||||||
'/tags/7',
|
'/tags/7',
|
||||||
)
|
)
|
||||||
expect (screen.getAllByText ('キャラクター').length).toBeGreaterThan (0)
|
expect (screen.getAllByText ('キャラクター').length).toBeGreaterThan (0)
|
||||||
expect (screen.getAllByRole ('combobox')[2]).toHaveValue ('1')
|
expect (screen.getAllByRole ('combobox')[1]).toHaveValue ('1')
|
||||||
expect (screen.getAllByText ('廃止')).toHaveLength (2)
|
expect (screen.getAllByText ('廃止')).toHaveLength (2)
|
||||||
})
|
})
|
||||||
|
|
||||||
@@ -66,7 +58,7 @@ describe ('TagListPage', () => {
|
|||||||
renderWithProviders (<TagListPage/>, { route: '/tags' })
|
renderWithProviders (<TagListPage/>, { route: '/tags' })
|
||||||
|
|
||||||
fireEvent.change (screen.getByRole ('textbox'), { target: { value: '虹夏' } })
|
fireEvent.change (screen.getByRole ('textbox'), { target: { value: '虹夏' } })
|
||||||
fireEvent.change (screen.getAllByRole ('combobox')[1], {
|
fireEvent.change (screen.getAllByRole ('combobox')[0], {
|
||||||
target: { value: 'character' },
|
target: { value: 'character' },
|
||||||
})
|
})
|
||||||
fireEvent.submit (screen.getByRole ('button', { name: '検索' }).closest ('form')!)
|
fireEvent.submit (screen.getByRole ('button', { name: '検索' }).closest ('form')!)
|
||||||
@@ -90,41 +82,4 @@ describe ('TagListPage', () => {
|
|||||||
|
|
||||||
expect (await screen.findByText ('結果ないよ(笑)')).toBeInTheDocument ()
|
expect (await screen.findByText ('結果ないよ(笑)')).toBeInTheDocument ()
|
||||||
})
|
})
|
||||||
|
|
||||||
it ('uses URL limit before localStorage and preserves the query order', async () => {
|
|
||||||
localStorage.setItem (
|
|
||||||
CLIENT_SETTINGS_STORAGE_KEY,
|
|
||||||
JSON.stringify ({ lists: { tagList: { limit: 100, order: 'name:asc' } } }))
|
|
||||||
tagsApi.fetchTags.mockResolvedValueOnce ({ tags: [], count: 0 })
|
|
||||||
|
|
||||||
renderWithProviders (
|
|
||||||
<TagListPage/>,
|
|
||||||
{ route: '/tags?limit=50&order=updated_at%3Adesc' },
|
|
||||||
)
|
|
||||||
|
|
||||||
await waitFor (() => {
|
|
||||||
expect (tagsApi.fetchTags).toHaveBeenCalledWith (
|
|
||||||
expect.objectContaining ({ limit: 50, order: 'updated_at:desc' }),
|
|
||||||
)
|
|
||||||
})
|
|
||||||
expect (JSON.parse (localStorage.getItem (CLIENT_SETTINGS_STORAGE_KEY) ?? '{}'))
|
|
||||||
.toMatchObject ({ lists: { tagList: { limit: 50, order: 'updated_at:desc' } } })
|
|
||||||
})
|
|
||||||
|
|
||||||
it ('keeps the compact limit control outside the search form and resets page on change', async () => {
|
|
||||||
tagsApi.fetchTags.mockResolvedValue ({ tags: [], count: 0 })
|
|
||||||
|
|
||||||
renderWithProviders (<TagListPage/>, { route: '/tags?page=4' })
|
|
||||||
|
|
||||||
const limitSelect = await screen.findByLabelText ('件数')
|
|
||||||
expect (limitSelect.closest ('form')).toBeNull ()
|
|
||||||
|
|
||||||
fireEvent.change (limitSelect, { target: { value: '100' } })
|
|
||||||
|
|
||||||
await waitFor (() => {
|
|
||||||
expect (tagsApi.fetchTags).toHaveBeenLastCalledWith (
|
|
||||||
expect.objectContaining ({ page: 1, limit: 100 }),
|
|
||||||
)
|
|
||||||
})
|
|
||||||
})
|
|
||||||
})
|
})
|
||||||
|
|||||||
@@ -13,7 +13,6 @@ import Pagination from '@/components/common/Pagination'
|
|||||||
import MainArea from '@/components/layout/MainArea'
|
import MainArea from '@/components/layout/MainArea'
|
||||||
import { SITE_TITLE } from '@/config'
|
import { SITE_TITLE } from '@/config'
|
||||||
import { CATEGORIES, CATEGORY_NAMES } from '@/consts'
|
import { CATEGORIES, CATEGORY_NAMES } from '@/consts'
|
||||||
import { clientScrollBehaviour } from '@/lib/clientAnimation'
|
|
||||||
import { tagsKeys } from '@/lib/queryKeys'
|
import { tagsKeys } from '@/lib/queryKeys'
|
||||||
import {
|
import {
|
||||||
DEFAULT_POST_LIST_LIMIT,
|
DEFAULT_POST_LIST_LIMIT,
|
||||||
@@ -23,7 +22,6 @@ import {
|
|||||||
LIST_LIMIT_OPTIONS,
|
LIST_LIMIT_OPTIONS,
|
||||||
setClientListSettings,
|
setClientListSettings,
|
||||||
} from '@/lib/settings'
|
} from '@/lib/settings'
|
||||||
import { useClientBehaviourSettings } from '@/lib/useClientBehaviourSettings'
|
|
||||||
import { useKeyboardShortcuts } from '@/lib/useKeyboardShortcuts'
|
import { useKeyboardShortcuts } from '@/lib/useKeyboardShortcuts'
|
||||||
import { fetchTags } from '@/lib/tags'
|
import { fetchTags } from '@/lib/tags'
|
||||||
import { dateString, inputClass } from '@/lib/utils'
|
import { dateString, inputClass } from '@/lib/utils'
|
||||||
@@ -73,8 +71,6 @@ const parseOrder = (value: string | null): FetchTagsOrder | null => {
|
|||||||
|
|
||||||
|
|
||||||
const TagListPage: FC = () => {
|
const TagListPage: FC = () => {
|
||||||
const behaviourSettings = useClientBehaviourSettings ()
|
|
||||||
const animationMode = behaviourSettings.animation ?? 'normal'
|
|
||||||
const location = useLocation ()
|
const location = useLocation ()
|
||||||
|
|
||||||
const navigate = useNavigate ()
|
const navigate = useNavigate ()
|
||||||
@@ -149,11 +145,9 @@ const TagListPage: FC = () => {
|
|||||||
setUpdatedTo (qUpdatedTo)
|
setUpdatedTo (qUpdatedTo)
|
||||||
setDeprecated (qDeprecated)
|
setDeprecated (qDeprecated)
|
||||||
|
|
||||||
document.querySelector ('table')?.scrollIntoView ({
|
document.querySelector ('table')?.scrollIntoView ({ behavior: 'smooth' })
|
||||||
behavior: clientScrollBehaviour (animationMode) })
|
}, [location.search, qCategory, qCreatedFrom, qCreatedTo, qName, qPostCountGTE,
|
||||||
}, [animationMode, location.search, qCategory, qCreatedFrom, qCreatedTo,
|
qPostCountLTE, qUpdatedFrom, qUpdatedTo, qDeprecated])
|
||||||
qName, qPostCountGTE, qPostCountLTE, qUpdatedFrom, qUpdatedTo,
|
|
||||||
qDeprecated])
|
|
||||||
|
|
||||||
const handleSearch = (e: FormEvent) => {
|
const handleSearch = (e: FormEvent) => {
|
||||||
e.preventDefault ()
|
e.preventDefault ()
|
||||||
|
|||||||
@@ -41,7 +41,6 @@ const postEmbed = vi.hoisted (() => ({
|
|||||||
vi.mock ('@/lib/api', () => api)
|
vi.mock ('@/lib/api', () => api)
|
||||||
vi.mock ('@/lib/posts', () => postsApi)
|
vi.mock ('@/lib/posts', () => postsApi)
|
||||||
vi.mock ('@/components/dialogues/DialogueProvider', () => ({
|
vi.mock ('@/components/dialogues/DialogueProvider', () => ({
|
||||||
default: ({ children }: { children: ReactNode }) => <>{children}</>,
|
|
||||||
useDialogue: () => dialogue,
|
useDialogue: () => dialogue,
|
||||||
}))
|
}))
|
||||||
vi.mock ('@/components/PostEmbed', () => ({
|
vi.mock ('@/components/PostEmbed', () => ({
|
||||||
|
|||||||
@@ -15,8 +15,6 @@ import { Button } from '@/components/ui/button'
|
|||||||
import { SITE_TITLE } from '@/config'
|
import { SITE_TITLE } from '@/config'
|
||||||
import { CATEGORIES, CATEGORY_NAMES } from '@/consts'
|
import { CATEGORIES, CATEGORY_NAMES } from '@/consts'
|
||||||
import { apiDelete, apiGet, apiPatch, apiPost, apiPut, isApiError } from '@/lib/api'
|
import { apiDelete, apiGet, apiPatch, apiPost, apiPut, isApiError } from '@/lib/api'
|
||||||
import { clientAnimationTransition,
|
|
||||||
clientScrollBehaviour } from '@/lib/clientAnimation'
|
|
||||||
import { fetchPost } from '@/lib/posts'
|
import { fetchPost } from '@/lib/posts'
|
||||||
import {
|
import {
|
||||||
getClientTheatreLayoutMode,
|
getClientTheatreLayoutMode,
|
||||||
@@ -24,7 +22,6 @@ import {
|
|||||||
setClientTheatreLayoutMode,
|
setClientTheatreLayoutMode,
|
||||||
setClientTheatreTagFlow,
|
setClientTheatreTagFlow,
|
||||||
} from '@/lib/settings'
|
} from '@/lib/settings'
|
||||||
import { useClientBehaviourSettings } from '@/lib/useClientBehaviourSettings'
|
|
||||||
import { canEditContent } from '@/lib/users'
|
import { canEditContent } from '@/lib/users'
|
||||||
import { cn, dateString, inputClass } from '@/lib/utils'
|
import { cn, dateString, inputClass } from '@/lib/utils'
|
||||||
import { useValidationErrors } from '@/lib/useValidationErrors'
|
import { useValidationErrors } from '@/lib/useValidationErrors'
|
||||||
@@ -60,6 +57,8 @@ const INITIAL_THEATRE_INFO: TheatreInfo =
|
|||||||
const INITIAL_WEIGHTS: TheatrePostSelectionWeights =
|
const INITIAL_WEIGHTS: TheatrePostSelectionWeights =
|
||||||
{ tagPenalties: [], lightestPosts: [], heaviestPosts: [] }
|
{ tagPenalties: [], lightestPosts: [], heaviestPosts: [] }
|
||||||
|
|
||||||
|
const LAYOUT_STORAGE_KEY = 'theatre-layout-mode'
|
||||||
|
const TAG_FLOW_STORAGE_KEY = 'theatre-tag-flow'
|
||||||
const MIN_MAIN_WIDTH = 360
|
const MIN_MAIN_WIDTH = 360
|
||||||
const SIDEBAR_GAP_WIDTH = 16
|
const SIDEBAR_GAP_WIDTH = 16
|
||||||
|
|
||||||
@@ -215,12 +214,6 @@ type Props = { user: User | null }
|
|||||||
|
|
||||||
|
|
||||||
const TheatreDetailPage: FC<Props> = ({ user }: Props) => {
|
const TheatreDetailPage: FC<Props> = ({ user }: Props) => {
|
||||||
const behaviourSettings = useClientBehaviourSettings ()
|
|
||||||
const animationMode = behaviourSettings.animation ?? 'normal'
|
|
||||||
const layoutTransition = clientAnimationTransition (
|
|
||||||
animationMode,
|
|
||||||
{ normal: { duration: .2, ease: 'easeOut' as const } },
|
|
||||||
)
|
|
||||||
const { id } = useParams ()
|
const { id } = useParams ()
|
||||||
const dialogue = useDialogue ()
|
const dialogue = useDialogue ()
|
||||||
|
|
||||||
@@ -627,9 +620,7 @@ const TheatreDetailPage: FC<Props> = ({ user }: Props) => {
|
|||||||
clearValidationErrors ()
|
clearValidationErrors ()
|
||||||
await apiPost (`/theatres/${ id }/comments`, { content })
|
await apiPost (`/theatres/${ id }/comments`, { content })
|
||||||
setContent ('')
|
setContent ('')
|
||||||
commentsRef.current?.scrollTo ({
|
commentsRef.current?.scrollTo ({ top: 0, behavior: 'smooth' })
|
||||||
top: 0,
|
|
||||||
behavior: clientScrollBehaviour (animationMode) })
|
|
||||||
}
|
}
|
||||||
catch (error)
|
catch (error)
|
||||||
{
|
{
|
||||||
@@ -846,8 +837,8 @@ const TheatreDetailPage: FC<Props> = ({ user }: Props) => {
|
|||||||
|
|
||||||
return (
|
return (
|
||||||
<motion.div
|
<motion.div
|
||||||
layout={animationMode === 'off' ? false : 'position'}
|
layout="position"
|
||||||
transition={{ layout: layoutTransition }}
|
transition={{ layout: { duration: .2, ease: 'easeOut' } }}
|
||||||
className="min-h-0 flex-1 overflow-y-auto bg-zinc-50 text-zinc-950
|
className="min-h-0 flex-1 overflow-y-auto bg-zinc-50 text-zinc-950
|
||||||
md:overflow-hidden dark:bg-zinc-950 dark:text-zinc-50">
|
md:overflow-hidden dark:bg-zinc-950 dark:text-zinc-50">
|
||||||
<Helmet>
|
<Helmet>
|
||||||
@@ -871,7 +862,7 @@ const TheatreDetailPage: FC<Props> = ({ user }: Props) => {
|
|||||||
</SidebarComponent>)}
|
</SidebarComponent>)}
|
||||||
|
|
||||||
<motion.main
|
<motion.main
|
||||||
layout={animationMode === 'off' ? false : 'position'}
|
layout="position"
|
||||||
className="order-1 min-w-0 flex-1 space-y-4 md:order-none
|
className="order-1 min-w-0 flex-1 space-y-4 md:order-none
|
||||||
md:min-w-[360px] md:overflow-y-auto">
|
md:min-w-[360px] md:overflow-y-auto">
|
||||||
<div className="space-y-4">
|
<div className="space-y-4">
|
||||||
|
|||||||
@@ -6,7 +6,6 @@ import { buildUser } from '@/test/factories'
|
|||||||
import { renderWithProviders } from '@/test/render'
|
import { renderWithProviders } from '@/test/render'
|
||||||
|
|
||||||
const api = vi.hoisted (() => ({
|
const api = vi.hoisted (() => ({
|
||||||
apiGet: vi.fn (),
|
|
||||||
apiPut: vi.fn (),
|
apiPut: vi.fn (),
|
||||||
isApiError: vi.fn (),
|
isApiError: vi.fn (),
|
||||||
}))
|
}))
|
||||||
@@ -28,23 +27,12 @@ describe ('SettingPage', () => {
|
|||||||
beforeEach (() => {
|
beforeEach (() => {
|
||||||
vi.clearAllMocks ()
|
vi.clearAllMocks ()
|
||||||
api.isApiError.mockReturnValue (false)
|
api.isApiError.mockReturnValue (false)
|
||||||
api.apiGet.mockImplementation ((path: string) => {
|
|
||||||
if (path === '/users/settings')
|
|
||||||
return Promise.resolve ({
|
|
||||||
theme: 'system',
|
|
||||||
auto_fetch_title: 'manual',
|
|
||||||
auto_fetch_thumbnail: 'manual',
|
|
||||||
wiki_editor_mode: 'split' })
|
|
||||||
if (path === '/users/theme_slots')
|
|
||||||
return Promise.resolve ([])
|
|
||||||
return Promise.resolve ({})
|
|
||||||
})
|
|
||||||
})
|
})
|
||||||
|
|
||||||
it ('shows loading when user is absent', () => {
|
it ('shows loading when user is absent', () => {
|
||||||
renderWithProviders (<SettingPage user={null} setUser={vi.fn ()}/>)
|
renderWithProviders (<SettingPage user={null} setUser={vi.fn ()}/>)
|
||||||
|
|
||||||
expect (screen.getAllByText ('Loading...').length).toBeGreaterThan (0)
|
expect (screen.getByText ('Loading...')).toBeInTheDocument ()
|
||||||
})
|
})
|
||||||
|
|
||||||
it ('updates the current user name', async () => {
|
it ('updates the current user name', async () => {
|
||||||
@@ -54,9 +42,8 @@ describe ('SettingPage', () => {
|
|||||||
|
|
||||||
renderWithProviders (<SettingPage user={user} setUser={setUser}/>)
|
renderWithProviders (<SettingPage user={user} setUser={setUser}/>)
|
||||||
|
|
||||||
const nameInput = (await screen.findAllByRole ('textbox'))[0]
|
fireEvent.change (screen.getByRole ('textbox'), { target: { value: 'new' } })
|
||||||
fireEvent.change (nameInput, { target: { value: 'new' } })
|
fireEvent.click (screen.getByRole ('button', { name: '更新' }))
|
||||||
fireEvent.click (screen.getAllByRole ('button', { name: '表示名を更新' })[0])
|
|
||||||
|
|
||||||
await waitFor (() => {
|
await waitFor (() => {
|
||||||
expect (api.apiPut).toHaveBeenCalledWith (
|
expect (api.apiPut).toHaveBeenCalledWith (
|
||||||
@@ -68,7 +55,7 @@ describe ('SettingPage', () => {
|
|||||||
const formData = api.apiPut.mock.calls[0]?.[1] as FormData
|
const formData = api.apiPut.mock.calls[0]?.[1] as FormData
|
||||||
expect (formData.get ('name')).toBe ('new')
|
expect (formData.get ('name')).toBe ('new')
|
||||||
expect (setUser).toHaveBeenCalled ()
|
expect (setUser).toHaveBeenCalled ()
|
||||||
expect (toastApi.toast).toHaveBeenCalledWith ({ title: '表示名を更新しました.' })
|
expect (toastApi.toast).toHaveBeenCalledWith ({ title: '設定を更新しました.' })
|
||||||
})
|
})
|
||||||
|
|
||||||
it ('shows validation errors returned for the name field', async () => {
|
it ('shows validation errors returned for the name field', async () => {
|
||||||
@@ -88,11 +75,10 @@ describe ('SettingPage', () => {
|
|||||||
|
|
||||||
renderWithProviders (<SettingPage user={user} setUser={vi.fn ()}/>)
|
renderWithProviders (<SettingPage user={user} setUser={vi.fn ()}/>)
|
||||||
|
|
||||||
const nameInput = (await screen.findAllByRole ('textbox'))[0]
|
fireEvent.change (screen.getByRole ('textbox'), { target: { value: '' } })
|
||||||
fireEvent.change (nameInput, { target: { value: '' } })
|
fireEvent.click (screen.getByRole ('button', { name: '更新' }))
|
||||||
fireEvent.click (screen.getAllByRole ('button', { name: '表示名を更新' })[0])
|
|
||||||
|
|
||||||
expect ((await screen.findAllByText ('名前は必須です.')).length).toBeGreaterThan (0)
|
expect (await screen.findByText ('名前は必須です.')).toBeInTheDocument ()
|
||||||
expect (nameInput).toHaveAttribute ('aria-invalid', 'true')
|
expect (screen.getByRole ('textbox')).toHaveAttribute ('aria-invalid', 'true')
|
||||||
})
|
})
|
||||||
})
|
})
|
||||||
|
|||||||
ファイル差分が大きすぎるため省略します
差分を読込み
@@ -3,10 +3,6 @@ import { render } from '@testing-library/react'
|
|||||||
import { HelmetProvider } from 'react-helmet-async'
|
import { HelmetProvider } from 'react-helmet-async'
|
||||||
import { MemoryRouter } from 'react-router-dom'
|
import { MemoryRouter } from 'react-router-dom'
|
||||||
|
|
||||||
import DialogueProvider from '@/components/dialogues/DialogueProvider'
|
|
||||||
import { KeyboardShortcutsProvider } from '@/lib/useKeyboardShortcuts'
|
|
||||||
import { UnsavedChangesGuardProvider } from '@/lib/useUnsavedChangesGuard'
|
|
||||||
|
|
||||||
import type { ReactElement, ReactNode } from 'react'
|
import type { ReactElement, ReactNode } from 'react'
|
||||||
|
|
||||||
type Options = {
|
type Options = {
|
||||||
@@ -19,25 +15,21 @@ export const renderWithProviders = (
|
|||||||
) => {
|
) => {
|
||||||
const queryClient = new QueryClient ({
|
const queryClient = new QueryClient ({
|
||||||
defaultOptions: {
|
defaultOptions: {
|
||||||
queries: { retry: false } },
|
queries: { retry: false },
|
||||||
|
},
|
||||||
})
|
})
|
||||||
|
|
||||||
const Wrapper = ({ children }: { children: ReactNode }) => (
|
const Wrapper = ({ children }: { children: ReactNode }) => (
|
||||||
<QueryClientProvider client={queryClient}>
|
<QueryClientProvider client={queryClient}>
|
||||||
<HelmetProvider>
|
<HelmetProvider>
|
||||||
<MemoryRouter initialEntries={[options.route ?? '/']}>
|
<MemoryRouter initialEntries={[options.route ?? '/']}>
|
||||||
<DialogueProvider>
|
{children}
|
||||||
<UnsavedChangesGuardProvider>
|
|
||||||
<KeyboardShortcutsProvider>
|
|
||||||
{children}
|
|
||||||
</KeyboardShortcutsProvider>
|
|
||||||
</UnsavedChangesGuardProvider>
|
|
||||||
</DialogueProvider>
|
|
||||||
</MemoryRouter>
|
</MemoryRouter>
|
||||||
</HelmetProvider>
|
</HelmetProvider>
|
||||||
</QueryClientProvider>)
|
</QueryClientProvider>)
|
||||||
|
|
||||||
return {
|
return {
|
||||||
queryClient,
|
queryClient,
|
||||||
...render (ui, { wrapper: Wrapper }) }
|
...render (ui, { wrapper: Wrapper }),
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -20,10 +20,3 @@ window.requestAnimationFrame = callback => {
|
|||||||
callback (0)
|
callback (0)
|
||||||
return 0
|
return 0
|
||||||
}
|
}
|
||||||
|
|
||||||
Object.defineProperty (window, 'matchMedia', {
|
|
||||||
configurable: true,
|
|
||||||
value: vi.fn ().mockImplementation (() => ({
|
|
||||||
addEventListener: vi.fn (),
|
|
||||||
removeEventListener: vi.fn (),
|
|
||||||
matches: false })) })
|
|
||||||
|
|||||||
新しい課題から参照
ユーザをブロックする