From 556f7ab6bf7eba8c2716742ca5308967352d24c5 Mon Sep 17 00:00:00 2001
From: Stefan Genov <stefantigro@gmail.com>
Date: Thu, 9 Dec 2021 08:52:15 +0200
Subject: [PATCH 1/9] [alphabetical-sort] Done with checkbox

---
 src/components/list/partials/filters.vue | 29 ++++++++++++++++++++++++
 src/components/tasks/mixins/taskList.js  | 12 +++++++++-
 src/i18n/lang/en.json                    |  1 +
 src/views/list/views/List.vue            | 24 ++++++++++++++------
 vite.config.js                           |  3 +++
 5 files changed, 61 insertions(+), 8 deletions(-)

diff --git a/src/components/list/partials/filters.vue b/src/components/list/partials/filters.vue
index 039061ac3..57fc4c5a1 100644
--- a/src/components/list/partials/filters.vue
+++ b/src/components/list/partials/filters.vue
@@ -18,6 +18,23 @@
 					{{ $t('filters.attributes.showDoneTasks') }}
 				</fancycheckbox>
 			</div>
+			<div class="field">
+				<label class="label">{{ $t('task.attributes.sortAlphabetically') }}</label>
+				<div class="control">
+					<flat-pickr
+							:config="flatPickerConfig"
+							@on-close="setStartDateFilter"
+							class="input"
+							:placeholder="$t('filters.attributes.sortAlphabetically')"
+							v-model="filters.startDate"
+					/>
+				</div>
+			</div>
+			<div class="control">
+				<fancycheckbox @change="setSortAlphabetically" v-model="sortAlphabetically">
+					{{ $t('filters.attributes.sortAlphabetically') }}
+				</fancycheckbox>
+			</div>
 		</div>
 		<div class="field">
 			<label class="label">{{ $t('misc.search') }}</label>
@@ -190,6 +207,7 @@ import NamespaceService from '@/services/namespace'
 import EditLabels from '@/components/tasks/partials/editLabels.vue'
 
 import {objectToSnakeCase} from '@/helpers/case'
