Merge pull request #3171 from ProjectMirador/container-wiring

Fix a container wiring issue

Merge pull request #3171 from ProjectMirador/container-wiring
c954f144 · Jack Reed · GitHub · 7bb0b59c · bbef7fad · c954f144
Unverified Commit c954f144 authored 4 years ago by Jack Reed Committed by GitHub 4 years ago
--- a/__tests__/integration/mirador/minimalist.html
+++ b/__tests__/integration/mirador/minimalist.html
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="utf-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
+    <meta name="theme-color" content="#000000">
+    <title>Mirador</title>
+    <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Roboto:300,400,500">
+  </head>
+  <body>
+    <div id="mirador" style="position: absolute; top: 0; bottom: 0; left: 0; right: 0;"></div>
+    <script>document.write("<script type='text/javascript' src='../../../dist/mirador.min.js?v=" + Date.now() + "'><\/script>");</script>
+    <script type="text/javascript">
+     var miradorInstance = Mirador.viewer({
+       id: 'mirador',
+       windows: [{
+         manifestId: 'https://iiif.harvardartmuseums.org/manifests/object/299843',
+         canvasId: 'https://iiif.harvardartmuseums.org/manifests/object/299843/canvas/canvas-47174892',
+         thumbnailNavigationPosition: 'far-bottom',
+         allowClose: false,
+       }],
+       window: {
+         allowWindowSideBar: false,
+         sideBarPanel: '',
+         sideBarOpen: true,
+       },
+       workspace: {
+         type: 'single',
+       },
+       workspaceControlPanel: {
+         enabled: false,
+       },
+     });
+    </script>
+  </body>
+</html>
--- a/__tests__/integration/mirador/minimalist.test.js
+++ b/__tests__/integration/mirador/minimalist.test.js
+describe('Minimalist configuration to Mirador', () => {
+  beforeAll(async () => {
+    await page.goto('http://127.0.0.1:4488/__tests__/integration/mirador/minimalist.html');
+  });
+  it('loads a manifest and displays it without some of the default controls', async () => {
+    await expect(page).toMatchElement(
+      'h2',
+      { text: /Self-Portrait/ },
+    );
+    await expect(page).toMatchElement('button[aria-label="Information"]');
+    await expect(page).toMatchElement('button[aria-label="Rights"]');
+    await expect(page).not.toMatchElement('#addBtn');
+    await expect(page).not.toMatchElement('button[aria-label="Toggle sidebar"]');
+    await expect(page).not.toMatchElement('button[aria-label="Close window"]');
+  });
+});
--- a/src/containers/WindowTopBar.js
+++ b/src/containers/WindowTopBar.js
@@ -9,7 +9,7 @@ import { WindowTopBar } from '../components/WindowTopBar';

 /** mapStateToProps */
 const mapStateToProps = (state, { windowId }) => {
-  const config = getWindowConfig;
+  const config = getWindowConfig(state, { windowId });

  return {
    allowClose: config.allowClose,