From 67ab04dd6e82b3046f5a6e17476cc505e37b1ef2 Mon Sep 17 00:00:00 2001 From: Lucas Nascimento Date: Fri, 14 Jun 2024 10:48:23 -0300 Subject: [PATCH 1/2] =?UTF-8?q?fix:=20Adiciona=20l=C3=B3gica=20de=20resolu?= =?UTF-8?q?=C3=A7=C3=A3o=20de=20p=C3=A1gina=20atual=20ao=20mounted=20do=20?= =?UTF-8?q?componente?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- resources/js/modules/board/views/App.vue | 34 +++++++++++++----------- 1 file changed, 19 insertions(+), 15 deletions(-) diff --git a/resources/js/modules/board/views/App.vue b/resources/js/modules/board/views/App.vue index 01d766a2..1ce2521d 100644 --- a/resources/js/modules/board/views/App.vue +++ b/resources/js/modules/board/views/App.vue @@ -170,6 +170,7 @@ export default { ...mapState('workspaces', { loadingWorkspaces: ({ getWorkspaces }) => getWorkspaces.isFetching, workspaces: 'items', + currentWorkspace: 'currentWorkspace', }), ...mapState('members', { loadingMembers: ({ getMembers }) => getMembers.isFetching, @@ -187,9 +188,6 @@ export default { ...mapState('boards', { loadingBoards: ({ getBoards }) => getBoards.isFetching, }), - ...mapState('workspaces', { - loadingWorkspaces: ({ getWorkspaces }) => getWorkspaces.isFetching, - }), ...mapState('goals', { milestones: 'items', loadingGoals: ({ getGoals }) => getGoals.isFetching, @@ -226,22 +224,14 @@ export default { }, watch: { - $route(to) { - if (to.params && to.params.workspaceId) { - this.setSelectedWorkspace(this.workspaces - .filter(({ id }) => id === to.params.workspaceId)[0]); - } else { - this.setSelectedWorkspace(null); - } - - if (to.meta && to.meta.title) { - this.currentPage = to.meta.title; - document.title = `${to.meta.title} | Trelássio`; - } + $route(newValue) { + this.resolveCurrentPage(newValue); }, }, mounted() { + this.resolveCurrentPage(this.$route); + document.title = this.$route && this.$route.meta ? `${this.$route.meta.title} | Trelássio` : 'Trelássio'; @@ -377,6 +367,20 @@ export default { goToReports() { this.$router.push({ name: 'reports' }); }, + + resolveCurrentPage(route) { + if (route.params && route.params.workspaceId) { + this.setSelectedWorkspace(this.workspaces + .filter(({ id }) => id === route.params.workspaceId)[0]); + } else { + this.setSelectedWorkspace(null); + } + + if (route.meta && route.meta.title) { + this.currentPage = route.meta.title; + document.title = `${route.meta.title} | Trelássio`; + } + }, }, }; From df780ab0beb909c9fd9bad3a9ca648a8346e3d36 Mon Sep 17 00:00:00 2001 From: Lucas Nascimento Date: Fri, 14 Jun 2024 10:58:26 -0300 Subject: [PATCH 2/2] =?UTF-8?q?fix:=20Remove=20c=C3=B3digo=20n=C3=A3o=20ut?= =?UTF-8?q?ilizado?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- resources/js/modules/board/views/App.vue | 1 - 1 file changed, 1 deletion(-) diff --git a/resources/js/modules/board/views/App.vue b/resources/js/modules/board/views/App.vue index 1ce2521d..8c3c16fa 100644 --- a/resources/js/modules/board/views/App.vue +++ b/resources/js/modules/board/views/App.vue @@ -170,7 +170,6 @@ export default { ...mapState('workspaces', { loadingWorkspaces: ({ getWorkspaces }) => getWorkspaces.isFetching, workspaces: 'items', - currentWorkspace: 'currentWorkspace', }), ...mapState('members', { loadingMembers: ({ getMembers }) => getMembers.isFetching,