apply feedback on private projects ui (#2011)

* refersh holders when changing project visibility
* always show warning on permission templates page

diff --git a/server/sonar-web/src/main/js/apps/permission-templates/components/ListHeader.js b/server/sonar-web/src/main/js/apps/permission-templates/components/ListHeader.js
index 29d3e159a3756bb7d90105064ce5baa4dc1cca04..7f6a6fae4db112074897712cadf43bc2bd2d2131 100644 (file)
--- a/server/sonar-web/src/main/js/apps/permission-templates/components/ListHeader.js
+++ b/server/sonar-web/src/main/js/apps/permission-templates/components/ListHeader.js
@@ -28,7 +28,7 @@ export default class ListHeader extends React.PureComponent {
   };
 
   renderTooltip = permission =>
-    (this.props.organization && (permission.key === 'user' || permission.key === 'codeviewer')
+    (permission.key === 'user' || permission.key === 'codeviewer'
       ? <div>
           {permission.description}
           <div className="alert alert-warning spacer-top">

diff --git a/server/sonar-web/src/main/js/apps/permissions/project/components/App.js b/server/sonar-web/src/main/js/apps/permissions/project/components/App.js
index 67aad792163d4cfae36d0e2a3ee43a3089095416..85b0528cdd3a3a65e0be1578c20b16dc7e2d2cc8 100644 (file)
--- a/server/sonar-web/src/main/js/apps/permissions/project/components/App.js
+++ b/server/sonar-web/src/main/js/apps/permissions/project/components/App.js
@@ -294,18 +294,28 @@ export default class App extends React.PureComponent {
 
   turnProjectToPublic = () => {
     this.props.onComponentChange({ visibility: 'public' });
-    api.changeProjectVisibility(this.props.component.key, 'public').catch(error => {
-      this.props.onComponentChange({ visibility: 'private' });
-      this.props.onRequestFail(error);
-    });
+    api.changeProjectVisibility(this.props.component.key, 'public').then(
+      () => {
+        this.loadHolders();
+      },
+      error => {
+        this.props.onComponentChange({ visibility: 'private' });
+        this.props.onRequestFail(error);
+      }
+    );
   };
 
   turnProjectToPrivate = () => {
     this.props.onComponentChange({ visibility: 'private' });
-    api.changeProjectVisibility(this.props.component.key, 'private').catch(error => {
-      this.props.onComponentChange({ visibility: 'public' });
-      this.props.onRequestFail(error);
-    });
+    api.changeProjectVisibility(this.props.component.key, 'private').then(
+      () => {
+        this.loadHolders();
+      },
+      error => {
+        this.props.onComponentChange({ visibility: 'public' });
+        this.props.onRequestFail(error);
+      }
+    );
   };
 
   openDisclaimer = () => {