From 4d94b7c60ad371ed461a0afc94ba8ea792aa506f Mon Sep 17 00:00:00 2001
From: neel1996 <47709856+neel1996@users.noreply.github.com>
Date: Wed, 12 Oct 2022 02:20:12 +0530
Subject: [PATCH 1/5] fix: hide repo related info while viewing or blaming a
 file - Hide repository's description, website link, topics list, and
 statistics bar while viewing or blaming a file from the repo - Resolves
 #21406

---
 templates/repo/home.tmpl     | 2 ++
 templates/repo/sub_menu.tmpl | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/templates/repo/home.tmpl b/templates/repo/home.tmpl
index e1aa1c4f3b45b..156c660a5a5b8 100644
--- a/templates/repo/home.tmpl
+++ b/templates/repo/home.tmpl
@@ -3,6 +3,7 @@
 	{{template "repo/header" .}}
 	<div class="ui container {{if .IsBlame}}fluid padded{{end}}">
 		{{template "base/alert" .}}
+		{{if and (not .IsViewFile) (not .IsBlame)}}
 		<div class="ui repo-description">
 			<div id="repo-desc">
 				{{$description := .Repository.DescriptionHTML $.Context}}
@@ -31,6 +32,7 @@
 		{{range .Topics}}<a class="ui repo-topic large label topic" href="{{AppSubUrl}}/explore/repos?q={{.Name}}&topic=1">{{.Name}}</a>{{end}}
 		{{if and .Permission.IsAdmin (not .Repository.IsArchived)}}<a id="manage_topic" class="muted">{{.locale.Tr "repo.topic.manage_topics"}}</a>{{end}}
 		</div>
+		{{end}}
 		{{if and .Permission.IsAdmin (not .Repository.IsArchived)}}
 		<div class="ui repo-topic-edit grid form" id="topic_edit" style="display:none">
 			<div class="fourteen wide column">
diff --git a/templates/repo/sub_menu.tmpl b/templates/repo/sub_menu.tmpl
index e63cb50df1bb8..8892a99932d01 100644
--- a/templates/repo/sub_menu.tmpl
+++ b/templates/repo/sub_menu.tmpl
@@ -1,3 +1,4 @@
+{{if and (not .IsViewFile) (not .IsBlame)}}
 <div class="ui segments repository-summary{{if and (.Permission.CanRead $.UnitTypeCode) (not .IsEmptyRepo) .LanguageStats}} repository-summary-language-stats{{end}} mt-2 mb-0">
 	<div class="ui segment sub-menu repository-menu">
 		<div class="ui two horizontal center link list">
@@ -44,3 +45,4 @@
 	</a>
 	{{end}}
 </div>
+{{end}}

From d549f7ca0fd2ef8d6baea2eaad8fd38bab956977 Mon Sep 17 00:00:00 2001
From: neel1996 <47709856+neel1996@users.noreply.github.com>
Date: Wed, 12 Oct 2022 12:56:12 +0530
Subject: [PATCH 2/5] fix: add integration tests for fix-21406 - Asserts that
 repo description, topics and summary are not displayed in file view / blame
 mode - Resolves #21406

---
 tests/integration/repo_test.go | 38 ++++++++++++++++++++++++++++++++++
 1 file changed, 38 insertions(+)

diff --git a/tests/integration/repo_test.go b/tests/integration/repo_test.go
index 8dfa9d08f1457..d101452ec0973 100644
--- a/tests/integration/repo_test.go
+++ b/tests/integration/repo_test.go
@@ -182,3 +182,41 @@ func TestViewAsRepoAdmin(t *testing.T) {
 		assert.Equal(t, expectedNoDescription, noDescription.HasClass("no-description"))
 	}
 }
