Merge branch 'main' into task/WP-62--change-file-upload-operation

TACC · Sep 21, 2023 · 56d1d5b · 56d1d5b
2 parents 67e628d + 224e370
commit 56d1d5b
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 0 deletions.
diff --git a/client/src/components/Onboarding/OnboardingAdmin.jsx b/client/src/components/Onboarding/OnboardingAdmin.jsx
@@ -120,6 +120,8 @@ const OnboardingAdminListUser = ({ user, viewLogCallback }) => {
           {index === 0 && (
             <td rowSpan={stepCount} className={styles.name}>
               {`${user.firstName} ${user.lastName}`}
+              <br />
+              <span className={styles.username}>{user.username}</span>
             </td>
           )}
           <td className={step.state === 'staffwait' ? styles.staffwait : ''}>

diff --git a/client/src/components/Onboarding/OnboardingAdmin.module.scss b/client/src/components/Onboarding/OnboardingAdmin.module.scss
@@ -87,6 +87,12 @@
   background-color: #c6c6c61a;
 }
 
+.username {
+  display: inline-block; /* needed to make margin-top work with span */
+  margin-top: 5px; /* adjust value as needed to create more space between fullname and username */
+  font-weight: bold;
+}
+
 /* HACK: This selector has knowledge of sibling component's internal markup */
 /* FAQ: Because we cannot pass `className`to <Pill> via <OnboardingStatus> */
 /* FAQ: Because <OnboardingStatus> has a superfluous root element */

diff --git a/client/src/components/Onboarding/OnboardingAdmin.test.js b/client/src/components/Onboarding/OnboardingAdmin.test.js
@@ -29,5 +29,6 @@ describe('Onboarding Admin View', () => {
 
     const { getByText } = renderOnboardingAdminComponent(store);
     expect(getByText(/First Last/)).toBeDefined();
+    expect(getByText(/username/)).toBeDefined();
   });
 });