From 247d64255fe3143c6a2dbbba92b72737649d5ddd Mon Sep 17 00:00:00 2001
From: Harinder Singh <harinder.singh@navi.com>
Date: Thu, 21 Nov 2024 21:29:27 +0530
Subject: [PATCH] INFRA-3971 | Harinder | Updating display tables for AWS
 CUSTOM resource

---
 .../JustInTimeAccessPage.tsx                  | 25 ++++++++++++++++---
 .../just-in-time-access/structs.tsx           |  2 ++
 src/components/just-in-time-access/utils.tsx  | 17 +++++++++++++
 3 files changed, 40 insertions(+), 4 deletions(-)

diff --git a/src/components/just-in-time-access/JustInTimeAccessPage.tsx b/src/components/just-in-time-access/JustInTimeAccessPage.tsx
index 1685c4d..2c7ffd9 100644
--- a/src/components/just-in-time-access/JustInTimeAccessPage.tsx
+++ b/src/components/just-in-time-access/JustInTimeAccessPage.tsx
@@ -159,6 +159,11 @@ const JustInTimeAccessPage = () => {
               validationSchema={justInTimeAccessValidationSchema}
               onSubmit={values => {
                 values.grantAt = new Date(values.grantAt).getTime();
+                const tempList = values.awsResourceNames.toString();
+                values.awsResourceNames = tempList.split(',');
+                console.log(values.awsResourceNames);
+                console.log(Array.isArray(values.awsResourceNames));
+                console.log(typeof values.awsResourceNames);
                 submitJustInTimeAccessRequest(values);
               }}
             >
@@ -309,8 +314,14 @@ const Requests = () => {
     },
     {
       key: 'Requested For',
-      value: ({ resourceType, resourceAction }: RequestsInfo) =>
-        renderResourceTypeAndAction(resourceType, resourceAction, classes),
+      value: ({ resourceType, awsResourceType, resourceAction, awsResourceNames }: RequestsInfo) =>
+        renderResourceTypeAndAction(
+          resourceType,
+          awsResourceType,
+          resourceAction,
+          awsResourceNames,
+          classes,
+        ),
     },
     {
       key: 'Justification',
@@ -438,8 +449,14 @@ const Reviews = () => {
     },
     {
       key: 'Requested For',
-      value: ({ resourceType, resourceAction }: ReviewsInfo) =>
-        renderResourceTypeAndAction(resourceType, resourceAction, classes),
+      value: ({ resourceType, awsResourceType, resourceAction, awsResourceNames }: ReviewsInfo) =>
+        renderResourceTypeAndAction(
+          resourceType,
+          awsResourceType,
+          resourceAction,
+          awsResourceNames,
+          classes,
+        ),
     },
     {
       key: 'Justification',
diff --git a/src/components/just-in-time-access/structs.tsx b/src/components/just-in-time-access/structs.tsx
index 36bd711..2d83673 100644
--- a/src/components/just-in-time-access/structs.tsx
+++ b/src/components/just-in-time-access/structs.tsx
@@ -41,6 +41,8 @@ export type ReviewsInfo = {
   vertical: string;
   environment: string;
   resourceType: string;
+  awsResourceType: string;
+  awsResourceNames: Array<string>;
   resourceAction: string;
   grantWindow: number;
   grantAt: number;
diff --git a/src/components/just-in-time-access/utils.tsx b/src/components/just-in-time-access/utils.tsx
index d01988c..266fe10 100644
--- a/src/components/just-in-time-access/utils.tsx
+++ b/src/components/just-in-time-access/utils.tsx
@@ -19,9 +19,26 @@ export const renderGrantDuration = (
 
 export const renderResourceTypeAndAction = (
   resourceType: string,
+  awsResourceType: string,
   resourceAction: string,
+  awsResourceNames: Array<string>,
   classes: ClassNameMap,
 ): React.ReactElement => {
+  if (resourceType === 'AWS-CUSTOM') {
+    return (
+      <div className={classes.resourceTypeAndAction}>
+        <div>
+          {resourceType +
+            ' - ' +
+            awsResourceType +
+            ' with ' +
+            resourceAction +
+            ' on ' +
+            awsResourceNames.join(', ')}
+        </div>
+      </div>
+    );
+  }
   return (
     <div className={classes.resourceTypeAndAction}>
       <div>{resourceType + ' - ' + resourceAction}</div>