SONAR-12634 Reorganize the branches & pull requests selection menu

6 files changed, 13 insertions, 13 deletions

diff --git a/server/sonar-web/src/main/js/apps/projectBaseline/__tests__/__snapshots__/BranchList-test.tsx.snap b/server/sonar-web/src/main/js/apps/projectBaseline/__tests__/__snapshots__/BranchList-test.tsx.snap
index df73eeeaa98..96c102bf2ec 100644
--- a/server/sonar-web/src/main/js/apps/projectBaseline/__tests__/__snapshots__/BranchList-test.tsx.snap
+++ b/server/sonar-web/src/main/js/apps/projectBaseline/__tests__/__snapshots__/BranchList-test.tsx.snap
@@ -29,7 +29,7 @@ exports[`should render correctly 1`] = `
         <td
           className="nowrap"
         >
-          <BranchIcon
+          <BranchLikeIcon
             branchLike={
               Object {
                 "analysisDate": "2018-01-01",
@@ -79,7 +79,7 @@ exports[`should render correctly 1`] = `
         <td
           className="nowrap"
         >
-          <BranchIcon
+          <BranchLikeIcon
             branchLike={
               Object {
                 "analysisDate": "2018-01-01",
@@ -115,7 +115,7 @@ exports[`should render correctly 1`] = `
         <td
           className="nowrap"
         >
-          <BranchIcon
+          <BranchLikeIcon
             branchLike={
               Object {
                 "analysisDate": "2018-01-01",
diff --git a/server/sonar-web/src/main/js/apps/projectBaseline/components/BranchList.tsx b/server/sonar-web/src/main/js/apps/projectBaseline/components/BranchList.tsx
index 9aa7ffdf8b9..94cdebad8f7 100644
--- a/server/sonar-web/src/main/js/apps/projectBaseline/components/BranchList.tsx
+++ b/server/sonar-web/src/main/js/apps/projectBaseline/components/BranchList.tsx
@@ -24,7 +24,7 @@ import ActionsDropdown, {
 import DeferredSpinner from 'sonar-ui-common/components/ui/DeferredSpinner';
 import { translate } from 'sonar-ui-common/helpers/l10n';
 import { listBranchesNewCodePeriod, resetNewCodePeriod } from '../../../api/newCodePeriod';
-import BranchIcon from '../../../components/icons-components/BranchIcon';
+import BranchLikeIcon from '../../../components/icons/BranchLikeIcon';
 import DateTimeFormatter from '../../../components/intl/DateTimeFormatter';
 import { isBranch, sortBranches } from '../../../helpers/branches';
 import BranchBaselineSettingModal from './BranchBaselineSettingModal';
@@ -176,7 +176,7 @@ export default class BranchList extends React.PureComponent<Props, State> {
             {branches.map(branch => (
               <tr key={branch.name}>
                 <td className="nowrap">
-                  <BranchIcon branchLike={branch} className="little-spacer-right" />
+                  <BranchLikeIcon branchLike={branch} className="little-spacer-right" />
                   {branch.name}
                   {branch.isMain && (
                     <div className="badge spacer-left">{translate('branches.main_branch')}</div>
diff --git a/server/sonar-web/src/main/js/apps/projectBranches/components/BranchLikeRowRenderer.tsx b/server/sonar-web/src/main/js/apps/projectBranches/components/BranchLikeRowRenderer.tsx
index 33c5be081cd..34439e3e2cb 100644
--- a/server/sonar-web/src/main/js/apps/projectBranches/components/BranchLikeRowRenderer.tsx
+++ b/server/sonar-web/src/main/js/apps/projectBranches/components/BranchLikeRowRenderer.tsx
@@ -24,7 +24,7 @@ import ActionsDropdown, {
 } from 'sonar-ui-common/components/controls/ActionsDropdown';
 import { translate } from 'sonar-ui-common/helpers/l10n';
 import BranchStatus from '../../../components/common/BranchStatus';
-import BranchIcon from '../../../components/icons-components/BranchIcon';
+import BranchLikeIcon from '../../../components/icons/BranchLikeIcon';
 import DateFromNow from '../../../components/intl/DateFromNow';
 import { getBranchLikeDisplayName, isMainBranch, isPullRequest } from '../../../helpers/branches';
 
@@ -41,7 +41,7 @@ export function BranchLikeRowRenderer(props: BranchLikeRowRendererProps) {
   return (
     <tr>
       <td>
-        <BranchIcon branchLike={branchLike} className="little-spacer-right" />
+        <BranchLikeIcon branchLike={branchLike} className="little-spacer-right" />
         {getBranchLikeDisplayName(branchLike)}
         {isMainBranch(branchLike) && (
           <div className="badge spacer-left">{translate('branches.main_branch')}</div>
diff --git a/server/sonar-web/src/main/js/apps/projectBranches/components/BranchLikeTableRenderer.tsx b/server/sonar-web/src/main/js/apps/projectBranches/components/BranchLikeTableRenderer.tsx
index 641ae3f21b6..2d4b6aa5b6f 100644
--- a/server/sonar-web/src/main/js/apps/projectBranches/components/BranchLikeTableRenderer.tsx
+++ b/server/sonar-web/src/main/js/apps/projectBranches/components/BranchLikeTableRenderer.tsx
@@ -42,7 +42,7 @@ export function BranchLikeTableRenderer(props: BranchLikeTableRendererProps) {
             <th>{tableTitle}</th>
             <th className="thin nowrap">{translate('status')}</th>
             <th className="thin nowrap text-right big-spacer-left">
-              {translate('branches.last_analysis_date')}
+              {translate('project_branch_pull_request.last_analysis_date')}
             </th>
             <th className="thin nowrap text-right">{translate('actions')}</th>
           </tr>
diff --git a/server/sonar-web/src/main/js/apps/projectBranches/components/__tests__/__snapshots__/BranchLikeRowRenderer-test.tsx.snap b/server/sonar-web/src/main/js/apps/projectBranches/components/__tests__/__snapshots__/BranchLikeRowRenderer-test.tsx.snap
index 53ca50c0bf8..3cc09481ada 100644
--- a/server/sonar-web/src/main/js/apps/projectBranches/components/__tests__/__snapshots__/BranchLikeRowRenderer-test.tsx.snap
+++ b/server/sonar-web/src/main/js/apps/projectBranches/components/__tests__/__snapshots__/BranchLikeRowRenderer-test.tsx.snap
@@ -3,7 +3,7 @@
 exports[`should render correctly for long lived branch 1`] = `
 <tr>
   <td>
-    <BranchIcon
+    <BranchLikeIcon
       branchLike={
         Object {
           "analysisDate": "2018-01-01",
@@ -59,7 +59,7 @@ exports[`should render correctly for long lived branch 1`] = `
 exports[`should render correctly for mai branch 1`] = `
 <tr>
   <td>
-    <BranchIcon
+    <BranchLikeIcon
       branchLike={
         Object {
           "analysisDate": "2018-01-01",
@@ -117,7 +117,7 @@ exports[`should render correctly for mai branch 1`] = `
 exports[`should render correctly for pull request 1`] = `
 <tr>
   <td>
-    <BranchIcon
+    <BranchLikeIcon
       branchLike={
         Object {
           "analysisDate": "2018-01-01",
@@ -177,7 +177,7 @@ exports[`should render correctly for pull request 1`] = `
 exports[`should render correctly for short lived branch 1`] = `
 <tr>
   <td>
-    <BranchIcon
+    <BranchLikeIcon
       branchLike={
         Object {
           "analysisDate": "2018-01-01",
diff --git a/server/sonar-web/src/main/js/apps/projectBranches/components/__tests__/__snapshots__/BranchLikeTableRenderer-test.tsx.snap b/server/sonar-web/src/main/js/apps/projectBranches/components/__tests__/__snapshots__/BranchLikeTableRenderer-test.tsx.snap
index 372b315da23..c26c41e5225 100644
--- a/server/sonar-web/src/main/js/apps/projectBranches/components/__tests__/__snapshots__/BranchLikeTableRenderer-test.tsx.snap
+++ b/server/sonar-web/src/main/js/apps/projectBranches/components/__tests__/__snapshots__/BranchLikeTableRenderer-test.tsx.snap
@@ -20,7 +20,7 @@ exports[`should render correctly 1`] = `
         <th
           className="thin nowrap text-right big-spacer-left"
         >
-          branches.last_analysis_date
+          project_branch_pull_request.last_analysis_date
         </th>
         <th
           className="thin nowrap text-right"