Skip to content

Commit 1a5c1b9

Browse files
kmalyjurMariaAga
kmalyjur
authored andcommitted
Fixes #37805 - Add possibility to display message when table is empty
1 parent fbbf6c6 commit 1a5c1b9

File tree

2 files changed

+8
-4
lines changed

2 files changed

+8
-4
lines changed

webpack/assets/javascripts/react_app/components/PF4/TableIndexPage/Table/Table.js

+6-3
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ import { getColumnHelpers } from './helpers';
1919

2020
export const Table = ({
2121
columns,
22+
emptyMessage,
2223
errorMessage,
2324
getActions,
2425
isDeleteable,
@@ -133,10 +134,10 @@ export const Table = ({
133134
</Td>
134135
</Tr>
135136
)}
136-
{!isPending && !errorMessage && results.length === 0 && (
137+
{!isPending && results.length === 0 && !errorMessage && (
137138
<Tr ouiaId="table-empty">
138139
<Td colSpan={100}>
139-
<EmptyPage />
140+
<EmptyPage message={{ type: 'empty', text: emptyMessage }} />
140141
</Td>
141142
</Tr>
142143
)}
@@ -177,7 +178,7 @@ export const Table = ({
177178
})}
178179
</Tbody>
179180
</TableComposable>
180-
{results.length > 0 && !errorMessage && bottomPagination}
181+
{results.length > 0 && !errorMessage && !emptyMessage && bottomPagination}
181182
</>
182183
);
183184
};
@@ -190,6 +191,7 @@ Table.propTypes = {
190191
perPage: PropTypes.number,
191192
order: PropTypes.string,
192193
}).isRequired,
194+
emptyMessage: PropTypes.string,
193195
errorMessage: PropTypes.string,
194196
getActions: PropTypes.func,
195197
isDeleteable: PropTypes.bool,
@@ -210,6 +212,7 @@ Table.propTypes = {
210212

211213
Table.defaultProps = {
212214
children: null,
215+
emptyMessage: null,
213216
errorMessage: null,
214217
isDeleteable: false,
215218
itemCount: 0,

webpack/assets/javascripts/react_app/components/PF4/TableIndexPage/Table/Table.test.js

+2-1
Original file line numberDiff line numberDiff line change
@@ -179,14 +179,15 @@ describe('Table', () => {
179179
setParams={setParams}
180180
refreshData={refreshData}
181181
results={[]}
182+
errorMessage="Empty test"
182183
isDeleteable={true}
183184
url="/users"
184185
isPending={false}
185186
/>
186187
</Provider>
187188
);
188189
expect(screen.queryAllByText('items')).toHaveLength(0);
189-
expect(screen.queryAllByText('No Results')).toHaveLength(2);
190+
expect(screen.queryAllByText('Empty test')).toHaveLength(1);
190191
expect(screen.queryAllByText('Loading...')).toHaveLength(0);
191192
});
192193
test('show empty state while loading', () => {

0 commit comments

Comments
 (0)