Merge pull request #209 from osu-cass/dev

Dev

Author: tnoelcke

src/Accessibility/AccessibilityModal.tsx

@@ -109,10 +109,6 @@ export class ItemAccessibilityModal extends React.Component<
   };
 
   handleShowModal = () => {
-    if (!this.state.showModal) {
-      ga("send", "event", "button", "OpenAccessibility");
-    }
-
     this.setState({ showModal: true });
   };
 

src/Filter/__tests__/CombinedFilter.test.tsx

@@ -1,5 +1,6 @@
 import "jsdom-global/register";
 import * as React from "react";
+import * as CombinedFilterHelpers from "../CombinedFilterHelpers";
 import { shallow, mount } from "enzyme";
 import {
   mockBasicFilterCategories,
@@ -10,9 +11,11 @@ import {
   AdvancedFilterContainer,
   BasicFilterContainer,
   CombinedFilter,
+  CombinedFilterProps,
   AdvancedFilterCategoryModel,
   BasicFilterCategoryModel
 } from "@src/index";
+import { mockSeachAPI } from "./Mocks";
 
 describe("FilterContainer", () => {
   const onFilterUpdated = jest.fn(
@@ -37,7 +40,15 @@ describe("FilterContainer", () => {
   it("renders", () => {
     expect(wrapper).toMatchSnapshot();
   });
-
+  it("filter updates", () => {
+    expect(
+      onFilterUpdated(
+        mockSeachAPI,
+        mockBasicFilterCategories,
+        mockAdvancedFilterCategoriesAll
+      )
+    ).toMatchSnapshot();
+  });
   it("toggles the advanced filter", () => {
     expect(wrapper).toMatchSnapshot();
 

src/Filter/__tests__/CombinedFilterHelpers.test.ts

@@ -1,15 +1,21 @@
 import * as CombinedFilterHelpers from "../CombinedFilterHelpers";
+import { ItemSearch } from "../../ItemSearch/ItemSearch";
 import * as Mocks from "./Mocks";
 import {
   BasicFilterCategoryModel,
   OptionTypeModel,
   AdvancedFilterCategoryModel,
   FilterType
 } from "../FilterModels";
+import { siwFilterUpdated } from "gh-site/lib/src/Filter/CombinedFilterHelpers";
+import { SearchAPIParamsModel } from "gh-site/lib/src";
 
 const basicFilter: BasicFilterCategoryModel[] = [
   { ...Mocks.claimSelectedCategory, optionType: OptionTypeModel.DropDown }
 ];
+const emptyFilter: BasicFilterCategoryModel[] = [
+  { ...Mocks.claimSelectedCategory, optionType: OptionTypeModel.DropDown }
+];
 const advancedFilter: AdvancedFilterCategoryModel[] = [
   {
     ...Mocks.claimSelectedCategory,
@@ -22,6 +28,7 @@ describe("resetFilters", () => {
   it("deselects all filters", () => {
     const advancedFilterClone = JSON.parse(JSON.stringify(advancedFilter));
     const basicFilterClone = JSON.parse(JSON.stringify(basicFilter));
+
     const result = CombinedFilterHelpers.resetFilters(
       basicFilterClone,
       advancedFilterClone
@@ -35,6 +42,14 @@ describe("resetFilters", () => {
         expect(o.isSelected).toBeFalsy()
       );
     }
+
+    emptyFilter.forEach(o => (o.optionType = OptionTypeModel.inputBox));
+    const inputBox = CombinedFilterHelpers.resetFilters(
+      emptyFilter,
+      advancedFilterClone
+    );
+    inputBox.basicFilter.forEach(f => expect(f.filterOptions).toHaveLength(0));
+
     result.basicFilter[0].filterOptions.forEach(o =>
       expect(o.isSelected).toBeFalsy()
     );
@@ -138,3 +153,26 @@ describe("advancedFilterUpdated", () => {
     expect(result.basicFilter[0].filterOptions[1].isSelected).toBeTruthy();
   });
 });
+
+describe("siwUpdateDependentAndSeach", () => {
+  it("updates filter", () => {
+    const basicFilterClone: BasicFilterCategoryModel[] = JSON.parse(
+      JSON.stringify(basicFilter)
+    );
+    const advancedFilterClone: AdvancedFilterCategoryModel[] = JSON.parse(
+      JSON.stringify(advancedFilter)
+    );
+
+    const result = CombinedFilterHelpers.siwFilterUpdated(
+      basicFilterClone,
+      Mocks.mockSeachAPI,
+      advancedFilterClone,
+      Mocks.searchModel
+    );
+    const searchParams = ItemSearch.updateDependentSearchParams(
+      Mocks.mockSeachAPI,
+      Mocks.searchModel
+    );
+    expect(result.searchAPI).toEqual(searchParams);
+  });
+});

src/Filter/__tests__/FilterLink.test.tsx

@@ -0,0 +1,11 @@
+import * as React from "react";
+import { mount } from "enzyme";
+import "jsdom-global/register";
+import { FilterLink } from "@src/index";
+
+const wrapper = mount(<FilterLink filterId="sb-filter-id" />);
+
+it("filter link test", () => {
+  wrapper.simulate("click");
+  expect(wrapper).toMatchSnapshot();
+});

src/Filter/__tests__/Mocks.ts

@@ -209,17 +209,20 @@ export const targets: TargetModel[] = [
   {
     name: "ELA1",
     nameHash: 21,
-    idLabel: "21"
+    idLabel: "21",
+    id: "21"
   },
   {
     name: "MATH1",
     nameHash: 11,
-    idLabel: "11"
+    idLabel: "11",
+    id: "11"
   },
   {
     name: "MATH2",
     nameHash: 12,
-    idLabel: "12"
+    idLabel: "12",
+    id: "12"
   }
 ];
 
@@ -233,7 +236,17 @@ export const interactionTypes: InteractionTypeModel[] = [
     label: "ELA1"
   }
 ];
-
+export const mockSeachAPI: SearchAPIParamsModel = {
+  itemId: "item1",
+  // tslint:disable-next-line:no-bitwise
+  gradeLevels: GradeLevels.Grade3 | GradeLevels.Grade4,
+  subjects: ["t1", "t2"],
+  claims: ["t1", "t2"],
+  interactionTypes: ["t1", "t2"],
+  performanceOnly: true,
+  catOnly: true,
+  targets: ["A", "B"]
+};
 export const searchModel: ItemsSearchModel = {
   interactionTypes,
   claims,