Skip to content

fix: Cancel deployment when deleting applications #4747

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
shaohuzhang1 merged 1 commit into from
Jan 30, 2026
+13 −1
Merged

fix: Cancel deployment when deleting applications #4747

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 13 additions & 1 deletion apps/application/serializers/application.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@
from system_manage.serializers.user_resource_permission import UserResourcePermissionSerializer
from tools.models import Tool, ToolScope
from tools.serializers.tool import ToolExportModelSerializer
from trigger.models import TriggerTask
from trigger.models import TriggerTask, Trigger
from users.models import User
from users.serializers.user import is_workspace_manage

Expand Down Expand Up @@ -790,6 +790,8 @@ def get_mcp_servers(self, instance, with_valid=True):
return tools

def delete(self, with_valid=True):
from trigger.handler.simple_tools import deploy
from trigger.serializers.trigger import TriggerModelSerializer
if with_valid:
self.is_valid()
application_id = self.data.get('application_id')
Expand All @@ -798,6 +800,16 @@ def delete(self, with_valid=True):
Q(target_id=application_id) | Q(source_id=application_id)
).delete()
QuerySet(Application).filter(id=application_id).delete()
trigger_ids = list(
QuerySet(TriggerTask).filter(
source_type="APPLICATION", source_id=self.data.get('id')
).values('trigger_id').distinct()
)
QuerySet(TriggerTask).filter(source_type="APPLICATION", source_id=self.data.get('id')).delete()
for trigger_id in trigger_ids:
trigger = Trigger.objects.filter(id=trigger_id['trigger_id']).first()
if trigger and trigger.is_active:
deploy(TriggerModelSerializer(trigger).data, **{})
return True

def export(self, with_valid=True):
Expand Down