diff --git a/.github/workflows/production.yml b/.github/workflows/production.yml index d85a680f..d86bc547 100644 --- a/.github/workflows/production.yml +++ b/.github/workflows/production.yml @@ -28,7 +28,7 @@ jobs: deploy-server: name: 🚀 Deploy server needs: test-client - environment: + environment: name: production url: https://applicants-api.nycplanningdigital.com runs-on: ubuntu-latest @@ -46,6 +46,7 @@ jobs: appdir: server env: HD_FEATURE_FLAG_SELF_SERVICE: ${{ vars.FEATURE_FLAG_SELF_SERVICE }} + HD_LETTER_FILETYPE_UUID: ${{ vars.LETTER_FILETYPE_UUID }} HD_ADO_PRINCIPAL: ${{ secrets.ADO_PRINCIPAL }} HD_AUTHORITY_HOST_URL: ${{ secrets.AUTHORITY_HOST_URL }} HD_CITYPAY_AGENCYID: ${{ secrets.CITYPAY_AGENCYID }} @@ -107,7 +108,7 @@ jobs: uses: actions/setup-node@v4 with: node-version: 12.x - - name: Install application dependencies + - name: Install application dependencies working-directory: client run: yarn install --immutable --immutable-cache --check-cache - name: Build client diff --git a/.github/workflows/qa.yml b/.github/workflows/qa.yml index b6c79aad..936cf67d 100644 --- a/.github/workflows/qa.yml +++ b/.github/workflows/qa.yml @@ -46,6 +46,7 @@ jobs: appdir: server env: HD_FEATURE_FLAG_SELF_SERVICE: ${{ vars.FEATURE_FLAG_SELF_SERVICE }} + HD_LETTER_FILETYPE_UUID: ${{ vars.LETTER_FILETYPE_UUID }} HD_ADO_PRINCIPAL: ${{ secrets.ADO_PRINCIPAL }} HD_AUTHORITY_HOST_URL: ${{ secrets.AUTHORITY_HOST_URL }} HD_CITYPAY_AGENCYID: ${{ secrets.CITYPAY_AGENCYID }} @@ -102,7 +103,7 @@ jobs: uses: actions/setup-node@v4 with: node-version: 12.x - - name: Install application dependencies + - name: Install application dependencies working-directory: client run: yarn install --immutable --immutable-cache --check-cache - name: Build client @@ -119,4 +120,3 @@ jobs: --site ${{secrets.NETLIFY_SITE_ID}} \ --auth ${{secrets.NETLIFY_AUTH_TOKEN}} \ --message "${{ github.event.head_commit.message }}" - diff --git a/.github/workflows/staging.yml b/.github/workflows/staging.yml index b2326ace..7fb12dcc 100644 --- a/.github/workflows/staging.yml +++ b/.github/workflows/staging.yml @@ -50,6 +50,7 @@ jobs: appdir: server env: HD_FEATURE_FLAG_SELF_SERVICE: ${{ vars.FEATURE_FLAG_SELF_SERVICE }} + HD_LETTER_FILETYPE_UUID: ${{ vars.LETTER_FILETYPE_UUID }} HD_ADO_PRINCIPAL: ${{ secrets.ADO_PRINCIPAL }} HD_AUTHORITY_HOST_URL: ${{ secrets.AUTHORITY_HOST_URL }} HD_CLIENT_ID: ${{ secrets.CLIENT_ID }} @@ -94,7 +95,7 @@ jobs: uses: actions/setup-node@v4 with: node-version: 12.x - - name: Install application dependencies + - name: Install application dependencies working-directory: client run: yarn install - name: Build client diff --git a/client/.gitignore b/client/.gitignore index 5108621b..3da6f6e2 100644 --- a/client/.gitignore +++ b/client/.gitignore @@ -1,12 +1,12 @@ # See https://help.github.com/ignore-files/ for more about ignoring files. # compiled output -/dist/ +**/dist /tmp/ # dependencies /bower_components/ -/node_modules/ +**/node_modules # misc /.env* diff --git a/client/app/components/packages/projects/new.js b/client/app/components/packages/projects/new.js deleted file mode 100644 index 9d68fd65..00000000 --- a/client/app/components/packages/projects/new.js +++ /dev/null @@ -1,64 +0,0 @@ -import Component from '@glimmer/component'; -import { action } from '@ember/object'; -import { inject as service } from '@ember/service'; -import SubmittableProjectsNewForm from '../../../validations/submittable-projects-new-form'; - -export default class ProjectsNewFormComponent extends Component { - validations = { - SubmittableProjectsNewForm, - }; - - @service - router; - - @service - store; - - @action - async submitPackage() { - const primaryContactInput = { - first: this.args.package.primaryContactFirstName, - last: this.args.package.primaryContactLastName, - email: this.args.package.primaryContactEmail, - phone: this.args.package.primaryContactPhone, - role: 'contact', - }; - - const applicantInput = { - first: this.args.package.applicantFirstName, - last: this.args.package.applicantLastName, - email: this.args.package.applicantEmail, - phone: this.args.package.applicantPhone, - role: 'applicant', - }; - - const contactInputs = [primaryContactInput, applicantInput]; - try { - const contactPromises = contactInputs - .map((contact) => this.store.queryRecord('contact', - { - email: contact.email, - includeAllStatusCodes: true, - })); - - const contacts = await Promise.all(contactPromises); - - const verifiedContactPromises = contacts.map((contact, index) => { - if (contact.id === '-1') { - const contactInput = contactInputs[index]; - const contactModel = this.store.createRecord('contact', { - firstname: contactInput.first, - lastname: contactInput.last, - emailaddress1: contactInput.email, - telephone1: contactInput.phone, - }); - return contactModel.save(); - } - return contact; - }); - await Promise.all(verifiedContactPromises); - } catch { - console.log('Save new project package error'); - } - } -} diff --git a/client/app/components/packages/projects/new.hbs b/client/app/components/projects/new.hbs similarity index 60% rename from client/app/components/packages/projects/new.hbs rename to client/app/components/projects/new.hbs index 589721b5..2ac761fe 100644 --- a/client/app/components/packages/projects/new.hbs +++ b/client/app/components/projects/new.hbs @@ -20,24 +20,44 @@ Planning will contact you with the next steps.

- + + + + + + + -
+ +
Confirm New Project Submission

Are you sure?

- Before submitting, ensure that your answers are accurate and complete, and that necessary attachments (including - the - signature form) have been uploaded. + Before submitting, ensure that your answers are accurate and complete, and that necessary attachments have been uploaded. If NYC Planning does not receive enough accurate information to provide guidance, the Lead Planner will notify you and request that this form be resubmitted with necessary materials, corrections, or + clarifications.

