From 434fc3987ef99ecff835309f9c29d9f108a750cb Mon Sep 17 00:00:00 2001
From: Fraser Tweedale <ftweedal@redhat.com>
Date: Tue, 5 Mar 2024 16:38:20 +1000
Subject: [PATCH 1/3] HMS-3595: add UUID column to domain list

Distinguish domains with same name by adding a UUID column to the
domain list.  This change assists test automation, in addition to
possibly helping confused users (although we do not think this
scenario will be common in real world use).

Fixes: https://issues.redhat.com/browse/HMS-3595
---
 src/Components/DomainList/DomainList.tsx | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/Components/DomainList/DomainList.tsx b/src/Components/DomainList/DomainList.tsx
index 61888e6..7a44a44 100644
--- a/src/Components/DomainList/DomainList.tsx
+++ b/src/Components/DomainList/DomainList.tsx
@@ -218,6 +218,7 @@ export const DomainList = () => {
         <Thead>
           <Tr ouiaId="TrDomainListHeader">
             <Th sort={getSortParams(0)}>Name</Th>
+            <Th>UUID</Th>
             <Th>Type</Th>
             <Th sort={getSortParams(3)}>Domain auto-join on launch</Th>
             <Th></Th>
@@ -246,6 +247,7 @@ export const DomainList = () => {
                       {domain.title}
                     </Button>
                   </Td>
+                  <Td>{domain.domain_id}</Td>
                   <Td>
                     <DomainListFieldType domain_type={domain.domain_type} />
                   </Td>

From 519e91306b86d7a875d6f0fe06b692e15938ce7c Mon Sep 17 00:00:00 2001
From: Fraser Tweedale <ftweedal@redhat.com>
Date: Wed, 6 Mar 2024 09:15:55 +1000
Subject: [PATCH 2/3] HMS-3610: rename RHSM ID column

The RHSM ID column is named "UUID", which conflicts with the UUID
field (soon to be added) for the domain registration itself.  To
avoid confusion, change the column heading to "Subscription Manager
ID".

Related: https://issues.redhat.com/browse/HMS-3610
---
 src/Routes/WizardPage/Components/PageReview/PageReview.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Routes/WizardPage/Components/PageReview/PageReview.tsx b/src/Routes/WizardPage/Components/PageReview/PageReview.tsx
index 39b4b19..4a03202 100644
--- a/src/Routes/WizardPage/Components/PageReview/PageReview.tsx
+++ b/src/Routes/WizardPage/Components/PageReview/PageReview.tsx
@@ -29,7 +29,7 @@ const PageReviewIpaServersHead = () => {
     <Thead>
       <Tr ouiaId="TrPageReviewIpaServers">
         <Th>Name</Th>
-        <Th>UUID</Th>
+        <Th>Subscription Manager ID</Th>
       </Tr>
     </Thead>
   );

From 088fba03fee0e6d798eb3c39271364b9c1668a11 Mon Sep 17 00:00:00 2001
From: Fraser Tweedale <ftweedal@redhat.com>
Date: Wed, 6 Mar 2024 09:15:55 +1000
Subject: [PATCH 3/3] HMS-3610: show domain UUID on wizard review page

Add the domain UUID in the review page of the registration wizard.
The change assists automated testing and provides more complete
information about the registration to the user.

A popover in the `<dt>` explains that this is a unique ID for this
directory/domain service registration.

Fixes: https://issues.redhat.com/browse/HMS-3610
---
 .../Components/PageReview/PageReview.tsx      | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/src/Routes/WizardPage/Components/PageReview/PageReview.tsx b/src/Routes/WizardPage/Components/PageReview/PageReview.tsx
index 4a03202..c5e9cf1 100644
--- a/src/Routes/WizardPage/Components/PageReview/PageReview.tsx
+++ b/src/Routes/WizardPage/Components/PageReview/PageReview.tsx
@@ -12,7 +12,16 @@
  */
 import React from 'react';
 
-import { DescriptionList, DescriptionListDescription, DescriptionListGroup, DescriptionListTerm, Title } from '@patternfly/react-core';
+import {
+  DescriptionList,
+  DescriptionListDescription,
+  DescriptionListGroup,
+  DescriptionListTerm,
+  DescriptionListTermHelpText,
+  DescriptionListTermHelpTextButton,
+  Popover,
+  Title,
+} from '@patternfly/react-core';
 
 import './PageReview.scss';
 import { Domain, DomainIpaServer } from '../../../../Api/api';
@@ -138,6 +147,14 @@ const PageReviewIpa = (props: PageReviewProps & { className?: string }) => {
           <DescriptionListTerm>Domain auto-join on launch</DescriptionListTerm>
           <DescriptionListDescription disabled>{auto_enrollment_description}</DescriptionListDescription>
         </DescriptionListGroup>
+        <DescriptionListGroup>
+          <DescriptionListTermHelpText>
+            <Popover headerContent={<div>UUID</div>} bodyContent={<div>Unique identifier for this registration</div>}>
+              <DescriptionListTermHelpTextButton>UUID</DescriptionListTermHelpTextButton>
+            </Popover>
+          </DescriptionListTermHelpText>
+          <DescriptionListDescription disabled>{props.domain.domain_id}</DescriptionListDescription>
+        </DescriptionListGroup>
       </DescriptionList>
     </>
   );