SONAR-9566 Move "Members" tab after "Quality Gates" in organizations navbar

diff --git a/server/sonar-web/src/main/js/apps/organizations/navigation/OrganizationNavigation.js b/server/sonar-web/src/main/js/apps/organizations/navigation/OrganizationNavigation.js
index be4670195a13f3d5faa264f763dc975f45e9f189..e6c50799dbce09a90e573f923f2dcfa99647af41 100644 (file)
--- a/server/sonar-web/src/main/js/apps/organizations/navigation/OrganizationNavigation.js
+++ b/server/sonar-web/src/main/js/apps/organizations/navigation/OrganizationNavigation.js
@@ -212,11 +212,6 @@ export default class OrganizationNavigation extends React.PureComponent {
               {translate('issues.page')}
             </Link>
           </li>
-          <li>
-            <Link to={`/organizations/${organization.key}/members`} activeClassName="active">
-              {translate('organization.members.page')}
-            </Link>
-          </li>
           <li>
             <Link
               to={`/organizations/${organization.key}/quality_profiles`}
@@ -234,6 +229,11 @@ export default class OrganizationNavigation extends React.PureComponent {
               {translate('quality_gates.page')}
             </Link>
           </li>
+          <li>
+            <Link to={`/organizations/${organization.key}/members`} activeClassName="active">
+              {translate('organization.members.page')}
+            </Link>
+          </li>
           {this.renderExtensions(moreActive)}
           {organization.canAdmin && this.renderAdministration(adminActive)}
         </NavBarTabs>

diff --git a/server/sonar-web/src/main/js/apps/organizations/navigation/__tests__/__snapshots__/OrganizationNavigation-test.js.snap b/server/sonar-web/src/main/js/apps/organizations/navigation/__tests__/__snapshots__/OrganizationNavigation-test.js.snap
index e3acf365788aff90e7ab699340ccf00574a9d800..d5a3413b98b24749dfdf49cc02e0f00390198636 100644 (file)
--- a/server/sonar-web/src/main/js/apps/organizations/navigation/__tests__/__snapshots__/OrganizationNavigation-test.js.snap
+++ b/server/sonar-web/src/main/js/apps/organizations/navigation/__tests__/__snapshots__/OrganizationNavigation-test.js.snap
@@ -57,16 +57,6 @@ exports[`admin 1`] = `
         issues.page
       </Link>
     </li>
-    <li>
-      <Link
-        activeClassName="active"
-        onlyActiveOnIndex={false}
-        style={Object {}}
-        to="/organizations/foo/members"
-      >
-        organization.members.page
-      </Link>
-    </li>
     <li>
       <Link
         activeClassName="active"
@@ -101,6 +91,16 @@ exports[`admin 1`] = `
         quality_gates.page
       </Link>
     </li>
+    <li>
+      <Link
+        activeClassName="active"
+        onlyActiveOnIndex={false}
+        style={Object {}}
+        to="/organizations/foo/members"
+      >
+        organization.members.page
+      </Link>
+    </li>
     <li
       className="dropdown"
     >
@@ -241,16 +241,6 @@ exports[`regular user 1`] = `
         issues.page
       </Link>
     </li>
-    <li>
-      <Link
-        activeClassName="active"
-        onlyActiveOnIndex={false}
-        style={Object {}}
-        to="/organizations/foo/members"
-      >
-        organization.members.page
-      </Link>
-    </li>
     <li>
       <Link
         activeClassName="active"
@@ -285,6 +275,16 @@ exports[`regular user 1`] = `
         quality_gates.page
       </Link>
     </li>
+    <li>
+      <Link
+        activeClassName="active"
+        onlyActiveOnIndex={false}
+        style={Object {}}
+        to="/organizations/foo/members"
+      >
+        organization.members.page
+      </Link>
+    </li>
   </NavBarTabs>
 </ContextNavBar>
 `;
@@ -346,16 +346,6 @@ exports[`undeletable org 1`] = `
         issues.page
       </Link>
     </li>
-    <li>
-      <Link
-        activeClassName="active"
-        onlyActiveOnIndex={false}
-        style={Object {}}
-        to="/organizations/foo/members"
-      >
-        organization.members.page
-      </Link>
-    </li>
     <li>
       <Link
         activeClassName="active"
@@ -390,6 +380,16 @@ exports[`undeletable org 1`] = `
         quality_gates.page
       </Link>
     </li>
+    <li>
+      <Link
+        activeClassName="active"
+        onlyActiveOnIndex={false}
+        style={Object {}}
+        to="/organizations/foo/members"
+      >
+        organization.members.page
+      </Link>
+    </li>
     <li
       className="dropdown"
     >