self-hosted/focalboard
1
0
Fork 0
mirror of https://github.com/mattermost/focalboard.git synced 2024-12-24 13:43:12 +02:00
Code Issues Releases Activity

fix string vs string[] in hiding rows

Browse Source
This commit is contained in:
Scott Bishel 2023-01-17 15:51:24 -07:00
parent c761ea7c88
commit 9d86216f5d
3 changed files with 29 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
webapp/src/components/table/tableRow.tsx
View File

@ -103,6 +103,8 @@ const TableRow = (props: Props) => {
} else if (template && template.type === 'updatedBy') {
groupValue = card.modifiedBy
}
} else if (Array.isArray(groupValue)) {
groupValue = groupValue[0]
}
if (collapsedOptionIds.indexOf(groupValue) > -1) {
className += ' hidden'

31
webapp/src/mutator.ts
View File

@ -665,19 +665,28 @@ class Mutator {
const newBlockIDs: string[] = []
if (propertyTemplate.type !== newType) {
if (propertyTemplate.type === 'select' || propertyTemplate.type === 'multiSelect') { // If the old type was either select or multiselect
if (propertyTemplate.type === 'select' || propertyTemplate.type === 'multiSelect' ||
(propertyTemplate.type === 'person' || propertyTemplate.type === 'multiPerson')) { // If the old type was either select or multiselect
const isNewTypeSelectOrMulti = newType === 'select' || newType === 'multiSelect'
const isNewTypePersonOrMulti = newType === 'person' || newType === 'multiPerson'
for (const card of cards) {
const oldValue = Array.isArray(card.fields.properties[propertyTemplate.id]) ? (card.fields.properties[propertyTemplate.id].length > 0 && card.fields.properties[propertyTemplate.id][0]) : card.fields.properties[propertyTemplate.id]
const oldValue = Array.isArray(card.fields.properties[propertyTemplate.id]) ? (card.fields.properties[propertyTemplate.id].length > 0 && card.fields.properties[propertyTemplate.id][0] as string) : card.fields.properties[propertyTemplate.id] as string
if (oldValue) {
const newValue = isNewTypeSelectOrMulti ? propertyTemplate.options.find((o) => o.id === oldValue)?.id : propertyTemplate.options.find((o) => o.id === oldValue)?.value
const newCard = createCard(card)
let newValue: string | undefined
if (isNewTypeSelectOrMulti) {
newValue = propertyTemplate.options.find((o) => o.id === oldValue)?.id
} else if (isNewTypePersonOrMulti) {
newValue = oldValue
} else if (propertyTemplate.type === 'select' || propertyTemplate.type === 'multiSelect') {
newValue = propertyTemplate.options.find((o) => o.id === oldValue)?.value
}
const newCard = createCard(card)
if (newValue) {
newCard.fields.properties[propertyTemplate.id] = newType === 'multiSelect' ? [newValue] : newValue
} else {
// This was an invalid select option, so delete it
// This was an invalid select option or old person id, so delete it
delete newCard.fields.properties[propertyTemplate.id]
}
@ -708,6 +717,18 @@ class Mutator {
const newCard = createCard(card)
newCard.fields.properties[propertyTemplate.id] = newType === 'multiSelect' ? [option.id] : option.id
newBlocks.push(newCard)
newBlockIDs.push(newCard.id)
oldBlocks.push(card)
}
}
} else if (newType === 'person' || newType === 'multiPerson') { // if the new type is either person or multiperson
// Clear old values
for (const card of cards) {
const oldValue = card.fields.properties[propertyTemplate.id] as string
if (oldValue) {
const newCard = createCard(card)
delete newCard.fields.properties[propertyTemplate.id]
newBlocks.push(newCard)
newBlockIDs.push(newCard.id)
oldBlocks.push(card)

2
webapp/src/properties/person/confirmPerson.tsx
View File

@ -85,7 +85,7 @@ const ConfirmPerson = (props: PropertyProps): JSX.Element => {
setConfirmAddUser(null)
await mutator.createBoardMember(newMember)
if (userIDs) {
if (propertyTemplate.type === 'multiPerson') {
await mutator.changePropertyValue(board.id, card, propertyTemplate.id, [...userIDs, newMember.userId])
} else {
await mutator.changePropertyValue(board.id, card, propertyTemplate.id, newMember.userId)