fixed error accepting user access request

openforis · Oct 27, 2024 · f03b444 · f03b444
1 parent 1587f74
commit f03b444
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/server/modules/user/service/userService.js b/server/modules/user/service/userService.js
@@ -223,7 +223,7 @@ export const acceptUserAccessRequest = async ({ user, serverUrl, accessRequestAc
 
     // 4) invite user to that group and send email
     const surveyId = Survey.getId(survey)
-    const { userInvited } = await UserInviteService.inviteUsers(
+    const { invitedUsers } = await UserInviteService.inviteUsers(
       {
         user,
         surveyId,
@@ -233,9 +233,12 @@ export const acceptUserAccessRequest = async ({ user, serverUrl, accessRequestAc
       },
       t
     )
+    const userInvited = invitedUsers[0]
     const surveyOwnerUuid = User.getUuid(userInvited)
+
     await SurveyManager.updateSurveyOwner({ user, surveyId, ownerUuid: surveyOwnerUuid, system: true }, t)
     survey = Survey.assocOwnerUuid(surveyOwnerUuid)(survey)
+
     return { survey, userInvited }
   })
 

diff --git a/webapp/components/survey/Surveys/SurveyOwnerColumn.js b/webapp/components/survey/Surveys/SurveyOwnerColumn.js
@@ -52,7 +52,7 @@ export const SurveyOwnerColumn = (props) => {
       canEdit={canEdit}
       className="owner-col"
       item={surveyInfo}
-      renderItem={({ item }) => Survey.getOwnerName(item)}
+      renderItem={({ item }) => Survey.getOwnerName(item) || '---'}
       renderItemEditing={() => <SurveyOwnerDropdown selectedUuid={ownerUuid} onChange={onChange} />}
     />
   )