@cu-mkp/editioncrafter 1.2.0 → 1.3.0-beta.1

package/dist/es/src/EditionCrafter/action/NotesActions.js

@@ -0,0 +1,11 @@
+const NotesActions = {}
+
+NotesActions.loadNotes = function loadNotes(state, noteData) {
+  return {
+    ...state,
+    loaded: true,
+    notes: noteData,
+  }
+}
+
+export default NotesActions

package/dist/es/src/EditionCrafter/action/initialState/documentInitialState.js

@@ -3,12 +3,26 @@ function getHeaderUrlFromManifestUrl(manifestUrl) {
   return `${truncated}/html/index.html`
 }
 
+function getHeaderUrlsFromManifestUrls(data) {
+  if (typeof data === 'string') {
+    return getHeaderUrlFromManifestUrl(data)
+  }
+
+  const result = {}
+
+  Object.entries(data).forEach((ent) => {
+    result[ent[0]] = getHeaderUrlFromManifestUrl(ent[1])
+  })
+
+  return result
+}
+
 export default function documentInitalState(iiifManifest, documentName, transcriptionTypes, variorum = false, derivativeNames = null, threePanel = false) {
   return {
     documentName,
     derivativeNames,
     manifestURL: iiifManifest,
-    headerUrl: getHeaderUrlFromManifestUrl(iiifManifest),
+    headerUrl: getHeaderUrlsFromManifestUrls(iiifManifest),
     transcriptionTypes,
     variorum,
     threePanel,

package/dist/es/src/EditionCrafter/action/initialState/notesInitialState.js

@@ -0,0 +1,8 @@
+export default function notesInitialState(notesURL) {
+    return {
+      notes: '',
+      loaded: false,
+      URL: notesURL,
+    }
+  }
+  

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

@@ -4,16 +4,19 @@ import { createReducer } from '../model/ReduxStore'
 import DiplomaticActions from './DiplomaticActions'
 import DocumentActions from './DocumentActions'
 import GlossaryActions from './GlossaryActions'
+import NotesActions from './NotesActions'
 
 import diplomaticInitialState from './initialState/diplomaticInitialState'
 import documentInitialState from './initialState/documentInitialState'
 import glossaryInitialState from './initialState/glossaryInitialState'
+import notesInitialState from './initialState/notesInitialState'
 
 export default function rootReducer(config) {
   const {
     documentName,
     documentInfo,
     glossaryURL,
+    notesURL,
     threePanel = false,
   } = config
   const variorum = documentInfo && Object.keys(documentInfo).length > 1
@@ -34,5 +37,6 @@ export default function rootReducer(config) {
     diplomatic: createReducer('DiplomaticActions', DiplomaticActions, diplomaticInitialState),
     document: createReducer('DocumentActions', DocumentActions, documentInitialState(iiifManifest, documentName, transcriptionTypes, variorum, derivativeNames, threePanel)),
     glossary: createReducer('GlossaryActions', GlossaryActions, glossaryInitialState(glossaryURL)),
+    notes: createReducer('NotesActions', NotesActions, notesInitialState(notesURL)),
   })
 }

package/dist/es/src/EditionCrafter/component/DocumentView.js

@@ -8,6 +8,7 @@ import {
 } from 'react-router-dom'
 import { dispatchAction } from '../model/ReduxStore'
 import GlossaryView from './GlossaryView'
+import NotesView from './NotesView'
 import ImageGridView from './ImageGridView'
 import ImageView from './ImageView'
 import SinglePaneView from './SinglePaneView'
@@ -345,6 +346,9 @@ function DocumentView(props) {
     if (transcriptionType === 'glossary') {
       return 'GlossaryView'
     }
+    if (transcriptionType === 'notes') {
+      return 'NotesView'
+    }
     return xmlMode ? 'XMLView' : 'TranscriptionView'
   }
 
@@ -479,6 +483,16 @@ function DocumentView(props) {
         />
       )
     }
+    if (viewType === 'NotesView') {
+      return (
+        <NotesView
+          key={key}
+          documentView={docView}
+          documentViewActions={documentViewActions}
+          side={side}
+        />
+      )
+    }
     return (
       <div>ERROR: Unrecognized viewType.</div>
     )

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

@@ -312,6 +312,11 @@ function Navigation(props) {
                         {DocumentHelper.transcriptionTypeLabels.glossary}
                       </MenuItem>
                     ) }
