Skip to content

refactor: remove systems default filter #1763

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
Dugowitch wants to merge 1 commit into
base: master
Choose a base branch
from
Open

refactor: remove systems default filter #1763

Show file tree
Hide file tree
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
2 changes: 1 addition & 1 deletion src/PresentationalComponents/Filters/SystemStaleFilter.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ const systemsStaleFilter = (apply, currentFilter = {}) => {

return {
label: intl.formatMessage(messages.labelsFiltersStale),
type: conditionalFilterType.checkbox,
type: conditionalFilterType.singleSelect,
filterValues: {
onChange: (event, value) => {
filterByStale(value);
Expand Down
2 changes: 1 addition & 1 deletion src/PresentationalComponents/Filters/SystemStaleFilter.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ describe('SystemStaleFilter', () => {
const response = systemStaleFilter(apply, currentFilter);
expect(response.filterValues.value).toEqual(['filter']);
expect(response.label).toEqual('Status');
expect(response.type).toEqual('checkbox');
expect(response.type).toEqual('singleSelect');
});

it('Should call apply with a test value', () => {
Expand Down
5 changes: 2 additions & 3 deletions src/PresentationalComponents/StatusReports/SystemsStatusReport.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,6 @@ const SystemsStatusReport = ({ apply, queryParams }) => {
selectedTags: [...selectedTags, ...selectedGlobalTags],
systemProfile,
limit: 1,
'filter[stale]': 'in:true,false',
}).then((result) => {
setSubtotals(result.meta?.subtotals);
});
Expand Down Expand Up @@ -77,14 +76,14 @@ const SystemsStatusReport = ({ apply, queryParams }) => {
color='var(--pf-t--global--icon--color--status--success--default)'
value={subtotals?.patched}
apply={apply}
filter={{ filter: { packages_updatable: 'eq:0', stale: false } }} // TODO: remove `stale: false` once default filter is gone
filter={{ filter: { packages_updatable: 'eq:0', stale: false } }}
/>
<StatusCard
title={intl.formatMessage(messages.labelsStatusSystemsWithPatchesAvailable)}
Icon={BundleIcon}
value={subtotals?.unpatched}
apply={apply}
filter={{ filter: { packages_updatable: 'gt:0', stale: false } }} // TODO: remove `stale: false` once default filter is gone
filter={{ filter: { packages_updatable: 'gt:0', stale: false } }}
/>
<StatusCard
title={intl.formatMessage(messages.labelsStatusStaleSystems)}
Expand Down
108 changes: 7 additions & 101 deletions src/SmartComponents/Systems/SystemTable.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,7 @@ describe('SystemsTable', () => {
value: undefined,
},
label: 'Status',
type: 'checkbox',
type: 'singleSelect',
},
{
filterValues: {
Expand Down Expand Up @@ -232,106 +232,12 @@ describe('SystemsTable', () => {
);
});

it('should keep default systems filters visible while hiding reset at baseline', async () => {
const filteredState = {
...mockState,
SystemsStore: {
queryParams: {
filter: { stale: [true, false] },
},
},
};

await renderComponent(filteredState);
expect(InventoryTable).toHaveBeenCalledWith(
expect.objectContaining({
activeFiltersConfig: {
deleteTitle: 'Reset filters',
filters: [
{
category: 'Status',
chips: [
{
id: true,
name: 'Stale',
value: true,
},
{
id: false,
name: 'Fresh',
value: false,
},
],
id: 'stale',
},
],
onDelete: expect.any(Function),
showDeleteButton: false,
},
}),
{},
);
});

it('should show reset only when at least one filter differs from defaults', async () => {
const filteredState = {
...mockState,
SystemsStore: {
queryParams: {
filter: { packages_updatable: 'eq:0', stale: [true, false] },
},
},
};

await renderComponent(filteredState);

expect(InventoryTable).toHaveBeenCalledWith(
expect.objectContaining({
activeFiltersConfig: {
deleteTitle: 'Reset filters',
filters: [
{
category: 'Patch status',
chips: [
{
id: 'eq:0',
name: 'Systems up to date',
value: 'eq:0',
},
],
id: 'packages_updatable',
},
{
category: 'Status',
chips: [
{
id: true,
name: 'Stale',
value: true,
},
{
id: false,
name: 'Fresh',
value: false,
},
],
id: 'stale',
},
],
onDelete: expect.any(Function),
showDeleteButton: true,
},
}),
{},
);
});

it('should show reset when inventory-based operating system filters are active', async () => {
it('should show clear when inventory-based operating system filters are active', async () => {
const filteredState = {
...mockState,
SystemsStore: {
queryParams: {
filter: { os: ['RHEL 8.8'], stale: [true, false] },
filter: { os: ['RHEL 8.8'] },
},
},
};
Expand All @@ -341,7 +247,7 @@ describe('SystemsTable', () => {
expect(InventoryTable).toHaveBeenCalledWith(
expect.objectContaining({
activeFiltersConfig: expect.objectContaining({
deleteTitle: 'Reset filters',
deleteTitle: 'Clear filters',
showDeleteButton: true,
}),
customFilters: expect.objectContaining({
Expand All @@ -360,7 +266,7 @@ describe('SystemsTable', () => {
);
});

it('should show reset before an inventory-backed fetch resolves', async () => {
it('should show clear before an inventory-backed fetch resolves', async () => {
let resolveFetch;
fetchSystems.mockImplementationOnce(
() =>
Expand All @@ -381,7 +287,7 @@ describe('SystemsTable', () => {
page: 1,
per_page: 20,
patchParams: {
filter: { stale: [true, false] },
filter: {},
selectedTags: [],
systemProfile: {},
},
Expand All @@ -399,7 +305,7 @@ describe('SystemsTable', () => {
expect(InventoryTable).toHaveBeenLastCalledWith(
expect.objectContaining({
activeFiltersConfig: expect.objectContaining({
deleteTitle: 'Reset filters',
deleteTitle: 'Clear filters',
showDeleteButton: true,
}),
}),
Expand Down
3 changes: 2 additions & 1 deletion src/SmartComponents/Systems/SystemsTable.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,8 @@ const SystemsTable = ({

return {
...config,
showDeleteButton: config.showDeleteButton || hasInventoryFilterDeviation,
showDeleteButton:
config.showDeleteButton || config.filters.length > 0 || hasInventoryFilterDeviation,
};
}, [deleteFilters, filter, hasInventoryFilterDeviation]);

Expand Down
2 changes: 1 addition & 1 deletion src/Utilities/constants.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ export const packagesListDefaultFilters = {
};

export const systemsListDefaultFilters = {
filter: { stale: [true, false] },
filter: {},
};

export const emptyDefaultFilters = {
Expand Down
3 changes: 0 additions & 3 deletions src/store/Reducers/SystemsStore.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,6 @@ const initialState = {
queryParams: {
page: 1,
perPage: 20,
filter: {
stale: [true, false],
},
},
};

Expand Down
Loading