Merge branch 'dev' into staging

This commit is contained in:
Vins 2024-08-02 10:28:48 +02:00
commit d14e2fcc36

View File

@ -27,7 +27,7 @@ export default function CreateFolder(): JSX.Element {
/**
* State
*/
const [folderAccessType, setFolderAccessType] = useState<"whole_office" | "select_collaborators">("whole_office");
const [folderAccessType, setFolderAccessType] = useState<"whole_office" | "select_collaborators">("select_collaborators");
const [availableDeedTypes, setAvailableDeedTypes] = useState<DeedType[]>([]);
const [availableCollaborators, setAvailableCollaborators] = useState<User[]>([]);
const [validationError, setValidationError] = useState<ValidationError[]>([]);
@ -110,7 +110,11 @@ export default function CreateFolder(): JSX.Element {
})
.then((users) => {
setAvailableCollaborators(users);
setSelectedCollaborators(users);
// set default selected collaborators to the connected user
const currentUser = users.find((user) => user.uid === JwtService.getInstance().decodeJwt()?.userId);
if (currentUser) {
setSelectedCollaborators([currentUser]);
}
});
}, []);
@ -169,16 +173,11 @@ export default function CreateFolder(): JSX.Element {
Donner l'accès au dossier
</Typography>
<div className={classes["radio-container"]}>
<RadioBox name="file_access" onChange={radioOnChange} value="whole_office" label="Sélectionner tout l'office" />
<RadioBox
name="file_access"
defaultChecked
onChange={radioOnChange}
value="whole_office"
label="Sélectionner tout l'office"
/>
<RadioBox
name="file_access"
onChange={radioOnChange}
value="select_collaborators"
label="Sélectionner certains collaborateurs"
/>