Skip to content
This repository was archived by the owner on Sep 18, 2024. It is now read-only.

Commit ec84d82

Browse files
committed
Bruker redux-variabler i stedet for cookie-verdier
1 parent 0ea2a7f commit ec84d82

File tree

1 file changed

+6
-11
lines changed
  • src/komponenter/header/header-regular/common/sok

1 file changed

+6
-11
lines changed

src/komponenter/header/header-regular/common/sok/Sok.tsx

+6-11
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,6 @@ import SokResultater from './sok-innhold/SokResultater';
1313
import { Environment } from 'store/reducers/environment-duck';
1414
import Cookies from 'js-cookie';
1515
import 'komponenter/header/header-regular/common/sok/Sok.scss';
16-
import { useCookies } from 'react-cookie';
17-
import { decoratorContextCookie, decoratorLanguageCookie } from '../../../Header';
1816

1917
interface Props {
2018
id: string;
@@ -30,26 +28,23 @@ const MAX_HITS_TO_DISPLAY = 5;
3028
const stateSelector = (state: AppState) => ({
3129
environment: state.environment,
3230
language: state.language.language,
31+
audience: state.arbeidsflate.status,
3332
});
3433

3534
const setSubmitTrackerCookie = () => {
3635
Cookies.set('nav-search-use', Date.now().toString(), { expires: 30, domain: '.nav.no' });
3736
};
3837

3938
const Sok = (props: Props) => {
40-
const { environment, language } = useSelector(stateSelector);
39+
const { environment, language, audience } = useSelector(stateSelector);
4140
const [loading, setLoading] = useState<boolean>(false);
4241
const [result, setResult] = useState<Sokeresultat | undefined>();
4342
const [error, setError] = useState<string | undefined>();
44-
const [cookies] = useCookies();
4543
const { searchInput, setSearchInput, searchHitsCallback } = props;
4644
const klassenavn = cls('sok-input', {
4745
engelsk: language === Locale.ENGELSK,
4846
});
4947

50-
const audience = cookies[decoratorContextCookie];
51-
const preferredLanguage = cookies[decoratorLanguageCookie];
52-
5348
useEffect(() => {
5449
if (!props.isOpen) {
5550
clearInput();
@@ -113,7 +108,7 @@ const Sok = (props: Props) => {
113108
fetchSearchDebounced({
114109
value,
115110
audience,
116-
preferredLanguage,
111+
language,
117112
environment,
118113
setLoading,
119114
setError,
@@ -154,15 +149,15 @@ const Sok = (props: Props) => {
154149
interface FetchResult {
155150
value: string;
156151
audience: string;
157-
preferredLanguage: string;
152+
language: Locale;
158153
environment: Environment;
159154
setLoading: (value: boolean) => void;
160155
setError: (value?: string) => void;
161156
setResult: (value?: any) => void;
162157
}
163158

164159
const fetchSearch = (props: FetchResult) => {
165-
const { environment, value, audience, preferredLanguage } = props;
160+
const { environment, value, audience, language } = props;
166161
const { setLoading, setError, setResult } = props;
167162
const { APP_URL } = environment;
168163
const url = `${APP_URL}/api/sok`;
@@ -184,7 +179,7 @@ const fetchSearch = (props: FetchResult) => {
184179

185180
const facet = validAudiences[audience] || '0';
186181

187-
fetch(`${url}?ord=${encodeURIComponent(value)}&f=${facet}&preferredLanguage=${preferredLanguage}`)
182+
fetch(`${url}?ord=${encodeURIComponent(value)}&f=${facet}&preferredLanguage=${language}`)
188183
.then((response) => {
189184
if (response.ok) {
190185
return response;

0 commit comments

Comments
 (0)