From 1e1312e600b2b2016a913ba70009dc6723c43379 Mon Sep 17 00:00:00 2001
From: Sandra Hoang <sandrahoang686@gmail.com>
Date: Wed, 7 Aug 2024 12:17:26 -0400
Subject: [PATCH 1/9] connect data catalog component

---
 app/(datasets)/datasets/page.tsx   | 16 ++++++++++++++--
 app/blog/datasets/lahaina-fire.mdx |  2 +-
 app/lib/index.ts                   |  3 ++-
 3 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/app/(datasets)/datasets/page.tsx b/app/(datasets)/datasets/page.tsx
index 1b8484e..2829d21 100644
--- a/app/(datasets)/datasets/page.tsx
+++ b/app/(datasets)/datasets/page.tsx
@@ -1,11 +1,23 @@
+'use client';
+
 import { BlogPosts } from 'app/components/posts';
-import { getDatasets } from 'app/blog/utils/mdx';
+// import { getDatasets } from 'app/blog/utils/mdx';
+import { useDataStore } from "app/store/providers/data";
+import { CatalogView } from '../../lib';
 
 export default function Page() {
-  const posts = getDatasets();
+  // const posts = getDatasets();
+  const { datasets: posts } = useDataStore();
+
+  const transformed = posts?.map((post) => ({
+    ...post.metadata
+  }));
+  
+  console.log(`transformed: `, transformed)
   return (
     <section>
       <h1 className="font-semibold text-2xl mb-8 tracking-tighter">Datasets</h1>
+      <CatalogView datasets={transformed} onFilterChanges={() => { return {search: '', taxonomies: {}, onAction: () => true}}}/>
       <BlogPosts postType="dataset" posts={posts} />
     </section>
   )
diff --git a/app/blog/datasets/lahaina-fire.mdx b/app/blog/datasets/lahaina-fire.mdx
index ba5bbc3..6ce5987 100644
--- a/app/blog/datasets/lahaina-fire.mdx
+++ b/app/blog/datasets/lahaina-fire.mdx
@@ -3,7 +3,7 @@ id: lahaina-fire
 name: 'Lahaina Fire'
 description: "HLS (BAIS2 and SWIR FalseColor composites) and Landsat-8 thermal imagery supporting the Lahaina, HI Wildfire Story"
 media:
-  src: ::file ./lahaina-fire-background.jpg
+  src: /images/dataset/nighttime-lights--dataset-cover.jpg
   alt: Wildfire erupting over Lahaina, HI, August 8, 2023
   author:
     name: Matthew Thayer/AP
diff --git a/app/lib/index.ts b/app/lib/index.ts
index 2272faf..5654284 100644
--- a/app/lib/index.ts
+++ b/app/lib/index.ts
@@ -1,6 +1,7 @@
 'use client';
-import { PageHero } from '@developmentseed/veda-ui';
+import { CatalogView, PageHero } from '@developmentseed/veda-ui';
 
 export {
+  CatalogView,
   PageHero
 }
\ No newline at end of file

From 48e971ebd8a6902e254991eb6228aaa79ea5bb89 Mon Sep 17 00:00:00 2001
From: Sandra Hoang <sandrahoang686@gmail.com>
Date: Mon, 26 Aug 2024 15:42:37 -0700
Subject: [PATCH 2/9] Use DataCatalog and filterHook

---
 app/(datasets)/datasets/page.tsx | 43 +++++++++++++++++++++++---------
 app/lib/index.ts                 |  5 ++--
 2 files changed, 34 insertions(+), 14 deletions(-)

diff --git a/app/(datasets)/datasets/page.tsx b/app/(datasets)/datasets/page.tsx
index 2829d21..4c86fd7 100644
--- a/app/(datasets)/datasets/page.tsx
+++ b/app/(datasets)/datasets/page.tsx
@@ -1,24 +1,43 @@
 'use client';
-
-import { BlogPosts } from 'app/components/posts';
-// import { getDatasets } from 'app/blog/utils/mdx';
 import { useDataStore } from "app/store/providers/data";
-import { CatalogView } from '../../lib';
+import { CatalogView, useFiltersWithQS } from '../../lib';
+import { useRouter } from "next/navigation";
+import { usePathname } from 'next/navigation'
 
 export default function Page() {
-  // const posts = getDatasets();
   const { datasets: posts } = useDataStore();
 
-  const transformed = posts?.map((post) => ({
-    ...post.metadata
-  }));
-  
-  console.log(`transformed: `, transformed)
+  const transformData = () => {
+    const data = posts?.map((post) => ({
+      ...post.metadata
+    }));
+
+    const result = data?.map((d) => {
+      const updatedTax = d.taxonomy.map((t) => {
+        const updatedVals = t.values.map((v) => {
+          return {
+            id: v.replace(/ /g, '_').toLowerCase(),
+            name: v
+          }
+        })
+        return {...t, values: updatedVals}
+      })
+      return {...d, taxonomy: updatedTax}
+    })
+
+    return result
+  };
+
+  const transformed = transformData();
+
+  const router = useRouter();
+  const pathName = usePathname();
+  const controlVars = useFiltersWithQS({navigate: router, push: true});
+
   return (
     <section>
       <h1 className="font-semibold text-2xl mb-8 tracking-tighter">Datasets</h1>
-      <CatalogView datasets={transformed} onFilterChanges={() => { return {search: '', taxonomies: {}, onAction: () => true}}}/>
-      <BlogPosts postType="dataset" posts={posts} />
+      <CatalogView datasets={transformed} onFilterChanges={() => controlVars} location={pathName}/>
     </section>
   )
 }
diff --git a/app/lib/index.ts b/app/lib/index.ts
index 5654284..17b7aa9 100644
--- a/app/lib/index.ts
+++ b/app/lib/index.ts
@@ -1,7 +1,8 @@
 'use client';
-import { CatalogView, PageHero } from '@developmentseed/veda-ui';
+import { CatalogView, PageHero, useFiltersWithQS } from '@developmentseed/veda-ui';
 
 export {
   CatalogView,
-  PageHero
+  PageHero,
+  useFiltersWithQS
 }
\ No newline at end of file

From 2bdf5fb374055580044774b666c957f6aeb0036d Mon Sep 17 00:00:00 2001
From: Sandra Hoang <sandrahoang686@gmail.com>
Date: Mon, 26 Aug 2024 16:08:39 -0700
Subject: [PATCH 3/9] Update devseed/veda-ui version

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 45c59f5..9b08f40 100644
--- a/package.json
+++ b/package.json
@@ -25,6 +25,6 @@
     "sugar-high": "^0.6.0",
     "tailwindcss": "4.0.0-alpha.13",
     "typescript": "5.3.3",
-    "@developmentseed/veda-ui": "v5.3.1-alpha.2"
+    "@developmentseed/veda-ui": "v5.6.0"
   }
 }

