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

Commit 1f5414b

Browse files
authored
Merge pull request #187 from osu-cass/fix/default-selected-fix
fix(item search): fix default button select
2 parents 03d6669 + 8da11b0 commit 1f5414b

File tree

1 file changed

+17
-6
lines changed

1 file changed

+17
-6
lines changed

src/ItemSearch/ItemSearch.ts

+17-6
Original file line numberDiff line numberDiff line change
@@ -253,14 +253,17 @@ export class ItemSearch {
253253
options = this.searchOptionToFilterClaim(
254254
filter.filterOptions,
255255
filter.code,
256-
searchApi.claims === [] ? defaultOptionKeys : searchApi.claims
256+
searchApi.claims === undefined || searchApi.claims.length < 1
257+
? defaultOptionKeys
258+
: searchApi.claims
257259
);
258260
break;
259261
case FilterType.InteractionType:
260262
options = this.searchOptionFilterString(
261263
filter.filterOptions,
262264
filter.code,
263-
searchApi.interactionTypes === []
265+
searchApi.interactionTypes === undefined ||
266+
searchApi.interactionTypes.length < 1
264267
? defaultOptionKeys
265268
: searchApi.interactionTypes
266269
);
@@ -269,7 +272,9 @@ export class ItemSearch {
269272
options = this.searchOptionFilterString(
270273
filter.filterOptions,
271274
filter.code,
272-
searchApi.subjects === [] ? defaultOptionKeys : searchApi.subjects
275+
searchApi.subjects === undefined || searchApi.subjects.length < 1
276+
? defaultOptionKeys
277+
: searchApi.subjects
273278
);
274279
break;
275280
case FilterType.Grade:
@@ -283,23 +288,29 @@ export class ItemSearch {
283288
options = this.searchOptionToFilterTarget(
284289
filter.filterOptions,
285290
filter.code,
286-
searchApi.targets === [] ? defaultOptionKeys : searchApi.targets
291+
searchApi.targets === undefined || searchApi.targets.length < 1
292+
? defaultOptionKeys
293+
: searchApi.targets
287294
);
288295
break;
289296
case FilterType.TechnologyType:
290297
const techTypesCodes = this.getTechnologyTypeCodes(searchApi);
291298
options = this.searchOptionFilterString(
292299
filter.filterOptions,
293300
filter.code,
294-
techTypesCodes === [] ? defaultOptionKeys : techTypesCodes
301+
techTypesCodes === undefined || techTypesCodes.length < 1
302+
? defaultOptionKeys
303+
: techTypesCodes
295304
);
296305
break;
297306
case FilterType.Calculator:
298307
const flagCodes = this.getFlagCodes(searchApi.calculator);
299308
options = this.searchOptionFilterString(
300309
filter.filterOptions,
301310
filter.code,
302-
flagCodes === [] ? defaultOptionKeys : flagCodes
311+
flagCodes === undefined || flagCodes.length < 1
312+
? defaultOptionKeys
313+
: flagCodes
303314
);
304315
break;
305316
default:

0 commit comments

Comments
 (0)