From 59d1d27264583d3090b401a238610f95690b7f15 Mon Sep 17 00:00:00 2001 From: Wan Muhammad Rayhan Arwindra <wan.muhammad81@ui.ac.id> Date: Tue, 24 Nov 2020 18:55:14 +0700 Subject: [PATCH] Revert "Merge branch 'PBI-6-Ray' into 'master'" This reverts commit 0a5a79215920953b7544b9ef47ba498fbb65d400, reversing changes made to 980c3fbefa1daae0043573f32d0fe49e7757cd79. --- .gitlab-ci.yml | 2 +- src/component/TableComponent.jsx | 1 - src/page/donasi/FormDonasi.jsx | 2 -- src/page/pengguna/ListPengguna.jsx | 13 +++++++++---- 4 files changed, 10 insertions(+), 8 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index bcaa8dc..070a8cf 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,4 +1,4 @@ -image: node:12.18.4 +image: node:latest stages: - lint - test diff --git a/src/component/TableComponent.jsx b/src/component/TableComponent.jsx index fe50707..826e740 100644 --- a/src/component/TableComponent.jsx +++ b/src/component/TableComponent.jsx @@ -60,7 +60,6 @@ const TableComponent = ({ reset: resetFilter, } = useForm(); const [filterTab, setFilterTab] = useState(false); - console.log(results); return ( <div css={css` diff --git a/src/page/donasi/FormDonasi.jsx b/src/page/donasi/FormDonasi.jsx index b9fde4f..3ad49f4 100644 --- a/src/page/donasi/FormDonasi.jsx +++ b/src/page/donasi/FormDonasi.jsx @@ -26,8 +26,6 @@ const FormDonasi = ({ idDonasi, defaultStatus }) => { }); const onSubmit = (data) => { - console.log(data); - console.log(...data); send(JSON.stringify({ ...data })); }; return ( diff --git a/src/page/pengguna/ListPengguna.jsx b/src/page/pengguna/ListPengguna.jsx index 78f6443..aad43ca 100644 --- a/src/page/pengguna/ListPengguna.jsx +++ b/src/page/pengguna/ListPengguna.jsx @@ -38,6 +38,11 @@ const ListPengguna = () => { const handleClose = () => { setDialogOpen(false); }; + const handleSubmit = e => { + e.preventDefault(); + setSortBy(choice); + handleClose(); + } return ( <div css={css` @@ -89,7 +94,7 @@ const ListPengguna = () => { > <DialogTitle id="max-width-dialog-title">Urutkan Berdasarkan</DialogTitle> <DialogContent> - <form onSubmit={() => setSortBy(choice)}> + <form onSubmit={handleSubmit}> <RowInput> <input data-testid="transaksi-radio" @@ -98,7 +103,7 @@ const ListPengguna = () => { value="transaksi" id="transaksi" checked={choice === "transaksi"} - onClick={() => setChoice("transaksi")} + onChange={() => setChoice("transaksi")} /> <label htmlFor="preorder" css={css` margin-left:20px @@ -111,7 +116,7 @@ const ListPengguna = () => { value="donasi-uang" id="donasi-uang" checked={choice === "donasi-uang"} - onClick={() => setChoice("donasi-uang")} + onChange={() => setChoice("donasi-uang")} /> <label htmlFor="preorder" css={css` margin-left:20px @@ -124,7 +129,7 @@ const ListPengguna = () => { value="donasi-barang" id="donasi-barang" checked={choice === "donasi-barang"} - onClick={() => setChoice("donasi-barang")} + onChange={() => setChoice("donasi-barang")} /> <label htmlFor="preorder" css={css` margin-left:20px -- GitLab