Merge branch 'develop' of https://github.com/shauryag2002/care_fe int…

…o issues/8829/camera-audio-permissions

.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,

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,7 +239,7 @@ 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(

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;
 

src/CAREUI/misc/PrintPreview.tsx

@@ -1,9 +1,9 @@
 import { ReactNode } from "react";
-import ButtonV2 from "../../Components/Common/components/ButtonV2";
+import ButtonV2 from "@/components/Common/components/ButtonV2";
 import CareIcon from "../icons/CareIcon";
 import { classNames } from "../../Utils/utils";
-import Page from "../../Components/Common/components/Page";
-import useBreakpoints from "../../Common/hooks/useBreakpoints";
+import Page from "@/components/Common/components/Page";
+import useBreakpoints from "@/common/hooks/useBreakpoints";
 import { useTranslation } from "react-i18next";
 import { ZoomControls, ZoomProvider, ZoomTransform } from "../interactive/Zoom";
 

src/Integrations/Plausible.tsx

@@ -1,5 +1,5 @@
 import { useLocationChange } from "raviger";
-import Script from "../Components/Common/Script";
+import Script from "@/components/Common/Script";
 import { useEffect } from "react";
 import careConfig from "@careConfig";
 

src/PluginEngine.tsx

@@ -1,9 +1,9 @@
 /* eslint-disable i18next/no-literal-string */
 import React, { Suspense } from "react";
-import { CareAppsContext, useCareApps } from "./Common/hooks/useCareApps";
+import { CareAppsContext, useCareApps } from "@/common/hooks/useCareApps";
 import { pluginMap } from "./pluginTypes";
-import { UserAssignedModel } from "./Components/Users/models";
-import ErrorBoundary from "./Components/Common/ErrorBoundary";
+import { UserAssignedModel } from "@/components/Users/models";
+import ErrorBoundary from "@/components/Common/ErrorBoundary";
 
 export default function PluginEngine({
   children,