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

Commit 00f4b19

Browse files
authored
Merge pull request #179 from osu-cass/feat/fix-default-selected
Feat/fix default selected
2 parents cb89b0f + 34578d8 commit 00f4b19

File tree

1 file changed

+12
-6
lines changed

1 file changed

+12
-6
lines changed

src/ItemSearch/ItemSearch.ts

+12-6
Original file line numberDiff line numberDiff line change
@@ -253,14 +253,16 @@ export class ItemSearch {
253253
options = this.searchOptionToFilterClaim(
254254
filter.filterOptions,
255255
filter.code,
256-
searchApi.claims === [] ? defaultOptionKeys : searchApi.claims
256+
searchApi.claims
257257
);
258258
break;
259259
case FilterType.InteractionType:
260260
options = this.searchOptionFilterString(
261261
filter.filterOptions,
262262
filter.code,
263-
searchApi.interactionTypes === []
263+
searchApi.interactionTypes === undefined ||
264+
searchApi.interactionTypes.length < 1 ||
265+
searchApi.interactionTypes === undefined
264266
? defaultOptionKeys
265267
: searchApi.interactionTypes
266268
);
@@ -269,7 +271,9 @@ export class ItemSearch {
269271
options = this.searchOptionFilterString(
270272
filter.filterOptions,
271273
filter.code,
272-
searchApi.subjects === [] ? defaultOptionKeys : searchApi.subjects
274+
searchApi.subjects === undefined || searchApi.subjects.length < 1
275+
? defaultOptionKeys
276+
: searchApi.subjects
273277
);
274278
break;
275279
case FilterType.Grade:
@@ -283,23 +287,25 @@ export class ItemSearch {
283287
options = this.searchOptionToFilterTarget(
284288
filter.filterOptions,
285289
filter.code,
286-
searchApi.targets === [] ? defaultOptionKeys : searchApi.targets
290+
searchApi.targets === undefined || searchApi.targets.length < 1
291+
? defaultOptionKeys
292+
: searchApi.targets
287293
);
288294
break;
289295
case FilterType.TechnologyType:
290296
const techTypesCodes = this.getTechnologyTypeCodes(searchApi);
291297
options = this.searchOptionFilterString(
292298
filter.filterOptions,
293299
filter.code,
294-
techTypesCodes === [] ? defaultOptionKeys : techTypesCodes
300+
techTypesCodes.length < 1 ? defaultOptionKeys : techTypesCodes
295301
);
296302
break;
297303
case FilterType.Calculator:
298304
const flagCodes = this.getFlagCodes(searchApi.calculator);
299305
options = this.searchOptionFilterString(
300306
filter.filterOptions,
301307
filter.code,
302-
flagCodes === [] ? defaultOptionKeys : flagCodes
308+
flagCodes.length < 1 ? defaultOptionKeys : flagCodes
303309
);
304310
break;
305311
default:

0 commit comments

Comments
 (0)