@cu-mkp/editioncrafter 0.0.7 → 0.0.8

package/dist/es/src/action/initialState/glossaryInitialState.js

@@ -1,6 +1,5 @@
-export default function glossaryInitialState(glossaryURL) {
+export default function glossaryInitialState() {
   return {
-    glossaryURL: glossaryURL,
     glossary: {},
     loaded: false
   };

package/dist/es/src/action/rootReducer.js

@@ -6,18 +6,13 @@ import DiplomaticActions from './DiplomaticActions';
 import diplomaticInitialState from './initialState/diplomaticInitialState';
 import glossaryInitialState from './initialState/glossaryInitialState';
 import documentInitialState from './initialState/documentInitialState';
-import CommentActions from './CommentActions';
-import commentInitialState from './initialState/commentInitialState';
 export default function rootReducer(config) {
   var iiifManifest = config.iiifManifest,
     documentName = config.documentName,
-    commentsURL = config.commentsURL,
-    glossaryURL = config.glossaryURL,
     transcriptionTypes = config.transcriptionTypes;
   return combineReducers({
     diplomatic: createReducer('DiplomaticActions', DiplomaticActions, diplomaticInitialState),
     document: createReducer('DocumentActions', DocumentActions, documentInitialState(iiifManifest, documentName, transcriptionTypes)),
-    glossary: createReducer('GlossaryActions', GlossaryActions, glossaryInitialState(glossaryURL)),
-    comments: createReducer('CommentActions', CommentActions, commentInitialState(commentsURL))
+    glossary: createReducer('GlossaryActions', GlossaryActions, glossaryInitialState())
   });
 }

package/dist/es/src/component/EditorComment.js

@@ -14,7 +14,6 @@ function _assertThisInitialized(self) { if (self === void 0) { throw new Referen
 function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
 function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf.bind() : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); }
 import React, { Component } from 'react';
-import { connect } from 'react-redux';
 import Typography from '@material-ui/core/Typography';
 import Popper from '@material-ui/core/Popper';
 import Fade from '@material-ui/core/Fade';
@@ -50,12 +49,8 @@ var EditorComment = /*#__PURE__*/function (_Component) {
       var _this$state = this.state,
         anchorRef = _this$state.anchorRef,
         open = _this$state.open;
-      var id = "comment-".concat(this.props.commentID);
-      var comments = this.props.comments.comments;
-      var comment = comments[this.props.commentID] ? comments[this.props.commentID].comment : null;
-      var interpreted;
-      if (comment) interpreted = Parser(comment);
-      var content = interpreted || comment || "ERROR: Could not find comment for id: ".concat(this.props.commentID, ".");
+      var interpreted = Parser(this.props.text);
+      var content = interpreted || "ERROR: Could not find comment for id: ".concat(this.props.commentID, ".");
       var style = {
         maxWidth: 200,
         padding: '25px 15px 15px 15px'
@@ -66,7 +61,7 @@ var EditorComment = /*#__PURE__*/function (_Component) {
         fontStyle: 'bold'
       };
       return /*#__PURE__*/React.createElement(Popper, {
-        id: id,
+        id: this.props.commentID,
         open: open,
         anchorEl: anchorRef
       }, /*#__PURE__*/React.createElement(Fade, {
@@ -106,9 +101,4 @@ var EditorComment = /*#__PURE__*/function (_Component) {
   }]);
   return EditorComment;
 }(Component);
-function mapStateToProps(state) {
-  return {
-    comments: state.comments
-  };
-}
-export default connect(mapStateToProps)(EditorComment);
+export default EditorComment;

package/dist/es/src/component/HelpPopper.js

@@ -9,7 +9,6 @@ import ListItemText from '@material-ui/core/ListItemText';
 import { FaArrowCircleLeft, FaArrowCircleRight } from 'react-icons/fa';
 import asterisk from '../icons/howtouse-asterisk.png';
 import curly from '../icons/howtouse-curly.png';
-import beaker from '../icons/howtouse-beaker.png';
 import square from '../icons/howtouse-square.png';
 import ups from '../icons/howtouse-ups.png';
 var HelpPopper = function HelpPopper(props) {
@@ -70,9 +69,6 @@ var HelpPopper = function HelpPopper(props) {
     src: square,
     alt: "howtouse-square"
   })), /*#__PURE__*/React.createElement("td", null, /*#__PURE__*/React.createElement(Typography, null, "Editorial interventions and corrections"))), /*#__PURE__*/React.createElement("tr", null, /*#__PURE__*/React.createElement("td", null, /*#__PURE__*/React.createElement("img", {
-    src: beaker,
-    alt: "howtouse-beaker"
-  })), /*#__PURE__*/React.createElement("td", null, /*#__PURE__*/React.createElement(Typography, null, "Associated research essay"))), /*#__PURE__*/React.createElement("tr", null, /*#__PURE__*/React.createElement("td", null, /*#__PURE__*/React.createElement("img", {
     src: asterisk,
     alt: "howtouse-asterisk"
   })), /*#__PURE__*/React.createElement("td", null, /*#__PURE__*/React.createElement(Typography, null, "Editorial Comments"))))))), /*#__PURE__*/React.createElement(Typography, null, "See \xA0", /*#__PURE__*/React.createElement("a", {

package/dist/es/src/component/Navigation.js

@@ -222,13 +222,11 @@ var Navigation = /*#__PURE__*/function (_React$Component) {
         value: documentView[side].transcriptionType,
         id: "doc-type",
         onClick: this.changeType
-      }, /*#__PURE__*/React.createElement(MenuItem, {
-        value: "tl"
-      }, DocumentHelper.transcriptionTypeLabels.tl), /*#__PURE__*/React.createElement(MenuItem, {
-        value: "tc"
-      }, DocumentHelper.transcriptionTypeLabels.tc), /*#__PURE__*/React.createElement(MenuItem, {
-        value: "tcn"
-      }, DocumentHelper.transcriptionTypeLabels.tcn), /*#__PURE__*/React.createElement(MenuItem, {
+      }, Object.keys(this.props.document.transcriptionTypes).map(function (ttKey) {
+        return /*#__PURE__*/React.createElement(MenuItem, {
+          value: ttKey
+        }, _this2.props.document.transcriptionTypes[ttKey]);
+      }), /*#__PURE__*/React.createElement(MenuItem, {
         value: "f"
       }, DocumentHelper.transcriptionTypeLabels.f), /*#__PURE__*/React.createElement(MenuItem, {
         value: "glossary"

package/dist/es/src/component/TranscriptionView.js

@@ -68,11 +68,25 @@ var TranscriptionView = /*#__PURE__*/function (_Component) {
         });
       }
       var transcriptionData = folio.transcription[transcriptionType];
+      if (!transcriptionData) {
+        return /*#__PURE__*/React.createElement(Watermark, {
+          documentView: documentView,
+          documentViewActions: documentViewActions,
+          side: side
+        });
+      }
 
       // Configure parser to replace certain tags with components
       var htmlToReactParserOptionsSide = htmlToReactParserOptions();
       var html = transcriptionData.html,
         layout = transcriptionData.layout;
+      if (!html) {
+        return /*#__PURE__*/React.createElement(Watermark, {
+          documentView: documentView,
+          documentViewActions: documentViewActions,
+          side: side
+        });
+      }
       var surfaceStyle = {
         gridTemplateAreas: layout
       };
@@ -104,12 +118,42 @@ function htmlToReactParserOptions() {
   var parserOptions = {
     replace: function replace(domNode) {
       switch (domNode.name) {
-        case 'comment':
+        case 'tei-note':
           {
-            var commentID = domNode.attribs.rid; // ( domNode.children && domNode.children[0] ) ? domNode.children[0].data : null
+            var _domNode$children$;
+            var text = ((_domNode$children$ = domNode.children[0]) === null || _domNode$children$ === void 0 ? void 0 : _domNode$children$.data) || '';
+            var id = domNode.attribs.n;
+
+            // Not sure what else to do if there's no ID
+            if (!id) {
+              return domNode;
+            }
             return /*#__PURE__*/React.createElement(EditorComment, {
-              commentID: commentID
+              commentID: id,
+              text: text
+            });
+          }
+        case 'tei-figure':
+          {
+            var _graphicEl$attribs, _descEl$children$;
+            var graphicEl = domNode.children.find(function (ch) {
+              return ch.name === 'tei-graphic';
+            });
+            var src = graphicEl === null || graphicEl === void 0 ? void 0 : (_graphicEl$attribs = graphicEl.attribs) === null || _graphicEl$attribs === void 0 ? void 0 : _graphicEl$attribs.url;
+            if (!src) {
+              return domNode;
+            }
+            var descEl = domNode.children.find(function (ch) {
+              return ch.name === 'tei-figdesc';
             });
+            var desc = descEl === null || descEl === void 0 ? void 0 : (_descEl$children$ = descEl.children[0]) === null || _descEl$children$ === void 0 ? void 0 : _descEl$children$.data;
+            return /*#__PURE__*/React.createElement("figure", {
+              className: "inline-figure"
+            }, /*#__PURE__*/React.createElement("img", {
+              src: src,
+              alt: desc || '',
+              className: "inline-image"
+            }), desc ? /*#__PURE__*/React.createElement("figcaption", null, desc) : null);
           }
         default:
           /* Otherwise, Just pass through */

package/dist/es/src/model/DocumentHelper.js

@@ -1,10 +1,8 @@
 var DocumentHelper = {};
 DocumentHelper.transcriptionTypeLabels = {
-  tc: 'Diplomatic (FR)',
-  tcn: 'Normalized (FR)',
-  tl: 'Translation (EN)',
   f: 'Facsimile',
-  anno: 'Research Esssay',
-  glossary: 'Glossary'
+  // keep
+  glossary: 'Glossary' // keep
 };
+
 export default DocumentHelper;

package/dist/es/src/model/Folio.js

@@ -22,6 +22,9 @@ export function loadFolio(folioData) {
   // promise to load all the data for this folio
   return new Promise(function (resolve, reject) {
     var transcriptionTypes = Object.keys(folio.annotationURLs);
+    var transcriptionTypeTracker = Object.fromEntries(transcriptionTypes.map(function (t) {
+      return [t, false];
+    }));
     if (transcriptionTypes.length > 0) {
       axios.get(folio.image_zoom_url).then(function (imageServerResponse) {
         // Handle the image server response
@@ -43,11 +46,18 @@ export function loadFolio(folioData) {
               } else {
                 folio.transcription[transcriptionType] = transcription;
                 folio.loading = false;
-                resolve(folio);
+                transcriptionTypeTracker[transcriptionType] = true;
               }
             }))["catch"](function (error) {
               folioData.loading = false;
               reject(error);
+            })["finally"](function () {
+              // Only resolve once all transcription types have been fetched
+              if (Object.values(transcriptionTypeTracker).filter(function (v) {
+                return !v;
+              }).length === 0) {
+                resolve(folio);
+              }
             });
           };
           for (_iterator.s(); !(_step = _iterator.n()).done;) {

package/dist/es/src/saga/RouteListenerSaga.js

@@ -3,8 +3,7 @@ var _marked = /*#__PURE__*/_regeneratorRuntime().mark(userNavigation),
   _marked2 = /*#__PURE__*/_regeneratorRuntime().mark(resolveDocumentManifest),
   _marked3 = /*#__PURE__*/_regeneratorRuntime().mark(resolveFolio),
   _marked4 = /*#__PURE__*/_regeneratorRuntime().mark(resolveGlossary),
-  _marked5 = /*#__PURE__*/_regeneratorRuntime().mark(resolveComments),
-  _marked6 = /*#__PURE__*/_regeneratorRuntime().mark(routeListenerSaga);
+  _marked5 = /*#__PURE__*/_regeneratorRuntime().mark(routeListenerSaga);
 import axios from 'axios';
 import { takeEvery, select } from 'redux-saga/effects';
 import { putResolveAction } from '../model/ReduxStore';
@@ -15,38 +14,33 @@ var justDocument = function justDocument(state) {
 var justGlossary = function justGlossary(state) {
   return state.glossary;
 };
-var justComments = function justComments(state) {
-  return state.comments;
-};
 function userNavigation(action) {
-  var pathname, pathSegments;
+  var pathname, pathSegments, manifest;
   return _regeneratorRuntime().wrap(function userNavigation$(_context) {
     while (1) switch (_context.prev = _context.next) {
       case 0:
         pathname = action.payload.params[0].pathname;
         pathSegments = pathname.split('/');
         if (!(pathSegments.length > 1)) {
-          _context.next = 15;
+          _context.next = 14;
           break;
         }
         _context.t0 = pathSegments[1];
-        _context.next = _context.t0 === 'ec' ? 6 : 15;
+        _context.next = _context.t0 === 'ec' ? 6 : 14;
         break;
       case 6:
         _context.next = 8;
-        return resolveComments();
-      case 8:
-        _context.next = 10;
         return resolveDocumentManifest();
-      case 10:
-        _context.next = 12;
-        return resolveGlossary();
-      case 12:
-        _context.next = 14;
+      case 8:
+        manifest = _context.sent;
+        _context.next = 11;
+        return resolveGlossary(manifest);
+      case 11:
+        _context.next = 13;
         return resolveFolio(pathSegments);
+      case 13:
+        return _context.abrupt("break", 14);
       case 14:
-        return _context.abrupt("break", 15);
-      case 15:
       case "end":
         return _context.stop();
     }
@@ -62,7 +56,7 @@ function resolveDocumentManifest() {
       case 2:
         document = _context2.sent;
         if (document.loaded) {
-          _context2.next = 9;
+          _context2.next = 10;
           break;
         }
         _context2.next = 6;
@@ -72,6 +66,10 @@ function resolveDocumentManifest() {
         _context2.next = 9;
         return putResolveAction('DocumentActions.loadDocument', response.data);
       case 9:
+        return _context2.abrupt("return", response.data);
+      case 10:
+        return _context2.abrupt("return", null);
+      case 11:
       case "end":
         return _context2.stop();
     }
@@ -127,8 +125,8 @@ function resolveFolio(pathSegments) {
     }
   }, _marked3);
 }
-function resolveGlossary() {
-  var glossary, response;
+function resolveGlossary(manifest) {
+  var glossary, glossaryURL, response;
   return _regeneratorRuntime().wrap(function resolveGlossary$(_context4) {
     while (1) switch (_context4.prev = _context4.next) {
       case 0:
@@ -137,55 +135,37 @@ function resolveGlossary() {
       case 2:
         glossary = _context4.sent;
         if (glossary.loaded) {
-          _context4.next = 9;
+          _context4.next = 12;
           break;
         }
-        _context4.next = 6;
-        return axios.get(glossary.glossaryURL);
+        if (!(!(manifest !== null && manifest !== void 0 && manifest.seeAlso) || manifest.seeAlso.length === 0 || !manifest.seeAlso[0].id)) {
+          _context4.next = 6;
+          break;
+        }
+        throw new Error('Missing glossary link in seeAlso array.');
       case 6:
-        response = _context4.sent;
+        glossaryURL = manifest.seeAlso[0].id;
         _context4.next = 9;
-        return putResolveAction('GlossaryActions.loadGlossary', response.data);
+        return axios.get(glossaryURL);
       case 9:
+        response = _context4.sent;
+        _context4.next = 12;
+        return putResolveAction('GlossaryActions.loadGlossary', response.data);
+      case 12:
       case "end":
         return _context4.stop();
     }
   }, _marked4);
 }
-function resolveComments() {
-  var comments, response;
-  return _regeneratorRuntime().wrap(function resolveComments$(_context5) {
+export default function routeListenerSaga() {
+  return _regeneratorRuntime().wrap(function routeListenerSaga$(_context5) {
     while (1) switch (_context5.prev = _context5.next) {
       case 0:
         _context5.next = 2;
-        return select(justComments);
+        return takeEvery('RouteListenerSaga.userNavigatation', userNavigation);
       case 2:
-        comments = _context5.sent;
-        if (comments.loaded) {
-          _context5.next = 9;
-          break;
-        }
-        _context5.next = 6;
-        return axios.get(comments.commentsURL);
-      case 6:
-        response = _context5.sent;
-        _context5.next = 9;
-        return putResolveAction('CommentActions.loadComments', response.data);
-      case 9:
       case "end":
         return _context5.stop();
     }
   }, _marked5);
-}
-export default function routeListenerSaga() {
-  return _regeneratorRuntime().wrap(function routeListenerSaga$(_context6) {
-    while (1) switch (_context6.prev = _context6.next) {
-      case 0:
-        _context6.next = 2;
-        return takeEvery('RouteListenerSaga.userNavigatation', userNavigation);
-      case 2:
-      case "end":
-        return _context6.stop();
-    }
-  }, _marked6);
 }

package/dist/es/src/scss/_transcriptView.scss

@@ -7,161 +7,165 @@
 		@include md {
 			padding: 5px 16px;
 		}
-	   
+
 	  -webkit-user-select: text;
 	  -moz-user-select: text;
 	  -ms-user-select: text;
 	  user-select: text;
 	  margin-bottom:92px;
-  
+
 	  figure {
-		  display: inline;
+		  display: inline-flex;
+			flex-direction: column;
+			width: 100%;
+			align-items: center;
+			gap: 6px;
 	  }
-	  	
+
 	.block[data-layout='right-middle'] {
 		max-width: 250px;
 	}
-	
+
 	.block[data-layout='right-top'] {
 		max-width: 250px;
 	}
-	
+
 	.block[data-layout='right-bottom'] {
 		max-width: 250px;
 	}
-	
+
 	// TODO refactor to appropriate TEI element
 	// .ups {
 	// 	background: lightgray;
 	// 	font-size: 14px;
 	// }
-	
+
 	.x-small-inline-figure {
 		margin: 5px;
 		border: 1px solid gray;
 		width: 30px;
 	}
-	
+
 	.small-inline-figure {
 		margin: 5px;
 		border: 1px solid gray;
 		width: 60px;
 	}
-	
+
 	.medium-inline-figure {
 		margin: 5px;
 		border: 1px solid gray;
 		width: 200px;
 	}
-	
+
 	.large-inline-figure {
 		margin: 5px;
 		border: 1px solid gray;
 		width: 350px;
 	}
-	
-	
+
+
 	.surface {
 		grid-area: transcription;
 		margin: 0;
 		padding: 0;
 		list-style: none;
 	}
-	
+
 	.grid-mode {
 		display: grid;
 		grid-auto-rows: minmax(min-content, 0fr);
 		grid-gap: 2px;
 	}
-	
+
 	.surface > .small-font {
 		font-size: 11pt;
 	}
-	
+
 	.surface > div {
 		padding: 10px;
 	}
-	
+
 	.surface > #z0 {
 		grid-area: z0;
 	}
-	
+
 	.surface > #z1 {
 		grid-area: z1;
 	}
-	
+
 	.surface > #z2 {
 		grid-area: z2;
 	}
-	
+
 	.surface > #z3 {
 		grid-area: z3;
 	}
-	
+
 	.surface > #z4 {
 		grid-area: z4;
 	}
-	
+
 	.surface > #z5 {
 		grid-area: z5;
 	}
-	
+
 	.surface > #z6 {
 		grid-area: z6;
 	}
-	
+
 	.surface > #z7 {
 		grid-area: z7;
 	}
-	
+
 	.surface > #z8 {
 		grid-area: z8;
 	}
-	
+
 	.surface > #z9 {
 		grid-area: z9;
 	}
-	
+
 	.surface > #z10 {
 		grid-area: z10;
 	}
-	
+
 	.surface > #z11 {
 		grid-area: z11;
 	}
-	
+
 	.surface > #z12 {
 		grid-area: z12;
 	}
-	
+
 	.surface > #z13 {
 		grid-area: z13;
 	}
-	
+
 	.surface > #z14 {
 		grid-area: z14;
 	}
-	
+
 	.surface > #z15 {
 		grid-area: z15;
 	}
-	
+
 	.surface > #z16 {
 		grid-area: z16;
 	}
-	
+
 	.surface > #z17 {
 		grid-area: z17;
 	}
