chore: move duplicate project logic to composable
Some checks failed
continuous-integration/drone/pr Build is failing

This commit is contained in:
kolaente 2023-04-12 12:18:11 +02:00
parent 3fe48fbdd7
commit f705d2366c
Signed by: konrad
GPG Key ID: F40E70337AB24C9B
2 changed files with 33 additions and 28 deletions

View File

@ -4,6 +4,8 @@ import {useI18n} from 'vue-i18n'
import {useRouter} from 'vue-router' import {useRouter} from 'vue-router'
import ProjectService from '@/services/project' import ProjectService from '@/services/project'
import ProjectDuplicateService from '@/services/projectDuplicateService'
import ProjectDuplicateModel from '@/models/projectDuplicateModel'
import {setModuleLoading} from '@/stores/helper' import {setModuleLoading} from '@/stores/helper'
import {removeProjectFromHistory} from '@/modules/projectHistory' import {removeProjectFromHistory} from '@/modules/projectHistory'
import {createNewIndexer} from '@/indexes' import {createNewIndexer} from '@/indexes'
@ -201,9 +203,14 @@ export const useProjectStore = defineStore('project', () => {
export function useProject(projectId: MaybeRef<IProject['id']>) { export function useProject(projectId: MaybeRef<IProject['id']>) {
const projectService = shallowReactive(new ProjectService()) const projectService = shallowReactive(new ProjectService())
const {loading: isLoading} = toRefs(projectService) const projectDuplicateService = shallowReactive(new ProjectDuplicateService())
const isLoading = computed(() => projectService.loading || projectDuplicateService.loading)
const project: IProject = reactive(new ProjectModel()) const project: IProject = reactive(new ProjectModel())
const {t} = useI18n({useScope: 'global'}) const {t} = useI18n({useScope: 'global'})
const router = useRouter()
const projectStore = useProjectStore()
watch( watch(
() => unref(projectId), () => unref(projectId),
@ -214,18 +221,30 @@ export function useProject(projectId: MaybeRef<IProject['id']>) {
{immediate: true}, {immediate: true},
) )
const projectStore = useProjectStore()
async function save() { async function save() {
const updatedProject = await projectStore.updateProject(project) const updatedProject = await projectStore.updateProject(project)
Object.assign(project, updatedProject) Object.assign(project, updatedProject)
success({message: t('project.edit.success')}) success({message: t('project.edit.success')})
} }
async function duplicateProject(parentProjectId: IProject['id']) {
const projectDuplicate = new ProjectDuplicateModel({
projectId: unref(projectId),
parentProjectId,
})
const duplicate = await projectDuplicateService.create(projectDuplicate)
projectStore.setProject(duplicate.project)
success({message: t('project.duplicate.success')})
router.push({name: 'project.index', params: {projectId: duplicate.project.id}})
}
return { return {
isLoading: readonly(isLoading), isLoading: readonly(isLoading),
project, project,
save, save,
duplicateProject,
} }
} }

View File

@ -3,8 +3,8 @@
:title="$t('project.duplicate.title')" :title="$t('project.duplicate.title')"
primary-icon="paste" primary-icon="paste"
:primary-label="$t('project.duplicate.label')" :primary-label="$t('project.duplicate.label')"
@primary="duplicateProject" @primary="duplicate"
:loading="projectDuplicateService.loading" :loading="isLoading"
> >
<p>{{ $t('project.duplicate.text') }}</p> <p>{{ $t('project.duplicate.text') }}</p>
<project-search v-model="parentProject"/> <project-search v-model="parentProject"/>
@ -12,19 +12,16 @@
</template> </template>
<script setup lang="ts"> <script setup lang="ts">
import {ref, shallowReactive, watch} from 'vue' import {ref, watch} from 'vue'
import {useRoute, useRouter} from 'vue-router' import {useRoute, useRouter} from 'vue-router'
import {useI18n} from 'vue-i18n' import {useI18n} from 'vue-i18n'
import ProjectDuplicateService from '@/services/projectDuplicateService'
import CreateEdit from '@/components/misc/create-edit.vue' import CreateEdit from '@/components/misc/create-edit.vue'
import ProjectSearch from '@/components/tasks/partials/projectSearch.vue' import ProjectSearch from '@/components/tasks/partials/projectSearch.vue'
import ProjectDuplicateModel from '@/models/projectDuplicateModel'
import {success} from '@/message' import {success} from '@/message'
import {useTitle} from '@/composables/useTitle' import {useTitle} from '@/composables/useTitle'
import {useProjectStore} from '@/stores/projects' import {useProject, useProjectStore} from '@/stores/projects'
import type {IProject} from '@/modelTypes/IProject' import type {IProject} from '@/modelTypes/IProject'
const {t} = useI18n({useScope: 'global'}) const {t} = useI18n({useScope: 'global'})
@ -34,30 +31,19 @@ const route = useRoute()
const router = useRouter() const router = useRouter()
const projectStore = useProjectStore() const projectStore = useProjectStore()
const projectDuplicateService = shallowReactive(new ProjectDuplicateService()) const {project, isLoading, duplicateProject} = useProject(route.params.projectId)
const parentProject = ref<IProject | null>(null) const parentProject = ref<IProject | null>(null)
watch( watch(
() => route.params.projectId, () => project.parentProjectId,
projectId => { parentProjectId => {
const project = projectStore.projects[route.params.projectId] parentProject.value = projectStore.projects[parentProjectId]
if (project.parentProjectId) {
parentProject.value = projectStore.projects[project.parentProjectId]
}
}, },
{immediate: true}, {immediate: true},
) )
async function duplicateProject() { async function duplicate() {
const projectDuplicate = new ProjectDuplicateModel({ await duplicateProject(parentProject.value.id)
// FIXME: should be parameter
projectId: route.params.projectId,
parentProjectId: parentProject.value.id,
})
const duplicate = await projectDuplicateService.create(projectDuplicate)
projectStore.setProject(duplicate.project)
success({message: t('project.duplicate.success')}) success({message: t('project.duplicate.success')})
router.push({name: 'project.index', params: {projectId: duplicate.project.id}})
} }
</script> </script>