Skip to content
This repository was archived by the owner on May 4, 2019. It is now read-only.

Commit 490f7db

Browse files
committed
feat: fixed issues with selecting a default button
1 parent 4bbe100 commit 490f7db

File tree

1 file changed

+16
-6
lines changed

1 file changed

+16
-6
lines changed

src/ItemSearch/ItemSearch.ts

+16-6
Original file line numberDiff line numberDiff line change
@@ -181,6 +181,7 @@ export class ItemSearch {
181181
filterType: FilterType,
182182
selectedCodes?: string[]
183183
): FilterOptionModel[] {
184+
console.log("Selected codes", selectedCodes);
184185
return options.map(o => {
185186
return {
186187
filterType,
@@ -253,14 +254,18 @@ export class ItemSearch {
253254
options = this.searchOptionToFilterClaim(
254255
filter.filterOptions,
255256
filter.code,
256-
searchApi.claims === [] ? defaultOptionKeys : searchApi.claims
257+
searchApi.claims === undefined || searchApi.claims.length > 1
258+
? defaultOptionKeys
259+
: searchApi.claims
257260
);
258261
break;
259262
case FilterType.InteractionType:
260263
options = this.searchOptionFilterString(
261264
filter.filterOptions,
262265
filter.code,
263-
searchApi.interactionTypes === []
266+
searchApi.interactionTypes === undefined ||
267+
searchApi.interactionTypes.length < 1 ||
268+
searchApi.interactionTypes === undefined
264269
? defaultOptionKeys
265270
: searchApi.interactionTypes
266271
);
@@ -269,7 +274,9 @@ export class ItemSearch {
269274
options = this.searchOptionFilterString(
270275
filter.filterOptions,
271276
filter.code,
272-
searchApi.subjects === [] ? defaultOptionKeys : searchApi.subjects
277+
searchApi.subjects === undefined || searchApi.subjects.length < 1
278+
? defaultOptionKeys
279+
: searchApi.subjects
273280
);
274281
break;
275282
case FilterType.Grade:
@@ -283,23 +290,26 @@ export class ItemSearch {
283290
options = this.searchOptionToFilterTarget(
284291
filter.filterOptions,
285292
filter.code,
286-
searchApi.targets === [] ? defaultOptionKeys : searchApi.targets
293+
searchApi.targets === undefined || searchApi.targets.length < 1
294+
? defaultOptionKeys
295+
: searchApi.targets
287296
);
288297
break;
289298
case FilterType.TechnologyType:
290299
const techTypesCodes = this.getTechnologyTypeCodes(searchApi);
291300
options = this.searchOptionFilterString(
292301
filter.filterOptions,
293302
filter.code,
294-
techTypesCodes === [] ? defaultOptionKeys : techTypesCodes
303+
techTypesCodes.length < 1 ? defaultOptionKeys : techTypesCodes
295304
);
305+
console.log(options);
296306
break;
297307
case FilterType.Calculator:
298308
const flagCodes = this.getFlagCodes(searchApi.calculator);
299309
options = this.searchOptionFilterString(
300310
filter.filterOptions,
301311
filter.code,
302-
flagCodes === [] ? defaultOptionKeys : flagCodes
312+
flagCodes.length < 1 ? defaultOptionKeys : flagCodes
303313
);
304314
break;
305315
default:

0 commit comments

Comments
 (0)