Merge pull request #4702 from alfonso-salces/MOBILE-4961

MOBILE-4961 site: Remove onboarding screen

Author: crazyserver

local_moodleappbehat/tests/behat/behat_app.php

@@ -38,7 +38,6 @@ class behat_app extends behat_app_helper {
     /** @var array Config overrides */
     protected $appconfig = [
         'disableUserTours' => true,
-        'enableonboarding' => false,
         'toastDurations' => [ // Extend toast durations in Behat so they don't disappear too soon.
             'short' => 7500,
             'long' => 10000,
@@ -129,10 +128,7 @@ protected function is_in_login_page(): bool {
      * @throws DriverException Issue with configuration or feature file
      * @throws dml_exception Problem with Moodle setup
      * @throws ExpectationException Problem with resizing window
-     * @deprecated since 5.1 "I launch the app :runtime" is deprecated, use "I launch the app" instead and
-     * "Given the app has the following config:
-     * | enableonboarding | true |"
-     * to enable onboarding in tests that need it.
+     * @deprecated since 5.1 "I launch the app :runtime" is deprecated, use "I launch the app" instead
      */
     public function i_launch_the_app(string $runtime = '') {
         // Go to page and prepare browser for app.

moodle.config.json

@@ -95,7 +95,6 @@
     "privacypolicy": "https://moodle.net/moodle-app-privacy/",
     "notificoncolor": "#f98012",
     "enableanalytics": false,
-    "enableonboarding": true,
     "forceColorScheme": "",
     "forceLoginLogo": false,
     "showTopLogo": "hidden",

scripts/langindex.json

@@ -2187,16 +2187,6 @@
   "core.login.mustconfirm": "moodle",
   "core.login.newaccount": "moodle",
   "core.login.notloggedin": "local_moodlemobileapp",
-  "core.login.onboardingcreatemanagecourses": "local_moodlemobileapp",
-  "core.login.onboardingenrolmanagestudents": "local_moodlemobileapp",
-  "core.login.onboardinggetstarted": "local_moodlemobileapp",
-  "core.login.onboardingialreadyhaveasite": "local_moodlemobileapp",
-  "core.login.onboardingimalearner": "local_moodlemobileapp",
-  "core.login.onboardingimaneducator": "local_moodlemobileapp",
-  "core.login.onboardingineedasite": "local_moodlemobileapp",
-  "core.login.onboardingprovidefeedback": "local_moodlemobileapp",
-  "core.login.onboardingtoconnect": "local_moodlemobileapp",
-  "core.login.onboardingwelcome": "local_moodlemobileapp",
   "core.login.or": "local_moodlemobileapp",
   "core.login.password": "moodle",
   "core.login.passwordforgotten": "moodle",

src/core/features/login/components/site-onboarding/site-onboarding.html

@@ -13,7 +13,6 @@
 // limitations under the License.
 
 export const GET_STARTED_URL = 'https://moodle.com';
-export const ONBOARDING_DONE = 'onboarding_done';
 export const FAQ_QRCODE_INFO_DONE = 'qrcode_info_done';
 export const FAQ_URL_IMAGE_HTML = '<img src="assets/img/login/faq_url.png" role="presentation" alt="">';
 export const FAQ_QRCODE_IMAGE_HTML = '<img src="assets/img/login/faq_qrcode.png" role="presentation" alt="">';

src/core/features/login/components/site-onboarding/site-onboarding.scss

@@ -76,16 +76,6 @@
     "mustconfirm": "You need to confirm your account",
     "newaccount": "New account",
     "notloggedin": "You need to be logged in.",
-    "onboardingcreatemanagecourses": "Create & manage your courses",
-    "onboardingenrolmanagestudents": "Enrol & manage your students",
-    "onboardinggetstarted": "Get started with Moodle",
-    "onboardingialreadyhaveasite": "I already have a Moodle site",
-    "onboardingimalearner": "I'm a learner",
-    "onboardingimaneducator": "I'm an educator",
-    "onboardingineedasite": "I need a Moodle site",
-    "onboardingprovidefeedback": "Provide timely feedback",
-    "onboardingtoconnect": "To connect to the Moodle App you'll need a Moodle site",
-    "onboardingwelcome": "Welcome to the Moodle App!",
     "or": "Or",
     "password": "Password",
     "passwordforgotten": "Forgotten password",

src/core/features/login/components/site-onboarding/site-onboarding.ts

@@ -16,7 +16,6 @@ import { Component, OnInit, ElementRef, inject, viewChild } from '@angular/core'
 import { FormBuilder, FormGroup, ValidatorFn, AbstractControl, ValidationErrors } from '@angular/forms';
 
 import { CoreNetwork } from '@services/network';
-import { CoreConfig } from '@services/config';
 import { CoreSites, CoreSiteCheckResponse, CoreLoginSiteInfo, CoreSitesDemoSiteData } from '@services/sites';
 import { CoreUtils } from '@static/utils';
 import {
@@ -39,10 +38,8 @@ import { CoreErrorAccordion } from '@services/error-accordion';
 import { CoreUserSupportConfig } from '@features/user/classes/support/support-config';
 import { CoreUserGuestSupportConfig } from '@features/user/classes/support/guest-support-config';
 import { CoreLoginError } from '@classes/errors/loginerror';
-import { CorePlatform } from '@services/platform';
 import { CoreReferrer } from '@services/referrer';
 import { CoreSitesFactory } from '@services/sites-factory';
-import { ONBOARDING_DONE } from '@features/login/constants';
 import { CoreUnauthenticatedSite } from '@classes/sites/unauthenticated-site';
 import { CoreKeyboard } from '@static/keyboard';
 import { CoreModals } from '@services/overlays/modals';
@@ -111,17 +108,8 @@ export default class CoreLoginSitePage implements OnInit {
         } else {
             url = await this.consumeInstallReferrerUrl() ?? '';
 
-            const showOnboarding = CoreConstants.CONFIG.enableonboarding && !CorePlatform.isIOS();
-
             if (url) {
                 this.connect(url);
-
-                if (showOnboarding) {
-                    // Don't display onboarding in this case, and don't display it again later.
-                    CoreConfig.set(ONBOARDING_DONE, 1);
-                }
-            } else if (showOnboarding) {
-                this.initOnboarding();
             }
         }
 
@@ -196,20 +184,6 @@ export default class CoreLoginSitePage implements OnInit {
         return url;
     }
 
-    /**
-     * Initialize and show onboarding if needed.
-     *
-     * @returns Promise resolved when done.
-     */
-    protected async initOnboarding(): Promise<void> {
-        const onboardingDone = await CoreConfig.get(ONBOARDING_DONE, false);
-
-        if (!onboardingDone) {
-            // Check onboarding.
-            this.showOnboarding();
-        }
-    }
-
     /**
      * Extend info of Login Site Info to get UI tweaks.
      *
@@ -279,19 +253,6 @@ export default class CoreLoginSitePage implements OnInit {
         });
     }
 
-    /**
-     * Show an onboarding modal.
-     */
-    async showOnboarding(): Promise<void> {
-        const { CoreLoginSiteOnboardingComponent } =
-            await import('@features/login/components/site-onboarding/site-onboarding');
-
-        await CoreModals.openModal({
-            component: CoreLoginSiteOnboardingComponent,
-            cssClass: 'core-modal-fullscreen',
-        });
-    }
-
     /**
      * Try to connect to a site.
      *

src/core/features/login/constants.ts

@@ -17,31 +17,6 @@ Feature: Test basic usage of login in app
       | student2 | C1     | student        |
       | teacher1 | C1     | editingteacher |
 
-  Scenario: Skip on boarding
-    Given the app has the following config:
-     | enableonboarding | true |
-    When I launch the app
-    Then I should find "Welcome to the Moodle App!" in the app
-
-    When I press "Skip" in the app
-    Then I should not find "Skip" in the app
-    And I should find "Connect to Moodle" in the app
-
-  Scenario: Complete on boarding
-    Given the app has the following config:
-     | enableonboarding | true |
-    When I launch the app
-    Then I should find "Welcome to the Moodle App!" in the app
-
-    When I press "I'm an educator" in the app
-    And I press "I need a Moodle site" in the app
-    And I press "Get started with Moodle" in the app
-    And I switch to the browser tab opened by the app
-    And I close the browser tab opened by the app
-    Then I should find "Connect to Moodle" in the app
-    When I restart the app
-    Then I should find "Connect to Moodle" in the app
-
   Scenario: Add a new account in the app & Site name in displayed when adding a new account
     When I launch the app
     And I set the field "Your site" to "$WWWROOT" in the app