Skip to content

Commit

Permalink
fix: Fix insert note page option - EXO-74420 - Meeds-io/MIPs#129 (#1154)
Browse files Browse the repository at this point in the history
  • Loading branch information
@azayati
azayati committed Oct 10, 2024
1 parent 63f3753 commit a04a684
Show file tree
Hide file tree
Showing 3 changed files with 103 additions and 145 deletions.
75 changes: 29 additions & 46 deletions notes-service/src/main/java/org/exoplatform/wiki/service/ExportThread.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,16 @@

package org.exoplatform.wiki.service;

import java.io.*;
import java.io.BufferedWriter;
import java.io.ByteArrayInputStream;
import java.io.File;
import java.io.FileInputStream;
import java.io.FileNotFoundException;
import java.io.FileOutputStream;
import java.io.FileWriter;
import java.io.IOException;
import java.io.InputStream;
import java.io.InterruptedIOException;
import java.nio.file.Files;
import java.nio.file.StandardCopyOption;
import java.text.SimpleDateFormat;
Expand All @@ -34,14 +43,15 @@
import java.util.List;
import java.util.Map;
import java.util.Optional;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import java.util.stream.Collectors;
import java.util.zip.ZipEntry;
import java.util.zip.ZipOutputStream;

import io.meeds.notes.model.NoteFeaturedImage;
import io.meeds.notes.model.NotePageProperties;
import org.apache.commons.io.FileUtils;
import org.apache.commons.lang3.StringUtils;
import org.springframework.util.MimeTypeUtils;

import com.fasterxml.jackson.databind.ObjectMapper;

Expand All @@ -59,9 +69,10 @@
import org.exoplatform.wiki.model.ExportList;
import org.exoplatform.wiki.model.NoteToExport;
import org.exoplatform.wiki.model.Page;
import org.exoplatform.wiki.model.Wiki;
import org.exoplatform.wiki.model.WikiType;
import org.springframework.util.MimeTypeUtils;

import io.meeds.notes.model.NoteFeaturedImage;
import io.meeds.notes.model.NotePageProperties;

public class ExportThread implements Runnable {

Expand Down Expand Up @@ -444,12 +455,20 @@ 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=\"";
String noteLinkprefix = "class=\"noteLink\" href=\"(?:.*?/|)(\\d+)";
String contentUpdated = content;
Map<String, String> urlToReplaces = new HashMap<>();
while (contentUpdated.contains("noteLink")) {
String checkContent = contentUpdated;
String noteId = contentUpdated.split(noteLinkprefix)[1].split("\"")[0];
Pattern pattern = Pattern.compile(noteLinkprefix);
Matcher matcher = pattern.matcher(contentUpdated);
while (matcher.find()) {
String matchedLink = matcher.group(0);
String noteId;
if (matcher.group(1) != null) {
noteId = matcher.group(1);
} else {
noteId = matcher.group(2);
}

Page linkedNote = null;
try {
linkedNote = noteService.getNoteById(noteId);
Expand All @@ -461,11 +480,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(noteLinkprefix + linkedNote.getId() + "\"", noteLinkprefix + noteParams + "\"");
}
contentUpdated = contentUpdated.replace(noteLinkprefix + noteId + "\"", "");
if (contentUpdated.equals(checkContent)) {
break;
urlToReplaces.put(matchedLink + "\"", "class=\"noteLink\" href=\"" + noteParams + "\"");
}
}
if (!urlToReplaces.isEmpty()) {
Expand Down Expand Up @@ -525,38 +540,6 @@ public String processImagesForExport(Page note) throws WikiException, IOExceptio
return htmlUploadImageProcessor.processImagesForExport(content);
}

private void replaceIncludedPages(Page note, Wiki wiki) throws WikiException {
Page note_ = noteService.getNoteOfNoteBookByName(wiki.getType(), wiki.getOwner(), note.getName());
if (note_ != null) {
String content = note_.getContent();
if (content.contains("class=\"noteLink\" href=\"//-")) {
while (content.contains("class=\"noteLink\" href=\"//-")) {
String linkedParams = content.split("class=\"noteLink\" href=\"//-")[1].split("-//\"")[0];
String NoteName = linkedParams.split("-////-")[2];
Page linkedNote = null;
linkedNote = noteService.getNoteOfNoteBookByName(wiki.getType(), wiki.getOwner(), NoteName);
if (linkedNote != null) {
content = content.replace("\"noteLink\" href=\"//-" + linkedParams + "-//",
"\"noteLink\" href=\"" + linkedNote.getId());
} else {
content = content.replace("\"noteLink\" href=\"//-" + linkedParams + "-//", "\"noteLink\" href=\"" + NoteName);
}
if (content.equals(note_.getContent()))
break;
}
if (!content.equals(note_.getContent())) {
note_.setContent(content);
noteService.updateNote(note_);
}
}
}
if (note.getChildren() != null) {
for (Page child : note.getChildren()) {
replaceIncludedPages(child, wiki);
}
}
}

private String replaceUrl(String body, Map<String, String> urlToReplaces) {
for (String url : urlToReplaces.keySet()) {
while (body.contains(url)) {
Expand Down
22 changes: 19 additions & 3 deletions notes-service/src/main/java/org/exoplatform/wiki/service/NoteService.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,7 @@

import java.io.IOException;
import java.util.List;
import java.util.Map;

import io.meeds.notes.model.NoteFeaturedImage;
import io.meeds.notes.model.NotePageProperties;
import org.gatein.api.EntityNotFoundException;

import org.exoplatform.commons.utils.PageList;
Expand All @@ -41,6 +38,9 @@
import org.exoplatform.wiki.service.search.SearchResult;
import org.exoplatform.wiki.service.search.WikiSearchData;

import io.meeds.notes.model.NoteFeaturedImage;
import io.meeds.notes.model.NotePageProperties;

/**
* Provides functions for processing database with notes, including: adding,
* editing, removing and searching for data.
Expand Down Expand Up @@ -72,6 +72,22 @@ public interface NoteService {
*/
Page createNote(Wiki noteBook, String parentNoteName, Page note, Identity userIdentity) throws WikiException,
IllegalAccessException;

/**
* Create a new note in the given notebook, under the given parent note.
*
* @param noteBook Notebook object.
* @param parentNoteName parent note name.
* @param note the note object to create.
* @param userIdentity user Identity.
* @param importMode true if the creation is without timestamp for import mode.
* @return The new note.
* @throws WikiException if an error occured
* @throws IllegalAccessException if the user don't have edit rights to the
* parent note
*/
Page createNote(Wiki noteBook, String parentNoteName, Page note, Identity userIdentity, boolean importMode) throws WikiException,
IllegalAccessException;

/**
* Deletes a note.
Expand Down
Loading

0 comments on commit a04a684

Please sign in to comment.