Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat: Merge into develop-exo - EXO-72738,EXO-72741,EXO-72749,EXO-73246 #1167

Merged
merged 2 commits into from
Oct 15, 2024
Merged

feat: Merge into develop-exo - EXO-72738,EXO-72741,EXO-72749,EXO-73246 #1167

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dc1c37c
feat: Implement notes publication drawer - EXO-72738_EXO-72741 - Meed…
hakermi Oct 9, 2024
b875cce
feat: Notes publication drawer in edit mode - EXO-72749_EXO-73246 - M…
hakermi Oct 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions notes-service/src/main/java/org/exoplatform/wiki/service/rest/NotesRestService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -761,8 +761,8 @@ public Response updateNoteById(@Parameter(description = "Note id", required = tr
}
note_ = noteService.updateNote(note_, PageUpdateType.EDIT_PAGE_CONTENT_AND_TITLE, identity);
} else {
note_.setLang(note.getLang());
note_ = noteService.updateNote(note_, PageUpdateType.EDIT_PAGE_CONTENT_AND_TITLE, identity);
note_.setLang(note.getLang());
note_.setTitle(note.getTitle());
note_.setContent(note.getContent());
note_.setProperties(notePageProperties);
Expand All @@ -783,8 +783,8 @@ public Response updateNoteById(@Parameter(description = "Note id", required = tr
note_.setProperties(notePageProperties);
note_ = noteService.updateNote(note_, PageUpdateType.EDIT_PAGE_TITLE, identity);
} else {
note_.setLang(note.getLang());
note_ = noteService.updateNote(note_, PageUpdateType.EDIT_PAGE_TITLE, identity);
note_.setLang(note.getLang());
note_.setTitle(note.getTitle());
note_.setProperties(notePageProperties);
}
Expand All @@ -799,8 +799,8 @@ public Response updateNoteById(@Parameter(description = "Note id", required = tr
note_.setProperties(notePageProperties);
note_ = noteService.updateNote(note_, PageUpdateType.EDIT_PAGE_CONTENT, identity);
} else {
note_.setLang(note.getLang());
note_ = noteService.updateNote(note_, PageUpdateType.EDIT_PAGE_CONTENT, identity);
note_.setLang(note.getLang());
note_.setContent(note.getContent());
note_.setProperties(notePageProperties);
}
Expand All @@ -815,8 +815,8 @@ public Response updateNoteById(@Parameter(description = "Note id", required = tr
note_.setProperties(notePageProperties);
note_ = noteService.updateNote(note_, PageUpdateType.EDIT_PAGE_PROPERTIES, identity);
} else {
note_.setLang(note.getLang());
note_ = noteService.updateNote(note_, PageUpdateType.EDIT_PAGE_PROPERTIES, identity);
note_.setLang(note.getLang());
note_.setProperties(notePageProperties);
}
noteService.createVersionOfNote(note_, identity.getUserId());
Expand Down
9 changes: 8 additions & 1 deletion notes-webapp/src/main/resources/locale/portlet/notes/notesPortlet_en.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ notes.save.success.message=Note saved successfully
notes.view.label=View

notes.metadata.properties.label=Properties
notes.metadata.featuredImage.label=Featured images
notes.metadata.featuredImage.label=Featured image
notes.metadata.featuredImage.add.label=Add an image
notes.metadata.featuredImage.alt=Featured image
notes.metadata.summary.label=Summary
Expand All @@ -66,6 +66,13 @@ notes.featuredImage.remove.error.message=Error while removing featured image
notes.featuredImage.remove.success.message=Featured image removed successfully
notes.featuredImage.size.error.message=Featured image size should be less or equals to 20MB

notes.publication.publish.label=Publication
notes.publication.label=Choose your publication options
notes.publication.check.properties.label=Check the teaser
notes.publication.publish.next.label=Next
notes.publication.post.in.feed.label=Post in Activity stream of
notes.publication.publish.save.label=Publish

popup.confirm=Confirm
popup.msg.confirmation=Confirmation
popup.confirmation.delete=Delete the note
Expand Down
7 changes: 7 additions & 0 deletions notes-webapp/src/main/resources/locale/portlet/notes/notesPortlet_fr.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,13 @@ notes.featuredImage.remove.error.message=Erreur lors de la suppression de l'illu
notes.featuredImage.remove.success.message=Illustration supprimée avec succès
notes.featuredImage.size.error.message=La taille de l'illustration doit être inférieure ou égale à 20Mo

notes.publication.publish.label=Publication
notes.publication.label=Choisir les options de publication
notes.publication.check.properties.label=Vérifier l'accroche
notes.publication.publish.next.label=Suivant
notes.publication.post.in.feed.label=Publier dans le fil d'activités de
notes.publication.publish.save.label=Publier

popup.confirm=Confirmer
popup.msg.confirmation=Confirmation
popup.confirmation.delete=Supprimer la note
Expand Down
29 changes: 29 additions & 0 deletions notes-webapp/src/main/webapp/WEB-INF/gatein-resources.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,9 @@
<script>
<path>/javascript/notesRichEditor.bundle.js</path>
</script>
<depends>
<module>NotesPublication</module>
</depends>
<depends>
<module>commonVueComponents</module>
</depends>
Expand Down Expand Up @@ -114,6 +117,32 @@
</depends>
</module>

<module>
<name>NotesPublication</name>
<load-group>NotesGRP</load-group>
<script>
<path>/javascript/notesPublication.bundle.js</path>
</script>
<depends>
<module>commonVueComponents</module>
</depends>
<depends>
<module>extensionRegistry</module>
</depends>
<depends>
<module>vue</module>
</depends>
<depends>
<module>vuetify</module>
</depends>
<depends>
<module>eXoVueI18n</module>
</depends>
<depends>
<module>imageCropper</module>
</depends>
</module>

<portlet>
<name>NotesEditor</name>
<module>
Expand Down
9 changes: 8 additions & 1 deletion notes-webapp/src/main/webapp/skin/less/notes/notes.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,7 +212,14 @@
}
}

#editorMetadataDrawer {
#editorPublicationDrawer {
.post-feed-target {
max-width: 335px;
}

}

#editorMetadataDrawer, #editorPublicationDrawer {

.add-image-area, .image-preview {
background-color: @primaryBackground !important;
Expand Down
6 changes: 3 additions & 3 deletions notes-webapp/src/main/webapp/vue-app/notes-editor/components/NotesEditorDashboard.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -281,7 +281,7 @@ export default {
this.note.content = noteObject.content;
this.note.properties = noteObject.properties;
},
postNote(toPublish) {
postNote() {
this.postingNote = true;
clearTimeout(this.saveDraft);
const properties = this.note?.properties;
Expand All @@ -297,7 +297,7 @@ export default {
wikiOwner: this.note.wikiOwner,
content: this.$noteUtils.getContentToSave('notesContent', this.oembedMinWidth) || this.note.content,
parentPageId: this.note?.draftPage && this.note?.targetPageId === this.parentPageId ? null : this.parentPageId,
toBePublished: toPublish,
toBePublished: false,
appName: this.appName,
properties: properties
};
Expand Down Expand Up @@ -550,7 +550,7 @@ export default {
if (draftNote.properties) {
draftNote.properties.draft = true;
if (this.newTranslation && !this.featuredImageUpdated) {
draftNote.properties.featuredImage = null;
draftNote.properties.featuredImage = {};
}
}
this.$notesService.saveDraftNote(draftNote, this.parentPageId).then(savedDraftNote => {
Expand Down
Loading