Merge pull request #9008 from ohcnetwork/develop

.github/workflows/cypress.yaml

@@ -1,8 +1,6 @@
 name: Cypress Tests
 
 on:
-  schedule:
-    - cron: "30 22 * * *"
   pull_request:
     branches:
       - develop
@@ -17,7 +15,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        containers: [1, 2, 3, 4, 5, 6, 7, 8]
+        containers: [1, 2, 3, 4]
     env:
       REACT_CARE_API_URL: http://localhost:9000
     steps:
@@ -136,4 +134,4 @@ jobs:
         if: steps.pr_origin.outputs.is_forked == 'true'
         with:
           name: cypress-videos
-          path: cypress/videos
+          path: cypress/videos

cypress/pageobject/Users/UserSearch.ts

@@ -23,7 +23,7 @@ export class UserPage {
   }
 
   checkUsernameText(username: string) {
-    cy.get(this.usernameText).should("have.text", username);
+    cy.get(this.usernameText).should("contain.text", username);
   }
 
   checkUsernameBadgeVisibility(shouldBeVisible: boolean) {

src/CAREUI/display/Timeline.tsx

@@ -1,14 +1,15 @@
-import { createContext, useContext } from "react";
-import { useTranslation } from "react-i18next";
-import { PerformedByModel } from "@/components/HCX/misc";
-import { classNames, formatName } from "../../Utils/utils";
 import CareIcon, { IconName } from "../icons/CareIcon";
+import { classNames, formatName } from "../../Utils/utils";
+import { createContext, useContext } from "react";
+
 import RecordMeta from "./RecordMeta";
+import { UserBareMinimum } from "@/components/Users/models";
+import { useTranslation } from "react-i18next";
 
 export interface TimelineEvent<TType = string> {
   type: TType;
   timestamp: string;
-  by: PerformedByModel | undefined;
+  by: UserBareMinimum | undefined;
   icon: IconName;
   iconStyle?: string;
   iconWrapperStyle?: string;

src/PluginEngine.tsx

@@ -1,8 +1,8 @@
+import { CareAppsContext, useCareApps } from "@/common/hooks/useCareApps";
 /* eslint-disable i18next/no-literal-string */
 import React, { Suspense } from "react";
-import { CareAppsContext, useCareApps } from "@/common/hooks/useCareApps";
-import { pluginMap } from "./pluginTypes";
-import { UserAssignedModel } from "@/components/Users/models";
+import { SupportedPluginComponents, pluginMap } from "./pluginTypes";
+
 import ErrorBoundary from "@/components/Common/ErrorBoundary";
 
 export default function PluginEngine({
@@ -27,25 +27,28 @@ export default function PluginEngine({
   );
 }
 
-export function PLUGIN_DoctorConnectButtons({
-  user,
-}: {
-  user: UserAssignedModel;
-}) {
+type PluginProps<K extends keyof SupportedPluginComponents> =
+  React.ComponentProps<SupportedPluginComponents[K]>;
+
+export function PLUGIN_Component<K extends keyof SupportedPluginComponents>({
+  __name,
+  ...props
+}: { __name: K } & PluginProps<K>) {
   const plugins = useCareApps();
+
   return (
-    <div>
-      {plugins.map((plugin, index) => {
-        const DoctorConnectButtons = plugin.components.DoctorConnectButtons;
-        if (!DoctorConnectButtons) {
+    <>
+      {plugins.map((plugin) => {
+        const Component = plugin.components[
+          __name
+        ] as React.ComponentType<unknown>;
+
+        if (!Component) {
           return null;
         }
-        return (
-          <div key={index}>
-            <DoctorConnectButtons user={user} />
-          </div>
-        );
+
+        return <Component {...props} key={plugin.plugin} />;
       })}
-    </div>
+    </>
   );
 }

src/Redux/api.tsx

@@ -72,11 +72,7 @@ import {
   NotificationData,
   PNconfigData,
 } from "@/components/Notifications/models";
-import {
-  HCXClaimModel,
-  HCXCommunicationModel,
-  HCXPolicyModel,
-} from "@/components/HCX/models";
+import { HCXPolicyModel } from "@/components/HCX/models";
 import { ICD11DiagnosisModel } from "@/components/Diagnosis/types";
 import { Investigation } from "@/components/Facility/Investigations/Reports/types";
 import { PaginatedResponse } from "../Utils/request/types";
@@ -104,7 +100,6 @@ import {
   IHealthFacility,
   IpartialUpdateHealthFacilityTBody,
 } from "@/components/ABDM/types/health-facility";
-import { PMJAYPackageItem } from "@/components/Common/PMJAYProcedurePackageAutocomplete";
 import { InsurerOptionModel } from "@/components/HCX/InsurerAutocomplete";
 
 /**
@@ -1696,117 +1691,6 @@ const routes = {
         TRes: Type<HCXPolicyModel>(),
       },
     },
-
-    claims: {
-      list: {
-        path: "/api/hcx/claim/",
-        method: "GET",
-        TRes: Type<PaginatedResponse<HCXClaimModel>>(),
-      },
-
-      create: {
-        path: "/api/hcx/claim/",
-        method: "POST",
-        TBody: Type<{
-          policy: string;
-          items: {
-            id: string;
-            price: number;
-            category?: string;
-            name: string;
-          }[];
-          consultation: string;
-          use: "preauthorization" | "claim";
-        }>(),
-        TRes: Type<HCXClaimModel>(),
-      },
-
-      get: {
-        path: "/api/hcx/claim/{external_id}/",
-        method: "GET",
-      },
-
-      update: {
-        path: "/api/hcx/claim/{external_id}/",
-        method: "PUT",
-      },
-
-      partialUpdate: {
-        path: "/api/hcx/claim/{external_id}/",
-        method: "PATCH",
-      },
-
-      delete: {
-        path: "/api/hcx/claim/{external_id}/",
-        method: "DELETE",
-      },
-
-      listPMJYPackages: {
-        path: "/api/hcx/pmjy_packages/",
-        method: "GET",
-        TRes: Type<PMJAYPackageItem[]>(),
-      },
-
-      makeClaim: {
-        path: "/api/hcx/make_claim/",
-        method: "POST",
-        TBody: Type<{ claim: string }>(),
-        TRes: Type<unknown>(),
-      },
-    },
-
-    communications: {
-      list: {
-        path: "/api/hcx/communication/",
-        method: "GET",
-        TRes: Type<PaginatedResponse<HCXCommunicationModel>>(),
-      },
-
-      create: {
-        path: "/api/hcx/communication/",
-        method: "POST",
-        TRes: Type<HCXCommunicationModel>(),
-        TBody: Type<{
-          claim: string;
-          content: {
-            type: string;
-            data: string;
-          }[];
-        }>(),
-      },
-
-      get: {
-        path: "/api/hcx/communication/{external_id}/",
-        method: "GET",
-        TRes: Type<HCXCommunicationModel>(),
-      },
-
-      update: {
-        path: "/api/hcx/communication/{external_id}/",
-        method: "PUT",
-        TRes: Type<HCXCommunicationModel>(),
-      },
-
-      partialUpdate: {
-        path: "/api/hcx/communication/{external_id}/",
-        method: "PATCH",
-        TRes: Type<HCXCommunicationModel>(),
-      },
-
-      delete: {
-        path: "/api/hcx/communication/{external_id}/",
-        method: "DELETE",
-      },
-
-      send: {
-        path: "/api/hcx/send_communication/",
-        method: "POST",
-        TRes: Type<void>(),
-        TBody: Type<{
-          communication: string;
-        }>(),
-      },
-    },
   },
 } as const;
 

src/Routers/AppRouter.tsx

@@ -1,32 +1,30 @@
-import { useRedirect, useRoutes, usePath, Redirect } from "raviger";
-import { useState, useEffect } from "react";
-
-import ShowPushNotification from "@/components/Notifications/ShowPushNotification";
-import { NoticeBoard } from "@/components/Notifications/NoticeBoard";
-import Error404 from "@/components/ErrorPages/404";
 import {
   DesktopSidebar,
   MobileSidebar,
   SIDEBAR_SHRINK_PREFERENCE_KEY,
   SidebarShrinkContext,
 } from "@/components/Common/Sidebar/Sidebar";
+import { Redirect, usePath, useRedirect, useRoutes } from "raviger";
+import { useEffect, useState } from "react";
+
+import ABDMFacilityRecords from "@/components/ABDM/ABDMFacilityRecords";
+import AssetRoutes from "./routes/AssetRoutes";
 import { BLACKLISTED_PATHS } from "@/common/constants";
-import SessionExpired from "@/components/ErrorPages/SessionExpired";
+import ConsultationRoutes from "./routes/ConsultationRoutes";
+import Error404 from "@/components/ErrorPages/404";
+import FacilityRoutes from "./routes/FacilityRoutes";
 import HealthInformation from "@/components/ABDM/HealthInformation";
-import ABDMFacilityRecords from "@/components/ABDM/ABDMFacilityRecords";
-
-import UserRoutes from "./routes/UserRoutes";
+import IconIndex from "../CAREUI/icons/Index";
+import { NoticeBoard } from "@/components/Notifications/NoticeBoard";
 import PatientRoutes from "./routes/PatientRoutes";
+import ResourceRoutes from "./routes/ResourceRoutes";
 import SampleRoutes from "./routes/SampleRoutes";
-import FacilityRoutes from "./routes/FacilityRoutes";
-import ConsultationRoutes from "./routes/ConsultationRoutes";
-import HCXRoutes from "./routes/HCXRoutes";
+import SessionExpired from "@/components/ErrorPages/SessionExpired";
 import ShiftingRoutes from "./routes/ShiftingRoutes";
-import AssetRoutes from "./routes/AssetRoutes";
-import ResourceRoutes from "./routes/ResourceRoutes";
-import { usePluginRoutes } from "@/common/hooks/useCareApps";
+import ShowPushNotification from "@/components/Notifications/ShowPushNotification";
+import UserRoutes from "./routes/UserRoutes";
 import careConfig from "@careConfig";
-import IconIndex from "../CAREUI/icons/Index";
+import { usePluginRoutes } from "@/common/hooks/useCareApps";
 
 export type RouteParams<T extends string> =
   T extends `${string}:${infer Param}/${infer Rest}`
@@ -78,16 +76,12 @@ export default function AppRouter() {
 
   let routes = Routes;
 
-  if (careConfig.hcx.enabled) {
-    routes = { ...HCXRoutes, ...routes };
-  }
-
   useRedirect("/user", "/users");
 
   // Merge in Plugin Routes
   routes = {
-    ...routes,
     ...pluginRoutes,
+    ...routes,
   };
 
   const pages = useRoutes(routes) || <Error404 />;

src/Utils/types.ts

@@ -1,11 +1,11 @@
-import { PerformedByModel } from "@/components/HCX/misc";
+import { UserBareMinimum } from "@/components/Users/models";
 
 export interface BaseModel {
   readonly id: string;
   readonly modified_date: string;
   readonly created_date: string;
-  readonly created_by: PerformedByModel;
-  readonly updated_by: PerformedByModel;
+  readonly created_by: UserBareMinimum;
+  readonly updated_by: UserBareMinimum;
 }
 
 export type Writable<T> = {

src/components/Assets/AssetManage.tsx

@@ -432,7 +432,7 @@ const AssetManage = (props: AssetManageProps) => {
                 data-testid="asset-update-button"
                 authorizeFor={NonReadOnlyUsers}
               >
-                <CareIcon icon="l-pen" className="mr-1 h-4" />
+                <CareIcon icon="l-pen" className="text-lg" />
                 {t("update")}
               </ButtonV2>
               {asset?.asset_class &&
@@ -449,7 +449,7 @@ const AssetManage = (props: AssetManageProps) => {
                     id="configure-asset"
                     data-testid="asset-configure-button"
                   >
-                    <CareIcon icon="l-setting" className="h-4" />
+                    <CareIcon icon="l-setting" className="text-lg" />
                     {t("configure")}
                   </ButtonV2>
                 )}
@@ -459,10 +459,9 @@ const AssetManage = (props: AssetManageProps) => {
                   onClick={() => setShowDeleteDialog(true)}
                   variant="danger"
                   data-testid="asset-delete-button"
-                  className="inline-flex"
                 >
-                  <CareIcon icon="l-trash" className="h-4" />
-                  <span className="md:hidden">{t("delete")}</span>
+                  <CareIcon icon="l-trash" className="text-lg" />
+                  <span>{t("delete")}</span>
                 </ButtonV2>
               )}
             </div>

src/components/Assets/AssetTypes.tsx

@@ -1,7 +1,7 @@
-import { IconName } from "../../CAREUI/icons/CareIcon";
 import { BedModel } from "../Facility/models";
-import { PerformedByModel } from "../HCX/misc";
+import { IconName } from "../../CAREUI/icons/CareIcon";
 import { PatientModel } from "../Patient/models";
+import { UserBareMinimum } from "@/components/Users/models";
 
 export enum AssetLocationType {
   OTHER = "OTHER",
@@ -169,7 +169,7 @@ export interface AssetServiceEdit {
   serviced_on: string;
   note: string;
   edited_on: string;
-  edited_by: PerformedByModel;
+  edited_by: UserBareMinimum;
 }
 export interface AssetService {
   id: string;