From 70c07d4afc16135839c17332c58c9e135e8fb7ca Mon Sep 17 00:00:00 2001
From: Alfonso Salces <alfonso.salces@moodle.com>
Date: Mon, 20 Feb 2023 11:26:21 +0100
Subject: [PATCH] MOBILE-4077 ReportBuilder: Fix report name format

---
 .../components/report-column/report-column.html  |  5 +++--
 .../components/report-column/report-column.ts    |  1 +
 .../components/report-detail/report-detail.html  |  4 ++--
 .../components/report-detail/report-detail.ts    | 16 +++++++++++++++-
 .../report-summary/report-summary.html           |  5 ++---
 .../features/reportbuilder/pages/list/list.html  |  4 +++-
 .../reportbuilder/pages/report/report.html       |  4 +++-
 7 files changed, 29 insertions(+), 10 deletions(-)

diff --git a/src/core/features/reportbuilder/components/report-column/report-column.html b/src/core/features/reportbuilder/components/report-column/report-column.html
index b5799edb3..e0157e75e 100644
--- a/src/core/features/reportbuilder/components/report-column/report-column.html
+++ b/src/core/features/reportbuilder/components/report-column/report-column.html
@@ -4,9 +4,10 @@
     <ion-label>
         <p class="item-heading" *ngIf="columnIndex !== 0 || (columnIndex === 0 && showFirstTitle)"> {{ header }} </p>
         <h2 *ngIf="columnIndex === 0">
-            <core-format-text [text]="column" contextLevel="site" [contextInstanceId]="contextId"></core-format-text>
+            <core-format-text [text]="column" [contextLevel]="source" [contextInstanceId]="contextId"></core-format-text>
         </h2>
-        <core-format-text *ngIf="columnIndex !== 0" [text]="column" contextLevel="site" [contextInstanceId]="contextId"></core-format-text>
+        <core-format-text *ngIf="columnIndex !== 0" [text]="column" [contextLevel]="source" [contextInstanceId]="contextId">
+        </core-format-text>
     </ion-label>
     <ion-icon [class.expandable-status-icon-expanded]="!isExpanded" slot="end" aria-hidden="true" name="fas-chevron-up"
         class="expandable-status-icon" *ngIf="isExpandable" flip-rtl>
