@harvard-lts/mirador-annotations-auth-plugin 0.0.3 → 0.0.4

package/dist/es/index.js

@@ -13,6 +13,7 @@ import { jsx, Fragment, jsxs } from 'react/jsx-runtime';
 import { withStyles } from '@material-ui/core/styles';
 import { withTranslation } from 'react-i18next';
 import { getVisibleCanvasIds, getCanvases, getCanvasLabel } from 'mirador/dist/es/src/state/selectors';
+import AnnotationFactory from 'mirador/dist/es/src/lib/AnnotationFactory';
 
 function _OverloadYield(e, d) {
   this.v = e, this.k = d;
@@ -373,10 +374,12 @@ var AnnotationsAuthSidePanel = /*#__PURE__*/function (_Component) {
     _this.handleAnnotationBlur = _this.handleAnnotationBlur.bind(_this);
     var _this$props = _this.props,
       windowId = _this$props.windowId,
-      canvasAnnotationPages = _this$props.canvasAnnotationPages;
+      canvasAnnotationPages = _this$props.canvasAnnotationPages,
+      canvasAnnotationList = _this$props.canvasAnnotationList;
     _this.state = {
       windowId: windowId,
-      canvasAnnotationPages: canvasAnnotationPages
+      canvasAnnotationPages: canvasAnnotationPages,
+      canvasAnnotationList: canvasAnnotationList
     };
     return _this;
   }
@@ -423,11 +426,25 @@ var AnnotationsAuthSidePanel = /*#__PURE__*/function (_Component) {
     key: "componentDidMount",
     value: function () {
       var _componentDidMount = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
-        var canvasAnnotationPages, promises, results;
+        var _this$state, canvasAnnotationPages, canvasAnnotationList, promises, results;
         return _regeneratorRuntime().wrap(function _callee2$(_context2) {
           while (1) switch (_context2.prev = _context2.next) {
             case 0:
-              canvasAnnotationPages = this.state.canvasAnnotationPages;
+              _this$state = this.state, canvasAnnotationPages = _this$state.canvasAnnotationPages, canvasAnnotationList = _this$state.canvasAnnotationList;
+              if (!(canvasAnnotationList.json !== undefined)) {
+                _context2.next = 5;
+                break;
+              }
+              if (!(canvasAnnotationList.json[0].items !== undefined)) {
+                _context2.next = 5;
+                break;
+              }
+              this.setState({
+                annotationData: canvasAnnotationList.json[0].items,
+                loading: false
+              });
+              return _context2.abrupt("return");
+            case 5:
               promises = [];
               canvasAnnotationPages.forEach(function (annotationPage, index) {
                 var promise = new Promise(/*#__PURE__*/function () {
@@ -463,30 +480,30 @@ var AnnotationsAuthSidePanel = /*#__PURE__*/function (_Component) {
                 }());
                 promises.push(promise);
               });
-              _context2.prev = 3;
-              _context2.next = 6;
+              _context2.prev = 7;
+              _context2.next = 10;
               return Promise.all(promises);
-            case 6:
+            case 10:
               results = _context2.sent;
               this.setState({
                 annotationData: results,
                 loading: false
               });
-              _context2.next = 14;
+              _context2.next = 18;
               break;
-            case 10:
-              _context2.prev = 10;
-              _context2.t0 = _context2["catch"](3);
+            case 14:
+              _context2.prev = 14;
+              _context2.t0 = _context2["catch"](7);
               console.error('There was a problem receiving the annotation:', _context2.t0);
               this.setState({
                 loading: false,
                 error: _context2.t0.message
               });
-            case 14:
+            case 18:
             case "end":
               return _context2.stop();
           }
-        }, _callee2, this, [[3, 10]]);
+        }, _callee2, this, [[7, 14]]);
       }));
       function componentDidMount() {
         return _componentDidMount.apply(this, arguments);
@@ -505,10 +522,10 @@ var AnnotationsAuthSidePanel = /*#__PURE__*/function (_Component) {
         listContainerComponent = _this$props5.listContainerComponent,
         hoveredAnnotationIds = _this$props5.hoveredAnnotationIds,
         htmlSanitizationRuleSet = _this$props5.htmlSanitizationRuleSet;
-      var _this$state = this.state,
-        annotationData = _this$state.annotationData,
-        loading = _this$state.loading,
-        error = _this$state.error;
+      var _this$state2 = this.state,
+        annotationData = _this$state2.annotationData,
+        loading = _this$state2.loading,
+        error = _this$state2.error;
       if ({
         annotationData: annotationData
       }.length === 0) return /*#__PURE__*/jsx(Fragment, {});
@@ -523,6 +540,7 @@ var AnnotationsAuthSidePanel = /*#__PURE__*/function (_Component) {
           })]
         }), annotationData && /*#__PURE__*/jsx(Fragment, {
           children: annotationData.map(function (annotation, i) {
+            var _annotation$body, _annotation$resources;
             return /*#__PURE__*/jsx(MenuList, {
               autoFocusItem: true,
               variant: "selectedMenu",
@@ -568,7 +586,7 @@ var AnnotationsAuthSidePanel = /*#__PURE__*/function (_Component) {
                     },
                     children: /*#__PURE__*/jsx(SanitizedHtml, {
                       ruleSet: htmlSanitizationRuleSet,
-                      htmlString: annotation.resources[0].resource.chars
+                      htmlString: ((_annotation$body = annotation.body) === null || _annotation$body === void 0 ? void 0 : _annotation$body.value) || ((_annotation$resources = annotation.resources) === null || _annotation$resources === void 0 || (_annotation$resources = _annotation$resources[0]) === null || _annotation$resources === void 0 || (_annotation$resources = _annotation$resources.resource) === null || _annotation$resources === void 0 ? void 0 : _annotation$resources.chars) || ''
                     })
                   })
                 }, {
@@ -586,6 +604,7 @@ var AnnotationsAuthSidePanel = /*#__PURE__*/function (_Component) {
 }(Component);
 AnnotationsAuthSidePanel.propTypes = {
   canvasAnnotationPages: PropTypes.arrayOf(PropTypes.string),
+  canvasAnnotationList: PropTypes.arrayOf(PropTypes.object),
   canvasLabel: PropTypes.string,
   classes: PropTypes.objectOf(PropTypes.string),
   htmlSanitizationRuleSet: PropTypes.string,
@@ -598,6 +617,7 @@ AnnotationsAuthSidePanel.propTypes = {
 };
 AnnotationsAuthSidePanel.defaultProps = {
   canvasAnnotationPages: [],
+  canvasAnnotationList: [],
   canvasLabel: null,
   classes: {},
   htmlSanitizationRuleSet: 'iiif',
@@ -658,6 +678,23 @@ function getAnnotationPages(canvases, canvasIds) {
   }
   return annotationPages;
 }
+function getAnnotationList(canvases, canvasIds) {
+  var annotationList = [];
+  for (var i = 0; i < canvases.length; i++) {
+    if (canvases[i].id === canvasIds[0]) {
+      if (canvases[i].__jsonld.otherContent !== undefined) {
+        // Version 2 Annotation Page
+        annotationList = AnnotationFactory.determineAnnotation(canvases[i].__jsonld.otherContent);
+      }
+      if (canvases[i].__jsonld.annotations !== undefined) {
+        // Version 3 Annotation Page
+        annotationList = AnnotationFactory.determineAnnotation(canvases[i].__jsonld.annotations);
+      }
+      break;
+    }
+  }
+  return annotationList;
+}
 var mapStateToProps = function mapStateToProps(state, _ref) {
   var canvasId = _ref.canvasId,
     windowId = _ref.windowId;
@@ -667,6 +704,11 @@ var mapStateToProps = function mapStateToProps(state, _ref) {
     }), getVisibleCanvasIds(state, {
       windowId: windowId
     })),
+    canvasAnnotationList: getAnnotationList(getCanvases(state, {
+      windowId: windowId
+    }), getVisibleCanvasIds(state, {
+      windowId: windowId
+    })),
     canvasLabel: getCanvasLabel(state, {
       canvasId: canvasId,
       windowId: windowId

package/package.json

@@ -5,7 +5,7 @@
     "keywords": [
         "react-component"
     ],
-    "version": "0.0.3",
+    "version": "0.0.4",
     "description": "A Mirador 3 plugin for including authentication cookies for annotations.",
     "module": "dist/es/index.js",
     "files": [