Update Resource Forms to Enhance Validation

cypress/e2e/resource_spec/ResourcesHomepage.cy.ts

@@ -73,6 +73,10 @@ describe("Resource Page", () => {
     cy.awaitUrl(createdResource);
     resourcePage.clickUpdateStatus();
     resourcePage.updateStatus("APPROVED");
+    cy.clickAndSelectOption(
+      "input[name='assigned_facility_object']",
+      "Dummy Request Fulfilment Center, Ernakulam",
+    );
     resourcePage.clickSubmitButton();
     resourcePage.verifySuccessNotification(
       "Resource request updated successfully",

cypress/pageobject/Facility/FacilityCreation.ts

@@ -244,7 +244,7 @@ class FacilityPage {
   ) {
     cy.get("#refering_facility_contact_name").type(name);
     cy.get("#refering_facility_contact_number").type(phone_number);
-    cy.get("[name='approving_facility']")
+    cy.get("[name='approving_facility_object']")
       .type(facility)
       .then(() => {
         cy.get("[role='option']").first().click();

public/locale/en.json

@@ -331,6 +331,7 @@
   "approve": "Approve",
   "approved_by_district_covid_control_room": "Approved by District COVID Control Room",
   "approving_facility": "Name of Approving Facility",
+  "approving_facility_error": "Name of the referring facility is required.",
   "archive": "Archive",
   "archived": "Archived",
   "are_non_editable_fields": "are non-editable fields",
@@ -348,9 +349,11 @@
   "assign": "Assign",
   "assign_a_volunteer_to": "Assign a volunteer to {{name}}",
   "assign_bed": "Assign Bed",
+  "assign_facility_label": "What facility would you like to assign the request to",
   "assign_to_volunteer": "Assign to a Volunteer",
   "assigned_doctor": "Assigned Doctor",
   "assigned_facility": "Facility assigned",
+  "assigned_quantity_error": "Value can't be smaller than 0",
   "assigned_to": "Assigned to",
   "assigned_volunteer": "Assigned Volunteer",
   "async_operation_warning": "This operation may take some time. Please check back later.",
@@ -687,6 +690,9 @@
   "emergency_contact_person_name_volunteer": "Emergency Contact Person Name (Volunteer)",
   "emergency_contact_volunteer": "Emergency Contact (Volunteer)",
   "empty_date_time": "--:-- --; --/--/----",
+  "empty_description_error": "Description is required field.",
+  "empty_resource_error": "Resource approving facility cannot be empty.",
+  "empty_title_error": "Title is required field.",
   "encounter_date_field_label__A": "Date & Time of Admission to the Facility",
   "encounter_date_field_label__DC": "Date & Time of Domiciliary Care commencement",
   "encounter_date_field_label__DD": "Date & Time of Consultation",
@@ -1216,10 +1222,12 @@
   "ration_card__NO_CARD": "Non-card holder",
   "ration_card_category": "Ration Card Category",
   "reason": "Reason",
+  "reason_error": "Description of the resource request is mandatory.",
   "reason_for_discontinuation": "Reason for discontinuation",
   "reason_for_edit": "Reason for edit",
   "reason_for_referral": "Reason for referral",
   "reason_for_shift": "Reason for shift",
+  "reason_invalid": "Please enter a description for the resource request.",
   "recommended_aspect_ratio_for": "Recommended aspect ratio for",
   "record": "Record Audio",
   "record_delete_confirm": "Are you sure you want to delete this record?",
@@ -1229,6 +1237,9 @@
   "redirected_to_create_consultation": "Note: You will be redirected to create consultation form. Please complete the form to finish the transfer process",
   "referral_letter": "Referral Letter",
   "referred_to": "Referred to",
+  "referring_facility_contact_name_error": "Name of the contact at the referring facility is required.",
+  "referring_facility_contact_number_error": "Phone number of the contact at the referring facility is required.",
+  "referring_facility_contact_number_invalid": "Please enter a valid phone number.",
   "refresh": "Refresh",
   "refresh_list": "Refresh List",
   "refuted": "Refuted",
@@ -1254,6 +1265,7 @@
   "request_sample_test": "Request Sample Test",
   "request_title": "Request Title",
   "request_title_placeholder": "Type your title here",
+  "requested_quantity_error": "Value can't be smaller than 1",
   "required": "Required",
   "required_quantity": "Required Quantity",
   "resend_otp": "Resend OTP",
@@ -1313,6 +1325,7 @@
   "select_date": "Select date",
   "select_eligible_policy": "Select an Eligible Insurance Policy",
   "select_facility_for_discharged_patients_warning": "Facility needs to be selected to view discharged patients.",
+  "select_facility_type_error": "Please select a facility type.",
   "select_for_administration": "Select for Administration",
   "select_groups": "Select Groups",
   "select_investigation": "Select Investigations (all investigations will be selected by default)",
@@ -1404,6 +1417,8 @@
   "test_type": "Type of test done",
   "tested_on": "Tested on",
   "third_party_software_licenses": "Third Party Software Licenses",
+  "title_error": "Title for the resource request is mandatory.",
+  "title_invalid": "Please enter a title for the resource request.",
   "titrate_dosage": "Titrate Dosage",
   "to_be_conducted": "To be conducted",
   "total_amount": "Total Amount",
@@ -1475,6 +1490,7 @@
   "update_preset_position_to_current": "Update preset's position to camera's current position",
   "update_record": "Update Record",
   "update_record_for_asset": "Update record for asset",
+  "update_resource_request": "Update Resource Request",
   "update_shift_request": "Update Shift Request",
   "update_status_details": "Update Status/Details",
   "update_volunteer": "Reassign Volunteer",

src/Routers/routes/ResourceRoutes.tsx

@@ -1,8 +1,8 @@
 import { Redirect } from "raviger";
 
 import BoardView from "@/components/Resource/ResourceBoard";
+import ResourceCreate from "@/components/Resource/ResourceCreate";
 import ResourceDetails from "@/components/Resource/ResourceDetails";
-import { ResourceDetailsUpdate } from "@/components/Resource/ResourceDetailsUpdate";
 import ListView from "@/components/Resource/ResourceList";
 
 import { AppRoutes } from "@/Routers/AppRouter";
@@ -15,7 +15,7 @@ const ResourceRoutes: AppRoutes = {
   "/resource/board": () => <BoardView />,
   "/resource/list": () => <ListView />,
   "/resource/:id": ({ id }) => <ResourceDetails id={id} />,
-  "/resource/:id/update": ({ id }) => <ResourceDetailsUpdate id={id} />,
+  "/resource/:id/update": ({ id }) => <ResourceCreate resourceId={id} />,
 };
 
 export default ResourceRoutes;