Merge Meeds-io/MIPs#161

notes-service/src/main/java/io/meeds/notes/model/NotePageProperties.java

@@ -37,5 +37,10 @@ public class NotePageProperties implements Serializable {
 
   private NoteFeaturedImage featuredImage;
 
+  private boolean           hideAuthor;
+
+  private boolean           hideReaction;
+
   private boolean           isDraft;
+
 }

notes-service/src/main/java/io/meeds/notes/rest/model/PageEntity.java

@@ -44,4 +44,6 @@ public class PageEntity implements Serializable {
   private String               lang;
 
   private PagePropertiesEntity properties;
+
+  private boolean              extensionDataUpdated;
 }

notes-service/src/main/java/io/meeds/notes/rest/model/PagePropertiesEntity.java

@@ -35,5 +35,9 @@ public class PagePropertiesEntity implements Serializable {
 
   private FeaturedImageEntity featuredImage;
 
+  private boolean             hideAuthor;
+
+  private boolean             hideReaction;
+
   private boolean             isDraft;
 }

notes-service/src/main/java/io/meeds/notes/rest/utils/EntityBuilder.java

@@ -40,6 +40,8 @@ public static NotePageProperties toNotePageProperties(PagePropertiesEntity pageP
     return new NotePageProperties(pagePropertiesEntity.getNoteId(),
                                   pagePropertiesEntity.getSummary(),
                                   toNoteFeaturedImage(pagePropertiesEntity.getFeaturedImage()),
+                                  pagePropertiesEntity.isHideAuthor(),
+                                  pagePropertiesEntity.isHideReaction(),
                                   pagePropertiesEntity.isDraft());
   }
 

notes-service/src/main/java/org/exoplatform/wiki/jpa/EntityConverter.java

@@ -38,6 +38,7 @@
 import org.exoplatform.social.core.space.model.Space;
 import org.exoplatform.social.core.space.spi.SpaceService;
 import org.exoplatform.social.metadata.MetadataService;
+import org.exoplatform.social.metadata.model.MetadataItem;
 import org.exoplatform.social.metadata.model.MetadataKey;
 import org.exoplatform.social.metadata.model.MetadataType;
 import org.exoplatform.wiki.WikiException;
@@ -51,23 +52,26 @@
 
 import java.io.ByteArrayInputStream;
 import java.util.*;
