fix: levels

Signed-off-by: Innei <i@innei.in>
This commit is contained in:
Innei 2024-07-15 23:47:26 +08:00
parent d24a014035
commit 7d40573dca
No known key found for this signature in database
GPG Key ID: 0F62D33977F021F7
6 changed files with 10 additions and 10 deletions

View File

@ -3,10 +3,8 @@ import * as semver from "semver"
import { getStorageNS } from "./ns"
export const levels = {
view: "view",
folder: "folder",
feed: "feed",
entry: "entry",
}
export const views = [
@ -86,4 +84,6 @@ export const ROUTE_FEED_PENDING = "all"
export const ROUTE_ENTRY_PENDING = "pending"
export const ROUTE_FEED_IN_FOLDER = "folder-"
export const channel = import.meta.env.DEV ? "development" : ((semver.prerelease(APP_VERSION)?.[0] as string) || "stable")
export const channel = import.meta.env.DEV ?
"development" :
(semver.prerelease(APP_VERSION)?.[0] as string) || "stable"

View File

@ -73,6 +73,7 @@ export const useEntriesByView = () => {
view,
...(unreadOnly === true && { read: false }),
})
const entries = useEntryIdsByFeedIdOrView(isAllFeeds ? view : feedId!, {
unread: unreadOnly,
view,

View File

@ -8,7 +8,7 @@ import { ProfileButton } from "@renderer/components/user-button"
import { useNavigateEntry } from "@renderer/hooks/biz/useNavigateEntry"
import { useReduceMotion } from "@renderer/hooks/biz/useReduceMotion"
import { getRouteParams } from "@renderer/hooks/biz/useRouteParams"
import { levels, views } from "@renderer/lib/constants"
import { views } from "@renderer/lib/constants"
import { stopPropagation } from "@renderer/lib/dom"
import { Routes } from "@renderer/lib/enum"
import { shortcuts } from "@renderer/lib/shortcuts"
@ -36,7 +36,6 @@ const useBackHome = (active: number) => {
feedId: null,
entryId: null,
view: overvideActive ?? active,
level: levels.view,
})
},
[active, navigate],

View File

@ -103,7 +103,6 @@ export function FeedList({
navigate({
entryId: null,
feedId: null,
level: levels.view,
view,
})
}

View File

@ -17,7 +17,7 @@ import {
TooltipTrigger,
} from "@renderer/components/ui/tooltip"
import { useNavigateEntry } from "@renderer/hooks/biz/useNavigateEntry"
import { ROUTE_ENTRY_PENDING } from "@renderer/lib/constants"
import { levels, ROUTE_ENTRY_PENDING } from "@renderer/lib/constants"
import { cn, pluralize } from "@renderer/lib/utils"
import { getFeedById } from "@renderer/store/feed"
import { searchActions, useSearchStore } from "@renderer/store/search"
@ -252,6 +252,8 @@ const SearchItem = memo(function Item({
navigateEntry({
feedId: item.feedId!,
entryId: item.entryId,
level: levels.feed,
})
}}
>
@ -295,7 +297,6 @@ const SearchResultCount: FC<{
{pluralize("result", count)}
{" "}
(Local mode)
<i className="i-mingcute-question-line" />
</small>
</TooltipTrigger>

View File

@ -1,4 +1,4 @@
import { levels, ROUTE_ENTRY_PENDING, ROUTE_FEED_PENDING } from "@renderer/lib/constants"
import { ROUTE_ENTRY_PENDING, ROUTE_FEED_PENDING } from "@renderer/lib/constants"
import { FeedViewType } from "@renderer/lib/enum"
import { redirect } from "react-router-dom"
@ -8,4 +8,4 @@ export function Component() {
export const loader = () =>
// navigate to the first feed
redirect(`/feeds/${ROUTE_FEED_PENDING}/${ROUTE_ENTRY_PENDING}?view=${FeedViewType.Articles}&level=${levels.view}`)
redirect(`/feeds/${ROUTE_FEED_PENDING}/${ROUTE_ENTRY_PENDING}?view=${FeedViewType.Articles}`)