Merge pull request #5 from ConductionNL/feature/DIMOC-236/Attachments…

…-page-refactor feature/DIMOC-236/Attachments-page-refactor
ConductionNL · Aug 13, 2024 · f54d26a · f54d26a
2 parents cf11326 + ee63b98
commit f54d26a
Show file tree

Hide file tree

Showing 10 changed files with 128 additions and 76 deletions.
diff --git a/lib/Db/Attachment.php b/lib/Db/Attachment.php
@@ -96,8 +96,8 @@ public function jsonSerialize(): array
 			'hash'	=> $this->hash,
 			'anonymization' => $this->anonymization,
 			'language' => $this->language,
-			'modified'	=> $this->modified->format('c'),
-			'published' => $this->published->format('c'),
+			'modified'	=> $this->modified?->format('c'),
+			'published' => $this->published?->format('c'),
 			'license' => $this->license,
 		];
 

diff --git a/src/dialogs/attachment/CopyAttachmentDialog.vue b/src/dialogs/attachment/CopyAttachmentDialog.vue
@@ -86,14 +86,11 @@ export default {
 				.then((response) => {
 					this.loading = false
 					this.succes = true
-					// Lets refresh the attachment list
-					response.json().then((data) => {
-						publicationStore.setAttachmentItem(data)
-					})
-					if (publicationStore.publicationItem?.id) {
-						publicationStore.getPublicationAttachments(publicationStore.publicationItem.id)
-						// @todo update the publication item
+
+					if (publicationStore.publicationItem) {
+						publicationStore.getPublicationAttachments(publicationStore.publicationItem)
 					}
+
 					// Wait for the user to read the feedback then close the model
 					const self = this
 					setTimeout(function() {

diff --git a/src/dialogs/attachment/DeleteAttachmentDialog.vue b/src/dialogs/attachment/DeleteAttachmentDialog.vue
@@ -61,7 +61,7 @@ export default {
 	},
 	data() {
 		return {
-
+			filterdAttachments: [],
 			loading: false,
 			succes: false,
 			error: false,
@@ -83,10 +83,38 @@ export default {
 					this.loading = false
 					this.succes = true
 					// Lets refresh the attachment list
-					if (publicationStore.publicationItem?.id) {
-						publicationStore.getPublicationAttachments(publicationStore.publicationItem.id)
-						// @todo update the publication item
+					if (publicationStore.publicationItem) {
+						publicationStore.getPublicationAttachments(publicationStore.publicationItem)
+						this.filterdAttachments = publicationStore.publicationItem.attachments.filter((attachment) => { return parseInt(attachment) !== parseInt(publicationStore.attachmentItem.id) })
+
+						fetch(
+							`/index.php/apps/opencatalogi/api/publications/${publicationStore.publicationItem.id}`,
+							{
+								method: 'PUT',
+								headers: {
+									'Content-Type': 'application/json',
+								},
+								body: JSON.stringify({
+									...publicationStore.publicationItem,
+									attachments: [...this.filterdAttachments],
+								}),
+							},
+						)
+							.then((response) => {
+								this.loading = false
+
+								// Lets refresh the publicationList
+								publicationStore.refreshPublicationList()
+								response.json().then((data) => {
+									publicationStore.setPublicationItem(data)
+								})
+							})
+							.catch((err) => {
+								this.error = err
+								this.loading = false
+							})
 					}
+
 					// Wait for the user to read the feedback then close the model
 					const self = this
 					setTimeout(function() {

diff --git a/src/dialogs/attachment/DepublishAttachmentDialog.vue b/src/dialogs/attachment/DepublishAttachmentDialog.vue
@@ -30,7 +30,7 @@ import { publicationStore, navigationStore } from '../../store/store.js'
 				v-if="!succes"
 				:disabled="loading"
 				type="primary"
-				@click="CopyAttachment()">
+				@click="depublishAttachment()">
 				<template #icon>
 					<NcLoadingIcon v-if="loading" :size="20" />
 					<PublishOff v-if="!loading" :size="20" />
@@ -67,10 +67,9 @@ export default {
 		}
 	},
 	methods: {
-		CopyAttachment() {
+		depublishAttachment() {
 			this.loading = true
-			publicationStore.attachmentItem.status = 'retracted'
-			publicationStore.attachmentItem.published = ''
+			publicationStore.attachmentItem.published = null
 			fetch(
 				`/index.php/apps/opencatalogi/api/attachments/${publicationStore.attachmentItem.id}`,
 				{
@@ -84,14 +83,11 @@ export default {
 				.then((response) => {
 					this.loading = false
 					this.succes = true
-					// Lets refresh the attachment list
-					response.json().then((data) => {
-						publicationStore.setAttachmentItem(data)
-					})
-					if (publicationStore.publicationItem?.id) {
-						publicationStore.getPublicationAttachments(publicationStore.publicationItem.id)
-						// @todo update the publication item
+
+					if (publicationStore.publicationItem) {
+						publicationStore.getPublicationAttachments(publicationStore.publicationItem)
 					}
+
 					// Wait for the user to read the feedback then close the model
 					const self = this
 					setTimeout(function() {

diff --git a/src/dialogs/attachment/PublishAttachmentDialog.vue b/src/dialogs/attachment/PublishAttachmentDialog.vue
@@ -69,7 +69,6 @@ export default {
 	methods: {
 		PublishAttachment() {
 			this.loading = true
-			publicationStore.attachmentItem.status = 'published'
 			fetch(
 				`/index.php/apps/opencatalogi/api/attachments/${publicationStore.attachmentItem.id}`,
 				{
@@ -79,27 +78,22 @@ export default {
 					},
 					body: JSON.stringify(publicationStore.attachmentItem),
 				},
-			)
-				.then((response) => {
-					this.loading = false
-					this.succes = true
-					// Lets refresh the attachment list
-					response.json().then((data) => {
-						publicationStore.setAttachmentItem(data)
-					})
-					if (publicationStore.publicationItem?.id) {
-						publicationStore.getPublicationAttachments(publicationStore.publicationItem.id)
-						// @todo update the publication item
-					}
-					publicationStore.getConceptAttachments()
-					// Wait for the user to read the feedback then close the model
-					const self = this
-					setTimeout(function() {
-						self.succes = false
-						publicationStore.setAttachmentItem(false)
-						navigationStore.setDialog(false)
-					}, 2000)
-				})
+			).then((response) => {
+				this.loading = false
+				this.succes = true
+
+				if (publicationStore.publicationItem) {
+					publicationStore.getPublicationAttachments(publicationStore.publicationItem)
+				}
+
+				// Wait for the user to read the feedback then close the model
+				const self = this
+				setTimeout(function() {
+					self.succes = false
+					publicationStore.setAttachmentItem(false)
+					navigationStore.setDialog(false)
+				}, 2000)
+			})
 				.catch((err) => {
 					this.error = err
 					this.loading = false

diff --git a/src/entities/publication/publication.mock.ts b/src/entities/publication/publication.mock.ts
@@ -20,9 +20,9 @@ export const mockPublicationsData = (): TPublication[] => [
 			key: 'anyvalue',
 			streetNumber: 1,
 			object: {
-                blabla: 'bla'
-            },
-            array: ['appel', 'peer', 0, [], {}]
+				blabla: 'bla',
+			},
+			array: ['appel', 'peer', 0, [], {}],
 		},
 		attachments: [],
 		attachmentCount: 1,

diff --git a/src/modals/attachment/AddAttachmentModal.vue b/src/modals/attachment/AddAttachmentModal.vue
@@ -21,7 +21,7 @@ import { navigationStore, publicationStore } from '../../store/store.js'
 				</NcNoteCard>
 			</div>
 			<div v-if="success === null" class="form-group">
-				<NcTextField :disabled="loading"
+				<NcTextField :disabled="(files && true) || loading"
 					label="Titel"
 					maxlength="255"
 					:value.sync="publicationStore.attachmentItem.title"
@@ -38,13 +38,13 @@ import { navigationStore, publicationStore } from '../../store/store.js'
 					label="Toegangs URL"
 					maxlength="255"
 					:value.sync="publicationStore.attachmentItem.accessUrl" />
-				<NcTextField :disabled="loading"
+				<NcTextField :disabled="(files && true) || loading"
 					label="Download URL"
 					maxlength="255"
 					:value.sync="publicationStore.attachmentItem.downloadUrl" />
 				<div class="addFileButtonGroup">
 					<NcButton v-if="success === null && !files"
-						:disabled="loading"
+						:disabled="checkIfDisabled() || loading"
 						type="primary"
 						@click="openFileUpload()">
 						<template #icon>
@@ -54,7 +54,7 @@ import { navigationStore, publicationStore } from '../../store/store.js'
 					</NcButton>
 
 					<NcButton v-if="success === null && files"
-						:disabled="loading"
+						:disabled="checkIfDisabled() || loading"
 						type="primary"
 						@click="reset()">
 						<template #icon>
@@ -64,7 +64,7 @@ import { navigationStore, publicationStore } from '../../store/store.js'
 					</NcButton>
 				</div>
 				<NcButton v-if="success === null"
-					:disabled="!publicationStore.attachmentItem.title || !files || loading"
+					:disabled="loading"
 					type="primary"
 					@click="addAttachment()">
 					<template #icon>
@@ -87,7 +87,7 @@ import Plus from 'vue-material-design-icons/Plus.vue'
 
 import axios from 'axios'
 
-const { files, open: openFileUpload, reset } = useFileDialog()
+const { files, open: openFileUpload, reset } = useFileDialog({ multiple: false })
 
 export default {
 	name: 'AddAttachmentModal',
@@ -115,12 +115,18 @@ export default {
 		closeModal() {
 			navigationStore.modal = false
 		},
+
+		checkIfDisabled() {
+			if (publicationStore.attachmentItem.downloadUrl || publicationStore.attachmentItem.title) return true
+			return false
+		},
 		addAttachment() {
 			this.loading = true
 			this.errorMessage = false
 
 			axios.post('/index.php/apps/opencatalogi/api/attachments', {
 				...(publicationStore.attachmentItem),
+				published: null,
 				_file: files.value ? files.value[0] : '',
 			}, {
 				headers: {
@@ -131,15 +137,42 @@ export default {
 					'Publication-Title': publicationStore.publicationItem.title,
 				},
 			}).then((response) => {
-				this.loading = false
+
 				this.success = true
+				reset()
 				// Lets refresh the attachment list
-				if (publicationStore.publicationItem?.id) {
-					publicationStore.getPublicationAttachments(publicationStore.publicationItem.id)
-					// @todo update the publication item
-				}
-				// store.refreshCatalogiList()
+				if (publicationStore.publicationItem) {
+					publicationStore.getPublicationAttachments(publicationStore.publicationItem)
+
+					fetch(
+						`/index.php/apps/opencatalogi/api/publications/${publicationStore.publicationItem.id}`,
+						{
+							method: 'PUT',
+							headers: {
+								'Content-Type': 'application/json',
+							},
+							body: JSON.stringify({
+								...publicationStore.publicationItem,
+								attachments: [...publicationStore.publicationItem.attachments, response.data.id],
+							}),
+						},
+					)
+						.then((response) => {
+							this.loading = false
+
+							// Lets refresh the publicationList
+							publicationStore.refreshPublicationList()
+							response.json().then((data) => {
+								publicationStore.setPublicationItem(data)
+							})
 
+						})
+						.catch((err) => {
+							this.error = err
+							this.loading = false
+						})
+				// store.refreshCatalogiList()
+				}
 				publicationStore.setAttachmentItem(response)
 
 				// Wait for the user to read the feedback then close the model
@@ -150,7 +183,7 @@ export default {
 				}, 2000)
 			})
 				.catch((err) => {
-					this.error = err
+					this.error = err.response?.data?.error ?? err
 					this.loading = false
 				})
 		},

diff --git a/src/modals/attachment/EditAttachmentModal.vue b/src/modals/attachment/EditAttachmentModal.vue
@@ -100,9 +100,8 @@ export default {
 					this.loading = false
 					this.success = response.ok
 					// Lets refresh the catalogiList
-					if (publicationStore.publicationItem?.id) {
-						publicationStore.getPublicationAttachments(publicationStore.publicationItem.id)
-						// @todo update the publication item
+					if (publicationStore.publicationItem) {
+						publicationStore.getPublicationAttachments(publicationStore.publicationItem)
 					}
 					response.json().then((data) => {
 						publicationStore.setAttachmentItem(data)

diff --git a/src/store/modules/publication.js b/src/store/modules/publication.js
@@ -76,7 +76,7 @@ export const usePublicationStore = defineStore(
 			},
 			getPublicationAttachments(publication) { // @todo this might belong in a service?
 				fetch(
-					'/index.php/apps/opencatalogi/api/attachments',
+					`/index.php/apps/opencatalogi/api/publications/${publication.id}/attachments`,
 					{
 						method: 'GET',
 					},