Merge pull request #76 from cu-mkp/main

Deploying recent updates to GitHub Pages
cu-mkp · Mar 6, 2024 · a1e80fb · a1e80fb
2 parents 8f8c4dc + d28c9ec
commit a1e80fb
Show file tree

Hide file tree

Showing 26 changed files with 400 additions and 105 deletions.
diff --git a/editioncrafter-umd/package.json b/editioncrafter-umd/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@cu-mkp/editioncrafter-umd",
-  "version": "0.1.0",
+  "version": "0.2.0",
   "description": "",
   "private": false,
   "source": "src/index.js",

diff --git a/editioncrafter-umd/src/EditionCrafter.js b/editioncrafter-umd/src/EditionCrafter.js
@@ -14,10 +14,13 @@ class EditionCrafter {
     if (config.id) {
       this.container = document.getElementById(config.id);
       config.id && ReactDOM.render(
-        <EditionCrafterComponent config={config} />,
+        <EditionCrafterComponent 
+          {...config}  
+        />,
         this.container,
       );
     }
+    // note: once the EC react component is updated, 
   }
 
   /**

diff --git a/editioncrafter/package.json b/editioncrafter/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@cu-mkp/editioncrafter",
-  "version": "0.1.0",
+  "version": "0.2.0",
   "description": "",
   "private": false,
   "main": "dist/editioncrafter.min.js",

diff --git a/editioncrafter/src/action/DocumentActions.js b/editioncrafter/src/action/DocumentActions.js
@@ -113,6 +113,17 @@ function parseAnnotationURLs(canvas, transcriptionTypes) {
 const MAX_THUMBNAIL_DIMENSION = 130;
 
 function parseManifest(manifest, transcriptionTypes) {
+  if (manifest.type === 'variorum') {
+    let folios = [];
+    Object.keys(manifest.documentData).forEach((key) => {
+      folios = folios.concat(parseSingleManifest(manifest.documentData[key], transcriptionTypes[key], key));
+    });
+    return folios;
+  }
+  return parseSingleManifest(manifest, transcriptionTypes);
+}
+
+function parseSingleManifest(manifest, transcriptionTypes, document) {
   const folios = [];
 
   // make sure this is a IIIF Presentation API v3 Manifest
@@ -146,6 +157,7 @@ function parseManifest(manifest, transcriptionTypes) {
 
     const folio = {
       id: folioID,
+      doc_id: document || manifest.id,
       name: canvasLabel,
       pageNumber: i,
       image_zoom_url: imageURL,
@@ -158,7 +170,6 @@ function parseManifest(manifest, transcriptionTypes) {
 
     folios.push(folio);
   }
-
   return folios;
 }
 

diff --git a/editioncrafter/src/action/initialState/documentInitialState.js b/editioncrafter/src/action/initialState/documentInitialState.js
@@ -1,8 +1,11 @@
-export default function documentInitalState(iiifManifest, documentName, transcriptionTypes) {
+export default function documentInitalState(iiifManifest, documentName, transcriptionTypes, variorum = false, derivativeNames = null, threePanel = false) {
   return {
-    documentName: documentName,
+    documentName,
+    derivativeNames,
     manifestURL: iiifManifest,
     transcriptionTypes,
+    variorum,
+    threePanel,
     folios: [],
     loaded: false,
     folioIndex: {},

diff --git a/editioncrafter/src/action/rootReducer.js b/editioncrafter/src/action/rootReducer.js
@@ -1,5 +1,6 @@
 import { combineReducers } from 'redux';
 
+// eslint-disable-next-line import/no-cycle
 import { createReducer } from '../model/ReduxStore';
 import GlossaryActions from './GlossaryActions';
 import DocumentActions from './DocumentActions';
@@ -11,11 +12,25 @@ import documentInitialState from './initialState/documentInitialState';
 
 export default function rootReducer(config) {
   const {
-    iiifManifest, documentName, transcriptionTypes,
+    documentName, documentInfo, threePanel = false
   } = config;
+  const variorum = documentInfo && Object.keys(documentInfo).length > 1;
+  const transcriptionTypesInfo = {};
+  const manifestInfo = {};
+  const derivativesInfo = {};
+  if (variorum) {
+    Object.keys(config.documentInfo).forEach((key) => {
+      transcriptionTypesInfo[key] = config.documentInfo[key].transcriptionTypes;
+      manifestInfo[key] = config.documentInfo[key].iiifManifest;
+      derivativesInfo[key] = config.documentInfo[key].documentName;
+    });
+  }
+  const transcriptionTypes = variorum ? transcriptionTypesInfo : config.transcriptionTypes;
+  const iiifManifest = variorum ? manifestInfo : config.iiifManifest;
+  const derivativeNames = variorum && derivativesInfo;
   return combineReducers({
     diplomatic: createReducer('DiplomaticActions', DiplomaticActions, diplomaticInitialState),
-    document: createReducer('DocumentActions', DocumentActions, documentInitialState(iiifManifest, documentName, transcriptionTypes)),
+    document: createReducer('DocumentActions', DocumentActions, documentInitialState(iiifManifest, documentName, transcriptionTypes, variorum, derivativeNames, threePanel)),
     glossary: createReducer('GlossaryActions', GlossaryActions, glossaryInitialState()),
   });
 }
diff --git a/editioncrafter/src/component/DiploMatic.js b/editioncrafter/src/component/DiploMatic.js
@@ -27,6 +27,7 @@ const DiploMatic = (props) => {
           <RouteListener />
           <div id="content">
             <Routes>
+              <Route path="/ec/:folioID/:transcriptionType/:folioID2/:transcriptionType2/:folioID3/:transcriptionType3" element={<DocumentView {...props} />} exact />
               <Route path="/ec/:folioID/:transcriptionType/:folioID2/:transcriptionType2" element={<DocumentView {...props} />} exact />
               <Route path="/ec/:folioID/:transcriptionType" element={<DocumentView {...props} />} exact />
               <Route path="/ec/:folioID" element={<DocumentView {...props} />} exact />