From 5b42ff07eef5cd5db8ab2aeb4d1924c3834cf171 Mon Sep 17 00:00:00 2001
From: Ken <ken.aleksander@gmail.com>
Date: Thu, 3 Aug 2023 13:29:56 +0200
Subject: [PATCH] =?UTF-8?q?:bug:=20Fikset=20oppdateringer=20av=20prop-docs?=
 =?UTF-8?q?=20p=C3=A5=20Aksel.nav.no?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../{Heading.tsx => GroupedHeading.tsx}       |  0
 .../GroupedList/{Item.tsx => GroupedItem.tsx} |  0
 .../src/dropdown/Menu/GroupedList/index.tsx   |  4 ++--
 aksel.nav.no/website/scripts/update-props.tsx | 24 ++++++++++++++-----
 4 files changed, 20 insertions(+), 8 deletions(-)
 rename @navikt/core/react/src/dropdown/Menu/GroupedList/{Heading.tsx => GroupedHeading.tsx} (100%)
 rename @navikt/core/react/src/dropdown/Menu/GroupedList/{Item.tsx => GroupedItem.tsx} (100%)

diff --git a/@navikt/core/react/src/dropdown/Menu/GroupedList/Heading.tsx b/@navikt/core/react/src/dropdown/Menu/GroupedList/GroupedHeading.tsx
similarity index 100%
rename from @navikt/core/react/src/dropdown/Menu/GroupedList/Heading.tsx
rename to @navikt/core/react/src/dropdown/Menu/GroupedList/GroupedHeading.tsx
diff --git a/@navikt/core/react/src/dropdown/Menu/GroupedList/Item.tsx b/@navikt/core/react/src/dropdown/Menu/GroupedList/GroupedItem.tsx
similarity index 100%
rename from @navikt/core/react/src/dropdown/Menu/GroupedList/Item.tsx
rename to @navikt/core/react/src/dropdown/Menu/GroupedList/GroupedItem.tsx
diff --git a/@navikt/core/react/src/dropdown/Menu/GroupedList/index.tsx b/@navikt/core/react/src/dropdown/Menu/GroupedList/index.tsx
index 32c65b2bf1..d47782c5f1 100644
--- a/@navikt/core/react/src/dropdown/Menu/GroupedList/index.tsx
+++ b/@navikt/core/react/src/dropdown/Menu/GroupedList/index.tsx
@@ -1,8 +1,8 @@
 import cl from "clsx";
 import React, { forwardRef } from "react";
 import { OverridableComponent } from "../../../util/OverridableComponent";
-import GroupedHeading, { GroupedHeadingProps } from "./Heading";
-import GroupedItem, { GroupedItemProps } from "./Item";
+import GroupedHeading, { GroupedHeadingProps } from "./GroupedHeading";
+import GroupedItem, { GroupedItemProps } from "./GroupedItem";
 
 export interface GroupedListProps
   extends React.HTMLAttributes<HTMLDListElement> {
diff --git a/aksel.nav.no/website/scripts/update-props.tsx b/aksel.nav.no/website/scripts/update-props.tsx
index bf47e8f7ac..d48c744dce 100644
--- a/aksel.nav.no/website/scripts/update-props.tsx
+++ b/aksel.nav.no/website/scripts/update-props.tsx
@@ -26,15 +26,18 @@ const propList = (
   name: string
 ) =>
   src.map((prop) => {
+    let dupe = false;
     if (ids.includes(`${prop?.displayName?.toLowerCase()}_${name}_ds_props`)) {
       console.error(
         `Found duplicate id: ${`${prop.displayName.toLowerCase()}_${name}_ds_props`}`
       );
+      dupe = true;
     }
-    ids.push(`${prop.displayName.toLowerCase()}_${name}_ds_props`);
+    const id = `${prop.displayName.toLowerCase()}_${name}_ds_props`;
+    ids.push(id);
 
     return {
-      _id: `${prop.displayName.toLowerCase()}_${name}_ds_props`,
+      _id: dupe ? `${id}_2` : id,
       _type: "ds_props",
       title: prop.displayName,
       displayname: prop.displayName,
@@ -60,13 +63,22 @@ const updateProps = async () => {
   // this is our transactional client, it won't push anything until we say .commit() later
   const transactionClient = noCdnClient(token).transaction();
 
-  propList(CoreDocs as any, "core").forEach((x) =>
-    transactionClient.createOrReplace(x)
-  );
+  const props = propList(CoreDocs as any, "core");
+
+  // Preserve existing props that are not in the new list to allow documenting deprecated props
+  /* const remoteProps = await noCdnClient(token).fetch(`*[_type == "ds_props"]`);
+
+  for (const prop of remoteProps) {
+    if (!props.find((x) => prop._id === x._id)) {
+      transactionClient.delete(prop._id);
+    }
+  } */
+
+  props.forEach((x) => transactionClient.createOrReplace(x));
 
   await transactionClient
     .commit()
-    .then(() => console.log(`Updated props`))
+    .then((e) => console.log(e))
     .catch((e) => console.error(e.message));
 };