feat: removing Join to explore Red Hat TPA section if the source is t…

…rustification (#340) Signed-off-by: Olga Lavtar <[email protected]>
RHEcosystemAppEng · Apr 25, 2024 · c432c3c · c432c3c
1 parent 04a1e0e
commit c432c3c
Show file tree

Hide file tree

Showing 12 changed files with 38 additions and 5 deletions.
diff --git a/src/main/java/com/redhat/exhort/integration/report/ReportTemplate.java b/src/main/java/com/redhat/exhort/integration/report/ReportTemplate.java
@@ -75,6 +75,7 @@ public Map<String, Object> setVariables(
       @Body Object report,
       @ExchangeProperty(Constants.ANONYMOUS_ID_PROPERTY) String anonymousId,
       @ExchangeProperty(Constants.RHDA_TOKEN_HEADER) String userId,
+      @ExchangeProperty(Constants.RHDA_SOURCE_HEADER) String rhdaSource,
       @ExchangeProperty(Constants.PROVIDER_PRIVATE_DATA_PROPERTY) List<String> providerPrivateData)
       throws JsonMappingException, JsonProcessingException, IOException {
 
@@ -87,6 +88,7 @@ public Map<String, Object> setVariables(
     params.put("snykSignup", snykSignup);
     params.put("cveIssueTemplate", cveIssuePathRegex);
     params.put("imageMapping", getImageMapping());
+    params.put("rhdaSource", rhdaSource);
     if (!disabled && writeKey.isPresent()) {
       params.put("userId", userId);
       params.put("anonymousId", anonymousId);

diff --git a/src/main/resources/freemarker/templates/generated/main.js b/src/main/resources/freemarker/templates/generated/main.js
diff --git a/ui/src/api/report.ts b/ui/src/api/report.ts
@@ -12,6 +12,7 @@ export interface AppData {
   userId?: string | null;
   anonymousId?: string | null;
   writeKey?: string | null;
+  rhdaSource?: string | null;
 }
 
 export interface ReportMap {

diff --git a/ui/src/components/SummaryCard.tsx b/ui/src/components/SummaryCard.tsx
@@ -27,6 +27,8 @@ import {useAppContext} from "../App";
 
 export const SummaryCard = ({report, isReportMap, purl}: { report: Report, isReportMap?: boolean, purl?: string }) => {
   const appContext = useAppContext();
+  const gridItemMd = appContext.rhdaSource !== 'trustification' ? 6 : undefined;
+
   return (
     <Grid hasGutter>
       <Title headingLevel="h3" size={TitleSizes['2xl']} style={{paddingLeft: '15px'}}>
@@ -79,7 +81,7 @@ export const SummaryCard = ({report, isReportMap, purl}: { report: Report, isRep
           <Divider/>
         </Card>
       </GridItem>
-      <GridItem md={6}>
+      <GridItem md={gridItemMd}>
         <Card isFlat>
           <DescriptionListGroup>
             <CardTitle component="h4">
@@ -137,7 +139,8 @@ export const SummaryCard = ({report, isReportMap, purl}: { report: Report, isRep
           </DescriptionListGroup>
         </Card>&nbsp;
       </GridItem>
-      <GridItem md={6}>
+      {appContext.rhdaSource !== 'trustification' && (
+        <GridItem md={6}>
         <Card isFlat>
           <DescriptionListGroup>
             <CardTitle component="h4">
@@ -166,6 +169,7 @@ export const SummaryCard = ({report, isReportMap, purl}: { report: Report, isRep
           </DescriptionListGroup>
         </Card>&nbsp;
       </GridItem>
+      )}
     </Grid>
   );
 };
diff --git a/ui/src/mocks/reportDocker.mock.ts b/ui/src/mocks/reportDocker.mock.ts
@@ -954,5 +954,6 @@ export const dockerReport: AppData = {
     "]",
   userId: 'testUser333',
   anonymousId: null,
-  writeKey: ''
+  writeKey: '',
+  rhdaSource: 'trustification'
 };
diff --git a/ui/src/mocks/reportMixed.mock.ts b/ui/src/mocks/reportMixed.mock.ts
@@ -7236,5 +7236,6 @@ export const reportMixed: AppData = {
     "]",
   userId: 'testUser003',
   anonymousId: null,
-  writeKey: ''
+  writeKey: '',
+  rhdaSource: 'vscode'
 };
diff --git a/ui/src/mocks/reportWithError.mock.ts b/ui/src/mocks/reportWithError.mock.ts
@@ -42,4 +42,8 @@ export const errorReport: AppData = {
     "    \"catalogUrl\": \"https://catalog.redhat.com/software/containers/ubi9/ubi-minimal/615bd9b4075b022acc111bf5?architecture=amd64&image=65a828e3cda4984705d45d26\"\n" +
     "  }\n" +
     "]",
+  userId: 'testUser003',
+  anonymousId: null,
+  writeKey: '',
+  rhdaSource: 'vscode'
 };
diff --git a/ui/src/mocks/reportWithForbidden.mock.ts b/ui/src/mocks/reportWithForbidden.mock.ts
@@ -42,4 +42,8 @@ export const forbiddenReport: AppData = {
     "    \"catalogUrl\": \"https://catalog.redhat.com/software/containers/ubi9/ubi-minimal/615bd9b4075b022acc111bf5?architecture=amd64&image=65a828e3cda4984705d45d26\"\n" +
     "  }\n" +
     "]",
+  userId: 'testUser003',
+  anonymousId: null,
+  writeKey: '',
+  rhdaSource: 'vscode'
 };
diff --git a/ui/src/mocks/reportWithToken.mock.ts b/ui/src/mocks/reportWithToken.mock.ts
@@ -449,4 +449,8 @@ export const withTokenReport: AppData = {
     "    \"catalogUrl\": \"https://catalog.redhat.com/software/containers/ubi9/ubi-minimal/615bd9b4075b022acc111bf5?architecture=amd64&image=65a828e3cda4984705d45d26\"\n" +
     "  }\n" +
     "]",
+  userId: 'testUser003',
+  anonymousId: null,
+  writeKey: '',
+  rhdaSource: 'vscode'
 };
diff --git a/ui/src/mocks/reportWithUnauthenticated.mock.ts b/ui/src/mocks/reportWithUnauthenticated.mock.ts
@@ -311,4 +311,8 @@ export const unauthenticatedReport: AppData = {
     "    \"catalogUrl\": \"https://catalog.redhat.com/software/containers/ubi9/ubi-minimal/615bd9b4075b022acc111bf5?architecture=amd64&image=65a828e3cda4984705d45d26\"\n" +
     "  }\n" +
     "]",
+  userId: 'testUser003',
+  anonymousId: null,
+  writeKey: '',
+  rhdaSource: 'vscode'
 };
diff --git a/ui/src/mocks/reportWithUnauthorized.mock.ts b/ui/src/mocks/reportWithUnauthorized.mock.ts
@@ -42,4 +42,8 @@ export const unauthorizedReport: AppData = {
     "    \"catalogUrl\": \"https://catalog.redhat.com/software/containers/ubi9/ubi-minimal/615bd9b4075b022acc111bf5?architecture=amd64&image=65a828e3cda4984705d45d26\"\n" +
     "  }\n" +
     "]",
+  userId: 'testUser003',
+  anonymousId: null,
+  writeKey: '',
+  rhdaSource: 'vscode'
 };
diff --git a/ui/src/mocks/reportWithoutToken.mock.ts b/ui/src/mocks/reportWithoutToken.mock.ts
@@ -397,4 +397,8 @@ export const withoutTokenReport: AppData = {
       "    \"catalogUrl\": \"https://catalog.redhat.com/software/containers/ubi9/ubi-minimal/615bd9b4075b022acc111bf5?architecture=amd64&image=65a828e3cda4984705d45d26\"\n" +
       "  }\n" +
       "]",
+    userId: 'testUser003',
+    anonymousId: null,
+    writeKey: '',
+    rhdaSource: 'vscode'
 };