+import java.util.stream.Collectors;
 
 /**
  * Utility class to convert JPA entity objects
  */
 public class EntityConverter {
 
-  private static final Log       LOG = ExoLogger.getLogger(EntityConverter.class);
+  private static final Log          LOG                        = ExoLogger.getLogger(EntityConverter.class);
 
-  private static SpaceService    spaceService;
+  private static SpaceService       spaceService;
 
-  private static MetadataService metadataService;
+  private static MetadataService    metadataService;
 
-  public static final MetadataType NOTES_METADATA_TYPE = new MetadataType(1001, "notes");
+  public static final MetadataType  NOTES_METADATA_TYPE        = new MetadataType(1001, "notes");
 
-  public static final MetadataKey  NOTES_METADATA_KEY   = new MetadataKey(NOTES_METADATA_TYPE.getName(),
-                                                                         Utils.NOTES_METADATA_OBJECT_TYPE,
-                                                                         0);
+  public static final MetadataKey   NOTES_METADATA_KEY         = new MetadataKey(NOTES_METADATA_TYPE.getName(),
+                                                                                 Utils.NOTES_METADATA_OBJECT_TYPE,
+                                                                                 0);
+
+  private static final List<String> ORIGINAL_SHARED_PROPERTIES = List.of("hideReaction", "hideAuthor");
 
   public static Wiki convertWikiEntityToWiki(WikiEntity wikiEntity) {
     Wiki wiki = null;
@@ -147,7 +151,7 @@ public static Page convertPageEntityToPage(PageEntity pageEntity) {
     }
     return page;
   }
-
+  
   public static void buildNotePageMetadata(Page note, boolean isDraft) {
     if (note == null) {
       return;
@@ -158,6 +162,7 @@ public static void buildNotePageMetadata(Page note, boolean isDraft) {
       if (note.getLang() != null) {
         noteId = noteId + "-" + note.getLang();
       }
+      Map<String, String> originalNoteSharedProperties = getOriginalNoteSharedProperties(note, space.getId());
       NoteMetadataObject noteMetadataObject = new NoteMetadataObject(isDraft ? "noteDraftPage" : "notePage",
                                                                      noteId,
                                                                      note.getParentPageId(),
@@ -167,40 +172,13 @@ public static void buildNotePageMetadata(Page note, boolean isDraft) {
                           .findFirst()
                           .ifPresent(metadataItem -> {
                             if (!MapUtils.isEmpty(metadataItem.getProperties())) {
-                              buildPageProperties(metadataItem.getProperties(), note);
+                              buildPageProperties(metadataItem.getProperties(), originalNoteSharedProperties, note);
                             }
                           });
 
     }
   }
-
-  private static void buildPageProperties(Map<String, String> properties, Page note) {
-    NotePageProperties notePageProperties = new NotePageProperties();
-    NoteFeaturedImage noteFeaturedImage = new NoteFeaturedImage();
-    notePageProperties.setNoteId(Long.parseLong(note.getId()));
-    notePageProperties.setSummary(properties.get(NoteServiceImpl.SUMMARY_PROP));
-    noteFeaturedImage.setId(Long.valueOf(properties.getOrDefault(NoteServiceImpl.FEATURED_IMAGE_ID, "0")));
-    noteFeaturedImage.setLastUpdated(Long.valueOf(properties.getOrDefault(NoteServiceImpl.FEATURED_IMAGE_UPDATED_DATE, "0")));
-    noteFeaturedImage.setAltText(properties.get(NoteServiceImpl.FEATURED_IMAGE_ALT_TEXT));
-    notePageProperties.setDraft(note.isDraftPage());
-    notePageProperties.setFeaturedImage(noteFeaturedImage);
-    note.setProperties(notePageProperties);
-  }
-
-  private static SpaceService getSpaceService() {
-    if (spaceService == null) {
-      spaceService = CommonsUtils.getService(SpaceService.class);
-    }
-    return spaceService;
-  }
 
-  private static MetadataService getMetadataService() {
-    if (metadataService == null) {
-      metadataService = CommonsUtils.getService(MetadataService.class);
-    }
-    return metadataService;
-  }
-
   public static List<PermissionEntry> convertPermissionEntitiesToPermissionEntries(List<PermissionEntity> permissionEntities,
                                                                                    List<PermissionType> filteredPermissionTypes) {
     List<PermissionEntry> permissionEntries = new ArrayList<>();
@@ -586,4 +564,60 @@ public static List<PageHistory> toPageHistoryVersions(List<PageVersionEntity> pa
   public static List<DraftPage> toDraftPages(List<DraftPageEntity> draftPageEntities) {
     return draftPageEntities.stream().map(EntityConverter::convertDraftPageEntityToDraftPage).toList();
   }
+
+  private static Map<String, String> getOriginalNoteSharedProperties(Page note, String spaceId) {
+    if (note.getLang() == null || note.isDraftPage()) {
+      return new HashMap<>();
+    }
+    NoteMetadataObject originalNoteMetadataObject = new NoteMetadataObject("notePage",
+                                                                           note.getId(),
+                                                                           note.getParentPageId(),
+                                                                           Long.parseLong(spaceId));
+    List<MetadataItem> metadataItems = getMetadataService().getMetadataItemsByMetadataAndObject(NOTES_METADATA_KEY,
+                                                                                                originalNoteMetadataObject);
+    Map<String, String> originalNoteSharedProperties = new HashMap<>();
+    if (!CollectionUtils.isEmpty(metadataItems)) {
+      originalNoteSharedProperties = metadataItems.getFirst().getProperties();
+    }
+    return originalNoteSharedProperties.entrySet()
+                                       .stream()
+                                       .filter(entry -> ORIGINAL_SHARED_PROPERTIES.contains(entry.getKey()))
+                                       .collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue));
+  }
+
+  private static void buildPageProperties(Map<String, String> properties,
+                                          Map<String, String> originalNoteSharedProperties,
+                                          Page note) {
+    Map<String, String> finalProperties = new HashMap<>(properties);
+    finalProperties.putAll(originalNoteSharedProperties);
+    NotePageProperties notePageProperties = new NotePageProperties();
+    NoteFeaturedImage noteFeaturedImage = new NoteFeaturedImage();
+    notePageProperties.setNoteId(Long.parseLong(note.getId()));
+    notePageProperties.setSummary(finalProperties.get(NoteServiceImpl.SUMMARY_PROP));
+    notePageProperties.setHideAuthor(Boolean.parseBoolean(finalProperties.getOrDefault(NoteServiceImpl.HIDE_AUTHOR_PROP,
+                                                                                       "false")));
+    notePageProperties.setHideReaction(Boolean.parseBoolean(properties.getOrDefault(NoteServiceImpl.HIDE_REACTION_PROP,
+                                                                                    "false")));
+    noteFeaturedImage.setId(Long.valueOf(finalProperties.getOrDefault(NoteServiceImpl.FEATURED_IMAGE_ID, "0")));
+    noteFeaturedImage.setLastUpdated(Long.valueOf(finalProperties.getOrDefault(NoteServiceImpl.FEATURED_IMAGE_UPDATED_DATE,
+                                                                               "0")));
+    noteFeaturedImage.setAltText(finalProperties.get(NoteServiceImpl.FEATURED_IMAGE_ALT_TEXT));
+    notePageProperties.setDraft(note.isDraftPage());
+    notePageProperties.setFeaturedImage(noteFeaturedImage);
+    note.setProperties(notePageProperties);
+  }
+
+  private static SpaceService getSpaceService() {
+    if (spaceService == null) {
+      spaceService = CommonsUtils.getService(SpaceService.class);
+    }
+    return spaceService;
+  }
+
+  private static MetadataService getMetadataService() {
+    if (metadataService == null) {
+      metadataService = CommonsUtils.getService(MetadataService.class);
+    }
+    return metadataService;
+  }
 }

notes-service/src/main/java/org/exoplatform/wiki/model/Page.java

@@ -95,6 +95,8 @@ public class Page {
 
   private boolean                         hasChild;
 
+  private String                         latestVersionId;
+
   private boolean                         isDeleted;
 
   private Page                            parent;

notes-service/src/main/java/org/exoplatform/wiki/service/ExportThread.java

@@ -455,7 +455,8 @@ public NoteToExport getNoteToExport(NoteToExport note, int exportId) throws Wiki
 
   public String processNotesLinkForExport(NoteToExport note) throws WikiException {
     String content = note.getContent();
-    String noteLinkprefix = "class=\"noteLink\" href=\"(?:.*?/|)(\\d+)";
+    String noteLinkprefix = "class=\"noteLink\" href=\"(?:.*?/)?(\\d+)\"";
+
     String contentUpdated = content;
     Map<String, String> urlToReplaces = new HashMap<>();
     Pattern pattern = Pattern.compile(noteLinkprefix);
@@ -480,7 +481,7 @@ public String processNotesLinkForExport(NoteToExport note) throws WikiException
         String noteParams = IMAGE_URL_REPLACEMENT_PREFIX + linkedNote.getWikiType() + IMAGE_URL_REPLACEMENT_SUFFIX
             + IMAGE_URL_REPLACEMENT_PREFIX + linkedNote.getWikiOwner() + IMAGE_URL_REPLACEMENT_SUFFIX
             + IMAGE_URL_REPLACEMENT_PREFIX + linkedNote.getName() + IMAGE_URL_REPLACEMENT_SUFFIX;
-        urlToReplaces.put(matchedLink + "\"", "class=\"noteLink\" href=\"" + noteParams + "\"");
+        urlToReplaces.put(matchedLink, "class=\"noteLink\" href=\"" + noteParams + "\"");
       }
     }
     if (!urlToReplaces.isEmpty()) {

notes-service/src/main/java/org/exoplatform/wiki/service/impl/NoteServiceImpl.java

@@ -142,6 +142,10 @@ public class NoteServiceImpl implements NoteService {
 
   public static final String                              SUMMARY_PROP                           = "summary";
 
+  public static final String                              HIDE_AUTHOR_PROP                       = "hideAuthor";
+
+  public static final String                              HIDE_REACTION_PROP                     = "hideReaction";
+
   public static final String                              FEATURED_IMAGE_ID                      = "featuredImageId";
 
   public static final String                              FEATURED_IMAGE_UPDATED_DATE            = "featuredImageUpdatedDate";
@@ -256,6 +260,7 @@ public Page createNote(Wiki noteBook, String parentNoteName, Page note, Identity
       note.setContent(note.getContent());
       Page createdPage = createNote(noteBook, parentPage, note);
       NotePageProperties properties = note.getProperties();
+      String draftPageId = String.valueOf(properties != null && properties.isDraft() ? properties.getNoteId() : null);
       try {
         if (properties != null) {
           properties.setNoteId(Long.parseLong(createdPage.getId()));
@@ -274,6 +279,15 @@ public Page createNote(Wiki noteBook, String parentNoteName, Page note, Identity
         createdPage.setCanImport(canImportNotes(note.getAuthor(), space, note));
         createdPage.setCanView(canViewNotes(note.getAuthor(), space, note));
       }
+      dataStorage.addPageVersion(createdPage, userIdentity.getUserId());
+      PageVersion pageVersion = dataStorage.getPublishedVersionByPageIdAndLang(Long.valueOf(createdPage.getId()), createdPage.getLang());
+      createdPage.setLatestVersionId(pageVersion != null ? pageVersion.getId() : null);
+      if (pageVersion != null && draftPageId != null) {
+        Map<String, String> eventData = new HashMap<>();
+        eventData.put("draftPageId", draftPageId);
+        eventData.put("pageVersionId", pageVersion.getId());
+        Utils.broadcast(listenerService, "note.page.version.created", this, eventData);
+      }
       return createdPage;
     } else {
       throw new EntityNotFoundException("Parent note not found");
@@ -1007,6 +1021,8 @@ public List<PageHistory> getVersionsHistoryOfNote(Page note, String userName) th
   @Override
   public void createVersionOfNote(Page note, String userName) throws WikiException {
     PageVersion pageVersion = dataStorage.addPageVersion(note, userName);
+    String pageVersionId = pageVersion.getId();
+    note.setLatestVersionId(pageVersionId);
     if (note.getLang() != null) {
       try {
         NotePageProperties properties = note.getProperties();
@@ -1028,8 +1044,14 @@ public void createVersionOfNote(Page note, String userName) throws WikiException
                              null,
                              NOTE_METADATA_PAGE_OBJECT_TYPE,
                              NOTE_METADATA_VERSION_PAGE_OBJECT_TYPE,
-                             userName
-      );
+                             userName);
+    }
+    DraftPage draftPage = dataStorage.getLatestDraftPageByTargetPageAndLang(Long.valueOf(note.getId()), note.getLang());
+    if (draftPage != null) {
+      Map<String, String> eventData = new HashMap<>();
+      eventData.put("draftPageId", draftPage.getId());
+      eventData.put("pageVersionId", pageVersionId);
+      Utils.broadcast(listenerService, "note.page.version.created", this, eventData);
     }
   }
 
@@ -1212,6 +1234,14 @@ public DraftPage createDraftForExistPage(DraftPage draftPage,
       log.error("Failed to save draft note metadata", e);
     }
     newDraftPage.setProperties(properties);
+    //
+    PageVersion pageVersion = getPublishedVersionByPageIdAndLang(Long.valueOf(newDraftPage.getTargetPageId()), newDraftPage.getLang());
+    if (pageVersion != null) {
+      Map<String, String> eventData = new HashMap<>();
+      eventData.put("pageVersionId", pageVersion.getId());
+      eventData.put("draftForExistingPageId", newDraftPage.getId());
+      Utils.broadcast(listenerService, "note.draft.for.exist.page.created", this, eventData);
+    }
     return newDraftPage;
   }
 
@@ -1407,10 +1437,16 @@ public Page getNoteByIdAndLang(Long pageId, Identity userIdentity, String source
       page.setContent(publishedVersion.getContent());
       page.setLang(publishedVersion.getLang());
       page.setProperties(publishedVersion.getProperties());
+      page.setLatestVersionId(publishedVersion.getId());
       if (lang != null) {
         page.setMetadatas(retrieveMetadataItems(pageId + "-" + lang, userIdentity.getUserId()));
       }
     }
+    if (page != null && publishedVersion == null && lang != null) {
+      //no version with lang, set the latest version id without lang
+      publishedVersion = dataStorage.getPublishedVersionByPageIdAndLang(pageId, null);
+      page.setLatestVersionId(publishedVersion == null ? null : publishedVersion.getId());
+    }
     return page;
   }
 
@@ -1423,6 +1459,7 @@ public Page getNoteByIdAndLang(Long pageId, String lang) {
       page.setTitle(publishedVersion.getTitle());
       page.setContent(publishedVersion.getContent());
       page.setLang(publishedVersion.getLang());
+      page.setLatestVersionId(publishedVersion.getId());
     }
     return page;
   }
@@ -1716,6 +1753,8 @@ public NotePageProperties saveNoteMetadata(NotePageProperties notePageProperties
       properties = metadataItem.getProperties();
     }
     properties.put(SUMMARY_PROP, notePageProperties.getSummary());
+    properties.put(HIDE_AUTHOR_PROP, String.valueOf(notePageProperties.isHideAuthor()));
+    properties.put(HIDE_REACTION_PROP, String.valueOf(notePageProperties.isHideReaction()));
     if (featuredImageId != null) {
       properties.put(FEATURED_IMAGE_ID, String.valueOf(featuredImageId));
       properties.put(FEATURED_IMAGE_UPDATED_DATE, String.valueOf(new Date().getTime()));