Update linting

CRRU-UK · Oct 28, 2024 · 38575d5 · 38575d5
1 parent 290059e
commit 38575d5
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 14 deletions.
diff --git a/next.config.ts b/next.config.ts
@@ -8,6 +8,9 @@ const nextConfig: NextConfig = {
   experimental: {
     scrollRestoration: true
   },
+  sassOptions: {
+    silenceDeprecations: ['legacy-js-api'],
+  },
   images: {
     remotePatterns: [{
       protocol: 'https',

diff --git a/src/components/Toolbar/Toolbar.tsx b/src/components/Toolbar/Toolbar.tsx
@@ -43,7 +43,7 @@ const Toolbar = ({
 
     const timeout = setTimeout(getData, 500);
     return () => clearTimeout(timeout);
-  }, [search]);
+  }, [search, catalogue]);
 
   const handleSearchChange = (value: string) => setSearch(value);
 

diff --git a/src/helpers/rendering/embedded-entries.tsx b/src/helpers/rendering/embedded-entries.tsx
@@ -82,6 +82,7 @@ const renderModule = (data: Node['data']) => {
         <input type="hidden" name="cmd" value="_s-xclick" />
         <input type="hidden" name="hosted_button_id" value="68DD5VDPDK3TQ" />
         <input type="image" src="https://www.paypalobjects.com/WEBSCR-640-20110401-1/en_GB/i/btn/btn_subscribe_SM.gif" name="submit" alt="PayPal - The safer, easier way to pay online." />
+        {/* eslint-disable-next-line @next/next/no-img-element */}
         <img alt="" src="https://www.paypalobjects.com/WEBSCR-640-20110401-1/en_GB/i/scr/pixel.gif" width="1" height="1" />
       </form>
     );

diff --git a/src/pages/research/catalogues/index.tsx b/src/pages/research/catalogues/index.tsx
@@ -18,6 +18,29 @@ import { Card, Filters, Loading } from '@/components';
 
 import styles from './index.module.scss';
 
+interface updateURLProps {
+  catalogue: Catalogues,
+  page: number,
+  search: string,
+}
+
+const updateURL = ({
+  catalogue,
+  page,
+  search,
+}: updateURLProps) => {
+  let newURL: URL | string = new URL(location.toString());
+
+  newURL.searchParams.set('catalogue', catalogue);
+  newURL.searchParams.set('page', String(page));
+  if (search !== '') {
+    newURL.searchParams.set('search', search);
+  }
+
+  newURL = newURL.toString();
+  history.replaceState({ ...window.history.state, as: newURL, url: newURL }, '', newURL);
+};
+
 interface PageProps {
   pageData: PageData,
 }
@@ -66,6 +89,7 @@ const Page: NextPage<PageProps> = ({
       const result: CatalogueAPIResponse = await response.json();
       setSearchText(search);
       setData(result);
+      updateURL({ catalogue, page, search });
 
       setLoading(false);
     };
@@ -74,19 +98,6 @@ const Page: NextPage<PageProps> = ({
     return () => clearTimeout(timeout);
   }, [catalogue, page, search]);
 
-  useEffect(() => {
-    let newURL: URL | string = new URL(location.toString());
-
-    newURL.searchParams.set('catalogue', catalogue);
-    newURL.searchParams.set('page', String(page));
-    if (search !== '') {
-      newURL.searchParams.set('search', search);
-    }
-
-    newURL = newURL.toString();
-    history.replaceState({ ...window.history.state, as: newURL, url: newURL }, '', newURL);
-  }, [data]);
-
   const handleCatalogueChange = (value: Catalogues) => {
     setPage(1);
     setCatalogue(value);