upd: task divisi

Deskripsi: - upload file - view file No Issues
2024-09-12 15:39:09 +08:00
parent e01dbed1eb
commit ad6bd2cbfb
9 changed files with 226 additions and 212 deletions
--- a/prisma/schema.prisma
+++ b/prisma/schema.prisma
@@ -452,6 +452,7 @@ model ContainerFileDivision {
  id                  String                @id @default(cuid())
  Division            Division              @relation(fields: [idDivision], references: [id])
  idDivision          String
+  idStorage           String?
  name                String
  extension           String
  isActive            Boolean               @default(true)
--- a/src/app/api/task/[id]/route.ts
+++ b/src/app/api/task/[id]/route.ts
@@ -90,7 +90,8 @@ export async function GET(request: Request, context: { params: { id: string } })
                  select: {
                     id: true,
                     name: true,
-                     extension: true
+                     extension: true,
+                     idStorage: true
                  }
               }
            }
@@ -101,6 +102,7 @@ export async function GET(request: Request, context: { params: { id: string } })
            nameInStorage: v.ContainerFileDivision.id,
            name: v.ContainerFileDivision.name,
            extension: v.ContainerFileDivision.extension,
+            idStorage: v.ContainerFileDivision.idStorage,
         }))

         allData = fix
--- a/src/app/api/task/file/[id]/route.ts
+++ b/src/app/api/task/file/[id]/route.ts
@@ -1,4 +1,4 @@
-import { prisma } from "@/module/_global";
+import { DIR, funDeleteFile, funUploadFile, prisma } from "@/module/_global";
 import { funGetUserByCookies } from "@/module/auth";
 import _ from "lodash";
 import { NextResponse } from "next/server";
@@ -42,7 +42,7 @@ export async function DELETE(request: Request, context: { params: { id: string }
         }
      })

