Merge branch 'main' into feat/plugin-auto-upgrade-fe

web/app/components/plugins/plugin-detail-panel/endpoint-modal.tsx

@@ -18,6 +18,15 @@ type Props = {
   onSaved: (value: Record<string, any>) => void
 }
 
+const extractDefaultValues = (schemas: any[]) => {
+  const result: Record<string, any> = {}
+  for (const field of schemas) {
+    if (field.default !== undefined)
+      result[field.name] = field.default
+  }
+  return result
+}
+
 const EndpointModal: FC<Props> = ({
   formSchemas,
   defaultValues = {},
@@ -26,7 +35,10 @@ const EndpointModal: FC<Props> = ({
 }) => {
   const getValueFromI18nObject = useRenderI18nObject()
   const { t } = useTranslation()
-  const [tempCredential, setTempCredential] = React.useState<any>(defaultValues)
+  const initialValues = Object.keys(defaultValues).length > 0
+    ? defaultValues
+    : extractDefaultValues(formSchemas)
+  const [tempCredential, setTempCredential] = React.useState<any>(initialValues)
 
   const handleSave = () => {
     for (const field of formSchemas) {

web/app/components/plugins/plugin-detail-panel/multiple-tool-selector/index.tsx

@@ -117,6 +117,7 @@ const MultipleToolSelector = ({
         )}
         {!disabled && (
           <ActionButton className='mx-1' onClick={() => {
+            setCollapse(false)
             setOpen(!open)
             setPanelShowState(true)
           }}>
@@ -126,23 +127,6 @@ const MultipleToolSelector = ({
       </div>
       {!collapse && (
         <>
-          <ToolSelector
-            nodeId={nodeId}
-            nodeOutputVars={nodeOutputVars}
-            availableNodes={availableNodes}
-            scope={scope}
-            value={undefined}
-            selectedTools={value}
-            onSelect={handleAdd}
-            controlledState={open}
-            onControlledStateChange={setOpen}
-            trigger={
-              <div className=''></div>
-            }
-            panelShowState={panelShowState}
-            onPanelShowStateChange={setPanelShowState}
-            isEdit={false}
-          />
           {value.length === 0 && (
             <div className='system-xs-regular flex justify-center rounded-[10px] bg-background-section p-3 text-text-tertiary'>{t('plugin.detailPanel.toolSelector.empty')}</div>
           )}
@@ -164,6 +148,23 @@ const MultipleToolSelector = ({
           ))}
         </>
       )}
+      <ToolSelector
+        nodeId={nodeId}
+        nodeOutputVars={nodeOutputVars}
+        availableNodes={availableNodes}
+        scope={scope}
+        value={undefined}
+        selectedTools={value}
+        onSelect={handleAdd}
+        controlledState={open}
+        onControlledStateChange={setOpen}
+        trigger={
+          <div className=''></div>
+        }
+        panelShowState={panelShowState}
+        onPanelShowStateChange={setPanelShowState}
+        isEdit={false}
+      />
     </>
   )
 }

web/app/components/plugins/plugin-detail-panel/tool-selector/index.tsx

@@ -275,7 +275,7 @@ const ToolSelector: FC<Props> = ({
             />
           )}
         </PortalToFollowElemTrigger>
-        <PortalToFollowElemContent className='z-[1000]'>
+        <PortalToFollowElemContent>
           <div className={cn('relative max-h-[642px] min-h-20 w-[361px] rounded-xl border-[0.5px] border-components-panel-border bg-components-panel-bg-blur pb-4 shadow-lg backdrop-blur-sm', !isShowSettingAuth && 'overflow-y-auto pb-2')}>
             {!isShowSettingAuth && (
               <>