feat(helpBubble): add Academy link and update text of existing links (#…

…5437)

jsapp/js/components/support/helpBubble.tsx

@@ -148,11 +148,9 @@ class HelpBubble extends React.Component<{}, HelpBubbleState> {
               onClick={this.close.bind(this)}
             >
               <i className='k-icon k-icon-help-articles' />
-              <header>{t('KoboToolbox Help Center')}</header>
+              <header>{t('Help Center')}</header>
               <p>
-                {t(
-                  'A vast collection of user support articles and tutorials related to Kobo'
-                )}
+                {t('Find answers in our extensive library of user support articles and tutorials.')}
               </p>
             </bem.HelpBubble__rowAnchor>
           )}
@@ -164,12 +162,25 @@ class HelpBubble extends React.Component<{}, HelpBubbleState> {
               href={envStore.data.community_url}
               onClick={this.close.bind(this)}
             >
-              <i className='k-icon k-icon-forum' />
-              <header>{t('KoboToolbox Community Forum')}</header>
+              <i className='k-icon k-icon-help-forum' />
+              <header>{t('Community Forum')}</header>
               <p>
-                {t(
-                  'Post your questions to get answers from experienced Kobo users around the world'
-                )}
+                {t('Connect with thousands of KoboToolbox users, ask questions, and share ideas.')}
+              </p>
+            </bem.HelpBubble__rowAnchor>
+          )}
+
+          {envStore.isReady && envStore.data.academy_url && (
+            <bem.HelpBubble__rowAnchor
+              m='link'
+              target='_blank'
+              href={envStore.data.academy_url}
+              onClick={this.close.bind(this)}
+            >
+              <i className='k-icon k-icon-help-academy' />
+              <header>{t('KoboToolbox Academy')}</header>
+              <p>
+                {t('Enroll in an online self-paced course designed by Kobo staff experts.')}
               </p>
             </bem.HelpBubble__rowAnchor>
           )}

jsapp/js/envStore.ts

@@ -13,6 +13,7 @@ export interface EnvironmentResponse {
   support_email: string;
   support_url: string;
   community_url: string;
+  academy_url: string;
   project_metadata_fields: EnvStoreFieldItem[];
   user_metadata_fields: UserMetadataField[];
   sector_choices: string[][];
@@ -101,6 +102,7 @@ export class EnvStoreData {
   public support_email = '';
   public support_url = '';
   public community_url = '';
+  public academy_url = '';
   public min_retry_time = 4; // seconds
   public max_retry_time: number = 4 * 60; // seconds
   public project_metadata_fields: EnvStoreFieldItem[] = [];
@@ -210,6 +212,7 @@ class EnvStore {
     this.data.support_email = response.support_email;
     this.data.support_url = response.support_url;
     this.data.community_url = response.community_url;
+    this.data.academy_url = response.academy_url;
     this.data.min_retry_time = response.frontend_min_retry_time;
     this.data.max_retry_time = response.frontend_max_retry_time;
     this.data.project_metadata_fields = response.project_metadata_fields;

kobo/settings/base.py

@@ -217,6 +217,12 @@
         env.str('KOBO_SUPPORT_URL', 'https://support.kobotoolbox.org/'),
         'URL for "KoboToolbox Help Center"',
     ),
+    'ACADEMY_URL': (
+        env.str(
+            'KOBO_ACADEMY_URL', 'https://academy.kobotoolbox.org/'
+        ),
+        'URL for "KoboToolbox Community Forum"',
+    ),
     'COMMUNITY_URL': (
         env.str(
             'KOBO_COMMUNITY_URL', 'https://community.kobotoolbox.org/'
@@ -669,6 +675,7 @@
         'SOURCE_CODE_URL',
         'SUPPORT_EMAIL',
         'SUPPORT_URL',
+        'ACADEMY_URL',
         'COMMUNITY_URL',
         'SYNCHRONOUS_EXPORT_CACHE_MAX_AGE',
         'EXPOSE_GIT_REV',

kpi/tests/api/test_api_environment.py

@@ -55,6 +55,7 @@ def setUp(self):
             'source_code_url': constance.config.SOURCE_CODE_URL,
             'support_email': constance.config.SUPPORT_EMAIL,
             'support_url': constance.config.SUPPORT_URL,
+            'academy_url': constance.config.ACADEMY_URL,
             'community_url': constance.config.COMMUNITY_URL,
             'frontend_min_retry_time': constance.config.FRONTEND_MIN_RETRY_TIME,
             'frontend_max_retry_time': constance.config.FRONTEND_MAX_RETRY_TIME,
@@ -316,7 +317,7 @@ def test_free_tier_override_uses_organization_owner_join_date(
     def test_social_apps(self):
         # GET mutates state, call it first to test num queries later
         self.client.get(self.url, format='json')
-        queries = FuzzyInt(18, 27)
+        queries = FuzzyInt(18, 28)
         with self.assertNumQueries(queries):
             response = self.client.get(self.url, format='json')
         self.assertEqual(response.status_code, status.HTTP_200_OK)
@@ -335,7 +336,7 @@ def test_social_apps(self):
     def test_social_apps_no_custom_data(self):
         SocialAppCustomData.objects.all().delete()
         self.client.get(self.url, format='json')
-        queries = FuzzyInt(18, 27)
+        queries = FuzzyInt(18, 28)
         with self.assertNumQueries(queries):
             response = self.client.get(self.url, format='json')
 

kpi/views/environment.py

@@ -46,6 +46,7 @@ class EnvironmentView(APIView):
         'SOURCE_CODE_URL',
         'SUPPORT_EMAIL',
         'SUPPORT_URL',
+        'ACADEMY_URL',
         'COMMUNITY_URL',
         'FRONTEND_MIN_RETRY_TIME',
         'FRONTEND_MAX_RETRY_TIME',