Resolved null-pointer-exception while running raptor test cases

Issue-ID: PORTAL-725

Change-Id: I31b57e200b98e616f32f73e1b6a14682555fca94
Signed-off-by: mravula <mr257h@att.com>

4 files changed, 64 insertions, 34 deletions

diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/pages/analytics/Report_List/header-tabs-component/header-tabs.component.html b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/pages/analytics/Report_List/header-tabs-component/header-tabs.component.html
index 29ad0dcf..a240c634 100644
--- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/pages/analytics/Report_List/header-tabs-component/header-tabs.component.html
+++ b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/pages/analytics/Report_List/header-tabs-component/header-tabs.component.html
@@ -1,34 +1,22 @@
-<!-- <nav mat-tab-nav-bar>
-        <a mat-tab-link
-           *ngFor="let link of navLinks"
-           [routerLink]="link.path"
-           routerLinkActive #rla="routerLinkActive"
-           [active]="rla.isActive">
-          {{link.label}}
-        </a>
-      </nav> -->
-    
-    
-    <!-- 
-    <app-pilot-page></app-pilot-page> -->
-    
-    
-<!-- <router-outlet></router-outlet> -->
 
-<!-- <mat-tab-group>
-  <mat-tab *ngFor="let tab of asyncTabs | async">
-    <ng-template mat-tab-label>{{tab.label}}</ng-template>
-    {{tab.content}}
-  </mat-tab>
-</mat-tab-group> -->
-
-<mat-tab-group>
-  <mat-tab label="Definition"><ng-template matTabContent><app-definition [reportId]="reportId" [reportMode]="reportMode"></app-definition></ng-template></mat-tab>
-  <mat-tab label="SQL"><ng-template matTabContent><app-sqlcomponent [reportId]="reportId" [reportMode]="reportMode"></app-sqlcomponent></ng-template></mat-tab>
-  <mat-tab label="Colums"><ng-template matTabContent><app-columns [reportId]="reportId"></app-columns></ng-template></mat-tab>
-  <mat-tab label="Form Fields"><ng-template matTabContent><app-form-fields [reportId]="reportId"></app-form-fields></ng-template></mat-tab>
-  <mat-tab label="Chart Wizard"><ng-template matTabContent><app-chart-wizard [reportId]="reportId"></app-chart-wizard></ng-template></mat-tab>
-  <mat-tab label="Security"><ng-template matTabContent><app-security [reportId]="reportId"></app-security></ng-template></mat-tab>
-  <mat-tab label="Log"><ng-template matTabContent><app-log [reportId]="reportId"></app-log></ng-template></mat-tab>
-  <mat-tab label="Run"><ng-template matTabContent><app-run [reportId]="reportId"></app-run></ng-template></mat-tab>
-</mat-tab-group>
\ No newline at end of file
+<div *ngIf="reportType === 'Linear' || reportMode === 'Create'">
+  <mat-tab-group>
+    <mat-tab label="Definition"><ng-template matTabContent><app-definition [reportId]="reportId" [reportMode]="reportMode"></app-definition></ng-template></mat-tab>
+    <mat-tab label="SQL"><ng-template matTabContent><app-sqlcomponent [reportId]="reportId" [reportMode]="reportMode"></app-sqlcomponent></ng-template></mat-tab>
+    <mat-tab label="Columns"><ng-template matTabContent><app-columns [reportId]="reportId"></app-columns></ng-template></mat-tab>
+    <mat-tab label="Form Fields"><ng-template matTabContent><app-form-fields [reportId]="reportId"></app-form-fields></ng-template></mat-tab>
+    <mat-tab label="Chart Wizard"><ng-template matTabContent><app-chart-wizard [reportId]="reportId"></app-chart-wizard></ng-template></mat-tab>
+    <mat-tab label="Security"><ng-template matTabContent><app-security [reportId]="reportId"></app-security></ng-template></mat-tab>
+    <mat-tab label="Log"><ng-template matTabContent><app-log [reportId]="reportId"></app-log></ng-template></mat-tab>
+    <mat-tab label="Run"><ng-template matTabContent><app-run [reportId]="reportId"></app-run></ng-template></mat-tab>
+  </mat-tab-group>
+  </div>
+  
+  <div *ngIf="reportType === 'Dashboard'">
+      <mat-tab-group>
+        <mat-tab label="Definition"><ng-template matTabContent><app-definition [reportId]="reportId" [reportMode]="reportMode"></app-definition></ng-template></mat-tab>
+        <mat-tab label="Security"><ng-template matTabContent><app-security [reportId]="reportId" [reportType]="reportType"></app-security></ng-template></mat-tab>
+        <mat-tab label="Log"><ng-template matTabContent><app-log [reportId]="reportId" [reportType]="reportType"></app-log></ng-template></mat-tab>
+        <mat-tab label="Run"><ng-template matTabContent><app-run [reportId]="reportId" [reportType]="reportType"></app-run></ng-template></mat-tab>
+      </mat-tab-group>
+  </div>
\ No newline at end of file
diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/pages/analytics/Report_List/header-tabs-component/header-tabs.component.ts b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/pages/analytics/Report_List/header-tabs-component/header-tabs.component.ts
index c2c89780..e95481b7 100644
--- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/pages/analytics/Report_List/header-tabs-component/header-tabs.component.ts
+++ b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/pages/analytics/Report_List/header-tabs-component/header-tabs.component.ts
@@ -3,6 +3,7 @@ import { Router } from '@angular/router';
 import { environment } from '../../../../../environments/environment';
 import {MatTabChangeEvent, VERSION} from '@angular/material';
 import { Observable, Observer } from 'rxjs';