From ef58239652052105b6e1228b05d6b269fab8295f Mon Sep 17 00:00:00 2001
From: Sandra Hoang <sandrahoang686@gmail.com>
Date: Mon, 26 Aug 2024 17:01:16 -0700
Subject: [PATCH 4/9] Move catalog to own component for rendering problem

---
 app/(datasets)/datasets/catalog.tsx | 16 ++++++++++++++++
 app/(datasets)/datasets/page.tsx    | 18 +++++++-----------
 app/(datasets)/layout.tsx           |  2 +-
 3 files changed, 24 insertions(+), 12 deletions(-)
 create mode 100644 app/(datasets)/datasets/catalog.tsx

diff --git a/app/(datasets)/datasets/catalog.tsx b/app/(datasets)/datasets/catalog.tsx
new file mode 100644
index 0000000..0672786
--- /dev/null
+++ b/app/(datasets)/datasets/catalog.tsx
@@ -0,0 +1,16 @@
+'use client';
+import { CatalogView, useFiltersWithQS } from '../../lib';
+import { useRouter } from "next/navigation";
+import { usePathname } from 'next/navigation'
+
+export default function Catalog({
+  datasets
+}: {
+  datasets: any;
+}) {
+  const router = useRouter();
+  const pathName = usePathname();
+  const controlVars = useFiltersWithQS({navigate: router, push: true});
+
+  return <CatalogView datasets={datasets} onFilterChanges={() => controlVars} location={pathName}/>
+}
\ No newline at end of file
diff --git a/app/(datasets)/datasets/page.tsx b/app/(datasets)/datasets/page.tsx
index 4c86fd7..392bb0a 100644
--- a/app/(datasets)/datasets/page.tsx
+++ b/app/(datasets)/datasets/page.tsx
@@ -1,11 +1,9 @@
-'use client';
-import { useDataStore } from "app/store/providers/data";
-import { CatalogView, useFiltersWithQS } from '../../lib';
-import { useRouter } from "next/navigation";
-import { usePathname } from 'next/navigation'
+import { getDatasets } from 'app/blog/utils/mdx';
+import { Suspense } from "react";
+import Catalog from './catalog'
 
 export default function Page() {
-  const { datasets: posts } = useDataStore();
+  const posts: any[] = getDatasets();
 
   const transformData = () => {
     const data = posts?.map((post) => ({
@@ -30,14 +28,12 @@ export default function Page() {
 
   const transformed = transformData();
 
-  const router = useRouter();
-  const pathName = usePathname();
-  const controlVars = useFiltersWithQS({navigate: router, push: true});
-
   return (
     <section>
       <h1 className="font-semibold text-2xl mb-8 tracking-tighter">Datasets</h1>
-      <CatalogView datasets={transformed} onFilterChanges={() => controlVars} location={pathName}/>
+      <Suspense fallback={<>Loading...</>}>
+        <Catalog datasets={transformed} />
+      </Suspense>
     </section>
   )
 }
diff --git a/app/(datasets)/layout.tsx b/app/(datasets)/layout.tsx
index 3ab0e4c..9ee7855 100644
--- a/app/(datasets)/layout.tsx
+++ b/app/(datasets)/layout.tsx
@@ -3,9 +3,9 @@ import { getDatasetsMetadata } from 'app/blog/utils/mdx';
 
 export default function DatasetLayout(props) {
   const datasets = getDatasetsMetadata();
+  
   return(
     <DataProvider initialDatasets={datasets}>
-      <h1>Hello nested layout</h1>
       {props.children}
     </DataProvider>
   ) 

From 2eecf53a04c1d82759a24fbeb393ab54ae2bfa89 Mon Sep 17 00:00:00 2001
From: Sandra Hoang <sandrahoang686@gmail.com>
Date: Tue, 3 Sep 2024 09:46:15 -0400
Subject: [PATCH 5/9] Pass in override link component

---
 app/(datasets)/datasets/catalog.tsx | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/app/(datasets)/datasets/catalog.tsx b/app/(datasets)/datasets/catalog.tsx
index 0672786..c4318f1 100644
--- a/app/(datasets)/datasets/catalog.tsx
+++ b/app/(datasets)/datasets/catalog.tsx
@@ -1,7 +1,9 @@
 'use client';
 import { CatalogView, useFiltersWithQS } from '../../lib';
 import { useRouter } from "next/navigation";
-import { usePathname } from 'next/navigation'
+import { usePathname } from 'next/navigation';
+import Link from 'next/link'
+import styled from 'styled-components';
 
 export default function Catalog({
   datasets
@@ -12,5 +14,12 @@ export default function Catalog({
   const pathName = usePathname();
   const controlVars = useFiltersWithQS({navigate: router, push: true});
 
-  return <CatalogView datasets={datasets} onFilterChanges={() => controlVars} location={pathName}/>
+  return (
+    <CatalogView
+      datasets={datasets}
+      onFilterChanges={() => controlVars}
+      location={pathName}
+      OverrideLinkElement={Link}
+    />
+  );
 }
\ No newline at end of file

From e7e0fc0cac60a56c612ba8a5705bc73fbe31a047 Mon Sep 17 00:00:00 2001
From: Sandra Hoang <sandrahoang686@gmail.com>
Date: Wed, 4 Sep 2024 14:02:01 -0400
Subject: [PATCH 6/9] Bump version and update catalog

---
 app/(datasets)/datasets/catalog.tsx | 9 ++++++---
 package.json                        | 2 +-
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/app/(datasets)/datasets/catalog.tsx b/app/(datasets)/datasets/catalog.tsx
index c4318f1..0847d17 100644
--- a/app/(datasets)/datasets/catalog.tsx
+++ b/app/(datasets)/datasets/catalog.tsx
@@ -2,8 +2,7 @@
 import { CatalogView, useFiltersWithQS } from '../../lib';
 import { useRouter } from "next/navigation";
 import { usePathname } from 'next/navigation';
-import Link from 'next/link'
-import styled from 'styled-components';
+import Link from 'next/link';
 
 export default function Catalog({
   datasets
@@ -18,8 +17,12 @@ export default function Catalog({
     <CatalogView
       datasets={datasets}
       onFilterChanges={() => controlVars}
+      rootPath={pathName}
       location={pathName}
-      OverrideLinkElement={Link}
+      linkProperties={{
+        LinkElement: Link,
+        pathAttributeKeyName: 'href'
+      }}
     />
   );
 }
\ No newline at end of file
diff --git a/package.json b/package.json
index 9b08f40..66176cc 100644
--- a/package.json
+++ b/package.json
@@ -25,6 +25,6 @@
     "sugar-high": "^0.6.0",
     "tailwindcss": "4.0.0-alpha.13",
     "typescript": "5.3.3",
-    "@developmentseed/veda-ui": "v5.6.0"
+    "@developmentseed/veda-ui": "v5.7.0"
   }
 }

From a8e8e0d49f8934fe68752309b904b9967df91daf Mon Sep 17 00:00:00 2001
From: Sandra Hoang <sandrahoang686@gmail.com>
Date: Wed, 4 Sep 2024 15:02:18 -0400
Subject: [PATCH 7/9] Remove prop

---
 app/(datasets)/datasets/catalog.tsx | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/(datasets)/datasets/catalog.tsx b/app/(datasets)/datasets/catalog.tsx
index 0847d17..b55f5bc 100644
--- a/app/(datasets)/datasets/catalog.tsx
+++ b/app/(datasets)/datasets/catalog.tsx
@@ -17,7 +17,6 @@ export default function Catalog({
     <CatalogView
       datasets={datasets}
       onFilterChanges={() => controlVars}
-      rootPath={pathName}
       location={pathName}
       linkProperties={{
         LinkElement: Link,

From 58d320d35bb814817b41cd321f857ce809b78b3a Mon Sep 17 00:00:00 2001
From: Sandra Hoang <sandrahoang686@gmail.com>
Date: Wed, 4 Sep 2024 15:13:27 -0400
Subject: [PATCH 8/9] update version

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 66176cc..f7c3b13 100644
--- a/package.json
+++ b/package.json
@@ -25,6 +25,6 @@
     "sugar-high": "^0.6.0",
     "tailwindcss": "4.0.0-alpha.13",
     "typescript": "5.3.3",
-    "@developmentseed/veda-ui": "v5.7.0"
+    "@developmentseed/veda-ui": "v5.7.0-alpha.0"
   }
 }

From b5d9aef99a31093d2f930625526a8adf1878140b Mon Sep 17 00:00:00 2001
From: Sandra Hoang <sandrahoang686@gmail.com>
Date: Fri, 6 Sep 2024 08:17:50 -0400
Subject: [PATCH 9/9] update version

---
 app/(datasets)/datasets/catalog.tsx | 4 ++--
 package.json                        | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/(datasets)/datasets/catalog.tsx b/app/(datasets)/datasets/catalog.tsx
index b55f5bc..450d17c 100644
--- a/app/(datasets)/datasets/catalog.tsx
+++ b/app/(datasets)/datasets/catalog.tsx
@@ -10,14 +10,14 @@ export default function Catalog({
   datasets: any;
 }) {
   const router = useRouter();
-  const pathName = usePathname();
+  const pathname = usePathname();
   const controlVars = useFiltersWithQS({navigate: router, push: true});
 
   return (
     <CatalogView
       datasets={datasets}
       onFilterChanges={() => controlVars}
-      location={pathName}
+      pathname={pathname}
       linkProperties={{
         LinkElement: Link,
         pathAttributeKeyName: 'href'
diff --git a/package.json b/package.json
index f7c3b13..37c1508 100644
--- a/package.json
+++ b/package.json
@@ -25,6 +25,6 @@
     "sugar-high": "^0.6.0",
     "tailwindcss": "4.0.0-alpha.13",
     "typescript": "5.3.3",
-    "@developmentseed/veda-ui": "v5.7.0-alpha.0"
+    "@developmentseed/veda-ui": "v5.7.0-alpha.1"
   }
 }