@harvard-lts/mirador-annotations-auth-plugin 0.0.1 → 0.0.2

package/dist/es/index.js

@@ -430,10 +430,10 @@ var AnnotationsAuthSidePanel = /*#__PURE__*/function (_Component) {
     _this.handleAnnotationBlur = _this.handleAnnotationBlur.bind(_this);
     var _this$props = _this.props,
       windowId = _this$props.windowId,
-      canvasAnnotationPage = _this$props.canvasAnnotationPage;
+      canvasAnnotationPages = _this$props.canvasAnnotationPages;
     _this.state = {
       windowId: windowId,
-      canvasAnnotationPage: canvasAnnotationPage
+      canvasAnnotationPages: canvasAnnotationPages
     };
     return _this;
   }
@@ -479,38 +479,71 @@ var AnnotationsAuthSidePanel = /*#__PURE__*/function (_Component) {
   }, {
     key: "componentDidMount",
     value: function () {
-      var _componentDidMount = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
-        var _this2 = this;
-        var canvasAnnotationPage;
-        return _regeneratorRuntime().wrap(function _callee$(_context) {
-          while (1) switch (_context.prev = _context.next) {
+      var _componentDidMount = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
+        var canvasAnnotationPages, promises, results;
+        return _regeneratorRuntime().wrap(function _callee2$(_context2) {
+          while (1) switch (_context2.prev = _context2.next) {
             case 0:
-              canvasAnnotationPage = this.state.canvasAnnotationPage;
-              fetch(canvasAnnotationPage, {
-                method: 'get',
-                credentials: 'include'
-              }).then(function (response) {
-                if (!response.ok) {
-                  throw new Error('Network response was not ok');
-                }
-                return response.json();
-              }).then(function (annotationData) {
-                _this2.setState({
-                  annotationData: annotationData,
-                  loading: false
-                });
-              })["catch"](function (error) {
-                console.error('There was a problem receiving the annotation:', error);
-                _this2.setState({
-                  loading: false,
-                  error: error.message
-                });
+              canvasAnnotationPages = this.state.canvasAnnotationPages;
+              promises = [];
+              canvasAnnotationPages.forEach(function (annotationPage, index) {
+                var promise = new Promise(/*#__PURE__*/function () {
+                  var _ref = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(resolve, reject) {
+                    var result;
+                    return _regeneratorRuntime().wrap(function _callee$(_context) {
+                      while (1) switch (_context.prev = _context.next) {
+                        case 0:
+                          _context.prev = 0;
+                          _context.next = 3;
+                          return fetch(annotationPage, {
+                            method: 'get',
+                            credentials: 'include'
+                          });
+                        case 3:
+                          result = _context.sent;
+                          resolve(result.json());
+                          _context.next = 10;
+                          break;
+                        case 7:
+                          _context.prev = 7;
+                          _context.t0 = _context["catch"](0);
+                          reject('Network response was not ok');
+                        case 10:
+                        case "end":
+                          return _context.stop();
+                      }
+                    }, _callee, null, [[0, 7]]);
+                  }));
+                  return function (_x, _x2) {
+                    return _ref.apply(this, arguments);
+                  };
+                }());
+                promises.push(promise);
               });
-            case 2:
+              _context2.prev = 3;
+              _context2.next = 6;
+              return Promise.all(promises);
+            case 6:
+              results = _context2.sent;
+              this.setState({
+                annotationData: results,
+                loading: false
+              });
+              _context2.next = 14;
+              break;
+            case 10:
+              _context2.prev = 10;
+              _context2.t0 = _context2["catch"](3);
+              console.error('There was a problem receiving the annotation:', _context2.t0);
+              this.setState({
+                loading: false,
+                error: _context2.t0.message
+              });
+            case 14:
             case "end":
-              return _context.stop();
+              return _context2.stop();
           }
-        }, _callee, this);
+        }, _callee2, this, [[3, 10]]);
       }));
       function componentDidMount() {
         return _componentDidMount.apply(this, arguments);
@@ -520,7 +553,7 @@ var AnnotationsAuthSidePanel = /*#__PURE__*/function (_Component) {
   }, {
     key: "render",
     value: function render() {
-      var _this3 = this;
+      var _this2 = this;
       var _this$props5 = this.props,
         classes = _this$props5.classes,
         containerRef = _this$props5.containerRef,
@@ -545,67 +578,71 @@ var AnnotationsAuthSidePanel = /*#__PURE__*/function (_Component) {
           }), error && /*#__PURE__*/jsxs("p", {
             children: ["Error: ", error]
           })]
-        }), /*#__PURE__*/jsx(MenuList, {
-          autoFocusItem: true,
-          variant: "selectedMenu",
-          children: /*#__PURE__*/jsx(ScrollTo, {
-            containerRef: containerRef,
-            offsetTop: 96 // offset for the height of the form above
-            ,
-            scrollTo: selectedAnnotationId === {
-              annotationData: annotationData
-            }.id,
-            children: /*#__PURE__*/jsx(MenuItem, {
-              button: true,
-              component: listContainerComponent,
-              className: clsx(classes.annotationListItem, _defineProperty({}, classes.hovered, hoveredAnnotationIds.includes({
-                annotationData: annotationData
-              }.id))),
-              annotationid: {
-                annotationData: annotationData
-              }.id,
-              selected: selectedAnnotationId === {
-                annotationData: annotationData
-              }.id,
-              onClick: function onClick(e) {
-                return _this3.handleClick(e, {
-                  annotationData: annotationData
-                });
-              },
-              onFocus: function onFocus() {
-                return _this3.handleAnnotationHover({
-                  annotationData: annotationData
-                });
-              },
-              onBlur: this.handleAnnotationBlur,
-              onMouseEnter: function onMouseEnter() {
-                return _this3.handleAnnotationHover({
-                  annotationData: annotationData
-                });
-              },
-              onMouseLeave: this.handleAnnotationBlur,
-              children: /*#__PURE__*/jsx(ListItemText, {
-                primaryTypographyProps: {
-                  variant: 'body2'
-                },
-                children: annotationData && /*#__PURE__*/jsx(SanitizedHtml, {
-                  ruleSet: htmlSanitizationRuleSet,
-                  htmlString: annotationData.resources[0].resource.chars
-                })
-              })
-            }, {
-              annotationData: annotationData
-            }.id)
-          }, "".concat({
-            annotationData: annotationData
-          }.id, "-scroll"))
+        }), annotationData && /*#__PURE__*/jsx(Fragment, {
+          children: annotationData.map(function (annotation, i) {
+            return /*#__PURE__*/jsx(MenuList, {
+              autoFocusItem: true,
+              variant: "selectedMenu",
+              children: /*#__PURE__*/jsx(ScrollTo, {
+                containerRef: containerRef,
+                offsetTop: 96 // offset for the height of the form above
+                ,
+                scrollTo: selectedAnnotationId === {
+                  annotation: annotation
+                }.id,
+                children: /*#__PURE__*/jsx(MenuItem, {
+                  button: true,
+                  component: listContainerComponent,
+                  className: clsx(classes.annotationListItem, _defineProperty({}, classes.hovered, hoveredAnnotationIds.includes({
+                    annotation: annotation
+                  }.id))),
+                  annotationid: {
+                    annotation: annotation
+                  }.id,
+                  selected: selectedAnnotationId === {
+                    annotation: annotation
+                  }.id,
+                  onClick: function onClick(e) {
+                    return _this2.handleClick(e, {
+                      annotation: annotation
+                    });
+                  },
+                  onFocus: function onFocus() {
+                    return _this2.handleAnnotationHover({
+                      annotation: annotation
+                    });
+                  },
+                  onBlur: _this2.handleAnnotationBlur,
+                  onMouseEnter: function onMouseEnter() {
+                    return _this2.handleAnnotationHover({
+                      annotation: annotation
+                    });
+                  },
+                  onMouseLeave: _this2.handleAnnotationBlur,
+                  children: /*#__PURE__*/jsx(ListItemText, {
+                    primaryTypographyProps: {
+                      variant: 'body2'
+                    },
+                    children: /*#__PURE__*/jsx(SanitizedHtml, {
+                      ruleSet: htmlSanitizationRuleSet,
+                      htmlString: annotation.resources[0].resource.chars
+                    })
+                  })
+                }, {
+                  annotation: annotation
+                }.id)
+              }, "".concat({
+                annotation: annotation
+              }.id, "-scroll"))
+            });
+          })
         })]
       });
     }
   }]);
 }(Component);
 AnnotationsAuthSidePanel.propTypes = {
-  canvasAnnotationPage: PropTypes.string,
+  canvasAnnotationPages: PropTypes.arrayOf(PropTypes.string),
   canvasLabel: PropTypes.string,
   classes: PropTypes.objectOf(PropTypes.string),
   htmlSanitizationRuleSet: PropTypes.string,
@@ -617,7 +654,7 @@ AnnotationsAuthSidePanel.propTypes = {
   windowId: PropTypes.string.isRequired
 };
 AnnotationsAuthSidePanel.defaultProps = {
-  canvasAnnotationPage: null,
+  canvasAnnotationPages: [],
   canvasLabel: null,
   classes: {},
   htmlSanitizationRuleSet: 'iiif',
@@ -648,29 +685,41 @@ var styles = function styles(theme) {
 };
 
 /** */
-function getAnnotationPage(canvases, canvasIds) {
-  var annotationPage = null;
+function getAnnotationPages(canvases, canvasIds) {
+  var annotationPagesArray = [];
+  var annotationPages = [];
   for (var i = 0; i < canvases.length; i++) {
     if (canvases[i].id === canvasIds[0]) {
       if (canvases[i].__jsonld.otherContent !== undefined) {
         // Version 2 Annotation Page
-        annotationPage = canvases[i].__jsonld.otherContent[0]["@id"];
+        canvases[i].__jsonld.otherContent[0]["@id"];
+        annotationPagesArray = canvases[i].__jsonld.otherContent;
+        for (var j = 0; j < annotationPagesArray.length; j++) {
+          if (annotationPagesArray[j]["@type"] === "sc:AnnotationList") {
+            annotationPages[j] = annotationPagesArray[j]["@id"];
+          }
+        }
       }
       if (canvases[i].__jsonld.annotations !== undefined) {
         // Version 3 Annotation Page
-        annotationPage = canvases[i].__jsonld.annotations[0].id;
+        canvases[i].__jsonld.annotations[0].id;
+        annotationPagesArray = canvases[i].__jsonld.annotations;
+        for (var _j = 0; _j < annotationPagesArray.length; _j++) {
+          if (annotationPagesArray[_j].type === "AnnotationPage") {
+            annotationPages[_j] = annotationPagesArray[_j].id;
+          }
+        }
       }
       break;
     }
   }
-  console.log('annotationPage', annotationPage);
-  return annotationPage;
+  return annotationPages;
 }
 var mapStateToProps = function mapStateToProps(state, _ref) {
   var canvasId = _ref.canvasId,
     windowId = _ref.windowId;
   return {
-    canvasAnnotationPage: getAnnotationPage(getCanvases(state, {
+    canvasAnnotationPages: getAnnotationPages(getCanvases(state, {
       windowId: windowId
     }), getVisibleCanvasIds(state, {
       windowId: windowId

package/package.json

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