From fc98bf57965fae174a7e04f402cf557284815288 Mon Sep 17 00:00:00 2001
From: Alfonso Salces <alfonso.salces@moodle.com>
Date: Tue, 7 Feb 2023 12:57:22 +0100
Subject: [PATCH] MOBILE-4077 ReportBuilder: Sort reports list and update lang
 strings

---
 scripts/langindex.json                                      | 6 +++---
 src/core/features/reportbuilder/classes/reports-source.ts   | 2 +-
 src/core/features/reportbuilder/lang.json                   | 2 +-
 src/core/features/reportbuilder/pages/list/list.html        | 2 +-
 .../reportbuilder/services/handlers/reportbuilder.ts        | 4 ++--
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/scripts/langindex.json b/scripts/langindex.json
index 325e56d42..b451b9660 100644
--- a/scripts/langindex.json
+++ b/scripts/langindex.json
@@ -1653,9 +1653,9 @@
   "core.currentdevice": "local_moodlemobileapp",
   "core.custom": "form",
   "core.reportbuilder.modifiedby": "tool_reportbuilder",
-  "core.reportbuilder.reportstab": "tool_reportbuilder",
-  "core.reportbuilder.reportsource": "tool_reportbuilder",
-  "core.reportbuilder.timecreated": "tool_reportbuilder",
+  "core.reportbuilder.reports": "moodle",
+  "core.reportbuilder.reportsource": "moodle",
+  "core.reportbuilder.timecreated": "moodle",
   "core.reportbuilder.showcolumns": "local_moodlemobileapp",
   "core.reportbuilder.hidecolumns": "local_moodlemobileapp",
   "core.datastoredoffline": "local_moodlemobileapp",
diff --git a/src/core/features/reportbuilder/classes/reports-source.ts b/src/core/features/reportbuilder/classes/reports-source.ts
index 31449689f..04f5e27ae 100644
--- a/src/core/features/reportbuilder/classes/reports-source.ts
+++ b/src/core/features/reportbuilder/classes/reports-source.ts
@@ -41,7 +41,7 @@ export class CoreReportBuilderReportsSource extends CoreRoutedItemsManagerSource
      */
     protected setItems(reports: CoreReportBuilderReport[], hasMoreItems: boolean): void {
         const sortedReports = reports.slice(0);
-        reports.sort((a, b) => a.timecreated < b.timecreated ? 1 : -1);
+        sortedReports.sort((a, b) => a.timemodified < b.timemodified ? 1 : -1);
         super.setItems(sortedReports, hasMoreItems);
     }
 
diff --git a/src/core/features/reportbuilder/lang.json b/src/core/features/reportbuilder/lang.json
index 299a7a10f..3ff518a5f 100644
--- a/src/core/features/reportbuilder/lang.json
+++ b/src/core/features/reportbuilder/lang.json
@@ -1,6 +1,6 @@
 {
     "modifiedby": "Modified by",
-    "reportstab": "Reports",
+    "reports": "Reports",
     "reportsource": "Report source",
     "timecreated": "Time created",
     "showcolumns": "Show columns",
diff --git a/src/core/features/reportbuilder/pages/list/list.html b/src/core/features/reportbuilder/pages/list/list.html
index 832fc49d5..85295b1b6 100644
--- a/src/core/features/reportbuilder/pages/list/list.html
+++ b/src/core/features/reportbuilder/pages/list/list.html
@@ -4,7 +4,7 @@
             <ion-back-button [text]="'core.back' | translate"></ion-back-button>
         </ion-buttons>
         <ion-title>
-            <h1>{{ 'core.reportbuilder.reportstab' | translate }}</h1>
+            <h1>{{ 'core.reportbuilder.reports' | translate }}</h1>
         </ion-title>
     </ion-toolbar>
 </ion-header>
diff --git a/src/core/features/reportbuilder/services/handlers/reportbuilder.ts b/src/core/features/reportbuilder/services/handlers/reportbuilder.ts
index 4a463f46e..9aacb15ab 100644
--- a/src/core/features/reportbuilder/services/handlers/reportbuilder.ts
+++ b/src/core/features/reportbuilder/services/handlers/reportbuilder.ts
@@ -45,11 +45,11 @@ export class CoreReportBuilderHandlerService implements CoreUserProfileHandler {
         return {
             class: 'core-report-builder',
             icon: 'fa-list-alt',
-            title: 'core.reportbuilder.reportstab',
+            title: 'core.reportbuilder.reports',
             action: async (event): Promise<void> => {
                 event.preventDefault();
                 event.stopPropagation();
-                await CoreNavigator.navigate(`/${CoreReportBuilderHandlerService.PAGE_NAME}`);
+                await CoreNavigator.navigateToSitePath(CoreReportBuilderHandlerService.PAGE_NAME);
             },
         };
     }