Remove janzz occupation suggestions

navikt · Sep 24, 2024 · ac7c342 · ac7c342
1 parent 1fe4377
commit ac7c342
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 57 deletions.
diff --git a/src/app/(sok)/_components/searchBox/SearchCombobox.jsx b/src/app/(sok)/_components/searchBox/SearchCombobox.jsx
@@ -12,23 +12,13 @@ import {
     PUBLISHED,
     SEARCH_STRING,
 } from "@/app/(sok)/_components/searchParamNames";
-import { FetchAction, useFetchReducer } from "@/app/_common/hooks/useFetchReducer";
-import * as actions from "@/app/_common/actions";
 import { findLabelForFilter, getSearchBoxOptions } from "@/app/(sok)/_components/searchBox/buildSearchBoxOptions";
 import logAmplitudeEvent, { logFilterChanged } from "@/app/_common/monitoring/amplitude";
 
-let suggestionsCache = [];
-const CACHE_MAX_SIZE = 50;
-const MINIMUM_LENGTH = 1;
-
 function SearchCombobox({ aggregations, locations }) {
     const searchQuery = useSearchQuery();
-    const [suggestionsResponse, suggestionsDispatch] = useFetchReducer([]);
 
-    const options = useMemo(
-        () => getSearchBoxOptions(aggregations, locations, [...suggestionsResponse.data]),
-        [aggregations, locations, suggestionsResponse.data],
-    );
+    const options = useMemo(() => getSearchBoxOptions(aggregations, locations), [aggregations, locations]);
 
     const selectedOptions = useMemo(
         () => buildSelectedOptions(searchQuery.urlSearchParams),
@@ -42,30 +32,6 @@ function SearchCombobox({ aggregations, locations }) {
             : { label: o.label, value: o.value };
     });
 
-    async function fetchSuggestions(value) {
-        const cached = suggestionsCache.find((c) => c.value === value);
-        if (cached) {
-            suggestionsDispatch({ type: FetchAction.RESOLVE, data: cached.data });
-            return;
-        }
-        let data;
-        try {
-            data = await actions.getSuggestions(value, MINIMUM_LENGTH);
-        } catch (err) {
-            // ignore fetch failed errors
-        }
-        if (data) {
-            suggestionsCache = [{ value, data }, ...suggestionsCache].slice(0, CACHE_MAX_SIZE);
-            suggestionsDispatch({ type: FetchAction.RESOLVE, data });
-        }
-    }
-
-    function handleValueChange(value) {
-        if (value && value.length >= MINIMUM_LENGTH) {
-            fetchSuggestions(value);
-        }
-    }
-
     const handleFreeTextSearchOption = (value, isSelected) => {
         if (isSelected) {
             searchQuery.append(SEARCH_STRING, value);
@@ -173,7 +139,6 @@ function SearchCombobox({ aggregations, locations }) {
             onToggleSelected={onToggleSelected}
             selectedOptions={selectedOptions}
             options={optionList}
-            onChange={handleValueChange}
         />
     );
 }

diff --git a/src/app/(sok)/_components/searchBox/buildSearchBoxOptions.ts b/src/app/(sok)/_components/searchBox/buildSearchBoxOptions.ts
@@ -17,7 +17,6 @@ import {
     INTERNATIONAL,
     MUNICIPAL,
     NEED_DRIVERS_LICENSE,
-    OCCUPATION,
     OCCUPATION_FIRST_LEVEL,
     OCCUPATION_SECOND_LEVEL,
     PUBLISHED,
@@ -28,7 +27,6 @@ import {
 import { PublishedLabels } from "@/app/(sok)/_utils/publishedLabels";
 
 const promotedOptions: ComboboxOption[] = [
-    { label: "Butikkmedarbeider", value: `${OCCUPATION}-Butikkmedarbeider` },
     { label: "Deltid", value: `${EXTENT}-Deltid` },
     { label: labelForEducation("Ingen krav"), value: `${EDUCATION}-Ingen krav` },
     { label: labelForExperience("Ingen"), value: `${EXPERIENCE}-Ingen` },
@@ -199,17 +197,6 @@ function getRemoteOptions(aggregations: Aggregations): ComboboxOption[] {
     );
 }
 
-function getOccupationSuggestionOptions(allSuggestions: string[]): ComboboxOption[] {
-    return allSuggestions
-        .map(
-            (suggestion): ComboboxOption => ({
-                label: suggestion,
-                value: `${OCCUPATION}-${suggestion}`,
-            }),
-        )
-        .filter((option) => !promotedValues.includes(option.value));
-}
-
 function getDriversLicenseOptions(aggregations: Aggregations): ComboboxOption[] {
     return aggregations.needDriversLicense
         .map(
@@ -238,11 +225,7 @@ function getExperienceOptions(aggregations: Aggregations): ComboboxOption[] {
         .filter((option) => !promotedValues.includes(option.value));
 }
 
-export function getSearchBoxOptions(
-    aggregations: Aggregations,
-    locations: LocationList[],
-    allSuggestions: string[],
-): ComboboxOption[] {
+export function getSearchBoxOptions(aggregations: Aggregations, locations: LocationList[]): ComboboxOption[] {
     const locationList = buildLocations(aggregations, locations);
 
     return [
@@ -261,7 +244,6 @@ export function getSearchBoxOptions(
         ...getRemoteOptions(aggregations),
         ...getDriversLicenseOptions(aggregations),
         ...getExperienceOptions(aggregations),
-        ...getOccupationSuggestionOptions(allSuggestions),
     ];
 }
 
@@ -277,8 +259,6 @@ export const findLabelForFilter = (value: string): string => {
             return "(Kategori)";
         case OCCUPATION_SECOND_LEVEL:
             return "(Kategori)";
-        case OCCUPATION:
-            return "(Yrke)";
         case SECTOR:
             return "(Sektor)";
         case ENGAGEMENT_TYPE: