Merge pull request #156 from cu-mkp/dev

`editioncrafter` 1.2.0

editioncrafter-umd/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cu-mkp/editioncrafter-umd",
-  "version": "1.1.0",
+  "version": "1.2.0",
   "homepage": "https://editioncrafter.org/",
   "description": "A simple digital critical edition publication tool",
   "private": false,

editioncrafter/.storybook/main.js

@@ -1,5 +1,3 @@
-import { transformWithEsbuild } from 'vite'
-
 /** @type { import('@storybook/react-webpack5').StorybookConfig } */
 const config = {
   stories: ['../stories/**/*.mdx', '../stories/**/*.stories.@(js|jsx|ts|tsx)'],
@@ -25,7 +23,7 @@ const config = {
   },
   async viteFinal(config) {
     // Merge custom configuration into the default config
-    const { mergeConfig } = await import('vite')
+    const { mergeConfig, transformWithEsbuild } = await import('vite')
 
     return mergeConfig(config, {
       plugins: [

editioncrafter/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@cu-mkp/editioncrafter",
   "type": "module",
-  "version": "1.1.0",
+  "version": "1.2.0",
   "private": false,
   "description": "A simple digital critical edition publication tool",
   "license": "MIT",
@@ -37,15 +37,16 @@
     "html-react-parser": "^4.2.2",
     "openseadragon": "^4.1.0",
     "prop-types": "^15.5.10",
-    "react-icons": "^4.8.0",
+    "react-icons": "^4.12.0",
     "react-infinite-scroller": "^1.1.3",
     "react-markdown": "^8.0.7",
     "react-redux": "^8.0.5",
     "react-router": "^6.11.0",
     "react-router-dom": "^6.11.0",
     "react-scroll": "^1.7.10",
     "redux": "^4.2.1",
-    "redux-saga": "^1.2.2"
+    "redux-saga": "^1.2.2",
+    "sql.js": "^1.12.0"
   },
   "devDependencies": {
     "@antfu/eslint-config": "^3.8.0",
@@ -73,6 +74,8 @@
     "glob": "^7.1.4",
     "http-server": "^14.1.0",
     "jsdom": "^19.0.0",
+    "react": "^17.0.2",
+    "react-dom": "^17.0.2",
     "react-refresh": "^0.14.0",
     "redux-mock-store": "^1.5.1",
     "redux-saga-test-plan": "^4.0.6",

editioncrafter/src/action/DocumentActions.js → editioncrafter/src/EditionCrafter/action/DocumentActions.js

@@ -16,12 +16,20 @@ DocumentActions.loadDocument = function loadDocument(state, manifestData) {
   }
 }
 
+DocumentActions.loadTags = function loadTags(state, tags) {
+  return {
+    ...state,
+    tags,
+  }
+}
+
 DocumentActions.loadFolio = function loadFolio(state, folio) {
   const oldFolio = state.folioIndex[folio.id]
   const folioIdx = state.folios.indexOf(oldFolio)
   state.folios[folioIdx] = folio
   state.folioIndex[folio.id] = folio
   state.folioByName[folio.name] = folio
+
   return {
     ...state,
   }

editioncrafter/src/action/initialState/documentInitialState.js → editioncrafter/src/EditionCrafter/action/initialState/documentInitialState.js

@@ -1,14 +1,21 @@
+function getHeaderUrlFromManifestUrl(manifestUrl) {
+  const truncated = manifestUrl.replace('/iiif/manifest.json', '')
+  return `${truncated}/html/index.html`
+}
+
 export default function documentInitalState(iiifManifest, documentName, transcriptionTypes, variorum = false, derivativeNames = null, threePanel = false) {
   return {
     documentName,
     derivativeNames,
     manifestURL: iiifManifest,
+    headerUrl: getHeaderUrlFromManifestUrl(iiifManifest),
     transcriptionTypes,
     variorum,
     threePanel,
     folios: [],
     loaded: false,
     folioIndex: {},
     folioByName: {},
+    tags: null,
   }
 }

editioncrafter/src/component/DiploMatic.js → editioncrafter/src/EditionCrafter/component/DiploMatic.js

@@ -9,6 +9,7 @@ import {
   Route,
   Routes,
 } from 'react-router-dom'
+import TagFilterProvider from '../context/TagFilter'
 import DocumentView from './DocumentView'
 import RouteListener from './RouteListener'
 
@@ -38,27 +39,29 @@ function DiploMatic(props) {
   return (
     <Provider store={props.store}>
       <HashRouter>
-        <div id="diplomatic" className={fixedFrameModeClass} ref={containerRef} style={{ height: containerHeight }}>
-          <RouteListener />
-          <div id="content" style={{ height: '100%' }}>
-            <Routes>
-              <Route path="/ec/:folioID/:transcriptionType/:folioID2/:transcriptionType2/:folioID3/:transcriptionType3" element={<DocumentView {...props} containerWidth={containerWidth} />} exact />
-              <Route path="/ec/:folioID/:transcriptionType/:folioID2/:transcriptionType2" element={<DocumentView {...props} containerWidth={containerWidth} />} exact />
-              <Route path="/ec/:folioID/:transcriptionType" element={<DocumentView {...props} containerWidth={containerWidth} />} exact />
-              <Route path="/ec/:folioID" element={<DocumentView {...props} containerWidth={containerWidth} />} exact />
-              <Route path="/ec" element={<DocumentView {...props} containerWidth={containerWidth} />} exact />
-              <Route path="/" element={<Navigate to="/ec" />} exact />
-            </Routes>
+        <TagFilterProvider>
+          <div id="diplomatic" className={fixedFrameModeClass} ref={containerRef} style={{ height: containerHeight }}>
+            <RouteListener />
+            <div id="content" style={{ height: '100%' }}>
+              <Routes>
+                <Route path="/ec/:folioID/:transcriptionType/:folioID2/:transcriptionType2/:folioID3/:transcriptionType3" element={<DocumentView {...props} containerWidth={containerWidth} />} exact />
+                <Route path="/ec/:folioID/:transcriptionType/:folioID2/:transcriptionType2" element={<DocumentView {...props} containerWidth={containerWidth} />} exact />
+                <Route path="/ec/:folioID/:transcriptionType" element={<DocumentView {...props} containerWidth={containerWidth} />} exact />
+                <Route path="/ec/:folioID" element={<DocumentView {...props} containerWidth={containerWidth} />} exact />
+                <Route path="/ec" element={<DocumentView {...props} containerWidth={containerWidth} />} exact />
+                <Route path="/" element={<Navigate to="/ec" />} exact />
+              </Routes>
+            </div>
           </div>
-        </div>
+        </TagFilterProvider>
       </HashRouter>
     </Provider>
   )
 }
 
 DiploMatic.propTypes = {
-  store: PropTypes.isRequired,
-  config: PropTypes.isRequired,
+  store: PropTypes.object.isRequired,
+  config: PropTypes.object.isRequired,
 }
 
 function mapStateToProps(state) {

editioncrafter/src/component/DocumentView.js → editioncrafter/src/EditionCrafter/component/DocumentView.js

@@ -34,7 +34,7 @@ function DocumentView(props) {
 
   // "reload" the page if the config props change
   useEffect(() => {
-    dispatchAction(props, 'RouteListenerSaga.userNavigatation', location)
+    dispatchAction(props, 'RouteListenerSaga.userNavigation', location.pathname)
   }, [props.config])
 
   useEffect(() => {
@@ -429,7 +429,9 @@ function DocumentView(props) {
           side={side}
         />
       )
-    } if (viewType === 'TranscriptionView') {
+    }
+
+    if (viewType === 'TranscriptionView') {
       return (
         <TranscriptionView
           key={key}
@@ -440,7 +442,9 @@ function DocumentView(props) {
           transcriptionType={transcriptionType}
         />
       )
-    } if (viewType === 'XMLView') {
+    }
+
+    if (viewType === 'XMLView') {
       return (
         <XMLView
           key={key}
@@ -451,7 +455,9 @@ function DocumentView(props) {
           side={side}
         />
       )
-    } if (viewType === 'ImageGridView') {
+    }
+
+    if (viewType === 'ImageGridView') {
       return (
         <ImageGridView
           key={key}
@@ -461,7 +467,9 @@ function DocumentView(props) {
           selectedDoc={document || props.document.variorum && Object.keys(props.document.derivativeNames)[side === 'left' ? 0 : side === 'right' ? 1 : Object.keys(props.document.derivativeNames).length > 2 ? 2 : 1]}
         />
       )
-    } if (viewType === 'GlossaryView') {
+    }
+
+    if (viewType === 'GlossaryView') {
       return (
         <GlossaryView
           key={key}
@@ -492,7 +500,9 @@ function DocumentView(props) {
     return `${side}-${pane.viewType}`
   }
 
-  if (!props.document.loaded) { return null }
+  if (!props.document.loaded) {
+    return null
+  }
 
   // combine component state with state from props
   const docView = {