From 2db820d926fbfd00ba5ff0c68fec243020db2620 Mon Sep 17 00:00:00 2001 From: Dominik Pschenitschni Date: Sat, 4 Dec 2021 17:04:28 +0100 Subject: [PATCH] feat: review changes --- cypress.json | 6 +----- src/components/home/contentAuth.vue | 6 +++--- src/components/tasks/edit-task.vue | 2 +- src/components/tasks/partials/kanban-card.vue | 2 +- src/components/tasks/partials/singleTaskInList.vue | 2 +- src/composables/taskList.js | 2 +- src/views/list/ListTable.vue | 2 +- src/views/list/ListWrapper.vue | 2 +- 8 files changed, 10 insertions(+), 14 deletions(-) diff --git a/cypress.json b/cypress.json index fbdc9fcb5..27f12495c 100644 --- a/cypress.json +++ b/cypress.json @@ -7,9 +7,5 @@ "video": false, "retries": { "runMode": 2 - }, - "testFiles": [ - "list/list.spec.js", - "**/*.spec.js" - ] + } } diff --git a/src/components/home/contentAuth.vue b/src/components/home/contentAuth.vue index bc36bc7ff..d19d04878 100644 --- a/src/components/home/contentAuth.vue +++ b/src/components/home/contentAuth.vue @@ -54,8 +54,8 @@ function useRouteWithModal() { const historyState = computed(() => route.fullPath && window.history.state) const routeWithModal = computed(() => { - if (historyState.value.backgroundView) { - return router.resolve(historyState.value.backgroundView) + if (historyState.value.backdropView) { + return router.resolve(historyState.value.backdropView) } else { return route } @@ -65,7 +65,7 @@ function useRouteWithModal() { const currentModal = shallowRef(null) watchEffect(() => { - currentModal.value = historyState.value.backgroundView + currentModal.value = historyState.value.backdropView ? route.matched[0]?.components.default : null }) diff --git a/src/components/tasks/edit-task.vue b/src/components/tasks/edit-task.vue index 6ebe41106..cb57c3d18 100644 --- a/src/components/tasks/edit-task.vue +++ b/src/components/tasks/edit-task.vue @@ -107,7 +107,7 @@ export default { return { name: 'task.detail', params: { id: this.taskEditTask.id }, - state: { backgroundView: this.$router.currentRoute.value.fullPath }, + state: { backdropView: this.$router.currentRoute.value.fullPath }, } }, }, diff --git a/src/components/tasks/partials/kanban-card.vue b/src/components/tasks/partials/kanban-card.vue index 2bd2f33f6..4a65e5c2b 100644 --- a/src/components/tasks/partials/kanban-card.vue +++ b/src/components/tasks/partials/kanban-card.vue @@ -116,7 +116,7 @@ export default { this.$router.push({ name: 'task.detail', params: { id: this.task.id }, - state: { backgroundView: this.$router.currentRoute.value.fullPath }, + state: { backdropView: this.$router.currentRoute.value.fullPath }, }) }, }, diff --git a/src/components/tasks/partials/singleTaskInList.vue b/src/components/tasks/partials/singleTaskInList.vue index 168386e62..93a35b275 100644 --- a/src/components/tasks/partials/singleTaskInList.vue +++ b/src/components/tasks/partials/singleTaskInList.vue @@ -167,7 +167,7 @@ export default { return { name: 'task.detail', params: { id: this.task.id }, - state: { backgroundView: this.$router.currentRoute.value.fullPath }, + state: { backdropView: this.$router.currentRoute.value.fullPath }, } }, }, diff --git a/src/composables/taskList.js b/src/composables/taskList.js index 1855e8cd7..4ba35d8b4 100644 --- a/src/composables/taskList.js +++ b/src/composables/taskList.js @@ -21,7 +21,7 @@ export function useTaskList(initTasks) { const loading = computed(() => taskCollectionService.value.loading) const totalPages = computed(() => taskCollectionService.value.totalPages) - const tasks = ref([]) + const tasks = ref([]) const currentPage = ref(0) const loadedList = ref(null) const searchTerm = ref('') diff --git a/src/views/list/ListTable.vue b/src/views/list/ListTable.vue index d86770064..954d49df3 100644 --- a/src/views/list/ListTable.vue +++ b/src/views/list/ListTable.vue @@ -282,7 +282,7 @@ const taskDetailRoutes = computed(() => Object.fromEntries( { name: 'task.detail', params: { id }, - state: { backgroundView: router.currentRoute.value.fullPath }, + state: { backdropView: router.currentRoute.value.fullPath }, }, ])), )) diff --git a/src/views/list/ListWrapper.vue b/src/views/list/ListWrapper.vue index 96283b385..3d75952dd 100644 --- a/src/views/list/ListWrapper.vue +++ b/src/views/list/ListWrapper.vue @@ -124,7 +124,7 @@ async function loadList(listIdToLoad) { const loadedList = await listService.value.get(list) await store.dispatch(CURRENT_LIST, loadedList) } finally { - loadedListId.value = listId + loadedListId.value = listId.value } }