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 1/6] :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<HTMLButtonElement, HelpTextProps>(
         <button
           {...rest}
           ref={mergedRef}
-          onClick={composeEventHandlers(onClick, () => setOpen((x) => x))}
+          onClick={composeEventHandlers(onClick, () => setOpen((x) => !x))}
           className={cl(className, "navds-help-text__button")}
           type="button"
           aria-expanded={open}
diff --git a/yarn.lock b/yarn.lock
index 47b6a0fdb0..450eff5146 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3462,7 +3462,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@navikt/aksel-icons@^5.14.0, @navikt/aksel-icons@workspace:@navikt/aksel-icons":
+"@navikt/aksel-icons@^5.15.0, @navikt/aksel-icons@workspace:@navikt/aksel-icons":
   version: 0.0.0-use.local
   resolution: "@navikt/aksel-icons@workspace:@navikt/aksel-icons"
   dependencies:
@@ -3489,8 +3489,8 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@navikt/aksel-stylelint@workspace:@navikt/aksel-stylelint"
   dependencies:
-    "@navikt/ds-css": ^5.14.0
-    "@navikt/ds-tokens": ^5.14.0
+    "@navikt/ds-css": ^5.15.0
+    "@navikt/ds-tokens": ^5.15.0
     "@types/jest": ^29.0.0
     concurrently: 7.2.1
     copyfiles: 2.4.1
@@ -3508,7 +3508,7 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@navikt/aksel@workspace:@navikt/aksel"
   dependencies:
-    "@navikt/ds-css": 5.14.0
+    "@navikt/ds-css": 5.15.0
     "@types/inquirer": ^9.0.3
     "@types/jest": ^29.0.0
     axios: 1.6.0
@@ -3532,11 +3532,11 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@navikt/ds-css@*, @navikt/ds-css@5.14.0, @navikt/ds-css@^5.14.0, @navikt/ds-css@^5.9.2, @navikt/ds-css@workspace:@navikt/core/css":
+"@navikt/ds-css@*, @navikt/ds-css@5.15.0, @navikt/ds-css@^5.15.0, @navikt/ds-css@^5.9.2, @navikt/ds-css@workspace:@navikt/core/css":
   version: 0.0.0-use.local
   resolution: "@navikt/ds-css@workspace:@navikt/core/css"
   dependencies:
-    "@navikt/ds-tokens": ^5.14.0
+    "@navikt/ds-tokens": ^5.15.0
     cssnano: 6.0.0
     fast-glob: 3.2.11
     lodash: 4.17.21
@@ -3549,13 +3549,13 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@navikt/ds-react@*, @navikt/ds-react@^5.14.0, @navikt/ds-react@^5.9.2, @navikt/ds-react@workspace:@navikt/core/react":
+"@navikt/ds-react@*, @navikt/ds-react@^5.15.0, @navikt/ds-react@^5.9.2, @navikt/ds-react@workspace:@navikt/core/react":
   version: 0.0.0-use.local
   resolution: "@navikt/ds-react@workspace:@navikt/core/react"
   dependencies:
     "@floating-ui/react": 0.25.4
-    "@navikt/aksel-icons": ^5.14.0
-    "@navikt/ds-tokens": ^5.14.0
+    "@navikt/aksel-icons": ^5.15.0
+    "@navikt/ds-tokens": ^5.15.0
     "@radix-ui/react-tabs": 1.0.0
     "@radix-ui/react-toggle-group": 1.0.0
     "@testing-library/dom": 8.13.0
@@ -3589,11 +3589,11 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@navikt/ds-tailwind@^5.14.0, @navikt/ds-tailwind@workspace:@navikt/core/tailwind":
+"@navikt/ds-tailwind@^5.15.0, @navikt/ds-tailwind@workspace:@navikt/core/tailwind":
   version: 0.0.0-use.local
   resolution: "@navikt/ds-tailwind@workspace:@navikt/core/tailwind"
   dependencies:
-    "@navikt/ds-tokens": ^5.14.0
+    "@navikt/ds-tokens": ^5.15.0
     "@types/jest": ^29.0.0
     color: 4.2.3
     jest: ^29.0.0
@@ -3605,7 +3605,7 @@ __metadata:
   languageName: unknown
   linkType: soft
 
-"@navikt/ds-tokens@^5.14.0, @navikt/ds-tokens@workspace:@navikt/core/tokens":
+"@navikt/ds-tokens@^5.15.0, @navikt/ds-tokens@workspace:@navikt/core/tokens":
   version: 0.0.0-use.local
   resolution: "@navikt/ds-tokens@workspace:@navikt/core/tokens"
   dependencies:
@@ -8718,11 +8718,11 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "aksel.nav.no@workspace:aksel.nav.no"
   dependencies:
-    "@navikt/aksel-icons": ^5.14.0
-    "@navikt/ds-css": ^5.14.0
-    "@navikt/ds-react": ^5.14.0
-    "@navikt/ds-tailwind": ^5.14.0
-    "@navikt/ds-tokens": ^5.14.0
+    "@navikt/aksel-icons": ^5.15.0
+    "@navikt/ds-css": ^5.15.0
+    "@navikt/ds-react": ^5.15.0
+    "@navikt/ds-tailwind": ^5.15.0
+    "@navikt/ds-tokens": ^5.15.0
   languageName: unknown
   linkType: soft
 

From 6abc1c0f3b6ea90afc5ed78726c7300982b786bc Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Wed, 17 Jan 2024 11:14:41 +0100
Subject: [PATCH 2/6] Version Packages (#2644)

Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
---
 .changeset/rare-comics-draw.md       |  5 -----
 @navikt/aksel-icons/CHANGELOG.md     |  2 ++
 @navikt/aksel-icons/package.json     |  2 +-
 @navikt/aksel-stylelint/CHANGELOG.md |  2 ++
 @navikt/aksel-stylelint/package.json |  6 +++---
 @navikt/aksel/CHANGELOG.md           |  7 +++++++
 @navikt/aksel/package.json           |  4 ++--
 @navikt/core/css/CHANGELOG.md        |  2 ++
 @navikt/core/css/package.json        |  4 ++--
 @navikt/core/react/CHANGELOG.md      | 10 ++++++++++
 @navikt/core/react/package.json      |  6 +++---
 @navikt/core/tailwind/CHANGELOG.md   |  2 ++
 @navikt/core/tailwind/package.json   |  4 ++--
 @navikt/core/tokens/CHANGELOG.md     |  2 ++
 @navikt/core/tokens/package.json     |  2 +-
 CHANGELOG.md                         |  4 ++++
 aksel.nav.no/package.json            | 10 +++++-----
 17 files changed, 50 insertions(+), 24 deletions(-)
 delete mode 100644 .changeset/rare-comics-draw.md

diff --git a/.changeset/rare-comics-draw.md b/.changeset/rare-comics-draw.md
deleted file mode 100644
index 77445fa700..0000000000
--- a/.changeset/rare-comics-draw.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-"@navikt/ds-react": patch
----
-
-HelpText: HelpText-state ble ikke riktig oppdatert ved klikk
diff --git a/@navikt/aksel-icons/CHANGELOG.md b/@navikt/aksel-icons/CHANGELOG.md
index 78158d2c44..8a3bf30614 100644
--- a/@navikt/aksel-icons/CHANGELOG.md
+++ b/@navikt/aksel-icons/CHANGELOG.md
@@ -1,5 +1,7 @@
 # @navikt/aksel-icons
 
+## 5.15.1
+
 ## 5.15.0
 
 ### Minor Changes
diff --git a/@navikt/aksel-icons/package.json b/@navikt/aksel-icons/package.json
index c28d87788f..f390fcc095 100644
--- a/@navikt/aksel-icons/package.json
+++ b/@navikt/aksel-icons/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@navikt/aksel-icons",
-  "version": "5.15.0",
+  "version": "5.15.1",
   "author": "Aksel | NAV",
   "homepage": "https://aksel.nav.no/ikoner",
   "repository": {
diff --git a/@navikt/aksel-stylelint/CHANGELOG.md b/@navikt/aksel-stylelint/CHANGELOG.md
index 666271ad7c..91d760a073 100644
--- a/@navikt/aksel-stylelint/CHANGELOG.md
+++ b/@navikt/aksel-stylelint/CHANGELOG.md
@@ -1,5 +1,7 @@
 # @navikt/aksel-stylelint
 
+## 5.15.1
+
 ## 5.15.0
 
 ## 5.14.0
diff --git a/@navikt/aksel-stylelint/package.json b/@navikt/aksel-stylelint/package.json
index 9a0d396c33..385cc80728 100644
--- a/@navikt/aksel-stylelint/package.json
+++ b/@navikt/aksel-stylelint/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@navikt/aksel-stylelint",
-  "version": "5.15.0",
+  "version": "5.15.1",
   "author": "Aksel | NAV",
   "homepage": "https://aksel.nav.no/grunnleggende/kode/stylelint",
   "repository": {
@@ -35,8 +35,8 @@
     "dev": "yarn watch:lint"
   },
   "devDependencies": {
-    "@navikt/ds-css": "^5.15.0",
-    "@navikt/ds-tokens": "^5.15.0",
+    "@navikt/ds-css": "^5.15.1",
+    "@navikt/ds-tokens": "^5.15.1",
     "@types/jest": "^29.0.0",
     "concurrently": "7.2.1",
     "copyfiles": "2.4.1",
diff --git a/@navikt/aksel/CHANGELOG.md b/@navikt/aksel/CHANGELOG.md
index 16a690f2bf..dc74a55647 100644
--- a/@navikt/aksel/CHANGELOG.md
+++ b/@navikt/aksel/CHANGELOG.md
@@ -1,5 +1,12 @@
 # @navikt/aksel
 
+## 5.15.1
+
+### Patch Changes
+
+- Updated dependencies []:
+  - @navikt/ds-css@5.15.1
+
 ## 5.15.0
 
 ### Patch Changes
diff --git a/@navikt/aksel/package.json b/@navikt/aksel/package.json
index 3693c0007b..a2c4f751a8 100644
--- a/@navikt/aksel/package.json
+++ b/@navikt/aksel/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@navikt/aksel",
-  "version": "5.15.0",
+  "version": "5.15.1",
   "description": "Aksel command line interface. Handles css-imports, codemods and more",
   "author": "Aksel | NAV designsystem team",
   "license": "MIT",
@@ -29,7 +29,7 @@
   },
   "homepage": "https://aksel.nav.no/grunnleggende/kode/kommandolinje",
   "dependencies": {
-    "@navikt/ds-css": "5.15.0",
+    "@navikt/ds-css": "5.15.1",
     "axios": "1.6.0",
     "chalk": "4.1.0",
     "clipboardy": "^2.3.0",
diff --git a/@navikt/core/css/CHANGELOG.md b/@navikt/core/css/CHANGELOG.md
index d7d08fb881..3c54380fc8 100644
--- a/@navikt/core/css/CHANGELOG.md
+++ b/@navikt/core/css/CHANGELOG.md
@@ -1,5 +1,7 @@
 # @navikt/ds-css
 
+## 5.15.1
+
 ## 5.15.0
 
 ## 5.14.0
diff --git a/@navikt/core/css/package.json b/@navikt/core/css/package.json
index 038c8aa5aa..163bece574 100644
--- a/@navikt/core/css/package.json
+++ b/@navikt/core/css/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@navikt/ds-css",
-  "version": "5.15.0",
+  "version": "5.15.1",
   "description": "CSS for NAV Designsystem",
   "author": "Aksel | NAV designsystem team",
   "keywords": [
@@ -27,7 +27,7 @@
     "css:get-version": "node config/get-version.js"
   },
   "devDependencies": {
-    "@navikt/ds-tokens": "^5.15.0",
+    "@navikt/ds-tokens": "^5.15.1",
     "cssnano": "6.0.0",
     "fast-glob": "3.2.11",
     "lodash": "4.17.21",
diff --git a/@navikt/core/react/CHANGELOG.md b/@navikt/core/react/CHANGELOG.md
index 40812633e0..2816a07677 100644
--- a/@navikt/core/react/CHANGELOG.md
+++ b/@navikt/core/react/CHANGELOG.md
@@ -1,5 +1,15 @@
 # @navikt/ds-react
 
+## 5.15.1
+
+### Patch Changes
+
+- HelpText: HelpText-state ble ikke riktig oppdatert ved klikk ([#2643](https://github.com/navikt/aksel/pull/2643))
+
+- Updated dependencies []:
+  - @navikt/ds-tokens@5.15.1
+  - @navikt/aksel-icons@5.15.1
+
 ## 5.15.0
 
 ### Patch Changes
diff --git a/@navikt/core/react/package.json b/@navikt/core/react/package.json
index f941223526..6d2fe2e912 100644
--- a/@navikt/core/react/package.json
+++ b/@navikt/core/react/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@navikt/ds-react",
-  "version": "5.15.0",
+  "version": "5.15.1",
   "description": "Aksel react-components for NAV designsystem",
   "author": "Aksel | NAV designsystem team",
   "license": "MIT",
@@ -38,8 +38,8 @@
   },
   "dependencies": {
     "@floating-ui/react": "0.25.4",
-    "@navikt/aksel-icons": "^5.15.0",
-    "@navikt/ds-tokens": "^5.15.0",
+    "@navikt/aksel-icons": "^5.15.1",
+    "@navikt/ds-tokens": "^5.15.1",
     "@radix-ui/react-tabs": "1.0.0",
     "@radix-ui/react-toggle-group": "1.0.0",
     "clsx": "^1.2.1",
diff --git a/@navikt/core/tailwind/CHANGELOG.md b/@navikt/core/tailwind/CHANGELOG.md
index 5f1f214a9e..d28f6d593e 100644
--- a/@navikt/core/tailwind/CHANGELOG.md
+++ b/@navikt/core/tailwind/CHANGELOG.md
@@ -1,5 +1,7 @@
 # @navikt/ds-tailwind
 
+## 5.15.1
+
 ## 5.15.0
 
 ## 5.14.0
diff --git a/@navikt/core/tailwind/package.json b/@navikt/core/tailwind/package.json
index 408aa4cc8d..834f2288f5 100644
--- a/@navikt/core/tailwind/package.json
+++ b/@navikt/core/tailwind/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@navikt/ds-tailwind",
-  "version": "5.15.0",
+  "version": "5.15.1",
   "description": "Tailwind config based on @navikt/ds-tokens",
   "author": "Aksel | NAV designsystem team",
   "keywords": [
@@ -24,7 +24,7 @@
     "directory": "@navikt/core/tailwind"
   },
   "devDependencies": {
-    "@navikt/ds-tokens": "^5.15.0",
+    "@navikt/ds-tokens": "^5.15.1",
     "@types/jest": "^29.0.0",
     "color": "4.2.3",
     "jest": "^29.0.0",
diff --git a/@navikt/core/tokens/CHANGELOG.md b/@navikt/core/tokens/CHANGELOG.md
index 3ec5050311..b320dc2806 100644
--- a/@navikt/core/tokens/CHANGELOG.md
+++ b/@navikt/core/tokens/CHANGELOG.md
@@ -1,5 +1,7 @@
 # @navikt/ds-tokens
 
+## 5.15.1
+
 ## 5.15.0
 
 ## 5.14.0
diff --git a/@navikt/core/tokens/package.json b/@navikt/core/tokens/package.json
index dabb802cb5..42559a20b1 100644
--- a/@navikt/core/tokens/package.json
+++ b/@navikt/core/tokens/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@navikt/ds-tokens",
-  "version": "5.15.0",
+  "version": "5.15.1",
   "description": "Design-tokens for NAV designsystem",
   "author": "Aksel | NAV designsystem team",
   "keywords": [
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 114ad19d59..285a40b93d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,10 @@
 
 - Ikoner: Synket ikoner med Figma. Lagt til nytt ikon `FigureChild` ([#2629](https://github.com/navikt/aksel/pull/2629))
 
+### @navikt/ds-react
+
+- HelpText: HelpText-state ble ikke riktig oppdatert ved klikk ([#2643](https://github.com/navikt/aksel/pull/2643))
+
 ## 5.14
 
 ### @navikt/ds-react
diff --git a/aksel.nav.no/package.json b/aksel.nav.no/package.json
index b9a30cce34..da1a2929f2 100644
--- a/aksel.nav.no/package.json
+++ b/aksel.nav.no/package.json
@@ -16,10 +16,10 @@
     "playroom"
   ],
   "dependencies": {
-    "@navikt/aksel-icons": "^5.15.0",
-    "@navikt/ds-css": "^5.15.0",
-    "@navikt/ds-react": "^5.15.0",
-    "@navikt/ds-tailwind": "^5.15.0",
-    "@navikt/ds-tokens": "^5.15.0"
+    "@navikt/aksel-icons": "^5.15.1",
+    "@navikt/ds-css": "^5.15.1",
+    "@navikt/ds-react": "^5.15.1",
+    "@navikt/ds-tailwind": "^5.15.1",
+    "@navikt/ds-tokens": "^5.15.1"
   }
 }

From 13b148aab6fe5b82cd2fbfbb22f06a625c1cbf8f Mon Sep 17 00:00:00 2001
From: Andreas Nordahl <andnorda@gmail.com>
Date: Wed, 17 Jan 2024 12:31:13 +0100
Subject: [PATCH 3/6] Add dockerfile and yaml to syntax highlighting (#2638)

* Add dockerfile and yaml to syntax highlighting

* Remove dockerfile as it is not supported ootb
---
 aksel.nav.no/website/sanity/schema/objects/shared/kode.tsx | 1 +
 1 file changed, 1 insertion(+)

diff --git a/aksel.nav.no/website/sanity/schema/objects/shared/kode.tsx b/aksel.nav.no/website/sanity/schema/objects/shared/kode.tsx
index 0bba7a550a..906deb2357 100644
--- a/aksel.nav.no/website/sanity/schema/objects/shared/kode.tsx
+++ b/aksel.nav.no/website/sanity/schema/objects/shared/kode.tsx
@@ -28,6 +28,7 @@ export const Kode = defineType({
           { value: "less", title: "LESS" },
           { value: "bash", title: "Terminal" },
           { value: "markdown", title: "Markdown" },
+          { value: "yaml", title: "YAML" },
         ],
       },
     }),

From d90fe26e262af3f70a1a9a43908a51aad586bdef Mon Sep 17 00:00:00 2001
From: Julian Nymark <julian.nymark@nav.no>
Date: Wed, 17 Jan 2024 15:26:48 +0100
Subject: [PATCH 4/6] popular articles (#2628)

* :sparkle: new schema for view tracking

* :construction: wip for article views schema

* :construction: wip on schema

* :construction: schema changes for ArticleViews

* :construction: run prettier with new config
---
 .../sanity/plugins/structure/index.tsx        | 14 ++++
 .../sanity/schema/documents/articleViews.tsx  | 75 +++++++++++++++++++
 .../website/sanity/schema/documents/index.ts  |  1 +
 aksel.nav.no/website/sanity/schema/index.ts   |  3 +-
 4 files changed, 92 insertions(+), 1 deletion(-)
 create mode 100644 aksel.nav.no/website/sanity/schema/documents/articleViews.tsx

diff --git a/aksel.nav.no/website/sanity/plugins/structure/index.tsx b/aksel.nav.no/website/sanity/plugins/structure/index.tsx
index aaf236f97c..b1a61ef75c 100644
--- a/aksel.nav.no/website/sanity/plugins/structure/index.tsx
+++ b/aksel.nav.no/website/sanity/plugins/structure/index.tsx
@@ -57,6 +57,7 @@ const filtered = [
   "skrivehjelp",
   "publication_flow",
   "aksel_feedback",
+  "article_views",
   ...GP_DOCUMENT_NAMES,
 ];
 
@@ -296,6 +297,19 @@ export const structure: StructureResolver = async (
                       .schemaType(`publication_flow`)
                       .icon(FileTextIcon)
                       .id(`publication_flow`),
+                    S.listItem()
+                      .title("Artikkel Visninger")
+                      .child(
+                        S.documentList()
+                          .title("Artikkel Visninger")
+                          .filter(`_type == 'article_views'`)
+                          .apiVersion(SANITY_API_VERSION)
+                          .menuItems([
+                            ...S.documentTypeList(
+                              "article_views",
+                            ).getMenuItems(),
+                          ]),
+                      ),
                   ]),
               ),
           ]
diff --git a/aksel.nav.no/website/sanity/schema/documents/articleViews.tsx b/aksel.nav.no/website/sanity/schema/documents/articleViews.tsx
new file mode 100644
index 0000000000..234e1da879
--- /dev/null
+++ b/aksel.nav.no/website/sanity/schema/documents/articleViews.tsx
@@ -0,0 +1,75 @@
+import { defineField, defineType } from "sanity";
+import { LineGraphIcon } from "@navikt/aksel-icons";
+
+export const ArticleViews = defineType({
+  title: "Artikkel Visninger",
+  name: "article_views",
+  type: "document",
+  readOnly: ({ currentUser }) =>
+    !currentUser.roles.find((x) => x.name === "developer"),
+  preview: {
+    select: {
+      title: "article_ref.heading",
+      url: "article_ref.slug.current",
+    },
+    prepare: (selected) => ({
+      title: selected.title,
+      subtitle: selected.url,
+      media: LineGraphIcon,
+    }),
+  },
+  orderings: [
+    {
+      title: "Views total",
+      name: "views",
+      by: [{ field: "views", direction: "desc" }],
+    },
+    {
+      title: "Views week",
+      name: "views_week",
+      by: [{ field: "views_week", direction: "desc" }],
+    },
+    {
+      title: "Views month",
+      name: "views_month",
+      by: [{ field: "views_month", direction: "desc" }],
+    },
+    {
+      title: "Views year",
+      name: "views_year",
+      by: [{ field: "views_year", direction: "desc" }],
+    },
+  ],
+  fields: [
+    defineField({
+      type: "number",
+      name: "views",
+      description: "total lifetime views",
+    }),
+    defineField({
+      type: "number",
+      name: "views_week",
+      description: "views in the last week",
+    }),
+    defineField({
+      type: "number",
+      name: "views_month",
+      description: "views in the last month",
+    }),
+    defineField({
+      type: "number",
+      name: "views_year",
+      description: "views in the last year",
+    }),
+    defineField({
+      title: "articleRef",
+      name: "article_ref",
+      type: "reference",
+      to: { type: "aksel_artikkel" },
+    }),
+    defineField({
+      type: "string",
+      name: "url",
+    }),
+  ],
+});
diff --git a/aksel.nav.no/website/sanity/schema/documents/index.ts b/aksel.nav.no/website/sanity/schema/documents/index.ts
index 90a530efd6..78b61a7457 100644
--- a/aksel.nav.no/website/sanity/schema/documents/index.ts
+++ b/aksel.nav.no/website/sanity/schema/documents/index.ts
@@ -21,3 +21,4 @@ export * from "./skrivehjelp";
 export * from "./standalone-artikkel";
 export * from "./templates/artikkel";
 export * from "./templates/landingsside";
+export * from "./articleViews";
diff --git a/aksel.nav.no/website/sanity/schema/index.ts b/aksel.nav.no/website/sanity/schema/index.ts
index ad432c8f25..aea97e9879 100644
--- a/aksel.nav.no/website/sanity/schema/index.ts
+++ b/aksel.nav.no/website/sanity/schema/index.ts
@@ -5,7 +5,7 @@ import * as object from "./objects";
 import { WorkspaceT } from "./util";
 
 export const schema: (workspace: WorkspaceT) => SchemaPluginOptions = (
-  workspace,
+  workspace
 ) => ({
   types: [
     ...GP_DOCUMENTS,
@@ -17,6 +17,7 @@ export const schema: (workspace: WorkspaceT) => SchemaPluginOptions = (
     document.Skrivehjelp,
     document.Publiseringsflyt,
     document.Feedback,
+    document.ArticleViews,
 
     /* Komponentsider */
     document.KodeEksempelDoc,

From ade5d59392001901f90bf63e1709f71b467487f9 Mon Sep 17 00:00:00 2001
From: Halvor Haugan <83693529+HalvorHaugan@users.noreply.github.com>
Date: Thu, 18 Jan 2024 13:49:04 +0100
Subject: [PATCH 5/6] [aksel.nav.no] Fjern forwardRef i ShowMore (#2649)

---
 .../sanity-modules/token-tabell/parts/ShowMore.tsx     | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/aksel.nav.no/website/components/sanity-modules/token-tabell/parts/ShowMore.tsx b/aksel.nav.no/website/components/sanity-modules/token-tabell/parts/ShowMore.tsx
index 4d7cb980c4..69cbfe2987 100644
--- a/aksel.nav.no/website/components/sanity-modules/token-tabell/parts/ShowMore.tsx
+++ b/aksel.nav.no/website/components/sanity-modules/token-tabell/parts/ShowMore.tsx
@@ -1,7 +1,7 @@
 import { ChevronDownIcon, ChevronUpIcon } from "@navikt/aksel-icons";
 import { Button, useId, type HeadingProps } from "@navikt/ds-react";
 import cl from "clsx";
-import React, { forwardRef, useRef, useState } from "react";
+import React, { useRef, useState } from "react";
 
 export interface ShowMoreProps
   extends Omit<React.HTMLAttributes<HTMLElement>, "onClick"> {
@@ -62,7 +62,8 @@ export interface ShowMoreProps
  *   Toads have dry, leathery skin, short legs, and large bumps covering the parotoid glands.
  * </ShowMore>
  */
-export const ShowMore = forwardRef<HTMLElement, ShowMoreProps>(
+export const ShowMore =
+  /*forwardRef<HTMLElement, ShowMoreProps>(*/
   (
     {
       as: Component = "aside",
@@ -77,7 +78,7 @@ export const ShowMore = forwardRef<HTMLElement, ShowMoreProps>(
       className,
       "aria-labelledby": ariaLabelledby,
       ...rest
-    },
+    }: ShowMoreProps,
     /* ref, */
   ) => {
     const localRef = useRef<HTMLElement>(null);
@@ -136,8 +137,7 @@ export const ShowMore = forwardRef<HTMLElement, ShowMoreProps>(
         </div>
       </Component>
     );
-  },
-);
+  };
 
 export default ShowMore;
 

From 930c772bd6497b5c6456c51abfa339a8e5c34c89 Mon Sep 17 00:00:00 2001
From: Halvor Haugan <83693529+HalvorHaugan@users.noreply.github.com>
Date: Thu, 18 Jan 2024 13:50:40 +0100
Subject: [PATCH 6/6] [aksel.nav.no] Separat artikkelside for nye God praksis
 (#2648)

---
 .../god-praksis-page/articles/ArticleCard.tsx |   4 +-
 .../website/pages/gp/artikler/[slug].tsx      | 309 ++++++++++++++++++
 aksel.nav.no/website/public/robots.txt        |   1 +
 3 files changed, 313 insertions(+), 1 deletion(-)
 create mode 100644 aksel.nav.no/website/pages/gp/artikler/[slug].tsx

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
index f0a3216acc..15057eae46 100644
--- 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
@@ -39,7 +39,9 @@ export const ArticleCard = ({
 
   return (
     <Link
-      href={`/${slug}`}
+      href={`/${
+        slug.replace("god-praksis/", "gp/") /* TODO: Remove replace */
+      }`}
       className={cl(
         "w-full flex-shrink overflow-hidden text-ellipsis rounded-large bg-surface-default p-5 shadow-small transition-shadow ease-out hover:shadow-large focus:outline-none focus-visible:shadow-focus",
         {
diff --git a/aksel.nav.no/website/pages/gp/artikler/[slug].tsx b/aksel.nav.no/website/pages/gp/artikler/[slug].tsx
new file mode 100644
index 0000000000..1543e256c4
--- /dev/null
+++ b/aksel.nav.no/website/pages/gp/artikler/[slug].tsx
@@ -0,0 +1,309 @@
+import NextLink from "next/link";
+import { GetStaticPaths, GetStaticProps } from "next/types";
+import { Suspense, lazy } from "react";
+import { ChevronRightIcon } from "@navikt/aksel-icons";
+import { BodyLong, BodyShort, Detail, Heading, Label } from "@navikt/ds-react";
+import ArtikkelCard from "@/cms/cards/ArtikkelCard";
+import Footer from "@/layout/footer/Footer";
+import Header from "@/layout/header/Header";
+import { SanityBlockContent } from "@/sanity-block";
+import { getClient } from "@/sanity/client.server";
+import { getDocuments } from "@/sanity/interface";
+import {
+  contributorsAll,
+  contributorsSingle,
+  destructureBlocks,
+} from "@/sanity/queries";
+import {
+  AkselGodPraksisDocT,
+  NextPageT,
+  ResolveContributorsT,
+  ResolveRelatedArticlesT,
+  ResolveSlugT,
+  ResolveTemaT,
+  TableOfContentsT,
+} from "@/types";
+import { abbrName, dateStr, generateTableOfContents } from "@/utils";
+import { BreadCrumbs } from "@/web/BreadCrumbs";
+import { SEO } from "@/web/seo/SEO";
+import TableOfContents from "@/web/toc/TableOfContents";
+import NotFotfund from "../../404";
+
+type PageProps = NextPageT<{
+  page: ResolveContributorsT<
+    ResolveTemaT<ResolveSlugT<ResolveRelatedArticlesT<AkselGodPraksisDocT>>>
+  >;
+  publishDate: string;
+  verifiedDate: string;
+  toc: TableOfContentsT;
+}>;
+
+export const query = `{
+  "page": *[slug.current == $slug] | order(_updatedAt desc)[0]
+  {
+    ...,
+    "slug": slug.current,
+    content[]{
+      ...,
+      ${destructureBlocks}
+    },
+    tema[]->{title, slug, seo},
+    ${contributorsAll},
+    relevante_artikler[]->{
+      _id,
+      heading,
+      _createdAt,
+      _updatedAt,
+      publishedAt,
+      updateInfo,
+      "slug": slug.current,
+      "tema": tema[]->tag,
+      ingress,
+      "contributor": ${contributorsSingle},
+    }
+  }
+}`;
+
+export const getStaticPaths: GetStaticPaths = async () => {
+  return {
+    paths: await getDocuments("aksel_artikkel").then((paths) =>
+      paths.map(({ slug }) => ({
+        params: {
+          slug: slug.replace("god-praksis/artikler/", ""),
+        },
+      })),
+    ),
+    fallback: "blocking",
+  };
+};
+
+export const getStaticProps: GetStaticProps = async ({
+  params: { slug },
+  preview = false,
+}: {
+  params: { slug: string };
+  preview?: boolean;
+}): Promise<PageProps> => {
+  const { page } = await getClient().fetch(query, {
+    slug: `god-praksis/artikler/${slug}`,
+  });
+
+  return {
+    props: {
+      page,
+      slug,
+      preview,
+      id: page?._id ?? "",
+      title: page?.heading ?? "",
+      verifiedDate: await dateStr(
+        page?.updateInfo?.lastVerified ?? page?.publishedAt ?? page?._updatedAt,
+      ),
+      publishDate: await dateStr(page?.publishedAt ?? page?._updatedAt),
+      toc: generateTableOfContents({
+        content: page?.content,
+        type: "aksel_artikkel",
+      }),
+    },
+    notFound: !page && !preview,
+    revalidate: 60,
+  };
+};
+
+const Page = ({
+  page: data,
+  publishDate,
+  verifiedDate,
+  toc,
+}: PageProps["props"]) => {
+  if (!data) {
+    return <NotFotfund />;
+  }
+
+  if (!data.content || !data.heading) {
+    console.warn(
+      `Artikkelen har ikke ${
+        !data.content ? "innhold" : "overskrift"
+      }, så den kan ikke vises.`,
+    );
+    return null;
+  }
+
+  const authors = (data?.contributors as any)?.map((x) => x?.title) ?? [];
+
+  const hasTema = "tema" in data && data.tema && data?.tema.length > 0;
+
+  const aside = data?.relevante_artikler?.length > 0 && (
+    <aside
+      className="overflow-x-clip py-8"
+      aria-labelledby="relevante-artikler-aside"
+    >
+      <div className="relativept-12 pb-16">
+        <div className="dynamic-wrapper">
+          <Heading
+            level="2"
+            size="medium"
+            className="px-4 text-deepblue-700"
+            id="relevante-artikler-aside"
+          >
+            {data?.relevante_artikler?.length === 1
+              ? `Les også`
+              : `Relevante artikler`}
+          </Heading>
+          <div className="card-grid-3-1 mt-6 px-4">
+            {data.relevante_artikler.map((x: any) =>
+              x && x?._id ? (
+                <ArtikkelCard level="3" {...x} key={x._id} />
+              ) : null,
+            )}
+          </div>
+        </div>
+      </div>
+    </aside>
+  );
+
+  const filteredTema =
+    hasTema && data?.tema?.filter((x: any) => x?.title && x?.slug);
+
+  return (
+    <>
+      <SEO
+        title={data?.heading}
+        description={data?.seo?.meta ?? data?.ingress}
+        image={data?.seo?.image ?? (data?.tema?.[0] as any)?.seo?.image}
+        publishDate={publishDate}
+        canonical={`/${data.slug}`}
+      />
+
+      <Header variant="subtle" />
+      <main
+        tabIndex={-1}
+        id="hovedinnhold"
+        className="aksel-artikkel group/aksel bg-surface-subtle pt-4 focus:outline-none"
+      >
+        <div className="mx-auto max-w-aksel px-4 sm:w-[90%]">
+          <article className="pb-16 pt-12 md:pb-32">
+            <div className="mx-auto mb-16 max-w-prose lg:ml-0">
+              <BreadCrumbs auto />
+              <Heading
+                level="1"
+                size="large"
+                className="text-wrap-balance mt-4 text-deepblue-800 md:text-5xl"
+              >
+                {data.heading}
+              </Heading>
+              {data?.ingress && (
+                <BodyLong
+                  size="large"
+                  className="override-text-700 mt-4 text-2xl"
+                >
+                  {data?.ingress}
+                </BodyLong>
+              )}
+
+              <div className="mt-6 inline-flex flex-wrap items-center gap-2 text-base">
+                <Detail uppercase as="span">
+                  {verifiedDate}
+                </Detail>
+                {authors?.length > 0 && (
+                  <>
+                    <span className="h-2 w-2 rotate-45 rounded-[1px] bg-deepblue-700 opacity-25" />
+                    <BodyShort
+                      size="small"
+                      as="div"
+                      className="flex flex-wrap gap-1"
+                    >
+                      <address className="not-italic">{authors?.[0]}</address>
+                    </BodyShort>
+                  </>
+                )}
+              </div>
+              {hasTema && (
+                <div className="mt-8 flex flex-wrap gap-2">
+                  {filteredTema.map(({ title, slug }: any) => (
+                    <span key={title}>
+                      <BodyShort
+                        href={`/god-praksis/${slug.current}`}
+                        key={title}
+                        size="small"
+                        as={NextLink}
+                        className="flex min-h-8 items-center justify-center gap-[2px] rounded-full bg-surface-neutral-subtle pl-4  pr-1 text-deepblue-800 ring-1 ring-inset ring-border-subtle hover:bg-surface-neutral-subtle-hover focus:outline-none focus-visible:shadow-focus"
+                      >
+                        {title}
+                        <ChevronRightIcon aria-hidden fontSize="1.25rem" />
+                      </BodyShort>
+                    </span>
+                  ))}
+                </div>
+              )}
+            </div>
+            <div className="relative mx-auto mt-4 max-w-prose lg:ml-0 lg:grid lg:max-w-none lg:grid-flow-row-dense lg:grid-cols-3 lg:items-start lg:gap-x-12">
+              <TableOfContents toc={toc} variant="subtle" />
+              <div className="max-w-prose lg:col-span-2 lg:col-start-1">
+                <SanityBlockContent blocks={data?.content ?? []} />
+                <div className="mt-12">
+                  {authors?.length > 0 && (
+                    <Label className="mb-2 text-deepblue-700" as="p">
+                      Bidragsytere
+                    </Label>
+                  )}
+                  {authors?.length > 0 && (
+                    <BodyShort
+                      as="div"
+                      className="mb-1 flex flex-wrap gap-1 text-text-subtle"
+                    >
+                      {authors.map(abbrName).map((x, y) => (
+                        <address className="not-italic" key={x}>
+                          {x}
+                          {y !== authors.length - 1 && ", "}
+                        </address>
+                      ))}
+                    </BodyShort>
+                  )}
+                  <BodyShort as="span" className="text-text-subtle">
+                    Publisert: {publishDate}
+                  </BodyShort>
+                </div>
+              </div>
+            </div>
+          </article>
+        </div>
+        {aside}
+      </main>
+      <Footer />
+    </>
+  );
+};
+
+const WithPreview = lazy(() => import("@/preview"));
+
+const Wrapper = (props: any) => {
+  if (props?.preview) {
+    return (
+      <Suspense fallback={<Page {...props} />}>
+        <WithPreview
+          comp={Page}
+          query={query}
+          props={props}
+          params={{
+            slug: `god-praksis/artikler/${props?.slug}`,
+          }}
+          resolvers={[
+            {
+              key: "toc",
+              dataKeys: ["page.content"],
+              cb: (v) =>
+                generateTableOfContents({
+                  content: v[0],
+                  type: "aksel_artikkel",
+                }),
+            },
+          ]}
+        />
+      </Suspense>
+    );
+  }
+
+  return <Page {...props} />;
+};
+
+export default Wrapper;
diff --git a/aksel.nav.no/website/public/robots.txt b/aksel.nav.no/website/public/robots.txt
index cf26368882..3b36aaf493 100644
--- a/aksel.nav.no/website/public/robots.txt
+++ b/aksel.nav.no/website/public/robots.txt
@@ -19,5 +19,6 @@ Disallow: /*.js$
 Disallow: /eksempler
 Disallow: /templates
 Disallow: /admin
+Disallow: /gp
 
 Sitemap: https://aksel.nav.no/sitemap.xml
\ No newline at end of file