Fix: Switch to shadcn form in userResetPassword

public/locale/en.json

@@ -651,7 +651,6 @@
   "created_on": "Created On",
   "csv_file_in_the_specified_format": "Select a CSV file in the specified format",
   "current_address": "Current Address",
-  "current_password": "Current Password",
   "current_status": "Current Status",
   "customer_support_email": "Customer Support Email",
   "customer_support_name": "Customer Support Name",
@@ -1283,6 +1282,7 @@
   "occupancy": "Occupancy",
   "occupation": "Occupation",
   "occupied": "Occupied",
+  "old_password": "Current Password",
   "on": "on",
   "on_emergency_basis": " on emergency basis",
   "ongoing_medications": "Ongoing Medications",
@@ -1318,6 +1318,7 @@
   "password_reset_success": "Password Reset successfully",
   "password_sent": "Password Reset Email Sent",
   "password_update_error": "Error while updating password. Try again later.",
+  "password_updated": "Password updated successfully",
   "password_uppercase_validation": "Password must contain at least one uppercase letter (A-Z)",
   "password_validation": "Password must contain at least: 8 characters, 1 uppercase letter (A-Z), 1 lowercase letter (a-z), and 1 number (0-9)",
   "patient": "Patient",
@@ -1393,6 +1394,7 @@
   "please_check_your_messages": "Please check your messages",
   "please_confirm_password": "Please confirm your new password.",
   "please_enter_a_reason_for_the_shift": "Please enter a reason for the shift.",
+  "please_enter_confirm_password": "Please confirm your new password",
   "please_enter_current_password": "Please enter your current password.",
   "please_enter_new_password": "Please enter your new password.",
   "please_enter_username": "Please enter the username",

src/Utils/request/api.tsx

@@ -171,7 +171,7 @@ const routes = {
   updatePassword: {
     path: "/api/v1/password_change/",
     method: "PUT",
-    TRes: Type<Record<string, string | string[]>>(),
+    TRes: Type<{ message: string }>(),
     TBody: Type<UpdatePasswordForm>(),
   },
   // User Endpoints

src/Utils/request/errorHandler.ts

@@ -2,7 +2,7 @@ import { navigate } from "raviger";
 import { toast } from "sonner";
 
 import * as Notifications from "@/Utils/Notifications";
-import { HTTPError } from "@/Utils/request/types";
+import { HTTPError, StructuredError } from "@/Utils/request/types";
 
 export function handleHttpError(error: Error) {
   if (error.name === "AbortError") {
@@ -36,6 +36,12 @@ export function handleHttpError(error: Error) {
       handlePydanticErrors(errs);
       return;
     }
+
+    if (isStructuredError(cause)) {
+      handleStructuredErrors(cause);
+      return;
+    }
+
     Notifications.BadRequest({ errs });
     return;
   }
@@ -76,6 +82,23 @@ type PydanticError = {
   url: string;
 };
 
+function isStructuredError(err: HTTPError["cause"]): err is StructuredError {
+  return typeof err === "object" && !Array.isArray(err);
+}
+
+function handleStructuredErrors(cause: StructuredError) {
+  for (const value of Object.values(cause)) {
+    if (Array.isArray(value)) {
+      value.forEach((err) => toast.error(err));
+      return;
+    }
+    if (typeof value === "string") {
+      toast.error(value);
+      return;
+    }
+  }
+}
+
 function isPydanticError(errors: unknown): errors is PydanticError[] {
   return (
     Array.isArray(errors) &&

src/Utils/request/types.ts

@@ -51,7 +51,9 @@ export interface APICallOptions<TBody = unknown> {
   headers?: HeadersInit;
 }
 
-type HTTPErrorCause = Record<string, unknown> | undefined;
+export type StructuredError = Record<string, string | string[]>;
+
+type HTTPErrorCause = StructuredError | Record<string, unknown> | undefined;
 
 export class HTTPError extends Error {
   status: number;

src/components/Form/Form.tsx

@@ -6,7 +6,7 @@
 import {
   FormContextValue,
   createFormContext,
 } from "@/components/Form/FormContext";
 import { FieldChangeEvent } from "@/components/Form/FormFields/Utils";
 import {
   FormDetails,
@@ -167,3 +167,4 @@
 };
 
 export default Form;
+