Skip to content

Commit 3781835

Browse files
MOBILE-4077 ReportBuilder: Fix reports broken when receive a number
1 parent dac5834 commit 3781835

File tree

2 files changed

+10
-4
lines changed

2 files changed

+10
-4
lines changed

src/core/features/reportbuilder/components/report-column/report-column.ts

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,25 +12,31 @@
1212
// See the License for the specific language governing permissions and
1313
// limitations under the License.
1414

15-
import { Component, EventEmitter, Input, Output } from '@angular/core';
15+
import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core';
1616

1717
@Component({
1818
selector: 'core-report-builder-report-column',
1919
templateUrl: './report-column.html',
2020
styleUrls: ['./report-column.scss'],
2121
})
22-
export class CoreReportBuilderReportColumnComponent {
22+
export class CoreReportBuilderReportColumnComponent implements OnInit {
2323

2424
@Input() isExpanded = false;
2525
@Input() isExpandable = false;
2626
@Input() showFirstTitle = false;
2727
@Input() columnIndex!: number;
2828
@Input() rowIndex!: number;
29-
@Input() column!: string;
29+
@Input() column!: string | number;
3030
@Input() contextId!: number;
3131
@Input() header!: string;
3232
@Output() onToggleRow: EventEmitter<number> = new EventEmitter();
3333

34+
ngOnInit(): void {
35+
if (typeof this.column === 'number') {
36+
this.column = this.column.toString();
37+
}
38+
}
39+
3440
/**
3541
* Emits row click
3642
*/

src/core/features/reportbuilder/services/reportbuilder.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -232,7 +232,7 @@ export interface CoreReportBuilderRetrieveReportMapped extends Omit<CoreReportBu
232232
export type CoreReportBuilderReportDataWSResponse = {
233233
headers: string[]; // Headers.
234234
rows: { // Rows.
235-
columns: string[]; // Columns.
235+
columns: string | number[]; // Columns.
236236
isExpanded: boolean;
237237
}[];
238238
totalrowcount: number; // Totalrowcount.

0 commit comments

Comments
 (0)