From 1580290da098e1754b4ecaa21011f58a313896e1 Mon Sep 17 00:00:00 2001 From: Ken Date: Tue, 16 Jan 2024 16:19:21 +0100 Subject: [PATCH 1/7] =?UTF-8?q?:bug:=20Artikler=20uten=20riktig=20tema=20b?= =?UTF-8?q?le=20vist=20p=C3=A5=20forside?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- aksel.nav.no/website/pages/index.tsx | 56 ++++++++++++++++++++-------- 1 file changed, 41 insertions(+), 15 deletions(-) diff --git a/aksel.nav.no/website/pages/index.tsx b/aksel.nav.no/website/pages/index.tsx index 26269f81e2..5710634cfb 100644 --- a/aksel.nav.no/website/pages/index.tsx +++ b/aksel.nav.no/website/pages/index.tsx @@ -68,19 +68,34 @@ const query = `*[_type == "aksel_forside"][0]{ seo, ${contributorsAll} }, - "artikler": *[_type == "aksel_artikkel" && defined(publishedAt) && !(_id in ^.highlights[]._ref)] | order(publishedAt desc)[0...4]{ - _type, - _id, - heading, - _createdAt, - _updatedAt, - publishedAt, - "slug": slug.current, - "tema": tema[]->title, - ingress, - seo, - ${contributorsAll} - }, + "artikler": select( + $preview == "true" => *[_type == "aksel_artikkel" && defined(publishedAt) && !(_id in ^.highlights[]._ref)] | order(publishedAt desc)[0...4]{ + _type, + _id, + heading, + _createdAt, + _updatedAt, + publishedAt, + "slug": slug.current, + "tema": tema[]->title, + ingress, + seo, + ${contributorsAll} + }, + $preview != "true" => *[_type == "aksel_artikkel" && defined(publishedAt) && !(_id in ^.highlights[]._ref) && count(*[references(^._id)]) > 0] | order(publishedAt desc)[0...4]{ + _type, + _id, + heading, + _createdAt, + _updatedAt, + publishedAt, + "slug": slug.current, + "tema": tema[]->title, + ingress, + seo, + ${contributorsAll} + } + ), "komponenter": *[_type in ["komponent_artikkel", "ds_artikkel", "templates_artikkel"] && defined(publishedAt) && !(_id in ^.highlights[]._ref)] | order(publishedAt desc)[0...3]{ _type, _id, @@ -106,7 +121,13 @@ export const getStaticProps: GetStaticProps = async ({ }): Promise => { const client = getClient(); - const { page = null, tema = null, blocks = null } = await client.fetch(query); + const { + page = null, + tema = null, + blocks = null, + } = await client.fetch(query, { + preview: "false", + }); const validateTema = tema .filter( @@ -284,7 +305,12 @@ const PagePreview = (props: PageProps["props"]) => { if (props?.preview) { return ( }> - + ); } From 1177b36f481a796d2f40ff45ac79788952efa402 Mon Sep 17 00:00:00 2001 From: Ken <26967723+KenAJoh@users.noreply.github.com> Date: Wed, 17 Jan 2024 11:13:00 +0100 Subject: [PATCH 2/7] :bug: HelpText-state ble ikke riktig oppdatert ved klikk (#2643) --- .changeset/rare-comics-draw.md | 5 +++ @navikt/core/react/src/help-text/HelpText.tsx | 2 +- yarn.lock | 34 +++++++++---------- 3 files changed, 23 insertions(+), 18 deletions(-) create mode 100644 .changeset/rare-comics-draw.md diff --git a/.changeset/rare-comics-draw.md b/.changeset/rare-comics-draw.md new file mode 100644 index 0000000000..77445fa700 --- /dev/null +++ b/.changeset/rare-comics-draw.md @@ -0,0 +1,5 @@ +--- +"@navikt/ds-react": patch +--- + +HelpText: HelpText-state ble ikke riktig oppdatert ved klikk diff --git a/@navikt/core/react/src/help-text/HelpText.tsx b/@navikt/core/react/src/help-text/HelpText.tsx index fe55c09ced..530a9ac446 100644 --- a/@navikt/core/react/src/help-text/HelpText.tsx +++ b/@navikt/core/react/src/help-text/HelpText.tsx @@ -57,7 +57,7 @@ export const HelpText = forwardRef(