diff --git a/src/core/features/reportbuilder/components/report-column/report-column.ts b/src/core/features/reportbuilder/components/report-column/report-column.ts
index 4006702e0..ab7259eee 100644
--- a/src/core/features/reportbuilder/components/report-column/report-column.ts
+++ b/src/core/features/reportbuilder/components/report-column/report-column.ts
@@ -29,6 +29,7 @@ export class CoreReportBuilderReportColumnComponent implements OnInit {
     @Input() column!: string | number;
     @Input() contextId!: number;
     @Input() header!: string;
+    @Input() source!: string;
     @Output() onToggleRow: EventEmitter<number> = new EventEmitter();
 
     ngOnInit(): void {
diff --git a/src/core/features/reportbuilder/components/report-detail/report-detail.html b/src/core/features/reportbuilder/components/report-detail/report-detail.html
index 6ffd3a631..be704251f 100644
--- a/src/core/features/reportbuilder/components/report-detail/report-detail.html
+++ b/src/core/features/reportbuilder/components/report-detail/report-detail.html
@@ -14,7 +14,7 @@
                         <core-report-builder-report-column *ngFor="let column of row.columns | slice:0:row.isExpanded ?
                             row.columns.length : state.cardVisibleColumns; let columnIndex = index" [columnIndex]="columnIndex"
                             [rowIndex]="rowIndex" [isExpandable]="columnIndex === 0 && row.columns.length > state.cardVisibleColumns"
-                            [isExpanded]="row.isExpanded" [showFirstTitle]="state.cardviewShowFirstTitle"
+                            [isExpanded]="row.isExpanded" [showFirstTitle]="state.cardviewShowFirstTitle" [source]="source$ | async"
                             [contextId]="state.report.details.contextid" [header]="state.report.data.headers[columnIndex]" [column]="column"
                             (onToggleRow)="toggleRow(rowIndex)">
                         </core-report-builder-report-column>
@@ -34,7 +34,7 @@
                     <tbody>
                         <tr *ngFor="let row of state.report.data.rows">
                             <td *ngFor="let column of row.columns">
-                                <core-format-text [text]="column" [contextLevel]="'site'"
+                                <core-format-text [text]="column" [contextLevel]="source$ | async"
                                     [contextInstanceId]="state.report.details.contextid">
                                 </core-format-text>
                             </td>
diff --git a/src/core/features/reportbuilder/components/report-detail/report-detail.ts b/src/core/features/reportbuilder/components/report-detail/report-detail.ts
index 992277102..1e2ce0e09 100644
--- a/src/core/features/reportbuilder/components/report-detail/report-detail.ts
+++ b/src/core/features/reportbuilder/components/report-detail/report-detail.ts
@@ -25,7 +25,8 @@ import { CoreNavigator } from '@services/navigator';
 import { CoreScreen } from '@services/screen';
 import { CoreDomUtils } from '@services/utils/dom';
 import { CoreUtils } from '@services/utils/utils';
-import { BehaviorSubject } from 'rxjs';
+import { BehaviorSubject, Observable } from 'rxjs';
+import { map } from 'rxjs/operators';
 
 @Component({
     selector: 'core-report-builder-report-detail',
@@ -55,6 +56,19 @@ export class CoreReportBuilderReportDetailComponent implements OnInit {
         page: 0,
     });
 
+    source$: Observable<string>;
+
+    constructor() {
+        this.source$ = this.state$.pipe(
+            map(state => {
+                const splittedSource = state.report?.details.source.split('\\');
+                const source = splittedSource?.[splittedSource?.length - 1];
+
+                return source ?? 'system';
+            }),
+        );
+    }
+
     /**
      * @inheritdoc
      */
diff --git a/src/core/features/reportbuilder/components/report-summary/report-summary.html b/src/core/features/reportbuilder/components/report-summary/report-summary.html
index 162a46a58..ae9116769 100644
--- a/src/core/features/reportbuilder/components/report-summary/report-summary.html
+++ b/src/core/features/reportbuilder/components/report-summary/report-summary.html
@@ -39,9 +39,8 @@
         <ion-label>
             <p>
                 <ion-icon name="fas-info-circle" aria-hidden="true"></ion-icon>
-                <core-format-text [text]="'core.reportbuilder.filtersapplied' | translate: { $a: reportUrl }" contextLevel="report"
-                    [contextInstanceId]="reportDetail.id">
-                </core-format-text>
+                <core-format-text [text]="'core.reportbuilder.filtersapplied' | translate: { $a: reportUrl }" [filter]="false"
+                    [clean]="true"></core-format-text>
             </p>
         </ion-label>
     </ion-item>
diff --git a/src/core/features/reportbuilder/pages/list/list.html b/src/core/features/reportbuilder/pages/list/list.html
index 35539a9a4..066eb5352 100644
--- a/src/core/features/reportbuilder/pages/list/list.html
+++ b/src/core/features/reportbuilder/pages/list/list.html
@@ -17,7 +17,9 @@
             <ion-item [attr.aria-current]="reports.getItemAriaCurrent(report)" [detail]="true" class="ion-text-wrap" [button]="true"
                 *ngFor="let report of reports.items" (click)="reports.select(report)">
                 <ion-label>
-                    <p class="item-heading">{{ report.name }}</p>
+                    <p class="item-heading">
+                        <core-format-text [clean]="true" [text]="report.name" [filter]="false"></core-format-text>
+                    </p>
                     <p>{{ report.sourcename }}</p>
                 </ion-label>
             </ion-item>
diff --git a/src/core/features/reportbuilder/pages/report/report.html b/src/core/features/reportbuilder/pages/report/report.html
index 4dd499a70..f7151d711 100644
--- a/src/core/features/reportbuilder/pages/report/report.html
+++ b/src/core/features/reportbuilder/pages/report/report.html
@@ -9,7 +9,9 @@
             </ion-button>
         </ion-buttons>
         <ion-title *ngIf="reportDetail">
-            <h1> {{ reportDetail.name }} </h1>
+            <h1>
+                <core-format-text [clean]="true" [text]="reportDetail.name" [filter]="false"></core-format-text>
+            </h1>
             <p class="subheading"> {{ reportDetail.sourcename }} </p>
         </ion-title>
     </ion-toolbar>