Upgrade dependencies and fix Type errors which are fixable

nulib · Mar 15, 2023 · 30ee21c · 30ee21c
1 parent d0e7783
commit 30ee21c
Show file tree

Hide file tree

Showing 11 changed files with 783 additions and 834 deletions.
diff --git a/components/Hero/Hero.tsx b/components/Hero/Hero.tsx
@@ -28,7 +28,6 @@ const Hero: React.FC<HeroProps> = ({ collection }) => {
         pagination={{
           clickable: true,
         }}
-        preloadImages={false}
         slidesPerView={1}
         speed={1000}
       >

diff --git a/components/Search/JumpTo.tsx b/components/Search/JumpTo.tsx
@@ -6,6 +6,7 @@ import React, {
   useRef,
   useState,
 } from "react";
+
 import { IconSearch } from "@/components/Shared/SVG/Icons";
 import SearchJumpToList from "@/components/Search/JumpToList";
 import Swiper from "swiper";
@@ -23,12 +24,11 @@ const SearchJumpTo: React.FC<SearchProps> = ({ isSearchActive }) => {
   const [showJumpTo, setShowJumpTo] = useState<boolean>(false);
 
   React.useEffect(() => {
-    // @ts-ignore
-    const handleMouseDown = (e) => {
+    const handleMouseDown = (e: MouseEvent) => {
       if (
         showJumpTo &&
         formRef.current &&
-        !formRef.current.contains(e.target)
+        !formRef.current.contains(e.target as Node)
       ) {
         setShowJumpTo(false);
       }

diff --git a/components/Search/JumpToList.tsx b/components/Search/JumpToList.tsx
@@ -110,10 +110,9 @@ const SearchJumpToList: React.FC<SearchJumpToListProps> = ({
               query: item.query,
             }}
             tabIndex={0}
-            data-testid={item.dataTestId}>
-
+            data-testid={item.dataTestId}
+          >
             {searchValue} <Helper label={item.helperLabel} />
-
           </Link>
         </JumpItem>
       ))}

diff --git a/components/SharedLink/SharedLink.test.tsx b/components/SharedLink/SharedLink.test.tsx
@@ -6,6 +6,7 @@ import type {
   WorkType,
 } from "@nulib/dcapi-types";
 import { render, screen } from "@/test-utils";
+
 import { Manifest } from "@iiif/presentation-3";
 import SharedLink from "./SharedLink";
 
@@ -207,7 +208,6 @@ const work: Work = {
   box_name: [],
 };
 
-// @ts-ignore
 const manifest = {
   "@context": "http://iiif.io/api/presentation/3/context.json",
   id: "https://dcapi.rdc-staging.library.northwestern.edu/api/v2/works/263625cc-6fd7-47ae-a725-394a483d28d2?as=iiif",
@@ -322,6 +322,7 @@ const manifest = {
       id: "https://dcapi.rdc-staging.library.northwestern.edu/api/v2/works/263625cc-6fd7-47ae-a725-394a483d28d2",
       type: "Dataset",
       format: "application/json",
+      // @ts-ignore
       label: {
         none: ["Northwestern University Libraries Digital Collections API"],
       },
@@ -371,8 +372,7 @@ const manifest = {
           width: 300,
           service: [
             {
-              "@id":
-                "https://iiif.stack.rdc-staging.library.northwestern.edu/iiif/2/7ad42e60-a8b6-444d-b4cf-f53f9c2756f6",
+              id: "https://iiif.stack.rdc-staging.library.northwestern.edu/iiif/2/7ad42e60-a8b6-444d-b4cf-f53f9c2756f6",
               "@type": "ImageService2",
               profile: "http://iiif.io/api/image/2/level2.json",
             },
@@ -398,8 +398,7 @@ const manifest = {
                 width: 6079,
                 service: [
                   {
-                    "@id":
-                      "https://iiif.stack.rdc-staging.library.northwestern.edu/iiif/2/7ad42e60-a8b6-444d-b4cf-f53f9c2756f6",
+                    id: "https://iiif.stack.rdc-staging.library.northwestern.edu/iiif/2/7ad42e60-a8b6-444d-b4cf-f53f9c2756f6",
                     "@type": "ImageService2",
                     profile: "http://iiif.io/api/image/2/level2.json",
                   },

diff --git a/components/Transition.tsx b/components/Transition.tsx
@@ -26,7 +26,7 @@ const Transition: React.FC<Props> = ({ children }) => {
 
   return (
     <div style={{ overflow: "hidden" }}>
-      <AnimatePresence initial={false} exitBeforeEnter>
+      <AnimatePresence initial={false} mode="wait">
         <motion.div
           key={asPath}
           variants={variants}

diff --git a/components/layout.tsx b/components/layout.tsx
@@ -1,6 +1,5 @@
 import "swiper/css";
 import "swiper/css/effect-fade";
-import "swiper/css/lazy";
 import "swiper/css/navigation";
 import "swiper/css/pagination";
 import Footer from "@/components/Footer/Footer";

diff --git a/lib/homepage-helpers.ts b/lib/homepage-helpers.ts
@@ -33,12 +33,13 @@ const getHomePageCollections = async (
       if (!work) return;
       worksUpdated.push({
         ...work,
-        // @ts-ignore
-        representative_file_set: {
-          ...work?.representative_file_set,
-          /** Format for nice UI display on the home page */
-          aspect_ratio: 1,
-        },
+        ...(work?.representative_file_set && {
+          representative_file_set: {
+            ...work?.representative_file_set,
+            /** Format for nice UI display on the home page */
+            aspect_ratio: 1,
+          },
+        }),
       });
     });
 

diff --git a/lib/json-ld.test.ts b/lib/json-ld.test.ts
@@ -79,7 +79,11 @@ describe("work structured data", () => {
     expect(obj.contributor).toEqual('"Roberts, James S."');
     expect(obj.dateCreated).toEqual("2021-03-16T15:52:00.377715Z");
     expect(obj.description).toBeUndefined();
-    expect(obj.genre![0]).toEqual("Ima Genre1");
+
+    if (obj.genre) {
+      expect(obj.genre[0]).toEqual("Ima Genre1");
+    }
+
     expect(obj.image).toEqual(
       "https://iiif.stack.rdc-staging.library.northwestern.edu/iiif/2/93d75ffe-20d8-48ea-9206-8db9114f2731"
     );

diff --git a/lib/queries/aggs.ts b/lib/queries/aggs.ts
@@ -1,5 +1,6 @@
 import { Aggs } from "@/types/api/request";
 import { FacetsInstance } from "@/types/components/facets";
+import { SortOrder } from "@elastic/elasticsearch/api/types";
 import { UrlFacets } from "@/types/context/filter-context";
 import { facetRegex } from "@/lib/utils/facet-helpers";
 
@@ -14,6 +15,7 @@ export const buildAggs = (
 ) => {
   const aggs: Aggs = {};
   let cleanFilterValue: string;
+  const desc = "desc" as SortOrder;
 
   /** Is user filtering using quotes for exact match? */
   const quoteCount = (facetFilterValue?.match(/"/g) || []).length;
@@ -41,21 +43,22 @@ export const buildAggs = (
       include: cleanFilterValue ? cleanFilterValue : undefined,
 
       order: {
-        _count: "desc",
+        _count: desc,
       },
       size: 20,
     };
 
     /**
      * Create a separate aggregation for user selected aggs (checkboxes)
      */
+
     if (userFacetsValues) {
       aggs.userFacets = {
         terms: {
           field: facet.field,
           include: userFacetsValues,
           order: {
-            _count: "desc",
+            _count: desc,
           },
           size: 20,
         },
@@ -66,7 +69,6 @@ export const buildAggs = (
      * Default agg values for the active Facet
      */
     aggs[facet.id] = {
-      // @ts-ignore
       terms,
     };
   });