From 4570e5080627fb206958d02bc287708b84142245 Mon Sep 17 00:00:00 2001 From: tonyrewin Date: Sun, 9 Oct 2022 08:08:38 +0300 Subject: [PATCH] fixing-editor --- src/components/Editor/prosemirror/extension/image.ts | 2 +- src/components/Editor/prosemirror/extension/todo-list.ts | 2 +- src/components/Editor/prosemirror/setup.ts | 4 ++-- src/components/types.ts | 3 ++- src/pages/inbox.astro | 2 +- src/utils/apiClient.ts | 3 ++- 6 files changed, 9 insertions(+), 7 deletions(-) diff --git a/src/components/Editor/prosemirror/extension/image.ts b/src/components/Editor/prosemirror/extension/image.ts index bb8b4223..aa658089 100644 --- a/src/components/Editor/prosemirror/extension/image.ts +++ b/src/components/Editor/prosemirror/extension/image.ts @@ -168,5 +168,5 @@ export default (path?: string): ProseMirrorExtension => ({ image: (node, view, getPos) => { return new ImageView(node, view, getPos, view.state.schema, path) } - } + } as any }) diff --git a/src/components/Editor/prosemirror/extension/todo-list.ts b/src/components/Editor/prosemirror/extension/todo-list.ts index 40c26ca3..d0a56a24 100644 --- a/src/components/Editor/prosemirror/extension/todo-list.ts +++ b/src/components/Editor/prosemirror/extension/todo-list.ts @@ -91,5 +91,5 @@ export default (): ProseMirrorExtension => ({ todo_item: (node: any, view, getPos) => { return new TodoItemView(node, view, getPos) } - } + } as any }) diff --git a/src/components/Editor/prosemirror/setup.ts b/src/components/Editor/prosemirror/setup.ts index 0ea9a21f..afca1ff7 100644 --- a/src/components/Editor/prosemirror/setup.ts +++ b/src/components/Editor/prosemirror/setup.ts @@ -1,5 +1,5 @@ import { keymap } from 'prosemirror-keymap' -import { ProseMirrorExtension } from './helpers' +import type { ProseMirrorExtension } from './helpers' import { Schema } from 'prosemirror-model' import base from './extension/base' import markdown from './extension/markdown' @@ -15,7 +15,7 @@ import dragHandle from './extension/drag-handle' import pasteMarkdown from './extension/paste-markdown' import table from './extension/table' import collab from './extension/collab' -import { Config, YOptions } from '../store' +import type { Config, YOptions } from '../store' import selectionMenu from './extension/selection' interface Props { diff --git a/src/components/types.ts b/src/components/types.ts index 0b2fca98..35d1f7b7 100644 --- a/src/components/types.ts +++ b/src/components/types.ts @@ -1,5 +1,5 @@ // in a separate file to avoid circular dependencies -import type { Author, Shout, Topic } from '../graphql/types.gen' +import type { Author, Chat, Shout, Topic } from '../graphql/types.gen' // all the things (she said) that could be passed from the server export type PageProps = { @@ -16,4 +16,5 @@ export type PageProps = { searchQuery?: string // other types? searchResults?: Shout[] + chats?: Chat[] } diff --git a/src/pages/inbox.astro b/src/pages/inbox.astro index 99d4c08a..8e7abf67 100644 --- a/src/pages/inbox.astro +++ b/src/pages/inbox.astro @@ -11,5 +11,5 @@ initRouter(pathname, search) --- - + diff --git a/src/utils/apiClient.ts b/src/utils/apiClient.ts index cfd359fc..02b3903d 100644 --- a/src/utils/apiClient.ts +++ b/src/utils/apiClient.ts @@ -313,6 +313,7 @@ export const apiClient = { await privateGraphQLClient.mutation(incrementView, { shout: articleSlug }) }, getInboxes: async (payload = {}) => { - await privateGraphQLClient.query(myChats, payload) + const resp = await privateGraphQLClient.query(myChats, payload).toPromise() + return resp.data.myChats } }