Skip to content

fix: decode HTML entities in team display names #4831

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: decode HTML entities in team display names #4831

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 13 additions & 2 deletions src/components/MemberList/MemberList.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,8 @@
v-if="showPicker"
ref="entityPicker"
v-model:selection="pickerSelection"
:confirm-label="t('contacts', 'Add to {team}', { team: circle.displayName })"
:title-label="t('contacts', 'Invite members to {team}', { team: circle.displayName })"
:confirm-label="t('contacts', 'Add to {team}', { team: decodedTeamName })"
:title-label="t('contacts', 'Invite members to {team}', { team: decodedTeamName })"
:data-types="pickerTypes"
:data-set="filteredPickerData"
:internal-search="false"
Expand Down Expand Up @@ -116,6 +116,17 @@ export default defineComponent({
return this.$store.getters.getCircle(this.selectedCircle)
},

// Decode HTML entities in the circle display name so apostrophes (') and other
// HTML-encoded chars (e.g. ') are shown correctly in the picker labels.
decodedTeamName(): string {
const raw = this.circle && this.circle.displayName ? this.circle.displayName : ''
// Use a DOM textarea element to decode HTML entities safely.
// This works for common entities such as &, <, >, ', etc.
const ta = document.createElement('textarea')
ta.innerHTML = raw
return ta.value
},

filteredPickerData() {
return this.pickerData.filter((entity) => {
const type = SHARES_TYPES_MEMBER_MAP[entity.shareType]
Expand Down