Live Camera Feed Enhancement(Review, QA and testing)

cypress/e2e/camera_spec/camera_boundary.cy.ts

@@ -0,0 +1,70 @@
+import { cy, describe, before, beforeEach, it } from "local-cypress";
+const user = { username: "devdistrictadmin", password: "Coronasafe@123" };
+describe("Camera Boundary", () => {
+  before(() => {
+    cy.loginByApi(user.username, user.password);
+    cy.saveLocalStorage();
+  });
+  beforeEach(() => {
+    cy.restoreLocalStorage();
+    cy.awaitUrl("/assets");
+    cy.get("input[id='search']").type("Dev Camera");
+    cy.contains("a", "Dev Camera").contains("a", "ICU").click();
+    cy.get("button[id='configure-asset']").click();
+  });
+
+  it("Add new boundary", () => {
+    cy.get("input[name='bed']").type("bed 01");
+    cy.get("li[role='option']").contains("Bed 01").click();
+    cy.wait(2000);
+    cy.intercept("**/api/v1/assetbed/**").as("addBoundary");
+    cy.get("button[id='add-boundary-preset']").click();
+    cy.wait("@addBoundary");
+  });
+
+  it("Update boundary", () => {
+    cy.get("input[name='bed']").type("bed 01");
+    cy.get("li[role='option']").contains("Bed 01").click();
+    cy.wait(2000);
+    cy.get("button[id='update-boundary-preset']").click();
+    cy.intercept("**/api/v1/assetbed/**").as("updateBoundary");
+    cy.get("button")
+      .find("svg.care-svg-icon__baseline.care-l-angle-right")
+      .should("be.visible")
+      .first()
+      .click();
+    cy.wait("@updateBoundary");
+    cy.get("button").contains("Next").click();
+    cy.get("button")
+      .find("svg.care-svg-icon__baseline.care-l-angle-right")
+      .should("be.visible")
+      .first()
+      .click();
+    cy.wait("@updateBoundary");
+    cy.get("button").contains("Next").click();
+    cy.get("button")
+      .find("svg.care-svg-icon__baseline.care-l-angle-up")
+      .should("be.visible")
+      .first()
+      .click();
+    cy.wait("@updateBoundary");
+    cy.get("button").contains("Next").click();
+    cy.get("button")
+      .find("svg.care-svg-icon__baseline.care-l-angle-down")
+      .should("be.visible")
+      .first()
+      .click();
+    cy.wait("@updateBoundary");
+    cy.get("button").contains("Done").click();
+  });
+
+  it("Delete boundary", () => {
+    cy.get("input[name='bed']").type("bed 01");
+    cy.get("li[role='option']").contains("Bed 01").click();
+    cy.wait(1000);
+    cy.intercept("**/api/v1/assetbed/**").as("deleteBoundary");
+    cy.get("button[id='delete-boundary-preset']").click();
+    cy.get("button").contains("Delete").click();
+    cy.wait("@deleteBoundary");
+  });
+});

cypress/e2e/camera_spec/patient_privacy.cy.ts

@@ -0,0 +1,25 @@
+import { cy, describe, before, beforeEach, it } from "local-cypress";
+const user = { username: "devdistrictadmin", password: "Coronasafe@123" };
+
+describe("Patient Privacy", () => {
+  before(() => {
+    cy.loginByApi(user.username, user.password);
+    cy.saveLocalStorage();
+  });
+  beforeEach(() => {
+    cy.restoreLocalStorage();
+    cy.awaitUrl("/patients");
+    cy.intercept("**/api/v1/consultation/**").as("consultation");
+    cy.get("input[id='name']").type("Dummy Patient");
+    cy.contains("a", "Dummy Patient").contains("a", "Dummy Facility 1").click();
+    cy.wait("@consultation");
+    cy.get("a").contains("Camera Feed").click();
+    cy.wait("@consultation");
+  });
+
+  it("Toggle privacy", () => {
+    cy.intercept("**/api/v1/consultationbed/**").as("togglePrivacy");
+    cy.get("button[id='privacy-toggle']").click();
+    cy.wait("@togglePrivacy");
+  });
+});

