SONAR-14111 Fix label in IDE selection dropdown when description is empty

diff --git a/server/sonar-web/src/main/js/apps/security-hotspots/components/HotspotOpenInIdeOverlay.tsx b/server/sonar-web/src/main/js/apps/security-hotspots/components/HotspotOpenInIdeOverlay.tsx
index 1df109c6faddb30bb8dc2af8c122e2763168899c..0e8fdce7fce40acde8e3d3bbedbdcacdba4d93de 100644 (file)
--- a/server/sonar-web/src/main/js/apps/security-hotspots/components/HotspotOpenInIdeOverlay.tsx
+++ b/server/sonar-web/src/main/js/apps/security-hotspots/components/HotspotOpenInIdeOverlay.tsx
@@ -30,12 +30,16 @@ export const HotspotOpenInIdeOverlay = ({
 }) =>
   ides.length > 1 ? (
     <ul className="menu">
-      {ides.map(ide => (
-        <li key={ide.port}>
-          <a href="#" onClick={() => onIdeSelected(ide)}>
-            {ide.ideName} - {ide.description}
-          </a>
-        </li>
-      ))}
+      {ides.map(ide => {
+        const { ideName, description } = ide;
+        const label = ideName + (description ? ` - ${description}` : '');
+        return (
+          <li key={ide.port}>
+            <a href="#" onClick={() => onIdeSelected(ide)}>
+              {label}
+            </a>
+          </li>
+        );
+      })}
     </ul>
   ) : null;

diff --git a/server/sonar-web/src/main/js/apps/security-hotspots/components/__tests__/HotspotOpenInIdeOverlay-test.tsx b/server/sonar-web/src/main/js/apps/security-hotspots/components/__tests__/HotspotOpenInIdeOverlay-test.tsx
index d131f21f4551095c40581fb65c8ed73b4d6d3d2f..b0d5ddeef54804904f8d59fe70fbc8126d9ef0e9 100644 (file)
--- a/server/sonar-web/src/main/js/apps/security-hotspots/components/__tests__/HotspotOpenInIdeOverlay-test.tsx
+++ b/server/sonar-web/src/main/js/apps/security-hotspots/components/__tests__/HotspotOpenInIdeOverlay-test.tsx
@@ -39,7 +39,7 @@ it('should render nothing with fewer than 2 IDE', () => {
 it('should render menu and select the right IDE', () => {
   const onIdeSelected = jest.fn();
   const ide1 = { port: 0, ideName: 'Polop', description: 'Plouf' };
-  const ide2 = { port: 1, ideName: 'Foo', description: 'Bar' };
+  const ide2 = { port: 1, ideName: 'Foo', description: '' };
   const wrapper = shallow(
     <HotspotOpenInIdeOverlay ides={[ide1, ide2]} onIdeSelected={onIdeSelected} />
   );

diff --git a/server/sonar-web/src/main/js/apps/security-hotspots/components/__tests__/__snapshots__/HotspotOpenInIdeOverlay-test.tsx.snap b/server/sonar-web/src/main/js/apps/security-hotspots/components/__tests__/__snapshots__/HotspotOpenInIdeOverlay-test.tsx.snap
index 7c4ffa6c9efff4950ff7ef701bb971e4643d553f..47edfaa8c8f79c83a0b6379f9526a915905f30dc 100644 (file)
--- a/server/sonar-web/src/main/js/apps/security-hotspots/components/__tests__/__snapshots__/HotspotOpenInIdeOverlay-test.tsx.snap
+++ b/server/sonar-web/src/main/js/apps/security-hotspots/components/__tests__/__snapshots__/HotspotOpenInIdeOverlay-test.tsx.snap
@@ -11,9 +11,7 @@ exports[`should render menu and select the right IDE 1`] = `
       href="#"
       onClick={[Function]}
     >
-      Polop
-       - 
-      Plouf
+      Polop - Plouf
     </a>
   </li>
   <li
@@ -24,8 +22,6 @@ exports[`should render menu and select the right IDE 1`] = `
       onClick={[Function]}
     >
       Foo
-       - 
-      Bar
     </a>
   </li>
 </ul>