Skip to content

Commit 1ad1b08

Browse files
authored
fix(Systems page): Correctly parse all URL params (RedHatInsights#1172)
1 parent ad74aba commit 1ad1b08

File tree

1 file changed

+17
-7
lines changed

1 file changed

+17
-7
lines changed

src/Components/SmartComponents/SystemsPage/SystemsPage.js

+17-7
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ const SystemsPage = () => {
6161

6262
const apply = (params) => dispatch(changeSystemsParams(params));
6363

64-
useEffect(() => apply(urlParameters), []);
64+
useEffect(() => apply(urlParameters), []);
6565

6666
useDeepCompareEffect(() => setUrlParams({ ...parameters }), [parameters]);
6767

@@ -81,15 +81,25 @@ const SystemsPage = () => {
8181
<Header title={intl.formatMessage(messages.systemsHeader)} showBreadcrumb={false} />
8282
<Main>
8383
<Fragment>
84-
{ hasError
84+
{hasError
8585
? <ErrorHandler code={errorCode} />
8686
: (
8787
<InventoryTable
8888
disableDefaultColumns
8989
onLoad={({ mergeWithEntities }) => {
9090
ReducerRegistry.register({
9191
...mergeWithEntities(
92-
inventoryEntitiesReducer(SYSTEMS_HEADER)
92+
inventoryEntitiesReducer(SYSTEMS_HEADER),
93+
{
94+
page: Number(parameters.page || 1),
95+
perPage: Number(parameters.page_size || 20),
96+
...(parameters.sort && {
97+
sortBy: {
98+
key: parameters.sort.replace(/^-/, ''),
99+
direction: parameters.sort.match(/^-/) ? 'desc' : 'asc'
100+
}
101+
})
102+
}
93103
)
94104
});
95105
}}
@@ -117,12 +127,12 @@ const SystemsPage = () => {
117127
noSystemsTable={<EmptyStateNoSystems />}
118128
>
119129
<SystemsTableToolbar
120-
parameters = {parameters}
121-
systems = {{ data: systems, meta: { total_items: totalItems } }}
122-
selectedRows = {selectedRows}
130+
parameters={parameters}
131+
systems={{ data: systems, meta: { total_items: totalItems } }}
132+
selectedRows={selectedRows}
123133
selectedRowsCount={selectedRowsCount}
124134
selectedRowsRawData={selectedRowsRawData}
125-
methods = {{
135+
methods={{
126136
doOptOut,
127137
apply,
128138
handleSelect

0 commit comments

Comments
 (0)