From 2d186cc906de9290cf3c32d9779dfe8175141e56 Mon Sep 17 00:00:00 2001
From: Antoine Martineau <47289926+Udito3@users.noreply.github.com>
Date: Fri, 12 Apr 2024 10:36:23 -0400
Subject: [PATCH 1/2] Update draft

---
 components/modals/PublicationDetails.tsx       |  8 ++++----
 lib/publications/actions/draft-publication.tsx |  4 ++--
 lib/publications/draft-publication.tsx         | 10 ++++++++--
 3 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/components/modals/PublicationDetails.tsx b/components/modals/PublicationDetails.tsx
index 6b939283..3a2f72c4 100644
--- a/components/modals/PublicationDetails.tsx
+++ b/components/modals/PublicationDetails.tsx
@@ -87,9 +87,9 @@ export default function PublicationDetails({
 
 	useEffect(() => {
 		if (modalMode === Constants.publicationModalStatus.duplicate) {
-		  setEventEndDate('');
+			setEventEndDate('');
 		}
-	  }, [modalMode]);
+	}, [modalMode]);
 
 	const isDisabled =
 		modalMode === Constants.publicationModalStatus.view ||
@@ -306,7 +306,7 @@ export default function PublicationDetails({
 			const formData = new FormData();
 			const updatedFormData = updateFormData(formData, true);
 
-			const helloEvent = await draftAPublication(updatedFormData);
+			const helloEvent = await draftAPublication(updatedFormData, publication?.id);
 
 			setToast(
 				t(`modal.draft-${helloEvent ? 'success' : 'error'}-toast-message`),
@@ -592,7 +592,7 @@ export default function PublicationDetails({
 								modalMode === Constants.publicationModalStatus.moderator ? 'flex justify-between' : 'flex justify-start'
 							}`}
 						>
-							{modalMode !== Constants.publicationModalStatus.modify &&
+							{(modalMode !== Constants.publicationModalStatus.modify || publication?.state === NewsStates.DRAFT) &&
 								modalMode !== Constants.publicationModalStatus.moderator && (
 									<button
 										className="btn btn-info px-8 font-normal"
diff --git a/lib/publications/actions/draft-publication.tsx b/lib/publications/actions/draft-publication.tsx
index 02b4565d..24258ed2 100644
--- a/lib/publications/actions/draft-publication.tsx
+++ b/lib/publications/actions/draft-publication.tsx
@@ -4,11 +4,11 @@ import { draftPublication } from '../draft-publication';
 import { revalidateTag } from 'next/cache';
 import constants from '@/utils/constants';
 
-export async function draftAPublication(formData: FormData) {
+export async function draftAPublication(formData: FormData, draftId?: string) {
 	var publication;
 
 	try {
-		publication = await draftPublication(formData);
+		publication = await draftPublication(formData, draftId);
 	} catch (e) {
 		return;
 	}
diff --git a/lib/publications/draft-publication.tsx b/lib/publications/draft-publication.tsx
index f829ef38..4ac87b65 100644
--- a/lib/publications/draft-publication.tsx
+++ b/lib/publications/draft-publication.tsx
@@ -2,14 +2,20 @@ import { fetchWithSession, Method } from '@/lib/fetch-with-refresh';
 import { ApiResponse } from '@/models/api-response';
 import { HelloEvent } from '@/models/hello-event';
 
-export async function draftPublication(formData: FormData) {
+export async function draftPublication(formData: FormData, draftId?: string) {
 	for (const [key, value] of Array.from(formData.entries())) {
 		if (!value || value === 'Invalid Date') {
 			formData.delete(key);
 		}
 	}
 
-	const response = await fetchWithSession('organizer-drafts', Method.POSTFORM, formData);
+	let response;
+
+	if (draftId) {
+		response = await fetchWithSession(`organizer-drafts/${draftId}`, Method.PATCHFORM, formData);
+	} else {
+		response = await fetchWithSession('organizer-drafts', Method.POSTFORM, formData);
+	}
 
 	if (!response.ok) {
 		throw new Error('Failed to draft the publication');

From f0aa084d743e5f11502850a38fe83b6e5709c80a Mon Sep 17 00:00:00 2001
From: Antoine Martineau <47289926+Udito3@users.noreply.github.com>
Date: Fri, 12 Apr 2024 20:02:45 -0400
Subject: [PATCH 2/2] Draft a draft

---
 components/modals/PublicationDetails.tsx       | 14 ++++++++++----
 lib/publications/actions/draft-publication.tsx |  4 ++--
 lib/publications/actions/patch-draft.tsx       | 18 ++++++++++++++++++
 lib/publications/draft-publication.tsx         | 10 ++--------
 4 files changed, 32 insertions(+), 14 deletions(-)
 create mode 100644 lib/publications/actions/patch-draft.tsx

diff --git a/components/modals/PublicationDetails.tsx b/components/modals/PublicationDetails.tsx
index 3a2f72c4..e2a46bc3 100644
--- a/components/modals/PublicationDetails.tsx
+++ b/components/modals/PublicationDetails.tsx
@@ -30,6 +30,7 @@ import { ActivityArea, getActivityAreaName } from '@/models/activity-area';
 import dayjs from 'dayjs';
 import rehypeRaw from 'rehype-raw';
 import { useLoading } from '@/utils/provider/LoadingProvider';
+import { patchADraft } from '@/lib/publications/actions/patch-draft';
 
 const EditorComp = dynamic(() => import('../EditorComponent'), { ssr: false });
 
@@ -305,15 +306,20 @@ export default function PublicationDetails({
 		startTransition(async () => {
 			const formData = new FormData();
 			const updatedFormData = updateFormData(formData, true);
+			let result;
 
-			const helloEvent = await draftAPublication(updatedFormData, publication?.id);
+			if (publication?.id) {
+				result = await patchADraft(updatedFormData, publication.id);
+			} else {
+				result = await draftAPublication(updatedFormData);
+			}
 
 			setToast(
-				t(`modal.draft-${helloEvent ? 'success' : 'error'}-toast-message`),
-				helloEvent ? AlertType.success : AlertType.error
+				t(`modal.draft-${result ? 'success' : 'error'}-toast-message`),
+				result ? AlertType.success : AlertType.error
 			);
 
-			if (helloEvent) onClose();
+			if (result) onClose();
 		});
 	};
 
diff --git a/lib/publications/actions/draft-publication.tsx b/lib/publications/actions/draft-publication.tsx
index 24258ed2..02b4565d 100644
--- a/lib/publications/actions/draft-publication.tsx
+++ b/lib/publications/actions/draft-publication.tsx
@@ -4,11 +4,11 @@ import { draftPublication } from '../draft-publication';
 import { revalidateTag } from 'next/cache';
 import constants from '@/utils/constants';
 
-export async function draftAPublication(formData: FormData, draftId?: string) {
+export async function draftAPublication(formData: FormData) {
 	var publication;
 
 	try {
-		publication = await draftPublication(formData, draftId);
+		publication = await draftPublication(formData);
 	} catch (e) {
 		return;
 	}
diff --git a/lib/publications/actions/patch-draft.tsx b/lib/publications/actions/patch-draft.tsx
new file mode 100644
index 00000000..64778722
--- /dev/null
+++ b/lib/publications/actions/patch-draft.tsx
@@ -0,0 +1,18 @@
+'use server';
+
+import { revalidateTag } from 'next/cache';
+import constants from '@/utils/constants';
+import { patchDraft } from '../patch-draft';
+
+export async function patchADraft(formData: FormData, draftId: string) {
+	var publication;
+
+	try {
+		publication = await patchDraft(formData, draftId);
+	} catch (e) {
+		return;
+	}
+
+	revalidateTag(constants.tags.publications);
+	return true;
+}
diff --git a/lib/publications/draft-publication.tsx b/lib/publications/draft-publication.tsx
index 4ac87b65..f829ef38 100644
--- a/lib/publications/draft-publication.tsx
+++ b/lib/publications/draft-publication.tsx
@@ -2,20 +2,14 @@ import { fetchWithSession, Method } from '@/lib/fetch-with-refresh';
 import { ApiResponse } from '@/models/api-response';
 import { HelloEvent } from '@/models/hello-event';
 
-export async function draftPublication(formData: FormData, draftId?: string) {
+export async function draftPublication(formData: FormData) {
 	for (const [key, value] of Array.from(formData.entries())) {
 		if (!value || value === 'Invalid Date') {
 			formData.delete(key);
 		}
 	}
 
-	let response;
-
-	if (draftId) {
-		response = await fetchWithSession(`organizer-drafts/${draftId}`, Method.PATCHFORM, formData);
-	} else {
-		response = await fetchWithSession('organizer-drafts', Method.POSTFORM, formData);
-	}
+	const response = await fetchWithSession('organizer-drafts', Method.POSTFORM, formData);
 
 	if (!response.ok) {
 		throw new Error('Failed to draft the publication');