fix: handle empty fetched releases and update locale usage in plugin item

pull/12372/head
twwu 2 years ago
parent 65285965b6
commit de24d9c145

@ -57,6 +57,8 @@ const Action: FC<Props> = ({
const handleFetchNewVersion = async () => { const handleFetchNewVersion = async () => {
try { try {
const fetchedReleases = await fetchReleases(author, pluginName) const fetchedReleases = await fetchReleases(author, pluginName)
if (fetchedReleases.length === 0)
return
const versions = fetchedReleases.map(release => release.tag_name) const versions = fetchedReleases.map(release => release.tag_name)
const latestVersion = getLatestVersion(versions) const latestVersion = getLatestVersion(versions)
if (compareVersion(latestVersion, version) === 1) { if (compareVersion(latestVersion, version) === 1) {

@ -1,7 +1,6 @@
'use client' 'use client'
import type { FC } from 'react' import type { FC } from 'react'
import React, { useMemo } from 'react' import React, { useMemo } from 'react'
import { useContext } from 'use-context-selector'
import { import {
RiArrowRightUpLine, RiArrowRightUpLine,
RiBugLine, RiBugLine,
@ -20,8 +19,8 @@ import OrgInfo from '../card/base/org-info'
import Title from '../card/base/title' import Title from '../card/base/title'
import Action from './action' import Action from './action'
import cn from '@/utils/classnames' import cn from '@/utils/classnames'
import I18n from '@/context/i18n'
import { API_PREFIX, MARKETPLACE_URL_PREFIX } from '@/config' import { API_PREFIX, MARKETPLACE_URL_PREFIX } from '@/config'
import { useLanguage } from '../../header/account-setting/model-provider-page/hooks'
type Props = { type Props = {
className?: string className?: string
@ -32,7 +31,7 @@ const PluginItem: FC<Props> = ({
className, className,
plugin, plugin,
}) => { }) => {
const { locale } = useContext(I18n) const locale = useLanguage()
const { t } = useTranslation() const { t } = useTranslation()
const currentPluginDetail = usePluginPageContext(v => v.currentPluginDetail) const currentPluginDetail = usePluginPageContext(v => v.currentPluginDetail)
const setCurrentPluginDetail = usePluginPageContext(v => v.setCurrentPluginDetail) const setCurrentPluginDetail = usePluginPageContext(v => v.setCurrentPluginDetail)
@ -52,10 +51,6 @@ const PluginItem: FC<Props> = ({
const orgName = useMemo(() => { const orgName = useMemo(() => {
return [PluginSource.github, PluginSource.marketplace].includes(source) ? author : '' return [PluginSource.github, PluginSource.marketplace].includes(source) ? author : ''
}, [source, author]) }, [source, author])
const tLocale = useMemo(() => {
return locale.replace('-', '_')
}, [locale])
return ( return (
<div <div
className={cn( className={cn(
@ -80,12 +75,12 @@ const PluginItem: FC<Props> = ({
</div> </div>
<div className="ml-3 w-0 grow"> <div className="ml-3 w-0 grow">
<div className="flex items-center h-5"> <div className="flex items-center h-5">
<Title title={label[tLocale]} /> <Title title={label[locale]} />
{verified && <RiVerifiedBadgeLine className="shrink-0 ml-0.5 w-4 h-4 text-text-accent" />} {verified && <RiVerifiedBadgeLine className="shrink-0 ml-0.5 w-4 h-4 text-text-accent" />}
<Badge className='ml-1' text={plugin.version} /> <Badge className='ml-1' text={plugin.version} />
</div> </div>
<div className='flex items-center justify-between'> <div className='flex items-center justify-between'>
<Description text={description[tLocale]} descriptionLineRows={1}></Description> <Description text={description[locale]} descriptionLineRows={1}></Description>
<div onClick={e => e.stopPropagation()}> <div onClick={e => e.stopPropagation()}>
<Action <Action
installationId={installation_id} installationId={installation_id}

@ -2,6 +2,7 @@ import React, { useState } from 'react'
import CategoriesFilter from './category-filter' import CategoriesFilter from './category-filter'
import TagFilter from './tag-filter' import TagFilter from './tag-filter'
import SearchBox from './search-box' import SearchBox from './search-box'
import { usePluginPageContext } from '../context'
export type FilterState = { export type FilterState = {
categories: string[] categories: string[]
@ -14,11 +15,8 @@ type FilterManagementProps = {
} }
const FilterManagement: React.FC<FilterManagementProps> = ({ onFilterChange }) => { const FilterManagement: React.FC<FilterManagementProps> = ({ onFilterChange }) => {
const [filters, setFilters] = useState<FilterState>({ const initFilters = usePluginPageContext(v => v.filters) as FilterState
categories: [], const [filters, setFilters] = useState<FilterState>(initFilters)
tags: [],
searchQuery: '',
})
const updateFilters = (newFilters: Partial<FilterState>) => { const updateFilters = (newFilters: Partial<FilterState>) => {
const updatedFilters = { ...filters, ...newFilters } const updatedFilters = { ...filters, ...newFilters }

Loading…
Cancel
Save