Feat/add email to group (#246)

corona-warn-app · Oct 1, 2021 · af4fb3f · af4fb3f
1 parent 8139e68
commit af4fb3f
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 2 deletions.
diff --git a/src/api.tsx b/src/api.tsx
@@ -691,6 +691,7 @@ export const useGetGroups = (onSuccess?: () => void, onError?: (error: any) => v
 
     const removeEmpty = (group: IGroupDetails): IGroupDetails => {
         if (group) {
+            group.email = group.email || undefined;
             group.website = group.website || undefined;
             group.openingHours = group.openingHours || undefined;
             group.appointmentRequired = group.appointmentRequired || false;

diff --git a/src/components/modals/group-modal.component.tsx b/src/components/modals/group-modal.component.tsx
@@ -38,6 +38,7 @@ const emptyGroup: IGroupDetails = {
     searchPortalConsent: false,
     parentGroup: '',
     website: '',
+    email: '',
     appointmentRequired: false,
     openingHours: ''
 }
@@ -190,6 +191,7 @@ const GroupModal = (props: any) => {
         const ngroup: IGroupDetails = { ...group, [name]: value };
 
         if (value === false) {
+            ngroup.email = '';
             ngroup.website = '';
             ngroup.openingHours = '';
             ngroup.appointmentRequired = false;
@@ -304,6 +306,17 @@ const GroupModal = (props: any) => {
 
                             <Collapse in={group.searchPortalConsent}>
                                 <div>
+                                    < FormGroupInput controlId='formEmailInput' title={t('translation:email-address')}
+                                        value={group?.email ? group.email : ''}
+                                        onChange={(evt: any) => {
+                                            updateGroupProp('email', evt.target.value);
+                                            props.resetError();
+                                        }}
+                                        type='email'
+                                        pattern={utils.pattern.eMail}
+                                        minLength={5}
+                                        maxLength={255}
+                                    />
                                     < FormGroupInput controlId='formPocWebsite' title={t('translation:searchPortalWebsite')} placeholder={t('translation:searchPortalWebsitePlaceholder')}
                                         value={websiteValue}
                                         dropdown={dropdownItems}

diff --git a/src/components/modules/group-table.component.tsx b/src/components/modules/group-table.component.tsx
@@ -39,14 +39,14 @@ const GroupTable = (props: any) => {
     const [confirmTitle, setConfirmTitle] = React.useState('');
     const [confirmHandle, setConfirmHandle] = React.useState<() => void>();
     const [groupIsReady, setGroupIsReady] = React.useState(false);
-    
+
     const [
         bGroups,
         refreshGroups,
         createGroup,
         updateGroup,
         deleteGroup
-    ] = useGetGroups(()=> setGroupIsReady(true), props.handleError);
+    ] = useGetGroups(() => setGroupIsReady(true), props.handleError);
 
 
     React.useEffect(() => {

diff --git a/src/misc/user.tsx b/src/misc/user.tsx
@@ -57,6 +57,7 @@ export interface IGroupDetails {
     pocId: string,
     searchPortalConsent: boolean,
     website?: string,
+    email?: string,
     openingHours?: string,
     appointmentRequired?: boolean,
     parentGroup?: string,