+
+// TestViewFileInRepo repo description, topics and summary should not be displayed when viewing a file
+func TestViewFileInRepo(t *testing.T) {
+	defer tests.PrepareTestEnv(t)()
+
+	session := loginUser(t, "user2")
+
+	req := NewRequest(t, "GET", "/user2/repo1/src/branch/master/README.md")
+	resp := session.MakeRequest(t, req, http.StatusOK)
+
+	htmlDoc := NewHTMLParser(t, resp.Body)
+	description := htmlDoc.doc.Find("#repo-desc")
+	repoTopics := htmlDoc.doc.Find("#repo-topics")
+	repoSummary := htmlDoc.doc.Find(".repository-summary")
+
+	assert.EqualValues(t, 0, description.Length())
+	assert.EqualValues(t, 0, repoTopics.Length())
+	assert.EqualValues(t, 0, repoSummary.Length())
+}
+
+// TestBlameFileInRepo repo description, topics and summary should not be displayed when running blame on a file
+func TestBlameFileInRepo(t *testing.T) {
+	defer tests.PrepareTestEnv(t)()
+
+	session := loginUser(t, "user2")
+
+	req := NewRequest(t, "GET", "/user2/repo1/blame/branch/master/README.md")
+	resp := session.MakeRequest(t, req, http.StatusOK)
+
+	htmlDoc := NewHTMLParser(t, resp.Body)
+	description := htmlDoc.doc.Find("#repo-desc")
+	repoTopics := htmlDoc.doc.Find("#repo-topics")
+	repoSummary := htmlDoc.doc.Find(".repository-summary")
+
+	assert.EqualValues(t, 0, description.Length())
+	assert.EqualValues(t, 0, repoTopics.Length())
+	assert.EqualValues(t, 0, repoSummary.Length())
+}

From bfa09c4d5783e5c425a9e6b76856284284246364 Mon Sep 17 00:00:00 2001
From: neel1996 <47709856+neel1996@users.noreply.github.com>
Date: Thu, 13 Oct 2022 01:01:50 +0530
Subject: [PATCH 3/5] add test assertions to check repo info is displayed on
 home page - Asserts if repo description, topics and summary are displayed in
 the repo home page - Test enhancement for #21406

---
 tests/integration/repo_test.go | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

diff --git a/tests/integration/repo_test.go b/tests/integration/repo_test.go
index d101452ec0973..c61e1446b3733 100644
--- a/tests/integration/repo_test.go
+++ b/tests/integration/repo_test.go
@@ -23,12 +23,23 @@ func TestViewRepo(t *testing.T) {
 	defer tests.PrepareTestEnv(t)()
 
 	req := NewRequest(t, "GET", "/user2/repo1")
-	MakeRequest(t, req, http.StatusOK)
+
+	session := loginUser(t, "user2")
+	resp := session.MakeRequest(t, req, http.StatusOK)
+
+	htmlDoc := NewHTMLParser(t, resp.Body)
+	noDescription := htmlDoc.doc.Find("#repo-desc").Children()
+	repoTopics := htmlDoc.doc.Find("#repo-topics").Children()
+	repoSummary := htmlDoc.doc.Find(".repository-summary").Children()
+
+	assert.True(t, noDescription.HasClass("no-description"))
+	assert.True(t, repoTopics.HasClass("repo-topic"))
+	assert.True(t, repoSummary.HasClass("repository-menu"))
 
 	req = NewRequest(t, "GET", "/user3/repo3")
 	MakeRequest(t, req, http.StatusNotFound)
 
-	session := loginUser(t, "user1")
+	session = loginUser(t, "user1")
 	session.MakeRequest(t, req, http.StatusNotFound)
 }
 
@@ -178,8 +189,12 @@ func TestViewAsRepoAdmin(t *testing.T) {
 
 		htmlDoc := NewHTMLParser(t, resp.Body)
 		noDescription := htmlDoc.doc.Find("#repo-desc").Children()
+		repoTopics := htmlDoc.doc.Find("#repo-topics").Children()
+		repoSummary := htmlDoc.doc.Find(".repository-summary").Children()
 
 		assert.Equal(t, expectedNoDescription, noDescription.HasClass("no-description"))
+		assert.True(t, repoTopics.HasClass("repo-topic"))
+		assert.True(t, repoSummary.HasClass("repository-menu"))
 	}
 }
 

