MOBILE-4860 course: Handle current view in getAndOpenCourse

Author: crazyserver

src/addons/mod/subsection/services/handlers/index-link.ts

@@ -18,7 +18,6 @@ import { CoreContentLinksAction } from '@features/contentlinks/services/contentl
 import { CoreCourse } from '@features/course/services/course';
 import { CoreLoadings } from '@services/overlays/loadings';
 import { makeSingleton } from '@singletons';
-import { CoreSites } from '@services/sites';
 import { CoreCourseHelper } from '@features/course/services/course-helper';
 import { CoreAlerts } from '@services/overlays/alerts';
 import { ADDON_MOD_SUBSECTION_COMPONENT, ADDON_MOD_SUBSECTION_MODNAME } from '../../constants';
@@ -48,14 +47,7 @@ export class AddonModSubsectionIndexLinkHandlerService extends CoreContentLinksM
             sectionId,
         };
 
-        if (
-            (!siteId || siteId === CoreSites.getCurrentSiteId()) &&
-            CoreCourse.currentViewIsCourse(courseId)
-        ) {
-            CoreCourse.selectCourseTab('', pageParams);
-        } else {
-            await CoreCourseHelper.getAndOpenCourse(courseId, pageParams, siteId);
-        }
+        await CoreCourseHelper.getAndOpenCourse(courseId, pageParams, siteId);
     }
 
     /**

src/core/features/course/components/course-format/course-format.ts

@@ -180,9 +180,9 @@ export class CoreCourseFormatComponent implements OnInit, OnChanges, OnDestroy {
             let section: CoreCourseSection | undefined;
 
             if (data.sectionId !== undefined && this.sections) {
-                section = this.sections.find((section) => section.id == data.sectionId);
+                section = this.sections.find((section) => section.id === data.sectionId);
             } else if (data.sectionNumber !== undefined && this.sections) {
-                section = this.sections.find((section) => section.section == data.sectionNumber);
+                section = this.sections.find((section) => section.section === data.sectionNumber);
             }
 
             if (section) {

src/core/features/course/pages/index/index.ts

@@ -87,7 +87,7 @@ export default class CoreCourseIndexPage implements OnInit, OnDestroy {
                 // Select course contents.
                 this.tabsComponent?.selectByIndex(0);
             } else if (this.tabs) {
-                const index = this.tabs.findIndex((tab) => tab.name == data.name);
+                const index = this.tabs.findIndex((tab) => tab.name === data.name);
 
                 if (index >= 0) {
                     this.tabsComponent?.selectByIndex(index);

src/core/features/course/services/course-helper.ts

@@ -987,6 +987,15 @@ export class CoreCourseHelperProvider {
      * @returns Promise resolved when done.
      */
     async getAndOpenCourse(courseId: number, params?: Params, siteId?: string): Promise<void> {
+        siteId = siteId ?? CoreSites.getCurrentSiteId();
+
+        // Do not navigate if the course is already being displayed.
+        if (siteId === CoreSites.getCurrentSiteId() && CoreCourse.currentViewIsCourse(courseId)) {
+            CoreCourse.selectCourseTab(params?.selectedTab, params);
+
+            return;
+        }
+
         const modal = await CoreLoadings.show();
 
         let course: CoreCourseAnyCourseData | { id: number };
@@ -1473,7 +1482,7 @@ export class CoreCourseHelperProvider {
                 modNavOptions: options.modNavOptions,
             };
 
-            if (courseId == site.getSiteHomeId()) {
+            if (courseId === site.getSiteHomeId()) {
                 // Check if site home is available.
                 const isAvailable = await CoreSiteHome.isAvailable();
 

src/core/features/grades/services/grades-helper.ts

@@ -495,21 +495,13 @@ export class CoreGradesHelperProvider {
         } catch {
             try {
                 // Cannot get grade items or there's no need to.
-                if (userId && userId != currentUserId) {
+                if (userId && userId !== currentUserId) {
                     // View another user grades. Open the grades page directly.
                     await CorePromiseUtils.ignoreErrors(
                         CoreNavigator.navigateToSitePath(`/${GRADES_PAGE_NAME}/${courseId}`, { siteId }),
                     );
                 }
 
-                // View own grades. Check if we already are in the course index page.
-                if (CoreCourse.currentViewIsCourse(courseId)) {
-                    // Current view is this course, just select the grades tab.
-                    CoreCourse.selectCourseTab(CORE_GRADES_COURSE_OPTION_NAME);
-
-                    return;
-                }
-
                 // Open the course with the grades tab selected.
                 await CoreCourseHelper.getAndOpenCourse(courseId, { selectedTab: CORE_GRADES_COURSE_OPTION_NAME }, siteId);
             } catch {