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 +23 -18
3 changed files with 23 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 6a8c656dbb - Show all commits

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

@ -11,7 +11,10 @@
@search="findProjects"
>
<template #searchResult="{option}">
{{ (option as IProject).title }}
<span class="has-text-grey">
{{ getParentProjects(option, projectStore).filter(p => p.id !== option.id).map(p => getProjectTitle(p) ).join(' &gt; ') }} &gt;
</span>
{{ getProjectTitle(option) }}
</template>
</Multiselect>
</template>
@ -24,6 +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 ProjectModel from '@/models/project'

18
src/helpers/getProjectTitle.ts
View File

@ -1,14 +1,28 @@
import {i18n} from '@/i18n'
import type {IProject} from '@/modelTypes/IProject'
import {useProjectStore} from '@/stores/projects'
dpschen marked this conversation as resolved Outdated
dpschen commented 2023-03-28 13:36:57 +00:00
Outdated
Review
Copy Link

Use long var names.

Use long var names.
✅ 1
konrad commented 2023-03-28 13:42:08 +00:00
Outdated
Review
Copy Link

Done.

Done.
export function getProjectTitle(project: IProject) {
if (project.id === -1) {
return i18n.global.t('project.pseudo.favorites.title')
}
if (project.title === 'Inbox') {
return i18n.global.t('project.inboxTitle')
}
return project.title
}
export function getParentProjects(project: IProject, projectStore): IProject[] {
konrad marked this conversation as resolved Outdated
dpschen commented 2023-03-28 17:20:59 +00:00
Outdated
Review
Copy Link

This should either be in a new helper (see the name of this file) or both should be part of the project store.

This should either be in a new helper (see the name of this file) or both should be part of the project store.
👍 1
konrad commented 2023-03-28 19:28:56 +00:00
Outdated
Review
Copy Link

Refactored it and moved to the projects store.

Refactored it and moved to the projects store.
let parents = []
if (project.parentProjectId) {
konrad marked this conversation as resolved Outdated
dpschen commented 2023-03-28 17:24:44 +00:00
Outdated
Review
Copy Link
if (!project.parentProjectId) {
	return [project]
}

const parentProject = projectStore.getProjectById(project.parentProjectId)

return [
	...getParentProjects(parentProject, projectStore),
	project,
]
```ts if (!project.parentProjectId) { return [project] } const parentProject = projectStore.getProjectById(project.parentProjectId) return [ ...getParentProjects(parentProject, projectStore), project, ] ```
const parentProject = projectStore.getProjectById(project.parentProjectId)
parents = getParentProjects(parentProject, projectStore)
}
return [
...parents,
project,
]
}

17
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 getAllParentProjects(project)">
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 getParentProjects(project, projectStore)">
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} from '@/helpers/getProjectTitle'
import {getProjectTitle, getParentProjects} from '@/helpers/getProjectTitle'
import {scrollIntoView} from '@/helpers/scrollIntoView'
import {useBaseStore} from '@/stores/base'
@ -784,19 +784,6 @@ async function setPercentDone(percentDone: number) {
task: newTask,
})
}
function getAllParentProjects(project: IProject): IProject[] {
let parents = []
if (project.parentProjectId) {
const parentProject = projectStore.getProjectById(project.parentProjectId)
parents = getAllParentProjects(parentProject)
}
return [
...parents,
project,
]
}
</script>
<style lang="scss" scoped>