Merge pull request #161 from chingu-x/fix/ideation

Fix/ideation
chingu-x · Aug 6, 2024 · a515365 · a515365
2 parents 1e9b9ef + 21472c2
commit a515365
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 20 deletions.
diff --git a/src/app/(main)/my-voyage/[teamId]/ideation/components/IdeationComponentWrapper.tsx b/src/app/(main)/my-voyage/[teamId]/ideation/components/IdeationComponentWrapper.tsx
@@ -115,9 +115,9 @@ export default async function IdeationComponentWrapper({
 
     return (
       <>
+        <CreateIdeationContainer />
         {!projectIdeas.length ? (
           <>
-            <CreateIdeationContainer />
             <div className="my-20 flex h-[290px] w-full gap-x-48">
               <div className="flex flex-col justify-center">
                 <h1 className="text-xl font-medium text-base-300">
@@ -155,7 +155,6 @@ export default async function IdeationComponentWrapper({
               isIdeationFinalized={false}
               firstChild={
                 <VoteCard
-                  teamId={teamId}
                   projectIdeaId={projectIdea.id}
                   users={projectIdea.projectIdeaVotes}
                 />

diff --git a/src/app/(main)/my-voyage/[teamId]/ideation/components/IdeationForm.tsx b/src/app/(main)/my-voyage/[teamId]/ideation/components/IdeationForm.tsx
@@ -93,7 +93,6 @@ export default function IdeationForm() {
       }
 
       const filteredData: MyObject = {
-        teamId,
         ideationId,
       };
 
@@ -148,7 +147,6 @@ export default function IdeationForm() {
         },
         payload: {
           params: {
-            teamId,
             ideationId,
           },
           redirect: { router, route },
@@ -221,7 +219,6 @@ export default function IdeationForm() {
       }
 
       const filteredData = {
-        teamId,
         ideationId,
         ...modifiedObject,
       };

diff --git a/src/app/(main)/my-voyage/[teamId]/ideation/components/VoteCard.tsx b/src/app/(main)/my-voyage/[teamId]/ideation/components/VoteCard.tsx
@@ -22,10 +22,9 @@ interface VoteCardProps {
   projectIdeaId: number;
   users: ProjectIdeaVotes[];
   className?: string;
-  teamId: number;
 }
 
-function VoteCard({ teamId, projectIdeaId, users, className }: VoteCardProps) {
+function VoteCard({ projectIdeaId, users, className }: VoteCardProps) {
   const [currentUserVoted, setCurrentUserVoted] = useState<null | boolean>(
     null,
   );
@@ -52,7 +51,6 @@ function VoteCard({ teamId, projectIdeaId, users, className }: VoteCardProps) {
       dispatch(setProjectIdeasLoadingTrue());
 
       const [, error] = await removeIdeationVoteAction({
-        teamId,
         ideationId: projectIdeaId,
       });
 
@@ -67,7 +65,6 @@ function VoteCard({ teamId, projectIdeaId, users, className }: VoteCardProps) {
     } else {
       dispatch(setProjectIdeasLoadingTrue());
       const [, error] = await addIdeationVoteAction({
-        teamId,
         ideationId: projectIdeaId,
       });
 

diff --git a/src/app/(main)/my-voyage/[teamId]/ideation/ideationService.ts b/src/app/(main)/my-voyage/[teamId]/ideation/ideationService.ts
@@ -29,11 +29,13 @@ interface IdeationResponse {
 interface AddIdeationBody extends IdeationBody {}
 interface EditIdeationBody extends Partial<AddIdeationBody> {}
 
+type IdeationWithoutTeamId = Omit<IdeationProps, "teamId">;
+
 export interface AddIdeationProps extends AddIdeationType, IdeationBody {}
-export interface EditIdeationProps extends EditIdeationBody, IdeationProps {}
-export interface DeleteIdeationProps extends IdeationProps {}
+export type EditIdeationProps = EditIdeationBody & IdeationWithoutTeamId;
+export type DeleteIdeationProps = IdeationWithoutTeamId;
 
-export interface IdeationVoteProps extends IdeationProps {}
+export type IdeationVoteProps = IdeationWithoutTeamId;
 export type FetchIdeationsProps = Pick<IdeationProps, "teamId">;
 
 export interface FinalizeIdeationProps extends IdeationProps {}
@@ -77,7 +79,6 @@ export async function addIdeation({
 }
 
 export async function editIdeation({
-  teamId,
   ideationId,
   title,
   description,
@@ -87,7 +88,7 @@ export async function editIdeation({
 
   const editIdeationAsync = () =>
     PATCH<EditIdeationBody, EditIdeationResponse>(
-      `api/v1/voyages/teams/${teamId}/ideations/${ideationId}`,
+      `api/v1/voyages/ideations/${ideationId}`,
       token,
       "default",
       { title, description, vision },
@@ -103,13 +104,12 @@ export async function editIdeation({
 }
 
 export async function deleteIdeation({
-  teamId,
   ideationId,
 }: DeleteIdeationProps): Promise<AsyncActionResponse<DeleteIdeationResponse>> {
   const token = getAccessToken();
   const deleteIdeationAsync = () =>
     DELETE<DeleteIdeationResponse>(
-      `api/v1/voyages/teams/${teamId}/ideations/${ideationId}`,
+      `api/v1/voyages/ideations/${ideationId}`,
       token,
       "default",
     );
@@ -124,14 +124,13 @@ export async function deleteIdeation({
 }
 
 export async function addIdeationVote({
-  teamId,
   ideationId,
 }: IdeationVoteProps): Promise<AsyncActionResponse<IdeationVoteResponse>> {
   const token = getAccessToken();
 
   const addIdeationVoteAsync = () =>
     POST<undefined, IdeationVoteResponse>(
-      `api/v1/voyages/teams/${teamId}/ideations/${ideationId}/ideation-votes`,
+      `api/v1/voyages/ideations/${ideationId}/ideation-votes`,
       token,
       "default",
     );
@@ -146,14 +145,13 @@ export async function addIdeationVote({
 }
 
 export async function removeIdeationVote({
-  teamId,
   ideationId,
 }: IdeationVoteProps): Promise<AsyncActionResponse<IdeationVoteResponse>> {
   const token = getAccessToken();
 
   const removeIdeationVoteAsync = () =>
     DELETE<IdeationVoteResponse>(
-      `api/v1/voyages/teams/${teamId}/ideations/${ideationId}/ideation-votes`,
+      `api/v1/voyages/ideations/${ideationId}/ideation-votes`,
       token,
       "default",
     );