feat: use admin emails for mailtolink in contact help message

openedx · Apr 6, 2022 · 6905cfd · 6905cfd
1 parent 0c7b9fc
commit 6905cfd
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 9 deletions.
diff --git a/src/components/dashboard/SubscriptionExpirationModal.jsx b/src/components/dashboard/SubscriptionExpirationModal.jsx
@@ -20,7 +20,7 @@ export const SUBSCRIPTION_EXPIRING_MODAL_TITLE = 'Your subscription is expiring'
 
 const SubscriptionExpirationModal = () => {
   const {
-    enterpriseConfig: { uuid: enterpriseId, contactEmail },
+    enterpriseConfig: { uuid: enterpriseId, adminUsers },
     config,
   } = useContext(AppContext);
   const { subscriptionPlan } = useContext(UserSubsidyContext);
@@ -38,10 +38,12 @@ const SubscriptionExpirationModal = () => {
   };
 
   const renderContactText = () => {
+    const adminEmails = adminUsers.map(user => user.email);
     const contactText = 'contact your learning manager';
-    if (contactEmail) {
+
+    if (adminEmails.length > 0) {
       return (
-        <MailtoLink to={contactEmail} className="font-weight-bold">{contactText}</MailtoLink>
+        <MailtoLink to={adminEmails} className="font-weight-bold">{contactText}</MailtoLink>
       );
     }
     return contactText;

diff --git a/src/components/dashboard/sidebar/SupportInformation.jsx b/src/components/dashboard/sidebar/SupportInformation.jsx
@@ -11,19 +11,22 @@ const SupportInformation = ({ className }) => {
   const config = getConfig();
   const {
     enterpriseConfig: {
-      contactEmail,
+      adminUsers,
     },
   } = useContext(AppContext);
 
   const renderContactHelpText = () => {
     const message = CONTACT_HELP_EMAIL_MESSAGE;
-    if (contactEmail) {
+    const adminEmails = adminUsers.map(user => user.email);
+
+    if (adminEmails.length > 0) {
       return (
-        <MailtoLink to={contactEmail}>
+        <MailtoLink to={adminEmails}>
           {message}
         </MailtoLink>
       );
     }
+
     return message;
   };
 

diff --git a/src/components/dashboard/sidebar/tests/DashboardSidebar.test.jsx b/src/components/dashboard/sidebar/tests/DashboardSidebar.test.jsx
@@ -57,7 +57,10 @@ describe('<DashboardSidebar />', () => {
     },
   };
   const initialAppState = {
-    enterpriseConfig: { contactEmail: 'foo@foo.com' },
+    enterpriseConfig: {
+      contactEmail: 'foo@foo.com',
+      adminUsers: [{ email: 'admin@foo.com' }],
+    },
     name: 'Bears Inc.',
   };
   const userSubsidyStateWithSubscription = {
@@ -167,7 +170,7 @@ describe('<DashboardSidebar />', () => {
   test('Find a course button is not rendered when user has no offer or license subsidy', () => {
     renderWithRouter(
       <DashboardSidebarWithContext
-        initialAppState={{ enterpriseConfig: { slug: 'sluggykins' } }}
+        initialAppState={{ enterpriseConfig: { slug: 'sluggykins', adminUsers: [] } }}
         initialUserSubsidyState={defaultUserSubsidyState}
       />,
     );
@@ -177,7 +180,7 @@ describe('<DashboardSidebar />', () => {
   test('Find a course button is not rendered when user has subsidy but customer has search disabled', () => {
     renderWithRouter(
       <DashboardSidebarWithContext
-        initialAppState={{ enterpriseConfig: { disableSearch: true } }}
+        initialAppState={{ enterpriseConfig: { disableSearch: true, adminUsers: [] } }}
         initialUserSubsidyState={userSubsidyStateWithSubscription}
       />,
     );

diff --git a/src/components/dashboard/tests/Dashboard.test.jsx b/src/components/dashboard/tests/Dashboard.test.jsx
@@ -39,6 +39,7 @@ const defaultAppState = {
     name: 'BearsRUs',
     uuid: 'BearsRUs',
     disableSearch: false,
+    adminUsers: [{ email: 'admin@foo.com' }],
   },
   config: {
     LMS_BASE_URL: process.env.LMS_BASE_URL,
@@ -221,6 +222,7 @@ describe('<Dashboard />', () => {
         name: 'BearsRUs',
         uuid: 'BearsRUs',
         disableSearch: true,
+        adminUsers: [{ email: 'admin@foo.com' }],
       },
       config: {
         LMS_BASE_URL: process.env.LMS_BASE_URL,

diff --git a/src/components/enterprise-page/data/hooks.js b/src/components/enterprise-page/data/hooks.js
@@ -44,6 +44,7 @@ export function useEnterpriseCustomerConfig(enterpriseSlug, useCache = true) {
             name,
             uuid,
             slug,
+            adminUsers,
             contactEmail,
             hideCourseOriginalPrice,
             hideLaborMarketData,
@@ -53,6 +54,7 @@ export function useEnterpriseCustomerConfig(enterpriseSlug, useCache = true) {
             name,
             uuid,
             slug,
+            adminUsers,
             contactEmail,
             hideCourseOriginalPrice,
             hideLaborMarketData,