Skip to content

Commit ab3f408

Browse files
committed
remove lang prop from crisiBannerHSL
1 parent b85aaf4 commit ab3f408

3 files changed

Lines changed: 12 additions & 8 deletions

File tree

app/component/AppBarContainer.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ const AppBarContainer = (
2828
</a>
2929
{style === 'hsl' ? (
3030
<div className="hsl-header-container" style={{ display: 'block' }}>
31-
<CrisisBannerHsl lang={lang} />
31+
<CrisisBannerHsl />
3232
<AppBarHsl user={user} lang={lang} favourites={favourites} />
3333
<MessageBar breakpoint={breakpoint} />
3434
</div>

app/component/CrisisBannerHsl.js

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,16 @@
11
import React, { useState, useEffect } from 'react';
22
import PropTypes from 'prop-types';
3+
import { useIntl } from 'react-intl';
34
import { classList } from '@hsl-fi/utilities';
45
import { Alert } from '@hsl-fi/icons';
56
import { CrisisPriority } from '@hsl-fi/content-delivery-api-types';
67
import { useConfigContext } from '../configurations/ConfigContext';
78
import { getJson } from '../util/xhrPromise';
89
import './crisis-banner-hsl.scss';
910

10-
const CrisisBannerHsl = ({ lang = 'fi', initialBanners = null }) => {
11+
const CrisisBannerHsl = ({ initialBanners = null }) => {
1112
const config = useConfigContext();
13+
const { locale } = useIntl();
1214
const [banners, setBanners] = useState(() => {
1315
if (initialBanners) {
1416
return initialBanners;
@@ -27,10 +29,10 @@ const CrisisBannerHsl = ({ lang = 'fi', initialBanners = null }) => {
2729
) {
2830
return;
2931
}
30-
getJson(`${config.URL.BANNERS}&language=${lang}`)
32+
getJson(`${config.URL.BANNERS}&language=${locale}`)
3133
.then(data => setBanners(data))
3234
.catch(() => setBanners([]));
33-
}, [lang]);
35+
}, []);
3436

3537
if (!banners.length) {
3638
return null;
@@ -62,7 +64,6 @@ const CrisisBannerHsl = ({ lang = 'fi', initialBanners = null }) => {
6264
};
6365

6466
CrisisBannerHsl.propTypes = {
65-
lang: PropTypes.string,
6667
initialBanners: PropTypes.arrayOf(
6768
PropTypes.shape({
6869
body: PropTypes.string,

test/unit/CrisisBannerHsl.test.js

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import React from 'react';
22
import { render } from '@testing-library/react';
3+
import { IntlProvider } from 'react-intl';
34
import { expect } from 'chai';
45
import { describe, it } from 'mocha';
56

@@ -16,9 +17,11 @@ const baseConfig = {
1617

1718
const renderWithBanners = (banners = []) => {
1819
const { container } = render(
19-
<ConfigProvider value={baseConfig}>
20-
<CrisisBannerHsl lang="fi" initialBanners={banners} />
21-
</ConfigProvider>,
20+
<IntlProvider locale="fi" messages={{}}>
21+
<ConfigProvider value={baseConfig}>
22+
<CrisisBannerHsl initialBanners={banners} />
23+
</ConfigProvider>
24+
</IntlProvider>,
2225
);
2326
return container;
2427
};

0 commit comments

Comments
 (0)