vikunja/frontend
Archived
6
39
Fork 48
Code Issues 1 Pull Requests 4 Projects Releases 26 Activity

feature/projects-all-the-way-down #3323

Merged
konrad merged 123 commits from feature/projects-all-the-way-down into main 2023-05-30 10:09:40 +00:00
Conversation 16 Commits 123 Files Changed 85 +27 -26
4 changed files with 27 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit c32a198a34 - Show all commits

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

@ -12,7 +12,7 @@
>
<template #searchResult="{option}">
<span class="has-text-grey">
{{ getParentProjects(option, projectStore).filter(p => p.id !== option.id).map(p => getProjectTitle(p) ).join(' &gt; ') }} &gt;
{{ projectStore.getParentProjects(option).filter(p => p.id !== option.id).map(p => getProjectTitle(p) ).join(' &gt; ') }} &gt;
</span>
{{ getProjectTitle(option) }}
</template>
@ -27,7 +27,7 @@ import {useI18n} from 'vue-i18n'
import type {IProject} from '@/modelTypes/IProject'
import {useProjectStore} from '@/stores/projects'
import {getProjectTitle, getParentProjects} from '@/helpers/getProjectTitle'
import {getProjectTitle} from '@/helpers/getProjectTitle'
import ProjectModel from '@/models/project'

13
src/helpers/getProjectTitle.ts
View File

@ -13,16 +13,3 @@ export function getProjectTitle(project: IProject) {
return project.title
}
export function getParentProjects(project: IProject, projectStore): IProject[] {
let parents = []
if (project.parentProjectId) {
const parentProject = projectStore.getProjectById(project.parentProjectId)
parents = getParentProjects(parentProject, projectStore)
}
return [
...parents,
project,
]
}

32
src/stores/projects.ts
View File

