🎨 Only current undertema is shown

navikt · Dec 13, 2023 · 491f0f9 · 491f0f9
1 parent 4f23ea9
commit 491f0f9
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 8 deletions.
diff --git a/aksel.nav.no/website/components/layout/god-praksis-page/articles/ArticleCard.tsx b/aksel.nav.no/website/components/layout/god-praksis-page/articles/ArticleCard.tsx
@@ -32,7 +32,7 @@ export const ArticleCard = ({
   group,
   delay,
   innholdstype,
-  undertema,
+  currentUndertema,
 }: GpArticleT & {
   group: "initial" | "lazy";
   delay?: number;
@@ -80,10 +80,12 @@ export const ArticleCard = ({
         </div>
         <div className="flex gap-2 justify-between items-center mt-6">
           <div className="flex gap-3 flex-wrap items-center font-semibold">
-            <span className="text-deepblue-500 flex gap-05 items-center">
-              <TagFillIcon aria-hidden />
-              <span>{undertema}</span>
-            </span>
+            {currentUndertema && (
+              <span className="text-deepblue-500 flex gap-05 items-center">
+                <TagFillIcon aria-hidden />
+                <span>{currentUndertema}</span>
+              </span>
+            )}
             <span className="text-teal-700 flex gap-05 items-center">
               <FileFillIcon aria-hidden />
               <span>{innholdstype}</span>

diff --git a/aksel.nav.no/website/components/layout/god-praksis-page/types.ts b/aksel.nav.no/website/components/layout/god-praksis-page/types.ts
@@ -3,6 +3,7 @@ export type GpArticleT = {
   heading: string;
   ingress: string;
   undertema: string[];
+  currentUndertema: string;
   slug: string;
   innholdstype: string | null;
   publishedAt: string | null;

diff --git a/aksel.nav.no/website/components/layout/god-praksis-page/useInitialState.ts b/aksel.nav.no/website/components/layout/god-praksis-page/useInitialState.ts
@@ -20,9 +20,10 @@ function useInitialState(articles: GpGroupedArticlesT): {
   const { isReady } = useRouter();
 
   const initialData = isReady
-    ? getArticleList(articles, innholdstypeQuery, undertemaQuery).map(
-        (x) => x.article
-      )
+    ? getArticleList(articles, innholdstypeQuery, undertemaQuery).map((x) => ({
+        ...x.article,
+        currentUndertema: x.undertema,
+      }))
     : [];
 
   return {