Pull Request branch dev-clone to main #1

Merged
gitea merged 429 commits from dev-clone into main 2024-12-23 09:31:34 +00:00
Showing only changes of commit c9faedd44f - Show all commits

View File

@ -15,7 +15,7 @@ import {
} from "@tanstack/react-query"; } from "@tanstack/react-query";
import { useDebouncedValue } from "@mantine/hooks"; import { useDebouncedValue } from "@mantine/hooks";
import { Button } from "@/shadcn/components/ui/button"; import { Button } from "@/shadcn/components/ui/button";
import { useNavigate } from "@tanstack/react-router"; import { useLocation, useNavigate } from "@tanstack/react-router";
import { Card } from "@/shadcn/components/ui/card"; import { Card } from "@/shadcn/components/ui/card";
import { Input } from "@/shadcn/components/ui/input"; import { Input } from "@/shadcn/components/ui/input";
import { import {
@ -83,13 +83,17 @@ const createCreateButton = (
} }
if (property === true) { if (property === true) {
const location = useLocation();
const isAssessmentRequestPage =
location.pathname === "/assessmentRequest";
return ( return (
<Button <Button
className="gap-2" className="gap-2"
variant={"outline"} variant={"outline"}
onClick={addQuery} onClick={addQuery}
> >
Tambah Data {isAssessmentRequestPage ? "Ajukan Permohonan" : "Tambah Data"}
<TbPlus /> <TbPlus />
</Button> </Button>
); );