From 5217c93fb10be9799d5a22886ea77afcaebdbe22 Mon Sep 17 00:00:00 2001
From: HesterG <hestergong@gmail.com>
Date: Tue, 4 Jul 2023 11:59:49 +0800
Subject: [PATCH 01/46] save for branches

---
 models/git/branch_list.go                     | 16 ++++++
 routers/web/repo/view.go                      | 32 +++++++++++
 routers/web/web.go                            |  1 +
 templates/repo/branch_dropdown.tmpl           |  1 -
 .../js/components/RepoBranchTagSelector.vue   | 55 +++++++++++--------
 5 files changed, 82 insertions(+), 23 deletions(-)

diff --git a/models/git/branch_list.go b/models/git/branch_list.go
index 131a149782e27..1f36c4a775973 100644
--- a/models/git/branch_list.go
+++ b/models/git/branch_list.go
@@ -5,6 +5,7 @@ package git
 
 import (
 	"context"
+	"fmt"
 
 	"code.gitea.io/gitea/models/db"
 	user_model "code.gitea.io/gitea/models/user"
@@ -143,3 +144,18 @@ func FindBranchesByRepoAndBranchName(ctx context.Context, repoBranches map[int64
 	}
 	return branchMap, nil
 }
+
+func FindBranchesWithSearch(ctx context.Context, opts FindBranchOptions, search string) ([]string, error) {
+	fmt.Println(search)
+	branches := make([]string, 0, 30)
+	var prefixCond builder.Cond = builder.Like{"name", "%" + search + "%"}
+	sess := db.GetEngine(ctx).Select("name").Where(opts.Cond()).And(prefixCond)
+	if opts.PageSize > 0 && !opts.IsListAll() {
+		sess = db.SetSessionPagination(sess, &opts.ListOptions)
+	}
+	sess = orderByBranches(sess, opts)
+	if err := sess.Table("branch").Limit(30).Find(&branches); err != nil {
+		return nil, err
+	}
+	return branches, nil
+}
diff --git a/routers/web/repo/view.go b/routers/web/repo/view.go
index ece2ec5416a5c..8563793abb950 100644
--- a/routers/web/repo/view.go
+++ b/routers/web/repo/view.go
@@ -13,6 +13,7 @@ import (
 	"net/http"
 	"net/url"
 	"path"
+	"sort"
 	"strings"
 	"time"
 
@@ -1085,3 +1086,34 @@ func Forks(ctx *context.Context) {
 
 	ctx.HTML(http.StatusOK, tplForks)
 }
+
+type branchSearchResponse struct {
+	Branches []string `json:"branches"`
+}
+
+// GetBranches get branches for current repo'
+func GetBranches(ctx *context.Context) {
+	search := strings.TrimSpace(ctx.FormString("q"))
+	branchOpts := git_model.FindBranchOptions{
+		RepoID:          ctx.Repo.Repository.ID,
+		IsDeletedBranch: util.OptionalBoolFalse,
+		ListOptions: db.ListOptions{
+			ListAll: true,
+		},
+	}
+	branches, err := git_model.FindBranchesWithSearch(ctx, branchOpts, search)
+	if err != nil {
+		ctx.JSON(http.StatusInternalServerError, err)
+		return
+	}
+	// always put default branch on the top
+	sort.Slice(branches, func(i, j int) bool {
+		if branches[i] == branches[j] {
+			return false
+		}
+		return branches[i] == ctx.Repo.Repository.DefaultBranch
+	})
+	resp := &branchSearchResponse{}
+	resp.Branches = branches
+	ctx.JSON(http.StatusOK, resp)
+}
diff --git a/routers/web/web.go b/routers/web/web.go
index 00e0ca36dab0e..7cea23659d6bd 100644
--- a/routers/web/web.go
+++ b/routers/web/web.go
@@ -1368,6 +1368,7 @@ func registerRoutes(m *web.Route) {
 	m.Group("/{username}", func() {
 		m.Group("/{reponame}", func() {
 			m.Get("", repo.SetEditorconfigIfExists, repo.Home)
+			m.Get("/branches", repo.GetBranches)
 		}, ignSignIn, context.RepoAssignment, context.RepoRef(), context.UnitTypes())
 
 		m.Group("/{reponame}", func() {
diff --git a/templates/repo/branch_dropdown.tmpl b/templates/repo/branch_dropdown.tmpl
index 984899552dc0b..0a12ba93b04a1 100644
--- a/templates/repo/branch_dropdown.tmpl
+++ b/templates/repo/branch_dropdown.tmpl
@@ -44,7 +44,6 @@
 		'tagName': {{.root.TagName}},
 		'branchName': {{.root.BranchName}},
 		'noTag': {{.noTag}},
-		'branches': {{.root.Branches}},
 		'tags': {{.root.Tags}},
 		'defaultBranch': {{$defaultBranch}},
 		'enableFeed': {{.root.EnableFeed}},
diff --git a/web_src/js/components/RepoBranchTagSelector.vue b/web_src/js/components/RepoBranchTagSelector.vue
index 4fc393624469d..fad0cbd808ba3 100644
--- a/web_src/js/components/RepoBranchTagSelector.vue
+++ b/web_src/js/components/RepoBranchTagSelector.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="ui floating filter dropdown custom">
-    <button class="branch-dropdown-button gt-ellipsis ui basic small compact button gt-df gt-m-0" @click="menuVisible = !menuVisible" @keyup.enter="menuVisible = !menuVisible">
+    <button class="branch-dropdown-button gt-ellipsis ui basic small compact button gt-df gt-m-0" @click="menuVisible = !menuVisible;fetchBranches()" @keyup.enter="menuVisible = !menuVisible">
       <span class="text gt-df gt-ac gt-mr-2">
         <template v-if="release">{{ textReleaseCompare }}</template>
         <template v-else>
@@ -14,7 +14,7 @@
     <div class="menu transition" :class="{visible: menuVisible}" v-if="menuVisible" v-cloak>
       <div class="ui icon search input">
         <i class="icon"><svg-icon name="octicon-filter" :size="16"/></i>
-        <input name="search" ref="searchField" autocomplete="off" v-model="searchTerm" @keydown="keydown($event)" :placeholder="searchFieldPlaceholder">
+        <input name="search" ref="searchField" autocomplete="off" v-model="searchTerm" @input="handleSearchInputChange" @keydown="keydown($event)" :placeholder="searchFieldPlaceholder">
       </div>
       <template v-if="showBranchesInDropdown">
         <div class="header branch-tag-choice">
@@ -81,6 +81,7 @@ import {createApp, nextTick} from 'vue';
 import $ from 'jquery';
 import {SvgIcon} from '../svg.js';
 import {pathEscapeSegments} from '../utils/url.js';
+import {debounce} from 'throttle-debounce';
 
 const sfc = {
   components: {SvgIcon},
@@ -90,12 +91,14 @@ const sfc = {
   computed: {
     filteredItems() {
       const items = this.items.filter((item) => {
-        return ((this.mode === 'branches' && item.branch) || (this.mode === 'tags' && item.tag)) &&
-          (!this.searchTerm || item.name.toLowerCase().includes(this.searchTerm.toLowerCase()));
+        return ((this.mode === 'branches' && item.branch) || (this.mode === 'tags' && item.tag));
+        // return ((this.mode === 'branches' && item.branch) || (this.mode === 'tags' && item.tag)) &&
+        //   (!this.searchTerm || item.name.toLowerCase().includes(this.searchTerm.toLowerCase()));
       });
 
       // TODO: fix this anti-pattern: side-effects-in-computed-properties
       this.active = (items.length === 0 && this.showCreateNewBranch ? 0 : -1);
+      console.log('filteredItems', items);
       return items;
     },
     showNoResults() {
@@ -139,7 +142,6 @@ const sfc = {
       }
     });
   },
-
   methods: {
     selectItem(item) {
       const prev = this.getSelected();
@@ -246,6 +248,32 @@ const sfc = {
         event.preventDefault();
         this.menuVisible = false;
       }
+    },
+    async fetchBranches() {
+      console.log('handleSearchInputChange', this.searchTerm);
+      const searchQuery = this.searchTerm;
+      const resp = await fetch(`${this.repoLink}/branches?&q=${searchQuery}`);
+      const {branches} = await resp.json();
+      console.log(branches);
+      this.items = [];
+      if (this.showBranchesInDropdown && branches) {
+        for (const branch of branches) {
+          this.items.push({name: branch, url: branch, branch: true, tag: false, selected: branch === this.defaultBranch});
+        }
+      }
+      if (!this.noTag && this.tags) {
+        for (const tag of this.tags) {
+          if (this.release) {
+            this.items.push({name: tag, url: tag, branch: false, tag: true, selected: tag === this.release.tagName});
+          } else {
+            this.items.push({name: tag, url: tag, branch: false, tag: true, selected: tag === this.defaultBranch});
+          }
+        }
+      }
+    },
+    handleSearchInputChange(e) {
+      e.preventDefault();
+      this.fetchBranches();
     }
   }
 };
@@ -270,23 +298,6 @@ export function initRepoBranchTagSelector(selector) {
       ...window.config.pageData.branchDropdownDataList[elIndex],
     };
 
-    // the "data.defaultBranch" is ambiguous, it could be "branch name" or "tag name"
-
-    if (data.showBranchesInDropdown && data.branches) {
-      for (const branch of data.branches) {
-        data.items.push({name: branch, url: pathEscapeSegments(branch), branch: true, tag: false, selected: branch === data.defaultBranch});
-      }
-    }
-    if (!data.noTag && data.tags) {
-      for (const tag of data.tags) {
-        if (data.release) {
-          data.items.push({name: tag, url: pathEscapeSegments(tag), branch: false, tag: true, selected: tag === data.release.tagName});
-        } else {
-          data.items.push({name: tag, url: pathEscapeSegments(tag), branch: false, tag: true, selected: tag === data.defaultBranch});
-        }
-      }
-    }
-
     const comp = {...sfc, data() { return data }};
     createApp(comp).mount(elRoot);
   }

From 1404c7edca9540949a83e4b0b19ef8d5b84e362b Mon Sep 17 00:00:00 2001
From: HesterG <hestergong@gmail.com>
Date: Tue, 4 Jul 2023 12:58:19 +0800
Subject: [PATCH 02/46] update tags

---
 models/git/branch_list.go                     |  4 +--
 models/repo/release.go                        | 24 +++++++++++++
 routers/web/repo/view.go                      | 21 +++++++++---
 routers/web/web.go                            |  1 +
 templates/repo/branch_dropdown.tmpl           |  1 -
 .../js/components/RepoBranchTagSelector.vue   | 34 ++++++++++---------
 6 files changed, 62 insertions(+), 23 deletions(-)

diff --git a/models/git/branch_list.go b/models/git/branch_list.go
index 1f36c4a775973..47e54c12fece9 100644
--- a/models/git/branch_list.go
+++ b/models/git/branch_list.go
@@ -148,8 +148,8 @@ func FindBranchesByRepoAndBranchName(ctx context.Context, repoBranches map[int64
 func FindBranchesWithSearch(ctx context.Context, opts FindBranchOptions, search string) ([]string, error) {
 	fmt.Println(search)
 	branches := make([]string, 0, 30)
-	var prefixCond builder.Cond = builder.Like{"name", "%" + search + "%"}
-	sess := db.GetEngine(ctx).Select("name").Where(opts.Cond()).And(prefixCond)
+	var searchCond builder.Cond = builder.Like{"name", "%" + search + "%"}
+	sess := db.GetEngine(ctx).Select("name").Where(opts.Cond()).And(searchCond)
 	if opts.PageSize > 0 && !opts.IsListAll() {
 		sess = db.SetSessionPagination(sess, &opts.ListOptions)
 	}
diff --git a/models/repo/release.go b/models/repo/release.go
index c63b32445767a..1e4f28470a438 100644
--- a/models/repo/release.go
+++ b/models/repo/release.go
@@ -277,6 +277,30 @@ func GetTagNamesByRepoID(ctx context.Context, repoID int64) ([]string, error) {
 	return tags, sess.Find(&tags)
 }
 
+// GetTagNamesByRepoID returns a list of release tag names of repository.
+func GetTagNamesByRepoIDWithSearch(ctx context.Context, repoID int64, search string) ([]string, error) {
+	tags := make([]string, 0, 30)
+	listOptions := db.ListOptions{
+		ListAll: true,
+	}
+	opts := FindReleasesOptions{
+		ListOptions:   listOptions,
+		IncludeDrafts: true,
+		IncludeTags:   true,
+		HasSha1:       util.OptionalBoolTrue,
+	}
+	var searchCond builder.Cond = builder.Like{"tag_name", "%" + search + "%"}
+	sess := db.GetEngine(ctx).
+		Table("release").
+		Desc("created_unix", "id").
+		Where(opts.toConds(repoID)).
+		Cols("tag_name").
+		And(searchCond).
+		Limit(30)
+
+	return tags, sess.Find(&tags)
+}
+
 // CountReleasesByRepoID returns a number of releases matching FindReleaseOptions and RepoID.
 func CountReleasesByRepoID(repoID int64, opts FindReleasesOptions) (int64, error) {
 	return db.GetEngine(db.DefaultContext).Where(opts.toConds(repoID)).Count(new(Release))
diff --git a/routers/web/repo/view.go b/routers/web/repo/view.go
index 8563793abb950..a5652f16a1fd6 100644
--- a/routers/web/repo/view.go
+++ b/routers/web/repo/view.go
@@ -1087,8 +1087,8 @@ func Forks(ctx *context.Context) {
 	ctx.HTML(http.StatusOK, tplForks)
 }
 
-type branchSearchResponse struct {
-	Branches []string `json:"branches"`
+type branchTagSearchResponse struct {
+	Results []string `json:"results"`
 }
 
 // GetBranches get branches for current repo'
@@ -1113,7 +1113,20 @@ func GetBranches(ctx *context.Context) {
 		}
 		return branches[i] == ctx.Repo.Repository.DefaultBranch
 	})
-	resp := &branchSearchResponse{}
-	resp.Branches = branches
+	resp := &branchTagSearchResponse{}
+	resp.Results = branches
+	ctx.JSON(http.StatusOK, resp)
+}
+
+// GetTags get tags for current repo'
+func GetTags(ctx *context.Context) {
+	search := strings.TrimSpace(ctx.FormString("q"))
+	tags, err := repo_model.GetTagNamesByRepoIDWithSearch(ctx, ctx.Repo.Repository.ID, search)
+	if err != nil {
+		ctx.JSON(http.StatusInternalServerError, err)
+		return
+	}
+	resp := &branchTagSearchResponse{}
+	resp.Results = tags
 	ctx.JSON(http.StatusOK, resp)
 }
diff --git a/routers/web/web.go b/routers/web/web.go
index 7cea23659d6bd..89c891fc3703c 100644
--- a/routers/web/web.go
+++ b/routers/web/web.go
@@ -1369,6 +1369,7 @@ func registerRoutes(m *web.Route) {
 		m.Group("/{reponame}", func() {
 			m.Get("", repo.SetEditorconfigIfExists, repo.Home)
 			m.Get("/branches", repo.GetBranches)
+			m.Get("/tags", repo.GetTags)
 		}, ignSignIn, context.RepoAssignment, context.RepoRef(), context.UnitTypes())
 
 		m.Group("/{reponame}", func() {
diff --git a/templates/repo/branch_dropdown.tmpl b/templates/repo/branch_dropdown.tmpl
index 0a12ba93b04a1..4ec2fd557c76a 100644
--- a/templates/repo/branch_dropdown.tmpl
+++ b/templates/repo/branch_dropdown.tmpl
@@ -44,7 +44,6 @@
 		'tagName': {{.root.TagName}},
 		'branchName': {{.root.BranchName}},
 		'noTag': {{.noTag}},
-		'tags': {{.root.Tags}},
 		'defaultBranch': {{$defaultBranch}},
 		'enableFeed': {{.root.EnableFeed}},
 		'rssURLPrefix': '{{$.root.RepoLink}}/rss/branch/',
diff --git a/web_src/js/components/RepoBranchTagSelector.vue b/web_src/js/components/RepoBranchTagSelector.vue
index fad0cbd808ba3..f957ffb651fcd 100644
--- a/web_src/js/components/RepoBranchTagSelector.vue
+++ b/web_src/js/components/RepoBranchTagSelector.vue
@@ -20,13 +20,13 @@
         <div class="header branch-tag-choice">
           <div class="ui grid">
             <div class="two column row">
-              <a class="reference column" href="#" @click="createTag = false; mode = 'branches'; focusSearchField()">
+              <a class="reference column" href="#" @click="createTag = false; mode = 'branches'; focusSearchField(); fetchBranches()">
                 <span class="text" :class="{black: mode === 'branches'}">
                   <svg-icon name="octicon-git-branch" :size="16" class-name="gt-mr-2"/>{{ textBranches }}
                 </span>
               </a>
               <template v-if="!noTag">
-                <a class="reference column" href="#" @click="createTag = true; mode = 'tags'; focusSearchField()">
+                <a class="reference column" href="#" @click="createTag = true; mode = 'tags'; focusSearchField(); fetchBranches()">
                   <span class="text" :class="{black: mode === 'tags'}">
                     <svg-icon name="octicon-tag" :size="16" class-name="gt-mr-2"/>{{ textTags }}
                   </span>
@@ -251,22 +251,24 @@ const sfc = {
     },
     async fetchBranches() {
       console.log('handleSearchInputChange', this.searchTerm);
-      const searchQuery = this.searchTerm;
-      const resp = await fetch(`${this.repoLink}/branches?&q=${searchQuery}`);
-      const {branches} = await resp.json();
-      console.log(branches);
+      const resp = await fetch(`${this.repoLink}/${this.mode}?&q=${this.searchTerm}`);
+      const {results} = await resp.json();
+      console.log(results);
       this.items = [];
-      if (this.showBranchesInDropdown && branches) {
-        for (const branch of branches) {
-          this.items.push({name: branch, url: branch, branch: true, tag: false, selected: branch === this.defaultBranch});
+      if (this.mode === 'branches') {
+        if (this.showBranchesInDropdown && results) {
+          for (const branch of results) {
+            this.items.push({name: branch, url: branch, branch: true, tag: false, selected: branch === this.defaultBranch});
+          }
         }
-      }
-      if (!this.noTag && this.tags) {
-        for (const tag of this.tags) {
-          if (this.release) {
-            this.items.push({name: tag, url: tag, branch: false, tag: true, selected: tag === this.release.tagName});
-          } else {
-            this.items.push({name: tag, url: tag, branch: false, tag: true, selected: tag === this.defaultBranch});
+      } else {
+        if (!this.noTag && results) {
+          for (const tag of results) {
+            if (this.release) {
+              this.items.push({name: tag, url: tag, branch: false, tag: true, selected: tag === this.release.tagName});
+            } else {
+              this.items.push({name: tag, url: tag, branch: false, tag: true, selected: tag === this.defaultBranch});
+            }
           }
         }
       }

From 494b632d98db52edd6ab4944cd92150d5dde18d1 Mon Sep 17 00:00:00 2001
From: HesterG <hestergong@gmail.com>
Date: Tue, 4 Jul 2023 15:40:36 +0800
Subject: [PATCH 03/46] update

---
 routers/web/web.go                            |  4 +--
 .../js/components/RepoBranchTagSelector.vue   | 25 ++++++++-----------
 2 files changed, 13 insertions(+), 16 deletions(-)

diff --git a/routers/web/web.go b/routers/web/web.go
index 89c891fc3703c..0938326c0fe7a 100644
--- a/routers/web/web.go
+++ b/routers/web/web.go
@@ -1094,6 +1094,7 @@ func registerRoutes(m *web.Route) {
 		}, context.RepoRef(), canEnableEditor, context.RepoMustNotBeArchived())
 
 		m.Group("/branches", func() {
+			m.Get("/list", repo.GetBranches)
 			m.Group("/_new", func() {
 				m.Post("/branch/*", context.RepoRefByType(context.RepoRefBranch), repo.CreateBranch)
 				m.Post("/tag/*", context.RepoRefByType(context.RepoRefTag), repo.CreateBranch)
@@ -1108,6 +1109,7 @@ func registerRoutes(m *web.Route) {
 	m.Group("/{username}/{reponame}", func() {
 		m.Group("/tags", func() {
 			m.Get("", repo.TagsList)
+			m.Get("/list", repo.GetTags)
 			m.Get(".rss", feedEnabled, repo.TagsListFeedRSS)
 			m.Get(".atom", feedEnabled, repo.TagsListFeedAtom)
 		}, ctxDataSet("EnableFeed", setting.Other.EnableFeed),
@@ -1368,8 +1370,6 @@ func registerRoutes(m *web.Route) {
 	m.Group("/{username}", func() {
 		m.Group("/{reponame}", func() {
 			m.Get("", repo.SetEditorconfigIfExists, repo.Home)
-			m.Get("/branches", repo.GetBranches)
-			m.Get("/tags", repo.GetTags)
 		}, ignSignIn, context.RepoAssignment, context.RepoRef(), context.UnitTypes())
 
 		m.Group("/{reponame}", func() {
diff --git a/web_src/js/components/RepoBranchTagSelector.vue b/web_src/js/components/RepoBranchTagSelector.vue
index f957ffb651fcd..f60db56fea469 100644
--- a/web_src/js/components/RepoBranchTagSelector.vue
+++ b/web_src/js/components/RepoBranchTagSelector.vue
@@ -251,24 +251,21 @@ const sfc = {
     },
     async fetchBranches() {
       console.log('handleSearchInputChange', this.searchTerm);
-      const resp = await fetch(`${this.repoLink}/${this.mode}?&q=${this.searchTerm}`);
+      const resp = await fetch(`${this.repoLink}/${this.mode}/list?&q=${this.searchTerm}`);
       const {results} = await resp.json();
       console.log(results);
+      if (!results || !['branches', 'tags'].includes(this.mode)) return;
       this.items = [];
-      if (this.mode === 'branches') {
-        if (this.showBranchesInDropdown && results) {
-          for (const branch of results) {
-            this.items.push({name: branch, url: branch, branch: true, tag: false, selected: branch === this.defaultBranch});
-          }
+      if (this.mode === 'branches' && this.showBranchesInDropdown) {
+        for (const branch of results) {
+          this.items.push({name: branch, url: branch, branch: true, tag: false, selected: branch === this.defaultBranch});
         }
-      } else {
-        if (!this.noTag && results) {
-          for (const tag of results) {
-            if (this.release) {
-              this.items.push({name: tag, url: tag, branch: false, tag: true, selected: tag === this.release.tagName});
-            } else {
-              this.items.push({name: tag, url: tag, branch: false, tag: true, selected: tag === this.defaultBranch});
-            }
+      } else if (this.mode === 'tags' && !this.noTag) {
+        for (const tag of results) {
+          if (this.release) {
+            this.items.push({name: tag, url: tag, branch: false, tag: true, selected: tag === this.release.tagName});
+          } else {
+            this.items.push({name: tag, url: tag, branch: false, tag: true, selected: tag === this.defaultBranch});
           }
         }
       }

From db1156a702f4a9abd13ff5e8837b375dca267a64 Mon Sep 17 00:00:00 2001
From: HesterG <hestergong@gmail.com>
Date: Tue, 4 Jul 2023 17:44:15 +0800
Subject: [PATCH 04/46] debounce

---
 .../js/components/RepoBranchTagSelector.vue    | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/web_src/js/components/RepoBranchTagSelector.vue b/web_src/js/components/RepoBranchTagSelector.vue
index f60db56fea469..c6767965a9cca 100644
--- a/web_src/js/components/RepoBranchTagSelector.vue
+++ b/web_src/js/components/RepoBranchTagSelector.vue
@@ -14,7 +14,7 @@
     <div class="menu transition" :class="{visible: menuVisible}" v-if="menuVisible" v-cloak>
       <div class="ui icon search input">
         <i class="icon"><svg-icon name="octicon-filter" :size="16"/></i>
-        <input name="search" ref="searchField" autocomplete="off" v-model="searchTerm" @input="handleSearchInputChange" @keydown="keydown($event)" :placeholder="searchFieldPlaceholder">
+        <input name="search" ref="searchField" autocomplete="off" v-model="searchTerm" @keydown="keydown($event)" :placeholder="searchFieldPlaceholder">
       </div>
       <template v-if="showBranchesInDropdown">
         <div class="header branch-tag-choice">
@@ -81,7 +81,7 @@ import {createApp, nextTick} from 'vue';
 import $ from 'jquery';
 import {SvgIcon} from '../svg.js';
 import {pathEscapeSegments} from '../utils/url.js';
-import {debounce} from 'throttle-debounce';
+import _ from 'lodash';
 
 const sfc = {
   components: {SvgIcon},
@@ -120,6 +120,10 @@ const sfc = {
       if (visible) {
         this.focusSearchField();
       }
+    },
+    searchTerm: function(val) {
+      console.log(val);
+      this.fetchBranches();
     }
   },
 
@@ -249,8 +253,8 @@ const sfc = {
         this.menuVisible = false;
       }
     },
-    async fetchBranches() {
-      console.log('handleSearchInputChange', this.searchTerm);
+    fetchBranches: _.debounce(async function() {
+      console.log('fetchBranches', this.searchTerm);
       const resp = await fetch(`${this.repoLink}/${this.mode}/list?&q=${this.searchTerm}`);
       const {results} = await resp.json();
       console.log(results);
@@ -269,11 +273,7 @@ const sfc = {
           }
         }
       }
-    },
-    handleSearchInputChange(e) {
-      e.preventDefault();
-      this.fetchBranches();
-    }
+    }, 500),
   }
 };
 

From 0bd74db79b6de21f9a248b13ecdb87c56a75ed0d Mon Sep 17 00:00:00 2001
From: HesterG <hestergong@gmail.com>
Date: Wed, 5 Jul 2023 12:04:59 +0800
Subject: [PATCH 05/46] change debounce

---
 web_src/js/components/RepoBranchTagSelector.vue | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/web_src/js/components/RepoBranchTagSelector.vue b/web_src/js/components/RepoBranchTagSelector.vue
index c6767965a9cca..763b7aa89314b 100644
--- a/web_src/js/components/RepoBranchTagSelector.vue
+++ b/web_src/js/components/RepoBranchTagSelector.vue
@@ -81,7 +81,7 @@ import {createApp, nextTick} from 'vue';
 import $ from 'jquery';
 import {SvgIcon} from '../svg.js';
 import {pathEscapeSegments} from '../utils/url.js';
-import _ from 'lodash';
+import {onInputDebounce} from '../utils/dom.js';
 
 const sfc = {
   components: {SvgIcon},
@@ -253,7 +253,7 @@ const sfc = {
         this.menuVisible = false;
       }
     },
-    fetchBranches: _.debounce(async function() {
+    fetchBranches: onInputDebounce(async function() {
       console.log('fetchBranches', this.searchTerm);
       const resp = await fetch(`${this.repoLink}/${this.mode}/list?&q=${this.searchTerm}`);
       const {results} = await resp.json();
@@ -273,7 +273,7 @@ const sfc = {
           }
         }
       }
-    }, 500),
+    }),
   }
 };
 

From 592a93a99ba06b005b7296f21872c23f7a12a161 Mon Sep 17 00:00:00 2001
From: HesterG <hestergong@gmail.com>
Date: Thu, 6 Jul 2023 12:02:14 +0800
Subject: [PATCH 06/46] remove comments

---
 web_src/js/components/RepoBranchTagSelector.vue | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/web_src/js/components/RepoBranchTagSelector.vue b/web_src/js/components/RepoBranchTagSelector.vue
index 763b7aa89314b..97acd1e44a263 100644
--- a/web_src/js/components/RepoBranchTagSelector.vue
+++ b/web_src/js/components/RepoBranchTagSelector.vue
@@ -92,13 +92,10 @@ const sfc = {
     filteredItems() {
       const items = this.items.filter((item) => {
         return ((this.mode === 'branches' && item.branch) || (this.mode === 'tags' && item.tag));
-        // return ((this.mode === 'branches' && item.branch) || (this.mode === 'tags' && item.tag)) &&
-        //   (!this.searchTerm || item.name.toLowerCase().includes(this.searchTerm.toLowerCase()));
       });
 
       // TODO: fix this anti-pattern: side-effects-in-computed-properties
       this.active = (items.length === 0 && this.showCreateNewBranch ? 0 : -1);
-      console.log('filteredItems', items);
       return items;
     },
     showNoResults() {
@@ -121,8 +118,7 @@ const sfc = {
         this.focusSearchField();
       }
     },
-    searchTerm: function(val) {
-      console.log(val);
+    searchTerm: function() {
       this.fetchBranches();
     }
   },
@@ -254,10 +250,8 @@ const sfc = {
       }
     },
     fetchBranches: onInputDebounce(async function() {
-      console.log('fetchBranches', this.searchTerm);
       const resp = await fetch(`${this.repoLink}/${this.mode}/list?&q=${this.searchTerm}`);
       const {results} = await resp.json();
-      console.log(results);
       if (!results || !['branches', 'tags'].includes(this.mode)) return;
       this.items = [];
       if (this.mode === 'branches' && this.showBranchesInDropdown) {

From aa20d3b560d98b8f9512245178907693eb43604a Mon Sep 17 00:00:00 2001
From: HesterG <hestergong@gmail.com>
Date: Thu, 6 Jul 2023 12:16:21 +0800
Subject: [PATCH 07/46] position

---
 models/git/branch_list.go |  2 --
 models/repo/release.go    | 11 +-------
 routers/web/repo/repo.go  | 54 +++++++++++++++++++++++++++++++++++++++
 routers/web/repo/view.go  | 45 --------------------------------
 routers/web/web.go        |  4 +--
 5 files changed, 57 insertions(+), 59 deletions(-)

diff --git a/models/git/branch_list.go b/models/git/branch_list.go
index 47e54c12fece9..1f8be7bbce736 100644
--- a/models/git/branch_list.go
+++ b/models/git/branch_list.go
@@ -5,7 +5,6 @@ package git
 
 import (
 	"context"
-	"fmt"
 
 	"code.gitea.io/gitea/models/db"
 	user_model "code.gitea.io/gitea/models/user"
@@ -146,7 +145,6 @@ func FindBranchesByRepoAndBranchName(ctx context.Context, repoBranches map[int64
 }
 
 func FindBranchesWithSearch(ctx context.Context, opts FindBranchOptions, search string) ([]string, error) {
-	fmt.Println(search)
 	branches := make([]string, 0, 30)
 	var searchCond builder.Cond = builder.Like{"name", "%" + search + "%"}
 	sess := db.GetEngine(ctx).Select("name").Where(opts.Cond()).And(searchCond)
diff --git a/models/repo/release.go b/models/repo/release.go
index 1e4f28470a438..d2f2677adca31 100644
--- a/models/repo/release.go
+++ b/models/repo/release.go
@@ -278,17 +278,8 @@ func GetTagNamesByRepoID(ctx context.Context, repoID int64) ([]string, error) {
 }
 
 // GetTagNamesByRepoID returns a list of release tag names of repository.
-func GetTagNamesByRepoIDWithSearch(ctx context.Context, repoID int64, search string) ([]string, error) {
+func GetTagNamesByRepoIDWithSearch(ctx context.Context, repoID int64, opts FindReleasesOptions, search string) ([]string, error) {
 	tags := make([]string, 0, 30)
-	listOptions := db.ListOptions{
-		ListAll: true,
-	}
-	opts := FindReleasesOptions{
-		ListOptions:   listOptions,
-		IncludeDrafts: true,
-		IncludeTags:   true,
-		HasSha1:       util.OptionalBoolTrue,
-	}
 	var searchCond builder.Cond = builder.Like{"tag_name", "%" + search + "%"}
 	sess := db.GetEngine(ctx).
 		Table("release").
diff --git a/routers/web/repo/repo.go b/routers/web/repo/repo.go
index 0a2b334eb90aa..8f1e0f8bdafe6 100644
--- a/routers/web/repo/repo.go
+++ b/routers/web/repo/repo.go
@@ -8,6 +8,7 @@ import (
 	"errors"
 	"fmt"
 	"net/http"
+	"sort"
 	"strings"
 
 	"code.gitea.io/gitea/models"
@@ -622,3 +623,56 @@ func SearchRepo(ctx *context.Context) {
 		Data: results,
 	})
 }
+
+type branchTagSearchResponse struct {
+	Results []string `json:"results"`
+}
+
+// GetBrancheList get branches for current repo'
+func GetBrancheList(ctx *context.Context) {
+	search := strings.TrimSpace(ctx.FormString("q"))
+	branchOpts := git_model.FindBranchOptions{
+		RepoID:          ctx.Repo.Repository.ID,
+		IsDeletedBranch: util.OptionalBoolFalse,
+		ListOptions: db.ListOptions{
+			ListAll: true,
+		},
+	}
+	branches, err := git_model.FindBranchesWithSearch(ctx, branchOpts, search)
+	if err != nil {
+		ctx.JSON(http.StatusInternalServerError, err)
+		return
+	}
+	// always put default branch on the top
+	sort.Slice(branches, func(i, j int) bool {
+		if branches[i] == branches[j] {
+			return false
+		}
+		return branches[i] == ctx.Repo.Repository.DefaultBranch
+	})
+	resp := &branchTagSearchResponse{}
+	resp.Results = branches
+	ctx.JSON(http.StatusOK, resp)
+}
+
+// GetTagList get tag list for current repo
+func GetTagList(ctx *context.Context) {
+	search := strings.TrimSpace(ctx.FormString("q"))
+	listOptions := db.ListOptions{
+		ListAll: true,
+	}
+	opts := repo_model.FindReleasesOptions{
+		ListOptions:   listOptions,
+		IncludeDrafts: true,
+		IncludeTags:   true,
+		HasSha1:       util.OptionalBoolTrue,
+	}
+	tags, err := repo_model.GetTagNamesByRepoIDWithSearch(ctx, ctx.Repo.Repository.ID, opts, search)
+	if err != nil {
+		ctx.JSON(http.StatusInternalServerError, err)
+		return
+	}
+	resp := &branchTagSearchResponse{}
+	resp.Results = tags
+	ctx.JSON(http.StatusOK, resp)
+}
diff --git a/routers/web/repo/view.go b/routers/web/repo/view.go
index a5652f16a1fd6..ece2ec5416a5c 100644
--- a/routers/web/repo/view.go
+++ b/routers/web/repo/view.go
@@ -13,7 +13,6 @@ import (
 	"net/http"
 	"net/url"
 	"path"
-	"sort"
 	"strings"
 	"time"
 
@@ -1086,47 +1085,3 @@ func Forks(ctx *context.Context) {
 
 	ctx.HTML(http.StatusOK, tplForks)
 }
-
-type branchTagSearchResponse struct {
-	Results []string `json:"results"`
-}
-
-// GetBranches get branches for current repo'
-func GetBranches(ctx *context.Context) {
-	search := strings.TrimSpace(ctx.FormString("q"))
-	branchOpts := git_model.FindBranchOptions{
-		RepoID:          ctx.Repo.Repository.ID,
-		IsDeletedBranch: util.OptionalBoolFalse,
-		ListOptions: db.ListOptions{
-			ListAll: true,
-		},
-	}
-	branches, err := git_model.FindBranchesWithSearch(ctx, branchOpts, search)
-	if err != nil {
-		ctx.JSON(http.StatusInternalServerError, err)
-		return
-	}
-	// always put default branch on the top
-	sort.Slice(branches, func(i, j int) bool {
-		if branches[i] == branches[j] {
-			return false
-		}
-		return branches[i] == ctx.Repo.Repository.DefaultBranch
-	})
-	resp := &branchTagSearchResponse{}
-	resp.Results = branches
-	ctx.JSON(http.StatusOK, resp)
-}
-
-// GetTags get tags for current repo'
-func GetTags(ctx *context.Context) {
-	search := strings.TrimSpace(ctx.FormString("q"))
-	tags, err := repo_model.GetTagNamesByRepoIDWithSearch(ctx, ctx.Repo.Repository.ID, search)
-	if err != nil {
-		ctx.JSON(http.StatusInternalServerError, err)
-		return
-	}
-	resp := &branchTagSearchResponse{}
-	resp.Results = tags
-	ctx.JSON(http.StatusOK, resp)
-}
diff --git a/routers/web/web.go b/routers/web/web.go
index 0938326c0fe7a..5049624898d40 100644
--- a/routers/web/web.go
+++ b/routers/web/web.go
@@ -1094,7 +1094,7 @@ func registerRoutes(m *web.Route) {
 		}, context.RepoRef(), canEnableEditor, context.RepoMustNotBeArchived())
 
 		m.Group("/branches", func() {
-			m.Get("/list", repo.GetBranches)
+			m.Get("/list", repo.GetBrancheList)
 			m.Group("/_new", func() {
 				m.Post("/branch/*", context.RepoRefByType(context.RepoRefBranch), repo.CreateBranch)
 				m.Post("/tag/*", context.RepoRefByType(context.RepoRefTag), repo.CreateBranch)
@@ -1109,7 +1109,7 @@ func registerRoutes(m *web.Route) {
 	m.Group("/{username}/{reponame}", func() {
 		m.Group("/tags", func() {
 			m.Get("", repo.TagsList)
-			m.Get("/list", repo.GetTags)
+			m.Get("/list", repo.GetTagList)
 			m.Get(".rss", feedEnabled, repo.TagsListFeedRSS)
 			m.Get(".atom", feedEnabled, repo.TagsListFeedAtom)
 		}, ctxDataSet("EnableFeed", setting.Other.EnableFeed),

From 610612061ed61745cf2af834e2fe256a04430ac3 Mon Sep 17 00:00:00 2001
From: HesterG <hestergong@gmail.com>
Date: Thu, 6 Jul 2023 12:28:11 +0800
Subject: [PATCH 08/46] css

---
 web_src/css/repo.css | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/web_src/css/repo.css b/web_src/css/repo.css
index 877f0d9c1734e..6cd7c2537e513 100644
--- a/web_src/css/repo.css
+++ b/web_src/css/repo.css
@@ -3359,3 +3359,7 @@ tbody.commit-list {
   font-size: 18px;
   margin-left: 4px;
 }
+
+#cherry-pick-modal .scrolling.menu {
+  max-height: 200px;
+}

From d786e2311afcb98eef158784dfaf9620f407d362 Mon Sep 17 00:00:00 2001
From: HesterG <hestergong@gmail.com>
Date: Thu, 6 Jul 2023 12:30:52 +0800
Subject: [PATCH 09/46] rename

---
 web_src/js/components/RepoBranchTagSelector.vue | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/web_src/js/components/RepoBranchTagSelector.vue b/web_src/js/components/RepoBranchTagSelector.vue
index 97acd1e44a263..31eccb0759e71 100644
--- a/web_src/js/components/RepoBranchTagSelector.vue
+++ b/web_src/js/components/RepoBranchTagSelector.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="ui floating filter dropdown custom">
-    <button class="branch-dropdown-button gt-ellipsis ui basic small compact button gt-df gt-m-0" @click="menuVisible = !menuVisible;fetchBranches()" @keyup.enter="menuVisible = !menuVisible">
+    <button class="branch-dropdown-button gt-ellipsis ui basic small compact button gt-df gt-m-0" @click="menuVisible = !menuVisible;fetchBranchesOrTags()" @keyup.enter="menuVisible = !menuVisible">
       <span class="text gt-df gt-ac gt-mr-2">
         <template v-if="release">{{ textReleaseCompare }}</template>
         <template v-else>
@@ -20,13 +20,13 @@
         <div class="header branch-tag-choice">
           <div class="ui grid">
             <div class="two column row">
-              <a class="reference column" href="#" @click="createTag = false; mode = 'branches'; focusSearchField(); fetchBranches()">
+              <a class="reference column" href="#" @click="createTag = false; mode = 'branches'; focusSearchField(); fetchBranchesOrTags()">
                 <span class="text" :class="{black: mode === 'branches'}">
                   <svg-icon name="octicon-git-branch" :size="16" class-name="gt-mr-2"/>{{ textBranches }}
                 </span>
               </a>
               <template v-if="!noTag">
-                <a class="reference column" href="#" @click="createTag = true; mode = 'tags'; focusSearchField(); fetchBranches()">
+                <a class="reference column" href="#" @click="createTag = true; mode = 'tags'; focusSearchField(); fetchBranchesOrTags()">
                   <span class="text" :class="{black: mode === 'tags'}">
                     <svg-icon name="octicon-tag" :size="16" class-name="gt-mr-2"/>{{ textTags }}
                   </span>
@@ -119,7 +119,7 @@ const sfc = {
       }
     },
     searchTerm: function() {
-      this.fetchBranches();
+      this.fetchBranchesOrTags();
     }
   },
 
@@ -249,7 +249,7 @@ const sfc = {
         this.menuVisible = false;
       }
     },
-    fetchBranches: onInputDebounce(async function() {
+    fetchBranchesOrTags: onInputDebounce(async function() {
       const resp = await fetch(`${this.repoLink}/${this.mode}/list?&q=${this.searchTerm}`);
       const {results} = await resp.json();
       if (!results || !['branches', 'tags'].includes(this.mode)) return;

From b795e40c892cbcb276a1003488adff9c3b8b1892 Mon Sep 17 00:00:00 2001
From: HesterG <hestergong@gmail.com>
Date: Thu, 6 Jul 2023 12:32:08 +0800
Subject: [PATCH 10/46] add back comment

---
 web_src/js/components/RepoBranchTagSelector.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/web_src/js/components/RepoBranchTagSelector.vue b/web_src/js/components/RepoBranchTagSelector.vue
index 31eccb0759e71..54d9b1313502e 100644
--- a/web_src/js/components/RepoBranchTagSelector.vue
+++ b/web_src/js/components/RepoBranchTagSelector.vue
@@ -254,6 +254,7 @@ const sfc = {
       const {results} = await resp.json();
       if (!results || !['branches', 'tags'].includes(this.mode)) return;
       this.items = [];
+      // the "data.defaultBranch" is ambiguous, it could be "branch name" or "tag name"
       if (this.mode === 'branches' && this.showBranchesInDropdown) {
         for (const branch of results) {
           this.items.push({name: branch, url: branch, branch: true, tag: false, selected: branch === this.defaultBranch});

From 476cdb61af709ab0e9161806aa167e8912b8a522 Mon Sep 17 00:00:00 2001
From: HesterG <hestergong@gmail.com>
Date: Thu, 6 Jul 2023 14:29:58 +0800
Subject: [PATCH 11/46] remove unnecessary

---
 models/git/branch_list.go                     | 14 ----------
 models/repo/release.go                        | 15 -----------
 routers/web/repo/repo.go                      | 27 ++++---------------
 .../js/components/RepoBranchTagSelector.vue   |  8 +++---
 4 files changed, 8 insertions(+), 56 deletions(-)

diff --git a/models/git/branch_list.go b/models/git/branch_list.go
index 1f8be7bbce736..131a149782e27 100644
--- a/models/git/branch_list.go
+++ b/models/git/branch_list.go
@@ -143,17 +143,3 @@ func FindBranchesByRepoAndBranchName(ctx context.Context, repoBranches map[int64
 	}
 	return branchMap, nil
 }
-
-func FindBranchesWithSearch(ctx context.Context, opts FindBranchOptions, search string) ([]string, error) {
-	branches := make([]string, 0, 30)
-	var searchCond builder.Cond = builder.Like{"name", "%" + search + "%"}
-	sess := db.GetEngine(ctx).Select("name").Where(opts.Cond()).And(searchCond)
-	if opts.PageSize > 0 && !opts.IsListAll() {
-		sess = db.SetSessionPagination(sess, &opts.ListOptions)
-	}
-	sess = orderByBranches(sess, opts)
-	if err := sess.Table("branch").Limit(30).Find(&branches); err != nil {
-		return nil, err
-	}
-	return branches, nil
-}
diff --git a/models/repo/release.go b/models/repo/release.go
index d2f2677adca31..c63b32445767a 100644
--- a/models/repo/release.go
+++ b/models/repo/release.go
@@ -277,21 +277,6 @@ func GetTagNamesByRepoID(ctx context.Context, repoID int64) ([]string, error) {
 	return tags, sess.Find(&tags)
 }
 
-// GetTagNamesByRepoID returns a list of release tag names of repository.
-func GetTagNamesByRepoIDWithSearch(ctx context.Context, repoID int64, opts FindReleasesOptions, search string) ([]string, error) {
-	tags := make([]string, 0, 30)
-	var searchCond builder.Cond = builder.Like{"tag_name", "%" + search + "%"}
-	sess := db.GetEngine(ctx).
-		Table("release").
-		Desc("created_unix", "id").
-		Where(opts.toConds(repoID)).
-		Cols("tag_name").
-		And(searchCond).
-		Limit(30)
-
-	return tags, sess.Find(&tags)
-}
-
 // CountReleasesByRepoID returns a number of releases matching FindReleaseOptions and RepoID.
 func CountReleasesByRepoID(repoID int64, opts FindReleasesOptions) (int64, error) {
 	return db.GetEngine(db.DefaultContext).Where(opts.toConds(repoID)).Count(new(Release))
diff --git a/routers/web/repo/repo.go b/routers/web/repo/repo.go
index 8f1e0f8bdafe6..f35ebb7190be7 100644
--- a/routers/web/repo/repo.go
+++ b/routers/web/repo/repo.go
@@ -8,7 +8,6 @@ import (
 	"errors"
 	"fmt"
 	"net/http"
-	"sort"
 	"strings"
 
 	"code.gitea.io/gitea/models"
@@ -630,7 +629,6 @@ type branchTagSearchResponse struct {
 
 // GetBrancheList get branches for current repo'
 func GetBrancheList(ctx *context.Context) {
-	search := strings.TrimSpace(ctx.FormString("q"))
 	branchOpts := git_model.FindBranchOptions{
 		RepoID:          ctx.Repo.Repository.ID,
 		IsDeletedBranch: util.OptionalBoolFalse,
@@ -638,36 +636,21 @@ func GetBrancheList(ctx *context.Context) {
 			ListAll: true,
 		},
 	}
-	branches, err := git_model.FindBranchesWithSearch(ctx, branchOpts, search)
+	branchOpts.ExcludeBranchNames = []string{ctx.Repo.Repository.DefaultBranch}
+	branches, err := git_model.FindBranchNames(ctx, branchOpts)
 	if err != nil {
 		ctx.JSON(http.StatusInternalServerError, err)
 		return
 	}
-	// always put default branch on the top
-	sort.Slice(branches, func(i, j int) bool {
-		if branches[i] == branches[j] {
-			return false
-		}
-		return branches[i] == ctx.Repo.Repository.DefaultBranch
-	})
 	resp := &branchTagSearchResponse{}
-	resp.Results = branches
+	// always put default branch on the top
+	resp.Results = append(branchOpts.ExcludeBranchNames, branches...)
 	ctx.JSON(http.StatusOK, resp)
 }
 
 // GetTagList get tag list for current repo
 func GetTagList(ctx *context.Context) {
-	search := strings.TrimSpace(ctx.FormString("q"))
-	listOptions := db.ListOptions{
-		ListAll: true,
-	}
-	opts := repo_model.FindReleasesOptions{
-		ListOptions:   listOptions,
-		IncludeDrafts: true,
-		IncludeTags:   true,
-		HasSha1:       util.OptionalBoolTrue,
-	}
-	tags, err := repo_model.GetTagNamesByRepoIDWithSearch(ctx, ctx.Repo.Repository.ID, opts, search)
+	tags, err := repo_model.GetTagNamesByRepoID(ctx, ctx.Repo.Repository.ID)
 	if err != nil {
 		ctx.JSON(http.StatusInternalServerError, err)
 		return
diff --git a/web_src/js/components/RepoBranchTagSelector.vue b/web_src/js/components/RepoBranchTagSelector.vue
index 54d9b1313502e..d7e533ccfe2ac 100644
--- a/web_src/js/components/RepoBranchTagSelector.vue
+++ b/web_src/js/components/RepoBranchTagSelector.vue
@@ -91,7 +91,8 @@ const sfc = {
   computed: {
     filteredItems() {
       const items = this.items.filter((item) => {
-        return ((this.mode === 'branches' && item.branch) || (this.mode === 'tags' && item.tag));
+        return ((this.mode === 'branches' && item.branch) || (this.mode === 'tags' && item.tag)) &&
+          (!this.searchTerm || item.name.toLowerCase().includes(this.searchTerm.toLowerCase()));
       });
 
       // TODO: fix this anti-pattern: side-effects-in-computed-properties
@@ -118,9 +119,6 @@ const sfc = {
         this.focusSearchField();
       }
     },
-    searchTerm: function() {
-      this.fetchBranchesOrTags();
-    }
   },
 
   beforeMount() {
@@ -250,7 +248,7 @@ const sfc = {
       }
     },
     fetchBranchesOrTags: onInputDebounce(async function() {
-      const resp = await fetch(`${this.repoLink}/${this.mode}/list?&q=${this.searchTerm}`);
+      const resp = await fetch(`${this.repoLink}/${this.mode}/list`);
       const {results} = await resp.json();
       if (!results || !['branches', 'tags'].includes(this.mode)) return;
       this.items = [];

From 51dac0e0fe18774d17e7fe69033f2d48877f0fd5 Mon Sep 17 00:00:00 2001
From: HesterG <hestergong@gmail.com>
Date: Thu, 6 Jul 2023 15:42:32 +0800
Subject: [PATCH 12/46] save for adding Branches

---
 modules/context/repo.go                       | 20 +++++++++----------
 routers/web/repo/compare.go                   | 15 +++++++++++++-
 routers/web/repo/issue.go                     | 14 ++++++++++++-
 routers/web/repo/pull.go                      | 13 ++++++++++++
 .../js/components/RepoBranchTagSelector.vue   |  2 +-
 5 files changed, 51 insertions(+), 13 deletions(-)

diff --git a/modules/context/repo.go b/modules/context/repo.go
index eae71cfb7be67..b59492853172a 100644
--- a/modules/context/repo.go
+++ b/modules/context/repo.go
@@ -690,14 +690,13 @@ func RepoAssignment(ctx *Context) context.CancelFunc {
 	}
 
 	// FIXME: use paganation and async loading
-	branchOpts.ExcludeBranchNames = []string{ctx.Repo.Repository.DefaultBranch}
-	brs, err := git_model.FindBranchNames(ctx, branchOpts)
-	if err != nil {
-		ctx.ServerError("GetBranches", err)
-		return cancel
-	}
-	// always put default branch on the top
-	ctx.Data["Branches"] = append(branchOpts.ExcludeBranchNames, brs...)
+	// branchOpts.ExcludeBranchNames = []string{ctx.Repo.Repository.DefaultBranch}
+	// brs, err := git_model.FindBranchNames(ctx, branchOpts)
+	// if err != nil {
+	// 	ctx.ServerError("GetBranches", err)
+	// 	return
+	// }
+	// ctx.Data["Branches"] = append(branchOpts.ExcludeBranchNames, brs...)
 	ctx.Data["BranchesCount"] = branchesTotal
 
 	// If not branch selected, try default one.
@@ -705,9 +704,10 @@ func RepoAssignment(ctx *Context) context.CancelFunc {
 	if len(ctx.Repo.BranchName) == 0 {
 		if len(ctx.Repo.Repository.DefaultBranch) > 0 && gitRepo.IsBranchExist(ctx.Repo.Repository.DefaultBranch) {
 			ctx.Repo.BranchName = ctx.Repo.Repository.DefaultBranch
-		} else if len(brs) > 0 {
-			ctx.Repo.BranchName = brs[0]
 		}
+		// else if len(brs) > 0 {
+		// 	ctx.Repo.BranchName = brs[0]
+		// }
 		ctx.Repo.RefName = ctx.Repo.BranchName
 	}
 	ctx.Data["BranchName"] = ctx.Repo.BranchName
diff --git a/routers/web/repo/compare.go b/routers/web/repo/compare.go
index 7089c219ad25c..0ffcfeb8ee271 100644
--- a/routers/web/repo/compare.go
+++ b/routers/web/repo/compare.go
@@ -754,6 +754,20 @@ func CompareDiff(ctx *context.Context) {
 	}
 	ctx.Data["HeadBranches"] = headBranches
 
+	// For compare repo branches
+	brs, err := git_model.FindBranchNames(ctx, git_model.FindBranchOptions{
+		RepoID: ctx.Repo.Repository.ID,
+		ListOptions: db.ListOptions{
+			ListAll: true,
+		},
+		IsDeletedBranch: util.OptionalBoolFalse,
+	})
+	if err != nil {
+		ctx.ServerError("GetBranches", err)
+		return
+	}
+	ctx.Data["Branches"] = brs
+
 	headTags, err := repo_model.GetTagNamesByRepoID(ctx, ci.HeadRepo.ID)
 	if err != nil {
 		ctx.ServerError("GetTagNamesByRepoID", err)
@@ -840,7 +854,6 @@ func CompareDiff(ctx *context.Context) {
 	} else {
 		ctx.Data["AllowMaintainerEdit"] = false
 	}
-
 	ctx.HTML(http.StatusOK, tplCompare)
 }
 
diff --git a/routers/web/repo/issue.go b/routers/web/repo/issue.go
index 8fb6fe04dfcf6..7131407d4389c 100644
--- a/routers/web/repo/issue.go
+++ b/routers/web/repo/issue.go
@@ -1918,7 +1918,19 @@ func ViewIssue(ctx *context.Context) {
 	ctx.Data["ShouldShowCommentType"] = func(commentType issues_model.CommentType) bool {
 		return hiddenCommentTypes == nil || hiddenCommentTypes.Bit(int(commentType)) == 0
 	}
-
+	// For sidebar
+	brs, err := git_model.FindBranchNames(ctx, git_model.FindBranchOptions{
+		RepoID: ctx.Repo.Repository.ID,
+		ListOptions: db.ListOptions{
+			ListAll: true,
+		},
+		IsDeletedBranch: util.OptionalBoolFalse,
+	})
+	if err != nil {
+		ctx.ServerError("GetBranches", err)
+		return
+	}
+	ctx.Data["Branches"] = brs
 	ctx.HTML(http.StatusOK, tplIssueView)
 }
 
diff --git a/routers/web/repo/pull.go b/routers/web/repo/pull.go
index c5f260adfa745..f76817ee7554c 100644
--- a/routers/web/repo/pull.go
+++ b/routers/web/repo/pull.go
@@ -893,6 +893,19 @@ func ViewPullFiles(ctx *context.Context) {
 	ctx.Data["HasIssuesOrPullsWritePermission"] = ctx.Repo.CanWriteIssuesOrPulls(issue.IsPull)
 
 	ctx.Data["IsAttachmentEnabled"] = setting.Attachment.Enabled
+	// For files changed page
+	brs, err := git_model.FindBranchNames(ctx, git_model.FindBranchOptions{
+		RepoID: ctx.Repo.Repository.ID,
+		ListOptions: db.ListOptions{
+			ListAll: true,
+		},
+		IsDeletedBranch: util.OptionalBoolFalse,
+	})
+	if err != nil {
+		ctx.ServerError("GetBranches", err)
+		return
+	}
+	ctx.Data["Branches"] = brs
 	upload.AddUploadContext(ctx, "comment")
 
 	ctx.HTML(http.StatusOK, tplPullFiles)
diff --git a/web_src/js/components/RepoBranchTagSelector.vue b/web_src/js/components/RepoBranchTagSelector.vue
index d7e533ccfe2ac..4d338a02f88fc 100644
--- a/web_src/js/components/RepoBranchTagSelector.vue
+++ b/web_src/js/components/RepoBranchTagSelector.vue
@@ -118,7 +118,7 @@ const sfc = {
       if (visible) {
         this.focusSearchField();
       }
-    },
+    }
   },
 
   beforeMount() {

From bd2c3f989499ee4c1fdc18e6b6369aa114efb097 Mon Sep 17 00:00:00 2001
From: HesterG <hestergong@gmail.com>
Date: Thu, 6 Jul 2023 15:47:20 +0800
Subject: [PATCH 13/46] fix typo

---
 routers/web/repo/compare.go | 1 +
 routers/web/repo/repo.go    | 4 ++--
 routers/web/web.go          | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/routers/web/repo/compare.go b/routers/web/repo/compare.go
index 0ffcfeb8ee271..209692da4dab3 100644
--- a/routers/web/repo/compare.go
+++ b/routers/web/repo/compare.go
@@ -854,6 +854,7 @@ func CompareDiff(ctx *context.Context) {
 	} else {
 		ctx.Data["AllowMaintainerEdit"] = false
 	}
+
 	ctx.HTML(http.StatusOK, tplCompare)
 }
 
diff --git a/routers/web/repo/repo.go b/routers/web/repo/repo.go
index f35ebb7190be7..e90a96606baf3 100644
--- a/routers/web/repo/repo.go
+++ b/routers/web/repo/repo.go
@@ -627,8 +627,8 @@ type branchTagSearchResponse struct {
 	Results []string `json:"results"`
 }
 
-// GetBrancheList get branches for current repo'
-func GetBrancheList(ctx *context.Context) {
+// GetBranchesList get branches for current repo'
+func GetBranchesList(ctx *context.Context) {
 	branchOpts := git_model.FindBranchOptions{
 		RepoID:          ctx.Repo.Repository.ID,
 		IsDeletedBranch: util.OptionalBoolFalse,
diff --git a/routers/web/web.go b/routers/web/web.go
index 5049624898d40..f091bfefb86d4 100644
--- a/routers/web/web.go
+++ b/routers/web/web.go
@@ -1094,7 +1094,7 @@ func registerRoutes(m *web.Route) {
 		}, context.RepoRef(), canEnableEditor, context.RepoMustNotBeArchived())
 
 		m.Group("/branches", func() {
-			m.Get("/list", repo.GetBrancheList)
+			m.Get("/list", repo.GetBranchesList)
 			m.Group("/_new", func() {
 				m.Post("/branch/*", context.RepoRefByType(context.RepoRefBranch), repo.CreateBranch)
 				m.Post("/tag/*", context.RepoRefByType(context.RepoRefTag), repo.CreateBranch)

From 9061d457eca04b3857b555d61b480cd3cb2c2b37 Mon Sep 17 00:00:00 2001
From: HesterG <hestergong@gmail.com>
Date: Thu, 6 Jul 2023 16:11:57 +0800
Subject: [PATCH 14/46] fetch on mounted

---
 .../js/components/RepoBranchTagSelector.vue   | 27 ++++++++++---------
 1 file changed, 15 insertions(+), 12 deletions(-)

diff --git a/web_src/js/components/RepoBranchTagSelector.vue b/web_src/js/components/RepoBranchTagSelector.vue
index 4d338a02f88fc..e82e92663d3fe 100644
--- a/web_src/js/components/RepoBranchTagSelector.vue
+++ b/web_src/js/components/RepoBranchTagSelector.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="ui floating filter dropdown custom">
-    <button class="branch-dropdown-button gt-ellipsis ui basic small compact button gt-df gt-m-0" @click="menuVisible = !menuVisible;fetchBranchesOrTags()" @keyup.enter="menuVisible = !menuVisible">
+    <button class="branch-dropdown-button gt-ellipsis ui basic small compact button gt-df gt-m-0" @click="menuVisible = !menuVisible;" @keyup.enter="menuVisible = !menuVisible">
       <span class="text gt-df gt-ac gt-mr-2">
         <template v-if="release">{{ textReleaseCompare }}</template>
         <template v-else>
@@ -20,13 +20,13 @@
         <div class="header branch-tag-choice">
           <div class="ui grid">
             <div class="two column row">
-              <a class="reference column" href="#" @click="createTag = false; mode = 'branches'; focusSearchField(); fetchBranchesOrTags()">
+              <a class="reference column" href="#" @click="createTag = false; mode = 'branches'; focusSearchField();">
                 <span class="text" :class="{black: mode === 'branches'}">
                   <svg-icon name="octicon-git-branch" :size="16" class-name="gt-mr-2"/>{{ textBranches }}
                 </span>
               </a>
               <template v-if="!noTag">
-                <a class="reference column" href="#" @click="createTag = true; mode = 'tags'; focusSearchField(); fetchBranchesOrTags()">
+                <a class="reference column" href="#" @click="createTag = true; mode = 'tags'; focusSearchField()">
                   <span class="text" :class="{black: mode === 'tags'}">
                     <svg-icon name="octicon-tag" :size="16" class-name="gt-mr-2"/>{{ textTags }}
                   </span>
@@ -81,7 +81,6 @@ import {createApp, nextTick} from 'vue';
 import $ from 'jquery';
 import {SvgIcon} from '../svg.js';
 import {pathEscapeSegments} from '../utils/url.js';
-import {onInputDebounce} from '../utils/dom.js';
 
 const sfc = {
   components: {SvgIcon},
@@ -140,6 +139,9 @@ const sfc = {
       }
     });
   },
+  mounted() {
+    this.fetchBranchesAndTags();
+  },
   methods: {
     selectItem(item) {
       const prev = this.getSelected();
@@ -247,17 +249,18 @@ const sfc = {
         this.menuVisible = false;
       }
     },
-    fetchBranchesOrTags: onInputDebounce(async function() {
-      const resp = await fetch(`${this.repoLink}/${this.mode}/list`);
-      const {results} = await resp.json();
-      if (!results || !['branches', 'tags'].includes(this.mode)) return;
-      this.items = [];
+    async fetchBranchesAndTags() {
       // the "data.defaultBranch" is ambiguous, it could be "branch name" or "tag name"
-      if (this.mode === 'branches' && this.showBranchesInDropdown) {
+      if (this.showBranchesInDropdown) {
+        const resp = await fetch(`${this.repoLink}/branches/list`);
+        const {results} = await resp.json();
         for (const branch of results) {
           this.items.push({name: branch, url: branch, branch: true, tag: false, selected: branch === this.defaultBranch});
         }
-      } else if (this.mode === 'tags' && !this.noTag) {
+      } 
+      if (!this.noTag) {
+        const resp = await fetch(`${this.repoLink}/tags/list`);
+        const {results} = await resp.json();
         for (const tag of results) {
           if (this.release) {
             this.items.push({name: tag, url: tag, branch: false, tag: true, selected: tag === this.release.tagName});
@@ -266,7 +269,7 @@ const sfc = {
           }
         }
       }
-    }),
+    },
   }
 };
 

From eeda2d5d63641e7c07c1addd230969f8f033c421 Mon Sep 17 00:00:00 2001
From: HesterG <hestergong@gmail.com>
Date: Thu, 6 Jul 2023 17:16:51 +0800
Subject: [PATCH 15/46] fix lint

---
 routers/web/repo/repo.go | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/routers/web/repo/repo.go b/routers/web/repo/repo.go
index e90a96606baf3..41bdc90a44d89 100644
--- a/routers/web/repo/repo.go
+++ b/routers/web/repo/repo.go
@@ -644,7 +644,8 @@ func GetBranchesList(ctx *context.Context) {
 	}
 	resp := &branchTagSearchResponse{}
 	// always put default branch on the top
-	resp.Results = append(branchOpts.ExcludeBranchNames, branches...)
+	branches = append(branchOpts.ExcludeBranchNames, branches...)
+	resp.Results = branches
 	ctx.JSON(http.StatusOK, resp)
 }
 

From 5e0c11c90854069db20fa3f679cf1f6319a4eb13 Mon Sep 17 00:00:00 2001
From: HesterG <hestergong@gmail.com>
Date: Thu, 6 Jul 2023 17:17:54 +0800
Subject: [PATCH 16/46] remove unnecessary

---
 web_src/js/components/RepoBranchTagSelector.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/web_src/js/components/RepoBranchTagSelector.vue b/web_src/js/components/RepoBranchTagSelector.vue
index e82e92663d3fe..883a39e8f98bd 100644
--- a/web_src/js/components/RepoBranchTagSelector.vue
+++ b/web_src/js/components/RepoBranchTagSelector.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="ui floating filter dropdown custom">
-    <button class="branch-dropdown-button gt-ellipsis ui basic small compact button gt-df gt-m-0" @click="menuVisible = !menuVisible;" @keyup.enter="menuVisible = !menuVisible">
+    <button class="branch-dropdown-button gt-ellipsis ui basic small compact button gt-df gt-m-0" @click="menuVisible = !menuVisible" @keyup.enter="menuVisible = !menuVisible">
       <span class="text gt-df gt-ac gt-mr-2">
         <template v-if="release">{{ textReleaseCompare }}</template>
         <template v-else>
@@ -20,7 +20,7 @@
         <div class="header branch-tag-choice">
           <div class="ui grid">
             <div class="two column row">
-              <a class="reference column" href="#" @click="createTag = false; mode = 'branches'; focusSearchField();">
+              <a class="reference column" href="#" @click="createTag = false; mode = 'branches'; focusSearchField()">
                 <span class="text" :class="{black: mode === 'branches'}">
                   <svg-icon name="octicon-git-branch" :size="16" class-name="gt-mr-2"/>{{ textBranches }}
                 </span>

From fcded06a0f618725cff636004e58532763d72a1f Mon Sep 17 00:00:00 2001
From: HesterG <hestergong@gmail.com>
Date: Fri, 7 Jul 2023 08:57:41 +0800
Subject: [PATCH 17/46] Update web_src/js/components/RepoBranchTagSelector.vue

Co-authored-by: silverwind <me@silverwind.io>
---
 web_src/js/components/RepoBranchTagSelector.vue | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/web_src/js/components/RepoBranchTagSelector.vue b/web_src/js/components/RepoBranchTagSelector.vue
index 883a39e8f98bd..17dc59953ca2f 100644
--- a/web_src/js/components/RepoBranchTagSelector.vue
+++ b/web_src/js/components/RepoBranchTagSelector.vue
@@ -262,11 +262,8 @@ const sfc = {
         const resp = await fetch(`${this.repoLink}/tags/list`);
         const {results} = await resp.json();
         for (const tag of results) {
-          if (this.release) {
-            this.items.push({name: tag, url: tag, branch: false, tag: true, selected: tag === this.release.tagName});
-          } else {
-            this.items.push({name: tag, url: tag, branch: false, tag: true, selected: tag === this.defaultBranch});
-          }
+          const selected = tag === (this.release ? this.release.tagName : this.defaultBranch);
+          this.items.push({name: tag, url: tag, branch: false, tag: true, selected});
         }
       }
     },

From f9eb341fde53943c153cef5efd4f84f66b69252f Mon Sep 17 00:00:00 2001
From: HesterG <hestergong@gmail.com>
Date: Fri, 7 Jul 2023 17:52:46 +0800
Subject: [PATCH 18/46] save: v-show and loading

---
 web_src/css/modules/animations.css              |  2 +-
 web_src/js/components/RepoBranchTagSelector.vue | 12 +++++++-----
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/web_src/css/modules/animations.css b/web_src/css/modules/animations.css
index 876758d8bfb31..6f2fdff7e4dce 100644
--- a/web_src/css/modules/animations.css
+++ b/web_src/css/modules/animations.css
@@ -16,7 +16,7 @@
 .is-loading::after {
   content: "";
   position: absolute;
-  display: block;
+  display: block !important; /* to override fomantic rule .ui.dropdown .menu .menu:after {display: none} */
   left: 50%;
   top: 50%;
   height: min(4em, 66.6%);
diff --git a/web_src/js/components/RepoBranchTagSelector.vue b/web_src/js/components/RepoBranchTagSelector.vue
index 17dc59953ca2f..9373745f93346 100644
--- a/web_src/js/components/RepoBranchTagSelector.vue
+++ b/web_src/js/components/RepoBranchTagSelector.vue
@@ -11,7 +11,7 @@
       </span>
       <svg-icon name="octicon-triangle-down" :size="14" class-name="dropdown icon"/>
     </button>
-    <div class="menu transition" :class="{visible: menuVisible}" v-if="menuVisible" v-cloak>
+    <div class="menu transition" :class="{visible: menuVisible}" v-show="menuVisible" v-cloak>
       <div class="ui icon search input">
         <i class="icon"><svg-icon name="octicon-filter" :size="16"/></i>
         <input name="search" ref="searchField" autocomplete="off" v-model="searchTerm" @keydown="keydown($event)" :placeholder="searchFieldPlaceholder">
@@ -36,7 +36,8 @@
           </div>
         </div>
       </template>
-      <div class="scrolling menu" ref="scrollContainer">
+      <!-- TODO: is-loading not working properly because menu is not shown until data is done fetching, need to figure out a proper way -->
+      <div class="scrolling menu" :class="{'is-loading' : isLoading}" ref="scrollContainer">
         <div v-for="(item, index) in filteredItems" :key="item.name" class="item" :class="{selected: item.selected, active: active === index}" @click="selectItem(item)" :ref="'listItem' + index">
           {{ item.name }}
           <a v-if="enableFeed && mode === 'branches'" role="button" class="rss-icon ui compact right" :href="rssURLPrefix + item.url" target="_blank" @click.stop>
@@ -257,7 +258,8 @@ const sfc = {
         for (const branch of results) {
           this.items.push({name: branch, url: branch, branch: true, tag: false, selected: branch === this.defaultBranch});
         }
-      } 
+      }
+      this.isLoading = false;
       if (!this.noTag) {
         const resp = await fetch(`${this.repoLink}/tags/list`);
         const {results} = await resp.json();
@@ -265,7 +267,7 @@ const sfc = {
           const selected = tag === (this.release ? this.release.tagName : this.defaultBranch);
           this.items.push({name: tag, url: tag, branch: false, tag: true, selected});
         }
-      }
+      } 
     },
   }
 };
@@ -286,7 +288,7 @@ export function initRepoBranchTagSelector(selector) {
       isViewTree: false,
 
       active: 0,
-
+      isLoading: true,
       ...window.config.pageData.branchDropdownDataList[elIndex],
     };
 

From 8f28814a00a8e7140aa024f7ea4fbbda098935b5 Mon Sep 17 00:00:00 2001
From: HesterG <hestergong@gmail.com>
Date: Mon, 10 Jul 2023 14:50:34 +0800
Subject: [PATCH 19/46] save changes

---
 modules/context/repo.go                       | 12 ++---
 routers/web/repo/compare.go                   | 13 +----
 routers/web/repo/issue.go                     | 15 +++---
 routers/web/repo/pull.go                      | 15 ++----
 routers/web/repo/release.go                   | 18 +++++++
 routers/web/repo/repo.go                      | 17 +++++++
 routers/web/repo/setting/protected_branch.go  |  5 ++
 .../js/components/RepoBranchTagSelector.vue   | 51 +++++++++++--------
 8 files changed, 85 insertions(+), 61 deletions(-)

diff --git a/modules/context/repo.go b/modules/context/repo.go
index b59492853172a..1844e84f43c62 100644
--- a/modules/context/repo.go
+++ b/modules/context/repo.go
@@ -660,12 +660,12 @@ func RepoAssignment(ctx *Context) context.CancelFunc {
 		return cancel
 	}
 
-	tags, err := repo_model.GetTagNamesByRepoID(ctx, ctx.Repo.Repository.ID)
-	if err != nil {
-		ctx.ServerError("GetTagNamesByRepoID", err)
-		return cancel
-	}
-	ctx.Data["Tags"] = tags
+	// tags, err := repo_model.GetTagNamesByRepoID(ctx, ctx.Repo.Repository.ID)
+	// if err != nil {
+	// 	ctx.ServerError("GetTagNamesByRepoID", err)
+	// 	return cancel
+	// }
+	// ctx.Data["Tags"] = tags
 
 	branchOpts := git_model.FindBranchOptions{
 		RepoID:          ctx.Repo.Repository.ID,
diff --git a/routers/web/repo/compare.go b/routers/web/repo/compare.go
index 209692da4dab3..da35b6621a318 100644
--- a/routers/web/repo/compare.go
+++ b/routers/web/repo/compare.go
@@ -755,18 +755,7 @@ func CompareDiff(ctx *context.Context) {
 	ctx.Data["HeadBranches"] = headBranches
 
 	// For compare repo branches
-	brs, err := git_model.FindBranchNames(ctx, git_model.FindBranchOptions{
-		RepoID: ctx.Repo.Repository.ID,
-		ListOptions: db.ListOptions{
-			ListAll: true,
-		},
-		IsDeletedBranch: util.OptionalBoolFalse,
-	})
-	if err != nil {
-		ctx.ServerError("GetBranches", err)
-		return
-	}
-	ctx.Data["Branches"] = brs
+	PrepareBranchList(ctx)
 
 	headTags, err := repo_model.GetTagNamesByRepoID(ctx, ci.HeadRepo.ID)
 	if err != nil {
diff --git a/routers/web/repo/issue.go b/routers/web/repo/issue.go
index 7131407d4389c..25b394ec775b8 100644
--- a/routers/web/repo/issue.go
+++ b/routers/web/repo/issue.go
@@ -1919,18 +1919,15 @@ func ViewIssue(ctx *context.Context) {
 		return hiddenCommentTypes == nil || hiddenCommentTypes.Bit(int(commentType)) == 0
 	}
 	// For sidebar
-	brs, err := git_model.FindBranchNames(ctx, git_model.FindBranchOptions{
-		RepoID: ctx.Repo.Repository.ID,
-		ListOptions: db.ListOptions{
-			ListAll: true,
-		},
-		IsDeletedBranch: util.OptionalBoolFalse,
-	})
+	PrepareBranchList(ctx)
+
+	tags, err := repo_model.GetTagNamesByRepoID(ctx, ctx.Repo.Repository.ID)
 	if err != nil {
-		ctx.ServerError("GetBranches", err)
+		ctx.ServerError("GetTagNamesByRepoID", err)
 		return
 	}
-	ctx.Data["Branches"] = brs
+	ctx.Data["Tags"] = tags
+
 	ctx.HTML(http.StatusOK, tplIssueView)
 }
 
diff --git a/routers/web/repo/pull.go b/routers/web/repo/pull.go
index f76817ee7554c..256239616c0ad 100644
--- a/routers/web/repo/pull.go
+++ b/routers/web/repo/pull.go
@@ -729,6 +729,8 @@ func ViewPullCommits(ctx *context.Context) {
 	ctx.Data["HasIssuesOrPullsWritePermission"] = ctx.Repo.CanWriteIssuesOrPulls(issue.IsPull)
 	ctx.Data["IsIssuePoster"] = ctx.IsSigned && issue.IsPoster(ctx.Doer.ID)
 
+	// For commits page
+	PrepareBranchList(ctx)
 	getBranchData(ctx, issue)
 	ctx.HTML(http.StatusOK, tplPullCommits)
 }
@@ -894,18 +896,7 @@ func ViewPullFiles(ctx *context.Context) {
 
 	ctx.Data["IsAttachmentEnabled"] = setting.Attachment.Enabled
 	// For files changed page
-	brs, err := git_model.FindBranchNames(ctx, git_model.FindBranchOptions{
-		RepoID: ctx.Repo.Repository.ID,
-		ListOptions: db.ListOptions{
-			ListAll: true,
-		},
-		IsDeletedBranch: util.OptionalBoolFalse,
-	})
-	if err != nil {
-		ctx.ServerError("GetBranches", err)
-		return
-	}
-	ctx.Data["Branches"] = brs
+	PrepareBranchList(ctx)
 	upload.AddUploadContext(ctx, "comment")
 
 	ctx.HTML(http.StatusOK, tplPullFiles)
diff --git a/routers/web/repo/release.go b/routers/web/repo/release.go
index 1a0303f1f21ba..ad6bfaa964d09 100644
--- a/routers/web/repo/release.go
+++ b/routers/web/repo/release.go
@@ -352,6 +352,17 @@ func NewRelease(ctx *context.Context) {
 	ctx.Data["Assignees"] = MakeSelfOnTop(ctx, assigneeUsers)
 
 	upload.AddUploadContext(ctx, "release")
+
+	// For New Release page
+	PrepareBranchList(ctx)
+
+	tags, err := repo_model.GetTagNamesByRepoID(ctx, ctx.Repo.Repository.ID)
+	if err != nil {
+		ctx.ServerError("GetTagNamesByRepoID", err)
+		return
+	}
+	ctx.Data["Tags"] = tags
+
 	ctx.HTML(http.StatusOK, tplReleaseNew)
 }
 
@@ -361,6 +372,13 @@ func NewReleasePost(ctx *context.Context) {
 	ctx.Data["Title"] = ctx.Tr("repo.release.new_release")
 	ctx.Data["PageIsReleaseList"] = true
 
+	tags, err := repo_model.GetTagNamesByRepoID(ctx, ctx.Repo.Repository.ID)
+	if err != nil {
+		ctx.ServerError("GetTagNamesByRepoID", err)
+		return
+	}
+	ctx.Data["Tags"] = tags
+
 	if ctx.HasError() {
 		ctx.HTML(http.StatusOK, tplReleaseNew)
 		return
diff --git a/routers/web/repo/repo.go b/routers/web/repo/repo.go
index 41bdc90a44d89..627a0117b248c 100644
--- a/routers/web/repo/repo.go
+++ b/routers/web/repo/repo.go
@@ -660,3 +660,20 @@ func GetTagList(ctx *context.Context) {
 	resp.Results = tags
 	ctx.JSON(http.StatusOK, resp)
 }
+
+func PrepareBranchList(ctx *context.Context) {
+	branchOpts := git_model.FindBranchOptions{
+		RepoID:          ctx.Repo.Repository.ID,
+		IsDeletedBranch: util.OptionalBoolFalse,
+		ListOptions: db.ListOptions{
+			ListAll: true,
+		},
+	}
+	branchOpts.ExcludeBranchNames = []string{ctx.Repo.Repository.DefaultBranch}
+	brs, err := git_model.FindBranchNames(ctx, branchOpts)
+	if err != nil {
+		ctx.ServerError("GetBranches", err)
+		return
+	}
+	ctx.Data["Branches"] = append(branchOpts.ExcludeBranchNames, brs...)
+}
diff --git a/routers/web/repo/setting/protected_branch.go b/routers/web/repo/setting/protected_branch.go
index 777d52c858061..004b8bfb11500 100644
--- a/routers/web/repo/setting/protected_branch.go
+++ b/routers/web/repo/setting/protected_branch.go
@@ -21,6 +21,7 @@ import (
 	"code.gitea.io/gitea/modules/log"
 	"code.gitea.io/gitea/modules/setting"
 	"code.gitea.io/gitea/modules/web"
+	"code.gitea.io/gitea/routers/web/repo"
 	"code.gitea.io/gitea/services/forms"
 	pull_service "code.gitea.io/gitea/services/pull"
 	"code.gitea.io/gitea/services/repository"
@@ -44,6 +45,8 @@ func ProtectedBranchRules(ctx *context.Context) {
 	}
 	ctx.Data["ProtectedBranches"] = rules
 
+	repo.PrepareBranchList(ctx)
+
 	ctx.HTML(http.StatusOK, tplBranches)
 }
 
@@ -52,6 +55,8 @@ func SetDefaultBranchPost(ctx *context.Context) {
 	ctx.Data["Title"] = ctx.Tr("repo.settings.branches.update_default_branch")
 	ctx.Data["PageIsSettingsBranches"] = true
 
+	repo.PrepareBranchList(ctx)
+
 	repo := ctx.Repo.Repository
 
 	switch ctx.FormString("action") {
diff --git a/web_src/js/components/RepoBranchTagSelector.vue b/web_src/js/components/RepoBranchTagSelector.vue
index 9373745f93346..f56e2c11f3d3f 100644
--- a/web_src/js/components/RepoBranchTagSelector.vue
+++ b/web_src/js/components/RepoBranchTagSelector.vue
@@ -20,13 +20,13 @@
         <div class="header branch-tag-choice">
           <div class="ui grid">
             <div class="two column row">
-              <a class="reference column" href="#" @click="createTag = false; mode = 'branches'; focusSearchField()">
+              <a class="reference column" href="#" @click="createTag = false; mode = 'branches'; focusSearchField();this.fetchBranchesOrTags()">
                 <span class="text" :class="{black: mode === 'branches'}">
                   <svg-icon name="octicon-git-branch" :size="16" class-name="gt-mr-2"/>{{ textBranches }}
                 </span>
               </a>
               <template v-if="!noTag">
-                <a class="reference column" href="#" @click="createTag = true; mode = 'tags'; focusSearchField()">
+                <a class="reference column" href="#" @click="createTag = true; mode = 'tags'; focusSearchField();this.fetchBranchesOrTags()">
                   <span class="text" :class="{black: mode === 'tags'}">
                     <svg-icon name="octicon-tag" :size="16" class-name="gt-mr-2"/>{{ textTags }}
                   </span>
@@ -37,7 +37,7 @@
         </div>
       </template>
       <!-- TODO: is-loading not working properly because menu is not shown until data is done fetching, need to figure out a proper way -->
-      <div class="scrolling menu" :class="{'is-loading' : isLoading}" ref="scrollContainer">
+      <div class="scrolling menu" :class="{'is-loading': isLoading}" ref="scrollContainer">
         <div v-for="(item, index) in filteredItems" :key="item.name" class="item" :class="{selected: item.selected, active: active === index}" @click="selectItem(item)" :ref="'listItem' + index">
           {{ item.name }}
           <a v-if="enableFeed && mode === 'branches'" role="button" class="rss-icon ui compact right" :href="rssURLPrefix + item.url" target="_blank" @click.stop>
@@ -70,7 +70,7 @@
           </form>
         </div>
       </div>
-      <div class="message" v-if="showNoResults">
+      <div class="message" v-if="showNoResults && !isLoading">
         {{ noResults }}
       </div>
     </div>
@@ -117,6 +117,7 @@ const sfc = {
     menuVisible(visible) {
       if (visible) {
         this.focusSearchField();
+        this.fetchBranchesOrTags();
       }
     }
   },
@@ -140,9 +141,6 @@ const sfc = {
       }
     });
   },
-  mounted() {
-    this.fetchBranchesAndTags();
-  },
   methods: {
     selectItem(item) {
       const prev = this.getSelected();
@@ -250,24 +248,28 @@ const sfc = {
         this.menuVisible = false;
       }
     },
-    async fetchBranchesAndTags() {
+    async fetchBranchesOrTags() {
+      if (!['branches', 'tags'].includes(this.mode)) return;
+      if ((this.mode === 'branches' && (!this.showBranchesInDropdown || !this.isBranchOrTagListInit[0])) 
+      || (this.mode === 'tags' && (this.noTag || !this.isBranchOrTagListInit[1]))) return;
+      if (this.isLoading) return;
+      this.isLoading = true;
+      console.log(this.isLoading);
+      this.isBranchOrTagListInit[this.mode === 'branches' ? 0: 1] = false;
       // the "data.defaultBranch" is ambiguous, it could be "branch name" or "tag name"
-      if (this.showBranchesInDropdown) {
-        const resp = await fetch(`${this.repoLink}/branches/list`);
-        const {results} = await resp.json();
-        for (const branch of results) {
-          this.items.push({name: branch, url: branch, branch: true, tag: false, selected: branch === this.defaultBranch});
+      const reqUrl = `${this.repoLink}/${this.mode}/list`;
+      const resp = await fetch(reqUrl);
+      const {results} = await resp.json();
+      for (const result of results) {
+        let selected = false;
+        if (this.mode === 'branches') {
+          selected = result === this.defaultBranch;
+        } else {
+          selected = result === (this.release ? this.release.tagName : this.defaultBranch)
         }
+        this.items.push({name: result, url: result, branch: this.mode === 'branches', tag: this.mode === 'tags', selected});
       }
       this.isLoading = false;
-      if (!this.noTag) {
-        const resp = await fetch(`${this.repoLink}/tags/list`);
-        const {results} = await resp.json();
-        for (const tag of results) {
-          const selected = tag === (this.release ? this.release.tagName : this.defaultBranch);
-          this.items.push({name: tag, url: tag, branch: false, tag: true, selected});
-        }
-      } 
     },
   }
 };
@@ -288,7 +290,8 @@ export function initRepoBranchTagSelector(selector) {
       isViewTree: false,
 
       active: 0,
-      isLoading: true,
+      isLoading: false,
+      isBranchOrTagListInit: [true, true],
       ...window.config.pageData.branchDropdownDataList[elIndex],
     };
 
@@ -307,4 +310,8 @@ export default sfc; // activate IDE's Vue plugin
 .menu .item:hover .rss-icon {
   display: inline-block;
 }
+
+.scrolling.menu.is-loading {
+  height: 200px;
+}
 </style>

From f39cb22d0f73589ea8bc615b7d14d8029c5a6691 Mon Sep 17 00:00:00 2001
From: HesterG <hestergong@gmail.com>
Date: Mon, 10 Jul 2023 15:09:13 +0800
Subject: [PATCH 20/46] save changes for branches

---
 web_src/js/components/RepoBranchTagSelector.vue | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/web_src/js/components/RepoBranchTagSelector.vue b/web_src/js/components/RepoBranchTagSelector.vue
index f56e2c11f3d3f..ce6fb92b1bb3a 100644
--- a/web_src/js/components/RepoBranchTagSelector.vue
+++ b/web_src/js/components/RepoBranchTagSelector.vue
@@ -250,12 +250,11 @@ const sfc = {
     },
     async fetchBranchesOrTags() {
       if (!['branches', 'tags'].includes(this.mode)) return;
-      if ((this.mode === 'branches' && (!this.showBranchesInDropdown || !this.isBranchOrTagListInit[0])) 
-      || (this.mode === 'tags' && (this.noTag || !this.isBranchOrTagListInit[1]))) return;
+      if ((this.mode === 'branches' && !this.showBranchesInDropdown) || (this.mode === 'tags' && this.noTag)
+      || !this.isListInit[this.mode]) return;
       if (this.isLoading) return;
       this.isLoading = true;
-      console.log(this.isLoading);
-      this.isBranchOrTagListInit[this.mode === 'branches' ? 0: 1] = false;
+      this.isListInit[this.mode] = false;
       // the "data.defaultBranch" is ambiguous, it could be "branch name" or "tag name"
       const reqUrl = `${this.repoLink}/${this.mode}/list`;
       const resp = await fetch(reqUrl);
@@ -291,7 +290,10 @@ export function initRepoBranchTagSelector(selector) {
 
       active: 0,
       isLoading: false,
-      isBranchOrTagListInit: [true, true],
+      isListInit: {
+        'branches': true,
+        'tags': true,
+      },
       ...window.config.pageData.branchDropdownDataList[elIndex],
     };
 

From e4d9a643da6aed5b55fbebae4336cea8982a17f7 Mon Sep 17 00:00:00 2001
From: HesterG <hestergong@gmail.com>
Date: Mon, 10 Jul 2023 15:53:01 +0800
Subject: [PATCH 21/46] comments

---
 web_src/css/modules/animations.css              | 2 +-
 web_src/js/components/RepoBranchTagSelector.vue | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/web_src/css/modules/animations.css b/web_src/css/modules/animations.css
index 6f2fdff7e4dce..876758d8bfb31 100644
--- a/web_src/css/modules/animations.css
+++ b/web_src/css/modules/animations.css
@@ -16,7 +16,7 @@
 .is-loading::after {
   content: "";
   position: absolute;
-  display: block !important; /* to override fomantic rule .ui.dropdown .menu .menu:after {display: none} */
+  display: block;
   left: 50%;
   top: 50%;
   height: min(4em, 66.6%);
diff --git a/web_src/js/components/RepoBranchTagSelector.vue b/web_src/js/components/RepoBranchTagSelector.vue
index ce6fb92b1bb3a..ae9c9dd4b4523 100644
--- a/web_src/js/components/RepoBranchTagSelector.vue
+++ b/web_src/js/components/RepoBranchTagSelector.vue
@@ -250,6 +250,7 @@ const sfc = {
     },
     async fetchBranchesOrTags() {
       if (!['branches', 'tags'].includes(this.mode)) return;
+      // only fetch when the current branch/tag list has not be initialized 
       if ((this.mode === 'branches' && !this.showBranchesInDropdown) || (this.mode === 'tags' && this.noTag)
       || !this.isListInit[this.mode]) return;
       if (this.isLoading) return;
@@ -290,6 +291,7 @@ export function initRepoBranchTagSelector(selector) {
 
       active: 0,
       isLoading: false,
+      // This means whether branch list/tag list needs initialize
       isListInit: {
         'branches': true,
         'tags': true,
@@ -316,4 +318,8 @@ export default sfc; // activate IDE's Vue plugin
 .scrolling.menu.is-loading {
   height: 200px;
 }
+
+.scrolling.menu.is-loading::after {
+  display: block !important; /* to override fomantic rule .ui.dropdown .menu .menu:after {display: none} */
+}
 </style>

From 43fcd8722c13605fcc7e73767ec187f647e16760 Mon Sep 17 00:00:00 2001
From: HesterG <hestergong@gmail.com>
Date: Mon, 10 Jul 2023 16:46:30 +0800
Subject: [PATCH 22/46] comment

---
 routers/web/repo/pull.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/routers/web/repo/pull.go b/routers/web/repo/pull.go
index 256239616c0ad..8d3ac29bd7ed6 100644
--- a/routers/web/repo/pull.go
+++ b/routers/web/repo/pull.go
@@ -729,7 +729,7 @@ func ViewPullCommits(ctx *context.Context) {
 	ctx.Data["HasIssuesOrPullsWritePermission"] = ctx.Repo.CanWriteIssuesOrPulls(issue.IsPull)
 	ctx.Data["IsIssuePoster"] = ctx.IsSigned && issue.IsPoster(ctx.Doer.ID)
 
-	// For commits page
+	// For PR commits page
 	PrepareBranchList(ctx)
 	getBranchData(ctx, issue)
 	ctx.HTML(http.StatusOK, tplPullCommits)

From be909315aba0583655d5173252b8f64edfccd121 Mon Sep 17 00:00:00 2001
From: HesterG <hestergong@gmail.com>
Date: Tue, 11 Jul 2023 09:30:16 +0800
Subject: [PATCH 23/46] save changes for rename and handler

---
 .../js/components/RepoBranchTagSelector.vue   | 31 +++++++++++--------
 1 file changed, 18 insertions(+), 13 deletions(-)

diff --git a/web_src/js/components/RepoBranchTagSelector.vue b/web_src/js/components/RepoBranchTagSelector.vue
index ae9c9dd4b4523..a51d9e37f91e2 100644
--- a/web_src/js/components/RepoBranchTagSelector.vue
+++ b/web_src/js/components/RepoBranchTagSelector.vue
@@ -20,13 +20,13 @@
         <div class="header branch-tag-choice">
           <div class="ui grid">
             <div class="two column row">
-              <a class="reference column" href="#" @click="createTag = false; mode = 'branches'; focusSearchField();this.fetchBranchesOrTags()">
+              <a class="reference column" href="#" @click="handleTabSwitch('branches')">
                 <span class="text" :class="{black: mode === 'branches'}">
                   <svg-icon name="octicon-git-branch" :size="16" class-name="gt-mr-2"/>{{ textBranches }}
                 </span>
               </a>
               <template v-if="!noTag">
-                <a class="reference column" href="#" @click="createTag = true; mode = 'tags'; focusSearchField();this.fetchBranchesOrTags()">
+                <a class="reference column" href="#" @click="handleTabSwitch('tags')">
                   <span class="text" :class="{black: mode === 'tags'}">
                     <svg-icon name="octicon-tag" :size="16" class-name="gt-mr-2"/>{{ textTags }}
                   </span>
@@ -36,7 +36,6 @@
           </div>
         </div>
       </template>
-      <!-- TODO: is-loading not working properly because menu is not shown until data is done fetching, need to figure out a proper way -->
       <div class="scrolling menu" :class="{'is-loading': isLoading}" ref="scrollContainer">
         <div v-for="(item, index) in filteredItems" :key="item.name" class="item" :class="{selected: item.selected, active: active === index}" @click="selectItem(item)" :ref="'listItem' + index">
           {{ item.name }}
@@ -90,6 +89,7 @@ const sfc = {
 
   computed: {
     filteredItems() {
+      // TODO: improve filter
       const items = this.items.filter((item) => {
         return ((this.mode === 'branches' && item.branch) || (this.mode === 'tags' && item.tag)) &&
           (!this.searchTerm || item.name.toLowerCase().includes(this.searchTerm.toLowerCase()));
@@ -248,14 +248,19 @@ const sfc = {
         this.menuVisible = false;
       }
     },
+    handleTabSwitch(mode) {
+      this.createTag = mode === 'tags';
+      this.mode = mode;
+      this.focusSearchField();
+      this.fetchBranchesOrTags();
+    },
     async fetchBranchesOrTags() {
-      if (!['branches', 'tags'].includes(this.mode)) return;
-      // only fetch when the current branch/tag list has not be initialized 
-      if ((this.mode === 'branches' && !this.showBranchesInDropdown) || (this.mode === 'tags' && this.noTag)
-      || !this.isListInit[this.mode]) return;
-      if (this.isLoading) return;
+      if (!['branches', 'tags'].includes(this.mode) || this.isLoading) return;
+      // only fetch when branch/tag list has not been initialized 
+      if (this.hasListInitialized[this.mode] 
+      || (this.mode === 'branches' && !this.showBranchesInDropdown) || (this.mode === 'tags' && this.noTag)) return;
       this.isLoading = true;
-      this.isListInit[this.mode] = false;
+      this.hasListInitialized[this.mode] = true;
       // the "data.defaultBranch" is ambiguous, it could be "branch name" or "tag name"
       const reqUrl = `${this.repoLink}/${this.mode}/list`;
       const resp = await fetch(reqUrl);
@@ -291,10 +296,10 @@ export function initRepoBranchTagSelector(selector) {
 
       active: 0,
       isLoading: false,
-      // This means whether branch list/tag list needs initialize
-      isListInit: {
-        'branches': true,
-        'tags': true,
+      // This means whether branch list/tag list has initialized
+      hasListInitialized: {
+        'branches': false,
+        'tags': false,
       },
       ...window.config.pageData.branchDropdownDataList[elIndex],
     };

From cfbac171d9e390bb5078e16da4a9c6d367d00ea5 Mon Sep 17 00:00:00 2001
From: HesterG <hestergong@gmail.com>
Date: Tue, 11 Jul 2023 10:38:07 +0800
Subject: [PATCH 24/46] fix lint

---
 web_src/js/components/RepoBranchTagSelector.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/web_src/js/components/RepoBranchTagSelector.vue b/web_src/js/components/RepoBranchTagSelector.vue
index a51d9e37f91e2..dfc12b6e30803 100644
--- a/web_src/js/components/RepoBranchTagSelector.vue
+++ b/web_src/js/components/RepoBranchTagSelector.vue
@@ -256,7 +256,7 @@ const sfc = {
     },
     async fetchBranchesOrTags() {
       if (!['branches', 'tags'].includes(this.mode) || this.isLoading) return;
-      // only fetch when branch/tag list has not been initialized 
+      // only fetch when branch/tag list has not been initialized
       if (this.hasListInitialized[this.mode] 
       || (this.mode === 'branches' && !this.showBranchesInDropdown) || (this.mode === 'tags' && this.noTag)) return;
       this.isLoading = true;
@@ -270,7 +270,7 @@ const sfc = {
         if (this.mode === 'branches') {
           selected = result === this.defaultBranch;
         } else {
-          selected = result === (this.release ? this.release.tagName : this.defaultBranch)
+          selected = result === (this.release ? this.release.tagName : this.defaultBranch);
         }
         this.items.push({name: result, url: result, branch: this.mode === 'branches', tag: this.mode === 'tags', selected});
       }

From b05a816e56eb4823329f00790dc4d892fa49a392 Mon Sep 17 00:00:00 2001
From: HesterG <hestergong@gmail.com>
Date: Tue, 11 Jul 2023 11:57:02 +0800
Subject: [PATCH 25/46] use native svg

---
 web_src/js/components/RepoBranchTagSelector.vue | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/web_src/js/components/RepoBranchTagSelector.vue b/web_src/js/components/RepoBranchTagSelector.vue
index dfc12b6e30803..3b59afa165f5a 100644
--- a/web_src/js/components/RepoBranchTagSelector.vue
+++ b/web_src/js/components/RepoBranchTagSelector.vue
@@ -40,7 +40,8 @@
         <div v-for="(item, index) in filteredItems" :key="item.name" class="item" :class="{selected: item.selected, active: active === index}" @click="selectItem(item)" :ref="'listItem' + index">
           {{ item.name }}
           <a v-if="enableFeed && mode === 'branches'" role="button" class="rss-icon ui compact right" :href="rssURLPrefix + item.url" target="_blank" @click.stop>
-            <svg-icon name="octicon-rss" :size="14"/>
+            <!-- <svg-icon name="octicon-rss" :size="14"/> -->
+            <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16" width="14" height="14" aria-hidden="true" class="svg octicon-rss"><path d="M2.002 2.725a.75.75 0 0 1 .797-.699C8.79 2.42 13.58 7.21 13.974 13.201a.75.75 0 0 1-1.497.098 10.502 10.502 0 0 0-9.776-9.776.747.747 0 0 1-.7-.798ZM2.84 7.05h-.002a7.002 7.002 0 0 1 6.113 6.111.75.75 0 0 1-1.49.178 5.503 5.503 0 0 0-4.8-4.8.75.75 0 0 1 .179-1.489ZM2 13a1 1 0 1 1 2 0 1 1 0 0 1-2 0Z"></path></svg>
           </a>
         </div>
         <div class="item" v-if="showCreateNewBranch" :class="{active: active === filteredItems.length}" :ref="'listItem' + filteredItems.length">
@@ -89,7 +90,7 @@ const sfc = {
 
   computed: {
     filteredItems() {
-      // TODO: improve filter
+      console.log('filtering');
       const items = this.items.filter((item) => {
         return ((this.mode === 'branches' && item.branch) || (this.mode === 'tags' && item.tag)) &&
           (!this.searchTerm || item.name.toLowerCase().includes(this.searchTerm.toLowerCase()));

From 67b9910f7ed45f665be60bae109478dc989b9759 Mon Sep 17 00:00:00 2001
From: HesterG <hestergong@gmail.com>
Date: Tue, 11 Jul 2023 12:05:42 +0800
Subject: [PATCH 26/46] remove comment

---
 web_src/js/components/RepoBranchTagSelector.vue | 2 --
 1 file changed, 2 deletions(-)

diff --git a/web_src/js/components/RepoBranchTagSelector.vue b/web_src/js/components/RepoBranchTagSelector.vue
index 3b59afa165f5a..3b7c78f4af3af 100644
--- a/web_src/js/components/RepoBranchTagSelector.vue
+++ b/web_src/js/components/RepoBranchTagSelector.vue
@@ -40,7 +40,6 @@
         <div v-for="(item, index) in filteredItems" :key="item.name" class="item" :class="{selected: item.selected, active: active === index}" @click="selectItem(item)" :ref="'listItem' + index">
           {{ item.name }}
           <a v-if="enableFeed && mode === 'branches'" role="button" class="rss-icon ui compact right" :href="rssURLPrefix + item.url" target="_blank" @click.stop>
-            <!-- <svg-icon name="octicon-rss" :size="14"/> -->
             <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16" width="14" height="14" aria-hidden="true" class="svg octicon-rss"><path d="M2.002 2.725a.75.75 0 0 1 .797-.699C8.79 2.42 13.58 7.21 13.974 13.201a.75.75 0 0 1-1.497.098 10.502 10.502 0 0 0-9.776-9.776.747.747 0 0 1-.7-.798ZM2.84 7.05h-.002a7.002 7.002 0 0 1 6.113 6.111.75.75 0 0 1-1.49.178 5.503 5.503 0 0 0-4.8-4.8.75.75 0 0 1 .179-1.489ZM2 13a1 1 0 1 1 2 0 1 1 0 0 1-2 0Z"></path></svg>
           </a>
         </div>
@@ -90,7 +89,6 @@ const sfc = {
 
   computed: {
     filteredItems() {
-      console.log('filtering');
       const items = this.items.filter((item) => {
         return ((this.mode === 'branches' && item.branch) || (this.mode === 'tags' && item.tag)) &&
           (!this.searchTerm || item.name.toLowerCase().includes(this.searchTerm.toLowerCase()));

From e339424815c16117aa64de4348efb80e52507674 Mon Sep 17 00:00:00 2001
From: HesterG <hestergong@gmail.com>
Date: Tue, 11 Jul 2023 12:09:05 +0800
Subject: [PATCH 27/46] fix lint

---
 web_src/js/components/RepoBranchTagSelector.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/web_src/js/components/RepoBranchTagSelector.vue b/web_src/js/components/RepoBranchTagSelector.vue
index 3b7c78f4af3af..da9ddc8243f5f 100644
--- a/web_src/js/components/RepoBranchTagSelector.vue
+++ b/web_src/js/components/RepoBranchTagSelector.vue
@@ -256,8 +256,8 @@ const sfc = {
     async fetchBranchesOrTags() {
       if (!['branches', 'tags'].includes(this.mode) || this.isLoading) return;
       // only fetch when branch/tag list has not been initialized
-      if (this.hasListInitialized[this.mode] 
-      || (this.mode === 'branches' && !this.showBranchesInDropdown) || (this.mode === 'tags' && this.noTag)) return;
+      if (this.hasListInitialized[this.mode] ||
+      (this.mode === 'branches' && !this.showBranchesInDropdown) || (this.mode === 'tags' && this.noTag)) return;
       this.isLoading = true;
       this.hasListInitialized[this.mode] = true;
       // the "data.defaultBranch" is ambiguous, it could be "branch name" or "tag name"

From c7a33e60f32002fd1f0056c432d462f1c84323a1 Mon Sep 17 00:00:00 2001
From: HesterG <hestergong@gmail.com>
Date: Tue, 11 Jul 2023 13:49:02 +0800
Subject: [PATCH 28/46] fix lint

---
 web_src/js/components/RepoBranchTagSelector.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web_src/js/components/RepoBranchTagSelector.vue b/web_src/js/components/RepoBranchTagSelector.vue
index da9ddc8243f5f..4798dde148be5 100644
--- a/web_src/js/components/RepoBranchTagSelector.vue
+++ b/web_src/js/components/RepoBranchTagSelector.vue
@@ -40,7 +40,7 @@
         <div v-for="(item, index) in filteredItems" :key="item.name" class="item" :class="{selected: item.selected, active: active === index}" @click="selectItem(item)" :ref="'listItem' + index">
           {{ item.name }}
           <a v-if="enableFeed && mode === 'branches'" role="button" class="rss-icon ui compact right" :href="rssURLPrefix + item.url" target="_blank" @click.stop>
-            <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16" width="14" height="14" aria-hidden="true" class="svg octicon-rss"><path d="M2.002 2.725a.75.75 0 0 1 .797-.699C8.79 2.42 13.58 7.21 13.974 13.201a.75.75 0 0 1-1.497.098 10.502 10.502 0 0 0-9.776-9.776.747.747 0 0 1-.7-.798ZM2.84 7.05h-.002a7.002 7.002 0 0 1 6.113 6.111.75.75 0 0 1-1.49.178 5.503 5.503 0 0 0-4.8-4.8.75.75 0 0 1 .179-1.489ZM2 13a1 1 0 1 1 2 0 1 1 0 0 1-2 0Z"></path></svg>
+            <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16" width="14" height="14" aria-hidden="true" class="svg octicon-rss"><path d="M2.002 2.725a.75.75 0 0 1 .797-.699C8.79 2.42 13.58 7.21 13.974 13.201a.75.75 0 0 1-1.497.098 10.502 10.502 0 0 0-9.776-9.776.747.747 0 0 1-.7-.798ZM2.84 7.05h-.002a7.002 7.002 0 0 1 6.113 6.111.75.75 0 0 1-1.49.178 5.503 5.503 0 0 0-4.8-4.8.75.75 0 0 1 .179-1.489ZM2 13a1 1 0 1 1 2 0 1 1 0 0 1-2 0Z"/></svg>
           </a>
         </div>
         <div class="item" v-if="showCreateNewBranch" :class="{active: active === filteredItems.length}" :ref="'listItem' + filteredItems.length">

From c1026e1030be844465d12339f3744f57cbecbd70 Mon Sep 17 00:00:00 2001
From: HesterG <hestergong@gmail.com>
Date: Wed, 12 Jul 2023 09:44:09 +0800
Subject: [PATCH 29/46] use v-show for v-for

---
 web_src/js/components/RepoBranchTagSelector.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web_src/js/components/RepoBranchTagSelector.vue b/web_src/js/components/RepoBranchTagSelector.vue
index 4798dde148be5..8bb3117246d83 100644
--- a/web_src/js/components/RepoBranchTagSelector.vue
+++ b/web_src/js/components/RepoBranchTagSelector.vue
@@ -39,7 +39,7 @@
       <div class="scrolling menu" :class="{'is-loading': isLoading}" ref="scrollContainer">
         <div v-for="(item, index) in filteredItems" :key="item.name" class="item" :class="{selected: item.selected, active: active === index}" @click="selectItem(item)" :ref="'listItem' + index">
           {{ item.name }}
-          <a v-if="enableFeed && mode === 'branches'" role="button" class="rss-icon ui compact right" :href="rssURLPrefix + item.url" target="_blank" @click.stop>
+          <a v-show="enableFeed && mode === 'branches'" role="button" class="rss-icon ui compact right" :href="rssURLPrefix + item.url" target="_blank" @click.stop>
             <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16" width="14" height="14" aria-hidden="true" class="svg octicon-rss"><path d="M2.002 2.725a.75.75 0 0 1 .797-.699C8.79 2.42 13.58 7.21 13.974 13.201a.75.75 0 0 1-1.497.098 10.502 10.502 0 0 0-9.776-9.776.747.747 0 0 1-.7-.798ZM2.84 7.05h-.002a7.002 7.002 0 0 1 6.113 6.111.75.75 0 0 1-1.49.178 5.503 5.503 0 0 0-4.8-4.8.75.75 0 0 1 .179-1.489ZM2 13a1 1 0 1 1 2 0 1 1 0 0 1-2 0Z"/></svg>
           </a>
         </div>

From 611edce82dfd83438099b97ef2a6722780a41632 Mon Sep 17 00:00:00 2001
From: HesterG <hestergong@gmail.com>
Date: Wed, 12 Jul 2023 10:08:45 +0800
Subject: [PATCH 30/46] modify fallback for default branch

---
 modules/context/repo.go | 22 +++-------------------
 1 file changed, 3 insertions(+), 19 deletions(-)

diff --git a/modules/context/repo.go b/modules/context/repo.go
index 1844e84f43c62..c3e544cebc87d 100644
--- a/modules/context/repo.go
+++ b/modules/context/repo.go
@@ -660,13 +660,6 @@ func RepoAssignment(ctx *Context) context.CancelFunc {
 		return cancel
 	}
 
-	// tags, err := repo_model.GetTagNamesByRepoID(ctx, ctx.Repo.Repository.ID)
-	// if err != nil {
-	// 	ctx.ServerError("GetTagNamesByRepoID", err)
-	// 	return cancel
-	// }
-	// ctx.Data["Tags"] = tags
-
 	branchOpts := git_model.FindBranchOptions{
 		RepoID:          ctx.Repo.Repository.ID,
 		IsDeletedBranch: util.OptionalBoolFalse,
@@ -689,25 +682,16 @@ func RepoAssignment(ctx *Context) context.CancelFunc {
 		}
 	}
 
-	// FIXME: use paganation and async loading
-	// branchOpts.ExcludeBranchNames = []string{ctx.Repo.Repository.DefaultBranch}
-	// brs, err := git_model.FindBranchNames(ctx, branchOpts)
-	// if err != nil {
-	// 	ctx.ServerError("GetBranches", err)
-	// 	return
-	// }
-	// ctx.Data["Branches"] = append(branchOpts.ExcludeBranchNames, brs...)
 	ctx.Data["BranchesCount"] = branchesTotal
 
 	// If not branch selected, try default one.
-	// If default branch doesn't exist, fall back to some other branch.
+	// If default branch doesn't exist, fall back to defualt branch from setting.
 	if len(ctx.Repo.BranchName) == 0 {
 		if len(ctx.Repo.Repository.DefaultBranch) > 0 && gitRepo.IsBranchExist(ctx.Repo.Repository.DefaultBranch) {
 			ctx.Repo.BranchName = ctx.Repo.Repository.DefaultBranch
+		} else {
+			ctx.Repo.BranchName = setting.Repository.DefaultBranch
 		}
-		// else if len(brs) > 0 {
-		// 	ctx.Repo.BranchName = brs[0]
-		// }
 		ctx.Repo.RefName = ctx.Repo.BranchName
 	}
 	ctx.Data["BranchName"] = ctx.Repo.BranchName

From 87b2e34b18b736f3e57519b3289bbcbf32dd5a5b Mon Sep 17 00:00:00 2001
From: HesterG <hestergong@gmail.com>
Date: Wed, 12 Jul 2023 10:19:33 +0800
Subject: [PATCH 31/46] fix typo

---
 modules/context/repo.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/context/repo.go b/modules/context/repo.go
index c3e544cebc87d..3508a8d1ed88a 100644
--- a/modules/context/repo.go
+++ b/modules/context/repo.go
@@ -685,7 +685,7 @@ func RepoAssignment(ctx *Context) context.CancelFunc {
 	ctx.Data["BranchesCount"] = branchesTotal
 
 	// If not branch selected, try default one.
-	// If default branch doesn't exist, fall back to defualt branch from setting.
+	// If default branch doesn't exist, fall back to default branch from setting.
 	if len(ctx.Repo.BranchName) == 0 {
 		if len(ctx.Repo.Repository.DefaultBranch) > 0 && gitRepo.IsBranchExist(ctx.Repo.Repository.DefaultBranch) {
 			ctx.Repo.BranchName = ctx.Repo.Repository.DefaultBranch

From 0783e82bc8ea692c3db8ce9196875da1bbe5702d Mon Sep 17 00:00:00 2001
From: HesterG <hestergong@gmail.com>
Date: Wed, 12 Jul 2023 10:43:27 +0800
Subject: [PATCH 32/46] fix check

---
 templates/swagger/v1_json.tmpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/swagger/v1_json.tmpl b/templates/swagger/v1_json.tmpl
index 7b3a616740ca2..4b304cb11fa4b 100644
--- a/templates/swagger/v1_json.tmpl
+++ b/templates/swagger/v1_json.tmpl
@@ -23132,4 +23132,4 @@
       "TOTPHeader": []
     }
   ]
-}
+}
\ No newline at end of file

From c94931b6cfac329b1c82b0e15c7bc4d2b471a09d Mon Sep 17 00:00:00 2001
From: HesterG <hestergong@gmail.com>
Date: Wed, 12 Jul 2023 11:03:59 +0800
Subject: [PATCH 33/46] fix for new issue

---
 routers/web/repo/issue.go      | 20 ++++++++------------
 templates/swagger/v1_json.tmpl |  2 +-
 2 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/routers/web/repo/issue.go b/routers/web/repo/issue.go
index 25b394ec775b8..31d0348fdcdcf 100644
--- a/routers/web/repo/issue.go
+++ b/routers/web/repo/issue.go
@@ -785,18 +785,7 @@ func RetrieveRepoMetas(ctx *context.Context, repo *repo_model.Repository, isPull
 		return nil
 	}
 
-	brs, err := git_model.FindBranchNames(ctx, git_model.FindBranchOptions{
-		RepoID: ctx.Repo.Repository.ID,
-		ListOptions: db.ListOptions{
-			ListAll: true,
-		},
-		IsDeletedBranch: util.OptionalBoolFalse,
-	})
-	if err != nil {
-		ctx.ServerError("GetBranches", err)
-		return nil
-	}
-	ctx.Data["Branches"] = brs
+	PrepareBranchList(ctx)
 
 	// Contains true if the user can create issue dependencies
 	ctx.Data["CanCreateIssueDependencies"] = ctx.Repo.CanCreateIssueDependencies(ctx.Doer, isPull)
@@ -921,6 +910,13 @@ func NewIssue(ctx *context.Context) {
 
 	RetrieveRepoMetas(ctx, ctx.Repo.Repository, false)
 
+	tags, err := repo_model.GetTagNamesByRepoID(ctx, ctx.Repo.Repository.ID)
+	if err != nil {
+		ctx.ServerError("GetTagNamesByRepoID", err)
+		return
+	}
+	ctx.Data["Tags"] = tags
+
 	_, templateErrs := issue_service.GetTemplatesFromDefaultBranch(ctx.Repo.Repository, ctx.Repo.GitRepo)
 	if errs := setTemplateIfExists(ctx, issueTemplateKey, IssueTemplateCandidates); len(errs) > 0 {
 		for k, v := range errs {
diff --git a/templates/swagger/v1_json.tmpl b/templates/swagger/v1_json.tmpl
index 4b304cb11fa4b..7b3a616740ca2 100644
--- a/templates/swagger/v1_json.tmpl
+++ b/templates/swagger/v1_json.tmpl
@@ -23132,4 +23132,4 @@
       "TOTPHeader": []
     }
   ]
-}
\ No newline at end of file
+}

From 5872d87e239e57dae6e1ad598360671518d44302 Mon Sep 17 00:00:00 2001
From: HesterG <hestergong@gmail.com>
Date: Mon, 17 Jul 2023 09:57:42 +0800
Subject: [PATCH 34/46] ctx.written,try catch finally, computing createTag, svg
 change, css selector, mode assignment change

---
 routers/web/repo/compare.go                   |  3 ++
 routers/web/repo/issue.go                     |  7 ++++
 routers/web/repo/pull.go                      |  6 +++
 routers/web/repo/release.go                   |  3 ++
 routers/web/repo/setting/protected_branch.go  |  6 +++
 .../js/components/RepoBranchTagSelector.vue   | 40 +++++++++++--------
 6 files changed, 49 insertions(+), 16 deletions(-)

diff --git a/routers/web/repo/compare.go b/routers/web/repo/compare.go
index da35b6621a318..4ceb52d03994a 100644
--- a/routers/web/repo/compare.go
+++ b/routers/web/repo/compare.go
@@ -756,6 +756,9 @@ func CompareDiff(ctx *context.Context) {
 
 	// For compare repo branches
 	PrepareBranchList(ctx)
+	if ctx.Written() {
+		return
+	}
 
 	headTags, err := repo_model.GetTagNamesByRepoID(ctx, ci.HeadRepo.ID)
 	if err != nil {
diff --git a/routers/web/repo/issue.go b/routers/web/repo/issue.go
index 31d0348fdcdcf..f855514048491 100644
--- a/routers/web/repo/issue.go
+++ b/routers/web/repo/issue.go
@@ -786,6 +786,9 @@ func RetrieveRepoMetas(ctx *context.Context, repo *repo_model.Repository, isPull
 	}
 
 	PrepareBranchList(ctx)
+	if ctx.Written() {
+		return nil
+	}
 
 	// Contains true if the user can create issue dependencies
 	ctx.Data["CanCreateIssueDependencies"] = ctx.Repo.CanCreateIssueDependencies(ctx.Doer, isPull)
@@ -1917,6 +1920,10 @@ func ViewIssue(ctx *context.Context) {
 	// For sidebar
 	PrepareBranchList(ctx)
 
+	if ctx.Written() {
+		return
+	}
+
 	tags, err := repo_model.GetTagNamesByRepoID(ctx, ctx.Repo.Repository.ID)
 	if err != nil {
 		ctx.ServerError("GetTagNamesByRepoID", err)
diff --git a/routers/web/repo/pull.go b/routers/web/repo/pull.go
index 8d3ac29bd7ed6..adfc01c2517f5 100644
--- a/routers/web/repo/pull.go
+++ b/routers/web/repo/pull.go
@@ -731,6 +731,9 @@ func ViewPullCommits(ctx *context.Context) {
 
 	// For PR commits page
 	PrepareBranchList(ctx)
+	if ctx.Written() {
+		return
+	}
 	getBranchData(ctx, issue)
 	ctx.HTML(http.StatusOK, tplPullCommits)
 }
@@ -897,6 +900,9 @@ func ViewPullFiles(ctx *context.Context) {
 	ctx.Data["IsAttachmentEnabled"] = setting.Attachment.Enabled
 	// For files changed page
 	PrepareBranchList(ctx)
+	if ctx.Written() {
+		return
+	}
 	upload.AddUploadContext(ctx, "comment")
 
 	ctx.HTML(http.StatusOK, tplPullFiles)
diff --git a/routers/web/repo/release.go b/routers/web/repo/release.go
index ad6bfaa964d09..3d991384e56a7 100644
--- a/routers/web/repo/release.go
+++ b/routers/web/repo/release.go
@@ -355,6 +355,9 @@ func NewRelease(ctx *context.Context) {
 
 	// For New Release page
 	PrepareBranchList(ctx)
+	if ctx.Written() {
+		return
+	}
 
 	tags, err := repo_model.GetTagNamesByRepoID(ctx, ctx.Repo.Repository.ID)
 	if err != nil {
diff --git a/routers/web/repo/setting/protected_branch.go b/routers/web/repo/setting/protected_branch.go
index 004b8bfb11500..b8775cca2d3cf 100644
--- a/routers/web/repo/setting/protected_branch.go
+++ b/routers/web/repo/setting/protected_branch.go
@@ -46,6 +46,9 @@ func ProtectedBranchRules(ctx *context.Context) {
 	ctx.Data["ProtectedBranches"] = rules
 
 	repo.PrepareBranchList(ctx)
+	if ctx.Written() {
+		return
+	}
 
 	ctx.HTML(http.StatusOK, tplBranches)
 }
@@ -56,6 +59,9 @@ func SetDefaultBranchPost(ctx *context.Context) {
 	ctx.Data["PageIsSettingsBranches"] = true
 
 	repo.PrepareBranchList(ctx)
+	if ctx.Written() {
+		return
+	}
 
 	repo := ctx.Repo.Repository
 
diff --git a/web_src/js/components/RepoBranchTagSelector.vue b/web_src/js/components/RepoBranchTagSelector.vue
index 8bb3117246d83..538db3fd17ee7 100644
--- a/web_src/js/components/RepoBranchTagSelector.vue
+++ b/web_src/js/components/RepoBranchTagSelector.vue
@@ -40,7 +40,7 @@
         <div v-for="(item, index) in filteredItems" :key="item.name" class="item" :class="{selected: item.selected, active: active === index}" @click="selectItem(item)" :ref="'listItem' + index">
           {{ item.name }}
           <a v-show="enableFeed && mode === 'branches'" role="button" class="rss-icon ui compact right" :href="rssURLPrefix + item.url" target="_blank" @click.stop>
-            <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16" width="14" height="14" aria-hidden="true" class="svg octicon-rss"><path d="M2.002 2.725a.75.75 0 0 1 .797-.699C8.79 2.42 13.58 7.21 13.974 13.201a.75.75 0 0 1-1.497.098 10.502 10.502 0 0 0-9.776-9.776.747.747 0 0 1-.7-.798ZM2.84 7.05h-.002a7.002 7.002 0 0 1 6.113 6.111.75.75 0 0 1-1.49.178 5.503 5.503 0 0 0-4.8-4.8.75.75 0 0 1 .179-1.489ZM2 13a1 1 0 1 1 2 0 1 1 0 0 1-2 0Z"/></svg>
+            <svg viewBox="0 0 16 16" width="14" height="14" aria-hidden="true" class="svg octicon-rss"><path d="M2.002 2.725a.75.75 0 0 1 .797-.699C8.79 2.42 13.58 7.21 13.974 13.201a.75.75 0 0 1-1.497.098 10.502 10.502 0 0 0-9.776-9.776.747.747 0 0 1-.7-.798ZM2.84 7.05h-.002a7.002 7.002 0 0 1 6.113 6.111.75.75 0 0 1-1.49.178 5.503 5.503 0 0 0-4.8-4.8.75.75 0 0 1 .179-1.489ZM2 13a1 1 0 1 1 2 0 1 1 0 0 1-2 0Z"/></svg>
           </a>
         </div>
         <div class="item" v-if="showCreateNewBranch" :class="{active: active === filteredItems.length}" :ref="'listItem' + filteredItems.length">
@@ -110,6 +110,9 @@ const sfc = {
     formActionUrl() {
       return `${this.repoLink}/branches/_new/${this.branchNameSubURL}`;
     },
+    createTag() {
+      return this.mode === 'tags';
+    }
   },
 
   watch: {
@@ -248,7 +251,7 @@ const sfc = {
       }
     },
     handleTabSwitch(mode) {
-      this.createTag = mode === 'tags';
+      if (this.isLoading) return; 
       this.mode = mode;
       this.focusSearchField();
       this.fetchBranchesOrTags();
@@ -259,21 +262,26 @@ const sfc = {
       if (this.hasListInitialized[this.mode] ||
       (this.mode === 'branches' && !this.showBranchesInDropdown) || (this.mode === 'tags' && this.noTag)) return;
       this.isLoading = true;
-      this.hasListInitialized[this.mode] = true;
-      // the "data.defaultBranch" is ambiguous, it could be "branch name" or "tag name"
-      const reqUrl = `${this.repoLink}/${this.mode}/list`;
-      const resp = await fetch(reqUrl);
-      const {results} = await resp.json();
-      for (const result of results) {
-        let selected = false;
-        if (this.mode === 'branches') {
-          selected = result === this.defaultBranch;
-        } else {
-          selected = result === (this.release ? this.release.tagName : this.defaultBranch);
+      try {
+        // the "data.defaultBranch" is ambiguous, it could be "branch name" or "tag name"
+        const reqUrl = `${this.repoLink}/${this.mode}/list`;
+        const resp = await fetch(reqUrl);
+        const {results} = await resp.json();
+        for (const result of results) {
+          let selected = false;
+          if (this.mode === 'branches') {
+            selected = result === this.defaultBranch;
+          } else {
+            selected = result === (this.release ? this.release.tagName : this.defaultBranch);
+          }
+          this.items.push({name: result, url: result, branch: this.mode === 'branches', tag: this.mode === 'tags', selected});
         }
-        this.items.push({name: result, url: result, branch: this.mode === 'branches', tag: this.mode === 'tags', selected});
+        this.hasListInitialized[this.mode] = true;
+      } catch (e) {
+        console.error(`Network error when fetching ${this.mode}`, e);
+      } finally {
+        this.isLoading = false;
       }
-      this.isLoading = false;
     },
   }
 };
@@ -323,7 +331,7 @@ export default sfc; // activate IDE's Vue plugin
   height: 200px;
 }
 
-.scrolling.menu.is-loading::after {
+.ui.dropdown .menu .scrolling.menu.is-loading::after {
   display: block !important; /* to override fomantic rule .ui.dropdown .menu .menu:after {display: none} */
 }
 </style>

From 8cd60387f752e5671a606f5db9a23d8dd2e8486d Mon Sep 17 00:00:00 2001
From: HesterG <hestergong@gmail.com>
Date: Mon, 17 Jul 2023 10:46:11 +0800
Subject: [PATCH 35/46] comment

---
 routers/web/repo/repo.go                        | 1 +
 web_src/js/components/RepoBranchTagSelector.vue | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/routers/web/repo/repo.go b/routers/web/repo/repo.go
index 627a0117b248c..407a8540c0f6d 100644
--- a/routers/web/repo/repo.go
+++ b/routers/web/repo/repo.go
@@ -669,6 +669,7 @@ func PrepareBranchList(ctx *context.Context) {
 			ListAll: true,
 		},
 	}
+	// always put default branch on the top
 	branchOpts.ExcludeBranchNames = []string{ctx.Repo.Repository.DefaultBranch}
 	brs, err := git_model.FindBranchNames(ctx, branchOpts)
 	if err != nil {
diff --git a/web_src/js/components/RepoBranchTagSelector.vue b/web_src/js/components/RepoBranchTagSelector.vue
index 538db3fd17ee7..7eb372b2b399a 100644
--- a/web_src/js/components/RepoBranchTagSelector.vue
+++ b/web_src/js/components/RepoBranchTagSelector.vue
@@ -251,7 +251,7 @@ const sfc = {
       }
     },
     handleTabSwitch(mode) {
-      if (this.isLoading) return; 
+      if (this.isLoading) return;
       this.mode = mode;
       this.focusSearchField();
       this.fetchBranchesOrTags();

From 6be08e669a3465853754f85d43fe75abf93ca068 Mon Sep 17 00:00:00 2001
From: HesterG <hestergong@gmail.com>
Date: Mon, 17 Jul 2023 14:41:08 +0800
Subject: [PATCH 36/46] Update web_src/js/components/RepoBranchTagSelector.vue

Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
---
 web_src/js/components/RepoBranchTagSelector.vue | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/web_src/js/components/RepoBranchTagSelector.vue b/web_src/js/components/RepoBranchTagSelector.vue
index 7eb372b2b399a..f402757c51d67 100644
--- a/web_src/js/components/RepoBranchTagSelector.vue
+++ b/web_src/js/components/RepoBranchTagSelector.vue
@@ -260,7 +260,11 @@ const sfc = {
       if (!['branches', 'tags'].includes(this.mode) || this.isLoading) return;
       // only fetch when branch/tag list has not been initialized
       if (this.hasListInitialized[this.mode] ||
-      (this.mode === 'branches' && !this.showBranchesInDropdown) || (this.mode === 'tags' && this.noTag)) return;
+        (this.mode === 'branches' && !this.showBranchesInDropdown) ||
+        (this.mode === 'tags' && this.noTag)
+      ) {
+        return;
+      }
       this.isLoading = true;
       try {
         // the "data.defaultBranch" is ambiguous, it could be "branch name" or "tag name"

From 40899c7c872648097c8827194343ef790f3435e7 Mon Sep 17 00:00:00 2001
From: HesterG <hestergong@gmail.com>
Date: Mon, 17 Jul 2023 14:49:15 +0800
Subject: [PATCH 37/46] remove important

---
 web_src/js/components/RepoBranchTagSelector.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web_src/js/components/RepoBranchTagSelector.vue b/web_src/js/components/RepoBranchTagSelector.vue
index f402757c51d67..4c6853c04fb06 100644
--- a/web_src/js/components/RepoBranchTagSelector.vue
+++ b/web_src/js/components/RepoBranchTagSelector.vue
@@ -336,6 +336,6 @@ export default sfc; // activate IDE's Vue plugin
 }
 
 .ui.dropdown .menu .scrolling.menu.is-loading::after {
-  display: block !important; /* to override fomantic rule .ui.dropdown .menu .menu:after {display: none} */
+  display: block; /* to override fomantic rule .ui.dropdown .menu .menu:after {display: none} */
 }
 </style>

From 967ce65ecc5a8e8a731fbf2a5877ba3f32fe0812 Mon Sep 17 00:00:00 2001
From: wxiaoguang <wxiaoguang@gmail.com>
Date: Fri, 21 Jul 2023 11:08:42 +0800
Subject: [PATCH 38/46] fix branch handling

---
 modules/context/repo.go  | 12 ++++++++----
 routers/web/repo/repo.go |  9 ++++++---
 2 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/modules/context/repo.go b/modules/context/repo.go
index 3508a8d1ed88a..2c67735c934c6 100644
--- a/modules/context/repo.go
+++ b/modules/context/repo.go
@@ -673,7 +673,7 @@ func RepoAssignment(ctx *Context) context.CancelFunc {
 		return cancel
 	}
 
-	// non empty repo should have at least 1 branch, so this repository's branches haven't been synced yet
+	// non-empty repo should have at least 1 branch, so this repository's branches haven't been synced yet
 	if branchesTotal == 0 { // fallback to do a sync immediately
 		branchesTotal, err = repo_module.SyncRepoBranches(ctx, ctx.Repo.Repository.ID, 0)
 		if err != nil {
@@ -684,13 +684,17 @@ func RepoAssignment(ctx *Context) context.CancelFunc {
 
 	ctx.Data["BranchesCount"] = branchesTotal
 
-	// If not branch selected, try default one.
-	// If default branch doesn't exist, fall back to default branch from setting.
+	// If no branch is set in the request URL, try to guess a default one.
 	if len(ctx.Repo.BranchName) == 0 {
 		if len(ctx.Repo.Repository.DefaultBranch) > 0 && gitRepo.IsBranchExist(ctx.Repo.Repository.DefaultBranch) {
 			ctx.Repo.BranchName = ctx.Repo.Repository.DefaultBranch
 		} else {
-			ctx.Repo.BranchName = setting.Repository.DefaultBranch
+			ctx.Repo.BranchName, _ = gitRepo.GetDefaultBranch()
+			if ctx.Repo.BranchName == "" {
+				// If it still can't get a default branch, fall back to default branch from setting.
+				// Something might be wrong. Either site admin should fix the repo sync or Gitea should fix a potential bug.
+				ctx.Repo.BranchName = setting.Repository.DefaultBranch
+			}
 		}
 		ctx.Repo.RefName = ctx.Repo.BranchName
 	}
diff --git a/routers/web/repo/repo.go b/routers/web/repo/repo.go
index 407a8540c0f6d..6df834902061e 100644
--- a/routers/web/repo/repo.go
+++ b/routers/web/repo/repo.go
@@ -669,12 +669,15 @@ func PrepareBranchList(ctx *context.Context) {
 			ListAll: true,
 		},
 	}
-	// always put default branch on the top
-	branchOpts.ExcludeBranchNames = []string{ctx.Repo.Repository.DefaultBranch}
 	brs, err := git_model.FindBranchNames(ctx, branchOpts)
 	if err != nil {
 		ctx.ServerError("GetBranches", err)
 		return
 	}
-	ctx.Data["Branches"] = append(branchOpts.ExcludeBranchNames, brs...)
+	// always put default branch on the top if it exists
+	if util.SliceContains(brs, ctx.Repo.Repository.DefaultBranch) {
+		brs = util.SliceRemoveAll(brs, ctx.Repo.Repository.DefaultBranch)
+		brs = append([]string{ctx.Repo.Repository.DefaultBranch}, brs...)
+	}
+	ctx.Data["Branches"] = brs
 }

From 9c8119a4829eeafca62d2b95aa3ca6019789985e Mon Sep 17 00:00:00 2001
From: wxiaoguang <wxiaoguang@gmail.com>
Date: Fri, 21 Jul 2023 11:17:34 +0800
Subject: [PATCH 39/46] use separate .loading-indicator to avoid conflicting
 with fomantic dropdown menu

---
 web_src/js/components/RepoBranchTagSelector.vue | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/web_src/js/components/RepoBranchTagSelector.vue b/web_src/js/components/RepoBranchTagSelector.vue
index 4c6853c04fb06..867ad5b112087 100644
--- a/web_src/js/components/RepoBranchTagSelector.vue
+++ b/web_src/js/components/RepoBranchTagSelector.vue
@@ -36,7 +36,8 @@
           </div>
         </div>
       </template>
-      <div class="scrolling menu" :class="{'is-loading': isLoading}" ref="scrollContainer">
+      <div class="scrolling menu" ref="scrollContainer">
+        <div class="loading-indicator is-loading" v-if="isLoading"></div>
         <div v-for="(item, index) in filteredItems" :key="item.name" class="item" :class="{selected: item.selected, active: active === index}" @click="selectItem(item)" :ref="'listItem' + index">
           {{ item.name }}
           <a v-show="enableFeed && mode === 'branches'" role="button" class="rss-icon ui compact right" :href="rssURLPrefix + item.url" target="_blank" @click.stop>
@@ -331,11 +332,7 @@ export default sfc; // activate IDE's Vue plugin
   display: inline-block;
 }
 
-.scrolling.menu.is-loading {
-  height: 200px;
-}
-
-.ui.dropdown .menu .scrolling.menu.is-loading::after {
-  display: block; /* to override fomantic rule .ui.dropdown .menu .menu:after {display: none} */
+.scrolling.menu .loading-indicator {
+  height: 4em;
 }
 </style>

From 2bb6f442a2980350b46af4b12889eea591e62160 Mon Sep 17 00:00:00 2001
From: wxiaoguang <wxiaoguang@gmail.com>
Date: Fri, 21 Jul 2023 11:25:58 +0800
Subject: [PATCH 40/46] fix conflicted "data" and "computed"

---
 web_src/js/components/RepoBranchTagSelector.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/web_src/js/components/RepoBranchTagSelector.vue b/web_src/js/components/RepoBranchTagSelector.vue
index 867ad5b112087..f30ff92d5f09e 100644
--- a/web_src/js/components/RepoBranchTagSelector.vue
+++ b/web_src/js/components/RepoBranchTagSelector.vue
@@ -299,7 +299,6 @@ export function initRepoBranchTagSelector(selector) {
       searchTerm: '',
       refNameText: '',
       menuVisible: false,
-      createTag: false,
       release: null,
 
       isViewTag: false,

From 65b0328badf7e26e6377710621205975d91a22c4 Mon Sep 17 00:00:00 2001
From: wxiaoguang <wxiaoguang@gmail.com>
Date: Fri, 21 Jul 2023 11:26:32 +0800
Subject: [PATCH 41/46] use toast and add FIXME

---
 web_src/js/components/RepoBranchTagSelector.vue | 3 ++-
 web_src/js/modules/toast.js                     | 2 ++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/web_src/js/components/RepoBranchTagSelector.vue b/web_src/js/components/RepoBranchTagSelector.vue
index f30ff92d5f09e..506b0a66d08e1 100644
--- a/web_src/js/components/RepoBranchTagSelector.vue
+++ b/web_src/js/components/RepoBranchTagSelector.vue
@@ -82,6 +82,7 @@ import {createApp, nextTick} from 'vue';
 import $ from 'jquery';
 import {SvgIcon} from '../svg.js';
 import {pathEscapeSegments} from '../utils/url.js';
+import {showErrorToast} from "../modules/toast.js";
 
 const sfc = {
   components: {SvgIcon},
@@ -283,7 +284,7 @@ const sfc = {
         }
         this.hasListInitialized[this.mode] = true;
       } catch (e) {
-        console.error(`Network error when fetching ${this.mode}`, e);
+        showErrorToast(`Network error when fetching ${this.mode}, error: ${e}`);
       } finally {
         this.isLoading = false;
       }
diff --git a/web_src/js/modules/toast.js b/web_src/js/modules/toast.js
index b0d02dc64470e..247cfcadf4685 100644
--- a/web_src/js/modules/toast.js
+++ b/web_src/js/modules/toast.js
@@ -23,6 +23,8 @@ const levels = {
 async function showToast(message, level, {gravity, position, duration, ...other} = {}) {
   if (!message) return;
 
+  // FIXME: the "toast" mode shouldn't be imported asynchronously.
+  // Otherwise, network errors can't be shown because the toastify itself can't be loaded at that time.
   const {default: Toastify} = await import(/* webpackChunkName: 'toastify' */'toastify-js');
   const {icon, background, duration: levelDuration} = levels[level ?? 'info'];
 

From daa4ef5bdfd295c12e3a114cbc460a0224373ff2 Mon Sep 17 00:00:00 2001
From: wxiaoguang <wxiaoguang@gmail.com>
Date: Fri, 21 Jul 2023 11:51:50 +0800
Subject: [PATCH 42/46] use SVG symbol instead of hard-coded content

---
 web_src/js/components/RepoBranchTagSelector.vue | 4 +++-
 web_src/js/svg.js                               | 8 ++++++--
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/web_src/js/components/RepoBranchTagSelector.vue b/web_src/js/components/RepoBranchTagSelector.vue
index 506b0a66d08e1..ce8a8ec53edfd 100644
--- a/web_src/js/components/RepoBranchTagSelector.vue
+++ b/web_src/js/components/RepoBranchTagSelector.vue
@@ -37,11 +37,13 @@
         </div>
       </template>
       <div class="scrolling menu" ref="scrollContainer">
+        <svg-icon name="octicon-rss" symbol-id="svg-symbol-octicon-rss"/>
         <div class="loading-indicator is-loading" v-if="isLoading"></div>
         <div v-for="(item, index) in filteredItems" :key="item.name" class="item" :class="{selected: item.selected, active: active === index}" @click="selectItem(item)" :ref="'listItem' + index">
           {{ item.name }}
           <a v-show="enableFeed && mode === 'branches'" role="button" class="rss-icon ui compact right" :href="rssURLPrefix + item.url" target="_blank" @click.stop>
-            <svg viewBox="0 0 16 16" width="14" height="14" aria-hidden="true" class="svg octicon-rss"><path d="M2.002 2.725a.75.75 0 0 1 .797-.699C8.79 2.42 13.58 7.21 13.974 13.201a.75.75 0 0 1-1.497.098 10.502 10.502 0 0 0-9.776-9.776.747.747 0 0 1-.7-.798ZM2.84 7.05h-.002a7.002 7.002 0 0 1 6.113 6.111.75.75 0 0 1-1.49.178 5.503 5.503 0 0 0-4.8-4.8.75.75 0 0 1 .179-1.489ZM2 13a1 1 0 1 1 2 0 1 1 0 0 1-2 0Z"/></svg>
+            <!-- creating a lot of Vue component is pretty slow, so we use a static SVG here -->
+            <svg width="14" height="14" class="svg octicon-rss"><use href="#svg-symbol-octicon-rss"></use></svg>
           </a>
         </div>
         <div class="item" v-if="showCreateNewBranch" :class="{active: active === filteredItems.length}" :ref="'listItem' + filteredItems.length">
diff --git a/web_src/js/svg.js b/web_src/js/svg.js
index b0c55e4e371df..2ef839aa21d29 100644
--- a/web_src/js/svg.js
+++ b/web_src/js/svg.js
@@ -185,9 +185,10 @@ export const SvgIcon = {
     name: {type: String, required: true},
     size: {type: Number, default: 16},
     className: {type: String, default: ''},
+    symbolId: {type: String}
   },
   render() {
-    const {svgOuter, svgInnerHtml} = svgParseOuterInner(this.name);
+    let {svgOuter, svgInnerHtml} = svgParseOuterInner(this.name);
     // https://vuejs.org/guide/extras/render-function.html#creating-vnodes
     // the `^` is used for attr, set SVG attributes like 'width', `aria-hidden`, `viewBox`, etc
     const attrs = {};
@@ -207,7 +208,10 @@ export const SvgIcon = {
     if (this.className) {
       classes.push(...this.className.split(/\s+/).filter(Boolean));
     }
-
+    if (this.symbolId) {
+      classes.push('gt-hidden', 'svg-symbol-container');
+      svgInnerHtml = `<symbol id="${this.symbolId}" viewBox="${attrs['^viewBox']}">${svgInnerHtml}</symbol>`;
+    }
     // create VNode
     return h('svg', {
       ...attrs,

From 0f0b9ec9949eab90b66c7c2a48822bca5210a9c7 Mon Sep 17 00:00:00 2001
From: wxiaoguang <wxiaoguang@gmail.com>
Date: Fri, 21 Jul 2023 11:54:00 +0800
Subject: [PATCH 43/46] fix lint

---
 web_src/js/components/RepoBranchTagSelector.vue | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/web_src/js/components/RepoBranchTagSelector.vue b/web_src/js/components/RepoBranchTagSelector.vue
index ce8a8ec53edfd..ae7f6e434b647 100644
--- a/web_src/js/components/RepoBranchTagSelector.vue
+++ b/web_src/js/components/RepoBranchTagSelector.vue
@@ -38,12 +38,12 @@
       </template>
       <div class="scrolling menu" ref="scrollContainer">
         <svg-icon name="octicon-rss" symbol-id="svg-symbol-octicon-rss"/>
-        <div class="loading-indicator is-loading" v-if="isLoading"></div>
+        <div class="loading-indicator is-loading" v-if="isLoading"/>
         <div v-for="(item, index) in filteredItems" :key="item.name" class="item" :class="{selected: item.selected, active: active === index}" @click="selectItem(item)" :ref="'listItem' + index">
           {{ item.name }}
           <a v-show="enableFeed && mode === 'branches'" role="button" class="rss-icon ui compact right" :href="rssURLPrefix + item.url" target="_blank" @click.stop>
             <!-- creating a lot of Vue component is pretty slow, so we use a static SVG here -->
-            <svg width="14" height="14" class="svg octicon-rss"><use href="#svg-symbol-octicon-rss"></use></svg>
+            <svg width="14" height="14" class="svg octicon-rss"><use href="#svg-symbol-octicon-rss"/></svg>
           </a>
         </div>
         <div class="item" v-if="showCreateNewBranch" :class="{active: active === filteredItems.length}" :ref="'listItem' + filteredItems.length">
@@ -84,7 +84,7 @@ import {createApp, nextTick} from 'vue';
 import $ from 'jquery';
 import {SvgIcon} from '../svg.js';
 import {pathEscapeSegments} from '../utils/url.js';
-import {showErrorToast} from "../modules/toast.js";
+import {showErrorToast} from '../modules/toast.js';
 
 const sfc = {
   components: {SvgIcon},

From 0ec8fd55d21e300ba02c9efc7c43326fb862bba8 Mon Sep 17 00:00:00 2001
From: HesterG <hestergong@gmail.com>
Date: Fri, 21 Jul 2023 14:29:23 +0800
Subject: [PATCH 44/46] fix

---
 web_src/js/components/RepoBranchTagSelector.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web_src/js/components/RepoBranchTagSelector.vue b/web_src/js/components/RepoBranchTagSelector.vue
index ae7f6e434b647..3f3aecd96d019 100644
--- a/web_src/js/components/RepoBranchTagSelector.vue
+++ b/web_src/js/components/RepoBranchTagSelector.vue
@@ -282,7 +282,7 @@ const sfc = {
           } else {
             selected = result === (this.release ? this.release.tagName : this.defaultBranch);
           }
-          this.items.push({name: result, url: result, branch: this.mode === 'branches', tag: this.mode === 'tags', selected});
+          this.items.push({name: result, url: pathEscapeSegments(result), branch: this.mode === 'branches', tag: this.mode === 'tags', selected});
         }
         this.hasListInitialized[this.mode] = true;
       } catch (e) {

From 1b2d2000302f70aa1af8da964b81ca9dc5ab854c Mon Sep 17 00:00:00 2001
From: HesterG <hestergong@gmail.com>
Date: Fri, 21 Jul 2023 16:09:34 +0800
Subject: [PATCH 45/46] sync

---
 routers/web/repo/repo.go | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/routers/web/repo/repo.go b/routers/web/repo/repo.go
index 6df834902061e..0de804dbce6fa 100644
--- a/routers/web/repo/repo.go
+++ b/routers/web/repo/repo.go
@@ -636,15 +636,17 @@ func GetBranchesList(ctx *context.Context) {
 			ListAll: true,
 		},
 	}
-	branchOpts.ExcludeBranchNames = []string{ctx.Repo.Repository.DefaultBranch}
 	branches, err := git_model.FindBranchNames(ctx, branchOpts)
 	if err != nil {
 		ctx.JSON(http.StatusInternalServerError, err)
 		return
 	}
 	resp := &branchTagSearchResponse{}
-	// always put default branch on the top
-	branches = append(branchOpts.ExcludeBranchNames, branches...)
+	// always put default branch on the top if it exists
+	if util.SliceContains(branches, ctx.Repo.Repository.DefaultBranch) {
+		branches = util.SliceRemoveAll(branches, ctx.Repo.Repository.DefaultBranch)
+		branches = append([]string{ctx.Repo.Repository.DefaultBranch}, branches...)
+	}
 	resp.Results = branches
 	ctx.JSON(http.StatusOK, resp)
 }

From 5c5ac0aaa023b369ed41c11ea2ba21ce630637fa Mon Sep 17 00:00:00 2001
From: HesterG <hestergong@gmail.com>
Date: Fri, 21 Jul 2023 17:16:18 +0800
Subject: [PATCH 46/46] sync import and rename createTag

---
 web_src/js/components/RepoBranchTagSelector.vue | 8 ++++----
 web_src/js/modules/toast.js                     | 4 +---
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/web_src/js/components/RepoBranchTagSelector.vue b/web_src/js/components/RepoBranchTagSelector.vue
index 3f3aecd96d019..e6e72e3886d70 100644
--- a/web_src/js/components/RepoBranchTagSelector.vue
+++ b/web_src/js/components/RepoBranchTagSelector.vue
@@ -48,12 +48,12 @@
         </div>
         <div class="item" v-if="showCreateNewBranch" :class="{active: active === filteredItems.length}" :ref="'listItem' + filteredItems.length">
           <a href="#" @click="createNewBranch()">
-            <div v-show="createTag">
+            <div v-show="shouldCreateTag">
               <i class="reference tags icon"/>
               <!-- eslint-disable-next-line vue/no-v-html -->
               <span v-html="textCreateTag.replace('%s', searchTerm)"/>
             </div>
-            <div v-show="!createTag">
+            <div v-show="!shouldCreateTag">
               <svg-icon name="octicon-git-branch"/>
               <!-- eslint-disable-next-line vue/no-v-html -->
               <span v-html="textCreateBranch.replace('%s', searchTerm)"/>
@@ -67,7 +67,7 @@
           <form ref="newBranchForm" :action="formActionUrl" method="post">
             <input type="hidden" name="_csrf" :value="csrfToken">
             <input type="hidden" name="new_branch_name" v-model="searchTerm">
-            <input type="hidden" name="create_tag" v-model="createTag">
+            <input type="hidden" name="create_tag" v-model="shouldCreateTag">
             <input type="hidden" name="current_path" v-model="treePath" v-if="treePath">
           </form>
         </div>
@@ -114,7 +114,7 @@ const sfc = {
     formActionUrl() {
       return `${this.repoLink}/branches/_new/${this.branchNameSubURL}`;
     },
-    createTag() {
+    shouldCreateTag() {
       return this.mode === 'tags';
     }
   },
diff --git a/web_src/js/modules/toast.js b/web_src/js/modules/toast.js
index 247cfcadf4685..b5899052d48c6 100644
--- a/web_src/js/modules/toast.js
+++ b/web_src/js/modules/toast.js
@@ -1,5 +1,6 @@
 import {htmlEscape} from 'escape-goat';
 import {svg} from '../svg.js';
+import Toastify from 'toastify-js';
 
 const levels = {
   info: {
@@ -23,9 +24,6 @@ const levels = {
 async function showToast(message, level, {gravity, position, duration, ...other} = {}) {
   if (!message) return;
 
-  // FIXME: the "toast" mode shouldn't be imported asynchronously.
-  // Otherwise, network errors can't be shown because the toastify itself can't be loaded at that time.
-  const {default: Toastify} = await import(/* webpackChunkName: 'toastify' */'toastify-js');
   const {icon, background, duration: levelDuration} = levels[level ?? 'info'];
 
   const toast = Toastify({