Check the edition status only while an operation is in progress

diff --git a/server/sonar-web/src/main/js/api/marketplace.ts b/server/sonar-web/src/main/js/api/marketplace.ts
index d067f7b3e22848642463e08dc2b528f51896b9aa..8bb8a462a42845ec29a3c69f73898f962326f7d1 100644 (file)
--- a/server/sonar-web/src/main/js/api/marketplace.ts
+++ b/server/sonar-web/src/main/js/api/marketplace.ts
@@ -42,7 +42,6 @@ export interface EditionStatus {
     | 'AUTOMATIC_IN_PROGRESS'
     | 'MANUAL_IN_PROGRESS'
     | 'AUTOMATIC_READY'
-    | 'AUTOMATIC_FAILURE'
     | 'UNINSTALL_IN_PROGRESS';
 }
 

diff --git a/server/sonar-web/src/main/js/apps/marketplace/App.tsx b/server/sonar-web/src/main/js/apps/marketplace/App.tsx
index 0c008e09b7c60a640d10dab408217720974c03a7..969c1c7135c1e49e873b1eb53f2282d9fe6eb917 100644 (file)
--- a/server/sonar-web/src/main/js/apps/marketplace/App.tsx
+++ b/server/sonar-web/src/main/js/apps/marketplace/App.tsx
@@ -63,6 +63,7 @@ interface State {
 
 export default class App extends React.PureComponent<Props, State> {
   mounted: boolean;
+  timer?: NodeJS.Timer;
 
   static contextTypes = {
     router: PropTypes.object.isRequired
@@ -159,7 +160,6 @@ export default class App extends React.PureComponent<Props, State> {
       editionStatus => {
         if (this.mounted) {
           this.updateEditionStatus(editionStatus);
-          setTimeout(this.fetchEditionStatus, 5000);
         }
       },
       () => {}
@@ -184,8 +184,19 @@ export default class App extends React.PureComponent<Props, State> {
     );
   };
 
-  updateEditionStatus = (editionStatus: EditionStatus) =>
+  updateEditionStatus = (editionStatus: EditionStatus) => {
     this.setState({ editionStatus: editionStatus });
+    if (this.timer) {
+      global.clearTimeout(this.timer);
+      this.timer = undefined;
+    }
+    if (editionStatus.installationStatus === 'AUTOMATIC_IN_PROGRESS') {
+      this.timer = global.setTimeout(() => {
+        this.fetchEditionStatus();
+        this.timer = undefined;
+      }, 2000);
+    }
+  };
 
   updateQuery = (newQuery: Partial<Query>) => {
     const query = serializeQuery({ ...parseQuery(this.props.location.query), ...newQuery });

diff --git a/server/sonar-web/src/main/js/apps/marketplace/components/__tests__/EditionsStatusNotif-test.tsx b/server/sonar-web/src/main/js/apps/marketplace/components/__tests__/EditionsStatusNotif-test.tsx
index 0a3ca4c9acdb05839e324be44c6f3cd1af298b23..d86c8ac266c7d35bfe36ef348bfbcc926cf760b8 100644 (file)
--- a/server/sonar-web/src/main/js/apps/marketplace/components/__tests__/EditionsStatusNotif-test.tsx
+++ b/server/sonar-web/src/main/js/apps/marketplace/components/__tests__/EditionsStatusNotif-test.tsx
@@ -42,16 +42,6 @@ it('should display an in progress notif', () => {
   expect(wrapper).toMatchSnapshot();
 });
 
-it('should display an error notification', () => {
-  const wrapper = shallow(
-    <EditionsStatusNotif
-      editionStatus={{ installationStatus: 'AUTOMATIC_FAILURE' }}
-      updateEditionStatus={jest.fn()}
-    />
-  );
-  expect(wrapper).toMatchSnapshot();
-});
-
 it('should display a ready notification', () => {
   const wrapper = shallow(
     <EditionsStatusNotif

diff --git a/server/sonar-web/src/main/js/apps/marketplace/components/__tests__/__snapshots__/EditionsStatusNotif-test.tsx.snap b/server/sonar-web/src/main/js/apps/marketplace/components/__tests__/__snapshots__/EditionsStatusNotif-test.tsx.snap
index 70b4ce43ef0482d6717318dddd49197f0e4e1c5f..e52e16c6fa7c49bf773670d0a8c15c8556b892ef 100644 (file)
--- a/server/sonar-web/src/main/js/apps/marketplace/components/__tests__/__snapshots__/EditionsStatusNotif-test.tsx.snap
+++ b/server/sonar-web/src/main/js/apps/marketplace/components/__tests__/__snapshots__/EditionsStatusNotif-test.tsx.snap
@@ -18,8 +18,6 @@ exports[`should display a ready notification 1`] = `
 </div>
 `;
 
-exports[`should display an error notification 1`] = `<div />`;
-
 exports[`should display an in progress notif 1`] = `
 <div>
   <div