diff --git a/src/components/_shared/InviteMembers/InviteMembers.tsx b/src/components/_shared/InviteMembers/InviteMembers.tsx
index a1563d0e..75431db0 100644
--- a/src/components/_shared/InviteMembers/InviteMembers.tsx
+++ b/src/components/_shared/InviteMembers/InviteMembers.tsx
@@ -8,7 +8,6 @@ import { Author } from '../../../graphql/schema/core.gen'
import { hideModal } from '../../../stores/ui'
import { useAuthorsStore } from '../../../stores/zine/authors'
import { AuthorBadge } from '../../Author/AuthorBadge'
-import { Modal } from '../../Nav/Modal'
import { Button } from '../Button'
import { DropdownSelect } from '../DropdownSelect'
import { Loading } from '../Loading'
diff --git a/src/context/editor.tsx b/src/context/editor.tsx
index 83992474..049a7e84 100644
--- a/src/context/editor.tsx
+++ b/src/context/editor.tsx
@@ -8,6 +8,7 @@ import { createStore, SetStoreFunction } from 'solid-js/store'
import { apiClient } from '../graphql/client/core'
import { Topic, TopicInput } from '../graphql/schema/core.gen'
import { router, useRouter } from '../stores/router'
+import { addArticles } from '../stores/zine/articles'
import { slugify } from '../utils/slugify'
import { useLocalize } from './localize'
@@ -122,20 +123,11 @@ export const EditorProvider = (props: { children: JSX.Element }) => {
const updateShout = async (formToUpdate: ShoutForm, { publish }: { publish: boolean }) => {
return await apiClient.updateArticle({
- shoutId: formToUpdate.shoutId,
- shoutInput: {
- body: formToUpdate.body,
+ shout_id: formToUpdate.shoutId,
+ shout_input: {
+ ...formToUpdate,
topics: formToUpdate.selectedTopics.map((topic) => topic2topicInput(topic)), // NOTE: first is main
- // authors?: InputMaybe
>>
- // community?: InputMaybe
- // mainTopic: topic2topicInput(formToUpdate.mainTopic),
- slug: formToUpdate.slug,
- subtitle: formToUpdate.subtitle,
- title: formToUpdate.title,
- lead: formToUpdate.lead,
- description: formToUpdate.description,
cover: formToUpdate.coverImageUrl,
- media: formToUpdate.media,
},
publish,
})
@@ -204,13 +196,13 @@ export const EditorProvider = (props: { children: JSX.Element }) => {
}
}
- const publishShoutById = async (shoutId: number) => {
+ const publishShoutById = async (shout_id: number) => {
try {
- await apiClient.updateArticle({
- shoutId,
+ const newShout = await apiClient.updateArticle({
+ shout_id,
publish: true,
})
-
+ addArticles([newShout])
openPage(router, 'feed')
} catch (error) {
console.error('[publishShoutById]', error)
@@ -218,10 +210,10 @@ export const EditorProvider = (props: { children: JSX.Element }) => {
}
}
- const deleteShout = async (shoutId: number) => {
+ const deleteShout = async (shout_id: number) => {
try {
await apiClient.deleteShout({
- shoutId,
+ shout_id,
})
return true
} catch {
diff --git a/src/graphql/client/core.ts b/src/graphql/client/core.ts
index 04e8acf6..90402a4f 100644
--- a/src/graphql/client/core.ts
+++ b/src/graphql/client/core.ts
@@ -13,6 +13,7 @@ import type {
QueryLoad_Shouts_SearchArgs,
QueryLoad_Shouts_Random_TopArgs,
Community,
+ MutationDelete_ShoutArgs,
} from '../schema/core.gen'
import { createGraphQLClient } from '../createGraphQLClient'
@@ -149,22 +150,22 @@ export const apiClient = {
return response.data.create_shout.shout
},
updateArticle: async ({
- shoutId,
- shoutInput,
+ shout_id,
+ shout_input,
publish,
}: {
- shoutId: number
- shoutInput?: ShoutInput
+ shout_id: number
+ shout_input?: ShoutInput
publish: boolean
}): Promise => {
const response = await apiClient.private
- .mutation(updateArticle, { shoutId, shoutInput, publish })
+ .mutation(updateArticle, { shout_id, shout_input, publish })
.toPromise()
console.debug('[graphql.client.core] updateArticle:', response.data)
return response.data.update_shout.shout
},
- deleteShout: async ({ shoutId }: { shoutId: number }): Promise => {
- const response = await apiClient.private.mutation(deleteShout, { shout_id: shoutId }).toPromise()
+ deleteShout: async (params: MutationDelete_ShoutArgs): Promise => {
+ const response = await apiClient.private.mutation(deleteShout, params).toPromise()
console.debug('[graphql.client.core] deleteShout:', response)
},
getDrafts: async (): Promise => {
diff --git a/src/graphql/mutation/core/article-delete.ts b/src/graphql/mutation/core/article-delete.ts
index 9aa22fc1..6ac5578e 100644
--- a/src/graphql/mutation/core/article-delete.ts
+++ b/src/graphql/mutation/core/article-delete.ts
@@ -1,8 +1,8 @@
import { gql } from '@urql/core'
export default gql`
- mutation DeleteShoutMutation($shoutId: Int!) {
- delete_shout(shout_id: $shoutId) {
+ mutation DeleteShoutMutation($shout_id: Int!) {
+ delete_shout(shout_id: $shout_id) {
error
}
}
diff --git a/src/graphql/mutation/core/article-update.ts b/src/graphql/mutation/core/article-update.ts
index ca455bc5..307a4b90 100644
--- a/src/graphql/mutation/core/article-update.ts
+++ b/src/graphql/mutation/core/article-update.ts
@@ -1,8 +1,8 @@
import { gql } from '@urql/core'
export default gql`
- mutation UpdateShoutMutation($shoutId: Int!, $shoutInput: ShoutInput, $publish: Boolean) {
- update_shout(shout_id: $shoutId, shout_input: $shoutInput, publish: $publish) {
+ mutation UpdateShoutMutation($shout_id: Int!, $shout_input: ShoutInput, $publish: Boolean) {
+ update_shout(shout_id: $shout_id, shout_input: $shout_input, publish: $publish) {
error
shout {
id
@@ -12,7 +12,10 @@ export default gql`
lead
description
body
- visibility
+ created_at
+ updated_at
+ published_at
+ featured_at
}
}
}
diff --git a/src/graphql/query/core/reactions-load-by.ts b/src/graphql/query/core/reactions-load-by.ts
index 02aff493..c0700f07 100644
--- a/src/graphql/query/core/reactions-load-by.ts
+++ b/src/graphql/query/core/reactions-load-by.ts
@@ -6,7 +6,6 @@ export default gql`
id
kind
body
- range
reply_to
shout {
id
diff --git a/src/stores/zine/articles.ts b/src/stores/zine/articles.ts
index ed15fe97..9b41fc69 100644
--- a/src/stores/zine/articles.ts
+++ b/src/stores/zine/articles.ts
@@ -64,12 +64,14 @@ const topCommentedArticles = createLazyMemo(() => {
})
// eslint-disable-next-line sonarjs/cognitive-complexity
-const addArticles = (...args: Shout[][]) => {
+export const addArticles = (...args: Shout[][]) => {
const allArticles = args.flatMap((articles) => articles || [])
const newArticleEntities = allArticles.reduce(
(acc, article) => {
- acc[article.slug] = article
+ if (!acc[article.slug]) {
+ acc[article.slug] = article
+ }
return acc
},
{} as { [articleSLug: string]: Shout },