From f0d695e789773f3a075d12398d8c50bd988dec9d Mon Sep 17 00:00:00 2001 From: waza-ari Date: Tue, 2 Apr 2024 13:49:38 +0000 Subject: [PATCH] fix(views): remove default filter from frontend, apply by default to new list views instead (#2240) Fixes #2234 Co-authored-by: Daniel Herrmann Reviewed-on: https://kolaente.dev/vikunja/vikunja/pulls/2240 Reviewed-by: konrad Co-authored-by: waza-ari Co-committed-by: waza-ari --- frontend/src/services/taskCollection.ts | 2 +- pkg/migration/20240329170952.go | 51 +++++++++++++++++++++++++ pkg/models/project_view.go | 1 + 3 files changed, 53 insertions(+), 1 deletion(-) create mode 100644 pkg/migration/20240329170952.go diff --git a/frontend/src/services/taskCollection.ts b/frontend/src/services/taskCollection.ts index 3304227f1..3aa04cada 100644 --- a/frontend/src/services/taskCollection.ts +++ b/frontend/src/services/taskCollection.ts @@ -18,7 +18,7 @@ export function getDefaultTaskFilterParams(): TaskFilterParams { return { sort_by: ['position', 'id'], order_by: ['asc', 'desc'], - filter: 'done = false', + filter: '', filter_include_nulls: false, filter_timezone: '', s: '', diff --git a/pkg/migration/20240329170952.go b/pkg/migration/20240329170952.go new file mode 100644 index 000000000..ffd48120e --- /dev/null +++ b/pkg/migration/20240329170952.go @@ -0,0 +1,51 @@ +// 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 . + +package migration + +import ( + "src.techknowlogick.com/xormigrate" + "xorm.io/xorm" +) + +type projectView20240329170952 struct { + ID int64 `xorm:"autoincr not null unique pk" json:"id" param:"view"` + Filter string `xorm:"text null default null" query:"filter" json:"filter"` + ViewKind int `xorm:"not null" json:"view_kind"` +} + +func (projectView20240329170952) TableName() string { + return "project_views" +} + +func init() { + migrations = append(migrations, &xormigrate.Migration{ + ID: "20240329170952", + Description: "Update default filter for list views to hide completed tasks", + Migrate: func(tx *xorm.Engine) error { + + // Update the filter for all list views to hide completed tasks unless the filter is already set + _, err := tx.Where("view_kind = ? AND filter = ?", 0, "").Cols("filter").Update(&projectView20240329170952{Filter: "done = false"}) + if err != nil { + return err + } + return nil + }, + Rollback: func(tx *xorm.Engine) error { + return nil + }, + }) +} diff --git a/pkg/models/project_view.go b/pkg/models/project_view.go index 4788f9399..66cc98f48 100644 --- a/pkg/models/project_view.go +++ b/pkg/models/project_view.go @@ -391,6 +391,7 @@ func CreateDefaultViewsForProject(s *xorm.Session, project *Project, a web.Auth, Title: "List", ViewKind: ProjectViewKindList, Position: 100, + Filter: "done = false", } err = createProjectView(s, list, a, createBacklogBucket) if err != nil {