update contract

This commit is contained in:
Stephen Zhou 2026-04-30 15:46:31 +08:00
parent e424a2ad9a
commit 48a96739d4
No known key found for this signature in database
13 changed files with 41 additions and 87 deletions

View File

@ -42,30 +42,7 @@ import {
workflowDraftUpdateFeaturesContract,
} from './console/workflow'
import { workflowCommentContracts } from './console/workflow-comment'
import {
enterpriseAppDeployConsoleCancelRuntimeDeployment,
enterpriseAppDeployConsoleCreateAppInstance,
enterpriseAppDeployConsoleCreateDeployment,
enterpriseAppDeployConsoleCreateDeveloperApiKey,
enterpriseAppDeployConsoleCreateRelease,
enterpriseAppDeployConsoleDeleteAppInstance,
enterpriseAppDeployConsoleDeleteDeveloperApiKey,
enterpriseAppDeployConsoleGetAppInstanceAccess,
enterpriseAppDeployConsoleGetAppInstanceOverview,
enterpriseAppDeployConsoleGetAppInstanceSettings,
enterpriseAppDeployConsoleGetEnvironmentAccessPolicy,
enterpriseAppDeployConsoleListAppInstances,
enterpriseAppDeployConsoleListDeploymentEnvironmentOptions,
enterpriseAppDeployConsoleListReleases,
enterpriseAppDeployConsoleListRuntimeInstances,
enterpriseAppDeployConsolePreviewRelease,
enterpriseAppDeployConsoleSearchAccessSubjects,
enterpriseAppDeployConsoleUndeployRuntimeInstance,
enterpriseAppDeployConsoleUpdateAccessChannels,
enterpriseAppDeployConsoleUpdateAppInstance,
enterpriseAppDeployConsoleUpdateDeveloperApi,
enterpriseAppDeployConsoleUpdateEnvironmentAccessPolicy,
} from './generated/enterprise/orpc.gen'
import { contract as enterpriseContract } from './generated/enterprise/orpc.gen'
import { collectionPluginsContract, collectionsContract, searchAdvancedContract, templateDetailContract } from './marketplace'
export const marketplaceRouterContract = {
@ -78,6 +55,7 @@ export const marketplaceRouterContract = {
export type MarketPlaceInputs = InferContractRouterInputs<typeof marketplaceRouterContract>
export const consoleRouterContract = {
enterprise: enterpriseContract,
account: {
avatar: accountAvatarContract,
},
@ -115,30 +93,6 @@ export const consoleRouterContract = {
invoices: invoicesContract,
bindPartnerStack: bindPartnerStackContract,
},
deployments: {
list: enterpriseAppDeployConsoleListAppInstances,
createInstance: enterpriseAppDeployConsoleCreateAppInstance,
overview: enterpriseAppDeployConsoleGetAppInstanceOverview,
environmentDeployments: enterpriseAppDeployConsoleListRuntimeInstances,
deploymentEnvironmentOptions: enterpriseAppDeployConsoleListDeploymentEnvironmentOptions,
previewRelease: enterpriseAppDeployConsolePreviewRelease,
releaseHistory: enterpriseAppDeployConsoleListReleases,
accessConfig: enterpriseAppDeployConsoleGetAppInstanceAccess,
environmentAccessPolicy: enterpriseAppDeployConsoleGetEnvironmentAccessPolicy,
updateEnvironmentAccessPolicy: enterpriseAppDeployConsoleUpdateEnvironmentAccessPolicy,
searchAccessSubjects: enterpriseAppDeployConsoleSearchAccessSubjects,
patchAccessChannel: enterpriseAppDeployConsoleUpdateAccessChannels,
patchDeveloperAPI: enterpriseAppDeployConsoleUpdateDeveloperApi,
createRelease: enterpriseAppDeployConsoleCreateRelease,
createDeployment: enterpriseAppDeployConsoleCreateDeployment,
cancelDeployment: enterpriseAppDeployConsoleCancelRuntimeDeployment,
undeployEnvironment: enterpriseAppDeployConsoleUndeployRuntimeInstance,
createEnvironmentAPIToken: enterpriseAppDeployConsoleCreateDeveloperApiKey,
deleteEnvironmentAPIToken: enterpriseAppDeployConsoleDeleteDeveloperApiKey,
settings: enterpriseAppDeployConsoleGetAppInstanceSettings,
updateInstance: enterpriseAppDeployConsoleUpdateAppInstance,
deleteInstance: enterpriseAppDeployConsoleDeleteAppInstance,
},
workflowDraft: {
environmentVariables: workflowDraftEnvironmentVariablesContract,
updateEnvironmentVariables: workflowDraftUpdateEnvironmentVariablesContract,

View File

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

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.deployments.previewRelease.queryOptions({
const releasePreview = useQuery(consoleQuery.enterprise.enterpriseAppDeployConsolePreviewRelease.queryOptions({
input: appInstanceId && (!isPromote || previewReleaseId)
? {
params: { appInstanceId },

View File

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

View File

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

View File

@ -190,7 +190,7 @@ const SubjectPicker: FC<SubjectPickerProps> = ({
() => new Set(selectedSubjects.map(subjectKey)),
[selectedSubjects],
)
const subjectsQuery = useQuery(consoleQuery.deployments.searchAccessSubjects.queryOptions({
const subjectsQuery = useQuery(consoleQuery.enterprise.enterpriseAppDeployConsoleSearchAccessSubjects.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.deployments.environmentAccessPolicy.queryOptions({
const policyQuery = useQuery(consoleQuery.enterprise.enterpriseAppDeployConsoleGetEnvironmentAccessPolicy.queryOptions({
input: environmentId
? {
params: {

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.deployments.deploymentEnvironmentOptions.queryOptions())
const { data: environmentOptionsReply } = useQuery(consoleQuery.enterprise.enterpriseAppDeployConsoleListDeploymentEnvironmentOptions.queryOptions())
const openDeployDrawer = useDeploymentsStore(state => state.openDeployDrawer)
const undeployDeployment = useUndeployDeployment()
const environmentOptions = useMemo(

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.deployments.accessConfig.queryOptions({
const { data: accessConfig } = useQuery(consoleQuery.enterprise.enterpriseAppDeployConsoleGetAppInstanceAccess.queryOptions({
input,
}))
const openDeployDrawer = useDeploymentsStore(state => state.openDeployDrawer)

View File

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

View File

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

View File

@ -90,9 +90,9 @@ export const useCreateDeploymentInstance = () => {
const queryClient = useQueryClient()
return useMutation({
mutationKey: consoleQuery.deployments.createInstance.mutationKey(),
mutationKey: consoleQuery.enterprise.enterpriseAppDeployConsoleCreateAppInstance.mutationKey(),
mutationFn: async (params: CreateInstanceParams): Promise<CreateDeploymentInstanceResult> => {
const response = await consoleClient.deployments.createInstance({
const response = await consoleClient.enterprise.enterpriseAppDeployConsoleCreateAppInstance({
body: {
sourceAppId: params.sourceAppId,
name: params.name,
@ -125,7 +125,7 @@ export const useCreateDeploymentInstance = () => {
export const useUpdateDeploymentInstance = () => {
const queryClient = useQueryClient()
return useMutation(consoleQuery.deployments.updateInstance.mutationOptions({
return useMutation(consoleQuery.enterprise.enterpriseAppDeployConsoleUpdateAppInstance.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.deployments.deleteInstance.mutationOptions({
return useMutation(consoleQuery.enterprise.enterpriseAppDeployConsoleDeleteAppInstance.mutationOptions({
onSuccess: (_data, variables) => {
return removeDeletedInstanceState(queryClient, variables.params.appInstanceId)
},
@ -146,7 +146,7 @@ export const useStartDeployment = () => {
const queryClient = useQueryClient()
return useMutation({
mutationKey: consoleQuery.deployments.createDeployment.mutationKey(),
mutationKey: consoleQuery.enterprise.enterpriseAppDeployConsoleCreateDeployment.mutationKey(),
mutationFn: async ({
appInstanceId,
environmentId,
@ -155,7 +155,7 @@ export const useStartDeployment = () => {
}: CreateDeploymentParams) => {
let targetReleaseId = releaseId
let releaseWasCreated = false
await consoleClient.deployments.previewRelease({
await consoleClient.enterprise.enterpriseAppDeployConsolePreviewRelease({
params: {
appInstanceId,
},
@ -167,7 +167,7 @@ export const useStartDeployment = () => {
try {
if (!targetReleaseId) {
const trimmedReleaseNote = releaseNote?.trim()
const response = await consoleClient.deployments.createRelease({
const response = await consoleClient.enterprise.enterpriseAppDeployConsoleCreateRelease({
params: {
appInstanceId,
},
@ -185,7 +185,7 @@ export const useStartDeployment = () => {
if (!targetReleaseId)
throw new Error('Failed to create a deployable release.')
return await consoleClient.deployments.createDeployment({
return await consoleClient.enterprise.enterpriseAppDeployConsoleCreateDeployment({
params: {
appInstanceId,
},
@ -214,12 +214,12 @@ export const useUndeployDeployment = () => {
const queryClient = useQueryClient()
return useMutation({
mutationKey: consoleQuery.deployments.undeployEnvironment.mutationKey(),
mutationKey: consoleQuery.enterprise.enterpriseAppDeployConsoleUndeployRuntimeInstance.mutationKey(),
mutationFn: ({ appInstanceId, runtimeInstanceId, isDeploying }: UndeployDeploymentParams) => {
if (!runtimeInstanceId)
throw new Error('runtimeInstanceId is required to undeploy a deployment.')
if (isDeploying) {
return consoleClient.deployments.cancelDeployment({
return consoleClient.enterprise.enterpriseAppDeployConsoleCancelRuntimeDeployment({
params: {
appInstanceId,
runtimeInstanceId,
@ -230,7 +230,7 @@ export const useUndeployDeployment = () => {
},
})
}
return consoleClient.deployments.undeployEnvironment({
return consoleClient.enterprise.enterpriseAppDeployConsoleUndeployRuntimeInstance({
params: {
appInstanceId,
runtimeInstanceId,
@ -250,7 +250,7 @@ export const useUndeployDeployment = () => {
export const useGenerateDeploymentApiKey = () => {
const queryClient = useQueryClient()
return useMutation(consoleQuery.deployments.createEnvironmentAPIToken.mutationOptions({
return useMutation(consoleQuery.enterprise.enterpriseAppDeployConsoleCreateDeveloperApiKey.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.deployments.deleteEnvironmentAPIToken.mutationOptions({
return useMutation(consoleQuery.enterprise.enterpriseAppDeployConsoleDeleteDeveloperApiKey.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.deployments.patchAccessChannel.mutationOptions({
return useMutation(consoleQuery.enterprise.enterpriseAppDeployConsoleUpdateAccessChannels.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.deployments.patchDeveloperAPI.mutationOptions({
return useMutation(consoleQuery.enterprise.enterpriseAppDeployConsoleUpdateDeveloperApi.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.deployments.updateEnvironmentAccessPolicy.mutationOptions({
return useMutation(consoleQuery.enterprise.enterpriseAppDeployConsoleUpdateEnvironmentAccessPolicy.mutationOptions({
onSuccess: (_data, variables) => {
return invalidateEnvironmentAccessPolicy(
queryClient,

View File

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

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.deployments.list.queryOptions({
consoleQuery.enterprise.enterpriseAppDeployConsoleListAppInstances.queryOptions({
input: {
query: {
pageNumber: 1,
@ -15,7 +15,7 @@ export const deploymentsListQueryOptions = (query: ListAppDeploymentsQuery = {})
})
export const deploymentsListQueryKey = () =>
consoleQuery.deployments.list.key({ type: 'query' })
consoleQuery.enterprise.enterpriseAppDeployConsoleListAppInstances.key({ type: 'query' })
export const deploymentAppInstanceInput = (appInstanceId: string) => ({
params: { appInstanceId },
@ -40,30 +40,30 @@ export const deploymentEnvironmentAccessPolicyQueryKey = (
})
export const deploymentOverviewQueryKey = (appInstanceId: string) =>
consoleQuery.deployments.overview.key(deploymentAppInstanceQueryKey(appInstanceId))
consoleQuery.enterprise.enterpriseAppDeployConsoleGetAppInstanceOverview.key(deploymentAppInstanceQueryKey(appInstanceId))
export const deploymentSettingsQueryKey = (appInstanceId: string) =>
consoleQuery.deployments.settings.key(deploymentAppInstanceQueryKey(appInstanceId))
consoleQuery.enterprise.enterpriseAppDeployConsoleGetAppInstanceSettings.key(deploymentAppInstanceQueryKey(appInstanceId))
export const deploymentEnvironmentDeploymentsQueryKey = (appInstanceId: string) =>
consoleQuery.deployments.environmentDeployments.key(deploymentAppInstanceQueryKey(appInstanceId))
consoleQuery.enterprise.enterpriseAppDeployConsoleListRuntimeInstances.key(deploymentAppInstanceQueryKey(appInstanceId))
export const deploymentReleaseHistoryQueryKey = (appInstanceId: string) =>
consoleQuery.deployments.releaseHistory.key(deploymentAppInstanceQueryKey(appInstanceId))
consoleQuery.enterprise.enterpriseAppDeployConsoleListReleases.key(deploymentAppInstanceQueryKey(appInstanceId))
export const deploymentAccessConfigQueryKey = (appInstanceId: string) =>
consoleQuery.deployments.accessConfig.key(deploymentAppInstanceQueryKey(appInstanceId))
consoleQuery.enterprise.enterpriseAppDeployConsoleGetAppInstanceAccess.key(deploymentAppInstanceQueryKey(appInstanceId))
export const deploymentEnvironmentAccessPolicyQueryKeyForEnvironment = (
appInstanceId: string,
environmentId: string,
) =>
consoleQuery.deployments.environmentAccessPolicy.key(
consoleQuery.enterprise.enterpriseAppDeployConsoleGetEnvironmentAccessPolicy.key(
deploymentEnvironmentAccessPolicyQueryKey(appInstanceId, environmentId),
)
export const deploymentEnvironmentAccessPoliciesQueryKey = (appInstanceId: string) =>
consoleQuery.deployments.environmentAccessPolicy.key(deploymentAppInstanceQueryKey(appInstanceId))
consoleQuery.enterprise.enterpriseAppDeployConsoleGetEnvironmentAccessPolicy.key(deploymentAppInstanceQueryKey(appInstanceId))
export const deploymentInstanceIdentityQueryKeys = (appInstanceId: string) => [
deploymentsListQueryKey(),
@ -94,21 +94,21 @@ export const deploymentAccessStateQueryKeys = (appInstanceId: string) => [
]
export const deploymentOverviewQueryOptions = (appInstanceId?: string) =>
consoleQuery.deployments.overview.queryOptions({
consoleQuery.enterprise.enterpriseAppDeployConsoleGetAppInstanceOverview.queryOptions({
input: appInstanceId
? { params: { appInstanceId } }
: skipToken,
})
export const deploymentEnvironmentDeploymentsQueryOptions = (appInstanceId?: string) =>
consoleQuery.deployments.environmentDeployments.queryOptions({
consoleQuery.enterprise.enterpriseAppDeployConsoleListRuntimeInstances.queryOptions({
input: appInstanceId
? { params: { appInstanceId } }
: skipToken,
})
export const deploymentReleaseHistoryQueryOptions = (appInstanceId?: string) =>
consoleQuery.deployments.releaseHistory.queryOptions({
consoleQuery.enterprise.enterpriseAppDeployConsoleListReleases.queryOptions({
input: appInstanceId
? {
params: { appInstanceId },