Skip to content

[Bugfix/#460] org 저장시 alert draft 값 반영 #463

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
jjjsun merged 1 commit into from
Aug 13, 2026
Merged

[Bugfix/#460] org 저장시 alert draft 값 반영 #463

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
69 changes: 47 additions & 22 deletions src/hooks/setting/useSettingNotifications.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,7 @@ export default function useSettingNotifications() {
(isNotificationLoading || isNotificationRefetching);

const buildOrgBody = (
alerts: { alertClicks: boolean; alertReport: boolean },
overrides: Partial<IUpdateOrgNotificationSettingsRequest> = {},
): IUpdateOrgNotificationSettingsRequest => ({
isSlackEnabled: savedOrgNotif.slackEnabled,
Expand All @@ -94,8 +95,8 @@ export default function useSettingNotifications() {
isDiscordEnabled: savedOrgNotif.discordEnabled,
discordWebhookUrl: "",
disconnectDiscord: false,
alertClicks: savedWorkspaceNotif.clickAlarm ?? false,
alertReport: savedWorkspaceNotif.weeklyReport ?? false,
alertClicks: alerts.alertClicks,
alertReport: alerts.alertReport,
...overrides,
});

Expand All @@ -121,11 +122,17 @@ export default function useSettingNotifications() {
setPendingOrgAction("slack");
try {
await updateOrg.mutateAsync(
buildOrgBody({
isSlackEnabled: true,
slackWebhookUrl: url,
disconnectSlack: false,
}),
buildOrgBody(
{
alertClicks: draftWorkspaceNotif.clickAlarm,
alertReport: draftWorkspaceNotif.weeklyReport,
},
{
isSlackEnabled: true,
slackWebhookUrl: url,
disconnectSlack: false,
},
),
);
toast.success("슬랙이 연동되었습니다");
setSlackWebhookUrl("");
Expand All @@ -142,11 +149,17 @@ export default function useSettingNotifications() {
setPendingOrgAction("slack");
try {
await updateOrg.mutateAsync(
buildOrgBody({
isSlackEnabled: false,
slackWebhookUrl: "",
disconnectSlack: true,
}),
buildOrgBody(
{
alertClicks: draftWorkspaceNotif.clickAlarm,
alertReport: draftWorkspaceNotif.weeklyReport,
},
{
isSlackEnabled: false,
slackWebhookUrl: "",
disconnectSlack: true,
},
),
);
toast.success("슬랙 연동이 해제되었습니다");
} catch (e) {
Expand All @@ -171,11 +184,17 @@ export default function useSettingNotifications() {
setPendingOrgAction("discord");
try {
await updateOrg.mutateAsync(
buildOrgBody({
isDiscordEnabled: true,
discordWebhookUrl: url,
disconnectDiscord: false,
}),
buildOrgBody(
{
alertClicks: draftWorkspaceNotif.clickAlarm,
alertReport: draftWorkspaceNotif.weeklyReport,
},
{
isDiscordEnabled: true,
discordWebhookUrl: url,
disconnectDiscord: false,
},
),
);
toast.success("디스코드가 연동되었습니다");
setDiscordWebhookUrl("");
Expand All @@ -192,11 +211,17 @@ export default function useSettingNotifications() {
setPendingOrgAction("discord");
try {
await updateOrg.mutateAsync(
buildOrgBody({
isDiscordEnabled: false,
discordWebhookUrl: "",
disconnectDiscord: true,
}),
buildOrgBody(
{
alertClicks: draftWorkspaceNotif.clickAlarm,
alertReport: draftWorkspaceNotif.weeklyReport,
},
{
isDiscordEnabled: false,
discordWebhookUrl: "",
disconnectDiscord: true,
},
),
);
toast.success("디스코드 연동이 해제되었습니다");
} catch (e) {
Expand Down
22 changes: 14 additions & 8 deletions src/hooks/setting/useSettingSave.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,14 +131,20 @@ export default function useSettingSave({
}
if (shouldSaveOrg) {
await notifications.updateOrg.mutateAsync(
notifications.buildOrgBody({
isSlackEnabled: notifications.draftOrgNotif.slackEnabled,
slackWebhookUrl: "",
disconnectSlack: false,
isDiscordEnabled: notifications.draftOrgNotif.discordEnabled,
discordWebhookUrl: "",
disconnectDiscord: false,
}),
notifications.buildOrgBody(
{
alertClicks: notifications.draftWorkspaceNotif.clickAlarm,
alertReport: notifications.draftWorkspaceNotif.weeklyReport,
},
{
isSlackEnabled: notifications.draftOrgNotif.slackEnabled,
slackWebhookUrl: "",
disconnectSlack: false,
isDiscordEnabled: notifications.draftOrgNotif.discordEnabled,
discordWebhookUrl: "",
disconnectDiscord: false,
},
),
);
notifications.setSavedOrgNotif((prev) => ({
...prev,
Expand Down
Loading