Merge branch 'feat/plugins' into dev/plugin-deploy

langgenius · Nov 15, 2024 · 5be781e · 5be781e
2 parents 7fe16a9 + 746838e
commit 5be781e
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/web/app/components/base/copy-btn/index.tsx b/web/app/components/base/copy-btn/index.tsx
@@ -32,6 +32,7 @@ const CopyBtn = ({
     <div className={`${className}`}>
       <Tooltip
         popupContent={(isCopied ? t('appApi.copied') : t('appApi.copy'))}
+        asChild={false}
       >
         <div
           onMouseLeave={onMouseLeave}

diff --git a/web/app/components/plugins/marketplace/list/card-wrapper.tsx b/web/app/components/plugins/marketplace/list/card-wrapper.tsx
@@ -8,6 +8,7 @@ import Button from '@/app/components/base/button'
 import { useMixedTranslation } from '@/app/components/plugins/marketplace/hooks'
 import InstallFromMarketplace from '@/app/components/plugins/install-plugin/install-from-marketplace'
 import { useBoolean } from 'ahooks'
+import { useI18N } from '@/context/i18n'
 
 type CardWrapperProps = {
   plugin: Plugin
@@ -24,6 +25,7 @@ const CardWrapper = ({
     setTrue: showInstallFromMarketplace,
     setFalse: hideInstallFromMarketplace,
   }] = useBoolean(false)
+  const { locale: localeFromLocale } = useI18N()
 
   if (showInstallButton) {
     return (
@@ -54,7 +56,7 @@ const CardWrapper = ({
               <Button
                 className='flex-1'
               >
-                <a href={`${MARKETPLACE_URL_PREFIX}/plugin/${plugin.org}/${plugin.name}`} target='_blank' className='flex items-center gap-0.5'>
+                <a href={`${MARKETPLACE_URL_PREFIX}/plugin/${plugin.org}/${plugin.name}?language=${localeFromLocale}`} target='_blank' className='flex items-center gap-0.5'>
                   {t('plugin.detailPanel.operation.detail')}
                   <RiArrowRightUpLine className='ml-1 w-4 h-4' />
                 </a>
@@ -105,7 +107,7 @@ const CardWrapper = ({
             <Button
               className='flex-1'
             >
-              <a href={`${MARKETPLACE_URL_PREFIX}/plugin/${plugin.org}/${plugin.name}`} target='_blank' className='flex items-center gap-0.5'>
+              <a href={`${MARKETPLACE_URL_PREFIX}/plugins/${plugin.org}/${plugin.name}`} target='_blank' className='flex items-center gap-0.5'>
                 {t('plugin.detailPanel.operation.detail')}
                 <RiArrowRightUpLine className='ml-1 w-4 h-4' />
               </a>

diff --git a/web/app/components/tools/marketplace/index.tsx b/web/app/components/tools/marketplace/index.tsx
@@ -29,7 +29,7 @@ const Marketplace = ({
   } = useMarketplace(searchPluginText, filterPluginTags)
 
   return (
-    <div className='flex flex-col shrink-0 sticky -bottom-[442px] h-[530px] overflow-y-auto px-12 py-2 pt-0 bg-background-default-subtle'>
+    <div className='flex flex-col shrink-0 sticky bottom-[-442px] h-[530px] overflow-y-auto px-12 py-2 pt-0 bg-background-default-subtle'>
       <RiArrowUpDoubleLine
         className='absolute top-2 left-1/2 -translate-x-1/2 w-4 h-4 text-text-quaternary cursor-pointer'
         onClick={() => onMarketplaceScroll()}
@@ -57,7 +57,7 @@ const Marketplace = ({
           </span>
           {t('common.operation.in')}
           <a
-            href={`${MARKETPLACE_URL_PREFIX}`}
+            href={`${MARKETPLACE_URL_PREFIX}?language=${locale}`}
             className='flex items-center ml-1 system-sm-medium text-text-accent'
             target='_blank'
           >