From e151c2ee8c9c1abf100787ae58919a16443b2b5e Mon Sep 17 00:00:00 2001
From: Joel <iamjoel007@gmail.com>
Date: Tue, 19 Nov 2024 17:29:02 +0800
Subject: [PATCH] fix: when error can not install

---
 .../install-bundle/steps/install-multi.tsx             | 10 +++++++---
 .../install-plugin/install-bundle/steps/install.tsx    |  4 ++--
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/web/app/components/plugins/install-plugin/install-bundle/steps/install-multi.tsx b/web/app/components/plugins/install-plugin/install-bundle/steps/install-multi.tsx
index 6034d0c2cc..50cf5b7dc9 100644
--- a/web/app/components/plugins/install-plugin/install-bundle/steps/install-multi.tsx
+++ b/web/app/components/plugins/install-plugin/install-bundle/steps/install-multi.tsx
@@ -30,8 +30,12 @@ const InstallByDSLList: FC<Props> = ({
       return []
 
     const _plugins = allPlugins.map((d) => {
-      if (d.type === 'package')
-        return (d as any).value.manifest
+      if (d.type === 'package') {
+        return {
+          ...(d as any).value.manifest,
+          plugin_id: (d as any).value.unique_identifier,
+        }
+      }
 
       return undefined
     })
@@ -84,7 +88,7 @@ const InstallByDSLList: FC<Props> = ({
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [isFetchingMarketplaceData])
 
-  const isLoadedAllData = allPlugins.length === plugins.length && plugins.every(p => !!p)
+  const isLoadedAllData = (plugins.filter(p => !!p).length + errorIndexes.length) === allPlugins.length
   useEffect(() => {
     if (isLoadedAllData)
       onLoadedAllPlugin()
diff --git a/web/app/components/plugins/install-plugin/install-bundle/steps/install.tsx b/web/app/components/plugins/install-plugin/install-bundle/steps/install.tsx
index 9c361d4e4b..258b179a16 100644
--- a/web/app/components/plugins/install-plugin/install-bundle/steps/install.tsx
+++ b/web/app/components/plugins/install-plugin/install-bundle/steps/install.tsx
@@ -5,7 +5,7 @@ import type { Dependency, InstallStatusResponse, Plugin } from '../../../types'
 import Button from '@/app/components/base/button'
 import { RiLoader2Line } from '@remixicon/react'
 import { useTranslation } from 'react-i18next'
-import InstallByDSLList from './install-multi'
+import InstallMulti from './install-multi'
 import { useInstallFromMarketplaceAndGitHub } from '@/service/use-plugins'
 import { useInvalidateInstalledPluginList } from '@/service/use-plugins'
 const i18nPrefix = 'plugin.installModal'
@@ -67,7 +67,7 @@ const Install: FC<Props> = ({
           <p>{t(`${i18nPrefix}.${selectedPluginsNum > 1 ? 'readyToInstallPackages' : 'readyToInstallPackage'}`, { num: selectedPluginsNum })}</p>
         </div>
         <div className='w-full p-2 rounded-2xl bg-background-section-burn space-y-1'>
-          <InstallByDSLList
+          <InstallMulti
             allPlugins={allPlugins}
             selectedPlugins={selectedPlugins}
             onSelect={handleSelect}