diff --git a/public/images/fallback_thumbnail.jpg b/public/images/fallback_thumbnail.jpg
new file mode 100644
index 00000000..75a96356
Binary files /dev/null and b/public/images/fallback_thumbnail.jpg differ
diff --git a/src/components/CollapsibleCards.js b/src/components/CollapsibleCards.js
index f86a5cf3..5833d98d 100644
--- a/src/components/CollapsibleCards.js
+++ b/src/components/CollapsibleCards.js
@@ -2,25 +2,17 @@ import * as React from "react";
import { styled } from "@mui/material/styles";
import Card from "@mui/material/Card";
import CardHeader from "@mui/material/CardHeader";
-import CardMedia from "@mui/material/CardMedia";
import CardContent from "@mui/material/CardContent";
import CardActions from "@mui/material/CardActions";
import Collapse from "@mui/material/Collapse";
-import Avatar from "@mui/material/Avatar";
import IconButton from "@mui/material/IconButton";
-import Typography from "@mui/material/Typography";
-import { red } from "@mui/material/colors";
-import FavoriteIcon from "@mui/icons-material/Favorite";
-import ShareIcon from "@mui/icons-material/Share";
import ExpandMoreIcon from "@mui/icons-material/ExpandMore";
-import MoreVertIcon from "@mui/icons-material/MoreVert";
import LocationOnIcon from "@mui/icons-material/LocationOn";
import InfoIcon from "@mui/icons-material/Info";
import CopyrightIcon from "@mui/icons-material/Copyright";
import LocalLibraryIcon from "@mui/icons-material/LocalLibrary";
import { LeafletThumb } from "./LeafletThumb";
import Citation from "../components/Citation";
-import { useNavigate } from "react-router-dom";
import "../css/CollapsibleCards.scss";
@@ -58,6 +50,7 @@ const multi_value_headers = [
"date",
"description",
"display_date",
+ "download_link",
"extent",
"format",
"has_format",
@@ -108,7 +101,6 @@ const getMarker = (marker) => {
};
const getLocationData = (data) => {
- console.log(data.location);
return (
<>
{data.location ? (
@@ -123,7 +115,7 @@ const getLocationData = (data) => {
};
const modifyKey = (key) => {
- if (key == "display_date") {
+ if (key === "display_date") {
return "Date";
}
const newKey = key
@@ -185,7 +177,6 @@ export default function CollapsibleCard({
setExpanded(!expanded);
};
- const navigate = useNavigate();
let facetSearchItems = ["format", "medium", "type", "tags"];
const renderContent = (key, value, index) => {
@@ -205,7 +196,7 @@ export default function CollapsibleCard({
);
- } else if (key == "language") {
+ } else if (key === "language") {
return (
{
- console.log("about: ", data);
let items = [
"description",
"date",
diff --git a/src/components/ThreeD2DiiifHandler/ThreeD2DiiifHandler.tsx b/src/components/ThreeD2DiiifHandler/ThreeD2DiiifHandler.tsx
index f13192f9..4aa261df 100644
--- a/src/components/ThreeD2DiiifHandler/ThreeD2DiiifHandler.tsx
+++ b/src/components/ThreeD2DiiifHandler/ThreeD2DiiifHandler.tsx
@@ -58,7 +58,6 @@ export const ThreeD2DiiifHandler: FC = ({ item, site }) => {
return () => {
if (x3dElement) {
- console.log("Removing event listeners");
x3dElement.removeEventListener("mousedown", handleMouseDown);
x3dElement.removeEventListener("touchstart", handleMouseDown);
}
@@ -120,17 +119,19 @@ export const ThreeD2DiiifHandler: FC = ({ item, site }) => {
)}
-
-
-
+ >
+
+
+ )}
>
);
} catch (e) {
@@ -198,9 +199,11 @@ export const ThreeD2DiiifHandler: FC = ({ item, site }) => {
{primarySectionContent()}
-
- {secondarySectionContent()}
-
+ {item.manifest_url && (
+
+ {secondarySectionContent()}
+
+ )}
);
};
diff --git a/src/components/Thumbnail/Thumbnail.tsx b/src/components/Thumbnail/Thumbnail.tsx
index 8ad86cb7..7ffe1b19 100644
--- a/src/components/Thumbnail/Thumbnail.tsx
+++ b/src/components/Thumbnail/Thumbnail.tsx
@@ -2,6 +2,8 @@ import { FC } from "react";
import "../../css/Thumbnail.scss";
import { useSignedLink } from "../../hooks/useSignedLink";
+const THUMBNAIL_FALLBACK = "/images/fallback_thumbnail.jpg";
+
type Props = {
item: Collection | Archive;
site: Site;
@@ -24,9 +26,7 @@ export const Thumbnail: FC = ({
"image",
site?.siteId
);
- if (!image) {
- return null;
- }
+
return (
{category && (
@@ -34,7 +34,11 @@ export const Thumbnail: FC
= ({
{category === "collection" ? "Collection" : "Item"}
)}
-
+
);
};
diff --git a/src/css/RelatedItems.scss b/src/css/RelatedItems.scss
index 6263068d..2d5e1306 100644
--- a/src/css/RelatedItems.scss
+++ b/src/css/RelatedItems.scss
@@ -1,5 +1,6 @@
.related-items-wrapper {
background-color: var(--light-gray);
+ margin-top: 40px;
padding: 40px;
width: 100%;
overflow: hidden;
diff --git a/src/graphql/mutations.js b/src/graphql/mutations.js
index 64e670e3..da9aa27c 100644
--- a/src/graphql/mutations.js
+++ b/src/graphql/mutations.js
@@ -27,6 +27,7 @@ export const createCollection = /* GraphQL */ `
modified_date
ownerinfo
parent_collection
+ parent_collection_identifer
provenance
relation
rights_holder
@@ -87,6 +88,7 @@ export const updateCollection = /* GraphQL */ `
modified_date
ownerinfo
parent_collection
+ parent_collection_identifer
provenance
relation
rights_holder
@@ -147,6 +149,7 @@ export const deleteCollection = /* GraphQL */ `
modified_date
ownerinfo
parent_collection
+ parent_collection_identifer
provenance
relation
rights_holder
@@ -214,6 +217,7 @@ export const createCollectionmap = /* GraphQL */ `
modified_date
ownerinfo
parent_collection
+ parent_collection_identifer
provenance
relation
rights_holder
@@ -270,6 +274,7 @@ export const updateCollectionmap = /* GraphQL */ `
modified_date
ownerinfo
parent_collection
+ parent_collection_identifer
provenance
relation
rights_holder
@@ -326,6 +331,7 @@ export const deleteCollectionmap = /* GraphQL */ `
modified_date
ownerinfo
parent_collection
+ parent_collection_identifer
provenance
relation
rights_holder
@@ -483,6 +489,7 @@ export const createArchive = /* GraphQL */ `
date
description
display_date
+ download_link
end_date
explicit
extent
@@ -506,6 +513,7 @@ export const createArchive = /* GraphQL */ `
modified_date
other_identifier
parent_collection
+ parent_collection_identifer
provenance
publisher
references
@@ -544,6 +552,7 @@ export const createArchive = /* GraphQL */ `
modified_date
ownerinfo
parent_collection
+ parent_collection_identifer
provenance
relation
rights_holder
@@ -588,6 +597,7 @@ export const updateArchive = /* GraphQL */ `
date
description
display_date
+ download_link
end_date
explicit
extent
@@ -611,6 +621,7 @@ export const updateArchive = /* GraphQL */ `
modified_date
other_identifier
parent_collection
+ parent_collection_identifer
provenance
publisher
references
@@ -649,6 +660,7 @@ export const updateArchive = /* GraphQL */ `
modified_date
ownerinfo
parent_collection
+ parent_collection_identifer
provenance
relation
rights_holder
@@ -693,6 +705,7 @@ export const deleteArchive = /* GraphQL */ `
date
description
display_date
+ download_link
end_date
explicit
extent
@@ -716,6 +729,7 @@ export const deleteArchive = /* GraphQL */ `
modified_date
other_identifier
parent_collection
+ parent_collection_identifer
provenance
publisher
references
@@ -754,6 +768,7 @@ export const deleteArchive = /* GraphQL */ `
modified_date
ownerinfo
parent_collection
+ parent_collection_identifer
provenance
relation
rights_holder
diff --git a/src/graphql/queries.js b/src/graphql/queries.js
index e63faf7f..4b572faf 100644
--- a/src/graphql/queries.js
+++ b/src/graphql/queries.js
@@ -32,6 +32,7 @@ export const searchObjects = /* GraphQL */ `
location
modified_date
parent_collection
+ parent_collection_identifer
provenance
relation
rights_holder
@@ -63,6 +64,7 @@ export const searchObjects = /* GraphQL */ `
coverage
created
date
+ download_link
explicit
extent
format
@@ -131,6 +133,7 @@ export const fulltextCollections = /* GraphQL */ `
modified_date
ownerinfo
parent_collection
+ parent_collection_identifer
provenance
relation
rights_holder
@@ -183,6 +186,7 @@ export const fulltextArchives = /* GraphQL */ `
date
description
display_date
+ download_link
end_date
explicit
extent
@@ -206,6 +210,7 @@ export const fulltextArchives = /* GraphQL */ `
modified_date
other_identifier
parent_collection
+ parent_collection_identifer
provenance
publisher
references
@@ -258,6 +263,7 @@ export const getCollection = /* GraphQL */ `
modified_date
ownerinfo
parent_collection
+ parent_collection_identifer
provenance
relation
rights_holder
@@ -320,6 +326,7 @@ export const listCollections = /* GraphQL */ `
modified_date
ownerinfo
parent_collection
+ parent_collection_identifer
provenance
relation
rights_holder
@@ -377,6 +384,7 @@ export const collectionByIdentifier = /* GraphQL */ `
modified_date
ownerinfo
parent_collection
+ parent_collection_identifer
provenance
relation
rights_holder
@@ -436,6 +444,7 @@ export const searchCollections = /* GraphQL */ `
modified_date
ownerinfo
parent_collection
+ parent_collection_identifer
provenance
relation
rights_holder
@@ -488,6 +497,7 @@ export const getCollectionmap = /* GraphQL */ `
modified_date
ownerinfo
parent_collection
+ parent_collection_identifer
provenance
relation
rights_holder
@@ -608,6 +618,7 @@ export const getArchive = /* GraphQL */ `
date
description
display_date
+ download_link
end_date
explicit
extent
@@ -631,6 +642,7 @@ export const getArchive = /* GraphQL */ `
modified_date
other_identifier
parent_collection
+ parent_collection_identifer
provenance
publisher
references
@@ -669,6 +681,7 @@ export const getArchive = /* GraphQL */ `
modified_date
ownerinfo
parent_collection
+ parent_collection_identifer
provenance
relation
rights_holder
@@ -715,6 +728,7 @@ export const listArchives = /* GraphQL */ `
date
description
display_date
+ download_link
end_date
explicit
extent
@@ -738,6 +752,7 @@ export const listArchives = /* GraphQL */ `
modified_date
other_identifier
parent_collection
+ parent_collection_identifer
provenance
publisher
references
@@ -796,6 +811,7 @@ export const archiveByIdentifier = /* GraphQL */ `
date
description
display_date
+ download_link
end_date
explicit
extent
@@ -819,6 +835,7 @@ export const archiveByIdentifier = /* GraphQL */ `
modified_date
other_identifier
parent_collection
+ parent_collection_identifer
provenance
publisher
references
@@ -879,6 +896,7 @@ export const searchArchives = /* GraphQL */ `
date
description
display_date
+ download_link
end_date
explicit
extent
@@ -902,6 +920,7 @@ export const searchArchives = /* GraphQL */ `
modified_date
other_identifier
parent_collection
+ parent_collection_identifer
provenance
publisher
references
diff --git a/src/graphql/schema.json b/src/graphql/schema.json
index e60e38a2..39fdcec5 100644
--- a/src/graphql/schema.json
+++ b/src/graphql/schema.json
@@ -1380,6 +1380,26 @@
"isDeprecated": false,
"deprecationReason": null
},
+ {
+ "name": "parent_collection_identifer",
+ "description": null,
+ "args": [],
+ "type": {
+ "kind": "LIST",
+ "name": null,
+ "ofType": {
+ "kind": "NON_NULL",
+ "name": null,
+ "ofType": {
+ "kind": "SCALAR",
+ "name": "String",
+ "ofType": null
+ }
+ }
+ },
+ "isDeprecated": false,
+ "deprecationReason": null
+ },
{
"name": "provenance",
"description": null,
@@ -2792,6 +2812,26 @@
"isDeprecated": false,
"deprecationReason": null
},
+ {
+ "name": "parent_collection_identifer",
+ "description": null,
+ "args": [],
+ "type": {
+ "kind": "LIST",
+ "name": null,
+ "ofType": {
+ "kind": "NON_NULL",
+ "name": null,
+ "ofType": {
+ "kind": "SCALAR",
+ "name": "String",
+ "ofType": null
+ }
+ }
+ },
+ "isDeprecated": false,
+ "deprecationReason": null
+ },
{
"name": "provenance",
"description": null,
@@ -3588,6 +3628,26 @@
"isDeprecated": false,
"deprecationReason": null
},
+ {
+ "name": "download_link",
+ "description": null,
+ "args": [],
+ "type": {
+ "kind": "LIST",
+ "name": null,
+ "ofType": {
+ "kind": "NON_NULL",
+ "name": null,
+ "ofType": {
+ "kind": "SCALAR",
+ "name": "String",
+ "ofType": null
+ }
+ }
+ },
+ "isDeprecated": false,
+ "deprecationReason": null
+ },
{
"name": "end_date",
"description": null,
@@ -3917,13 +3977,9 @@
"description": null,
"args": [],
"type": {
- "kind": "NON_NULL",
- "name": null,
- "ofType": {
- "kind": "SCALAR",
- "name": "String",
- "ofType": null
- }
+ "kind": "SCALAR",
+ "name": "String",
+ "ofType": null
},
"isDeprecated": false,
"deprecationReason": null
@@ -4000,6 +4056,26 @@
"isDeprecated": false,
"deprecationReason": null
},
+ {
+ "name": "parent_collection_identifer",
+ "description": null,
+ "args": [],
+ "type": {
+ "kind": "LIST",
+ "name": null,
+ "ofType": {
+ "kind": "NON_NULL",
+ "name": null,
+ "ofType": {
+ "kind": "SCALAR",
+ "name": "String",
+ "ofType": null
+ }
+ }
+ },
+ "isDeprecated": false,
+ "deprecationReason": null
+ },
{
"name": "provenance",
"description": null,
@@ -4542,6 +4618,16 @@
},
"defaultValue": null
},
+ {
+ "name": "download_link",
+ "description": null,
+ "type": {
+ "kind": "INPUT_OBJECT",
+ "name": "ModelStringInput",
+ "ofType": null
+ },
+ "defaultValue": null
+ },
{
"name": "end_date",
"description": null,
@@ -4772,6 +4858,16 @@
},
"defaultValue": null
},
+ {
+ "name": "parent_collection_identifer",
+ "description": null,
+ "type": {
+ "kind": "INPUT_OBJECT",
+ "name": "ModelStringInput",
+ "ofType": null
+ },
+ "defaultValue": null
+ },
{
"name": "provenance",
"description": null,
@@ -6955,6 +7051,16 @@
},
"defaultValue": null
},
+ {
+ "name": "parent_collection_identifer",
+ "description": null,
+ "type": {
+ "kind": "INPUT_OBJECT",
+ "name": "ModelStringInput",
+ "ofType": null
+ },
+ "defaultValue": null
+ },
{
"name": "provenance",
"description": null,
@@ -7366,6 +7472,12 @@
"isDeprecated": false,
"deprecationReason": null
},
+ {
+ "name": "parent_collection_identifer",
+ "description": null,
+ "isDeprecated": false,
+ "deprecationReason": null
+ },
{
"name": "provenance",
"description": null,
@@ -8346,6 +8458,12 @@
"isDeprecated": false,
"deprecationReason": null
},
+ {
+ "name": "download_link",
+ "description": null,
+ "isDeprecated": false,
+ "deprecationReason": null
+ },
{
"name": "end_date",
"description": null,
@@ -8484,6 +8602,12 @@
"isDeprecated": false,
"deprecationReason": null
},
+ {
+ "name": "parent_collection_identifer",
+ "description": null,
+ "isDeprecated": false,
+ "deprecationReason": null
+ },
{
"name": "provenance",
"description": null,
@@ -10577,6 +10701,24 @@
},
"defaultValue": null
},
+ {
+ "name": "parent_collection_identifer",
+ "description": null,
+ "type": {
+ "kind": "LIST",
+ "name": null,
+ "ofType": {
+ "kind": "NON_NULL",
+ "name": null,
+ "ofType": {
+ "kind": "SCALAR",
+ "name": "String",
+ "ofType": null
+ }
+ }
+ },
+ "defaultValue": null
+ },
{
"name": "provenance",
"description": null,
@@ -10962,6 +11104,16 @@
},
"defaultValue": null
},
+ {
+ "name": "parent_collection_identifer",
+ "description": null,
+ "type": {
+ "kind": "INPUT_OBJECT",
+ "name": "ModelStringInput",
+ "ofType": null
+ },
+ "defaultValue": null
+ },
{
"name": "provenance",
"description": null,
@@ -11427,6 +11579,24 @@
},
"defaultValue": null
},
+ {
+ "name": "parent_collection_identifer",
+ "description": null,
+ "type": {
+ "kind": "LIST",
+ "name": null,
+ "ofType": {
+ "kind": "NON_NULL",
+ "name": null,
+ "ofType": {
+ "kind": "SCALAR",
+ "name": "String",
+ "ofType": null
+ }
+ }
+ },
+ "defaultValue": null
+ },
{
"name": "provenance",
"description": null,
@@ -12437,6 +12607,24 @@
},
"defaultValue": null
},
+ {
+ "name": "download_link",
+ "description": null,
+ "type": {
+ "kind": "LIST",
+ "name": null,
+ "ofType": {
+ "kind": "NON_NULL",
+ "name": null,
+ "ofType": {
+ "kind": "SCALAR",
+ "name": "String",
+ "ofType": null
+ }
+ }
+ },
+ "defaultValue": null
+ },
{
"name": "end_date",
"description": null,
@@ -12725,13 +12913,9 @@
"name": "manifest_url",
"description": null,
"type": {
- "kind": "NON_NULL",
- "name": null,
- "ofType": {
- "kind": "SCALAR",
- "name": "String",
- "ofType": null
- }
+ "kind": "SCALAR",
+ "name": "String",
+ "ofType": null
},
"defaultValue": null
},
@@ -12799,6 +12983,24 @@
},
"defaultValue": null
},
+ {
+ "name": "parent_collection_identifer",
+ "description": null,
+ "type": {
+ "kind": "LIST",
+ "name": null,
+ "ofType": {
+ "kind": "NON_NULL",
+ "name": null,
+ "ofType": {
+ "kind": "SCALAR",
+ "name": "String",
+ "ofType": null
+ }
+ }
+ },
+ "defaultValue": null
+ },
{
"name": "provenance",
"description": null,
@@ -13252,6 +13454,16 @@
},
"defaultValue": null
},
+ {
+ "name": "download_link",
+ "description": null,
+ "type": {
+ "kind": "INPUT_OBJECT",
+ "name": "ModelStringInput",
+ "ofType": null
+ },
+ "defaultValue": null
+ },
{
"name": "end_date",
"description": null,
@@ -13472,6 +13684,16 @@
},
"defaultValue": null
},
+ {
+ "name": "parent_collection_identifer",
+ "description": null,
+ "type": {
+ "kind": "INPUT_OBJECT",
+ "name": "ModelStringInput",
+ "ofType": null
+ },
+ "defaultValue": null
+ },
{
"name": "provenance",
"description": null,
@@ -13959,6 +14181,24 @@
},
"defaultValue": null
},
+ {
+ "name": "download_link",
+ "description": null,
+ "type": {
+ "kind": "LIST",
+ "name": null,
+ "ofType": {
+ "kind": "NON_NULL",
+ "name": null,
+ "ofType": {
+ "kind": "SCALAR",
+ "name": "String",
+ "ofType": null
+ }
+ }
+ },
+ "defaultValue": null
+ },
{
"name": "end_date",
"description": null,
@@ -14314,7 +14554,7 @@
"defaultValue": null
},
{
- "name": "provenance",
+ "name": "parent_collection_identifer",
"description": null,
"type": {
"kind": "LIST",
@@ -14332,7 +14572,7 @@
"defaultValue": null
},
{
- "name": "publisher",
+ "name": "provenance",
"description": null,
"type": {
"kind": "LIST",
@@ -14350,7 +14590,7 @@
"defaultValue": null
},
{
- "name": "references",
+ "name": "publisher",
"description": null,
"type": {
"kind": "LIST",
@@ -14368,7 +14608,25 @@
"defaultValue": null
},
{
- "name": "relation",
+ "name": "references",
+ "description": null,
+ "type": {
+ "kind": "LIST",
+ "name": null,
+ "ofType": {
+ "kind": "NON_NULL",
+ "name": null,
+ "ofType": {
+ "kind": "SCALAR",
+ "name": "String",
+ "ofType": null
+ }
+ }
+ },
+ "defaultValue": null
+ },
+ {
+ "name": "relation",
"description": null,
"type": {
"kind": "LIST",
@@ -16589,6 +16847,16 @@
},
"defaultValue": null
},
+ {
+ "name": "parent_collection_identifer",
+ "description": null,
+ "type": {
+ "kind": "INPUT_OBJECT",
+ "name": "ModelSubscriptionStringInput",
+ "ofType": null
+ },
+ "defaultValue": null
+ },
{
"name": "provenance",
"description": null,
@@ -17443,6 +17711,16 @@
},
"defaultValue": null
},
+ {
+ "name": "download_link",
+ "description": null,
+ "type": {
+ "kind": "INPUT_OBJECT",
+ "name": "ModelSubscriptionStringInput",
+ "ofType": null
+ },
+ "defaultValue": null
+ },
{
"name": "end_date",
"description": null,
@@ -17663,6 +17941,16 @@
},
"defaultValue": null
},
+ {
+ "name": "parent_collection_identifer",
+ "description": null,
+ "type": {
+ "kind": "INPUT_OBJECT",
+ "name": "ModelSubscriptionStringInput",
+ "ofType": null
+ },
+ "defaultValue": null
+ },
{
"name": "provenance",
"description": null,
@@ -18335,7 +18623,7 @@
},
{
"kind": "INPUT_OBJECT",
- "name": "ModelFloatInput",
+ "name": "ModelIntInput",
"description": null,
"fields": null,
"inputFields": [
@@ -18344,7 +18632,7 @@
"description": null,
"type": {
"kind": "SCALAR",
- "name": "Float",
+ "name": "Int",
"ofType": null
},
"defaultValue": null
@@ -18354,7 +18642,7 @@
"description": null,
"type": {
"kind": "SCALAR",
- "name": "Float",
+ "name": "Int",
"ofType": null
},
"defaultValue": null
@@ -18364,7 +18652,7 @@
"description": null,
"type": {
"kind": "SCALAR",
- "name": "Float",
+ "name": "Int",
"ofType": null
},
"defaultValue": null
@@ -18374,7 +18662,7 @@
"description": null,
"type": {
"kind": "SCALAR",
- "name": "Float",
+ "name": "Int",
"ofType": null
},
"defaultValue": null
@@ -18384,7 +18672,7 @@
"description": null,
"type": {
"kind": "SCALAR",
- "name": "Float",
+ "name": "Int",
"ofType": null
},
"defaultValue": null
@@ -18394,7 +18682,7 @@
"description": null,
"type": {
"kind": "SCALAR",
- "name": "Float",
+ "name": "Int",
"ofType": null
},
"defaultValue": null
@@ -18407,7 +18695,7 @@
"name": null,
"ofType": {
"kind": "SCALAR",
- "name": "Float",
+ "name": "Int",
"ofType": null
}
},
@@ -18438,19 +18726,9 @@
"enumValues": null,
"possibleTypes": null
},
- {
- "kind": "SCALAR",
- "name": "Float",
- "description": "Built-in Float",
- "fields": null,
- "inputFields": null,
- "interfaces": null,
- "enumValues": null,
- "possibleTypes": null
- },
{
"kind": "INPUT_OBJECT",
- "name": "ModelSubscriptionIntInput",
+ "name": "ModelSubscriptionFloatInput",
"description": null,
"fields": null,
"inputFields": [
@@ -18459,7 +18737,7 @@
"description": null,
"type": {
"kind": "SCALAR",
- "name": "Int",
+ "name": "Float",
"ofType": null
},
"defaultValue": null
@@ -18469,7 +18747,7 @@
"description": null,
"type": {
"kind": "SCALAR",
- "name": "Int",
+ "name": "Float",
"ofType": null
},
"defaultValue": null
@@ -18479,7 +18757,7 @@
"description": null,
"type": {
"kind": "SCALAR",
- "name": "Int",
+ "name": "Float",
"ofType": null
},
"defaultValue": null
@@ -18489,7 +18767,7 @@
"description": null,
"type": {
"kind": "SCALAR",
- "name": "Int",
+ "name": "Float",
"ofType": null
},
"defaultValue": null
@@ -18499,7 +18777,7 @@
"description": null,
"type": {
"kind": "SCALAR",
- "name": "Int",
+ "name": "Float",
"ofType": null
},
"defaultValue": null
@@ -18509,7 +18787,7 @@
"description": null,
"type": {
"kind": "SCALAR",
- "name": "Int",
+ "name": "Float",
"ofType": null
},
"defaultValue": null
@@ -18522,7 +18800,7 @@
"name": null,
"ofType": {
"kind": "SCALAR",
- "name": "Int",
+ "name": "Float",
"ofType": null
}
},
@@ -18536,7 +18814,7 @@
"name": null,
"ofType": {
"kind": "SCALAR",
- "name": "Int",
+ "name": "Float",
"ofType": null
}
},
@@ -18550,7 +18828,7 @@
"name": null,
"ofType": {
"kind": "SCALAR",
- "name": "Int",
+ "name": "Float",
"ofType": null
}
},
@@ -18561,9 +18839,19 @@
"enumValues": null,
"possibleTypes": null
},
+ {
+ "kind": "SCALAR",
+ "name": "Float",
+ "description": "Built-in Float",
+ "fields": null,
+ "inputFields": null,
+ "interfaces": null,
+ "enumValues": null,
+ "possibleTypes": null
+ },
{
"kind": "INPUT_OBJECT",
- "name": "ModelIntInput",
+ "name": "SearchableFloatFilterInput",
"description": null,
"fields": null,
"inputFields": [
@@ -18572,94 +18860,159 @@
"description": null,
"type": {
"kind": "SCALAR",
- "name": "Int",
+ "name": "Float",
"ofType": null
},
"defaultValue": null
},
{
- "name": "eq",
+ "name": "gt",
"description": null,
"type": {
"kind": "SCALAR",
- "name": "Int",
+ "name": "Float",
"ofType": null
},
"defaultValue": null
},
{
- "name": "le",
+ "name": "lt",
"description": null,
"type": {
"kind": "SCALAR",
- "name": "Int",
+ "name": "Float",
"ofType": null
},
"defaultValue": null
},
{
- "name": "lt",
+ "name": "gte",
"description": null,
"type": {
"kind": "SCALAR",
- "name": "Int",
+ "name": "Float",
"ofType": null
},
"defaultValue": null
},
{
- "name": "ge",
+ "name": "lte",
"description": null,
"type": {
"kind": "SCALAR",
- "name": "Int",
+ "name": "Float",
"ofType": null
},
"defaultValue": null
},
{
- "name": "gt",
+ "name": "eq",
"description": null,
"type": {
"kind": "SCALAR",
- "name": "Int",
+ "name": "Float",
"ofType": null
},
"defaultValue": null
},
{
- "name": "between",
+ "name": "range",
"description": null,
"type": {
"kind": "LIST",
"name": null,
"ofType": {
"kind": "SCALAR",
- "name": "Int",
+ "name": "Float",
"ofType": null
}
},
"defaultValue": null
+ }
+ ],
+ "interfaces": null,
+ "enumValues": null,
+ "possibleTypes": null
+ },
+ {
+ "kind": "INPUT_OBJECT",
+ "name": "SearchableIntFilterInput",
+ "description": null,
+ "fields": null,
+ "inputFields": [
+ {
+ "name": "ne",
+ "description": null,
+ "type": {
+ "kind": "SCALAR",
+ "name": "Int",
+ "ofType": null
+ },
+ "defaultValue": null
},
{
- "name": "attributeExists",
+ "name": "gt",
"description": null,
"type": {
"kind": "SCALAR",
- "name": "Boolean",
+ "name": "Int",
"ofType": null
},
"defaultValue": null
},
{
- "name": "attributeType",
+ "name": "lt",
"description": null,
"type": {
- "kind": "ENUM",
- "name": "ModelAttributeTypes",
+ "kind": "SCALAR",
+ "name": "Int",
+ "ofType": null
+ },
+ "defaultValue": null
+ },
+ {
+ "name": "gte",
+ "description": null,
+ "type": {
+ "kind": "SCALAR",
+ "name": "Int",
+ "ofType": null
+ },
+ "defaultValue": null
+ },
+ {
+ "name": "lte",
+ "description": null,
+ "type": {
+ "kind": "SCALAR",
+ "name": "Int",
+ "ofType": null
+ },
+ "defaultValue": null
+ },
+ {
+ "name": "eq",
+ "description": null,
+ "type": {
+ "kind": "SCALAR",
+ "name": "Int",
"ofType": null
},
"defaultValue": null
+ },
+ {
+ "name": "range",
+ "description": null,
+ "type": {
+ "kind": "LIST",
+ "name": null,
+ "ofType": {
+ "kind": "SCALAR",
+ "name": "Int",
+ "ofType": null
+ }
+ },
+ "defaultValue": null
}
],
"interfaces": null,
@@ -18668,7 +19021,7 @@
},
{
"kind": "INPUT_OBJECT",
- "name": "ModelSubscriptionFloatInput",
+ "name": "ModelSubscriptionIntInput",
"description": null,
"fields": null,
"inputFields": [
@@ -18677,7 +19030,7 @@
"description": null,
"type": {
"kind": "SCALAR",
- "name": "Float",
+ "name": "Int",
"ofType": null
},
"defaultValue": null
@@ -18687,7 +19040,7 @@
"description": null,
"type": {
"kind": "SCALAR",
- "name": "Float",
+ "name": "Int",
"ofType": null
},
"defaultValue": null
@@ -18697,7 +19050,7 @@
"description": null,
"type": {
"kind": "SCALAR",
- "name": "Float",
+ "name": "Int",
"ofType": null
},
"defaultValue": null
@@ -18707,7 +19060,7 @@
"description": null,
"type": {
"kind": "SCALAR",
- "name": "Float",
+ "name": "Int",
"ofType": null
},
"defaultValue": null
@@ -18717,7 +19070,7 @@
"description": null,
"type": {
"kind": "SCALAR",
- "name": "Float",
+ "name": "Int",
"ofType": null
},
"defaultValue": null
@@ -18727,7 +19080,7 @@
"description": null,
"type": {
"kind": "SCALAR",
- "name": "Float",
+ "name": "Int",
"ofType": null
},
"defaultValue": null
@@ -18740,7 +19093,7 @@
"name": null,
"ofType": {
"kind": "SCALAR",
- "name": "Float",
+ "name": "Int",
"ofType": null
}
},
@@ -18754,7 +19107,7 @@
"name": null,
"ofType": {
"kind": "SCALAR",
- "name": "Float",
+ "name": "Int",
"ofType": null
}
},
@@ -18768,7 +19121,7 @@
"name": null,
"ofType": {
"kind": "SCALAR",
- "name": "Float",
+ "name": "Int",
"ofType": null
}
},
@@ -18938,7 +19291,7 @@
},
{
"kind": "INPUT_OBJECT",
- "name": "SearchableIntFilterInput",
+ "name": "ModelFloatInput",
"description": null,
"fields": null,
"inputFields": [
@@ -18947,159 +19300,94 @@
"description": null,
"type": {
"kind": "SCALAR",
- "name": "Int",
+ "name": "Float",
"ofType": null
},
"defaultValue": null
},
{
- "name": "gt",
+ "name": "eq",
"description": null,
"type": {
"kind": "SCALAR",
- "name": "Int",
+ "name": "Float",
"ofType": null
},
"defaultValue": null
},
{
- "name": "lt",
+ "name": "le",
"description": null,
"type": {
"kind": "SCALAR",
- "name": "Int",
+ "name": "Float",
"ofType": null
},
"defaultValue": null
},
{
- "name": "gte",
+ "name": "lt",
"description": null,
"type": {
"kind": "SCALAR",
- "name": "Int",
+ "name": "Float",
"ofType": null
},
"defaultValue": null
},
{
- "name": "lte",
+ "name": "ge",
"description": null,
"type": {
"kind": "SCALAR",
- "name": "Int",
+ "name": "Float",
"ofType": null
},
"defaultValue": null
},
{
- "name": "eq",
+ "name": "gt",
"description": null,
"type": {
"kind": "SCALAR",
- "name": "Int",
+ "name": "Float",
"ofType": null
},
"defaultValue": null
},
{
- "name": "range",
+ "name": "between",
"description": null,
"type": {
"kind": "LIST",
"name": null,
"ofType": {
"kind": "SCALAR",
- "name": "Int",
+ "name": "Float",
"ofType": null
}
},
"defaultValue": null
- }
- ],
- "interfaces": null,
- "enumValues": null,
- "possibleTypes": null
- },
- {
- "kind": "INPUT_OBJECT",
- "name": "SearchableFloatFilterInput",
- "description": null,
- "fields": null,
- "inputFields": [
- {
- "name": "ne",
- "description": null,
- "type": {
- "kind": "SCALAR",
- "name": "Float",
- "ofType": null
- },
- "defaultValue": null
- },
- {
- "name": "gt",
- "description": null,
- "type": {
- "kind": "SCALAR",
- "name": "Float",
- "ofType": null
- },
- "defaultValue": null
- },
- {
- "name": "lt",
- "description": null,
- "type": {
- "kind": "SCALAR",
- "name": "Float",
- "ofType": null
- },
- "defaultValue": null
- },
- {
- "name": "gte",
- "description": null,
- "type": {
- "kind": "SCALAR",
- "name": "Float",
- "ofType": null
- },
- "defaultValue": null
},
{
- "name": "lte",
+ "name": "attributeExists",
"description": null,
"type": {
"kind": "SCALAR",
- "name": "Float",
+ "name": "Boolean",
"ofType": null
},
"defaultValue": null
},
{
- "name": "eq",
+ "name": "attributeType",
"description": null,
"type": {
- "kind": "SCALAR",
- "name": "Float",
+ "kind": "ENUM",
+ "name": "ModelAttributeTypes",
"ofType": null
},
"defaultValue": null
- },
- {
- "name": "range",
- "description": null,
- "type": {
- "kind": "LIST",
- "name": null,
- "ofType": {
- "kind": "SCALAR",
- "name": "Float",
- "ofType": null
- }
- },
- "defaultValue": null
}
],
"interfaces": null,
@@ -19978,9 +20266,9 @@
"onField": true
},
{
- "name": "aws_auth",
- "description": "Directs the schema to enforce authorization on a field",
- "locations": ["FIELD_DEFINITION"],
+ "name": "aws_cognito_user_pools",
+ "description": "Tells the service this field/object has access authorized by a Cognito User Pools token.",
+ "locations": ["OBJECT", "FIELD_DEFINITION"],
"args": [
{
"name": "cognito_groups",
@@ -20002,8 +20290,8 @@
"onField": false
},
{
- "name": "aws_oidc",
- "description": "Tells the service this field/object has access authorized by an OIDC token.",
+ "name": "aws_lambda",
+ "description": "Tells the service this field/object has access authorized by a Lambda Authorizer.",
"locations": ["OBJECT", "FIELD_DEFINITION"],
"args": [],
"onOperation": false,
@@ -20011,34 +20299,62 @@
"onField": false
},
{
- "name": "aws_lambda",
- "description": "Tells the service this field/object has access authorized by a Lambda Authorizer.",
- "locations": ["OBJECT", "FIELD_DEFINITION"],
- "args": [],
+ "name": "aws_subscribe",
+ "description": "Tells the service which mutation triggers this subscription.",
+ "locations": ["FIELD_DEFINITION"],
+ "args": [
+ {
+ "name": "mutations",
+ "description": "List of mutations which will trigger this subscription when they are called.",
+ "type": {
+ "kind": "LIST",
+ "name": null,
+ "ofType": {
+ "kind": "SCALAR",
+ "name": "String",
+ "ofType": null
+ }
+ },
+ "defaultValue": null
+ }
+ ],
"onOperation": false,
"onFragment": false,
"onField": false
},
{
- "name": "deprecated",
- "description": null,
- "locations": ["FIELD_DEFINITION", "ENUM_VALUE"],
+ "name": "aws_auth",
+ "description": "Directs the schema to enforce authorization on a field",
+ "locations": ["FIELD_DEFINITION"],
"args": [
{
- "name": "reason",
- "description": null,
+ "name": "cognito_groups",
+ "description": "List of cognito user pool groups which have access on this field",
"type": {
- "kind": "SCALAR",
- "name": "String",
- "ofType": null
+ "kind": "LIST",
+ "name": null,
+ "ofType": {
+ "kind": "SCALAR",
+ "name": "String",
+ "ofType": null
+ }
},
- "defaultValue": "\"No longer supported\""
+ "defaultValue": null
}
],
"onOperation": false,
"onFragment": false,
"onField": false
},
+ {
+ "name": "aws_oidc",
+ "description": "Tells the service this field/object has access authorized by an OIDC token.",
+ "locations": ["OBJECT", "FIELD_DEFINITION"],
+ "args": [],
+ "onOperation": false,
+ "onFragment": false,
+ "onField": false
+ },
{
"name": "aws_iam",
"description": "Tells the service this field/object has access authorized by sigv4 signing.",
@@ -20073,23 +20389,19 @@
"onField": false
},
{
- "name": "aws_subscribe",
- "description": "Tells the service which mutation triggers this subscription.",
- "locations": ["FIELD_DEFINITION"],
+ "name": "deprecated",
+ "description": null,
+ "locations": ["FIELD_DEFINITION", "ENUM_VALUE"],
"args": [
{
- "name": "mutations",
- "description": "List of mutations which will trigger this subscription when they are called.",
+ "name": "reason",
+ "description": null,
"type": {
- "kind": "LIST",
- "name": null,
- "ofType": {
- "kind": "SCALAR",
- "name": "String",
- "ofType": null
- }
+ "kind": "SCALAR",
+ "name": "String",
+ "ofType": null
},
- "defaultValue": null
+ "defaultValue": "\"No longer supported\""
}
],
"onOperation": false,
@@ -20097,25 +20409,10 @@
"onField": false
},
{
- "name": "aws_cognito_user_pools",
- "description": "Tells the service this field/object has access authorized by a Cognito User Pools token.",
- "locations": ["OBJECT", "FIELD_DEFINITION"],
- "args": [
- {
- "name": "cognito_groups",
- "description": "List of cognito user pool groups which have access on this field",
- "type": {
- "kind": "LIST",
- "name": null,
- "ofType": {
- "kind": "SCALAR",
- "name": "String",
- "ofType": null
- }
- },
- "defaultValue": null
- }
- ],
+ "name": "aws_transform",
+ "description": "Indicates that the schema is allowed to be further processed by supported type/field-level directives.",
+ "locations": ["SCHEMA"],
+ "args": [],
"onOperation": false,
"onFragment": false,
"onField": false
diff --git a/src/graphql/subscriptions.js b/src/graphql/subscriptions.js
index 2d701bb3..5064e67c 100644
--- a/src/graphql/subscriptions.js
+++ b/src/graphql/subscriptions.js
@@ -26,6 +26,7 @@ export const onCreateCollection = /* GraphQL */ `
modified_date
ownerinfo
parent_collection
+ parent_collection_identifer
provenance
relation
rights_holder
@@ -85,6 +86,7 @@ export const onUpdateCollection = /* GraphQL */ `
modified_date
ownerinfo
parent_collection
+ parent_collection_identifer
provenance
relation
rights_holder
@@ -144,6 +146,7 @@ export const onDeleteCollection = /* GraphQL */ `
modified_date
ownerinfo
parent_collection
+ parent_collection_identifer
provenance
relation
rights_holder
@@ -210,6 +213,7 @@ export const onCreateCollectionmap = /* GraphQL */ `
modified_date
ownerinfo
parent_collection
+ parent_collection_identifer
provenance
relation
rights_holder
@@ -265,6 +269,7 @@ export const onUpdateCollectionmap = /* GraphQL */ `
modified_date
ownerinfo
parent_collection
+ parent_collection_identifer
provenance
relation
rights_holder
@@ -320,6 +325,7 @@ export const onDeleteCollectionmap = /* GraphQL */ `
modified_date
ownerinfo
parent_collection
+ parent_collection_identifer
provenance
relation
rights_holder
@@ -471,6 +477,7 @@ export const onCreateArchive = /* GraphQL */ `
date
description
display_date
+ download_link
end_date
explicit
extent
@@ -494,6 +501,7 @@ export const onCreateArchive = /* GraphQL */ `
modified_date
other_identifier
parent_collection
+ parent_collection_identifer
provenance
publisher
references
@@ -532,6 +540,7 @@ export const onCreateArchive = /* GraphQL */ `
modified_date
ownerinfo
parent_collection
+ parent_collection_identifer
provenance
relation
rights_holder
@@ -573,6 +582,7 @@ export const onUpdateArchive = /* GraphQL */ `
date
description
display_date
+ download_link
end_date
explicit
extent
@@ -596,6 +606,7 @@ export const onUpdateArchive = /* GraphQL */ `
modified_date
other_identifier
parent_collection
+ parent_collection_identifer
provenance
publisher
references
@@ -634,6 +645,7 @@ export const onUpdateArchive = /* GraphQL */ `
modified_date
ownerinfo
parent_collection
+ parent_collection_identifer
provenance
relation
rights_holder
@@ -675,6 +687,7 @@ export const onDeleteArchive = /* GraphQL */ `
date
description
display_date
+ download_link
end_date
explicit
extent
@@ -698,6 +711,7 @@ export const onDeleteArchive = /* GraphQL */ `
modified_date
other_identifier
parent_collection
+ parent_collection_identifer
provenance
publisher
references
@@ -736,6 +750,7 @@ export const onDeleteArchive = /* GraphQL */ `
modified_date
ownerinfo
parent_collection
+ parent_collection_identifer
provenance
relation
rights_holder
diff --git a/src/pages/archives/ArchivePage.js b/src/pages/archives/ArchivePage.js
index 6218b958..0e50f466 100644
--- a/src/pages/archives/ArchivePage.js
+++ b/src/pages/archives/ArchivePage.js
@@ -154,9 +154,8 @@ class ArchivePage extends Component {
is3D_2DiiifType(item) {
try {
const options = JSON.parse(item.archiveOptions);
- const type = options.assets.media_type;
return (
- type === "3d_2diiif" &&
+ item.format.indexOf("model/x3d") !== -1 &&
!!options.assets.x3d_config &&
!!options.assets.x3d_src_img
);
@@ -348,7 +347,7 @@ class ArchivePage extends Component {