fix merge conflicts

.cursorrules

@@ -7,12 +7,12 @@ Care uses a custom useQuery hook to fetch data from the API. APIs are defined in
 Here's an example of how to use the useQuery hook to fetch data from the API:
 
 ```
-useQuery from "@/Common/hooks/useQuery";
+useQuery from "@/common/hooks/useQuery";
 const { data, loading, error } = useQuery(routes.getFacilityUsers, {
   facility_id: "1",
 });
 
-request from "@/Common/utils/request";
+request from "@/common/utils/request";
 const { res } = await request(routes.partialUpdateAsset, {
   pathParams: { external_id: assetId },
   body: data,

.dockerignore

@@ -3,3 +3,4 @@ build
 .dockerignore
 Dockerfile
 .git
+apps

.env

@@ -12,4 +12,6 @@ REACT_CARE_API_URL=https://careapi.ohc.network
 # Dev envs
 ESLINT_NO_DEV_ERRORS=true
 CARE_CDN_URL="https://egov-s3-facility-10bedicu.s3.amazonaws.com https://egov-s3-patient-data-10bedicu.s3.amazonaws.com http://localhost:4566"
-REACT_ALLOWED_LOCALES="en,hi,ta,ml,mr,kn"
+REACT_ALLOWED_LOCALES="en,hi,ta,ml,mr,kn"
+
+REACT_ENABLED_APPS="ohcnetwork/care_livekit_fe@main"

Dockerfile

@@ -5,16 +5,17 @@ WORKDIR /app
 
 ENV NODE_OPTIONS="--max-old-space-size=4096"
 
-RUN if [ "$(uname -m)" = "aarch64" ] || [ "$(uname -m)" = "arm64" ]; then apt-get update && apt-get install -y python3-dev make g++; fi
+RUN apt-get update && apt-get install -y git
+
+RUN if [ "$(uname -m)" = "aarch64" ] || [ "$(uname -m)" = "arm64" ]; then apt-get install -y python3-dev make g++; fi
+
 
 COPY package.json package-lock.json ./
 
 RUN npm install
 
 COPY . .
 
-RUN npm run setup
-
 RUN npm run build
 
 

cypress/e2e/patient_spec/PatientLogUpdate.cy.ts

@@ -113,6 +113,7 @@ describe("Patient Log Update in Normal, Critical and TeleIcu", () => {
     cy.closeNotification();
     // Submit the doctors log update
     cy.submitButton("Save and Continue");
+    cy.wait(2000);
     cy.verifyNotification("Progress Note created successfully");
     cy.closeNotification();
     // modify the relevant critical care log update

cypress/e2e/patient_spec/PatientRegistration.cy.ts

@@ -239,17 +239,9 @@ describe("Patient Creation with consultation", () => {
     patientMedicalHistory.verifyNoSymptosPresent("Diabetes");
     // verify insurance details and dedicatd page
     cy.get("[data-testid=patient-details]")
-      .contains(patientOneFirstSubscriberId)
+      .contains("member id")
       .scrollIntoView();
     cy.wait(2000);
-    patientInsurance.verifyPatientPolicyDetails(
-      patientOneFirstSubscriberId,
-      patientOneFirstPolicyId,
-      patientOneFirstInsurerId,
-      patientOneFirstInsurerName,
-      isHCXEnabled,
-    );
-
     patientInsurance.clickPatientInsuranceViewDetail();
     cy.wait(3000);
     patientInsurance.verifyPatientPolicyDetails(

cypress/e2e/users_spec/UsersCreation.cy.ts

@@ -79,13 +79,10 @@ describe("User Creation", () => {
     );
     userCreationPage.typeIntoElementByIdPostClear("lastName", "Cypress");
     userCreationPage.selectDropdownOption("gender", "Male");
-    userCreationPage.typeIntoElementByIdPostClear(
-      "phoneNumber",
-      "+91" + phone_number,
-    );
+    userCreationPage.typeIntoElementByIdPostClear("phoneNumber", phone_number);
     userCreationPage.typeIntoElementByIdPostClear(
       "altPhoneNumber",
-      "+91" + emergency_phone_number,
+      emergency_phone_number,
     );
     userCreationPage.typeIntoElementByIdPostClear("email", "[email protected]");
     userCreationPage.typeIntoElementByIdPostClear("weekly_working_hours", "14");

cypress/e2e/users_spec/UsersProfile.cy.ts

@@ -10,7 +10,7 @@ describe("Manage User Profile", () => {
   const date_of_birth = "01011999";
   const gender = "Male";
   const email = "[email protected]";
-  const phone = "+918899887788";
+  const phone = "8899887788";
   const workinghours = "8";
   const qualification = "MBBS";
   const doctorYoE = "10";

cypress/pageobject/Facility/FacilityLocation.ts

@@ -84,7 +84,7 @@ class FacilityLocation {
   }
 
   clickNotification() {
-    cy.get(".pnotify").click();
+    cy.get(".pnotify-container").click();
   }
 
   enterBedName(name: string) {

scripts/setup-care-apps.js

@@ -1,5 +1,5 @@
 // eslint-disable-next-line @typescript-eslint/no-var-requires
-const { execSync } = require("child_process");
+const { execSync, spawnSync } = require("child_process");
 // eslint-disable-next-line @typescript-eslint/no-var-requires
 const fs = require("fs");
 // eslint-disable-next-line @typescript-eslint/no-var-requires
@@ -33,12 +33,12 @@ const installApp = (app) => {
   const appDir = path.join(appsDir, app.package.split("/")[1]);
 
   console.log(`Cloning ${app.package}...`);
-  execSync(
-    `npx -y gitget ${app.package}${app.branch ? `#${app.branch}` : ""} apps/${app.package.split("/")[1]} `,
-    {
-      stdio: "inherit",
-    },
-  );
+
+  const cloneUrl = `https://github.com/${app.package.replace("github:", "")}.git`;
+  const branchOption = app.branch ? ["--branch", app.branch] : [];
+
+  spawnSync("git", ["clone", ...branchOption, cloneUrl, appDir]);
+
   // Create a care-package.lock file
   fs.writeFileSync(
     path.join(appDir, "care-package.lock"),

src/App.tsx

@@ -1,12 +1,12 @@
 import { Suspense } from "react";
 import Routers from "./Routers";
 import Integrations from "./Integrations";
-import Loading from "./Components/Common/Loading";
+import Loading from "@/components/Common/Loading";
 import HistoryAPIProvider from "./Providers/HistoryAPIProvider";
 import AuthUserProvider from "./Providers/AuthUserProvider";
 import PluginEngine from "./PluginEngine";
 import { FeatureFlagsProvider } from "./Utils/featureFlags";
-import { Toaster } from "./Components/ui/toaster";
+import { Toaster } from "@/components/ui/toaster";
 
 const App = () => {
   return (

src/CAREUI/display/Chip.tsx

@@ -1,5 +1,5 @@
 import CareIcon, { IconName } from "../icons/CareIcon";
-import { ButtonVariant } from "../../Components/Common/components/ButtonV2";
+import { ButtonVariant } from "@/components/Common/components/ButtonV2";
 import { classNames } from "../../Utils/utils";
 
 interface Props {

src/CAREUI/display/PopupModal.tsx

@@ -1,9 +1,9 @@
 import { ReactNode, useEffect, useRef, useState } from "react";
-import { Cancel, Submit } from "../../Components/Common/components/ButtonV2";
+import { Cancel, Submit } from "@/components/Common/components/ButtonV2";
 import { classNames } from "../../Utils/utils";
 import { useTranslation } from "react-i18next";
-import useBreakpoints from "../../Common/hooks/useBreakpoints";
-import DialogModal from "../../Components/Common/Dialog";
+import useBreakpoints from "@/common/hooks/useBreakpoints";
+import DialogModal from "@/components/Common/Dialog";
 
 type Props = {
   show: boolean;

src/CAREUI/display/Timeline.tsx

@@ -1,6 +1,6 @@
 import { createContext, useContext } from "react";
 import { useTranslation } from "react-i18next";
-import { PerformedByModel } from "../../Components/HCX/misc";
+import { PerformedByModel } from "@/components/HCX/misc";
 import { classNames, formatName } from "../../Utils/utils";
 import CareIcon, { IconName } from "../icons/CareIcon";
 import RecordMeta from "./RecordMeta";

src/CAREUI/icons/Index.tsx

@@ -3,7 +3,7 @@ import React, { useState } from "react";
 import CareIcon, { IconName } from "./CareIcon";
 import iconPaths from "./UniconPaths.json";
 import { t } from "i18next";
-import PageTitle from "../../Components/Common/PageTitle";
+import PageTitle from "@/components/Common/PageTitle";
 import { useToast } from "@/hooks/use-toast";
 
 const IconIndex: React.FC = () => {

src/CAREUI/interactive/FiltersSlideover.tsx

@@ -1,6 +1,6 @@
 import { useTranslation } from "react-i18next";
-import useFilters from "../../Common/hooks/useFilters";
-import ButtonV2 from "../../Components/Common/components/ButtonV2";
+import useFilters from "@/common/hooks/useFilters";
+import ButtonV2 from "@/components/Common/components/ButtonV2";
 import CareIcon from "../icons/CareIcon";
 import SlideOver from "./SlideOver";
 import { ReactNode } from "react";

src/CAREUI/interactive/HumanChart.tsx

@@ -1,5 +1,5 @@
 import { Fragment } from "react/jsx-runtime";
-import { HumanBodyPaths, HumanBodyRegion } from "../../Common/constants";
+import { HumanBodyPaths, HumanBodyRegion } from "@/common/constants";
 
 type Props = {
   regionColor: (region: HumanBodyRegion) => string;

src/CAREUI/interactive/Zoom.tsx

@@ -1,5 +1,5 @@
 import { createContext, ReactNode, useContext, useState } from "react";
-import ButtonV2 from "../../Components/Common/components/ButtonV2";
+import ButtonV2 from "@/components/Common/components/ButtonV2";
 import CareIcon from "../icons/CareIcon";
 
 type ProviderValue = {

src/CAREUI/misc/AuthorizedChild.tsx

@@ -1,7 +1,7 @@
 import { ReactNode } from "react";
-import useAuthUser from "../../Common/hooks/useAuthUser";
-import { useIsAuthorized } from "../../Common/hooks/useIsAuthorized";
-import useSlug from "../../Common/hooks/useSlug";
+import useAuthUser from "@/common/hooks/useAuthUser";
+import { useIsAuthorized } from "@/common/hooks/useIsAuthorized";
+import useSlug from "@/common/hooks/useSlug";
 import { AuthorizedForCB } from "../../Utils/AuthorizeFor";
 
 interface Props {

src/CAREUI/misc/PaginatedList.tsx

@@ -3,10 +3,10 @@ import { PaginatedResponse, QueryRoute } from "../../Utils/request/types";
 import useQuery, { QueryOptions } from "../../Utils/request/useQuery";
 import ButtonV2, {
   CommonButtonProps,
-} from "../../Components/Common/components/ButtonV2";
+} from "@/components/Common/components/ButtonV2";
 import CareIcon from "../icons/CareIcon";
 import { classNames } from "../../Utils/utils";
-import Pagination from "../../Components/Common/Pagination";
+import Pagination from "@/components/Common/Pagination";
 
 const DEFAULT_PER_PAGE_LIMIT = 14;