From eb4240d072499376f2b9236c239f4c2c77ef3aa8 Mon Sep 17 00:00:00 2001 From: Victor Date: Mon, 8 Jan 2024 15:56:29 -0800 Subject: [PATCH] invalid html, ratings load bug fixes --- packages/components/src/api/MakeRequest.ts | 11 ++++++--- .../common/Card/AudioCard/AudioCard.tsx | 4 ++-- .../components/common/Card/CreatorName.tsx | 13 +++++----- .../common/Card/ImageCard/ImageCard.tsx | 24 ++++++++++--------- .../common/Card/SkeletonCard/SkeletonCard.tsx | 4 ++-- .../common/Card/VideoCard/VideoCard.tsx | 4 ++-- 6 files changed, 34 insertions(+), 26 deletions(-) diff --git a/packages/components/src/api/MakeRequest.ts b/packages/components/src/api/MakeRequest.ts index 1a0b25389e..35287e3d0c 100644 --- a/packages/components/src/api/MakeRequest.ts +++ b/packages/components/src/api/MakeRequest.ts @@ -23,9 +23,14 @@ const METHOD_OMITS_BODY: { [key: string]: boolean } = { PUT: false, }; -const MakeRequest = (routeSetup: RouteSetup) : (urlRouteArgs: UrlRouteArgs, request: Request, urlParams?: UrlParams) => Promise => { - return async function(urlRouteArgs: UrlRouteArgs, request: Request, urlParams?: any) : Promise { - const endpoint = `${ routeSetup.routingFunction(urlRouteArgs) }${ urlParams ? "?" + new URLSearchParams(urlParams) : "" }`; +const MakeRequest = (routeSetup: RouteSetup) : (urlRouteArgs: UrlRouteArgs, request: Request, queries?: UrlParams) => Promise => { + return async function(urlRouteArgs: UrlRouteArgs, request: Request, queries?: any) : Promise { + const prepedQueries = queries ? Object.keys(queries).reduce((obj,key) => { + let current = queries[key] + return { [key]: Array.isArray(current) ? current.join("&tokens=") : current }; + },{}) : null; + console.log("❓",prepedQueries); + const endpoint = `${ routeSetup.routingFunction(urlRouteArgs) }${ prepedQueries ? "?" + new URLSearchParams(prepedQueries) : "" }`; const method = routeSetup.method; const methodOmitsBody = METHOD_OMITS_BODY[method] || false; diff --git a/packages/fakeyou.com/src/components/common/Card/AudioCard/AudioCard.tsx b/packages/fakeyou.com/src/components/common/Card/AudioCard/AudioCard.tsx index 3a0b9ca7e4..57070db90f 100644 --- a/packages/fakeyou.com/src/components/common/Card/AudioCard/AudioCard.tsx +++ b/packages/fakeyou.com/src/components/common/Card/AudioCard/AudioCard.tsx @@ -190,14 +190,14 @@ export default function AudioCard({ entityToken: data.weight_token, entityType: "model_weight", likeCount: data.likes, - onToggle: ratings.toggle + onToggle: ratings?.toggle }} /> diff --git a/packages/fakeyou.com/src/components/common/Card/CreatorName.tsx b/packages/fakeyou.com/src/components/common/Card/CreatorName.tsx index bfae8ee190..ca3750c8ac 100644 --- a/packages/fakeyou.com/src/components/common/Card/CreatorName.tsx +++ b/packages/fakeyou.com/src/components/common/Card/CreatorName.tsx @@ -1,6 +1,6 @@ import { Gravatar } from "@storyteller/components/src/elements/Gravatar"; import React from "react"; -import { Link } from "react-router-dom"; +import { useHistory } from "react-router-dom"; interface CreatorNameProps { displayName: string; @@ -23,6 +23,7 @@ export default function CreatorName({ username, className, }: CreatorNameProps) { + const history = useHistory(); return (
- +
history.push(`/profile/${username}`) // programatically link to avoid " cannot appear as a descendant of " errors + }} > {displayName} - +
); } diff --git a/packages/fakeyou.com/src/components/common/Card/ImageCard/ImageCard.tsx b/packages/fakeyou.com/src/components/common/Card/ImageCard/ImageCard.tsx index bb7bfe10d3..935b32721c 100644 --- a/packages/fakeyou.com/src/components/common/Card/ImageCard/ImageCard.tsx +++ b/packages/fakeyou.com/src/components/common/Card/ImageCard/ImageCard.tsx @@ -1,5 +1,5 @@ import React from "react"; -import { Link } from "react-router-dom"; +import { Link, useHistory } from "react-router-dom"; import Card from "../Card"; import useTimeAgo from "hooks/useTimeAgo"; import Badge from "components/common/Badge"; @@ -28,6 +28,7 @@ export default function ImageCard({ ratings, type }: ImageCardProps) { + const history = useHistory(); const linkUrl = type === "media" ? `/media/${data.token}` @@ -145,14 +146,15 @@ export default function ImageCard({ overlay={true} /> -