Skip to content

Commit 6cc0c95

Browse files
committed
Drop inertia_errors
1 parent ea5ffa4 commit 6cc0c95

18 files changed

Lines changed: 29 additions & 38 deletions

File tree

app/controllers/identity/password_resets_controller.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ def update
2525
if @user.update(user_params)
2626
redirect_to sign_in_path, notice: "Your password was reset successfully. Please sign in"
2727
else
28-
redirect_to edit_identity_password_reset_path(sid: params[:sid]), inertia: inertia_errors(@user)
28+
redirect_to edit_identity_password_reset_path(sid: params[:sid]), inertia: {errors: @user.errors}
2929
end
3030
end
3131

app/controllers/inertia_controller.rb

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,4 @@ class InertiaController < ApplicationController
77
user: -> { Current.user.as_json(only: %i[id name email verified created_at updated_at]) },
88
session: -> { Current.session.as_json(only: %i[id]) }
99
}
10-
11-
private
12-
13-
def inertia_errors(model, full_messages: true)
14-
{
15-
errors: model.errors.to_hash(full_messages).transform_values(&:to_sentence)
16-
}
17-
end
1810
end

app/controllers/settings/emails_controller.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ def update
1010
if @user.update(user_params)
1111
redirect_to_success
1212
else
13-
redirect_to settings_email_path, inertia: inertia_errors(@user)
13+
redirect_to settings_email_path, inertia: {errors: @user.errors}
1414
end
1515
end
1616

app/controllers/settings/passwords_controller.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ def update
1010
if @user.update(user_params)
1111
redirect_to settings_password_path, notice: "Your password has been changed"
1212
else
13-
redirect_to settings_password_path, inertia: inertia_errors(@user)
13+
redirect_to settings_password_path, inertia: {errors: @user.errors}
1414
end
1515
end
1616

app/controllers/settings/profiles_controller.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ def update
1010
if @user.update(user_params)
1111
redirect_to settings_profile_path, notice: "Your profile has been updated"
1212
else
13-
redirect_to settings_profile_path, inertia: inertia_errors(@user)
13+
redirect_to settings_profile_path, inertia: {errors: @user.errors}
1414
end
1515
end
1616

app/controllers/users_controller.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ def create
1818
send_email_verification
1919
redirect_to dashboard_path, notice: "Welcome! You have signed up successfully"
2020
else
21-
redirect_to sign_up_path, inertia: inertia_errors(@user)
21+
redirect_to sign_up_path, inertia: {errors: @user.errors}
2222
end
2323
end
2424

app/frontend/components/delete-user.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ export default function DeleteUser() {
7373
autoComplete="current-password"
7474
/>
7575

76-
<InputError message={errors.password_challenge} />
76+
<InputError messages={errors.password_challenge} />
7777
</div>
7878

7979
<DialogFooter>

app/frontend/components/input-error.tsx

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,16 @@ import type { HTMLAttributes } from "react"
33
import { cn } from "@/lib/utils"
44

55
export default function InputError({
6-
message,
6+
messages,
77
className = "",
88
...props
9-
}: HTMLAttributes<HTMLParagraphElement> & { message?: string }) {
10-
return message ? (
9+
}: HTMLAttributes<HTMLParagraphElement> & { messages?: string[] }) {
10+
return messages ? (
1111
<p
1212
{...props}
1313
className={cn("text-sm text-red-600 dark:text-red-400", className)}
1414
>
15-
{message}
15+
{messages.join(", ")}
1616
</p>
1717
) : null
1818
}

app/frontend/pages/identity/password_resets/edit.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ export default function ResetPassword({ sid, email }: ResetPasswordProps) {
3939
className="mt-1 block w-full"
4040
readOnly
4141
/>
42-
<InputError message={errors.email} className="mt-2" />
42+
<InputError messages={errors.email} className="mt-2" />
4343
</div>
4444

4545
<div className="grid gap-2">
@@ -53,7 +53,7 @@ export default function ResetPassword({ sid, email }: ResetPasswordProps) {
5353
autoFocus
5454
placeholder="Password"
5555
/>
56-
<InputError message={errors.password} />
56+
<InputError messages={errors.password} />
5757
</div>
5858

5959
<div className="grid gap-2">
@@ -67,7 +67,7 @@ export default function ResetPassword({ sid, email }: ResetPasswordProps) {
6767
placeholder="Confirm password"
6868
/>
6969
<InputError
70-
message={errors.password_confirmation}
70+
messages={errors.password_confirmation}
7171
className="mt-2"
7272
/>
7373
</div>

app/frontend/pages/identity/password_resets/new.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ export default function ForgotPassword() {
3131
autoFocus
3232
placeholder="email@example.com"
3333
/>
34-
<InputError message={errors.email} />
34+
<InputError messages={errors.email} />
3535
</div>
3636

3737
<div className="my-6 flex items-center justify-start">

0 commit comments

Comments
 (0)