From 6cb738a8a29c3f68ec4d486fd352708b4ea6d0ed Mon Sep 17 00:00:00 2001
From: swve <bdswve@gmail.com>
Date: Mon, 12 Aug 2024 19:29:38 +0200
Subject: [PATCH] feat: update activity publish state in assignment page

---
 .../dash/assignments/[assignmentuuid]/page.tsx         |  2 +-
 .../DraggableElements/ActivityElement.tsx              |  3 ++-
 .../Pages/CourseEdit/Draggables/Activity.tsx           | 10 +++-------
 3 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/apps/web/app/orgs/[orgslug]/dash/assignments/[assignmentuuid]/page.tsx b/apps/web/app/orgs/[orgslug]/dash/assignments/[assignmentuuid]/page.tsx
index f4c0fdf0..c55684fa 100644
--- a/apps/web/app/orgs/[orgslug]/dash/assignments/[assignmentuuid]/page.tsx
+++ b/apps/web/app/orgs/[orgslug]/dash/assignments/[assignmentuuid]/page.tsx
@@ -92,7 +92,7 @@ function PublishingState() {
 
     async function updateAssignmentPublishState(assignmentUUID: string) {
         const res = await updateAssignment({ published: !assignment?.assignment_object?.published }, assignmentUUID, access_token)
-        const res2 = await updateActivity({ published: !assignment?.assignment_object?.published }, assignment?.activity_object?.activity_uuid, access_token)
+        const res2 = await updateActivity({ published: !assignment?.assignment_object?.published  }, assignment?.activity_object?.activity_uuid, access_token)
         if (res.success && res2) {
             mutate(`${getAPIUrl()}assignments/${assignmentUUID}`)
             toast.success('The assignment has been updated successfully')
diff --git a/apps/web/components/Dashboard/Course/EditCourseStructure/DraggableElements/ActivityElement.tsx b/apps/web/components/Dashboard/Course/EditCourseStructure/DraggableElements/ActivityElement.tsx
index e693ab67..264d3ce5 100644
--- a/apps/web/components/Dashboard/Course/EditCourseStructure/DraggableElements/ActivityElement.tsx
+++ b/apps/web/components/Dashboard/Course/EditCourseStructure/DraggableElements/ActivityElement.tsx
@@ -65,6 +65,7 @@ function ActivityElement(props: ActivitiyElementProps) {
   async function changePublicStatus() {
     await updateActivity(
       {
+        ...props.activity,
         published: !props.activity.published,
       },
       props.activity.activity_uuid,
@@ -82,8 +83,8 @@ function ActivityElement(props: ActivitiyElementProps) {
     ) {
       setSelectedActivity(undefined)
       let modifiedActivityCopy = {
+        ...props.activity,
         name: modifiedActivity.activityName,
-        description: '',
       }
 
       await updateActivity(modifiedActivityCopy, activityUUID, access_token)
diff --git a/apps/web/components/Pages/CourseEdit/Draggables/Activity.tsx b/apps/web/components/Pages/CourseEdit/Draggables/Activity.tsx
index ed3ed13d..0aba0032 100644
--- a/apps/web/components/Pages/CourseEdit/Draggables/Activity.tsx
+++ b/apps/web/components/Pages/CourseEdit/Draggables/Activity.tsx
@@ -48,10 +48,8 @@ function Activity(props: any) {
     ) {
       setSelectedActivity(undefined)
       let modifiedActivityCopy = {
+        ...props.activity,
         name: modifiedActivity.activityName,
-        description: '',
-        type: props.activity.type,
-        content: props.activity.content,
       }
 
       await updateActivity(modifiedActivityCopy, activityId, session.data?.tokens?.access_token)
@@ -155,8 +153,7 @@ function Activity(props: any) {
                 <Link
                   href={
                     getUriWithOrg(props.orgslug, '') +
-                    `/course/${
-                      props.courseid
+                    `/course/${props.courseid
                     }/activity/${props.activity.uuid.replace(
                       'activity_',
                       ''
@@ -172,8 +169,7 @@ function Activity(props: any) {
             <Link
               href={
                 getUriWithOrg(props.orgslug, '') +
-                `/course/${
-                  props.courseid
+                `/course/${props.courseid
                 }/activity/${props.activity.uuid.replace('activity_', '')}`
               }
               className=" hover:cursor-pointer p-1 px-3 bg-gray-200 rounded-md"