From 9735a7d946bcff308539e31e2d01f2001220cf41 Mon Sep 17 00:00:00 2001
From: neel1996 <47709856+neel1996@users.noreply.github.com>
Date: Thu, 13 Oct 2022 02:11:41 +0530
Subject: [PATCH 4/5] fix: hide repo info within a directory - The repo
 description, topics and summary will not be displayed within a directory -
 The repo home page will still display the repo info - Resolves #21406

---
 routers/web/repo/view.go       |  2 ++
 templates/repo/home.tmpl       |  2 +-
 templates/repo/sub_menu.tmpl   |  2 +-
 tests/integration/repo_test.go | 30 ++++++++++++++++++++++++++++--
 4 files changed, 32 insertions(+), 4 deletions(-)

diff --git a/routers/web/repo/view.go b/routers/web/repo/view.go
index a43840467dc85..3e869376ee376 100644
--- a/routers/web/repo/view.go
+++ b/routers/web/repo/view.go
@@ -119,6 +119,7 @@ func renderDirectory(ctx *context.Context, treeLink string) {
 	}
 
 	if ctx.Repo.TreePath != "" {
+		ctx.Data["HideRepoInfo"] = true
 		ctx.Data["Title"] = ctx.Tr("repo.file.title", ctx.Repo.Repository.Name+"/"+path.Base(ctx.Repo.TreePath), ctx.Repo.RefName)
 	}
 
