From 3e07ca4cf87984267afb75c4ebca5f0010d70e0a Mon Sep 17 00:00:00 2001 From: Kira Miller Date: Fri, 24 Jan 2025 21:24:35 +0000 Subject: [PATCH] fix: adding link to username and email --- .../EnterpriseCustomerUserDetail.jsx | 52 +++++++++---------- .../EnterpriseCustomerUserDetail.test.jsx | 2 + 2 files changed, 27 insertions(+), 27 deletions(-) diff --git a/src/Configuration/Customers/CustomerDetailView/EnterpriseCustomerUserDetail.jsx b/src/Configuration/Customers/CustomerDetailView/EnterpriseCustomerUserDetail.jsx index 942a5e96..de960972 100644 --- a/src/Configuration/Customers/CustomerDetailView/EnterpriseCustomerUserDetail.jsx +++ b/src/Configuration/Customers/CustomerDetailView/EnterpriseCustomerUserDetail.jsx @@ -1,14 +1,13 @@ import React from 'react'; import PropTypes from 'prop-types'; import { - Hyperlink, Icon, IconButton, Stack, Chip, + Chip, Hyperlink, Icon, IconButton, Stack, } from '@openedx/paragon'; -import { Person, Check, Timelapse } from '@openedx/paragon/icons'; +import { Check, Person, Timelapse } from '@openedx/paragon/icons'; + import ROUTES from '../../../data/constants/routes'; -export const EnterpriseCustomerUserDetail = ({ - row, -}) => { +export const EnterpriseCustomerUserDetail = ({ row }) => { const user = row.original.enterpriseCustomerUser; let memberDetails; const iconLink = `${ROUTES.SUPPORT_TOOLS_TABS.SUB_DIRECTORY.LEARNER_INFORMATION}/?email=${user?.email}`; @@ -48,12 +47,19 @@ export const EnterpriseCustomerUserDetail = ({ if (user?.username) { memberDetails = ( -
-

- {user?.username} -

-

{user?.email}

-
+ +
+

{user?.username}

+

{user?.email}

+
+
); } else { memberDetails = ( @@ -72,17 +78,13 @@ export const EnterpriseCustomerUserDetail = ({ export const AdministratorCell = ({ row }) => { if (row.original?.pendingEnterpriseCustomerUser?.isPendingAdmin) { - return ( - - Pending - - ); + return Pending; } return (
- {row.original?.roleAssignments?.includes('enterprise_admin') ? : null} + {row.original?.roleAssignments?.includes('enterprise_admin') ? ( + + ) : null}
); }; @@ -91,18 +93,14 @@ export const LearnerCell = ({ row }) => { if (!row.original?.pendingEnterpriseCustomerUser?.isPendingLearner) { return (
- {row.original?.roleAssignments?.includes('enterprise_learner') ? : null} + {row.original?.roleAssignments?.includes('enterprise_learner') ? ( + + ) : null}
); } - return ( - - Pending - - ); + return Pending; }; EnterpriseCustomerUserDetail.propTypes = { diff --git a/src/Configuration/Customers/CustomerDetailView/tests/EnterpriseCustomerUserDetail.test.jsx b/src/Configuration/Customers/CustomerDetailView/tests/EnterpriseCustomerUserDetail.test.jsx index 30a8decb..96f49b2e 100644 --- a/src/Configuration/Customers/CustomerDetailView/tests/EnterpriseCustomerUserDetail.test.jsx +++ b/src/Configuration/Customers/CustomerDetailView/tests/EnterpriseCustomerUserDetail.test.jsx @@ -24,6 +24,7 @@ describe('EnterpriseCustomerUserDetail', () => { expect(screen.getByText('ash ketchum')).toBeInTheDocument(); expect(screen.getByText('ash@ketchum.org')).toBeInTheDocument(); expect(screen.getByTestId('icon-hyperlink')).toHaveAttribute('href', '/learner-information/?email=ash@ketchum.org'); + expect(screen.getByTestId('username-email-hyperlink')).toHaveAttribute('href', '/learner-information/?email=ash@ketchum.org'); }); it('renders pending enterprise customer detail', () => { @@ -37,6 +38,7 @@ describe('EnterpriseCustomerUserDetail', () => { render(); expect(screen.getByText('pending@customer.org')).toBeInTheDocument(); expect(screen.queryByTestId('icon-hyperlink')).not.toBeInTheDocument(); + expect(screen.queryByTestId('username-email-hyperlink')).not.toBeInTheDocument(); }); it('renders AdministratorCell there is a pending admin', () => {