SONAR-20498 Prevent issues from loading forever

diff --git a/server/sonar-web/src/main/js/apps/issues/components/IssuesApp.tsx b/server/sonar-web/src/main/js/apps/issues/components/IssuesApp.tsx
index 78aa3b0f2418f043e36c6a8abe97537e095f6891..53fb1308fd23796f77ef27acc9870a3a4032e11c 100644 (file)
--- a/server/sonar-web/src/main/js/apps/issues/components/IssuesApp.tsx
+++ b/server/sonar-web/src/main/js/apps/issues/components/IssuesApp.tsx
@@ -155,6 +155,7 @@ const ISSUES_PAGE_SIZE = 100;
 
 export class App extends React.PureComponent<Props, State> {
   mounted = false;
+  requiresInitialFetch = false;
   bulkButtonRef: React.RefObject<HTMLButtonElement>;
 
   constructor(props: Props) {
@@ -222,6 +223,8 @@ export class App extends React.PureComponent<Props, State> {
 
     if (!this.props.isFetchingBranch) {
       this.fetchFirstIssues(true).catch(() => undefined);
+    } else {
+      this.requiresInitialFetch = true;
     }
   }
 
@@ -230,6 +233,12 @@ export class App extends React.PureComponent<Props, State> {
     const { query: prevQuery } = prevProps.location;
     const { openIssue } = this.state;
 
+    if (this.requiresInitialFetch && !this.props.isFetchingBranch) {
+      this.requiresInitialFetch = false;
+      this.fetchFirstIssues(true).catch(() => undefined);
+      return;
+    }
+
     if (
       prevProps.component !== this.props.component ||
       !isSameBranchLike(prevProps.branchLike, this.props.branchLike) ||