diff --git a/app/src/actions/clearTopic.ts b/app/src/actions/clearTopic.ts index f5d4ee7d..068662bf 100644 --- a/app/src/actions/clearTopic.ts +++ b/app/src/actions/clearTopic.ts @@ -9,6 +9,8 @@ export const clearTopic = (topic: q.TreeNode, recursive: boolean) => async dispatch: Dispatch, getState: () => AppState ) => { + const topicsForPurging = recursive ? [topic, ...topic.childTopics()] : [topic] + if (recursive) { const topicCount = topic.childTopicCount() @@ -21,7 +23,7 @@ export const clearTopic = (topic: q.TreeNode, recursive: boolean) => async const confirmed = await dispatch( globalActions.requestConfirmation( 'Confirm delete', - `Do you want to delete "${topic.path()}"${childTopicsMessage}?` + `Do you want to clear "${topic.path()}"${childTopicsMessage}?\n\nThis function will send an empty payload (QoS 0, retain) to this and every subtopic, clearing retained topics in the process. Only use this function if you know what you are doing.` ) ) if (!confirmed) { @@ -36,7 +38,6 @@ export const clearTopic = (topic: q.TreeNode, recursive: boolean) => async return } const publishEvent = makePublishEvent(connectionId) - const topicsForPurging = recursive ? [topic, ...topic.childTopics()] : [topic] topicsForPurging .filter(t => t.path() !== '' && t.hasMessage()) diff --git a/app/src/components/ConfirmationDialog.tsx b/app/src/components/ConfirmationDialog.tsx index d3a1b539..005bff69 100644 --- a/app/src/components/ConfirmationDialog.tsx +++ b/app/src/components/ConfirmationDialog.tsx @@ -42,7 +42,9 @@ function ConfirmationDialog(props: { confirmationRequests: Array {request.title} - {request.inquiry} + + {request.inquiry} +