ami/tl-vikunja
1
0
Fork 0
Code Activity

fix: remove getProjectById and replace all usages of it

Browse Source
This commit is contained in:
kolaente
2023-04-12 11:13:55 +02:00
parent 9402344b7e
commit 78158bcba5
14 changed files with 24 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/components/tasks/partials/relatedTasks.vue
View File

@ -222,12 +222,12 @@ async function findTasks(newQuery: string) {
function mapRelatedTasks(tasks: ITask[]) {
return tasks.map(task => {
// by doing this here once we can save a lot of duplicate calls in the template
const project = projectStore.getProjectById(task.ProjectId)
const project = projectStore.projects[task.ProjectId]
return {
...task,
differentProject:
(project !== null &&
(project &&
task.projectId !== props.projectId &&
project?.title) || null,
}

10
src/components/tasks/partials/singleTaskInProject.vue
View File

@ -14,12 +14,12 @@
<router-link
:to="taskDetailRoute"
:class="{ 'done': task.done, 'show-project': showProject && project !== null}"
:class="{ 'done': task.done, 'show-project': showProject && project}"
class="tasktext"
>
<span>
<router-link
v-if="showProject && project !== null"
v-if="showProject && typeof project !== 'undefined'"
:to="{ name: 'project.list', params: { projectId: task.projectId } }"
class="task-project"
:class="{'mr-2': task.hexColor !== ''}"
@ -104,7 +104,7 @@
</progress>
<router-link
v-if="!showProject && currentProject.id !== task.projectId && project !== null"
v-if="!showProject && currentProject.id !== task.projectId && project"
:to="{ name: 'project.list', params: { projectId: task.projectId } }"
class="task-project"
v-tooltip="$t('task.detail.belongsToProject', {project: project.title})"
@ -209,8 +209,8 @@ const baseStore = useBaseStore()
const projectStore = useProjectStore()
const taskStore = useTaskStore()
const project = computed(() => projectStore.getProjectById(task.value.projectId))
const projectColor = computed(() => project.value !== null ? project.value.hexColor : '')
const project = computed(() => projectStore.projects[task.value.projectId])
const projectColor = computed(() => project.value ? project.value?.hexColor : '')
const currentProject = computed(() => {
return typeof baseStore.currentProject === 'undefined' ? {