Merge pull request #177 from osu-cass/dev

Pulling latest changes for SIW.

Author: tnoelcke

package-lock.json

@@ -77,7 +77,7 @@
     "@types/react": "^16.0.40",
     "@types/react-dom": "^16.0.3",
     "@types/react-modal": "3.1.2",
-    "@types/react-router": "^4.0.25",
+    "@types/react-router": "4.0.25",
     "@types/react-router-dom": "4.2.5",
     "@types/storybook__addon-actions": "~3.0.3",
     "@types/storybook__react": "^3.0.7",
@@ -104,7 +104,7 @@
     "react": "~16.2.0",
     "react-dom": "~16.2.0",
     "react-modal": "3.3.2",
-    "react-router": "^4.2.0",
+    "react-router": "4.2.0",
     "react-router-dom": "4.2.2",
     "react-test-renderer": "~16.2.0",
     "semantic-release": "^15.4.0",

package.json

@@ -243,7 +243,8 @@ export class ItemSearch {
 
   public static getFilterOptionModel(
     filter: SearchFilterModelTypes,
-    searchApi: SearchAPIParamsModel = {}
+    searchApi: SearchAPIParamsModel = {},
+    defaultOptionKeys?: string[]
   ): FilterOptionModel[] {
     let options: FilterOptionModel[] = [];
 
@@ -252,21 +253,23 @@ export class ItemSearch {
         options = this.searchOptionToFilterClaim(
           filter.filterOptions,
           filter.code,
-          searchApi.claims
+          searchApi.claims === [] ? defaultOptionKeys : searchApi.claims
         );
         break;
       case FilterType.InteractionType:
         options = this.searchOptionFilterString(
           filter.filterOptions,
           filter.code,
-          searchApi.interactionTypes
+          searchApi.interactionTypes === []
+            ? defaultOptionKeys
+            : searchApi.interactionTypes
         );
         break;
       case FilterType.Subject:
         options = this.searchOptionFilterString(
           filter.filterOptions,
           filter.code,
-          searchApi.subjects
+          searchApi.subjects === [] ? defaultOptionKeys : searchApi.subjects
         );
         break;
       case FilterType.Grade:
@@ -280,21 +283,23 @@ export class ItemSearch {
         options = this.searchOptionToFilterTarget(
           filter.filterOptions,
           filter.code,
-          searchApi.targets
+          searchApi.targets === [] ? defaultOptionKeys : searchApi.targets
         );
         break;
       case FilterType.TechnologyType:
+        const techTypesCodes = this.getTechnologyTypeCodes(searchApi);
         options = this.searchOptionFilterString(
           filter.filterOptions,
           filter.code,
-          this.getTechnologyTypeCodes(searchApi)
+          techTypesCodes === [] ? defaultOptionKeys : techTypesCodes
         );
         break;
       case FilterType.Calculator:
+        const flagCodes = this.getFlagCodes(searchApi.calculator);
         options = this.searchOptionFilterString(
           filter.filterOptions,
           filter.code,
-          this.getFlagCodes(searchApi.calculator)
+          flagCodes === [] ? defaultOptionKeys : flagCodes
         );
         break;
       default:
@@ -326,9 +331,14 @@ export class ItemSearch {
 
   public static filterSearchToCategory(
     filter: SearchFilterModelTypes,
-    searchApi: SearchAPIParamsModel = {}
+    searchApi: SearchAPIParamsModel = {},
+    defaultOptionKeys?: string[]
   ): FilterCategoryModel {
-    const options = this.getFilterOptionModel(filter, searchApi);
+    const options = this.getFilterOptionModel(
+      filter,
+      searchApi,
+      defaultOptionKeys
+    );
 
     return {
       ...filter,