opensource/dify
2
0
Fork 0
mirror of https://github.com/langgenius/dify.git synced 2026-05-09 12:59:18 +08:00
Code Issues Packages Projects Releases Wiki Activity

tweaks

Browse Source
This commit is contained in:
Stephen Zhou 2026-04-30 17:32:36 +08:00
parent 19d445452c
commit 60d5187bcf
No known key found for this signature in database
14 changed files with 49 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
web/contract/generated/enterprise/orpc.gen.ts
View File

@ -390,7 +390,7 @@ export const listDeploymentEnvironmentOptions = oc
})
.output(zEnterpriseAppDeployConsoleListDeploymentEnvironmentOptionsResponse)
export const enterpriseAppDeployConsole = {
export const appDeploy = {
listAppInstances,
createAppInstance,
deleteAppInstance,
@ -528,7 +528,7 @@ export const webAppAuth = {
}
export const contract = {
enterpriseAppDeployConsole,
appDeploy,
consoleSso,
webAppAuth,
}

2
web/features/deployments/components/deploy-drawer.tsx
View File

@ -24,7 +24,7 @@ const DeployDrawer: FC = () => {
enabled: open && Boolean(drawerAppInstanceId),
})
const { data: environmentOptionsReply } = useQuery({
...consoleQuery.enterprise.enterpriseAppDeployConsole.listDeploymentEnvironmentOptions.queryOptions(),
...consoleQuery.enterprise.appDeploy.listDeploymentEnvironmentOptions.queryOptions(),
enabled: open,
})

2
web/features/deployments/components/deploy-drawer/form.tsx
View File

@ -104,7 +104,7 @@ export const DeployForm: FC<DeployFormProps> = ({
const [releaseNote, setReleaseNote] = useState<string>('')
const canDeploy = Boolean(selectedEnvironmentId && selectedEnvironment && !selectedEnvironment.disabled && (!isPromote || displayedRelease?.id || defaultReleaseId))
const previewReleaseId = isPromote ? displayedRelease?.id ?? defaultReleaseId : undefined
const releasePreview = useQuery(consoleQuery.enterprise.enterpriseAppDeployConsole.previewRelease.queryOptions({
const releasePreview = useQuery(consoleQuery.enterprise.appDeploy.previewRelease.queryOptions({
input: appInstanceId && (!isPromote || previewReleaseId)
? {
params: { appInstanceId },

2
web/features/deployments/components/rollback-modal.tsx
View File

@ -54,7 +54,7 @@ const RollbackModal: FC = () => {
enabled: modal.open && Boolean(modal.appInstanceId),
})
const { data: environmentOptionsReply } = useQuery({
...consoleQuery.enterprise.enterpriseAppDeployConsole.listDeploymentEnvironmentOptions.queryOptions(),
...consoleQuery.enterprise.appDeploy.listDeploymentEnvironmentOptions.queryOptions(),
enabled: modal.open,
})
const { data: releaseHistory } = useQuery({

2
web/features/deployments/detail/access-tab.tsx
View File

@ -41,7 +41,7 @@ type AccessTabProps = {
const AccessTab: FC<AccessTabProps> = ({ instanceId: appId }) => {
const appInput = { params: { appInstanceId: appId } }
const { data: accessConfig } = useQuery(consoleQuery.enterprise.enterpriseAppDeployConsole.getAppInstanceAccess.queryOptions({
const { data: accessConfig } = useQuery(consoleQuery.enterprise.appDeploy.getAppInstanceAccess.queryOptions({
input: appInput,
}))
const { data: environmentDeployments } = useQuery(deploymentEnvironmentDeploymentsQueryOptions(appId))

4
web/features/deployments/detail/access-tab/permissions.tsx
View File

@ -190,7 +190,7 @@ const SubjectPicker: FC<SubjectPickerProps> = ({
() => new Set(selectedSubjects.map(subjectKey)),
[selectedSubjects],
)
const subjectsQuery = useQuery(consoleQuery.enterprise.enterpriseAppDeployConsole.searchAccessSubjects.queryOptions({
const subjectsQuery = useQuery(consoleQuery.enterprise.appDeploy.searchAccessSubjects.queryOptions({
input: open
? {
params: { appInstanceId: appId },
@ -316,7 +316,7 @@ export const EnvironmentPermissionRow: FC<EnvironmentPermissionRowProps> = ({
}) => {
const { t } = useTranslation('deployments')
const environmentId = environment.id
const policyQuery = useQuery(consoleQuery.enterprise.enterpriseAppDeployConsole.getEnvironmentAccessPolicy.queryOptions({
const policyQuery = useQuery(consoleQuery.enterprise.appDeploy.getEnvironmentAccessPolicy.queryOptions({
input: environmentId
? {
params: {

2
web/features/deployments/detail/deploy-tab.tsx
View File

@ -41,7 +41,7 @@ type DeployTabProps = {
const DeployTab: FC<DeployTabProps> = ({ instanceId: appInstanceId }) => {
const { t } = useTranslation('deployments')
const { data: environmentDeployments } = useQuery(deploymentEnvironmentDeploymentsQueryOptions(appInstanceId))
const { data: environmentOptionsReply } = useQuery(consoleQuery.enterprise.enterpriseAppDeployConsole.listDeploymentEnvironmentOptions.queryOptions())
const { data: environmentOptionsReply } = useQuery(consoleQuery.enterprise.appDeploy.listDeploymentEnvironmentOptions.queryOptions())
const openDeployDrawer = useDeploymentsStore(state => state.openDeployDrawer)
const undeployDeployment = useUndeployDeployment()
const environmentOptions = useMemo(

2
web/features/deployments/detail/overview-tab.tsx
View File

@ -98,7 +98,7 @@ const OverviewTab: FC<OverviewTabProps> = ({ instanceId }) => {
const router = useRouter()
const input = { params: { appInstanceId: instanceId } }
const { data: overview } = useQuery(deploymentOverviewQueryOptions(instanceId))
const { data: accessConfig } = useQuery(consoleQuery.enterprise.enterpriseAppDeployConsole.getAppInstanceAccess.queryOptions({
const { data: accessConfig } = useQuery(consoleQuery.enterprise.appDeploy.getAppInstanceAccess.queryOptions({
input,
}))
const openDeployDrawer = useDeploymentsStore(state => state.openDeployDrawer)

2
web/features/deployments/detail/settings-tab.tsx
View File

@ -194,7 +194,7 @@ const SettingsTab: FC<SettingsTabProps> = ({ instanceId }) => {
() => toAppInfoFromOverview(overview?.instance),
[overview?.instance],
)
const settingsQuery = useQuery(consoleQuery.enterprise.enterpriseAppDeployConsole.getAppInstanceSettings.queryOptions({
const settingsQuery = useQuery(consoleQuery.enterprise.appDeploy.getAppInstanceSettings.queryOptions({
input: appInput,
}))

2
web/features/deployments/detail/versions-tab/deploy-release-menu.tsx
View File

@ -39,7 +39,7 @@ export const DeployReleaseMenu: FC<DeployReleaseMenuProps> = ({ appInstanceId, r
enabled: open,
})
const { data: environmentOptionsReply } = useQuery({
...consoleQuery.enterprise.enterpriseAppDeployConsole.listDeploymentEnvironmentOptions.queryOptions(),
...consoleQuery.enterprise.appDeploy.listDeploymentEnvironmentOptions.queryOptions(),
enabled: open,
})

32
web/features/deployments/hooks/use-deployment-mutations.ts
View File

@ -90,9 +90,9 @@ export const useCreateDeploymentInstance = () => {
const queryClient = useQueryClient()
return useMutation({
mutationKey: consoleQuery.enterprise.enterpriseAppDeployConsole.createAppInstance.mutationKey(),
mutationKey: consoleQuery.enterprise.appDeploy.createAppInstance.mutationKey(),
mutationFn: async (params: CreateInstanceParams): Promise<CreateDeploymentInstanceResult> => {
const response = await consoleClient.enterprise.enterpriseAppDeployConsole.createAppInstance({
const response = await consoleClient.enterprise.appDeploy.createAppInstance({
body: {
sourceAppId: params.sourceAppId,
name: params.name,
@ -125,7 +125,7 @@ export const useCreateDeploymentInstance = () => {
export const useUpdateDeploymentInstance = () => {
const queryClient = useQueryClient()
return useMutation(consoleQuery.enterprise.enterpriseAppDeployConsole.updateAppInstance.mutationOptions({
return useMutation(consoleQuery.enterprise.appDeploy.updateAppInstance.mutationOptions({
onSuccess: (_data, variables) => {
return invalidateInstanceIdentity(queryClient, variables.params.appInstanceId)
},
@ -135,7 +135,7 @@ export const useUpdateDeploymentInstance = () => {
export const useDeleteDeploymentInstance = () => {
const queryClient = useQueryClient()
return useMutation(consoleQuery.enterprise.enterpriseAppDeployConsole.deleteAppInstance.mutationOptions({
return useMutation(consoleQuery.enterprise.appDeploy.deleteAppInstance.mutationOptions({
onSuccess: (_data, variables) => {
return removeDeletedInstanceState(queryClient, variables.params.appInstanceId)
},
@ -146,7 +146,7 @@ export const useStartDeployment = () => {
const queryClient = useQueryClient()
return useMutation({
mutationKey: consoleQuery.enterprise.enterpriseAppDeployConsole.createDeployment.mutationKey(),
mutationKey: consoleQuery.enterprise.appDeploy.createDeployment.mutationKey(),
mutationFn: async ({
appInstanceId,
environmentId,
@ -155,7 +155,7 @@ export const useStartDeployment = () => {
}: CreateDeploymentParams) => {
let targetReleaseId = releaseId
let releaseWasCreated = false
await consoleClient.enterprise.enterpriseAppDeployConsole.previewRelease({
await consoleClient.enterprise.appDeploy.previewRelease({
params: {
appInstanceId,
},
@ -167,7 +167,7 @@ export const useStartDeployment = () => {
try {
if (!targetReleaseId) {
const trimmedReleaseNote = releaseNote?.trim()
const response = await consoleClient.enterprise.enterpriseAppDeployConsole.createRelease({
const response = await consoleClient.enterprise.appDeploy.createRelease({
params: {
appInstanceId,
},
@ -185,7 +185,7 @@ export const useStartDeployment = () => {
if (!targetReleaseId)
throw new Error('Failed to create a deployable release.')
return await consoleClient.enterprise.enterpriseAppDeployConsole.createDeployment({
return await consoleClient.enterprise.appDeploy.createDeployment({
params: {
appInstanceId,
},
@ -214,12 +214,12 @@ export const useUndeployDeployment = () => {
const queryClient = useQueryClient()
return useMutation({
mutationKey: consoleQuery.enterprise.enterpriseAppDeployConsole.undeployRuntimeInstance.mutationKey(),
mutationKey: consoleQuery.enterprise.appDeploy.undeployRuntimeInstance.mutationKey(),
mutationFn: ({ appInstanceId, runtimeInstanceId, isDeploying }: UndeployDeploymentParams) => {
if (!runtimeInstanceId)
throw new Error('runtimeInstanceId is required to undeploy a deployment.')
if (isDeploying) {
return consoleClient.enterprise.enterpriseAppDeployConsole.cancelRuntimeDeployment({
return consoleClient.enterprise.appDeploy.cancelRuntimeDeployment({
params: {
appInstanceId,
runtimeInstanceId,
@ -230,7 +230,7 @@ export const useUndeployDeployment = () => {
},
})
}
return consoleClient.enterprise.enterpriseAppDeployConsole.undeployRuntimeInstance({
return consoleClient.enterprise.appDeploy.undeployRuntimeInstance({
params: {
appInstanceId,
runtimeInstanceId,
@ -250,7 +250,7 @@ export const useUndeployDeployment = () => {
export const useGenerateDeploymentApiKey = () => {
const queryClient = useQueryClient()
return useMutation(consoleQuery.enterprise.enterpriseAppDeployConsole.createDeveloperApiKey.mutationOptions({
return useMutation(consoleQuery.enterprise.appDeploy.createDeveloperApiKey.mutationOptions({
onSuccess: (_data, variables) => {
return invalidateAccessState(queryClient, variables.params.appInstanceId)
},
@ -260,7 +260,7 @@ export const useGenerateDeploymentApiKey = () => {
export const useRevokeDeploymentApiKey = () => {
const queryClient = useQueryClient()
return useMutation(consoleQuery.enterprise.enterpriseAppDeployConsole.deleteDeveloperApiKey.mutationOptions({
return useMutation(consoleQuery.enterprise.appDeploy.deleteDeveloperApiKey.mutationOptions({
onSuccess: (_data, variables) => {
return invalidateAccessState(queryClient, variables.params.appInstanceId)
},
@ -270,7 +270,7 @@ export const useRevokeDeploymentApiKey = () => {
export const useToggleDeploymentAccessChannel = () => {
const queryClient = useQueryClient()
return useMutation(consoleQuery.enterprise.enterpriseAppDeployConsole.updateAccessChannels.mutationOptions({
return useMutation(consoleQuery.enterprise.appDeploy.updateAccessChannels.mutationOptions({
onSuccess: (_data, variables) => {
return invalidateAccessState(queryClient, variables.params.appInstanceId)
},
@ -280,7 +280,7 @@ export const useToggleDeploymentAccessChannel = () => {
export const useToggleDeploymentDeveloperAPI = () => {
const queryClient = useQueryClient()
return useMutation(consoleQuery.enterprise.enterpriseAppDeployConsole.updateDeveloperApi.mutationOptions({
return useMutation(consoleQuery.enterprise.appDeploy.updateDeveloperApi.mutationOptions({
onSuccess: (_data, variables) => {
return invalidateAccessState(queryClient, variables.params.appInstanceId)
},
@ -290,7 +290,7 @@ export const useToggleDeploymentDeveloperAPI = () => {
export const useSetEnvironmentAccessPolicy = () => {
const queryClient = useQueryClient()
return useMutation(consoleQuery.enterprise.enterpriseAppDeployConsole.updateEnvironmentAccessPolicy.mutationOptions({
return useMutation(consoleQuery.enterprise.appDeploy.updateEnvironmentAccessPolicy.mutationOptions({
onSuccess: (_data, variables) => {
return invalidateEnvironmentAccessPolicy(
queryClient,

2
web/features/deployments/list/index.tsx
View File

@ -50,7 +50,7 @@ const DeploymentsMain: FC = () => {
...(envFilter === 'not-deployed' ? { notDeployed: true } : {}),
...(queryKeywords.trim() ? { query: queryKeywords.trim() } : {}),
}))
const { data: environmentOptionsReply } = useQuery(consoleQuery.enterprise.enterpriseAppDeployConsole.listDeploymentEnvironmentOptions.queryOptions())
const { data: environmentOptionsReply } = useQuery(consoleQuery.enterprise.appDeploy.listDeploymentEnvironmentOptions.queryOptions())
const apps = useMemo(() => sourceAppsFromList(listQuery.data), [listQuery.data])
const summaries = useMemo(() => deploymentSummariesFromList(listQuery.data), [listQuery.data])
const environments = useMemo(() => {

24
web/features/deployments/queries.ts
View File

@ -4,7 +4,7 @@ import { consoleQuery } from '@/service/client'
import { DEPLOYMENT_PAGE_SIZE, SOURCE_APPS_PAGE_SIZE } from './data'
export const deploymentsListQueryOptions = (query: ListAppDeploymentsQuery = {}) =>
consoleQuery.enterprise.enterpriseAppDeployConsole.listAppInstances.queryOptions({
consoleQuery.enterprise.appDeploy.listAppInstances.queryOptions({
input: {
query: {
pageNumber: 1,
@ -15,7 +15,7 @@ export const deploymentsListQueryOptions = (query: ListAppDeploymentsQuery = {})
})
export const deploymentsListQueryKey = () =>
consoleQuery.enterprise.enterpriseAppDeployConsole.listAppInstances.key({ type: 'query' })
consoleQuery.enterprise.appDeploy.listAppInstances.key({ type: 'query' })
export const deploymentAppInstanceInput = (appInstanceId: string) => ({
params: { appInstanceId },
@ -40,30 +40,30 @@ export const deploymentEnvironmentAccessPolicyQueryKey = (
})
export const deploymentOverviewQueryKey = (appInstanceId: string) =>
consoleQuery.enterprise.enterpriseAppDeployConsole.getAppInstanceOverview.key(deploymentAppInstanceQueryKey(appInstanceId))
consoleQuery.enterprise.appDeploy.getAppInstanceOverview.key(deploymentAppInstanceQueryKey(appInstanceId))
export const deploymentSettingsQueryKey = (appInstanceId: string) =>
consoleQuery.enterprise.enterpriseAppDeployConsole.getAppInstanceSettings.key(deploymentAppInstanceQueryKey(appInstanceId))
consoleQuery.enterprise.appDeploy.getAppInstanceSettings.key(deploymentAppInstanceQueryKey(appInstanceId))
export const deploymentEnvironmentDeploymentsQueryKey = (appInstanceId: string) =>
consoleQuery.enterprise.enterpriseAppDeployConsole.listRuntimeInstances.key(deploymentAppInstanceQueryKey(appInstanceId))
consoleQuery.enterprise.appDeploy.listRuntimeInstances.key(deploymentAppInstanceQueryKey(appInstanceId))
export const deploymentReleaseHistoryQueryKey = (appInstanceId: string) =>
consoleQuery.enterprise.enterpriseAppDeployConsole.listReleases.key(deploymentAppInstanceQueryKey(appInstanceId))
consoleQuery.enterprise.appDeploy.listReleases.key(deploymentAppInstanceQueryKey(appInstanceId))
export const deploymentAccessConfigQueryKey = (appInstanceId: string) =>
consoleQuery.enterprise.enterpriseAppDeployConsole.getAppInstanceAccess.key(deploymentAppInstanceQueryKey(appInstanceId))
consoleQuery.enterprise.appDeploy.getAppInstanceAccess.key(deploymentAppInstanceQueryKey(appInstanceId))
export const deploymentEnvironmentAccessPolicyQueryKeyForEnvironment = (
appInstanceId: string,
environmentId: string,
) =>
consoleQuery.enterprise.enterpriseAppDeployConsole.getEnvironmentAccessPolicy.key(
consoleQuery.enterprise.appDeploy.getEnvironmentAccessPolicy.key(
deploymentEnvironmentAccessPolicyQueryKey(appInstanceId, environmentId),
)
export const deploymentEnvironmentAccessPoliciesQueryKey = (appInstanceId: string) =>
consoleQuery.enterprise.enterpriseAppDeployConsole.getEnvironmentAccessPolicy.key(deploymentAppInstanceQueryKey(appInstanceId))
consoleQuery.enterprise.appDeploy.getEnvironmentAccessPolicy.key(deploymentAppInstanceQueryKey(appInstanceId))
export const deploymentInstanceIdentityQueryKeys = (appInstanceId: string) => [
deploymentsListQueryKey(),
@ -94,21 +94,21 @@ export const deploymentAccessStateQueryKeys = (appInstanceId: string) => [
]
export const deploymentOverviewQueryOptions = (appInstanceId?: string) =>
consoleQuery.enterprise.enterpriseAppDeployConsole.getAppInstanceOverview.queryOptions({
consoleQuery.enterprise.appDeploy.getAppInstanceOverview.queryOptions({
input: appInstanceId
? { params: { appInstanceId } }
: skipToken,
})
export const deploymentEnvironmentDeploymentsQueryOptions = (appInstanceId?: string) =>
consoleQuery.enterprise.enterpriseAppDeployConsole.listRuntimeInstances.queryOptions({
consoleQuery.enterprise.appDeploy.listRuntimeInstances.queryOptions({
input: appInstanceId
? { params: { appInstanceId } }
: skipToken,
})
export const deploymentReleaseHistoryQueryOptions = (appInstanceId?: string) =>
consoleQuery.enterprise.enterpriseAppDeployConsole.listReleases.queryOptions({
consoleQuery.enterprise.appDeploy.listReleases.queryOptions({
input: appInstanceId
? {
params: { appInstanceId },

9
web/openapi-ts.enterprise.config.ts
View File

@ -37,6 +37,13 @@ const stripSchemaNamePrefix = (schemaName: string) => {
.replace(/^pagination\./, '')
}
const contractTagSegment = (tag?: string) => {
if (tag === 'EnterpriseAppDeployConsole')
return 'AppDeploy'
return tag || 'default'
}
const contractNameSegments = (operation: ContractOperation) => {
const operationId = operation.operationId || operation.id
const tag = operation.tags?.[0]
@ -48,7 +55,7 @@ const contractNameSegments = (operation: ContractOperation) => {
}
const contractPathSegments = (operation: ContractOperation) => {
return [operation.tags?.[0] || 'default', ...contractNameSegments(operation)]
return [contractTagSegment(operation.tags?.[0]), ...contractNameSegments(operation)]
}
const normalizeEnterpriseOpenApi = () => {