diff --git a/app/db/models/plusSuggestions.server.ts b/app/db/models/plusSuggestions.server.ts index 8c783a014..e9644e3ac 100644 --- a/app/db/models/plusSuggestions.server.ts +++ b/app/db/models/plusSuggestions.server.ts @@ -59,8 +59,7 @@ const findVisibleForUserStm = sql.prepare(` `); export interface FindVisibleForUserSuggestedUserInfo { - // xxx: rename suggestedUser or something - info: Pick< + suggestedUser: Pick< User, | "id" | "discordId" @@ -105,14 +104,14 @@ function mapFindVisibleForUserRowsToResult(rows: any[]): FindVisibleForUser { }; const existingSuggestion = result[row.tier].find( - (suggestion) => suggestion.info.id === row.suggestedId + (suggestion) => suggestion.suggestedUser.id === row.suggestedId ); if (existingSuggestion) { existingSuggestion.suggestions.push(suggestionInfo); } else { result[row.tier].push({ - info: { + suggestedUser: { id: row.suggestedId, discordId: row.suggestedDiscordId, discordName: row.suggestedDiscordName, diff --git a/app/permissions.ts b/app/permissions.ts index 112a41f49..ee79929ce 100644 --- a/app/permissions.ts +++ b/app/permissions.ts @@ -75,7 +75,7 @@ function alreadyCommentedByUser({ }: CanAddCommentToSuggestionArgs) { return Boolean( suggestions[targetPlusTier] - ?.find((u) => u.info.id === suggested.id) + ?.find((u) => u.suggestedUser.id === suggested.id) ?.suggestions.some((s) => s.author.id === user?.id) ); } @@ -89,7 +89,9 @@ export function playerAlreadySuggested({ "suggestions" | "suggested" | "targetPlusTier" >) { return Boolean( - suggestions[targetPlusTier]?.find((u) => u.info.id === suggested.id) + suggestions[targetPlusTier]?.find( + (u) => u.suggestedUser.id === suggested.id + ) ); } diff --git a/app/routes/plus/suggestions.tsx b/app/routes/plus/suggestions.tsx index 048d55b15..c10981cc8 100644 --- a/app/routes/plus/suggestions.tsx +++ b/app/routes/plus/suggestions.tsx @@ -168,7 +168,7 @@ export default function PlusSuggestionsPage() {
{visibleSuggestions.map((u) => ( @@ -229,16 +229,16 @@ function SuggestedUser({
{/* xxx: can cause page to overflow when long e.g. Buckinghamshire */} -

{suggested.info.discordName}

+

{suggested.suggestedUser.discordName}

{canAddCommentToSuggestionFE({ user, suggestions: data.suggestions, - suggested: { id: suggested.info.id }, + suggested: { id: suggested.suggestedUser.id }, targetPlusTier: Number(tier), }) ? ( // TODO: resetScroll={false} https://twitter.com/ryanflorence/status/1527775882797907969 @@ -246,7 +246,7 @@ function SuggestedUser({ className="plus__comment-button" tiny variant="outlined" - to={`comment/${tier}/${suggested.info.id}`} + to={`comment/${tier}/${suggested.suggestedUser.id}`} data-cy="comment-button" > Comment @@ -284,7 +284,7 @@ function SuggestedUser({ ) : null}
diff --git a/app/routes/plus/suggestions/comment.$tier.$userId.tsx b/app/routes/plus/suggestions/comment.$tier.$userId.tsx index fe51309f4..f88ba0f93 100644 --- a/app/routes/plus/suggestions/comment.$tier.$userId.tsx +++ b/app/routes/plus/suggestions/comment.$tier.$userId.tsx @@ -66,7 +66,7 @@ export default function PlusCommentModalPage() { const tierSuggestedTo = String(params.tier); const userBeingCommented = data.suggestions?.[tierSuggestedTo]?.find( - (u) => u.info.id === targetUserId + (u) => u.suggestedUser.id === targetUserId ); if ( @@ -88,8 +88,8 @@ export default function PlusCommentModalPage() {

- {userBeingCommented.info.discordName}'s +{tierSuggestedTo}{" "} - suggestion + {userBeingCommented.suggestedUser.discordName}'s + + {tierSuggestedTo} suggestion