Minor optimization regarding regexp filtering in timelines
parent
c49f7d5d16
commit
9d6b46fe34
|
@ -6,19 +6,26 @@ import { createSelector } from 'reselect';
|
||||||
import { debounce } from 'lodash';
|
import { debounce } from 'lodash';
|
||||||
import { me } from 'flavours/glitch/util/initial_state';
|
import { me } from 'flavours/glitch/util/initial_state';
|
||||||
|
|
||||||
|
const getRegex = createSelector([
|
||||||
|
(state, { type }) => state.getIn(['settings', type, 'regex', 'body']),
|
||||||
|
], (rawRegex) => {
|
||||||
|
let regex = null;
|
||||||
|
|
||||||
|
try {
|
||||||
|
regex = rawRegex && new RegExp(rawRegex.trim(), 'i');
|
||||||
|
} catch (e) {
|
||||||
|
// Bad regex, don't affect filters
|
||||||
|
}
|
||||||
|
return regex;
|
||||||
|
});
|
||||||
|
|
||||||
const makeGetStatusIds = () => createSelector([
|
const makeGetStatusIds = () => createSelector([
|
||||||
(state, { type }) => state.getIn(['settings', type], ImmutableMap()),
|
(state, { type }) => state.getIn(['settings', type], ImmutableMap()),
|
||||||
(state, { type }) => state.getIn(['timelines', type, 'items'], ImmutableList()),
|
(state, { type }) => state.getIn(['timelines', type, 'items'], ImmutableList()),
|
||||||
(state) => state.get('statuses'),
|
(state) => state.get('statuses'),
|
||||||
], (columnSettings, statusIds, statuses) => {
|
getRegex,
|
||||||
|
], (columnSettings, statusIds, statuses, regex) => {
|
||||||
const rawRegex = columnSettings.getIn(['regex', 'body'], '').trim();
|
const rawRegex = columnSettings.getIn(['regex', 'body'], '').trim();
|
||||||
let regex = null;
|
|
||||||
|
|
||||||
try {
|
|
||||||
regex = rawRegex && new RegExp(rawRegex, 'i');
|
|
||||||
} catch (e) {
|
|
||||||
// Bad regex, don't affect filters
|
|
||||||
}
|
|
||||||
|
|
||||||
return statusIds.filter(id => {
|
return statusIds.filter(id => {
|
||||||
if (id === null) return true;
|
if (id === null) return true;
|
||||||
|
|
Loading…
Reference in New Issue