From cba2b388d7ef754dbd2a6fbc6bb10f2403b29885 Mon Sep 17 00:00:00 2001 From: Lee Hunter Date: Tue, 8 Oct 2024 18:20:47 -0400 Subject: [PATCH 1/2] still need to hide thumbs under model if no iiif working? clean up amplify pull amplify pull components runtime collectionmap style post-push more amplify --- .../api/collectionarchives/schema.graphql | 6 +- amplify/backend/package-lock.json | 24 +- public/images/fallback_thumbnail.jpg | Bin 0 -> 26769 bytes src/components/CollapsibleCards.js | 16 +- .../ThreeD2DiiifHandler.tsx | 31 +- src/components/Thumbnail/Thumbnail.tsx | 12 +- src/css/RelatedItems.scss | 1 + src/graphql/mutations.js | 15 + src/graphql/queries.js | 19 + src/graphql/schema.json | 715 +++++++++++++----- src/graphql/subscriptions.js | 15 + src/pages/archives/ArchivePage.js | 5 +- src/ui-components/ArchiveCreateForm.d.ts | 6 + src/ui-components/ArchiveCreateForm.jsx | 341 ++++++++- src/ui-components/ArchiveUpdateForm.d.ts | 6 + src/ui-components/ArchiveUpdateForm.jsx | 345 ++++++++- src/ui-components/CollectionCreateForm.d.ts | 3 + src/ui-components/CollectionCreateForm.jsx | 125 +++ src/ui-components/CollectionUpdateForm.d.ts | 3 + src/ui-components/CollectionUpdateForm.jsx | 127 ++++ .../CollectionmapCreateForm.d.ts | 77 +- src/ui-components/CollectionmapCreateForm.jsx | 22 +- .../CollectionmapUpdateForm.d.ts | 77 +- src/ui-components/CollectionmapUpdateForm.jsx | 24 +- src/ui-components/EmbargoCreateForm.d.ts | 77 +- src/ui-components/EmbargoCreateForm.jsx | 22 +- src/ui-components/EmbargoUpdateForm.d.ts | 77 +- src/ui-components/EmbargoUpdateForm.jsx | 24 +- src/ui-components/HistoryCreateForm.d.ts | 77 +- src/ui-components/HistoryCreateForm.jsx | 39 +- src/ui-components/HistoryUpdateForm.d.ts | 77 +- src/ui-components/HistoryUpdateForm.jsx | 41 +- src/ui-components/PageContentCreateForm.d.ts | 59 +- src/ui-components/PageContentCreateForm.jsx | 16 +- src/ui-components/PageContentUpdateForm.d.ts | 59 +- src/ui-components/PageContentUpdateForm.jsx | 18 +- src/ui-components/SiteCreateForm.d.ts | 136 ++-- src/ui-components/SiteCreateForm.jsx | 63 +- src/ui-components/SiteUpdateForm.d.ts | 136 ++-- src/ui-components/SiteUpdateForm.jsx | 65 +- src/ui-components/utils.js | 120 +-- 41 files changed, 2133 insertions(+), 988 deletions(-) create mode 100644 public/images/fallback_thumbnail.jpg diff --git a/amplify/backend/api/collectionarchives/schema.graphql b/amplify/backend/api/collectionarchives/schema.graphql index 61740926..81c615eb 100644 --- a/amplify/backend/api/collectionarchives/schema.graphql +++ b/amplify/backend/api/collectionarchives/schema.graphql @@ -14,6 +14,7 @@ interface Object { location: [String!] modified_date: String parent_collection: [String!] + parent_collection_identifer: [String!] provenance: [String!] relation: [String!] rights_holder: [String!] @@ -58,6 +59,7 @@ type Collection implements Object modified_date: String ownerinfo: AWSJSON parent_collection: [String!] + parent_collection_identifer: [String!] provenance: [String!] relation: [String!] rights_holder: [String!] @@ -130,6 +132,7 @@ type Archive implements Object date: [String!] description: [String!] display_date: [String!] + download_link:[String!] end_date: String explicit: Boolean extent: [String!] @@ -149,11 +152,12 @@ type Archive implements Object license: [String!] location: [String!] manifest_file_characterization: AWSJSON - manifest_url: String! + manifest_url: String medium: [String!] modified_date: String other_identifier: [String!] parent_collection: [String!] + parent_collection_identifer: [String!] provenance: [String!] publisher: [String!] references: [String!] diff --git a/amplify/backend/package-lock.json b/amplify/backend/package-lock.json index 7d183a79..461f8ac8 100644 --- a/amplify/backend/package-lock.json +++ b/amplify/backend/package-lock.json @@ -286,9 +286,9 @@ "license": "MIT" }, "node_modules/@types/node": { - "version": "16.18.115", - "resolved": "https://registry.npmjs.org/@types/node/-/node-16.18.115.tgz", - "integrity": "sha512-NF5ajYn+dq0tRfswdyp8Df75h7D9z+L8TCIwrXoh46ZLK6KZVXkRhf/luXaZytvm/keUo9vU4m1Bg39St91a5w==", + "version": "16.18.119", + "resolved": "https://registry.npmjs.org/@types/node/-/node-16.18.119.tgz", + "integrity": "sha512-ia7V9a2FnhUFfetng4/sRPBMTwHZUkPFY736rb1cg9AgG7MZdR97q7/nLR9om+sq5f1la9C857E0l/nrI0RiFQ==", "license": "MIT" }, "node_modules/@types/triple-beam": { @@ -2815,9 +2815,9 @@ } }, "node_modules/tslib": { - "version": "2.8.0", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.0.tgz", - "integrity": "sha512-jWVzBLplnCmoaTr13V9dYbiQ99wvZRd0vNWaDRg+aVYRcjDF3nDksxFDE/+fkXnKhpnUUkmx5pK/v8mCtLVqZA==", + "version": "2.8.1", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz", + "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==", "license": "0BSD" }, "node_modules/type-fest": { @@ -2955,9 +2955,9 @@ } }, "node_modules/winston": { - "version": "3.15.0", - "resolved": "https://registry.npmjs.org/winston/-/winston-3.15.0.tgz", - "integrity": "sha512-RhruH2Cj0bV0WgNL+lOfoUBI4DVfdUNjVnJGVovWZmrcKtrFTTRzgXYK2O9cymSGjrERCtaAeHwMNnUWXlwZow==", + "version": "3.16.0", + "resolved": "https://registry.npmjs.org/winston/-/winston-3.16.0.tgz", + "integrity": "sha512-xz7+cyGN5M+4CmmD4Npq1/4T+UZaz7HaeTlAruFUTjk79CNMq+P6H30vlE4z0qfqJ01VHYQwd7OZo03nYm/+lg==", "license": "MIT", "dependencies": { "@colors/colors": "^1.6.0", @@ -3105,9 +3105,9 @@ } }, "node_modules/yauzl": { - "version": "3.1.3", - "resolved": "https://registry.npmjs.org/yauzl/-/yauzl-3.1.3.tgz", - "integrity": "sha512-JCCdmlJJWv7L0q/KylOekyRaUrdEoUxWkWVcgorosTROCFWiS9p2NNPE9Yb91ak7b1N5SxAZEliWpspbZccivw==", + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/yauzl/-/yauzl-3.2.0.tgz", + "integrity": "sha512-Ow9nuGZE+qp1u4JIPvg+uCiUr7xGQWdff7JQSk5VGYTAZMDe2q8lxJ10ygv10qmSj031Ty/6FNJpLO4o1Sgc+w==", "license": "MIT", "dependencies": { "buffer-crc32": "~0.2.3", diff --git a/public/images/fallback_thumbnail.jpg b/public/images/fallback_thumbnail.jpg new file mode 100644 index 0000000000000000000000000000000000000000..75a96356426eb816c4c55f834c14b8ca89da4fb4 GIT binary patch literal 26769 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 literal 0 HcmV?d00001 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 (

)} - + > +