feat: add user tags to map list items

ONEARMY · Oct 23, 2024 · f2918c7 · f2918c7
1 parent 054f10b
commit f2918c7
Show file tree

Hide file tree

Showing 7 changed files with 20 additions and 10 deletions.
diff --git a/package.json b/package.json
@@ -14,8 +14,8 @@
   "main": "lib/index.js",
   "type": "module",
   "scripts": {
-    "start": "concurrently --kill-others --names themes,components,platform --prefix-colors cyan,blue,magenta \"yarn start:shared\" \"yarn start:themes\" \"yarn start:components\" \"yarn start:platform\"",
-    "start-ci": "concurrently --kill-others --names themes,components,platform --prefix-colors cyan,blue,magenta \"yarn start:themes\" \"yarn start:components\" \"yarn start:platform-ci\"",
+    "start": "concurrently --kill-others --names shared,themes,components,platform --prefix-colors cyan,blue,magenta \"yarn start:shared\" \"yarn start:themes\" \"yarn start:components\" \"yarn start:platform\"",
+    "start-ci": "concurrently --kill-others --names shared,themes,components,platform --prefix-colors cyan,blue,magenta \"yarn start:themes\" \"yarn start:components\" \"yarn start:platform-ci\"",
     "start:themes": "yarn workspace oa-themes dev",
     "start:components": "yarn workspace oa-components dev",
     "start:shared": "yarn workspace oa-shared dev",

diff --git a/packages/components/src/CardProfile/CardDetailsSpaceProfile.tsx b/packages/components/src/CardProfile/CardDetailsSpaceProfile.tsx
@@ -2,6 +2,7 @@ import { Box, Flex, Image, Text } from 'theme-ui'
 
 import { Category } from '../Category/Category'
 import { MemberBadge } from '../MemberBadge/MemberBadge'
+import { ProfileTagsList } from '../ProfileTagsList/ProfileTagsList'
 import { Username } from '../Username/Username'
 
 import type { IProfileCreator } from 'oa-shared'
@@ -19,6 +20,7 @@ export const CardDetailsSpaceProfile = ({ creator, isLink }: IProps) => {
     countryCode,
     coverImage,
     profileType,
+    tags,
     workspaceType,
   } = creator
 
@@ -82,7 +84,8 @@ export const CardDetailsSpaceProfile = ({ creator, isLink }: IProps) => {
             isLink={isLink}
           />
         </Flex>
-        {workspaceType && (
+
+        {workspaceType && profileType === 'workspace' && (
           <Category
             category={{ label: workspaceLabel }}
             sx={{
@@ -92,6 +95,9 @@ export const CardDetailsSpaceProfile = ({ creator, isLink }: IProps) => {
             }}
           />
         )}
+
+        {tags && <ProfileTagsList tagIds={tags} />}
+
         {about && (
           <Text variant="quiet" sx={{ fontSize: 2 }}>
             {aboutTextStart || about}

diff --git a/packages/components/src/ProfileTagsList/ProfileTagsList.tsx b/packages/components/src/ProfileTagsList/ProfileTagsList.tsx
@@ -20,7 +20,7 @@ export const ProfileTagsList = ({ tagIds }: IProps) => {
   }
 
   return (
-    <Flex sx={{ gap: 2 }}>
+    <Flex sx={{ gap: 2, flexWrap: 'wrap' }}>
       {tags.map(
         (tag, index) =>
           tag?.label && (

diff --git a/shared/models/maps.ts b/shared/models/maps.ts
@@ -1,5 +1,6 @@
 import type { ILatLng } from './common'
 import type { IModerationStatus } from './moderation'
+import type { ISelectedTags } from './tags'
 import type { IUserBadges, ProfileTypeName, WorkspaceType } from './user'
 
 /**
@@ -68,6 +69,7 @@ export interface IProfileCreator {
   displayName: string
   isContactableByPublic: boolean
   profileType: ProfileTypeName
+  tags?: ISelectedTags
   workspaceType?: string
   userImage?: string
 }

diff --git a/src/pages/Maps/Maps.client.tsx b/src/pages/Maps/Maps.client.tsx
@@ -77,13 +77,13 @@ const MapsPage = observer(() => {
 
   useEffect(() => {
     const userName = user?._id
-    if (!userName) {
+    if (!userName || mapPins.find(({ _id }) => _id === userName)) {
       return
     }
 
     mapPinService.getMapPinSelf(userName).then((userMapPin) => {
       if (userMapPin && !mapPins.find((pin) => pin._id === userMapPin._id)) {
-        setMapPins([...mapPins, userMapPin])
+        setMapPins((existingPins) => [...existingPins, userMapPin])
       }
     })
   }, [user])

diff --git a/src/pages/Maps/map.service.ts b/src/pages/Maps/map.service.ts
@@ -19,9 +19,9 @@ const getMapPins = async (currentUserId?: string) => {
     const response = await fetch(API_URL + '/map-pins')
     const mapPins = await response.json()
 
-    const currentUserPin = !!mapPins.find(({ _id }) => _id === currentUserId)
+    const hasCurrentUserPin = !!mapPins.find(({ _id }) => _id === currentUserId)
 
-    if (currentUserId && !currentUserPin) {
+    if (currentUserId && !hasCurrentUserPin) {
       const userMapPin = await getMapPinByUserId(currentUserId)
       userMapPin && mapPins.push(userMapPin)
     }

diff --git a/src/stores/Maps/maps.store.ts b/src/stores/Maps/maps.store.ts
@@ -176,12 +176,13 @@ export class MapsStore extends ModuleStore {
       badges,
       coverImages,
       displayName,
+      isContactableByPublic,
       location,
       profileType,
-      isContactableByPublic,
+      userImage,
+      tags,
       verified,
       workspaceType,
-      userImage,
     } = user
     const type = profileType || ProfileTypeList.MEMBER
     const existingPin = await this.getPin(_id, 'server')
@@ -238,6 +239,7 @@ export class MapsStore extends ModuleStore {
         isContactableByPublic:
           isContactableByPublic || DEFAULT_PUBLIC_CONTACT_PREFERENCE,
         profileType,
+        ...(tags ? { tags } : {}),
         ...(workspaceType ? { workspaceType } : {}),
         ...(userImage ? { userImage: userImage.downloadUrl } : {}),
       },