Merge pull request #852 from navikt/feature/under-18-filter

Legger til filter for Passer for deg under 18 år i venstremeny.
navikt · Nov 1, 2024 · 607ff80 · 607ff80
2 parents 9c61fa3 + c16adb7
commit 607ff80
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 2 deletions.
diff --git a/src/app/(sok)/_components/filters/FiltersDesktop.tsx b/src/app/(sok)/_components/filters/FiltersDesktop.tsx
@@ -17,6 +17,8 @@ import Extent from "./Extent";
 import Sector from "./Sector";
 import EngagementType from "./Engagement";
 import WorkLanguage from "./WorkLanguage";
+import Under18 from "@/app/(sok)/_components/filters/Under18";
+import useIsDebug from "@/app/(sok)/_components/IsDebugProvider";
 
 interface FiltersDesktopProps {
     aggregations: FilterAggregations;
@@ -33,6 +35,8 @@ export default function FiltersDesktop({
     searchResult,
     errors,
 }: FiltersDesktopProps): ReactElement {
+    const { isDebug } = useIsDebug();
+
     return (
         <div>
             <Accordion indent={false} headingSize="small">
@@ -62,6 +66,12 @@ export default function FiltersDesktop({
                     <Alert variant="info" className="mb-6">
                         <NewFiltersMessage />
                     </Alert>
+                    {isDebug && (
+                        <Under18
+                            initialValues={aggregations.under18}
+                            updatedValues={searchResult.aggregations.under18}
+                        />
+                    )}
                     <Education
                         initialValues={aggregations.education}
                         updatedValues={searchResult.aggregations.education}

diff --git a/src/app/(sok)/_components/filters/FiltersMobile.jsx b/src/app/(sok)/_components/filters/FiltersMobile.jsx
@@ -15,10 +15,13 @@ import Extent from "./Extent";
 import Sector from "./Sector";
 import EngagementType from "./Engagement";
 import WorkLanguage from "./WorkLanguage";
+import useIsDebug from "@/app/(sok)/_components/IsDebugProvider";
+import Under18 from "@/app/(sok)/_components/filters/Under18";
 
 function FiltersMobile({ onCloseClick, searchResult, aggregations, locations, postcodes, errors }) {
     const [selectedFilter, setSelectedFilter] = useState("");
     const headingRef = useRef();
+    const { isDebug } = useIsDebug();
 
     const changeView = () => {
         if (selectedFilter !== "") {
@@ -114,6 +117,12 @@ function FiltersMobile({ onCloseClick, searchResult, aggregations, locations, po
                             <Alert variant="info" className="mb-4">
                                 <NewFiltersMessage />
                             </Alert>
+                            {isDebug && (
+                                <Under18
+                                    initialValues={aggregations.under18}
+                                    updatedValues={searchResult.aggregations.under18}
+                                />
+                            )}
                             <Education
                                 initialValues={aggregations.education}
                                 updatedValues={searchResult.aggregations.education}

diff --git a/src/app/App.tsx b/src/app/App.tsx
@@ -7,7 +7,6 @@ import { getSessionId } from "@/app/_common/monitoring/session";
 import { AuthenticationContext, AuthenticationStatus } from "./_common/auth/contexts/AuthenticationProvider";
 import { initAmplitude } from "./_common/monitoring/amplitude";
 import googleTranslateWorkaround from "./_common/utils/googleTranslateWorkaround";
-import Axe from "./Axe";
 
 // Todo: Gå igjennom alle fetch-kall i koden og se om referrer er satt riktig. Nå er den satt referrer: CONTEXT_PATH, men ikke sikker på hva som er rett her.
 
@@ -43,7 +42,6 @@ function App({ children, amplitudeToken }: AppProps) {
         <div id="app">
             <SkipLink href="#main-content" />
             <div className="arb-push-footer-down">
-                <Axe />
                 <Header
                     variant="person"
                     active="ledige-stillinger"