Merge branch 'develop' into FIx-ohcnetwork#7244

AshrafMd-1 · Mar 12, 2024 · e8532d4 · e8532d4
2 parents e6b342c + 4c51d3a
commit e8532d4
Show file tree

Hide file tree

Showing 15 changed files with 402 additions and 278 deletions.
diff --git a/cypress/e2e/users_spec/user_homepage.cy.ts b/cypress/e2e/users_spec/user_homepage.cy.ts
@@ -28,6 +28,7 @@ describe("User Homepage", () => {
     userPage.typeInFirstName("Dev");
     userPage.typeInLastName("Doctor");
     userPage.selectRole("Doctor");
+    userPage.selectState("Kerala");
     userPage.selectDistrict("Ernakulam");
     userPage.typeInPhoneNumber(phone_number);
     userPage.typeInAltPhoneNumber(alt_phone_number);

diff --git a/cypress/pageobject/Users/UserSearch.ts b/cypress/pageobject/Users/UserSearch.ts
@@ -29,7 +29,7 @@ export class UserPage {
       .and("include", "phone_number=%2B919876543219")
       .and("include", "alt_phone_number=%2B919876543219")
       .and("include", "user_type=Doctor")
-      .and("include", "district_id=7");
+      .and("include", "district=7");
   }
 
   checkUsernameText(username: string) {
@@ -62,9 +62,12 @@ export class UserPage {
     cy.get("[role='option']").contains(role).click();
   }
 
+  selectState(state: string) {
+    cy.searchAndSelectOption("#state input", state);
+  }
+
   selectDistrict(district: string) {
-    cy.get("input[name='district']").click().type(district);
-    cy.get("[role='option']").contains(district).click();
+    cy.searchAndSelectOption("#district input", district);
   }
 
   typeInPhoneNumber(phone: string) {

diff --git a/src/Common/hooks/useMSEplayer.ts b/src/Common/hooks/useMSEplayer.ts
@@ -1,5 +1,4 @@
 import { useEffect, useRef } from "react";
-import axios from "axios";
 
 export interface IAsset {
   middlewareHostname: string;
@@ -45,9 +44,18 @@ const stopStream =
   (payload: { id: string }, options: IOptions) => {
     const { id } = payload;
     ws?.close();
-    axios
-      .post(`https://${middlewareHostname}/stop`, {
-        id,
+    fetch(`https://${middlewareHostname}/stop`, {
+      method: "POST",
+      headers: {
+        "Content-Type": "application/json",
+      },
+      body: JSON.stringify({ id }),
+    })
+      .then((res) => {
+        if (!res.ok) {
+          throw new Error("network response was not ok");
+        }
+        return res.json();
       })
       .then((res) => options?.onSuccess && options.onSuccess(res))
       .catch((err) => options.onError && options.onError(err));

diff --git a/src/Components/Assets/AssetType/ONVIFCamera.tsx b/src/Components/Assets/AssetType/ONVIFCamera.tsx
@@ -2,7 +2,6 @@ import { useEffect, useState } from "react";
 import { AssetData, ResolvedMiddleware } from "../AssetTypes";
 import * as Notification from "../../../Utils/Notifications.js";
 import { BedModel } from "../../Facility/models";
-import axios from "axios";
 import { getCameraConfig } from "../../../Utils/transformUtils";
 import CameraConfigure from "../configure/CameraConfigure";
 import Loading from "../../Common/Loading";
@@ -100,13 +99,18 @@ const ONVIFCamera = ({ assetId, facilityId, asset, onUpdated }: Props) => {
     };
     try {
       setLoadingAddPreset(true);
-      const presetData = await axios.get(
+
+      const response = await fetch(
         `https://${resolvedMiddleware?.hostname}/status?hostname=${config.hostname}&port=${config.port}&username=${config.username}&password=${config.password}`
       );
+      if (!response.ok) {
+        throw new Error("Network error");
+      }
+      const presetData = await response.json();
 
       const { res } = await request(routes.createAssetBed, {
         body: {
-          meta: { ...data, ...presetData.data },
+          meta: { ...data, ...presetData },
           asset: assetId,
           bed: bed?.id as string,
         },

diff --git a/src/Components/Common/DateInputV2.tsx b/src/Components/Common/DateInputV2.tsx
@@ -159,6 +159,22 @@ const DateInputV2: React.FC<Props> = ({
     return true;
   };
 
+  const isDateWithinLimits = (parsedDate: dayjs.Dayjs): boolean => {
+    if (parsedDate?.isValid()) {
+      if (
+        (max && parsedDate.toDate() > max) ||
+        (min && parsedDate.toDate() < min)
+      ) {
+        Notification.Error({
+          msg: outOfLimitsErrorMessage ?? "Cannot select date out of range",
+        });
+        return false;
+      }
+      return true;
+    }
+    return false;
+  };
+
   const isSelectedMonth = (month: number) =>
     month === datePickerHeaderDate.getMonth();
 
@@ -261,7 +277,7 @@ const DateInputV2: React.FC<Props> = ({
                       onChange={(e) => {
                         setDisplayValue(e.target.value.replaceAll("/", ""));
                         const value = dayjs(e.target.value, "DD/MM/YYYY", true);
-                        if (value.isValid()) {
+                        if (isDateWithinLimits(value)) {
                           onChange(value.toDate());
                           close();
                           setIsOpen?.(false);