13 files changed, 13 insertions, 3 deletions
diff --git a/cache/repo_cache_bug.go b/cache/repo_cache_bug.go
index 226c4c13e..4522f1bcb 100644
--- a/cache/repo_cache_bug.go
+++ b/cache/repo_cache_bug.go
@@ -290,7 +290,7 @@ func (c *RepoCache) ResolveComment(prefix string) (*BugCache, entity.CombinedId,
 		}
 
 		for _, comment := range b.Snapshot().Comments {
-			if comment.TargetId().HasPrefix(prefix) {
+			if comment.CombinedId().HasPrefix(prefix) {
 				matchingBugIds = append(matchingBugIds, bugId)
 				matchingBug = b
 				matchingCommentId = comment.CombinedId()
diff --git a/webui/src/components/Identity/CurrentIdentity.graphql b/webui/src/components/Identity/CurrentIdentity.graphql
index 054190df5..56efeacf0 100644
--- a/webui/src/components/Identity/CurrentIdentity.graphql
+++ b/webui/src/components/Identity/CurrentIdentity.graphql
@@ -2,6 +2,7 @@
 
 query CurrentIdentity {
   repository {
+    name
     userIdentity {
       ...Identity
     }
diff --git a/webui/src/components/Identity/UserIdentity.graphql b/webui/src/components/Identity/UserIdentity.graphql
index 9cf102486..01e8c3e56 100644
--- a/webui/src/components/Identity/UserIdentity.graphql
+++ b/webui/src/components/Identity/UserIdentity.graphql
@@ -2,6 +2,7 @@
 
 query GetUserById($userId: String!) {
   repository {
+    name
     identity(prefix: $userId) {
       ...Identity
     }
diff --git a/webui/src/pages/bug/BugQuery.graphql b/webui/src/pages/bug/BugQuery.graphql
index cdc4723fd..9d4cede83 100644
--- a/webui/src/pages/bug/BugQuery.graphql
+++ b/webui/src/pages/bug/BugQuery.graphql
@@ -2,6 +2,7 @@
 
 query GetBug($id: String!) {
   repository {
+    name
     bug(prefix: $id) {
       ...Bug
     }
diff --git a/webui/src/pages/bug/EditCommentForm.tsx b/webui/src/pages/bug/EditCommentForm.tsx
index 4da051e6c..b265735b0 100644
--- a/webui/src/pages/bug/EditCommentForm.tsx
+++ b/webui/src/pages/bug/EditCommentForm.tsx
@@ -58,9 +58,8 @@ function EditCommentForm({ bug, comment, onCancel, onPostSubmit }: Props) {
     editComment({
       variables: {
         input: {
-          prefix: bug.id,
+          targetPrefix: comment.id,
           message: message,
-          target: comment.id,
         },
       },
     }).then((result) => {
diff --git a/webui/src/pages/bug/MessageHistory.graphql b/webui/src/pages/bug/MessageHistory.graphql
index e90eb4595..6daab75c9 100644
--- a/webui/src/pages/bug/MessageHistory.graphql
+++ b/webui/src/pages/bug/MessageHistory.graphql
@@ -3,6 +3,7 @@
 
 query MessageHistory($bugIdPrefix: String!) {
   repository {
+    name
     bug(prefix: $bugIdPrefix) {
       timeline {
         comments: nodes {
diff --git a/webui/src/pages/bug/TimelineQuery.graphql b/webui/src/pages/bug/TimelineQuery.graphql
index 6d78ab7f8..7c9badfd8 100644
--- a/webui/src/pages/bug/TimelineQuery.graphql
+++ b/webui/src/pages/bug/TimelineQuery.graphql
@@ -6,6 +6,7 @@
 
 query Timeline($id: String!, $first: Int = 10, $after: String) {
   repository {
+    name
     bug(prefix: $id) {
       timeline(first: $first, after: $after) {
         nodes {
diff --git a/webui/src/pages/identity/GetBugsByUser.graphql b/webui/src/pages/identity/GetBugsByUser.graphql
index 38f139ab0..5bb09553e 100644
--- a/webui/src/pages/identity/GetBugsByUser.graphql
+++ b/webui/src/pages/identity/GetBugsByUser.graphql
@@ -1,5 +1,6 @@
 query GetBugsByUser($query: String) {
   repository {
+    name
     allBugs(query: $query) {
       nodes {
         id
diff --git a/webui/src/pages/identity/GetUserStatistic.graphql b/webui/src/pages/identity/GetUserStatistic.graphql
index a75983205..bc7ab8746 100644
--- a/webui/src/pages/identity/GetUserStatistic.graphql
+++ b/webui/src/pages/identity/GetUserStatistic.graphql
@@ -4,6 +4,7 @@ query GetUserStatistic(
   $actionQuery: String!
 ) {
   repository {
+    name
     authored: allBugs(query: $authorQuery) {
       totalCount
     }
diff --git a/webui/src/pages/list/FilterToolbar.graphql b/webui/src/pages/list/FilterToolbar.graphql
index cd103f449..2d2435cf6 100644
--- a/webui/src/pages/list/FilterToolbar.graphql
+++ b/webui/src/pages/list/FilterToolbar.graphql
@@ -1,5 +1,6 @@
 query BugCount($query: String) {
   repository {
+    name
     bugs: allBugs(query: $query) {
       totalCount
     }
diff --git a/webui/src/pages/list/ListIdentities.graphql b/webui/src/pages/list/ListIdentities.graphql
index 1d9094962..9a92dae73 100644
--- a/webui/src/pages/list/ListIdentities.graphql
+++ b/webui/src/pages/list/ListIdentities.graphql
@@ -1,5 +1,6 @@
 query ListIdentities {
   repository {
+    name
     allIdentities {
       nodes {
         id
diff --git a/webui/src/pages/list/ListLabels.graphql b/webui/src/pages/list/ListLabels.graphql
index 35f25e251..84ed38dd2 100644
--- a/webui/src/pages/list/ListLabels.graphql
+++ b/webui/src/pages/list/ListLabels.graphql
@@ -1,5 +1,6 @@
 query ListLabels {
   repository {
+    name
     validLabels {
       nodes {
         name
diff --git a/webui/src/pages/list/ListQuery.graphql b/webui/src/pages/list/ListQuery.graphql
index ded60c8a8..922e8e09f 100644
--- a/webui/src/pages/list/ListQuery.graphql
+++ b/webui/src/pages/list/ListQuery.graphql
@@ -8,6 +8,7 @@ query ListBugs(
   $query: String
 ) {
   repository {
+    name
     bugs: allBugs(
       first: $first
       last: $last