Merge pull request #540 from NYPL/development

SFR-2254: Release 0.18.4 to production

CHANGELOG.md

@@ -1,5 +1,13 @@
 # CHANGE LOG
 
+## [0.18.4]
+
+- Update license link for editions, works, and collections to copyright
+- Update License page to Copyright and add section for "In Copyright" explanation
+- Remove error codes from error page
+- Update styling for mobile view of error page
+- SFR:2257 - fix pw tests for modified license page
+
 ## [0.18.3]
 
 - Fix error when collections are empty

package.json

@@ -1,6 +1,6 @@
 {
   "name": "sfr-bookfinder-front-end",
-  "version": "0.18.3",
+  "version": "0.18.4",
   "private": true,
   "scripts": {
     "dev": "next dev",

playwright/features/licensePage.feature → playwright/features/copyrightPage.feature

@@ -1,13 +1,13 @@
 Feature: License Page
 
-    Scenario: As a user I want to verify the headers and subheaders of DRB License Page
-        Given I go to the "license" page
-        Then the "license explanations header" should be displayed
+    Scenario: As a user I want to verify the headers and subheaders of DRB Copyright Page
+        Given I go to the "copyright" page
+        Then the "copyright explanations header" should be displayed
         Then the "public domain header" should be displayed
         Then the "public domain us only header" should be displayed
         Then the "creative commons licenses header" should be displayed
 
-    Scenario: As a user I verify the subheaders of DRB License Page are displayed correctly
-        Given I go to the "license" page
+    Scenario: As a user I verify the subheaders of DRB Copyright Page are displayed correctly
+        Given I go to the "copyright" page
         Then the "public domain subheader" should be displayed
         Then the "public domain us only subheader" should be displayed

playwright/features/drbFooters.feature

@@ -15,13 +15,13 @@ Feature: Footer Links
         And the "language footer link" should be displayed
 
         Examples:
-        | DRB                 |
-        | "home"              |
-        | "advanced search"   |
-        | "search results"    |
-        | "item details"      |
-        | "edition details"   |
-        | "collection"        |
-        | "read online"       |
-        | "license"           |
-        | "about"             |
+            | DRB               |
+            | "home"            |
+            | "advanced search" |
+            | "search results"  |
+            | "item details"    |
+            | "edition details" |
+            | "collection"      |
+            | "read online"     |
+            | "copyright"       |
+            | "about"           |

playwright/features/headerLinks.feature

@@ -27,7 +27,7 @@ Feature: Header Links
             | "edition details" |
             | "collection"      |
             | "read online"     |
-            | "license"         |
+            | "copyright"       |
             | "about"           |
 
     Scenario: As a user I navigate to the Digital Research Books home page and verify the account and search header sub-links and elements are displayed

playwright/support/mappings.ts

@@ -27,8 +27,8 @@ export const pages: { [name: string]: Pages } = {
   about: {
     route: "/about",
   },
-  license: {
-    route: "/license",
+  copyright: {
+    route: "/copyright",
   },
   "read online": {
     route: "/read/4440666",
@@ -117,7 +117,7 @@ export const elements = {
   "item featured edition year": "a:has-text('Edition') >> nth=0",
   "item featured edition publisher": "div:text('Published by') >> nth=0",
   "item featured edition language": "div:text('Languages') >> nth=0",
-  "item featured edition license": "[href='/license'] >> nth=0",
+  "item featured edition license": "[href='/copyright'] >> nth=0",
   "item details heading": "#details-list-heading",
   "item details authors heading": "dt:text('Authors')",
   "item details authors": "dd > a[href*='display=author'] >> nth=0",
@@ -213,7 +213,7 @@ export const elements = {
   "language footer link": "//a[@href='http://www.nypl.org/language']",
 
   /** license page locators */
-  "license explanations header": "//h1[text()='License Explanations']",
+  "copyright explanations header": "//h1[text()='Copyright Explanations']",
   "public domain header": "//h2[text()='Public Domain']",
   "creative commons licenses header":
     "//h2[text()='Creative Commons Licenses']",

src/__tests__/Search.test.tsx

@@ -366,8 +366,8 @@ describe("Renders Search Results Page", () => {
       });
       test("Shows license with links", () => {
         expect(
-          screen.getByText("License: Public Domain").closest("a").href
-        ).toContain("/license");
+          screen.getByText("Copyright: Public Domain").closest("a").href
+        ).toContain("/copyright");
       });
       test("Shows cover", () => {
         expect(
@@ -415,8 +415,8 @@ describe("Renders Search Results Page", () => {
       });
       test("Shows Unknown license with links", () => {
         expect(
-          screen.getByText("License: Unknown").closest("a").href
-        ).toContain("/license");
+          screen.getByText("Copyright: Unknown").closest("a").href
+        ).toContain("/copyright");
       });
       test("Shows Placeholder cover", () => {
         expect(
@@ -483,10 +483,10 @@ 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("/license");
+        ).toContain("/copyright");
       });
       test("Shows cover", () => {
         expect(

src/components/About/About.tsx

@@ -39,10 +39,10 @@ const About: React.FC = () => {
         All the materials in Digital Research Books Beta are completely free to
         read and most of them you can download and keep, with no library card
         required. The books are either in the{" "}
-        <Link to="/license">public domain</Link>, with no restrictions on your
+        <Link to="/copyright">public domain</Link>, with no restrictions on your
         use of them, or under{" "}
-        <Link to="/license">Creative Commons licences</Link> that may have some
-        conditions, but only on redistribution or adaptation.
+        <Link to="/copyright">Creative Commons licences</Link> that may have
+        some conditions, but only on redistribution or adaptation.
       </p>
 
       <p>

src/components/About/__snapshots__/About.test.tsx.snap

@@ -142,15 +142,15 @@ exports[`renders about unchanged 1`] = `
          
         <a
           class="chakra-link css-qsaw8"
-          href="/license"
+          href="/copyright"
         >
           public domain
         </a>
         , with no restrictions on your use of them, or under
          
         <a
           class="chakra-link css-qsaw8"
-          href="/license"
+          href="/copyright"
         >
           Creative Commons licences
         </a>

src/components/Collection/Collection.test.tsx

@@ -99,8 +99,8 @@ describe("Renders Collection Page", () => {
     });
     test("Shows license with links", () => {
       expect(
-        screen.getByText("License: Public Domain").closest("a").href
-      ).toContain("/license");
+        screen.getByText("Copyright: Public Domain").closest("a").href
+      ).toContain("/copyright");
     });
   });
 });

src/components/CollectionItemCard/CollectionItemCard.test.tsx

@@ -29,8 +29,8 @@ describe("Collection Item Card", () => {
     );
   });
   test("shows license", () => {
-    expect(screen.getByText("License: Unknown").closest("a").href).toContain(
-      "/license"
+    expect(screen.getByText("Copyright: Unknown").closest("a").href).toContain(
+      "/copyright"
     );
   });
 });

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}
         />
         <LanguageDisplayText language={language} />
-        <LicenseLink rights={rights} />
+        <CopyrightLink rights={rights} />
       </CardContent>
       <CardActions display="flex" flexDir="column" whiteSpace="nowrap" gap={4}>
         <Ctas

src/components/CollectionItemCard/CopyrightLink.tsx

@@ -0,0 +1,13 @@
+import React from "react";
+import { Rights } from "~/src/types/DataModel";
+import Link from "~/src/components/Link/Link";
+
+const CopyrightLink: React.FC<{ rights: Rights }> = ({ rights }) => {
+  return (
+    <Link to="/copyright">
+      {rights ? `Copyright: ${rights.rightsStatement}` : "Copyright: Unknown"}
+    </Link>
+  );
+};
+
+export default CopyrightLink;

src/components/Copyright/Copyright.test.tsx

@@ -0,0 +1,77 @@
+import React from "react";
+import { render } from "~/src/__tests__/testUtils/render";
+import { screen } from "@testing-library/react";
+import Copyright from "./Copyright";
+
+it("renders Copyright page unchanged", async () => {
+  const tree = render(<Copyright />);
+  expect(tree.container.firstChild).toMatchSnapshot();
+});
+
+describe("Copyright Page", () => {
+  beforeEach(() => {
+    render(<Copyright />);
+  });
+
+  it("renders the Copyright Explanations heading", () => {
+    expect(
+      screen.getByRole("heading", { name: "Copyright Explanations" })
+    ).toBeInTheDocument();
+  });
+
+  it("renders the Public Domain headings", () => {
+    expect(
+      screen.getByRole("heading", { name: "Public Domain" })
+    ).toBeInTheDocument();
+    expect(
+      screen.getByRole("heading", { name: "Public Domain (US Only)" })
+    ).toBeInTheDocument();
+  });
+
+  it("renders the Creative Commons section", () => {
+    expect(
+      screen.getByRole("heading", { name: "Creative Commons Licenses" })
+    ).toBeInTheDocument();
+
+    expect(
+      screen.getByRole("link", { name: "Creative Commons licenses" })
+    ).toHaveAttribute("href", "https://creativecommons.org/");
+
+    expect(
+      screen.getByRole("link", { name: "Attribution 3.0 Unported (CC BY 3.0)" })
+    ).toHaveAttribute("href", "https://creativecommons.org/licenses/by/3.0/");
+  });
+
+  it("renders the CC0 section", () => {
+    expect(
+      screen.getByRole("heading", { name: "CC0 Public Domain Dedication" })
+    ).toBeInTheDocument();
+
+    expect(
+      screen.getByRole("link", {
+        name: "CC0 1.0 Universal (CC0 1.0) Public Domain Dedication",
+      })
+    ).toHaveAttribute(
+      "href",
+      "https://creativecommons.org/publicdomain/zero/1.0/"
+    );
+  });
+
+  it("renders the GNU section", () => {
+    expect(
+      screen.getByRole("heading", { name: "GNU General Public License" })
+    ).toBeInTheDocument();
+
+    expect(
+      screen.getByRole("link", {
+        name: "GNU General Public License",
+      })
+    ).toHaveAttribute("href", "http://www.gnu.org/licenses/gpl.html");
+  });
+
+  it("renders the In Copyright heading", () => {
+    expect(
+      screen.getByRole("heading", { name: "In Copyright" })
+    ).toBeInTheDocument();
+  });
+});

src/components/License/License.tsx → src/components/Copyright/Copyright.tsx

@@ -8,13 +8,13 @@ import {
 import Link from "../Link/Link";
 import DrbBreakout from "../DrbBreakout/DrbBreakout";
 
-const License: React.FC = () => {
+const Copyright: React.FC = () => {
   const breakoutElement = (
-    <DrbBreakout breadcrumbsData={[{ url: "/license", text: "License" }]} />
+    <DrbBreakout breadcrumbsData={[{ url: "/copyright", text: "Copyright" }]} />
   );
   const contentPrimaryElement = (
     <>
-      <Heading level="h1">License Explanations</Heading>
+      <Heading level="h1">Copyright Explanations</Heading>
       <Heading level="h2">Public Domain</Heading>
       <p>
         Works in the public domain have no copyright (in most cases because the
@@ -159,6 +159,13 @@ const License: React.FC = () => {
         , you may copy, distribute and modify the work as long as any
         modifications are also made available under the GPL.
       </p>
+      <Heading level="h2">In Copyright</Heading>
+      <p>
+        Works that are In Copyright are protected by copyright and/or related
+        rights. You are free to use this Item in any way that is permitted by
+        the copyright and related rights legislation that applies to your use.
+        For other uses you need to obtain permission from the rights-holder(s).
+      </p>
     </>
   );
   return (
@@ -169,4 +176,4 @@ const License: React.FC = () => {
   );
 };
 
-export default License;
+export default Copyright;