+                    { props.notes && (
+                      <MenuItem value="notes" key="notes">
+                        {DocumentHelper.transcriptionTypeLabels.notes}
+                      </MenuItem>
+                    )}
                   </Select>
                   {!imageViewActive && (
                     <ToggleButton
@@ -440,6 +445,7 @@ function mapStateToProps(state) {
   return {
     document: state.document,
     glossary: !!state.glossary.URL,
+    notes: !!state.notes.URL,
   }
 }
 

package/dist/es/src/EditionCrafter/component/NotesView.js

@@ -0,0 +1,50 @@
+import { Typography } from '@material-ui/core'
+import React, { Component } from 'react'
+import ReactMarkdown from 'react-markdown'
+import remarkGfm from 'remark-gfm'
+import { connect } from 'react-redux'
+import Navigation from './Navigation'
+
+class NotesView extends Component {
+    constructor() {
+        super()
+        this.state = { filterTerm: '' }
+    }
+
+    onFilterChange = (event) => {
+        const filterTerm = event.target.value
+        this.setState({ ...this.state, filterTerm })
+    }
+    
+  render() {
+    if (!this.props.notes.loaded)
+      return null
+
+    return (
+      <div id="notesView" style={{ position: 'relative', overflow: 'auto' }}>
+        <Navigation
+          side={this.props.side}
+          onFilterChange={this.onFilterChange}
+          value={this.state.filterTerm}
+          documentView={this.props.documentView}
+          documentViewActions={this.props.documentViewActions}
+        />
+
+        <div id="notesViewInner">
+          <div id="notesContent">
+            <ReactMarkdown children={this.props.notes.notes} remarkPlugins={[remarkGfm]}/>
+          </div>
+        </div>
+
+      </div>
+    )
+  }
+}
+
+function mapStateToProps(state) {
+  return {
+    notes: state.notes,
+  }
+}
+
+export default connect(mapStateToProps)(NotesView)

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

@@ -3,6 +3,7 @@ const DocumentHelper = {}
 DocumentHelper.transcriptionTypeLabels = {
   f: 'Facsimile', // keep
   glossary: 'Glossary', // keep
+  notes: 'Notes', 
 }
 
 export default DocumentHelper

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

@@ -5,6 +5,7 @@ import { putResolveAction } from '../model/ReduxStore'
 
 const justDocument = state => state.document
 const justGlossary = state => state.glossary
+const justNotes = state => state.notes
 
 function* parseTags(headerUrl) {
   const tags = {}
@@ -48,6 +49,7 @@ function* userNavigation(action) {
         yield resolveDocumentManifest()
         yield resolveDocumentTags()
         yield resolveGlossary()
+        yield resolveNotes()
         yield resolveFolio(pathSegments)
         break
       }
@@ -134,6 +136,15 @@ function* resolveGlossary() {
   }
 }
 
+function* resolveNotes() {
+  const notes = yield select(justNotes)
+  if (!notes.loaded && notes.URL) {
+    const response = yield fetch(notes.URL)
+    const txt = yield response.text()
+    yield putResolveAction('NotesActions.loadNotes', txt)
+  }
+}
+
 export default function* routeListenerSaga() {
   yield takeEvery('RouteListenerSaga.userNavigation', userNavigation)
 }

package/dist/es/src/EditionCrafter/scss/_notes.scss

@@ -0,0 +1,49 @@
+.editioncrafter {
+
+	#notesView {
+	
+		#notesViewInner {
+			margin: 5px 0 0 0;
+			// @include md {
+			// 	margin: 52px 0 0 0;
+			// }
+			width: calc(100% - 1.2rem);
+				max-height: calc(100vh - 170px);
+				padding: 5px 16px;
+		}
+		
+		#notesContent {
+			padding: max(80px, 5rem) 0 0;
+			max-height: 100vh;
+			-webkit-user-select: text;
+			-moz-user-select: text;
+			-ms-user-select: text;
+			user-select: text;
+			min-width: max(10rem, 160px);
+			@include md {
+				padding: max(3.5rem, 56px) 0 0;
+			}
+
+			table {
+				margin-top: 30px;
+			}
+
+			td, th {
+				border: 1px solid #ddd;
+				padding: 8px;
+			}
+			  
+			tr:nth-child(even){
+				background-color: #f2f2f2;
+			}
+			  
+			th {
+				padding-top: 12px;
+				padding-bottom: 12px;
+				text-align: left;
+				background-color: gray;
+				color: white;
+			}
+		}
+	}
+}

package/dist/es/src/EditionCrafter/scss/editioncrafter.scss

@@ -105,6 +105,7 @@ animation: #{$str};
 @import "transcriptView";
 @import "xmlView";
 @import "glossary";
+@import "notes";
 @import "jumpbox";
 
 @import "CETEIcean";

package/dist/es/src/RecordList/component/Record.jsx

@@ -18,7 +18,7 @@ function getTagObjects(ids, allTags) {
 
 function getSurfaceLink(baseUrl, div, cats, tags) {
   return (
-    `${baseUrl}&viewMode=story#/ec/${div.surface_xml_id}/f/${div.surface_xml_id}/${div.layer_xml_id}?tags=${[...cats, ...tags].join(',')}`
+    `${baseUrl}#/ec/${div.surface_xml_id}/f/${div.surface_xml_id}/${div.layer_xml_id}?tags=${[...cats, ...tags].join(',')}`
   )
 }
 

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@cu-mkp/editioncrafter",
   "type": "module",
-  "version": "1.2.0",
+  "version": "1.3.0-beta.1",
   "private": false,
   "description": "A simple digital critical edition publication tool",
   "license": "MIT",
@@ -46,6 +46,7 @@
     "react-scroll": "^1.7.10",
     "redux": "^4.2.1",
     "redux-saga": "^1.2.2",
+    "remark-gfm": "^3.0.1",
     "sql.js": "^1.12.0"
   },
   "devDependencies": {