garrettmills/commafeed
1
0
Fork 0
forked from Archives/Athou_commafeed
Code Pull Requests Activity

trigger reload manually instead of relying on effects

Browse Source
This commit is contained in:
Athou
2022-08-13 21:57:03 +02:00
parent 4e5fd18eea
commit e803ce13eb
4 changed files with 22 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
commafeed-client/src/app/slices/entries.ts
View File

@@ -2,7 +2,7 @@ import { createAsyncThunk, createSlice, PayloadAction } from "@reduxjs/toolkit"
import { client } from "app/client"
import { Constants } from "app/constants"
import { RootState } from "app/store"
import { Entries, Entry, GetEntriesRequest, MarkRequest } from "app/types"
import { Entries, Entry, MarkRequest } from "app/types"
export type EntrySourceType = "category" | "feed"
export type EntrySource = { type: EntrySourceType; id: string }
@@ -35,18 +35,18 @@ const initialState: EntriesState = {
}
const getEndpoint = (sourceType: EntrySourceType) => (sourceType === "category" ? client.category.getEntries : client.feed.getEntries)
export const loadEntries = createAsyncThunk<Entries, { req: GetEntriesRequest; sourceType: EntrySourceType }, { state: RootState }>(
"entries/load",
async arg => {
const endpoint = getEndpoint(arg.sourceType)
const result = await endpoint({
...arg.req,
offset: 0,
limit: 50,
})
return result.data
}
)
export const loadEntries = createAsyncThunk<Entries, EntrySource, { state: RootState }>("entries/load", async (source, thunkApi) => {
const state = thunkApi.getState()
const endpoint = getEndpoint(source.type)
const result = await endpoint({
id: source.id,
order: state.user.settings?.readingOrder,
readType: state.user.settings?.readingMode,
offset: 0,
limit: 50,
})
return result.data
})
export const loadMoreEntries = createAsyncThunk<Entries, void, { state: RootState }>("entries/loadMore", async (_, thunkApi) => {
const state = thunkApi.getState()
const offset =
@@ -61,17 +61,9 @@ export const loadMoreEntries = createAsyncThunk<Entries, void, { state: RootStat
})
return result.data
})
export const reloadEntries = createAsyncThunk<Entries, void, { state: RootState }>("entries/reload", async (_, thunkApi) => {
export const reloadEntries = createAsyncThunk<void, void, { state: RootState }>("entries/reload", async (_, thunkApi) => {
const state = thunkApi.getState()
const endpoint = getEndpoint(state.entries.source.type)
const result = await endpoint({
id: state.entries.source.id,
readType: state.user.settings?.readingMode,
order: state.user.settings?.readingOrder,
offset: 0,
limit: 50,
})
return result.data
thunkApi.dispatch(loadEntries(state.entries.source))
})
export const markEntry = createAsyncThunk(
"entries/entry/mark",
@@ -160,10 +152,7 @@ export const entriesSlice = createSlice({
})
})
builder.addCase(loadEntries.pending, (state, action) => {
state.source = {
type: action.meta.arg.sourceType,
id: action.meta.arg.req.id,
}
state.source = action.meta.arg
state.entries = []
state.timestamp = undefined
state.sourceLabel = ""
@@ -184,21 +173,6 @@ export const entriesSlice = createSlice({
state.entries = [...state.entries, ...entriesToAdd]
state.hasMore = action.payload.hasMore
})
builder.addCase(reloadEntries.pending, state => {
state.entries = []
state.timestamp = undefined
state.sourceLabel = ""
state.sourceWebsiteUrl = ""
state.hasMore = true
state.selectedEntryId = undefined
})
builder.addCase(reloadEntries.fulfilled, (state, action) => {
state.entries = action.payload.entries
state.timestamp = action.payload.timestamp
state.sourceLabel = action.payload.name
state.sourceWebsiteUrl = action.payload.feedLink
state.hasMore = action.payload.hasMore
})
},
})