split thunks from slices to avoid circular dependencies

commafeed-client/src/components/content/Content.tsx

@@ -77,7 +77,6 @@ class HighlightMatcher extends Matcher {
         return <Mark>{children}</Mark>
     }
 
-    // eslint-disable-next-line class-methods-use-this
     asTag(): string {
         return "span"
     }

commafeed-client/src/components/content/FeedEntries.tsx

@@ -2,8 +2,8 @@ import { Trans } from "@lingui/macro"
 import { Box } from "@mantine/core"
 import { openModal } from "@mantine/modals"
 import { Constants } from "app/constants"
+import { type ExpendableEntry } from "app/entries/slice"
 import {
-    type ExpendableEntry,
     loadMoreEntries,
     markAllEntries,
     markEntry,
@@ -12,10 +12,10 @@ import {
     selectNextEntry,
     selectPreviousEntry,
     starEntry,
-} from "app/slices/entries"
-import { redirectToRootCategory } from "app/slices/redirect"
-import { toggleSidebar } from "app/slices/tree"
+} from "app/entries/thunks"
+import { redirectToRootCategory } from "app/redirect/thunks"
 import { useAppDispatch, useAppSelector } from "app/store"
+import { toggleSidebar } from "app/tree/slice"
 import { KeyboardShortcutsHelp } from "components/KeyboardShortcutsHelp"
 import { Loader } from "components/Loader"
 import { useBrowserExtension } from "hooks/useBrowserExtension"

commafeed-client/src/components/content/FeedEntryContextMenu.tsx

@@ -1,8 +1,8 @@
 import { Trans } from "@lingui/macro"
 import { createStyles, Group } from "@mantine/core"
 import { Constants } from "app/constants"
-import { markEntriesUpToEntry, markEntry, starEntry } from "app/slices/entries"
-import { redirectToFeed } from "app/slices/redirect"
+import { markEntriesUpToEntry, markEntry, starEntry } from "app/entries/thunks"
+import { redirectToFeed } from "app/redirect/thunks"
 import { useAppDispatch, useAppSelector } from "app/store"
 import { type Entry } from "app/types"
 import { truncate } from "app/utils"

commafeed-client/src/components/content/FeedEntryFooter.tsx

@@ -1,6 +1,6 @@
 import { t, Trans } from "@lingui/macro"
 import { Group, Indicator, MultiSelect, Popover } from "@mantine/core"
-import { markEntriesUpToEntry, markEntry, starEntry, tagEntry } from "app/slices/entries"
+import { markEntriesUpToEntry, markEntry, starEntry, tagEntry } from "app/entries/thunks"
 import { useAppDispatch, useAppSelector } from "app/store"
 import { type Entry } from "app/types"
 import { ActionButton } from "components/ActionButton"
@@ -22,7 +22,13 @@ export function FeedEntryFooter(props: FeedEntryFooterProps) {
 
     const showSharingButtons = sharingSettings && Object.values(sharingSettings).some(v => v)
 
-    const readStatusButtonClicked = async () => await dispatch(markEntry({ entry: props.entry, read: !props.entry.read }))
+    const readStatusButtonClicked = async () =>
+        await dispatch(
+            markEntry({
+                entry: props.entry,
+                read: !props.entry.read,
+            })
+        )
     const onTagsChange = async (values: string[]) =>
         await dispatch(
             tagEntry({
@@ -44,7 +50,14 @@ export function FeedEntryFooter(props: FeedEntryFooterProps) {
                 <ActionButton
                     icon={props.entry.starred ? <TbStarOff size={18} /> : <TbStar size={18} />}
                     label={props.entry.starred ? <Trans>Unstar</Trans> : <Trans>Star</Trans>}
-                    onClick={async () => await dispatch(starEntry({ entry: props.entry, starred: !props.entry.starred }))}
+                    onClick={async () =>
+                        await dispatch(
+                            starEntry({
+                                entry: props.entry,
+                                starred: !props.entry.starred,
+                            })
+                        )
+                    }
                 />
 
                 {showSharingButtons && (

commafeed-client/src/components/content/add/AddCategory.tsx

@@ -2,9 +2,9 @@ import { t, Trans } from "@lingui/macro"
 import { Box, Button, Group, Stack, TextInput } from "@mantine/core"
 import { useForm } from "@mantine/form"
 import { client, errorToStrings } from "app/client"
-import { redirectToSelectedSource } from "app/slices/redirect"
-import { reloadTree } from "app/slices/tree"
+import { redirectToSelectedSource } from "app/redirect/thunks"
 import { useAppDispatch } from "app/store"
+import { reloadTree } from "app/tree/thunks"
 import { type AddCategoryRequest } from "app/types"
 import { Alert } from "components/Alert"
 import { useAsyncCallback } from "react-async-hook"

commafeed-client/src/components/content/add/ImportOpml.tsx

@@ -2,9 +2,9 @@ import { t, Trans } from "@lingui/macro"
 import { Box, Button, FileInput, Group, Stack } from "@mantine/core"
 import { useForm } from "@mantine/form"
 import { client, errorToStrings } from "app/client"
-import { redirectToSelectedSource } from "app/slices/redirect"
-import { reloadTree } from "app/slices/tree"
+import { redirectToSelectedSource } from "app/redirect/thunks"
 import { useAppDispatch } from "app/store"
+import { reloadTree } from "app/tree/thunks"
 import { Alert } from "components/Alert"
 import { useAsyncCallback } from "react-async-hook"
 import { TbFileImport } from "react-icons/tb"

commafeed-client/src/components/content/add/Subscribe.tsx

@@ -3,9 +3,9 @@ import { Box, Button, Group, Stack, Stepper, TextInput } from "@mantine/core"
 import { useForm } from "@mantine/form"
 import { client, errorToStrings } from "app/client"
 import { Constants } from "app/constants"
-import { redirectToFeed, redirectToSelectedSource } from "app/slices/redirect"
-import { reloadTree } from "app/slices/tree"
+import { redirectToFeed, redirectToSelectedSource } from "app/redirect/thunks"
 import { useAppDispatch } from "app/store"
+import { reloadTree } from "app/tree/thunks"
 import { type FeedInfoRequest, type SubscribeRequest } from "app/types"
 import { Alert } from "components/Alert"
 import { useState } from "react"
@@ -46,8 +46,11 @@ export function Subscribe() {
     })
 
     const previousStep = () => {
-        if (activeStep === 0) dispatch(redirectToSelectedSource())
-        else setActiveStep(activeStep - 1)
+        if (activeStep === 0) {
+            dispatch(redirectToSelectedSource())
+        } else {
+            setActiveStep(activeStep - 1)
+        }
     }
     const nextStep = (e: React.FormEvent<HTMLFormElement>) => {
         if (activeStep === 0) {