Merge branch 'dev' into aimodel

Author: Deepthi-Chand

.eslintrc.js

@@ -26,10 +26,15 @@ const CollaborativeInfoQuery = graphql(`
 export async function generateMetadata({
   params,
 }: {
-  params: { collaborativeSlug: string };
+  params: Promise<{ collaborativeSlug: string }>;
 }): Promise<Metadata> {
+  const { collaborativeSlug } = await params;
   try {
-    const data = await GraphQLPublic(CollaborativeInfoQuery, {}, { pk: params.collaborativeSlug });
+    const data = await GraphQLPublic(
+      CollaborativeInfoQuery,
+      {},
+      { pk: collaborativeSlug }
+    );
     const Collaborative = data?.collaborative;
 
     return generatePageMetadata({
@@ -41,7 +46,7 @@ export async function generateMetadata({
       openGraph: {
         type: 'article',
         locale: 'en_US',
-        url: `${process.env.NEXT_PUBLIC_PLATFORM_URL}/collaboratives/${params.collaborativeSlug}`,
+        url: `${process.env.NEXT_PUBLIC_PLATFORM_URL}/collaboratives/${collaborativeSlug}`,
         title: `${Collaborative?.title} | Collaborative Data | CivicDataSpace`,
         description:
           Collaborative?.summary ||
@@ -59,7 +64,7 @@ export async function generateMetadata({
       openGraph: {
         type: 'article',
         locale: 'en_US',
-        url: `${process.env.NEXT_PUBLIC_PLATFORM_URL}/collaboratives/${params.collaborativeSlug}`,
+        url: `${process.env.NEXT_PUBLIC_PLATFORM_URL}/collaboratives/${collaborativeSlug}`,
         title: `Collaborative Details | CivicDataSpace`,
         description: `Explore open data and curated datasets in this collaborative.`,
         siteName: 'CivicDataSpace',

.eslintrc.json

@@ -10,6 +10,7 @@ import { SearchInput, Spinner, Tag, Text } from 'opub-ui';
 import { GraphQL } from '@/lib/api';
 import { cn } from '@/lib/utils';
 import Styles from '../page.module.scss';
+import { useTourTrigger } from '@/hooks/use-tour-trigger';
 
 const statsInfo: any = graphql(`
   query StatsList {
@@ -34,6 +35,10 @@ const statsInfo: any = graphql(`
 
 export const Content = () => {
   const router = useRouter();
+  
+  // Enable tour for first-time users
+  useTourTrigger(true, 1500);
+  
   const Stats: { data: any; isLoading: any } = useQuery([`statsDetails`], () =>
     GraphQL(statsInfo, {}, [])
   );
@@ -104,7 +109,11 @@ export const Content = () => {
           ) : (
             <div className="flex flex-wrap items-center gap-4 md:gap-0 lg:gap-0 ">
               {Metrics.map((item, index) => (
-                <Link key={`${item.label}_${index}`} href={item.link}>
+                <Link 
+                  key={`${item.label}_${index}`} 
+                  href={item.link}
+                  data-tour={index === 0 ? 'datasets-link' : index === 1 ? 'usecases-link' : index === 2 ? 'publishers-link' : undefined}
+                >
                   <div
                     key={index}
                     className="flex flex-col border-x-[1px] border-solid border-tertiaryAccent px-4"
@@ -123,7 +132,7 @@ export const Content = () => {
               ))}
             </div>
           )}
-          <div className="w-full">
+          <div className="w-full" data-tour="search-bar">
             <SearchInput
               className={cn(Styles.Search)}
               onSubmit={handleSearch}

app/[locale]/(user)/collaboratives/CollaborativesListingClient.tsx

@@ -18,6 +18,7 @@ import {
 import { cn } from '@/lib/utils';
 import { Icons } from '@/components/icons';
 import Styles from './datasets.module.scss';
+import { DatasetListingSkeleton } from '@/components/loading';
 
 interface Bucket {
   key: string;
@@ -81,9 +82,10 @@ const Datasets = () => {
 
           <CarouselContent className="p-4">
             {isLoading ? (
-              <div className="p-8">
-                <Spinner />
-              </div>
+              <DatasetListingSkeleton 
+              cardCount={3}  
+              cardsOnly={true}  
+            />
             ) : (
               facets &&
               facets.results.map((item: any) => (
@@ -100,25 +102,29 @@ const Datasets = () => {
                     description={item.description}
                     metadataContent={[
                       {
-                        icon: Icons.calendar,
+                        icon: Icons.calendar as any,
                         label: 'Date',
-                        value: new Date(item.modified).toLocaleDateString('en-US', {
-                          day: 'numeric',
-                          month: 'long',
-                          year: 'numeric',
-                        }),
+                        value: new Date(item.modified).toLocaleDateString(
+                          'en-US',
+                          {
+                            day: 'numeric',
+                            month: 'long',
+                            year: 'numeric',
+                          }
+                        ),
                       },
                       {
-                        icon: Icons.download,
+                        icon: Icons.download as any,
                         label: 'Download',
                         value: item.download_count.toString(),
                       },
                       {
                         icon: Icons.globe,
                         label: 'Geography',
-                        value: item.geographies?.length > 0 
-                          ? item.geographies.join(', ') 
-                          : 'Not specified',
+                        value:
+                          item.geographies?.length > 0
+                            ? item.geographies.join(', ')
+                            : 'Not specified',
                       },
                     ]}
                     tag={item.tags}