From bb46d8438cd7046e11e058c5e69e953eea07c629 Mon Sep 17 00:00:00 2001 From: Rudra Date: Thu, 18 Jul 2024 14:51:42 +0530 Subject: [PATCH 1/3] bulk upload cta and same group error name --- frontend/src/ManageGranularAccess/index.jsx | 3 +-- frontend/src/ManageOrgUsers/FileDropzone.jsx | 11 ++++++++++- frontend/src/ManageOrgUsers/InviteUsersForm.jsx | 10 +++++++++- 3 files changed, 20 insertions(+), 4 deletions(-) diff --git a/frontend/src/ManageGranularAccess/index.jsx b/frontend/src/ManageGranularAccess/index.jsx index 6cc583a4b7..88d558361b 100644 --- a/frontend/src/ManageGranularAccess/index.jsx +++ b/frontend/src/ManageGranularAccess/index.jsx @@ -134,7 +134,6 @@ class ManageGranularAccessComponent extends React.Component { }) .catch(({ error }) => { this.closeAddPermissionModal(); - console.log(error); if (error?.error) { this.props.updateParentState({ showEditRoleErrorModal: true, @@ -145,7 +144,7 @@ class ManageGranularAccessComponent extends React.Component { }); return; } - toast.error(error?.error, { + toast.error(error, { style: { maxWidth: '500px', }, diff --git a/frontend/src/ManageOrgUsers/FileDropzone.jsx b/frontend/src/ManageOrgUsers/FileDropzone.jsx index 488669bcad..c1e5757212 100644 --- a/frontend/src/ManageOrgUsers/FileDropzone.jsx +++ b/frontend/src/ManageOrgUsers/FileDropzone.jsx @@ -3,7 +3,15 @@ import { useDropzone } from 'react-dropzone'; import BulkIcon from '@/_ui/Icon/BulkIcons'; import { toast } from 'react-hot-toast'; -export function FileDropzone({ handleClick, hiddenFileInput, errors, handleFileChange, inviteBulkUsers, onDrop }) { +export function FileDropzone({ + handleClick, + hiddenFileInput, + errors, + handleFileChange, + inviteBulkUsers, + onDrop, + setFileUpload, +}) { const [fileData, setFileData] = useState(); const { getRootProps, getInputProps, isDragActive, acceptedFiles } = useDropzone({ accept: { parsedFileType: ['text/csv'] }, @@ -58,6 +66,7 @@ export function FileDropzone({ handleClick, hiddenFileInput, errors, handleFileC e.target.value = null; } else { handleFileChange(file); + setFileUpload(true); } }} accept=".csv" diff --git a/frontend/src/ManageOrgUsers/InviteUsersForm.jsx b/frontend/src/ManageOrgUsers/InviteUsersForm.jsx index f5ba332fc1..c0fb9ede6f 100644 --- a/frontend/src/ManageOrgUsers/InviteUsersForm.jsx +++ b/frontend/src/ManageOrgUsers/InviteUsersForm.jsx @@ -43,6 +43,7 @@ function InviteUsersForm({ return indexA - indexB; }); const [isChangeRoleModalOpen, setIsChangeRoleModalOpen] = useState(false); + const [fileUpload, setFileUpload] = useState(false); const groupedOptions = [ { label: 'default', @@ -54,6 +55,10 @@ function InviteUsersForm({ }, ]; const [selectedGroups, setSelectedGroups] = useState([]); + useEffect(() => { + console.log('activeTab changed', activeTab); + setFileUpload(false); + }, [activeTab]); const hiddenFileInput = useRef(null); @@ -81,11 +86,13 @@ function InviteUsersForm({ }, [currentEditingUser, groups]); const onDrop = useCallback((acceptedFiles) => { + console.log('onDrop', acceptedFiles); const file = acceptedFiles[0]; if (Math.round(file.size / 1024) > 1024) { toast.error('File size cannot exceed more than 1MB'); } else { handleFileChange(file); + setFileUpload(true); } // eslint-disable-next-line react-hooks/exhaustive-deps }, []); @@ -334,6 +341,7 @@ function InviteUsersForm({ handleFileChange={handleFileChange} inviteBulkUsers={inviteBulkUsers} onDrop={onDrop} + setFileUpload={setFileUpload} /> )} @@ -353,7 +361,7 @@ function InviteUsersForm({ form={activeTab == 1 ? 'inviteByEmail' : 'inviteBulkUsers'} type="submit" variant="primary" - disabled={uploadingUsers || creatingUser || !isEdited()} + disabled={uploadingUsers || creatingUser || !isEdited() || (activeTab !== 1 && !fileUpload)} data-cy={activeTab == 1 ? 'button-invite-users' : 'button-upload-users'} leftIcon={activeTab == 1 ? 'sent' : 'fileupload'} width="20" From eab16ab7bc36f24e91d11b21570d3b52cc160d8c Mon Sep 17 00:00:00 2001 From: Rudra Date: Thu, 18 Jul 2024 14:53:56 +0530 Subject: [PATCH 2/3] removed logs --- frontend/src/ManageOrgUsers/InviteUsersForm.jsx | 2 -- 1 file changed, 2 deletions(-) diff --git a/frontend/src/ManageOrgUsers/InviteUsersForm.jsx b/frontend/src/ManageOrgUsers/InviteUsersForm.jsx index c0fb9ede6f..1f877c8c70 100644 --- a/frontend/src/ManageOrgUsers/InviteUsersForm.jsx +++ b/frontend/src/ManageOrgUsers/InviteUsersForm.jsx @@ -56,7 +56,6 @@ function InviteUsersForm({ ]; const [selectedGroups, setSelectedGroups] = useState([]); useEffect(() => { - console.log('activeTab changed', activeTab); setFileUpload(false); }, [activeTab]); @@ -86,7 +85,6 @@ function InviteUsersForm({ }, [currentEditingUser, groups]); const onDrop = useCallback((acceptedFiles) => { - console.log('onDrop', acceptedFiles); const file = acceptedFiles[0]; if (Math.round(file.size / 1024) > 1024) { toast.error('File size cannot exceed more than 1MB'); From af3b51c888a612b4aaaa78d2228b913f02e2d45d Mon Sep 17 00:00:00 2001 From: Rudra Date: Thu, 18 Jul 2024 16:33:16 +0530 Subject: [PATCH 3/3] undefined file change --- frontend/src/ManageOrgUsers/FileDropzone.jsx | 3 +++ 1 file changed, 3 insertions(+) diff --git a/frontend/src/ManageOrgUsers/FileDropzone.jsx b/frontend/src/ManageOrgUsers/FileDropzone.jsx index c1e5757212..c7825f9a7b 100644 --- a/frontend/src/ManageOrgUsers/FileDropzone.jsx +++ b/frontend/src/ManageOrgUsers/FileDropzone.jsx @@ -61,6 +61,9 @@ export function FileDropzone({ onChange={(e) => { const file = e.target.files[0]; setFileData(file); + if (file === undefined) { + setFileUpload(false); + } if (Math.round(file.size / 1024) > 1024) { toast.error('File size cannot exceed more than 1MB'); e.target.value = null;