Unverified Commit 975117f3 authored by Rajesh Kumaravel's avatar Rajesh Kumaravel Committed by GitHub
Browse files

Merge pull request #8331 from 5Amogh/release-5.0.0

Issue #SB-31008 fix: disabling the graphs and tables feature
Showing with 12 additions and 12 deletions
+12 -12
...@@ -39,7 +39,7 @@ ...@@ -39,7 +39,7 @@
</ng-template> </ng-template>
<ng-container *ngTemplateOutlet="programDataset"></ng-container> <ng-container *ngTemplateOutlet="programDataset"></ng-container>
</mat-tab> </mat-tab>
<mat-tab appTelemetryInteract> <!-- <mat-tab appTelemetryInteract>
<ng-template mat-tab-label> <ng-template mat-tab-label>
<span class="font-weight-bold">{{resourceService?.frmelmnts?.lbl?.graphs}}</span> <span class="font-weight-bold">{{resourceService?.frmelmnts?.lbl?.graphs}}</span>
</ng-template> </ng-template>
...@@ -50,7 +50,7 @@ ...@@ -50,7 +50,7 @@
<span class="font-weight-bold">{{resourceService?.frmelmnts?.lbl?.table}}</span> <span class="font-weight-bold">{{resourceService?.frmelmnts?.lbl?.table}}</span>
</ng-template> </ng-template>
<ng-container *ngTemplateOutlet="table"></ng-container> <ng-container *ngTemplateOutlet="table"></ng-container>
</mat-tab> </mat-tab> -->
</mat-tab-group> </mat-tab-group>
</div> </div>
......
...@@ -311,16 +311,16 @@ export class DatasetsComponent implements OnInit, OnDestroy { ...@@ -311,16 +311,16 @@ export class DatasetsComponent implements OnInit, OnDestroy {
"reportconfig.report_status": "active" "reportconfig.report_status": "active"
} }
this.dashboardReport$ = this.renderReport(filtersForReport).pipe( // this.dashboardReport$ = this.renderReport(filtersForReport).pipe(
catchError(err => { // catchError(err => {
console.error('Error while rendering report', err); // console.error('Error while rendering report', err);
this.noResultMessage = { // this.noResultMessage = {
'messageText': _.get(err, 'messageText') || 'messages.stmsg.m0131' // 'messageText': _.get(err, 'messageText') || 'messages.stmsg.m0131'
}; // };
this.noResult = true; // this.noResult = true;
return of({}); // return of({});
}) // })
); // );
if (types && types.length > 0) { if (types && types.length > 0) {
types.forEach(element => { types.forEach(element => {
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment