Skip to content

Commit 38575d5

Browse files
committed
Update linting
1 parent 290059e commit 38575d5

File tree

4 files changed

+29
-14
lines changed

4 files changed

+29
-14
lines changed

next.config.ts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,9 @@ const nextConfig: NextConfig = {
88
experimental: {
99
scrollRestoration: true
1010
},
11+
sassOptions: {
12+
silenceDeprecations: ['legacy-js-api'],
13+
},
1114
images: {
1215
remotePatterns: [{
1316
protocol: 'https',

src/components/Toolbar/Toolbar.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ const Toolbar = ({
4343

4444
const timeout = setTimeout(getData, 500);
4545
return () => clearTimeout(timeout);
46-
}, [search]);
46+
}, [search, catalogue]);
4747

4848
const handleSearchChange = (value: string) => setSearch(value);
4949

src/helpers/rendering/embedded-entries.tsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,7 @@ const renderModule = (data: Node['data']) => {
8282
<input type="hidden" name="cmd" value="_s-xclick" />
8383
<input type="hidden" name="hosted_button_id" value="68DD5VDPDK3TQ" />
8484
<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." />
85+
{/* eslint-disable-next-line @next/next/no-img-element */}
8586
<img alt="" src="https://www.paypalobjects.com/WEBSCR-640-20110401-1/en_GB/i/scr/pixel.gif" width="1" height="1" />
8687
</form>
8788
);

src/pages/research/catalogues/index.tsx

Lines changed: 24 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,29 @@ import { Card, Filters, Loading } from '@/components';
1818

1919
import styles from './index.module.scss';
2020

21+
interface updateURLProps {
22+
catalogue: Catalogues,
23+
page: number,
24+
search: string,
25+
}
26+
27+
const updateURL = ({
28+
catalogue,
29+
page,
30+
search,
31+
}: updateURLProps) => {
32+
let newURL: URL | string = new URL(location.toString());
33+
34+
newURL.searchParams.set('catalogue', catalogue);
35+
newURL.searchParams.set('page', String(page));
36+
if (search !== '') {
37+
newURL.searchParams.set('search', search);
38+
}
39+
40+
newURL = newURL.toString();
41+
history.replaceState({ ...window.history.state, as: newURL, url: newURL }, '', newURL);
42+
};
43+
2144
interface PageProps {
2245
pageData: PageData,
2346
}
@@ -66,6 +89,7 @@ const Page: NextPage<PageProps> = ({
6689
const result: CatalogueAPIResponse = await response.json();
6790
setSearchText(search);
6891
setData(result);
92+
updateURL({ catalogue, page, search });
6993

7094
setLoading(false);
7195
};
@@ -74,19 +98,6 @@ const Page: NextPage<PageProps> = ({
7498
return () => clearTimeout(timeout);
7599
}, [catalogue, page, search]);
76100

77-
useEffect(() => {
78-
let newURL: URL | string = new URL(location.toString());
79-
80-
newURL.searchParams.set('catalogue', catalogue);
81-
newURL.searchParams.set('page', String(page));
82-
if (search !== '') {
83-
newURL.searchParams.set('search', search);
84-
}
85-
86-
newURL = newURL.toString();
87-
history.replaceState({ ...window.history.state, as: newURL, url: newURL }, '', newURL);
88-
}, [data]);
89-
90101
const handleCatalogueChange = (value: Catalogues) => {
91102
setPage(1);
92103
setCatalogue(value);

0 commit comments

Comments
 (0)