fix: move parent project handling out of useProject
Some checks failed
continuous-integration/drone/pr Build is failing

This commit is contained in:
kolaente 2023-04-12 11:48:37 +02:00
parent fcac3c8ebb
commit 1116eeae9a
Signed by: konrad
GPG Key ID: F40E70337AB24C9B
2 changed files with 18 additions and 19 deletions

View File

@ -211,22 +211,8 @@ export function useProject(projectId: MaybeRef<IProject['id']>) {
const projectStore = useProjectStore() const projectStore = useProjectStore()
const parentProject = ref<IProject | null>(null)
watch(
() => project.parentProjectId,
projectId => {
if (project.parentProjectId) {
parentProject.value = projectStore.projects[project.parentProjectId]
}
},
{immediate: true},
)
async function save() { async function save() {
const updatedProject = await projectStore.updateProject({ const updatedProject = await projectStore.updateProject(project)
...project,
parentProjectId: parentProject.value.id ?? project.parentProjectId,
})
Object.assign(project, updatedProject) Object.assign(project, updatedProject)
success({message: t('project.edit.success')}) success({message: t('project.edit.success')})
} }
@ -234,7 +220,6 @@ export function useProject(projectId: MaybeRef<IProject['id']>) {
return { return {
isLoading: readonly(isLoading), isLoading: readonly(isLoading),
project, project,
parentProject,
save, save,
} }
} }

View File

@ -72,11 +72,11 @@
</template> </template>
<script lang="ts"> <script lang="ts">
export default { name: 'project-setting-edit' } export default {name: 'project-setting-edit'}
</script> </script>
<script setup lang="ts"> <script setup lang="ts">
import {type PropType} from 'vue' import {watch, ref, type PropType} from 'vue'
import {useRouter} from 'vue-router' import {useRouter} from 'vue-router'
import {useI18n} from 'vue-i18n' import {useI18n} from 'vue-i18n'
@ -88,6 +88,7 @@ import ProjectSearch from '@/components/tasks/partials/projectSearch.vue'
import type {IProject} from '@/modelTypes/IProject' import type {IProject} from '@/modelTypes/IProject'
import {useBaseStore} from '@/stores/base' import {useBaseStore} from '@/stores/base'
import {useProjectStore} from '@/stores/projects'
import {useProject} from '@/stores/projects' import {useProject} from '@/stores/projects'
import {useTitle} from '@/composables/useTitle' import {useTitle} from '@/composables/useTitle'
@ -100,14 +101,27 @@ const props = defineProps({
}) })
const router = useRouter() const router = useRouter()
const projectStore = useProjectStore()
const {t} = useI18n({useScope: 'global'}) const {t} = useI18n({useScope: 'global'})
const {project, parentProject, save: saveProject, isLoading} = useProject(props.projectId) const {project, save: saveProject, isLoading} = useProject(props.projectId)
const parentProject = ref<IProject | null>(null)
watch(
() => project.parentProjectId,
projectId => {
if (project.parentProjectId) {
parentProject.value = projectStore.projects[project.parentProjectId]
}
},
{immediate: true},
)
useTitle(() => project?.title ? t('project.edit.title', {project: project.title}) : '') useTitle(() => project?.title ? t('project.edit.title', {project: project.title}) : '')
async function save() { async function save() {
project.parentProjectId = parentProject.value.id ?? project.parentProjectId
await saveProject() await saveProject()
await useBaseStore().handleSetCurrentProject({project}) await useBaseStore().handleSetCurrentProject({project})
router.back() router.back()