Version Packages (#1746)

Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>

.github/workflows/aksel-dev.yml

@@ -22,9 +22,6 @@ jobs:
       - name: add tokens to .env
         run: |
           echo "SANITY_WRITE_KEY=${{ secrets.SANITY_FEEDBACK_WRITE_KEY }}" >> aksel.nav.no/website/.env
-          echo "ALGOLIA_ADMIN=${{ secrets.ALGOLIA_ADMIN }}" >> aksel.nav.no/website/.env
-          echo "ALGOLIA_ID=${{ secrets.ALGOLIA_ID}}" >> aksel.nav.no/website/.env
-          echo "TRELLO_TOKEN=${{ secrets.TRELLO_TOKEN }}" >> aksel.nav.no/website/.env
           echo "SENTRY_AUTH_TOKEN=${{ secrets.SENTRY_AUTH_TOKEN }}" >> aksel.nav.no/website/.env
           echo "SANITY_PREVIEW_TOKEN=${{ secrets.SANITY_PREVIEW_TOKEN }}" >> aksel.nav.no/website/.env
           echo "SANITY_PRIVATE_NO_DRAFTS=${{ secrets.SANITY_PRIVATE_NO_DRAFTS }}" >> aksel.nav.no/website/.env

.github/workflows/aksel-prod.yml

@@ -21,9 +21,6 @@ jobs:
       - name: add tokens to .env
         run: |
           echo "SANITY_WRITE_KEY=${{ secrets.SANITY_FEEDBACK_WRITE_KEY }}" >> aksel.nav.no/website/.env
-          echo "ALGOLIA_ADMIN=${{ secrets.ALGOLIA_ADMIN }}" >> aksel.nav.no/website/.env
-          echo "ALGOLIA_ID=${{ secrets.ALGOLIA_ID}}" >> aksel.nav.no/website/.env
-          echo "TRELLO_TOKEN=${{ secrets.TRELLO_TOKEN }}" >> aksel.nav.no/website/.env
           echo "SENTRY_AUTH_TOKEN=${{ secrets.SENTRY_AUTH_TOKEN }}" >> aksel.nav.no/website/.env
           echo "SANITY_PREVIEW_TOKEN=${{ secrets.SANITY_PREVIEW_TOKEN }}" >> aksel.nav.no/website/.env
           echo "SANITY_PRIVATE_NO_DRAFTS=${{ secrets.SANITY_PRIVATE_NO_DRAFTS }}" >> aksel.nav.no/website/.env

.github/workflows/backup-sanity.yml

@@ -22,18 +22,17 @@ jobs:
           key: ${{ runner.os }}-build-${{ github.sha }}
           restore-keys: |
             ${{ runner.os }}-build-
-
       - name: Install dependencies
-        run: yarn
+        run: cd aksel.nav.no/website && yarn
 
       - name: Export dataset
-        run: SANITY_TOKEN=${{secrets.SANITY_DATASET_EDITOR_TOKEN}} yarn workspace aksel.nav.no sanity:backup
+        run: cd aksel.nav.no/website && SANITY_TOKEN=${{secrets.SANITY_DATASET_EDITOR_TOKEN}} yarn backup
       - name: Upload GCP bucket
         uses: "google-github-actions/auth@v0"
         with:
           credentials_json: "${{ secrets.gcp_credentials_prod }}"
       - uses: "google-github-actions/upload-cloud-storage@v0"
         with:
-          path: ./aksel.nav.no/sanity
+          path: ./aksel.nav.no/website
           destination: "aksel-website-prod/backups"
-          glob: "**/backup-*.tar.gz"
+          glob: "backup-*.tar.gz"

.github/workflows/e2e.yml

@@ -21,9 +21,6 @@ jobs:
       - name: add tokens to .env
         run: |
           echo "SANITY_WRITE_KEY=${{ secrets.SANITY_FEEDBACK_WRITE_KEY }}" >> aksel.nav.no/website/.env
-          echo "ALGOLIA_ADMIN=${{ secrets.ALGOLIA_ADMIN }}" >> aksel.nav.no/website/.env
-          echo "ALGOLIA_ID=${{ secrets.ALGOLIA_ID}}" >> aksel.nav.no/website/.env
-          echo "TRELLO_TOKEN=${{ secrets.TRELLO_TOKEN }}" >> aksel.nav.no/website/.env
           echo "SENTRY_AUTH_TOKEN=${{ secrets.SENTRY_AUTH_TOKEN }}" >> aksel.nav.no/website/.env
           echo "SANITY_PREVIEW_TOKEN=${{ secrets.SANITY_PREVIEW_TOKEN }}" >> aksel.nav.no/website/.env
           echo "SANITY_PRIVATE_NO_DRAFTS=${{ secrets.SANITY_PRIVATE_NO_DRAFTS }}" >> aksel.nav.no/website/.env
@@ -47,7 +44,7 @@ jobs:
       - name: Install Playwright Browsers
         run: npx playwright install --with-deps
       - name: Run Playwright tests
-        run: yarn workspace website e2e
+        run: yarn workspace website e2e:full
       - uses: actions/upload-artifact@v3
         if: always()
         with:

.github/workflows/push-to-cdn.yaml

@@ -20,9 +20,8 @@ jobs:
       - uses: "actions/checkout@v3"
 
       - id: upload
-        uses: nais/frontend-plattform-cdn-upload-action@main
+        uses: navikt/frontend/actions/cdn-upload/v1@main
         with:
-          cdn-environment: cdn.nav.no
           cdn-team-name: aksel
           source: ./fonts
           destination: "" # uploads folder to team root

.github/workflows/searchindex.yml

@@ -1,25 +0,0 @@
-name: Indexing search
-on:
-  workflow_dispatch:
-  schedule:
-    # 01.00 & 12.00 every day
-    - cron: "00 01,12 * * *"
-
-jobs:
-  searchcrawl:
-    name: Search-indexing aksel.nav.no
-    runs-on: ubuntu-latest
-    env:
-      APPLICATION_ID: ${{ secrets.ALGOLIA_ID}}
-      API_KEY: ${{ secrets.ALGOLIA_ADMIN }}
-    steps:
-      - uses: actions/checkout@v2
-      - name: Read crawler.json
-        id: algolia_config
-        run: echo "::set-output name=config::$(cat ./aksel.nav.no/crawler.json | jq -r tostring)"
-      - name: Push indices to Algolia
-        uses: signcl/docsearch-scraper-action@master
-        env:
-          APPLICATION_ID: ${{ secrets.ALGOLIA_ID}}
-          API_KEY: ${{ secrets.ALGOLIA_ADMIN }}
-          CONFIG: ${{ steps.algolia_config.outputs.config }}

.gitignore

@@ -148,3 +148,6 @@ tmp.json
 /playwright/.cache/
 playwright-report/
 /test-results/
+backup-*.tar.gz
+sitemap-urls.json
+*.tar.gz

@navikt/codemod/CHANGELOG.md

@@ -1,5 +1,23 @@
 # @navikt/ds-codemod
 
+## 2.0.14
+
+## 2.0.13
+
+## 2.0.12
+
+## 2.0.11
+
+## 2.0.10
+
+## 2.0.9
+
+## 2.0.8
+
+## 2.0.7
+
+## 2.0.6
+
 ## 2.0.5
 
 ## 2.0.4

@navikt/codemod/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@navikt/ds-codemod",
-  "version": "2.0.5",
+  "version": "2.0.14",
   "description": "Aksel codemods for NAVs designsystem",
   "author": "Aksel | NAV designsystem team",
   "license": "MIT",

@navikt/community/navno/package.json

@@ -39,8 +39,8 @@
     "build-pict": "svgr --silent --index-template index-template.js --out-dir src/pictograms pictograms"
   },
   "dependencies": {
-    "@navikt/ds-icons": "^2.0.5",
-    "@navikt/ds-react": "^2.0.5",
+    "@navikt/ds-icons": "^2.0.14",
+    "@navikt/ds-react": "^2.0.14",
     "clsx": "^1.1.1"
   },
   "devDependencies": {
@@ -51,7 +51,6 @@
     "@rollup/plugin-commonjs": "23.0.2",
     "@rollup/plugin-node-resolve": "^15.0.1",
     "@svgr/cli": "6.2.1",
-    "@types/node": "^17.0.35",
     "concurrently": "7.2.1",
     "copyfiles": "2.4.1",
     "postcss-combine-duplicated-selectors": "10.0.3",

@navikt/core/css/CHANGELOG.md

@@ -1,5 +1,27 @@
 # @navikt/ds-css
 
+## 2.0.14
+
+## 2.0.13
+
+## 2.0.12
+
+### Patch Changes
+
+- [#1737](https://github.com/navikt/Designsystemet/pull/1737) [`8a1ef5e7e`](https://github.com/navikt/Designsystemet/commit/8a1ef5e7e2c066cb80c13e14329e1585e2c427f8) Thanks [@KenAJoh](https://github.com/KenAJoh)! - :bug: Fikset default visuell error-state for radio
+
+## 2.0.11
+
+## 2.0.10
+
+## 2.0.9
+
+## 2.0.8
+
+## 2.0.7
+
+## 2.0.6
+
 ## 2.0.5
 
 ### Patch Changes

@navikt/core/css/accordion.css

@@ -14,7 +14,7 @@
   background: transparent;
   cursor: pointer;
   border: none;
-  border-bottom: 2px solid var(--a-border-strong);
+  border-bottom: 2px solid var(--ac-accordion-header-border, var(--a-border-strong));
 }
 
 .navds-accordion__header:focus {

@navikt/core/css/form/radio-checkbox.css

@@ -143,27 +143,21 @@
 .navds-checkbox--error
   > .navds-checkbox__input:not(:hover):not(:disabled):not(:checked):not(:indeterminate)
   + .navds-checkbox__label::before,
-.navds-radio--error
-  > .navds-radio__input:not(:hover):not(:disabled):not(:checked):not(:indeterminate)
-  + .navds-radio__label::before {
+.navds-radio--error > .navds-radio__input:not(:hover):not(:disabled):not(:checked) + .navds-radio__label::before {
   box-shadow: inset 0 0 0 2px var(--ac-radio-checkbox-error-border, var(--a-border-danger));
 }
 
 .navds-checkbox--error
   > .navds-checkbox__input:focus:not(:hover):not(:disabled):not(:checked):not(:indeterminate)
   + .navds-checkbox__label::before,
-.navds-radio--error
-  > .navds-radio__input:focus:not(:hover):not(:disabled):not(:checked):not(:indeterminate)
-  + .navds-radio__label::before {
+.navds-radio--error > .navds-radio__input:focus:not(:hover):not(:disabled):not(:checked) + .navds-radio__label::before {
   box-shadow: inset 0 0 0 2px var(--ac-radio-checkbox-error-border, var(--a-border-danger)), var(--a-shadow-focus);
 }
 
 .navds-checkbox--error
   > .navds-checkbox__input:hover:not(:disabled):not(:checked):not(:indeterminate):not(:focus)
   + .navds-checkbox__label::before,
-.navds-radio--error
-  > .navds-radio__input:hover:not(:disabled):not(:checked):not(:indeterminate):not(:focus)
-  + .navds-radio__label::before {
+.navds-radio--error > .navds-radio__input:hover:not(:disabled):not(:checked):not(:focus) + .navds-radio__label::before {
   background-color: var(--ac-radio-checkbox-error-hover-bg, var(--a-surface-danger-subtle));
   box-shadow: inset 0 0 0 2px var(--ac-radio-checkbox-error-border, var(--a-border-danger));
 }
@@ -171,9 +165,7 @@
 .navds-checkbox--error
   > .navds-checkbox__input:focus:hover:not(:disabled):not(:checked):not(:indeterminate)
   + .navds-checkbox__label::before,
-.navds-radio--error
-  > .navds-radio__input:focus:hover:not(:disabled):not(:checked):not(:indeterminate)
-  + .navds-radio__label::before {
+.navds-radio--error > .navds-radio__input:focus:hover:not(:disabled):not(:checked) + .navds-radio__label::before {
   background-color: var(--ac-radio-checkbox-error-hover-bg, var(--a-surface-danger-subtle));
   box-shadow: inset 0 0 0 2px var(--ac-radio-checkbox-error-border, var(--a-border-danger)), var(--a-shadow-focus);
 }

@navikt/core/css/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@navikt/ds-css",
-  "version": "2.0.5",
+  "version": "2.0.14",
   "description": "CSS for NAV Designsystem",
   "author": "Aksel | NAV designsystem team",
   "keywords": [
@@ -20,7 +20,7 @@
     "watch": "postcss --watch --use postcss-import -o dist/index.css index.css"
   },
   "devDependencies": {
-    "@navikt/ds-tokens": "^2.0.5",
+    "@navikt/ds-tokens": "^2.0.14",
     "normalize.css": "^8.0.1",
     "postcss": "^8.4.0",
     "postcss-cli": "^9.0.0",

@navikt/core/css/tokens.json

@@ -10,6 +10,7 @@
     "--ac-alert-success-bg": "--a-surface-success-subtle"
   },
   "accordion": {
+    "--ac-accordion-header-border": "--a-border-strong",
     "--ac-accordion-header-text-hover": "--a-text-action-on-action-subtle",
     "--ac-accordion-header-border-hover": "--a-border-strong",
     "--ac-accordion-item-bg-open": "--a-surface-action-subtle",

@navikt/core/react/CHANGELOG.md

@@ -1,5 +1,80 @@
 # @navikt/ds-react
 
+## 2.0.14
+
+### Patch Changes
+
+- [`8e5c55443`](https://github.com/navikt/Designsystemet/commit/8e5c554431c98b1b658c5054c0b3cf08b8a65e52) Thanks [@KenAJoh](https://github.com/KenAJoh)! - Bumpet @floating-ui/react
+
+- Updated dependencies []:
+  - @navikt/ds-icons@2.0.14
+
+## 2.0.13
+
+### Patch Changes
+
+- Updated dependencies [[`a6c339123`](https://github.com/navikt/Designsystemet/commit/a6c3391237f13394063e4c004ac9efb1875fc944)]:
+  - @navikt/ds-icons@2.0.13
+
+## 2.0.12
+
+### Patch Changes
+
+- Updated dependencies []:
+  - @navikt/ds-icons@2.0.12
+
+## 2.0.11
+
+### Patch Changes
+
+- Updated dependencies []:
+  - @navikt/ds-icons@2.0.11
+
+## 2.0.10
+
+### Patch Changes
+
+- Button submittet form i table
+
+- Updated dependencies []:
+  - @navikt/ds-icons@2.0.10
+
+## 2.0.9
+
+### Patch Changes
+
+- ShouldCloseOnEsc i Modal
+
+- Updated dependencies []:
+  - @navikt/ds-icons@2.0.9
+
+## 2.0.8
+
+### Patch Changes
+
+- Confirmationpanel wrappet med div
+
+- Updated dependencies []:
+  - @navikt/ds-icons@2.0.8
+
+## 2.0.7
+
+### Patch Changes
+
+- :bug: Fikset keyboard-click i monthpicker
+
+- Updated dependencies []:
+  - @navikt/ds-icons@2.0.7
+
+## 2.0.6
+
+### Patch Changes
+
+- DateInput hadde duplikat className satt
+
+- Updated dependencies []:
+  - @navikt/ds-icons@2.0.6
+
 ## 2.0.5
 
 ### Patch Changes

@navikt/core/react/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@navikt/ds-react",
-  "version": "2.0.5",
+  "version": "2.0.14",
   "description": "Aksel react-components for NAV designsystem",
   "author": "Aksel | NAV designsystem team",
   "license": "MIT",
@@ -36,8 +36,8 @@
     "test": "TZ=UTC jest"
   },
   "dependencies": {
-    "@floating-ui/react-dom-interactions": "0.9.2",
-    "@navikt/ds-icons": "^2.0.5",
+    "@floating-ui/react": "0.17.0",
+    "@navikt/ds-icons": "^2.0.14",
     "@radix-ui/react-tabs": "1.0.0",
     "@radix-ui/react-toggle-group": "1.0.0",
     "clsx": "^1.2.1",
@@ -52,7 +52,6 @@
     "@testing-library/user-event": "^14.2.0",
     "@types/faker": "5.5.8",
     "@types/jest": "^29.0.0",
-    "@types/node": "^17.0.35",
     "@types/react-modal": "^3.13.1",
     "concurrently": "7.2.1",
     "copyfiles": "^2.4.1",

@navikt/core/react/src/date/DateInput.tsx

@@ -108,7 +108,6 @@ const DateInput: DateInputType = forwardRef<HTMLInputElement, DateInputProps>(
             autoComplete="off"
             aria-controls={ariaId}
             className={cl(
-              className,
               "navds-date__field-input",
               "navds-text-field__input",
               "navds-body-short",

@navikt/core/react/src/date/monthpicker/MonthButton.tsx

@@ -74,7 +74,6 @@ export const MonthButton = ({
           : -1
       }
       onKeyDown={(e) => {
-        e.preventDefault();
         const next = nextEnabled(
           months,
           e.key,

@navikt/core/react/src/date/utils/__tests__/check-dates.test.ts

@@ -36,7 +36,7 @@ describe("Returns if year is at start or end of range", () => {
     expect(hasNextYear(new Date(), years, 1)).toBeTruthy();
   });
   test("Should have previous year (true)", () => {
-    expect(hasNextYear(new Date("Aug 3 2023"), years, -1)).toBeTruthy();
+    expect(hasNextYear(new Date("Aug 3 2024"), years, -1)).toBeTruthy();
   });
   test("Should not have next year (false)", () => {
     expect(hasNextYear(new Date("Aug 3 2029"), years, 1)).toBeFalsy();

@navikt/core/react/src/form/ConfirmationPanel.tsx

@@ -51,6 +51,7 @@ export const ConfirmationPanel = forwardRef<
             size={props.size}
             className="navds-confirmation-panel__content"
             id={`confirmation-panel-${id}`}
+            as="div"
           >
             {children}
           </BodyLong>

@navikt/core/react/src/form/radio/Radio.tsx

@@ -1,5 +1,5 @@
-import React, { forwardRef, InputHTMLAttributes } from "react";
 import cl from "clsx";
+import React, { forwardRef, InputHTMLAttributes } from "react";
 import { BodyShort, Detail, omit } from "../..";
 import { FormFieldProps } from "../useFormField";
 import { useRadio } from "./useRadio";

@navikt/core/react/src/form/radio/radio.stories.tsx

@@ -23,7 +23,7 @@ export const Default = (props) => {
       value={props.controlled ? state : undefined}
       onChange={props.controlled ? setState : undefined}
       hideLegend={props.hideLegend}
-      error={props.errorGroup ? "Errormelding" : undefined}
+      error={props.error ? "Errormelding" : undefined}
       size={props?.size}
     >
       <Radio value="radio1">{props.children || "Apple"}</Radio>
@@ -41,6 +41,7 @@ export const Default = (props) => {
 
 Default.args = {
   controlled: false,
+  error: false,
   size: "medium",
   legend: "Legend-tekst",
   radioDescription: false,

@navikt/core/react/src/modal/Modal.tsx

@@ -36,6 +36,10 @@ export interface ModalProps {
    * @default true
    */
   closeButton?: boolean;
+  /**
+   *
+   */
+  shouldCloseOnEsc?: boolean;
   /**
    * Allows custom styling of ReactModal, in accordance with their typing
    */
@@ -75,6 +79,7 @@ export const Modal = forwardRef<ReactModal, ModalProps>(
       className,
       overlayClassName,
       shouldCloseOnOverlayClick = true,
+      shouldCloseOnEsc = true,
       closeButton = true,
       "aria-describedby": ariaDescribedBy,
       "aria-labelledby": ariaLabelledBy,
@@ -123,6 +128,7 @@ export const Modal = forwardRef<ReactModal, ModalProps>(
         className={cl("navds-modal", className)}
         overlayClassName={cl("navds-modal__overlay", overlayClassName)}
         shouldCloseOnOverlayClick={shouldCloseOnOverlayClick}
+        shouldCloseOnEsc={shouldCloseOnEsc}
         onRequestClose={(e) => onModalCloseRequest(e)}
         aria={{
           describedby: ariaDescribedBy,

@navikt/core/react/src/popover/Popover.tsx

@@ -8,7 +8,7 @@ import {
   useDismiss,
   useFloating,
   useInteractions,
-} from "@floating-ui/react-dom-interactions";
+} from "@floating-ui/react";
 import cl from "clsx";
 import React, {
   forwardRef,

@navikt/core/react/src/table/ColumnHeader.tsx

@@ -44,6 +44,7 @@ export const ColumnHeader: ColumnHeaderType = forwardRef(
       >
         {sortable ? (
           <button
+            type="button"
             className="navds-table__sort-button"
             onClick={
               sortable && sortKey

@navikt/core/react/src/table/ExpandableRow.tsx

@@ -85,6 +85,7 @@ export const ExpandableRow: ExpandableRowType = forwardRef(
           >
             {!expansionDisabled && (
               <button
+                type="button"
                 className="navds-table__toggle-expand-button"
                 aria-controls={id}
                 aria-expanded={isOpen}

@navikt/core/react/src/tooltip/Tooltip.tsx

@@ -11,7 +11,7 @@ import {
   useFocus,
   useHover,
   useInteractions,
-} from "@floating-ui/react-dom-interactions";
+} from "@floating-ui/react";
 import cl from "clsx";
 import React, {
   cloneElement,

@navikt/core/tailwind/CHANGELOG.md

@@ -1,5 +1,23 @@
 # @navikt/ds-tailwind
 
+## 2.0.14
+
+## 2.0.13
+
+## 2.0.12
+
+## 2.0.11
+
+## 2.0.10
+
+## 2.0.9
+
+## 2.0.8
+
+## 2.0.7
+
+## 2.0.6
+
 ## 2.0.5
 
 ## 2.0.4

@navikt/core/tailwind/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@navikt/ds-tailwind",
-  "version": "2.0.5",
+  "version": "2.0.14",
   "description": "Tailwind config based on @navikt/ds-tokens",
   "author": "Aksel | NAV designsystem team",
   "keywords": [
@@ -22,9 +22,8 @@
     "directory": "@navikt/core/tailwind"
   },
   "devDependencies": {
-    "@navikt/ds-tokens": "^2.0.5",
+    "@navikt/ds-tokens": "^2.0.14",
     "@types/jest": "^29.0.0",
-    "@types/node": "^17.0.35",
     "color": "4.2.3",
     "jest": "^29.0.0",
     "lodash": "^4.17.21",

@navikt/core/tokens/CHANGELOG.md

@@ -1,5 +1,23 @@
 # @navikt/ds-tokens
 
+## 2.0.14
+
+## 2.0.13
+
+## 2.0.12
+
+## 2.0.11
+
+## 2.0.10
+
+## 2.0.9
+
+## 2.0.8
+
+## 2.0.7
+
+## 2.0.6
+
 ## 2.0.5
 
 ## 2.0.4

@navikt/core/tokens/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@navikt/ds-tokens",
-  "version": "2.0.5",
+  "version": "2.0.14",
   "description": "Design-tokens for NAV designsystem",
   "author": "Aksel | NAV designsystem team",
   "keywords": [
@@ -31,7 +31,6 @@
   },
   "devDependencies": {
     "@types/jest": "^29.0.0",
-    "@types/node": "^17.0.35",
     "color": "4.2.3",
     "jest": "^29.0.0",
     "lodash": "^4.17.21",

@navikt/icons/CHANGELOG.md

@@ -1,5 +1,31 @@
 # @navikt/ds-icons
 
+## 2.0.14
+
+## 2.0.13
+
+### Patch Changes
+
+- [`a6c339123`](https://github.com/navikt/Designsystemet/commit/a6c3391237f13394063e4c004ac9efb1875fc944) Thanks [@KenAJoh](https://github.com/KenAJoh)! - Ikonjusteringer sirkleikoner
+
+## 2.0.12
+
+## 2.0.11
+
+### Patch Changes
+
+- Oppdatert svg-path i ikoner
+
+## 2.0.10
+
+## 2.0.9
+
+## 2.0.8
+
+## 2.0.7
+
+## 2.0.6
+
 ## 2.0.5
 
 ## 2.0.4

@navikt/icons/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@navikt/ds-icons",
-  "version": "2.0.5",
+  "version": "2.0.14",
   "description": "Aksel icons for NAV",
   "author": "Aksel | NAV designsystem team",
   "repository": {
@@ -49,7 +49,6 @@
     "@svgr/cli": "6.2.1",
     "@types/jest": "^29.0.0",
     "@types/lodash.startcase": "^4.4.6",
-    "@types/node": "^17.0.35",
     "@types/rimraf": "3.0.2",
     "axios": "^0.21.3",
     "concurrently": "7.2.1",

@navikt/icons/svg/AddCircle.svg

@@ -1,3 +1,5 @@
 <svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M12 0C18.6274 0 24 5.37258 24 12C24 18.6274 18.6274 24 12 24C5.37258 24 0 18.6274 0 12C0 5.37258 5.37258 0 12 0ZM12 2C6.47715 2 2 6.47715 2 12C2 17.5228 6.47715 22 12 22C17.5228 22 22 17.5228 22 12C22 6.47715 17.5228 2 12 2ZM13 6V11H18V13H13V18H11V13H6V11H11V6H13Z" fill="#262626"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M11.75 2.5C6.64137 2.5 2.5 6.64137 2.5 11.75C2.5 16.8586 6.64137 21 11.75 21C16.8586 21 21 16.8586 21 11.75C21 6.64137 16.8586 2.5 11.75 2.5ZM1 11.75C1 5.81294 5.81294 1 11.75 1C17.6871 1 22.5 5.81294 22.5 11.75C22.5 17.6871 17.6871 22.5 11.75 22.5C5.81294 22.5 1 17.6871 1 11.75Z" fill="#262626"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M17 12.75H7V11.25H17V12.75Z" fill="black"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M11.25 17L11.25 7L12.75 7L12.75 17H11.25Z" fill="black"/>
 </svg>

@navikt/icons/svg/AddCircleFilled.svg

@@ -1,3 +1,3 @@
 <svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M12 0C18.6274 0 24 5.37258 24 12C24 18.6274 18.6274 24 12 24C5.37258 24 0 18.6274 0 12C0 5.37258 5.37258 0 12 0ZM13 6V11H18V13H13V18H11V13H6V11H11V6H13Z" fill="#262626"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M11.75 1C5.81294 1 1 5.81294 1 11.75C1 17.6871 5.81294 22.5 11.75 22.5C17.6871 22.5 22.5 17.6871 22.5 11.75C22.5 5.81294 17.6871 1 11.75 1ZM11.25 12.75V17H12.75V12.75H17V11.25H12.75V7H11.25V11.25H7V12.75H11.25Z" fill="#262626"/>
 </svg>

@navikt/icons/svg/Cancel.svg

@@ -1,3 +1,3 @@
 <svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M7.70711 4.7071C8.09763 4.31657 8.09763 3.68341 7.70711 3.29289C7.31658 2.90236 6.68342 2.90236 6.29289 3.29289L2.29289 7.29289C2.10535 7.48042 2 7.73478 2 8C2 8.26521 2.10535 8.51957 2.29289 8.7071L6.29289 12.7071C6.68342 13.0976 7.31658 13.0976 7.70711 12.7071C8.09763 12.3166 8.09763 11.6834 7.70711 11.2929L5.41421 8.99999H15C17.7614 8.99999 20 11.2386 20 14C20 16.7614 17.7614 19 15 19H13.7879C13.2356 19 12.7879 19.4477 12.7879 20C12.7879 20.5523 13.2356 21 13.7879 21H15C18.866 21 22 17.866 22 14C22 10.134 18.866 6.99999 15 6.99999H5.41421L7.70711 4.7071Z" fill="#262626"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M7.70708 4.7071L8.41418 3.99999L6.99997 2.58578L6.29286 3.29288L2.29286 7.29289L1.58575 7.99999L2.29286 8.7071L6.29286 12.7071L6.99997 13.4142L8.41418 12L7.70708 11.2929L5.41418 8.99999H15C17.7614 8.99999 20 11.2386 20 14C20 16.7614 17.7614 19 15 19H13.7878H12.7878V21H13.7878H15C18.866 21 22 17.866 22 14C22 10.134 18.866 6.99999 15 6.99999H5.41418L7.70708 4.7071Z" fill="#262626"/>
 </svg>

@navikt/icons/svg/CancelFilled.svg

@@ -1,3 +1,3 @@
 <svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M2 0C0.895431 0 0 0.89543 0 2V22C0 23.1046 0.89543 24 2 24H22C23.1046 24 24 23.1046 24 22V2C24 0.895431 23.1046 0 22 0H2ZM7.70711 3.29289C8.09763 3.68342 8.09763 4.31658 7.70711 4.70711L5.41422 7H15C18.866 7 22 10.134 22 14C22 17.866 18.866 21 15 21H13.7879C13.2356 21 12.7879 20.5523 12.7879 20C12.7879 19.4477 13.2356 19 13.7879 19H15C17.7614 19 20 16.7614 20 14C20 11.2386 17.7614 9 15 9H5.41421L7.70711 11.2929C8.09763 11.6834 8.09763 12.3166 7.70711 12.7071C7.31659 13.0976 6.68342 13.0976 6.2929 12.7071L2.29289 8.70711C2.10536 8.51957 2 8.26522 2 8C2 7.73479 2.10536 7.48043 2.29289 7.2929L6.2929 3.29289C6.68342 2.90237 7.31659 2.90237 7.70711 3.29289Z" fill="#262626"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M8.41418 3.99999L6.99997 2.58578L1.58575 7.99999L6.99997 13.4142L8.41418 12L5.41418 8.99999H15C17.7614 8.99999 20 11.2386 20 14C20 16.7614 17.7614 19 15 19H12.7878V21H15C18.866 21 22 17.866 22 14C22 10.134 18.866 6.99999 15 6.99999H5.41418L8.41418 3.99999Z" fill="#262626"/>
 </svg>

@navikt/icons/svg/Divide.svg

@@ -1,3 +1,4 @@
 <svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M2 12C2 6.81465 5.94668 2.5511 11 2.04938V12.4142L18.3288 19.743C16.6044 21.1544 14.4017 22 12 22C6.47715 22 2 17.5228 2 12ZM19.7488 21.163C17.6587 22.9321 14.9533 24 12 24C5.37258 24 0 18.6274 0 12C0 5.70934 4.84047 0.549225 11 0.0410738V0H12H13V0.0410738C19.1595 0.549225 24 5.70934 24 12C24 14.9533 22.9321 17.6587 21.163 19.7488L21.1924 19.7782L20.4853 20.4853L19.7782 21.1924L19.7488 21.163ZM19.743 18.3288C21.1543 16.6044 22 14.4017 22 12C22 6.81465 18.0533 2.5511 13 2.04938V11.5858L19.743 18.3288Z" fill="#262626"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M12 2.75C6.89137 2.75 2.75 6.89137 2.75 12C2.75 17.1086 6.89137 21.25 12 21.25C17.1086 21.25 21.25 17.1086 21.25 12C21.25 6.89137 17.1086 2.75 12 2.75ZM1.25 12C1.25 6.06294 6.06294 1.25 12 1.25C17.9371 1.25 22.75 6.06294 22.75 12C22.75 17.9371 17.9371 22.75 12 22.75C6.06294 22.75 1.25 17.9371 1.25 12Z" fill="#262626"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M11.25 2.5H12.75V12.1729L19.5103 18.4504L18.4897 19.5496L11.25 12.8271V2.5Z" fill="black"/>
 </svg>

@navikt/icons/svg/DivideFilled.svg

@@ -1,3 +1,3 @@
 <svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M11 12V0.0410767C4.84047 0.549228 0 5.70934 0 12C0 18.6274 5.37258 24 12 24C14.9922 24 17.7286 22.9048 19.8303 21.0935L11 12ZM24 12C24 12.9017 23.9005 13.7803 23.712 14.6252C23.297 16.4847 22.4505 18.1814 21.2831 19.6048L13 11V0.0410767C18.2766 0.476386 22.5852 4.32557 23.712 9.37485C23.9005 10.2198 24 11.0983 24 12Z" fill="#262626"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M11.25 1.27576C5.66285 1.6608 1.25 6.31506 1.25 12C1.25 17.9371 6.06294 22.75 12 22.75C14.5711 22.75 16.9313 21.8474 18.7812 20.3418L11.25 12.8107V1.27576ZM19.8766 19.3159C21.6596 17.3972 22.75 14.8259 22.75 12C22.75 6.31506 18.3372 1.6608 12.75 1.27576V12.1893L19.8766 19.3159Z" fill="#262626"/>
 </svg>

@navikt/icons/svg/Forward.svg

@@ -1,3 +1,3 @@
 <svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M3 17V18H5V17H3ZM20 10L20.7071 10.7071L21.4142 10L20.7071 9.29289L20 10ZM16.7071 5.29289L16 4.58579L14.5858 6L15.2929 6.70711L16.7071 5.29289ZM15.2929 13.2929L14.5858 14L16 15.4142L16.7071 14.7071L15.2929 13.2929ZM5 17V14H3V17H5ZM8 11H20V9H8V11ZM20.7071 9.29289L16.7071 5.29289L15.2929 6.70711L19.2929 10.7071L20.7071 9.29289ZM19.2929 9.29289L15.2929 13.2929L16.7071 14.7071L20.7071 10.7071L19.2929 9.29289ZM5 14C5 12.3431 6.34315 11 8 11V9C5.23858 9 3 11.2386 3 14H5Z" fill="#262626"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M16 4.58579L21.4142 10L16 15.4142L14.5858 14L17.5858 11H8C6.34315 11 5 12.3431 5 14V18H3V14C3 11.2386 5.23858 9 8 9H17.5858L14.5858 6.00001L16 4.58579Z" fill="#262626"/>
 </svg>

@navikt/icons/svg/ForwardFilled.svg

@@ -1,3 +1,3 @@
 <svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M3 17V18H5V17H3ZM20 10L20.7071 10.7071L21.4142 10L20.7071 9.29289L20 10ZM16.7071 5.29289L16 4.58579L14.5858 6L15.2929 6.70711L16.7071 5.29289ZM15.2929 13.2929L14.5858 14L16 15.4142L16.7071 14.7071L15.2929 13.2929ZM5 17V14H3V17H5ZM8 11H20V9H8V11ZM20.7071 9.29289L16.7071 5.29289L15.2929 6.70711L19.2929 10.7071L20.7071 9.29289ZM19.2929 9.29289L15.2929 13.2929L16.7071 14.7071L20.7071 10.7071L19.2929 9.29289ZM5 14C5 12.3431 6.34315 11 8 11V9C5.23858 9 3 11.2386 3 14H5Z" fill="#262626"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M16 4.58578L21.4142 10L16 15.4142L14.5858 14L17.5858 11H8C6.34315 11 5 12.3431 5 14V18H3V14C3 11.2386 5.23858 9 8 9H17.5858L14.5858 6L16 4.58578Z" fill="#262626"/>
 </svg>

@navikt/icons/svg/FullscreenEnterFilled.svg

@@ -1,3 +1,3 @@
 <svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M1 0C0.447715 0 0 0.447716 0 1V23C0 23.5523 0.447716 24 1 24H23C23.5523 24 24 23.5523 24 23V1C24 0.447715 23.5523 0 23 0H1ZM12.2928 10.2929L17.5857 5L13 5V3H21V11H19V6.41412L13.707 11.7071L12.2928 10.2929ZM5 17.5859V13H3V21H11V19H6.4143L11.7072 13.7071L10.293 12.2929L5 17.5859Z" fill="#262626"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M17.5857 5L12.2928 10.2929L13.707 11.7071L19 6.41412V11H21V3H13V5L17.5857 5ZM5 13V17.5859L10.293 12.2929L11.7072 13.7071L6.4143 19H11V21H3V13H5Z" fill="#262626"/>
 </svg>

@navikt/icons/svg/FullscreenExitFilled.svg

@@ -1,3 +1,3 @@
 <svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M1 0C0.447715 0 0 0.447716 0 1V23C0 23.5523 0.447716 24 1 24H23C23.5523 24 24 23.5523 24 23V1C24 0.447715 23.5523 0 23 0H1ZM21.7068 3.70709L16.414 8.99998H20.9999V11H12.9999V2.99998H14.9999V7.5856L20.2926 2.29288L21.7068 3.70709ZM2.29272 20.2929L7.58562 15L2.99991 15L2.99991 13L10.9999 13L10.9999 21H8.99991V16.4141L3.70694 21.7071L2.29272 20.2929Z" fill="#262626"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M16.414 8.99998L21.7068 3.70709L20.2926 2.29288L14.9999 7.5856V2.99998H12.9999V11H20.9999V8.99998H16.414ZM7.58562 15L2.29272 20.2929L3.70694 21.7071L8.99991 16.4141L8.99991 21H10.9999L10.9999 13L2.99991 13L2.99991 15L7.58562 15Z" fill="#262626"/>
 </svg>

@navikt/icons/svg/MinusCircle.svg

@@ -1,3 +1,4 @@
 <svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M12 0C18.6274 0 24 5.37258 24 12C24 18.6274 18.6274 24 12 24C5.37258 24 0 18.6274 0 12C0 5.37258 5.37258 0 12 0ZM12 2C6.47715 2 2 6.47715 2 12C2 17.5228 6.47715 22 12 22C17.5228 22 22 17.5228 22 12C22 6.47715 17.5228 2 12 2ZM18 11H6V13H18V11Z" fill="#262626"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M11.75 2.5C6.64137 2.5 2.5 6.64137 2.5 11.75C2.5 16.8586 6.64137 21 11.75 21C16.8586 21 21 16.8586 21 11.75C21 6.64137 16.8586 2.5 11.75 2.5ZM1 11.75C1 5.81294 5.81294 1 11.75 1C17.6871 1 22.5 5.81294 22.5 11.75C22.5 17.6871 17.6871 22.5 11.75 22.5C5.81294 22.5 1 17.6871 1 11.75Z" fill="#262626"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M17 12.75H7V11.25H17V12.75Z" fill="black"/>
 </svg>

@navikt/icons/svg/MinusCircleFilled.svg

@@ -1,3 +1,3 @@
 <svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M24 12C24 5.37258 18.6274 0 12 0C5.37258 0 0 5.37258 0 12C0 18.6274 5.37258 24 12 24C18.6274 24 24 18.6274 24 12ZM18 11H6V13H18V11Z" fill="#262626"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M11.75 1C5.81294 1 1 5.81294 1 11.75C1 17.6871 5.81294 22.5 11.75 22.5C17.6871 22.5 22.5 17.6871 22.5 11.75C22.5 5.81294 17.6871 1 11.75 1ZM7 12.75H17V11.25H7V12.75Z" fill="#262626"/>
 </svg>

@navikt/icons/svg/Refresh.svg

@@ -1,3 +1,3 @@
 <svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M9.70711 3.7071C10.0976 3.31658 10.0976 2.68341 9.70711 2.29289C9.31658 1.90237 8.68342 1.90237 8.29289 2.29289L5.29289 5.29289C5.10535 5.48043 5 5.73478 5 6C5 6.26522 5.10535 6.51957 5.29289 6.70711L8.29289 9.7071C8.68342 10.0976 9.31658 10.0976 9.70711 9.7071C10.0976 9.31658 10.0976 8.68341 9.70711 8.29289L8.41421 7H17C18.6569 7 20 8.34314 20 10V12C20 12.5523 20.4477 13 21 13C21.5523 13 22 12.5523 22 12V10C22 7.23857 19.7614 5 17 5H8.41421L9.70711 3.7071ZM14.2929 20.2929C13.9024 20.6834 13.9024 21.3166 14.2929 21.7071C14.6834 22.0976 15.3166 22.0976 15.7071 21.7071L18.7071 18.7071C18.8946 18.5196 19 18.2652 19 18C19 17.7348 18.8946 17.4804 18.7071 17.2929L15.7071 14.2929C15.3166 13.9024 14.6834 13.9024 14.2929 14.2929C13.9024 14.6834 13.9024 15.3166 14.2929 15.7071L15.5858 17L7 17C5.34314 17 4 15.6568 4 14L4 12C4 11.4477 3.55228 11 3 11C2.44771 11 2 11.4477 2 12V14C2 16.7614 4.23858 19 7 19H15.5858L14.2929 20.2929Z" fill="#262626"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M9.70711 3.7071L10.4142 2.99999L9 1.58578L8.29289 2.29289L5.29289 5.29289L4.58578 6L5.29289 6.7071L8.29289 9.7071L9 10.4142L10.4142 8.99999L9.70711 8.29289L8.41421 6.99999H17C18.6569 6.99999 20 8.34314 20 9.99999V12V13H22V12V9.99999C22 7.23857 19.7614 4.99999 17 4.99999H8.41421L9.70711 3.7071ZM14.2929 20.2929L13.5858 21L15 22.4142L15.7071 21.7071L18.7071 18.7071L19.4142 18L18.7071 17.2929L15.7071 14.2929L15 13.5858L13.5858 15L14.2929 15.7071L15.5858 17L7 17C5.34314 17 4 15.6568 4 14L4 12L4 11H2V12V14C2 16.7614 4.23858 19 7 19H15.5858L14.2929 20.2929Z" fill="#262626"/>
 </svg>

@navikt/icons/svg/RefreshFilled.svg

@@ -1,3 +1,3 @@
 <svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M2 0C0.895431 0 0 0.89543 0 2V22C0 23.1046 0.89543 24 2 24H22C23.1046 24 24 23.1046 24 22V2C24 0.895431 23.1046 0 22 0H2ZM9.70711 2.29289C10.0976 2.68342 10.0976 3.31658 9.70711 3.70711L8.41421 5H17C19.7614 5 22 7.23858 22 10V12C22 12.5523 21.5523 13 21 13C20.4477 13 20 12.5523 20 12V10C20 8.34315 18.6569 7 17 7H8.41421L9.70711 8.29289C10.0976 8.68342 10.0976 9.31658 9.70711 9.70711C9.31658 10.0976 8.68342 10.0976 8.29289 9.70711L5.29289 6.70711C5.10535 6.51957 5 6.26522 5 6C5 5.73479 5.10535 5.48043 5.29289 5.2929L8.29289 2.29289C8.68342 1.90237 9.31658 1.90237 9.70711 2.29289ZM14.2929 21.7071C13.9024 21.3166 13.9024 20.6834 14.2929 20.2929L15.5858 19H7C4.23858 19 2 16.7614 2 14V12C2 11.4477 2.44771 11 3 11C3.55228 11 4 11.4477 4 12V14C4 15.6569 5.34314 17 7 17H15.5858L14.2929 15.7071C13.9024 15.3166 13.9024 14.6834 14.2929 14.2929C14.6834 13.9024 15.3166 13.9024 15.7071 14.2929L18.7071 17.2929C18.8946 17.4804 19 17.7348 19 18C19 18.2652 18.8946 18.5196 18.7071 18.7071L15.7071 21.7071C15.3166 22.0976 14.6834 22.0976 14.2929 21.7071Z" fill="#262626"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M9.70711 3.7071L10.4142 2.99999L9 1.58578L8.29289 2.29289L5.29289 5.29289L4.58578 6L5.29289 6.7071L8.29289 9.7071L9 10.4142L10.4142 8.99999L9.70711 8.29289L8.41421 6.99999H17C18.6569 6.99999 20 8.34314 20 9.99999V12V13H22V12V9.99999C22 7.23857 19.7614 4.99999 17 4.99999H8.41421L9.70711 3.7071ZM14.2929 20.2929L13.5858 21L15 22.4142L15.7071 21.7071L18.7071 18.7071L19.4142 18L18.7071 17.2929L15.7071 14.2929L15 13.5858L13.5858 15L14.2929 15.7071L15.5858 17L7 17C5.34314 17 4 15.6568 4 14L4 12L4 11H2V12V14C2 16.7614 4.23858 19 7 19H15.5858L14.2929 20.2929Z" fill="#262626"/>
 </svg>

@navikt/icons/svg/Reset.svg

@@ -1,3 +1,3 @@
 <svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M6.70817 6C8.11909 4.75448 9.9715 4 12 4C16.4183 4 20 7.58172 20 12C20 16.4183 16.4183 20 12 20C7.58172 20 4 16.4183 4 12H2C2 17.5228 6.47715 22 12 22C17.5228 22 22 17.5228 22 12C22 6.47715 17.5228 2 12 2C9.27396 2 6.80296 3.09136 5 4.85869L5 2H3L3 8H9V6H6.70817Z" fill="#262626"/>
+<path d="M6.70817 6C8.11909 4.75448 9.9715 4 12 4C16.4183 4 20 7.58172 20 12C20 16.4183 16.4183 20 12 20C7.58172 20 4 16.4183 4 12H2C2 17.5228 6.47715 22 12 22C17.5228 22 22 17.5228 22 12C22 6.47715 17.5228 2 12 2C9.27396 2 6.80296 3.09136 5 4.85869L5 2H3L3 8H9V6H6.70817Z" fill="#262626"/>
 </svg>

@navikt/internal/css/CHANGELOG.md

@@ -1,5 +1,23 @@
 # @navikt/ds-css-internal
 
+## 2.0.14
+
+## 2.0.13
+
+## 2.0.12
+
+## 2.0.11
+
+## 2.0.10
+
+## 2.0.9
+
+## 2.0.8
+
+## 2.0.7
+
+## 2.0.6
+
 ## 2.0.5
 
 ## 2.0.4

@navikt/internal/css/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@navikt/ds-css-internal",
-  "version": "2.0.5",
+  "version": "2.0.14",
   "description": "CSS for NAV internal Designsystem-components",
   "author": "Aksel | NAV designsystem team",
   "keywords": [

@navikt/internal/react/CHANGELOG.md

@@ -1,5 +1,77 @@
 # @navikt/ds-react-internal
 
+## 2.0.14
+
+### Patch Changes
+
+- Updated dependencies [[`8e5c55443`](https://github.com/navikt/Designsystemet/commit/8e5c554431c98b1b658c5054c0b3cf08b8a65e52)]:
+  - @navikt/ds-react@2.0.14
+  - @navikt/ds-icons@2.0.14
+
+## 2.0.13
+
+### Patch Changes
+
+- Updated dependencies [[`a6c339123`](https://github.com/navikt/Designsystemet/commit/a6c3391237f13394063e4c004ac9efb1875fc944)]:
+  - @navikt/ds-icons@2.0.13
+  - @navikt/ds-react@2.0.13
+
+## 2.0.12
+
+### Patch Changes
+
+- Updated dependencies []:
+  - @navikt/ds-react@2.0.12
+  - @navikt/ds-icons@2.0.12
+
+## 2.0.11
+
+### Patch Changes
+
+- Updated dependencies []:
+  - @navikt/ds-icons@2.0.11
+  - @navikt/ds-react@2.0.11
+
+## 2.0.10
+
+### Patch Changes
+
+- Updated dependencies []:
+  - @navikt/ds-react@2.0.10
+  - @navikt/ds-icons@2.0.10
+
+## 2.0.9
+
+### Patch Changes
+
+- Updated dependencies []:
+  - @navikt/ds-react@2.0.9
+  - @navikt/ds-icons@2.0.9
+
+## 2.0.8
+
+### Patch Changes
+
+- Updated dependencies []:
+  - @navikt/ds-react@2.0.8
+  - @navikt/ds-icons@2.0.8
+
+## 2.0.7
+
+### Patch Changes
+
+- Updated dependencies []:
+  - @navikt/ds-react@2.0.7
+  - @navikt/ds-icons@2.0.7
+
+## 2.0.6
+
+### Patch Changes
+
+- Updated dependencies []:
+  - @navikt/ds-react@2.0.6
+  - @navikt/ds-icons@2.0.6
+
 ## 2.0.5
 
 ### Patch Changes

@navikt/internal/react/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@navikt/ds-react-internal",
-  "version": "2.0.5",
+  "version": "2.0.14",
   "description": "Aksel react components for internal UIs in NAV",
   "author": "Aksel | NAV designsystem team",
   "license": "MIT",
@@ -35,13 +35,12 @@
     "watch": "tsc --watch -p tsconfig.esm.json"
   },
   "dependencies": {
-    "@navikt/ds-icons": "^2.0.5",
-    "@navikt/ds-react": "^2.0.5",
+    "@navikt/ds-icons": "^2.0.14",
+    "@navikt/ds-react": "^2.0.14",
     "clsx": "^1.1.1",
     "copy-to-clipboard": "^3.3.1"
   },
   "devDependencies": {
-    "@types/node": "^17.0.35",
     "concurrently": "7.2.1",
     "rimraf": "^3.0.2",
     "ts-node": "10.9.0",

aksel.nav.no/README.md

@@ -65,11 +65,6 @@ Blir brukt flere keys i .env under `./website`, men kun `SANITY_PRIVATE_NO_DRAFT
 
 - SANITY_WRITE_KEY:
   For å sende dokumenter til sanity, brukt til å oppdatere sandboxes/examples/farger. Trengs bare hvis kode skal synkes fra lokal branch
-- ALGOLIA_ADMIN:
-  For å oppdatere records i søkemotoren. Trengs bare hvis man oppdaterer søkeindexen lokalt.
-- ALGOLIA_ID:
-  Søkemotor index-id for å redigere riktig Index. Trengs bare for at søk skal fungere lokalt
-- TRELLO_TOKEN: Sender feedback til et egent trello-board. Ikke nødvendig lokalt hvis man ikke vil teste feedback-modulen.
 - SANITY_PREVIEW_TOKEN: Gir appen tilgang til å lese draft innhold fra sanity i "preview"-mode. Trengs for å teste preview-sider
 - SANITY_PRIVATE_NO_DRAFTS: Gir appen tilgang til å lese innhold fra Sanity da datasettet er privat
 
@@ -89,4 +84,4 @@ Kjøres backups hver 3 dag til GCP-bucket under `designsystem-prod`
 
 Spørsmål og kontakt kan rettes til team Aksel
 
-Aksel har også en egen slack-kanal #aksel
+Aksel har også en egen Slack-kanal #Aksel-designsystemet

aksel.nav.no/crawler.json

@@ -1,48 +0,0 @@
-{
-  "index_name": "aksel_docsearch",
-  "start_urls": [
-    "https://aksel.nav.no/",
-    {
-      "url": "https://aksel.nav.no/designsystem",
-      "tags": ["designsystem", "docs"]
-    },
-    {
-      "url": "https://aksel.nav.no/artikkel/",
-      "tags": ["aksel"],
-      "selectors_key": "aksel"
-    },
-    {
-      "url": "https://aksel.nav.no/blogg/",
-      "tags": ["aksel"],
-      "selectors_key": "aksel"
-    }
-  ],
-  "selectors": {
-    "default": {
-      "lvl0": {
-        "selector": "h1.algolia-index-lvl1",
-        "global": true
-      },
-      "lvl1": ".algolia-index-tabs--active",
-      "lvl2": "h2.algolia-index-lvl2",
-      "lvl3": "h3.algolia-index-lvl3",
-      "text": "p.algolia-index-body, p.algolia-index-ingress"
-    },
-    "aksel": {
-      "lvl0": {
-        "selector": "h1.algolia-index-lvl1",
-        "global": true
-      },
-      "lvl1": "h2.algolia-index-lvl2",
-      "lvl2": "h3.algolia-index-lvl3",
-      "text": "p.algolia-index-body, p.algolia-index-ingress"
-    }
-  },
-  "selectors_exclude": [".algolia-ignore-index"],
-  "stop_urls": [
-    "https://aksel.nav.no/preview",
-    "https://old-design-nav.vercel.app"
-  ],
-  "sitemap_urls": ["https://aksel.nav.no/api/sitemap"],
-  "js_render": true
-}

aksel.nav.no/nais-dev.yaml

@@ -40,10 +40,3 @@ spec:
         - host: cdn.sanity.io
       rules: []
       env:
-  azure:
-    application:
-      enabled: true
-      allowAllUsers: true
-      tenant: nav.no
-    sidecar:
-      enabled: true

aksel.nav.no/nais-prod.yaml

@@ -38,13 +38,6 @@ spec:
         - host: cdn.sanity.io
       rules: []
       env:
-  azure:
-    application:
-      enabled: true
-      allowAllUsers: true
-      tenant: nav.no
-    sidecar:
-      enabled: true
   gcp:
     buckets:
       - name: aksel-website-prod

aksel.nav.no/package.json

@@ -8,25 +8,21 @@
     "dev": "yarn workspace website dev",
     "build:next": "yarn workspace website build",
     "serve:next": "yarn workspace website start",
-    "sanity": "yarn workspace sanity start",
-    "sanity:deploy": "yarn workspace sanity deploy",
-    "sanity:backup": "yarn workspace sanity backup",
     "sanity:update": "yarn workspace website update:sanity",
     "test": "yarn workspace website test"
   },
   "workspaces": [
-    "sanity",
     "website"
   ],
   "dependencies": {
-    "@navikt/ds-codemod": "^2.0.5",
-    "@navikt/ds-css": "^2.0.5",
-    "@navikt/ds-css-internal": "^2.0.5",
-    "@navikt/ds-icons": "^2.0.5",
-    "@navikt/ds-react": "^2.0.5",
-    "@navikt/ds-react-internal": "^2.0.5",
-    "@navikt/ds-tailwind": "^2.0.5",
-    "@navikt/ds-tokens": "^2.0.5"
+    "@navikt/ds-codemod": "^2.0.14",
+    "@navikt/ds-css": "^2.0.14",
+    "@navikt/ds-css-internal": "^2.0.14",
+    "@navikt/ds-icons": "^2.0.14",
+    "@navikt/ds-react": "^2.0.14",
+    "@navikt/ds-react-internal": "^2.0.14",
+    "@navikt/ds-tailwind": "^2.0.14",
+    "@navikt/ds-tokens": "^2.0.14"
   },
   "devDependencies": {
     "prettier-plugin-tailwindcss": "^0.1.13"

aksel.nav.no/sanity/.gitignore

@@ -0,0 +1,2 @@
+.yarn/cache
+*.tar.gz

aksel.nav.no/sanity/client/actions/set-private.tsx

@@ -62,8 +62,8 @@ export default function SetPrivateAction(props) {
               dele offentlig kan medføre eks omdømmetap og uønsket oppmerksomhet
               utenfra. Dobbelsjekk med temaansvarlig og andre som har skrevet
               artikkelen før du velger å åpne innholdet for alle. Er du usikker
-              er det bare å sende en melding på #aksel eller #aksel-redaktører
-              på slack.
+              er det bare å sende en melding på #Aksel-designsystemet eller
+              #aksel-redaktører på Slack.
             </BodyLong>
           ) : (
             <>

aksel.nav.no/sanity/client/bundleCheck.tsx

@@ -1,8 +1,8 @@
 import { useEffect } from "react";
 import config from "config:sanity";
 
-const BUNDLE_CHECK_INTERVAL = 60 * 1000;
-const BUNDLE_CHECK_INTERVAL_DECLINED = 60 * 10000;
+const BUNDLE_CHECK_INTERVAL = 60 * 5000;
+const BUNDLE_CHECK_INTERVAL_DECLINED = 60 * 20000;
 const CHANGES_AVAILABLE_MESSAGE =
   "Studioet er har nye endringer! For å ta i bruk disse vil siden nå oppdateres for den nyeste versjonen.";
 
@@ -25,6 +25,11 @@ const BundleChecker = () => {
     interval = createInterval();
 
     return () => clearInterval(interval);
+
+    /*
+    TODO: @release uncomment for redirecting to new studio
+    */
+    /* window.location.replace(`http://aksel.nav.no/admin`); */
   }, []);
 
   // We're a react component, in theory, so return null to not render anything

aksel.nav.no/sanity/client/desk-structure/admin.tsx

@@ -11,11 +11,6 @@ export const adminPanel = async (roles) =>
       S.list()
         .title("Admin")
         .items([
-          S.documentListItem()
-            .title(`Forside Aksel`)
-            .schemaType(`vk_frontpage`)
-            .icon(() => <Picture />)
-            .id(`frontpage_vk_praksis`),
           S.listItem()
             .title("Standalone-sider")
             .child(S.documentTypeList("aksel_standalone")),

aksel.nav.no/sanity/client/desk-structure/aksel.tsx

@@ -68,7 +68,9 @@ export const akselInnhold = async () => {
                 })
               )
             ),
-          S.listItem().title("Blogg").child(S.documentTypeList("aksel_blogg")),
+          S.listItem()
+            .title("Produktbloggen")
+            .child(S.documentTypeList("aksel_blogg")),
           S.listItem()
             .title("Prinsipper")
             .child(

aksel.nav.no/sanity/client/desk-structure/ds.tsx

@@ -93,18 +93,10 @@ export const dsPanel = async (roles) => {
                       .title("Eksempler")
                       .icon(() => <span>{`EX`}</span>)
                       .child(S.documentTypeList("kode_eksempler_fil")),
-                    S.listItem()
-                      .title("Fargekategorier")
-                      .icon(() => <Folder />)
-                      .child(S.documentTypeList("ds_color_categories")),
                     S.listItem()
                       .title("Props")
                       .icon(() => <Folder />)
                       .child(S.documentTypeList("ds_props")),
-                    S.listItem()
-                      .title("Tokens")
-                      .icon(() => <Folder />)
-                      .child(S.documentTypeList("ds_tokens")),
                     S.listItem()
                       .title("Token-kategorier")
                       .icon(() => <Folder />)

aksel.nav.no/sanity/components/profile/profile-page.tsx

@@ -75,8 +75,8 @@ const IntroPage = React.forwardRef<HTMLDivElement, Props>((props, ref) => {
       >
         <ReadMore header="Har du ikke de rollene du trenger?">
           Send en melding til oss på{" "}
-          <Link href="https://nav-it.slack.com/archives/C0370ADS0HX">
-            #Aksel
+          <Link href="https://nav-it.slack.com/archives/C7NE7A8UF">
+            #Aksel-designsystemet
           </Link>{" "}
           slack så fikser vi det.
         </ReadMore>

aksel.nav.no/sanity/config/.checksums

@@ -5,5 +5,6 @@
   "@sanity/form-builder": "b38478227ba5e22c91981da4b53436df22e48ff25238a55a973ed620be5068aa",
   "@sanity/data-aspects": "d199e2c199b3e26cd28b68dc84d7fc01c9186bf5089580f2e2446994d36b3cb6",
   "@sanity/vision": "da5b6ed712703ecd04bf4df560570c668aa95252c6bc1c41d6df1bda9b8b8f60",
-  "power-table": "922902575995e62af8f628e6abe652ecc5f3b1e1d2dec5859392e79e47707088"
+  "power-table": "922902575995e62af8f628e6abe652ecc5f3b1e1d2dec5859392e79e47707088",
+  "table": "e56785cc6cecbacf8ebe6bb99ffae32b973e233503c0714497ac7df3042863f1"
 }

aksel.nav.no/sanity/lib/fields.tsx

@@ -38,14 +38,6 @@ export const publishedAtField = {
     !currentUser.roles.find((x) => x.name === "administrator"),
 };
 
-export const migratedField = {
-  title: "Migrert riktekst",
-  name: "isMigrated",
-  type: "boolean",
-  hidden: true,
-  initialValue: true,
-};
-
 export const titleField = {
   title: "Sidetittel",
   name: "heading",
@@ -111,19 +103,3 @@ export const innholdFieldNewNested = (name?: string, type?: string) => {
   delete fields.group;
   return fields;
 };
-
-export const hidePageFeedback = {
-  title: "Tilbakemeldinger",
-  name: "metadata_feedback",
-  type: "object",
-  group: "settings",
-  fields: [
-    {
-      title: "Skjul artikkel feedback modul",
-      description: "Gjemmer <<Var denne artikkelen til hjelp?>> modulen.",
-      name: "hide_feedback",
-      type: "boolean",
-      initialValue: false,
-    },
-  ],
-};

aksel.nav.no/sanity/lib/index.ts

@@ -114,3 +114,41 @@ export const groups = [
     title: "SEO",
   },
 ];
+
+export const validateKategoriSlug = (Rule, prefix) =>
+  Rule.required().custom((slug, { document }) => {
+    if (!slug.current.startsWith(`${prefix}${document?.kategori}/`)) {
+      return `Slug må starte med prefiks: ${prefix}${document?.kategori}`;
+    }
+    if ((slug.current.match(/\//g) || []).length > 3 - 1) {
+      return `Siden kan bare være på ${3} nivå`;
+    }
+    return true;
+  });
+
+export const kategoriSlug = (prefix: string) => ({
+  title: "url (v2)",
+  name: "slug_v2",
+  type: "slug",
+  validation: (Rule) => validateKategoriSlug(Rule, prefix),
+  group: "settings",
+  options: {
+    source: (s) => `${s?.kategori}/${s?.heading}`,
+    slugify: (input) => {
+      return (
+        `${prefix}${input}`
+          .toLowerCase()
+          .trim()
+          .slice(0, 200)
+          .trim()
+          .replace(/\s+/g, "-")
+          .replace(/-+/gm, "-")
+          .replace(/æ/g, "a")
+          .replace(/å/g, "a")
+          .replace(/ø/g, "o")
+          // eslint-disable-next-line no-useless-escape
+          .replace(/[&\\#!,+()$~%.'"¨:*?<>{}]/g, "")
+      );
+    },
+  },
+});

aksel.nav.no/sanity/package.json

@@ -10,7 +10,10 @@
     "build": "sanity build",
     "deploy": "yarn typegen && sanity deploy",
     "backup": "node scripts/backup.js",
-    "typegen": "sanity exec typegen.ts"
+    "typegen": "sanity exec typegen.ts",
+    "sanity:dev": "sanity start",
+    "sanity:deploy": "yarn typegen && sanity deploy",
+    "sanity:backup": "node scripts/backup.js"
   },
   "main": "package.json",
   "keywords": [
@@ -29,6 +32,7 @@
     "@sanity/export": "^2.30.3",
     "@sanity/production-preview": "^2.29.3",
     "@sanity/react-hooks": "^2.35.0",
+    "@sanity/ui": "^0.37.22",
     "@sanity/vision": "^2.35.0",
     "moment": "2.29.4",
     "sanity-codegen": "0.9.8",

aksel.nav.no/sanity/schemas/documents/aksel-artikkel.tsx

@@ -4,7 +4,6 @@ import {
   groups,
   ingressField,
   innholdFieldNew,
-  migratedField,
   publishedAtField,
   relevanteArtiklerField,
   sanitySlug,
@@ -12,7 +11,7 @@ import {
   titleField,
 } from "@/lib";
 
-const prefix = "artikkel/";
+const prefix = "god-praksis/artikler/";
 
 export default {
   title: "Aksel Artikkel",
@@ -22,9 +21,24 @@ export default {
   ...defaultDocPreview,
   fields: [
     publishedAtField,
+    {
+      title: "Sist godkjent",
+      name: "updateInfo",
+      type: "object",
+      hidden: true,
+      fields: [
+        {
+          type: "date",
+          name: "lastVerified",
+          title: "Sist oppdatert",
+          description: "Kun synlig for utviklere",
+          readOnly: true,
+        },
+      ],
+    },
     editorField,
     titleField,
-    sanitySlug(prefix, 2),
+    sanitySlug(prefix, 3),
     {
       title: "Tema",
       description: "Legg til de viktigeste temaene",
@@ -39,6 +53,5 @@ export default {
     relevanteArtiklerField,
 
     SEOFields,
-    migratedField,
   ],
 };

aksel.nav.no/sanity/schemas/documents/aksel/index.tsx

@@ -1,5 +0,0 @@
-export { default as Artikkel } from "./articles/artikkel";
-export { default as Blogg } from "./articles/blogg";
-export { default as Tema } from "./tema";
-export { default as Prinsipp } from "./articles/prinsipp";
-export { default as Standalone } from "./articles/standalone";

aksel.nav.no/sanity/schemas/documents/blogg.tsx

@@ -4,14 +4,13 @@ import {
   groups,
   ingressField,
   innholdFieldNew,
-  migratedField,
   publishedAtField,
   sanitySlug,
   SEOFields,
   titleField,
 } from "@/lib";
 
-const prefix = "blogg/";
+const prefix = "produktbloggen/";
 
 export default {
   title: "Blogg",
@@ -28,6 +27,5 @@ export default {
     innholdFieldNew,
 
     SEOFields,
-    migratedField,
   ],
 };

aksel.nav.no/sanity/schemas/documents/component-template.tsx

@@ -1,4 +1,4 @@
-import { KomponentArtikkel } from "./index";
+import KomponentArtikkel from "./komponent";
 
 export default {
   ...KomponentArtikkel,

aksel.nav.no/sanity/schemas/documents/designsystem/articles/artikkel.tsx

@@ -1,83 +0,0 @@
-import {
-  defaultDocPreview,
-  editorField,
-  groups,
-  hidePageFeedback,
-  innholdFieldNew,
-  innholdFieldNewNested,
-  migratedField,
-  publishedAtField,
-  sanitySlug,
-  titleField,
-} from "@/lib";
-
-const prefix = "designsystem/side/";
-
-export default {
-  title: "Artikkel",
-  name: "ds_artikkel",
-  type: "document",
-  groups,
-  ...defaultDocPreview,
-  fields: [
-    migratedField,
-    publishedAtField,
-    editorField,
-    titleField,
-    sanitySlug(prefix, 3),
-    {
-      title: "Layout",
-      description:
-        "'Full' bruker hele bredden, men fjerner table of content (bruk bare for eks ikonside eller komponentvisning)",
-      name: "layout",
-      type: "string",
-      group: "settings",
-      options: {
-        list: [
-          { title: "Full", value: "full" },
-          { title: "Default", value: "default" },
-        ],
-        layout: "radio",
-      },
-      initialValue: "default",
-    },
-    {
-      type: "boolean",
-      name: "artikkel_type",
-      title: "Bruk Tabs",
-      group: "innhold",
-      initialValue: false,
-    },
-    {
-      ...innholdFieldNew,
-      type: "riktekst_ds_artikkel",
-      hidden: ({ document }) => !!document?.artikkel_type,
-    },
-    {
-      name: "content_tabs",
-      title: "Innhold i Tabs",
-      type: "array",
-      group: "innhold",
-      hidden: ({ document }) => !document?.artikkel_type,
-      of: [
-        {
-          name: "tab",
-          title: "Tab",
-          type: "object",
-          fields: [
-            {
-              title: "Tittel",
-              description: "Innhold vil da legges under url/tab-tittel",
-              name: "title",
-              type: "string",
-              validation: (Rule) =>
-                Rule.required().error("Tabben må ha en enkel tittel"),
-            },
-            innholdFieldNewNested(),
-          ],
-        },
-      ],
-    },
-    hidePageFeedback,
-  ],
-};

aksel.nav.no/sanity/schemas/documents/designsystem/automated/color-categories.tsx

@@ -1,93 +0,0 @@
-export default {
-  title: "Fargekategori",
-  name: "ds_color_categories",
-  type: "document",
-  fields: [
-    {
-      title: "Tittel",
-      name: "title",
-      type: "string",
-      validation: (Rule) => Rule.required(),
-    },
-    {
-      title: "Beskrivelse",
-      name: "description",
-      type: "riktekst_enkel",
-    },
-    {
-      type: "array",
-      name: "colors",
-      title: "Farger",
-      of: [{ type: "ds_color" }],
-      options: {
-        sortable: false,
-      },
-    },
-  ],
-};
-
-export const Color = {
-  name: "ds_color",
-  title: "Farge",
-  type: "object",
-  fields: [
-    {
-      name: "title",
-      title: "Navn",
-      type: "string",
-      validation: (Rule) => Rule.required(),
-      readOnly: true,
-    },
-    {
-      name: "full_title",
-      title: "CSS variabelnavn",
-      type: "string",
-      validation: (Rule) => Rule.required(),
-      readOnly: true,
-    },
-    {
-      title: "Fargetype/nivå",
-      name: "color_type",
-      type: "string",
-      validation: (Rule) => Rule.required(),
-      initialValue: "global",
-      readOnly: true,
-      options: {
-        layout: "radio",
-        list: [
-          { value: "global", title: "Global" },
-          { value: "semantic", title: "Semantic" },
-        ],
-      },
-    },
-    {
-      name: "color_name",
-      title: "Brukt fargenavn",
-      type: "string",
-      readOnly: true,
-      hidden: ({ parent }) => parent?.color_type === "global",
-    },
-    {
-      name: "color_roles",
-      title: "Fargeroller",
-      type: "array",
-      hidden: ({ parent }) => parent?.color_type === "global",
-      of: [{ type: "string", name: "role" }],
-    },
-    {
-      name: "color_value",
-      title: "Brukt farge",
-      type: "string",
-      readOnly: true,
-      validation: (Rule) => Rule.required(),
-    },
-    {
-      name: "color_index",
-      title: "Fargeindeks",
-      type: "number",
-      description:
-        "Brukes for å endre rekkefølgen på listen. Farger med indeks 0 vil være først, større tall sorteres under der igjen",
-    },
-  ],
-  __experimental_omnisearch_visibility: false,
-};

aksel.nav.no/sanity/schemas/documents/designsystem/automated/tokens.old.tsx

@@ -1,45 +0,0 @@
-export default {
-  title: "Tokens",
-  name: "ds_tokens",
-  type: "document",
-  fields: [
-    {
-      title: "Navn",
-      name: "title",
-      type: "string",
-      validation: (Rule) => Rule.required(),
-      readOnly: true,
-    },
-    {
-      title: "Verdi",
-      name: "token",
-      type: "string",
-      validation: (Rule) => Rule.required(),
-      readOnly: true,
-    },
-    {
-      title: "Faktisk verdi",
-      name: "raw",
-      type: "string",
-      readOnly: true,
-    },
-    {
-      title: "Parent",
-      name: "parent",
-      type: "string",
-      readOnly: true,
-    },
-    {
-      title: "Beskrivelse",
-      name: "beskrivelse",
-      type: "string",
-    },
-    {
-      title: "Autogenerert",
-      name: "autogenerated",
-      type: "boolean",
-      readOnly: true,
-    },
-  ],
-  __experimental_omnisearch_visibility: false,
-};

aksel.nav.no/sanity/schemas/documents/designsystem/index.ts

@@ -1,14 +0,0 @@
-export { default as KomponentArtikkel } from "./articles/komponent";
-export { default as Artikkel } from "./articles/artikkel";
-export { default as ComponentTemplate } from "./component-template";
-
-export { default as Props } from "./automated/props";
-export { default as TokensOld } from "./automated/tokens.old";
-export { default as TokenKategori } from "./automated/tokens";
-export { default as KodeEksempler } from "./automated/kode-eksempler";
-export {
-  Color,
-  default as ColorCategories,
-} from "./automated/color-categories";
-export { default as Frontpage } from "./frontpage";
-export { default as Navigation, ds_header_heading } from "./navigation";

aksel.nav.no/sanity/schemas/documents/designsystem/navigation.tsx

@@ -1,129 +0,0 @@
-export default {
-  name: "ds_navigation",
-  title: "Navigation",
-  type: "document",
-  fields: [
-    {
-      title: "Designsystem navigajsons-struktur",
-      name: "title",
-      type: "string",
-      readOnly: true,
-      hidden: true,
-      initialValue: "Designsystem navigajsons-struktur",
-    },
-    {
-      name: "headings",
-      title: "Header linker",
-      type: "array",
-      of: [
-        {
-          type: "ds_navigation_heading",
-          name: "heading",
-          title: "Header link",
-        },
-      ],
-      validation: (Rule) =>
-        Rule.required()
-          .min(1)
-          .error("Headingmenyen må ha minst en koblet lenke i sidemenyen"),
-    },
-  ],
-};
-
-export const ds_header_heading = {
-  name: "ds_navigation_heading",
-  title: "Header link",
-  type: "object",
-  fields: [
-    {
-      name: "title",
-      title: "Heading tittel",
-      type: "string",
-      validation: (Rule) =>
-        Rule.required().error("Header lenken må ha en tittel"),
-    },
-    {
-      title: "Side selve headingen linker til",
-      description:
-        "Husk å legge denne til i menyen også, hvis ikke blir den bare tilgjengelig via headern",
-      name: "link_ref",
-      type: "reference",
-      to: [{ type: "komponent_artikkel" }, { type: "ds_artikkel" }],
-      validation: (Rule) =>
-        Rule.required().error("Header lenken må linke til en startside"),
-    },
-    {
-      title: "Meny for denne headingen",
-      name: "menu",
-      type: "array",
-      validation: (Rule) =>
-        Rule.required().error("Sidemeny må ha misnt en lenke"),
-      of: [
-        {
-          title: "Menypunkt",
-          name: "item",
-          type: "object",
-          fields: [
-            {
-              title: "Menypunkt tittel",
-              name: "title",
-              type: "string",
-              validation: (Rule) =>
-                Rule.required().error("Sidemeny-lenken må ha en tittel"),
-            },
-            {
-              title: "Link til side",
-              name: "link",
-              type: "reference",
-              to: [{ type: "komponent_artikkel" }, { type: "ds_artikkel" }],
-              options: {
-                modal: {
-                  type: "dialog",
-                  width: "medium", // 'small' | 'medium' | 'large' | 'full'
-                },
-              },
-              validation: (Rule) =>
-                Rule.required().error("Sidemeny-lenken må lenke til en side"),
-            },
-          ],
-        },
-        {
-          title: "Subheading",
-          name: "subheading",
-          type: "object",
-          fields: [
-            {
-              title: "Subheading",
-              name: "title",
-              type: "string",
-              validation: (Rule) =>
-                Rule.required().error("Subheading må være fylt ut"),
-            },
-          ],
-          preview: {
-            select: {
-              title: "title",
-            },
-            prepare(selection) {
-              const { title } = selection;
-              return {
-                title: title,
-                subtitle: "Subheading",
-              };
-            },
-          },
-        },
-      ],
-    },
-  ],
-  preview: {
-    select: {
-      title: "title",
-    },
-    prepare({ title }) {
-      return {
-        title: `${title}`,
-      };
-    },
-  },
-};

aksel.nav.no/sanity/schemas/documents/ds-artikkel.tsx

@@ -0,0 +1,65 @@
+import {
+  defaultDocPreview,
+  editorField,
+  groups,
+  innholdFieldNew,
+  kategoriSlug,
+  publishedAtField,
+  titleField,
+} from "@/lib";
+
+const prefix = "grunnleggende/";
+
+export default {
+  title: "Artikkel",
+  name: "ds_artikkel",
+  type: "document",
+  groups,
+  ...defaultDocPreview,
+  fields: [
+    {
+      title: "Sist godkjent",
+      name: "updateInfo",
+      type: "object",
+      hidden: true,
+      fields: [
+        {
+          type: "date",
+          name: "lastVerified",
+          title: "Sist oppdatert",
+          description: "Kun synlig for utviklere",
+          readOnly: true,
+        },
+      ],
+    },
+    publishedAtField,
+    editorField,
+    titleField,
+    kategoriSlug(prefix),
+    { title: "url", name: "slug", type: "slug", hidden: true },
+    {
+      title: "Kategori",
+      name: "kategori",
+      type: "string",
+      validation: (Rule) => Rule.required(),
+      options: {
+        list: [
+          { title: "Styling", value: "styling" },
+          { title: "Tokens", value: "tokens" },
+          { title: "Stæsj", value: "staesj" },
+          { title: "Guider", value: "guider" },
+        ].map((x) => ({
+          title: x.title,
+          value: x.value,
+        })),
+        layout: "radio",
+      },
+      hidden: ({ currentUser }) =>
+        !currentUser.roles.find((x) => x.name === "developer"),
+    },
+    {
+      ...innholdFieldNew,
+      type: "riktekst_ds_artikkel",
+    },
+  ],
+};

aksel.nav.no/sanity/schemas/documents/editors.tsx

@@ -1,8 +1,143 @@
+// MIGRERT
+
 import { People } from "@navikt/ds-icons";
 import React from "react";
 import profilePage from "../../components/profile/profile-page";
 import { isEditorUnique } from "@/lib";
 import userStore from "part:@sanity/base/user";
+import sanityClient from "part:@sanity/base/client";
+
+const navn = [
+  "Alpesteinbukk",
+  "Amurtiger",
+  "Kamel",
+  "Blissbukk",
+  "Borneoorangutang",
+  "Damfrosk",
+  "Dvergsilkeape",
+  "Dåhjort",
+  "Edderkoppape",
+  "Elandantilope",
+  "Elg",
+  "Esel",
+  "Oter",
+  "Fjellrev",
+  "Flodsvin",
+  "Fugler",
+  "Gaupe",
+  "Gepard",
+  "Gulkinngibbon",
+  "Javalangur",
+  "Jerv",
+  "Krokodille",
+  "Labrador",
+  "Puddel",
+  "Skogskatt",
+  "Maine Coon",
+  "Lavlandstapir",
+  "Beagle",
+  "Hysky",
+  "Løve",
+  "Løvetamarin",
+  "Nubisk geit",
+  "Papegøye",
+  "Ringhalelemur",
+  "Rødpanda",
+  "Sau",
+  "Sjimpanse",
+  "Sjiraff",
+  "Stråleskilpadde",
+  "Slanger",
+  "Steppesebra",
+  "Flamingo",
+  "Struts",
+  "Shetlandsponni",
+  "Surikat",
+  "Tiger",
+  "Ulv",
+  "Fjordfe",
+  "Ekorn",
+  "Bever",
+  "Lemen",
+  "Klatremus",
+  "Fjellmarkmus",
+  "Dvergmus",
+  "Småskogmus",
+  "Steinkobbe",
+  "Røyskatt",
+  "Moskusfe",
+];
+
+const adjektiv = [
+  "aktuell",
+  "alvorlig",
+  "ansvarlig",
+  "berømt",
+  "bevisst",
+  "klein",
+  "eksisterende",
+  "fjern",
+  "forsiktig",
+  "heldig",
+  "hjelpsom",
+  "hyppig",
+  "imponerende",
+  "kul",
+  "sjarmerende",
+  "lykkelig",
+  "lys",
+  "merkelig",
+  "mistenkelig",
+  "modig",
+  "morsom",
+  "nysgjerrig",
+  "rå",
+  "rask",
+  "blå",
+  "fersk",
+  "grønn",
+  "rettferdig",
+  "rimelig",
+  "ryddig",
+  "selvsikker",
+  "skarp",
+  "skikkelig",
+  "skyldig",
+  "smal",
+  "sprudlende",
+  "søt",
+  "stolt",
+  "streng",
+  "sulten",
+  "tilgjengelig",
+  "vennlig",
+  "voksen",
+  "ærlig",
+  "flittig",
+];
+
+const client = sanityClient.withConfig({ apiVersion: "2020-06-19" });
+
+const generateName = async () => {
+  console.log("ran");
+  const names = await client.fetch(`*[_type == "editor"].anon_navn.current`);
+
+  let c = 0;
+  let res = "";
+  while ((res === "" || names.includes(res)) && c < 1000) {
+    const adj = adjektiv[Math.floor(Math.random() * adjektiv.length)];
+    const animal = navn[Math.floor(Math.random() * navn.length)];
+    res = `${adj.charAt(0).toUpperCase() + adj.slice(1)} ${animal}`;
+    c += 1;
+  }
+
+  console.log(res);
+  return res;
+};
+
+const generateInitialName = async () => ({
+  current: await generateName(),
+});
 
 export default {
   title: "Redaktører",
@@ -29,6 +164,23 @@ export default {
         slugify: (input) => input,
       },
     },
+    {
+      title: "Gjør meg anonym",
+      description:
+        "På artikler bytter vi ut navnet ditt med et tullenavn. Eks. Sprudlende Tiger",
+      name: "anonym",
+      type: "boolean",
+      initialValue: true,
+      hidden: true,
+    },
+    {
+      hidden: true,
+      title: "Anonymt navn",
+      name: "anon_navn",
+      type: "slug",
+      initialValue: () => generateInitialName(),
+      readOnly: true,
+    },
     {
       title: "Roller",
       description: "eks: Utvikler, Webanalytiker, uu-spesialist",

aksel.nav.no/sanity/schemas/documents/komponent.tsx

@@ -3,13 +3,12 @@ import {
   editorField,
   groups,
   innholdFieldNew,
-  migratedField,
+  kategoriSlug,
   publishedAtField,
-  sanitySlug,
   titleField,
 } from "@/lib";
 
-const prefix = "designsystem/komponenter/";
+const prefix = "komponenter/";
 
 export default {
   title: "Komponentartikkel",
@@ -21,7 +20,41 @@ export default {
     publishedAtField,
     editorField,
     titleField,
-    sanitySlug(prefix, 3),
+    kategoriSlug(prefix),
+    { title: "url", name: "slug", type: "slug", hidden: true },
+    {
+      title: "Sist godkjent",
+      name: "updateInfo",
+      type: "object",
+      hidden: true,
+      fields: [
+        {
+          type: "date",
+          name: "lastVerified",
+          title: "Sist oppdatert",
+          description: "Kun synlig for utviklere",
+          readOnly: true,
+        },
+      ],
+    },
+    {
+      title: "Kategori",
+      name: "kategori",
+      type: "string",
+      validation: (Rule) => Rule.required(),
+      options: {
+        list: [
+          { title: "Core", value: "core" },
+          { title: "Internal", value: "internal" },
+        ].map((x) => ({
+          title: x.title,
+          value: x.value,
+        })),
+        layout: "radio",
+      },
+      hidden: ({ currentUser }) =>
+        !currentUser.roles.find((x) => x.name === "developer"),
+    },
     {
       title: "Metadata",
       name: "status",
@@ -46,7 +79,7 @@ export default {
         },
         {
           name: "bilde",
-          title: "Thumbnail/og-bilde",
+          title: "Thumbnail",
           type: "image",
         },
       ],
@@ -63,7 +96,7 @@ export default {
     {
       ...innholdFieldNew,
       type: "riktekst_komponent",
-      name: "bruk_tab",
+      name: "content",
       title: "Innhold",
     },
     {

aksel.nav.no/sanity/schemas/documents/navigation.tsx

@@ -1,144 +1,121 @@
-import { Expand, Link } from "@navikt/ds-icons";
-import React from "react";
-const config = require("../../config");
-
-const maxDepth = 2;
-
-const checkDepth = (list, depth) => {
-  if (!list || list.length === 0) {
-    throw new Error("Dropdown lister må ha mist et element");
-  }
-
-  if (depth > maxDepth) {
-    throw new Error(`Sidemeny kan ha maks dybde på ${maxDepth} elementer`);
-  }
-
-  for (const el of list) {
-    el._type === "dropdown" && checkDepth(el.dropdown, depth + 1);
-  }
-  return true;
-};
-
-function validateNestedDepth(sidemenu) {
-  if (!sidemenu) {
-    return "Sidemeny må ha minst et element";
-  }
-  try {
-    checkDepth(sidemenu, 0);
-  } catch (e) {
-    return e.message;
-  }
-  return true;
-}
-
 export default {
-  name: "navigation",
+  name: "ds_navigation",
   title: "Navigation",
   type: "document",
   fields: [
     {
+      title: "Designsystem navigajsons-struktur",
       name: "title",
-      title: "Tittel",
       type: "string",
       readOnly: true,
       hidden: true,
+      initialValue: "Designsystem navigajsons-struktur",
     },
     {
-      name: "sidemenu",
-      title: "Sidemeny",
+      name: "headings",
+      title: "Header linker",
+      type: "array",
+      of: [
+        {
+          type: "ds_navigation_heading",
+          name: "heading",
+          title: "Header link",
+        },
+      ],
+      validation: (Rule) =>
+        Rule.required()
+          .min(1)
+          .error("Headingmenyen må ha minst en koblet lenke i sidemenyen"),
+    },
+  ],
+};
+
+export const ds_header_heading = {
+  name: "ds_navigation_heading",
+  title: "Header link",
+  type: "object",
+  fields: [
+    {
+      name: "title",
+      title: "Heading tittel",
+      type: "string",
+      validation: (Rule) =>
+        Rule.required().error("Header lenken må ha en tittel"),
+    },
+    {
+      title: "Side selve headingen linker til",
       description:
-        "Linker eller dropdowns med linker. Maks dybde på 2 dropdowns er støttet. Sider må være publisert før de kan linkes her.",
-      type: "array",
-      of: [
-        { type: "navigation_dropdown", name: "dropdown", title: "Dropdown" },
-        { type: "navigation_link", name: "link", title: "Link" },
-      ],
-      validation: (Rule) => Rule.required().min(1),
-    },
-  ],
-  validation: (Rule) =>
-    Rule.required().custom(({ sidemenu, ...rest }) => {
-      return validateNestedDepth(sidemenu);
-    }),
-};
-
-export const dropdown = {
-  name: "navigation_dropdown",
-  title: "Dropdown",
-  type: "object",
-  fields: [
-    {
-      name: "title",
-      title: "Tittel",
-      type: "string",
-      validation: (Rule) => Rule.required(),
-    },
-    {
-      title: "Meny",
-      name: "dropdown",
-      type: "array",
-      of: [
-        { type: "navigation_link", name: "link", title: "Link" },
-        { type: "navigation_dropdown", name: "dropdown", title: "Dropdown" },
-      ],
-      validation: (Rule) => Rule.required().min(1),
-    },
-  ],
-  preview: {
-    select: {
-      title: "title",
-    },
-    prepare({ title }) {
-      return {
-        title: `${title}`,
-        media: <Expand />,
-      };
-    },
-  },
-};
-
-export const link = {
-  name: "navigation_link",
-  title: "Link",
-  type: "object",
-  fields: [
-    {
-      name: "title",
-      title: "Tittel",
-      type: "string",
-      validation: (Rule) => Rule.required(),
-    },
-    {
-      title: "Link",
+        "Husk å legge denne til i menyen også, hvis ikke blir den bare tilgjengelig via headern",
       name: "link_ref",
       type: "reference",
-      weak: true,
       to: [{ type: "komponent_artikkel" }, { type: "ds_artikkel" }],
-      validation: (Rule) => Rule.required(),
-      /* Matches results based on document prefix */
-      options: {
-        filter: ({ document }) => {
-          const match = config.teams.find((team) =>
-            document._id.endsWith(team.name)
-          );
-          if (!match) {
-            return {
-              filter: ``,
-            };
-          }
-          return {
-            filter: `_type match ["${match.prefix}_*", "*_page"]`,
-          };
+      validation: (Rule) =>
+        Rule.required().error("Header lenken må linke til en startside"),
+    },
+    {
+      title: "Meny for denne headingen",
+      name: "menu",
+      type: "array",
+      validation: (Rule) =>
+        Rule.required().error("Sidemeny må ha misnt en lenke"),
+      of: [
+        {
+          title: "Menypunkt",
+          name: "item",
+          type: "object",
+          fields: [
+            {
+              title: "Menypunkt tittel",
+              name: "title",
+              type: "string",
+              validation: (Rule) =>
+                Rule.required().error("Sidemeny-lenken må ha en tittel"),
+            },
+            {
+              title: "Link til side",
+              name: "link",
+              type: "reference",
+              to: [{ type: "komponent_artikkel" }, { type: "ds_artikkel" }],
+              options: {
+                modal: {
+                  type: "dialog",
+                  width: "medium", // 'small' | 'medium' | 'large' | 'full'
+                },
+              },
+              validation: (Rule) =>
+                Rule.required().error("Sidemeny-lenken må lenke til en side"),
+            },
+          ],
         },
-      },
+        {
+          title: "Subheading",
+          name: "subheading",
+          type: "object",
+          fields: [
+            {
+              title: "Subheading",
+              name: "title",
+              type: "string",
+              validation: (Rule) =>
+                Rule.required().error("Subheading må være fylt ut"),
+            },
+          ],
+          preview: {
+            select: {
+              title: "title",
+            },
+            prepare(selection) {
+              const { title } = selection;
+              return {
+                title: title,
+                subtitle: "Subheading",
+              };
+            },
+          },
+        },
+      ],
     },
   ],
-  options: {
-    modal: {
-      type: "dialog",
-      width: "medium", // 'small' | 'medium' | 'large' | 'full'
-    },
-  },
   preview: {
     select: {
       title: "title",
@@ -146,7 +123,6 @@ export const link = {
     prepare({ title }) {
       return {
         title: `${title}`,
-        media: <Link />,
       };
     },
   },

aksel.nav.no/sanity/schemas/documents/prinsipp.tsx

@@ -5,7 +5,6 @@ import {
   ingressField,
   innholdFieldPrinsipp,
   isSlugUnique,
-  migratedField,
   prinsipper,
   publishedAtField,
   SEOFields,
@@ -138,6 +137,5 @@ export default {
     ingressField,
     innholdFieldPrinsipp,
     SEOFields,
-    migratedField,
   ],
 };

aksel.nav.no/sanity/schemas/documents/standalone.tsx

@@ -2,7 +2,6 @@ import {
   defaultDocPreview,
   groups,
   innholdFieldNew,
-  migratedField,
   publishedAtField,
   sanitySlug,
   titleField,
@@ -21,6 +20,5 @@ export default {
     titleField,
     sanitySlug(prefix, 2),
     innholdFieldNew,
-    migratedField,
   ],
 };

aksel.nav.no/sanity/schemas/documents/tema.tsx

@@ -11,7 +11,10 @@ export default {
       name: "title",
       type: "string",
       group: "innhold",
-      validation: (Rule) => Rule.required().error("Temaet må ha et navn"),
+      validation: (Rule) =>
+        Rule.required()
+          .warning("Denne endringe påvirker URL")
+          .error("Temaet må ha et navn"),
     },
     {
       title: "Kort Intro/Oppsummering",
@@ -30,6 +33,36 @@ export default {
       type: "riktekst_enkel",
       group: "innhold",
     },
+    {
+      title: "Hidden",
+      name: "bruk_seksjoner",
+      type: "boolean",
+      hidden: true,
+    },
+    {
+      title: "Shortname",
+      description: "En mer sanitert visning av tema-navnet i url ene",
+      name: "slug",
+      type: "slug",
+      group: "innhold",
+      validation: (Rule) => Rule.required().error("Tema må ha en URL"),
+      options: {
+        source: "title",
+        slugify: (s: string) =>
+          s
+            ? s
+                .toLowerCase()
+                .trim()
+                .replace(/\s+/g, "-")
+                .replace(/-+/gm, "-")
+                .replace(/æ/g, "a")
+                .replace(/å/g, "a")
+                .replace(/ø/g, "o")
+                // eslint-disable-next-line no-useless-escape
+                .replace(/[&\\#!,+()$~%.'"¨:*?<>{}]/g, "")
+            : "",
+      },
+    },
     {
       title: "Ansvarlig for tema",
       description: "Legg til redaktør som har forvaltningsansvaret for temaet",
@@ -39,15 +72,6 @@ export default {
       validation: (Rule) => Rule.required(),
       group: "innhold",
     },
-    {
-      title: "Bruk seksjonsinndeling",
-      description:
-        "Vil ikke vise artikler som ikke er lagt til i seksjoner hvis valgt!",
-      name: "bruk_seksjoner",
-      type: "boolean",
-      group: "innhold",
-      initialValue: false,
-    },
     {
       title: "Seksjonering",
       description:
@@ -55,7 +79,6 @@ export default {
       name: "seksjoner",
       type: "array",
       group: "innhold",
-      hidden: ({ parent }) => !parent?.bruk_seksjoner,
       of: [
         {
           type: "object",
@@ -107,5 +130,19 @@ export default {
         },
       ],
     },
+    {
+      title: "Pictogram",
+      name: "pictogram",
+      type: "image",
+      fields: [
+        {
+          name: "alt",
+          type: "string",
+          title: "Attribution",
+          hidden: true,
+        },
+      ],
+      validation: (Rule) => Rule.required().error("Tema må ha pictogram"),
+    },
   ],
 };

aksel.nav.no/sanity/schemas/modules/index.ts

@@ -1,28 +1,28 @@
 import Accordion from "./accordion";
 import Alert from "./alert";
+import Innholdskort from "./innholdskort";
 import Bilde from "./bilde";
-import HeroBilde from "./hero-bilde";
 import DoDont, { doDontBlock } from "./do-dont";
+import HeroBilde from "./hero-bilde";
 import introKomponent from "./intro-komponent";
 import Kode from "./kode";
+import KodeEksempler from "./kode-eksempler";
 import Props from "./props";
 import RelatertInnhold from "./relatert-innhold";
-import Innholdskort from "./innholdskort";
-import KodeEksempler from "./kode-eksempler";
-import TokenRef from "./token-tabell";
+import { tmpTabell, tmpTabellRow } from "./tabellv2";
 import {
   RiktekstAksel,
   RiktekstDsArtikkel,
   RiktekstEnkel,
   RiktekstKomponent,
-  RiktekstTabell,
   RiktekstPrinsipp,
+  RiktekstTabell,
 } from "./riktekst";
 import SpesialSeksjon from "./spesial-seksjon";
 import Tastatur from "./tastatur";
 import Tips from "./tips";
+import TokenRef from "./token-tabell";
 import Video from "./video";
-import { tmpTabell, tmpTabellRow } from "./tabellv2";
 
 const v2Blocks = [
   tmpTabell,
@@ -36,6 +36,7 @@ const v2Blocks = [
   RiktekstPrinsipp,
 
   /* Moduler */
+  /* Tabellv2, */
   DoDont,
   doDontBlock,
   Bilde,

aksel.nav.no/sanity/schemas/modules/innholdskort.tsx

@@ -1,3 +1,5 @@
+// Usikker på om skal være med videre
+
 import { FileContent } from "@navikt/ds-icons";
 import React from "react";
 

aksel.nav.no/sanity/schemas/modules/kode-eksempler.tsx

@@ -22,7 +22,7 @@ export default {
       initialValue: false,
     },
     {
-      title: "Installasjon-snippet",
+      title: "Eksempel-navn",
       name: "dir",
       type: "reference",
       to: [{ type: "kode_eksempler_fil" }],

aksel.nav.no/sanity/schemas/modules/kode.tsx

@@ -1,3 +1,5 @@
+// MIGRERT
+
 import React from "react";
 
 export default {

aksel.nav.no/sanity/schemas/modules/props.tsx

@@ -1,3 +1,5 @@
+// MIGRERT
+
 import { List } from "@navikt/ds-icons";
 import React from "react";
 

aksel.nav.no/sanity/schemas/modules/relatert-innhold.tsx

@@ -1,3 +1,5 @@
+// MIGRERT
+
 import { allDocumentTypes } from "../../config";
 import { Link } from "@navikt/ds-icons";
 import React from "react";

aksel.nav.no/sanity/schemas/modules/spesial-seksjon.tsx

@@ -2,7 +2,7 @@ import { Star } from "@navikt/ds-icons";
 import React from "react";
 
 export default {
-  title: "Sidemodul",
+  title: "Unik Sidemodul",
   type: "object",
   name: "spesial_seksjon",
   icon: Star,
@@ -14,26 +14,13 @@ export default {
       type: "string",
       options: {
         list: [
-          { title: "Farge kategori", value: "farge_kategori" },
           { title: "Token kategori", value: "token_kategori" },
           { title: "Ikonsøk", value: "ikonsok" },
-          { title: "Endringslogg", value: "endringslogg" },
           { title: "Komponentoversikt", value: "komponentoversikt" },
-          /* ...Object.keys(docs).map((x) => ({
-            title: `Tokenvisning: ${x}`,
-            value: `tokens_${x}`,
-          })), */
         ],
         layout: "radio",
       },
     },
-    {
-      title: "Farge kategori",
-      type: "reference",
-      name: "farge_ref",
-      hidden: ({ parent }) => parent.modul !== "farge_kategori",
-      to: [{ type: "ds_color_categories" }],
-    },
     {
       title: "Token kategori",
       type: "reference",
@@ -49,7 +36,7 @@ export default {
     prepare(s) {
       return {
         title: s.modul,
-        subtitle: "Sidemodul",
+        subtitle: "Unik Sidemodul",
         media: () => <Star />,
       };
     },

aksel.nav.no/sanity/schemas/schema.ts

@@ -4,42 +4,44 @@ import schemaTypes from "all:part:@sanity/base/schema-type";
 /* Schemas */
 /* Documents */
 import editors from "./documents/editors";
-import navigation, { dropdown, link } from "./documents/navigation";
-import frontpage from "./documents/frontpage";
 import redirect from "./documents/redirects";
+import KodeEksempler from "./documents/kode-eksempler";
+import Tokens from "./documents/tokens";
+import Props from "./documents/props";
+import DsFrontpage from "./documents/ds-frontpage";
+import DsCompTemplate from "./documents/component-template";
+import KompArtikkel from "./documents/komponent";
+import AkselTema from "./documents/tema";
+import AkselArtikkel from "./documents/aksel-artikkel";
+import DsArtikkel from "./documents/ds-artikkel";
+import Blogg from "./documents/blogg";
+import Prinsipp from "./documents/prinsipp";
+import Standalone from "./documents/standalone";
+import Navigation, { ds_header_heading } from "./documents/navigation";
 
-import * as Designsystem from "./documents/designsystem";
-import * as Aksel from "./documents/aksel";
 import v2Blocks from "./modules";
 
 export default createSchema({
   name: "default",
   types: schemaTypes.concat([
     ...v2Blocks,
-    frontpage,
     editors,
-    navigation,
-    link,
-    dropdown,
     redirect,
+    Navigation,
+    ds_header_heading,
+    KompArtikkel,
 
-    Designsystem.Color,
-    Designsystem.ds_header_heading,
-    Designsystem.ColorCategories,
-    Designsystem.TokensOld,
-    Designsystem.TokenKategori,
-    Designsystem.KodeEksempler,
-    Designsystem.Props,
-    Designsystem.ComponentTemplate,
-    Designsystem.Frontpage,
-    Designsystem.Navigation,
-    Designsystem.KomponentArtikkel,
-    Designsystem.Artikkel,
+    KodeEksempler,
+    Tokens,
+    Props,
+    DsFrontpage,
+    DsCompTemplate,
+    DsArtikkel,
 
-    Aksel.Artikkel,
-    Aksel.Blogg,
-    Aksel.Tema,
-    Aksel.Prinsipp,
-    Aksel.Standalone,
+    AkselArtikkel,
+    Blogg,
+    AkselTema,
+    Prinsipp,
+    Standalone,
   ]),
 });

aksel.nav.no/website/components/SanityBlockContent.tsx

@@ -2,6 +2,7 @@ import { ExternalLink } from "@navikt/ds-icons";
 import { BodyLong, Detail, Heading, Ingress, Link } from "@navikt/ds-react";
 import BlockContent from "@sanity/block-content-to-react";
 import cl from "classnames";
+import InnholdsKort from "components/sanity-modules/cards/InnholdsKort";
 import NextLink from "next/link";
 import React, { createContext, useContext } from "react";
 import {
@@ -10,7 +11,6 @@ import {
   Bilde,
   CodeExamples,
   DoDont,
-  InnholdsKort,
   Kode,
   LevelTwoHeading,
   PropsSeksjon,
@@ -93,7 +93,7 @@ const serializers = {
         case "h3":
           return (
             <Heading
-              className="algolia-index-lvl3 max-w-text mt-8 scroll-mt-20 focus:outline-none"
+              className="algolia-index-lvl3 max-w-text text-deepblue-800 mt-8 scroll-mt-20 focus:outline-none"
               spacing
               level="3"
               size="medium"
@@ -105,7 +105,7 @@ const serializers = {
         case "h4":
           return (
             <Heading
-              className="algolia-index-lvl4 max-w-text mt-6"
+              className="algolia-index-lvl4 max-w-text text-deepblue-800 mt-6"
               spacing
               level="4"
               size="small"