diff --git a/frontend/src/pages/Deploy/Application/List/components/ApplicationModal.tsx b/frontend/src/pages/Deploy/Application/List/components/ApplicationModal.tsx index e901e5a8..9cc6cca5 100644 --- a/frontend/src/pages/Deploy/Application/List/components/ApplicationModal.tsx +++ b/frontend/src/pages/Deploy/Application/List/components/ApplicationModal.tsx @@ -56,12 +56,12 @@ const ApplicationModal: React.FC = ({ initialValues, projectGroupId, }) => { - const [gitInstances, setGitInstances] = useState([]); + const [externalSystems, setExternalSystems] = useState([]); const [repositoryGroups, setRepositoryGroups] = useState([]); const [repositoryProjects, setRepositoryProjects] = useState([]); const {toast} = useToast(); const isEdit = !!initialValues?.id; - const [selectedGitInstance, setSelectedGitInstance] = useState(); + const [selectedExternalSystem, setSelectedExternalSystem] = useState(); const form = useForm({ resolver: zodResolver(applicationFormSchema), @@ -79,20 +79,20 @@ const ApplicationModal: React.FC = ({ }, }); - // 加载Git实例列表 - const loadGitInstances = async () => { + // 加载外部系统列表 + const loadExternalSystems = async () => { try { const response = await getExternalSystems({ type: SystemType.GIT, enabled: true, }); if (response?.content) { - setGitInstances(response.content); + setExternalSystems(response.content); } } catch (error) { toast({ variant: "destructive", - title: "加载Git实例失败", + title: "加载外部系统失败", description: error instanceof Error ? error.message : undefined, duration: 3000, }); @@ -100,7 +100,7 @@ const ApplicationModal: React.FC = ({ }; useEffect(() => { - loadGitInstances(); + loadExternalSystems(); }, []); useEffect(() => { @@ -117,15 +117,15 @@ const ApplicationModal: React.FC = ({ repoProjectId: initialValues.repoProjectId, projectGroupId: initialValues.projectGroupId, }); - const gitInstance = gitInstances.find(instance => instance.id === initialValues.externalSystemId); - if (gitInstance) { - setSelectedGitInstance(gitInstance); + const externalSystem = externalSystems.find(system => system.id === initialValues.externalSystemId); + if (externalSystem) { + setSelectedExternalSystem(externalSystem); } } - }, [initialValues, form, gitInstances]); + }, [initialValues, form, externalSystems]); - // 当选择Git实例时,获取对应的仓库组列表 - const handleGitInstanceChange = (externalSystemId: number) => { + // 当选择外部系统时,获取对应的仓库组列表 + const handleExternalSystemChange = (externalSystemId: number) => { form.setValue('repoGroupId', undefined); form.setValue('repoProjectId', undefined); setRepositoryProjects([]); @@ -150,12 +150,29 @@ const ApplicationModal: React.FC = ({ ...values, id: initialValues!.id, }); + toast({ + title: "更新成功", + description: `应用 ${values.appName} 已更新`, + duration: 3000, + }); } else { await createApplication(values); + toast({ + title: "创建成功", + description: `应用 ${values.appName} 已创建`, + duration: 3000, + }); } onSuccess?.(); + onCancel(); } catch (e) { console.error(e); + toast({ + variant: "destructive", + title: isEdit ? "更新失败" : "创建失败", + description: e instanceof Error ? e.message : "操作失败,请重试", + duration: 3000, + }); } }; @@ -240,26 +257,26 @@ const ApplicationModal: React.FC = ({ name="externalSystemId" render={({field}) => ( - Git实例 + 外部系统