fix: Fix sonar metrics api url (#140)

Jira: EPMDEDP-13134
Related: #140
Change-Id: I2171f2e42e9f41d70b61d8457f622c92adb7bbc4

src/pages/edp-component-details/components/CodebaseBranchesList/components/CodebaseBranch/components/Details/index.tsx

@@ -71,7 +71,11 @@ export const Details = ({ codebaseData, codebaseBranchData, pipelineRuns }: Deta
       <Grid item xs={12}>
         <Grid container alignItems={'center'}>
           <Grid item>
-            <SonarQubeMetrics codebaseName={codebaseData.metadata.name} namespace={namespace} />
+            <SonarQubeMetrics
+              codebaseName={codebaseData.metadata.name}
+              branchName={codebaseBranchData.spec.branchName}
+              namespace={namespace}
+            />
           </Grid>
           <Grid item style={{ marginLeft: 'auto' }}>
             <DependencyTrackMetrics

src/services/link-creation/sonar/index.test.ts

@@ -1,3 +1,7 @@
+/**
+ * @jest-environment jsdom
+ */
+
 import { SonarQubeURLService } from './index';
 
 describe('testing link-creation SonarQubeURLService', () => {
@@ -33,9 +37,13 @@ describe('testing link-creation SonarQubeURLService', () => {
 
   it('should successfully create metrics api url based on given sonarURLOrigin and codebaseName params', () => {
     expect(
-      SonarQubeURLService.createMetricsApiUrl('https://sonar-test.com', 'test-codebase-name')
+      SonarQubeURLService.createMetricsApiUrl(
+        'https://sonar-test.com',
+        'test-codebase-name',
+        'test-branch-name'
+      )
     ).toEqual(
-      'https://sonar-test.com/api/measures/component?component=test-codebase-name&metricKeys=bugs,code_smells,coverage,duplicated_lines_density,ncloc,sqale_rating,alert_status,reliability_rating,security_hotspots,security_rating,sqale_index,vulnerabilities'
+      'https://sonar-test.com/api/measures/component?component=test-codebase-name&branch=test-branch-name&metricKeys=bugs,code_smells,coverage,duplicated_lines_density,ncloc,sqale_rating,alert_status,reliability_rating,security_hotspots,security_rating,sqale_index,vulnerabilities'
     );
   });
 });

src/services/link-creation/sonar/index.ts

@@ -20,11 +20,15 @@ export const SonarQubeURLService = {
 
     return `${sonarURLOrigin}/component_measures?id=${projectID}&metric=${metricName}`;
   },
-  createMetricsApiUrl: (sonarURLOrigin: string, codebaseName: string) => {
+  createMetricsApiUrl: (sonarURLOrigin: string, codebaseName: string, branchName: string) => {
     if (!sonarURLOrigin) {
       return undefined;
     }
 
-    return `${sonarURLOrigin}/api/measures/component?component=${codebaseName}&metricKeys=bugs,code_smells,coverage,duplicated_lines_density,ncloc,sqale_rating,alert_status,reliability_rating,security_hotspots,security_rating,sqale_index,vulnerabilities`;
+    return `${sonarURLOrigin}/api/measures/component?component=${window.encodeURIComponent(
+      codebaseName
+    )}&branch=${window.encodeURIComponent(
+      branchName
+    )}&metricKeys=bugs,code_smells,coverage,duplicated_lines_density,ncloc,sqale_rating,alert_status,reliability_rating,security_hotspots,security_rating,sqale_index,vulnerabilities`;
   },
 };

src/widgets/SonarQubeMetrics/hooks/useSonarQubeMetrics.ts

@@ -16,7 +16,11 @@ const getMetricsValues = (metrics: SonarQubeMetricsResponse) => {
   return values;
 };
 
-export const useSonarQubeMetrics = (sonarQubeBaseURL: string, codebaseName: string) => {
+export const useSonarQubeMetrics = (
+  sonarQubeBaseURL: string,
+  codebaseName: string,
+  branchName: string
+) => {
   const { namespace } = useParams<EDPComponentDetailsRouteParams>();
 
   const { data: ciSonarQubeToken } = useSecretByNameQuery<string>({
@@ -31,7 +35,11 @@ export const useSonarQubeMetrics = (sonarQubeBaseURL: string, codebaseName: stri
     },
   });
 
-  const fetchURL = LinkCreationService.sonar.createMetricsApiUrl(sonarQubeBaseURL, codebaseName);
+  const fetchURL = LinkCreationService.sonar.createMetricsApiUrl(
+    sonarQubeBaseURL,
+    codebaseName,
+    branchName
+  );
 
   const { data, isFetched } = useQuery(['sonarQubeMetrics', { codebaseName: codebaseName }], {
     queryFn: async () =>

src/widgets/SonarQubeMetrics/index.tsx

@@ -87,14 +87,14 @@ const getIconCodeSmells = (value: string) =>
     <Icon icon={'material-symbols:sentiment-dissatisfied-outline'} />
   );
 
-export const SonarQubeMetrics = ({ codebaseName, namespace }: SonarQubeMetricsProps) => {
+export const SonarQubeMetrics = ({ codebaseName, namespace, branchName }: SonarQubeMetricsProps) => {
   const classes = useStyles();
   const projectID = codebaseName;
 
   const { data: EDPComponentsURLS } = useEDPComponentsURLsQuery(namespace);
   const sonarQubeBaseURL = EDPComponentsURLS?.[SYSTEM_EDP_COMPONENTS.SONAR];
 
-  const { data: metrics, isLoading } = useSonarQubeMetrics(sonarQubeBaseURL, codebaseName);
+  const { data: metrics, isLoading } = useSonarQubeMetrics(sonarQubeBaseURL, codebaseName, branchName);
   const sonarConfigurationPage = Router.createRouteURL(routeEDPSonarIntegration.path);
   const history = useHistory();
 

src/widgets/SonarQubeMetrics/types.ts

@@ -37,4 +37,5 @@ export type DuplicationRating = {
 export interface SonarQubeMetricsProps {
   codebaseName: string;
   namespace: string;
+  branchName: string;
 }