Compare commits
	
		
			2 Commits
		
	
	
		
			bec10610e1
			...
			38626a3a81
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
|   | 38626a3a81 | ||
|   | 347e61a029 | 
| @@ -17,8 +17,6 @@ export default function AddOrEditUserForm({ onAdd, initialData, onCancel }) { | |||||||
|     tenantId: '', |     tenantId: '', | ||||||
|     roleId: '', |     roleId: '', | ||||||
|     status: 'Active', |     status: 'Active', | ||||||
|     companies: [], |  | ||||||
|     projects: [], |  | ||||||
|     sendInvitation: true, |     sendInvitation: true, | ||||||
|   }); |   }); | ||||||
|  |  | ||||||
| @@ -33,8 +31,6 @@ export default function AddOrEditUserForm({ onAdd, initialData, onCancel }) { | |||||||
|         tenantId: initialData.tenantId ?? '', |         tenantId: initialData.tenantId ?? '', | ||||||
|         roleId: initialData.roleId ?? '', |         roleId: initialData.roleId ?? '', | ||||||
|         status: initialData.status ?? 'Active', |         status: initialData.status ?? 'Active', | ||||||
|         companies: Array.isArray(initialData.companies) ? initialData.companies : [], |  | ||||||
|         projects: Array.isArray(initialData.projects) ? initialData.projects : [], |  | ||||||
|         sendInvitation: true, |         sendInvitation: true, | ||||||
|       }); |       }); | ||||||
|     } else { |     } else { | ||||||
| @@ -44,11 +40,9 @@ export default function AddOrEditUserForm({ onAdd, initialData, onCancel }) { | |||||||
|         name: '', |         name: '', | ||||||
|         middleName: '', |         middleName: '', | ||||||
|         lastName: '', |         lastName: '', | ||||||
|         tenantId: '', |         tenantId: '6894f9ddfb7072bdfc881613', | ||||||
|         roleId: '', |         roleId: '68407642ec46a0e6fe1e8ec9', | ||||||
|         status: 'Active', |         status: 'Active', | ||||||
|         companies: [], |  | ||||||
|         projects: [], |  | ||||||
|         sendInvitation: true, |         sendInvitation: true, | ||||||
|       }); |       }); | ||||||
|     } |     } | ||||||
| @@ -56,12 +50,7 @@ export default function AddOrEditUserForm({ onAdd, initialData, onCancel }) { | |||||||
|  |  | ||||||
|   const handleChange = (e) => { |   const handleChange = (e) => { | ||||||
|     const { name, value } = e.target; |     const { name, value } = e.target; | ||||||
|     if (name === 'companies' || name === 'projects') { |  | ||||||
|       const arr = value.split(',').map(s => s.trim()).filter(s => s.length > 0); |  | ||||||
|       setFormData(prev => ({ ...prev, [name]: arr })); |  | ||||||
|     } else { |  | ||||||
|       setFormData(prev => ({ ...prev, [name]: value })); |       setFormData(prev => ({ ...prev, [name]: value })); | ||||||
|     } |  | ||||||
|   }; |   }; | ||||||
|  |  | ||||||
|   const handleSubmit = async () => { |   const handleSubmit = async () => { | ||||||
| @@ -78,8 +67,6 @@ export default function AddOrEditUserForm({ onAdd, initialData, onCancel }) { | |||||||
|           lastName: formData.lastName, |           lastName: formData.lastName, | ||||||
|           tenantId: formData.tenantId, |           tenantId: formData.tenantId, | ||||||
|           roleId: formData.roleId, |           roleId: formData.roleId, | ||||||
|           companies: formData.companies, |  | ||||||
|           projects: formData.projects, |  | ||||||
|           status: formData.status || 'Active', |           status: formData.status || 'Active', | ||||||
|         }; |         }; | ||||||
|         await api.updateUser(payload); |         await api.updateUser(payload); | ||||||
| @@ -91,6 +78,7 @@ export default function AddOrEditUserForm({ onAdd, initialData, onCancel }) { | |||||||
|           middleName: formData.middleName, |           middleName: formData.middleName, | ||||||
|           lastName: formData.lastName, |           lastName: formData.lastName, | ||||||
|           roleId: formData.roleId, |           roleId: formData.roleId, | ||||||
|  |           tenantId: formData.tenantId, | ||||||
|           sendInvitation: !!formData.sendInvitation, |           sendInvitation: !!formData.sendInvitation, | ||||||
|         }; |         }; | ||||||
|         await api.createUser(payload); |         await api.createUser(payload); | ||||||
| @@ -143,6 +131,7 @@ export default function AddOrEditUserForm({ onAdd, initialData, onCancel }) { | |||||||
|         value={formData.tenantId} |         value={formData.tenantId} | ||||||
|         onChange={handleChange} |         onChange={handleChange} | ||||||
|         margin="normal" |         margin="normal" | ||||||
|  |         disabled={!initialData} | ||||||
|       /> |       /> | ||||||
|       <TextField |       <TextField | ||||||
|         fullWidth |         fullWidth | ||||||
| @@ -151,24 +140,7 @@ export default function AddOrEditUserForm({ onAdd, initialData, onCancel }) { | |||||||
|         value={formData.roleId} |         value={formData.roleId} | ||||||
|         onChange={handleChange} |         onChange={handleChange} | ||||||
|         margin="normal" |         margin="normal" | ||||||
|       /> |         disabled={!initialData} | ||||||
|       <TextField |  | ||||||
|         fullWidth |  | ||||||
|         label="Companies" |  | ||||||
|         name="companies" |  | ||||||
|         value={formData.companies.join(', ')} |  | ||||||
|         onChange={handleChange} |  | ||||||
|         margin="normal" |  | ||||||
|         helperText="Comma-separated list" |  | ||||||
|       /> |  | ||||||
|       <TextField |  | ||||||
|         fullWidth |  | ||||||
|         label="Projects" |  | ||||||
|         name="projects" |  | ||||||
|         value={formData.projects.join(', ')} |  | ||||||
|         onChange={handleChange} |  | ||||||
|         margin="normal" |  | ||||||
|         helperText="Comma-separated list" |  | ||||||
|       /> |       /> | ||||||
|       <TextField |       <TextField | ||||||
|         fullWidth |         fullWidth | ||||||
|   | |||||||
| @@ -119,14 +119,12 @@ export default function UserManagement() { | |||||||
|  |  | ||||||
|             const payload = { |             const payload = { | ||||||
|                 _Id: rowToDelete._id || rowToDelete._Id, |                 _Id: rowToDelete._id || rowToDelete._Id, | ||||||
|                 Id: rowToDelete.id || rowToDelete.Id, |  | ||||||
|                 email: rowToDelete.email ?? '', |                 email: rowToDelete.email ?? '', | ||||||
|                 name: rowToDelete.name ?? '', |                 name: rowToDelete.name ?? '', | ||||||
|                 middleName: rowToDelete.middleName ?? '', |                 middleName: rowToDelete.middleName ?? '', | ||||||
|                 lastName: rowToDelete.lastName ?? '', |                 lastName: rowToDelete.lastName ?? '', | ||||||
|                 roleId: rowToDelete.roleId ?? '', |                 roleId: '68407642ec46a0e6fe1e8ec9', | ||||||
|                 companies: Array.isArray(rowToDelete.companies) ? rowToDelete.companies : [], |                 tenantId: '6894f9ddfb7072bdfc881613', | ||||||
|                 projects: Array.isArray(rowToDelete.projects) ? rowToDelete.projects : [], |  | ||||||
|                 status: 'Inactive', |                 status: 'Inactive', | ||||||
|             }; |             }; | ||||||
|  |  | ||||||
|   | |||||||
| @@ -21,7 +21,7 @@ const theme = createTheme({ | |||||||
|             backgroundColor: '#f0eae3', |             backgroundColor: '#f0eae3', | ||||||
|           }, |           }, | ||||||
|           '&.Mui-selected': { |           '&.Mui-selected': { | ||||||
|             backgroundColor: '#40120EFF', |             backgroundColor: '#d0b9a8', | ||||||
|             color: '#26201A', |             color: '#26201A', | ||||||
|           }, |           }, | ||||||
|           '&.Mui-selected:hover': { |           '&.Mui-selected:hover': { | ||||||
| @@ -31,7 +31,7 @@ const theme = createTheme({ | |||||||
|         }, |         }, | ||||||
|         cell: { |         cell: { | ||||||
|           '&:focus-within': { |           '&:focus-within': { | ||||||
|             outline: '2px solid #40120EFF', // custom Fendi focus |             outline: '2px solid #d0b9a8', // custom Fendi focus | ||||||
|             outlineOffset: '-2px', // tighten the outline |             outlineOffset: '-2px', // tighten the outline | ||||||
|             backgroundColor: '#f5f0eb', // optional subtle highlight |             backgroundColor: '#f5f0eb', // optional subtle highlight | ||||||
|           }, |           }, | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user