Upgrade Mirador to version 4

replaces both Mirador 3 and the customized Mirador 2 previously used for palimpsests

Author: sourcefilter

.gitignore

@@ -9,6 +9,10 @@ node_modules
 /cypress/videos
 
 
+# mirador annotation editor, temporarily copied while I wait for a fix on the npm package exports
+/mae
+
+
 # local env files
 .env.local
 .env.*.local

cypress/e2e/sinaimanuscript.spec.js

@@ -1,21 +1,25 @@
 describe('With the `site=sinai` parameter set', () => {
-  const URL_PARAMETERS = `?site=sinai&manifest=${encodeURIComponent("https://iiif.library.ucla.edu/ark%3A%2F21198%2Fz18w4z1w/manifest")}`
-  
-  it('loads Mirador 3 in an iframe', () => {
+  const URL_PARAMETERS = `?site=sinai&manifest=${encodeURIComponent('https://iiif.library.ucla.edu/ark%3A%2F21198%2Fz18w4z1w/manifest')}`
+
+  it('loads in Mirador', () => {
     // http://localhost:8080/?site=sinai&manifest=https%3A%2F%2Fiiif.library.ucla.edu%2Fark%253A%252F21198%252Fz18w4z1w%2Fmanifest
     cy.visit('/' + URL_PARAMETERS)
-    
-    cy.frameLoaded("#mirador-iframe", {
-      url: '/mirador3.html' + URL_PARAMETERS,
-    });
-  })
-  
-  it('loads in Mirador 3', () => {
-    // http://localhost:8080/mirador3.html?site=sinai&manifest=https%3A%2F%2Fiiif.library.ucla.edu%2Fark%253A%252F21198%252Fz18w4z1w%2Fmanifest
-    cy.visit('/mirador3.html' + URL_PARAMETERS)
 
-    // Shows title
-    cy.get(".mirador-viewer").should("exist").should("be.visible")
-    cy.contains("h2", "Sinai, St. Catherine’s Monastery, Arabic 1").should("exist").should("be.visible")
+    cy.get('.mirador-viewer').should('exist').should('be.visible')
+
+    // Image tools loaded
+    cy.get('[aria-label="Expand image tools"]').should('exist').should('be.visible')
+
+    // Annotations plugin loaded
+    cy.get('button[aria-label="Annotations"]').should('exist').should('be.visible')
+
+    // index panel open on load
+    cy.get('.mirador-companion-area-left')
+      .contains('h3', 'Index')
+      .should('exist')
+      .should('be.visible')
+
+    // close window button is present
+    cy.get('button[aria-label="Close window"').should('exist').should('be.visible')
   })
 })

cypress/e2e/sinaipalimpsest.spec.js

@@ -1,31 +1,30 @@
 describe('With the `viewer=mirador` parameter set', () => {
-  const URL_PARAMETERS = `?viewer=mirador&manifest=${encodeURIComponent('https://sinai-images.library.ucla.edu/iiif/ark:%2F21198%2Fz1bc4wfw/manifest')}`
-  // beforeEach(() => {
-  //   cy.intercept(
-  //     'GET',
-  //     'https://sinai-images.library.ucla.edu/iiif/ark:%2F21198%2Fz1bc4wfw/manifest',
-  //     { fixture: 'arabic514.json' },
-  //   ).as('getManifest')
-  // })
-
-  // For some reason cypress is blocking the api call to get the manifest, so everything works in real life but the test fails. It even loads fine int he cypress window, but only AFTER cypress times out
-
-  // it('loads Mirador 2 in an iframe', () => {
-  //   // http://localhost:8080/?viewer=mirador&manifest=https%3A%2F%2Fsinai-images.library.ucla.edu%2Fiiif%2Fark%3A%252F21198%252Fz1bc4wfw%2Fmanifest
-  //   cy.visit('/' + URL_PARAMETERS)
-  //   // cy.wait('@getManifest')
-
-  //   cy.frameLoaded('#mirador-iframe', {
-  //     url: '/palimpsest/viewer.html' + URL_PARAMETERS,
-  //   })
-  // })
-
-  it('loads in Mirador2 Viewer!', () => {
-    // http://localhost:8080/mirador3.html?viewer=mirador&manifest=https%3A%2F%2Fsinai-images.library.ucla.edu%2Fiiif%2Fark%3A%252F21198%252Fz1bc4wfw%2Fmanifest
-    cy.visit('/palimpsest/viewer.html' + URL_PARAMETERS)
-    // cy.wait('@getManifest')
-
-    // Shows title
-    cy.contains('.window-manifest-title', 'Arabic 514').should('exist').should('be.visible')
+  const URL_PARAMETERS =
+    '?site=sinai&manifest=https%3A%2F%2Fsinai-images.library.ucla.edu%2Fiiif%2Fark%3A%252F21198%252Fz1ft92mh%2Fmanifest'
+
+  it('loads in Mirador', () => {
+    // http://localhost:8080/?site=sinai&manifest=https%3A%2F%2Fiiif.library.ucla.edu%2Fark%253A%252F21198%252Fz18w4z1w%2Fmanifest
+    cy.visit('/' + URL_PARAMETERS)
+
+    cy.get('.mirador-viewer').should('exist').should('be.visible')
+
+    cy.contains('CPA NF fragment 13').should('exist')
+
+    // Image tools loaded
+    cy.get('[aria-label="Expand image tools"]').should('exist').should('be.visible')
+
+    // Annotations plugin loaded
+    cy.get('button[aria-label="Annotations"]').should('exist').should('be.visible')
+
+    // index panel open on load
+    cy.get('.mirador-companion-area-left')
+      .contains('h3', 'Index')
+      .should('exist')
+      .should('be.visible')
+
+    // close window button is present
+    cy.get('button[aria-label="Close window"').should('exist').should('be.visible')
+
+    cy.contains('An error occurred').should('not.exist')
   })
 })