From 1eed8ce7f5ebb74bc628f820d644ecdedaabd47d Mon Sep 17 00:00:00 2001
From: pratishta <ypradhi9@gmail.com>
Date: Wed, 18 Dec 2024 11:16:01 -0500
Subject: [PATCH 1/3] Disable all input when subscribing

Co-authored-by: David Hochbaum <dhochbaum@planning.nyc.gov>
---
 client/app/components/subscription-form.js            | 6 ++----
 client/app/controllers/subscribe.js                   | 7 +++++++
 client/app/templates/components/subscription-form.hbs | 8 ++++----
 client/app/templates/subscribe.hbs                    | 4 ++--
 4 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/client/app/components/subscription-form.js b/client/app/components/subscription-form.js
index 0b1259a6..a3417229 100644
--- a/client/app/components/subscription-form.js
+++ b/client/app/components/subscription-form.js
@@ -11,8 +11,6 @@ export default class SubscriptionFormComponent extends Component {
 
     isCommunityDistrict = false;
 
-    isSubmitting = false;
-
     showSubscriptionUpdateConfirmationModal = false;
 
     updateStatus = 'none';
@@ -93,7 +91,7 @@ export default class SubscriptionFormComponent extends Component {
     async subscribe() {
       if (!this.canBeSubmitted) { return; }
 
-      set(this, 'isSubmitting', true);
+      this.args.setIsSubmitting(true)
 
       const requestBody = { email: this.args.email, subscriptions: {} };
       if (this.isCommunityDistrict) {
@@ -143,7 +141,7 @@ export default class SubscriptionFormComponent extends Component {
 
       if (!this.args.isUpdate) window.location.pathname = '/subscribed';
 
-      set(this, 'isSubmitting', false);
+      this.args.setIsSubmitting(false)
 
       if (this.args.isUpdate) {
         set(this, 'showSubscriptionUpdateConfirmationModal', true);
diff --git a/client/app/controllers/subscribe.js b/client/app/controllers/subscribe.js
index a1f195bd..f3ba8de1 100644
--- a/client/app/controllers/subscribe.js
+++ b/client/app/controllers/subscribe.js
@@ -5,6 +5,8 @@ import ENV from 'labs-zap-search/config/environment';
 import { validateEmail } from '../helpers/validate-email';
 
 export default class SubscribeController extends Controller {
+  isSubmitting = false;
+
   lastEmailChecked = '';
 
   emailAlreadyExists = false;
@@ -20,6 +22,11 @@ export default class SubscribeController extends Controller {
     return (this.emailAlreadyExists || this.emailNeedsConfirmation);
   }
 
+  @action
+  setIsSubmitting(isSubmittingValue) {
+    this.set('isSubmitting', isSubmittingValue);
+  }
+
   @action
   async checkExistingEmail(event) {
     const email = event.target.value;
diff --git a/client/app/templates/components/subscription-form.hbs b/client/app/templates/components/subscription-form.hbs
index 9c4df427..2c1d008a 100644
--- a/client/app/templates/components/subscription-form.hbs
+++ b/client/app/templates/components/subscription-form.hbs
@@ -9,7 +9,7 @@
         <ul>
             <li>
                 <div class="update-type-item">               
-                    <Input @id="city-wide-checkbox" @type="checkbox" @checked={{isCityWide}} {{on "change" this.toggleCitywide}}/>
+                    <Input @id="city-wide-checkbox" @type="checkbox" @checked={{isCityWide}} {{on "change" this.toggleCitywide}} @disabled={{this.args.isSubmitting}}/>
                     <div class="update-type-label">
                         <label for="city-wide-checkbox">Citywide Updates</label>
                         <span class="text-small">You'll receive an email for all citywide projects, which are projects that aren’t
@@ -20,7 +20,7 @@
             <li>
                 <div class="update-type-item">
                     <Input @id="community-district-checkbox" @type="checkbox" @checked={{isCommunityDistrict}}
-                        {{on "change" this.closeAllAccordions}}/>
+                        {{on "change" this.closeAllAccordions}} @disabled={{this.args.isSubmitting}}/>
                     <div class="update-type-label">
                         <label for="community-district-checkbox">Community District (CD) Updates</label>
                         <span class="text-small">You'll receive an email for projects from all CDs you have selected.</span>
@@ -46,12 +46,12 @@
                     <div class="accordion-content" data-tab-content>
                         <div>
                         <div>
-                        <Input id="all-{{borough}}" type="checkbox" @value={{borough}} {{on "change" this.checkWholeBorough}} /><label
+                        <Input id="all-{{borough}}" type="checkbox" @value={{borough}} {{on "change" this.checkWholeBorough}} @disabled={{this.args.isSubmitting}}/><label
                             for="all-{{borough}}">Select all</label>
                         </div>
                         {{#each districts as |district| }}
                         <div>
-                            <Input id={{district.code}} @type="checkbox" @checked={{ get this.args.subscriptions district.code }} />
+                            <Input id={{district.code}} @type="checkbox" @checked={{ get this.args.subscriptions district.code }} @disabled={{this.args.isSubmitting}}/>
                             <label
                             for={{district.code}}>District {{district.num}}</label>
                         </div>
diff --git a/client/app/templates/subscribe.hbs b/client/app/templates/subscribe.hbs
index c4bec57a..a5cc9607 100644
--- a/client/app/templates/subscribe.hbs
+++ b/client/app/templates/subscribe.hbs
@@ -7,11 +7,11 @@
                     <span class="text-small">Get updated on milestones for all projects in any community district (CD) by signing up to receive
                         emails on Zoning Application Portal.</span>
                 </div>
-                    <SubscriptionForm @subscriptions={{this.model.subscriptions}} @email={{this.model.email}} @isUpdate={{false}} @invalidEmailForSignup={{this.invalidEmailForSignup}}>
+                    <SubscriptionForm @subscriptions={{this.model.subscriptions}} @isSubmitting={{this.isSubmitting}} @setIsSubmitting={{this.setIsSubmitting}} @email={{this.model.email}} @isUpdate={{false}} @invalidEmailForSignup={{this.invalidEmailForSignup}}>
                         <div class="subscribe-section">
                             <div class="subscribe-input-group">
                             <label class="email-label">Email Address</label>
-                            <Input class="input-group-field" type="text" @value={{this.model.email}} onkeyup={{action 'continuouslyCheckEmail'}} onchange={{action 'checkExistingEmail'}} />
+                            <Input class="input-group-field" type="text" @value={{this.model.email}} onkeyup={{action 'continuouslyCheckEmail'}} onchange={{action 'checkExistingEmail'}} @disabled={{ this.isSubmitting }}/>
                             </div>
                             {{#if this.emailAlreadyExists}}
                                 <p class="email-exists">This email already is subscribed to ZAP Updates. <a onclick={{action 'sendEmail'}}>Click here to receive an email to modify subscriptions.</a></p>

From ddd4eebbb1072ccd156c405f18930e3ee5211dd2 Mon Sep 17 00:00:00 2001
From: pratishta <ypradhi9@gmail.com>
Date: Wed, 18 Dec 2024 14:39:34 -0500
Subject: [PATCH 2/3] Disable input when updating subscriptions

Add semicolon
---
 client/app/components/subscription-form.js            |  4 ++--
 client/app/controllers/subscription-update.js         | 11 +++++++++++
 client/app/templates/components/subscription-form.hbs |  2 +-
 client/app/templates/subscribe.hbs                    |  2 +-
 client/app/templates/subscription-update.hbs          |  2 +-
 5 files changed, 16 insertions(+), 5 deletions(-)
 create mode 100644 client/app/controllers/subscription-update.js

diff --git a/client/app/components/subscription-form.js b/client/app/components/subscription-form.js
index a3417229..5c73c142 100644
--- a/client/app/components/subscription-form.js
+++ b/client/app/components/subscription-form.js
@@ -91,7 +91,7 @@ export default class SubscriptionFormComponent extends Component {
     async subscribe() {
       if (!this.canBeSubmitted) { return; }
 
-      this.args.setIsSubmitting(true)
+      this.args.setIsSubmitting(true);
 
       const requestBody = { email: this.args.email, subscriptions: {} };
       if (this.isCommunityDistrict) {
@@ -141,7 +141,7 @@ export default class SubscriptionFormComponent extends Component {
 
       if (!this.args.isUpdate) window.location.pathname = '/subscribed';
 
-      this.args.setIsSubmitting(false)
+      this.args.setIsSubmitting(false);
 
       if (this.args.isUpdate) {
         set(this, 'showSubscriptionUpdateConfirmationModal', true);
diff --git a/client/app/controllers/subscription-update.js b/client/app/controllers/subscription-update.js
new file mode 100644
index 00000000..a22a3b5f
--- /dev/null
+++ b/client/app/controllers/subscription-update.js
@@ -0,0 +1,11 @@
+import Controller from '@ember/controller';
+import { action } from '@ember/object';
+
+export default class SubscriptionUpdateController extends Controller {
+    isSubmitting = false;
+
+    @action
+    setIsSubmitting(isSubmittingValue) {
+      this.set('isSubmitting', isSubmittingValue);
+    }
+}
\ No newline at end of file
diff --git a/client/app/templates/components/subscription-form.hbs b/client/app/templates/components/subscription-form.hbs
index 2c1d008a..55434719 100644
--- a/client/app/templates/components/subscription-form.hbs
+++ b/client/app/templates/components/subscription-form.hbs
@@ -67,7 +67,7 @@
     </div>
 
     <div class="subscribe-section">
-        {{#if isSubmitting}}
+        {{#if this.args.isSubmitting}}
             {{fa-icon icon='spinner' spin="true" size="5x" class="map-loading-spinner"}}
         {{/if}}
         <a class="button primary no-margin {{if this.canBeSubmitted "" "disabled"}}" type="submit" {{action "subscribe"}}>{{if this.args.isUpdate "Update" "Subscribe"}}</a>
diff --git a/client/app/templates/subscribe.hbs b/client/app/templates/subscribe.hbs
index a5cc9607..13481064 100644
--- a/client/app/templates/subscribe.hbs
+++ b/client/app/templates/subscribe.hbs
@@ -11,7 +11,7 @@
                         <div class="subscribe-section">
                             <div class="subscribe-input-group">
                             <label class="email-label">Email Address</label>
-                            <Input class="input-group-field" type="text" @value={{this.model.email}} onkeyup={{action 'continuouslyCheckEmail'}} onchange={{action 'checkExistingEmail'}} @disabled={{ this.isSubmitting }}/>
+                            <Input class="input-group-field" type="text" @value={{this.model.email}} onkeyup={{action 'continuouslyCheckEmail'}} onchange={{action 'checkExistingEmail'}} @disabled={{this.isSubmitting}}/>
                             </div>
                             {{#if this.emailAlreadyExists}}
                                 <p class="email-exists">This email already is subscribed to ZAP Updates. <a onclick={{action 'sendEmail'}}>Click here to receive an email to modify subscriptions.</a></p>
diff --git a/client/app/templates/subscription-update.hbs b/client/app/templates/subscription-update.hbs
index 49047ca4..31386558 100644
--- a/client/app/templates/subscription-update.hbs
+++ b/client/app/templates/subscription-update.hbs
@@ -9,7 +9,7 @@
                         <p></p>
                     <div class="update-type-question">To unsubscribe from a Community District or Citywide, uncheck the selected options below.</div>
                 </div>
-                    <SubscriptionForm @subscriptions={{this.model.subscriptions}} @email={{this.model.email}} @isUpdate={{true}} @id={{this.model.id}}>
+                    <SubscriptionForm @subscriptions={{this.model.subscriptions}} @email={{this.model.email}} @isUpdate={{true}} @id={{this.model.id}} @isSubmitting={{this.isSubmitting}} @setIsSubmitting={{this.setIsSubmitting}}>
                         <div class="subscribe-section">
                             <div class="subscribe-input-group">
                                 <label class="email-label">Email Address</label>

From 9f180daa09f2182b4bde999899013083f6ee36a7 Mon Sep 17 00:00:00 2001
From: pratishta <ypradhi9@gmail.com>
Date: Wed, 18 Dec 2024 15:14:15 -0500
Subject: [PATCH 3/3] Add newline at end of file

---
 client/app/controllers/subscription-update.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/app/controllers/subscription-update.js b/client/app/controllers/subscription-update.js
index a22a3b5f..9cd213d6 100644
--- a/client/app/controllers/subscription-update.js
+++ b/client/app/controllers/subscription-update.js
@@ -8,4 +8,4 @@ export default class SubscriptionUpdateController extends Controller {
     setIsSubmitting(isSubmittingValue) {
       this.set('isSubmitting', isSubmittingValue);
     }
-}
\ No newline at end of file
+}