From 3086165b7f08b77c8cb291ae275bb0c4524feeae Mon Sep 17 00:00:00 2001
From: Nirmal Kumar R <tildezero@gmail.com>
Date: Tue, 5 Nov 2024 22:01:22 +0000
Subject: [PATCH] Fix data-context + Remove RelativePath attributes

---
 modules/structs/miscellaneous.go   |  4 ----
 routers/api/v1/misc/markup.go      | 13 ++++++-------
 routers/common/markup.go           |  6 +++---
 routers/web/misc/markup.go         | 13 ++++++-------
 templates/repo/editor/edit.tmpl    |  2 +-
 templates/swagger/v1_json.tmpl     |  4 ----
 web_src/js/features/repo-editor.js |  1 -
 7 files changed, 16 insertions(+), 27 deletions(-)

diff --git a/modules/structs/miscellaneous.go b/modules/structs/miscellaneous.go
index 3af7c818d1..7866cb5fc0 100644
--- a/modules/structs/miscellaneous.go
+++ b/modules/structs/miscellaneous.go
@@ -41,10 +41,6 @@ type MarkupOption struct {
 	//
 	// in: body
 	BranchPath string
-	// Relative path to the repository
-	//
-	// in: body
-	RelativePath string
 }
 
 // MarkupRender is a rendered markup document
diff --git a/routers/api/v1/misc/markup.go b/routers/api/v1/misc/markup.go
index 94046c1352..155ad15712 100644
--- a/routers/api/v1/misc/markup.go
+++ b/routers/api/v1/misc/markup.go
@@ -42,13 +42,12 @@ func Markup(ctx *context.APIContext) {
 	}
 
 	re := common.Renderer{
-		Mode:         form.Mode,
-		Text:         form.Text,
-		URLPrefix:    form.Context,
-		FilePath:     form.FilePath,
-		BranchPath:   form.BranchPath,
-		RelativePath: form.RelativePath,
-		IsWiki:       form.Wiki,
+		Mode:       form.Mode,
+		Text:       form.Text,
+		URLPrefix:  form.Context,
+		FilePath:   form.FilePath,
+		BranchPath: form.BranchPath,
+		IsWiki:     form.Wiki,
 	}
 
 	re.RenderMarkup(ctx.Base, ctx.Repo)
diff --git a/routers/common/markup.go b/routers/common/markup.go
index 7e11d88e93..ea14e315f2 100644
--- a/routers/common/markup.go
+++ b/routers/common/markup.go
@@ -19,8 +19,8 @@ import (
 )
 
 type Renderer struct {
-	Mode, Text, URLPrefix, FilePath, BranchPath, RelativePath string
-	IsWiki                                                    bool
+	Mode, Text, URLPrefix, FilePath, BranchPath string
+	IsWiki                                      bool
 }
 
 // RenderMarkup renders markup text for the /markup and /markdown endpoints
@@ -55,7 +55,7 @@ func (re *Renderer) RenderMarkup(ctx *context.Base, repo *context.Repository) {
 	case "file":
 		// File as document based on file extension
 		markupType = ""
-		re.URLPrefix = re.RelativePath
+		re.URLPrefix = repo.RepoLink
 		relativePath = re.FilePath
 	default:
 		ctx.Error(http.StatusUnprocessableEntity, fmt.Sprintf("Unknown mode: %s", re.Mode))
diff --git a/routers/web/misc/markup.go b/routers/web/misc/markup.go
index e9a6f951d1..2bae122b91 100644
--- a/routers/web/misc/markup.go
+++ b/routers/web/misc/markup.go
@@ -16,13 +16,12 @@ func Markup(ctx *context.Context) {
 	form := web.GetForm(ctx).(*api.MarkupOption)
 
 	re := common.Renderer{
-		Mode:         form.Mode,
-		Text:         form.Text,
-		URLPrefix:    form.Context,
-		FilePath:     form.FilePath,
-		BranchPath:   form.BranchPath,
-		RelativePath: form.RelativePath,
-		IsWiki:       form.Wiki,
+		Mode:       form.Mode,
+		Text:       form.Text,
+		URLPrefix:  form.Context,
+		FilePath:   form.FilePath,
+		BranchPath: form.BranchPath,
+		IsWiki:     form.Wiki,
 	}
 
 	re.RenderMarkup(ctx.Base, ctx.Repo)
diff --git a/templates/repo/editor/edit.tmpl b/templates/repo/editor/edit.tmpl
index 7b750b1e27..39379a977c 100644
--- a/templates/repo/editor/edit.tmpl
+++ b/templates/repo/editor/edit.tmpl
@@ -28,7 +28,7 @@
 			<div class="field">
 				<div class="ui top attached tabular menu" data-write="write" data-preview="preview" data-diff="diff">
 					<a class="active item" data-tab="write">{{svg "octicon-code"}} {{if .IsNewFile}}{{ctx.Locale.Tr "repo.editor.new_file"}}{{else}}{{ctx.Locale.Tr "repo.editor.edit_file"}}{{end}}</a>
-					<a class="item" data-tab="preview" data-url="{{.Repository.Link}}/markup" data-context="{{.RepoLink}}/src/{{.BranchNameSubURL}}" data-branch-path="{{.BranchNameSubURL}}" data-relative-path="{{.Repository.Link}}" data-markup-mode="file">{{svg "octicon-eye"}} {{ctx.Locale.Tr "preview"}}</a>
+					<a class="item" data-tab="preview" data-url="{{.Repository.Link}}/markup" data-context="{{.RepoLink}}" data-branch-path="{{.BranchNameSubURL}}" data-markup-mode="file">{{svg "octicon-eye"}} {{ctx.Locale.Tr "preview"}}</a>
 					{{if not .IsNewFile}}
 					<a class="item" data-tab="diff" hx-params="context,content" hx-vals='{"context":"{{.BranchLink}}"}' hx-include="#edit_area" hx-swap="innerHTML" hx-target=".tab[data-tab='diff']" hx-indicator=".tab[data-tab='diff']" hx-post="{{.RepoLink}}/_preview/{{.BranchName | PathEscapeSegments}}/{{.TreePath | PathEscapeSegments}}">{{svg "octicon-diff"}} {{ctx.Locale.Tr "repo.editor.preview_changes"}}</a>
 					{{end}}
diff --git a/templates/swagger/v1_json.tmpl b/templates/swagger/v1_json.tmpl
index 4f5bf8d29d..c714ff0927 100644
--- a/templates/swagger/v1_json.tmpl
+++ b/templates/swagger/v1_json.tmpl
@@ -24338,10 +24338,6 @@
           "description": "Mode to render (comment, gfm, markdown, file)\n\nin: body",
           "type": "string"
         },
-        "RelativePath": {
-          "description": "Relative path to the repository\n\nin: body",
-          "type": "string"
-        },
         "Text": {
           "description": "Text markup to render\n\nin: body",
           "type": "string"
diff --git a/web_src/js/features/repo-editor.js b/web_src/js/features/repo-editor.js
index 242b0143c4..5b59b66f80 100644
--- a/web_src/js/features/repo-editor.js
+++ b/web_src/js/features/repo-editor.js
@@ -27,7 +27,6 @@ function initEditPreviewTab($form) {
       formData.append('mode', mode);
       formData.append('context', context);
       formData.append('branch_path', $this.data('branch-path'));
-      formData.append('relative_path', $this.data('relative-path'));
       formData.append(
         'text',
         $form.find(`.tab[data-tab="${$tabMenu.data('write')}"] textarea`).val(),