From a904db9ff3b1b319c6b5d62431b02bf4bcf7414d Mon Sep 17 00:00:00 2001
From: horatio <horatiorosa@aol.com>
Date: Mon, 28 Oct 2024 22:00:09 -0400
Subject: [PATCH] passing borough and applicant type to form args working

---
 .../app/components/packages/projects/new.hbs  |  3 +-
 .../app/components/packages/projects/new.js   | 75 ++++++++++---------
 .../projects/projects-new-information.hbs     | 28 +++----
 client/app/routes/projects/new.js             |  4 +
 4 files changed, 59 insertions(+), 51 deletions(-)

diff --git a/client/app/components/packages/projects/new.hbs b/client/app/components/packages/projects/new.hbs
index 7d9a10c9..3ca49ed7 100644
--- a/client/app/components/packages/projects/new.hbs
+++ b/client/app/components/packages/projects/new.hbs
@@ -20,7 +20,8 @@
           Planning will contact you with the next steps.
         </p>
       </section>
-      <Packages::Projects::ProjectsNewInformation 
+      <Packages::Projects::ProjectsNewInformation
+        @project={{saveableProjectsNewForm.data}}
         @form={{saveableProjectsNewForm}} 
         @boroughOptions={{this.boroughOptions}} 
         @onBoroughChange={{this.handleBoroughChange}} 
diff --git a/client/app/components/packages/projects/new.js b/client/app/components/packages/projects/new.js
index e01d37ef..e36b1965 100644
--- a/client/app/components/packages/projects/new.js
+++ b/client/app/components/packages/projects/new.js
@@ -1,6 +1,5 @@
 import Component from '@glimmer/component';
 import { action } from '@ember/object';
-import { tracked } from '@glimmer/tracking';
 import { inject as service } from '@ember/service';
 import SubmittableProjectsNewForm from '../../../validations/submittable-projects-new-form';
 import { optionset } from '../../../helpers/optionset';
