From fd5457b6f50aaa2eded78a19acb9942cee268677 Mon Sep 17 00:00:00 2001
From: Abhishekfm <abhisheksingh.fm@gmail.com>
Date: Thu, 23 Apr 2026 13:48:13 +0530
Subject: [PATCH] Use case, dataset, publisher page now loads right detail page

---
 .../[datasetIdentifier]/components/Metadata/index.tsx       | 4 ++--
 app/[locale]/(user)/publishers/components/Datasets.tsx      | 6 +++++-
 app/[locale]/(user)/publishers/components/UseCases.tsx      | 6 +++++-
 .../(user)/usecases/[useCaseSlug]/UsecaseDetailsClient.tsx  | 6 +++---
 app/[locale]/(user)/usecases/components/Metadata.tsx        | 5 ++---
 5 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/app/[locale]/(user)/datasets/[datasetIdentifier]/components/Metadata/index.tsx b/app/[locale]/(user)/datasets/[datasetIdentifier]/components/Metadata/index.tsx
index 9c9dd583..205ae8b6 100644
--- a/app/[locale]/(user)/datasets/[datasetIdentifier]/components/Metadata/index.tsx
+++ b/app/[locale]/(user)/datasets/[datasetIdentifier]/components/Metadata/index.tsx
@@ -83,11 +83,11 @@ const MetadataComponent: React.FC<MetadataProps> = ({ data, setOpen }) => {
     if (!data) return '/publishers';
 
     if (data.isIndividualDataset && data.user) {
-      return `/publishers/${data.user.fullName + '_' + data.user.id}`;
+      return `/publishers/${data.user.id}`;
     }
 
     if (data.organization) {
-      return `/publishers/organization/${data.organization.slug + '_' + data.organization.id}`;
+      return `/publishers/organization/${data.organization.id}`;
     }
 
     return '/publishers';
diff --git a/app/[locale]/(user)/publishers/components/Datasets.tsx b/app/[locale]/(user)/publishers/components/Datasets.tsx
index 889a6ab5..4aad988c 100644
--- a/app/[locale]/(user)/publishers/components/Datasets.tsx
+++ b/app/[locale]/(user)/publishers/components/Datasets.tsx
@@ -106,7 +106,11 @@ const Datasets = ({ type }: { type: 'organization' | 'Publisher' }) => {
   const params = useParams();
 
   const PublishedDatasetsList: any = useQuery(
-    [`userDataset_${params.publisherSlug}`],
+    [
+      type === 'organization'
+        ? `orgPublishedDatasets_${params.organizationSlug}`
+        : `userPublishedDatasets_${params.publisherSlug}`,
+    ],
     () =>
       type === 'organization'
         ? GraphQL(
diff --git a/app/[locale]/(user)/publishers/components/UseCases.tsx b/app/[locale]/(user)/publishers/components/UseCases.tsx
index 5ae25e9c..964b34ac 100644
--- a/app/[locale]/(user)/publishers/components/UseCases.tsx
+++ b/app/[locale]/(user)/publishers/components/UseCases.tsx
@@ -103,7 +103,11 @@ const UseCases = ({ type }: { type: 'organization' | 'Publisher' }) => {
   const params = useParams();
 
   const PublishedUseCasesList: any = useQuery(
-    [`userPublishedDataset_${params.publisherSlug}`],
+    [
+      type === 'organization'
+        ? `orgPublishedUseCases_${params.organizationSlug}`
+        : `userPublishedUseCases_${params.publisherSlug}`,
+    ],
     () =>
       type === 'organization'
         ? GraphQL(
diff --git a/app/[locale]/(user)/usecases/[useCaseSlug]/UsecaseDetailsClient.tsx b/app/[locale]/(user)/usecases/[useCaseSlug]/UsecaseDetailsClient.tsx
index 4732a6f1..83040c3c 100644
--- a/app/[locale]/(user)/usecases/[useCaseSlug]/UsecaseDetailsClient.tsx
+++ b/app/[locale]/(user)/usecases/[useCaseSlug]/UsecaseDetailsClient.tsx
@@ -362,7 +362,7 @@ const UseCaseDetailClient = () => {
                         {UseCaseDetails?.useCase?.supportingOrganizations?.map(
                           (org: any) => (
                             <Link
-                              href={`/publishers/organization/${org.slug + '_' + org.id}`}
+                              href={`/publishers/organization/${org.id}`}
                               key={org.id}
                             >
                               <div className=" rounded-4 bg-surfaceDefault  p-4">
@@ -389,7 +389,7 @@ const UseCaseDetailClient = () => {
                         {UseCaseDetails?.useCase?.partnerOrganizations?.map(
                           (org: any) => (
                             <Link
-                              href={`/publishers/organization/${org.slug + '_' + org.id}`}
+                              href={`/publishers/organization/${org.id}`}
                               key={org.id}
                             >
                               <div className=" rounded-4 bg-surfaceDefault  p-4">
@@ -423,7 +423,7 @@ const UseCaseDetailClient = () => {
                       {UseCaseDetails?.useCase?.contributors?.map(
                         (contributor: any) => (
                           <Link
-                            href={`/publishers/${contributor.fullName + '_' + contributor.id}`}
+                            href={`/publishers/${contributor.id}`}
                             key={contributor.id}
                           >
                             <Image
diff --git a/app/[locale]/(user)/usecases/components/Metadata.tsx b/app/[locale]/(user)/usecases/components/Metadata.tsx
index 3a957897..dc393e02 100644
--- a/app/[locale]/(user)/usecases/components/Metadata.tsx
+++ b/app/[locale]/(user)/usecases/components/Metadata.tsx
@@ -34,16 +34,15 @@ const Metadata = ({ data, setOpen }: { data: any; setOpen?: any }) => {
     if (!data) return '/publishers';
 
     if (data.useCase.isIndividualUsecase && data.useCase.user) {
-      return `/publishers/${data.useCase.user.fullName + '_' + data.useCase.user.id}`;
+      return `/publishers/${data.useCase.user.id}`;
     }
 
     if (data.useCase.organization) {
-      return `/publishers/organization/${data.useCase.organization.slug + '_' + data.useCase.organization.id}`;
+      return `/publishers/organization/${data.useCase.organization.id}`;
     }
 
     return '/publishers';
   };
-  console.log('data?.useCase ', data?.useCase);
 
   const metadata = [
     {