Skip to content

Commit baff5af

Browse files
synzensynzen
committed
Show full message in channel when creating threads
1 parent d21eb27 commit baff5af

22 files changed

+262
-243
lines changed

‎services/backend-api/client/src/features/feedConnections/api/createDiscordChannelConnectionPreview.ts

+2
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,8 @@ export interface CreateDiscordChannelConnectionPreviewInput {
6262
id: string;
6363
filters?: Record<string, any> | null;
6464
}> | null;
65+
channelNewThreadExcludesPreview?: boolean | null;
66+
channelNewThreadTitle?: string | null;
6567
};
6668
}
6769

‎services/backend-api/client/src/features/feedConnections/components/DiscordMessageForm/DiscordMessageChannelThreadForm.tsx

+41-2
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ import {
77
Input,
88
Stack,
99
StackDivider,
10+
Switch,
1011
} from "@chakra-ui/react";
1112
import { Controller, useFormContext } from "react-hook-form";
1213
import { DiscordMessageFormData } from "@/types/discord";
@@ -20,7 +21,7 @@ export const DiscordMessageChannelThreadForm = () => {
2021

2122
return (
2223
<Stack spacing={8} divider={<StackDivider />}>
23-
<FormControl isInvalid={!!errors.content}>
24+
<FormControl isInvalid={!!errors.channelNewThreadTitle}>
2425
<Stack
2526
direction={{ base: "column", md: "row" }}
2627
spacing={{ base: "1.5", md: "8" }}
@@ -47,7 +48,45 @@ export const DiscordMessageChannelThreadForm = () => {
4748
<Input size="sm" {...field} bg="gray.900" value={field.value || ""} />
4849
)}
4950
/>
50-
<FormErrorMessage>{errors.content?.message}</FormErrorMessage>
51+
<FormErrorMessage>{errors.channelNewThreadTitle?.message}</FormErrorMessage>
52+
</Stack>
53+
</Stack>
54+
</FormControl>
55+
<FormControl isInvalid={!!errors.channelNewThreadExcludesPreview}>
56+
<Stack
57+
direction={{ base: "column", md: "row" }}
58+
spacing={{ base: "1.5", md: "8" }}
59+
justify="space-between"
60+
>
61+
<Box>
62+
<FormLabel id="thread-hide-message">Hide Message in Channel</FormLabel>
63+
<FormHelperText id="thread-hide-message-helper">
64+
If enabled, the message contents will only be shown inside the thread. Only the thread
65+
title will be shown in the channel.
66+
<MessagePlaceholderText withBrackets>title</MessagePlaceholderText>
67+
</FormHelperText>
68+
</Box>
69+
<Stack
70+
spacing={8}
71+
width="100%"
72+
maxW={{ md: "3xl" }}
73+
minW={{ md: "md", lg: "lg", xl: "3xl" }}
74+
>
75+
<Controller
76+
name="channelNewThreadExcludesPreview"
77+
control={control}
78+
render={({ field }) => (
79+
<Switch
80+
isChecked={field.value || false}
81+
name={field.name}
82+
onChange={(e) => field.onChange(e.target.checked)}
83+
onBlur={field.onBlur}
84+
aria-describedby="thread-hide-message-helper"
85+
aria-labelledby="thread-hide-message"
86+
/>
87+
)}
88+
/>
89+
<FormErrorMessage>{errors.channelNewThreadExcludesPreview?.message}</FormErrorMessage>
5190
</Stack>
5291
</Stack>
5392
</FormControl>

‎services/backend-api/client/src/features/feedConnections/components/DiscordMessageForm/DiscordMessageForumThreadForm.tsx

+4-2
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ export const DiscordMessageForumThreadForm = () => {
126126

127127
return (
128128
<Stack spacing={8} divider={<StackDivider />}>
129-
<FormControl isInvalid={!!errors.content}>
129+
<FormControl isInvalid={!!errors.forumThreadTitle}>
130130
<Stack
131131
direction={{ base: "column", md: "row" }}
132132
spacing={{ base: "1.5", md: "8" }}
@@ -161,7 +161,9 @@ export const DiscordMessageForumThreadForm = () => {
161161
/>
162162
)}
163163
/>
164-
{errors.content && <FormErrorMessage>{errors.content.message}</FormErrorMessage>}
164+
{errors.forumThreadTitle && (
165+
<FormErrorMessage>{errors.forumThreadTitle.message}</FormErrorMessage>
166+
)}
165167
</Stack>
166168
</Stack>
167169
</FormControl>

‎services/backend-api/client/src/features/feedConnections/components/DiscordMessageForm/index.tsx

+6
Original file line numberDiff line numberDiff line change
@@ -127,6 +127,8 @@ export const DiscordMessageForm = ({ onClickSave, articleIdToPreview, guildId }:
127127
forumThreadTitle,
128128
componentRows,
129129
externalProperties,
130+
channelNewThreadTitle,
131+
channelNewThreadExcludesPreview,
130132
] = useWatch({
131133
control,
132134
name: [
@@ -142,6 +144,8 @@ export const DiscordMessageForm = ({ onClickSave, articleIdToPreview, guildId }:
142144
"forumThreadTitle",
143145
"componentRows",
144146
"externalProperties",
147+
"channelNewThreadTitle",
148+
"channelNewThreadExcludesPreview",
145149
],
146150
});
147151

@@ -170,6 +174,8 @@ export const DiscordMessageForm = ({ onClickSave, articleIdToPreview, guildId }:
170174
forumThreadTitle,
171175
componentRows,
172176
externalProperties,
177+
channelNewThreadTitle,
178+
channelNewThreadExcludesPreview,
173179
},
174180
};
175181

‎services/backend-api/client/src/features/feedConnections/components/MessageTabSection/index.tsx

+11-39
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,6 @@ import {
55
AccordionIcon,
66
AccordionItem,
77
AccordionPanel,
8-
Alert,
9-
AlertIcon,
108
Box,
119
Button,
1210
Card,
@@ -42,8 +40,6 @@ import { Link } from "react-router-dom";
4240
import { DiscordMessageFormData } from "../../../../types/discord";
4341
import { notifyError } from "../../../../utils/notifyError";
4442
import { useUserFeedArticles } from "../../../feed/hooks";
45-
import { UserFeedArticleRequestStatus } from "../../../feed/types";
46-
import { getErrorMessageForArticleRequestStatus } from "../../../feed/utils";
4743
import { ArticlePlaceholderTable } from "../ArticlePlaceholderTable";
4844
import { DiscordMessageForm } from "../DiscordMessageForm";
4945
import { ArticleSelectDialog } from "../../../feed/components";
@@ -52,6 +48,7 @@ import { pages } from "../../../../constants";
5248
import { UserFeedConnectionTabSearchParam } from "../../../../constants/userFeedConnectionTabSearchParam";
5349
import { UserFeedTabSearchParam } from "../../../../constants/userFeedTabSearchParam";
5450
import { useUserFeedConnectionContext } from "../../../../contexts/UserFeedConnectionContext";
51+
import { useGetUserFeedArticlesError } from "../../hooks";
5552

5653
interface Props {
5754
onMessageUpdated: (data: DiscordMessageFormData) => Promise<void>;
@@ -69,6 +66,7 @@ export const MessageTabSection = ({ onMessageUpdated, guildId }: Props) => {
6966
refetch: refetchUserFeedArticle,
7067
fetchStatus: userFeedArticlesFetchStatus,
7168
status: userFeedArticlesStatus,
69+
error,
7270
} = useUserFeedArticles({
7371
feedId: userFeed.id,
7472
data: {
@@ -83,8 +81,13 @@ export const MessageTabSection = ({ onMessageUpdated, guildId }: Props) => {
8381
},
8482
});
8583

84+
const { alertComponent } = useGetUserFeedArticlesError({
85+
getUserFeedArticlesStatus: userFeedArticlesStatus,
86+
getUserFeedArticlesError: error,
87+
getUserFeedArticlesOutput: userFeedArticles,
88+
});
89+
8690
const firstArticle = userFeedArticles?.result.articles[0];
87-
const requestStatus = userFeedArticles?.result.requestStatus;
8891

8992
const { t } = useTranslation();
9093

@@ -101,37 +104,6 @@ export const MessageTabSection = ({ onMessageUpdated, guildId }: Props) => {
101104
setSelectedArticleId(articleId);
102105
};
103106

104-
const fetchErrorAlert = userFeedArticlesStatus === "error" && (
105-
<Alert status="error">
106-
<AlertIcon />
107-
{t("common.errors.somethingWentWrong")}
108-
</Alert>
109-
);
110-
111-
const alertStatus =
112-
requestStatus && requestStatus !== UserFeedArticleRequestStatus.Success
113-
? getErrorMessageForArticleRequestStatus(
114-
requestStatus,
115-
userFeedArticles?.result?.response?.statusCode
116-
)
117-
: null;
118-
119-
const parseErrorAlert = alertStatus && (
120-
<Alert status={alertStatus.status || "error"}>
121-
<AlertIcon />
122-
{t(alertStatus.ref)}
123-
</Alert>
124-
);
125-
126-
const noArticlesAlert = userFeedArticles?.result.articles.length === 0 && (
127-
<Alert status="info">
128-
<AlertIcon />
129-
{t("features.feedConnections.components.articlePlaceholderTable.noArticles")}
130-
</Alert>
131-
);
132-
133-
const hasAlert = !!(fetchErrorAlert || parseErrorAlert || noArticlesAlert);
134-
135107
const firstArticleTitle = (firstArticle as Record<string, string>)?.title;
136108
const firstArticleDate = (firstArticle as Record<string, string>)?.date;
137109

@@ -176,7 +148,7 @@ export const MessageTabSection = ({ onMessageUpdated, guildId }: Props) => {
176148
</Text>
177149
</Stack>
178150
)}
179-
{!hasAlert && firstArticle && (
151+
{!alertComponent && firstArticle && (
180152
<ArticlePlaceholderTable
181153
asPlaceholders
182154
article={userFeedArticles.result.articles[0]}
@@ -225,13 +197,13 @@ export const MessageTabSection = ({ onMessageUpdated, guildId }: Props) => {
225197
corresponding article content.
226198
</Text>
227199
</Stack>
228-
{fetchErrorAlert || parseErrorAlert || noArticlesAlert}
200+
{alertComponent}
229201
{userFeedArticlesStatus === "loading" && (
230202
<Center mt={6}>
231203
<Spinner />
232204
</Center>
233205
)}
234-
{!hasAlert && firstArticle && (
206+
{!alertComponent && firstArticle && (
235207
<Card size="md">
236208
<CardHeader padding={0} margin={5}>
237209
<Heading size="xs" as="h4" textTransform="uppercase">

‎services/backend-api/client/src/pages/FeedMessage.tsx

+1
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@ const FeedMessage: React.FC = () => {
5555
splitOptions: null,
5656
forumThreadTags: null,
5757
mentions: null,
58+
channelNewThreadExcludesPreview: false,
5859
}}
5960
onClickSave={onFormSaved}
6061
/>

‎services/backend-api/client/src/types/discord/DiscordMessageFormData.ts

+1
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,7 @@ export const discordMessageFormSchema = object({
104104
.max(5)
105105
.nullable(),
106106
channelNewThreadTitle: string().optional(),
107+
channelNewThreadExcludesPreview: boolean().optional().nullable().default(false),
107108
forumThreadTitle: string().optional(),
108109
forumThreadTags: array(
109110
object({

‎services/backend-api/client/src/utils/getStandardErrorCodeMessage copy.ts

+3-1
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,9 @@ export const getStandardErrorCodeMessage = (code: ApiErrorCode) => {
9797
const mappedError = ERROR_CODE_MESSAGES[code];
9898

9999
if (!mappedError) {
100-
return t("common.errors.somethingWentWrong");
100+
return `${t(
101+
"common.errors.somethingWentWrong"
102+
)} Please try again later, or contact support if the issue persists.`;
101103
}
102104

103105
return mappedError;

‎services/backend-api/src/features/feed-connections/dto/create-discord-channel-connection-preview-input.dto.ts

+4
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,10 @@ export class CreateDiscordChannelConnectionPreviewInputDto {
4949
@IsOptional()
5050
channelNewThreadTitle?: string;
5151

52+
@IsBoolean()
53+
@IsOptional()
54+
channelNewThreadExcludesPreview?: boolean;
55+
5256
@IsArray()
5357
@IsOptional()
5458
@ValidateNested({ each: true })

‎services/backend-api/src/features/feed-connections/dto/index.ts

-2
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@ export * from "./create-discord-webhook-connection-input.dto";
44
export * from "./create-discord-webhook-connection-output.dto";
55
export * from "./update-discord-channel-connection-input.dto";
66
export * from "./update-discord-channel-connection-output.dto";
7-
export * from "./update-discord-webhook-connection-input.dto";
8-
export * from "./update-discord-webhook-connection-output.dto";
97
export * from "./create-discord-channel-connection-test-article-output.dto";
108
export * from "./create-discord-webhook-connection-test-article-output.dto";
119
export * from "./create-discord-channel-connection-test-article-input.dto";

‎services/backend-api/src/features/feed-connections/dto/update-discord-channel-connection-input.dto.ts

+4
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,10 @@ export class UpdateDiscordChannelConnectionInputDto {
7070
@IsOptional()
7171
channelNewThreadTitle?: string;
7272

73+
@IsBoolean()
74+
@IsOptional()
75+
channelNewThreadExcludesPreview?: boolean;
76+
7377
@IsObject()
7478
@IsOptional()
7579
@ValidateNested()

0 commit comments

Comments
 (0)