fix(user-dashboard): fix url to include firebaseId

app/components/ItemSelectInput/index.tsx

@@ -76,6 +76,7 @@ query UserGroupOptions($search: String, $offset: Int!, $limit: Int!) {
     ) {
         results {
             id
+            firebaseId
             isArchived
             clientId
             name
@@ -223,7 +224,7 @@ function ItemSelectInput<Name extends string>(props: ItemSelectInputProps<Name>)
                 type: 'user' as const,
             })) ?? []),
             ...(userGroupsData?.map((userGroup) => ({
-                id: userGroup.id,
+                id: userGroup.firebaseId,
                 name: userGroup.name ?? 'Unknown',
                 type: 'user-group' as const,
                 isArchived: userGroup.isArchived ?? false,

app/views/UserDashboard/index.tsx

@@ -36,12 +36,12 @@ import styles from './styles.module.css';
 
 const USER_STATS = gql`
     query UserStats($pk: ID!, $limit: Int!, $offset: Int!) {
-        contributorUserByFirebaseId(firebaseId: $pk) {
+        contributorUser(userId: {firebaseId: $pk}) {
             id
             firebaseId
             username
         }
-        communityUserStats(firebaseId: $pk) {
+        communityUserStats(userId: {firebaseId: $pk}) {
             id
             stats {
                 totalSwipes
@@ -59,8 +59,11 @@ const USER_STATS = gql`
         ) {
             results {
                 id
+                firebaseId
                 name
-                membersCount
+                userMemberships {
+                    totalCount
+                }
             }
             totalCount
         }
@@ -69,7 +72,7 @@ const USER_STATS = gql`
 
 const FILTERED_USER_STATS = gql`
     query FilteredUserStats($pk: ID!, $fromDate: Date!, $toDate: Date!) {
-        communityUserStats(firebaseId: $pk) {
+        communityUserStats(userId: {firebaseId: $pk}) {
             id
             filteredStats(dateRange: {fromDate: $fromDate, toDate: $toDate}) {
                 id
@@ -196,10 +199,10 @@ function UserDashboard(props: Props) {
 
     // NOTE: OSM user does not have username stored
     const userName = useMemo(() => {
-        if (isDefined(userStats) && isDefined(userStats.contributorUserByFirebaseId)) {
-            return isFalsyString(userStats.contributorUserByFirebaseId.username)
-                ? userStats.contributorUserByFirebaseId.firebaseId
-                : userStats.contributorUserByFirebaseId.username;
+        if (isDefined(userStats) && isDefined(userStats.contributorUser)) {
+            return isFalsyString(userStats.contributorUser.username)
+                ? userStats.contributorUser.firebaseId
+                : userStats.contributorUser.username;
         }
 
         return null;
@@ -256,14 +259,14 @@ function UserDashboard(props: Props) {
                                         className={styles.link}
                                         to={generatePath(
                                             routes.userGroupDashboard.path,
-                                            { userGroupId: group.id },
+                                            { userGroupId: group.firebaseId },
                                         )}
                                     >
                                         {group.name}
                                     </Link>
                                 )}
                                 description={
-                                    `${group.membersCount} ${group.membersCount > 1
+                                    `${group.userMemberships?.totalCount} ${group.userMemberships?.totalCount > 1
                                         ? 'members'
                                         : 'member'
                                     }`

app/views/UserGroupDashboard/index.tsx

@@ -40,11 +40,10 @@ const EXPORT_LIMIT = 500;
 
 const USER_GROUP_STATS = gql`
 query UserGroupStats($pk: ID!, $limit: Int!, $offset: Int!) {
-    contributorUserGroup(id: $pk) {
+    contributorUserGroup(userGroupId: {firebaseId: $pk}) {
         id
         name
         description
-        membersCount
         userMemberships(pagination: {limit: $limit, offset: $offset}) {
             totalCount
             results {
@@ -61,7 +60,7 @@ query UserGroupStats($pk: ID!, $limit: Int!, $offset: Int!) {
             }
         }
     }
-    communityUserGroupStats(userGroupId: $pk) {
+    communityUserGroupStats(userGroupId: {firebaseId: $pk}) {
         id
         stats {
             totalContributors
@@ -79,7 +78,7 @@ query UserGroupStats($pk: ID!, $limit: Int!, $offset: Int!) {
 
 const FILTERED_USER_GROUP_STATS = gql`
     query FilteredUserGroupStats($pk: ID!, $fromDate: Date! $toDate: Date!) {
-        communityUserGroupStats(userGroupId: $pk) {
+        communityUserGroupStats(userGroupId: {firebaseId: $pk}) {
             id
             filteredStats(dateRange: {fromDate: $fromDate, toDate: $toDate}) {
                 areaSwipedByProjectType {
@@ -119,11 +118,10 @@ const USER_MEMBERSHIPS_EXPORT = gql`
         $limit: Int!,
         $offset: Int!,
     ) {
-        contributorUserGroup(id: $pk) {
+        contributorUserGroup(userGroupId: {firebaseId: $pk}) {
             id
             name
             description
-            membersCount
             userMemberships(pagination: {limit: $limit, offset: $offset}) {
                 totalCount
                 results {
@@ -303,7 +301,7 @@ function UserGroupDashboard(props: Props) {
     );
 
     const memberList = userGroupStats?.contributorUserGroup?.userMemberships?.results;
-    const totalMembers = userGroupStats?.contributorUserGroup?.membersCount ?? 0;
+    const totalMembers = userGroupStats?.contributorUserGroup?.userMemberships?.totalCount ?? 0;
 
     const memberRendererParams = useCallback((_: string, item: UserGroupMember) => (
         {