Skip to content
Closed
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
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ import {loadModule} from 'frontend-js-web';
import React, {ReactElement, useContext, useEffect, useState} from 'react';

import FrontendDataSetContext from '../../../FrontendDataSetContext';
import {activateFilter} from '../../../utils/filters/activateFilter';
import ViewsContext from '../../../views/ViewsContext';

// @ts-ignore
Expand Down Expand Up @@ -97,10 +96,14 @@ const Filter = ({
...filters.find(
(filter: FilterConfiguration) => filter.id === filterId
),
selectedData,
...otherProps,
};

activateFilter({filter: newFilter, selectedData});
newFilter.odataFilterString =
filterImplementation.getOdataString(newFilter);
newFilter.selectedItemsLabel =
filterImplementation.getSelectedItemsLabel(newFilter);

setSearching(true);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,7 @@ export function deactivateFilter(filter: any) {
filter.odataFilterString = undefined;
filter.selectedData = undefined;

return filter;
return {
...filter,
};
}
Original file line number Diff line number Diff line change
Expand Up @@ -463,8 +463,6 @@ for (const spaConfiguration of spaConfigurations) {
});

await test.step('Check back navigation', async () => {
await checkFilter(true, 'color', 'Color: Green, Red');

await page.goBack();
await checkFilter(true, 'color', 'Color: Yellow, Green');
await page.goBack();
Expand Down