-	
+
 	.surface > #z18 {
 		grid-area: z18;
 	}
-	
+
 	.surface > #z19 {
 		grid-area: z19;
 	}
-	
+
 	.surface > #z20 {
 		grid-area: z20;
 	}
@@ -175,4 +179,9 @@
 	word-wrap:break-word;
 }
 
-
+.inline-image {
+	max-width: 90%;
+	max-height: 360px;
+	margin: auto;
+	text-align: center;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cu-mkp/editioncrafter",
-  "version": "0.0.7",
+  "version": "0.0.8",
   "description": "",
   "private": false,
   "main": "dist/editioncrafter.min.js",

package/dist/es/src/action/CommentActions.js

@@ -1,13 +0,0 @@
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
-function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return typeof key === "symbol" ? key : String(key); }
-function _toPrimitive(input, hint) { if (typeof input !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (typeof res !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
-var CommentsActions = {};
-CommentsActions.loadComments = function loadComments(state, commentData) {
-  return _objectSpread(_objectSpread({}, state), {}, {
-    loaded: true,
-    comments: commentData
-  });
-};
-export default CommentsActions;

package/dist/es/src/action/initialState/commentInitialState.js

@@ -1,7 +0,0 @@
-export default function commentInitialState(commentsURL) {
-  return {
-    commentsURL: commentsURL,
-    comments: {},
-    loaded: false
-  };
-}