Use context to pass the window id around

Author: cbeer

__tests__/src/components/CompanionArea.test.js

@@ -56,7 +56,6 @@ describe('CompanionArea', () => {
     const wrapper = createWrapper();
     const props = wrapper.find(CompanionWindowFactory).at(0).props();
     expect(props.id).toBe('foo');
-    expect(props.windowId).toBe('abc123');
   });
 
   it('has a toggle to show the companion area window in the left position', () => {

__tests__/src/components/LayersPanel.test.js

@@ -26,14 +26,12 @@ describe('LayersPanel', () => {
       canvasId: 'a',
       index: 0,
       totalSize: 2,
-      windowId: 'window',
     });
 
     expect(wrapper.find(CanvasLayers).at(1).props()).toMatchObject({
       canvasId: 'b',
       index: 1,
       totalSize: 2,
-      windowId: 'window',
     });
   });
 });

__tests__/src/components/SearchPanel.test.js

@@ -52,7 +52,7 @@ describe('SearchPanel', () => {
 
   it('has the SearchPanelControls component', () => {
     const titleControls = createWrapper().find(CompanionWindow).prop('titleControls');
-    expect(titleControls.type.displayName).toEqual('Connect(WithStyles(WithPlugins(SearchPanelControls)))');
+    expect(titleControls.type.displayName).toEqual('WithStyles(WithWindowContext(Connect(WithPlugins(SearchPanelControls))))');
   });
   it('has the SearchResults', () => {
     const wrapper = createWrapper();

__tests__/src/components/SearchPanelControls.test.js

@@ -23,7 +23,7 @@ describe('SearchPanelControls', () => {
   it('renders a form and navigation', () => {
     const wrapper = createWrapper();
     expect(wrapper.find('form').length).toEqual(1);
-    expect(wrapper.find('Connect(WithStyles(WithPlugins(SearchPanelNavigation)))').length).toEqual(1);
+    expect(wrapper.find('WithStyles(WithWindowContext(Connect(WithPlugins(SearchPanelNavigation))))').length).toEqual(1);
   });
 
   it('submits a search when an autocomplete suggestion is picked', () => {

__tests__/src/components/SearchResults.test.js

@@ -30,14 +30,14 @@ describe('SearchResults', () => {
   it('renders a SearchHit for each hit', () => {
     const selectContentSearchAnnotation = jest.fn();
     const wrapper = createWrapper({ selectContentSearchAnnotation });
-    const searchHits = wrapper.find('Connect(WithStyles(WithPlugins(SearchHit)))');
+    const searchHits = wrapper.find('WithStyles(WithWindowContext(Connect(WithPlugins(SearchHit))))');
     expect(searchHits.length).toEqual(1);
     expect(searchHits.first().props().index).toEqual(0);
   });
 
   it('can focus on a single item', () => {
     const wrapper = createWrapper({});
-    const searchHits = wrapper.find('Connect(WithStyles(WithPlugins(SearchHit)))');
+    const searchHits = wrapper.find('WithStyles(WithWindowContext(Connect(WithPlugins(SearchHit))))');
 
     searchHits.first().props().showDetails();
     expect(wrapper.state().focused).toEqual(true);
@@ -59,7 +59,7 @@ describe('SearchResults', () => {
         searchHits: [],
       });
 
-      const searchHits = wrapper.find('Connect(WithStyles(WithPlugins(SearchHit)))');
+      const searchHits = wrapper.find('WithStyles(WithWindowContext(Connect(WithPlugins(SearchHit))))');
       expect(searchHits.length).toEqual(2);
       expect(searchHits.get(0).props.index).toEqual(0);
       expect(searchHits.get(0).props.annotationId).toEqual('x');

__tests__/src/components/WindowSideBarAnnotationsPanel.test.js

@@ -30,7 +30,7 @@ describe('WindowSideBarAnnotationsPanel', () => {
 
   it('has the AnnotationSettings component', () => {
     const titleControls = createWrapper().prop('titleControls');
-    expect(titleControls.type.displayName).toEqual('Connect(WithPlugins(AnnotationSettings))');
+    expect(titleControls.type.displayName).toEqual('WithWindowContext(Connect(WithPlugins(AnnotationSettings)))');
   });
 
   it('renders the annotationsCount', () => {

__tests__/src/components/WindowTopBar.test.js

@@ -56,12 +56,12 @@ describe('WindowTopBar', () => {
 
   it('passes correct props to <WindowTopBarButtons/>', () => {
     const wrapper = createWrapper();
-    expect(wrapper.find(WindowTopBarPluginMenu).first().props().windowId).toBe('xyz');
+    expect(wrapper.find(WindowTopBarPluginMenu).length).toEqual(1);
   });
 
   it('passe correct props to <WindowTopMenuButton', () => {
     const wrapper = createWrapper();
-    expect(wrapper.find(WindowTopMenuButton).first().props().windowId).toBe('xyz');
+    expect(wrapper.find(WindowTopMenuButton).length).toEqual(1);
   });
 
   it('passes correct props to <Button/>', () => {

__tests__/src/components/WindowTopMenu.test.js

@@ -29,8 +29,7 @@ describe('WindowTopMenu', () => {
 
   it('passes windowId to <WindowThumbnailSettings/>', () => {
     const wrapper = createWrapper();
-    expect(wrapper.find(WindowThumbnailSettings)
-      .first().props().windowId).toBe('xyz');
+    expect(wrapper.find(WindowThumbnailSettings).length).toBe(1);
   });
 
   it('passses correct props to <Menu/> when no achor element given', () => {

__tests__/src/components/WindowTopMenuButton.test.js

@@ -26,7 +26,6 @@ describe('WindowTopMenuButton', () => {
     const wrapper = createWrapper();
     const props = wrapper.find(WindowTopMenu).first().props();
     const { handleMenuClose } = wrapper.instance();
-    expect(props.windowId).toBe('xyz');
     expect(props.anchorEl).toBe(null);
     expect(props.handleClose).toBe(handleMenuClose);
   });

__tests__/src/components/WindowViewer.test.js

@@ -24,8 +24,7 @@ describe('WindowViewer', () => {
   describe('when lazy imorts have loaded', () => {
     it('renders expected components', () => {
       wrapper = createWrapper({}, false);
-      expect(wrapper.find('lazy').props().windowId).toBe('xyz');
-      expect(wrapper.find(WindowCanvasNavigationControls).props().windowId).toBe('xyz');
+      expect(wrapper.find(WindowCanvasNavigationControls).length).toBe(1);
     });
   });
 });