From 60fef4c5701f00e34e02eca59b4e991ccf913de9 Mon Sep 17 00:00:00 2001
From: Wouter Admiraal <wouter.admiraal@sonarsource.com>
Date: Thu, 11 May 2023 16:53:01 +0200
Subject: [PATCH] SONAR-19197 Show code variants on hotspots

---
 .../api/mocks/SecurityHotspotServiceMock.ts   |  1 +
 .../__tests__/SecurityHotspotsApp-it.tsx      | 20 ++++++++++++++++---
 .../components/HotspotHeader.tsx              | 17 +++++++++++++---
 .../src/main/js/types/security-hotspots.ts    |  1 +
 4 files changed, 33 insertions(+), 6 deletions(-)

diff --git a/server/sonar-web/src/main/js/api/mocks/SecurityHotspotServiceMock.ts b/server/sonar-web/src/main/js/api/mocks/SecurityHotspotServiceMock.ts
index 32ba90c0426..849d45ed7a5 100644
--- a/server/sonar-web/src/main/js/api/mocks/SecurityHotspotServiceMock.ts
+++ b/server/sonar-web/src/main/js/api/mocks/SecurityHotspotServiceMock.ts
@@ -319,6 +319,7 @@ export default class SecurityHotspotServiceMock {
         key: 'test-2',
         status: HotspotStatus.TO_REVIEW,
         message: "'2' is a magic number.",
+        codeVariants: ['variant 1', 'variant 2'],
       }),
     ];
     this.canChangeStatus = true;
diff --git a/server/sonar-web/src/main/js/apps/security-hotspots/__tests__/SecurityHotspotsApp-it.tsx b/server/sonar-web/src/main/js/apps/security-hotspots/__tests__/SecurityHotspotsApp-it.tsx
index 0ee7b5b5e74..9bfe9fb9085 100644
--- a/server/sonar-web/src/main/js/apps/security-hotspots/__tests__/SecurityHotspotsApp-it.tsx
+++ b/server/sonar-web/src/main/js/apps/security-hotspots/__tests__/SecurityHotspotsApp-it.tsx
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
-import { screen, within } from '@testing-library/react';
+import { act, screen, within } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 import React from 'react';
 import { Route } from 'react-router-dom';
@@ -82,6 +82,15 @@ afterEach(() => {
   handler.reset();
 });
 
+describe('rendering', () => {
+  it('should render code variants correctly', async () => {
+    renderSecurityHotspotsApp(
+      'security_hotspots?id=guillaume-peoch-sonarsource_benflix_AYGpXq2bd8qy4i0eO9ed&hotspots=test-2'
+    );
+    expect(await screen.findAllByText('variant 1, variant 2')).toHaveLength(2);
+  });
+});
+
 it('should navigate when comming from SonarLint', async () => {
   // On main branch
   const rtl = renderSecurityHotspotsApp(
@@ -188,7 +197,9 @@ it('should be able to change the status of a hotspot', async () => {
   await user.click(screen.getByRole('textbox', { name: 'hotspots.status.add_comment' }));
   await user.keyboard(comment);
 
-  await user.click(ui.changeStatus.get());
+  await act(async () => {
+    await user.click(ui.changeStatus.get());
+  });
 
   expect(setSecurityHotspotStatus).toHaveBeenLastCalledWith('test-1', {
     comment: 'COMMENT-TEXT',
@@ -218,7 +229,10 @@ it('should remember the comment when toggling change status panel for the same s
   await user.keyboard(comment);
 
   // Close the panel
-  await user.keyboard('{Escape}');
+  await act(async () => {
+    await user.keyboard('{Escape}');
+  });
+
   // Check panel is closed
   expect(ui.panel.query()).not.toBeInTheDocument();
 
diff --git a/server/sonar-web/src/main/js/apps/security-hotspots/components/HotspotHeader.tsx b/server/sonar-web/src/main/js/apps/security-hotspots/components/HotspotHeader.tsx
index 07dacf5f64e..9f1283cb2f6 100644
--- a/server/sonar-web/src/main/js/apps/security-hotspots/components/HotspotHeader.tsx
+++ b/server/sonar-web/src/main/js/apps/security-hotspots/components/HotspotHeader.tsx
@@ -19,6 +19,7 @@
  */
 import React from 'react';
 import Link from '../../../components/common/Link';
+import Tooltip from '../../../components/controls/Tooltip';
 import { IssueMessageHighlighting } from '../../../components/issue/IssueMessageHighlighting';
 import { translate } from '../../../helpers/l10n';
 import { getRuleUrl } from '../../../helpers/urls';
@@ -52,9 +53,19 @@ export function HotspotHeader(props: HotspotHeaderProps) {
           hotspot={hotspot}
           onStatusChange={(statusOption) => props.onUpdateHotspot(true, statusOption)}
         />
-        <div className="display-flex-end">
-          <div className="display-inline-flex-center it__hs-assignee">
-            <div className="big-spacer-right">{`${translate('assignee')}: `}</div>
+        <div className="display-flex-end display-flex-column abs-width-240">
+          {hotspot.codeVariants && hotspot.codeVariants.length > 0 && (
+            <Tooltip overlay={hotspot.codeVariants.join(', ')}>
+              <div className="spacer-bottom display-flex-center">
+                <div>{translate('issues.facet.codeVariants')}:</div>
+                <div className="text-bold spacer-left spacer-right text-ellipsis">
+                  {hotspot.codeVariants.join(', ')}
+                </div>
+              </div>
+            </Tooltip>
+          )}
+          <div className="display-flex-center it__hs-assignee">
+            <div className="big-spacer-right">{translate('assignee')}:</div>
             <Assignee hotspot={hotspot} onAssigneeChange={props.onUpdateHotspot} />
           </div>
         </div>
diff --git a/server/sonar-web/src/main/js/types/security-hotspots.ts b/server/sonar-web/src/main/js/types/security-hotspots.ts
index edeafdd8f91..f759c59ac21 100644
--- a/server/sonar-web/src/main/js/types/security-hotspots.ts
+++ b/server/sonar-web/src/main/js/types/security-hotspots.ts
@@ -87,6 +87,7 @@ export interface Hotspot {
   authorUser: UserBase;
   canChangeStatus: boolean;
   changelog: IssueChangelog[];
+  codeVariants?: string[];
   comment: HotspotComment[];
   component: HotspotComponent;
   creationDate: string;
-- 
2.39.5