Split routes of App Router

src/Components/Facility/UpdateFacilityMiddleware.tsx → src/Components/Facility/FacilityConfigure.tsx

@@ -46,7 +46,7 @@ const FormReducer = (state = initialState, action: any) => {
   }
 };
 
-export const UpdateFacilityMiddleware = (props: any) => {
+export const FacilityConfigure = (props: any) => {
   const [state, dispatch] = useReducer(FormReducer, initialState);
   const { facilityId } = props;
   const dispatchAction: any = useDispatch();

src/Components/Facility/FacilityHome.tsx

@@ -541,9 +541,7 @@ export const FacilityHome = (props: any) => {
                 </DropdownItem>
                 <DropdownItem
                   id="configure-facility"
-                  onClick={() =>
-                    navigate(`/facility/${facilityId}/middleware/update`)
-                  }
+                  onClick={() => navigate(`/facility/${facilityId}/configure`)}
                   authorizeFor={NonReadOnlyUsers}
                   icon={<CareIcon className="care-l-setting text-lg" />}
                 >

src/Components/Notifications/ShowPushNotification.tsx

@@ -1,13 +1,13 @@
 import { useDispatch } from "react-redux";
 import { getNotificationData } from "../../Redux/actions";
 import { useEffect } from "react";
+import { DetailRoute } from "../../Routers/types";
 
-export default function ShowPushNotification({ external_id }: any) {
+export default function ShowPushNotification({ id }: DetailRoute) {
   const dispatch: any = useDispatch();
 
   const resultUrl = async () => {
-    console.log("ID:", external_id.id);
-    const res = await dispatch(getNotificationData({ id: external_id.id }));
+    const res = await dispatch(getNotificationData({ id }));
     const data = res.data.caused_objects;
     switch (res.data.event) {
       case "PATIENT_CREATED":

src/Components/Patient/FileUpload.tsx

@@ -100,7 +100,7 @@ interface FileUploadProps {
   hideBack: boolean;
   audio?: boolean;
   unspecified: boolean;
-  sampleId?: number;
+  sampleId?: string;
   claimId?: string;
 }
 

src/Components/Patient/SampleDetails.tsx

@@ -13,14 +13,11 @@ import { getTestSample } from "../../Redux/actions";
 
 import { navigate } from "raviger";
 import { useDispatch } from "react-redux";
+import { DetailRoute } from "../../Routers/types";
 
 const Loading = lazy(() => import("../Common/Loading"));
 
-interface SampleDetailsProps {
-  id: number;
-}
-
-export const SampleDetails = ({ id }: SampleDetailsProps) => {
+export const SampleDetails = ({ id }: DetailRoute) => {
   const dispatch: any = useDispatch();
   const [isLoading, setIsLoading] = useState(false);
   const [sampleDetails, setSampleDetails] = useState<SampleTestModel>({});

src/Components/Resource/ListView.tsx

@@ -31,7 +31,7 @@ export default function ListView() {
   const { t } = useTranslation();
 
   const onBoardViewBtnClick = () =>
-    navigate("/resource/board-view", { query: qParams });
+    navigate("/resource/board", { query: qParams });
   const appliedFilters = formatFilter(qParams);
 
   const refreshList = () => {

src/Components/Resource/ResourceBoardView.tsx

@@ -32,7 +32,7 @@ export default function BoardView() {
   const { t } = useTranslation();
 
   const onListViewBtnClick = () => {
-    navigate("/resource/list-view", { query: qParams });
+    navigate("/resource/list", { query: qParams });
     localStorage.setItem("defaultResourceView", "list");
   };
 

src/Components/Resource/ResourceDetails.tsx

@@ -231,7 +231,7 @@ export default function ResourceDetails(props: { id: string }) {
     <Page
       title={"Resource details"}
       crumbsReplacements={{ [props.id]: { name: data.title } }}
-      backUrl={"/resource/board-view"}
+      backUrl={"/resource/board"}
     >
       {isPrintMode ? (
         <div className="my-4">

src/Components/Shifting/BoardView.tsx

@@ -95,9 +95,7 @@ export default function BoardView() {
           <div className="flex w-full flex-col gap-2 lg:mr-4 lg:w-fit lg:flex-row lg:gap-4">
             <ButtonV2
               className="py-[11px]"
-              onClick={() =>
-                navigate("/shifting/list-view", { query: qParams })
-              }
+              onClick={() => navigate("/shifting/list", { query: qParams })}
             >
               <CareIcon className="care-l-list-ul" />
               {t("list_view")}

src/Components/Shifting/ListView.tsx

@@ -312,9 +312,7 @@ export default function ListView() {
           <div className="flex w-full flex-col gap-2 lg:w-fit lg:flex-row lg:gap-4">
             <ButtonV2
               className="py-[11px]"
-              onClick={() =>
-                navigate("/shifting/board-view", { query: qParams })
-              }
+              onClick={() => navigate("/shifting/board", { query: qParams })}
             >
               <CareIcon className="care-l-list-ul rotate-90" />
               {t("board_view")}

src/Components/Shifting/ShiftDetails.tsx

@@ -557,7 +557,7 @@ export default function ShiftDetails(props: { id: string }) {
       ) : (
         <Page
           title={t("shifting_details")}
-          backUrl="/shifting/board-view"
+          backUrl="/shifting/board"
           options={
             <div className="flex gap-2">
               <ButtonV2

src/Redux/actions.tsx

@@ -501,7 +501,7 @@ export const sampleReport = (id: string, sampleId: string) => {
 export const getTestList = (params: object) => {
   return fireRequest("getTestSampleList", [], params);
 };
-export const getTestSample = (id: number) => {
+export const getTestSample = (id: string) => {
   return fireRequest("getTestSample", [id], {});
 };
 export const patchSample = (params: object, pathParam: object) => {