From b207fb9e0c5d4a684a655f61790349ea5a3d85ad Mon Sep 17 00:00:00 2001 From: ilya-bkv Date: Tue, 15 Nov 2022 16:55:00 +0300 Subject: [PATCH] linter fixies --- src/components/Inbox/DialogCard.tsx | 8 +++--- src/components/Nav/HeaderAuth.tsx | 2 +- src/components/Views/Inbox.tsx | 42 ++++++++++++++++------------- 3 files changed, 28 insertions(+), 24 deletions(-) diff --git a/src/components/Inbox/DialogCard.tsx b/src/components/Inbox/DialogCard.tsx index d0bf9ac8..c1e11bde 100644 --- a/src/components/Inbox/DialogCard.tsx +++ b/src/components/Inbox/DialogCard.tsx @@ -14,13 +14,13 @@ type Props = { const DialogCard = (props: Props) => { const handleOpenChat = async () => { try { - const test = await apiClient.createChat({ + const initChat = await apiClient.createChat({ title: 'test chat', members: [props.slug, props.ownerSlug] }) - console.log('!!! test:', test.data) - } catch (err) { - console.log('!!! errr:', err) + console.log('!!! test:', initChat.data) + } catch (error) { + console.log('!!! errr:', error) } } diff --git a/src/components/Nav/HeaderAuth.tsx b/src/components/Nav/HeaderAuth.tsx index a98566d8..f8eee853 100644 --- a/src/components/Nav/HeaderAuth.tsx +++ b/src/components/Nav/HeaderAuth.tsx @@ -3,7 +3,7 @@ import { clsx } from 'clsx' import { handleClientRouteLinkClick, useRouter } from '../../stores/router' import { t } from '../../utils/intl' import { Icon } from './Icon' -import { createSignal, onMount, Show } from 'solid-js' +import { createSignal, Show } from 'solid-js' import Notifications from './Notifications' import { ProfilePopup } from './ProfilePopup' import Userpic from '../Author/Userpic' diff --git a/src/components/Views/Inbox.tsx b/src/components/Views/Inbox.tsx index 2a9fc2be..1dc0e04c 100644 --- a/src/components/Views/Inbox.tsx +++ b/src/components/Views/Inbox.tsx @@ -55,12 +55,17 @@ const userSearch = (array: Author[], keyword: string) => { }) } +const postMessage = async (msg: string) => { + const response = await client.mutation(newMessageQuery, { messageBody: msg }).toPromise() + return response.data.createComment +} + export const InboxView = () => { const [messages, setMessages] = createSignal([]) const [authors, setAuthors] = createSignal([]) const [postMessageText, setPostMessageText] = createSignal('') const [loading, setLoading] = createSignal(false) - const [currentSlug, setCurrentSlug] = createSignal(undefined) + const [currentSlug, setCurrentSlug] = createSignal() const { session } = useSession() const { sortedAuthors } = useAuthorsStore() @@ -91,31 +96,30 @@ export const InboxView = () => { if (response.error) console.debug('getMessages', response.error) setMessages(response.data.comments.data) } - const postMessage = async (msg: string) => { - const response = await client.mutation(newMessageQuery, { messageBody: msg }).toPromise() - return response.data.createComment - } let chatWindow onMount(async () => { setLoading(true) - await fetchMessages(messageQuery) - .then(() => { - setLoading(false) - chatWindow.scrollTop = chatWindow.scrollHeight - }) - .catch(() => setLoading(false)) + try { + await fetchMessages(messageQuery) + } catch (error) { + setLoading(false) + console.error([fetchMessages], error) + } finally { + setLoading(false) + chatWindow.scrollTop = chatWindow.scrollHeight + } }) const handleSubmit = async () => { - postMessage(postMessageText()) - .then((result) => { - setMessages((prev) => [...prev, result]) - }) - .then(() => { - setPostMessageText('') - chatWindow.scrollTop = chatWindow.scrollHeight - }) + try { + const post = await postMessage(postMessageText()) + setMessages((prev) => [...prev, post]) + setPostMessageText('') + chatWindow.scrollTop = chatWindow.scrollHeight + } catch (error) { + console.error('[post message error]:', error) + } } const handleChangeMessage = (event) => { setPostMessageText(event.target.value)