From b73bd1e6647f049c2a57c63a6617b2f923b92e06 Mon Sep 17 00:00:00 2001 From: Katalina Okano Date: Mon, 5 Jul 2021 12:10:40 -0500 Subject: [PATCH] fix linting issues --- packages/api/handlers/update-guild.ts | 59 ++++++++++--------- .../organisms/editor-shell/EditorShell.tsx | 20 +++++-- .../design-system/templates/editor/Editor.tsx | 9 +-- 3 files changed, 47 insertions(+), 41 deletions(-) diff --git a/packages/api/handlers/update-guild.ts b/packages/api/handlers/update-guild.ts index dc9c309..0c37729 100644 --- a/packages/api/handlers/update-guild.ts +++ b/packages/api/handlers/update-guild.ts @@ -5,34 +5,35 @@ import { GuildData } from '../utils/kv'; import { lowPermissions, missingParameters, notFound, ok } from '../utils/responses'; export const UpdateGuild = withSession( - (session: SessionData) => async (request: Request): Promise => { - const url = new URL(request.url); - const [, , guildID] = url.pathname.split('/'); - if (!guildID) { - return missingParameters(); + (session: SessionData) => + async (request: Request): Promise => { + const url = new URL(request.url); + const [, , guildID] = url.pathname.split('/'); + if (!guildID) { + return missingParameters(); + } + + const guildUpdate = (await request.json()) as GuildDataUpdate; + + const guild = session.guilds.find((guild) => guild.id === guildID); + if (!guild) { + return notFound(); + } + + if ( + guild?.permissionLevel !== UserGuildPermissions.Manager && + guild?.permissionLevel !== UserGuildPermissions.Admin + ) { + return lowPermissions(); + } + + const newGuildData = { + ...(await getGuildData(guildID)), + ...guildUpdate, + }; + + await GuildData.put(guildID, newGuildData); + + return ok(); } - - const guildUpdate = (await request.json()) as GuildDataUpdate; - - const guild = session.guilds.find((guild) => guild.id === guildID); - if (!guild) { - return notFound(); - } - - if ( - guild?.permissionLevel !== UserGuildPermissions.Manager && - guild?.permissionLevel !== UserGuildPermissions.Admin - ) { - return lowPermissions(); - } - - const newGuildData = { - ...(await getGuildData(guildID)), - ...guildUpdate, - }; - - await GuildData.put(guildID, newGuildData); - - return ok(); - } ); diff --git a/packages/design-system/organisms/editor-shell/EditorShell.tsx b/packages/design-system/organisms/editor-shell/EditorShell.tsx index 2fa3222..67d8c2c 100644 --- a/packages/design-system/organisms/editor-shell/EditorShell.tsx +++ b/packages/design-system/organisms/editor-shell/EditorShell.tsx @@ -37,15 +37,25 @@ export const EditorShell = (props: EditorShellProps) => { }); }; - const hasChanges = React.useMemo(() => !deepEqual(guild.data, props.guild.data), [ - guild.data, - props.guild.data, - ]); + const hasChanges = React.useMemo( + () => !deepEqual(guild.data, props.guild.data), + [guild.data, props.guild.data] + ); return (
- }> + props.onGuildChange?.(guild)} + showSaveReset={hasChanges} + /> + } + > {() => ( ) => { - const { - guild, - onCategoryChange, - onMessageChange, - onGuildChange, - ...appShellProps - } = props; + const { guild, onCategoryChange, onMessageChange, onGuildChange, ...appShellProps } = + props; return (