revert browser newux changes (#5714)

browser/app/js/buckets/__tests__/Bucket.test.js

@@ -28,14 +28,12 @@ describe("Bucket", () => {
     const wrapper = shallow(
       <Bucket bucket={"test"} selectBucket={selectBucket} />
     )
-    wrapper.find("div").simulate("click", {
-      preventDefault: jest.fn()
-    })
+    wrapper.find("li").simulate("click", { preventDefault: jest.fn() })
     expect(selectBucket).toHaveBeenCalledWith("test")
   })
 
   it("should highlight the selected bucket", () => {
     const wrapper = shallow(<Bucket bucket={"test"} isActive={true} />)
-    expect(wrapper.find("div").hasClass("buckets__item--active")).toBeTruthy()
+    expect(wrapper.find("li").hasClass("active")).toBeTruthy()
   })
 })

browser/app/js/buckets/__tests__/BucketContainer.test.js

@@ -31,23 +31,21 @@ describe("BucketContainer", () => {
     })
     store.dispatch = jest.fn()
   })
-
+  
   it("should render without crashing", () => {
-    shallow(<BucketContainer store={store} />)
+    shallow(<BucketContainer store={store}/>)
   })
 
-  it("maps state and dispatch to props", () => {
-    const wrapper = shallow(<BucketContainer store={store} />)
-    expect(wrapper.props()).toEqual(
-      expect.objectContaining({
-        isActive: expect.any(Boolean),
-        selectBucket: expect.any(Function)
-      })
-    )
+  it('maps state and dispatch to props', () => {
+    const wrapper = shallow(<BucketContainer store={store}/>)
+    expect(wrapper.props()).toEqual(expect.objectContaining({
+      isActive: expect.any(Boolean),
+      selectBucket: expect.any(Function)
+    }))
   })
 
-  it("maps selectBucket to dispatch action", () => {
-    const wrapper = shallow(<BucketContainer store={store} />)
+  it('maps selectBucket to dispatch action', () => {
+    const wrapper = shallow(<BucketContainer store={store}/>)
     wrapper.props().selectBucket()
     expect(store.dispatch).toHaveBeenCalled()
   })

browser/app/js/buckets/__tests__/BucketDropdown.test.js

@@ -24,9 +24,13 @@ describe("BucketDropdown", () => {
   })
 
   it("should call toggleDropdown on dropdown toggle", () => {
-    const spy = jest.spyOn(BucketDropdown.prototype, "toggleDropdown")
-    const wrapper = shallow(<BucketDropdown />)
-    wrapper.find("Uncontrolled(Dropdown)").simulate("toggle")
+    const spy = jest.spyOn(BucketDropdown.prototype, 'toggleDropdown')
+    const wrapper = shallow(
+      <BucketDropdown />
+    )
+    wrapper
+      .find("Uncontrolled(Dropdown)")
+      .simulate("toggle")
     expect(spy).toHaveBeenCalled()
     spy.mockReset()
     spy.mockRestore()
@@ -38,11 +42,9 @@ describe("BucketDropdown", () => {
       <BucketDropdown showBucketPolicy={showBucketPolicy} />
     )
     wrapper
-      .find("MenuItem")
+      .find("li a")
       .at(0)
-      .simulate("click", {
-        stopPropagation: jest.fn()
-      })
+      .simulate("click", { stopPropagation: jest.fn() })
     expect(showBucketPolicy).toHaveBeenCalled()
   })
 
@@ -52,11 +54,9 @@ describe("BucketDropdown", () => {
       <BucketDropdown bucket={"test"} deleteBucket={deleteBucket} />
     )
     wrapper
-      .find("MenuItem")
+      .find("li a")
       .at(1)
-      .simulate("click", {
-        stopPropagation: jest.fn()
-      })
+      .simulate("click", { stopPropagation: jest.fn() })
     expect(deleteBucket).toHaveBeenCalledWith("test")
   })
 })

browser/app/js/buckets/__tests__/BucketList.test.js

@@ -29,13 +29,13 @@ jest.mock("../../web", () => ({
 describe("BucketList", () => {
   it("should render without crashing", () => {
     const fetchBuckets = jest.fn()
-    shallow(<BucketList filteredBuckets={[]} fetchBuckets={fetchBuckets} />)
+    shallow(<BucketList visibleBuckets={[]} fetchBuckets={fetchBuckets} />)
   })
 
   it("should call fetchBuckets before component is mounted", () => {
     const fetchBuckets = jest.fn()
     const wrapper = shallow(
-      <BucketList filteredBuckets={[]} fetchBuckets={fetchBuckets} />
+      <BucketList visibleBuckets={[]} fetchBuckets={fetchBuckets} />
     )
     expect(fetchBuckets).toHaveBeenCalled()
   })
@@ -46,7 +46,7 @@ describe("BucketList", () => {
     history.push("/bk1/pre1")
     const wrapper = shallow(
       <BucketList
-        filteredBuckets={[]}
+        visibleBuckets={[]}
         setBucketList={setBucketList}
         selectBucket={selectBucket}
       />

browser/app/js/buckets/__tests__/BucketPolicyModal.test.js

@@ -21,7 +21,7 @@ import { READ_ONLY, WRITE_ONLY, READ_WRITE } from "../../constants"
 
 describe("BucketPolicyModal", () => {
   it("should render without crashing", () => {
-    shallow(<BucketPolicyModal policies={[]} />)
+    shallow(<BucketPolicyModal policies={[]}/>)
   })
 
   it("should call hideBucketPolicy when close button is clicked", () => {
@@ -29,13 +29,13 @@ describe("BucketPolicyModal", () => {
     const wrapper = shallow(
       <BucketPolicyModal hideBucketPolicy={hideBucketPolicy} policies={[]} />
     )
-    wrapper.find("i.close").simulate("click")
+    wrapper.find("button").simulate("click")
     expect(hideBucketPolicy).toHaveBeenCalled()
   })
 
   it("should include the PolicyInput and Policy components when there are any policies", () => {
     const wrapper = shallow(
-      <BucketPolicyModal policies={[{ prefix: "test", policy: READ_ONLY }]} />
+      <BucketPolicyModal policies={ [{prefix: "test", policy: READ_ONLY}] } />
     )
     expect(wrapper.find("Connect(PolicyInput)").length).toBe(1)
     expect(wrapper.find("Connect(Policy)").length).toBe(1)

browser/app/js/buckets/__tests__/BucketSearch.test.js

@@ -26,11 +26,7 @@ describe("BucketSearch", () => {
   it("should call onChange with search text", () => {
     const onChange = jest.fn()
     const wrapper = shallow(<BucketSearch onChange={onChange} />)
-    wrapper.find("input").simulate("change", {
-      target: {
-        value: "test"
-      }
-    })
+    wrapper.find("input").simulate("change", { target: { value: "test" } })
     expect(onChange).toHaveBeenCalledWith("test")
   })
 })

browser/app/js/buckets/__tests__/MakeBucketModal.test.js

@@ -28,7 +28,7 @@ describe("MakeBucketModal", () => {
     const wrapper = shallow(
       <MakeBucketModal hideMakeBucketModal={hideMakeBucketModal} />
     )
-    wrapper.find("i.close").simulate("click")
+    wrapper.find("button").simulate("click")
     expect(hideMakeBucketModal).toHaveBeenCalled()
   })
 
@@ -38,12 +38,10 @@ describe("MakeBucketModal", () => {
       <MakeBucketModal hideMakeBucketModal={hideMakeBucketModal} />
     )
     wrapper.find("input").simulate("change", {
-      target: {
-        value: "test"
-      }
+      target: { value: "test" }
     })
     expect(wrapper.state("bucketName")).toBe("test")
-    wrapper.find("i.close").simulate("click")
+    wrapper.find("button").simulate("click")
     expect(wrapper.state("bucketName")).toBe("")
   })
 
@@ -57,13 +55,9 @@ describe("MakeBucketModal", () => {
       />
     )
     wrapper.find("input").simulate("change", {
-      target: {
-        value: "test"
-      }
-    })
-    wrapper.find("form").simulate("submit", {
-      preventDefault: jest.fn()
+      target: { value: "test" }
     })
+    wrapper.find("form").simulate("submit", { preventDefault: jest.fn() })
     expect(makeBucket).toHaveBeenCalledWith("test")
   })
 
@@ -77,13 +71,9 @@ describe("MakeBucketModal", () => {
       />
     )
     wrapper.find("input").simulate("change", {
-      target: {
-        value: "test"
-      }
-    })
-    wrapper.find("form").simulate("submit", {
-      preventDefault: jest.fn()
+      target: { value: "test" }
     })
+    wrapper.find("form").simulate("submit", { preventDefault: jest.fn() })
     expect(hideMakeBucketModal).toHaveBeenCalled()
     expect(wrapper.state("bucketName")).toBe("")
   })

browser/app/js/buckets/__tests__/Policy.test.js

@@ -28,31 +28,27 @@ jest.mock("../../web", () => ({
 
 describe("Policy", () => {
   it("should render without crashing", () => {
-    shallow(
-      <Policy currentBucket={"bucket"} prefix={"foo"} policy={READ_ONLY} />
-    )
+    shallow(<Policy currentBucket={"bucket"} prefix={"foo"} policy={READ_ONLY} />)
   })
 
   it("should call web.setBucketPolicy and fetchPolicies on submit", () => {
     const fetchPolicies = jest.fn()
     const wrapper = shallow(
-      <Policy
+      <Policy 
         currentBucket={"bucket"}
         prefix={"foo"}
         policy={READ_ONLY}
         fetchPolicies={fetchPolicies}
       />
     )
-    wrapper.find("button").simulate("click", {
-      preventDefault: jest.fn()
-    })
+    wrapper.find("button").simulate("click", { preventDefault: jest.fn() })
 
     expect(web.SetBucketPolicy).toHaveBeenCalledWith({
       bucketName: "bucket",
       prefix: "foo",
       policy: "none"
     })
-
+    
     setImmediate(() => {
       expect(fetchPolicies).toHaveBeenCalledWith("bucket")
     })
@@ -62,11 +58,6 @@ describe("Policy", () => {
     const wrapper = shallow(
       <Policy currentBucket={"bucket"} prefix={""} policy={READ_ONLY} />
     )
-    expect(
-      wrapper
-        .find("input")
-        .at(0)
-        .prop("value")
-    ).toEqual("*")
+    expect(wrapper.find(".pmbl-item").at(0).text()).toEqual("*")
   })
 })

browser/app/js/buckets/__tests__/PolicyInput.test.js

@@ -29,9 +29,7 @@ jest.mock("../../web", () => ({
 describe("PolicyInput", () => {
   it("should render without crashing", () => {
     const fetchPolicies = jest.fn()
-    shallow(
-      <PolicyInput currentBucket={"bucket"} fetchPolicies={fetchPolicies} />
-    )
+    shallow(<PolicyInput currentBucket={"bucket"} fetchPolicies={fetchPolicies}/>)
   })
 
   it("should call fetchPolicies after the component has mounted", () => {
@@ -47,21 +45,11 @@ describe("PolicyInput", () => {
   it("should call web.setBucketPolicy and fetchPolicies on submit", () => {
     const fetchPolicies = jest.fn()
     const wrapper = shallow(
-      <PolicyInput
-        currentBucket={"bucket"}
-        policies={[]}
-        fetchPolicies={fetchPolicies}
-      />
+      <PolicyInput currentBucket={"bucket"} policies={[]} fetchPolicies={fetchPolicies}/>
     )
-    wrapper.instance().prefix = {
-      value: "baz"
-    }
-    wrapper.instance().policy = {
-      value: READ_ONLY
-    }
-    wrapper.find("button").simulate("click", {
-      preventDefault: jest.fn()
-    })
+    wrapper.instance().prefix = { value: "baz" }
+    wrapper.instance().policy = { value: READ_ONLY }
+    wrapper.find("button").simulate("click", { preventDefault: jest.fn() })
 
     expect(web.SetBucketPolicy).toHaveBeenCalledWith({
       bucketName: "bucket",
@@ -77,25 +65,13 @@ describe("PolicyInput", () => {
   it("should change the prefix '*' to an empty string", () => {
     const fetchPolicies = jest.fn()
     const wrapper = shallow(
-      <PolicyInput
-        currentBucket={"bucket"}
-        policies={[]}
-        fetchPolicies={fetchPolicies}
-      />
+      <PolicyInput currentBucket={"bucket"} policies={[]} fetchPolicies={fetchPolicies}/>
     )
-    wrapper.instance().prefix = {
-      value: "*"
-    }
-    wrapper.instance().policy = {
-      value: READ_ONLY
-    }
+    wrapper.instance().prefix = { value: "*" }
+    wrapper.instance().policy = { value: READ_ONLY }
 
-    wrapper.find("button").simulate("click", {
-      preventDefault: jest.fn()
-    })
+    wrapper.find("button").simulate("click", { preventDefault: jest.fn() })
 
-    expect(wrapper.instance().prefix).toEqual({
-      value: ""
-    })
+    expect(wrapper.instance().prefix).toEqual({ value: "" })
   })
 })

browser/app/js/buckets/__tests__/actions.test.js

@@ -17,20 +17,12 @@
 import configureStore from "redux-mock-store"
 import thunk from "redux-thunk"
 import * as actionsBuckets from "../actions"
+import * as objectActions from "../../objects/actions"
 import history from "../../history"
 
 jest.mock("../../web", () => ({
   ListBuckets: jest.fn(() => {
-    return Promise.resolve({
-      buckets: [
-        {
-          name: "test1"
-        },
-        {
-          name: "test2"
-        }
-      ]
-    })
+    return Promise.resolve({ buckets: [{ name: "test1" }, { name: "test2" }] })
   }),
   MakeBucket: jest.fn(() => {
     return Promise.resolve()
@@ -51,14 +43,8 @@ describe("Buckets actions", () => {
   it("creates buckets/SET_LIST and buckets/SET_CURRENT_BUCKET with first bucket after fetching the buckets", () => {
     const store = mockStore()
     const expectedActions = [
-      {
-        type: "buckets/SET_LIST",
-        buckets: ["test1", "test2"]
-      },
-      {
-        type: "buckets/SET_CURRENT_BUCKET",
-        bucket: "test1"
-      }
+      { type: "buckets/SET_LIST", buckets: ["test1", "test2"] },
+      { type: "buckets/SET_CURRENT_BUCKET", bucket: "test1" }
     ]
     return store.dispatch(actionsBuckets.fetchBuckets()).then(() => {
       const actions = store.getActions()
@@ -70,14 +56,8 @@ describe("Buckets actions", () => {
     history.push("/test2")
     const store = mockStore()
     const expectedActions = [
-      {
-        type: "buckets/SET_LIST",
-        buckets: ["test1", "test2"]
-      },
-      {
-        type: "buckets/SET_CURRENT_BUCKET",
-        bucket: "test2"
-      }
+      { type: "buckets/SET_LIST", buckets: ["test1", "test2"] },
+      { type: "buckets/SET_CURRENT_BUCKET", bucket: "test2" }
     ]
     window.location
     return store.dispatch(actionsBuckets.fetchBuckets()).then(() => {
@@ -90,14 +70,8 @@ describe("Buckets actions", () => {
     history.push("/test3")
     const store = mockStore()
     const expectedActions = [
-      {
-        type: "buckets/SET_LIST",
-        buckets: ["test1", "test2"]
-      },
-      {
-        type: "buckets/SET_CURRENT_BUCKET",
-        bucket: "test1"
-      }
+      { type: "buckets/SET_LIST", buckets: ["test1", "test2"] },
+      { type: "buckets/SET_CURRENT_BUCKET", bucket: "test1" }
     ]
     window.location
     return store.dispatch(actionsBuckets.fetchBuckets()).then(() => {
@@ -109,10 +83,7 @@ describe("Buckets actions", () => {
   it("creates buckets/SET_CURRENT_BUCKET action when selectBucket is called", () => {
     const store = mockStore()
     const expectedActions = [
-      {
-        type: "buckets/SET_CURRENT_BUCKET",
-        bucket: "test1"
-      }
+      { type: "buckets/SET_CURRENT_BUCKET", bucket: "test1" }
     ]
     store.dispatch(actionsBuckets.selectBucket("test1"))
     const actions = store.getActions()
@@ -122,10 +93,7 @@ describe("Buckets actions", () => {
   it("creates buckets/SHOW_MAKE_BUCKET_MODAL for showMakeBucketModal", () => {
     const store = mockStore()
     const expectedActions = [
-      {
-        type: "buckets/SHOW_MAKE_BUCKET_MODAL",
-        show: true
-      }
+      { type: "buckets/SHOW_MAKE_BUCKET_MODAL", show: true }
     ]
     store.dispatch(actionsBuckets.showMakeBucketModal())
     const actions = store.getActions()
@@ -135,10 +103,7 @@ describe("Buckets actions", () => {
   it("creates buckets/SHOW_MAKE_BUCKET_MODAL for hideMakeBucketModal", () => {
     const store = mockStore()
     const expectedActions = [
-      {
-        type: "buckets/SHOW_MAKE_BUCKET_MODAL",
-        show: false
-      }
+      { type: "buckets/SHOW_MAKE_BUCKET_MODAL", show: false }
     ]
     store.dispatch(actionsBuckets.hideMakeBucketModal())
     const actions = store.getActions()
@@ -148,10 +113,7 @@ describe("Buckets actions", () => {
   it("creates buckets/SHOW_BUCKET_POLICY for showBucketPolicy", () => {
     const store = mockStore()
     const expectedActions = [
-      {
-        type: "buckets/SHOW_BUCKET_POLICY",
-        show: true
-      }
+      { type: "buckets/SHOW_BUCKET_POLICY", show: true }
     ]
     store.dispatch(actionsBuckets.showBucketPolicy())
     const actions = store.getActions()
@@ -161,10 +123,7 @@ describe("Buckets actions", () => {
   it("creates buckets/SHOW_BUCKET_POLICY for hideBucketPolicy", () => {
     const store = mockStore()
     const expectedActions = [
-      {
-        type: "buckets/SHOW_BUCKET_POLICY",
-        show: false
-      }
+      { type: "buckets/SHOW_BUCKET_POLICY", show: false }
     ]
     store.dispatch(actionsBuckets.hideBucketPolicy())
     const actions = store.getActions()
@@ -174,10 +133,7 @@ describe("Buckets actions", () => {
   it("creates buckets/SET_POLICIES action", () => {
     const store = mockStore()
     const expectedActions = [
-      {
-        type: "buckets/SET_POLICIES",
-        policies: ["test1", "test2"]
-      }
+      { type: "buckets/SET_POLICIES", policies: ["test1", "test2"] }
     ]
     store.dispatch(actionsBuckets.setPolicies(["test1", "test2"]))
     const actions = store.getActions()
@@ -186,12 +142,7 @@ describe("Buckets actions", () => {
 
   it("creates buckets/ADD action", () => {
     const store = mockStore()
-    const expectedActions = [
-      {
-        type: "buckets/ADD",
-        bucket: "test"
-      }
-    ]
+    const expectedActions = [{ type: "buckets/ADD", bucket: "test" }]
     store.dispatch(actionsBuckets.addBucket("test"))
     const actions = store.getActions()
     expect(actions).toEqual(expectedActions)
@@ -199,12 +150,7 @@ describe("Buckets actions", () => {
 
   it("creates buckets/REMOVE action", () => {
     const store = mockStore()
-    const expectedActions = [
-      {
-        type: "buckets/REMOVE",
-        bucket: "test"
-      }
-    ]
+    const expectedActions = [{ type: "buckets/REMOVE", bucket: "test" }]
     store.dispatch(actionsBuckets.removeBucket("test"))
     const actions = store.getActions()
     expect(actions).toEqual(expectedActions)
@@ -213,14 +159,8 @@ describe("Buckets actions", () => {
   it("creates buckets/ADD and buckets/SET_CURRENT_BUCKET after creating the bucket", () => {
     const store = mockStore()
     const expectedActions = [
-      {
-        type: "buckets/ADD",
-        bucket: "test1"
-      },
-      {
-        type: "buckets/SET_CURRENT_BUCKET",
-        bucket: "test1"
-      }
+      { type: "buckets/ADD", bucket: "test1" },
+      { type: "buckets/SET_CURRENT_BUCKET", bucket: "test1" }
     ]
     return store.dispatch(actionsBuckets.makeBucket("test1")).then(() => {
       const actions = store.getActions()
@@ -228,37 +168,18 @@ describe("Buckets actions", () => {
     })
   })
 
-  it(
-    "creates alert/SET, buckets/REMOVE, buckets/SET_LIST and buckets/SET_CURRENT_BUCKET " +
-      "after deleting the bucket",
-    () => {
-      const store = mockStore()
-      const expectedActions = [
-        {
-          type: "alert/SET",
-          alert: {
-            id: 0,
-            message: "Bucket 'test3' has been deleted.",
-            type: "info"
-          }
-        },
-        {
-          type: "buckets/REMOVE",
-          bucket: "test3"
-        },
-        {
-          type: "buckets/SET_LIST",
-          buckets: ["test1", "test2"]
-        },
-        {
-          type: "buckets/SET_CURRENT_BUCKET",
-          bucket: "test1"
-        }
-      ]
-      return store.dispatch(actionsBuckets.deleteBucket("test3")).then(() => {
-        const actions = store.getActions()
-        expect(actions).toEqual(expectedActions)
-      })
-    }
-  )
+  it("creates alert/SET, buckets/REMOVE, buckets/SET_LIST and buckets/SET_CURRENT_BUCKET " + 
+     "after deleting the bucket", () => {
+    const store = mockStore()
+    const expectedActions = [
+      { type: "alert/SET", alert: {id: 0, message: "Bucket 'test3' has been deleted.", type: "info"} },
+      { type: "buckets/REMOVE", bucket: "test3" },
+      { type: "buckets/SET_LIST", buckets: ["test1", "test2"] },
+      { type: "buckets/SET_CURRENT_BUCKET", bucket: "test1" }
+    ]
+    return store.dispatch(actionsBuckets.deleteBucket("test3")).then(() => {
+      const actions = store.getActions()
+      expect(actions).toEqual(expectedActions)
+    })
+  })
 })

browser/app/js/buckets/__tests__/reducer.test.js

@@ -40,9 +40,7 @@ describe("buckets reducer", () => {
 
   it("should handle ADD", () => {
     const newState = reducer(
-      {
-        list: ["test1", "test2"]
-      },
+      { list: ["test1", "test2"] },
       {
         type: actions.ADD,
         bucket: "test3"
@@ -53,9 +51,7 @@ describe("buckets reducer", () => {
 
   it("should handle REMOVE", () => {
     const newState = reducer(
-      {
-        list: ["test1", "test2"]
-      },
+      { list: ["test1", "test2"] },
       {
         type: actions.REMOVE,
         bucket: "test2"
@@ -95,7 +91,7 @@ describe("buckets reducer", () => {
     })
     expect(newState.showBucketPolicy).toBeTruthy()
   })
-
+  
   it("should handle SHOW_MAKE_BUCKET_MODAL", () => {
     const newState = reducer(undefined, {
       type: actions.SHOW_MAKE_BUCKET_MODAL,

browser/app/js/buckets/__tests__/selectors.test.js

@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-import { getFilteredBuckets, getCurrentBucket } from "../selectors"
+import { getVisibleBuckets, getCurrentBucket } from "../selectors"
 
-describe("getFilteredBuckets", () => {
+describe("getVisibleBuckets", () => {
   let state
   beforeEach(() => {
     state = {
@@ -28,11 +28,11 @@ describe("getFilteredBuckets", () => {
 
   it("should return all buckets if no filter specified", () => {
     state.buckets.filter = ""
-    expect(getFilteredBuckets(state)).toEqual(["test1", "test11", "test2"])
+    expect(getVisibleBuckets(state)).toEqual(["test1", "test11", "test2"])
   })
 
   it("should return all matching buckets if filter is specified", () => {
     state.buckets.filter = "test1"
-    expect(getFilteredBuckets(state)).toEqual(["test1", "test11"])
+    expect(getVisibleBuckets(state)).toEqual(["test1", "test11"])
   })
 })