From 465f7ca73d7093eeeecb6553c804d8cfb06e6652 Mon Sep 17 00:00:00 2001
From: Quentin Gliech <quentingliech@gmail.com>
Date: Tue, 11 Feb 2020 21:49:19 +0100
Subject: [PATCH] webui: stop using defaultRepository

---
 webui/src/CurrentIdentity.graphql    | 2 +-
 webui/src/CurrentIdentity.tsx        | 4 ++--
 webui/src/bug/BugQuery.graphql       | 2 +-
 webui/src/bug/BugQuery.tsx           | 4 ++--
 webui/src/bug/TimelineQuery.graphql  | 2 +-
 webui/src/bug/TimelineQuery.js       | 5 +----
 webui/src/list/FilterToolbar.graphql | 2 +-
 webui/src/list/FilterToolbar.tsx     | 4 ++--
 webui/src/list/ListQuery.graphql     | 2 +-
 webui/src/list/ListQuery.tsx         | 8 ++++----
 10 files changed, 16 insertions(+), 19 deletions(-)

diff --git a/webui/src/CurrentIdentity.graphql b/webui/src/CurrentIdentity.graphql
index 6c000a2e7ee73f4de6bf4992ccbd43ba829b6213..2794a40f19223b6fb8a8b0a8c3c8e83a04a05fc2 100644
--- a/webui/src/CurrentIdentity.graphql
+++ b/webui/src/CurrentIdentity.graphql
@@ -1,5 +1,5 @@
 query CurrentIdentity {
-  defaultRepository {
+  repository {
     userIdentity {
       displayName
       avatarUrl
diff --git a/webui/src/CurrentIdentity.tsx b/webui/src/CurrentIdentity.tsx
index 5b8fcbb9e4777cd95f91bd925ab41a6bf1bb32b4..256f44c476214f120fd2ffc7e80522670119d35d 100644
--- a/webui/src/CurrentIdentity.tsx
+++ b/webui/src/CurrentIdentity.tsx
@@ -14,9 +14,9 @@ const CurrentIdentity = () => {
   const classes = useStyles();
   const { loading, error, data } = useCurrentIdentityQuery();
 
-  if (error || loading || !data?.defaultRepository?.userIdentity) return null;
+  if (error || loading || !data?.repository?.userIdentity) return null;
 
-  const user = data.defaultRepository.userIdentity;
+  const user = data.repository.userIdentity;
   return (
     <>
       <Avatar src={user.avatarUrl ? user.avatarUrl : undefined}>
diff --git a/webui/src/bug/BugQuery.graphql b/webui/src/bug/BugQuery.graphql
index caa247ed400c9e3d03ed797b3cb76c35cf00fc25..cdc4723fdf032e10cec2898771a718151275bf8a 100644
--- a/webui/src/bug/BugQuery.graphql
+++ b/webui/src/bug/BugQuery.graphql
@@ -1,7 +1,7 @@
 #import "./Bug.graphql"
 
 query GetBug($id: String!) {
-  defaultRepository {
+  repository {
     bug(prefix: $id) {
       ...Bug
     }
diff --git a/webui/src/bug/BugQuery.tsx b/webui/src/bug/BugQuery.tsx
index ea7bb7dacb3e6deefab5776a4b26c21de9c98970..2ecf718ce9510ba300a0baa3eb097449ce1fe474 100644
--- a/webui/src/bug/BugQuery.tsx
+++ b/webui/src/bug/BugQuery.tsx
@@ -15,8 +15,8 @@ const BugQuery: React.FC<Props> = ({ match }: Props) => {
   });
   if (loading) return <CircularProgress />;
   if (error) return <p>Error: {error}</p>;
-  if (!data?.defaultRepository?.bug) return <p>404.</p>;
-  return <Bug bug={data.defaultRepository.bug} />;
+  if (!data?.repository?.bug) return <p>404.</p>;
+  return <Bug bug={data.repository.bug} />;
 };
 
 export default BugQuery;
diff --git a/webui/src/bug/TimelineQuery.graphql b/webui/src/bug/TimelineQuery.graphql
index 7a8bc7368b00e7140c65d32d4aa35588a162d7ea..493f441657a3bbdb35de11cad19ca51d8f536202 100644
--- a/webui/src/bug/TimelineQuery.graphql
+++ b/webui/src/bug/TimelineQuery.graphql
@@ -5,7 +5,7 @@
 #import "./SetStatusFragment.graphql"
 
 query Timeline($id: String!, $first: Int = 10, $after: String) {
-  defaultRepository {
+  repository {
     bug(prefix: $id) {
       timeline(first: $first, after: $after) {
         nodes {
diff --git a/webui/src/bug/TimelineQuery.js b/webui/src/bug/TimelineQuery.js
index 11f3d08ce43edbcf1b196f7e8fadc5f3be070a65..886edab2911ffad769c0f011a0ce5b395637c5b4 100644
--- a/webui/src/bug/TimelineQuery.js
+++ b/webui/src/bug/TimelineQuery.js
@@ -15,10 +15,7 @@ const TimelineQuery = ({ id }) => {
   if (loading) return <CircularProgress />;
   if (error) return <p>Error: {error}</p>;
   return (
-    <Timeline
-      ops={data.defaultRepository.bug.timeline.nodes}
-      fetchMore={fetchMore}
-    />
+    <Timeline ops={data.repository.bug.timeline.nodes} fetchMore={fetchMore} />
   );
 };
 
diff --git a/webui/src/list/FilterToolbar.graphql b/webui/src/list/FilterToolbar.graphql
index 644a4eedbe04f43c817030659949f8c6cbfcef51..cd103f4490ae3bab3388bf7bb99d1ff25d90266a 100644
--- a/webui/src/list/FilterToolbar.graphql
+++ b/webui/src/list/FilterToolbar.graphql
@@ -1,5 +1,5 @@
 query BugCount($query: String) {
-  defaultRepository {
+  repository {
     bugs: allBugs(query: $query) {
       totalCount
     }
diff --git a/webui/src/list/FilterToolbar.tsx b/webui/src/list/FilterToolbar.tsx
index df295054cfbe1a705956826c6a1b3d7af3d912ef..b95b10bc6e16b1dec8e81dbb073ed70dec70590c 100644
--- a/webui/src/list/FilterToolbar.tsx
+++ b/webui/src/list/FilterToolbar.tsx
@@ -41,9 +41,9 @@ function CountingFilter({ query, children, ...props }: CountingFilterProps) {
 
   var prefix;
   if (loading) prefix = '...';
-  else if (error || !data?.defaultRepository) prefix = '???';
+  else if (error || !data?.repository) prefix = '???';
   // TODO: better prefixes & error handling
-  else prefix = data.defaultRepository.bugs.totalCount;
+  else prefix = data.repository.bugs.totalCount;
 
   return (
     <Filter {...props}>
diff --git a/webui/src/list/ListQuery.graphql b/webui/src/list/ListQuery.graphql
index bf9ea80a4ae5da5670ae4c1c92fe74cb44701491..ded60c8a80a4abc785d8d36e709e9c5924c9c7be 100644
--- a/webui/src/list/ListQuery.graphql
+++ b/webui/src/list/ListQuery.graphql
@@ -7,7 +7,7 @@ query ListBugs(
   $before: String
   $query: String
 ) {
-  defaultRepository {
+  repository {
     bugs: allBugs(
       first: $first
       last: $last
diff --git a/webui/src/list/ListQuery.tsx b/webui/src/list/ListQuery.tsx
index c91264e173c3abc84e697ae0bd23ef6c5019d4b4..84b724317a66646abc052a55c94be243bc45a7ea 100644
--- a/webui/src/list/ListQuery.tsx
+++ b/webui/src/list/ListQuery.tsx
@@ -203,8 +203,8 @@ function ListQuery() {
   let nextPage = null;
   let previousPage = null;
   let count = 0;
-  if (!loading && !error && data?.defaultRepository?.bugs) {
-    const bugs = data.defaultRepository.bugs;
+  if (!loading && !error && data?.repository?.bugs) {
+    const bugs = data.repository.bugs;
     count = bugs.totalCount;
     // This computes the URL for the next page
     if (bugs.pageInfo.hasNextPage) {
@@ -250,8 +250,8 @@ function ListQuery() {
     content = <Placeholder count={10} />;
   } else if (error) {
     content = <Error error={error} />;
-  } else if (data?.defaultRepository) {
-    const bugs = data.defaultRepository.bugs;
+  } else if (data?.repository) {
+    const bugs = data.repository.bugs;
 
     if (bugs.totalCount === 0) {
       content = <NoBug />;