diff --git a/CHANGELOG.md b/CHANGELOG.md
index b7adf958..477be20c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,7 @@
## [Prerelease]
+- Update license link for editions, works, and collections to copyright
- Update License page to Copyright and add section for "In Copyright" explanation
## [0.18.3]
diff --git a/src/__tests__/Search.test.tsx b/src/__tests__/Search.test.tsx
index e0278282..8bd0c899 100644
--- a/src/__tests__/Search.test.tsx
+++ b/src/__tests__/Search.test.tsx
@@ -366,7 +366,7 @@ describe("Renders Search Results Page", () => {
});
test("Shows license with links", () => {
expect(
- screen.getByText("License: Public Domain").closest("a").href
+ screen.getByText("Copyright: Public Domain").closest("a").href
).toContain("/copyright");
});
test("Shows cover", () => {
@@ -415,7 +415,7 @@ describe("Renders Search Results Page", () => {
});
test("Shows Unknown license with links", () => {
expect(
- screen.getByText("License: Unknown").closest("a").href
+ screen.getByText("Copyright: Unknown").closest("a").href
).toContain("/copyright");
});
test("Shows Placeholder cover", () => {
@@ -483,7 +483,7 @@ describe("Renders Search Results Page", () => {
expect(
screen
.getByText(
- "License: Public Domain Public Domain Public Domain Public Domain Public Domain Public Domain Public Domain Public Domain Public Domain"
+ "Copyright: Public Domain Public Domain Public Domain Public Domain Public Domain Public Domain Public Domain Public Domain Public Domain"
)
.closest("a").href
).toContain("/copyright");
diff --git a/src/components/Collection/Collection.test.tsx b/src/components/Collection/Collection.test.tsx
index ce148c46..1551e06d 100644
--- a/src/components/Collection/Collection.test.tsx
+++ b/src/components/Collection/Collection.test.tsx
@@ -99,7 +99,7 @@ describe("Renders Collection Page", () => {
});
test("Shows license with links", () => {
expect(
- screen.getByText("License: Public Domain").closest("a").href
+ screen.getByText("Copyright: Public Domain").closest("a").href
).toContain("/copyright");
});
});
diff --git a/src/components/CollectionItemCard/CollectionItemCard.test.tsx b/src/components/CollectionItemCard/CollectionItemCard.test.tsx
index c16250d1..83abb2b6 100644
--- a/src/components/CollectionItemCard/CollectionItemCard.test.tsx
+++ b/src/components/CollectionItemCard/CollectionItemCard.test.tsx
@@ -29,7 +29,7 @@ describe("Collection Item Card", () => {
);
});
test("shows license", () => {
- expect(screen.getByText("License: Unknown").closest("a").href).toContain(
+ expect(screen.getByText("Copyright: Unknown").closest("a").href).toContain(
"/copyright"
);
});
diff --git a/src/components/CollectionItemCard/CollectionItemCard.tsx b/src/components/CollectionItemCard/CollectionItemCard.tsx
index 93abd1af..e5b7cb61 100644
--- a/src/components/CollectionItemCard/CollectionItemCard.tsx
+++ b/src/components/CollectionItemCard/CollectionItemCard.tsx
@@ -12,7 +12,7 @@ import CollectionUtils from "~/src/util/CollectionUtils";
import Ctas from "~/src/components/CollectionItemCard/Ctas";
import EditionYear from "~/src/components/CollectionItemCard/EditionYear";
import PublisherAndLocation from "~/src/components/CollectionItemCard/PublisherAndLocation";
-import LicenseLink from "~/src/components/CollectionItemCard/LicenseLink";
+import CopyrightLink from "~/src/components/CollectionItemCard/CopyrightLink";
import LanguageDisplayText from "~/src/components/CollectionItemCard/LanguageDisplayText";
// Creates an Collection item card out of the collectionItem object
@@ -56,7 +56,7 @@ export const CollectionItemCard: React.FC<{
publisher={publisher}
/>
-
+
= ({ rights }) => {
+const CopyrightLink: React.FC<{ rights: Rights }> = ({ rights }) => {
return (
- {rights ? `License: ${rights.rightsStatement}` : "License: Unknown"}
+ {rights ? `Copyright: ${rights.rightsStatement}` : "Copyright: Unknown"}
);
};
-export default LicenseLink;
+export default CopyrightLink;
diff --git a/src/components/EditionCard/LicenseLink.tsx b/src/components/EditionCard/CopyrightLink.tsx
similarity index 53%
rename from src/components/EditionCard/LicenseLink.tsx
rename to src/components/EditionCard/CopyrightLink.tsx
index 590ba7bd..e26a85d9 100644
--- a/src/components/EditionCard/LicenseLink.tsx
+++ b/src/components/EditionCard/CopyrightLink.tsx
@@ -2,14 +2,14 @@ import React from "react";
import { Rights } from "~/src/types/DataModel";
import Link from "~/src/components/Link/Link";
-const LicenseLink: React.FC<{ rights: Rights[] }> = ({ rights }) => {
+const CopyrightLink: React.FC<{ rights: Rights[] }> = ({ rights }) => {
return (
{rights && rights.length > 0
- ? `License: ${rights[0].rightsStatement}`
- : "License: Unknown"}
+ ? `Copyright: ${rights[0].rightsStatement}`
+ : "Copyright: Unknown"}
);
};
-export default LicenseLink;
+export default CopyrightLink;
diff --git a/src/components/EditionCard/EditionCard.test.tsx b/src/components/EditionCard/EditionCard.test.tsx
index ca68df12..7056aeb4 100644
--- a/src/components/EditionCard/EditionCard.test.tsx
+++ b/src/components/EditionCard/EditionCard.test.tsx
@@ -36,7 +36,7 @@ describe("Edition Card with Valid Data", () => {
});
test("Shows license with links", () => {
expect(
- screen.getByText("License: test rights statement").closest("a").href
+ screen.getByText("Copyright: test rights statement").closest("a").href
).toContain("/copyright");
});
test("Shows cover", () => {
@@ -79,7 +79,7 @@ describe("Edition Year with Minimal Data", () => {
expect(screen.getByText("Languages: Undetermined")).toBeInTheDocument();
});
test("Shows Unknown license with links", () => {
- expect(screen.getByText("License: Unknown").closest("a").href).toContain(
+ expect(screen.getByText("Copyright: Unknown").closest("a").href).toContain(
"/copyright"
);
});
diff --git a/src/components/EditionCard/EditionCard.tsx b/src/components/EditionCard/EditionCard.tsx
index 1dd58e06..7e1f45c6 100644
--- a/src/components/EditionCard/EditionCard.tsx
+++ b/src/components/EditionCard/EditionCard.tsx
@@ -19,7 +19,7 @@ import FeaturedEditionBadge from "./FeaturedEditionBadge";
import PhysicalEditionBadge from "./PhysicalEditionBadge";
import ScanAndDeliverBlurb from "./ScanAndDeliverBlurb";
import UpBlurb from "./UpBlurb";
-import LicenseLink from "./LicenseLink";
+import CopyrightLink from "./CopyrightLink";
export const EditionCard: React.FC<{
edition: WorkEdition;
@@ -115,7 +115,7 @@ export const EditionCard: React.FC<{
publishers={edition.publishers}
/>
-
+
{isPhysicalEdition && }
{isUniversityPress && }
diff --git a/src/components/EditionDetail/Edition.test.tsx b/src/components/EditionDetail/Edition.test.tsx
index 00e157d7..9eda8ba1 100644
--- a/src/components/EditionDetail/Edition.test.tsx
+++ b/src/components/EditionDetail/Edition.test.tsx
@@ -73,7 +73,7 @@ describe("Renders edition component when given valid edition", () => {
expect(screen.getAllByAltText("").length).toBe(2);
expect(
screen
- .getAllByText("License: Public Domain when viewed in the US")[0]
+ .getAllByText("Copyright: Public Domain when viewed in the US")[0]
.closest("a").href
).toContain("/copyright");
});
diff --git a/src/components/InstanceCard/InstanceCard.test.tsx b/src/components/InstanceCard/InstanceCard.test.tsx
index cd02e204..bdac6220 100644
--- a/src/components/InstanceCard/InstanceCard.test.tsx
+++ b/src/components/InstanceCard/InstanceCard.test.tsx
@@ -40,7 +40,7 @@ describe("Instance Card with Valid Data", () => {
});
test("shows license", () => {
expect(
- screen.getByText("License: test rights statement").closest("a").href
+ screen.getByText("Copyright: test rights statement").closest("a").href
).toContain("/copyright");
});
});
@@ -74,7 +74,7 @@ describe("Instance Card with Minmal Data", () => {
);
});
test("shows license", () => {
- expect(screen.getByText("License: Unknown").closest("a").href).toContain(
+ expect(screen.getByText("Copyright: Unknown").closest("a").href).toContain(
"/copyright"
);
});
diff --git a/src/components/InstanceCard/InstanceCard.tsx b/src/components/InstanceCard/InstanceCard.tsx
index 0b53078f..d26f9cb6 100644
--- a/src/components/InstanceCard/InstanceCard.tsx
+++ b/src/components/InstanceCard/InstanceCard.tsx
@@ -18,7 +18,7 @@ import FeaturedEditionBadge from "../EditionCard/FeaturedEditionBadge";
import PhysicalEditionBadge from "../EditionCard/PhysicalEditionBadge";
import ScanAndDeliverBlurb from "../EditionCard/ScanAndDeliverBlurb";
import UpBlurb from "../EditionCard/UpBlurb";
-import LicenseLink from "../EditionCard/LicenseLink";
+import CopyrightLink from "../EditionCard/CopyrightLink";
// Creates an Instance card out of the Edition Year and Instance object
// Note: Edition Year only needs to be passed because `instance.publication_date`
@@ -94,7 +94,7 @@ export const InstanceCard: React.FC<{
/>
-
+
{isPhysicalEdition && }
{isUniversityPress && }
diff --git a/src/components/Work/Work.test.tsx b/src/components/Work/Work.test.tsx
index d1194aea..abb00858 100644
--- a/src/components/Work/Work.test.tsx
+++ b/src/components/Work/Work.test.tsx
@@ -76,7 +76,7 @@ describe("Renders Work component when given valid work", () => {
).toBe(1);
expect(screen.getAllByText("Languages: English, German").length).toBe(1);
expect(
- screen.getAllByText("License: Unknown")[0].closest("a").href
+ screen.getAllByText("Copyright: Unknown")[0].closest("a").href
).toContain("/copyright");
});
test("Shows Details Table", () => {
diff --git a/src/util/EditionCardUtils.tsx b/src/util/EditionCardUtils.tsx
index 3849fc38..be0e88cb 100644
--- a/src/util/EditionCardUtils.tsx
+++ b/src/util/EditionCardUtils.tsx
@@ -134,8 +134,8 @@ export default class EditionCardUtils {
// Rights
static getLicense(item: ApiItem): string {
return item && item.rights && item.rights.length > 0
- ? `License: ${item.rights[0].rightsStatement}`
- : "License: Unknown";
+ ? `Copyright: ${item.rights[0].rightsStatement}`
+ : "Copyright: Unknown";
}
static getReadLink = (item: ApiItem, type: "reader" | "embed"): ItemLink => {