Merge pull request #101 from ConductionNL/feature/DIMOC-327/publicati…

…onType-id feature/DIMOC-327/publicationType-id
ConductionNL · Oct 15, 2024 · 64fdd93 · 64fdd93
2 parents 3514d72 + 352f7f6
commit 64fdd93
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 20 deletions.
diff --git a/src/dialogs/catalogiPublicationType/DeleteCatalogiPublicationType.vue b/src/dialogs/catalogiPublicationType/DeleteCatalogiPublicationType.vue
@@ -68,7 +68,7 @@ export default {
 	methods: {
 		deleteCatalogiPublicationType() {
 			const publicationTypeArray = catalogiStore.catalogiItem?.publicationTypes
-			    .filter((source) => source !== (publicationTypeStore.publicationTypeItem?.source || publicationTypeStore.publicationTypeItem?.id))
+			    .filter((id) => id !== publicationTypeStore.publicationTypeItem?.id)
 
 			const catalogiItem = new Catalogi({
 				...catalogiStore.catalogiItem,

diff --git a/src/modals/catalogiPublicationType/AddCatalogiPublicationType.vue b/src/modals/catalogiPublicationType/AddCatalogiPublicationType.vue
@@ -124,7 +124,7 @@ export default {
 			publicationTypeStore.getAllPublicationTypes()
 				.then(({ response, data }) => {
 					const filteredData = data.filter((publicationType) =>
-						!publicationTypeList.includes(publicationType?.source || publicationType?.id),
+						!publicationTypeList.includes(publicationType?.id),
 					)
 
 					this.publicationTypes = {
@@ -146,7 +146,7 @@ export default {
 			this.loading = true
 			this.error = false
 
-			this.catalogiItem.publicationTypes.push(this.publicationTypes.value.source !== '' ? this.publicationTypes.value.source : this.publicationTypes.value.id)
+			this.catalogiItem.publicationTypes.push(this.publicationTypes.value.id)
 
 			const newCatalogiItem = new Catalogi({
 				...this.catalogiItem,

diff --git a/src/modals/publication/AddPublicationModal.vue b/src/modals/publication/AddPublicationModal.vue
@@ -252,7 +252,7 @@ export default {
 			// step 2: get the full publication types from the publicationTypeIds
 			const filteredPublicationType = this.publicationTypeList
 				.filter((publicationType) => {
-					const publicationTypeId = publicationType.source || publicationType.id
+					const publicationTypeId = publicationType.id
 					return selectedCatalogus.publicationTypes.includes(publicationTypeId.toString())
 				})
 
@@ -268,9 +268,7 @@ export default {
 			const testClass = new Publication({
 				...this.publication,
 				catalog: this.catalogi.value?.id,
-				publicationType: this.publicationType?.value?.source !== ''
-					? this.publicationType?.value?.source
-					: this.publicationType?.value?.id,
+				publicationType: this.publicationType?.value?.id,
 				published: this.publication.published !== '' ? new Date(this.publication.published).toISOString() : new Date().toISOString(),
 			})
 
@@ -363,9 +361,7 @@ export default {
 			const publicationItem = new Publication({
 				...this.publication,
 				catalog: this.catalogi?.value?.id,
-				publicationType: this.publicationType?.value?.source !== ''
-					? this.publicationType?.value?.source
-					: this.publicationType?.value?.id,
+				publicationType: this.publicationType?.value?.id,
 				published: this.publication.published !== '' ? new Date(this.publication.published).toISOString() : new Date().toISOString(),
 			})
 

diff --git a/src/modals/publicationData/EditPublicationDataModal.vue b/src/modals/publicationData/EditPublicationDataModal.vue
@@ -264,7 +264,8 @@ export default {
 			console.log('activePublicationType', this.publicationTypeList)
 
 			// get the publication type linked to this publication
-			const activePublicationType = this.publicationTypeList.find((publicationType) => publicationType.source === this.publication.publicationType)
+			const activePublicationType = this.publicationTypeList.find((publicationType) => publicationType.id.toString() === this.publication.publicationType.toString(),
+			)
 			// get all the properties as an array of values (key is not needed as the comparison is done by title)
 			const publicationTypeProperties = Object.values(activePublicationType.properties)
 			// get the publication type properties with the same title as the publicationDataKey

diff --git a/src/views/catalogi/CatalogiDetails.vue b/src/views/catalogi/CatalogiDetails.vue
@@ -90,26 +90,26 @@ import { catalogiStore, publicationTypeStore, navigationStore, organizationStore
 			<BTabs content-class="mt-3" justified>
 				<BTab title="Publicatietypes">
 					<div v-if="catalogiStore.catalogiItem?.publicationTypes.length > 0 && !publicationTypeLoading">
-						<NcListItem v-for="(url, i) in catalogiStore.catalogiItem?.publicationTypes"
-							:key="url + i"
-							:name="filteredPublicationType(url)?.title || 'loading...'"
+						<NcListItem v-for="(id, i) in catalogiStore.catalogiItem?.publicationTypes"
+							:key="id + i"
+							:name="filteredPublicationType(id)?.title || 'loading...'"
 							:bold="false"
 							:force-display-actions="true">
 							<template #icon>
 								<FileTreeOutline disable-menu
 									:size="44" />
 							</template>
 							<template #subname>
-								{{ filteredPublicationType(url)?.description }}
+								{{ filteredPublicationType(id)?.description }}
 							</template>
 							<template #actions>
-								<NcActionButton @click="publicationTypeStore.setPublicationTypeItem(filteredPublicationType(url)); navigationStore.setSelected('publicationType')">
+								<NcActionButton @click="publicationTypeStore.setPublicationTypeItem(filteredPublicationType(id)); navigationStore.setSelected('publicationType')">
 									<template #icon>
 										<OpenInApp :size="20" />
 									</template>
 									Bekijk publicatietype
 								</NcActionButton>
-								<NcActionButton @click="publicationTypeStore.setPublicationTypeItem(filteredPublicationType(url)); navigationStore.setDialog('deleteCatalogiPublicationType')">
+								<NcActionButton @click="publicationTypeStore.setPublicationTypeItem(filteredPublicationType(id)); navigationStore.setDialog('deleteCatalogiPublicationType')">
 									<template #icon>
 										<Delete :size="20" />
 									</template>
@@ -237,10 +237,10 @@ export default {
 					if (loading) { this.organizationLoading = false }
 				})
 		},
-		filteredPublicationType(source) {
+		filteredPublicationType(id) {
 			if (this.publicationTypeLoading) return null
 			return publicationTypeStore.publicationTypeList.filter((publicationType) => {
-				return publicationType?.source ? publicationType?.source === source : publicationType?.id === source
+				return publicationType?.id === id
 			})[0]
 		},
 		goToOrganization() {

diff --git a/src/views/publications/PublicationDetail.vue b/src/views/publications/PublicationDetail.vue
@@ -307,7 +307,7 @@ import { ref } from 'vue'
 									{{ value }}
 								</template>
 								<template #actions>
-									<NcActionButton :disabled="true" @click="editPublicationDataItem(key)">
+									<NcActionButton @click="editPublicationDataItem(key)">
 										<template #icon>
 											<Pencil :size="20" />
 										</template>