Merge branch 'main' into epic/TUP-700-core-components-node-pkg

TACC · Dec 10, 2024 · f37ea4d · f37ea4d
2 parents 2dd44c2 + 3d35537
commit f37ea4d
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 7 deletions.
diff --git a/libs/tup-components/src/auth/LoginComponent/LoginComponent.spec.tsx b/libs/tup-components/src/auth/LoginComponent/LoginComponent.spec.tsx
@@ -27,7 +27,7 @@ describe('LoginComponent', () => {
       value: { replace: mockNavigate },
     });
     const { getByLabelText, getByRole } = testRender(<LoginComponent />);
-    const username = getByLabelText(/Username/);
+    const username = getByLabelText(/Username or Email/);
     const password = getByLabelText(/Password/);
     const submit = getByRole('button');
     await act(async () => {

diff --git a/libs/tup-components/src/auth/LoginComponent/LoginComponent.tsx b/libs/tup-components/src/auth/LoginComponent/LoginComponent.tsx
@@ -156,9 +156,9 @@ const LoginComponent: React.FC<LoginProps> = ({ className }) => {
           <Field
             component={FormikInput}
             name="username"
-            label="Username"
+            label="Username or Email"
             type="text"
-            autoComplete="username"
+            autoComplete="username email"
             required
           />
           <Field

diff --git a/libs/tup-components/src/mfa/Mfa.module.css b/libs/tup-components/src/mfa/Mfa.module.css
@@ -126,6 +126,10 @@ label.qr-code-alt-label {
     .mfa-message {
         width: max-content;
     }
+
+    .mfa-unpair-message {
+        font-size: var(--global-font-size--medium)
+    }
 
     /* HACK: Position .mfa-message at the bottom and "outside" of the panels */
     .pairing-container *:not(:only-child) .mfa-message {

diff --git a/libs/tup-components/src/mfa/MfaUnpairingView.tsx b/libs/tup-components/src/mfa/MfaUnpairingView.tsx
@@ -111,7 +111,9 @@ const MfaUnpairingView: React.FC = () => {
           </form>
 
           {!sendChallengeSuccess && !unpairCode && (
-            <p className={styles['mfa-message']}>
+            <p
+              className={`${styles['mfa-message']} ${styles['mfa-unpair-message']}`}
+            >
               Alternatively,{' '}
               <Button type="link" onClick={() => unpairWithEmail(null)}>
                 unpair via email

diff --git a/libs/tup-components/src/projects/details/ProjectDetails.tsx b/libs/tup-components/src/projects/details/ProjectDetails.tsx
@@ -82,7 +82,7 @@ const IncreaseAllocation: React.FC<{ chargeCode: string }> = ({
 }) => {
   const href = chargeCode.startsWith('TG-')
     ? 'https://allocations.access-ci.org/requests'
-    : 'https://submit-tacc.xras.org/';
+    : 'https://submit-tacc.xras.org/requests';
   return (
     <a href={href} target="_blank" rel="noreferrer">
       <Button type="link">Increase Existing Allocation</Button>

diff --git a/libs/tup-components/src/tickets/TicketCreateModal/TicketCreateForm.tsx b/libs/tup-components/src/tickets/TicketCreateModal/TicketCreateForm.tsx
@@ -121,9 +121,9 @@ export const TicketCreateForm: React.FC = () => {
             <option>Vista(vista.tacc.utexas.edu)</option>
             <option>Vislab(stallion.tacc.utexas.edu)</option>
             <option>Cyclone(cyclone.tacc.utexas.edu)</option>
-            <option>Cloud and Interactive Computing (Agave API)</option>
-            <option>Cloud and Interactive Computing (Abaco API)</option>
+            <option>Cloud and Interactive Computing (Tapis API)</option>
             <option>Cloud and Interactive Computing (JupyterHub)</option>
+            <option>Cloud and Interactive Computing (Other)</option>
             <option>Other</option>
           </Field>
           <Field