add profile actions to the main page

diff --git a/server/sonar-web/src/main/js/apps/quality-profiles/components/ProfileActions.js b/server/sonar-web/src/main/js/apps/quality-profiles/components/ProfileActions.js
new file mode 100644 (file)
index 0000000..f0a834c
--- /dev/null
+++ b/server/sonar-web/src/main/js/apps/quality-profiles/components/ProfileActions.js
@@ -0,0 +1,152 @@
+/*
+ * SonarQube
+ * Copyright (C) 2009-2016 SonarSource SA
+ * mailto:contact AT sonarsource DOT com
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+import React from 'react';
+import { Link } from 'react-router';
+import RenameProfileView from '../views/RenameProfileView';
+import CopyProfileView from '../views/CopyProfileView';
+import DeleteProfileView from '../views/DeleteProfileView';
+import { translate } from '../../../helpers/l10n';
+import { ProfileType } from '../propTypes';
+import { getRulesUrl } from '../../../helpers/urls';
+import { setDefaultProfile } from '../../../api/quality-profiles';
+
+export default class ProfileActions extends React.Component {
+  static propTypes = {
+    profile: ProfileType.isRequired,
+    canAdmin: React.PropTypes.bool.isRequired,
+    updateProfiles: React.PropTypes.func.isRequired
+  };
+
+  static contextTypes = {
+    router: React.PropTypes.object
+  };
+
+  handleRenameClick (e) {
+    e.preventDefault();
+    new RenameProfileView({
+      profile: this.props.profile
+    }).on('done', () => {
+      this.props.updateProfiles();
+    }).render();
+  }
+
+  handleCopyClick (e) {
+    e.preventDefault();
+    new CopyProfileView({
+      profile: this.props.profile
+    }).on('done', profile => {
+      this.props.updateProfiles().then(() => {
+        this.context.router.push({
+          pathname: '/show',
+          query: { key: profile.key }
+        });
+      });
+    }).render();
+  }
+
+  handleSetDefaultClick (e) {
+    e.preventDefault();
+    setDefaultProfile(this.props.profile.key)
+        .then(this.props.updateProfiles);
+  }
+
+  handleDeleteClick (e) {
+    e.preventDefault();
+    new DeleteProfileView({
+      profile: this.props.profile
+    }).on('done', () => {
+      this.context.router.replace('/');
+      this.props.updateProfiles();
+    }).render();
+  }
+
+  render () {
+    const { profile, canAdmin } = this.props;
+
+    const backupUrl = window.baseUrl +
+        '/api/qualityprofiles/backup?profileKey=' +
+        encodeURIComponent(profile.key);
+
+    const activateMoreUrl = getRulesUrl({
+      qprofile: profile.key,
+      activation: 'false'
+    });
+
+    return (
+        <ul className="dropdown-menu dropdown-menu-right">
+          {canAdmin && (
+              <li>
+                <a href={activateMoreUrl}>
+                  {translate('quality_profiles.activate_more_rules')}
+                </a>
+              </li>
+          )}
+          <li>
+            <a id="quality-profile-backup" href={backupUrl}>
+              {translate('backup_verb')}
+            </a>
+          </li>
+          <li>
+            <Link
+                to={{ pathname: '/compare', query: { key: profile.key } }}
+                id="quality-profile-compare">
+              {translate('compare')}
+            </Link>
+          </li>
+          {canAdmin && (
+              <li>
+                <a id="quality-profile-copy"
+                   href="#"
+                   onClick={this.handleCopyClick.bind(this)}>
+                  {translate('copy')}
+                </a>
+              </li>
+          )}
+          {canAdmin && (
+              <li>
+                <a id="quality-profile-rename"
+                   href="#"
+                   onClick={this.handleRenameClick.bind(this)}>
+                  {translate('rename')}
+                </a>
+              </li>
+          )}
+          {canAdmin && !profile.isDefault && (
+              <li>
+                <a id="quality-profile-set-as-default"
+                   href="#"
+                   onClick={this.handleSetDefaultClick.bind(this)}>
+                  {translate('set_as_default')}
+                </a>
+              </li>
+          )}
+          {canAdmin && !profile.isDefault && (
+              <li>
+                <a id="quality-profile-delete"
+                   href="#"
+                   onClick={this.handleDeleteClick.bind(this)}>
+                  {translate('delete')}
+                </a>
+              </li>
+          )}
+        </ul>
+    );
+  }
+}

diff --git a/server/sonar-web/src/main/js/apps/quality-profiles/details/ProfileHeader.js b/server/sonar-web/src/main/js/apps/quality-profiles/details/ProfileHeader.js
index 7f2c10f5abb3ec4294b7dae183fce493715c53ad..51db2e4b8acd7e70b54273c0f0a1089e575a0cd9 100644 (file)
--- a/server/sonar-web/src/main/js/apps/quality-profiles/details/ProfileHeader.js
+++ b/server/sonar-web/src/main/js/apps/quality-profiles/details/ProfileHeader.js
@@ -20,16 +20,11 @@
 import React from 'react';
 import { Link, IndexLink } from 'react-router';
 import classNames from 'classnames';
-import moment from 'moment';
 import ProfileLink from '../components/ProfileLink';
-import RenameProfileView from '../views/RenameProfileView';
-import CopyProfileView from '../views/CopyProfileView';
-import DeleteProfileView from '../views/DeleteProfileView';
+import ProfileActions from '../components/ProfileActions';
 import ProfileDate from '../components/ProfileDate';
 import { ProfileType } from '../propTypes';
 import { translate } from '../../../helpers/l10n';
-import { setDefaultProfile } from '../../../api/quality-profiles';
-import { getRulesUrl } from '../../../helpers/urls';
 import { isStagnant } from '../utils';
 
 export default class ProfileHeader extends React.Component {
@@ -39,49 +34,6 @@ export default class ProfileHeader extends React.Component {
     updateProfiles: React.PropTypes.func.isRequired
   };
 
-  static contextTypes = {
-    router: React.PropTypes.object
-  };
-
-  handleRenameClick (e) {
-    e.preventDefault();
-    new RenameProfileView({
-      profile: this.props.profile
-    }).on('done', () => {
-      this.props.updateProfiles();
-    }).render();
-  }
-
-  handleCopyClick (e) {
-    e.preventDefault();
-    new CopyProfileView({
-      profile: this.props.profile
-    }).on('done', profile => {
-      this.props.updateProfiles().then(() => {
-        this.context.router.push({
-          pathname: '/show',
-          query: { key: profile.key }
-        });
-      });
-    }).render();
-  }
-
-  handleSetDefaultClick (e) {
-    e.preventDefault();
-    setDefaultProfile(this.props.profile.key)
-        .then(this.props.updateProfiles);
-  }
-
-  handleDeleteClick (e) {
-    e.preventDefault();
-    new DeleteProfileView({
-      profile: this.props.profile
-    }).on('done', () => {
-      this.context.router.replace('/');
-      this.props.updateProfiles();
-    }).render();
-  }
-
   renderUpdateDate () {
     const { profile } = this.props;
     const warning = isStagnant(profile);
@@ -98,16 +50,7 @@ export default class ProfileHeader extends React.Component {
   }
 
   render () {
-    const { profile, canAdmin } = this.props;
-
-    const backupUrl = window.baseUrl +
-        '/api/qualityprofiles/backup?profileKey=' +
-        encodeURIComponent(profile.key);
-
-    const activateMoreUrl = getRulesUrl({
-      qprofile: this.props.profile.key,
-      activation: 'false'
-    });
+    const { profile } = this.props;
 
     return (
         <header className="page-header quality-profile-header">
@@ -125,7 +68,7 @@ export default class ProfileHeader extends React.Component {
 
           <h1 className="page-title">
             <ProfileLink
-                profileKey={this.props.profile.key}
+                profileKey={profile.key}
                 className="link-base-color">
               {profile.name}
             </ProfileLink>
@@ -141,7 +84,7 @@ export default class ProfileHeader extends React.Component {
               </li>
               <li>
                 <Link
-                    to={{ pathname: '/changelog', query: { key: this.props.profile.key } }}
+                    to={{ pathname: '/changelog', query: { key: profile.key } }}
                     className="button">
                   {translate('changelog')}
                 </Link>
@@ -154,63 +97,10 @@ export default class ProfileHeader extends React.Component {
                     {' '}
                     <i className="icon-dropdown"/>
                   </button>
-                  <ul className="dropdown-menu dropdown-menu-right">
-                    {canAdmin && (
-                        <li>
-                          <a href={activateMoreUrl}>
-                            {translate('quality_profiles.activate_more_rules')}
-                          </a>
-                        </li>
-                    )}
-                    <li>
-                      <a id="quality-profile-backup" href={backupUrl}>
-                        {translate('backup_verb')}
-                      </a>
-                    </li>
-                    <li>
-                      <Link
-                          to={{ pathname: '/compare', query: { key: profile.key } }}
-                          id="quality-profile-compare">
-                        {translate('compare')}
-                      </Link>
-                    </li>
-                    {canAdmin && (
-                        <li>
-                          <a id="quality-profile-copy"
-                             href="#"
-                             onClick={this.handleCopyClick.bind(this)}>
-                            {translate('copy')}
-                          </a>
-                        </li>
-                    )}
-                    {canAdmin && (
-                        <li>
-                          <a id="quality-profile-rename"
-                             href="#"
-                             onClick={this.handleRenameClick.bind(this)}>
-                            {translate('rename')}
-                          </a>
-                        </li>
-                    )}
-                    {canAdmin && !profile.isDefault && (
-                        <li>
-                          <a id="quality-profile-set-as-default"
-                             href="#"
-                             onClick={this.handleSetDefaultClick.bind(this)}>
-                            {translate('set_as_default')}
-                          </a>
-                        </li>
-                    )}
-                    {canAdmin && !profile.isDefault && (
-                        <li>
-                          <a id="quality-profile-delete"
-                             href="#"
-                             onClick={this.handleDeleteClick.bind(this)}>
-                            {translate('delete')}
-                          </a>
-                        </li>
-                    )}
-                  </ul>
+                  <ProfileActions
+                      profile={profile}
+                      canAdmin={this.props.canAdmin}
+                      updateProfiles={this.props.updateProfiles}/>
                 </div>
               </li>
             </ul>

diff --git a/server/sonar-web/src/main/js/apps/quality-profiles/home/ProfilesList.js b/server/sonar-web/src/main/js/apps/quality-profiles/home/ProfilesList.js
index 51f533c1861ff258f5a77ae73dfa2767233d1f53..ba333be7e1281ef5fbb8387f63cea1f814ddbff3 100644 (file)
--- a/server/sonar-web/src/main/js/apps/quality-profiles/home/ProfilesList.js
+++ b/server/sonar-web/src/main/js/apps/quality-profiles/home/ProfilesList.js
@@ -32,12 +32,18 @@ export default class ProfilesList extends React.Component {
   static propTypes = {
     profiles: ProfilesListType,
     languages: LanguagesListType,
-    location: RouterPropTypes.location
+    location: RouterPropTypes.location,
+    canAdmin: React.PropTypes.bool.isRequired,
+    updateProfiles: React.PropTypes.func.isRequired
   };
 
   renderProfiles (profiles) {
     return profiles.map(profile => (
-        <ProfilesListRow key={profile.key} profile={profile}/>
+        <ProfilesListRow
+            key={profile.key}
+            profile={profile}
+            canAdmin={this.props.canAdmin}
+            updateProfiles={this.props.updateProfiles}/>
     ));
   }
 
@@ -66,6 +72,9 @@ export default class ProfilesList extends React.Component {
             <th className="text-right nowrap">
               {translate('quality_profiles.list.used')}
             </th>
+            {this.props.canAdmin && (
+                <th>&nbsp;</th>
+            )}
           </tr>
         </thead>
     );

diff --git a/server/sonar-web/src/main/js/apps/quality-profiles/home/ProfilesListRow.js b/server/sonar-web/src/main/js/apps/quality-profiles/home/ProfilesListRow.js
index cda1762257c057c163cea15c0044064088c091c0..2ff6c99936c0084db0f40d8bbdb50ca023f04a12 100644 (file)
--- a/server/sonar-web/src/main/js/apps/quality-profiles/home/ProfilesListRow.js
+++ b/server/sonar-web/src/main/js/apps/quality-profiles/home/ProfilesListRow.js
@@ -21,6 +21,7 @@ import React from 'react';
 import shallowCompare from 'react-addons-shallow-compare';
 import ProfileLink from '../components/ProfileLink';
 import ProfileDate from '../components/ProfileDate';
+import ProfileActions from '../components/ProfileActions';
 import { ProfileType } from '../propTypes';
 import { translate } from '../../../helpers/l10n';
 import { getRulesUrl } from '../../../helpers/urls';
@@ -28,7 +29,9 @@ import { isStagnant } from '../utils';
 
 export default class ProfilesListRow extends React.Component {
   static propTypes = {
-    profile: ProfileType.isRequired
+    profile: ProfileType.isRequired,
+    canAdmin: React.PropTypes.bool.isRequired,
+    updateProfiles: React.PropTypes.func.isRequired
   };
 
   shouldComponentUpdate (nextProps, nextState) {
@@ -132,6 +135,19 @@ export default class ProfilesListRow extends React.Component {
           <td className="quality-profiles-table-date thin nowrap text-right">
             {this.renderUsageDate()}
           </td>
+          {this.props.canAdmin && (
+              <td className="quality-profiles-table-actions thin nowrap text-right">
+                <div className="dropdown">
+                  <button className="dropdown-toggle" data-toggle="dropdown">
+                    <i className="icon-dropdown"/>
+                  </button>
+                  <ProfileActions
+                      profile={this.props.profile}
+                      canAdmin={this.props.canAdmin}
+                      updateProfiles={this.props.updateProfiles}/>
+                </div>
+              </td>
+          )}
         </tr>
     );
   }