diff --git a/src/bed-admission/active-patients/active-patients-table.component.tsx b/src/bed-admission/active-patients/active-patients-table.component.tsx index 3142338..189091e 100644 --- a/src/bed-admission/active-patients/active-patients-table.component.tsx +++ b/src/bed-admission/active-patients/active-patients-table.component.tsx @@ -67,7 +67,6 @@ const ActivePatientsTable: React.FC = ({ session?.sessionLocation?.uuid, status ); - const handleBedAssigmentModal = useCallback( (entry) => { setSelectedPatientDetails({ diff --git a/src/bed-admission/bed-admission-tabs.component.tsx b/src/bed-admission/bed-admission-tabs.component.tsx index 38899ff..9889133 100644 --- a/src/bed-admission/bed-admission-tabs.component.tsx +++ b/src/bed-admission/bed-admission-tabs.component.tsx @@ -1,4 +1,4 @@ -import { Tab, TabList, TabPanel, TabPanels, Tabs } from "@carbon/react"; +import { Tab, TabList, TabPanel, TabPanels, Tabs, Button } from "@carbon/react"; import React, { useState } from "react"; import styles from "./bed-admission-tabs-styles.scss"; import { useTranslation } from "react-i18next"; @@ -12,7 +12,6 @@ const BedAdmissionTabs: React.FC = () => { const [admittedCount, setAdmittedCount] = useState(0); const [toAdmitCount, setToAdmitCount] = useState(0); const [toDischargeCount, setToDischargeCount] = useState(0); - return ( <>
diff --git a/src/bed-admission/bed-tag/edit-tag-form.component.tsx b/src/bed-admission/bed-tag/edit-tag-form.component.tsx index e49dd39..60804db 100644 --- a/src/bed-admission/bed-tag/edit-tag-form.component.tsx +++ b/src/bed-admission/bed-tag/edit-tag-form.component.tsx @@ -1,7 +1,6 @@ import React, { useCallback } from "react"; import { useTranslation } from "react-i18next"; import { showToast, showNotification } from "@openmrs/esm-framework"; - import { editBedTag, useBedTag } from "../../summary/summary.resource"; import { BedTagDataAdministration } from "../../bed-administration/bed-administration-types"; import BedTagsAdministrationForm from "./bed-tags-admin-form.component"; diff --git a/src/bed-admission/bed-type/bed-type-administration-table.component.tsx b/src/bed-admission/bed-type/bed-type-administration-table.component.tsx index eb22ee8..83f6f37 100644 --- a/src/bed-admission/bed-type/bed-type-administration-table.component.tsx +++ b/src/bed-admission/bed-type/bed-type-administration-table.component.tsx @@ -207,6 +207,7 @@ const BedTypeAdministrationTable: React.FC = () => { onChange={({ page, pageSize }) => { setCurrentPage(page); pageSize(pageSize); + }} /> diff --git a/src/bed-admission/bed-type/edit-bed-type.component.tsx b/src/bed-admission/bed-type/edit-bed-type.component.tsx index b6e1ff4..82e046a 100644 --- a/src/bed-admission/bed-type/edit-bed-type.component.tsx +++ b/src/bed-admission/bed-type/edit-bed-type.component.tsx @@ -1,7 +1,6 @@ import React, { useCallback } from "react"; import { useTranslation } from "react-i18next"; import { showToast, showNotification } from "@openmrs/esm-framework"; - import { editBedType, useBedType } from "../../summary/summary.resource"; import { BedTypeDataAdministration } from "../../bed-administration/bed-administration-types"; import { BedTypeData, Mutator } from "../../types"; diff --git a/src/root.component.tsx b/src/root.component.tsx index d253dc3..80bb9a9 100644 --- a/src/root.component.tsx +++ b/src/root.component.tsx @@ -1,7 +1,6 @@ import React, { useEffect } from "react"; import { BrowserRouter, Route, Routes } from "react-router-dom"; import { setLeftNav, unsetLeftNav } from "@openmrs/esm-framework"; -import BedAdministrationTable from "./bed-administration/bed-administration-table.component"; import Home from "./home.component"; import LeftPanel from "./left-panel/left-panel.component"; import WardWithBeds from "./ward-with-beds/ward-with-beds.component"; diff --git a/src/routes.json b/src/routes.json index e165c2d..95e60d3 100644 --- a/src/routes.json +++ b/src/routes.json @@ -21,6 +21,16 @@ "name": "bed-administration-left-panel-link", "slot": "bed-management-left-panel-slot" }, + { + "component": "bedTypeLeftPanelLink", + "name": "bed-type-left-panel-link", + "slot": "bed-management-left-panel-slot" + }, + { + "component": "bedTagLeftPanelLink", + "name": "bed-tag-left-panel-link", + "slot": "bed-management-left-panel-slot" + }, { "component": "summaryLeftPanelLink", "name": "bed-management-home-dashboard-link", diff --git a/src/types.ts b/src/types.ts index e237684..62cb5c5 100644 --- a/src/types.ts +++ b/src/types.ts @@ -108,6 +108,17 @@ export interface InitialData { }; } +export interface BedTypeData { + uuid: string; + name: string; + displayName: string; + description: string; +} + +export interface BedTagData { + uuid: string; + name: string; +} export type Mutator = KeyedMutator<{ data: { results: Array;