🏷️ simplified innholdstype

navikt · Dec 9, 2023 · b9755a5 · b9755a5
1 parent 02042b8
commit b9755a5
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 18 deletions.
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
@@ -15,6 +15,12 @@ export type GpTemaT = {
   undertema: { title: string; description: string }[];
 };
 
+export type GpInnholdstypeT = {
+  title: string;
+  description?: string;
+  hasRefs: boolean;
+};
+
 export type HeroNavT = {
   heroNav: {
     title: string;
@@ -23,14 +29,6 @@ export type HeroNavT = {
   }[];
 };
 
-export type GpInnholdstypeT = {
-  innholdstype: {
-    title: string;
-    description?: string;
-    hasRefs: boolean;
-  }[];
-};
-
 export type GpChipsInnholdstypeRawT = {
   chipsInnholdstype: {
     title: string;
@@ -78,8 +76,9 @@ export type GpGroupedArticlesInputT = {
   }[];
 };
 
-export type GpEntryPageProps = HeroNavT &
-  GpInnholdstypeT & { articles: GpArticleT[] } & {
-    tema: GpTemaT | null;
-  } & GpChipsInnholdstypeT &
+export type GpEntryPageProps = HeroNavT & {
+  innholdstype: GpInnholdstypeT[];
+} & { articles: GpArticleT[] } & {
+  tema: GpTemaT | null;
+} & GpChipsInnholdstypeT &
   GpChipsUndertemaT & { initialArticles: GpGroupedArticlesT };
diff --git a/aksel.nav.no/website/pages/gp/[slug].tsx b/aksel.nav.no/website/pages/gp/[slug].tsx
@@ -70,9 +70,11 @@ export const getStaticProps: GetStaticProps = async ({
     chipsUndertema,
     initialInnholdstype,
     initialUndertema,
-  }: HeroNavT & { tema: GpTemaT | null } & GpInnholdstypeT & {
-      articles: GpArticleT[];
-    } & GpChipsInnholdstypeRawT &
+  }: HeroNavT & { tema: GpTemaT | null } & {
+    innholdstype: GpInnholdstypeT[];
+  } & {
+    articles: GpArticleT[];
+  } & GpChipsInnholdstypeRawT &
     GpChipsUndertemaRawT &
     GpGroupedArticlesInputT = await getClient().fetch(query, {
     slug,

diff --git a/aksel.nav.no/website/pages/gp/index.tsx b/aksel.nav.no/website/pages/gp/index.tsx
@@ -60,9 +60,9 @@ export const getStaticProps: GetStaticProps = async ({
     innholdstype,
     chipsInnholdstype,
     initialInnholdstype,
-  }: { articles: GpArticleT[] } & HeroNavT &
-    GpInnholdstypeT &
-    GpChipsInnholdstypeRawT & {
+  }: { articles: GpArticleT[] } & HeroNavT & {
+      innholdstype: GpInnholdstypeT[];
+    } & GpChipsInnholdstypeRawT & {
       initialInnholdstype: GpGroupedArticlesInputT["initialInnholdstype"];
     } = await getClient().fetch(query);