From c3b6e13009380838ddcc4767ed9b78a10bf3f8ea Mon Sep 17 00:00:00 2001 From: kolaente Date: Sat, 2 Oct 2021 15:31:24 +0200 Subject: [PATCH 1/7] fix: typo in translation string --- src/i18n/lang/en.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/i18n/lang/en.json b/src/i18n/lang/en.json index c4d1135f..b70c6e20 100644 --- a/src/i18n/lang/en.json +++ b/src/i18n/lang/en.json @@ -128,7 +128,7 @@ } }, "list": { - "archived": "This list is archived. It is not possible to create new or edit tasks or it.", + "archived": "This list is archived. It is not possible to create new or edit tasks for it.", "title": "List Title", "color": "Color", "lists": "Lists", From 64abb1ce379c3400357cf0bbb7595cf5682f2e11 Mon Sep 17 00:00:00 2001 From: dpschen Date: Sat, 2 Oct 2021 13:33:01 +0000 Subject: [PATCH 2/7] feat: watch taskId instead of whole route (#812) Co-authored-by: Dominik Pschenitschni Reviewed-on: https://kolaente.dev/vikunja/frontend/pulls/812 Reviewed-by: konrad Co-authored-by: dpschen Co-committed-by: dpschen --- src/views/tasks/TaskDetailView.vue | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/src/views/tasks/TaskDetailView.vue b/src/views/tasks/TaskDetailView.vue index 653af154..6635097b 100644 --- a/src/views/tasks/TaskDetailView.vue +++ b/src/views/tasks/TaskDetailView.vue @@ -471,7 +471,6 @@ export default { }, data() { return { - taskId: Number(this.$route.params.id), taskService: new TaskService(), task: new TaskModel(), relationKinds: relationKinds, @@ -507,13 +506,16 @@ export default { } }, watch: { - '$route': { + taskId: { handler: 'loadTask', - deep: true, immediate: true, }, }, computed: { + taskId() { + const { id } = this.$route.params + return id === undefined ? id : Number(id) + }, currentList() { return this.$store.state[CURRENT_LIST] }, @@ -557,9 +559,12 @@ export default { return uploadFile(this.taskId, ...args) }, - loadTask() { - this.taskId = Number(this.$route.params.id) - this.taskService.get({id: this.taskId}) + loadTask(taskId) { + if (taskId === undefined) { + return + } + + this.taskService.get({id: taskId}) .then(r => { this.$set(this, 'task', r) this.$store.commit('attachments/set', r.attachments) From 7488378f5c729bf63a95ff2eceb332b109ff9f6b Mon Sep 17 00:00:00 2001 From: dpschen Date: Sat, 2 Oct 2021 13:38:38 +0000 Subject: [PATCH 3/7] [skip ci] Updated translations via Crowdin --- src/i18n/lang/de-DE.json | 2 +- src/i18n/lang/de-swiss.json | 2 +- src/i18n/lang/es-ES.json | 2 +- src/i18n/lang/fr-FR.json | 2 +- src/i18n/lang/it-IT.json | 2 +- src/i18n/lang/nl-NL.json | 2 +- src/i18n/lang/pt-BR.json | 2 +- src/i18n/lang/pt-PT.json | 2 +- src/i18n/lang/ro-RO.json | 2 +- src/i18n/lang/ru-RU.json | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/i18n/lang/de-DE.json b/src/i18n/lang/de-DE.json index 4e40564f..587abf29 100644 --- a/src/i18n/lang/de-DE.json +++ b/src/i18n/lang/de-DE.json @@ -128,7 +128,7 @@ } }, "list": { - "archived": "Diese Liste ist archiviert. Es ist nicht möglich, neue Aufgaben zu erstellen oder sie zu bearbeiten.", + "archived": "This list is archived. It is not possible to create new or edit tasks for it.", "title": "Listentitel", "color": "Farbe", "lists": "Listen", diff --git a/src/i18n/lang/de-swiss.json b/src/i18n/lang/de-swiss.json index d292020f..7de4d803 100644 --- a/src/i18n/lang/de-swiss.json +++ b/src/i18n/lang/de-swiss.json @@ -128,7 +128,7 @@ } }, "list": { - "archived": "Die Liste isch archiviert. Es isch nid möglich e neui Uufgab drin z'erstelle oder z'bearbeite.", + "archived": "This list is archived. It is not possible to create new or edit tasks for it.", "title": "Liste Titl", "color": "Farb", "lists": "Listene", diff --git a/src/i18n/lang/es-ES.json b/src/i18n/lang/es-ES.json index c4d1135f..b70c6e20 100644 --- a/src/i18n/lang/es-ES.json +++ b/src/i18n/lang/es-ES.json @@ -128,7 +128,7 @@ } }, "list": { - "archived": "This list is archived. It is not possible to create new or edit tasks or it.", + "archived": "This list is archived. It is not possible to create new or edit tasks for it.", "title": "List Title", "color": "Color", "lists": "Lists", diff --git a/src/i18n/lang/fr-FR.json b/src/i18n/lang/fr-FR.json index ab9f5e3f..e3eea77a 100644 --- a/src/i18n/lang/fr-FR.json +++ b/src/i18n/lang/fr-FR.json @@ -128,7 +128,7 @@ } }, "list": { - "archived": "Cette liste est archivée. Il n’est pas possible d’y créer de nouvelles tâches ou de les modifier.", + "archived": "This list is archived. It is not possible to create new or edit tasks for it.", "title": "Nom de la liste", "color": "Couleur", "lists": "Listes", diff --git a/src/i18n/lang/it-IT.json b/src/i18n/lang/it-IT.json index c4d1135f..b70c6e20 100644 --- a/src/i18n/lang/it-IT.json +++ b/src/i18n/lang/it-IT.json @@ -128,7 +128,7 @@ } }, "list": { - "archived": "This list is archived. It is not possible to create new or edit tasks or it.", + "archived": "This list is archived. It is not possible to create new or edit tasks for it.", "title": "List Title", "color": "Color", "lists": "Lists", diff --git a/src/i18n/lang/nl-NL.json b/src/i18n/lang/nl-NL.json index c4d1135f..b70c6e20 100644 --- a/src/i18n/lang/nl-NL.json +++ b/src/i18n/lang/nl-NL.json @@ -128,7 +128,7 @@ } }, "list": { - "archived": "This list is archived. It is not possible to create new or edit tasks or it.", + "archived": "This list is archived. It is not possible to create new or edit tasks for it.", "title": "List Title", "color": "Color", "lists": "Lists", diff --git a/src/i18n/lang/pt-BR.json b/src/i18n/lang/pt-BR.json index c4d1135f..b70c6e20 100644 --- a/src/i18n/lang/pt-BR.json +++ b/src/i18n/lang/pt-BR.json @@ -128,7 +128,7 @@ } }, "list": { - "archived": "This list is archived. It is not possible to create new or edit tasks or it.", + "archived": "This list is archived. It is not possible to create new or edit tasks for it.", "title": "List Title", "color": "Color", "lists": "Lists", diff --git a/src/i18n/lang/pt-PT.json b/src/i18n/lang/pt-PT.json index c4d1135f..b70c6e20 100644 --- a/src/i18n/lang/pt-PT.json +++ b/src/i18n/lang/pt-PT.json @@ -128,7 +128,7 @@ } }, "list": { - "archived": "This list is archived. It is not possible to create new or edit tasks or it.", + "archived": "This list is archived. It is not possible to create new or edit tasks for it.", "title": "List Title", "color": "Color", "lists": "Lists", diff --git a/src/i18n/lang/ro-RO.json b/src/i18n/lang/ro-RO.json index c4d1135f..b70c6e20 100644 --- a/src/i18n/lang/ro-RO.json +++ b/src/i18n/lang/ro-RO.json @@ -128,7 +128,7 @@ } }, "list": { - "archived": "This list is archived. It is not possible to create new or edit tasks or it.", + "archived": "This list is archived. It is not possible to create new or edit tasks for it.", "title": "List Title", "color": "Color", "lists": "Lists", diff --git a/src/i18n/lang/ru-RU.json b/src/i18n/lang/ru-RU.json index b54dc7c9..afbb5082 100644 --- a/src/i18n/lang/ru-RU.json +++ b/src/i18n/lang/ru-RU.json @@ -128,7 +128,7 @@ } }, "list": { - "archived": "Этот список архивирован. В нём нелья создавать или изменять задачи.", + "archived": "This list is archived. It is not possible to create new or edit tasks for it.", "title": "Название списка", "color": "Цвет", "lists": "Списки", From 234951fe3b5e76668ee7affc1a01c6878c153cc7 Mon Sep 17 00:00:00 2001 From: kolaente Date: Sat, 2 Oct 2021 15:43:15 +0200 Subject: [PATCH 4/7] chore(ci): use latest version of s3 plugin --- .drone.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.drone.yml b/.drone.yml index d2b5875c..514ca996 100644 --- a/.drone.yml +++ b/.drone.yml @@ -127,7 +127,7 @@ steps: - build-dev - name: upload-test-results - image: plugins/s3:1 + image: plugins/s3 pull: true settings: bucket: drone-test-results @@ -210,7 +210,7 @@ steps: depends_on: [ build ] - name: release - image: plugins/s3:1 + image: plugins/s3 pull: true settings: bucket: vikunja-releases @@ -285,7 +285,7 @@ steps: depends_on: [ build ] - name: release - image: plugins/s3:1 + image: plugins/s3 pull: true settings: bucket: vikunja-releases From 50799a7b3e657a862b3e55ba9488950a5e3ea948 Mon Sep 17 00:00:00 2001 From: kolaente Date: Sat, 2 Oct 2021 13:50:41 +0000 Subject: [PATCH 5/7] [skip ci] Updated translations via Crowdin --- src/i18n/lang/fr-FR.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/i18n/lang/fr-FR.json b/src/i18n/lang/fr-FR.json index e3eea77a..575a541f 100644 --- a/src/i18n/lang/fr-FR.json +++ b/src/i18n/lang/fr-FR.json @@ -98,8 +98,8 @@ "setSuccess": "Avatar défini." }, "quickAddMagic": { - "title": "Quick Add Magic Mode", - "disabled": "Disabled", + "title": "Ajout rapide en mode magique", + "disabled": "Désactivé", "todoist": "Todoist", "vikunja": "Vikunja" } @@ -128,7 +128,7 @@ } }, "list": { - "archived": "This list is archived. It is not possible to create new or edit tasks for it.", + "archived": "Cette liste est archivée. Il n’est pas possible d’y créer de nouvelles tâches ou de les modifier.", "title": "Nom de la liste", "color": "Couleur", "lists": "Listes", @@ -499,8 +499,8 @@ "doneSuccess": "Tâche marquée comme terminée.", "undoneSuccess": "Tâche marquée comme non terminée.", "openDetail": "Ouvrir la vue détaillée de la tâche", - "checklistTotal": "{checked} of {total} tasks", - "checklistAllDone": "{total} tasks", + "checklistTotal": "{checked} sur {total} tâches", + "checklistAllDone": "{total} tâches", "show": { "titleCurrent": "Tâches actuelles", "titleDates": "Tâches du {from} au {to}", @@ -673,7 +673,7 @@ "label4": "Par exemple : {prefix}\"Étiquette avec espaces\".", "priority1": "Pour définir la priorité d’une tâche, ajoutez un chiffre de 1 à 5, précédé d’un {prefix}.", "priority2": "Plus le numéro est élevé, plus la priorité est élevée.", - "assignees": "To directly assign the task to a user, add their username prefixed with {prefix} to the task.", + "assignees": "Pour assigner directement la tâche à un utilisateur, ajoutez son nom d'utilisateur préfixé avec {prefix} à la tâche.", "list1": "Pour définir une liste dans laquelle la tâche doit apparaître, entrez son nom précédé de {prefix}.", "list2": "Ceci renverra une erreur si la liste n’existe pas.", "dateAndTime": "Date et heure", From d13f3b9b19a2872474260021383b0610b155a4f2 Mon Sep 17 00:00:00 2001 From: kolaente Date: Sat, 2 Oct 2021 20:07:38 +0200 Subject: [PATCH 6/7] chore: change cypress settings to run tests in cypress without needing to modify the config --- cypress.json | 2 +- cypress/docker-compose.yml | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/cypress.json b/cypress.json index 404249f3..27f12495 100644 --- a/cypress.json +++ b/cypress.json @@ -2,7 +2,7 @@ "baseUrl": "http://localhost:5000", "env": { "API_URL": "http://localhost:3456/api/v1", - "TEST_SECRET": "testingS3cr3et" + "TEST_SECRET": "averyLongSecretToSe33dtheDB" }, "video": false, "retries": { diff --git a/cypress/docker-compose.yml b/cypress/docker-compose.yml index 1c496de4..98a24edd 100644 --- a/cypress/docker-compose.yml +++ b/cypress/docker-compose.yml @@ -2,10 +2,12 @@ version: '3' services: api: - image: vikunja/api + image: vikunja/api:unstable environment: VIKUNJA_LOG_LEVEL: DEBUG VIKUNJA_SERVICE_TESTINGTOKEN: averyLongSecretToSe33dtheDB + ports: + - 3456:3456 cypress: image: cypress/browsers:node12.18.3-chrome87-ff82 volumes: From 3f9917dfab7aaf238de5ea09e60a44c611474deb Mon Sep 17 00:00:00 2001 From: dpschen Date: Sat, 2 Oct 2021 18:51:54 +0000 Subject: [PATCH 7/7] fix: vuex mutation error in edit list (#813) Co-authored-by: Dominik Pschenitschni Reviewed-on: https://kolaente.dev/vikunja/frontend/pulls/813 Reviewed-by: konrad Co-authored-by: dpschen Co-committed-by: dpschen --- src/views/list/settings/edit.vue | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/views/list/settings/edit.vue b/src/views/list/settings/edit.vue index ab90017c..a6ea5086 100644 --- a/src/views/list/settings/edit.vue +++ b/src/views/list/settings/edit.vue @@ -71,7 +71,6 @@ import ListService from '@/services/list' import ColorPicker from '@/components/input/colorPicker.vue' import LoadingComponent from '@/components/misc/loading.vue' import ErrorComponent from '@/components/misc/error.vue' -import ListDuplicateService from '@/services/listDuplicateService' import {CURRENT_LIST} from '@/store/mutation-types' import CreateEdit from '@/components/misc/create-edit.vue' @@ -81,7 +80,6 @@ export default { return { list: ListModel, listService: new ListService(), - listDuplicateService: new ListDuplicateService(), } }, components: { @@ -106,9 +104,7 @@ export default { this.listService.get(list) .then(r => { - this.$set(this, 'list', r) - this.$store.commit(CURRENT_LIST, r) - this.setTitle(this.$t('list.edit.title', {list: this.list.title})) + this.list = { ...r } }) .catch(e => { this.$message.error(e) @@ -117,6 +113,8 @@ export default { save() { this.$store.dispatch('lists/updateList', this.list) .then(() => { + this.$store.commit(CURRENT_LIST, this.list) + this.setTitle(this.$t('list.edit.title', {list: this.list.title})) this.$message.success({message: this.$t('list.edit.success')}) this.$router.back() })