Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
D
dify
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
ai-tech
dify
Commits
b521aafd
Unverified
Commit
b521aafd
authored
Feb 01, 2024
by
Rhon Joe
Committed by
GitHub
Feb 01, 2024
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
chore(web): strong typing (#2339)
parent
a84e15b8
Changes
8
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
19 additions
and
19 deletions
+19
-19
setting-built-in-tool.tsx
...ration/config/agent/agent-tools/setting-built-in-tool.tsx
+1
-1
index.tsx
web/app/components/app/configuration/index.tsx
+1
-1
index.tsx
...p/components/tools/edit-custom-collection-modal/index.tsx
+1
-1
index.tsx
web/app/components/tools/index.tsx
+3
-3
config-credentials.tsx
.../components/tools/setting/build-in/config-credentials.tsx
+1
-1
index.tsx
web/app/components/tools/tool-list/index.tsx
+2
-2
billing.ts
web/service/billing.ts
+3
-3
tools.ts
web/service/tools.ts
+7
-7
No files found.
web/app/components/app/configuration/config/agent/agent-tools/setting-built-in-tool.tsx
View file @
b521aafd
...
@@ -52,7 +52,7 @@ const SettingBuiltInTool: FC<Props> = ({
...
@@ -52,7 +52,7 @@ const SettingBuiltInTool: FC<Props> = ({
(
async
()
=>
{
(
async
()
=>
{
setIsLoading
(
true
)
setIsLoading
(
true
)
try
{
try
{
const
list
=
await
fetchBuiltInToolList
(
collection
.
name
)
as
Tool
[]
const
list
=
await
fetchBuiltInToolList
(
collection
.
name
)
setTools
(
list
)
setTools
(
list
)
const
currTool
=
list
.
find
(
tool
=>
tool
.
name
===
toolName
)
const
currTool
=
list
.
find
(
tool
=>
tool
.
name
===
toolName
)
if
(
currTool
)
{
if
(
currTool
)
{
...
...
web/app/components/app/configuration/index.tsx
View file @
b521aafd
...
@@ -381,7 +381,7 @@ const Configuration: FC = () => {
...
@@ -381,7 +381,7 @@ const Configuration: FC = () => {
useEffect
(()
=>
{
useEffect
(()
=>
{
(
async
()
=>
{
(
async
()
=>
{
const
collectionList
=
await
fetchCollectionList
()
as
Collection
[]
const
collectionList
=
await
fetchCollectionList
()
setCollectionList
(
collectionList
)
setCollectionList
(
collectionList
)
fetchAppDetail
({
url
:
'/apps'
,
id
:
appId
}).
then
(
async
(
res
:
any
)
=>
{
fetchAppDetail
({
url
:
'/apps'
,
id
:
appId
}).
then
(
async
(
res
:
any
)
=>
{
setMode
(
res
.
mode
)
setMode
(
res
.
mode
)
...
...
web/app/components/tools/edit-custom-collection-modal/index.tsx
View file @
b521aafd
...
@@ -83,7 +83,7 @@ const EditCustomCollectionModal: FC<Props> = ({
...
@@ -83,7 +83,7 @@ const EditCustomCollectionModal: FC<Props> = ({
(
async
()
=>
{
(
async
()
=>
{
const
customCollection
=
getCustomCollection
()
const
customCollection
=
getCustomCollection
()
try
{
try
{
const
{
parameters_schema
,
schema_type
}
=
await
parseParamsSchema
(
debouncedSchema
)
as
any
const
{
parameters_schema
,
schema_type
}
=
await
parseParamsSchema
(
debouncedSchema
)
const
newCollection
=
produce
(
customCollection
,
(
draft
)
=>
{
const
newCollection
=
produce
(
customCollection
,
(
draft
)
=>
{
draft
.
schema_type
=
schema_type
draft
.
schema_type
=
schema_type
})
})
...
...
web/app/components/tools/index.tsx
View file @
b521aafd
...
@@ -43,7 +43,7 @@ const Tools: FC<Props> = ({
...
@@ -43,7 +43,7 @@ const Tools: FC<Props> = ({
const
[
isDetailLoading
,
setIsDetailLoading
]
=
useState
(
false
)
const
[
isDetailLoading
,
setIsDetailLoading
]
=
useState
(
false
)
const
fetchCollectionList
=
async
()
=>
{
const
fetchCollectionList
=
async
()
=>
{
const
list
=
await
doFetchCollectionList
()
as
Collection
[]
const
list
=
await
doFetchCollectionList
()
setCollectionList
(
list
)
setCollectionList
(
list
)
if
(
list
.
length
>
0
&&
currCollectionIndex
===
null
)
{
if
(
list
.
length
>
0
&&
currCollectionIndex
===
null
)
{
let
index
=
0
let
index
=
0
...
@@ -103,11 +103,11 @@ const Tools: FC<Props> = ({
...
@@ -103,11 +103,11 @@ const Tools: FC<Props> = ({
setIsDetailLoading
(
true
)
setIsDetailLoading
(
true
)
try
{
try
{
if
(
currCollection
.
type
===
CollectionType
.
builtIn
)
{
if
(
currCollection
.
type
===
CollectionType
.
builtIn
)
{
const
list
=
await
fetchBuiltInToolList
(
currCollection
.
name
)
as
Tool
[]
const
list
=
await
fetchBuiltInToolList
(
currCollection
.
name
)
setCurrentTools
(
list
)
setCurrentTools
(
list
)
}
}
else
{
else
{
const
list
=
await
fetchCustomToolList
(
currCollection
.
name
)
as
Tool
[]
const
list
=
await
fetchCustomToolList
(
currCollection
.
name
)
setCurrentTools
(
list
)
setCurrentTools
(
list
)
}
}
}
}
...
...
web/app/components/tools/setting/build-in/config-credentials.tsx
View file @
b521aafd
...
@@ -29,7 +29,7 @@ const ConfigCredential: FC<Props> = ({
...
@@ -29,7 +29,7 @@ const ConfigCredential: FC<Props> = ({
const
{
team_credentials
:
credentialValue
,
name
:
collectionName
}
=
collection
const
{
team_credentials
:
credentialValue
,
name
:
collectionName
}
=
collection
useEffect
(()
=>
{
useEffect
(()
=>
{
fetchBuiltInToolCredentialSchema
(
collectionName
).
then
((
res
)
=>
{
fetchBuiltInToolCredentialSchema
(
collectionName
).
then
((
res
)
=>
{
setCredentialSchema
(
toolCredentialToFormSchemas
(
res
as
any
))
setCredentialSchema
(
toolCredentialToFormSchemas
(
res
))
})
})
},
[])
},
[])
const
[
tempCredential
,
setTempCredential
]
=
React
.
useState
<
any
>
(
credentialValue
)
const
[
tempCredential
,
setTempCredential
]
=
React
.
useState
<
any
>
(
credentialValue
)
...
...
web/app/components/tools/tool-list/index.tsx
View file @
b521aafd
...
@@ -52,11 +52,11 @@ const ToolList: FC<Props> = ({
...
@@ -52,11 +52,11 @@ const ToolList: FC<Props> = ({
return
return
(
async
()
=>
{
(
async
()
=>
{
if
(
collection
.
type
===
CollectionType
.
custom
)
{
if
(
collection
.
type
===
CollectionType
.
custom
)
{
const
res
=
await
fetchCustomCollection
(
collection
.
name
)
as
any
const
res
=
await
fetchCustomCollection
(
collection
.
name
)
setCustomCollection
({
setCustomCollection
({
...
res
,
...
res
,
provider
:
collection
.
name
,
provider
:
collection
.
name
,
}
as
CustomCollectionBackend
)
})
}
}
})()
})()
},
[
collection
])
},
[
collection
])
...
...
web/service/billing.ts
View file @
b521aafd
...
@@ -2,13 +2,13 @@ import { get } from './base'
...
@@ -2,13 +2,13 @@ import { get } from './base'
import
type
{
CurrentPlanInfoBackend
,
SubscriptionUrlsBackend
}
from
'@/app/components/billing/type'
import
type
{
CurrentPlanInfoBackend
,
SubscriptionUrlsBackend
}
from
'@/app/components/billing/type'
export
const
fetchCurrentPlanInfo
=
()
=>
{
export
const
fetchCurrentPlanInfo
=
()
=>
{
return
get
<
Promise
<
CurrentPlanInfoBackend
>
>
(
'/features'
)
return
get
<
CurrentPlanInfoBackend
>
(
'/features'
)
}
}
export
const
fetchSubscriptionUrls
=
(
plan
:
string
,
interval
:
string
)
=>
{
export
const
fetchSubscriptionUrls
=
(
plan
:
string
,
interval
:
string
)
=>
{
return
get
<
Promise
<
SubscriptionUrlsBackend
>
>
(
`/billing/subscription?plan=
${
plan
}
&interval=
${
interval
}
`
)
return
get
<
SubscriptionUrlsBackend
>
(
`/billing/subscription?plan=
${
plan
}
&interval=
${
interval
}
`
)
}
}
export
const
fetchBillingUrl
=
()
=>
{
export
const
fetchBillingUrl
=
()
=>
{
return
get
<
Promise
<
{
url
:
string
}
>
>
(
'/billing/invoices'
)
return
get
<
{
url
:
string
}
>
(
'/billing/invoices'
)
}
}
web/service/tools.ts
View file @
b521aafd
import
{
get
,
post
}
from
'./base'
import
{
get
,
post
}
from
'./base'
import
type
{
C
ustomCollectionBackend
}
from
'@/app/components/tools/types'
import
type
{
C
ollection
,
CustomCollectionBackend
,
CustomParamSchema
,
Tool
,
ToolCredential
}
from
'@/app/components/tools/types'
export
const
fetchCollectionList
=
()
=>
{
export
const
fetchCollectionList
=
()
=>
{
return
get
(
'/workspaces/current/tool-providers'
)
return
get
<
Collection
[]
>
(
'/workspaces/current/tool-providers'
)
}
}
export
const
fetchBuiltInToolList
=
(
collectionName
:
string
)
=>
{
export
const
fetchBuiltInToolList
=
(
collectionName
:
string
)
=>
{
return
get
(
`/workspaces/current/tool-provider/builtin/
${
collectionName
}
/tools`
)
return
get
<
Tool
[]
>
(
`/workspaces/current/tool-provider/builtin/
${
collectionName
}
/tools`
)
}
}
export
const
fetchCustomToolList
=
(
collectionName
:
string
)
=>
{
export
const
fetchCustomToolList
=
(
collectionName
:
string
)
=>
{
return
get
(
`/workspaces/current/tool-provider/api/tools?provider=
${
collectionName
}
`
)
return
get
<
Tool
[]
>
(
`/workspaces/current/tool-provider/api/tools?provider=
${
collectionName
}
`
)
}
}
export
const
fetchBuiltInToolCredentialSchema
=
(
collectionName
:
string
)
=>
{
export
const
fetchBuiltInToolCredentialSchema
=
(
collectionName
:
string
)
=>
{
return
get
(
`/workspaces/current/tool-provider/builtin/
${
collectionName
}
/credentials_schema`
)
return
get
<
ToolCredential
[]
>
(
`/workspaces/current/tool-provider/builtin/
${
collectionName
}
/credentials_schema`
)
}
}
export
const
updateBuiltInToolCredential
=
(
collectionName
:
string
,
credential
:
Record
<
string
,
any
>
)
=>
{
export
const
updateBuiltInToolCredential
=
(
collectionName
:
string
,
credential
:
Record
<
string
,
any
>
)
=>
{
...
@@ -31,7 +31,7 @@ export const removeBuiltInToolCredential = (collectionName: string) => {
...
@@ -31,7 +31,7 @@ export const removeBuiltInToolCredential = (collectionName: string) => {
}
}
export
const
parseParamsSchema
=
(
schema
:
string
)
=>
{
export
const
parseParamsSchema
=
(
schema
:
string
)
=>
{
return
post
(
'/workspaces/current/tool-provider/api/schema'
,
{
return
post
<
{
parameters_schema
:
CustomParamSchema
[];
schema_type
:
string
}
>
(
'/workspaces/current/tool-provider/api/schema'
,
{
body
:
{
body
:
{
schema
,
schema
,
},
},
...
@@ -39,7 +39,7 @@ export const parseParamsSchema = (schema: string) => {
...
@@ -39,7 +39,7 @@ export const parseParamsSchema = (schema: string) => {
}
}
export
const
fetchCustomCollection
=
(
collectionName
:
string
)
=>
{
export
const
fetchCustomCollection
=
(
collectionName
:
string
)
=>
{
return
get
(
`/workspaces/current/tool-provider/api/get?provider=
${
collectionName
}
`
)
return
get
<
CustomCollectionBackend
>
(
`/workspaces/current/tool-provider/api/get?provider=
${
collectionName
}
`
)
}
}
export
const
createCustomCollection
=
(
collection
:
CustomCollectionBackend
)
=>
{
export
const
createCustomCollection
=
(
collection
:
CustomCollectionBackend
)
=>
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment