Merge branch 'kiram15/ENT-9526' of github.com:openedx/frontend-app-ad…

…min-portal into kiram15/ENT-9526
openedx · Jan 7, 2025 · 6833024 · 6833024
2 parents dca7c56 + 3158181
commit 6833024
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 5 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/src/components/Admin/AIAnalyticsSummary.jsx b/src/components/Admin/AIAnalyticsSummary.jsx
@@ -19,7 +19,7 @@ const AnalyticsDetailCard = ({
   const messages = defineMessages({
     errorMessage: {
       id: 'adminPortal.analyticsCardText.errorMessage',
-      defaultMessage: 'An error occurred: {error_message}',
+      defaultMessage: 'We encountered an issue while fetching analytics data. Kindly try again later or contact support for assistance. (Error: {error_message})',
       description: 'Message shown to the user in case of error returned byt analytics API.',
       values: { error_message: error?.message },
     },
@@ -38,7 +38,7 @@ const AnalyticsDetailCard = ({
         </Badge>
         <Stack gap={1} direction="horizontal">
           <p className="card-text text-justify small">
-            ${
+            {
               error ? (
                 <FormattedMessage {...messages.errorMessage} />
               ) : (

diff --git a/src/components/Admin/index.jsx b/src/components/Admin/index.jsx
@@ -423,6 +423,8 @@ class Admin extends React.Component {
       searchBudgetQuery: queryParams.get('budget_uuid') || '',
     };
 
+    const hasCompleteInsights = insights?.learner_engagement && insights?.learner_progress;
+
     return (
       <main role="main" className="learner-progress-report">
         {!loading && !error && !this.hasAnalyticsData() ? <EnterpriseAppSkeleton /> : (
@@ -445,7 +447,7 @@ class Admin extends React.Component {
               <div className="row mt-4">
                 <div className="col">
                   {insightsLoading ? <AIAnalyticsSummarySkeleton /> : (
-                    insights && <AIAnalyticsSummary enterpriseId={enterpriseId} />
+                    hasCompleteInsights && <AIAnalyticsSummary enterpriseId={enterpriseId} />
                   )}
                 </div>
               </div>

diff --git a/src/components/PeopleManagement/CreateGroupModalContent.jsx b/src/components/PeopleManagement/CreateGroupModalContent.jsx
@@ -94,7 +94,7 @@ const CreateGroupModalContent = ({
     });
     setMemberInviteMetadata(inviteMetadata);
     if (inviteMetadata.canInvite) {
-      onEmailAddressesChange(learnerEmails, { canInvite: true });
+      onEmailAddressesChange(inviteMetadata.lowerCasedEmails, { canInvite: true });
     } else {
       onEmailAddressesChange([]);
     }