From 6cc7eb34e546a7c4e7c1b420cd78dcb2dc8d3ee1 Mon Sep 17 00:00:00 2001
From: Helmi Akermi <70575401+hakermi@users.noreply.github.com>
Date: Tue, 19 Nov 2024 10:30:14 +0100
Subject: [PATCH] feat: Implement edit note publication schedule - EXO-75389 -
 Meeds-io/MIPs#161 (#1214)

Implement edit note publication schedule
---
 .../portlet/notes/notesPortlet_en.properties  |  1 +
 .../portlet/notes/notesPortlet_fr.properties  |  1 +
 .../javascript/eXo/wiki/notesService.js       |  1 +
 .../components/NotePublicationDrawer.vue      |  1 +
 .../schedule-option/NoteScheduleOption.vue    | 31 +++++++++++++------
 .../notes/components/NotesOverview.vue        |  4 ++-
 6 files changed, 28 insertions(+), 11 deletions(-)

diff --git a/notes-webapp/src/main/resources/locale/portlet/notes/notesPortlet_en.properties b/notes-webapp/src/main/resources/locale/portlet/notes/notesPortlet_en.properties
index f40176194..02c30f878 100644
--- a/notes-webapp/src/main/resources/locale/portlet/notes/notesPortlet_en.properties
+++ b/notes-webapp/src/main/resources/locale/portlet/notes/notesPortlet_en.properties
@@ -106,6 +106,7 @@ notes.publication.advanced.option.label=Advanced options
 notes.publication.hide.author.label=Hide author
 notes.publication.hide.reaction.label=Hide reaction
 notes.publication.success.message=Note successfully published
+notes.publication.externalPage.publish.cancel.label=Cancel publishing
 
 popup.confirm=Confirm
 popup.msg.confirmation=Confirmation
diff --git a/notes-webapp/src/main/resources/locale/portlet/notes/notesPortlet_fr.properties b/notes-webapp/src/main/resources/locale/portlet/notes/notesPortlet_fr.properties
index e83a0e112..64a644087 100644
--- a/notes-webapp/src/main/resources/locale/portlet/notes/notesPortlet_fr.properties
+++ b/notes-webapp/src/main/resources/locale/portlet/notes/notesPortlet_fr.properties
@@ -105,6 +105,7 @@ notes.publication.advanced.option.label=Options avancées
 notes.publication.hide.author.label=Masquer l'auteur
 notes.publication.hide.reaction.label=Masquer la réaction
 notes.publication.success.message=Note publi\u00E9e avec succ\u00E8s
+notes.publication.externalPage.publish.cancel.label=Annuler la publication
 
 popup.confirm=Confirmer
 popup.msg.confirmation=Confirmation
