Simplified the setup for filters and paging

Since we always use the builder now, the card container will never need to pull the filters and pager off the data source. Instead we just need to set them there if present.

Author: KorinaGraber

source/components/cardContainer/cardContainer.tests.ts

@@ -64,6 +64,21 @@ describe('CardContainerComponent', () => {
 		};
 	}
 
+	it('should set the filters on the data source', (): void => {
+		let filters: IFilterMock[] = [{
+			filter: sinon.spy(),
+		}];
+
+		let dataSource: IDataSourceMock = buildMockedDataSource();
+
+		cardContainer.builder.dataSource = <any>dataSource;
+		cardContainer.builder.filters = <any>filters;
+
+		cardContainer.ngOnInit();
+
+		expect(dataSource.filters).to.equal(filters);
+	});
+
 	describe('hasItems', () => {
 		it('should return true if the data set is not empty', () => {
 			dataSource.dataSet$.next([]);
@@ -104,20 +119,6 @@ describe('CardContainerComponent', () => {
 			cardContainer.ngOnInit();
 			expect(cardContainer.dataSource.pager).to.not.exist;
 		});
-
-		it('should use the data source\'s pager if paging is not specified', (): void => {
-			let pager: IDataPagerMock = <any>{
-				filter: sinon.spy(),
-			};
-
-			let dataSource: IDataSourceMock = buildMockedDataSource();
-			dataSource.pager = pager;
-
-			cardContainer.builder.dataSource = <any>dataSource;
-			cardContainer.ngOnInit();
-
-			expect(cardContainer.dataSource.pager).to.equal(pager);
-		});
 	});
 
 	describe('card coordination', (): void => {
@@ -153,36 +154,4 @@ describe('CardContainerComponent', () => {
 			expect(sortManager.updateSorts.firstCall.args[0]).to.equal(column);
 		});
 	});
-
-	describe('syncFilters', (): void => {
-		it('should set the filters on the data source', (): void => {
-			let filters: IFilterMock[] = [{
-				filter: sinon.spy(),
-			}];
-
-			let dataSource: IDataSourceMock = buildMockedDataSource();
-
-			cardContainer.builder.dataSource = <any>dataSource;
-			cardContainer.builder.filters = <any>filters;
-
-			cardContainer.ngOnInit();
-
-			expect(dataSource.filters).to.equal(filters);
-		});
-
-		it('should init filters from data source filters if no filters are specified', (): void => {
-			let filters: IFilterMock[] = [{
-				filter: sinon.spy(),
-			}];
-
-			let dataSource: IDataSourceMock = buildMockedDataSource();
-			dataSource.filters = filters;
-
-			cardContainer.builder.dataSource = <any>dataSource;
-
-			cardContainer.ngOnInit();
-
-			expect(cardContainer.filters).to.equal(filters);
-		});
-	});
 });

source/components/cardContainer/cardContainer.ts

@@ -107,9 +107,13 @@ export class CardContainerComponent<T> implements OnInit, AfterContentInit {
 		this.maxColumnSorts = this.maxColumnSorts || defaultMaxColumnSorts;
 		this.sortDirection = SortDirection;
 
-		this.syncFilters();
+		if (this.filters) {
+			this.dataSource.filters = this.filters;
+		}
 
-		this.setupPaging();
+		if (this.paging) {
+			this.dataSource.pager = this.injectedPager;
+		}
 
 		// need a way to customize the sorts?
 		this.sortManager.setup([], name => this.lookupColumn(name), this.maxColumnSorts);
@@ -144,25 +148,6 @@ export class CardContainerComponent<T> implements OnInit, AfterContentInit {
 		return this.columnHeaders.filter(column => column.name === columnName)[0];
 	}
 
-	private syncFilters(): void {
-		if (this.filters) {
-			this.dataSource.filters = this.filters;
-		} else if (this.dataSource.filters != null) {
-			this.filters = this.dataSource.filters;
-		}
-	}
-
-	private setupPaging(): void {
-		// If paging flag is specified, card container controls pager instance
-		if (this.paging != null) {
-			if (this.paging === false) {
-				this.dataSource.pager = null;
-			} else {
-				this.dataSource.pager = this.injectedPager;
-			}
-		}
-	}
-
 	private lookupColumn(label: string): IColumn<any> {
 		return find(this.columns, (column: IColumn<any>): boolean => {
 			return column.label === label;