Billing plugin integration

2 files changed, 10 insertions, 1 deletions

diff --git a/server/sonar-web/src/main/js/app/components/extensions/Extension.js b/server/sonar-web/src/main/js/app/components/extensions/Extension.js
index f5d145918b1..5f5116b5eb8 100644
--- a/server/sonar-web/src/main/js/app/components/extensions/Extension.js
+++ b/server/sonar-web/src/main/js/app/components/extensions/Extension.js
@@ -33,6 +33,7 @@ type Props = {
     key: string,
     title: string
   },
+  location: {},
   onFail: string => void,
   options?: {},
   router: Object
@@ -51,6 +52,8 @@ class Extension extends React.PureComponent {
     if (prevProps.extension !== this.props.extension) {
       this.stopExtension();
       this.startExtension();
+    } else if (prevProps.location !== this.props.location) {
+      this.startExtension();
     }
   }
 
@@ -64,6 +67,7 @@ class Extension extends React.PureComponent {
       store,
       el: this.container,
       currentUser: this.props.currentUser,
+      location: this.props.location,
       router: this.props.router,
       ...this.props.options
     });
diff --git a/server/sonar-web/src/main/js/app/components/extensions/OrganizationPageExtension.js b/server/sonar-web/src/main/js/app/components/extensions/OrganizationPageExtension.js
index 6f37a031437..1dbc52d85a9 100644
--- a/server/sonar-web/src/main/js/app/components/extensions/OrganizationPageExtension.js
+++ b/server/sonar-web/src/main/js/app/components/extensions/OrganizationPageExtension.js
@@ -27,6 +27,7 @@ import type { Organization } from '../../../store/organizations/duck';
 
 type Props = {
   organization: Organization,
+  location: {},
   params: {
     extensionKey: string,
     organizationKey: string,
@@ -48,7 +49,11 @@ class OrganizationPageExtension extends React.PureComponent {
 
     const extension = pages.find(p => p.key === `${pluginKey}/${extensionKey}`);
     return extension
-      ? <Extension extension={extension} options={{ organization }} />
+      ? <Extension
+          extension={extension}
+          options={{ organization }}
+          location={this.props.location}
+        />
       : <ExtensionNotFound />;
   }
 }