add last modified filter chip (#7455)

* add last modified filter chip * Update add-last-modified-filter-chip.md --------- Co-authored-by: Roman Perekhod <rperekhod@owncloud.com>
owncloud · Oct 19, 2023 · acfae80 · acfae80
1 parent b436e49
commit acfae80
Show file tree

Hide file tree

Showing 6 changed files with 355 additions and 199 deletions.
diff --git a/changelog/unreleased/add-last-modified-filter-chip.md b/changelog/unreleased/add-last-modified-filter-chip.md
@@ -0,0 +1,7 @@
+Enhancement:  Add "Last modified" filter Chip
+
+Add "Last modified" filter Chip
+
+https://github.com/owncloud/ocis/issues/7431
+https://github.com/owncloud/ocis/pull/7455
+
diff --git a/services/frontend/pkg/revaconfig/config.go b/services/frontend/pkg/revaconfig/config.go
@@ -289,6 +289,58 @@ func FrontendConfigFromStruct(cfg *config.Config, logger log.Logger) (map[string
 								"share_jail": cfg.EnableShareJail,
 								"max_quota":  cfg.MaxQuota,
 							},
+							"search": map[string]interface{}{
+								"property": []map[string]interface{}{
+									{
+										"name": []map[string]interface{}{
+											{
+												"enabled": true,
+											},
+										},
+										"mtime": []map[string]interface{}{
+											{
+												"keywords": []string{"today", "yesterday", "this week", "last week", "last 7 days", "this month", "last month", "last 30 days", "this year", "last year"},
+												"enabled":  true,
+											},
+										},
+										"size": []map[string]interface{}{
+											{
+												"enabled": false,
+											},
+										},
+										"mimetype": []map[string]interface{}{
+											{
+												"enabled": true,
+											},
+										},
+										"type": []map[string]interface{}{
+											{
+												"enabled": true,
+											},
+										},
+										"tag": []map[string]interface{}{
+											{
+												"enabled": true,
+											},
+										},
+										"tags": []map[string]interface{}{
+											{
+												"enabled": true,
+											},
+										},
+										"content": []map[string]interface{}{
+											{
+												"enabled": true,
+											},
+										},
+										"scope": []map[string]interface{}{
+											{
+												"enabled": true,
+											},
+										},
+									},
+								},
+							},
 							"password_policy": map[string]interface{}{
 								"max_characters":           72,
 								"min_characters":           cfg.PasswordPolicy.MinCharacters,

diff --git a/services/search/pkg/query/kql/cast.go b/services/search/pkg/query/kql/cast.go
@@ -104,13 +104,23 @@ func toTimeRange(in interface{}) (*time.Time, *time.Time, error) {
 	case "this week":
 		from = n.BeginningOfWeek()
 		to = n.EndOfWeek()
+	case "last week":
+		lastWeek := n.With(n.AddDate(0, 0, -7))
+		from = lastWeek.BeginningOfWeek()
+		to = lastWeek.EndOfWeek()
+	case "last 7 days":
+		from = n.With(n.AddDate(0, 0, -6)).BeginningOfDay()
+		to = n.EndOfDay()
 	case "this month":
 		from = n.BeginningOfMonth()
 		to = n.EndOfMonth()
 	case "last month":
 		lastMonth := n.With(n.AddDate(0, -1, 0))
 		from = lastMonth.BeginningOfMonth()
 		to = lastMonth.EndOfMonth()
+	case "last 30 days":
+		from = n.With(n.AddDate(0, 0, -29)).BeginningOfDay()
+		to = n.EndOfDay()
 	case "this year":
 		from = n.BeginningOfYear()
 		to = n.EndOfYear()

diff --git a/services/search/pkg/query/kql/dictionary.peg b/services/search/pkg/query/kql/dictionary.peg
@@ -200,8 +200,11 @@ NaturalLanguageDateTime  <-
     "today" /
     "yesterday" /
     "this week" /
+    "last week" /
+    "last 7 days" /
     "this month" /
     "last month" /
+    "last 30 days" /
     "this year" /
     "last year"  {
         return c.text, nil