From ede86a686ca5b48a3c4c946ed715ee118aff5506 Mon Sep 17 00:00:00 2001 From: "Joseph T. Lyons" Date: Mon, 17 Jul 2023 16:06:14 -0400 Subject: [PATCH] Prevent multiple submissions of the same feedback text Co-Authored-By: Julia <30666851+ForLoveOfCats@users.noreply.github.com> --- crates/feedback/src/feedback_editor.rs | 20 ++++++++++++++++- crates/feedback/src/submit_feedback_button.rs | 22 +++++++++++++++++-- styles/src/style_tree/feedback.ts | 5 +++++ 3 files changed, 44 insertions(+), 3 deletions(-) diff --git a/crates/feedback/src/feedback_editor.rs b/crates/feedback/src/feedback_editor.rs index bea398d3eb..47cb90875a 100644 --- a/crates/feedback/src/feedback_editor.rs +++ b/crates/feedback/src/feedback_editor.rs @@ -60,6 +60,7 @@ pub(crate) struct FeedbackEditor { system_specs: SystemSpecs, editor: ViewHandle, project: ModelHandle, + pub allow_submission: bool, } impl FeedbackEditor { @@ -82,10 +83,15 @@ impl FeedbackEditor { system_specs: system_specs.clone(), editor, project, + allow_submission: true, } } pub fn submit(&mut self, cx: &mut ViewContext) -> Task> { + if !self.allow_submission { + return Task::ready(Ok(())); + } + let feedback_text = self.editor.read(cx).text(cx); let feedback_char_count = feedback_text.chars().count(); let feedback_text = feedback_text.trim().to_string(); @@ -122,19 +128,26 @@ impl FeedbackEditor { let answer = answer.recv().await; if answer == Some(0) { + this.update(&mut cx, |feedback_editor, cx| { + feedback_editor.set_allow_submission(false, cx); + }) + .log_err(); + match FeedbackEditor::submit_feedback(&feedback_text, client, specs).await { Ok(_) => { this.update(&mut cx, |_, cx| cx.emit(editor::Event::Closed)) .log_err(); } + Err(error) => { log::error!("{}", error); - this.update(&mut cx, |_, cx| { + this.update(&mut cx, |feedback_editor, cx| { cx.prompt( PromptLevel::Critical, FEEDBACK_SUBMISSION_ERROR_TEXT, &["OK"], ); + feedback_editor.set_allow_submission(true, cx); }) .log_err(); } @@ -146,6 +159,11 @@ impl FeedbackEditor { Task::ready(Ok(())) } + fn set_allow_submission(&mut self, allow_submission: bool, cx: &mut ViewContext) { + self.allow_submission = allow_submission; + cx.notify(); + } + async fn submit_feedback( feedback_text: &str, zed_client: Arc, diff --git a/crates/feedback/src/submit_feedback_button.rs b/crates/feedback/src/submit_feedback_button.rs index 15f77bd561..03a2cd51ed 100644 --- a/crates/feedback/src/submit_feedback_button.rs +++ b/crates/feedback/src/submit_feedback_button.rs @@ -46,10 +46,28 @@ impl View for SubmitFeedbackButton { fn render(&mut self, cx: &mut ViewContext) -> AnyElement { let theme = theme::current(cx).clone(); + let allow_submission = self + .active_item + .as_ref() + .map_or(true, |i| i.read(cx).allow_submission); + enum SubmitFeedbackButton {} MouseEventHandler::::new(0, cx, |state, _| { - let style = theme.feedback.submit_button.style_for(state); - Label::new("Submit as Markdown", style.text.clone()) + let text; + let style = if allow_submission { + text = "Submit as Markdown"; + theme.feedback.submit_button.style_for(state) + } else { + text = "Submitting..."; + theme + .feedback + .submit_button + .disabled + .as_ref() + .unwrap_or(&theme.feedback.submit_button.default) + }; + + Label::new(text, style.text.clone()) .contained() .with_style(style.container) }) diff --git a/styles/src/style_tree/feedback.ts b/styles/src/style_tree/feedback.ts index 2bb63e951b..b1bd96e165 100644 --- a/styles/src/style_tree/feedback.ts +++ b/styles/src/style_tree/feedback.ts @@ -33,6 +33,11 @@ export default function feedback(): any { background: background(theme.highest, "on", "hovered"), border: border(theme.highest, "on", "hovered"), }, + disabled: { + ...text(theme.highest, "mono", "on", "disabled"), + background: background(theme.highest, "on", "disabled"), + border: border(theme.highest, "on", "disabled"), + } }, }), button_margin: 8,