Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
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.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';
Expand Down
6 changes: 5 additions & 1 deletion app/[locale]/(user)/publishers/components/Datasets.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down
6 changes: 5 additions & 1 deletion app/[locale]/(user)/publishers/components/UseCases.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down
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.slug + '_' + org.id}`}
href={`/publishers/organization/${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.slug + '_' + org.id}`}
href={`/publishers/organization/${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.fullName + '_' + contributor.id}`}
href={`/publishers/${contributor.id}`}
key={contributor.id}
>
<Image
Expand Down
5 changes: 2 additions & 3 deletions app/[locale]/(user)/usecases/components/Metadata.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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 = [
{
Expand Down
Loading