Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rm whatsapp phone number, hide email for updates #10334

Merged
merged 3 commits into from
Jan 31, 2025
Merged

Rm whatsapp phone number, hide email for updates #10334

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
10eafd2
rm alt_phone, whatsapp completely; rm email for updates
Jacobjeevan Jan 31, 2025
605e49d
removed the alt phone number cypress error message check
nihal467 Jan 31, 2025
01eb7cb
switch to tanstack
Jacobjeevan Jan 31, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
76 changes: 13 additions & 63 deletions src/components/Users/UserForm.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ import * as z from "zod";
import CareIcon from "@/CAREUI/icons/CareIcon";

import { Button } from "@/components/ui/button";
import { Checkbox } from "@/components/ui/checkbox";
import {
Form,
FormControl,
Expand Down Expand Up @@ -92,8 +91,6 @@ export default function UserForm({
last_name: z.string().min(1, t("field_required")),
email: z.string().email(t("invalid_email_address")),
phone_number: validators.phoneNumber.required,
alt_phone_number: validators.phoneNumber.optional,
phone_number_is_whatsapp: z.boolean().default(true),
gender: z.enum(GENDERS),
/* TODO: Userbase doesn't currently support these, neither does BE
but we will probably need these */
Expand Down Expand Up @@ -130,8 +127,6 @@ export default function UserForm({
last_name: "",
email: "",
phone_number: "",
alt_phone_number: "",
phone_number_is_whatsapp: true,
},
});

Expand All @@ -151,7 +146,6 @@ export default function UserForm({
email: userData.email,
phone_number: userData.phone_number || "",
gender: userData.gender,
phone_number_is_whatsapp: true,
};
form.reset(formData);
}
Expand All @@ -163,16 +157,12 @@ export default function UserForm({
//const userType = form.watch("user_type");
const usernameInput = form.watch("username");
const phoneNumber = form.watch("phone_number");
const isWhatsApp = form.watch("phone_number_is_whatsapp");

useEffect(() => {
if (isWhatsApp) {
form.setValue("alt_phone_number", phoneNumber);
}
if (usernameInput && usernameInput.length > 0 && !isEditMode) {
form.trigger("username");
}
}, [phoneNumber, isWhatsApp, form, usernameInput, isEditMode]);
}, [phoneNumber, form, usernameInput, isEditMode]);

const { isLoading: isUsernameChecking, isError: isUsernameTaken } = useQuery({
queryKey: ["checkUsername", usernameInput],
Expand Down Expand Up @@ -496,86 +486,46 @@ export default function UserForm({
</>
)}

<FormField
control={form.control}
name="email"
render={({ field }) => (
<FormItem>
<FormLabel required>{t("email")}</FormLabel>
<FormControl>
<Input
data-cy="email-input"
type="email"
placeholder={t("email")}
{...field}
/>
</FormControl>
<FormMessage />
</FormItem>
)}
/>

<div className="grid grid-cols-2 gap-4">
{!isEditMode && (
<FormField
control={form.control}
name="phone_number"
name="email"
render={({ field }) => (
<FormItem>
<FormLabel required>{t("phone_number")}</FormLabel>
<FormLabel required>{t("email")}</FormLabel>
<FormControl>
<PhoneInput
data-cy="phone-number-input"
placeholder={t("enter_phone_number")}
<Input
data-cy="email-input"
type="email"
placeholder={t("email")}
{...field}
/>
</FormControl>
<FormMessage />
</FormItem>
)}
/>
)}

<div className="grid grid-cols-2 gap-4">
<FormField
control={form.control}
name="alt_phone_number"
name="phone_number"
render={({ field }) => (
<FormItem>
<FormLabel>{t("alternate_phone_number")}</FormLabel>
<FormLabel required>{t("phone_number")}</FormLabel>
<FormControl>
<PhoneInput
data-cy="alt-phone-number-input"
data-cy="phone-number-input"
placeholder={t("enter_phone_number")}
{...field}
disabled={isWhatsApp}
/>
</FormControl>
<FormMessage />
</FormItem>
)}
/>
</div>

<FormField
control={form.control}
name="phone_number_is_whatsapp"
render={({ field }) => (
<FormItem className="flex flex-row items-start space-x-3 space-y-0">
<FormControl>
<Checkbox
data-cy="whatsapp-checkbox"
checked={field.value}
onCheckedChange={field.onChange}
/>
</FormControl>
<div className="space-y-1 leading-none">
<FormLabel>
{t("whatsapp_number_same_as_phone_number")}
</FormLabel>
</div>
</FormItem>
)}
/>

<div className="grid grid-cols-2 gap-4">
<FormField
control={form.control}
name="gender"
Expand Down
7 changes: 4 additions & 3 deletions src/types/user/user.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,14 @@ export type CreateUserModel = {
last_name: string;
email: string;
phone_number: string;
phone_number_is_whatsapp: boolean;
alt_phone_number?: string;
gender: (typeof GENDER_TYPES)[number]["id"];
qualification?: string;
doctor_experience_commenced_on?: string;
doctor_medical_council_registration?: string;
geo_organization: string;
};

export type UpdateUserModel = Omit<CreateUserModel, "username" | "password">;
export type UpdateUserModel = Omit<
CreateUserModel,
"username" | "password" | "email"
>;
Loading