Edit User Details (#10027)

cypress/e2e/users_spec/user_creation.cy.ts

@@ -1,10 +1,10 @@
-import { UserCreation } from "../../pageObject/Users/UserCreation";
-import { FacilityCreation } from "../../pageObject/facility/FacilityCreation";
+import { UserCreation } from "pageObject/Users/UserCreation";
+import { FacilityCreation } from "pageObject/facility/FacilityCreation";
 import {
   generateName,
   generatePhoneNumber,
   generateUsername,
-} from "../../utils/commonUtils";
+} from "utils/commonUtils";
 
 describe("User Creation", () => {
   const facilityCreation = new FacilityCreation();
@@ -30,7 +30,6 @@ describe("User Creation", () => {
       confirmPassword: defaultPassword,
       email: `${generateUsername(firstName)}@test.com`,
       phoneNumber: generatePhoneNumber(),
-      dateOfBirth: "1990-01-01",
       userType: "Doctor",
       state: "Kerala",
       district: "Ernakulam",

cypress/pageObject/Users/UserCreation.ts

@@ -5,7 +5,6 @@ export interface UserData {
   password?: string;
   email?: string;
   phoneNumber?: string;
-  dateOfBirth?: string;
   userType?: string;
   state?: string;
   district?: string;
@@ -78,17 +77,11 @@ export class UserCreation {
         label: "Alternate Phone Number",
         message: "Phone number must start with +91 followed by 10 digits",
       },
-      { label: "Date of Birth", message: "Required" },
       { label: "State", message: "Required" },
     ]);
     return this;
   }
 
-  fillDateOfBirth(dateOfBirth: string) {
-    cy.typeIntoField('[data-cy="dob-input"]', dateOfBirth);
-    return this;
-  }
-
   selectUserType(userType: string) {
     cy.clickAndSelectOption('[data-cy="user-type-select"]', userType);
     return this;
@@ -125,7 +118,6 @@ export class UserCreation {
     }
     if (userData.email) this.fillEmail(userData.email);
     if (userData.phoneNumber) this.fillPhoneNumber(userData.phoneNumber);
-    if (userData.dateOfBirth) this.fillDateOfBirth(userData.dateOfBirth);
     if (userData.state) this.selectState(userData.state);
     if (userData.district) this.selectDistrict(userData.district);
     if (userData.localBody) this.selectLocalBody(userData.localBody);

public/locale/en.json

@@ -349,6 +349,7 @@
   "add_skill": "Add Skill",
   "add_spoke": "Add Spoke Facility",
   "add_tags": "Add Tags",
+  "add_user": "Add User",
   "additional_information": "Additional Information",
   "additional_instructions": "Additional Instructions",
   "address": "Address",
@@ -702,6 +703,7 @@
   "create_tag": "Create Tag",
   "create_template": "Create Template",
   "create_user": "Create User",
+  "create_user_and_add_to_org": "Create a new user and add them to the organization.",
   "created": "Created",
   "created_by": "Created By",
   "created_date": "Created Date",
@@ -831,6 +833,7 @@
   "edit_profile": "Edit Profile",
   "edit_role": "Edit Role",
   "edit_schedule_template": "Edit Schedule Template",
+  "edit_user": "Edit User",
   "edit_user_profile": "Edit Profile",
   "edit_user_role": "Edit User Role",
   "edited_by": "Edited by",
@@ -2140,6 +2143,7 @@
   "update_shift_request": "Update Shift Request",
   "update_status": "Update Status",
   "update_status_details": "Update Status/Details",
+  "update_user": "Update User",
   "update_user_role_organization": "Update the role for this user in the organization",
   "update_volunteer": "Reassign Volunteer",
   "updated": "Updated",
@@ -2177,6 +2181,7 @@
   "user_removed_success": "User removed from organization successfully",
   "user_role_update_success": "User role updated successfully",
   "user_type": "User Type",
+  "user_updated_successfully": "User updated successfully",
   "username": "Username",
   "username_already_exists": "This username already exists",
   "username_available": "Username is available",

src/common/constants.tsx

@@ -104,6 +104,10 @@ export const GENDER_TYPES = [
   { id: "non_binary", text: "Non Binary", icon: "TRANS" },
 ] as const;
 
+export const GENDERS = GENDER_TYPES.map((gender) => gender.id) as [
+  (typeof GENDER_TYPES)[number]["id"],
+];
+
 export const CONSULTATION_SUGGESTION = [
   { id: "HI", text: "Home Isolation", deprecated: true }, // # Deprecated. Preserving option for backward compatibility (use only for readonly operations)
   { id: "A", text: "Admission" },

src/components/Patient/PatientRegistration.tsx

@@ -46,6 +46,7 @@ import {
   GENDER_TYPES, // OCCUPATION_TYPES,
   //RATION_CARD_CATEGORY, // SOCIOECONOMIC_STATUS_CHOICES ,
 } from "@/common/constants";
+import { GENDERS } from "@/common/constants";
 import countryList from "@/common/static/countries.json";
 
 import { PLUGIN_Component } from "@/PluginEngine";
@@ -63,10 +64,6 @@ interface PatientRegistrationPageProps {
   patientId?: string;
 }
 
-export const GENDERS = GENDER_TYPES.map((gender) => gender.id) as [
-  (typeof GENDER_TYPES)[number]["id"],
-];
-
 export const BLOOD_GROUPS = BLOOD_GROUP_CHOICES.map((bg) => bg.id) as [
   (typeof BLOOD_GROUP_CHOICES)[number]["id"],
 ];