+import {getDefaultParams} from "../../tasks/mixins/taskList"
 
 // FIXME: merge with DEFAULT_PARAMS in taskList.js
 const DEFAULT_PARAMS = {
@@ -234,6 +252,7 @@ export default {
 		return {
 			params: DEFAULT_PARAMS,
 			filters: DEFAULT_FILTERS,
+			sortAlphabetically: false,
 
 			usersService: new UserService(),
 			foundusers: [],
@@ -490,6 +509,16 @@ export default {
 			}
 			this.change()
 		},
+		setSortAlphabetically() {
+			if ( ! this.sortAlphabetically) {
+				this.params.sort_by	= getDefaultParams().sort_by
+				this.sortAlphabetically	= false
+			} else {
+				this.params.sort_by	= ['title']
+				this.sortAlphabetically	= true
+			}
+			this.change()
+		},
 		setFilterConcat() {
 			if (this.filters.requireAllFilters) {
 				this.params.filter_concat = 'and'
diff --git a/src/components/tasks/mixins/taskList.js b/src/components/tasks/mixins/taskList.js
index 5326b25ed..8361c6615 100644
--- a/src/components/tasks/mixins/taskList.js
+++ b/src/components/tasks/mixins/taskList.js
@@ -27,6 +27,8 @@ export default {
 
 			showTaskFilter: false,
 			params: {...getDefaultParams()},
+
+			sorting: getDefaultParams().sort_by,
 		}
 	},
 	watch: {
@@ -44,7 +46,10 @@ export default {
 			params = null,
 			forceLoading = false,
 		) {
-
+			console.log( page )
+			console.log( search )
+			console.log( params )
+			console.log( forceLoading )
 			// Because this function is triggered every time on topNavigation, we're putting a condition here to only load it when we actually want to show tasks
 			// FIXME: This is a bit hacky -> Cleanup.
 			if (
@@ -59,10 +64,15 @@ export default {
 				params = this.params
 			}
 
+			console.log( this.params )
+			
 			if (search !== '') {
 				params.s = search
 			}
 
+			//Save current sort
+			this.sorting	= params.sort_by
+
 			const list = {listId: parseInt(this.$route.params.listId)}
 
 			const currentList = {
diff --git a/src/i18n/lang/en.json b/src/i18n/lang/en.json
index 09714acd6..62cc65bf3 100644
--- a/src/i18n/lang/en.json
+++ b/src/i18n/lang/en.json
@@ -373,6 +373,7 @@
       "includeNulls": "Include Tasks which don't have a value set",
       "requireAll": "Require all filters to be true for a task to show up",
       "showDoneTasks": "Show Done Tasks",
+      "sortAlphabetically": "Sort Alphabetically",
       "enablePriority": "Enable Filter By Priority",
       "enablePercentDone": "Enable Filter By Percent Done",
       "dueDateRange": "Due Date Range",
diff --git a/src/views/list/views/List.vue b/src/views/list/views/List.vue
index 9d121fc65..b2e3fee6b 100644
--- a/src/views/list/views/List.vue
+++ b/src/views/list/views/List.vue
@@ -81,7 +81,7 @@
 						:disabled="!canWrite"
 						item-key="id"
 						:component-data="{
-							class: { 'dragging-disabled': !canWrite },
+							class: { 'dragging-disabled': !canWrite || !canDrag },
 						}"
 					>
 						<template #item="{element: t}">
@@ -216,6 +216,9 @@ export default {
 		canWrite() {
 			return this.list.maxRight > Rights.READ && this.list.id > 0
 		},
+		canDrag() {
+			return ! this.isAlphabeticalSorting()
+		},
 		list() {
 			return this.$store.state.currentList
 		},
@@ -224,6 +227,9 @@ export default {
 		this.$nextTick(() => (this.ctaVisible = true))
 	},
 	methods: {
+		isAlphabeticalSorting() {
+			return this.sorting.find( sortBy => sortBy === 'title' ) !== undefined
+		},
 		searchTasks() {
 			// Only search if the search term changed
 			if (this.$route.query === this.searchTerm) {
@@ -254,13 +260,17 @@ export default {
 		focusNewTaskInput() {
 			this.$refs.newTaskInput.$refs.newTaskInput.focus()
 		},
-		updateTaskList(task) {
-			const tasks = [
-				task,
-				...this.tasks,
-			]
-			this.tasks = tasks
+		updateTaskList() {
+			// const tasks = [
+			// 	task,
+			// 	...this.tasks,
+			// ]
+			// this.tasks = tasks
 			this.$store.commit(HAS_TASKS, true)
+			this.reloadTasksWithCurrentFilterAndSorting()
+		},
+		reloadTasksWithCurrentFilterAndSorting(){
+			this.loadTasks(undefined, undefined, undefined, true)
 		},
 		editTask(id) {
 			// Find the selected task and set it to the current object
diff --git a/vite.config.js b/vite.config.js
index 1d44bbeb4..beb42c7ac 100644
--- a/vite.config.js
+++ b/vite.config.js
@@ -125,6 +125,9 @@ export default defineConfig({
 		extensions: ['.mjs', '.js', '.ts', '.jsx', '.tsx', '.json', '.vue'],
 	},
 	server: {
+		watch: {
+			usePolling: true,
+		},
 		port: 5000,
 		strictPort: true,
 	},
-- 
2.40.1


From 95424e4c233462a8b3714948a152b609dd9a70c3 Mon Sep 17 00:00:00 2001
From: Stefan Genov <stefantigro@gmail.com>
Date: Thu, 9 Dec 2021 08:59:45 +0200
Subject: [PATCH 2/9] [alphabetical-sort] Removed dropdwon for now

---
 src/components/list/partials/filters.vue | 12 ------------
 src/components/tasks/mixins/taskList.js  |  6 ------
 src/i18n/lang/cs-CZ.json                 |  1 +
 src/i18n/lang/de-DE.json                 |  1 +
 src/i18n/lang/de-swiss.json              |  1 +
 src/i18n/lang/es-ES.json                 |  1 +
 src/i18n/lang/fr-FR.json                 |  1 +
 src/i18n/lang/it-IT.json                 |  1 +
 src/i18n/lang/nl-NL.json                 |  1 +
 src/i18n/lang/pt-BR.json                 |  1 +
 src/i18n/lang/pt-PT.json                 |  1 +
 src/i18n/lang/ro-RO.json                 |  1 +
 src/i18n/lang/ru-RU.json                 |  1 +
 src/i18n/lang/sv-SE.json                 |  1 +
 src/i18n/lang/tr-TR.json                 |  1 +
 src/i18n/lang/vi-VN.json                 |  1 +
 16 files changed, 14 insertions(+), 18 deletions(-)

diff --git a/src/components/list/partials/filters.vue b/src/components/list/partials/filters.vue
index 57fc4c5a1..47fa6f30d 100644
--- a/src/components/list/partials/filters.vue
+++ b/src/components/list/partials/filters.vue
@@ -18,18 +18,6 @@
 					{{ $t('filters.attributes.showDoneTasks') }}
 				</fancycheckbox>
 			</div>
-			<div class="field">
-				<label class="label">{{ $t('task.attributes.sortAlphabetically') }}</label>
-				<div class="control">
-					<flat-pickr
-							:config="flatPickerConfig"
-							@on-close="setStartDateFilter"
-							class="input"
-							:placeholder="$t('filters.attributes.sortAlphabetically')"
-							v-model="filters.startDate"
-					/>
-				</div>
-			</div>
 			<div class="control">
 				<fancycheckbox @change="setSortAlphabetically" v-model="sortAlphabetically">
 					{{ $t('filters.attributes.sortAlphabetically') }}
diff --git a/src/components/tasks/mixins/taskList.js b/src/components/tasks/mixins/taskList.js
index 8361c6615..9b5bb7feb 100644
--- a/src/components/tasks/mixins/taskList.js
+++ b/src/components/tasks/mixins/taskList.js
@@ -46,10 +46,6 @@ export default {
 			params = null,
 			forceLoading = false,
 		) {
-			console.log( page )
-			console.log( search )
-			console.log( params )
-			console.log( forceLoading )
 			// Because this function is triggered every time on topNavigation, we're putting a condition here to only load it when we actually want to show tasks
 			// FIXME: This is a bit hacky -> Cleanup.
 			if (
@@ -64,8 +60,6 @@ export default {
 				params = this.params
 			}
 
-			console.log( this.params )
-			
 			if (search !== '') {
 				params.s = search
 			}
diff --git a/src/i18n/lang/cs-CZ.json b/src/i18n/lang/cs-CZ.json
index bdba5a2af..8beae23e9 100644
--- a/src/i18n/lang/cs-CZ.json
+++ b/src/i18n/lang/cs-CZ.json
@@ -373,6 +373,7 @@
       "includeNulls": "Zahrnout úkoly, které nemají nastavenou hodnotu",
       "requireAll": "Vyžaduje aby všechny filtry odpovídaly, aby se úkol zobrazil",
       "showDoneTasks": "Zobrazit dokončené úkoly",
+      "sortAlphabetically": "Sort Alphabetically",
       "enablePriority": "Povolit filtrování podle priority",
       "enablePercentDone": "Povolit filtrování dle dokončenosti",
       "dueDateRange": "Rozsah termínu",
diff --git a/src/i18n/lang/de-DE.json b/src/i18n/lang/de-DE.json
index 631d14162..fdf104808 100644
--- a/src/i18n/lang/de-DE.json
+++ b/src/i18n/lang/de-DE.json
@@ -373,6 +373,7 @@
       "includeNulls": "Aufgaben ohne Werte einbeziehen",
       "requireAll": "Alle Filterkriterien müssen erfüllt sein, damit eine Aufgabe angezeigt wird",
       "showDoneTasks": "Erledigte Aufgaben anzeigen",
+      "sortAlphabetically": "Sort Alphabetically",
       "enablePriority": "Filter nach Priorität aktivieren",
       "enablePercentDone": "Filter nach % Erledigt aktivieren",
       "dueDateRange": "Fälligkeitsbereich",
diff --git a/src/i18n/lang/de-swiss.json b/src/i18n/lang/de-swiss.json
index e10df3b68..d84f38a1d 100644
--- a/src/i18n/lang/de-swiss.json
+++ b/src/i18n/lang/de-swiss.json
@@ -373,6 +373,7 @@
       "includeNulls": "Uufgabe ohni Wert iihbezieh",
       "requireAll": "Alli Filter mend wahr sii, demits die Uufgab ahzeigt",
       "showDoneTasks": "Zeig die fertige Uufgabe",
+      "sortAlphabetically": "Sort Alphabetically",
       "enablePriority": "Filter nach Priorität aktiviere",
       "enablePercentDone": "Filter nach Prozent iihschalte",
       "dueDateRange": "Fälligkeitsberiich",
diff --git a/src/i18n/lang/es-ES.json b/src/i18n/lang/es-ES.json
index 09714acd6..62cc65bf3 100644
--- a/src/i18n/lang/es-ES.json
+++ b/src/i18n/lang/es-ES.json
@@ -373,6 +373,7 @@
       "includeNulls": "Include Tasks which don't have a value set",
       "requireAll": "Require all filters to be true for a task to show up",
       "showDoneTasks": "Show Done Tasks",
+      "sortAlphabetically": "Sort Alphabetically",
       "enablePriority": "Enable Filter By Priority",
       "enablePercentDone": "Enable Filter By Percent Done",
       "dueDateRange": "Due Date Range",
diff --git a/src/i18n/lang/fr-FR.json b/src/i18n/lang/fr-FR.json
index 7a74847b5..3eafd71f0 100644
--- a/src/i18n/lang/fr-FR.json
+++ b/src/i18n/lang/fr-FR.json
@@ -373,6 +373,7 @@
       "includeNulls": "Inclure les tâches sans valeurs",
       "requireAll": "Exiger tous les filtres pour qu’une tâche s’affiche",
       "showDoneTasks": "Afficher les tâches terminées",
+      "sortAlphabetically": "Sort Alphabetically",
       "enablePriority": "Activer le filtre par priorité",
       "enablePercentDone": "Par % d’achèvement",
       "dueDateRange": "Plage de dates d’échéance",
diff --git a/src/i18n/lang/it-IT.json b/src/i18n/lang/it-IT.json
index e80271390..b4abedb8a 100644
--- a/src/i18n/lang/it-IT.json
+++ b/src/i18n/lang/it-IT.json
@@ -373,6 +373,7 @@
       "includeNulls": "Includi attività che non hanno un valore impostato",
       "requireAll": "Tutti i filtri devono essere veri affinché l'attività venga mostrata",
       "showDoneTasks": "Mostra Attività Fatte",
+      "sortAlphabetically": "Sort Alphabetically",
       "enablePriority": "Abilita Filtro Per Priorità",
       "enablePercentDone": "Abilitare Filtro Per Percentuale Fatta",
       "dueDateRange": "Intervallo Data Di Scadenza",
diff --git a/src/i18n/lang/nl-NL.json b/src/i18n/lang/nl-NL.json
index 09714acd6..62cc65bf3 100644
--- a/src/i18n/lang/nl-NL.json
+++ b/src/i18n/lang/nl-NL.json
@@ -373,6 +373,7 @@
       "includeNulls": "Include Tasks which don't have a value set",
       "requireAll": "Require all filters to be true for a task to show up",
       "showDoneTasks": "Show Done Tasks",
+      "sortAlphabetically": "Sort Alphabetically",
       "enablePriority": "Enable Filter By Priority",
       "enablePercentDone": "Enable Filter By Percent Done",
       "dueDateRange": "Due Date Range",
diff --git a/src/i18n/lang/pt-BR.json b/src/i18n/lang/pt-BR.json
index 09714acd6..62cc65bf3 100644
--- a/src/i18n/lang/pt-BR.json
+++ b/src/i18n/lang/pt-BR.json
@@ -373,6 +373,7 @@
       "includeNulls": "Include Tasks which don't have a value set",
       "requireAll": "Require all filters to be true for a task to show up",
       "showDoneTasks": "Show Done Tasks",
+      "sortAlphabetically": "Sort Alphabetically",
       "enablePriority": "Enable Filter By Priority",
       "enablePercentDone": "Enable Filter By Percent Done",
       "dueDateRange": "Due Date Range",
diff --git a/src/i18n/lang/pt-PT.json b/src/i18n/lang/pt-PT.json
index 09714acd6..62cc65bf3 100644
--- a/src/i18n/lang/pt-PT.json
+++ b/src/i18n/lang/pt-PT.json
@@ -373,6 +373,7 @@
       "includeNulls": "Include Tasks which don't have a value set",
       "requireAll": "Require all filters to be true for a task to show up",
       "showDoneTasks": "Show Done Tasks",
+      "sortAlphabetically": "Sort Alphabetically",
       "enablePriority": "Enable Filter By Priority",
       "enablePercentDone": "Enable Filter By Percent Done",
       "dueDateRange": "Due Date Range",
diff --git a/src/i18n/lang/ro-RO.json b/src/i18n/lang/ro-RO.json
index 09714acd6..62cc65bf3 100644
--- a/src/i18n/lang/ro-RO.json
+++ b/src/i18n/lang/ro-RO.json
@@ -373,6 +373,7 @@
       "includeNulls": "Include Tasks which don't have a value set",
       "requireAll": "Require all filters to be true for a task to show up",
       "showDoneTasks": "Show Done Tasks",
+      "sortAlphabetically": "Sort Alphabetically",
       "enablePriority": "Enable Filter By Priority",
       "enablePercentDone": "Enable Filter By Percent Done",
       "dueDateRange": "Due Date Range",
diff --git a/src/i18n/lang/ru-RU.json b/src/i18n/lang/ru-RU.json
index 6d79047db..263357412 100644
--- a/src/i18n/lang/ru-RU.json
+++ b/src/i18n/lang/ru-RU.json
@@ -373,6 +373,7 @@
       "includeNulls": "Включать задачи, у которых не установлено значение",
       "requireAll": "Для отображения задачи требовать истинность всех фильтров",
       "showDoneTasks": "Показывать завершённые задачи",
+      "sortAlphabetically": "Sort Alphabetically",
       "enablePriority": "Вкл. фильтр по приоритету",
       "enablePercentDone": "По % завершения",
       "dueDateRange": "Диапазон срока",
diff --git a/src/i18n/lang/sv-SE.json b/src/i18n/lang/sv-SE.json
index 09714acd6..62cc65bf3 100644
--- a/src/i18n/lang/sv-SE.json
+++ b/src/i18n/lang/sv-SE.json
@@ -373,6 +373,7 @@
       "includeNulls": "Include Tasks which don't have a value set",
       "requireAll": "Require all filters to be true for a task to show up",
       "showDoneTasks": "Show Done Tasks",
+      "sortAlphabetically": "Sort Alphabetically",
       "enablePriority": "Enable Filter By Priority",
       "enablePercentDone": "Enable Filter By Percent Done",
       "dueDateRange": "Due Date Range",
diff --git a/src/i18n/lang/tr-TR.json b/src/i18n/lang/tr-TR.json
index 09714acd6..62cc65bf3 100644
--- a/src/i18n/lang/tr-TR.json
+++ b/src/i18n/lang/tr-TR.json
@@ -373,6 +373,7 @@
       "includeNulls": "Include Tasks which don't have a value set",
       "requireAll": "Require all filters to be true for a task to show up",
       "showDoneTasks": "Show Done Tasks",
+      "sortAlphabetically": "Sort Alphabetically",
       "enablePriority": "Enable Filter By Priority",
       "enablePercentDone": "Enable Filter By Percent Done",
       "dueDateRange": "Due Date Range",
diff --git a/src/i18n/lang/vi-VN.json b/src/i18n/lang/vi-VN.json
index 9453e1a28..cb91e99aa 100644
--- a/src/i18n/lang/vi-VN.json
+++ b/src/i18n/lang/vi-VN.json
@@ -373,6 +373,7 @@
       "includeNulls": "Bao gồm các Công việc không có bộ giá trị",
       "requireAll": "Yêu cầu tất cả các bộ lọc phải đúng để một công việc được hiển thị",
       "showDoneTasks": "Hiển thị các công việc đã hoàn thành",
+      "sortAlphabetically": "Sort Alphabetically",
       "enablePriority": "Bật Bộ lọc theo mức độ ưu tiên",
       "enablePercentDone": "Bật Bộ lọc theo tỉ lệ % hoàn thành",
       "dueDateRange": "Phạm vi ngày đến hạn",
-- 
2.40.1


From 6b5d72da72a5ddd9e2091f81d6c45f557cddc127 Mon Sep 17 00:00:00 2001
From: Stefan Genov <stefantigro@gmail.com>
Date: Thu, 9 Dec 2021 09:01:06 +0200
Subject: [PATCH 3/9] [alphabetical-sort] Added one todo

---
 src/components/list/partials/filters.vue | 1 +
 vite.config.js                           | 3 ---
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/components/list/partials/filters.vue b/src/components/list/partials/filters.vue
index 47fa6f30d..b5b2691a8 100644
--- a/src/components/list/partials/filters.vue
+++ b/src/components/list/partials/filters.vue
@@ -497,6 +497,7 @@ export default {
 			}
 			this.change()
 		},
+		// @TODO - Improve logic to work for all sorts ideally.
 		setSortAlphabetically() {
 			if ( ! this.sortAlphabetically) {
 				this.params.sort_by	= getDefaultParams().sort_by
diff --git a/vite.config.js b/vite.config.js
index beb42c7ac..1d44bbeb4 100644
--- a/vite.config.js
+++ b/vite.config.js
@@ -125,9 +125,6 @@ export default defineConfig({
 		extensions: ['.mjs', '.js', '.ts', '.jsx', '.tsx', '.json', '.vue'],
 	},
 	server: {
-		watch: {
-			usePolling: true,
-		},
 		port: 5000,
 		strictPort: true,
 	},
-- 
2.40.1


From 1b6d50860c0b29c227120ce3b84c1a9ba4c96c1a Mon Sep 17 00:00:00 2001
From: Stefan Genov <stefantigro@gmail.com>
Date: Wed, 15 Dec 2021 09:02:32 +0200
Subject: [PATCH 4/9] [alphabetical-sort] Review fixes

---
 src/components/list/partials/filters.vue | 6 ++++--
 src/i18n/lang/cs-CZ.json                 | 1 -
 src/i18n/lang/de-DE.json                 | 1 -
 src/i18n/lang/de-swiss.json              | 1 -
 src/i18n/lang/es-ES.json                 | 1 -
 src/i18n/lang/fr-FR.json                 | 1 -
 src/i18n/lang/it-IT.json                 | 1 -
 src/i18n/lang/nl-NL.json                 | 1 -
 src/i18n/lang/pt-BR.json                 | 1 -
 src/i18n/lang/pt-PT.json                 | 1 -
 src/i18n/lang/ro-RO.json                 | 1 -
 src/i18n/lang/ru-RU.json                 | 1 -
 src/i18n/lang/sv-SE.json                 | 1 -
 src/i18n/lang/tr-TR.json                 | 1 -
 src/i18n/lang/vi-VN.json                 | 1 -
 src/views/list/views/List.vue            | 5 -----
 16 files changed, 4 insertions(+), 21 deletions(-)

diff --git a/src/components/list/partials/filters.vue b/src/components/list/partials/filters.vue
index b5b2691a8..2b36ff56b 100644
--- a/src/components/list/partials/filters.vue
+++ b/src/components/list/partials/filters.vue
@@ -195,7 +195,7 @@ import NamespaceService from '@/services/namespace'
 import EditLabels from '@/components/tasks/partials/editLabels.vue'
 
 import {objectToSnakeCase} from '@/helpers/case'
-import {getDefaultParams} from "../../tasks/mixins/taskList"
+import {getDefaultParams} from '../../tasks/mixins/taskList'
 
 // FIXME: merge with DEFAULT_PARAMS in taskList.js
 const DEFAULT_PARAMS = {
@@ -226,6 +226,8 @@ const DEFAULT_FILTERS = {
 	namespace: '',
 }
 
+const ALPHABETICAL_SORT	= ['title']
+
 export default {
 	name: 'filters',
 	components: {
@@ -503,7 +505,7 @@ export default {
 				this.params.sort_by	= getDefaultParams().sort_by
 				this.sortAlphabetically	= false
 			} else {
-				this.params.sort_by	= ['title']
+				this.params.sort_by	= ALPHABETICAL_SORT
 				this.sortAlphabetically	= true
 			}
 			this.change()
diff --git a/src/i18n/lang/cs-CZ.json b/src/i18n/lang/cs-CZ.json
index 8beae23e9..bdba5a2af 100644
--- a/src/i18n/lang/cs-CZ.json
+++ b/src/i18n/lang/cs-CZ.json
@@ -373,7 +373,6 @@
       "includeNulls": "Zahrnout úkoly, které nemají nastavenou hodnotu",
       "requireAll": "Vyžaduje aby všechny filtry odpovídaly, aby se úkol zobrazil",
       "showDoneTasks": "Zobrazit dokončené úkoly",
-      "sortAlphabetically": "Sort Alphabetically",
       "enablePriority": "Povolit filtrování podle priority",
       "enablePercentDone": "Povolit filtrování dle dokončenosti",
       "dueDateRange": "Rozsah termínu",
diff --git a/src/i18n/lang/de-DE.json b/src/i18n/lang/de-DE.json
index fdf104808..631d14162 100644
--- a/src/i18n/lang/de-DE.json
+++ b/src/i18n/lang/de-DE.json
@@ -373,7 +373,6 @@
       "includeNulls": "Aufgaben ohne Werte einbeziehen",
       "requireAll": "Alle Filterkriterien müssen erfüllt sein, damit eine Aufgabe angezeigt wird",
       "showDoneTasks": "Erledigte Aufgaben anzeigen",
-      "sortAlphabetically": "Sort Alphabetically",
       "enablePriority": "Filter nach Priorität aktivieren",
       "enablePercentDone": "Filter nach % Erledigt aktivieren",
       "dueDateRange": "Fälligkeitsbereich",
diff --git a/src/i18n/lang/de-swiss.json b/src/i18n/lang/de-swiss.json
index d84f38a1d..e10df3b68 100644
--- a/src/i18n/lang/de-swiss.json
+++ b/src/i18n/lang/de-swiss.json
@@ -373,7 +373,6 @@
       "includeNulls": "Uufgabe ohni Wert iihbezieh",
       "requireAll": "Alli Filter mend wahr sii, demits die Uufgab ahzeigt",
       "showDoneTasks": "Zeig die fertige Uufgabe",
-      "sortAlphabetically": "Sort Alphabetically",
       "enablePriority": "Filter nach Priorität aktiviere",
       "enablePercentDone": "Filter nach Prozent iihschalte",
       "dueDateRange": "Fälligkeitsberiich",
diff --git a/src/i18n/lang/es-ES.json b/src/i18n/lang/es-ES.json
index 62cc65bf3..09714acd6 100644
--- a/src/i18n/lang/es-ES.json
+++ b/src/i18n/lang/es-ES.json
@@ -373,7 +373,6 @@
       "includeNulls": "Include Tasks which don't have a value set",
       "requireAll": "Require all filters to be true for a task to show up",
       "showDoneTasks": "Show Done Tasks",
-      "sortAlphabetically": "Sort Alphabetically",
       "enablePriority": "Enable Filter By Priority",
       "enablePercentDone": "Enable Filter By Percent Done",
       "dueDateRange": "Due Date Range",
diff --git a/src/i18n/lang/fr-FR.json b/src/i18n/lang/fr-FR.json
index 3eafd71f0..7a74847b5 100644
--- a/src/i18n/lang/fr-FR.json
+++ b/src/i18n/lang/fr-FR.json
@@ -373,7 +373,6 @@
       "includeNulls": "Inclure les tâches sans valeurs",
       "requireAll": "Exiger tous les filtres pour qu’une tâche s’affiche",
       "showDoneTasks": "Afficher les tâches terminées",
-      "sortAlphabetically": "Sort Alphabetically",
       "enablePriority": "Activer le filtre par priorité",
       "enablePercentDone": "Par % d’achèvement",
       "dueDateRange": "Plage de dates d’échéance",
diff --git a/src/i18n/lang/it-IT.json b/src/i18n/lang/it-IT.json
index b4abedb8a..e80271390 100644
--- a/src/i18n/lang/it-IT.json
+++ b/src/i18n/lang/it-IT.json
@@ -373,7 +373,6 @@
       "includeNulls": "Includi attività che non hanno un valore impostato",
       "requireAll": "Tutti i filtri devono essere veri affinché l'attività venga mostrata",
       "showDoneTasks": "Mostra Attività Fatte",
-      "sortAlphabetically": "Sort Alphabetically",
       "enablePriority": "Abilita Filtro Per Priorità",
       "enablePercentDone": "Abilitare Filtro Per Percentuale Fatta",
       "dueDateRange": "Intervallo Data Di Scadenza",
diff --git a/src/i18n/lang/nl-NL.json b/src/i18n/lang/nl-NL.json
index 62cc65bf3..09714acd6 100644
--- a/src/i18n/lang/nl-NL.json
+++ b/src/i18n/lang/nl-NL.json
@@ -373,7 +373,6 @@
       "includeNulls": "Include Tasks which don't have a value set",
       "requireAll": "Require all filters to be true for a task to show up",
       "showDoneTasks": "Show Done Tasks",
-      "sortAlphabetically": "Sort Alphabetically",
       "enablePriority": "Enable Filter By Priority",
       "enablePercentDone": "Enable Filter By Percent Done",
       "dueDateRange": "Due Date Range",
diff --git a/src/i18n/lang/pt-BR.json b/src/i18n/lang/pt-BR.json
index 62cc65bf3..09714acd6 100644
--- a/src/i18n/lang/pt-BR.json
+++ b/src/i18n/lang/pt-BR.json
@@ -373,7 +373,6 @@
       "includeNulls": "Include Tasks which don't have a value set",
       "requireAll": "Require all filters to be true for a task to show up",
       "showDoneTasks": "Show Done Tasks",
-      "sortAlphabetically": "Sort Alphabetically",
       "enablePriority": "Enable Filter By Priority",
       "enablePercentDone": "Enable Filter By Percent Done",
       "dueDateRange": "Due Date Range",
diff --git a/src/i18n/lang/pt-PT.json b/src/i18n/lang/pt-PT.json
index 62cc65bf3..09714acd6 100644
--- a/src/i18n/lang/pt-PT.json
+++ b/src/i18n/lang/pt-PT.json
@@ -373,7 +373,6 @@
       "includeNulls": "Include Tasks which don't have a value set",
       "requireAll": "Require all filters to be true for a task to show up",
       "showDoneTasks": "Show Done Tasks",
-      "sortAlphabetically": "Sort Alphabetically",
       "enablePriority": "Enable Filter By Priority",
       "enablePercentDone": "Enable Filter By Percent Done",
       "dueDateRange": "Due Date Range",
diff --git a/src/i18n/lang/ro-RO.json b/src/i18n/lang/ro-RO.json
index 62cc65bf3..09714acd6 100644
--- a/src/i18n/lang/ro-RO.json
+++ b/src/i18n/lang/ro-RO.json
@@ -373,7 +373,6 @@
       "includeNulls": "Include Tasks which don't have a value set",
       "requireAll": "Require all filters to be true for a task to show up",
       "showDoneTasks": "Show Done Tasks",
-      "sortAlphabetically": "Sort Alphabetically",
       "enablePriority": "Enable Filter By Priority",
       "enablePercentDone": "Enable Filter By Percent Done",
       "dueDateRange": "Due Date Range",
diff --git a/src/i18n/lang/ru-RU.json b/src/i18n/lang/ru-RU.json
index 263357412..6d79047db 100644
--- a/src/i18n/lang/ru-RU.json
+++ b/src/i18n/lang/ru-RU.json
@@ -373,7 +373,6 @@
       "includeNulls": "Включать задачи, у которых не установлено значение",
       "requireAll": "Для отображения задачи требовать истинность всех фильтров",
       "showDoneTasks": "Показывать завершённые задачи",
-      "sortAlphabetically": "Sort Alphabetically",
       "enablePriority": "Вкл. фильтр по приоритету",
       "enablePercentDone": "По % завершения",
       "dueDateRange": "Диапазон срока",
diff --git a/src/i18n/lang/sv-SE.json b/src/i18n/lang/sv-SE.json
index 62cc65bf3..09714acd6 100644
--- a/src/i18n/lang/sv-SE.json
+++ b/src/i18n/lang/sv-SE.json
@@ -373,7 +373,6 @@
       "includeNulls": "Include Tasks which don't have a value set",
       "requireAll": "Require all filters to be true for a task to show up",
       "showDoneTasks": "Show Done Tasks",
-      "sortAlphabetically": "Sort Alphabetically",
       "enablePriority": "Enable Filter By Priority",
       "enablePercentDone": "Enable Filter By Percent Done",
       "dueDateRange": "Due Date Range",
diff --git a/src/i18n/lang/tr-TR.json b/src/i18n/lang/tr-TR.json
index 62cc65bf3..09714acd6 100644
--- a/src/i18n/lang/tr-TR.json
+++ b/src/i18n/lang/tr-TR.json
@@ -373,7 +373,6 @@
       "includeNulls": "Include Tasks which don't have a value set",
       "requireAll": "Require all filters to be true for a task to show up",
       "showDoneTasks": "Show Done Tasks",
-      "sortAlphabetically": "Sort Alphabetically",
       "enablePriority": "Enable Filter By Priority",
       "enablePercentDone": "Enable Filter By Percent Done",
       "dueDateRange": "Due Date Range",
diff --git a/src/i18n/lang/vi-VN.json b/src/i18n/lang/vi-VN.json
index cb91e99aa..9453e1a28 100644
--- a/src/i18n/lang/vi-VN.json
+++ b/src/i18n/lang/vi-VN.json
@@ -373,7 +373,6 @@
       "includeNulls": "Bao gồm các Công việc không có bộ giá trị",
       "requireAll": "Yêu cầu tất cả các bộ lọc phải đúng để một công việc được hiển thị",
       "showDoneTasks": "Hiển thị các công việc đã hoàn thành",
-      "sortAlphabetically": "Sort Alphabetically",
       "enablePriority": "Bật Bộ lọc theo mức độ ưu tiên",
       "enablePercentDone": "Bật Bộ lọc theo tỉ lệ % hoàn thành",
       "dueDateRange": "Phạm vi ngày đến hạn",
diff --git a/src/views/list/views/List.vue b/src/views/list/views/List.vue
index b2e3fee6b..d234209ab 100644
--- a/src/views/list/views/List.vue
+++ b/src/views/list/views/List.vue
@@ -261,11 +261,6 @@ export default {
 			this.$refs.newTaskInput.$refs.newTaskInput.focus()
 		},
 		updateTaskList() {
-			// const tasks = [
-			// 	task,
-			// 	...this.tasks,
-			// ]
-			// this.tasks = tasks
 			this.$store.commit(HAS_TASKS, true)
 			this.reloadTasksWithCurrentFilterAndSorting()
 		},
-- 
2.40.1


From 0de59a0e947abc8fe232d8905c4caef3ec5834c2 Mon Sep 17 00:00:00 2001
From: Stefan Genov <stefantigro@gmail.com>
Date: Sun, 19 Dec 2021 15:09:13 +0200
Subject: [PATCH 5/9] [alphabetical-sort] Ammended commit

---
 src/components/list/partials/filters.vue |  6 +++---
 src/views/list/views/List.vue            | 19 +++++++++++++++----
 2 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/src/components/list/partials/filters.vue b/src/components/list/partials/filters.vue
index 2b36ff56b..15545afb3 100644
--- a/src/components/list/partials/filters.vue
+++ b/src/components/list/partials/filters.vue
@@ -195,7 +195,7 @@ import NamespaceService from '@/services/namespace'
 import EditLabels from '@/components/tasks/partials/editLabels.vue'
 
 import {objectToSnakeCase} from '@/helpers/case'
-import {getDefaultParams} from '../../tasks/mixins/taskList'
+import {getDefaultParams} from '@/components/tasks/mixins/taskList'
 
 // FIXME: merge with DEFAULT_PARAMS in taskList.js
 const DEFAULT_PARAMS = {
@@ -226,7 +226,7 @@ const DEFAULT_FILTERS = {
 	namespace: '',
 }
 
-const ALPHABETICAL_SORT	= ['title']
+export const ALPHABETICAL_SORT	= 'title'
 
 export default {
 	name: 'filters',
@@ -505,7 +505,7 @@ export default {
 				this.params.sort_by	= getDefaultParams().sort_by
 				this.sortAlphabetically	= false
 			} else {
-				this.params.sort_by	= ALPHABETICAL_SORT
+				this.params.sort_by	= [ALPHABETICAL_SORT]
 				this.sortAlphabetically	= true
 			}
 			this.change()
diff --git a/src/views/list/views/List.vue b/src/views/list/views/List.vue
index d234209ab..c31a5d7d1 100644
--- a/src/views/list/views/List.vue
+++ b/src/views/list/views/List.vue
@@ -148,6 +148,7 @@ import {HAS_TASKS} from '@/store/mutation-types'
 import Nothing from '@/components/misc/nothing.vue'
 import Pagination from '@/components/misc/pagination.vue'
 import Popup from '@/components/misc/popup'
+import { ALPHABETICAL_SORT } from '@/components/list/partials/filters'
 
 import draggable from 'vuedraggable'
 import {calculateItemPosition} from '../../../helpers/calculateItemPosition'
@@ -228,7 +229,7 @@ export default {
 	},
 	methods: {
 		isAlphabeticalSorting() {
-			return this.sorting.find( sortBy => sortBy === 'title' ) !== undefined
+			return this.sorting.find( sortBy => sortBy === ALPHABETICAL_SORT ) !== undefined
 		},
 		searchTasks() {
 			// Only search if the search term changed
@@ -260,12 +261,22 @@ export default {
 		focusNewTaskInput() {
 			this.$refs.newTaskInput.$refs.newTaskInput.focus()
 		},
-		updateTaskList() {
+		updateTaskList( task ) {
+			if ( this.isAlphabeticalSorting() ) {
+				this.reloadTasksWithCurrentFilterAndSorting()
+			}
+			else {
+				const tasks = [
+					task,
+					...this.tasks,
+				]
+				this.tasks = tasks
+			}
+
 			this.$store.commit(HAS_TASKS, true)
-			this.reloadTasksWithCurrentFilterAndSorting()
 		},
 		reloadTasksWithCurrentFilterAndSorting(){
-			this.loadTasks(undefined, undefined, undefined, true)
+			this.loadTasks(1, undefined, undefined, true)
 		},
 		editTask(id) {
 			// Find the selected task and set it to the current object
-- 
2.40.1


From cebc06071474f7145677bacf43300da2d798f9df Mon Sep 17 00:00:00 2001
From: Stefan Genov <stefantigro@gmail.com>
Date: Mon, 20 Dec 2021 11:54:37 +0200
Subject: [PATCH 6/9] [alphabetical-sort] Review fixes

---
 src/components/list/partials/filters.vue | 26 ++++++++++++------------
 src/components/tasks/mixins/taskList.js  |  5 -----
 src/views/list/views/List.vue            | 22 ++++++++------------
 3 files changed, 21 insertions(+), 32 deletions(-)

diff --git a/src/components/list/partials/filters.vue b/src/components/list/partials/filters.vue
index 15545afb3..1ffba269a 100644
--- a/src/components/list/partials/filters.vue
+++ b/src/components/list/partials/filters.vue
@@ -19,7 +19,7 @@
 				</fancycheckbox>
 			</div>
 			<div class="control">
-				<fancycheckbox @change="setSortAlphabetically" v-model="sortAlphabetically">
+				<fancycheckbox v-model="sortAlphabetically">
 					{{ $t('filters.attributes.sortAlphabetically') }}
 				</fancycheckbox>
 			</div>
@@ -242,7 +242,6 @@ export default {
 		return {
 			params: DEFAULT_PARAMS,
 			filters: DEFAULT_FILTERS,
-			sortAlphabetically: false,
 
 			usersService: new UserService(),
 			foundusers: [],
@@ -281,6 +280,18 @@ export default {
 		},
 	},
 	computed: {
+		sortAlphabetically: {
+			get() {
+				return this.params.sort_by.find(sortBy => sortBy === ALPHABETICAL_SORT) !== undefined
+			},
+			set(sortAlphabetically) {
+				this.params.sort_by	= sortAlphabetically
+					? [ALPHABETICAL_SORT]
+					: getDefaultParams().sort_by
+
+				this.change()
+			},
+		},
 		foundLabels() {
 			return this.$store.getters['labels/filterLabelsByQuery'](this.labels, this.query)
 		},
@@ -499,17 +510,6 @@ export default {
 			}
 			this.change()
 		},
-		// @TODO - Improve logic to work for all sorts ideally.
-		setSortAlphabetically() {
-			if ( ! this.sortAlphabetically) {
-				this.params.sort_by	= getDefaultParams().sort_by
-				this.sortAlphabetically	= false
-			} else {
-				this.params.sort_by	= [ALPHABETICAL_SORT]
-				this.sortAlphabetically	= true
-			}
-			this.change()
-		},
 		setFilterConcat() {
 			if (this.filters.requireAllFilters) {
 				this.params.filter_concat = 'and'
diff --git a/src/components/tasks/mixins/taskList.js b/src/components/tasks/mixins/taskList.js
index 9b5bb7feb..a9b2e5878 100644
--- a/src/components/tasks/mixins/taskList.js
+++ b/src/components/tasks/mixins/taskList.js
@@ -27,8 +27,6 @@ export default {
 
 			showTaskFilter: false,
 			params: {...getDefaultParams()},
-
-			sorting: getDefaultParams().sort_by,
 		}
 	},
 	watch: {
@@ -64,9 +62,6 @@ export default {
 				params.s = search
 			}
 
-			//Save current sort
-			this.sorting	= params.sort_by
-
 			const list = {listId: parseInt(this.$route.params.listId)}
 
 			const currentList = {
diff --git a/src/views/list/views/List.vue b/src/views/list/views/List.vue
index c31a5d7d1..e23259ba7 100644
--- a/src/views/list/views/List.vue
+++ b/src/views/list/views/List.vue
@@ -81,7 +81,7 @@
 						:disabled="!canWrite"
 						item-key="id"
 						:component-data="{
-							class: { 'dragging-disabled': !canWrite || !canDrag },
+							class: { 'dragging-disabled': !canWrite || isAlphabeticalSorting },
 						}"
 					>
 						<template #item="{element: t}">
@@ -207,6 +207,9 @@ export default {
 		saveListView(this.$route.params.listId, this.$route.name)
 	},
 	computed: {
+		isAlphabeticalSorting() {
+			return this.params.sort_by.find( sortBy => sortBy === ALPHABETICAL_SORT ) !== undefined
+		},
 		firstNewPosition() {
 			if (this.tasks.length === 0) {
 				return 0
@@ -217,9 +220,6 @@ export default {
 		canWrite() {
 			return this.list.maxRight > Rights.READ && this.list.id > 0
 		},
-		canDrag() {
-			return ! this.isAlphabeticalSorting()
-		},
 		list() {
 			return this.$store.state.currentList
 		},
@@ -228,9 +228,6 @@ export default {
 		this.$nextTick(() => (this.ctaVisible = true))
 	},
 	methods: {
-		isAlphabeticalSorting() {
-			return this.sorting.find( sortBy => sortBy === ALPHABETICAL_SORT ) !== undefined
-		},
 		searchTasks() {
 			// Only search if the search term changed
 			if (this.$route.query === this.searchTerm) {
@@ -262,22 +259,19 @@ export default {
 			this.$refs.newTaskInput.$refs.newTaskInput.focus()
 		},
 		updateTaskList( task ) {
-			if ( this.isAlphabeticalSorting() ) {
-				this.reloadTasksWithCurrentFilterAndSorting()
+			if ( this.isAlphabeticalSorting ) {
+				// reload tasks with current filter and sorting
+				this.loadTasks(1, undefined, undefined, true)
 			}
 			else {
-				const tasks = [
+				this.tasks = [
 					task,
 					...this.tasks,
 				]
-				this.tasks = tasks
 			}
 
 			this.$store.commit(HAS_TASKS, true)
 		},
-		reloadTasksWithCurrentFilterAndSorting(){
-			this.loadTasks(1, undefined, undefined, true)
-		},
 		editTask(id) {
 			// Find the selected task and set it to the current object
 			let theTask = this.getTaskById(id) // Somehow this does not work if we directly assign this to this.taskEditTask
-- 
2.40.1


From 895474e3bf43cd1feb2f3114aff92ac448aaf068 Mon Sep 17 00:00:00 2001
From: Dominik Pschenitschni <mail@celement.de>
Date: Tue, 21 Dec 2021 13:32:04 +0100
Subject: [PATCH 7/9] fix: remove error for undefined sort_by in kanban view

---
 src/components/list/partials/filters.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/list/partials/filters.vue b/src/components/list/partials/filters.vue
index 1ffba269a..3a168b3eb 100644
--- a/src/components/list/partials/filters.vue
+++ b/src/components/list/partials/filters.vue
@@ -282,7 +282,7 @@ export default {
 	computed: {
 		sortAlphabetically: {
 			get() {
-				return this.params.sort_by.find(sortBy => sortBy === ALPHABETICAL_SORT) !== undefined
+				return this.params?.sort_by?.find(sortBy => sortBy === ALPHABETICAL_SORT) !== undefined
 			},
 			set(sortAlphabetically) {
 				this.params.sort_by	= sortAlphabetically
-- 
2.40.1


From 19bde2a86e64dff2fa521665db4bbecea5cda4a0 Mon Sep 17 00:00:00 2001
From: Dominik Pschenitschni <mail@celement.de>
Date: Tue, 21 Dec 2021 13:32:39 +0100
Subject: [PATCH 8/9] feat(filters): improve grouping

---
 src/components/list/partials/filters.vue | 21 +++++++++------------
 1 file changed, 9 insertions(+), 12 deletions(-)

diff --git a/src/components/list/partials/filters.vue b/src/components/list/partials/filters.vue
index 3a168b3eb..2e872c246 100644
--- a/src/components/list/partials/filters.vue
+++ b/src/components/list/partials/filters.vue
@@ -1,18 +1,15 @@
 <template>
 	<card class="filters has-overflow">
-		<fancycheckbox v-model="params.filter_include_nulls">
-			{{ $t('filters.attributes.includeNulls') }}
-		</fancycheckbox>
-		<fancycheckbox
-			v-model="filters.requireAllFilters"
-			@change="setFilterConcat()"
-		>
-			{{ $t('filters.attributes.requireAll') }}
-		</fancycheckbox>
 		<div class="field">
-			<label class="label">
-				{{ $t('filters.attributes.showDoneTasks') }}
-			</label>
+			<fancycheckbox v-model="params.filter_include_nulls">
+				{{ $t('filters.attributes.includeNulls') }}
+			</fancycheckbox>
+			<fancycheckbox
+				v-model="filters.requireAllFilters"
+				@change="setFilterConcat()"
+			>
+				{{ $t('filters.attributes.requireAll') }}
+			</fancycheckbox>
 			<div class="control">
 				<fancycheckbox @change="setDoneFilter" v-model="filters.done">
 					{{ $t('filters.attributes.showDoneTasks') }}
-- 
2.40.1


From 4d4fb89c0c85f37477fe5c26ee14045422c16e8f Mon Sep 17 00:00:00 2001
From: Dominik Pschenitschni <mail@celement.de>
Date: Tue, 21 Dec 2021 13:51:32 +0100
Subject: [PATCH 9/9] chore: remove unnecessary control wrapper

---
 src/components/list/partials/filters.vue | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/src/components/list/partials/filters.vue b/src/components/list/partials/filters.vue
index 2e872c246..cbbb82f14 100644
--- a/src/components/list/partials/filters.vue
+++ b/src/components/list/partials/filters.vue
@@ -10,16 +10,15 @@
 			>
 				{{ $t('filters.attributes.requireAll') }}
 			</fancycheckbox>
-			<div class="control">
-				<fancycheckbox @change="setDoneFilter" v-model="filters.done">
-					{{ $t('filters.attributes.showDoneTasks') }}
-				</fancycheckbox>
-			</div>
-			<div class="control">
-				<fancycheckbox v-model="sortAlphabetically">
-					{{ $t('filters.attributes.sortAlphabetically') }}
-				</fancycheckbox>
-			</div>
+			<fancycheckbox @change="setDoneFilter" v-model="filters.done">
+				{{ $t('filters.attributes.showDoneTasks') }}
+			</fancycheckbox>
+			<fancycheckbox
+				v-if="!$route.name.includes('list.kanban') || !$route.name.includes('list.table')"
+				v-model="sortAlphabetically"
+			>
+				{{ $t('filters.attributes.sortAlphabetically') }}
+			</fancycheckbox>
 		</div>
 		<div class="field">
 			<label class="label">{{ $t('misc.search') }}</label>
-- 
2.40.1