From 806211b976a501dab7f9a054258df406ea3a0e65 Mon Sep 17 00:00:00 2001
From: Tyrone Yeh <tyrone_yeh@draytek.com>
Date: Tue, 2 Aug 2022 17:28:34 +0800
Subject: [PATCH 1/3] Add issue filter search input

---
 templates/repo/issue/list.tmpl | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/templates/repo/issue/list.tmpl b/templates/repo/issue/list.tmpl
index 2a53239f1c6f7..4682637a06a1d 100644
--- a/templates/repo/issue/list.tmpl
+++ b/templates/repo/issue/list.tmpl
@@ -45,6 +45,10 @@
 							{{svg "octicon-triangle-down" 14 "dropdown icon"}}
 						</span>
 						<div class="menu">
+							<div class="ui icon search input">
+								<i class="icon df ac jc">{{svg "octicon-search" 16}}</i>
+								<input type="text" placeholder="{{.i18n.Tr "repo.issues.filter_label"}}">
+							</div>
 							<span class="info">{{.locale.Tr "repo.issues.filter_label_exclude" | Safe}}</span>
 							<a class="item" href="{{$.Link}}?q={{$.Keyword}}&type={{$.ViewType}}&sort={{$.SortType}}&state={{$.State}}&milestone={{$.MilestoneID}}&assignee={{$.AssigneeID}}">{{.locale.Tr "repo.issues.filter_label_no_select"}}</a>
 							{{range .Labels}}
@@ -60,6 +64,10 @@
 							{{svg "octicon-triangle-down" 14 "dropdown icon"}}
 						</span>
 						<div class="menu">
+							<div class="ui icon search input">
+								<i class="icon df ac jc">{{svg "octicon-search" 16}}</i>
+								<input type="text" placeholder="{{.i18n.Tr "repo.issues.filter_milestone"}}">
+							</div>
 							<a class="item" href="{{$.Link}}?q={{$.Keyword}}&type={{$.ViewType}}&sort={{$.SortType}}&state={{$.State}}&labels={{.SelectLabels}}&assignee={{$.AssigneeID}}">{{.locale.Tr "repo.issues.filter_milestone_no_select"}}</a>
 							{{range .Milestones}}
 								<a class="{{if $.MilestoneID}}{{if eq $.MilestoneID .ID}}active selected{{end}}{{end}} item" href="{{$.Link}}?type={{$.ViewType}}&sort={{$.SortType}}&state={{$.State}}&labels={{$.SelectLabels}}&milestone={{.ID}}&assignee={{$.AssigneeID}}">{{.Name}}</a>
@@ -74,6 +82,10 @@
 							{{svg "octicon-triangle-down" 14 "dropdown icon"}}
 						</span>
 						<div class="menu">
+							<div class="ui icon search input">
+								<i class="icon df ac jc">{{svg "octicon-search" 16}}</i>
+								<input type="text" placeholder="{{.i18n.Tr "repo.issues.filter_assignee"}}">
+							</div>
 							<a class="item" href="{{$.Link}}?q={{$.Keyword}}&type={{$.ViewType}}&sort={{$.SortType}}&state={{$.State}}&labels={{.SelectLabels}}&milestone={{$.MilestoneID}}">{{.locale.Tr "repo.issues.filter_assginee_no_select"}}</a>
 							{{range .Assignees}}
 								<a class="{{if eq $.AssigneeID .ID}}active selected{{end}} item" href="{{$.Link}}?type={{$.ViewType}}&sort={{$.SortType}}&state={{$.State}}&labels={{$.SelectLabels}}&milestone={{$.MilestoneID}}&assignee={{.ID}}">

From 5dc72e3959eb4e4fad2573456dfe883cabf7cfa8 Mon Sep 17 00:00:00 2001
From: Tyrone Yeh <tyrone_yeh@draytek.com>
Date: Tue, 2 Aug 2022 18:58:57 +0800
Subject: [PATCH 2/3] Add search filter to milestone page dropdown menu

