fix: make search in saved filter work

pkg/migration/20241118123644.go

@@ -0,0 +1,83 @@
+// Vikunja is a to-do list application to facilitate your life.
+// Copyright 2018-present Vikunja and contributors. All rights reserved.
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero General Public Licensee as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU Affero General Public Licensee for more details.
+//
+// You should have received a copy of the GNU Affero General Public Licensee
+// along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+package migration
+
+import (
+	"src.techknowlogick.com/xormigrate"
+	"xorm.io/xorm"
+)
+
+type taskCollection20241118123644 struct {
+	Filter string `query:"filter" json:"filter"`
+}
+
+type projectViews20241118123644New struct {
+	ID     int64                         `xorm:"autoincr not null unique pk" json:"id" param:"view"`
+	Filter *taskCollection20241118123644 `xorm:"json null default null" query:"filter" json:"filter"`
+}
+
+func (*projectViews20241118123644New) TableName() string {
+	return "project_views"
+}
+
+type projectViews20241118123644 struct {
+	ID     int64  `xorm:"autoincr not null unique pk" json:"id" param:"view"`
+	Filter string `xorm:"json null default null" query:"filter" json:"filter"`
+}
+
+func (*projectViews20241118123644) TableName() string {
+	return "project_views"
+}
+
+func init() {
+	migrations = append(migrations, &xormigrate.Migration{
+		ID:          "20241118123644",
+		Description: "change filter format",
+		Migrate: func(tx *xorm.Engine) (err error) {
+			oldViews := []*projectViews20241118123644{}
+
+			err = tx.Where("filter != '' AND filter IS NOT NULL").Find(&oldViews)
+			if err != nil {
+				return
+			}
+
+			err = tx.Sync(projectViews20241118123644New{})
+			if err != nil {
+				return
+			}
+
+			for _, view := range oldViews {
+				newView := &projectViews20241118123644New{
+					ID: view.ID,
+					Filter: &taskCollection20241118123644{
+						Filter: view.Filter,
+					},
+				}
+
+				_, err = tx.Where("id = ?", view.ID).Update(newView)
+				if err != nil {
+					return
+				}
+			}
+
+			return
+		},
+		Rollback: func(tx *xorm.Engine) error {
+			return nil
+		},
+	})
+}

pkg/models/project.go

@@ -136,7 +136,7 @@ var FavoritesPseudoProject = Project{
 			Title:     "List",
 			ViewKind:  ProjectViewKindList,
 			Position:  100,
-			Filter:    "done = false",
+			Filter:    &TaskCollection{Filter: "done = false"},
 		},
 		{
 			ID:        -2,

pkg/models/project_view.go

@@ -22,6 +22,7 @@ import (
 	"time"
 
 	"code.vikunja.io/api/pkg/web"
+
 	"xorm.io/xorm"
 )
 
@@ -130,7 +131,7 @@ type ProjectView struct {
 	ViewKind ProjectViewKind `xorm:"not null" json:"view_kind"`
 
 	// The filter query to match tasks by. Check out https://vikunja.io/docs/filters for a full explanation.
-	Filter string `xorm:"text null default null" query:"filter" json:"filter"`
+	Filter *TaskCollection `xorm:"json null default null" query:"filter" json:"filter"`
 	// The position of this view in the list. The list of all views will be sorted by this parameter.
 	Position float64 `xorm:"double null" json:"position"`
 
@@ -273,6 +274,13 @@ func (pv *ProjectView) Create(s *xorm.Session, a web.Auth) (err error) {
 }
 
 func createProjectView(s *xorm.Session, p *ProjectView, a web.Auth, createBacklogBucket bool, addExistingTasksToView bool) (err error) {
+	if p.Filter != nil && p.Filter.Filter != "" {
+		_, err = getTaskFiltersFromFilterString(p.Filter.Filter, p.Filter.FilterTimezone)
+		if err != nil {
+			return
+		}
+	}
+
 	p.ID = 0
 	_, err = s.Insert(p)
 	if err != nil {
@@ -348,6 +356,13 @@ func addTasksToView(s *xorm.Session, a web.Auth, pv *ProjectView, b *Bucket) (er
 // @Failure 500 {object} models.Message "Internal error"
 // @Router /projects/{project}/views/{id} [post]
 func (pv *ProjectView) Update(s *xorm.Session, _ web.Auth) (err error) {
+	if pv.Filter != nil && pv.Filter.Filter != "" {
+		_, err = getTaskFiltersFromFilterString(pv.Filter.Filter, pv.Filter.FilterTimezone)
+		if err != nil {
+			return
+		}
+	}
+
 	// Check if the project view exists
 	_, err = GetProjectViewByIDAndProject(s, pv.ID, pv.ProjectID)
 	if err != nil {
@@ -428,7 +443,9 @@ func CreateDefaultViewsForProject(s *xorm.Session, project *Project, a web.Auth,
 		Position:  100,
 	}
 	if createDefaultListFilter {
-		list.Filter = "done = false"
+		list.Filter = &TaskCollection{
+			Filter: "done = false",
+		}
 	}
 	err = createProjectView(s, list, a, createBacklogBucket, true)
 	if err != nil {

pkg/models/task_collection.go

@@ -32,6 +32,8 @@ type TaskCollection struct {
 	ProjectID     int64 `param:"project" json:"-"`
 	ProjectViewID int64 `param:"view" json:"-"`
 
+	Search string `query:"s" json:"s"`
+
 	// The query parameter to sort by. This is for ex. done, priority, etc.
 	SortBy    []string `query:"sort_by" json:"sort_by"`
 	SortByArr []string `query:"sort_by[]" json:"-"`
@@ -277,11 +279,26 @@ func (tf *TaskCollection) ReadAll(s *xorm.Session, a web.Auth, search string, pa
 			return nil, 0, 0, err
 		}
 
-		if view.Filter != "" {
-			if tf.Filter != "" {
-				tf.Filter = "(" + tf.Filter + ") && (" + view.Filter + ")"
-			} else {
-				tf.Filter = view.Filter
+		if view.Filter != nil {
+			if view.Filter.Filter != "" {
+				if tf.Filter != "" {
+					tf.Filter = "(" + tf.Filter + ") && (" + view.Filter.Filter + ")"
+				} else {
+					tf.Filter = view.Filter.Filter
+				}
+				tf.FilterIncludeNulls = view.Filter.FilterIncludeNulls
+			}
+
+			if view.Filter.FilterTimezone != "" {
+				tf.FilterTimezone = view.Filter.FilterTimezone
+			}
+
+			if view.Filter.FilterIncludeNulls {
+				tf.FilterIncludeNulls = view.Filter.FilterIncludeNulls
+			}
+
+			if view.Filter.Search != "" {
+				search = view.Filter.Search
 			}
 		}