Skip to content

Commit c59a97a

Browse files
authored
Merge pull request #981 from SuanmoSuanyangTechnology/fix/v0.3.1_zy
fix(web): user profile
2 parents 7ffd250 + 9480a61 commit c59a97a

2 files changed

Lines changed: 12 additions & 5 deletions

File tree

web/src/views/UserMemoryDetail/components/EndUserProfile.tsx

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,13 @@ interface EndUserProfileProps {
3131
className?: string;
3232
}
3333

34+
const formatValue = (value: string | string[] | null | undefined) => {
35+
if (!value) return '-'
36+
if (Array.isArray(value)) {
37+
return value.length ? value.join(' | ') : '-'
38+
}
39+
return value
40+
}
3441
const EndUserProfile = forwardRef<EndUserProfileRef, EndUserProfileProps>(({ className, onDataLoaded }, ref) => {
3542
const { t } = useTranslation()
3643
const { id } = useParams()
@@ -89,19 +96,19 @@ const EndUserProfile = forwardRef<EndUserProfileRef, EndUserProfileProps>(({ cla
8996
</div>
9097
<div>
9198
<div className="rb:text-[#7B8085]">{t('userMemory.role')}</div>
92-
<div className="rb:mt-0.5">{data?.profile?.role?.join(' | ') || '-'}</div>
99+
<div className="rb:mt-0.5">{formatValue(data?.profile?.role)}</div>
93100
</div>
94101
<div>
95102
<div className="rb:text-[#7B8085]">{t('userMemory.domain')}</div>
96-
<div className="rb:mt-0.5">{data?.profile?.domain?.join(' | ') || '-'}</div>
103+
<div className="rb:mt-0.5">{formatValue(data?.profile?.domain)}</div>
97104
</div>
98105
<div>
99106
<div className="rb:text-[#7B8085]">{t('userMemory.expertise')}</div>
100-
<div className="rb:mt-0.5">{data?.profile?.expertise?.join(' | ') || '-'}</div>
107+
<div className="rb:mt-0.5">{formatValue(data?.profile?.expertise)}</div>
101108
</div>
102109
<div>
103110
<div className="rb:text-[#7B8085]">{t('userMemory.interests')}</div>
104-
<div className="rb:mt-0.5">{data?.profile?.interests?.join(' | ') || '-'}</div>
111+
<div className="rb:mt-0.5">{formatValue(data?.profile?.interests)}</div>
105112
</div>
106113

107114
<div className="rb:text-[#7B8085] rb:text-[12px] rb:leading-4.5">

web/src/views/UserMemoryDetail/types.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,7 @@ export interface EndUser {
178178
created_at: string;
179179
updated_at: string;
180180
profile: {
181-
role: string[];
181+
role: string[] | string;
182182
domain: string[];
183183
expertise: string[];
184184
interests: string[];

0 commit comments

Comments
 (0)