Use an enum to represent modal states and simplify logic

Joseph T. Lyons created 2 years ago

Change summary

crates/feedback2/src/feedback_modal.rs | 51 ++++++++++++---------------
1 file changed, 23 insertions(+), 28 deletions(-)

Detailed changes

crates/feedback2/src/feedback_modal.rs

@@ -48,14 +48,19 @@ struct FeedbackRequestBody<'a> {
     token: &'a str,
 }
 
+#[derive(PartialEq)]
+enum FeedbackModalState {
+    CanSubmit,
+    DismissModal,
+    AwaitingSubmissionResponse,
+}
+
 pub struct FeedbackModal {
     system_specs: SystemSpecs,
     feedback_editor: View<Editor>,
     email_address_editor: View<Editor>,
-    awaiting_submission: bool,
-    user_submitted: bool,
-    user_discarded: bool,
     character_count: i32,
+    state: FeedbackModalState,
 }
 
 impl FocusableView for FeedbackModal {
@@ -67,12 +72,7 @@ impl EventEmitter<DismissEvent> for FeedbackModal {}
 
 impl ModalView for FeedbackModal {
     fn on_before_dismiss(&mut self, cx: &mut ViewContext<Self>) -> bool {
-        if self.user_submitted {
-            self.set_user_submitted(false, cx);
-            return true;
-        }
-
-        if self.user_discarded {
+        if self.state == FeedbackModalState::DismissModal {
             return true;
         }
 
@@ -86,7 +86,7 @@ impl ModalView for FeedbackModal {
         cx.spawn(move |this, mut cx| async move {
             if answer.await.ok() == Some(0) {
                 this.update(&mut cx, |this, cx| {
-                    this.user_discarded = true;
+                    this.state = FeedbackModalState::DismissModal;
                     cx.emit(DismissEvent)
                 })
                 .log_err();
@@ -183,9 +183,7 @@ impl FeedbackModal {
             system_specs: system_specs.clone(),
             feedback_editor,
             email_address_editor,
-            awaiting_submission: false,
-            user_submitted: false,
-            user_discarded: false,
+            state: FeedbackModalState::CanSubmit,
             character_count: 0,
         }
     }
@@ -220,7 +218,8 @@ impl FeedbackModal {
                 };
 
                 this.update(&mut cx, |this, cx| {
-                    this.set_awaiting_submission(true, cx);
+                    this.state = FeedbackModalState::AwaitingSubmissionResponse;
+                    cx.notify();
                 })
                 .log_err();
 
@@ -230,7 +229,8 @@ impl FeedbackModal {
                 match res {
                     Ok(_) => {
                         this.update(&mut cx, |this, cx| {
-                            this.set_user_submitted(true, cx);
+                            this.state = FeedbackModalState::DismissModal;
+                            cx.notify();
                             cx.emit(DismissEvent)
                         })
                         .ok();
@@ -247,7 +247,9 @@ impl FeedbackModal {
                                 prompt.await.ok();
                             })
                             .detach();
-                            this.set_awaiting_submission(false, cx);
+
+                            this.state = FeedbackModalState::CanSubmit;
+                            cx.notify();
                         })
                         .log_err();
                     }
@@ -259,16 +261,6 @@ impl FeedbackModal {
         Task::ready(Ok(()))
     }
 
-    fn set_awaiting_submission(&mut self, awaiting_submission: bool, cx: &mut ViewContext<Self>) {
-        self.awaiting_submission = awaiting_submission;
-        cx.notify();
-    }
-
-    fn set_user_submitted(&mut self, user_submitted: bool, cx: &mut ViewContext<Self>) {
-        self.user_submitted = user_submitted;
-        cx.notify();
-    }
-
     async fn submit_feedback(
         feedback_text: &str,
         email: Option<String>,
@@ -330,10 +322,13 @@ impl Render for FeedbackModal {
 
         let valid_character_count = FEEDBACK_CHAR_LIMIT.contains(&self.character_count);
 
+        let awaiting_submission_response =
+            self.state == FeedbackModalState::AwaitingSubmissionResponse;
+
         let allow_submission =
-            valid_character_count && valid_email_address && !self.awaiting_submission;
+            valid_character_count && valid_email_address && !awaiting_submission_response;
 
-        let submit_button_text = if self.awaiting_submission {
+        let submit_button_text = if awaiting_submission_response {
             "Submitting..."
         } else {
             "Submit"