Merge branch 'develop' into develop

.env

@@ -6,6 +6,7 @@ REACT_APP_COVER_IMAGE=https://cdn.ohc.network/care_logo.svg
 REACT_APP_COVER_IMAGE_ALT=https://cdn.ohc.network/care_logo.svg
 REACT_PUBLIC_URL=https://care.ohc.network
 HEADERS="/*\n  Strict-Transport-Security: max-age=63072000; includeSubDomains; preload\n  X-XSS-Protection: 1; mode=block\n  X-Frame-Options: SAMEORIGIN\n  X-Content-Type-Options: nosniff\n  Referrer-Policy: strict-origin-when-cross-origin\n  Permissions-Policy: geolocation=(self), microphone=()"
+REACT_RECAPTCHA_SITE_KEY=6LcedK8qAAAAAM2PpuqlqhZUxQpmIqHqluL74dDs
 
 # Care API URL without the /api prefix
 REACT_CARE_API_URL=https://careapi.ohc.network

care.config.ts

@@ -61,8 +61,7 @@ const careConfig = {
   govDataApiKey:
     env.REACT_GOV_DATA_API_KEY ||
     "579b464db66ec23bdd000001cdd3946e44ce4aad7209ff7b23ac571b",
-  reCaptchaSiteKey:
-    env.REACT_RECAPTCHA_SITE_KEY || "6LdvxuQUAAAAADDWVflgBqyHGfq-xmvNJaToM0pN",
+  reCaptchaSiteKey: env.REACT_RECAPTCHA_SITE_KEY,
 
   wartimeShifting: boolean("REACT_WARTIME_SHIFTING"),
 

public/locale/en.json

@@ -507,7 +507,7 @@
   "care_backend": "Care Backend",
   "care_frontend": "Care Frontend",
   "category": "Category",
-  "category_description": "Choose the category that best describes the resource needed.",
+  "category_description": "Choose the category  ",
   "caution": "Caution",
   "central_nursing_station": "Central Nursing Station",
   "change_avatar": "Change Avatar",
@@ -1848,6 +1848,7 @@
   "resource_status__transportation_to_be_arranged": "Transportation to be arranged",
   "resource_title": "Resource Title",
   "resource_type": "Request Type",
+  "resource_updated_successfully": "Resource updated successfully",
   "respiratory_status": "Respiratory Status",
   "result": "Result",
   "result_date": "Result Date",
@@ -1944,6 +1945,7 @@
   "search_tags": "Search tags...",
   "search_user": "Search User",
   "search_user_description": "Search for a user and assign a role to add them to the patient.",
+  "search_users": "Search users...",
   "searching": "Searching...",
   "see_attachments": "See Attachments",
   "see_details": "See Details",
@@ -2248,6 +2250,7 @@
   "update_record": "Update Record",
   "update_record_for_asset": "Update record for asset",
   "update_request": "Update Request",
+  "update_resource_request": "Update Resource Request",
   "update_role": "Update Role",
   "update_shift_request": "Update Shift Request",
   "update_status": "Update Status",

src/Routers/routes/ConsultationRoutes.tsx

@@ -1,6 +1,5 @@
 import QuestionnaireResponseView from "@/components/Facility/ConsultationDetails/QuestionnaireResponseView";
 import EncounterQuestionnaire from "@/components/Patient/EncounterQuestionnaire";
-import FileUploadPage from "@/components/Patient/FileUploadPage";
 import TreatmentSummary from "@/components/Patient/TreatmentSummary";
 
 import { AppRoutes } from "@/Routers/AppRouter";
@@ -72,18 +71,6 @@ const consultationRoutes: AppRoutes = {
     ({ patientId, id }) => (
       <QuestionnaireResponseView responseId={id} patientId={patientId} />
     ),
-  "/facility/:facilityId/patient/:patientId/encounterId/:id/files/": ({
-    facilityId,
-    patientId,
-    id,
-  }) => (
-    <FileUploadPage
-      facilityId={facilityId}
-      patientId={patientId}
-      encounterId={id}
-      type="encounter"
-    />
-  ),
 };
 
 export default consultationRoutes;

src/Routers/routes/FacilityRoutes.tsx

@@ -1,7 +1,7 @@
 import { Redirect } from "raviger";
 
 import FacilityUsers from "@/components/Facility/FacilityUsers";
-import ResourceCreate from "@/components/Resource/ResourceCreate";
+import ResourceCreate from "@/components/Resource/ResourceForm";
 
 import { AppRoutes } from "@/Routers/AppRouter";
 import { FacilityOverview } from "@/pages/Facility/overview";

src/Routers/routes/PatientRoutes.tsx

@@ -1,4 +1,3 @@
-import FileUploadPage from "@/components/Patient/FileUploadPage";
 import {
   facilityPatientTabs,
   patientTabs,
@@ -45,16 +44,6 @@ const PatientRoutes: AppRoutes = {
   "/facility/:facilityId/patient/:id/update": ({ facilityId, id }) => (
     <PatientRegistration facilityId={facilityId} patientId={id} />
   ),
-  "/facility/:facilityId/patient/:patientId/files": ({
-    facilityId,
-    patientId,
-  }) => (
-    <FileUploadPage
-      facilityId={facilityId}
-      patientId={patientId}
-      type="patient"
-    />
-  ),
 };
 
 export default PatientRoutes;

src/Routers/routes/ResourceRoutes.tsx

@@ -1,6 +1,6 @@
 import PrintResourceLetter from "@/components/Resource/PrintResourceLetter";
 import ResourceDetails from "@/components/Resource/ResourceDetails";
-import { ResourceDetailsUpdate } from "@/components/Resource/ResourceDetailsUpdate";
+import ResourceForm from "@/components/Resource/ResourceForm";
 import ResourceList from "@/components/Resource/ResourceList";
 
 import { AppRoutes } from "@/Routers/AppRouter";
@@ -13,7 +13,7 @@ const ResourceRoutes: AppRoutes = {
     <ResourceDetails facilityId={facilityId} id={id} />
   ),
   "/facility/:facilityId/resource/:id/update": ({ facilityId, id }) => (
-    <ResourceDetailsUpdate facilityId={facilityId} id={id} />
+    <ResourceForm facilityId={facilityId} id={id} />
   ),
   "/facility/:facilityId/resource/:id/print": ({ id }) => (
     <PrintResourceLetter id={id} />

src/Utils/request/api.tsx

@@ -164,12 +164,6 @@ const routes = {
     TRes: Type<UserModel>(),
   },
 
-  userList: {
-    path: "/api/v1/users/",
-    method: "GET",
-    TRes: Type<PaginatedResponse<UserModel>>(),
-  },
-
   deleteProfilePicture: {
     path: "/api/v1/users/{username}/profile_picture/",
     method: "DELETE",

src/components/Auth/Login.tsx

@@ -504,7 +504,7 @@ const Login = (props: LoginProps) => {
                           )}
                         </div>
 
-                        {isCaptchaEnabled && (
+                        {isCaptchaEnabled && reCaptchaSiteKey && (
                           <div className="py-4">
                             <ReCaptcha
                               sitekey={reCaptchaSiteKey}

src/components/Common/FilePreviewDialog.tsx

@@ -24,7 +24,6 @@ import {
 } from "@/components/ui/dialog";
 
 import CircularProgress from "@/components/Common/CircularProgress";
-import { StateInterface } from "@/components/Files/FileUpload";
 import { FileUploadModel } from "@/components/Patient/models";
 
 const PDFViewer = lazy(() => import("@/components/Common/PDFViewer"));
@@ -40,6 +39,19 @@ export const zoom_values = [
   "scale-200",
 ];
 
+export interface StateInterface {
+  open: boolean;
+  isImage: boolean;
+  name: string;
+  extension: string;
+  zoom: number;
+  isZoomInDisabled: boolean;
+  isZoomOutDisabled: boolean;
+  rotation: number;
+  id?: string;
+  associating_id?: string;
+}
+
 type FilePreviewProps = {
   title?: ReactNode;
   description?: ReactNode;