diff --git a/client/app/components/projects/new.js b/client/app/components/projects/new.js new file mode 100644 index 00000000..16e2f237 --- /dev/null +++ b/client/app/components/projects/new.js @@ -0,0 +1,116 @@ +import Component from '@glimmer/component'; +import { action } from '@ember/object'; +import { inject as service } from '@ember/service'; +import SubmittableProjectsNewForm from '../../validations/submittable-projects-new-form'; +import { optionset } from '../../helpers/optionset'; +import config from '../../config/environment'; + +export default class ProjectsNewFormComponent extends Component { + validations = { + SubmittableProjectsNewForm, + }; + + @service + router; + + @service + store; + + get boroughOptions() { + return optionset(['project', 'boroughs', 'list']); + } + + get applicantOptions() { + return optionset(['applicant', 'dcpApplicantType', 'list']); + } + + @action + async submitProject() { + const primaryContactInput = { + first: this.args.package.primaryContactFirstName, + last: this.args.package.primaryContactLastName, + email: this.args.package.primaryContactEmail, + phone: this.args.package.primaryContactPhone, + }; + + const applicantInput = { + first: this.args.package.applicantFirstName, + last: this.args.package.applicantLastName, + email: this.args.package.applicantEmail, + phone: this.args.package.applicantPhone, + }; + + const contactInputs = [primaryContactInput, applicantInput]; + + try { + const contactPromises = contactInputs.map((contact) => this.store.queryRecord('contact', { + email: contact.email, + includeAllStatusCodes: true, + })); + + const contacts = await Promise.all(contactPromises); + + const verifiedContactPromises = contacts.map((contact, index) => { + if (contact.id === '-1') { + const contactInput = contactInputs[index]; + const contactModel = this.store.createRecord('contact', { + firstname: contactInput.first, + lastname: contactInput.last, + emailaddress1: contactInput.email, + telephone1: contactInput.phone, + }); + return contactModel.save(); + } + return contact; + }); + + const [verifiedPrimaryContact, verifiedApplicant] = await Promise.all( + verifiedContactPromises, + ); + + const authSessionRaw = localStorage.getItem('ember_simple_auth-session'); + + if (authSessionRaw === null) { + throw new Error('unauthorized'); + } + const authSession = JSON.parse(authSessionRaw); + const { + authenticated: { access_token: accessToken }, + } = authSession; + if (accessToken === undefined) { + throw new Error('unauthorized'); + } + + const response = await fetch(`${config.host}/projects`, { + method: 'POST', + headers: { + Accept: 'application/json', + 'Content-Type': 'application/json', + Authorization: `Bearer ${accessToken}`, + }, + body: JSON.stringify({ + data: { + attributes: { + dcpProjectname: this.args.package.projectName, + dcpBorough: this.args.package.borough.code, + dcpApplicanttype: this.args.package.applicantType.code, + dcpProjectbrief: this.args.package.projectBrief, + _dcpApplicantadministratorCustomerValue: + verifiedPrimaryContact.id, + _dcpApplicantCustomerValue: verifiedApplicant.id, + }, + }, + }), + }); + const { data: project } = await response.json(); + + this.args.package.saveAttachedFiles(project.attributes['dcp-artifactsid']); + + this.router.transitionTo('project', project.id); + + } catch { + /* eslint-disable-next-line no-console */ + console.error('Error while creating project'); + } + } +} diff --git a/client/app/components/packages/projects/projects-new-information.hbs b/client/app/components/projects/projects-new-add-contacts.hbs similarity index 87% rename from client/app/components/packages/projects/projects-new-information.hbs rename to client/app/components/projects/projects-new-add-contacts.hbs index 50a16594..ca67a752 100644 --- a/client/app/components/packages/projects/projects-new-information.hbs +++ b/client/app/components/projects/projects-new-add-contacts.hbs @@ -1,19 +1,4 @@ {{#let @form as |form|}} - - - - Project Name - - - - -

Primary Contact

This contact is the person who will respond to public inquiries regarding the application.

@@ -70,13 +55,15 @@ id={{Q.questionId}} @showCounter={{true}} @maxlength="10" + placeholder='2125551212' />

Applicant

The owner, entity, or representative of the project described in this application.

- If using a company or organization, please split the name in the "First Name" and "Last Name" fields. For example, "NYC + If using a company or organization, please split the name in the "First Name" and "Last Name" fields. For example, + "NYC Planning" would be: First Name: NYC, Last Name: Planning

@@ -132,7 +119,8 @@ id={{Q.questionId}} @showCounter={{true}} @maxlength="10" + placeholder='2125551212' /> -{{/let}} \ No newline at end of file +{{/let}} diff --git a/client/app/components/projects/projects-new-attached-documents.hbs b/client/app/components/projects/projects-new-attached-documents.hbs new file mode 100644 index 00000000..7f66f035 --- /dev/null +++ b/client/app/components/projects/projects-new-attached-documents.hbs @@ -0,0 +1,22 @@ +{{#let @form as |form|}} +<@form.Section @title='Attached Documents'> +

+ Please attach the required items list on the + + Informational Interest Meeting checklist +  in one PDF document. The maximum + size for a document is 50MB. +

+ + + + + + +{{/let}} diff --git a/client/app/components/projects/projects-new-attachments.hbs b/client/app/components/projects/projects-new-attachments.hbs new file mode 100644 index 00000000..996aa3d5 --- /dev/null +++ b/client/app/components/projects/projects-new-attachments.hbs @@ -0,0 +1,132 @@ +
+
+ + Attachments + + +
    + {{#each @fileManager.existingFiles as |file idx|}} +
  • +
    +
    + + {{file.name}} + +
    +
    + + {{file.timeCreated}} + +
    +
    + +
    +
    +
    • + {{/each}} +
+ + {{#if (or @fileManager.filesToDelete @fileManager.filesToUpload.files)}} + {{#if @fileManager.existingFiles}} +
+ {{/if}} + +
+ To be + {{if @fileManager.filesToUpload.files 'uploaded'}} + {{if (and @fileManager.filesToDelete @fileManager.filesToUpload.files) '/'}} + {{if @fileManager.filesToDelete 'deleted'}} + when you save the project: +
+ {{/if}} + +
    + {{#each @fileManager.filesToDelete as |file idx|}} +
  • +
    +
    + + {{file.name}} + +
    +
    + + TO BE DELETED + +
    +
    + +
    +
    +
    • + {{/each}} +
+ +
    + {{#each @fileManager.filesToUpload.files as |file idx|}} +
  • +
    +
    + + {{file.name}} + +
    +
    + + TO BE ADDED + +
    +
    + +
    +
    +
    • + {{/each}} +
+ + + + Choose Files + + +

+ The size limit for each file is 50 MB. You can upload up to 1 GB of files. +

+
+
\ No newline at end of file diff --git a/client/app/components/projects/projects-new-attachments.js b/client/app/components/projects/projects-new-attachments.js new file mode 100644 index 00000000..840c1b80 --- /dev/null +++ b/client/app/components/projects/projects-new-attachments.js @@ -0,0 +1,49 @@ +import Component from '@glimmer/component'; +import { action } from '@ember/object'; + +/** + * This component wires a fileManager to the attachments UI. + * @param {Artifact Model} artifact + */ +export default class ProjectsNewAttachmentsComponent extends Component { + get fileManager() { + // should be an instance of FileManager + return this.args.fileManager; + } + + @action + markFileForDeletion(file) { + this.fileManager.markFileForDeletion(file); + + this.args.package.documents = this.fileManager.existingFiles; + } + + @action + unmarkFileForDeletion(file) { + this.fileManager.unMarkFileForDeletion(file); + } + + // This action doesn't perform any file selection. + // That part is automatically handled by the + // ember-file-upload addon. + // Here we manually increment the number of files to + // upload to update the fileManager isDirty state. + @action + trackFileForUpload() { + /* eslint-disable-next-line no-console */ + this.fileManager.trackFileForUpload(); + this.args.package.documents = [ + ...this.args.package.documents, + ...this.fileManager.filesToUpload.files, + ]; + } + + @action + deselectFileForUpload(file) { + this.fileManager.deselectFileForUpload(file); + + this.args.package.documents = this.args.package.documents.filter( + (document) => document !== file, + ); + } +} diff --git a/client/app/components/projects/projects-new-information.hbs b/client/app/components/projects/projects-new-information.hbs new file mode 100644 index 00000000..4f5f0b6e --- /dev/null +++ b/client/app/components/projects/projects-new-information.hbs @@ -0,0 +1,64 @@ +{{#let @form as |form|}} + + + + Project Name + + + + + + Borough + + + {{borough.label}} + + {{#if form.errors.borough}} + {{#each form.errors.borough.validation as |message|}} +
{{message}}
+ {{/each}} + {{/if}} + + + + Applicant Type + +

+ Identify if you represent a public agency or are a private entity. +

+ + {{dcpApplicantType.label}} + + {{#if form.errors.applicantType}} + {{#each form.errors.applicantType.validation as |message|}} +
{{message}} +
+ {{/each}} + {{/if}} + + +{{/let}} + diff --git a/client/app/components/projects/projects-new-project-description.hbs b/client/app/components/projects/projects-new-project-description.hbs new file mode 100644 index 00000000..c489e857 --- /dev/null +++ b/client/app/components/projects/projects-new-project-description.hbs @@ -0,0 +1,16 @@ +{{#let @form as |form|}} + + + + Please replace information in the brackets to the best of your ability. + + + + + +{{/let}} diff --git a/client/app/controllers/projects.js b/client/app/controllers/projects.js index 3311fd31..466c879c 100644 --- a/client/app/controllers/projects.js +++ b/client/app/controllers/projects.js @@ -1,5 +1,7 @@ import Controller from '@ember/controller'; import { sort } from '@ember/object/computed'; +import config from 'client/config/environment'; +import { tracked } from '@glimmer/tracking'; import { STATUSCODE, DCPVISIBILITY, @@ -20,19 +22,23 @@ export function packageIsToDo(projectPackages) { } export default class ProjectsController extends Controller { + @tracked + selfServiceFlagOn = config.featureFlagSelfService; // TODO: organize this business logic as computed properties on the projects model // Projects awaiting the applicant's submission // (includes active projects with packages that haven't been submitted) get toDoProjects() { // Check that at least ONE of the packages is currently editable - return this.model.filter((project) => packageIsToDo(project.pasPackages) - || packageIsToDo(project.rwcdsPackages) - || (packageIsToDo(project.landusePackages)) - || (packageIsToDo(project.easPackages)) - || (packageIsToDo(project.scopeOfWorkDraftPackages)) - || (packageIsToDo(project.eisPackages)) - || (packageIsToDo(project.technicalMemoPackages))); + return this.model.filter( + (project) => packageIsToDo(project.pasPackages) + || packageIsToDo(project.rwcdsPackages) + || packageIsToDo(project.landusePackages) + || packageIsToDo(project.easPackages) + || packageIsToDo(project.scopeOfWorkDraftPackages) + || packageIsToDo(project.eisPackages) + || packageIsToDo(project.technicalMemoPackages), + ); } // Projects in NYC Planning's hands diff --git a/client/app/helpers/optionset.js b/client/app/helpers/optionset.js index a5d3aa29..9b8b284c 100644 --- a/client/app/helpers/optionset.js +++ b/client/app/helpers/optionset.js @@ -38,6 +38,7 @@ const OPTIONSET_LOOKUP = { applicant: { dcpState: APPLICANT_OPTIONSETS.DCPSTATE, dcpType: APPLICANT_OPTIONSETS.DCPTYPE, + dcpApplicantType: APPLICANT_OPTIONSETS.DCP_APPLICANTTYPE, }, bbl: { boroughs: BBL_OPTIONSETS.BOROUGHS, @@ -62,6 +63,7 @@ const OPTIONSET_LOOKUP = { dcpVisibility: PROJECT_OPTIONSETS.DCPVISIBILITY, statuscode: PROJECT_OPTIONSETS.STATUSCODE, equityReportFields: YES_NO_UNSURE_SMALLINT, + boroughs: PROJECT_OPTIONSETS.BOROUGHS, }, landuseForm: { dcpOtherparties: YES_NO, @@ -78,22 +80,29 @@ const OPTIONSET_LOOKUP = { dcpHistoricdistrict: YES_NO, dcpDesignation: LANDUSE_FORM_OPTIONSETS.DCPDESIGNATION, dcpDisposition: LANDUSE_FORM_OPTIONSETS.DCPDISPOSITION, - dcpProjecthousingplanudaap: LANDUSE_FORM_OPTIONSETS.DCPPROJECTHOUSINGPLANUDAAP, + dcpProjecthousingplanudaap: + LANDUSE_FORM_OPTIONSETS.DCPPROJECTHOUSINGPLANUDAAP, dcpMannerofdisposition: LANDUSE_FORM_OPTIONSETS.DCPMANNEROFDISPOSITION, - dcpRestrictionsandconditionsdispositiontab: LANDUSE_FORM_OPTIONSETS.DCPRESTRICTIONSANDCONDITIONSDISPOSITIONTAB, + dcpRestrictionsandconditionsdispositiontab: + LANDUSE_FORM_OPTIONSETS.DCPRESTRICTIONSANDCONDITIONSDISPOSITIONTAB, dcpOfficespaceleaseopt: COMMON_OPTIONSETS.YES_NO_INTEGER, dcpAcquisitionopt: COMMON_OPTIONSETS.YES_NO_INTEGER, dcpSiteselectionopt: COMMON_OPTIONSETS.YES_NO_INTEGER, - dcpIndicatetypeoffacility: LANDUSE_FORM_OPTIONSETS.DCPINDICATETYPEOFFACILITY, + dcpIndicatetypeoffacility: + LANDUSE_FORM_OPTIONSETS.DCPINDICATETYPEOFFACILITY, dcpExistingfacilityproposedtoremainopt: COMMON_OPTIONSETS.YES_NO_INTEGER, - dcpExistingfacilityproposedtoremainandexpand: COMMON_OPTIONSETS.YES_NO_INTEGER, - dcpExistingfacilityreplacementinanewlocation: COMMON_OPTIONSETS.YES_NO_INTEGER, + dcpExistingfacilityproposedtoremainandexpand: + COMMON_OPTIONSETS.YES_NO_INTEGER, + dcpExistingfacilityreplacementinanewlocation: + COMMON_OPTIONSETS.YES_NO_INTEGER, dcpNewfacilityopt: COMMON_OPTIONSETS.YES_NO_INTEGER, dcpIsprojectlistedinstatementofneedsopt: COMMON_OPTIONSETS.YES_NO_INTEGER, - dcpDidboroughpresidentproposealternativesite: COMMON_OPTIONSETS.YES_NO_INTEGER, + dcpDidboroughpresidentproposealternativesite: + COMMON_OPTIONSETS.YES_NO_INTEGER, dcpLegalinstrument: COMMON_OPTIONSETS.YES_NO_UNSURE, dcpRelatedacquisitionofpropertyopt: COMMON_OPTIONSETS.YES_NO_INTEGER, - dcpOnlychangetheeliminationofamappedbutunimp: LANDUSE_FORM_OPTIONSETS.DCPONLYCHANGETHEELIMINATIONOFAMAPPEDBUTUNIMP, + dcpOnlychangetheeliminationofamappedbutunimp: + LANDUSE_FORM_OPTIONSETS.DCPONLYCHANGETHEELIMINATIONOFAMAPPEDBUTUNIMP, dcpYesmappedbutunimprovedstreetelimated: COMMON_OPTIONSETS.YES_NO, dcpEstablishstreetopt: COMMON_OPTIONSETS.YES_NO_INTEGER, dcpEstablishparkopt: COMMON_OPTIONSETS.YES_NO_INTEGER, @@ -110,10 +119,11 @@ const OPTIONSET_LOOKUP = { dcpChangestreetgradeopt: COMMON_OPTIONSETS.YES_NO_INTEGER, dcpChangeeasement: LANDUSE_FORM_OPTIONSETS.DCPEASEMENTS, dcpTypedisposition: LANDUSE_FORM_OPTIONSETS.DCPTYPEDISPOSITION, - dcpTotalzoningareatoberezoned: LANDUSE_FORM_OPTIONSETS.DCPTOTALZONINGAREATOBEREZONED, - dcpHaurbandevelopmentactionareaudaap: COMMON_OPTIONSETS.YES_NO_PICKLIST_CODE, + dcpTotalzoningareatoberezoned: + LANDUSE_FORM_OPTIONSETS.DCPTOTALZONINGAREATOBEREZONED, + dcpHaurbandevelopmentactionareaudaap: + COMMON_OPTIONSETS.YES_NO_PICKLIST_CODE, dcpHddispositionofurbanrenewalsite: COMMON_OPTIONSETS.YES_NO_PICKLIST_CODE, - }, rwcdsForm: { dcpHasprojectchangedsincesubmissionofthepas: YES_NO, @@ -148,19 +158,23 @@ const OPTIONSET_LOOKUP = { dcpApplicantispublicagencyactions: YES_NO, dcpIstheactiontoauthorizeorpermitanopenuse: YES_NO, dcpIstheactiontoauthorizeacommercial: YES_NO, - dcpIndicatewhetheractionisamodification: LANDUSE_ACTION_OPTIONSETS.DCPINDICATEWHETHERACTIONISAMODIFICATION, + dcpIndicatewhetheractionisamodification: + LANDUSE_ACTION_OPTIONSETS.DCPINDICATEWHETHERACTIONISAMODIFICATION, dcpModsubjectto197c: YES_NO, - dcpPreviouslyapprovedactioncode: LANDUSE_ACTION_OPTIONSETS.DCPPREVIOUSLYAPPROVEDACTIONCODE, + dcpPreviouslyapprovedactioncode: + LANDUSE_ACTION_OPTIONSETS.DCPPREVIOUSLYAPPROVEDACTIONCODE, actions: AFFECTED_ZONING_RESOLUTION_ACTION, }, sitedatahForm: { dcpSitetobedisposed: YES_NO, }, landuseGeography: { - dcpIsthesiteimprovedunimprovedorpartlyimp: LANDUSE_GEOGRAPHY_OPTIONSETS.DCPISTHESITEIMPROVEDUNIMPROVEDORPARTLYIMP, + dcpIsthesiteimprovedunimprovedorpartlyimp: + LANDUSE_GEOGRAPHY_OPTIONSETS.DCPISTHESITEIMPROVEDUNIMPROVEDORPARTLYIMP, }, zoningMapChange: { - dcpExistingzoningdistrictvaluenew: ZONING_MAP_CHANGE_OPTIONSETS.DCPEXISTINGZONINGDISTRICTVALUE, + dcpExistingzoningdistrictvaluenew: + ZONING_MAP_CHANGE_OPTIONSETS.DCPEXISTINGZONINGDISTRICTVALUE, }, relatedAction: { // Actually a boolean field in CRM, not picklist @@ -169,8 +183,10 @@ const OPTIONSET_LOOKUP = { ceqrInvoiceQuestionnaire: { dcpSquarefeet: CEQR_INVOICE_QUESTIONNAIRE_OPTIONSETS.SQUARE_FEET, dcpIsthesoleaapplicantagovtagency: COMMON_OPTIONSETS.YES_NO_PICKLIST_CODE, - dcpProjectspolelyconsistactionsnotmeasurable: COMMON_OPTIONSETS.YES_NO_PICKLIST_CODE, - dcpProjectmodificationtoapreviousapproval: COMMON_OPTIONSETS.YES_NO_PICKLIST_CODE, + dcpProjectspolelyconsistactionsnotmeasurable: + COMMON_OPTIONSETS.YES_NO_PICKLIST_CODE, + dcpProjectmodificationtoapreviousapproval: + COMMON_OPTIONSETS.YES_NO_PICKLIST_CODE, dcpRespectivedecrequired: COMMON_OPTIONSETS.YES_NO, }, }; diff --git a/client/app/models/artifact.js b/client/app/models/artifact.js index f6baabaf..56667272 100644 --- a/client/app/models/artifact.js +++ b/client/app/models/artifact.js @@ -33,6 +33,9 @@ export default class ArtifactModel extends Model { @belongsTo('project', { async: false }) project; + @belongsTo('project-new', { async: false }) + projectNew + @attr() dcpName; diff --git a/client/app/models/project-new.js b/client/app/models/project-new.js new file mode 100644 index 00000000..9e86c7fd --- /dev/null +++ b/client/app/models/project-new.js @@ -0,0 +1,124 @@ +import Model, { attr, belongsTo } from '@ember-data/model'; +import { inject as service } from '@ember/service'; +import { tracked } from '@glimmer/tracking'; +import FileManager from '../services/file-manager'; + +export default class ProjectNew extends Model { + createFileQueue() { + if (this.fileManager) { + this.fileManager.existingFiles = this.documents; + } else { + const fileQueue = this.fileQueue.create(`artifact${this.id}`); + + this.fileManager = new FileManager( + this.id, + 'artifact', + this.documents, + [], + fileQueue, + this.session + ); + } + } + + // Since file upload doesn't perform requests through + // an Ember Model save() process, it doesn't automatically + // hydrate the package.adapterError property. When an error occurs + // during upload we have to manually hydrate a custom error property + // to trigger the error box displayed to the user. + @tracked + fileUploadErrors = null; + + @service + session; + + @service + fileQueue; + + @belongsTo('projects', { async: false }) + projects; + + @attr('string', { + defaultValue: '', + }) + projectName; + + @attr('string', { + defaultValue: '', + }) + borough; + + @attr('string', { + defaultValue: '', + }) + applicantType; + + @attr('string', { + defaultValue: '', + }) + primaryContactFirstName; + + @attr('string', { + defaultValue: '', + }) + primaryContactLastName; + + @attr('string', { + defaultValue: '', + }) + primaryContactEmail; + + @attr('string', { + defaultValue: '', + }) + primaryContactPhone; + + @attr('string', { + defaultValue: '', + }) + applicantFirstName; + + @attr('string', { + defaultValue: '', + }) + applicantLastName; + + @attr('string', { + defaultValue: '', + }) + applicantEmail; + + @attr('string', { + defaultValue: '', + }) + applicantPhone; + + @attr('string', { + defaultValue: '', + }) + projectBrief; + + @attr('string', { + defaultValue: () => [], + }) + documents; + + async saveAttachedFiles(instanceId) { + try { + await this.fileManager.save(instanceId); + } catch (e) { + console.log('Error saving files: ', e); // eslint-disable-line no-console + + // See comment on the tracked fileUploadError property + // definition above. + this.fileUploadErrors = [ + { + code: 'UPLOAD_DOC_FAILED', + title: 'Failed to upload documents', + detail: + 'An error occured while uploading your documents. Please refresh and retry.', + }, + ]; + } + } +} diff --git a/client/app/models/project.js b/client/app/models/project.js index dcf7ae07..670dbab0 100644 --- a/client/app/models/project.js +++ b/client/app/models/project.js @@ -3,7 +3,7 @@ import { optionset } from '../helpers/optionset'; export default class ProjectModel extends Model { // The human-readable, descriptive name. - // e.g. "Marcus Garvey Blvd Project" + // e.g. 'Marcus Garvey Blvd Project' @attr dcpProjectname; // The CRM Project 5-letter ID. @@ -85,18 +85,22 @@ export default class ProjectModel extends Model { @hasMany('milestone', { async: false }) milestones; - get isDirty () { + get isDirty() { return this.hasDirtyAttributes || (this.artifact && this.artifact.isDirty); } get publicStatusGeneralPublicProject() { - const isGeneralPublic = this.dcpVisibility === optionset(['project', 'dcpVisibility', 'code', 'GENERAL_PUBLIC']); + const isGeneralPublic = this.dcpVisibility + === optionset(['project', 'dcpVisibility', 'code', 'GENERAL_PUBLIC']); return this.dcpPublicstatus && isGeneralPublic; } get pasPackages() { const pasPackages = this.packages - .filter((projectPackage) => projectPackage.dcpPackagetype === optionset(['package', 'dcpPackagetype', 'code', 'PAS_PACKAGE'])) + .filter( + (projectPackage) => projectPackage.dcpPackagetype + === optionset(['package', 'dcpPackagetype', 'code', 'PAS_PACKAGE']), + ) .sortBy('dcpPackageversion') .reverse(); @@ -105,7 +109,10 @@ export default class ProjectModel extends Model { get rwcdsPackages() { const rwcdsPackages = this.packages - .filter((projectPackage) => projectPackage.dcpPackagetype === optionset(['package', 'dcpPackagetype', 'code', 'RWCDS'])) + .filter( + (projectPackage) => projectPackage.dcpPackagetype + === optionset(['package', 'dcpPackagetype', 'code', 'RWCDS']), + ) .sortBy('dcpPackageversion') .reverse(); @@ -124,7 +131,10 @@ export default class ProjectModel extends Model { get draftLandusePackages() { const landusePackages = this.packages - .filter((projectPackage) => projectPackage.dcpPackagetype === optionset(['package', 'dcpPackagetype', 'code', 'DRAFT_LU_PACKAGE'])) + .filter( + (projectPackage) => projectPackage.dcpPackagetype + === optionset(['package', 'dcpPackagetype', 'code', 'DRAFT_LU_PACKAGE']), + ) .sortBy('dcpPackageversion') .reverse(); @@ -133,7 +143,10 @@ export default class ProjectModel extends Model { get filedLandusePackages() { const landusePackages = this.packages - .filter((projectPackage) => projectPackage.dcpPackagetype === optionset(['package', 'dcpPackagetype', 'code', 'FILED_LU_PACKAGE'])) + .filter( + (projectPackage) => projectPackage.dcpPackagetype + === optionset(['package', 'dcpPackagetype', 'code', 'FILED_LU_PACKAGE']), + ) .sortBy('dcpPackageversion') .reverse(); @@ -142,23 +155,26 @@ export default class ProjectModel extends Model { get postCertLUPackages() { return this.packages - .filter((projectPackage) => projectPackage.dcpPackagetype === optionset(['package', 'dcpPackagetype', 'code', 'POST_CERT_LU'])) + .filter( + (projectPackage) => projectPackage.dcpPackagetype + === optionset(['package', 'dcpPackagetype', 'code', 'POST_CERT_LU']), + ) .sortBy('dcpPackageversion') .reverse(); } get easPackages() { - const easPackages = [ - ...this.filedEasPackages, - ...this.draftEasPackages, - ]; + const easPackages = [...this.filedEasPackages, ...this.draftEasPackages]; return easPackages; } get draftEasPackages() { const easPackages = this.packages - .filter((projectPackage) => projectPackage.dcpPackagetype === optionset(['package', 'dcpPackagetype', 'code', 'DRAFT_EAS'])) + .filter( + (projectPackage) => projectPackage.dcpPackagetype + === optionset(['package', 'dcpPackagetype', 'code', 'DRAFT_EAS']), + ) .sortBy('dcpPackageversion') .reverse(); @@ -167,7 +183,10 @@ export default class ProjectModel extends Model { get filedEasPackages() { const easPackages = this.packages - .filter((projectPackage) => projectPackage.dcpPackagetype === optionset(['package', 'dcpPackagetype', 'code', 'FILED_EAS'])) + .filter( + (projectPackage) => projectPackage.dcpPackagetype + === optionset(['package', 'dcpPackagetype', 'code', 'FILED_EAS']), + ) .sortBy('dcpPackageversion') .reverse(); @@ -176,7 +195,15 @@ export default class ProjectModel extends Model { get scopeOfWorkDraftPackages() { const scopeOfWorkDraftPackages = this.packages - .filter((projectPackage) => projectPackage.dcpPackagetype === optionset(['package', 'dcpPackagetype', 'code', 'DRAFT_SCOPE_OF_WORK'])) + .filter( + (projectPackage) => projectPackage.dcpPackagetype + === optionset([ + 'package', + 'dcpPackagetype', + 'code', + 'DRAFT_SCOPE_OF_WORK', + ]), + ) .sortBy('dcpPackageversion') .reverse(); @@ -184,19 +211,17 @@ export default class ProjectModel extends Model { } get eisPackages() { - const eisPackages = [ - ...this.feisPackages, - ...this.deisPackages, - ]; + const eisPackages = [...this.feisPackages, ...this.deisPackages]; return eisPackages; } get deisPackages() { const eisPackages = this.packages - .filter((projectPackage) => projectPackage.dcpPackagetype === optionset( - ['package', 'dcpPackagetype', 'code', 'PDEIS'], - )) + .filter( + (projectPackage) => projectPackage.dcpPackagetype + === optionset(['package', 'dcpPackagetype', 'code', 'PDEIS']), + ) .sortBy('dcpPackageversion') .reverse(); @@ -205,9 +230,10 @@ export default class ProjectModel extends Model { get feisPackages() { const eisPackages = this.packages - .filter((projectPackage) => projectPackage.dcpPackagetype === optionset( - ['package', 'dcpPackagetype', 'code', 'EIS'], - )) + .filter( + (projectPackage) => projectPackage.dcpPackagetype + === optionset(['package', 'dcpPackagetype', 'code', 'EIS']), + ) .sortBy('dcpPackageversion') .reverse(); @@ -216,9 +242,10 @@ export default class ProjectModel extends Model { get technicalMemoPackages() { const technicalMemoPackages = this.packages - .filter((projectPackage) => projectPackage.dcpPackagetype === optionset( - ['package', 'dcpPackagetype', 'code', 'TECHNICAL_MEMO'], - )) + .filter( + (projectPackage) => projectPackage.dcpPackagetype + === optionset(['package', 'dcpPackagetype', 'code', 'TECHNICAL_MEMO']), + ) .sortBy('dcpPackageversion') .reverse(); @@ -227,9 +254,10 @@ export default class ProjectModel extends Model { get workingPackages() { return this.packages - .filter((projectPackage) => projectPackage.dcpPackagetype === optionset( - ['package', 'dcpPackagetype', 'code', 'WORKING_PACKAGE'], - )) + .filter( + (projectPackage) => projectPackage.dcpPackagetype + === optionset(['package', 'dcpPackagetype', 'code', 'WORKING_PACKAGE']), + ) .sortBy('dcpPackageversion') .reverse(); } diff --git a/client/app/optionsets/applicant.js b/client/app/optionsets/applicant.js index 44da738f..72843b16 100644 --- a/client/app/optionsets/applicant.js +++ b/client/app/optionsets/applicant.js @@ -248,9 +248,21 @@ export const DCPSTATE = { }, }; +export const DCP_APPLICANTTYPE = { + OTHER_PUBLIC_AGENCY: { + label: 'Other Public Agency', + code: 717170001, + }, + PRIVATE: { + label: 'Private', + code: 717170002, + }, +}; + const APPLICANT_OPTIONSETS = { DCPTYPE, DCPSTATE, + DCP_APPLICANTTYPE, }; export default APPLICANT_OPTIONSETS; diff --git a/client/app/optionsets/project.js b/client/app/optionsets/project.js index 17687208..0393eae6 100644 --- a/client/app/optionsets/project.js +++ b/client/app/optionsets/project.js @@ -71,10 +71,34 @@ export const STATUSCODE = { }, }; +export const BOROUGHS = { + BRONX: { + code: 717170000, + label: 'Bronx', + }, + BROOKLYN: { + code: 717170002, + label: 'Brooklyn', + }, + MANHATTAN: { + code: 717170001, + label: 'Manhattan', + }, + QUEENS: { + code: 717170003, + label: 'Queens', + }, + STATEN_ISLAND: { + code: 717170004, + label: 'Staten Island', + }, +}; + const PROJECT_OPTIONSETS = { DCPPUBLICSTATUS, DCPVISIBILITY, STATUSCODE, + BOROUGHS, }; export default PROJECT_OPTIONSETS; diff --git a/client/app/routes/projects/new.js b/client/app/routes/projects/new.js index d2673806..f49105d6 100644 --- a/client/app/routes/projects/new.js +++ b/client/app/routes/projects/new.js @@ -1,21 +1,21 @@ import Route from '@ember/routing/route'; -import { inject as service } from '@ember/service'; import AuthenticatedRouteMixin from 'ember-simple-auth/mixins/authenticated-route-mixin'; +import { inject as service } from '@ember/service'; + +export default class ProjectsNewRoute extends Route.extend( + AuthenticatedRouteMixin, +) { + authenticationRoute = '/'; -export default class ProjectsNewRoute extends Route.extend(AuthenticatedRouteMixin) { - @service store; + @service + store async model() { - return { - projectName: '', - primaryContactFirstName: '', - primaryContactLastName: '', - primaryContactEmail: '', - primaryContactPhone: '', - applicantFirstName: '', - applicantLastName: '', - applicantEmail: '', - applicantPhone: '', - }; + const projectsNewForm = this.store.createRecord('project-new'); + + projectsNewForm.id = `new${self.crypto.randomUUID()}`; + projectsNewForm.createFileQueue(); + + return projectsNewForm; } } diff --git a/client/app/services/file-manager.js b/client/app/services/file-manager.js index c516b586..2bfc26dc 100644 --- a/client/app/services/file-manager.js +++ b/client/app/services/file-manager.js @@ -12,7 +12,10 @@ export default class FileManager { filesToUpload, // EmberFileUpload Queue Object session, ) { - console.assert(entityType === 'package' || entityType === 'artifact', "entityType must be 'package' or 'artifact'"); + console.assert( + entityType === 'package' || entityType === 'artifact', + "entityType must be 'package' or 'artifact'" + ); this.recordId = recordId; this.entityType = entityType; @@ -61,18 +64,23 @@ export default class FileManager { this.numFilesToUpload -= 1; } - async uploadFiles() { + async uploadFiles(instanceId = this.recordId) { for (let i = 0; i < this.filesToUpload.files.length; i += 1) { - await this.filesToUpload.files[i].upload(`${ENV.host}/documents/${this.entityType}`, { // eslint-disable-line - fileKey: 'file', - headers: { - Authorization: `Bearer ${this.session.data.authenticated.access_token}`, - }, - data: { - instanceId: this.recordId, - entityName: this.entityType === 'artifact' ? 'dcp_artifacts' : 'dcp_package', - }, - }); + await this.filesToUpload.files[i].upload( + `${ENV.host}/documents/${this.entityType}`, + { + // eslint-disable-line + fileKey: 'file', + headers: { + Authorization: `Bearer ${this.session.data.authenticated.access_token}`, + }, + data: { + instanceId, + entityName: + this.entityType === 'artifact' ? 'dcp_artifacts' : 'dcp_package', + }, + } + ); } } @@ -82,21 +90,26 @@ export default class FileManager { // TODO: If this is not possible, rework this to be a // POST request to a differently named endpoint, like // deleteDocument - return Promise.all(this.filesToDelete.map((file) => fetch( - `${ENV.host}/documents?serverRelativeUrl=${file.serverRelativeUrl}`, { - method: 'DELETE', - credentials: 'include', - headers: { - 'Content-Type': 'application/json', - Authorization: `Bearer ${this.session.data.authenticated.access_token}`, - }, - }, - ))); + return Promise.all( + this.filesToDelete.map((file) => + fetch( + `${ENV.host}/documents?serverRelativeUrl=${file.serverRelativeUrl}`, + { + method: 'DELETE', + credentials: 'include', + headers: { + 'Content-Type': 'application/json', + Authorization: `Bearer ${this.session.data.authenticated.access_token}`, + }, + } + ) + ) + ); } - async save() { + async save(instanceId) { // See TODO at top of this file. - await this.uploadFiles(); + await this.uploadFiles(instanceId); await this.deleteFiles(); diff --git a/client/app/templates/project.hbs b/client/app/templates/project.hbs index e34e0560..0bc7a924 100644 --- a/client/app/templates/project.hbs +++ b/client/app/templates/project.hbs @@ -23,10 +23,10 @@

Status

- - {{#each + + {{#each (filter-by 'statuscode' 'In Progress' @model.milestones) - as |milestone|}} + as |milestone|}} {{milestone.dcpMilestoneValue}} {{/each}}
@@ -50,13 +50,13 @@

- Milestone planned completion dates are an estimate based on the amount of time that is - generally expected for the Department to review materials submitted to it, and for the - applicant to prepare and submit those materials for review. This date is not guaranteed, - may not accurately reflect timelines for review, and is subject to change. - Note that all Filed EAS or DEIS review periods are dependent on other City agencies' - reviews of materials and are less predictable as a result. Agency’s target duration are the - goal durations for milestones of this type for all projects. For the most accurate information + Milestone planned completion dates are an estimate based on the amount of time that is + generally expected for the Department to review materials submitted to it, and for the + applicant to prepare and submit those materials for review. This date is not guaranteed, + may not accurately reflect timelines for review, and is subject to change. + Note that all Filed EAS or DEIS review periods are dependent on other City agencies' + reviews of materials and are less predictable as a result. Agency’s target duration are the + goal durations for milestones of this type for all projects. For the most accurate information concerning timelines and review, please contact the lead DCP planner assigned to this project.

@@ -115,7 +115,7 @@

Milestones

-

*=Planned completion dates may be different from the agency’s target duration based +

*=Planned completion dates may be different from the agency’s target duration based on application quality, complexity, and overall volume awaiting review.

{{! end left/main column }} +
+ {{#if this.selfServiceFlagOn}} +

+ To initiate a new project engagement with the Department, complete this form with as many + + checklist items + as possible. +

+ + + + + {{/if}} diff --git a/client/app/templates/projects/new.hbs b/client/app/templates/projects/new.hbs index 36675f77..47160455 100644 --- a/client/app/templates/projects/new.hbs +++ b/client/app/templates/projects/new.hbs @@ -3,7 +3,7 @@ - diff --git a/client/app/validations/submittable-projects-new-form.js b/client/app/validations/submittable-projects-new-form.js index a532a024..14603a18 100644 --- a/client/app/validations/submittable-projects-new-form.js +++ b/client/app/validations/submittable-projects-new-form.js @@ -114,4 +114,27 @@ export default { message: 'This field is required', }), ], + borough: [ + validatePresence({ + presence: true, + message: 'Please select a Borough', + }), + ], + applicantType: [ + validatePresence({ + presence: true, + message: 'Please select an Applicant Type', + }), + ], + projectBrief: [ + validateLength({ + min: 0, + max: 500, + message: 'Text is too long (max {max} characters)', + }), + validatePresence({ + presence: true, + message: 'This field is required', + }), + ], }; diff --git a/server/package.json b/server/package.json index 0640bdef..4965c122 100644 --- a/server/package.json +++ b/server/package.json @@ -72,8 +72,8 @@ "@types/superagent-proxy": "^3.0.4", "@types/supertest": "^6.0.2", "@types/underscore": "^1.11.15", - "@typescript-eslint/eslint-plugin": "^2.23.0", - "@typescript-eslint/parser": "^2.23.0", + "@typescript-eslint/eslint-plugin": "^5.61.0", + "@typescript-eslint/parser": "^5.61.0", "eslint": "^6.8.0", "eslint-config-prettier": "^6.10.0", "eslint-plugin-import": "^2.20.1", @@ -85,7 +85,7 @@ "ts-loader": "^6.2.1", "ts-node": "^10.9.2", "tsconfig-paths": "^3.9.0", - "typescript": "^4.2.3" + "typescript": "^4.9.5" }, "jest": { "moduleNameMapper": { diff --git a/server/src/artifacts/artifacts.service.ts b/server/src/artifacts/artifacts.service.ts index 5d732ff1..d5d2fda9 100644 --- a/server/src/artifacts/artifacts.service.ts +++ b/server/src/artifacts/artifacts.service.ts @@ -7,6 +7,7 @@ import { ConfigService } from '../config/config.service'; @Injectable() export class ArtifactService { rerFiletypeUuid = ''; + letterFiletypeUuid= ''; constructor( private readonly crmService: CrmService, @@ -14,6 +15,7 @@ export class ArtifactService { private readonly config: ConfigService, ) { this.rerFiletypeUuid = this.config.get('RER_FILETYPE_UUID'); + this.letterFiletypeUuid = this.config.get('LETTER_FILETYPE_UUID'); } public async createEquityReport(projectId: string) { @@ -45,6 +47,35 @@ export class ArtifactService { return newArtifact; } + public async createProjectInitiationArtifacts(projectId: string) { + let newArtifact = null; + + try { + newArtifact = this.crmService.create('dcp_artifactses', { + dcp_name: `Project Initiation`, + dcp_isdcpinternal: false, + dcp_filecreator: 717170000, // Applicant + dcp_filecategory: 717170006, // Other + dcp_visibility: 717170002, // Applicant Only + 'dcp_applicantfiletype@odata.bind': `/dcp_filetypes(${this.letterFiletypeUuid})`, + ...(projectId + ? { 'dcp_project@odata.bind': `/dcp_projects(${projectId})` } + : {}), + }); + } catch (e) { + throw new HttpException( + { + code: 'CREATE_PROJECT_ARTIFACT_ERROR', + title: `Unable to create Project Initiation Artifact dcp_artifactses entity for project with UUID ${projectId}`, + detail: e, + }, + HttpStatus.INTERNAL_SERVER_ERROR, + ); + } + + return newArtifact; + } + async getArtifactSharepointDocuments(relativeUrl: string, dcp_name: string) { if (relativeUrl) { try { diff --git a/server/src/config/config.service.ts b/server/src/config/config.service.ts index f4a9d218..a94a8f97 100644 --- a/server/src/config/config.service.ts +++ b/server/src/config/config.service.ts @@ -36,7 +36,7 @@ export class ConfigService { get featureFlag() { return { - selfService: this.envConfig["FEATURE_FLAG_SELF_SERVICE"] === "ON" - } + selfService: this.envConfig['FEATURE_FLAG_SELF_SERVICE'] === 'ON', + }; } } diff --git a/server/src/contact/contact.controller.ts b/server/src/contact/contact.controller.ts index 3c08a286..b0974d1a 100644 --- a/server/src/contact/contact.controller.ts +++ b/server/src/contact/contact.controller.ts @@ -42,7 +42,12 @@ export class ContactController { ) {} @Get('/') - async getContact(@Session() session, @Query('me') me, @Query('email') email, @Query('includeAllStatusCodes') includeAllStatusCodes = 'false') { + async getContact( + @Session() session, + @Query('me') me, + @Query('email') email, + @Query('includeAllStatusCodes') includeAllStatusCodes = 'false', + ) { // if this is a self-check, lookup the contact id from session if (me) { const { contactId } = session; @@ -56,7 +61,10 @@ export class ContactController { return this.contactService.findOneById(contactId); } } else { - return this.contactService.findOneByEmail(email, includeAllStatusCodes === 'true'); + return this.contactService.findOneByEmail( + email, + includeAllStatusCodes === 'true', + ); } } @@ -64,7 +72,7 @@ export class ContactController { @UsePipes(JsonApiDeserializePipe) @Post('/') async create(@Body() body) { - return await this.contactService.create(body); + return await this.contactService.create(body); } @UseGuards(AuthenticateGuard) diff --git a/server/src/projects/projects.attrs.ts b/server/src/projects/projects.attrs.ts index ee1f9703..aa4e73b0 100644 --- a/server/src/projects/projects.attrs.ts +++ b/server/src/projects/projects.attrs.ts @@ -7,7 +7,9 @@ export const PROJECT_ATTRS = [ 'dcp_visibility', 'dcp_publicstatus', 'dcp_projectbrief', + 'dcp_applicanttype', '_dcp_applicant_customer_value', + '_dcp_applicantadministrator_customer_value', 'dcp_dcp_project_dcp_projectapplicant_Project', 'dcp_nonresatleast50000', diff --git a/server/src/projects/projects.controller.ts b/server/src/projects/projects.controller.ts index c5f7dc83..9c6370c7 100644 --- a/server/src/projects/projects.controller.ts +++ b/server/src/projects/projects.controller.ts @@ -38,6 +38,7 @@ import { INVOICE_ATTRS } from '../invoices/invoices.attrs'; 'team-members', 'contacts', 'milestones', + 'dcp_artifactsid', ], packages: { ref: 'dcp_packageid', @@ -131,17 +132,25 @@ export class ProjectsController { @Post('/') async createProject(@Body() body) { + const allowedAttrs = pick(body, PROJECT_ATTRS) as { + dcp_projectname: string; + dcp_borough: string; + dcp_applicanttype: string; + dcp_projectbrief: string; + _dcp_applicant_customer_value: string; + _dcp_applicantadministrator_customer_value: string; + }; if (!this.config.featureFlag.selfService) { - throw new HttpException({ - code: "NOT_FOUND", - title: "Not found", - }, - HttpStatus.NOT_FOUND) + throw new HttpException( + { + code: 'NOT_FOUND', + title: 'Not found', + }, + HttpStatus.NOT_FOUND, + ); } - return { - ...body - } + return await this.projectsService.create(allowedAttrs); } @Get('/:id') diff --git a/server/src/projects/projects.module.ts b/server/src/projects/projects.module.ts index 97e4eb17..48b3b693 100644 --- a/server/src/projects/projects.module.ts +++ b/server/src/projects/projects.module.ts @@ -6,10 +6,12 @@ import { ConfigModule } from '../config/config.module'; import { AuthModule } from '../auth/auth.module'; import { ProjectsController } from './projects.controller'; import { ProjectApplicantController } from './project-applicants/project-applicant.controller'; +import { ArtifactService } from '../artifacts/artifacts.service'; +import { SharepointModule } from '../sharepoint/sharepoint.module'; @Module({ - imports: [CrmModule, ConfigModule, ContactModule, AuthModule], - providers: [ProjectsService], + imports: [CrmModule, SharepointModule, ConfigModule, ContactModule, AuthModule], + providers: [ProjectsService, ArtifactService], exports: [ProjectsService], controllers: [ProjectsController, ProjectApplicantController], }) diff --git a/server/src/projects/projects.service.ts b/server/src/projects/projects.service.ts index 00c38071..4d9b2ce5 100644 --- a/server/src/projects/projects.service.ts +++ b/server/src/projects/projects.service.ts @@ -4,6 +4,7 @@ import { NycidService } from '../contact/nycid/nycid.service'; import { CrmService } from '../crm/crm.service'; import { overwriteCodesWithLabels } from '../_utils/overwrite-codes-with-labels'; import { MILESTONE_ATTRS, MILESTONE_NON_DATE_ATTRS } from './projects.attrs'; +import { ArtifactService } from '../artifacts/artifacts.service'; const APPLICANT_ACTIVE_STATUS_CODE = 1; const PROJECT_ACTIVE_STATE_CODE = 0; @@ -52,6 +53,7 @@ export class ProjectsService { constructor( private readonly crmService: CrmService, private readonly nycidService: NycidService, + private readonly artifactService: ArtifactService, ) {} public async findManyByContactId(contactId: string) { @@ -64,7 +66,7 @@ export class ProjectsService { any(o: o/_dcp_applicant_customer_value eq '${contactId}' and o/statuscode eq ${APPLICANT_ACTIVE_STATUS_CODE} - ) + ) and ( dcp_visibility eq ${PROJECT_VISIBILITY_APPLICANT_ONLY} or dcp_visibility eq ${PROJECT_VISIBILITY_GENERAL_PUBLIC} @@ -95,6 +97,51 @@ export class ProjectsService { } } + /** + * Create a project, including the contact id for the primary contact and applicant + * Lead planner is automatically assigned by CRM based on the borough + * + * @param body + */ + public async create(attributes: { + dcp_projectname: string; + dcp_borough: string; + dcp_applicanttype: string; + dcp_projectbrief: string; + _dcp_applicant_customer_value: string; + _dcp_applicantadministrator_customer_value: string; + }) { + try { + const data = { + dcp_projectname: attributes.dcp_projectname, + dcp_borough: attributes.dcp_borough, + dcp_applicanttype: attributes.dcp_applicanttype, + dcp_projectbrief: attributes.dcp_projectbrief, + 'dcp_applicant_customer_contact@odata.bind': `/contacts(${attributes._dcp_applicant_customer_value})`, + 'dcp_applicantadministrator_customer_contact@odata.bind': `/contacts(${attributes._dcp_applicantadministrator_customer_value})`, + }; + const { dcp_projectid } = await this.crmService.create( + 'dcp_projects', + data, + ); + const { dcp_artifactsid } = + await this.artifactService.createProjectInitiationArtifacts( + dcp_projectid, + ); + + return { + dcp_projectid, + dcp_artifactsid, + }; + } catch (e) { + console.debug('error creating project', e); + throw new HttpException( + 'Unable to create project', + HttpStatus.INTERNAL_SERVER_ERROR, + ); + } + } + /** * Gets a Project for given dcp_projectid and contactid * @@ -123,19 +170,19 @@ export class ProjectsService { $filter= statuscode eq ${APPLICANT_ACTIVE_STATUS_CODE} ), dcp_dcp_project_dcp_dcpprojectteam_project, - dcp_dcp_project_dcp_package_project( - $filter= - ( - dcp_visibility eq ${PACKAGE_VISIBILITY.APPLICANT_ONLY} - or dcp_visibility eq ${PACKAGE_VISIBILITY.GENERAL_PUBLIC} - ) - and ( - statuscode eq ${PACKAGE_STATUSCODE.PACKAGE_PREPARATION} - or statuscode eq ${PACKAGE_STATUSCODE.SUBMITTED} - or statuscode eq ${PACKAGE_STATUSCODE.UNDER_REVIEW} - or statuscode eq ${PACKAGE_STATUSCODE.REVIEWED_NO_REVISIONS_REQUIRED} - or statuscode eq ${PACKAGE_STATUSCODE.REVIEWED_REVISION_REQUIRED} - ) + dcp_dcp_project_dcp_package_project( + $filter= + ( + dcp_visibility eq ${PACKAGE_VISIBILITY.APPLICANT_ONLY} + or dcp_visibility eq ${PACKAGE_VISIBILITY.GENERAL_PUBLIC} + ) + and ( + statuscode eq ${PACKAGE_STATUSCODE.PACKAGE_PREPARATION} + or statuscode eq ${PACKAGE_STATUSCODE.SUBMITTED} + or statuscode eq ${PACKAGE_STATUSCODE.UNDER_REVIEW} + or statuscode eq ${PACKAGE_STATUSCODE.REVIEWED_NO_REVISIONS_REQUIRED} + or statuscode eq ${PACKAGE_STATUSCODE.REVIEWED_REVISION_REQUIRED} + ) ), dcp_dcp_project_dcp_projectmilestone_project( $select=${MILESTONE_ATTRS.join(',')}; diff --git a/server/src/provider/msal.provider.ts b/server/src/provider/msal.provider.ts index 2f3d1fa4..5a9d6559 100644 --- a/server/src/provider/msal.provider.ts +++ b/server/src/provider/msal.provider.ts @@ -17,10 +17,10 @@ export const MsalProvider: FactoryProvider = { 'SHAREPOINT_CLIENT_SECRET', ); const siteId: string | undefined = config.get('SHAREPOINT_SITE_ID'); - if(tenantId === undefined) throw new Error("Missing tenant id") - if(clientId === undefined) throw new Error("Missing client id") - if(clientSecret === undefined) throw new Error("Missing client secret") - if(siteId === undefined) throw new Error("Missing site id") + if (tenantId === undefined) throw new Error('Missing tenant id'); + if (clientId === undefined) throw new Error('Missing client id'); + if (clientSecret === undefined) throw new Error('Missing client secret'); + if (siteId === undefined) throw new Error('Missing site id'); const cca = new msal.ConfidentialClientApplication({ auth: { diff --git a/server/yarn.lock b/server/yarn.lock index 1d218e73..e16659ff 100644 --- a/server/yarn.lock +++ b/server/yarn.lock @@ -372,6 +372,18 @@ dependencies: "@jridgewell/trace-mapping" "0.3.9" +"@eslint-community/eslint-utils@^4.2.0": + version "4.4.1" + resolved "https://registry.yarnpkg.com/@eslint-community/eslint-utils/-/eslint-utils-4.4.1.tgz#d1145bf2c20132d6400495d6df4bf59362fd9d56" + integrity sha512-s3O3waFUrMV8P/XaF/+ZTp1X9XBZW1a4B97ZnjQF2KYWaFD2A8KyFBsrsfSjEmjn3RGWAIuvlneuZm3CUK3jbA== + dependencies: + eslint-visitor-keys "^3.4.3" + +"@eslint-community/regexpp@^4.4.0": + version "4.12.1" + resolved "https://registry.yarnpkg.com/@eslint-community/regexpp/-/regexpp-4.12.1.tgz#cfc6cffe39df390a3841cde2abccf92eaa7ae0e0" + integrity sha512-CCZCDJuduB9OUkFkY2IgppNZMi2lBQgD2qzwXkEia16cge2pijY/aXi96CJMquDMn3nJdlPV1A5KrJEXwfLNzQ== + "@istanbuljs/load-nyc-config@^1.0.0": version "1.1.0" resolved "https://registry.yarnpkg.com/@istanbuljs/load-nyc-config/-/load-nyc-config-1.1.0.tgz#fd3db1d59ecf7cf121e80650bb86712f9b55eced" @@ -708,6 +720,27 @@ optional "0.1.4" tslib "2.2.0" +"@nodelib/fs.scandir@2.1.5": + version "2.1.5" + resolved "https://registry.yarnpkg.com/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz#7619c2eb21b25483f6d167548b4cfd5a7488c3d5" + integrity sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g== + dependencies: + "@nodelib/fs.stat" "2.0.5" + run-parallel "^1.1.9" + +"@nodelib/fs.stat@2.0.5", "@nodelib/fs.stat@^2.0.2": + version "2.0.5" + resolved "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz#5bd262af94e9d25bd1e71b05deed44876a222e8b" + integrity sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A== + +"@nodelib/fs.walk@^1.2.3": + version "1.2.8" + resolved "https://registry.yarnpkg.com/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz#e95737e8bb6746ddedf69c556953494f196fe69a" + integrity sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg== + dependencies: + "@nodelib/fs.scandir" "2.1.5" + fastq "^1.6.0" + "@nuxtjs/opencollective@0.3.2": version "0.3.2" resolved "https://registry.yarnpkg.com/@nuxtjs/opencollective/-/opencollective-0.3.2.tgz#620ce1044f7ac77185e825e1936115bb38e2681c" @@ -871,11 +904,6 @@ "@types/eslint" "*" "@types/estree" "*" -"@types/eslint-visitor-keys@^1.0.0": - version "1.0.0" - resolved "https://registry.yarnpkg.com/@types/eslint-visitor-keys/-/eslint-visitor-keys-1.0.0.tgz#1ee30d79544ca84d68d4b3cdb0af4f205663dd2d" - integrity sha512-OCutwjDZ4aFS6PB1UZ988C4YgwlBHJd6wCeQqaLdmadZ/7e+w79+hbMUFC1QXDNCmdyoRfAFdm0RypzwR+Qpag== - "@types/eslint@*": version "8.56.6" resolved "https://registry.yarnpkg.com/@types/eslint/-/eslint-8.56.6.tgz#d5dc16cac025d313ee101108ba5714ea10eb3ed0" @@ -958,7 +986,7 @@ expect "^29.0.0" pretty-format "^29.0.0" -"@types/json-schema@*", "@types/json-schema@^7.0.3", "@types/json-schema@^7.0.4", "@types/json-schema@^7.0.5", "@types/json-schema@^7.0.8": +"@types/json-schema@*", "@types/json-schema@^7.0.4", "@types/json-schema@^7.0.5", "@types/json-schema@^7.0.8", "@types/json-schema@^7.0.9": version "7.0.15" resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.15.tgz#596a1747233694d50f6ad8a7869fcb6f56cf5841" integrity sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA== @@ -1027,6 +1055,11 @@ "@types/tough-cookie" "*" form-data "^2.5.0" +"@types/semver@^7.3.12": + version "7.5.8" + resolved "https://registry.yarnpkg.com/@types/semver/-/semver-7.5.8.tgz#8268a8c57a3e4abd25c165ecd36237db7948a55e" + integrity sha512-I8EUhyrgfLrcTkzV3TSsGyl1tSuPrEDzr0yd5m90UgNxQkyDXULk3b6MlQqTCpZpNtWe1K0hzclnZkTcLBe2UQ== + "@types/send@*": version "0.17.4" resolved "https://registry.yarnpkg.com/@types/send/-/send-0.17.4.tgz#6619cd24e7270793702e4e6a4b958a9010cfc57a" @@ -1100,48 +1133,89 @@ dependencies: "@types/yargs-parser" "*" -"@typescript-eslint/eslint-plugin@^2.23.0": - version "2.34.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-2.34.0.tgz#6f8ce8a46c7dea4a6f1d171d2bb8fbae6dac2be9" - integrity sha512-4zY3Z88rEE99+CNvTbXSyovv2z9PNOVffTWD2W8QF5s2prBQtwN2zadqERcrHpcR7O/+KMI3fcTAmUUhK/iQcQ== +"@typescript-eslint/eslint-plugin@^5.61.0": + version "5.62.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.62.0.tgz#aeef0328d172b9e37d9bab6dbc13b87ed88977db" + integrity sha512-TiZzBSJja/LbhNPvk6yc0JrX9XqhQ0hdh6M2svYfsHGejaKFIAGd9MQ+ERIMzLGlN/kZoYIgdxFV0PuljTKXag== dependencies: - "@typescript-eslint/experimental-utils" "2.34.0" - functional-red-black-tree "^1.0.1" - regexpp "^3.0.0" - tsutils "^3.17.1" + "@eslint-community/regexpp" "^4.4.0" + "@typescript-eslint/scope-manager" "5.62.0" + "@typescript-eslint/type-utils" "5.62.0" + "@typescript-eslint/utils" "5.62.0" + debug "^4.3.4" + graphemer "^1.4.0" + ignore "^5.2.0" + natural-compare-lite "^1.4.0" + semver "^7.3.7" + tsutils "^3.21.0" + +"@typescript-eslint/parser@^5.61.0": + version "5.62.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-5.62.0.tgz#1b63d082d849a2fcae8a569248fbe2ee1b8a56c7" + integrity sha512-VlJEV0fOQ7BExOsHYAGrgbEiZoi8D+Bl2+f6V2RrXerRSylnp+ZBHmPvaIa8cz0Ajx7WO7Z5RqfgYg7ED1nRhA== + dependencies: + "@typescript-eslint/scope-manager" "5.62.0" + "@typescript-eslint/types" "5.62.0" + "@typescript-eslint/typescript-estree" "5.62.0" + debug "^4.3.4" -"@typescript-eslint/experimental-utils@2.34.0": - version "2.34.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-2.34.0.tgz#d3524b644cdb40eebceca67f8cf3e4cc9c8f980f" - integrity sha512-eS6FTkq+wuMJ+sgtuNTtcqavWXqsflWcfBnlYhg/nS4aZ1leewkXGbvBhaapn1q6qf4M71bsR1tez5JTRMuqwA== +"@typescript-eslint/scope-manager@5.62.0": + version "5.62.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-5.62.0.tgz#d9457ccc6a0b8d6b37d0eb252a23022478c5460c" + integrity sha512-VXuvVvZeQCQb5Zgf4HAxc04q5j+WrNAtNh9OwCsCgpKqESMTu3tF/jhZ3xG6T4NZwWl65Bg8KuS2uEvhSfLl0w== dependencies: - "@types/json-schema" "^7.0.3" - "@typescript-eslint/typescript-estree" "2.34.0" - eslint-scope "^5.0.0" - eslint-utils "^2.0.0" + "@typescript-eslint/types" "5.62.0" + "@typescript-eslint/visitor-keys" "5.62.0" -"@typescript-eslint/parser@^2.23.0": - version "2.34.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-2.34.0.tgz#50252630ca319685420e9a39ca05fe185a256bc8" - integrity sha512-03ilO0ucSD0EPTw2X4PntSIRFtDPWjrVq7C3/Z3VQHRC7+13YB55rcJI3Jt+YgeHbjUdJPcPa7b23rXCBokuyA== +"@typescript-eslint/type-utils@5.62.0": + version "5.62.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-5.62.0.tgz#286f0389c41681376cdad96b309cedd17d70346a" + integrity sha512-xsSQreu+VnfbqQpW5vnCJdq1Z3Q0U31qiWmRhr98ONQmcp/yhiPJFPq8MXiJVLiksmOKSjIldZzkebzHuCGzew== dependencies: - "@types/eslint-visitor-keys" "^1.0.0" - "@typescript-eslint/experimental-utils" "2.34.0" - "@typescript-eslint/typescript-estree" "2.34.0" - eslint-visitor-keys "^1.1.0" + "@typescript-eslint/typescript-estree" "5.62.0" + "@typescript-eslint/utils" "5.62.0" + debug "^4.3.4" + tsutils "^3.21.0" + +"@typescript-eslint/types@5.62.0": + version "5.62.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.62.0.tgz#258607e60effa309f067608931c3df6fed41fd2f" + integrity sha512-87NVngcbVXUahrRTqIK27gD2t5Cu1yuCXxbLcFtCzZGlfyVWWh8mLHkoxzjsB6DDNnvdL+fW8MiwPEJyGJQDgQ== -"@typescript-eslint/typescript-estree@2.34.0": - version "2.34.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-2.34.0.tgz#14aeb6353b39ef0732cc7f1b8285294937cf37d5" - integrity sha512-OMAr+nJWKdlVM9LOqCqh3pQQPwxHAN7Du8DR6dmwCrAmxtiXQnhHJ6tBNtf+cggqfo51SG/FCwnKhXCIM7hnVg== +"@typescript-eslint/typescript-estree@5.62.0": + version "5.62.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-5.62.0.tgz#7d17794b77fabcac615d6a48fb143330d962eb9b" + integrity sha512-CmcQ6uY7b9y694lKdRB8FEel7JbU/40iSAPomu++SjLMntB+2Leay2LO6i8VnJk58MtE9/nQSFIH6jpyRWyYzA== dependencies: - debug "^4.1.1" - eslint-visitor-keys "^1.1.0" - glob "^7.1.6" - is-glob "^4.0.1" - lodash "^4.17.15" - semver "^7.3.2" - tsutils "^3.17.1" + "@typescript-eslint/types" "5.62.0" + "@typescript-eslint/visitor-keys" "5.62.0" + debug "^4.3.4" + globby "^11.1.0" + is-glob "^4.0.3" + semver "^7.3.7" + tsutils "^3.21.0" + +"@typescript-eslint/utils@5.62.0": + version "5.62.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-5.62.0.tgz#141e809c71636e4a75daa39faed2fb5f4b10df86" + integrity sha512-n8oxjeb5aIbPFEtmQxQYOLI0i9n5ySBEY/ZEHHZqKQSFnxio1rv6dthascc9dLuwrL0RC5mPCxB7vnAVGAYWAQ== + dependencies: + "@eslint-community/eslint-utils" "^4.2.0" + "@types/json-schema" "^7.0.9" + "@types/semver" "^7.3.12" + "@typescript-eslint/scope-manager" "5.62.0" + "@typescript-eslint/types" "5.62.0" + "@typescript-eslint/typescript-estree" "5.62.0" + eslint-scope "^5.1.1" + semver "^7.3.7" + +"@typescript-eslint/visitor-keys@5.62.0": + version "5.62.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-5.62.0.tgz#2174011917ce582875954ffe2f6912d5931e353e" + integrity sha512-07ny+LHRzQXepkGg6w0mFY41fVUNBrL2Roj/++7V1txKugfjm/Ci/qSND03r2RhlJhJYMcTn9AhhSSqQp0Ysyw== + dependencies: + "@typescript-eslint/types" "5.62.0" + eslint-visitor-keys "^3.3.0" "@webassemblyjs/ast@1.11.0": version "1.11.0" @@ -1454,6 +1528,11 @@ array-includes@^3.1.7: get-intrinsic "^1.2.4" is-string "^1.0.7" +array-union@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/array-union/-/array-union-2.1.0.tgz#b798420adbeb1de828d84acd8a2e23d3efe85e8d" + integrity sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw== + array.prototype.findlastindex@^1.2.3: version "1.2.5" resolved "https://registry.yarnpkg.com/array.prototype.findlastindex/-/array.prototype.findlastindex-1.2.5.tgz#8c35a755c72908719453f87145ca011e39334d0d" @@ -2353,6 +2432,13 @@ diff@^4.0.1: resolved "https://registry.yarnpkg.com/diff/-/diff-4.0.2.tgz#60f3aecb89d5fae520c11aa19efc2bb982aade7d" integrity sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A== +dir-glob@^3.0.1: + version "3.0.1" + resolved "https://registry.yarnpkg.com/dir-glob/-/dir-glob-3.0.1.tgz#56dbf73d992a4a93ba1584f4534063fd2e41717f" + integrity sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA== + dependencies: + path-type "^4.0.0" + doctrine@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-2.1.0.tgz#5cd01fc101621b42c4cd7f5d1a66243716d3f39d" @@ -2672,18 +2758,16 @@ eslint-utils@^1.4.3: dependencies: eslint-visitor-keys "^1.1.0" -eslint-utils@^2.0.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-2.1.0.tgz#d2de5e03424e707dc10c74068ddedae708741b27" - integrity sha512-w94dQYoauyvlDc43XnGB8lU3Zt713vNChgt4EWwhXAP2XkBvndfxF0AgIqKOOasjPIPzj9JqgwkwbCYD0/V3Zg== - dependencies: - eslint-visitor-keys "^1.1.0" - eslint-visitor-keys@^1.1.0: version "1.3.0" resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz#30ebd1ef7c2fdff01c3a4f151044af25fab0523e" integrity sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ== +eslint-visitor-keys@^3.3.0, eslint-visitor-keys@^3.4.3: + version "3.4.3" + resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz#0cd72fe8550e3c2eae156a96a4dddcd1c8ac5800" + integrity sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag== + eslint@^6.8.0: version "6.8.0" resolved "https://registry.yarnpkg.com/eslint/-/eslint-6.8.0.tgz#62262d6729739f9275723824302fb227c8c93ffb" @@ -2911,6 +2995,17 @@ fast-deep-equal@^3.1.1: resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz#3a7d56b559d6cbc3eb512325244e619a65c6c525" integrity sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q== +fast-glob@^3.2.9: + version "3.3.2" + resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.3.2.tgz#a904501e57cfdd2ffcded45e99a54fef55e46129" + integrity sha512-oX2ruAFQwf/Orj8m737Y5adxDQO0LAB7/S5MnxCdTNDd4p6BsyIVsv9JQsATbTSq8KHRpLwIHbVlUNatxd+1Ow== + dependencies: + "@nodelib/fs.stat" "^2.0.2" + "@nodelib/fs.walk" "^1.2.3" + glob-parent "^5.1.2" + merge2 "^1.3.0" + micromatch "^4.0.4" + fast-json-stable-stringify@2.1.0, fast-json-stable-stringify@2.x, fast-json-stable-stringify@^2.0.0, fast-json-stable-stringify@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz#874bf69c6f404c2b5d99c481341399fd55892633" @@ -2931,6 +3026,13 @@ fast-safe-stringify@^2.0.7, fast-safe-stringify@^2.1.1: resolved "https://registry.yarnpkg.com/fast-safe-stringify/-/fast-safe-stringify-2.1.1.tgz#c406a83b6e70d9e35ce3b30a81141df30aeba884" integrity sha512-W+KJc2dmILlPplD/H4K9l9LcAHAfPtP6BY84uVLXQ6Evcz9Lcg33Y2z1IVblT6xdY54PXYVHEv+0Wpq8Io6zkA== +fastq@^1.6.0: + version "1.17.1" + resolved "https://registry.yarnpkg.com/fastq/-/fastq-1.17.1.tgz#2a523f07a4e7b1e81a42b91b8bf2254107753b47" + integrity sha512-sRVD3lWVIXWg6By68ZN7vho9a1pQcN/WBFaAAsDDFzlJjvoGx0P8z7V1t72grFJfJhu3YPZBuu25f7Kaw2jN1w== + dependencies: + reusify "^1.0.4" + fb-watchman@^2.0.0: version "2.0.2" resolved "https://registry.yarnpkg.com/fb-watchman/-/fb-watchman-2.0.2.tgz#e9524ee6b5c77e9e5001af0f85f3adbb8623255c" @@ -3243,7 +3345,7 @@ getpass@^0.1.1: dependencies: assert-plus "^1.0.0" -glob-parent@^5.0.0, glob-parent@~5.1.0, glob-parent@~5.1.2: +glob-parent@^5.0.0, glob-parent@^5.1.2, glob-parent@~5.1.0, glob-parent@~5.1.2: version "5.1.2" resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.2.tgz#869832c58034fe68a4093c17dc15e8340d8401c4" integrity sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow== @@ -3255,7 +3357,7 @@ glob-to-regexp@^0.4.1: resolved "https://registry.yarnpkg.com/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz#c75297087c851b9a578bd217dd59a92f59fe546e" integrity sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw== -glob@^7.0.0, glob@^7.1.3, glob@^7.1.4, glob@^7.1.6: +glob@^7.0.0, glob@^7.1.3, glob@^7.1.4: version "7.2.3" resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.3.tgz#b8df0fb802bbfa8e89bd1d938b4e16578ed44f2b" integrity sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q== @@ -3286,6 +3388,18 @@ globalthis@^1.0.3: dependencies: define-properties "^1.1.3" +globby@^11.1.0: + version "11.1.0" + resolved "https://registry.yarnpkg.com/globby/-/globby-11.1.0.tgz#bd4be98bb042f83d796f7e3811991fbe82a0d34b" + integrity sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g== + dependencies: + array-union "^2.1.0" + dir-glob "^3.0.1" + fast-glob "^3.2.9" + ignore "^5.2.0" + merge2 "^1.4.1" + slash "^3.0.0" + gopd@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/gopd/-/gopd-1.0.1.tgz#29ff76de69dac7489b7c0918a5788e56477c332c" @@ -3298,6 +3412,11 @@ graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.4, resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.11.tgz#4183e4e8bf08bb6e05bbb2f7d2e0c8f712ca40e3" integrity sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ== +graphemer@^1.4.0: + version "1.4.0" + resolved "https://registry.yarnpkg.com/graphemer/-/graphemer-1.4.0.tgz#fb2f1d55e0e3a1849aeffc90c4fa0dd53a0e66c6" + integrity sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag== + growly@^1.3.0: version "1.3.0" resolved "https://registry.yarnpkg.com/growly/-/growly-1.3.0.tgz#f10748cbe76af964b7c96c93c6bcc28af120c081" @@ -3485,6 +3604,11 @@ ignore@^4.0.6: resolved "https://registry.yarnpkg.com/ignore/-/ignore-4.0.6.tgz#750e3db5862087b4737ebac8207ffd1ef27b25fc" integrity sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg== +ignore@^5.2.0: + version "5.3.2" + resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.3.2.tgz#3cd40e729f3643fd87cb04e50bf0eb722bc596f5" + integrity sha512-hsBTNUqQTDwkWtcdYI2i06Y/nUBEsNEDJKjWdigLvegy8kDuJAS8uRlpkkcQpyEXL0Z/pjDy5HBmMjRCJ2gq+g== + import-fresh@^3.0.0, import-fresh@^3.1.0: version "3.3.0" resolved "https://registry.yarnpkg.com/import-fresh/-/import-fresh-3.3.0.tgz#37162c25fcb9ebaa2e6e53d5b4d88ce17d9e0c2b" @@ -4460,7 +4584,7 @@ lodash.toarray@^4.4.0: resolved "https://registry.yarnpkg.com/lodash.toarray/-/lodash.toarray-4.4.0.tgz#24c4bfcd6b2fba38bfd0594db1179d8e9b656561" integrity sha512-QyffEA3i5dma5q2490+SgCvDN0pXLmRGSyAANuVi0HQ01Pkfr9fuoKQW8wm1wGBnJITs/mS7wQvS6VshUEBFCw== -lodash@^4.16.3, lodash@^4.17.13, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.19, lodash@^4.17.21: +lodash@^4.16.3, lodash@^4.17.13, lodash@^4.17.14, lodash@^4.17.19, lodash@^4.17.21: version "4.17.21" resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c" integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg== @@ -4559,6 +4683,11 @@ merge-stream@^2.0.0: resolved "https://registry.yarnpkg.com/merge-stream/-/merge-stream-2.0.0.tgz#52823629a14dd00c9770fb6ad47dc6310f2c1f60" integrity sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w== +merge2@^1.3.0, merge2@^1.4.1: + version "1.4.1" + resolved "https://registry.yarnpkg.com/merge2/-/merge2-1.4.1.tgz#4368892f885e907455a6fd7dc55c0c9d404990ae" + integrity sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg== + methods@^1.1.2, methods@~1.1.2: version "1.1.2" resolved "https://registry.yarnpkg.com/methods/-/methods-1.1.2.tgz#5529a4d67654134edcc5266656835b0f851afcee" @@ -4692,6 +4821,11 @@ mute-stream@0.0.8: resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.8.tgz#1630c42b2251ff81e2a283de96a5497ea92e5e0d" integrity sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA== +natural-compare-lite@^1.4.0: + version "1.4.0" + resolved "https://registry.yarnpkg.com/natural-compare-lite/-/natural-compare-lite-1.4.0.tgz#17b09581988979fddafe0201e931ba933c96cbb4" + integrity sha512-Tj+HTDSJJKaZnfiuw+iaF9skdPpTo2GtEly5JHnWV/hfv2Qj/9RKsGISQtLh2ox3l5EAGw487hnBee0sIJ6v2g== + natural-compare@^1.4.0: version "1.4.0" resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7" @@ -5217,6 +5351,11 @@ qs@~6.5.2: resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.3.tgz#3aeeffc91967ef6e35c0e488ef46fb296ab76aad" integrity sha512-qxXIEh4pCGfHICj1mAJQ2/2XVZkjCDTcEgfoSQxc/fYivUZxTkk7L3bDBJSoNrEzXI17oUO5Dp07ktqE5KzczA== +queue-microtask@^1.2.2: + version "1.2.3" + resolved "https://registry.yarnpkg.com/queue-microtask/-/queue-microtask-1.2.3.tgz#4929228bbc724dfac43e0efb058caf7b6cfb6243" + integrity sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A== + ramda@0.27.1: version "0.27.1" resolved "https://registry.yarnpkg.com/ramda/-/ramda-0.27.1.tgz#66fc2df3ef873874ffc2da6aa8984658abacf5c9" @@ -5332,11 +5471,6 @@ regexpp@^2.0.1: resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-2.0.1.tgz#8d19d31cf632482b589049f8281f93dbcba4d07f" integrity sha512-lv0M6+TkDVniA3aD1Eg0DVpfU/booSu7Eev3TDO/mZKHBfVjgCGTV4t4buppESEYDtkArYFOxTJWv6S5C+iaNw== -regexpp@^3.0.0: - version "3.2.0" - resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-3.2.0.tgz#0425a2768d8f23bad70ca4b90461fa2f1213e1b2" - integrity sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg== - request@^2.88.2: version "2.88.2" resolved "https://registry.yarnpkg.com/request/-/request-2.88.2.tgz#d73c918731cb5a87da047e207234146f664d12b3" @@ -5415,6 +5549,11 @@ restore-cursor@^4.0.0: onetime "^5.1.0" signal-exit "^3.0.2" +reusify@^1.0.4: + version "1.0.4" + resolved "https://registry.yarnpkg.com/reusify/-/reusify-1.0.4.tgz#90da382b1e126efc02146e90845a88db12925d76" + integrity sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw== + rfdc@^1.3.0: version "1.3.1" resolved "https://registry.yarnpkg.com/rfdc/-/rfdc-1.3.1.tgz#2b6d4df52dffe8bb346992a10ea9451f24373a8f" @@ -5439,6 +5578,13 @@ run-async@^2.4.0: resolved "https://registry.yarnpkg.com/run-async/-/run-async-2.4.1.tgz#8440eccf99ea3e70bd409d49aab88e10c189a455" integrity sha512-tvVnVv01b8c1RrA6Ep7JkStj85Guv/YrMcwqYQnwjsAS2cTmmPGBBjAjpCW7RrSodNSoE2/qg9O4bceNvUuDgQ== +run-parallel@^1.1.9: + version "1.2.0" + resolved "https://registry.yarnpkg.com/run-parallel/-/run-parallel-1.2.0.tgz#66d1368da7bdf921eb9d95bd1a9229e7f21a43ee" + integrity sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA== + dependencies: + queue-microtask "^1.2.2" + rxjs@6.5.4: version "6.5.4" resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.5.4.tgz#e0777fe0d184cec7872df147f303572d414e211c" @@ -5529,6 +5675,11 @@ semver@^7.3.2, semver@^7.3.8, semver@^7.5.3, semver@^7.5.4: dependencies: lru-cache "^6.0.0" +semver@^7.3.7: + version "7.6.3" + resolved "https://registry.yarnpkg.com/semver/-/semver-7.6.3.tgz#980f7b5550bc175fb4dc09403085627f9eb33143" + integrity sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A== + send@0.17.1: version "0.17.1" resolved "https://registry.yarnpkg.com/send/-/send-0.17.1.tgz#c1d8b059f7900f7466dd4938bdc44e11ddb376c8" @@ -6223,7 +6374,7 @@ tslib@^2.0.1: resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.6.2.tgz#703ac29425e7b37cd6fd456e92404d46d1f3e4ae" integrity sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q== -tsutils@^3.17.1: +tsutils@^3.21.0: version "3.21.0" resolved "https://registry.yarnpkg.com/tsutils/-/tsutils-3.21.0.tgz#b48717d394cea6c1e096983eed58e9d61715b623" integrity sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA== @@ -6326,7 +6477,7 @@ typescript@4.2.3: resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.2.3.tgz#39062d8019912d43726298f09493d598048c1ce3" integrity sha512-qOcYwxaByStAWrBf4x0fibwZvMRG+r4cQoTjbPtUlrWjBHbmCAww1i448U0GJ+3cNNEtebDteo/cHOR3xJ4wEw== -typescript@^4.2.3: +typescript@^4.9.5: version "4.9.5" resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.9.5.tgz#095979f9bcc0d09da324d58d03ce8f8374cbe65a" integrity sha512-1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g==