---
 templates/repo/issue/milestone_issues.tmpl | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/templates/repo/issue/milestone_issues.tmpl b/templates/repo/issue/milestone_issues.tmpl
index 484d0a8110663..94dc615f29a7e 100644
--- a/templates/repo/issue/milestone_issues.tmpl
+++ b/templates/repo/issue/milestone_issues.tmpl
@@ -51,6 +51,10 @@
 							{{svg "octicon-triangle-down" 14 "dropdown icon"}}
 						</span>
 						<div class="menu">
+							<div class="ui icon search input">
+								<i class="icon df ac jc">{{svg "octicon-search" 16}}</i>
+								<input type="text" placeholder="{{.i18n.Tr "repo.issues.filter_label"}}">
+							</div>
 							<span class="info">{{.locale.Tr "repo.issues.filter_label_exclude" | Safe}}</span>
 							<a class="item" href="{{$.Link}}?q={{$.Keyword}}&type={{$.ViewType}}&sort={{$.SortType}}&state={{$.State}}&assignee={{$.AssigneeID}}">{{.locale.Tr "repo.issues.filter_label_no_select"}}</a>
 							{{range .Labels}}
@@ -66,6 +70,10 @@
 							{{svg "octicon-triangle-down" 14 "dropdown icon"}}
 						</span>
 						<div class="menu">
+							<div class="ui icon search input">
+								<i class="icon df ac jc">{{svg "octicon-search" 16}}</i>
+								<input type="text" placeholder="{{.i18n.Tr "repo.issues.filter_assignee"}}">
+							</div>
 							<a class="item" href="{{$.Link}}?q={{$.Keyword}}&type={{$.ViewType}}&sort={{$.SortType}}&state={{$.State}}&labels={{.SelectLabels}}">{{.locale.Tr "repo.issues.filter_assginee_no_select"}}</a>
 							{{range .Assignees}}
 								<a class="{{if eq $.AssigneeID .ID}}active selected{{end}} item" href="{{$.Link}}?type={{$.ViewType}}&sort={{$.SortType}}&state={{$.State}}&labels={{$.SelectLabels}}&assignee={{.ID}}">

From 28040dc37e88e189e368b5b0f6d11e8bd15c93ce Mon Sep 17 00:00:00 2001
From: Tyrone Yeh <tyrone_yeh@draytek.com>
Date: Thu, 18 Aug 2022 14:25:23 +0800
Subject: [PATCH 3/3] Remove conflict word

---
 templates/repo/issue/list.tmpl | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/templates/repo/issue/list.tmpl b/templates/repo/issue/list.tmpl
index 34806a44e3743..5b25d664e6a0a 100644
--- a/templates/repo/issue/list.tmpl
+++ b/templates/repo/issue/list.tmpl
@@ -168,7 +168,7 @@
 						<div class="ui red active basic button issue-action" data-action="close" data-url="{{$.RepoLink}}/issues/status" style="margin-left: auto">{{.locale.Tr "repo.issues.action_close"}}</div>
 					{{end}}
 					<!-- Labels -->
-					<div class="ui {{if not .Labels}}dis<<<<<<< add-issue-filter-search-inputabled{{end}} dropdown jump item">
+					<div class="ui {{if not .Labels}}disabled{{end}} dropdown jump item">
 						<span class="text">
 							{{.locale.Tr "repo.issues.action_label"}}
 							{{svg "octicon-triangle-down" 14 "dropdown icon"}}
@@ -192,7 +192,7 @@
 							<div class="item issue-action" data-element-id="0" data-url="{{$.Link}}/milestone">
 							{{.locale.Tr "repo.issues.action_milestone_no_select"}}
 							</div>
-							{{range .Milestones}}<<<<<<< add-issue-filter-search-input
+							{{range .Milestones}}
 								<div class="item issue-action" data-element-id="{{.ID}}" data-url="{{$.RepoLink}}/issues/milestone">
 									{{.Name}}
 								</div>