Skip to content

Extends search filters to add cumulative terms and terms exclusion #499

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

Extends search filters to add cumulative terms and terms exclusion #499

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
19 changes: 10 additions & 9 deletions packages/redux-devtools-inspector/src/ActionList.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,22 +85,23 @@ export default class ActionList extends Component {
startActionId,
onSelect,
onSearch,
searchValue,
searchInclude,
searchExclude,
currentActionId,
hideMainButtons,
hideActionButtons,
onCommit,
onSweep,
onJumpToState
} = this.props;
const lowerSearchValue = searchValue && searchValue.toLowerCase();
const filteredActionIds = searchValue
? actionIds.filter(
id =>
actions[id].action.type.toLowerCase().indexOf(lowerSearchValue) !==
-1
)
: actionIds;

const filteredActionIds = actionIds.filter(id => {
const type = actions[id].action.type.toLowerCase();
return (
searchExclude.every(searchData => !type.includes(searchData)) &&
searchInclude.every(searchData => type.includes(searchData))
);
});

return (
<div
Expand Down
24 changes: 20 additions & 4 deletions packages/redux-devtools-inspector/src/DevtoolsInspector.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -219,7 +219,8 @@ export default class DevtoolsInspector extends Component {
const {
selectedActionId,
startActionId,
searchValue,
searchInclude,
searchExclude,
tabName
} = monitorState;
const inspectedPathType =
Expand Down Expand Up @@ -248,7 +249,8 @@ export default class DevtoolsInspector extends Component {
actions,
actionIds,
isWideLayout,
searchValue,
searchInclude,
searchExclude,
selectedActionId,
startActionId,
skippedActionIds,
Expand Down Expand Up @@ -322,8 +324,22 @@ export default class DevtoolsInspector extends Component {
this.props.dispatch(sweep());
};

handleSearch = val => {
this.updateMonitorState({ searchValue: val });
handleSearch = value => {
const segments = value.toLowerCase().trim().split(/\s+/);
const searchInclude = [];
const searchExclude = [];

segments.forEach(segment => {
if (segment.charAt(0) === '-') {
if (segment.length > 1) {
searchExclude.push(segment.substr(1));
}
} else {
searchInclude.push(segment);
}
});

this.updateMonitorState({ searchInclude, searchExclude });
};

handleSelectAction = (e, actionId) => {
Expand Down
4 changes: 3 additions & 1 deletion packages/redux-devtools-inspector/src/redux.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,9 @@ export const DEFAULT_STATE = {
startActionId: null,
inspectedActionPath: [],
inspectedStatePath: [],
tabName: 'Diff'
tabName: 'Diff',
searchInclude: [],
searchExclude: []
};

export function updateMonitorState(monitorState) {
Expand Down