FEAT: NEW WORKFLOW ENGINE (#3160)

Co-authored-by: Joel <iamjoel007@gmail.com>
Co-authored-by: Yeuoly <admin@srmxy.cn>
Co-authored-by: JzoNg <jzongcode@gmail.com>
Co-authored-by: StyleZhang <jasonapring2015@outlook.com>
Co-authored-by: jyong <jyong@dify.ai>
Co-authored-by: nite-knite <nkCoding@gmail.com>
Co-authored-by: jyong <718720800@qq.com>

web/app/components/tools/setting/build-in/config-credentials.tsx

@@ -7,7 +7,7 @@ import { addDefaultValue, toolCredentialToFormSchemas } from '../../utils/to-for
 import type { Collection } from '../../types'
 import Drawer from '@/app/components/base/drawer-plus'
 import Button from '@/app/components/base/button'
-import { fetchBuiltInToolCredentialSchema } from '@/service/tools'
+import { fetchBuiltInToolCredential, fetchBuiltInToolCredentialSchema } from '@/service/tools'
 import Loading from '@/app/components/base/loading'
 import Form from '@/app/components/header/account-setting/model-provider-page/model-modal/Form'
 import { LinkExternal02 } from '@/app/components/base/icons/src/vender/line/general'
@@ -16,22 +16,26 @@ type Props = {
   collection: Collection
   onCancel: () => void
   onSaved: (value: Record<string, any>) => void
-  onRemove: () => void
+  isHideRemoveBtn?: boolean
+  onRemove?: () => void
 }
 
 const ConfigCredential: FC<Props> = ({
   collection,
   onCancel,
   onSaved,
-  onRemove,
+  isHideRemoveBtn,
+  onRemove = () => { },
 }) => {
   const { t } = useTranslation()
   const [credentialSchema, setCredentialSchema] = useState<any>(null)
-  const { team_credentials: credentialValue, name: collectionName } = collection
-  const [tempCredential, setTempCredential] = React.useState<any>(credentialValue)
+  const { name: collectionName } = collection
+  const [tempCredential, setTempCredential] = React.useState<any>({})
   useEffect(() => {
-    fetchBuiltInToolCredentialSchema(collectionName).then((res) => {
+    fetchBuiltInToolCredentialSchema(collectionName).then(async (res) => {
       const toolCredentialSchemas = toolCredentialToFormSchemas(res)
+      const credentialValue = await fetchBuiltInToolCredential(collectionName)
+      setTempCredential(credentialValue)
       const defaultCredentials = addDefaultValue(credentialValue, toolCredentialSchemas)
       setCredentialSchema(toolCredentialSchemas)
       setTempCredential(defaultCredentials)
@@ -77,9 +81,9 @@ const ConfigCredential: FC<Props> = ({
                     </a>)
                     : null}
                 />
-                <div className={cn(collection.is_team_authorization ? 'justify-between' : 'justify-end', 'mt-2 flex ')} >
+                <div className={cn((collection.is_team_authorization && !isHideRemoveBtn) ? 'justify-between' : 'justify-end', 'mt-2 flex ')} >
                   {
-                    collection.is_team_authorization && (
+                    (collection.is_team_authorization && !isHideRemoveBtn) && (
                       <Button className='flex items-center h-8 !px-3 !text-[13px] font-medium !text-gray-700' onClick={onRemove}>{t('common.operation.remove')}</Button>
                     )
                   }

web/app/components/tools/utils/to-form-schema.ts

@@ -18,6 +18,7 @@ export const toolParametersToFormSchemas = (parameters: ToolParameter[]) => {
       ...parameter,
       variable: parameter.name,
       type: toType(parameter.type),
+      _type: parameter.type,
       show_on: [],
       options: parameter.options?.map((option) => {
         return {