Merge pull request #403 from RenovoSolutions/soup-du-jour

Component changes to help with Service Event List settings

Author: Sam Graber

package.json

@@ -1,6 +1,6 @@
 {
   "name": "typescript-angular-components",
-  "version": "4.2.2",
+  "version": "4.2.3",
   "description": "Reusable responsive angular components",
   "author": "Renovo Development Team",
   "keywords": [
@@ -112,7 +112,7 @@
     "rl-http": "~1.5.1",
     "rxjs": "~5.0.0",
     "systemjs": "^0.19.28",
-    "typescript-angular-utilities": "~4.1.1",
+    "typescript-angular-utilities": "~4.1.2",
     "ui-select": "~0.14.7",
     "zone.js": "~0.7.2"
   },

source/components/cardContainer/builder/cardContainerBuilderOld.service.ts

@@ -40,6 +40,7 @@ export interface ICardContainerBuilderOld {
 	useSelection(): void;
 	renderFilters(): void;
 	saveWhenInvalid(): void;
+	findColumnByFieldName(fieldName: string): IColumn<any>;
 }
 
 
@@ -101,6 +102,10 @@ export class CardContainerBuilderOld implements ICardContainerBuilderOld {
 		this._columns.push(column);
 	}
 
+	findColumnByFieldName(fieldName: string): IColumn<any> {
+		return this._columns.find(column => column.fieldName === fieldName);
+	}
+
 	useClickableCards(): void {
 		this._clickableCards = true;
 	}

source/components/cardContainer/cardContainer.ng1.ts

@@ -150,7 +150,10 @@ export class CardContainerController {
 			//*use card container event service?
 			$scope.$on('updateDisabledSelections', this.updateDisabledSelections);
 
-			this.dataSource.changed.subscribe(this.addViewData);
+			this.dataSource.changed.subscribe(() => {
+				this.addViewData();
+				this.updateVisualColumnSorting();
+			});
 			this.dataSource.redrawing.subscribe(this.clearFilteredSelections);
 
 			this.addViewData();
@@ -164,6 +167,11 @@ export class CardContainerController {
 				flipSort: true,
 			};
 		}
+		else {
+			this.dataSource.changed.subscribe(() => {
+				this.updateVisualColumnSorting();
+			});
+		}
 
 		if (this.dataSource.sorts == null) {
 			this.dataSource.sorts = [];

source/components/cardContainer/filters/filterGroup/filterGroup.directive.ng1.ts

@@ -31,6 +31,10 @@ export class FilterGroupController {
 		this.expanded = true;
 	}
 
+	$onInit(): void {
+		this.filterGroup.changeFromDefault$.subscribe(() => this.expanded = false);
+	}
+
 	get headerTitle(): string {
 		if (!this.disabled) {
 			return this.filterGroup.label + ': ' + this.filterGroup.activeOption.label

source/components/cardContainer/filters/filterGroup/filterGroupOld.service.tests.ts

@@ -150,4 +150,60 @@ describe('FilterGroupOld', () => {
 
 		expect(filterGroup.serialize()).to.equal(4);
 	});
+
+	it('should notify when the active option is changed from the default', () => {
+		// arrange
+		let nonDefaultOption: IFilterOptionMock = {
+			active: false,
+			value: 0,
+		};
+		let defaultOption: IFilterOptionMock = {
+			active: true,
+			value: 1,
+		};
+		let changeFromDefaultSpy = sinon.spy();
+
+		filterGroup = buildFilter({
+			options: [nonDefaultOption, defaultOption],
+		});
+		filterGroup.initOptions();
+		filterGroup.changeFromDefault$.subscribe(changeFromDefaultSpy);
+
+		// act
+		filterGroup.setActiveOptionByValue(nonDefaultOption.value);
+
+		// assert
+		sinon.assert.calledOnce(changeFromDefaultSpy);
+	});
+
+	it('should not notify when the active option is changed from a non-default option', () => {
+		// arrange
+		let nonDefaultOption: IFilterOptionMock = {
+			active: false,
+			value: 0,
+		};
+		let defaultOption: IFilterOptionMock = {
+			active: true,
+			value: 1,
+		};
+		let anotherOption: IFilterOptionMock = {
+			active: false,
+			value: 2,
+		}
+		let changeFromDefaultSpy = sinon.spy();
+
+		filterGroup = buildFilter({
+			options: [nonDefaultOption, defaultOption],
+		});
+		filterGroup.initOptions();
+		filterGroup.changeFromDefault$.subscribe(changeFromDefaultSpy);
+		filterGroup.setActiveOptionByValue(nonDefaultOption.value);
+		changeFromDefaultSpy.reset();
+
+		// act
+		filterGroup.setActiveOptionByValue(anotherOption.value);
+
+		// assert
+		sinon.assert.notCalled(changeFromDefaultSpy);
+	});
 });

source/components/cardContainer/filters/filterGroup/filterGroupOld.service.ts

@@ -1,4 +1,5 @@
 import * as _ from 'lodash';
+import { ReplaySubject, Observable } from 'rxjs/Rx';
 
 import { services, filters } from 'typescript-angular-utilities';
 import __object = services.object;
@@ -28,8 +29,11 @@ export interface IFilterGroupOld extends filters.IFilterWithCounts, filters.ISer
 	type: string;
 	options: IFilterOptionOld[];
 	activeOption: IFilterOptionOld;
+	changeFromDefault$: ReplaySubject<any>;
 	setActiveOption(index: number): void;
 	setOptionCounts(counts: number[]): void;
+	setActiveOptionByValue(value: number): void;
+	setActiveOptionByLabel(label: string): void;
 }
 
 export class FilterGroupOld extends filters.SerializableFilter<any> implements IFilterGroupOld {
@@ -39,14 +43,17 @@ export class FilterGroupOld extends filters.SerializableFilter<any> implements I
 	template: string = '<rl-filter-group filter-group="filter" source="dataSource"></rl-filter-group>';
 	settings: IFilterGroupSettingsOld;
 
+	private _defaultOption: IFilterOptionOld;
 	private _activeOption: IFilterOptionOld;
+	private _changeFromDefault$: ReplaySubject<any>;
 
 	object: __object.IObjectUtility;
 
 	constructor(settings: IFilterGroupSettingsOld, object: __object.IObjectUtility) {
 		super();
 		this.object = object;
 
+		this._changeFromDefault$ = new ReplaySubject<any>(1);
 		this.settings = settings;
 		this.label = settings.label;
 		this.type = settings.type != null ? settings.type : settings.label;
@@ -55,7 +62,8 @@ export class FilterGroupOld extends filters.SerializableFilter<any> implements I
 
 	initOptions():void {
 		this.options = this.settings.options;
-		this.activeOption = this.setDefaultOption();
+		this._defaultOption = this.setDefaultOption();
+		this.activeOption = this._defaultOption;
 
 		_.each(this.options, (option: IFilterOptionOld): void => {
 			if (_.isUndefined(option.type)) {
@@ -66,11 +74,18 @@ export class FilterGroupOld extends filters.SerializableFilter<any> implements I
 		});
 	}
 
+	get changeFromDefault$(): ReplaySubject<any> {
+		return this._changeFromDefault$;
+	}
+
 	get activeOption(): IFilterOptionOld {
 		return this._activeOption;
 	}
 
 	set activeOption(value: IFilterOptionOld) {
+		if (this._activeOption == this._defaultOption && value != this._defaultOption) {
+			this._changeFromDefault$.next(value);
+		}
 		this._activeOption = value;
 		this.onChange(false);
 	}
@@ -106,6 +121,28 @@ export class FilterGroupOld extends filters.SerializableFilter<any> implements I
 		}
 	}
 
+	setActiveOptionByValue(value: number): void {
+		_.each(this.options, (option: IFilterOptionOld): void => {
+			if (option.value === value) {
+				if (!option.active) {
+					this.activeOption = option;
+				}
+				return;
+			}
+		});
+	}
+
+	setActiveOptionByLabel(label: string): void {
+		_.each(this.options, (option: IFilterOptionOld): void => {
+			if (option.label === label) {
+				if (!option.active) {
+					this.activeOption = option;
+				}
+				return;
+			}
+		});
+	}
+
 	setOptionCounts(counts: number[]): void {
 		_.each(this.options, (option: IConfiguredFilterOption): void => {
 			if (_.has(counts, option.type)) {