SONAR-9813 allow to change portfolio visibility

server/sonar-web/src/main/js/apps/permissions/project/components/App.js

@@ -352,26 +352,25 @@ export default class App extends React.PureComponent {
           loadHolders={this.loadHolders}
         />
         <PageError />
-        {this.props.component.qualifier === 'TRK' && (
-          <div>
-            <VisibilitySelector
-              canTurnToPrivate={canTurnToPrivate}
-              className="big-spacer-top big-spacer-bottom"
-              onChange={this.handleVisibilityChange}
-              visibility={this.props.component.visibility}
+        <div>
+          <VisibilitySelector
+            canTurnToPrivate={canTurnToPrivate}
+            className="big-spacer-top big-spacer-bottom"
+            onChange={this.handleVisibilityChange}
+            visibility={this.props.component.visibility}
+          />
+          {this.props.component.qualifier === 'TRK' &&
+          !canTurnToPrivate && (
+            <UpgradeOrganizationBox organization={this.props.component.organization} />
+          )}
+          {this.state.disclaimer && (
+            <PublicProjectDisclaimer
+              component={this.props.component}
+              onClose={this.closeDisclaimer}
+              onConfirm={this.turnProjectToPublic}
             />
-            {!canTurnToPrivate && (
-              <UpgradeOrganizationBox organization={this.props.component.organization} />
-            )}
-            {this.state.disclaimer && (
-              <PublicProjectDisclaimer
-                component={this.props.component}
-                onClose={this.closeDisclaimer}
-                onConfirm={this.turnProjectToPublic}
-              />
-            )}
-          </div>
-        )}
+          )}
+        </div>
         <AllHoldersList
           component={this.props.component}
           filter={this.state.filter}

server/sonar-web/src/main/js/apps/permissions/project/components/PublicProjectDisclaimer.js

@@ -25,7 +25,8 @@ import { translate, translateWithParameters } from '../../../../helpers/l10n';
 /*::
 type Props = {
   component: {
-    name: string
+    name: string,
+    qualifier: string
   },
   onClose: () => void,
   onConfirm: () => void
@@ -47,6 +48,8 @@ export default class PublicProjectDisclaimer extends React.PureComponent {
   };
 
   render() {
+    const { qualifier } = this.props.component;
+
     return (
       <Modal
         isOpen={true}
@@ -61,15 +64,15 @@ export default class PublicProjectDisclaimer extends React.PureComponent {
         </header>
 
         <div className="modal-body">
-          <p>{translate('projects_role.are_you_sure_to_turn_project_to_public')}</p>
+          <p>{translate('projects_role.are_you_sure_to_turn_project_to_public', qualifier)}</p>
           <p className="spacer-top">
-            {translate('projects_role.are_you_sure_to_turn_project_to_public.2')}
+            {translate('projects_role.are_you_sure_to_turn_project_to_public.2', qualifier)}
           </p>
         </div>
 
         <footer className="modal-foot">
           <button id="confirm-turn-to-public" onClick={this.handleConfirmClick}>
-            {translate('projects_role.turn_project_to_public')}
+            {translate('projects_role.turn_project_to_public', qualifier)}
           </button>
           <a href="#" onClick={this.handleCancelClick}>
             {translate('cancel')}

sonar-core/src/main/resources/org/sonar/l10n/core.properties

@@ -2575,9 +2575,15 @@ projects_role.apply_template_to_xxx=Apply Permission Template To "{0}"
 projects_role.apply_template.success=Permission template was successfully applied.
 projects_role.no_projects=There are currently no results to apply the permission template to.
 projects_role.turn_x_to_public=Turn "{0}" to Public
-projects_role.turn_project_to_public=Turn Project to Public
-projects_role.are_you_sure_to_turn_project_to_public=Are you sure you want to turn your project to public?
-projects_role.are_you_sure_to_turn_project_to_public.2=Everybody will be able to browse and see the source code of your project.
+projects_role.turn_project_to_public.TRK=Turn Project to Public
+projects_role.turn_project_to_public.VW=Turn Portfolio to Public
+projects_role.turn_project_to_public.APP=Turn Application to Public
+projects_role.are_you_sure_to_turn_project_to_public.TRK=Are you sure you want to turn your project to public?
+projects_role.are_you_sure_to_turn_project_to_public.2.TRK=Everybody will be able to browse and see the source code of your project.
+projects_role.are_you_sure_to_turn_project_to_public.VW=Are you sure you want to turn your portfolio to public?
+projects_role.are_you_sure_to_turn_project_to_public.2.VW=Everybody will be able to browse it.
+projects_role.are_you_sure_to_turn_project_to_public.APP=Are you sure you want to turn your application to public?
+projects_role.are_you_sure_to_turn_project_to_public.2.APP=Everybody will be able to browse it.
 projects_role.public_projects_warning=This permission is always granted by default to everybody (anonymous and authenticated users) for public projects. Therefore, the selection made on this page will be applied to private projects only.