diff --git a/notes-webapp/src/main/webapp/javascript/eXo/wiki/notesService.js b/notes-webapp/src/main/webapp/javascript/eXo/wiki/notesService.js
index de811aa81..7e4ab7bf3 100644
--- a/notes-webapp/src/main/webapp/javascript/eXo/wiki/notesService.js
+++ b/notes-webapp/src/main/webapp/javascript/eXo/wiki/notesService.js
@@ -476,6 +476,7 @@ export async function getSavedNotePublicationSettings(id, lang) {
       audience: article.audience,
       schedulePostDate: article.schedulePostDate,
       scheduleUnpublishDate: article.scheduleUnpublishDate,
+      fromExternalPage: article.fromExternalPage,
       properties: article.properties ?? {}
     };
   } catch (error) {
diff --git a/notes-webapp/src/main/webapp/vue-app/notes-publication/components/NotePublicationDrawer.vue b/notes-webapp/src/main/webapp/vue-app/notes-publication/components/NotePublicationDrawer.vue
index 672732776..3220ec19d 100644
--- a/notes-webapp/src/main/webapp/vue-app/notes-publication/components/NotePublicationDrawer.vue
+++ b/notes-webapp/src/main/webapp/vue-app/notes-publication/components/NotePublicationDrawer.vue
@@ -157,6 +157,7 @@
                           :publish="publicationSettings?.publish"
                           :is-publishing="isPublishing"
                           :edit-mode="editMode"
+                          :from-external-page="noteObject?.fromExternalPage"
                           :saved-schedule-settings="{
                             scheduled: currentScheduleSettings?.schedule,
                             postDate: currentScheduleSettings?.postDate,
diff --git a/notes-webapp/src/main/webapp/vue-app/notes-publication/components/schedule-option/NoteScheduleOption.vue b/notes-webapp/src/main/webapp/vue-app/notes-publication/components/schedule-option/NoteScheduleOption.vue
index 1df7e12d1..9efaabbfd 100644
--- a/notes-webapp/src/main/webapp/vue-app/notes-publication/components/schedule-option/NoteScheduleOption.vue
+++ b/notes-webapp/src/main/webapp/vue-app/notes-publication/components/schedule-option/NoteScheduleOption.vue
@@ -30,8 +30,17 @@
       :multiple="isMultipleSelectionOption"
       class="d-flex ms-n1 mt-0 pt-0">
       <v-radio
-        :label="cancelOption.label"
-        :value="cancelOption.value" />
+        v-if="fromExternalPage"
+        :label="$t('notes.publication.externalPage.publish.cancel.label')"
+        :value="CANCEL_SCHEDULE_OPTION" />
+      <v-radio
+        v-else-if="hasSavedUnpublishSchedule"
+        :label="$t('notes.publication.publish.cancel.label')"
+        :value="CANCEL_PUBLICATION_OPTION" />
+      <v-radio
+        v-else
+        :label="$t('notes.publication.schedule.cancel.label')"
+        :value="CANCEL_SCHEDULE_OPTION" />
       <v-tooltip
         v-if="canPublish"
         :disabled="!isMultipleSelectionOption"
@@ -194,10 +203,10 @@
 </template>
 
 <script>
-const SCHEDULE_OPTION = 'schedule';
-const PUBLISH_NOW_OPTION = 'publish_now';
-const CANCEL_SCHEDULE_OPTION = 'cancel_schedule';
-const CANCEL_PUBLICATION_OPTION = 'cancel_unpublish';
+export const SCHEDULE_OPTION = 'schedule';
+export const PUBLISH_NOW_OPTION = 'publish_now';
+export const CANCEL_SCHEDULE_OPTION = 'cancel_schedule';
+export const CANCEL_PUBLICATION_OPTION = 'cancel_unpublish';
 export default {
   data() {
     const { startDate, minStartDate, endDate } = this.initDateValues();
@@ -205,6 +214,8 @@ export default {
     const untilScheduleType = {label: this.$t('notes.publication.schedule.until.label'), value: 'until'};
     const fromScheduleType = {label: this.$t('notes.publication.schedule.from.label'), value: 'from'};
     return {
+      CANCEL_SCHEDULE_OPTION,
+      CANCEL_PUBLICATION_OPTION,
       editScheduleOption: null,
       schedule: false,
       betweenScheduleType: betweenScheduleType,
@@ -257,6 +268,10 @@ export default {
     canPublish: {
       type: Boolean,
       default: false
+    },
+    fromExternalPage: {
+      type: Boolean,
+      default: false
     }
   },
   watch: {
@@ -298,10 +313,6 @@ export default {
     isMultipleSelectionOption() {
       return this.schedule && this.isUntilScheduleType && !this.hasSavedUnpublishSchedule;
     },
-    cancelOption() {
-      return this.hasSavedUnpublishSchedule && {label: this.$t('notes.publication.publish.cancel.label'), value: CANCEL_PUBLICATION_OPTION}
-          || {label: this.$t('notes.publication.schedule.cancel.label'), value: CANCEL_SCHEDULE_OPTION};
-    },
     formattedStartDate() {
       return this.startDate && this.formatDate(this.startDate) || '';
     },
diff --git a/notes-webapp/src/main/webapp/vue-app/notes/components/NotesOverview.vue b/notes-webapp/src/main/webapp/vue-app/notes/components/NotesOverview.vue
index 1d0a79f35..58cb86d74 100644
--- a/notes-webapp/src/main/webapp/vue-app/notes/components/NotesOverview.vue
+++ b/notes-webapp/src/main/webapp/vue-app/notes/components/NotesOverview.vue
@@ -718,6 +718,7 @@ export default {
         this.$notesService.updateNoteById(note).then(() => {
           this.$notesService.saveNoteArticle(this.$noteUtils.noteToArticle(article, this.spaceId)).then(() => {
             this.isPublishing = false;
+            this.getSavedNotePublicationSettings(this.note?.id);
             this.$refs.publicationDrawer.close();
             this.$root.$emit('show-alert', {type: 'success', message: this.$t('notes.publication.success.message')});
           });
@@ -727,7 +728,8 @@ export default {
         this.$notesService.updateNotePublication(editScheduleAction, scheduleSettings,
           this.$noteUtils.noteToArticle(article, this.spaceId)).then(() => {
           this.isPublishing = false;
-          this.$root.$emit('show-alert', {type: 'success', message: this.$t('notes.publication.success.message')});
+          this.$refs.publicationDrawer.close();
+          this.$root.$emit('show-alert', {type: 'success', message: this.$t('notes.publication.settings.update.success')});
         });
       }
     },