3 plugins failed to install
diff --git a/web/app/components/plugins/types.ts b/web/app/components/plugins/types.ts
index 8ccba6ef30..051f93906e 100644
--- a/web/app/components/plugins/types.ts
+++ b/web/app/components/plugins/types.ts
@@ -54,6 +54,7 @@ export type EndpointListItem = {
// Plugin manifest
export type PluginDeclaration = {
+ plugin_unique_identifier: string
version: string
author: string
icon: string
@@ -71,6 +72,7 @@ export type PluginDeclaration = {
}
export type PluginManifestInMarket = {
+ plugin_unique_identifier: string
name: string
org: string
icon: string
@@ -134,6 +136,36 @@ export type Permissions = {
debug_permission: PermissionType
}
+export type UpdateFromMarketPlacePayload = {
+ originalPackageInfo: {
+ id: string
+ payload: PluginDeclaration
+ },
+ targetPackageInfo: {
+ id: string
+ version: string
+ }
+}
+
+export type UpdateFromGitHubPayload = {
+ originalPackageInfo: {
+ id: string
+ repo: string
+ version: string
+ }
+}
+
+export type UpdatePluginPayload = {
+ type: PluginSource
+ marketPlace?: UpdateFromMarketPlacePayload
+ github?: UpdateFromGitHubPayload
+}
+
+export type UpdatePluginModalType = UpdatePluginPayload & {
+ onCancel: () => void
+ onSave: () => void
+}
+
export enum InstallStepFromGitHub {
setUrl = 'url',
selectPackage = 'selecting',
diff --git a/web/app/components/plugins/update-plugin/from-github.tsx b/web/app/components/plugins/update-plugin/from-github.tsx
new file mode 100644
index 0000000000..9bc2f2ad3e
--- /dev/null
+++ b/web/app/components/plugins/update-plugin/from-github.tsx
@@ -0,0 +1,26 @@
+'use client'
+import type { FC } from 'react'
+import React from 'react'
+import type { UpdateFromGitHubPayload } from '../types'
+import InstallFromGitHub from '../install-plugin/install-from-github'
+
+type Props = {
+ payload: UpdateFromGitHubPayload
+ onSave: () => void
+ onCancel: () => void
+}
+
+const FromGitHub: FC
= ({
+ payload,
+ onSave,
+ onCancel,
+}) => {
+ return (
+
+ )
+}
+export default React.memo(FromGitHub)
diff --git a/web/app/components/plugins/update-plugin/from-market-place.tsx b/web/app/components/plugins/update-plugin/from-market-place.tsx
new file mode 100644
index 0000000000..e0f9e2bc01
--- /dev/null
+++ b/web/app/components/plugins/update-plugin/from-market-place.tsx
@@ -0,0 +1,121 @@
+'use client'
+import type { FC } from 'react'
+import React, { useCallback, useEffect, useMemo, useState } from 'react'
+import { RiInformation2Line } from '@remixicon/react'
+import { useTranslation } from 'react-i18next'
+import Card from '@/app/components/plugins/card'
+import Modal from '@/app/components/base/modal'
+import Button from '@/app/components/base/button'
+import Badge, { BadgeState } from '@/app/components/base/badge/index'
+import type { UpdateFromMarketPlacePayload } from '../types'
+import { pluginManifestToCardPluginProps } from '@/app/components/plugins/install-plugin/utils'
+import useGetIcon from '../install-plugin/base/use-get-icon'
+
+const i18nPrefix = 'plugin.upgrade'
+
+type Props = {
+ payload: UpdateFromMarketPlacePayload
+ onSave: () => void
+ onCancel: () => void
+}
+
+enum UploadStep {
+ notStarted = 'notStarted',
+ upgrading = 'upgrading',
+ installed = 'installed',
+}
+
+const UpdatePluginModal: FC = ({
+ payload,
+ onSave,
+ onCancel,
+}) => {
+ const {
+ originalPackageInfo,
+ targetPackageInfo,
+ } = payload
+ const { t } = useTranslation()
+ const { getIconUrl } = useGetIcon()
+ const [icon, setIcon] = useState(originalPackageInfo.payload.icon)
+ useEffect(() => {
+ (async () => {
+ const icon = await getIconUrl(originalPackageInfo.payload.icon)
+ setIcon(icon)
+ })()
+ }, [originalPackageInfo, getIconUrl])
+ const [uploadStep, setUploadStep] = useState(UploadStep.notStarted)
+ const configBtnText = useMemo(() => {
+ return ({
+ [UploadStep.notStarted]: t(`${i18nPrefix}.upgrade`),
+ [UploadStep.upgrading]: t(`${i18nPrefix}.upgrading`),
+ [UploadStep.installed]: t(`${i18nPrefix}.close`),
+ })[uploadStep]
+ }, [t, uploadStep])
+
+ const handleConfirm = useCallback(() => {
+ if (uploadStep === UploadStep.notStarted) {
+ setUploadStep(UploadStep.upgrading)
+ setTimeout(() => {
+ setUploadStep(UploadStep.installed)
+ }, 1500)
+ return
+ }
+ if (uploadStep === UploadStep.installed) {
+ onSave()
+ onCancel()
+ }
+ }, [onCancel, onSave, uploadStep])
+ return (
+
+
+ {t(`${i18nPrefix}.description`)}
+
+
+
+
+ {`${originalPackageInfo.payload.version} -> ${targetPackageInfo.version}`}
+
+
+
{t(`${i18nPrefix}.usedInApps`, { num: 3 })}
+ {/* show the used apps */}
+
+
+ {uploadStep === UploadStep.notStarted && (
+
+ )}
+
+
+
+ )
+}
+export default React.memo(UpdatePluginModal)
diff --git a/web/app/components/plugins/update-plugin/index.tsx b/web/app/components/plugins/update-plugin/index.tsx
index 0a358debac..f9b49a6073 100644
--- a/web/app/components/plugins/update-plugin/index.tsx
+++ b/web/app/components/plugins/update-plugin/index.tsx
@@ -1,97 +1,33 @@
'use client'
import type { FC } from 'react'
-import React, { useCallback, useMemo, useState } from 'react'
-import { RiInformation2Line } from '@remixicon/react'
-import { useTranslation } from 'react-i18next'
-import Card from '@/app/components/plugins/card'
-import Modal from '@/app/components/base/modal'
-import Button from '@/app/components/base/button'
-import Badge, { BadgeState } from '@/app/components/base/badge/index'
-import { toolNotion } from '@/app/components/plugins/card/card-mock'
+import React from 'react'
+import type { UpdatePluginModalType } from '../types'
+import { PluginSource } from '../types'
+import UpdateFromGitHub from './from-github'
+import UpdateFromMarketplace from './from-market-place'
-const i18nPrefix = 'plugin.upgrade'
-
-type Props = {
- onHide: () => void
-}
-
-enum UploadStep {
- notStarted = 'notStarted',
- upgrading = 'upgrading',
- installed = 'installed',
-}
-
-const UpdatePluginModal: FC = ({
- onHide,
+const UpdatePlugin: FC = ({
+ type,
+ marketPlace,
+ github,
+ onCancel,
+ onSave,
}) => {
- const { t } = useTranslation()
- const [uploadStep, setUploadStep] = useState(UploadStep.notStarted)
- const configBtnText = useMemo(() => {
- return ({
- [UploadStep.notStarted]: t(`${i18nPrefix}.upgrade`),
- [UploadStep.upgrading]: t(`${i18nPrefix}.upgrading`),
- [UploadStep.installed]: t(`${i18nPrefix}.close`),
- })[uploadStep]
- }, [uploadStep])
- const handleConfirm = useCallback(() => {
- if (uploadStep === UploadStep.notStarted) {
- setUploadStep(UploadStep.upgrading)
- setTimeout(() => {
- setUploadStep(UploadStep.installed)
- }, 1500)
- return
- }
- if (uploadStep === UploadStep.installed)
- onHide()
- }, [uploadStep])
+ if (type === PluginSource.github) {
+ return (
+
+ )
+ }
return (
-
-
- {t(`${i18nPrefix}.description`)}
-
-
-
-
- {'1.2.0 -> 1.3.2'}
-
-
-
{t(`${i18nPrefix}.usedInApps`, { num: 3 })}
- {/* show the used apps */}
-
-
- {uploadStep === UploadStep.notStarted && (
-
- )}
-
-
-
+
)
}
-export default React.memo(UpdatePluginModal)
+export default React.memo(UpdatePlugin)
diff --git a/web/app/components/tools/labels/constant.ts b/web/app/components/tools/labels/constant.ts
index 3f073859d9..ad4836e6a8 100644
--- a/web/app/components/tools/labels/constant.ts
+++ b/web/app/components/tools/labels/constant.ts
@@ -1,6 +1,4 @@
-import type { TypeWithI18N } from '@/app/components/header/account-setting/model-provider-page/declarations'
export type Label = {
name: string
- icon: string
- label: TypeWithI18N
+ label: string
}
diff --git a/web/app/components/tools/labels/filter.tsx b/web/app/components/tools/labels/filter.tsx
index 36c1c1ba83..f33a63f480 100644
--- a/web/app/components/tools/labels/filter.tsx
+++ b/web/app/components/tools/labels/filter.tsx
@@ -1,10 +1,8 @@
import type { FC } from 'react'
import { useMemo, useState } from 'react'
import { useTranslation } from 'react-i18next'
-import { useContext } from 'use-context-selector'
-import { useDebounceFn, useMount } from 'ahooks'
+import { useDebounceFn } from 'ahooks'
import { RiArrowDownSLine } from '@remixicon/react'
-import { useStore as useLabelStore } from './store'
import cn from '@/utils/classnames'
import {
PortalToFollowElem,
@@ -16,11 +14,9 @@ import { Tag01, Tag03 } from '@/app/components/base/icons/src/vender/line/financ
import { Check } from '@/app/components/base/icons/src/vender/line/general'
import { XCircle } from '@/app/components/base/icons/src/vender/solid/general'
import type { Label } from '@/app/components/tools/labels/constant'
-import { fetchLabelList } from '@/service/tools'
-import I18n from '@/context/i18n'
-import { getLanguage } from '@/i18n/language'
+import { useTags } from '@/app/components/plugins/hooks'
-interface LabelFilterProps {
+type LabelFilterProps = {
value: string[]
onChange: (v: string[]) => void
}
@@ -29,12 +25,9 @@ const LabelFilter: FC = ({
onChange,
}) => {
const { t } = useTranslation()
- const { locale } = useContext(I18n)
- const language = getLanguage(locale)
const [open, setOpen] = useState(false)
- const labelList = useLabelStore(s => s.labelList)
- const setLabelList = useLabelStore(s => s.setLabelList)
+ const labelList = useTags()
const [keywords, setKeywords] = useState('')
const [searchKeywords, setSearchKeywords] = useState('')
@@ -61,12 +54,6 @@ const LabelFilter: FC = ({
onChange([...value, label.name])
}
- useMount(() => {
- fetchLabelList().then((res) => {
- setLabelList(res)
- })
- })
-
return (
= ({
{!value.length && t('common.tag.placeholder')}
- {!!value.length && currentLabel?.label[language]}
+ {!!value.length && currentLabel?.label}
{value.length > 1 && (
{`+${value.length - 1}`}
@@ -128,7 +115,7 @@ const LabelFilter: FC
= ({
className='flex items-center gap-2 pl-3 py-[6px] pr-2 rounded-lg cursor-pointer hover:bg-gray-100'
onClick={() => selectLabel(label)}
>
- {label.label[language]}
+ {label.label}
{value.includes(label.name) && }
))}
diff --git a/web/app/components/tools/labels/selector.tsx b/web/app/components/tools/labels/selector.tsx
index baa043010e..0c64ebb142 100644
--- a/web/app/components/tools/labels/selector.tsx
+++ b/web/app/components/tools/labels/selector.tsx
@@ -1,10 +1,8 @@
import type { FC } from 'react'
import { useMemo, useState } from 'react'
import { useTranslation } from 'react-i18next'
-import { useContext } from 'use-context-selector'
-import { useDebounceFn, useMount } from 'ahooks'
+import { useDebounceFn } from 'ahooks'
import { RiArrowDownSLine } from '@remixicon/react'
-import { useStore as useLabelStore } from './store'
import cn from '@/utils/classnames'
import {
PortalToFollowElem,
@@ -15,11 +13,9 @@ import Input from '@/app/components/base/input'
import { Tag03 } from '@/app/components/base/icons/src/vender/line/financeAndECommerce'
import Checkbox from '@/app/components/base/checkbox'
import type { Label } from '@/app/components/tools/labels/constant'
-import { fetchLabelList } from '@/service/tools'
-import I18n from '@/context/i18n'
-import { getLanguage } from '@/i18n/language'
+import { useTags } from '@/app/components/plugins/hooks'
-interface LabelSelectorProps {
+type LabelSelectorProps = {
value: string[]
onChange: (v: string[]) => void
}
@@ -28,12 +24,9 @@ const LabelSelector: FC