Skip to content

Added collabrative subdomain TextField, Fixed caching issues in colla… #395

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 1 commit into from
Apr 21, 2026
Merged

Added collabrative subdomain TextField, Fixed caching issues in colla… #395

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 2 additions & 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,8 @@ const CollaborativeDetailClient = () => {
});

const organizationPublisherHref = (org: any) => {
const path = `/publishers/organization/${org.slug + '_' + org.id}`;
const path = `/publishers/organization/${org.id}`;
// Original: `/publishers/organization/${org.slug + '_' + org.id}`;
// Match getPlatformEntityUrl() behavior (absolute to platform host + locale)
const platformBaseUrl = (
process.env.NEXT_PUBLIC_PLATFORM_URL || ''
Expand Down
14 changes: 7 additions & 7 deletions app/[locale]/(user)/collaboratives/components/Metadata.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ const Metadata = ({ data, setOpen }: { data: any; setOpen?: any }) => {

const metadata = [
{
label: 'Platform URL',
label: 'External Link',
value:
data.collaborativeBySlug.platformUrl === null ? (
'N/A'
Expand All @@ -46,7 +46,7 @@ const Metadata = ({ data, setOpen }: { data: any; setOpen?: any }) => {
className="text-primaryBlue underline lg:text-white"
variant="bodyLg"
>
{platformTitle?.trim() ? platformTitle : 'Visit Platform'}
{platformTitle?.trim() ? platformTitle : 'Open Link'}
</Text>
</Link>
),
Expand Down Expand Up @@ -119,12 +119,12 @@ const Metadata = ({ data, setOpen }: { data: any; setOpen?: any }) => {
return match ? `/${match[1].toLowerCase()}` : '';
};
const contributorHref = (contributor: any) => {
const path = `/publishers/${contributor.fullName + '_' + contributor.id}`;
const path = `/publishers/${contributor.id}`;
// Original: `/publishers/${contributor.fullName + '_' + contributor.id}`;
// Match getPlatformEntityUrl() behavior (absolute to NEXT_PUBLIC_PLATFORM_URL + locale)
const platformBaseUrl = (process.env.NEXT_PUBLIC_PLATFORM_URL || '').replace(
/\/$/,
''
);
const platformBaseUrl = (
process.env.NEXT_PUBLIC_PLATFORM_URL || ''
).replace(/\/$/, '');
const localeSegment = getLocaleSegment();
if (platformBaseUrl) return `${platformBaseUrl}${localeSegment}${path}`;

Expand Down
21 changes: 18 additions & 3 deletions app/[locale]/dashboard/[entityType]/[entitySlug]/collaboratives/edit/[id]/assign/page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,14 @@ import React, { useEffect, useState } from 'react';
import { useParams, useRouter } from 'next/navigation';
import { fetchDatasets } from '@/fetch';
import { graphql } from '@/gql';
import { useMutation, useQuery } from '@tanstack/react-query';
import { useMutation, useQuery, useQueryClient } from '@tanstack/react-query';
import { Button, DataTable, Text, toast } from 'opub-ui';

import { GraphQL } from '@/lib/api';
import { formatDate } from '@/lib/utils';
import { Loading } from '@/components/loading';

// prettier-ignore
const FetchCollaborativeDetails: any = graphql(`
query CollaborativeDetails($filters: CollaborativeFilter) {
collaboratives(filters: $filters) {
Expand All @@ -28,6 +29,7 @@ const FetchCollaborativeDetails: any = graphql(`
}
`);

// prettier-ignore
const AssignCollaborativeDatasets: any = graphql(`
mutation assignCollaborativeDatasets($collaborativeId: String!, $datasetIds: [UUID!]!) {
updateCollaborativeDatasets(collaborativeId: $collaborativeId, datasetIds: $datasetIds) {
Expand All @@ -48,6 +50,7 @@ const Assign = () => {
id: string;
}>();
const router = useRouter();
const queryClient = useQueryClient();
const COLLAB_ASSIGN_TOAST_ID = 'collaboratives-assign-toast';

const [data, setData] = useState<any[]>([]); // Ensure `data` is an array
Expand Down Expand Up @@ -128,13 +131,25 @@ const Assign = () => {
{
onSuccess: () => {
toast('Dataset Assigned Successfully', { id: COLLAB_ASSIGN_TOAST_ID });
CollaborativeDetails.refetch();
queryClient.invalidateQueries({
queryKey: [`Collaborative_Details`, params.id],
});
queryClient.invalidateQueries({
queryKey: [
`fetch_CollaborativeDetails`,
params.entityType,
params.entitySlug,
params.id,
],
});
router.push(
`/dashboard/${params.entityType}/${params.entitySlug}/collaboratives/edit/${params.id}/usecases`
);
},
onError: (err: any) => {
toast(`Received ${err} on dataset publish `, { id: COLLAB_ASSIGN_TOAST_ID });
toast(`Received ${err} on dataset publish `, {
id: COLLAB_ASSIGN_TOAST_ID,
});
},
}
);
Expand Down
75 changes: 68 additions & 7 deletions ...ocale]/dashboard/[entityType]/[entitySlug]/collaboratives/edit/[id]/contributors/page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
'use client';

import { useMutation, useQuery } from '@tanstack/react-query';
import { useMutation, useQuery, useQueryClient } from '@tanstack/react-query';
import Image from 'next/image';
import { useParams } from 'next/navigation';
import { Button, Icon, Text, toast } from 'opub-ui';
Expand All @@ -26,6 +26,7 @@ import {

const Details = () => {
const params = useParams<{ entityType: string; entitySlug: string; id: string }>();
const queryClient = useQueryClient();
const [searchValue, setSearchValue] = useState('');
const [formData, setFormData] = useState({
contributors: [] as { label: string; value: string }[],
Expand Down Expand Up @@ -114,7 +115,17 @@ const Details = () => {
{
onSuccess: () => {
toast('Contributor added successfully', { id: COLLAB_CONTRIBUTORS_TOAST_ID });
CollaborativeData.refetch();
queryClient.invalidateQueries({
queryKey: [`fetch_collaborative_${params.id}`],
});
queryClient.invalidateQueries({
queryKey: [
`fetch_CollaborativeDetails`,
params.entityType,
params.entitySlug,
params.id,
],
});
},
onError: (error: any) => {
toast(`Error: ${error.message}`, { id: COLLAB_CONTRIBUTORS_TOAST_ID });
Expand All @@ -131,7 +142,17 @@ const Details = () => {
{
onSuccess: () => {
toast('Contributor removed successfully', { id: COLLAB_CONTRIBUTORS_TOAST_ID });
CollaborativeData.refetch();
queryClient.invalidateQueries({
queryKey: [`fetch_collaborative_${params.id}`],
});
queryClient.invalidateQueries({
queryKey: [
`fetch_CollaborativeDetails`,
params.entityType,
params.entitySlug,
params.id,
],
});
},
onError: (error: any) => {
toast(`Error: ${error.message}`, { id: COLLAB_CONTRIBUTORS_TOAST_ID });
Expand All @@ -147,7 +168,17 @@ const Details = () => {
{
onSuccess: () => {
toast('Supporter added successfully', { id: COLLAB_CONTRIBUTORS_TOAST_ID });
CollaborativeData.refetch();
queryClient.invalidateQueries({
queryKey: [`fetch_collaborative_${params.id}`],
});
queryClient.invalidateQueries({
queryKey: [
`fetch_CollaborativeDetails`,
params.entityType,
params.entitySlug,
params.id,
],
});
},
onError: (error: any) => {
toast(`Error: ${error.message}`, { id: COLLAB_CONTRIBUTORS_TOAST_ID });
Expand All @@ -164,7 +195,17 @@ const Details = () => {
{
onSuccess: () => {
toast('Supporter removed successfully', { id: COLLAB_CONTRIBUTORS_TOAST_ID });
CollaborativeData.refetch();
queryClient.invalidateQueries({
queryKey: [`fetch_collaborative_${params.id}`],
});
queryClient.invalidateQueries({
queryKey: [
`fetch_CollaborativeDetails`,
params.entityType,
params.entitySlug,
params.id,
],
});
},
onError: (error: any) => {
toast(`Error: ${error.message}`, { id: COLLAB_CONTRIBUTORS_TOAST_ID });
Expand All @@ -180,7 +221,17 @@ const Details = () => {
{
onSuccess: () => {
toast('Partner added successfully', { id: COLLAB_CONTRIBUTORS_TOAST_ID });
CollaborativeData.refetch();
queryClient.invalidateQueries({
queryKey: [`fetch_collaborative_${params.id}`],
});
queryClient.invalidateQueries({
queryKey: [
`fetch_CollaborativeDetails`,
params.entityType,
params.entitySlug,
params.id,
],
});
},
onError: (error: any) => {
toast(`Error: ${error.message}`, { id: COLLAB_CONTRIBUTORS_TOAST_ID });
Expand All @@ -197,7 +248,17 @@ const Details = () => {
{
onSuccess: () => {
toast('Partner removed successfully', { id: COLLAB_CONTRIBUTORS_TOAST_ID });
CollaborativeData.refetch();
queryClient.invalidateQueries({
queryKey: [`fetch_collaborative_${params.id}`],
});
queryClient.invalidateQueries({
queryKey: [
`fetch_CollaborativeDetails`,
params.entityType,
params.entitySlug,
params.id,
],
});
},
onError: (error: any) => {
toast(`Error: ${error.message}`, { id: COLLAB_CONTRIBUTORS_TOAST_ID });
Expand Down
Loading
Loading