Show surveys count in users list (#3606)

* Users list: added count of owned surveys * layout adjustments * user access request: associate survey to user being invited --------- Co-authored-by: Stefano Ricci <[email protected]> Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
openforis · Oct 21, 2024 · 13a7de8 · 13a7de8
1 parent 679b4cb
commit 13a7de8
Show file tree

Hide file tree

Showing 9 changed files with 46 additions and 4 deletions.
diff --git a/core/i18n/resources/en/common.js b/core/i18n/resources/en/common.js
@@ -912,6 +912,8 @@ Copy the invitation link to the clipboard?`,
       label: 'Survey extra property',
       label_other: 'Survey extra properties',
     },
+    surveysDraft: 'Surveys (draft)',
+    surveysPublished: 'Surveys (published)',
   },
 
   usersAccessRequestView: {

diff --git a/core/survey/_survey/surveyInfo.js b/core/survey/_survey/surveyInfo.js
@@ -178,6 +178,8 @@ export const assocSrs = (srs) => ObjectUtils.setProp(keys.srs, srs)
 
 export const assocRDBInitilized = R.assoc(keys.rdbInitialized)
 
+export const assocOwnerUuid = R.assoc(keys.ownerUuid)
+
 // ====== UTILS
 
 export const isValid = (surveyInfo) => !!surveyInfo?.id

diff --git a/core/survey/survey.js b/core/survey/survey.js
@@ -146,7 +146,8 @@ export const {
 export const { getAuthGroupByName, getAuthGroups, isAuthGroupAdmin, getAuthGroupAdmin } = SurveyInfo
 
 // UPDATE
-export const { assocAuthGroups, assocFilesStatistics, assocRDBInitilized, assocSrs, markDraft } = SurveyInfo
+export const { assocAuthGroups, assocFilesStatistics, assocOwnerUuid, assocRDBInitilized, assocSrs, markDraft } =
+  SurveyInfo
 
 // ====== READ nodeDefs
 export const {

diff --git a/core/user/_user/userKeys.js b/core/user/_user/userKeys.js
@@ -22,4 +22,8 @@ export const keys = {
   // Used only when editing user auth groups
   authGroupsUuids: 'authGroupsUuids',
   authGroupExtraProps: 'authGroupExtraProps',
+
+  // Used only in list view
+  surveysCountDraft: 'surveysCountDraft',
+  surveysCountPublished: 'surveysCountPublished',
 }
diff --git a/core/user/user.js b/core/user/user.js
@@ -35,6 +35,8 @@ export const getAuthGroupsUuids = R.propOr([], keys.authGroupsUuids)
 export const getAuthGroupExtraProps = R.propOr({}, keys.authGroupExtraProps)
 export const getAuthGroupExtraProp = (prop) => R.pipe(getAuthGroupExtraProps, R.prop(prop))
 export const getLastLoginTime = R.prop(keys.lastLoginTime)
+export const getSurveysCountDraft = R.prop(keys.surveysCountDraft)
+export const getSurveysCountPublished = R.prop(keys.surveysCountPublished)
 
 // ====== UPDATE
 export const assocProp = R.assoc

diff --git a/server/modules/user/repository/userRepository.js b/server/modules/user/repository/userRepository.js
@@ -154,7 +154,19 @@ const _usersSelectQuery = ({
         SELECT uar.props ->> '${UserAccessRequest.keysProps.country}'
         FROM user_access_request uar
         WHERE uar.email = u.email
-      ) AS country
+      ) AS country,
+      (
+        SELECT COUNT(*) 
+        FROM survey s
+        WHERE s.owner_uuid = u.uuid
+          AND s.published
+      ) AS surveys_count_published,
+      (
+        SELECT COUNT(*) 
+        FROM survey s
+        WHERE s.owner_uuid = u.uuid
+          AND NOT s.published
+      ) AS surveys_count_draft
     FROM "user" u
     ${includeSurveys ? `LEFT JOIN user_surveys ON user_surveys.user_uuid = u.uuid` : ''}
     LEFT OUTER JOIN us

diff --git a/server/modules/user/service/userService.js b/server/modules/user/service/userService.js
@@ -210,7 +210,7 @@ export const acceptUserAccessRequest = async ({ user, serverUrl, accessRequestAc
       languages: ['en'],
     })
 
-    const survey = await _insertOrCloneSurvey({ user, surveyInfoTarget, templateUuid }, t)
+    let survey = await _insertOrCloneSurvey({ user, surveyInfoTarget, templateUuid }, t)
 
     // 3) find group to associate to the user
     let group = null
@@ -222,16 +222,20 @@ 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(
       {
         user,
-        surveyId: Survey.getId(survey),
+        surveyId,
         surveyCycleKey: Survey.cycleOneKey,
         invitation: UserGroupInvitation.newUserGroupInvitation(email, AuthGroup.getUuid(group)),
         serverUrl,
       },
       t
     )
+    const surveyOwnerUuid = User.getUuid(userInvited)
+    await SurveyManager.updateSurveyOwner({ user, surveyId, ownerUuid: surveyOwnerUuid, system: true })
+    survey = Survey.assocOwnerUuid(surveyOwnerUuid)(survey)
     return { survey, userInvited }
   })
 

diff --git a/webapp/views/App/views/Users/UsersList/UsersList.js b/webapp/views/App/views/Users/UsersList/UsersList.js
@@ -24,6 +24,7 @@ export const UsersList = () => {
       rowExpandedComponent={({ item }) => <UserSurveysTable user={item} />}
       headerLeftComponent={TableHeaderLeft}
       selectable={false}
+      visibleColumnsSelectionEnabled
     />
   )
 }
diff --git a/webapp/views/App/views/Users/UsersList/useUsersListColumns.js b/webapp/views/App/views/Users/UsersList/useUsersListColumns.js
@@ -78,6 +78,20 @@ export const useUsersListColumns = () => {
           <ButtonIconEdit disabled={!User.hasAccepted(item)} onClick={() => goToUserDetails(item)} />
         ),
       },
+      {
+        key: User.keys.surveysCountDraft,
+        header: 'usersView.surveysDraft',
+        hidden: true,
+        renderItem: ({ item }) => User.getSurveysCountDraft(item),
+        width: '10rem',
+      },
+      {
+        key: User.keys.surveysCountPublished,
+        header: 'usersView.surveysPublished',
+        hidden: true,
+        renderItem: ({ item }) => User.getSurveysCountPublished(item),
+        width: '12rem',
+      },
     ],
     [goToUserDetails, i18n]
   )