Skip to content

Publishers link path updated with slug and id #400

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Abhishekfm merged 3 commits into from
Apr 27, 2026
Merged

Publishers link path updated with slug and id #400

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3962bbd
Publishers link path updated with slug and id
Abhishekfm Apr 24, 2026
0fb7859
Removed console
Abhishekfm Apr 24, 2026
b17e703
Collabrative url changes
Abhishekfm Apr 27, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/[locale]/(user)/collaboratives/CollaborativesListingClient.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -337,7 +337,7 @@ const CollaborativesListingClient = () => {
stroke: 1.2,
},
]}
href={getCollaborativeDetailUrl(collaborative.slug)}
href={`/collaboratives/${collaborative.slug}`}
leftFooterChips={[
{
icon: collaborative.sectors?.[0]?.name
Expand Down
2 changes: 1 addition & 1 deletion app/[locale]/(user)/collaboratives/[collaborativeSlug]/CollaborativeDetailsClient.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -323,7 +323,7 @@ const CollaborativeDetailClient = () => {
});

const organizationPublisherHref = (org: any) => {
const path = `/publishers/organization/${org.id}`;
const path = `/publishers/organization/${org.slug || org.name}_${org.id}`;
// Original: `/publishers/organization/${org.slug + '_' + org.id}`;
// Match getPlatformEntityUrl() behavior (absolute to platform host + locale)
const platformBaseUrl = (
Expand Down
2 changes: 1 addition & 1 deletion app/[locale]/(user)/collaboratives/components/Metadata.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ const Metadata = ({ data, setOpen }: { data: any; setOpen?: any }) => {
return match ? `/${match[1].toLowerCase()}` : '';
};
const contributorHref = (contributor: any) => {
const path = `/publishers/${contributor.id}`;
const path = `/publishers/${contributor.fullName}_${contributor.id}`;
// Original: `/publishers/${contributor.fullName + '_' + contributor.id}`;
// Match getPlatformEntityUrl() behavior (absolute to NEXT_PUBLIC_PLATFORM_URL + locale)
const platformBaseUrl = (
Expand Down
4 changes: 2 additions & 2 deletions app/[locale]/(user)/datasets/[datasetIdentifier]/components/Metadata/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,11 +83,11 @@ const MetadataComponent: React.FC<MetadataProps> = ({ data, setOpen }) => {
if (!data) return '/publishers';

if (data.isIndividualDataset && data.user) {
return `/publishers/${data.user.id}`;
return `/publishers/${data.user.fullName}_${data.user.id}`;
}

if (data.organization) {
return `/publishers/organization/${data.organization.id}`;
return `/publishers/organization/${data.organization.slug}_${data.organization.id}`;
}

return '/publishers';
Expand Down
4 changes: 2 additions & 2 deletions app/[locale]/(user)/publishers/PublisherCard.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ const PublisherCard: React.FC<CardProps> = ({ data }) => {
<Link
href={
item.__typename === 'TypeOrganization'
? `/publishers/organization/${item.id}`
: `/publishers/${item.id}`
? `/publishers/organization/${item.slug || item.name}_${item.id}`
: `/publishers/${item.fullName}_${item.id}`
}
key={index}
className="flex flex-col gap-4 rounded-4 p-6 shadow-card"
Expand Down
15 changes: 7 additions & 8 deletions app/[locale]/(user)/publishers/components/Datasets.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import { useQuery } from '@tanstack/react-query';
import { Card, Icon, Spinner, Text } from 'opub-ui';

import { GraphQL } from '@/lib/api';
import { cn } from '@/lib/utils';
import { cn, extractPublisherId } from '@/lib/utils';
import { Icons } from '@/components/icons';
import { stripMarkdown } from '../../search/components/UnifiedListingComponent';

Expand Down Expand Up @@ -104,28 +104,27 @@ const organizationPublishedDatasetsDoc: any = graphql(`

const Datasets = ({ type }: { type: 'organization' | 'Publisher' }) => {
const params = useParams();
const id = extractPublisherId(
String(type === 'organization' ? params.organizationSlug : params.publisherSlug)
);

const PublishedDatasetsList: any = useQuery(
[
type === 'organization'
? `orgPublishedDatasets_${params.organizationSlug}`
: `userPublishedDatasets_${params.publisherSlug}`,
],
['publishedDatasets', type, id],
() =>
type === 'organization'
? GraphQL(
organizationPublishedDatasetsDoc,
{
// Entity Headers
},
{ organizationId: params.organizationSlug } // ✅ exact match for expected shape
{ organizationId: id } // ✅ exact match for expected shape
)
: GraphQL(
userPublishedDatasetsDoc,
{
// Entity Headers
},
{ userId: params.publisherSlug } // ✅ exact match for expected shape
{ userId: id } // ✅ exact match for expected shape
)
);

Expand Down
15 changes: 7 additions & 8 deletions app/[locale]/(user)/publishers/components/UseCases.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import { useQuery } from '@tanstack/react-query';
import { Card, Icon, Spinner, Text } from 'opub-ui';

import { GraphQL } from '@/lib/api';
import { cn, formatDate } from '@/lib/utils';
import { cn, extractPublisherId, formatDate } from '@/lib/utils';
import { Icons } from '@/components/icons';
import { stripMarkdown } from '../../search/components/UnifiedListingComponent';

Expand Down Expand Up @@ -101,28 +101,27 @@ const orgPublishedUseCasesDoc: any = graphql(`

const UseCases = ({ type }: { type: 'organization' | 'Publisher' }) => {
const params = useParams();
const id = extractPublisherId(
String(type === 'organization' ? params.organizationSlug : params.publisherSlug)
);

const PublishedUseCasesList: any = useQuery(
[
type === 'organization'
? `orgPublishedUseCases_${params.organizationSlug}`
: `userPublishedUseCases_${params.publisherSlug}`,
],
['publishedUseCases', type, id],
() =>
type === 'organization'
? GraphQL(
orgPublishedUseCasesDoc,
{
// Entity Headers
},
{ organizationId: params.organizationSlug } // ✅ exact match for expected shape
{ organizationId: id } // ✅ exact match for expected shape
)
: GraphQL(
userPublishedUseCasesDoc,
{
// Entity Headers
},
{ userId: params.publisherSlug } // ✅ exact match for expected shape
{ userId: id } // ✅ exact match for expected shape
)
);

Expand Down
6 changes: 3 additions & 3 deletions app/[locale]/(user)/usecases/[useCaseSlug]/UsecaseDetailsClient.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -362,7 +362,7 @@ const UseCaseDetailClient = () => {
{UseCaseDetails?.useCase?.supportingOrganizations?.map(
(org: any) => (
<Link
href={`/publishers/organization/${org.id}`}
href={`/publishers/organization/${org.slug || org.name}_${org.id}`}
key={org.id}
>
<div className=" rounded-4 bg-surfaceDefault p-4">
Expand All @@ -389,7 +389,7 @@ const UseCaseDetailClient = () => {
{UseCaseDetails?.useCase?.partnerOrganizations?.map(
(org: any) => (
<Link
href={`/publishers/organization/${org.id}`}
href={`/publishers/organization/${org.slug || org.name}_${org.id}`}
key={org.id}
>
<div className=" rounded-4 bg-surfaceDefault p-4">
Expand Down Expand Up @@ -423,7 +423,7 @@ const UseCaseDetailClient = () => {
{UseCaseDetails?.useCase?.contributors?.map(
(contributor: any) => (
<Link
href={`/publishers/${contributor.id}`}
href={`/publishers/${contributor.fullName}_${contributor.id}`}
key={contributor.id}
>
<Image
Expand Down
4 changes: 2 additions & 2 deletions app/[locale]/(user)/usecases/components/Metadata.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,11 +34,11 @@ const Metadata = ({ data, setOpen }: { data: any; setOpen?: any }) => {
if (!data) return '/publishers';

if (data.useCase.isIndividualUsecase && data.useCase.user) {
return `/publishers/${data.useCase.user.id}`;
return `/publishers/${data.useCase.user.fullName}_${data.useCase.user.id}`;
}

if (data.useCase.organization) {
return `/publishers/organization/${data.useCase.organization.id}`;
return `/publishers/organization/${data.useCase.organization.slug || data.useCase.organization.name}_${data.useCase.organization.id}`;
}

return '/publishers';
Expand Down
Loading