From 92ab56bf5e5e967c50d3a4da6d5cc841a07825bd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20=F0=9F=A6=84?= <43847817+codiflow@users.noreply.github.com> Date: Mon, 27 May 2024 14:48:45 +0200 Subject: [PATCH] Add AdvancedSearch support for filtering older mails --- dev/View/Popup/AdvancedSearch.js | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/dev/View/Popup/AdvancedSearch.js b/dev/View/Popup/AdvancedSearch.js index d3b084bbe..8db80316a 100644 --- a/dev/View/Popup/AdvancedSearch.js +++ b/dev/View/Popup/AdvancedSearch.js @@ -55,8 +55,18 @@ export class AdvancedSearchPopupView extends AbstractViewPopup { selectedDates: () => { translateTrigger(); + // We should think about migrating all SEARCH/DATE_ to either SEARCH/SINCE_DATE or SEARCH/BEFORE_DATE + // and adjust the prefix accordingly + // let prefix_since = 'SEARCH/SINCE_DATE_'; let prefix = 'SEARCH/DATE_'; + let prefix_before = 'SEARCH/BEFORE_DATE_'; return [ + { id: -365, name: i18n(prefix_before + 'YEAR') }, + { id: -180, name: i18n(prefix_before + '6_MONTHS') }, + { id: -90, name: i18n(prefix_before + '3_MONTHS') }, + { id: -30, name: i18n(prefix_before + 'MONTH') }, + { id: -7, name: i18n(prefix_before + '7_DAYS') }, + { id: -3, name: i18n(prefix_before + '3_DAYS') }, { id: -1, name: i18n(prefix + 'ALL') }, { id: 3, name: i18n(prefix + '3_DAYS') }, { id: 7, name: i18n(prefix + '7_DAYS') }, @@ -105,6 +115,11 @@ export class AdvancedSearchPopupView extends AbstractViewPopup { d.setDate(d.getDate() - self.selectedDateValue()); append('since', d.toISOString().split('T')[0]); } + else if (-1 > self.selectedDateValue()) { + let d = new Date(); + d.setDate(d.getDate() + self.selectedDateValue()); + append('before', d.toISOString().split('T')[0]); + } let result = decodeURIComponent(new URLSearchParams(data).toString());