From e01d975b80110c1465fb72ba7d315947890c8683 Mon Sep 17 00:00:00 2001 From: Joel Date: Fri, 30 May 2025 18:13:00 +0800 Subject: [PATCH] fix: the plugin order is not the same as passed to api in DSL (#20515) --- .../install-plugin/install-bundle/steps/install-multi.tsx | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) 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 40be3e65e6..5f60483d3c 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 @@ -83,7 +83,12 @@ const InstallByDSLList: FC = ({ useEffect(() => { if (!isFetchingMarketplaceDataById && infoGetById?.data.plugins) { - const payloads = infoGetById?.data.plugins + const sortedList = allPlugins.filter(d => d.type === 'marketplace').map((d) => { + const p = d as GitHubItemAndMarketPlaceDependency + const id = p.value.marketplace_plugin_unique_identifier?.split(':')[0] + return infoGetById.data.plugins.find(item => item.plugin_id === id)! + }) + const payloads = sortedList const failedIndex: number[] = [] const nextPlugins = produce(pluginsRef.current, (draft) => { marketPlaceInDSLIndex.forEach((index, i) => {