@ -47,9 +47,9 @@ export const useProjectStore = defineStore('project', () => {
const searchProject = computed(() => {
return (query: string, includeArchived = false) => {
return search(query)
?.filter(value => value > 0)
.map(id => projects.value[id])
.filter(project => project.isArchived === includeArchived)
?.filter(value => value > 0)
.map(id => projects.value[id])
.filter(project => project.isArchived === includeArchived)
|| []
}
})
@ -65,21 +65,21 @@ export const useProjectStore = defineStore('project', () => {
if (baseStore.currentProject?.id === project.id) {
baseStore.setCurrentProject(project)
}
if (updateChildren) {
project.childProjects?.forEach(p => setProject(p))
}
// if the project is a child project, we need to also set it in the parent
dpschen commented 2023-03-28 13:52:42 +00:00
Outdated
Review
Copy Link

See comment about having the data as sub projects from earlier.

See comment about having the data as sub projects from earlier.
if (project.parentProjectId) {
const parent = projects.value[project.parentProjectId]
let foundProject = false
dpschen commented 2023-04-11 15:23:40 +00:00
Outdated
Review
Copy Link

The three lines above should be called via a deep watcher on the current project. Not as a side effect.

The three lines above should be called via a deep watcher on the current project. Not as a side effect.
konrad commented 2023-04-12 09:30:19 +00:00
Outdated
Review
Copy Link

You mean setting the current project in the base store?

You mean setting the current project in the base store?
dpschen commented 2023-04-12 15:12:18 +00:00
Outdated
Review
Copy Link

I mean:

  1. remove this sideeffect of the setProject function:
if (baseStore.currentProject?.id === project.id) {
	baseStore.setCurrentProject(project)
}
  1. Instead add a watcher on the project that has the id of the current project.
watchEffect(() => baseStore.setCurrentProject(projects.value[baseStore.currentProject.id])
)

It might be even better to make the currentProject a computed based on the store instead and only setting it via id (unsure here how to handle projects that are not saved yet)

I mean: 1) remove this sideeffect of the `setProject` function: ``` if (baseStore.currentProject?.id === project.id) { baseStore.setCurrentProject(project) } ``` 2) Instead add a watcher on the project that has the id of the current project. ```ts watchEffect(() => baseStore.setCurrentProject(projects.value[baseStore.currentProject.id]) ) ``` It might be even better to make the currentProject a computed based on the store instead and only setting it via id (unsure here how to handle projects that are not saved yet)
konrad commented 2023-04-14 15:41:42 +00:00
Outdated
Review
Copy Link

I've now changed it to use a watcher.

It might be even better to make the currentProject a computed based on the store instead and only setting it via id (unsure here how to handle projects that are not saved yet)

That sounds like a good idea, but let's push that to another PR.

I've now changed it to use a watcher. > It might be even better to make the currentProject a computed based on the store instead and only setting it via id (unsure here how to handle projects that are not saved yet) That sounds like a good idea, but let's push that to another PR.
konrad commented 2023-04-14 15:41:44 +00:00
Outdated
Review
Copy Link

I've now changed it to use a watcher.

It might be even better to make the currentProject a computed based on the store instead and only setting it via id (unsure here how to handle projects that are not saved yet)

That sounds like a good idea, but let's push that to another PR.

I've now changed it to use a watcher. > It might be even better to make the currentProject a computed based on the store instead and only setting it via id (unsure here how to handle projects that are not saved yet) That sounds like a good idea, but let's push that to another PR.
parent.childProjects = parent.childProjects?.map(p => {
if(p.id === project.id) {
if (p.id === project.id) {
foundProject = true
return project
}
return p
})
// If we hit this, the project now has a new parent project which it did not have before
@ -162,7 +162,7 @@ export const useProjectStore = defineStore('project', () => {
cancel()
}
}
dpschen commented 2023-04-11 15:39:35 +00:00
Outdated
Review
Copy Link

When I read this first I thought that this implies that one project could have several parents. If I got it correct that's wrong. So how about getAncestors instead?

When I read this first I thought that this implies that one project could have several parents. If I got it correct that's wrong. So how about `getAncestors` instead?
konrad commented 2023-04-12 09:43:08 +00:00
Outdated
Review
Copy Link

I like that. Changed it.

I like that. Changed it.
async function loadProjects() {
const cancel = setModuleLoading(setIsLoading)
@ -178,6 +178,18 @@ export const useProjectStore = defineStore('project', () => {
}
}
function getParentProjects(project: IProject): IProject[] {
if (!project?.parentProjectId) {
return [project]
}
const parentProject = projects.value[project.parentProjectId]
return [
...getParentProjects(parentProject),
project,
]
}
return {
isLoading: readonly(isLoading),
projects: readonly(projects),
@ -196,6 +208,7 @@ export const useProjectStore = defineStore('project', () => {
createProject,
updateProject,
deleteProject,
getParentProjects,
}
})
@ -215,6 +228,7 @@ export function useProject(projectId: MaybeRef<IProject['id']>) {
)
const projectStore = useProjectStore()
dpschen commented 2023-04-11 15:21:40 +00:00
Outdated
Review
Copy Link

This changes project before calling update. was that intended? What happens if parentProject.value.id is undefined?

This changes project before calling update. was that intended? What happens if `parentProject.value.id` is undefined?
konrad commented 2023-04-12 09:28:42 +00:00
Outdated
Review
Copy Link

It was not intended. I've changed it now so that it checks it before and provides a proper fallback.

It was not intended. I've changed it now so that it checks it before and provides a proper fallback.
async function save() {
await projectStore.updateProject(project)
success({message: t('project.edit.success')})
@ -229,5 +243,5 @@ export function useProject(projectId: MaybeRef<IProject['id']>) {
// support hot reloading
if (import.meta.hot) {
import.meta.hot.accept(acceptHMRUpdate(useProjectStore, import.meta.hot))
import.meta.hot.accept(acceptHMRUpdate(useProjectStore, import.meta.hot))
}

4
src/views/tasks/TaskDetailView.vue
View File

@ -14,7 +14,7 @@
ref="heading"
/>
<h6 class="subtitle" v-if="project?.id">
<template v-for="p in getParentProjects(project, projectStore)">
dpschen commented 2023-03-28 14:07:14 +00:00
Outdated
Review
Copy Link

Shouldn't we still show the parent here?

Shouldn't we still show the parent here?
konrad commented 2023-03-28 15:47:20 +00:00
Outdated
Review
Copy Link

I've changed it now so that is shows this:

Screenshot_20230328_174428.png

(each project is clickable individually)

For a hierarchy like this:

Screenshot_20230328_174646.png

I've changed it now so that is shows this: ![Screenshot_20230328_174428.png](/attachments/35babb55-b48a-49bf-a595-3fcc28da12dc) (each project is clickable individually) For a hierarchy like this: ![Screenshot_20230328_174646.png](/attachments/070d677e-d199-45ee-af6b-c0a6b3196681)
dpschen commented 2023-03-28 16:32:34 +00:00
Outdated
Review
Copy Link

Can't see these images either

Can't see these images either
konrad commented 2023-03-28 19:20:18 +00:00
Outdated
Review
Copy Link

Again 404?

Again 404?
👍 1
konrad commented 2023-03-28 19:20:29 +00:00
Outdated
Review
Copy Link

This starts to feel like a gitea bug...

This starts to feel like a gitea bug...
👍 1
<template v-for="p in projectStore.getParentProjects(project)">
dpschen commented 2023-04-11 16:27:58 +00:00
Outdated
Review
Copy Link

This won't update dynamically. Should we change the getParentProjects to a computed parentProjects that automatically updates instead?

This won't update dynamically. Should we change the `getParentProjects` to a computed `parentProjects` that automatically updates instead?
konrad commented 2023-04-12 10:28:14 +00:00
Outdated
Review
Copy Link

I tried to change it but it fails with getAncestors is not a function. Any idea?

I tried to change it but it fails with `getAncestors is not a function`. Any idea?
konrad commented 2023-04-12 10:29:35 +00:00
Outdated
Review
Copy Link

Actually this does update dynamically when the project changes. I've had a task open, moved the project to another parent project and it updated instantly.

Actually this does update dynamically when the project changes. I've had a task open, moved the project to another parent project and it updated instantly.
<router-link :to="{ name: 'project.index', params: { projectId: p.id } }">
{{ getProjectTitle(p) }}
</router-link>
@ -488,7 +488,7 @@ import TaskSubscription from '@/components/misc/subscription.vue'
import CustomTransition from '@/components/misc/CustomTransition.vue'
import {uploadFile} from '@/helpers/attachments'
import {getProjectTitle, getParentProjects} from '@/helpers/getProjectTitle'
import {getProjectTitle} from '@/helpers/getProjectTitle'
import {scrollIntoView} from '@/helpers/scrollIntoView'
import {useBaseStore} from '@/stores/base'