-      fs.unlink(`./public/file/task/${dataFile?.id}.${dataFile?.extension}`, (err) => { })
+      await funDeleteFile({ fileId: String(dataFile?.idStorage) })

      const deleteRelasi = await prisma.divisionProjectFile.delete({
         where: {
@@ -57,7 +57,7 @@ export async function DELETE(request: Request, context: { params: { id: string }
      });

      // create log user
-      const log = await createLogUser({ act: 'DELETE', desc: 'User menghpus file divisi', table: 'divisionProject', data: String(dataRelasi?.idProject) })
+      const log = await createLogUser({ act: 'DELETE', desc: 'User menghapus file tugas divisi', table: 'divisionProject', data: String(dataRelasi?.idProject) })

      return NextResponse.json({ success: true, message: "File berhasil dihapus", data, }, { status: 200 });

@@ -115,25 +115,20 @@ export async function POST(request: Request, context: { params: { id: string } }
               const fName = file.name.replace("." + fExt, "")


+               const upload = await funUploadFile({ file: file, dirId: DIR.task })
+               if (upload.success) {
                  const insertToContainer = await prisma.containerFileDivision.create({
                     data: {
                        idDivision: String(dataProject?.idDivision),
                        name: fName,
-                     extension: String(fExt)
+                        extension: String(fExt),
+                        idStorage: upload.data.id
                     },
                     select: {
                        id: true
                     }
                  })

-               const nameFix = insertToContainer.id + '.' + fExt
-               const filePath = path.join(root, nameFix)
-               // Konversi ArrayBuffer ke Buffer
-               const buffer = Buffer.from(await file.arrayBuffer());
-               // Tulis file ke sistem
-               fs.writeFileSync(filePath, buffer);
-
-
                  const dataFile = {
                     idProject: id,
                     idDivision: dataProject?.idDivision,
@@ -141,10 +136,10 @@ export async function POST(request: Request, context: { params: { id: string } }
                     createdBy: user.id,
                  }

-
                  fileFix.push(dataFile)
               }
            }
+         }

         const insertFile = await prisma.divisionProjectFile.createMany({
            data: fileFix
@@ -152,12 +147,12 @@ export async function POST(request: Request, context: { params: { id: string } }
      }

      // create log user
-      const log = await createLogUser({ act: 'CREATE', desc: 'User meambahkan file tugas divisi baru', table: 'divisionProject', data: id })
-      return NextResponse.json({ success: true, message: "Berhasil membuat tugas divisi" }, { status: 200 });
+      const log = await createLogUser({ act: 'CREATE', desc: 'User menambahkan file tugas divisi baru', table: 'divisionProject', data: id })
+      return NextResponse.json({ success: true, message: "Berhasil menambahkan file" }, { status: 200 });

   } catch (error) {
      console.error(error);
-      return NextResponse.json({ success: false, message: "Gagal membuat tugas divisi, coba lagi nanti", reason: (error as Error).message, }, { status: 500 });
+      return NextResponse.json({ success: false, message: "Gagal menambahkan filae, coba lagi nanti", reason: (error as Error).message, }, { status: 500 });
   }
 }

--- a/src/app/api/task/route.ts
+++ b/src/app/api/task/route.ts
@@ -1,4 +1,4 @@
-import { prisma } from "@/module/_global";
+import { DIR, funUploadFile, prisma } from "@/module/_global";
 import { funGetUserByCookies } from "@/module/auth";
 import _, { ceil } from "lodash";
 import { NextResponse } from "next/server";
@@ -153,33 +153,26 @@ export async function POST(request: Request) {
      let fileFix: any[] = []

      if (cekFile) {
-         const root = path.join(process.cwd(), "./public/file/task/");
         for (var pair of body.entries()) {
            if (String(pair[0]).substring(0, 4) == "file") {
               const file = body.get(pair[0]) as File
               const fExt = file.name.split(".").pop()
               const fName = file.name.replace("." + fExt, "")

-
+               const upload = await funUploadFile({ file: file, dirId: DIR.task })
+               if (upload.success) {
                  const insertToContainer = await prisma.containerFileDivision.create({
                     data: {
                        idDivision: idDivision,
                        name: fName,
-                     extension: String(fExt)
+                        extension: String(fExt),
+                        idStorage: upload.data.id
                     },
                     select: {
                        id: true
                     }
                  })

-               const nameFix = insertToContainer.id + '.' + fExt
-               const filePath = path.join(root, nameFix)
-               // Konversi ArrayBuffer ke Buffer
-               const buffer = Buffer.from(await file.arrayBuffer());
-               // Tulis file ke sistem
-               fs.writeFileSync(filePath, buffer);
-
-
                  const dataFile = {
                     idProject: data.id,
                     idDivision: idDivision,
@@ -187,10 +180,10 @@ export async function POST(request: Request) {
                     createdBy: user.id,
                  }

-
                  fileFix.push(dataFile)
               }
            }
+         }

         const insertFile = await prisma.divisionProjectFile.createMany({
            data: fileFix
--- a/src/module/task/lib/type_task.ts
+++ b/src/module/task/lib/type_task.ts
@@ -68,5 +68,6 @@ export interface IDataFileTaskDivision {
   id: string
   name: string
   extension: string,
-   nameInStorage: string
+   nameInStorage: string,
+   idStorage: string
 }
--- a/src/module/task/ui/create_date_end_task.tsx
+++ b/src/module/task/ui/create_date_end_task.tsx
@@ -1,6 +1,7 @@
 "use client";
 import { LayoutNavbarNew, WARNA } from "@/module/_global";
 import {
+  ActionIcon,
  Avatar,
  Box,
  Button,
@@ -19,9 +20,10 @@ import { useParams, useRouter } from "next/navigation";
 import toast from "react-hot-toast";
 import { IFormDateTask } from "../lib/type_task";
 import moment from "moment";
+import { HiChevronLeft } from "react-icons/hi2";


-export default function ViewDateEndTask({ onClose }: { onClose: (val: IFormDateTask) => void }) {
+export default function ViewDateEndTask({ onClose, onSet }: {onClose: (val: boolean) => void, onSet: (val: IFormDateTask) => void }) {
  const [value, setValue] = useState<[Date | null, Date | null]>([null, null]);
  const router = useRouter()
  const param = useParams<{ id: string }>()
@@ -37,7 +39,7 @@ export default function ViewDateEndTask({ onClose }: { onClose: (val: IFormDateT
    if (title == "")
      return toast.error("Error! harus memasukkan judul tugas")

-    onClose(
+    onSet(
      {
        dateStart: value[0],
        dateEnd: value[1],
@@ -49,7 +51,13 @@ export default function ViewDateEndTask({ onClose }: { onClose: (val: IFormDateT

  return (
    <Box>
-      <LayoutNavbarNew back={`/division/${param.id}/task/create`} title={"Tanggal Tugas"} menu />
+      <LayoutNavbarNew state={
+        <Box>
+          <ActionIcon variant="light" onClick={() => { onClose(true) }} bg={WARNA.bgIcon} size="lg" radius="lg" aria-label="Settings">
+            <HiChevronLeft size={20} color='white' />
+          </ActionIcon>
+        </Box>
+      } title={"Tanggal Tugas"} menu />
      <Box p={20}>
        <Group
          justify="center"
--- a/src/module/task/ui/create_task.tsx
+++ b/src/module/task/ui/create_task.tsx
@@ -76,7 +76,7 @@ export default function CreateTask() {

      if (response.success) {
        toast.success(response.message)
-        // setTitle("")
+        setTitle("")
        member.set([])
        setFileForm([])
        setListFile([])
@@ -92,7 +92,7 @@ export default function CreateTask() {
  }


-  if (openTugas) return <ViewDateEndTask onClose={(val) => {
+  if (openTugas) return <ViewDateEndTask onClose={(val) => { setOpenTugas(false) }} onSet={(val) => {
    setDataTask([...dataTask, val])
    setOpenTugas(false)
  }} />;
@@ -148,7 +148,10 @@ export default function CreateTask() {
              border: `1px solid ${"#D6D8F6"}`,
              borderRadius: 10,
            }}
-            onClick={() => setOpenDrawer(true)}
+            onClick={() =>
+              // setOpenDrawer(true)
+              openRef.current?.()
+            }
          >
            <Text>Upload File</Text>
            <IoIosArrowDropright size={25} />
@@ -290,15 +293,6 @@ export default function CreateTask() {
        </Button>
      </Box>

-
-
-      {/* Drawer pilih file */}
-      <LayoutDrawer
-        opened={openDrawer}
-        onClose={() => setOpenDrawer(false)}
-        title={"Pilih File"}
-      >
-        <Flex justify={"flex-start"} px={20}>
      <Dropzone
        openRef={openRef}
        onDrop={async (files) => {
@@ -313,7 +307,18 @@ export default function CreateTask() {
        onReject={(files) => {
          return toast.error('File yang diizinkan: .csv, .png, .jpg, .heic, .pdf dengan ukuran maksimal 3 MB')
        }}
+      ></Dropzone>
+
+
+
+      {/* Drawer pilih file */}
+      {/* <LayoutDrawer
+        opened={openDrawer}
+        onClose={() => setOpenDrawer(false)}
+        title={"Pilih File"}
      >
+        <Flex justify={"flex-start"} px={20}>
+
          <Box onClick={() => openRef.current?.()}>
            <Box
              bg={"#DCEED8"}
@@ -332,8 +337,8 @@ export default function CreateTask() {
            </Text>
            <Text ta={"center"}>diperangkat</Text>
          </Box>
-          </Dropzone>
-          {/* <Box onClick={() => router.push("/task/create?page=file-save")}>
+
+          <Box onClick={() => router.push("/task/create?page=file-save")}>
            <Box
              bg={"#DCEED8"}
              style={{
@@ -350,9 +355,9 @@ export default function CreateTask() {
              Pilih file yang
            </Text>
            <Text ta={"center"}>sudah ada</Text>
-          </Box> */}
+          </Box>
        </Flex>
-      </LayoutDrawer>
+      </LayoutDrawer> */}



--- a/src/module/task/ui/create_users_project.tsx
+++ b/src/module/task/ui/create_users_project.tsx
@@ -26,7 +26,7 @@ import { globalMemberTask } from "../lib/val_task";
 import { FaCheck } from "react-icons/fa6";
 import { RiListCheck } from "react-icons/ri";
 import { BsListCheck } from "react-icons/bs";
-import { HiMagnifyingGlass } from "react-icons/hi2";
+import { HiChevronLeft, HiMagnifyingGlass } from "react-icons/hi2";
 import { IoArrowBackOutline, IoClose } from "react-icons/io5";
 import { Carousel } from "@mantine/carousel";

@@ -133,7 +133,13 @@ export default function CreateUsersProject({ onClose }: { onClose: (val: any) =>
  return (
    <Box>
      <LayoutNavbarNew
-        // back=""
+        state={
+          <Box>
+            <ActionIcon variant="light" onClick={() => { onClose(true) }} bg={WARNA.bgIcon} size="lg" radius="lg" aria-label="Settings">
+              <HiChevronLeft size={20} color='white' />
+            </ActionIcon>
+          </Box>
+        }
        title="Pilih Anggota"
        menu={<ActionIcon onClick={handleSearchClick} variant="light" bg={WARNA.bgIcon} size="lg" radius="lg" aria-label="search">
          <HiMagnifyingGlass size={20} color='white' />
--- a/src/module/task/ui/detail_list_file_task.tsx
+++ b/src/module/task/ui/detail_list_file_task.tsx
@@ -18,6 +18,7 @@ export default function ListFileDetailTask() {
   const [openDrawer, setOpenDrawer] = useState(false)
   const [isOpenModal, setOpenModal] = useState(false)
   const [idData, setIdData] = useState('')
+   const [idDataStorage, setIdDataStorage] = useState('')
   const [nameStorage, setNameStorage] = useState('')
   const [nameData, setNameData] = useState('')
   const [isOpenModalView, setOpenModalView] = useState(false)
@@ -52,6 +53,7 @@ export default function ListFileDetailTask() {
            toast.success(res.message)
            getOneData()
            setIdData("")
+            setIdDataStorage("")
            setOpenDrawer(false)
         } else {
            toast.error(res.message);
@@ -102,6 +104,7 @@ export default function ListFileDetailTask() {
                                 setExtension(item.extension)
                                 setNameStorage(item.nameInStorage)
                                 setIdData(item.id)
+                                 setIdDataStorage(item.idStorage)
                                 setOpenDrawer(true)
                              }}
                           >
@@ -167,7 +170,7 @@ export default function ListFileDetailTask() {
               setOpenModal(false)
            }} />

-         <LayoutModalViewFile opened={isOpenModalView} onClose={() => setOpenModalView(false)} file={nameStorage + '.' + isExtension} extension={isExtension} fitur='task' />
+         <LayoutModalViewFile opened={isOpenModalView} onClose={() => setOpenModalView(false)} file={idDataStorage} extension={isExtension} fitur='task' />
      </Box>
   )
 }