From 2550b8eadbfcdb2db922d37a90f98a3e96b4ce80 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakob=20Sch=C3=B6ttl?= Date: Sun, 7 Nov 2021 00:22:11 +0100 Subject: [PATCH] WIP Start refactoring --- src/lib/headline_filter.js | 1 + src/reducers/org.js | 4 +--- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/lib/headline_filter.js b/src/lib/headline_filter.js index e61e9e8d2..866e9d21c 100644 --- a/src/lib/headline_filter.js +++ b/src/lib/headline_filter.js @@ -207,6 +207,7 @@ export const isMatch = (filterExpr) => { //const filterClock = filterField.filter((f) => f.field.type === 'clock').map(timeFilter); const filterSchedule = filterField.filter((f) => f.field.type === 'scheduled').map(timeFilter); const filterDeadline = filterField.filter((f) => f.field.type === 'deadline').map(timeFilter); + const clockFilters = filterField.filter((f) => f.field.type === 'clock').map(timeFilter); const filterTagsExcl = filterExpr.filter(filterFilter('tag', true)).map(words); const filterCSExcl = filterExpr.filter(filterFilter('case-sensitive', true)).map(words); diff --git a/src/reducers/org.js b/src/reducers/org.js index 262aee3f7..eedbb56c1 100644 --- a/src/reducers/org.js +++ b/src/reducers/org.js @@ -1167,9 +1167,7 @@ export const setSearchFilterInformation = (state, action) => { const headers = files.map((file) => file.get('headers')); // show clocked times & sum if there is a clock search term - const clockFilters = searchFilterExpr - .filter((f) => f.type === 'field') - .filter((f) => f.field.type === 'clock'); + // TODO these depend on clockFilters which is now in isMatch() ... const filterFunctions = clockFilters.map(timeFilter); const showClockedTimes = clockFilters.length !== 0; state.setIn(['search', 'showClockedTimes'], showClockedTimes);