Skip to content
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.

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

fix: Filter out empty strings for tags and filter options #1905 #1939

Merged
merged 5 commits into from
Apr 24, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
83 changes: 66 additions & 17 deletions ui/src/table.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,22 @@ const
groupHeaderRow = 1,
groupHeaderRowsCount = 2,
filteredItem = 1,
emitMock = jest.fn()
emitMock = jest.fn(),
tagsColumn = {
name: 'tagsColumn',
label: 'tagsColumn',
filterable: true,
cell_type: {
tag: {
name: 'tags',
tags: [
{ label: 'TAG1', color: 'red' },
{ label: 'TAG2', color: 'green' },
{ label: 'TAG3', color: 'blue' },
]
}
}
}

let tableProps: Table

Expand Down Expand Up @@ -77,6 +92,54 @@ describe('Table.tsx', () => {
expect(getAllByRole('gridcell')[0].textContent).toBe('6/23/2022, 12:50:28 AM')
})

it('Renders tags correctly', () => {
tableProps = {
...tableProps,
columns: [tagsColumn],
rows: [
{ name: 'rowname1', cells: ['TAG1'] },
{ name: 'rowname2', cells: ['TAG2,TAG3'] },
{ name: 'rowname3', cells: ['TAG2'] }
]
}

const { container, getAllByRole, getAllByTestId } = render(<XTable model={tableProps} />)

fireEvent.click(container.querySelector('.ms-DetailsHeader-filterChevron')!)

const checkboxes = getAllByRole('checkbox')
expect(checkboxes).toHaveLength(3)

checkboxes.forEach(c => expect(c).not.toBeChecked())

expect(getAllByTestId('tags')[0].childElementCount).toBe(1)
expect(getAllByTestId('tags')[1].childElementCount).toBe(2)
expect(getAllByTestId('tags')[2].childElementCount).toBe(1)
})

it('Does not render empty tags', () => {
tableProps = {
...tableProps,
columns: [tagsColumn],
rows: [
{ name: 'rowname1', cells: ['TAG1'] },
{ name: 'rowname2', cells: ['TAG2,TAG1'] },
{ name: 'rowname3', cells: [''] }
]
}

const { container, getAllByRole, getAllByTestId } = render(<XTable model={tableProps} />)

fireEvent.click(container.querySelector('.ms-DetailsHeader-filterChevron')!)

expect(getAllByRole('checkbox')).toHaveLength(2)

const [tags1, tags2, tags3] = getAllByTestId('tags')
expect(tags1.childElementCount).toBe(1)
expect(tags2.childElementCount).toBe(2)
expect(tags3.childElementCount).toBe(0)
})

// TODO: Add a test to check that no event is emitted on rows update. Would result in infinite loop.

describe('Height compute', () => {
Expand Down Expand Up @@ -627,21 +690,7 @@ describe('Table.tsx', () => {
...tableProps,
columns: [
{ name: 'colname1', label: 'col1' },
{
name: 'colname2',
label: 'col2',
filterable: true,
cell_type: {
tag: {
name: 'tags',
tags: [
{ label: 'TAG1', color: 'red' },
{ label: 'TAG2', color: 'green' },
{ label: 'TAG3', color: 'blue' },
]
}
}
},
tagsColumn
],
rows: [
{ name: 'rowname1', cells: [cell11, 'TAG1'] },
Expand Down Expand Up @@ -689,7 +738,7 @@ describe('Table.tsx', () => {

fireEvent.click(container.querySelector('.ms-DetailsHeader-filterChevron')!)
fireEvent.click(getAllByText('TAG1')[1].parentElement!)
expect(emitMock).toHaveBeenCalledWith(tableProps.name, 'filter', { 'colname2': ['TAG1'] })
expect(emitMock).toHaveBeenCalledWith(tableProps.name, 'filter', { 'tagsColumn': ['TAG1'] })
expect(emitMock).toHaveBeenCalledTimes(1)
})
})
Expand Down
2 changes: 1 addition & 1 deletion ui/src/table.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -395,7 +395,7 @@ const
onColumnContextMenu = React.useCallback((col: WaveColumn, e: React.MouseEvent<HTMLElement>) => {
const menuFilters = col.filters || items.map(i => i[col.fieldName || col.key])
setColContextMenuList({
items: Array.from(new Set(menuFilters)).map(option => ({ key: option, text: option, data: col.fieldName || col.key })),
items: Array.from(new Set(menuFilters)).filter(item => item !== '').map(option => ({ key: option, text: option, data: col.fieldName || col.key })),
target: e.target as HTMLElement,
directionalHint: Fluent.DirectionalHint.bottomLeftEdge,
gapSpace: 10,
Expand Down
2 changes: 1 addition & 1 deletion ui/src/tag_table_cell_type.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -73,5 +73,5 @@ export const XTagTableCellType = ({ model, serializedTags, isMultiline }: { mode

return <span key={i} style={{ background, color }} className={clas(css.tag, 'wave-s12 wave-w6', isMultiline ? css.multiline : '')}>{tagLabel}</span>
})
return <div data-test={model.name}>{serializedTags.split(',').map(mapTags)}</div>
return <div data-test={model.name}>{serializedTags.split(',').filter(tag => tag !== '').map(mapTags)}</div>
}