Går mot det nye søket

Author: bjornhun

.env

@@ -1,5 +1,6 @@
 ENV=localhost
 XP_BASE_URL=https://www.nav.no
+SEARCH_URL=https://navno-search-api.intern.nav.no
 APP_BASE_URL=http://localhost:8088
 APP_BASE_PATH=/dekoratoren
 API_XP_SERVICES_URL=https://www.nav.no/_/service

.nais/vars/dev-stable.yaml

@@ -10,6 +10,8 @@ env:
     value: dev
   - name: XP_BASE_URL
     value: https://www.ekstern.dev.nav.no
+  - name: SEARCH_URL
+    value: https://navno-search-api.intern.dev.nav.no
   - name: APP_BASE_URL
     value: https://dekoratoren.ekstern.dev.nav.no
   - name: API_XP_SERVICES_URL

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

@@ -13,6 +13,8 @@ import SokResultater from './sok-innhold/SokResultater';
 import { Environment } from 'store/reducers/environment-duck';
 import Cookies from 'js-cookie';
 import 'komponenter/header/header-regular/common/sok/Sok.scss';
+import { useCookies } from 'react-cookie';
+import { decoratorContextCookie, decoratorLanguageCookie } from '../../../Header';
 
 interface Props {
     id: string;
@@ -37,12 +39,16 @@ const Sok = (props: Props) => {
     const [loading, setLoading] = useState<boolean>(false);
     const [result, setResult] = useState<Sokeresultat | undefined>();
     const [error, setError] = useState<string | undefined>();
+    const [cookies] = useCookies();
     const { searchInput, setSearchInput } = props;
     const numberOfResults = 5;
     const klassenavn = cls('sok-input', {
         engelsk: language === Locale.ENGELSK,
     });
 
+    const audience = cookies[decoratorContextCookie];
+    const preferredLanguage = cookies[decoratorLanguageCookie];
+
     useEffect(() => {
         if (!props.isOpen) {
             clearInput();
@@ -67,7 +73,7 @@ const Sok = (props: Props) => {
 
     const getSearchUrl = () => {
         const { XP_BASE_URL } = environment;
-        const url = `${XP_BASE_URL}/sok?ord=${searchInput}`;
+        const url = `${XP_BASE_URL}/nytt-sok?ord=${searchInput}`;
         return genererUrl(XP_BASE_URL, url);
     };
 
@@ -99,6 +105,8 @@ const Sok = (props: Props) => {
                                 setLoading(true);
                                 fetchSearchDebounced({
                                     value,
+                                    audience,
+                                    preferredLanguage,
                                     environment,
                                     setLoading,
                                     setError,
@@ -137,14 +145,16 @@ const Sok = (props: Props) => {
 /* Abstraction for debounce */
 interface FetchResult {
     value: string;
+    audience: string;
+    preferredLanguage: string;
     environment: Environment;
     setLoading: (value: boolean) => void;
     setError: (value?: string) => void;
     setResult: (value?: any) => void;
 }
 
 const fetchSearch = (props: FetchResult) => {
-    const { environment, value } = props;
+    const { environment, value, audience, preferredLanguage } = props;
     const { setLoading, setError, setResult } = props;
     const { APP_URL } = environment;
     const url = `${APP_URL}/api/sok`;
@@ -157,7 +167,7 @@ const fetchSearch = (props: FetchResult) => {
         label: value,
         action: 'søk-dynamisk',
     });
-    fetch(`${url}?ord=${encodeURIComponent(value)}`)
+    fetch(`${url}?ord=${encodeURIComponent(value)}&audience=${audience}&preferredLanguage=${preferredLanguage}`)
         .then((response) => {
             if (response.ok) {
                 return response;

src/server/api-handlers/sok.ts

@@ -1,6 +1,6 @@
 import { RequestHandler } from 'express';
 
-const sokServiceUrl = `${process.env.API_XP_SERVICES_URL}/navno.nav.no.search/search2/sok`;
+const sokServiceUrl = `${process.env.SEARCH_URL}/content/decorator-search`;
 
 export const getSokHandler: RequestHandler = (req, res) => {
     const queryString = new URL(req.url, process.env.APP_BASE_URL).search;

src/server/utils.ts

@@ -28,6 +28,7 @@ export const clientEnv = ({ req }: Props): Environment => {
     return {
         ENV: process.env.ENV as string,
         XP_BASE_URL: process.env.XP_BASE_URL as string,
+        SEARCH_URL: process.env.SEARCH_URL as string,
         APP_URL: appUrl as string,
         APP_BASE_URL: process.env.APP_BASE_URL as string,
         APP_BASE_PATH: process.env.APP_BASE_PATH as string,

src/store/reducers/environment-duck.ts

@@ -6,6 +6,7 @@ import { Breadcrumb } from 'komponenter/header/common/brodsmulesti/Brodsmulesti'
 export interface Environment {
     ENV: string;
     XP_BASE_URL: string;
+    SEARCH_URL: string;
     APP_URL: string;
     APP_BASE_URL: string;
     APP_BASE_PATH: string;
@@ -57,6 +58,7 @@ export interface Cookies {
 export const initialState: Environment = {
     ENV: '',
     XP_BASE_URL: '',
+    SEARCH_URL: '',
     APP_URL: '',
     APP_BASE_URL: '',
     APP_BASE_PATH: '',