-
+
{
name="otp"
type="text"
value={otp}
+ autoComplete="one-time-code"
onChange={(e) => {
setOtp(e.target.value);
setOtpValidationError("");
diff --git a/src/components/Common/Breadcrumbs.tsx b/src/components/Common/Breadcrumbs.tsx
deleted file mode 100644
index 72951c5a98e..00000000000
--- a/src/components/Common/Breadcrumbs.tsx
+++ /dev/null
@@ -1,174 +0,0 @@
-import { Link, usePath } from "raviger";
-import { useState } from "react";
-
-import CareIcon from "@/CAREUI/icons/CareIcon";
-
-import {
- Breadcrumb,
- BreadcrumbItem,
- BreadcrumbList,
-} from "@/components/ui/breadcrumb";
-import { Button } from "@/components/ui/button";
-import {
- DropdownMenu,
- DropdownMenuContent,
- DropdownMenuItem,
- DropdownMenuTrigger,
-} from "@/components/ui/dropdown-menu";
-
-import useAppHistory from "@/hooks/useAppHistory";
-
-import { classNames } from "@/Utils/utils";
-
-const MENU_TAGS: { [key: string]: string } = {
- facility: "Facilities",
- patients: "Patients",
- assets: "Assets",
- shifting: "Shiftings",
- resource: "Resources",
- users: "Users",
- notice_board: "Notice Board",
-};
-
-const capitalize = (string: string) =>
- string
- .replace(/[_-]/g, " ")
- .split(" ")
- .map((word) => word.charAt(0).toUpperCase() + word.slice(1))
- .join(" ");
-
-interface BreadcrumbsProps {
- replacements?: {
- [key: string]: {
- name?: string;
- uri?: string;
- style?: string;
- hide?: boolean;
- };
- };
- className?: string;
- hideBack?: boolean;
- backUrl?: string;
- onBackClick?: () => boolean | void;
-}
-
-export default function Breadcrumbs({
- replacements = {},
- className = "",
- hideBack = false,
- backUrl,
- onBackClick,
-}: BreadcrumbsProps) {
- const { goBack } = useAppHistory();
- const path = usePath();
- const [showFullPath, setShowFullPath] = useState(false);
-
- const crumbs = path
- ?.slice(1)
- .split("/")
- .filter((field) => replacements[field]?.hide !== true)
- .map((field, i) => ({
- name: replacements[field]?.name || MENU_TAGS[field] || capitalize(field),
- uri:
- replacements[field]?.uri ||
- path
- .split("/")
- .slice(0, i + 2)
- .join("/"),
- style: replacements[field]?.style || "",
- }));
-
- const renderCrumb = (crumb: any, index: number) => {
- const isLastItem = index === crumbs!.length - 1;
- return (
-
-
- {!isLastItem ? (
-
- ) : (
- {crumb.name}
- )}
-
-
- );
- };
-
- return (
-
-
-
- );
-}
diff --git a/src/components/Common/Page.tsx b/src/components/Common/Page.tsx
index 24b797d245f..b9079c5089e 100644
--- a/src/components/Common/Page.tsx
+++ b/src/components/Common/Page.tsx
@@ -33,7 +33,7 @@ export default function Page(props: PageProps) {
let padding = "";
if (!props.noImplicitPadding) {
- if (!props.hideBack || props.componentRight) padding = "py-0 md:px-6";
+ if (props.componentRight) padding = "py-0 md:px-6";
else padding = "px-6 py-0";
}
@@ -43,13 +43,8 @@ export default function Page(props: PageProps) {
diff --git a/src/components/Common/PageTitle.tsx b/src/components/Common/PageTitle.tsx
index cee87a8c5fb..c374124934d 100644
--- a/src/components/Common/PageTitle.tsx
+++ b/src/components/Common/PageTitle.tsx
@@ -1,46 +1,26 @@
import { ReactNode, useEffect, useRef } from "react";
-import Breadcrumbs from "@/components/Common/Breadcrumbs";
-import PageHeadTitle from "@/components/Common/PageHeadTitle";
+import { cn } from "@/lib/utils";
-import { classNames } from "@/Utils/utils";
+import PageHeadTitle from "@/components/Common/PageHeadTitle";
export interface PageTitleProps {
title: string;
className?: string;
componentRight?: ReactNode;
- breadcrumbs?: boolean;
- crumbsReplacements?: {
- [key: string]: {
- name?: string;
- uri?: string;
- style?: string;
- hide?: boolean;
- };
- };
focusOnLoad?: boolean;
isInsidePage?: boolean;
changePageMetadata?: boolean;
- // New props for Breadcrumbs
- hideBack?: boolean;
- backUrl?: string;
hideTitleOnPage?: boolean;
- onBackClick?: () => boolean | void;
}
export default function PageTitle({
title,
className = "",
componentRight = <>,
- breadcrumbs = true,
- crumbsReplacements = {},
focusOnLoad = false,
isInsidePage = false,
changePageMetadata = true,
- // New props passed to Breadcrumbs
- hideBack = false,
- backUrl,
- onBackClick,
hideTitleOnPage,
}: PageTitleProps) {
const divRef = useRef
();
@@ -54,23 +34,12 @@ export default function PageTitle({
return (
-
- {breadcrumbs && (
-
- )}
-
{changePageMetadata &&
}
-
+
-
+
+
+
;
- const { data: facilityData } = useQuery({
- queryKey: ["facility", facilityId],
- queryFn: query(routes.getAnyFacility, {
- pathParams: { id: String(facilityId) },
- }),
- enabled: !!facilityId,
- });
-
const { data: patientData } = useQuery({
queryKey: ["patient", related_patient],
queryFn: query(routes.patient.getPatient, {
@@ -167,17 +159,7 @@ export default function ResourceCreate(props: ResourceProps) {
}
return (
-
+