src/Common/constants.tsx

@@ -703,7 +703,7 @@ export const RHYTHM_CHOICES: Array<OptionsType> = [
   { id: 10, text: "IRREGULAR", desc: "Irregular" },
 ];
 
-export const LOCATION_BED_TYPES: Array<any> = [
+export const LOCATION_BED_TYPES: Array<{ id: string; name: string }> = [
   { id: "ISOLATION", name: "Isolation" },
   { id: "ICU", name: "ICU" },
   { id: "BED_WITH_OXYGEN_SUPPORT", name: "Bed with oxygen support" },
@@ -1020,6 +1020,14 @@ export const XLSXAssetImportSchema = {
   },
 };
 
+export type direction = "left" | "right" | "up" | "down" | null;
+export interface BoundaryRange {
+  max_x: number;
+  min_x: number;
+  max_y: number;
+  min_y: number;
+}
+
 export const USER_TYPES_MAP = {
   Pharmacist: "Pharmacist",
   Volunteer: "Volunteer",

src/Common/hooks/useFeedPTZ.ts

@@ -15,6 +15,8 @@ interface PTZPayload {
   x: number;
   y: number;
   zoom: number;
+  id?: string | null;
+  camera_state?: PTZState | null;
 }
 
 export interface PTZState {
@@ -55,6 +57,9 @@ interface UseMSEMediaPlayerReturnType {
   getCameraStatus: (options: IOptions) => void;
   getPresets: (options: IOptions) => void;
   gotoPreset: (payload: IGotoPresetPayload, options: IOptions) => void;
+  lockAsset: (options: IOptions) => void;
+  unlockAsset: (options: IOptions) => void;
+  requestAccess: (options: IOptions) => void;
 }
 
 interface IOptions {
@@ -196,6 +201,57 @@ export const getPTZPayload = (
   return { x, y, zoom };
 };
 
+const lockAsset =
+  (config: IAsset, dispatch: any) =>
+  async (options: IOptions = {}) => {
+    if (!config.id) return;
+    const resp = await dispatch(
+      operateAsset(config.id, {
+        action: {
+          type: "lock_asset",
+        },
+      })
+    );
+    resp &&
+      (resp.status === 200
+        ? options?.onSuccess && options.onSuccess(resp.data.result)
+        : options?.onError && options.onError(resp));
+  };
+
+const requestAccess =
+  (config: IAsset, dispatch: any) =>
+  async (options: IOptions = {}) => {
+    if (!config.id) return;
+    const resp = await dispatch(
+      operateAsset(config.id, {
+        action: {
+          type: "request_access",
+        },
+      })
+    );
+    resp &&
+      (resp.status === 200
+        ? options?.onSuccess && options.onSuccess(resp.data.result)
+        : options?.onError && options.onError(resp));
+  };
+
+const unlockAsset =
+  (config: IAsset, dispatch: any) =>
+  async (options: IOptions = {}) => {
+    if (!config.id) return;
+    const resp = await dispatch(
+      operateAsset(config.id, {
+        action: {
+          type: "unlock_asset",
+        },
+      })
+    );
+    resp &&
+      (resp.status === 200
+        ? options?.onSuccess && options.onSuccess(resp.data.result)
+        : options?.onError && options.onError(resp));
+  };
+
 export const useFeedPTZ = ({
   config,
   dispatch,
@@ -207,5 +263,8 @@ export const useFeedPTZ = ({
     getCameraStatus: getCameraStatus(config, dispatch),
     getPresets: getPresets(config, dispatch),
     gotoPreset: gotoPreset(config, dispatch),
+    lockAsset: lockAsset(config, dispatch),
+    unlockAsset: unlockAsset(config, dispatch),
+    requestAccess: requestAccess(config, dispatch),
   };
 };

src/Common/hooks/useNotificationSubscribe.ts

@@ -0,0 +1,138 @@
+import { useDispatch } from "react-redux";
+import {
+  getUserPnconfig,
+  updateUserPnconfig,
+  getPublicKey,
+} from "../../Redux/actions";
+import { useState } from "react";
+import * as Sentry from "@sentry/browser";
+import { useTranslation } from "react-i18next";
+import { Error } from "../../Utils/Notifications.js";
+import useAuthUser from "../../Common/hooks/useAuthUser";
+
+type SubscriptionStatusType =
+  | ""
+  | "NotSubscribed"
+  | "SubscribedOnThisDevice"
+  | "SubscribedOnAnotherDevice";
+
+export default function useNotificationSubscribe() {
+  const { username } = useAuthUser();
+  const dispatch: any = useDispatch();
+  const [subscriptionStatus, setSubscriptionStatus] =
+    useState<SubscriptionStatusType>("");
+  const [isSubscribing, setIsSubscribing] = useState(false);
+  const { t } = useTranslation();
+
+  const intialSubscriptionState = async () => {
+    try {
+      const res = await dispatch(getUserPnconfig({ username: username }));
+      const reg = await navigator.serviceWorker.ready;
+      const subscription = await reg.pushManager.getSubscription();
+      if (!subscription && !res?.data?.pf_endpoint) {
+        setSubscriptionStatus("NotSubscribed");
+      } else if (subscription?.endpoint === res?.data?.pf_endpoint) {
+        setSubscriptionStatus("SubscribedOnThisDevice");
+      } else {
+        setSubscriptionStatus("SubscribedOnAnotherDevice");
+      }
+    } catch (error) {
+      Sentry.captureException(error);
+    }
+  };
+
+  const handleSubscribeClick = () => {
+    const status = subscriptionStatus;
+    if (status === "NotSubscribed" || status === "SubscribedOnAnotherDevice") {
+      subscribe();
+    } else {
+      unsubscribe();
+    }
+  };
+
+  const unsubscribe = () => {
+    navigator.serviceWorker.ready
+      .then(function (reg) {
+        setIsSubscribing(true);
+        reg.pushManager
+          .getSubscription()
+          .then(function (subscription) {
+            subscription
+              ?.unsubscribe()
+              .then(async function (_successful) {
+                const data = {
+                  pf_endpoint: "",
+                  pf_p256dh: "",
+                  pf_auth: "",
+                };
+                await dispatch(
+                  updateUserPnconfig(data, { username: username })
+                );
+
+                setSubscriptionStatus("NotSubscribed");
+                setIsSubscribing(false);
+              })
+              .catch(function (_e) {
+                Error({
+                  msg: t("unsubscribe_failed"),
+                });
+              });
+          })
+          .catch(function (_e) {
+            Error({ msg: t("subscription_error") });
+          });
+      })
+      .catch(function (_e) {
+        Sentry.captureException(_e);
+      });
+  };
+
+  async function subscribe() {
+    setIsSubscribing(true);
+    const response = await dispatch(getPublicKey());
+    const public_key = response.data.public_key;
+    const sw = await navigator.serviceWorker.ready;
+    const push = await sw.pushManager.subscribe({
+      userVisibleOnly: true,
+      applicationServerKey: public_key,
+    });
+    const p256dh = btoa(
+      String.fromCharCode.apply(
+        null,
+        new Uint8Array(push.getKey("p256dh") as any) as any
+      )
+    );
+    const auth = btoa(
+      String.fromCharCode.apply(
+        null,
+        new Uint8Array(push.getKey("auth") as any) as any
+      )
+    );
+
+    const data = {
+      pf_endpoint: push.endpoint,
+      pf_p256dh: p256dh,
+      pf_auth: auth,
+    };
+
+    const res = await dispatch(
+      updateUserPnconfig(data, { username: username })
+    );
+
+    if (res.status >= 200 && res.status <= 300) {
+      setSubscriptionStatus("SubscribedOnThisDevice");
+    }
+    setIsSubscribing(false);
+  }
+
+  return {
+    subscriptionStatus,
+    isSubscribing,
+    setSubscriptionStatus,
+    setIsSubscribing,
+    handleSubscribeClick,
+    intialSubscriptionState,
+    subscribe,
+    unsubscribe,
+  };
+}