feat/user create group is required (#204)

corona-warn-app · Jul 29, 2021 · 6e4176a · 6e4176a
1 parent c8ebcc1
commit 6e4176a
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 12 deletions.
diff --git a/src/components/user-management.component.tsx b/src/components/user-management.component.tsx
@@ -194,7 +194,7 @@ const UserManagement = (props: any) => {
     }
 
     const handleDeleteGroup = (group:IGroup) => {
-        setConfirmMessage("Wollen Sie wirklich die Gruppe "+group.name+ " löschen?")
+        setConfirmMessage("Wollen Sie wirklich die Gruppe \""+group.name+ "\" löschen?")
         setShowConfirm(true);
         const handle = () => {
             if (keycloak.token && group.id) {
@@ -215,7 +215,7 @@ const UserManagement = (props: any) => {
     }
 
     const handleDeleteUser = (user:IUser) => {
-        setConfirmMessage("Wollen Sie wirklich den User "+user.username+ " löschen?")
+        setConfirmMessage("Wollen Sie wirklich den User \""+user.username+ "\" löschen?")
         setShowConfirm(true);
         const handle = () => {
             if (keycloak.token && user.username) {
@@ -333,7 +333,10 @@ const UserManagement = (props: any) => {
                 </Card>
                 </Fade>
                 <UserModal show={isUserData} 
-                    onCancel={() => setIsUserData(false)} 
+                    onCancel={() => {
+                        setEditUser({...emptyUser});
+                        setIsUserData(false);
+                    }}
                     groups={groupNodes} 
                     handleOk={userUpdate}
                     user={editUser}

diff --git a/src/components/user-modal.component.tsx b/src/components/user-modal.component.tsx
@@ -36,13 +36,7 @@ const UserModal = (props: any) => {
     const [validated, setValidated] = React.useState(false);
 
     React.useEffect(() => {
-        if (props.user.username !== user.username) {
-            if (!props.user.username 
-                && !props.user.subGroup
-                && props.groups
-                && props.groups.length>0) {
-                // props.user.subGroup = props.groups[0].group.id;
-            }
+        if (props.user.username !== user.username || !props.user.username) {
             setUser(props.user);
             setIsNew(!props.user.username);
         }
@@ -86,7 +80,7 @@ const UserModal = (props: any) => {
 
     if (!user.subGroup || !props.groups.find((groupNode: IGroupNode) => groupNode.group.id === user.subGroup)) {
         user.subGroup = null;
-        groupOptions.push(<option key="empty" value="empty">-- leer --</option>);
+        groupOptions.unshift(<option key={0} value="">-- leer --</option>);
     }
 
     return (
@@ -146,8 +140,10 @@ const UserModal = (props: any) => {
                     <Col xs='7' sm='9' className='d-flex'>
                     <Form.Control as="select"
                         className={!props.value ? 'selection-placeholder qt-input' : 'qt-input'}
-                        value={user.subGroup ? user.subGroup: 'empty'}
+                        value={user.subGroup ? user.subGroup : ''}
+                        placeholder="Gruppe"
                         onChange={(ent: any) => updateUserProp('subGroup',ent.target.value)}
+                        required
                     >
                         {groupOptions}
                     </Form.Control>