@@ -17,12 +16,6 @@ export default class ProjectsNewFormComponent extends Component {
   @service
   store;
 
-  @tracked
-  selectedBorough = null;
-
-  @tracked
-  selectedApplicantType = null;
-
   get boroughOptions() {
     return optionset(['project', 'boroughs', 'list']);
   }
@@ -32,29 +25,19 @@ export default class ProjectsNewFormComponent extends Component {
   }
 
   @action
-  handleBoroughChange(selectedBorough) {
-    console.log('Selected borough:', selectedBorough);
-
-    this.selectedBorough = selectedBorough;
-
-    if (this.args.form) {
-      this.args.form.set('borough', selectedBorough);
-    }
-  }
-
-  @action
-  handleApplicantTypeChange(selectedApplicantType) {
-    console.log('Selected Applicant Type:', selectedApplicantType);
-
-    this.selectedApplicantType = selectedApplicantType;
+  async submitPackage() {
+    /* eslint-disable no-console */
+    console.log('this.arg in submits', this.args);
+    console.log('any arg packages?', this.args.package);
+
+    const projectInformation = {
+      projectName: this.args.package.projectName,
+      borough: this.args.package.borough.code,
+      applicantType: this.args.package.applicantType.code,
+    };
 
-    if (this.args.form) {
-      this.args.form.set('dcpApplicantType', selectedApplicantType);
-    }
-  }
+    console.log('projectInformation', projectInformation);
 
-  @action
-  async submitPackage() {
     const primaryContactInput = {
       first: this.args.package.primaryContactFirstName,
       last: this.args.package.primaryContactLastName,
@@ -72,12 +55,14 @@ export default class ProjectsNewFormComponent extends Component {
     };
 
     const contactInputs = [primaryContactInput, applicantInput];
+
     try {
-      const contactPromises = contactInputs.map((contact) =>
-        this.store.queryRecord('contact', {
-          email: contact.email,
-          includeAllStatusCodes: true,
-        })
+      const contactPromises = contactInputs.map(
+        (contact) => this.store.queryRecord('contact',
+          {
+            email: contact.email,
+            includeAllStatusCodes: true,
+          }),
       );
 
       const contacts = await Promise.all(contactPromises);
@@ -95,9 +80,27 @@ export default class ProjectsNewFormComponent extends Component {
         }
         return contact;
       });
-      await Promise.all(verifiedContactPromises);
-    } catch {
-      console.log('Save new project package error');
+
+      const saveProjectInformation = () => {
+        const projectModel = this.store.createRecord('project', {
+          dcpProjectName: projectInformation.projectName,
+          dcpBorough: projectInformation.borough,
+          dcoApplicantType: projectInformation.applicantType,
+        });
+        return projectModel.save();
+      };
+
+      await Promise.all(
+        [
+          verifiedContactPromises,
+          saveProjectInformation,
+        ],
+      )
+        .then(
+          await this.args.package.submit(),
+        );
+    } catch (error) {
+      console.log('Save new project package error', error);
     }
   }
 }
diff --git a/client/app/components/packages/projects/projects-new-information.hbs b/client/app/components/packages/projects/projects-new-information.hbs
index 13b10922..c69c5328 100644
--- a/client/app/components/packages/projects/projects-new-information.hbs
+++ b/client/app/components/packages/projects/projects-new-information.hbs
@@ -4,7 +4,6 @@
     <Q.Label>
       Project Name
     </Q.Label>
-
     <form.Field 
       @attribute='projectName' 
       @type='text-input' 
@@ -18,18 +17,19 @@
     <Q.Label data-test-projects-new-borough-dropdown>
       Borough
     </Q.Label>
-    <PowerSelect
-      supportsDataTestProperties={{true}}
-      @attribute='borough'
-      @options={{@boroughOptions}}
-      @onChange={{@onBoroughChange}}
-      @selected={{@selectedBorough}} 
-      @searchField='label'
-      data-test-id='project-new-borough-dropdown'
-      @placeholder='select a borough' as |borough| >
-      {{borough.label}}
+    <PowerSelect 
+      supportsDataTestProperties={{true}} 
+      @attribute='borough' 
+      @options={{@boroughOptions}} 
+      @onChange={{fn (mut @project.borough)}}
+      @selected={{@project.borough}}  
+      @searchField='label' 
+      data-test-id='project-new-borough-dropdown' 
+      @placeholder='select a borough' as |borough|>
+       {{borough.label}}
     </PowerSelect>
   </Ui::Question>
+
   <Ui::Question @required={{true}} as |Q|>
     <Q.Label data-test-projects-new-applicant-type>
       Applicant Type
@@ -39,10 +39,10 @@
     </p>
     <PowerSelect
       supportsDataTestProperties={{true}}
-      @attribute='dcpApplicantType'
+      @attribute='applicantType'
       @options={{@applicantOptions}} 
-      @onChange={{@onApplicantTypeSelection}} 
-      @selected={{@selectedApplicantType}}
+      @onChange={{fn (mut @project.applicantType)}}
+      @selected={{@project.applicantType}}
       @searchField='label'
       data-test-id='projects-new-applicant-type'
       @placeholder='select applicant type' as |dcpApplicantType| >
diff --git a/client/app/routes/projects/new.js b/client/app/routes/projects/new.js
index d2673806..98fd5baf 100644
--- a/client/app/routes/projects/new.js
+++ b/client/app/routes/projects/new.js
@@ -6,8 +6,12 @@ export default class ProjectsNewRoute extends Route.extend(AuthenticatedRouteMix
   @service store;
 
   async model() {
+    // console.log(`store`, this.store);
+    // console.log(`model`, this.model);
     return {
       projectName: '',
+      borough: '',
+      applicantType: '',
       primaryContactFirstName: '',
       primaryContactLastName: '',
       primaryContactEmail: '',