@@ -360,6 +361,7 @@ func renderReadmeFile(ctx *context.Context, readmeFile *namedBlob, readmeTreelin
 
 func renderFile(ctx *context.Context, entry *git.TreeEntry, treeLink, rawLink string) {
 	ctx.Data["IsViewFile"] = true
+	ctx.Data["HideRepoInfo"] = true
 	blob := entry.Blob()
 	dataRc, err := blob.DataAsync()
 	if err != nil {
diff --git a/templates/repo/home.tmpl b/templates/repo/home.tmpl
index 156c660a5a5b8..9d4842579fa1b 100644
--- a/templates/repo/home.tmpl
+++ b/templates/repo/home.tmpl
@@ -3,7 +3,7 @@
 	{{template "repo/header" .}}
 	<div class="ui container {{if .IsBlame}}fluid padded{{end}}">
 		{{template "base/alert" .}}
-		{{if and (not .IsViewFile) (not .IsBlame)}}
+		{{if and (not .HideRepoInfo) (not .IsBlame)}}
 		<div class="ui repo-description">
 			<div id="repo-desc">
 				{{$description := .Repository.DescriptionHTML $.Context}}
diff --git a/templates/repo/sub_menu.tmpl b/templates/repo/sub_menu.tmpl
index 8892a99932d01..fac8e5ac99ddc 100644
--- a/templates/repo/sub_menu.tmpl
+++ b/templates/repo/sub_menu.tmpl
@@ -1,4 +1,4 @@
-{{if and (not .IsViewFile) (not .IsBlame)}}
+{{if and (not .HideRepoInfo) (not .IsBlame)}}
 <div class="ui segments repository-summary{{if and (.Permission.CanRead $.UnitTypeCode) (not .IsEmptyRepo) .LanguageStats}} repository-summary-language-stats{{end}} mt-2 mb-0">
 	<div class="ui segment sub-menu repository-menu">
 		<div class="ui two horizontal center link list">
diff --git a/tests/integration/repo_test.go b/tests/integration/repo_test.go
index c61e1446b3733..b277700192b44 100644
--- a/tests/integration/repo_test.go
+++ b/tests/integration/repo_test.go
@@ -22,9 +22,9 @@ import (
 func TestViewRepo(t *testing.T) {
 	defer tests.PrepareTestEnv(t)()
 
-	req := NewRequest(t, "GET", "/user2/repo1")
-
 	session := loginUser(t, "user2")
+
+	req := NewRequest(t, "GET", "/user2/repo1")
 	resp := session.MakeRequest(t, req, http.StatusOK)
 
 	htmlDoc := NewHTMLParser(t, resp.Body)
@@ -235,3 +235,29 @@ func TestBlameFileInRepo(t *testing.T) {
 	assert.EqualValues(t, 0, repoTopics.Length())
 	assert.EqualValues(t, 0, repoSummary.Length())
 }
+
+// TestViewRepoDirectory repo description, topics and summary should not be displayed when within a directory
+func TestViewRepoDirectory(t *testing.T) {
+	defer tests.PrepareTestEnv(t)()
+
+	session := loginUser(t, "user2")
+
+	req := NewRequest(t, "GET", "/user2/repo20/src/branch/master/a")
+	resp := session.MakeRequest(t, req, http.StatusOK)
+
+	htmlDoc := NewHTMLParser(t, resp.Body)
+	description := htmlDoc.doc.Find("#repo-desc")
+	repoTopics := htmlDoc.doc.Find("#repo-topics")
+	repoSummary := htmlDoc.doc.Find(".repository-summary")
+
+	directoryBody := htmlDoc.doc.Find("tbody").Children()
+	assert.True(t, directoryBody.HasClass("has-parent"))
+	assert.Len(t, directoryBody.Nodes, 4)
+	assert.Equal(t, "b", directoryBody.Nodes[1].Attr[0].Val)
+	assert.Equal(t, "c", directoryBody.Nodes[2].Attr[0].Val)
+	assert.Equal(t, "link_annex", directoryBody.Nodes[3].Attr[0].Val)
+
+	assert.EqualValues(t, 0, description.Length())
+	assert.EqualValues(t, 0, repoTopics.Length())
+	assert.EqualValues(t, 0, repoSummary.Length())
+}

From 44fd9f0d48bfd99e0163f4ffd5eeeb3ebc1a55a2 Mon Sep 17 00:00:00 2001
From: neel1996 <47709856+neel1996@users.noreply.github.com>
Date: Thu, 13 Oct 2022 10:26:11 +0530
Subject: [PATCH 5/5] revise test assertions - Asserts the presence of
 repo-files-table in directory view - Revised zero check assertions

---
 tests/integration/repo_test.go | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/tests/integration/repo_test.go b/tests/integration/repo_test.go
index b277700192b44..8e494a9af411a 100644
--- a/tests/integration/repo_test.go
+++ b/tests/integration/repo_test.go
@@ -250,14 +250,10 @@ func TestViewRepoDirectory(t *testing.T) {
 	repoTopics := htmlDoc.doc.Find("#repo-topics")
 	repoSummary := htmlDoc.doc.Find(".repository-summary")
 
-	directoryBody := htmlDoc.doc.Find("tbody").Children()
-	assert.True(t, directoryBody.HasClass("has-parent"))
-	assert.Len(t, directoryBody.Nodes, 4)
-	assert.Equal(t, "b", directoryBody.Nodes[1].Attr[0].Val)
-	assert.Equal(t, "c", directoryBody.Nodes[2].Attr[0].Val)
-	assert.Equal(t, "link_annex", directoryBody.Nodes[3].Attr[0].Val)
+	repoFilesTable := htmlDoc.doc.Find("#repo-files-table")
+	assert.NotZero(t, len(repoFilesTable.Nodes))
 
-	assert.EqualValues(t, 0, description.Length())
-	assert.EqualValues(t, 0, repoTopics.Length())
-	assert.EqualValues(t, 0, repoSummary.Length())
+	assert.Zero(t, description.Length())
+	assert.Zero(t, repoTopics.Length())
+	assert.Zero(t, repoSummary.Length())
 }