+import { HeadertabsService } from './headertabs.service';
 
 
 export interface ExampleTab {
@@ -27,10 +28,11 @@ export class HeaderTabsComponent implements OnInit {
   finalReportId : string;
   repMode : string;
   navLinks : {}[];
+  reportType : string;
 
   tabChanged : any;
   
-  constructor(private _router : Router) {
+  constructor(private _router : Router, private _headerTabsService : HeadertabsService) {
 
     this.asyncTabs = new Observable((observer: Observer<ExampleTab[]>) => {
       setTimeout(() => {
@@ -82,6 +84,16 @@ export class HeaderTabsComponent implements OnInit {
       {
         this.finalReportId = this.reportId;
         this.repMode = this.reportMode;
+
+          
+        this._headerTabsService.getReportTypeData(this.finalReportId)
+        .subscribe((responseReportType) => {
+
+          this.reportType = responseReportType["reportType"];
+          console.log(this.reportType);
+        });
+
+
         console.log(this.finalReportId, this.repMode);
       }
     }
diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/pages/analytics/Report_List/header-tabs-component/headertabs.service.spec.ts b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/pages/analytics/Report_List/header-tabs-component/headertabs.service.spec.ts
new file mode 100644
index 00000000..f9f63945
--- /dev/null
+++ b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/pages/analytics/Report_List/header-tabs-component/headertabs.service.spec.ts
@@ -0,0 +1,12 @@
+import { TestBed } from '@angular/core/testing';
+
+import { HeadertabsService } from './headertabs.service';
+
+describe('HeadertabsService', () => {
+  beforeEach(() => TestBed.configureTestingModule({}));
+
+  it('should be created', () => {
+    const service: HeadertabsService = TestBed.get(HeadertabsService);
+    expect(service).toBeTruthy();
+  });
+});
diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/pages/analytics/Report_List/header-tabs-component/headertabs.service.ts b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/pages/analytics/Report_List/header-tabs-component/headertabs.service.ts
new file mode 100644
index 00000000..b0d84278
--- /dev/null
+++ b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/pages/analytics/Report_List/header-tabs-component/headertabs.service.ts
@@ -0,0 +1,18 @@
+import { Injectable } from '@angular/core';
+import { Observable } from 'rxjs';
+import { environment } from 'src/environments/environment';
+import { HttpClient, HttpHeaders } from '@angular/common/http';
+
+@Injectable({
+  providedIn: 'root'
+})
+export class HeadertabsService {
+
+  constructor(private _http : HttpClient) { }
+
+  
+  getReportTypeData(reportId : string) : Observable<any>
+  {
+    return this._http.get(environment.baseUrl + "report/wizard/retrieve_def_tab_wise_data/" + reportId, { headers: new HttpHeaders({'Content-Type': 'application/json'})});
+  }
+}