From 1b6d50860c0b29c227120ce3b84c1a9ba4c96c1a Mon Sep 17 00:00:00 2001 From: Stefan Genov Date: Wed, 15 Dec 2021 09:02:32 +0200 Subject: [PATCH] [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() },