summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLorraine Welch <lb2391@att.com>2020-03-20 13:52:10 +0000
committerGerrit Code Review <gerrit@onap.org>2020-03-20 13:52:10 +0000
commita8f1c5ed9ec78c3bf7d1a761af34a8074e2508fe (patch)
treef771e17d818fd0fb61914acb8725165bc244d605
parent40be480f26ac8d24dabfae34b00015897649c3ba (diff)
parent381eba6f549696ccc32e43682884637ee54f5a60 (diff)
Merge "changes in column-list compo & headertabs.service"
-rw-r--r--ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/pages/analytics/Report_List/Report/columns/column-list/column-list.component.html2
-rw-r--r--ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/pages/analytics/Report_List/header-tabs-component/headertabs.service.spec.ts12
2 files changed, 8 insertions, 6 deletions
diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/pages/analytics/Report_List/Report/columns/column-list/column-list.component.html b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/pages/analytics/Report_List/Report/columns/column-list/column-list.component.html
index deffdffb..4d27b529 100644
--- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/pages/analytics/Report_List/Report/columns/column-list/column-list.component.html
+++ b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/app/pages/analytics/Report_List/Report/columns/column-list/column-list.component.html
@@ -230,7 +230,7 @@
</table>
<mat-paginator #paginator
- [length]="dataSource?.data.length"
+ [length]="dataSource?.data?.length"
[pageIndex]="0"
[pageSize]="25"
[pageSizeOptions]="[25, 50, 100, 250]">
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
index f9f63945..de1bffd9 100644
--- 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
@@ -1,12 +1,14 @@
import { TestBed } from '@angular/core/testing';
-
import { HeadertabsService } from './headertabs.service';
-
+import { HttpClientTestingModule } from '@angular/common/http/testing';
describe('HeadertabsService', () => {
- beforeEach(() => TestBed.configureTestingModule({}));
-
+ beforeEach(() => TestBed.configureTestingModule({
+
+ imports: [HttpClientTestingModule]
+ }));
+
it('should be created', () => {
const service: HeadertabsService = TestBed.get(HeadertabsService);
expect(service).toBeTruthy();
});
-});
+}); \ No newline at end of file