Skip to content

[Improvement-17947][ui] Improve delete confirmation to show workflow name #18029

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
SbloodyS merged 3 commits into from
Mar 10, 2026
Merged

[Improvement-17947][ui] Improve delete confirmation to show workflow name #18029

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d1709ed
[Improvement][UI] Show workflow name and warning in delete confirmati…
asadjan4611 Mar 6, 2026
51e5048
[Improvement-17947][ui] Fix delete confirmation i18n and warning style
asadjan4611 Mar 9, 2026
26830b6
Merge branch 'dev' into Feature-17947
SbloodyS Mar 10, 2026
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
3 changes: 3 additions & 0 deletions dolphinscheduler-ui/src/locales/en_US/project.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,6 +150,9 @@ export default {
end_time: 'End Time',
crontab: 'Crontab',
delete_confirm: 'Delete?',
delete_confirm_with_name: 'Delete "{name}"?',
delete_irreversible:
'This action cannot be undone. The workflow and its associated data will be permanently deleted.',
enter_name_tips: 'Please enter name',
switch_version: 'Switch To This Version',
confirm_switch_version: 'Confirm Switch To This Version?',
Expand Down
2 changes: 2 additions & 0 deletions dolphinscheduler-ui/src/locales/zh_CN/project.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,6 +149,8 @@ export default {
end_time: '结束时间',
crontab: 'Crontab',
delete_confirm: '确定删除吗?',
delete_confirm_with_name: '确定删除“{name}”吗?',
delete_irreversible: '此操作不可撤销。工作流及其关联数据将被永久删除。',
enter_name_tips: '请输入名称',
switch_version: '切换到该版本',
confirm_switch_version: '确定切换到该版本吗?',
Expand Down
24 changes: 22 additions & 2 deletions dolphinscheduler-ui/src/views/projects/workflow/definition/components/table-action.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
*/

import { defineComponent, PropType, toRefs } from 'vue'
import { NSpace, NTooltip, NButton, NIcon, NPopconfirm } from 'naive-ui'
import { NSpace, NTooltip, NButton, NIcon, NPopconfirm, NText } from 'naive-ui'
import {
DeleteOutlined,
DownloadOutlined,
Expand Down Expand Up @@ -271,7 +271,27 @@ export default defineComponent({
onPositiveClick={this.handleDeleteWorkflow}
>
{{
default: () => t('project.workflow.delete_confirm'),
default: () => (
<div style={{ maxWidth: 360 }}>
<div style={{ fontWeight: 600, marginBottom: 6 }}>
{(() => {
const workflowName = (this.row?.name || '').trim()
if (!workflowName) {
return t('project.workflow.delete_confirm')
}
return t(
'project.workflow.delete_confirm_with_name',
{
name: workflowName
}
)
})()}
</div>
<NText type='error'>
{t('project.workflow.delete_irreversible')}
</NText>
</div>
),
trigger: () => (
<NButton
size='small'
Expand Down
Loading