feat(targets): include target ID in dropdown

cryostatio · Nov 2, 2022 · 922edd8 · 922edd8
1 parent ff8f6f7
commit 922edd8
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/src/app/Shared/Services/Target.service.tsx b/src/app/Shared/Services/Target.service.tsx
@@ -58,6 +58,7 @@ export const indexOfTarget = (arr: Target[], target: Target): number => {
 };
 
 export interface Target {
+  id?: string; // present in responses, but we do not need to provide it in requests
   connectUrl: string;
   alias: string;
   labels?: {};

diff --git a/src/app/TargetSelect/TargetSelect.tsx b/src/app/TargetSelect/TargetSelect.tsx
@@ -242,7 +242,7 @@ export const TargetSelect: React.FunctionComponent<TargetSelectProps> = (props)
       ].concat(
         targets.map((t: Target) => (
           <SelectOption key={t.connectUrl} value={t} isPlaceholder={false}>
-            {!t.alias || t.alias === t.connectUrl ? `${t.connectUrl}` : `${t.alias} (${t.connectUrl})`}
+            {!t.alias || t.alias === t.connectUrl ? `${t.connectUrl}: ${t.id}` : `${t.alias} (${t.connectUrl}): ${t.id}`}
           </SelectOption>
         ))
       ),

diff --git a/src/test/TargetSelect/TargetSelect.test.tsx b/src/test/TargetSelect/TargetSelect.test.tsx
@@ -55,14 +55,15 @@ const cryostatAnnotation = {
   REALM: CUSTOM_TARGETS_REALM,
 };
 const mockFooTarget: Target = {
+  id: 'abcd',
   connectUrl: mockFooConnectUrl,
   alias: 'fooTarget',
   annotations: {
     cryostat: cryostatAnnotation,
     platform: {},
   },
 };
-const mockBarTarget: Target = { ...mockFooTarget, connectUrl: mockBarConnectUrl, alias: 'barTarget' };
+const mockBarTarget: Target = { ...mockFooTarget, id: 'efgh', connectUrl: mockBarConnectUrl, alias: 'barTarget' };
 const mockBazTarget: Target = { connectUrl: mockBazConnectUrl, alias: 'bazTarget' };
 
 const history = createMemoryHistory();
@@ -150,8 +151,8 @@ describe('<TargetSelect />', () => {
     userEvent.click(screen.getByLabelText('Options menu'));
     expect(screen.getByLabelText('Select Target')).toBeInTheDocument();
     expect(screen.getByText(`Select target...`)).toBeInTheDocument();
-    expect(screen.getByText(`fooTarget (service:jmx:rmi://someFooUrl)`)).toBeInTheDocument();
-    expect(screen.getByText(`barTarget (service:jmx:rmi://someBarUrl)`)).toBeInTheDocument();
+    expect(screen.getByText(`fooTarget (service:jmx:rmi://someFooUrl): abcd`)).toBeInTheDocument();
+    expect(screen.getByText(`barTarget (service:jmx:rmi://someBarUrl): efgh`)).toBeInTheDocument();
     expect(screen.getByText('2')).toBeInTheDocument(); // Number of discoverable targets
   });