Merge pull request #271 from AyshaHakeem/feat-markdown-editor

fix: fix errors, undo escaped code content in previous commit

wiki/hooks.py

@@ -7,6 +7,16 @@
 app_email = "[email protected]"
 app_license = "MIT"
 
+add_to_apps_screen = [
+	{
+		"name": "wiki",
+		"logo": "/assets/wiki/images/wiki-logo.png",
+		"title": "Wiki",
+		"route": "/app/wiki",
+		# "has_permission": "erpnext.check_app_permission",
+	}
+]
+
 page_renderer = "wiki.wiki.doctype.wiki_page.wiki_renderer.WikiPageRenderer"
 
 website_route_rules = [

wiki/patches.txt

@@ -7,4 +7,5 @@ wiki.wiki.doctype.wiki_feedback.patches.delete_wiki_feedback_item
 [post_model_sync]
 wiki.wiki.doctype.wiki_space.patches.wiki_sidebar_migration
 wiki.wiki.doctype.wiki_settings.patches.wiki_navbar_item_migration
-wiki.wiki.doctype.wiki_page.patches.convert_wiki_content_to_markdown
+wiki.wiki.doctype.wiki_page.patches.convert_wiki_content_to_markdown
+wiki.wiki.doctype.wiki_page.patches.update_escaped_code_content

wiki/public/js/editor.js

@@ -61,7 +61,15 @@ function setEditor() {
     theme: "ace/theme/tomorrow_night",
   });
   editor.renderer.lineHeight = 20;
-  editor.setValue(markdown_content || "", 1);
+  frappe.call({
+    method: "wiki.wiki.doctype.wiki_page.wiki_page.get_markdown_content",
+    args: {
+      wikiPageName,
+    },
+    callback: (r) => {
+      editor.setValue(r.message || "", 1);
+    },
+  });
   wikiTitleInput.val($(".wiki-title").text() || "");
 }
 

wiki/public/scss/wiki.scss

@@ -40,21 +40,9 @@ body {
 
   // ------------------------------------------
 
-  font-family:
-    InterVariable,
-    ui-sans-serif,
-    system-ui,
-    -apple-system,
-    BlinkMacSystemFont,
-    Segoe UI,
-    Roboto,
-    Helvetica Neue,
-    Arial,
-    Noto Sans,
-    sans-serif,
-    "Apple Color Emoji",
-    "Segoe UI Emoji",
-    Segoe UI Symbol,
+  font-family: InterVariable, ui-sans-serif, system-ui, -apple-system,
+    BlinkMacSystemFont, Segoe UI, Roboto, Helvetica Neue, Arial, Noto Sans,
+    sans-serif, "Apple Color Emoji", "Segoe UI Emoji", Segoe UI Symbol,
     "Noto Color Emoji";
 
   background-color: var(--background-color);
@@ -328,10 +316,7 @@ body.dark {
   &.active {
     background-color: var(--sidebar-active-item-color);
     border-radius: 0.625rem;
-    box-shadow:
-      0 0 #0000,
-      0 0 #0000,
-      0px 1px 2px rgba(0, 0, 0, 0.1);
+    box-shadow: 0 0 #0000, 0 0 #0000, 0px 1px 2px rgba(0, 0, 0, 0.1);
   }
 
   div {
@@ -777,6 +762,7 @@ body.dark {
     margin-bottom: 1rem;
   }
   .wiki-title-input {
+    color: var(--text-color);
     background-color: var(--editor-background-color);
   }
 }
@@ -969,10 +955,7 @@ h6:hover .feather-link {
   .active {
     color: var(--text-color);
     box-shadow: 1px 0 0 var(--primary) inset;
-    transition:
-      color 0.2s,
-      box-shadow 0.2s linear,
-      transform 0.2s linear;
+    transition: color 0.2s, box-shadow 0.2s linear, transform 0.2s linear;
   }
 
   a {

wiki/wiki/doctype/wiki_page/patches/update_escaped_code_content.py

@@ -0,0 +1,14 @@
+import frappe
+
+
+def execute():
+	wiki_pages = frappe.db.get_all("Wiki Page", fields=["name", "content"])
+	for page in wiki_pages:
+		markdown_content = (
+			page["content"]
+			.replace("`", "`")
+			.replace("${", "${")
+			.replace(">", ">")
+			.replace("&lt;", "<")
+		)
+		frappe.db.set_value("Wiki Page", page["name"], "content", markdown_content)

wiki/wiki/doctype/wiki_page/templates/show.html

@@ -3,7 +3,7 @@
 		<h1 class="wiki-title">{{ title }}</h1>
 	</div>
 	<div class="wiki-content">
-		{{frappe.utils.md_to_html(show_content)}}
+		{{frappe.utils.md_to_html(content)}}
 	</div>
 	<input value={{ name }} class="d-none" name="wiki-page-name"></input>
 	{% include "wiki/doctype/wiki_page/templates/revisions.html" %}
@@ -92,7 +92,7 @@ <h5 class="modal-title" id="addGroupModalTitle">Title</h5>
 {{ include_script('wiki.bundle.js') }}
 
 <script>
-	const markdown_content = `{{content}}`;
+	const wikiPageName = `{{name}}`;
 	function getSidebarItems() {
 		let side = {};
 
@@ -126,4 +126,4 @@ <h5 class="modal-title" id="addGroupModalTitle">Title</h5>
 
 {%- if script -%}
 <script>{{ script }}</script>
-{%- endif -%}
+{%- endif -%}

wiki/wiki/doctype/wiki_page/wiki_page.py

@@ -26,8 +26,6 @@
 
 class WikiPage(WebsiteGenerator):
 	def before_save(self):
-		self.content = self.sanitize_html().replace("`", "`").replace("${", "${")
-
 		if old_title := frappe.db.get_value("Wiki Page", self.name, "title"):
 			if old_title != self.title:
 				clear_sidebar_cache()
@@ -130,7 +128,7 @@ def attributes_filter(tag, name, value):
 			if "youtube.com/embed/" not in iframe["src"]:
 				iframe.replace_with(str(iframe))
 
-		escaped_html = str(soup).replace("`", "`").replace("${", "${")
+		escaped_html = str(soup)
 		return escaped_html
 
 	def update_page(self, title, content, edit_message, raised_by=None):
@@ -241,8 +239,6 @@ def get_context(self, context):
 			"Wiki Group Item", {"wiki_page": self.name}, "hide_on_sidebar"
 		)
 		html = frappe.utils.md_to_html(self.content)
-		context.show_content = self.content.replace("`", "`").replace("${", "${")
-		#
 		context.content = self.content
 		context.page_toc_html = (
 			self.calculate_toc_html(html) if wiki_settings.enable_table_of_contents else None
@@ -606,3 +602,8 @@ def update_page_settings(name, settings):
 	)
 
 	frappe.db.set_value("Wiki Page", name, "route", settings.route)
+
+
+@frappe.whitelist()
+def get_markdown_content(wikiPageName):
+	return frappe.db.get_value("Wiki Page", wikiPageName, "content")