From b6f7c7a33c36ff365a8fc58be758b7e4934d06a2 Mon Sep 17 00:00:00 2001 From: Aaron Russell Date: Wed, 15 Jan 2020 14:26:38 +0000 Subject: [PATCH 001/305] Started adding validations for CQC RM --- server/models/BulkImport/csv/establishments.js | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/server/models/BulkImport/csv/establishments.js b/server/models/BulkImport/csv/establishments.js index ac6e596a2b..bc7ae99e8f 100644 --- a/server/models/BulkImport/csv/establishments.js +++ b/server/models/BulkImport/csv/establishments.js @@ -1311,6 +1311,9 @@ class Establishment { const starters = this._currentLine.STARTERS.split(';'); const leavers = this._currentLine.LEAVERS.split(';'); + const regManager = 4; + const isCQCRegulated = this._regType === 2; + // allJobs can only be empty, if TOTALPERMTEMP is 0 if (!this._currentLine.ALLJOBROLES || this._currentLine.ALLJOBROLES.length === 0) { if( @@ -1358,6 +1361,21 @@ class Establishment { } } + console.log('Checking to see if we validate all jobs'); + console.log(allJobs); + + const hasRegisteredManager = () => { + allJobs.map((job, index) => { + console.log(job); + if (parseInt(job, 10) === regManager && parseInt(vacancies[index], 10) > 0) return true; + }); + return false; + } + + if (this._currentLine.ALLJOBROLES && this._currentLine.ALLJOBROLES.length > 0 && !isCQCRegulated && !hasRegisteredManager()) { + console.log('They have no registered manager'); + } + if (localValidationErrors.length > 0) { localValidationErrors.forEach(thisValidation => this._validationErrors.push(thisValidation)); return false; From 49a02ede8739ff82d5e1f74962e83b103a93af5d Mon Sep 17 00:00:00 2001 From: Aaron Russell Date: Thu, 16 Jan 2020 16:00:58 +0000 Subject: [PATCH 002/305] Added validation for non CQC reg with RM --- .../models/BulkImport/csv/establishments.js | 23 ++++++++++++------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/server/models/BulkImport/csv/establishments.js b/server/models/BulkImport/csv/establishments.js index bc7ae99e8f..0883b12bc8 100644 --- a/server/models/BulkImport/csv/establishments.js +++ b/server/models/BulkImport/csv/establishments.js @@ -1361,19 +1361,26 @@ class Establishment { } } - console.log('Checking to see if we validate all jobs'); - console.log(allJobs); - - const hasRegisteredManager = () => { + const hasRegisteredManagerVacancy = () => { allJobs.map((job, index) => { console.log(job); - if (parseInt(job, 10) === regManager && parseInt(vacancies[index], 10) > 0) return true; + if (parseInt(job, 10) === regManager && parseInt(vacancies[index], 10) > 0) { + allJobs.splice(index, 1); + return true; + } }); return false; - } + }; - if (this._currentLine.ALLJOBROLES && this._currentLine.ALLJOBROLES.length > 0 && !isCQCRegulated && !hasRegisteredManager()) { - console.log('They have no registered manager'); + if (this._currentLine.ALLJOBROLES && this._currentLine.ALLJOBROLES.length > 0 && !isCQCRegulated && !hasRegisteredManagerVacancy()) { + localValidationErrors.push({ + lineNumber: this._lineNumber, + warnCode: Establishment.ALL_JOBS_WARNING, + warnType: 'ALL_JOBS_WARNING', + warning: 'Vacancy for Registered Manager should not be included for this service and will be ignored', + source: this._currentLine.ALLJOBROLES, + name: this._currentLine.LOCALESTID + }); } if (localValidationErrors.length > 0) { From 031507124379012cae0539277f7aa2225d63e411 Mon Sep 17 00:00:00 2001 From: Aaron Russell Date: Fri, 17 Jan 2020 09:05:09 +0000 Subject: [PATCH 003/305] Changed so it on splices if not CQC registered --- server/models/BulkImport/csv/establishments.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/server/models/BulkImport/csv/establishments.js b/server/models/BulkImport/csv/establishments.js index 0883b12bc8..a46349da7f 100644 --- a/server/models/BulkImport/csv/establishments.js +++ b/server/models/BulkImport/csv/establishments.js @@ -1365,7 +1365,9 @@ class Establishment { allJobs.map((job, index) => { console.log(job); if (parseInt(job, 10) === regManager && parseInt(vacancies[index], 10) > 0) { - allJobs.splice(index, 1); + if (!isCQCRegulated) { + allJobs.splice(index, 1); + } return true; } }); From 18475b8e4d167703418d90248896a3ec55e1697f Mon Sep 17 00:00:00 2001 From: Aaron Russell Date: Fri, 17 Jan 2020 10:05:27 +0000 Subject: [PATCH 004/305] Srarted adding validation --- server/models/BulkImport/csv/establishments.js | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/server/models/BulkImport/csv/establishments.js b/server/models/BulkImport/csv/establishments.js index a46349da7f..400d5db990 100644 --- a/server/models/BulkImport/csv/establishments.js +++ b/server/models/BulkImport/csv/establishments.js @@ -1363,7 +1363,6 @@ class Establishment { const hasRegisteredManagerVacancy = () => { allJobs.map((job, index) => { - console.log(job); if (parseInt(job, 10) === regManager && parseInt(vacancies[index], 10) > 0) { if (!isCQCRegulated) { allJobs.splice(index, 1); @@ -1374,6 +1373,18 @@ class Establishment { return false; }; + // Need to add if they currently have a registered manager + if (this._currentLine.ALLJOBROLES && this._currentLine.ALLJOBROLES.length > 0 && isCQCRegulated && !hasRegisteredManagerVacancy()) { + localValidationErrors.push({ + lineNumber: this._lineNumber, + errCode: Establishment.ALL_JOBS_ERROR, + errType: 'ALL_JOBS_ERROR', + error: 'You do not have a staff record for a Registered Manager therefore must record a vacancy for one', + source: this._currentLine.ALLJOBROLES, + name: this._currentLine.LOCALESTID + }); + } + if (this._currentLine.ALLJOBROLES && this._currentLine.ALLJOBROLES.length > 0 && !isCQCRegulated && !hasRegisteredManagerVacancy()) { localValidationErrors.push({ lineNumber: this._lineNumber, From 247dc3f2e0e60ce5fba7864ba9a27a88cf9633aa Mon Sep 17 00:00:00 2001 From: Aaron Russell Date: Tue, 21 Jan 2020 16:40:02 +0000 Subject: [PATCH 005/305] Added removal of RM --- server/models/BulkImport/csv/establishments.js | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/server/models/BulkImport/csv/establishments.js b/server/models/BulkImport/csv/establishments.js index 400d5db990..7548671810 100644 --- a/server/models/BulkImport/csv/establishments.js +++ b/server/models/BulkImport/csv/establishments.js @@ -1363,12 +1363,7 @@ class Establishment { const hasRegisteredManagerVacancy = () => { allJobs.map((job, index) => { - if (parseInt(job, 10) === regManager && parseInt(vacancies[index], 10) > 0) { - if (!isCQCRegulated) { - allJobs.splice(index, 1); - } - return true; - } + if (parseInt(job, 10) === regManager && parseInt(vacancies[index], 10) > 0) return true; }); return false; }; @@ -1505,6 +1500,11 @@ class Establishment { this._starters = starters.map(thisCount => parseInt(thisCount, 10)); this._leavers = leavers.map(thisCount => parseInt(thisCount, 10)); + // remove RM vacancy + this._allJobs.map((job, index) => { + if (job === regManager && this._vacancies[index] > 0) this._vacancies[index] = 0; + }); + if (localValidationErrors.length > 0) { localValidationErrors.forEach(thisValidation => this._validationErrors.push(thisValidation)); return false; From b03da8ed8be88a01d98b2f8f87e304d55a58a60c Mon Sep 17 00:00:00 2001 From: Aaron Russell Date: Tue, 21 Jan 2020 17:18:04 +0000 Subject: [PATCH 006/305] Added validation rule if locationID already exists --- server/models/BulkImport/csv/establishments.js | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/server/models/BulkImport/csv/establishments.js b/server/models/BulkImport/csv/establishments.js index 7548671810..7defebe2a4 100644 --- a/server/models/BulkImport/csv/establishments.js +++ b/server/models/BulkImport/csv/establishments.js @@ -3,6 +3,7 @@ const hasProp = (obj, prop) => Object.prototype.hasOwnProperty.bind(obj)(prop); const BUDI = require('../BUDI').BUDI; +const models = require('../../index'); const STOP_VALIDATING_ON = ['UNCHECKED', 'DELETE', 'NOCHANGE']; @@ -851,6 +852,11 @@ class Establishment { // do not use const mainServiceIsHeadOffice = parseInt(this._currentLine.MAINSERVICE, 10) === 72; + const locationExists = models.establishment.findAll({ + where: { + locationId: myLocationID + } + }); if (this._regType === 2) { // ignore location i @@ -875,6 +881,16 @@ class Establishment { name: this._currentLine.LOCALESTID }); return false; + } else if (locationExists.length > 0) { + this._validationErrors.push({ + lineNumber: this._lineNumber, + errCode: Establishment.LOCATION_ID_ERROR, + errType: 'LOCATION_ID_ERROR', + error: 'LOCATIONID already exists in ASC-WDS please contact Support on 0113 241 0969', + source: myLocationID, + name: this._currentLine.LOCALESTID + }); + return false; } } From 803e39c429441bbe75ade8c3a4c25592be59de25 Mon Sep 17 00:00:00 2001 From: Aaron Russell Date: Wed, 22 Jan 2020 09:33:57 +0000 Subject: [PATCH 007/305] Made the location ID function async to allow for database query --- server/models/BulkImport/csv/establishments.js | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/server/models/BulkImport/csv/establishments.js b/server/models/BulkImport/csv/establishments.js index 7defebe2a4..6a114d8229 100644 --- a/server/models/BulkImport/csv/establishments.js +++ b/server/models/BulkImport/csv/establishments.js @@ -845,19 +845,18 @@ class Establishment { } } - _validateLocationID () { + async _validateLocationID () { // must be given if "share with CQC" - but if given must be in the format "n-nnnnnnnnn" const locationIDRegex = /^[0-9]{1}-[0-9]{8,10}$/; const myLocationID = this._currentLine.LOCATIONID; // do not use const mainServiceIsHeadOffice = parseInt(this._currentLine.MAINSERVICE, 10) === 72; - const locationExists = models.establishment.findAll({ + const locationExists = await models.establishment.findAll({ where: { locationId: myLocationID } }); - if (this._regType === 2) { // ignore location i if (!mainServiceIsHeadOffice) { From b61ee7dc107e6a36a27f0db39f60e7423b870c47 Mon Sep 17 00:00:00 2001 From: Aaron Russell Date: Wed, 22 Jan 2020 10:59:11 +0000 Subject: [PATCH 008/305] Added fix for cqc reg but on cqc service --- server/models/BulkImport/csv/establishments.js | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/server/models/BulkImport/csv/establishments.js b/server/models/BulkImport/csv/establishments.js index 6a114d8229..f973435086 100644 --- a/server/models/BulkImport/csv/establishments.js +++ b/server/models/BulkImport/csv/establishments.js @@ -10,7 +10,7 @@ const STOP_VALIDATING_ON = ['UNCHECKED', 'DELETE', 'NOCHANGE']; const localAuthorityEmployerTypes = [1, 3]; const nonDirectCareJobRoles = [1, 2, 4, 5, 7, 8, 9, 13, 14, 15, 17, 18, 19, 21, 22, 23, 24, 26, 27, 28]; const employedContractStatusIds = [1, 2]; -const dbNotCqcRegulatedServiceCodes = [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18]; +const cqcRegulatedServiceCodes = [24, 25, 20, 22, 21, 23, 19, 27, 28, 26, 29, 30, 32, 31, 33, 34]; const csvQuote = toCsv => { if (toCsv && toCsv.replace(/ /g, '').match(/[\s,"]/)) { @@ -786,9 +786,8 @@ class Establishment { name: this._currentLine.LOCALESTID }); return false; - } else if( - false && - myRegType === 2 && dbNotCqcRegulatedServiceCodes.includes(dbServiceCode) && dbServiceCode !== dbMainServiceCode) { + } else if(myRegType === 2 && + !cqcRegulatedServiceCodes.includes(dbServiceCode) && (dbServiceCode !== dbMainServiceCode)) { this._validationErrors.push({ lineNumber: this._lineNumber, errCode: Establishment.REGTYPE_ERROR, From 8dbc0d451fba7415057989cd01b4494a21c4d9bd Mon Sep 17 00:00:00 2001 From: Aaron Russell Date: Thu, 23 Jan 2020 15:03:03 +0000 Subject: [PATCH 009/305] Added endpoint for unlocking a users account --- server/routes/admin/index.js | 2 + server/routes/admin/unlock-account/index.js | 54 +++++++++++++++++++++ 2 files changed, 56 insertions(+) create mode 100644 server/routes/admin/unlock-account/index.js diff --git a/server/routes/admin/index.js b/server/routes/admin/index.js index 3c2b37b0aa..4cd1be83c0 100644 --- a/server/routes/admin/index.js +++ b/server/routes/admin/index.js @@ -7,6 +7,7 @@ const search = require('./search'); const recalcWdf = require('./recalcWdf'); const registrations = require('./registrations'); const approval = require('./approval'); +const unlockAccount = require('./unlock-account'); // middleware authentication - only role=Admin from here on in router.use('/', isAdmin); @@ -15,6 +16,7 @@ router.use('/search', search); router.use('/recalcWdf', recalcWdf); router.use('/registrations', registrations); router.use('/approval', approval); +router.use('/unlock-account', unlockAccount); router.route('/').post(async function (req, res) { return res.status(200).send({success: "from admin"}); diff --git a/server/routes/admin/unlock-account/index.js b/server/routes/admin/unlock-account/index.js new file mode 100644 index 0000000000..e81f4a88c4 --- /dev/null +++ b/server/routes/admin/unlock-account/index.js @@ -0,0 +1,54 @@ +// default route for admin/approval +const express = require('express'); +const router = express.Router(); +const models = require('../../../models'); + +router.route('/').post(async (req, res) => { + // parse input - escaped to prevent SQL injection + + // Sanatize username + if(req.body.username){ + const username = escape(req.body.username.toLowerCase()); + + try { + // Find the user matching the username + const login = await models.login.findOne({ + where: { + username: { + [models.Sequelize.Op.iLike] : username + } + }, + attributes: ['id', 'username'], + include: [{ + model: models.user, + attributes: ['id'] + }] + }); + // Make sure we have the matching user + if ((login && login.id) && (username === login.username)) { + // If approving user + try { + const updateduser = await login.update({ + isActive: true, + status: null, + invalidAttempt: 9 + }); + if (updateduser) { + return res.status(200).json({status: '0', message: 'User has been set as active'}) + } else { + return res.status(503).send(); + } + } catch(error) { + console.error(error); + return res.status(503).send(); + } + } + } catch (error) { + console.log(error); + } + } else { + return res.status(400).send(); + } +}); + +module.exports = router; From fa6ce399e0b7db248f4599d7944c47fcb1f6898c Mon Sep 17 00:00:00 2001 From: Aaron Russell Date: Thu, 23 Jan 2020 15:28:24 +0000 Subject: [PATCH 010/305] Removed status from endpoint --- server/routes/admin/unlock-account/index.js | 1 - 1 file changed, 1 deletion(-) diff --git a/server/routes/admin/unlock-account/index.js b/server/routes/admin/unlock-account/index.js index e81f4a88c4..ce52a14aa9 100644 --- a/server/routes/admin/unlock-account/index.js +++ b/server/routes/admin/unlock-account/index.js @@ -30,7 +30,6 @@ router.route('/').post(async (req, res) => { try { const updateduser = await login.update({ isActive: true, - status: null, invalidAttempt: 9 }); if (updateduser) { From faf817269f5b4235ac5285fd0404ce5eabb3288a Mon Sep 17 00:00:00 2001 From: Aaron Russell Date: Thu, 23 Jan 2020 16:46:23 +0000 Subject: [PATCH 011/305] Added unlock button to locked accounts on admin user screen --- src/app/core/services/registrations.service.ts | 4 ++++ src/app/features/search/search.component.html | 4 ++++ src/app/features/search/search.component.ts | 9 +++++++++ 3 files changed, 17 insertions(+) diff --git a/src/app/core/services/registrations.service.ts b/src/app/core/services/registrations.service.ts index aad6a69bd4..6eb89ae31a 100644 --- a/src/app/core/services/registrations.service.ts +++ b/src/app/core/services/registrations.service.ts @@ -16,4 +16,8 @@ export class RegistrationsService { public registrationApproval(data: object) { return this.http.post('/api/admin/approval/', data); } + + public unlockAccount(data: object) { + return this.http.post('/api/admin/unlock-account/', data); + } } diff --git a/src/app/features/search/search.component.html b/src/app/features/search/search.component.html index f86046b422..4736d1f0fa 100644 --- a/src/app/features/search/search.component.html +++ b/src/app/features/search/search.component.html @@ -155,6 +155,7 @@

Security Question Security Answer Parent ID + Locked @@ -175,6 +176,9 @@

item.establishment.parent && item.establishment.parent.nmdsId ? item.establishment.parent.nmdsId : '' }} + + Unlock + diff --git a/src/app/features/search/search.component.ts b/src/app/features/search/search.component.ts index acad3fa2c8..3604a90416 100644 --- a/src/app/features/search/search.component.ts +++ b/src/app/features/search/search.component.ts @@ -78,6 +78,15 @@ export class SearchComponent implements OnInit { ); } + public unlockUser(username: string, e) { + e.preventDefault(); + this.registrationsService.unlockAccount({username}).subscribe( + data => { + }, + error => this.onError(error) + ); + } + public searchType(data, type) { return this.http.post('/api/admin/search/' + type, data, { observe: 'response' }); } From f937b1ade97fc31580c99cc2c89232234c08b5ba Mon Sep 17 00:00:00 2001 From: Aaron Russell Date: Fri, 24 Jan 2020 14:46:19 +0000 Subject: [PATCH 012/305] Added bad input if can't find matching user --- server/routes/admin/unlock-account/index.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/server/routes/admin/unlock-account/index.js b/server/routes/admin/unlock-account/index.js index ce52a14aa9..36737e3146 100644 --- a/server/routes/admin/unlock-account/index.js +++ b/server/routes/admin/unlock-account/index.js @@ -41,6 +41,8 @@ router.route('/').post(async (req, res) => { console.error(error); return res.status(503).send(); } + } else { + return res.status(400).send(); } } catch (error) { console.log(error); From 13cf73b6038df214e388e6862eb334f5711762db Mon Sep 17 00:00:00 2001 From: Aaron Russell Date: Fri, 24 Jan 2020 14:46:46 +0000 Subject: [PATCH 013/305] Added a confirmation modal for unlocking a user --- src/app/features/search/search.component.ts | 15 ++-- src/app/features/search/search.module.ts | 17 +++- .../admin-unlock-confirmation.html | 22 +++++ .../admin-unlock-confirmation.ts | 87 +++++++++++++++++++ 4 files changed, 131 insertions(+), 10 deletions(-) create mode 100644 src/app/shared/components/link-to-parent-cancel copy/admin-unlock-confirmation.html create mode 100644 src/app/shared/components/link-to-parent-cancel copy/admin-unlock-confirmation.ts diff --git a/src/app/features/search/search.component.ts b/src/app/features/search/search.component.ts index 3604a90416..fb0e9f3229 100644 --- a/src/app/features/search/search.component.ts +++ b/src/app/features/search/search.component.ts @@ -1,18 +1,24 @@ +import { Overlay } from '@angular/cdk/overlay'; import { HttpClient } from '@angular/common/http'; import { Component, OnInit } from '@angular/core'; import { Router } from '@angular/router'; import { AuthService } from '@core/services/auth.service'; import { BackService } from '@core/services/back.service'; +import { DialogService } from '@core/services/dialog.service'; import { EstablishmentService } from '@core/services/establishment.service'; import { NotificationsService } from '@core/services/notifications/notifications.service'; import { PermissionsService } from '@core/services/permissions/permissions.service'; import { RegistrationsService } from '@core/services/registrations.service'; import { UserService } from '@core/services/user.service'; +import { + AdminUnlockConfirmationDialogComponent, +} from '@shared/components/link-to-parent-cancel copy/admin-unlock-confirmation'; import { take } from 'rxjs/operators'; @Component({ selector: 'app-search', templateUrl: './search.component.html', + providers: [DialogService, AdminUnlockConfirmationDialogComponent, Overlay], }) export class SearchComponent implements OnInit { public results = []; @@ -43,7 +49,8 @@ export class SearchComponent implements OnInit { private permissionsService: PermissionsService, private notificationsService: NotificationsService, private userService: UserService, - private registrationsService: RegistrationsService + private registrationsService: RegistrationsService, + private dialogService: DialogService ) {} ngOnInit() { @@ -80,11 +87,7 @@ export class SearchComponent implements OnInit { public unlockUser(username: string, e) { e.preventDefault(); - this.registrationsService.unlockAccount({username}).subscribe( - data => { - }, - error => this.onError(error) - ); + this.dialogService.open(AdminUnlockConfirmationDialogComponent, username); } public searchType(data, type) { diff --git a/src/app/features/search/search.module.ts b/src/app/features/search/search.module.ts index 209b98298d..21a045c478 100644 --- a/src/app/features/search/search.module.ts +++ b/src/app/features/search/search.module.ts @@ -1,14 +1,23 @@ +import { OverlayModule } from '@angular/cdk/overlay'; import { CommonModule } from '@angular/common'; import { NgModule } from '@angular/core'; -import { ReactiveFormsModule, FormsModule } from '@angular/forms'; +import { FormsModule, ReactiveFormsModule } from '@angular/forms'; +import { DialogService } from '@core/services/dialog.service'; +import { + AdminUnlockConfirmationDialogComponent, +} from '@shared/components/link-to-parent-cancel copy/admin-unlock-confirmation'; import { SharedModule } from '@shared/shared.module'; + import { SearchRoutingModule } from './search-routing.module'; import { SearchComponent } from './search.component'; @NgModule({ - imports: [CommonModule, ReactiveFormsModule, SharedModule, SearchRoutingModule, FormsModule], + imports: [CommonModule, OverlayModule, ReactiveFormsModule, SharedModule, SearchRoutingModule, FormsModule], + providers: [DialogService], declarations: [ - SearchComponent - ] + SearchComponent, + AdminUnlockConfirmationDialogComponent + ], + entryComponents: [AdminUnlockConfirmationDialogComponent] }) export class SearchModule { } diff --git a/src/app/shared/components/link-to-parent-cancel copy/admin-unlock-confirmation.html b/src/app/shared/components/link-to-parent-cancel copy/admin-unlock-confirmation.html new file mode 100644 index 0000000000..6b665d4216 --- /dev/null +++ b/src/app/shared/components/link-to-parent-cancel copy/admin-unlock-confirmation.html @@ -0,0 +1,22 @@ + +
+
+ +

+ Are you sure you want to unlock {{data}}'s account? +

+ +
+
+

+ They will be able to login again with 1 more attempt before being locked again. +

+ + + diff --git a/src/app/shared/components/link-to-parent-cancel copy/admin-unlock-confirmation.ts b/src/app/shared/components/link-to-parent-cancel copy/admin-unlock-confirmation.ts new file mode 100644 index 0000000000..eb5842dd19 --- /dev/null +++ b/src/app/shared/components/link-to-parent-cancel copy/admin-unlock-confirmation.ts @@ -0,0 +1,87 @@ +import { Component, Inject, OnDestroy, OnInit } from '@angular/core'; +import { DialogComponent } from '@core/components/dialog.component'; +import { ErrorDefinition } from '@core/model/errorSummary.model'; +import { DataPermissions } from '@core/model/my-workplaces.model'; +import { AlertService } from '@core/services/alert.service'; +import { Dialog, DIALOG_DATA } from '@core/services/dialog.service'; +import { ErrorSummaryService } from '@core/services/error-summary.service'; +import { RegistrationsService } from '@core/services/registrations.service'; +import { Subscription } from 'rxjs'; + +@Component({ + selector: 'app-admin-unlock-confirmation', + templateUrl: './admin-unlock-confirmation.html', +}) +export class AdminUnlockConfirmationDialogComponent extends DialogComponent implements OnInit, OnDestroy { + public dataPermissions: DataPermissions[]; + protected subscriptions: Subscription = new Subscription(); + public serverError: string; + public serverErrorsMap: Array; + + constructor( + @Inject(DIALOG_DATA) public data, + private errorSummaryService: ErrorSummaryService, + private registrationsService: RegistrationsService, + public dialog: Dialog, + private alertService: AlertService + ) { + super(data, dialog); + } + + ngOnInit() { + this.setupServerErrorsMap(); + console.log(this.data); + } + + // setup server error message + private setupServerErrorsMap(): void { + this.serverErrorsMap = [ + { + name: 503, + message: 'We could not unlock the users account. You can try again or contact us.', + }, + { + name: 400, + message: 'Unable to unlock account.', + }, + { + name: 404, + message: 'Send request to unlock service not found. You can try again or contact us.', + }, + ]; + } + + /** + * Function is used to close dialog window after successful confirmation + * @param {any} true to close dialog after response or null to close without action + * @return {void} + */ + public closeDialogWindow(confirm: any) { + this.dialog.close(confirm); + } + + /** + * Unlock a users account + * @param {string} + * @return {void} + */ + public unlockUser(username: string) { + this.registrationsService.unlockAccount({username}).subscribe( + data => { + this.alertService.addAlert({ + type: 'success', + message: `User account has been unlocked.`, + }); + this.closeDialogWindow(true); + }, + error => { + this.serverError = this.errorSummaryService.getServerErrorMessage(error.status, this.serverErrorsMap); + } + ); + } + + + public ngOnDestroy(): void { + this.subscriptions.unsubscribe(); + } +} From c06c903e653535588001e5d9170a709022d263d0 Mon Sep 17 00:00:00 2001 From: Aaron Russell Date: Fri, 24 Jan 2020 16:28:10 +0000 Subject: [PATCH 014/305] Remove button once complete --- src/app/features/search/search.component.html | 4 ++-- src/app/features/search/search.component.ts | 11 +++++++++-- .../admin-unlock-confirmation.html | 2 +- .../admin-unlock-confirmation.ts | 9 ++++++--- 4 files changed, 18 insertions(+), 8 deletions(-) diff --git a/src/app/features/search/search.component.html b/src/app/features/search/search.component.html index 4736d1f0fa..e937cdf074 100644 --- a/src/app/features/search/search.component.html +++ b/src/app/features/search/search.component.html @@ -159,7 +159,7 @@

- + {{ item.username }} {{ item.name }} @@ -177,7 +177,7 @@

}} - Unlock + Unlock diff --git a/src/app/features/search/search.component.ts b/src/app/features/search/search.component.ts index fb0e9f3229..5a0852620f 100644 --- a/src/app/features/search/search.component.ts +++ b/src/app/features/search/search.component.ts @@ -85,9 +85,16 @@ export class SearchComponent implements OnInit { ); } - public unlockUser(username: string, e) { + public unlockUser(username: string, index: number, e) { e.preventDefault(); - this.dialogService.open(AdminUnlockConfirmationDialogComponent, username); + const data = { + username, + index, + removeUnlock: () => { + this.results[index].isLocked = false; + } + } + this.dialogService.open(AdminUnlockConfirmationDialogComponent, data); } public searchType(data, type) { diff --git a/src/app/shared/components/link-to-parent-cancel copy/admin-unlock-confirmation.html b/src/app/shared/components/link-to-parent-cancel copy/admin-unlock-confirmation.html index 6b665d4216..01791983c1 100644 --- a/src/app/shared/components/link-to-parent-cancel copy/admin-unlock-confirmation.html +++ b/src/app/shared/components/link-to-parent-cancel copy/admin-unlock-confirmation.html @@ -3,7 +3,7 @@

- Are you sure you want to unlock {{data}}'s account? + Are you sure you want to unlock {{data.username}}'s account?

diff --git a/src/app/shared/components/link-to-parent-cancel copy/admin-unlock-confirmation.ts b/src/app/shared/components/link-to-parent-cancel copy/admin-unlock-confirmation.ts index eb5842dd19..52104a5cc9 100644 --- a/src/app/shared/components/link-to-parent-cancel copy/admin-unlock-confirmation.ts +++ b/src/app/shared/components/link-to-parent-cancel copy/admin-unlock-confirmation.ts @@ -65,9 +65,12 @@ export class AdminUnlockConfirmationDialogComponent extends DialogComponent impl * @param {string} * @return {void} */ - public unlockUser(username: string) { - this.registrationsService.unlockAccount({username}).subscribe( - data => { + public unlockUser(data: any) { + this.registrationsService.unlockAccount({ + username: data.username + }).subscribe( + result => { + data.removeUnlock(); this.alertService.addAlert({ type: 'success', message: `User account has been unlocked.`, From 22d4424aa96f0b5cecd08f612df23b26d54cc9c7 Mon Sep 17 00:00:00 2001 From: Aaron Russell Date: Mon, 27 Jan 2020 09:59:18 +0000 Subject: [PATCH 015/305] Added unit tests for unlock accounts --- server/routes/admin/unlock-account/index.js | 24 +++---- .../routes/admin/unlock-account/index.spec.js | 70 +++++++++++++++++++ 2 files changed, 82 insertions(+), 12 deletions(-) create mode 100644 server/test/unit/routes/admin/unlock-account/index.spec.js diff --git a/server/routes/admin/unlock-account/index.js b/server/routes/admin/unlock-account/index.js index 36737e3146..df9360314b 100644 --- a/server/routes/admin/unlock-account/index.js +++ b/server/routes/admin/unlock-account/index.js @@ -3,8 +3,8 @@ const express = require('express'); const router = express.Router(); const models = require('../../../models'); -router.route('/').post(async (req, res) => { - // parse input - escaped to prevent SQL injection +const unlockAccount = async (req, res) => { + // parse input - escaped to prevent SQL injection // Sanatize username if(req.body.username){ @@ -14,26 +14,20 @@ router.route('/').post(async (req, res) => { // Find the user matching the username const login = await models.login.findOne({ where: { - username: { - [models.Sequelize.Op.iLike] : username - } + username: username }, attributes: ['id', 'username'], - include: [{ - model: models.user, - attributes: ['id'] - }] }); // Make sure we have the matching user if ((login && login.id) && (username === login.username)) { - // If approving user try { const updateduser = await login.update({ isActive: true, invalidAttempt: 9 }); if (updateduser) { - return res.status(200).json({status: '0', message: 'User has been set as active'}) + res.status(200); + return res.json({status: '0', message: 'User has been set as active'}) } else { return res.status(503).send(); } @@ -42,7 +36,8 @@ router.route('/').post(async (req, res) => { return res.status(503).send(); } } else { - return res.status(400).send(); + res.status(400); + return res.send(); } } catch (error) { console.log(error); @@ -50,6 +45,11 @@ router.route('/').post(async (req, res) => { } else { return res.status(400).send(); } +}; + +router.route('/').post(async (req, res) => { + await unlockAccount(req, res); }); module.exports = router; +module.exports.unlockAccount = unlockAccount; diff --git a/server/test/unit/routes/admin/unlock-account/index.spec.js b/server/test/unit/routes/admin/unlock-account/index.spec.js new file mode 100644 index 0000000000..f293d53947 --- /dev/null +++ b/server/test/unit/routes/admin/unlock-account/index.spec.js @@ -0,0 +1,70 @@ +const expect = require('chai').expect; +const sinon = require('sinon'); + +const models = require('../../../../../models/index'); + +const unlockAccount = require('../../../../../routes/admin/unlock-account') + +const user = { + username: 'fred123', + id: 12345, + isActive: false, + invalidAttempt: 10, + update: (args) => { + expect(args.isActive).to.deep.equal(true); + expect(args.invalidAttempt).to.deep.equal(9); + return true; + } +}; + +sinon.stub(models.login, 'findOne').callsFake(async (args) => { + if (args.where.username=== user.username) { + return user; + } else { + return null; + } +}); + +describe('unlock-account route', () => { + describe('unlockAccount()', () => { + it('should return with an unlocked account status', async() => { + const updateStatus = (status) => { + expect(status).to.deep.equal(200); + }; + const updateJson = (json) => { + expect(typeof(json)).to.deep.equal('object'); + expect(json.status).to.deep.equal('0'); + expect(json.message).to.deep.equal('User has been set as active'); + }; + await unlockAccount.unlockAccount({ + body: { + username: user.username + } + }, {status: updateStatus, json: updateJson, send: updateJson}); + }); + it('should not return with an unlocked account status if invalid username', async() => { + const updateStatus = (status) => { + expect(status).to.deep.equal(400); + }; + const updateJson = (json) => { + expect(json).to.deep.equal(); + }; + await unlockAccount.unlockAccount({ + body: { + username: user.username + '1' + } + }, {status: updateStatus, json: updateJson, send: updateJson}); + }); + it('should not return with an unlocked account status if no username', async() => { + const updateStatus = (status) => { + expect(status).to.deep.equal(503); + }; + const updateJson = (json) => { + expect(json).to.deep.equal(); + }; + await unlockAccount.unlockAccount({ + body: {}, + }, {status: updateStatus, json: updateJson, send: updateJson}); + }); + }); +}); From f6e6976d9692d5fe17b930dc2c19fc06b098335c Mon Sep 17 00:00:00 2001 From: Aaron Russell Date: Mon, 27 Jan 2020 10:51:09 +0000 Subject: [PATCH 016/305] Fixed unit test if user is not defined --- server/routes/admin/unlock-account/index.js | 9 ++++++--- .../test/unit/routes/admin/unlock-account/index.spec.js | 2 +- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/server/routes/admin/unlock-account/index.js b/server/routes/admin/unlock-account/index.js index df9360314b..3ed7024041 100644 --- a/server/routes/admin/unlock-account/index.js +++ b/server/routes/admin/unlock-account/index.js @@ -29,11 +29,13 @@ const unlockAccount = async (req, res) => { res.status(200); return res.json({status: '0', message: 'User has been set as active'}) } else { - return res.status(503).send(); + res.status(503) + return res.send(); } } catch(error) { console.error(error); - return res.status(503).send(); + res.status(503) + return res.send(); } } else { res.status(400); @@ -43,7 +45,8 @@ const unlockAccount = async (req, res) => { console.log(error); } } else { - return res.status(400).send(); + res.status(400) + return res.send(); } }; diff --git a/server/test/unit/routes/admin/unlock-account/index.spec.js b/server/test/unit/routes/admin/unlock-account/index.spec.js index f293d53947..ac87e7cb8b 100644 --- a/server/test/unit/routes/admin/unlock-account/index.spec.js +++ b/server/test/unit/routes/admin/unlock-account/index.spec.js @@ -57,7 +57,7 @@ describe('unlock-account route', () => { }); it('should not return with an unlocked account status if no username', async() => { const updateStatus = (status) => { - expect(status).to.deep.equal(503); + expect(status).to.deep.equal(400); }; const updateJson = (json) => { expect(json).to.deep.equal(); From 2997ccda384a3bcb24743e29bcc551ce3f8a4edd Mon Sep 17 00:00:00 2001 From: Aaron Russell Date: Tue, 1 Oct 2019 13:36:36 +0100 Subject: [PATCH 017/305] Fix for data attributes on the HTML --- .../file-validate-status/file-validate-status.component.ts | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/app/features/bulk-upload/file-validate-status/file-validate-status.component.ts b/src/app/features/bulk-upload/file-validate-status/file-validate-status.component.ts index 8d27ef3837..45d21a3440 100644 --- a/src/app/features/bulk-upload/file-validate-status/file-validate-status.component.ts +++ b/src/app/features/bulk-upload/file-validate-status/file-validate-status.component.ts @@ -1,10 +1,11 @@ -import { Component, Input } from '@angular/core'; +import { Component, Input, ViewEncapsulation } from '@angular/core'; import { FileValidateStatus } from '@core/model/bulk-upload.model'; @Component({ selector: 'app-file-validate-status', templateUrl: './file-validate-status.component.html', - styleUrls: ['./file-validate-status.component.scss'] + styleUrls: ['./file-validate-status.component.scss'], + encapsulation: ViewEncapsulation.None, }) export class FileValidateStatusComponent { public statusEnum = FileValidateStatus; From 15501be23690145a161ee002a3b2e73ad05787c1 Mon Sep 17 00:00:00 2001 From: Aaron Russell Date: Tue, 1 Oct 2019 13:36:59 +0100 Subject: [PATCH 018/305] Fix for spaces been in the file name when linking to them --- .../report-download-link/report-download-link.component.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/features/bulk-upload/report-download-link/report-download-link.component.ts b/src/app/features/bulk-upload/report-download-link/report-download-link.component.ts index 26ce0b9f5b..058f52191b 100644 --- a/src/app/features/bulk-upload/report-download-link/report-download-link.component.ts +++ b/src/app/features/bulk-upload/report-download-link/report-download-link.component.ts @@ -58,6 +58,6 @@ export class ReportDownloadLinkComponent { Training: 'TrainingResults.txt', Worker: 'StaffrecordsResults.txt', }; - return filenameMap[this.fileType]; + return encodeURI(filenameMap[this.fileType]); } } From b358fa69743e1fc511ad7013d8cab513b43846e5 Mon Sep 17 00:00:00 2001 From: Aaron Russell Date: Mon, 27 Jan 2020 12:22:15 +0000 Subject: [PATCH 019/305] Fixed encoding issue on file download --- .../uploaded-files-list/uploaded-files-list.component.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/features/bulk-upload/uploaded-files-list/uploaded-files-list.component.html b/src/app/features/bulk-upload/uploaded-files-list/uploaded-files-list.component.html index 063cd6abed..1f16452d7d 100644 --- a/src/app/features/bulk-upload/uploaded-files-list/uploaded-files-list.component.html +++ b/src/app/features/bulk-upload/uploaded-files-list/uploaded-files-list.component.html @@ -32,7 +32,7 @@ [class.govuk-!-padding-left-6]="file.errors" >

- + {{ file.filename }}

From 6349e26a9f2aae851a2d93aa5c5ee26459fd695f Mon Sep 17 00:00:00 2001 From: Aaron Russell Date: Mon, 27 Jan 2020 12:23:36 +0000 Subject: [PATCH 020/305] Added encode function --- .../uploaded-files-list/uploaded-files-list.component.ts | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/app/features/bulk-upload/uploaded-files-list/uploaded-files-list.component.ts b/src/app/features/bulk-upload/uploaded-files-list/uploaded-files-list.component.ts index 182a03c2dd..c80697c39b 100644 --- a/src/app/features/bulk-upload/uploaded-files-list/uploaded-files-list.component.ts +++ b/src/app/features/bulk-upload/uploaded-files-list/uploaded-files-list.component.ts @@ -210,6 +210,14 @@ export class UploadedFilesListComponent implements OnInit, OnDestroy { }); } + /** + * Encode the filename so we have valid HTML + * @param url string + */ + public encodeUrl(url: string): string { + return encodeURI(url); + } + /** * Set validate success update uploaded files * And then set total warnings and/or errors and status From 0b99ea9929381477600ab13be695a93f3396be48 Mon Sep 17 00:00:00 2001 From: Aaron Russell Date: Wed, 29 Jan 2020 16:31:12 +0000 Subject: [PATCH 021/305] Added rate limiting to username lookup endpoint --- package-lock.json | 173 ++++++++++++++++++++++++ package.json | 1 + server/config/config.js | 19 ++- server/routes/registration.js | 3 + server/utils/middleware/rateLimiting.js | 38 ++++++ 5 files changed, 233 insertions(+), 1 deletion(-) create mode 100644 server/utils/middleware/rateLimiting.js diff --git a/package-lock.json b/package-lock.json index 057bb4492c..b572b168d9 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1107,6 +1107,12 @@ "@types/jasmine": "*" } }, + "@types/mime-types": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/@types/mime-types/-/mime-types-2.1.0.tgz", + "integrity": "sha1-nKUs2jY/aZxpRmwqbM2q2RPqenM=", + "dev": true + }, "@types/minimatch": { "version": "3.0.3", "resolved": "https://registry.npmjs.org/@types/minimatch/-/minimatch-3.0.3.tgz", @@ -1826,6 +1832,17 @@ } } }, + "aws-sdk-mock": { + "version": "4.5.0", + "resolved": "https://registry.npmjs.org/aws-sdk-mock/-/aws-sdk-mock-4.5.0.tgz", + "integrity": "sha512-PAZKbQsdaVVoMr1JZbi04FUrkxCK16qnwBWLm4keeBrEfqYab/cFNsn5IVp/ThdMQpJGYHnmqUPyFq1plKaHZg==", + "dev": true, + "requires": { + "aws-sdk": "^2.483.0", + "sinon": "^7.3.2", + "traverse": "^0.6.6" + } + }, "aws-sign2": { "version": "0.7.0", "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz", @@ -4856,6 +4873,29 @@ } } }, + "extract-zip": { + "version": "1.6.7", + "resolved": "https://registry.npmjs.org/extract-zip/-/extract-zip-1.6.7.tgz", + "integrity": "sha1-qEC0uK9kAyZMjbV/Txp0Mz74H+k=", + "dev": true, + "requires": { + "concat-stream": "1.6.2", + "debug": "2.6.9", + "mkdirp": "0.5.1", + "yauzl": "2.4.1" + }, + "dependencies": { + "debug": { + "version": "2.6.9", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", + "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", + "dev": true, + "requires": { + "ms": "2.0.0" + } + } + } + }, "extsprintf": { "version": "1.3.0", "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz", @@ -4897,6 +4937,15 @@ "websocket-driver": ">=0.5.1" } }, + "fd-slicer": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.0.1.tgz", + "integrity": "sha1-i1vL2ewyfFBBv5qwI/1nUPEXfmU=", + "dev": true, + "requires": { + "pend": "~1.2.0" + } + }, "feature-policy": { "version": "0.3.0", "resolved": "https://registry.npmjs.org/feature-policy/-/feature-policy-0.3.0.tgz", @@ -13170,6 +13219,12 @@ "sha.js": "^2.4.8" } }, + "pend": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/pend/-/pend-1.2.0.tgz", + "integrity": "sha1-elfrVQpng/kRUzH89GY9XI4AelA=", + "dev": true + }, "performance-now": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz", @@ -13428,6 +13483,12 @@ "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz", "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==" }, + "progress": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/progress/-/progress-2.0.3.tgz", + "integrity": "sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==", + "dev": true + }, "prom-client": { "version": "11.5.3", "resolved": "https://registry.npmjs.org/prom-client/-/prom-client-11.5.3.tgz", @@ -13619,6 +13680,12 @@ "ipaddr.js": "1.9.0" } }, + "proxy-from-env": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.0.0.tgz", + "integrity": "sha1-M8UDmPcOp+uW0h97gXYwpVeRx+4=", + "dev": true + }, "prr": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/prr/-/prr-1.0.1.tgz", @@ -13692,6 +13759,87 @@ "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz", "integrity": "sha1-llOgNvt8HuQjQvIyXM7v6jkmxI0=" }, + "puppeteer": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/puppeteer/-/puppeteer-2.1.0.tgz", + "integrity": "sha512-PC4oKMtwAElo8YtS/cYnk2/dew/3TonsGKKzjpFLWwkhBCteFsOZCVOXTt2QlP6w53mH0YsJE+fPLPzOW+DCug==", + "dev": true, + "requires": { + "@types/mime-types": "^2.1.0", + "debug": "^4.1.0", + "extract-zip": "^1.6.6", + "https-proxy-agent": "^4.0.0", + "mime": "^2.0.3", + "mime-types": "^2.1.25", + "progress": "^2.0.1", + "proxy-from-env": "^1.0.0", + "rimraf": "^2.6.1", + "ws": "^6.1.0" + }, + "dependencies": { + "agent-base": { + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-5.1.1.tgz", + "integrity": "sha512-TMeqbNl2fMW0nMjTEPOwe3J/PRFP4vqeoNuQMG0HlMrtm5QxKqdvAkZ1pRBQ/ulIyDD5Yq0nJ7YbdD8ey0TO3g==", + "dev": true + }, + "debug": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz", + "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==", + "dev": true, + "requires": { + "ms": "^2.1.1" + } + }, + "https-proxy-agent": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-4.0.0.tgz", + "integrity": "sha512-zoDhWrkR3of1l9QAL8/scJZyLu8j/gBkcwcaQOZh7Gyh/+uJQzGVETdgT30akuwkpL8HTRfssqI3BZuV18teDg==", + "dev": true, + "requires": { + "agent-base": "5", + "debug": "4" + } + }, + "mime": { + "version": "2.4.4", + "resolved": "https://registry.npmjs.org/mime/-/mime-2.4.4.tgz", + "integrity": "sha512-LRxmNwziLPT828z+4YkNzloCFC2YM4wrB99k+AV5ZbEyfGNWfG8SO1FUXLmLDBSo89NrJZ4DIWeLjy1CHGhMGA==", + "dev": true + }, + "mime-db": { + "version": "1.43.0", + "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.43.0.tgz", + "integrity": "sha512-+5dsGEEovYbT8UY9yD7eE4XTc4UwJ1jBYlgaQQF38ENsKR3wj/8q8RFZrF9WIZpB2V1ArTVFUva8sAul1NzRzQ==", + "dev": true + }, + "mime-types": { + "version": "2.1.26", + "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.26.tgz", + "integrity": "sha512-01paPWYgLrkqAyrlDorC1uDwl2p3qZT7yl806vW7DvDoxwXi46jsjFbg+WdwotBIk6/MbEhO/dh5aZ5sNj/dWQ==", + "dev": true, + "requires": { + "mime-db": "1.43.0" + } + }, + "ms": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", + "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", + "dev": true + }, + "ws": { + "version": "6.2.1", + "resolved": "https://registry.npmjs.org/ws/-/ws-6.2.1.tgz", + "integrity": "sha512-GIyAXC2cB7LjvpgMt9EKS2ldqr0MTrORaleiOno6TweZ6r3TKtoFQWay/2PceJ3RuBasOHzXNn5Lrw1X0bEjqA==", + "dev": true, + "requires": { + "async-limiter": "~1.0.0" + } + } + } + }, "q": { "version": "1.4.1", "resolved": "https://registry.npmjs.org/q/-/q-1.4.1.tgz", @@ -13760,6 +13908,11 @@ "integrity": "sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==", "dev": true }, + "rate-limiter-flexible": { + "version": "1.3.2", + "resolved": "https://registry.npmjs.org/rate-limiter-flexible/-/rate-limiter-flexible-1.3.2.tgz", + "integrity": "sha512-f+xNvGn+52G4nZVok9VB3LTE1kfDmqbnWKRayX5n2k/LEQ7doWrYvzmzFVh7ltmLgwEdEzoYwxGaXlfCjFg4Ag==" + }, "raw-body": { "version": "2.4.1", "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.4.1.tgz", @@ -14195,6 +14348,11 @@ "integrity": "sha512-5C9HXdzK8EAqN7JDif30jqsBzavB7wLpaubisuQIGHWf2gUXSpzy6ArX/+Da8RjFpagWsCn+pIgxTMAmKw9Zug==", "dev": true }, + "rfr": { + "version": "1.2.3", + "resolved": "https://registry.npmjs.org/rfr/-/rfr-1.2.3.tgz", + "integrity": "sha1-57txkzft6XcJH68S6si2zS26kBE=" + }, "right-align": { "version": "0.1.3", "resolved": "https://registry.npmjs.org/right-align/-/right-align-0.1.3.tgz", @@ -15922,6 +16080,12 @@ } } }, + "traverse": { + "version": "0.6.6", + "resolved": "https://registry.npmjs.org/traverse/-/traverse-0.6.6.tgz", + "integrity": "sha1-y99WD9e5r2MlAv7UD5GMFX6pcTc=", + "dev": true + }, "tree-kill": { "version": "1.2.1", "resolved": "https://registry.npmjs.org/tree-kill/-/tree-kill-1.2.1.tgz", @@ -17294,6 +17458,15 @@ "yargs": "^13.3.0" } }, + "yauzl": { + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/yauzl/-/yauzl-2.4.1.tgz", + "integrity": "sha1-lSj0QtqxsihOWLQ3m7GU4i4MQAU=", + "dev": true, + "requires": { + "fd-slicer": "~1.0.1" + } + }, "yeast": { "version": "0.1.2", "resolved": "https://registry.npmjs.org/yeast/-/yeast-0.1.2.tgz", diff --git a/package.json b/package.json index 3aaebf8ac4..b55627e753 100644 --- a/package.json +++ b/package.json @@ -69,6 +69,7 @@ "passport-jwt": "^4.0.0", "pg": "^7.12.1", "pg-hstore": "^2.3.2", + "rate-limiter-flexible": "^1.3.2", "rfr": "^1.2.3", "rxjs": "^6.5.2", "rxjs-compat": "^6.5.2", diff --git a/server/config/config.js b/server/config/config.js index e25aec97d2..e63605698a 100644 --- a/server/config/config.js +++ b/server/config/config.js @@ -421,7 +421,24 @@ const config = convict({ env: 'TEST_ADMINPASSWORD' } } - } + }, + rateLimiting: { + points: { + doc: 'How many times you want allow a user to visit sensitive endpoints', + format: 'int', + default: 60 + }, + duration: { + doc: 'How long a peroid you want to monitor a user visiting endpoints', + format: 'int', + default: 1 * 60 * 60 // 1 hour + }, + table: { + doc: 'The table name you want to create/update to log user requests', + format: String, + default: 'SensitiveSessions' + } +} }); // Load environment dependent configuration diff --git a/server/routes/registration.js b/server/routes/registration.js index 4380ad60ba..52f4ad4b48 100644 --- a/server/routes/registration.js +++ b/server/routes/registration.js @@ -22,6 +22,7 @@ const generateJWT = require('../utils/security/generateJWT'); const passwordCheck = require('../utils/security/passwordValidation').isPasswordValid; const usernameCheck = require('../utils/security/usernameValidation').isUsernameValid; const sendMail = require('../utils/email/notify-email').sendPasswordReset; +const rateLimiting = require('../utils/middleware/rateLimiting').rateLimiting; // const pCodeCheck = require('../utils/postcodeSanitizer'); class RegistrationException { @@ -73,6 +74,8 @@ router.get('/username', (req, res) => { message: 'Username not found', }); }); + +router.use('/username/:username', rateLimiting); router.get('/username/:username', async (req, res) => { const requestedUsername = req.params.username.toLowerCase(); try { diff --git a/server/utils/middleware/rateLimiting.js b/server/utils/middleware/rateLimiting.js new file mode 100644 index 0000000000..005dd282c7 --- /dev/null +++ b/server/utils/middleware/rateLimiting.js @@ -0,0 +1,38 @@ +const models = require('../../models/'); +const {RateLimiterPostgres} = require('rate-limiter-flexible'); +const appConfig = require('../../config/config'); + +const opts = { + points: appConfig.get('rateLimiting.points'), + duration: appConfig.get('rateLimiting.duration'), + storeClient: models.sequelize, + tableName: appConfig.get('rateLimiting.table'), + keyPrefix: 'UsernameLookup' +}; + +const ready = (err) => { + if (err) { + console.error(err); + } else { + console.log('Created/Found table needed for rate limiting'); + } +}; + +const rateLimiter = new RateLimiterPostgres(opts, ready); + +exports.rateLimiting = (req, res, next) => { + rateLimiter.consume(req.ip, 1) + .then((rateLimiterRes) => { + const headers = { + "Retry-After": rateLimiterRes.msBeforeNext / 1000, + "X-RateLimit-Limit": opts.points, + "X-RateLimit-Remaining": rateLimiterRes.remainingPoints, + "X-RateLimit-Reset": new Date(Date.now() + rateLimiterRes.msBeforeNext) + }; + res.set(headers); + next(); + }) + .catch(() => { + res.status(429).send('Too Many Requests'); + }); +}; From 8d53b23d637d27ff13557c09450ada10fdd2f64f Mon Sep 17 00:00:00 2001 From: Aaron Russell Date: Thu, 30 Jan 2020 08:26:14 +0000 Subject: [PATCH 022/305] Changed it so the headers aren't set in production --- server/utils/middleware/rateLimiting.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/server/utils/middleware/rateLimiting.js b/server/utils/middleware/rateLimiting.js index 005dd282c7..7c00b2385f 100644 --- a/server/utils/middleware/rateLimiting.js +++ b/server/utils/middleware/rateLimiting.js @@ -29,7 +29,9 @@ exports.rateLimiting = (req, res, next) => { "X-RateLimit-Remaining": rateLimiterRes.remainingPoints, "X-RateLimit-Reset": new Date(Date.now() + rateLimiterRes.msBeforeNext) }; - res.set(headers); + if (appConfig.get('env') !== 'production') { + res.set(headers); + } next(); }) .catch(() => { From e47f85595607fe04a292c8a675229c8618d18d81 Mon Sep 17 00:00:00 2001 From: Aaron Russell Date: Thu, 30 Jan 2020 08:31:29 +0000 Subject: [PATCH 023/305] Revert "Changed it so the headers aren't set in production" This reverts commit 8d53b23d637d27ff13557c09450ada10fdd2f64f. --- server/utils/middleware/rateLimiting.js | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/server/utils/middleware/rateLimiting.js b/server/utils/middleware/rateLimiting.js index 7c00b2385f..005dd282c7 100644 --- a/server/utils/middleware/rateLimiting.js +++ b/server/utils/middleware/rateLimiting.js @@ -29,9 +29,7 @@ exports.rateLimiting = (req, res, next) => { "X-RateLimit-Remaining": rateLimiterRes.remainingPoints, "X-RateLimit-Reset": new Date(Date.now() + rateLimiterRes.msBeforeNext) }; - if (appConfig.get('env') !== 'production') { - res.set(headers); - } + res.set(headers); next(); }) .catch(() => { From 71becce157f7cc7b9beebe7276fb29d0d7050cba Mon Sep 17 00:00:00 2001 From: Aaron Russell Date: Thu, 30 Jan 2020 15:12:10 +0000 Subject: [PATCH 024/305] Show services that are null and what else they need --- server/routes/services.js | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/server/routes/services.js b/server/routes/services.js index 84c3da20d0..4fb42fef10 100644 --- a/server/routes/services.js +++ b/server/routes/services.js @@ -43,7 +43,9 @@ router.route('/byCategory') if (filterByCqc) { results = await models.services.findAll({ where: { - iscqcregistered: true, + iscqcregistered: { + [models.Sequelize.Op.or]: [true, null], + }, isMain: true }, order: [ @@ -54,18 +56,20 @@ router.route('/byCategory') } else { results = await models.services.findAll({ where: { - iscqcregistered: false, + iscqcregistered: { + [models.Sequelize.Op.or]: [false, null], + }, isMain: true }, order: [ ['category', 'ASC'], ['name', 'ASC'] ] - }); + }); } - + let servicesData = ServiceFormatters.createServicesByCategoryJSON(results); - + if (servicesData.length === 0) { return res.sendStatus(404); } else { @@ -132,7 +136,7 @@ function createServicesJSON(results){ serviceId: data.id, category: data.category, name: data.name, - other: data.other ? true : undefined + other: data.other ? true : undefined // cqcRegistered: data.iscqcregistered, // capacityQuestion: data.capacityquestion, // currentUptakeQuestion: data.currentuptakequestion From 17befe20b30d309a4ae8bdb972b4c08393f82291 Mon Sep 17 00:00:00 2001 From: Anurag Negi <55235060+Negi-Anurag@users.noreply.github.com> Date: Mon, 3 Feb 2020 14:45:11 +0530 Subject: [PATCH 025/305] Feature/locked user with error (#1948) * Added functionality to return 409 if user locked and 403 if user is pending also stopped sending reset password email if user is locked on POST :: /login API. (#1938) * login-error-messages (#1944) Co-authored-by: rchitranshi <53287302+rchitranshi@users.noreply.github.com> --- server/models/classes/user.js | 5 ++-- server/routes/login.js | 36 +++++++++++++++++------ src/app/features/login/login.component.ts | 14 +++++---- 3 files changed, 39 insertions(+), 16 deletions(-) diff --git a/server/models/classes/user.js b/server/models/classes/user.js index e085e3431c..48f913c6f8 100644 --- a/server/models/classes/user.js +++ b/server/models/classes/user.js @@ -952,7 +952,7 @@ class User { include: [ { model: models.login, - attributes: ['username', 'lastLogin'], + attributes: ['username', 'lastLogin', 'status'], }, ], attributes: [ @@ -981,11 +981,12 @@ class User { updated: thisUser.updated.toJSON(), updatedBy: thisUser.updatedBy, isPrimary: thisUser.isPrimary ? true : false, + status: thisUser.login && thisUser.login.status ? thisUser.login.status : null }); }); allUsers = allUsers.map(user => { - return Object.assign(user, { status: user.username == null ? 'Pending' : 'Active' }); + return Object.assign(user, { status: user.username == null ? 'Pending' : (user.status !== null)? user.status: 'Active' }); }); allUsers.sort((a, b) => { diff --git a/server/routes/login.js b/server/routes/login.js index 183b34442a..86d4623060 100644 --- a/server/routes/login.js +++ b/server/routes/login.js @@ -38,10 +38,9 @@ router.post('/', async (req, res) => { try { let establishmentUser = givenEstablishmentUid === null ? await models.login.findOne({ where: { - username: givenUsername, - isActive:true + username: givenUsername }, - attributes: ['id', 'username', 'isActive', 'invalidAttempt', 'registrationId', 'firstLogin', 'Hash', 'lastLogin', 'tribalHash', 'tribalSalt', 'agreedUpdatedTerms'], + attributes: ['id', 'username', 'isActive', 'invalidAttempt', 'registrationId', 'firstLogin', 'Hash', 'lastLogin', 'tribalHash', 'tribalSalt', 'agreedUpdatedTerms', 'status'], include: [ { model: models.user, attributes: ['id', 'uid', 'FullNameValue', 'EmailValue', 'isPrimary', 'establishmentId', "UserRoleValue", 'tribalId'], @@ -61,10 +60,9 @@ router.post('/', async (req, res) => { // before returning error, check to see if this is a superadmin user with a given establishment UID, to be assumed as their "logged in session" primary establishment establishmentUser = await models.login.findOne({ where: { - username: givenUsername, - isActive:true, + username: givenUsername }, - attributes: ['id', 'username', 'isActive', 'invalidAttempt', 'registrationId', 'firstLogin', 'Hash', 'lastLogin', 'tribalHash', 'tribalSalt', 'agreedUpdatedTerms'], + attributes: ['id', 'username', 'isActive', 'invalidAttempt', 'registrationId', 'firstLogin', 'Hash', 'lastLogin', 'tribalHash', 'tribalSalt', 'agreedUpdatedTerms', 'status'], include: [ { model: models.user, attributes: ['id', 'uid', 'FullNameValue', 'EmailValue', 'isPrimary', 'establishmentId', "UserRoleValue", 'tribalId'], @@ -109,6 +107,23 @@ router.post('/', async (req, res) => { } } + //check weather posted user is locked or pending + if(establishmentUser){ + if(!establishmentUser.isActive && establishmentUser.status === 'Locked'){ + //check for locked status, if locked then return with 409 error + console.error(`POST .../login failed: User status is locked`); + return res.status(409).send({ + message: 'Authentication failed.', + }); + } else if(!establishmentUser.isActive && establishmentUser.status === 'PENDING'){ + //check for Pending status, if Pending then return with 403 error + console.error(`POST .../login failed: User status is pending`); + return res.status(405).send({ + message: 'Authentication failed.', + }); + } + } + // if this found login account is a migrated tribal account, and there is no current hash, then // we need to first validate password using tribal hashing let tribalErr = null; @@ -218,7 +233,8 @@ router.post('/', async (req, res) => { if (establishmentUser.invalidAttempt === (maxNumberOfFailedAttempts+1)) { // lock the account const loginUpdate = { - isActive: false + isActive: false, + status: 'Locked' }; await establishmentUser.update(loginUpdate, {transaction: t}); @@ -238,9 +254,11 @@ router.post('/', async (req, res) => { const resetLink = `${req.protocol}://${req.get('host')}/api/registration/validateResetPassword?reset=${requestUuid}`; - // send email to recipient with the reset UUID + // send email to recipient with the reset UUID if user is not locked try { - await sendMail(establishmentUser.user.EmailValue, establishmentUser.user.FullNameValue, requestUuid); + if(establishmentUser.isActive && establishmentUser.status !== 'Locked'){ + await sendMail(establishmentUser.user.EmailValue, establishmentUser.user.FullNameValue, requestUuid); + } } catch (err) { console.error(err); } diff --git a/src/app/features/login/login.component.ts b/src/app/features/login/login.component.ts index c3b4a42370..8cda7fb78c 100644 --- a/src/app/features/login/login.component.ts +++ b/src/app/features/login/login.component.ts @@ -79,11 +79,7 @@ export class LoginComponent implements OnInit, OnDestroy, AfterViewInit { { name: 401, message: - 'Please Note
' + - 'Your username / password is incorrect ' + - '(please consider resetting your password now, 5 incorrect attempts will lock your account)
' + - 'Or
' + - 'Your registration request is awaiting approval (contact support)', + 'Your username/password is incorrect', }, { name: 404, @@ -93,6 +89,14 @@ export class LoginComponent implements OnInit, OnDestroy, AfterViewInit { name: 503, message: 'Unable to authenticate user.', }, + { + name: 409, + message: 'There is a problem with your account, please contact support on 0113 241 0969', + }, + { + name: 405, + message: 'Your registration request is awaiting approval, please contact support on 0113 241 0969', + } ]; } From 939de600fabd3051dae3526cdd9dd46f3dc837f3 Mon Sep 17 00:00:00 2001 From: Aaron Russell Date: Wed, 5 Feb 2020 12:15:33 +0000 Subject: [PATCH 026/305] Updated for unit test on allJobs --- .../models/BulkImport/csv/establishments.js | 184 +- .../Bulkimport/csv/establishments.spec.js | 1940 +++++++++++------ 2 files changed, 1332 insertions(+), 792 deletions(-) diff --git a/server/models/BulkImport/csv/establishments.js b/server/models/BulkImport/csv/establishments.js index f973435086..34a1970aee 100644 --- a/server/models/BulkImport/csv/establishments.js +++ b/server/models/BulkImport/csv/establishments.js @@ -845,65 +845,69 @@ class Establishment { } async _validateLocationID () { - // must be given if "share with CQC" - but if given must be in the format "n-nnnnnnnnn" - const locationIDRegex = /^[0-9]{1}-[0-9]{8,10}$/; - const myLocationID = this._currentLine.LOCATIONID; - - // do not use - const mainServiceIsHeadOffice = parseInt(this._currentLine.MAINSERVICE, 10) === 72; - const locationExists = await models.establishment.findAll({ - where: { - locationId: myLocationID - } - }); - if (this._regType === 2) { - // ignore location i - if (!mainServiceIsHeadOffice) { - if (!myLocationID || myLocationID.length === 0) { - this._validationErrors.push({ - lineNumber: this._lineNumber, - errCode: Establishment.LOCATION_ID_ERROR, - errType: 'LOCATION_ID_ERROR', - error: 'LOCATIONID has not been supplied', - source: myLocationID, - name: this._currentLine.LOCALESTID - }); - return false; - } else if (!locationIDRegex.test(myLocationID)) { - this._validationErrors.push({ - lineNumber: this._lineNumber, - errCode: Establishment.LOCATION_ID_ERROR, - errType: 'LOCATION_ID_ERROR', - error: 'LOCATIONID is incorrectly formatted', - source: myLocationID, - name: this._currentLine.LOCALESTID - }); - return false; - } else if (locationExists.length > 0) { - this._validationErrors.push({ - lineNumber: this._lineNumber, - errCode: Establishment.LOCATION_ID_ERROR, - errType: 'LOCATION_ID_ERROR', - error: 'LOCATIONID already exists in ASC-WDS please contact Support on 0113 241 0969', - source: myLocationID, - name: this._currentLine.LOCALESTID - }); - return false; + try { + // must be given if "share with CQC" - but if given must be in the format "n-nnnnnnnnn" + const locationIDRegex = /^[0-9]{1}-[0-9]{8,10}$/; + const myLocationID = this._currentLine.LOCATIONID; + + // do not use + const mainServiceIsHeadOffice = parseInt(this._currentLine.MAINSERVICE, 10) === 72; + const locationExists = await models.establishment.findAll({ + where: { + locationId: myLocationID } - } - - this._locationID = myLocationID; - return true; - } else if (this._regType === 0 && myLocationID && myLocationID.length > 0) { - this._validationErrors.push({ - lineNumber: this._lineNumber, - warnCode: Establishment.LOCATION_ID_WARNING, - warnType: 'LOCATION_ID_WARNING', - warning: 'LOCATIONID will be ignored as not required for this REGTYPE', - source: myLocationID, - name: this._currentLine.LOCALESTID }); - return false; + if (this._regType === 2) { + // ignore location i + if (!mainServiceIsHeadOffice) { + if (!myLocationID || myLocationID.length === 0) { + this._validationErrors.push({ + lineNumber: this._lineNumber, + errCode: Establishment.LOCATION_ID_ERROR, + errType: 'LOCATION_ID_ERROR', + error: 'LOCATIONID has not been supplied', + source: myLocationID, + name: this._currentLine.LOCALESTID + }); + return false; + } else if (!locationIDRegex.test(myLocationID)) { + this._validationErrors.push({ + lineNumber: this._lineNumber, + errCode: Establishment.LOCATION_ID_ERROR, + errType: 'LOCATION_ID_ERROR', + error: 'LOCATIONID is incorrectly formatted', + source: myLocationID, + name: this._currentLine.LOCALESTID + }); + return false; + } else if (locationExists.length > 0) { + this._validationErrors.push({ + lineNumber: this._lineNumber, + errCode: Establishment.LOCATION_ID_ERROR, + errType: 'LOCATION_ID_ERROR', + error: 'LOCATIONID already exists in ASC-WDS please contact Support on 0113 241 0969', + source: myLocationID, + name: this._currentLine.LOCALESTID + }); + return false; + } + } + + this._locationID = myLocationID; + return true; + } else if (this._regType === 0 && myLocationID && myLocationID.length > 0) { + this._validationErrors.push({ + lineNumber: this._lineNumber, + warnCode: Establishment.LOCATION_ID_WARNING, + warnType: 'LOCATION_ID_WARNING', + warning: 'LOCATIONID will be ignored as not required for this REGTYPE', + source: myLocationID, + name: this._currentLine.LOCALESTID + }); + return false; + } + } catch (error) { + throw new Error(error); } } @@ -1324,9 +1328,16 @@ class Establishment { const vacancies = this._currentLine.VACANCIES.split(';'); const starters = this._currentLine.STARTERS.split(';'); const leavers = this._currentLine.LEAVERS.split(';'); + const myRegType = parseInt(this._currentLine.REGTYPE, 10); const regManager = 4; - const isCQCRegulated = this._regType === 2; + const isCQCRegulated = myRegType === 2; + + const hasRegisteredManagerVacancy = () => { + return allJobs.map((job, index) => { + if (parseInt(job, 10) === regManager && parseInt(vacancies[index], 10) > 0) return true; + }); + }; // allJobs can only be empty, if TOTALPERMTEMP is 0 if (!this._currentLine.ALLJOBROLES || this._currentLine.ALLJOBROLES.length === 0) { @@ -1373,38 +1384,29 @@ class Establishment { name: this._currentLine.LOCALESTID }); } + if (!isCQCRegulated && hasRegisteredManagerVacancy()) { + localValidationErrors.push({ + lineNumber: this._lineNumber, + warnCode: Establishment.ALL_JOBS_WARNING, + warnType: 'ALL_JOBS_WARNING', + warning: 'Vacancy for Registered Manager should not be included for this service and will be ignored', + source: this._currentLine.ALLJOBROLES, + name: this._currentLine.LOCALESTID + }); + } } - const hasRegisteredManagerVacancy = () => { - allJobs.map((job, index) => { - if (parseInt(job, 10) === regManager && parseInt(vacancies[index], 10) > 0) return true; - }); - return false; - }; - // Need to add if they currently have a registered manager - if (this._currentLine.ALLJOBROLES && this._currentLine.ALLJOBROLES.length > 0 && isCQCRegulated && !hasRegisteredManagerVacancy()) { - localValidationErrors.push({ - lineNumber: this._lineNumber, - errCode: Establishment.ALL_JOBS_ERROR, - errType: 'ALL_JOBS_ERROR', - error: 'You do not have a staff record for a Registered Manager therefore must record a vacancy for one', - source: this._currentLine.ALLJOBROLES, - name: this._currentLine.LOCALESTID - }); - } - - if (this._currentLine.ALLJOBROLES && this._currentLine.ALLJOBROLES.length > 0 && !isCQCRegulated && !hasRegisteredManagerVacancy()) { - localValidationErrors.push({ - lineNumber: this._lineNumber, - warnCode: Establishment.ALL_JOBS_WARNING, - warnType: 'ALL_JOBS_WARNING', - warning: 'Vacancy for Registered Manager should not be included for this service and will be ignored', - source: this._currentLine.ALLJOBROLES, - name: this._currentLine.LOCALESTID - }); - } - + // if (this._currentLine.ALLJOBROLES && this._currentLine.ALLJOBROLES.length > 0 && isCQCRegulated && !hasRegisteredManagerVacancy()) { + // localValidationErrors.push({ + // lineNumber: this._lineNumber, + // errCode: Establishment.ALL_JOBS_ERROR, + // errType: 'ALL_JOBS_ERROR', + // error: 'You do not have a staff record for a Registered Manager therefore must record a vacancy for one', + // source: this._currentLine.ALLJOBROLES, + // name: this._currentLine.LOCALESTID + // }); + // } if (localValidationErrors.length > 0) { localValidationErrors.forEach(thisValidation => this._validationErrors.push(thisValidation)); return false; @@ -1515,9 +1517,11 @@ class Establishment { this._leavers = leavers.map(thisCount => parseInt(thisCount, 10)); // remove RM vacancy - this._allJobs.map((job, index) => { - if (job === regManager && this._vacancies[index] > 0) this._vacancies[index] = 0; - }); + if (this._allJobs && this._allJobs.length) { + this._allJobs.map((job, index) => { + if (job === regManager && this._vacancies[index] > 0) this._vacancies[index] = 0; + }); + } if (localValidationErrors.length > 0) { localValidationErrors.forEach(thisValidation => this._validationErrors.push(thisValidation)); diff --git a/server/test/unit/models/Bulkimport/csv/establishments.spec.js b/server/test/unit/models/Bulkimport/csv/establishments.spec.js index 94c68335d5..aac8a3379b 100644 --- a/server/test/unit/models/Bulkimport/csv/establishments.spec.js +++ b/server/test/unit/models/Bulkimport/csv/establishments.spec.js @@ -12,6 +12,22 @@ const ALL_UTILISATIONS = null; const BUDI_TO_ASC = 100; const BUSI_FROM_ASC = 200; +const establishment = [{ + locationId: '1-2111759818' +}]; + +const models = { + establishment: { + async findAll(args) { + if (args.where.locationId === establishment.locationId) { + return establishment; + } else { + return []; + } + } + } +}; + const BUDI = { contractType (direction, originalCode) { const fixedMapping = [ @@ -212,6 +228,9 @@ const getUnitInstance = () => { require: testUtils.wrapRequire({ '../BUDI': { BUDI + }, + '../../index': { + models } }) } @@ -222,6 +241,10 @@ const getUnitInstance = () => { expect(bulkUpload.Establishment).to.be.a('function'); + expect(BUDI.contractType).to.be.a('function'); + + expect(models.establishment.findAll).to.be.a('function'); + return new (bulkUpload.Establishment)(); }; @@ -445,6 +468,9 @@ describe('/server/models/Bulkimport/csv/establishment.js', () => { require: testUtils.wrapRequire({ '../BUDI': { BUDI + }, + '../../index': { + establishment: models.establishment } }) } @@ -475,10 +501,10 @@ describe('/server/models/Bulkimport/csv/establishment.js', () => { SERVICEUSERS: '', OTHERUSERDESC: '', TOTALPERMTEMP: '1', - ALLJOBROLES: '34;8', - STARTERS: '0;0', - LEAVERS: '999', - VACANCIES: '999;333', + ALLJOBROLES: '34;8;4', + STARTERS: '0;0;0', + LEAVERS: '999;0;0', + VACANCIES: '999;333;1', REASONS: '', REASONNOS: '' }, @@ -501,7 +527,7 @@ describe('/server/models/Bulkimport/csv/establishment.js', () => { _town: 'My Town', _county: '', _locationId: 'A-328849599', - _provId: null, + _provId: 'A-328849599', _postcode: 'LN11 9JG', _isRegulated: false, _mainService: { id: 16, name: 'Head office services' }, @@ -617,6 +643,9 @@ describe('/server/models/Bulkimport/csv/establishment.js', () => { require: testUtils.wrapRequire({ '../BUDI': { BUDI + }, + '../../index': { + establishment: models.establishment } }) } @@ -647,10 +676,10 @@ describe('/server/models/Bulkimport/csv/establishment.js', () => { SERVICEUSERS: '', OTHERUSERDESC: '', TOTALPERMTEMP: '1', - ALLJOBROLES: '34;8', - STARTERS: '0;0', - LEAVERS: '999', - VACANCIES: '999;333', + ALLJOBROLES: '34;8;4', + STARTERS: '0;0;0', + LEAVERS: '999;0;0', + VACANCIES: '999;333;1', REASONS: '', REASONNOS: '' }, @@ -770,8 +799,7 @@ describe('/server/models/Bulkimport/csv/establishment.js', () => { expect(validationErrors).to.deep.equal([]); }); - - it('should emit an error if SLV is greater than zero and this ALLJOBROLES is blank', async () => { + it('should not emit an error if REGTYPE is 2 (CQC) but a CQC regulated main service has been specified', async () => { const bulkUpload = new (testUtils.sandBox( filename, { @@ -779,6 +807,9 @@ describe('/server/models/Bulkimport/csv/establishment.js', () => { require: testUtils.wrapRequire({ '../BUDI': { BUDI + }, + '../../index': { + establishment: models.establishment } }) } @@ -798,18 +829,18 @@ describe('/server/models/Bulkimport/csv/establishment.js', () => { PERMCQC: '1', PERMLA: '1', SHARELA: '708;721;720', - REGTYPE: '0', - PROVNUM: '', - LOCATIONID: '', - MAINSERVICE: '72', - ALLSERVICES: '72;13', + REGTYPE: '2', + PROVNUM: '1-123456789', + LOCATIONID: '1-123456789', + MAINSERVICE: '8', + ALLSERVICES: '12;13', CAPACITY: '0;0', UTILISATION: '0;0', SERVICEDESC: '1;1', SERVICEUSERS: '', OTHERUSERDESC: '', - TOTALPERMTEMP: '10', - ALLJOBROLES: '', + TOTALPERMTEMP: '1', + ALLJOBROLES: '34;8', STARTERS: '0;0', LEAVERS: '999', VACANCIES: '999;333', @@ -914,8 +945,8 @@ describe('/server/models/Bulkimport/csv/establishment.js', () => { _readyForDeletionWorkers: null, _status: 'COMPLETE', _logLevel: 300 - }] - ); + } + ]); expect(bulkUpload).to.have.property('validate'); @@ -930,20 +961,9 @@ describe('/server/models/Bulkimport/csv/establishment.js', () => { // assert a warning was returned - expect(validationErrors).to.deep.equal([{ - lineNumber: 2, - name: 'omar3', - origin: 'Establishments', - source: '', - errCode: 1280, - errType: 'ALL_JOBS_ERROR', - error: 'ALLJOBROLES cannot be blank as you have STARTERS, LEAVERS, VACANCIES greater than zero' - }]); + expect(validationErrors).to.deep.equal([]); }); - }); - - describe('cross entity validations', () => { - it('should emit a warning if there are zero staff', async () => { + it('should emit an error if REGTYPE is not 2 (CQC) but a registered manager vacancy has been specified', async () => { const bulkUpload = new (testUtils.sandBox( filename, { @@ -951,6 +971,9 @@ describe('/server/models/Bulkimport/csv/establishment.js', () => { require: testUtils.wrapRequire({ '../BUDI': { BUDI + }, + '../../index': { + establishment: models.establishment } }) } @@ -958,7 +981,7 @@ describe('/server/models/Bulkimport/csv/establishment.js', () => { ).Establishment)( { LOCALESTID: 'omar3', - STATUS: 'UPDATE', + STATUS: 'NEW', ESTNAME: 'WOZiTech, with even more care', ADDRESS1: 'First Line', ADDRESS2: 'Second Line', @@ -973,18 +996,18 @@ describe('/server/models/Bulkimport/csv/establishment.js', () => { REGTYPE: '0', PROVNUM: '', LOCATIONID: '', - MAINSERVICE: '72', - ALLSERVICES: '72;13', - CAPACITY: '', - UTILISATION: '', + MAINSERVICE: '12', + ALLSERVICES: '12;13', + CAPACITY: '0;0', + UTILISATION: '0;0', SERVICEDESC: '1;1', SERVICEUSERS: '', OTHERUSERDESC: '', - TOTALPERMTEMP: '0', - ALLJOBROLES: '34;8', - STARTERS: '0;0', - LEAVERS: '999', - VACANCIES: '999;333', + TOTALPERMTEMP: '1', + ALLJOBROLES: '34;8;4', + STARTERS: '0;0;0', + LEAVERS: '999;0;0', + VACANCIES: '999;333;1', REASONS: '', REASONNOS: '' }, @@ -1006,7 +1029,7 @@ describe('/server/models/Bulkimport/csv/establishment.js', () => { _address3: '', _town: 'My Town', _county: '', - _locationId: 'A-328849599', + _locationId: null, _provId: null, _postcode: 'LN11 9JG', _isRegulated: false, @@ -1089,688 +1112,1201 @@ describe('/server/models/Bulkimport/csv/establishment.js', () => { } ]); - expect(bulkUpload).to.have.property('crossValidate'); + expect(bulkUpload).to.have.property('validate'); const csvEstablishmentSchemaErrors = []; const myWorkers = []; - // the real version of this code is in the api Establishment business object and runs a sql query. - // We just return a 'fake result set' - const fetchMyEstablishmentsWorkers = sinon.spy(async (establishmentId, establishmentKey) => { - return []; - }); - - // Regular validation has to run first for the establishment to populate the internal properties correctly + // call the validation to ensure the proper error is shown await bulkUpload.validate(); - // call the method - await bulkUpload.crossValidate({ - csvEstablishmentSchemaErrors, - myWorkers, - fetchMyEstablishmentsWorkers - }); - - // assert the fetchMyEstalishmentsWorkers function was called - expect(fetchMyEstablishmentsWorkers.callCount).to.equal(1); + const validationErrors = bulkUpload.validationErrors; // assert a warning was returned - expect(csvEstablishmentSchemaErrors.length).to.equal(1); - - expect(csvEstablishmentSchemaErrors[0]).to.deep.equal({ - lineNumber: 2, - name: 'omar3', - origin: 'Establishments', - source: '0', - warnCode: 2200, - warnType: 'TOTAL_PERM_TEMP_WARNING', - warning: 'The number of employed staff is 0 please check your staff records' - }); - }); - it('should emit a warning if there are no direct care staff', async () => { - const bulkUpload = new (testUtils.sandBox( - filename, + expect(validationErrors).to.deep.equal([ { - locals: { - require: testUtils.wrapRequire({ - '../BUDI': { - BUDI - } - }) - } + origin: 'Establishments', + lineNumber: 2, + warnCode: 2180, + warnType: 'ALL_JOBS_WARNING', + warning: 'Vacancy for Registered Manager should not be included for this service and will be ignored', + source: '34;8;4', + name: 'omar3' } - ).Establishment)( - { - LOCALESTID: 'omar3', - STATUS: 'UPDATE', - ESTNAME: 'WOZiTech, with even more care', - ADDRESS1: 'First Line', - ADDRESS2: 'Second Line', - ADDRESS3: '', - POSTTOWN: 'My Town', - POSTCODE: 'LN11 9JG', - ESTTYPE: '6', - OTHERTYPE: '', - PERMCQC: '1', - PERMLA: '1', - SHARELA: '708;721;720', - REGTYPE: '2', - PROVNUM: '', - LOCATIONID: '', - MAINSERVICE: '72', - ALLSERVICES: '72;13', - CAPACITY: '', - UTILISATION: '', - SERVICEDESC: '1;1', - SERVICEUSERS: '', - OTHERUSERDESC: '', - TOTALPERMTEMP: '1', - ALLJOBROLES: '34;8', - STARTERS: '0;0', - LEAVERS: '999', - VACANCIES: '999;333', - REASONS: '', - REASONNOS: '' - }, - 2, - [ + ]); + }); + it('should not emit an error if REGTYPE is 2 (CQC) but a registered manager vacancy has been specified', async () => { + const bulkUpload = new (testUtils.sandBox( + filename, { - _validations: [], - _username: 'aylingw', - _id: 479, - _uid: '98a83eef-e1e1-49f3-89c5-b1287a3cc8dd', - _ustatus: null, - _created: '2019-03-15T09:54:10.562Z', - _updated: '2019-10-04T15:46:16.158Z', - _updatedBy: 'aylingw', - _auditEvents: null, - _name: 'WOZiTech, with even more care', - _address1: 'First Line', - _address2: 'Second Line', - _address3: '', - _town: 'My Town', - _county: '', - _locationId: 'A-328849599', - _provId: null, - _postcode: 'LN11 9JG', - _isRegulated: false, - _mainService: { id: 16, name: 'Head office services' }, - _nmdsId: 'G1001114', - _lastWdfEligibility: '2019-08-16T07:17:38.014Z', - _overallWdfEligibility: '2019-08-16T07:17:38.340Z', - _establishmentWdfEligibility: null, - _staffWdfEligibility: '2019-08-13T12:41:24.836Z', - _isParent: true, - _parentUid: null, - _parentId: null, - _parentName: null, - _dataOwner: 'Workplace', - _dataPermissions: 'None', - _archived: false, - _dataOwnershipRequested: null, - _reasonsForLeaving: '', - _properties: { - _properties: [Object], - _propertyTypes: [Array], - _auditEvents: null, - _modifiedProperties: [], - _additionalModels: null - }, - _isNew: false, - _workerEntities: { - }, - _readyForDeletionWorkers: null, - _status: 'NEW', - _logLevel: 300 - }, + locals: { + require: testUtils.wrapRequire({ + '../BUDI': { + BUDI + }, + '../../index': { + establishment: models.establishment + } + }) + } + } + ).Establishment)( { - _validations: [], - _username: 'aylingw', - _id: 1446, - _uid: 'a415435f-40f2-4de5-abf7-bff611e85591', - _ustatus: null, - _created: '2019-07-31T15:09:57.405Z', - _updated: '2019-10-04T15:46:16.797Z', - _updatedBy: 'aylingw', - _auditEvents: null, - _name: 'WOZiTech Cares Sub 100', - _address1: 'Number 1', - _address2: 'My street', - _address3: '', - _town: 'My Town', - _county: '', - _locationId: '1-888777666', - _provId: '1-999888777', - _postcode: 'LN11 9JG', - _isRegulated: true, - _mainService: { id: 1, name: 'Carers support' }, - _nmdsId: 'G1002110', - _lastWdfEligibility: '2019-10-04T15:46:16.797Z', - _overallWdfEligibility: null, - _establishmentWdfEligibility: '2019-10-04T14:46:16.797Z', - _staffWdfEligibility: null, - _isParent: false, - _parentUid: '98a83eef-e1e1-49f3-89c5-b1287a3cc8dd', - _parentId: 479, - _parentName: null, - _dataOwner: 'Parent', - _dataPermissions: 'None', - _archived: false, - _dataOwnershipRequested: null, - _reasonsForLeaving: '', - _properties: { - _properties: [Object], - _propertyTypes: [Array], + LOCALESTID: 'omar3', + STATUS: 'NEW', + ESTNAME: 'WOZiTech, with even more care', + ADDRESS1: 'First Line', + ADDRESS2: 'Second Line', + ADDRESS3: '', + POSTTOWN: 'My Town', + POSTCODE: 'LN11 9JG', + ESTTYPE: '6', + OTHERTYPE: '', + PERMCQC: '1', + PERMLA: '1', + SHARELA: '708;721;720', + REGTYPE: '2', + PROVNUM: '1-12345678', + LOCATIONID: '1-12345678', + MAINSERVICE: '8', + ALLSERVICES: '12;13', + CAPACITY: '0;0', + UTILISATION: '0;0', + SERVICEDESC: '1;1', + SERVICEUSERS: '', + OTHERUSERDESC: '', + TOTALPERMTEMP: '1', + ALLJOBROLES: '34;8;4', + STARTERS: '0;0;0', + LEAVERS: '999;0;0', + VACANCIES: '999;333;1', + REASONS: '', + REASONNOS: '' + }, + 2, + [ + { + _validations: [], + _username: 'aylingw', + _id: 479, + _uid: '98a83eef-e1e1-49f3-89c5-b1287a3cc8dd', + _ustatus: null, + _created: '2019-03-15T09:54:10.562Z', + _updated: '2019-10-04T15:46:16.158Z', + _updatedBy: 'aylingw', _auditEvents: null, - _modifiedProperties: [], - _additionalModels: null + _name: 'WOZiTech, with even more care', + _address1: 'First Line', + _address2: 'Second Line', + _address3: '', + _town: 'My Town', + _county: '', + _locationId: null, + _provId: null, + _postcode: 'LN11 9JG', + _isRegulated: false, + _mainService: { id: 16, name: 'Head office services' }, + _nmdsId: 'G1001114', + _lastWdfEligibility: '2019-08-16T07:17:38.014Z', + _overallWdfEligibility: '2019-08-16T07:17:38.340Z', + _establishmentWdfEligibility: null, + _staffWdfEligibility: '2019-08-13T12:41:24.836Z', + _isParent: true, + _parentUid: null, + _parentId: null, + _parentName: null, + _dataOwner: 'Workplace', + _dataPermissions: 'None', + _archived: false, + _dataOwnershipRequested: null, + _reasonsForLeaving: '', + _properties: { + _properties: [Object], + _propertyTypes: [Array], + _auditEvents: null, + _modifiedProperties: [], + _additionalModels: null + }, + _isNew: false, + _workerEntities: { + }, + _readyForDeletionWorkers: null, + _status: 'NEW', + _logLevel: 300 }, - _isNew: false, - _workerEntities: {}, - _readyForDeletionWorkers: null, - _status: 'COMPLETE', - _logLevel: 300 - } - ]); + { + _validations: [], + _username: 'aylingw', + _id: 1446, + _uid: 'a415435f-40f2-4de5-abf7-bff611e85591', + _ustatus: null, + _created: '2019-07-31T15:09:57.405Z', + _updated: '2019-10-04T15:46:16.797Z', + _updatedBy: 'aylingw', + _auditEvents: null, + _name: 'WOZiTech Cares Sub 100', + _address1: 'Number 1', + _address2: 'My street', + _address3: '', + _town: 'My Town', + _county: '', + _locationId: '1-888777666', + _provId: '1-999888777', + _postcode: 'LN11 9JG', + _isRegulated: true, + _mainService: { id: 1, name: 'Carers support' }, + _nmdsId: 'G1002110', + _lastWdfEligibility: '2019-10-04T15:46:16.797Z', + _overallWdfEligibility: null, + _establishmentWdfEligibility: '2019-10-04T14:46:16.797Z', + _staffWdfEligibility: null, + _isParent: false, + _parentUid: '98a83eef-e1e1-49f3-89c5-b1287a3cc8dd', + _parentId: 479, + _parentName: null, + _dataOwner: 'Parent', + _dataPermissions: 'None', + _archived: false, + _dataOwnershipRequested: null, + _reasonsForLeaving: '', + _properties: { + _properties: [Object], + _propertyTypes: [Array], + _auditEvents: null, + _modifiedProperties: [], + _additionalModels: null + }, + _isNew: false, + _workerEntities: {}, + _readyForDeletionWorkers: null, + _status: 'COMPLETE', + _logLevel: 300 + } + ]); - expect(bulkUpload).to.have.property('crossValidate'); + expect(bulkUpload).to.have.property('validate'); - const csvEstablishmentSchemaErrors = []; + const csvEstablishmentSchemaErrors = []; - const myWorkers = [{ - establishmentKey: 'omar3', - status: 'UPDATE', - uniqueWorker: '3', - contractTypeId: 1, - mainJobRoleId: 1, - otherJobIds: [] - }]; - - // the real version of this code is in the api Establishment business object and runs a sql query. - // We just return a 'fake result set' - const fetchMyEstablishmentsWorkers = sinon.spy(async (establishmentId, establishmentKey) => { - return []; - }); + const myWorkers = []; - // Regular validation has to run first for the establishment to populate the internal properties correctly - await bulkUpload.validate(); + // call the validation to ensure the proper error is shown + await bulkUpload.validate(); - // call the method - await bulkUpload.crossValidate({ - csvEstablishmentSchemaErrors, - myWorkers, - fetchMyEstablishmentsWorkers - }); + const validationErrors = bulkUpload.validationErrors; - // assert the fetchMyEstalishmentsWorkers function was called - expect(fetchMyEstablishmentsWorkers.callCount).to.equal(1); + // assert a warning was returned - // assert a warning was returned - expect(csvEstablishmentSchemaErrors.length).to.equal(1); - - expect(csvEstablishmentSchemaErrors[0]).to.deep.equal({ - lineNumber: 2, - name: 'omar3', - origin: 'Establishments', - source: '1', - warnCode: 2200, - warnType: 'TOTAL_PERM_TEMP_WARNING', - warning: 'The number of direct care staff is 0 please check your staff records' - }); + expect(validationErrors).to.deep.equal([ + + ]); }); - it('should emit a warning if there no non-direct care staff', async () => { - const bulkUpload = new (testUtils.sandBox( - filename, - { - locals: { - require: testUtils.wrapRequire({ - '../BUDI': { - BUDI - } - }) - } - } - ).Establishment)( - { - LOCALESTID: 'omar3', - STATUS: 'UPDATE', - ESTNAME: 'WOZiTech, with even more care', - ADDRESS1: 'First Line', - ADDRESS2: 'Second Line', - ADDRESS3: '', - POSTTOWN: 'My Town', - POSTCODE: 'LN11 9JG', - ESTTYPE: '1', - OTHERTYPE: '', - PERMCQC: '1', - PERMLA: '1', - SHARELA: '708;721;720', - REGTYPE: '2', - PROVNUM: '', - LOCATIONID: '', - MAINSERVICE: '72', - ALLSERVICES: '72;13', - CAPACITY: '', - UTILISATION: '', - SERVICEDESC: '1;1', - SERVICEUSERS: '', - OTHERUSERDESC: '', - TOTALPERMTEMP: '1', - ALLJOBROLES: '34;8', - STARTERS: '0;0', - LEAVERS: '999', - VACANCIES: '999;333', - REASONS: '', - REASONNOS: '' - }, - 2, - [ - { - _validations: [], - _username: 'aylingw', - _id: 479, - _uid: '98a83eef-e1e1-49f3-89c5-b1287a3cc8dd', - _ustatus: null, - _created: '2019-03-15T09:54:10.562Z', - _updated: '2019-10-04T15:46:16.158Z', - _updatedBy: 'aylingw', - _auditEvents: null, - _name: 'WOZiTech, with even more care', - _address1: 'First Line', - _address2: 'Second Line', - _address3: '', - _town: 'My Town', - _county: '', - _locationId: 'A-328849599', - _provId: null, - _postcode: 'LN11 9JG', - _isRegulated: false, - _mainService: { id: 16, name: 'Head office services' }, - _nmdsId: 'G1001114', - _lastWdfEligibility: '2019-08-16T07:17:38.014Z', - _overallWdfEligibility: '2019-08-16T07:17:38.340Z', - _establishmentWdfEligibility: null, - _staffWdfEligibility: '2019-08-13T12:41:24.836Z', - _isParent: true, - _parentUid: null, - _parentId: null, - _parentName: null, - _dataOwner: 'Workplace', - _dataPermissions: 'None', - _archived: false, - _dataOwnershipRequested: null, - _reasonsForLeaving: '', - _properties: { - _properties: [Object], - _propertyTypes: [Array], - _auditEvents: null, - _modifiedProperties: [], - _additionalModels: null - }, - _isNew: false, - _workerEntities: { - }, - _readyForDeletionWorkers: null, - _status: 'NEW', - _logLevel: 300 - }, - { - _validations: [], - _username: 'aylingw', - _id: 1446, - _uid: 'a415435f-40f2-4de5-abf7-bff611e85591', - _ustatus: null, - _created: '2019-07-31T15:09:57.405Z', - _updated: '2019-10-04T15:46:16.797Z', - _updatedBy: 'aylingw', - _auditEvents: null, - _name: 'WOZiTech Cares Sub 100', - _address1: 'Number 1', - _address2: 'My street', - _address3: '', - _town: 'My Town', - _county: '', - _locationId: '1-888777666', - _provId: '1-999888777', - _postcode: 'LN11 9JG', - _isRegulated: true, - _mainService: { id: 1, name: 'Carers support' }, - _nmdsId: 'G1002110', - _lastWdfEligibility: '2019-10-04T15:46:16.797Z', - _overallWdfEligibility: null, - _establishmentWdfEligibility: '2019-10-04T14:46:16.797Z', - _staffWdfEligibility: null, - _isParent: false, - _parentUid: '98a83eef-e1e1-49f3-89c5-b1287a3cc8dd', - _parentId: 479, - _parentName: null, - _dataOwner: 'Parent', - _dataPermissions: 'None', - _archived: false, - _dataOwnershipRequested: null, - _reasonsForLeaving: '', - _properties: { - _properties: [Object], - _propertyTypes: [Array], - _auditEvents: null, - _modifiedProperties: [], - _additionalModels: null - }, - _isNew: false, - _workerEntities: {}, - _readyForDeletionWorkers: null, - _status: 'COMPLETE', - _logLevel: 300 - } - ]); - - expect(bulkUpload).to.have.property('crossValidate'); - - const csvEstablishmentSchemaErrors = []; - - const myWorkers = [{ - establishmentKey: 'omar3', - status: 'UPDATE', - uniqueWorker: '3', - contractTypeId: 1, - mainJobRoleId: 10, - otherJobIds: [] - }]; - - // the real version of this code is in the api Establishment business object and runs a sql query. - // We just return a 'fake result set' - const fetchMyEstablishmentsWorkers = sinon.spy(async (establishmentId, establishmentKey) => { - return []; - }); - - // Regular validation has to run first for the establishment to populate the internal properties correctly - await bulkUpload.validate(); - - // call the method - await bulkUpload.crossValidate({ - csvEstablishmentSchemaErrors, - myWorkers, - fetchMyEstablishmentsWorkers - }); - - // assert the fetchMyEstalishmentsWorkers function was called - expect(fetchMyEstablishmentsWorkers.callCount).to.equal(1); - - // assert a warning was returned - expect(csvEstablishmentSchemaErrors.length).to.equal(1); - - expect(csvEstablishmentSchemaErrors[0]).to.deep.equal({ - lineNumber: 2, - name: 'omar3', - origin: 'Establishments', - source: '1', - warnCode: 2200, - warnType: 'TOTAL_PERM_TEMP_WARNING', - warning: 'The number of non-direct care staff is 0 please check your staff records' - }); - }); - - it('should emit a warning if there are fewer employed staff than non employed staff', async () => { - const bulkUpload = new (testUtils.sandBox( - filename, - { - locals: { - require: testUtils.wrapRequire({ - '../BUDI': { - BUDI - } - }) - } - } - ).Establishment)( - { - LOCALESTID: 'omar3', - STATUS: 'UPDATE', - ESTNAME: 'WOZiTech, with even more care', - ADDRESS1: 'First Line', - ADDRESS2: 'Second Line', - ADDRESS3: '', - POSTTOWN: 'My Town', - POSTCODE: 'LN11 9JG', - ESTTYPE: '6', - OTHERTYPE: '', - PERMCQC: '1', - PERMLA: '1', - SHARELA: '708;721;720', - REGTYPE: '0', - PROVNUM: '', - LOCATIONID: '', - MAINSERVICE: '72', - ALLSERVICES: '72;13', - CAPACITY: '', - UTILISATION: '', - SERVICEDESC: '1;1', - SERVICEUSERS: '', - OTHERUSERDESC: '', - TOTALPERMTEMP: '10', - ALLJOBROLES: '34;8', - STARTERS: '0;0', - LEAVERS: '999', - VACANCIES: '999;333', - REASONS: '', - REASONNOS: '' - }, - 2, - [ - { - _validations: [], - _username: 'aylingw', - _id: 479, - _uid: '98a83eef-e1e1-49f3-89c5-b1287a3cc8dd', - _ustatus: null, - _created: '2019-03-15T09:54:10.562Z', - _updated: '2019-10-04T15:46:16.158Z', - _updatedBy: 'aylingw', - _auditEvents: null, - _name: 'WOZiTech, with even more care', - _address1: 'First Line', - _address2: 'Second Line', - _address3: '', - _town: 'My Town', - _county: '', - _locationId: 'A-328849599', - _provId: null, - _postcode: 'LN11 9JG', - _isRegulated: false, - _mainService: { id: 16, name: 'Head office services' }, - _nmdsId: 'G1001114', - _lastWdfEligibility: '2019-08-16T07:17:38.014Z', - _overallWdfEligibility: '2019-08-16T07:17:38.340Z', - _establishmentWdfEligibility: null, - _staffWdfEligibility: '2019-08-13T12:41:24.836Z', - _isParent: true, - _parentUid: null, - _parentId: null, - _parentName: null, - _dataOwner: 'Workplace', - _dataPermissions: 'None', - _archived: false, - _dataOwnershipRequested: null, - _reasonsForLeaving: '', - _properties: { - _properties: [Object], - _propertyTypes: [Array], - _auditEvents: null, - _modifiedProperties: [], - _additionalModels: null - }, - _isNew: false, - _workerEntities: { - }, - _readyForDeletionWorkers: null, - _status: 'NEW', - _logLevel: 300 - }, - { - _validations: [], - _username: 'aylingw', - _id: 1446, - _uid: 'a415435f-40f2-4de5-abf7-bff611e85591', - _ustatus: null, - _created: '2019-07-31T15:09:57.405Z', - _updated: '2019-10-04T15:46:16.797Z', - _updatedBy: 'aylingw', - _auditEvents: null, - _name: 'WOZiTech Cares Sub 100', - _address1: 'Number 1', - _address2: 'My street', - _address3: '', - _town: 'My Town', - _county: '', - _locationId: '1-888777666', - _provId: '1-999888777', - _postcode: 'LN11 9JG', - _isRegulated: true, - _mainService: { id: 1, name: 'Carers support' }, - _nmdsId: 'G1002110', - _lastWdfEligibility: '2019-10-04T15:46:16.797Z', - _overallWdfEligibility: null, - _establishmentWdfEligibility: '2019-10-04T14:46:16.797Z', - _staffWdfEligibility: null, - _isParent: false, - _parentUid: '98a83eef-e1e1-49f3-89c5-b1287a3cc8dd', - _parentId: 479, - _parentName: null, - _dataOwner: 'Parent', - _dataPermissions: 'None', - _archived: false, - _dataOwnershipRequested: null, - _reasonsForLeaving: '', - _properties: { - _properties: [Object], - _propertyTypes: [Array], - _auditEvents: null, - _modifiedProperties: [], - _additionalModels: null - }, - _isNew: false, - _workerEntities: {}, - _readyForDeletionWorkers: null, - _status: 'COMPLETE', - _logLevel: 300 - } - ]); - - expect(bulkUpload).to.have.property('crossValidate'); - - const csvEstablishmentSchemaErrors = []; - - const myWorkers = [{ - establishmentKey: 'omar3', - status: 'UPDATE', - uniqueWorker: '3', - contractTypeId: 2, - mainJobRoleId: 10, - otherJobIds: [] - }]; - - // the real version of this code is in the api Establishment business object and runs a sql query. - // We just return a 'fake result set' - const fetchMyEstablishmentsWorkers = sinon.spy(async (establishmentId, establishmentKey) => { - return [{ - establishmentKey: 'omar3', - uniqueWorker: '3', - contractTypeId: 'Permanent', - mainJobRoleId: 10, - otherJobIds: '' - }, - { - establishmentKey: 'omar3', - uniqueWorker: 'WA100', - contractTypeId: 'Temporary', - mainJobRoleId: 26, - otherJobIds: '' - }, - { - establishmentKey: 'omar3', - uniqueWorker: '5', - contractTypeId: 'Pool/Bank', - mainJobRoleId: 7, - otherJobIds: '' - }, - { - establishmentKey: 'omar3', - uniqueWorker: '6', - contractTypeId: 'Temporary', - mainJobRoleId: 17, - otherJobIds: '' - }, - { - establishmentKey: 'omar3', - uniqueWorker: 'WA103', - contractTypeId: 'Temporary', - mainJobRoleId: 26, - otherJobIds: '' - }, - { - establishmentKey: 'omar3', - uniqueWorker: '10', - contractTypeId: 'Other', - mainJobRoleId: 18, - otherJobIds: '' - }, - { - establishmentKey: 'omar3', - uniqueWorker: '4', - contractTypeId: 'Other', - mainJobRoleId: 1, - otherJobIds: '' - }, - { - establishmentKey: 'omar3', - uniqueWorker: 'SA 4', - contractTypeId: 'Other', - mainJobRoleId: 23, - otherJobIds: '' - }, - { - establishmentKey: 'omar3', - uniqueWorker: 'FTSpecial', - contractTypeId: 'Other', - mainJobRoleId: 24, - otherJobIds: '' - }, - { - establishmentKey: 'omar3', - uniqueWorker: '1', - contractTypeId: 'Other', - mainJobRoleId: 2, - otherJobIds: '' - }]; - }); - - // Regular validation has to run first for the establishment to populate the internal properties correctly - await bulkUpload.validate(); - - // call the method - await bulkUpload.crossValidate({ - csvEstablishmentSchemaErrors, - myWorkers, - fetchMyEstablishmentsWorkers - }); - - // assert the fetchMyEstalishmentsWorkers function was called - expect(fetchMyEstablishmentsWorkers.callCount).to.equal(1); - - // assert a warning was returned - expect(csvEstablishmentSchemaErrors.length).to.equal(1); - - expect(csvEstablishmentSchemaErrors[0]).to.deep.equal({ - lineNumber: 2, - name: 'omar3', - origin: 'Establishments', - source: '10', - warnCode: 2200, - warnType: 'TOTAL_PERM_TEMP_WARNING', - warning: 'The number of employed staff is less than the number of non-employed staff please check your staff records' - }); - }); + // it('should emit an error if SLV is greater than zero and this ALLJOBROLES is blank', async () => { + // const bulkUpload = new (testUtils.sandBox( + // filename, + // { + // locals: { + // require: testUtils.wrapRequire({ + // '../BUDI': { + // BUDI + // }, + // '../../index': { + // models + // } + // }) + // } + // } + // ).Establishment)( + // { + // LOCALESTID: 'omar3', + // STATUS: 'NEW', + // ESTNAME: 'WOZiTech, with even more care', + // ADDRESS1: 'First Line', + // ADDRESS2: 'Second Line', + // ADDRESS3: '', + // POSTTOWN: 'My Town', + // POSTCODE: 'LN11 9JG', + // ESTTYPE: '6', + // OTHERTYPE: '', + // PERMCQC: '1', + // PERMLA: '1', + // SHARELA: '708;721;720', + // REGTYPE: '0', + // PROVNUM: '', + // LOCATIONID: '', + // MAINSERVICE: '72', + // ALLSERVICES: '72;13', + // CAPACITY: '0;0', + // UTILISATION: '0;0', + // SERVICEDESC: '1;1', + // SERVICEUSERS: '', + // OTHERUSERDESC: '', + // TOTALPERMTEMP: '10', + // ALLJOBROLES: '', + // STARTERS: '0;0', + // LEAVERS: '999', + // VACANCIES: '999;333', + // REASONS: '', + // REASONNOS: '' + // }, + // 2, + // [ + // { + // _validations: [], + // _username: 'aylingw', + // _id: 479, + // _uid: '98a83eef-e1e1-49f3-89c5-b1287a3cc8dd', + // _ustatus: null, + // _created: '2019-03-15T09:54:10.562Z', + // _updated: '2019-10-04T15:46:16.158Z', + // _updatedBy: 'aylingw', + // _auditEvents: null, + // _name: 'WOZiTech, with even more care', + // _address1: 'First Line', + // _address2: 'Second Line', + // _address3: '', + // _town: 'My Town', + // _county: '', + // _locationId: 'A-328849599', + // _provId: null, + // _postcode: 'LN11 9JG', + // _isRegulated: false, + // _mainService: { id: 72, name: 'Head office services' }, + // _nmdsId: 'G1001114', + // _lastWdfEligibility: '2019-08-16T07:17:38.014Z', + // _overallWdfEligibility: '2019-08-16T07:17:38.340Z', + // _establishmentWdfEligibility: null, + // _staffWdfEligibility: '2019-08-13T12:41:24.836Z', + // _isParent: true, + // _parentUid: null, + // _parentId: null, + // _parentName: null, + // _dataOwner: 'Workplace', + // _dataPermissions: 'None', + // _archived: false, + // _dataOwnershipRequested: null, + // _reasonsForLeaving: '', + // _properties: { + // _properties: [Object], + // _propertyTypes: [Array], + // _auditEvents: null, + // _modifiedProperties: [], + // _additionalModels: null + // }, + // _isNew: false, + // _workerEntities: { + // }, + // _readyForDeletionWorkers: null, + // _status: 'NEW', + // _logLevel: 300 + // }, + // { + // _validations: [], + // _username: 'aylingw', + // _id: 1446, + // _uid: 'a415435f-40f2-4de5-abf7-bff611e85591', + // _ustatus: null, + // _created: '2019-07-31T15:09:57.405Z', + // _updated: '2019-10-04T15:46:16.797Z', + // _updatedBy: 'aylingw', + // _auditEvents: null, + // _name: 'WOZiTech Cares Sub 100', + // _address1: 'Number 1', + // _address2: 'My street', + // _address3: '', + // _town: 'My Town', + // _county: '', + // _locationId: '1-888777666', + // _provId: '1-999888777', + // _postcode: 'LN11 9JG', + // _isRegulated: true, + // _mainService: { id: 1, name: 'Carers support' }, + // _nmdsId: 'G1002110', + // _lastWdfEligibility: '2019-10-04T15:46:16.797Z', + // _overallWdfEligibility: null, + // _establishmentWdfEligibility: '2019-10-04T14:46:16.797Z', + // _staffWdfEligibility: null, + // _isParent: false, + // _parentUid: '98a83eef-e1e1-49f3-89c5-b1287a3cc8dd', + // _parentId: 479, + // _parentName: null, + // _dataOwner: 'Parent', + // _dataPermissions: 'None', + // _archived: false, + // _dataOwnershipRequested: null, + // _reasonsForLeaving: '', + // _properties: { + // _properties: [Object], + // _propertyTypes: [Array], + // _auditEvents: null, + // _modifiedProperties: [], + // _additionalModels: null + // }, + // _isNew: false, + // _workerEntities: {}, + // _readyForDeletionWorkers: null, + // _status: 'COMPLETE', + // _logLevel: 300 + // }] + // ); + + // expect(bulkUpload).to.have.property('validate'); + + // const csvEstablishmentSchemaErrors = []; + + // const myWorkers = []; + + // // call the validation to ensure the proper error is shown + // await bulkUpload.validate(); + + // const validationErrors = bulkUpload.validationErrors; + + // // assert a warning was returned + + // expect(validationErrors).to.deep.equal([{ + // lineNumber: 2, + // name: 'omar3', + // origin: 'Establishments', + // source: '', + // errCode: 1280, + // errType: 'ALL_JOBS_ERROR', + // error: 'ALLJOBROLES cannot be blank as you have STARTERS, LEAVERS, VACANCIES greater than zero' + // }]); + // }); }); + + // describe('cross entity validations', () => { + // it('should emit a warning if there are zero staff', async () => { + // const bulkUpload = new (testUtils.sandBox( + // filename, + // { + // locals: { + // require: testUtils.wrapRequire({ + // '../BUDI': { + // BUDI + // } + // }) + // } + // } + // ).Establishment)( + // { + // LOCALESTID: 'omar3', + // STATUS: 'UPDATE', + // ESTNAME: 'WOZiTech, with even more care', + // ADDRESS1: 'First Line', + // ADDRESS2: 'Second Line', + // ADDRESS3: '', + // POSTTOWN: 'My Town', + // POSTCODE: 'LN11 9JG', + // ESTTYPE: '6', + // OTHERTYPE: '', + // PERMCQC: '1', + // PERMLA: '1', + // SHARELA: '708;721;720', + // REGTYPE: '0', + // PROVNUM: '', + // LOCATIONID: '', + // MAINSERVICE: '72', + // ALLSERVICES: '72;13', + // CAPACITY: '', + // UTILISATION: '', + // SERVICEDESC: '1;1', + // SERVICEUSERS: '', + // OTHERUSERDESC: '', + // TOTALPERMTEMP: '0', + // ALLJOBROLES: '34;8', + // STARTERS: '0;0', + // LEAVERS: '999', + // VACANCIES: '999;333', + // REASONS: '', + // REASONNOS: '' + // }, + // 2, + // [ + // { + // _validations: [], + // _username: 'aylingw', + // _id: 479, + // _uid: '98a83eef-e1e1-49f3-89c5-b1287a3cc8dd', + // _ustatus: null, + // _created: '2019-03-15T09:54:10.562Z', + // _updated: '2019-10-04T15:46:16.158Z', + // _updatedBy: 'aylingw', + // _auditEvents: null, + // _name: 'WOZiTech, with even more care', + // _address1: 'First Line', + // _address2: 'Second Line', + // _address3: '', + // _town: 'My Town', + // _county: '', + // _locationId: 'A-328849599', + // _provId: null, + // _postcode: 'LN11 9JG', + // _isRegulated: false, + // _mainService: { id: 16, name: 'Head office services' }, + // _nmdsId: 'G1001114', + // _lastWdfEligibility: '2019-08-16T07:17:38.014Z', + // _overallWdfEligibility: '2019-08-16T07:17:38.340Z', + // _establishmentWdfEligibility: null, + // _staffWdfEligibility: '2019-08-13T12:41:24.836Z', + // _isParent: true, + // _parentUid: null, + // _parentId: null, + // _parentName: null, + // _dataOwner: 'Workplace', + // _dataPermissions: 'None', + // _archived: false, + // _dataOwnershipRequested: null, + // _reasonsForLeaving: '', + // _properties: { + // _properties: [Object], + // _propertyTypes: [Array], + // _auditEvents: null, + // _modifiedProperties: [], + // _additionalModels: null + // }, + // _isNew: false, + // _workerEntities: { + // }, + // _readyForDeletionWorkers: null, + // _status: 'NEW', + // _logLevel: 300 + // }, + // { + // _validations: [], + // _username: 'aylingw', + // _id: 1446, + // _uid: 'a415435f-40f2-4de5-abf7-bff611e85591', + // _ustatus: null, + // _created: '2019-07-31T15:09:57.405Z', + // _updated: '2019-10-04T15:46:16.797Z', + // _updatedBy: 'aylingw', + // _auditEvents: null, + // _name: 'WOZiTech Cares Sub 100', + // _address1: 'Number 1', + // _address2: 'My street', + // _address3: '', + // _town: 'My Town', + // _county: '', + // _locationId: '1-888777666', + // _provId: '1-999888777', + // _postcode: 'LN11 9JG', + // _isRegulated: true, + // _mainService: { id: 1, name: 'Carers support' }, + // _nmdsId: 'G1002110', + // _lastWdfEligibility: '2019-10-04T15:46:16.797Z', + // _overallWdfEligibility: null, + // _establishmentWdfEligibility: '2019-10-04T14:46:16.797Z', + // _staffWdfEligibility: null, + // _isParent: false, + // _parentUid: '98a83eef-e1e1-49f3-89c5-b1287a3cc8dd', + // _parentId: 479, + // _parentName: null, + // _dataOwner: 'Parent', + // _dataPermissions: 'None', + // _archived: false, + // _dataOwnershipRequested: null, + // _reasonsForLeaving: '', + // _properties: { + // _properties: [Object], + // _propertyTypes: [Array], + // _auditEvents: null, + // _modifiedProperties: [], + // _additionalModels: null + // }, + // _isNew: false, + // _workerEntities: {}, + // _readyForDeletionWorkers: null, + // _status: 'COMPLETE', + // _logLevel: 300 + // } + // ]); + + // expect(bulkUpload).to.have.property('crossValidate'); + + // const csvEstablishmentSchemaErrors = []; + + // const myWorkers = []; + + // // the real version of this code is in the api Establishment business object and runs a sql query. + // // We just return a 'fake result set' + // const fetchMyEstablishmentsWorkers = sinon.spy(async (establishmentId, establishmentKey) => { + // return []; + // }); + + // // Regular validation has to run first for the establishment to populate the internal properties correctly + // await bulkUpload.validate(); + + // // call the method + // await bulkUpload.crossValidate({ + // csvEstablishmentSchemaErrors, + // myWorkers, + // fetchMyEstablishmentsWorkers + // }); + + // // assert the fetchMyEstalishmentsWorkers function was called + // expect(fetchMyEstablishmentsWorkers.callCount).to.equal(1); + + // // assert a warning was returned + // expect(csvEstablishmentSchemaErrors.length).to.equal(1); + + // expect(csvEstablishmentSchemaErrors[0]).to.deep.equal({ + // lineNumber: 2, + // name: 'omar3', + // origin: 'Establishments', + // source: '0', + // warnCode: 2200, + // warnType: 'TOTAL_PERM_TEMP_WARNING', + // warning: 'The number of employed staff is 0 please check your staff records' + // }); + // }); + + // it('should emit a warning if there are no direct care staff', async () => { + // const bulkUpload = new (testUtils.sandBox( + // filename, + // { + // locals: { + // require: testUtils.wrapRequire({ + // '../BUDI': { + // BUDI + // } + // }) + // } + // } + // ).Establishment)( + // { + // LOCALESTID: 'omar3', + // STATUS: 'UPDATE', + // ESTNAME: 'WOZiTech, with even more care', + // ADDRESS1: 'First Line', + // ADDRESS2: 'Second Line', + // ADDRESS3: '', + // POSTTOWN: 'My Town', + // POSTCODE: 'LN11 9JG', + // ESTTYPE: '6', + // OTHERTYPE: '', + // PERMCQC: '1', + // PERMLA: '1', + // SHARELA: '708;721;720', + // REGTYPE: '2', + // PROVNUM: '', + // LOCATIONID: '', + // MAINSERVICE: '72', + // ALLSERVICES: '72;13', + // CAPACITY: '', + // UTILISATION: '', + // SERVICEDESC: '1;1', + // SERVICEUSERS: '', + // OTHERUSERDESC: '', + // TOTALPERMTEMP: '1', + // ALLJOBROLES: '34;8', + // STARTERS: '0;0', + // LEAVERS: '999', + // VACANCIES: '999;333', + // REASONS: '', + // REASONNOS: '' + // }, + // 2, + // [ + // { + // _validations: [], + // _username: 'aylingw', + // _id: 479, + // _uid: '98a83eef-e1e1-49f3-89c5-b1287a3cc8dd', + // _ustatus: null, + // _created: '2019-03-15T09:54:10.562Z', + // _updated: '2019-10-04T15:46:16.158Z', + // _updatedBy: 'aylingw', + // _auditEvents: null, + // _name: 'WOZiTech, with even more care', + // _address1: 'First Line', + // _address2: 'Second Line', + // _address3: '', + // _town: 'My Town', + // _county: '', + // _locationId: 'A-328849599', + // _provId: null, + // _postcode: 'LN11 9JG', + // _isRegulated: false, + // _mainService: { id: 16, name: 'Head office services' }, + // _nmdsId: 'G1001114', + // _lastWdfEligibility: '2019-08-16T07:17:38.014Z', + // _overallWdfEligibility: '2019-08-16T07:17:38.340Z', + // _establishmentWdfEligibility: null, + // _staffWdfEligibility: '2019-08-13T12:41:24.836Z', + // _isParent: true, + // _parentUid: null, + // _parentId: null, + // _parentName: null, + // _dataOwner: 'Workplace', + // _dataPermissions: 'None', + // _archived: false, + // _dataOwnershipRequested: null, + // _reasonsForLeaving: '', + // _properties: { + // _properties: [Object], + // _propertyTypes: [Array], + // _auditEvents: null, + // _modifiedProperties: [], + // _additionalModels: null + // }, + // _isNew: false, + // _workerEntities: { + // }, + // _readyForDeletionWorkers: null, + // _status: 'NEW', + // _logLevel: 300 + // }, + // { + // _validations: [], + // _username: 'aylingw', + // _id: 1446, + // _uid: 'a415435f-40f2-4de5-abf7-bff611e85591', + // _ustatus: null, + // _created: '2019-07-31T15:09:57.405Z', + // _updated: '2019-10-04T15:46:16.797Z', + // _updatedBy: 'aylingw', + // _auditEvents: null, + // _name: 'WOZiTech Cares Sub 100', + // _address1: 'Number 1', + // _address2: 'My street', + // _address3: '', + // _town: 'My Town', + // _county: '', + // _locationId: '1-888777666', + // _provId: '1-999888777', + // _postcode: 'LN11 9JG', + // _isRegulated: true, + // _mainService: { id: 1, name: 'Carers support' }, + // _nmdsId: 'G1002110', + // _lastWdfEligibility: '2019-10-04T15:46:16.797Z', + // _overallWdfEligibility: null, + // _establishmentWdfEligibility: '2019-10-04T14:46:16.797Z', + // _staffWdfEligibility: null, + // _isParent: false, + // _parentUid: '98a83eef-e1e1-49f3-89c5-b1287a3cc8dd', + // _parentId: 479, + // _parentName: null, + // _dataOwner: 'Parent', + // _dataPermissions: 'None', + // _archived: false, + // _dataOwnershipRequested: null, + // _reasonsForLeaving: '', + // _properties: { + // _properties: [Object], + // _propertyTypes: [Array], + // _auditEvents: null, + // _modifiedProperties: [], + // _additionalModels: null + // }, + // _isNew: false, + // _workerEntities: {}, + // _readyForDeletionWorkers: null, + // _status: 'COMPLETE', + // _logLevel: 300 + // } + // ]); + + // expect(bulkUpload).to.have.property('crossValidate'); + + // const csvEstablishmentSchemaErrors = []; + + // const myWorkers = [{ + // establishmentKey: 'omar3', + // status: 'UPDATE', + // uniqueWorker: '3', + // contractTypeId: 1, + // mainJobRoleId: 1, + // otherJobIds: [] + // }]; + + // // the real version of this code is in the api Establishment business object and runs a sql query. + // // We just return a 'fake result set' + // const fetchMyEstablishmentsWorkers = sinon.spy(async (establishmentId, establishmentKey) => { + // return []; + // }); + + // // Regular validation has to run first for the establishment to populate the internal properties correctly + // await bulkUpload.validate(); + + // // call the method + // await bulkUpload.crossValidate({ + // csvEstablishmentSchemaErrors, + // myWorkers, + // fetchMyEstablishmentsWorkers + // }); + + // // assert the fetchMyEstalishmentsWorkers function was called + // expect(fetchMyEstablishmentsWorkers.callCount).to.equal(1); + + // // assert a warning was returned + // expect(csvEstablishmentSchemaErrors.length).to.equal(1); + + // expect(csvEstablishmentSchemaErrors[0]).to.deep.equal({ + // lineNumber: 2, + // name: 'omar3', + // origin: 'Establishments', + // source: '1', + // warnCode: 2200, + // warnType: 'TOTAL_PERM_TEMP_WARNING', + // warning: 'The number of direct care staff is 0 please check your staff records' + // }); + // }); + + // it('should emit a warning if there no non-direct care staff', async () => { + // const bulkUpload = new (testUtils.sandBox( + // filename, + // { + // locals: { + // require: testUtils.wrapRequire({ + // '../BUDI': { + // BUDI + // } + // }) + // } + // } + // ).Establishment)( + // { + // LOCALESTID: 'omar3', + // STATUS: 'UPDATE', + // ESTNAME: 'WOZiTech, with even more care', + // ADDRESS1: 'First Line', + // ADDRESS2: 'Second Line', + // ADDRESS3: '', + // POSTTOWN: 'My Town', + // POSTCODE: 'LN11 9JG', + // ESTTYPE: '1', + // OTHERTYPE: '', + // PERMCQC: '1', + // PERMLA: '1', + // SHARELA: '708;721;720', + // REGTYPE: '2', + // PROVNUM: '', + // LOCATIONID: '', + // MAINSERVICE: '72', + // ALLSERVICES: '72;13', + // CAPACITY: '', + // UTILISATION: '', + // SERVICEDESC: '1;1', + // SERVICEUSERS: '', + // OTHERUSERDESC: '', + // TOTALPERMTEMP: '1', + // ALLJOBROLES: '34;8', + // STARTERS: '0;0', + // LEAVERS: '999', + // VACANCIES: '999;333', + // REASONS: '', + // REASONNOS: '' + // }, + // 2, + // [ + // { + // _validations: [], + // _username: 'aylingw', + // _id: 479, + // _uid: '98a83eef-e1e1-49f3-89c5-b1287a3cc8dd', + // _ustatus: null, + // _created: '2019-03-15T09:54:10.562Z', + // _updated: '2019-10-04T15:46:16.158Z', + // _updatedBy: 'aylingw', + // _auditEvents: null, + // _name: 'WOZiTech, with even more care', + // _address1: 'First Line', + // _address2: 'Second Line', + // _address3: '', + // _town: 'My Town', + // _county: '', + // _locationId: 'A-328849599', + // _provId: null, + // _postcode: 'LN11 9JG', + // _isRegulated: false, + // _mainService: { id: 16, name: 'Head office services' }, + // _nmdsId: 'G1001114', + // _lastWdfEligibility: '2019-08-16T07:17:38.014Z', + // _overallWdfEligibility: '2019-08-16T07:17:38.340Z', + // _establishmentWdfEligibility: null, + // _staffWdfEligibility: '2019-08-13T12:41:24.836Z', + // _isParent: true, + // _parentUid: null, + // _parentId: null, + // _parentName: null, + // _dataOwner: 'Workplace', + // _dataPermissions: 'None', + // _archived: false, + // _dataOwnershipRequested: null, + // _reasonsForLeaving: '', + // _properties: { + // _properties: [Object], + // _propertyTypes: [Array], + // _auditEvents: null, + // _modifiedProperties: [], + // _additionalModels: null + // }, + // _isNew: false, + // _workerEntities: { + // }, + // _readyForDeletionWorkers: null, + // _status: 'NEW', + // _logLevel: 300 + // }, + // { + // _validations: [], + // _username: 'aylingw', + // _id: 1446, + // _uid: 'a415435f-40f2-4de5-abf7-bff611e85591', + // _ustatus: null, + // _created: '2019-07-31T15:09:57.405Z', + // _updated: '2019-10-04T15:46:16.797Z', + // _updatedBy: 'aylingw', + // _auditEvents: null, + // _name: 'WOZiTech Cares Sub 100', + // _address1: 'Number 1', + // _address2: 'My street', + // _address3: '', + // _town: 'My Town', + // _county: '', + // _locationId: '1-888777666', + // _provId: '1-999888777', + // _postcode: 'LN11 9JG', + // _isRegulated: true, + // _mainService: { id: 1, name: 'Carers support' }, + // _nmdsId: 'G1002110', + // _lastWdfEligibility: '2019-10-04T15:46:16.797Z', + // _overallWdfEligibility: null, + // _establishmentWdfEligibility: '2019-10-04T14:46:16.797Z', + // _staffWdfEligibility: null, + // _isParent: false, + // _parentUid: '98a83eef-e1e1-49f3-89c5-b1287a3cc8dd', + // _parentId: 479, + // _parentName: null, + // _dataOwner: 'Parent', + // _dataPermissions: 'None', + // _archived: false, + // _dataOwnershipRequested: null, + // _reasonsForLeaving: '', + // _properties: { + // _properties: [Object], + // _propertyTypes: [Array], + // _auditEvents: null, + // _modifiedProperties: [], + // _additionalModels: null + // }, + // _isNew: false, + // _workerEntities: {}, + // _readyForDeletionWorkers: null, + // _status: 'COMPLETE', + // _logLevel: 300 + // } + // ]); + + // expect(bulkUpload).to.have.property('crossValidate'); + + // const csvEstablishmentSchemaErrors = []; + + // const myWorkers = [{ + // establishmentKey: 'omar3', + // status: 'UPDATE', + // uniqueWorker: '3', + // contractTypeId: 1, + // mainJobRoleId: 10, + // otherJobIds: [] + // }]; + + // // the real version of this code is in the api Establishment business object and runs a sql query. + // // We just return a 'fake result set' + // const fetchMyEstablishmentsWorkers = sinon.spy(async (establishmentId, establishmentKey) => { + // return []; + // }); + + // // Regular validation has to run first for the establishment to populate the internal properties correctly + // await bulkUpload.validate(); + + // // call the method + // await bulkUpload.crossValidate({ + // csvEstablishmentSchemaErrors, + // myWorkers, + // fetchMyEstablishmentsWorkers + // }); + + // // assert the fetchMyEstalishmentsWorkers function was called + // expect(fetchMyEstablishmentsWorkers.callCount).to.equal(1); + + // // assert a warning was returned + // expect(csvEstablishmentSchemaErrors.length).to.equal(1); + + // expect(csvEstablishmentSchemaErrors[0]).to.deep.equal({ + // lineNumber: 2, + // name: 'omar3', + // origin: 'Establishments', + // source: '1', + // warnCode: 2200, + // warnType: 'TOTAL_PERM_TEMP_WARNING', + // warning: 'The number of non-direct care staff is 0 please check your staff records' + // }); + // }); + + // it('should emit a warning if there are fewer employed staff than non employed staff', async () => { + // const bulkUpload = new (testUtils.sandBox( + // filename, + // { + // locals: { + // require: testUtils.wrapRequire({ + // '../BUDI': { + // BUDI + // } + // }) + // } + // } + // ).Establishment)( + // { + // LOCALESTID: 'omar3', + // STATUS: 'UPDATE', + // ESTNAME: 'WOZiTech, with even more care', + // ADDRESS1: 'First Line', + // ADDRESS2: 'Second Line', + // ADDRESS3: '', + // POSTTOWN: 'My Town', + // POSTCODE: 'LN11 9JG', + // ESTTYPE: '6', + // OTHERTYPE: '', + // PERMCQC: '1', + // PERMLA: '1', + // SHARELA: '708;721;720', + // REGTYPE: '0', + // PROVNUM: '', + // LOCATIONID: '', + // MAINSERVICE: '72', + // ALLSERVICES: '72;13', + // CAPACITY: '', + // UTILISATION: '', + // SERVICEDESC: '1;1', + // SERVICEUSERS: '', + // OTHERUSERDESC: '', + // TOTALPERMTEMP: '10', + // ALLJOBROLES: '34;8', + // STARTERS: '0;0', + // LEAVERS: '999', + // VACANCIES: '999;333', + // REASONS: '', + // REASONNOS: '' + // }, + // 2, + // [ + // { + // _validations: [], + // _username: 'aylingw', + // _id: 479, + // _uid: '98a83eef-e1e1-49f3-89c5-b1287a3cc8dd', + // _ustatus: null, + // _created: '2019-03-15T09:54:10.562Z', + // _updated: '2019-10-04T15:46:16.158Z', + // _updatedBy: 'aylingw', + // _auditEvents: null, + // _name: 'WOZiTech, with even more care', + // _address1: 'First Line', + // _address2: 'Second Line', + // _address3: '', + // _town: 'My Town', + // _county: '', + // _locationId: 'A-328849599', + // _provId: null, + // _postcode: 'LN11 9JG', + // _isRegulated: false, + // _mainService: { id: 16, name: 'Head office services' }, + // _nmdsId: 'G1001114', + // _lastWdfEligibility: '2019-08-16T07:17:38.014Z', + // _overallWdfEligibility: '2019-08-16T07:17:38.340Z', + // _establishmentWdfEligibility: null, + // _staffWdfEligibility: '2019-08-13T12:41:24.836Z', + // _isParent: true, + // _parentUid: null, + // _parentId: null, + // _parentName: null, + // _dataOwner: 'Workplace', + // _dataPermissions: 'None', + // _archived: false, + // _dataOwnershipRequested: null, + // _reasonsForLeaving: '', + // _properties: { + // _properties: [Object], + // _propertyTypes: [Array], + // _auditEvents: null, + // _modifiedProperties: [], + // _additionalModels: null + // }, + // _isNew: false, + // _workerEntities: { + // }, + // _readyForDeletionWorkers: null, + // _status: 'NEW', + // _logLevel: 300 + // }, + // { + // _validations: [], + // _username: 'aylingw', + // _id: 1446, + // _uid: 'a415435f-40f2-4de5-abf7-bff611e85591', + // _ustatus: null, + // _created: '2019-07-31T15:09:57.405Z', + // _updated: '2019-10-04T15:46:16.797Z', + // _updatedBy: 'aylingw', + // _auditEvents: null, + // _name: 'WOZiTech Cares Sub 100', + // _address1: 'Number 1', + // _address2: 'My street', + // _address3: '', + // _town: 'My Town', + // _county: '', + // _locationId: '1-888777666', + // _provId: '1-999888777', + // _postcode: 'LN11 9JG', + // _isRegulated: true, + // _mainService: { id: 1, name: 'Carers support' }, + // _nmdsId: 'G1002110', + // _lastWdfEligibility: '2019-10-04T15:46:16.797Z', + // _overallWdfEligibility: null, + // _establishmentWdfEligibility: '2019-10-04T14:46:16.797Z', + // _staffWdfEligibility: null, + // _isParent: false, + // _parentUid: '98a83eef-e1e1-49f3-89c5-b1287a3cc8dd', + // _parentId: 479, + // _parentName: null, + // _dataOwner: 'Parent', + // _dataPermissions: 'None', + // _archived: false, + // _dataOwnershipRequested: null, + // _reasonsForLeaving: '', + // _properties: { + // _properties: [Object], + // _propertyTypes: [Array], + // _auditEvents: null, + // _modifiedProperties: [], + // _additionalModels: null + // }, + // _isNew: false, + // _workerEntities: {}, + // _readyForDeletionWorkers: null, + // _status: 'COMPLETE', + // _logLevel: 300 + // } + // ]); + + // expect(bulkUpload).to.have.property('crossValidate'); + + // const csvEstablishmentSchemaErrors = []; + + // const myWorkers = [{ + // establishmentKey: 'omar3', + // status: 'UPDATE', + // uniqueWorker: '3', + // contractTypeId: 2, + // mainJobRoleId: 10, + // otherJobIds: [] + // }]; + + // // the real version of this code is in the api Establishment business object and runs a sql query. + // // We just return a 'fake result set' + // const fetchMyEstablishmentsWorkers = sinon.spy(async (establishmentId, establishmentKey) => { + // return [{ + // establishmentKey: 'omar3', + // uniqueWorker: '3', + // contractTypeId: 'Permanent', + // mainJobRoleId: 10, + // otherJobIds: '' + // }, + // { + // establishmentKey: 'omar3', + // uniqueWorker: 'WA100', + // contractTypeId: 'Temporary', + // mainJobRoleId: 26, + // otherJobIds: '' + // }, + // { + // establishmentKey: 'omar3', + // uniqueWorker: '5', + // contractTypeId: 'Pool/Bank', + // mainJobRoleId: 7, + // otherJobIds: '' + // }, + // { + // establishmentKey: 'omar3', + // uniqueWorker: '6', + // contractTypeId: 'Temporary', + // mainJobRoleId: 17, + // otherJobIds: '' + // }, + // { + // establishmentKey: 'omar3', + // uniqueWorker: 'WA103', + // contractTypeId: 'Temporary', + // mainJobRoleId: 26, + // otherJobIds: '' + // }, + // { + // establishmentKey: 'omar3', + // uniqueWorker: '10', + // contractTypeId: 'Other', + // mainJobRoleId: 18, + // otherJobIds: '' + // }, + // { + // establishmentKey: 'omar3', + // uniqueWorker: '4', + // contractTypeId: 'Other', + // mainJobRoleId: 1, + // otherJobIds: '' + // }, + // { + // establishmentKey: 'omar3', + // uniqueWorker: 'SA 4', + // contractTypeId: 'Other', + // mainJobRoleId: 23, + // otherJobIds: '' + // }, + // { + // establishmentKey: 'omar3', + // uniqueWorker: 'FTSpecial', + // contractTypeId: 'Other', + // mainJobRoleId: 24, + // otherJobIds: '' + // }, + // { + // establishmentKey: 'omar3', + // uniqueWorker: '1', + // contractTypeId: 'Other', + // mainJobRoleId: 2, + // otherJobIds: '' + // }]; + // }); + + // // Regular validation has to run first for the establishment to populate the internal properties correctly + // await bulkUpload.validate(); + + // // call the method + // await bulkUpload.crossValidate({ + // csvEstablishmentSchemaErrors, + // myWorkers, + // fetchMyEstablishmentsWorkers + // }); + + // // assert the fetchMyEstalishmentsWorkers function was called + // expect(fetchMyEstablishmentsWorkers.callCount).to.equal(1); + + // // assert a warning was returned + // expect(csvEstablishmentSchemaErrors.length).to.equal(1); + + // expect(csvEstablishmentSchemaErrors[0]).to.deep.equal({ + // lineNumber: 2, + // name: 'omar3', + // origin: 'Establishments', + // source: '10', + // warnCode: 2200, + // warnType: 'TOTAL_PERM_TEMP_WARNING', + // warning: 'The number of employed staff is less than the number of non-employed staff please check your staff records' + // }); + // }); + // }); }); From 078188b3f52d87cda3980a433eb918edf106ade0 Mon Sep 17 00:00:00 2001 From: Aaron Russell Date: Wed, 5 Feb 2020 14:25:36 +0000 Subject: [PATCH 027/305] Started adding unit test for locationId already existing --- .../Bulkimport/csv/establishments.spec.js | 170 +++++++++++++++++- 1 file changed, 168 insertions(+), 2 deletions(-) diff --git a/server/test/unit/models/Bulkimport/csv/establishments.spec.js b/server/test/unit/models/Bulkimport/csv/establishments.spec.js index aac8a3379b..64381ae1ce 100644 --- a/server/test/unit/models/Bulkimport/csv/establishments.spec.js +++ b/server/test/unit/models/Bulkimport/csv/establishments.spec.js @@ -13,13 +13,13 @@ const BUDI_TO_ASC = 100; const BUSI_FROM_ASC = 200; const establishment = [{ - locationId: '1-2111759818' + locationId: '1-123456780' }]; const models = { establishment: { async findAll(args) { - if (args.where.locationId === establishment.locationId) { + if (args.where.locationId === establishment[0].locationId) { return establishment; } else { return []; @@ -1303,6 +1303,172 @@ describe('/server/models/Bulkimport/csv/establishment.js', () => { ]); }); + it('should emit an error if locationId has already been used in the database', async () => { + const bulkUpload = new (testUtils.sandBox( + filename, + { + locals: { + require: testUtils.wrapRequire({ + '../BUDI': { + BUDI + }, + '../../index': { + establishment: models.establishment + } + }) + } + } + ).Establishment)( + { + LOCALESTID: 'omar3', + STATUS: 'NEW', + ESTNAME: 'WOZiTech, with even more care', + ADDRESS1: 'First Line', + ADDRESS2: 'Second Line', + ADDRESS3: '', + POSTTOWN: 'My Town', + POSTCODE: 'LN11 9JG', + ESTTYPE: '6', + OTHERTYPE: '', + PERMCQC: '1', + PERMLA: '1', + SHARELA: '708;721;720', + REGTYPE: '2', + PROVNUM: '1-123456780', + LOCATIONID: '1-123456780', + MAINSERVICE: '8', + ALLSERVICES: '12;13', + CAPACITY: '0;0', + UTILISATION: '0;0', + SERVICEDESC: '1;1', + SERVICEUSERS: '', + OTHERUSERDESC: '', + TOTALPERMTEMP: '1', + ALLJOBROLES: '34;8;4', + STARTERS: '0;0;0', + LEAVERS: '999;0;0', + VACANCIES: '999;333;1', + REASONS: '', + REASONNOS: '' + }, + 2, + [ + { + _validations: [], + _username: 'aylingw', + _id: 479, + _uid: '98a83eef-e1e1-49f3-89c5-b1287a3cc8dd', + _ustatus: null, + _created: '2019-03-15T09:54:10.562Z', + _updated: '2019-10-04T15:46:16.158Z', + _updatedBy: 'aylingw', + _auditEvents: null, + _name: 'WOZiTech, with even more care', + _address1: 'First Line', + _address2: 'Second Line', + _address3: '', + _town: 'My Town', + _county: '', + _locationId: null, + _provId: null, + _postcode: 'LN11 9JG', + _isRegulated: false, + _mainService: { id: 16, name: 'Head office services' }, + _nmdsId: 'G1001114', + _lastWdfEligibility: '2019-08-16T07:17:38.014Z', + _overallWdfEligibility: '2019-08-16T07:17:38.340Z', + _establishmentWdfEligibility: null, + _staffWdfEligibility: '2019-08-13T12:41:24.836Z', + _isParent: true, + _parentUid: null, + _parentId: null, + _parentName: null, + _dataOwner: 'Workplace', + _dataPermissions: 'None', + _archived: false, + _dataOwnershipRequested: null, + _reasonsForLeaving: '', + _properties: { + _properties: [Object], + _propertyTypes: [Array], + _auditEvents: null, + _modifiedProperties: [], + _additionalModels: null + }, + _isNew: false, + _workerEntities: { + }, + _readyForDeletionWorkers: null, + _status: 'NEW', + _logLevel: 300 + }, + { + _validations: [], + _username: 'aylingw', + _id: 1446, + _uid: 'a415435f-40f2-4de5-abf7-bff611e85591', + _ustatus: null, + _created: '2019-07-31T15:09:57.405Z', + _updated: '2019-10-04T15:46:16.797Z', + _updatedBy: 'aylingw', + _auditEvents: null, + _name: 'WOZiTech Cares Sub 100', + _address1: 'Number 1', + _address2: 'My street', + _address3: '', + _town: 'My Town', + _county: '', + _locationId: '1-888777666', + _provId: '1-999888777', + _postcode: 'LN11 9JG', + _isRegulated: true, + _mainService: { id: 1, name: 'Carers support' }, + _nmdsId: 'G1002110', + _lastWdfEligibility: '2019-10-04T15:46:16.797Z', + _overallWdfEligibility: null, + _establishmentWdfEligibility: '2019-10-04T14:46:16.797Z', + _staffWdfEligibility: null, + _isParent: false, + _parentUid: '98a83eef-e1e1-49f3-89c5-b1287a3cc8dd', + _parentId: 479, + _parentName: null, + _dataOwner: 'Parent', + _dataPermissions: 'None', + _archived: false, + _dataOwnershipRequested: null, + _reasonsForLeaving: '', + _properties: { + _properties: [Object], + _propertyTypes: [Array], + _auditEvents: null, + _modifiedProperties: [], + _additionalModels: null + }, + _isNew: false, + _workerEntities: {}, + _readyForDeletionWorkers: null, + _status: 'COMPLETE', + _logLevel: 300 + } + ]); + + expect(bulkUpload).to.have.property('validate'); + + const csvEstablishmentSchemaErrors = []; + + const myWorkers = []; + + // call the validation to ensure the proper error is shown + await bulkUpload.validate(); + + const validationErrors = bulkUpload.validationErrors; + + // assert a warning was returned + + expect(validationErrors).to.deep.equal([ + + ]); + }); // it('should emit an error if SLV is greater than zero and this ALLJOBROLES is blank', async () => { // const bulkUpload = new (testUtils.sandBox( From 6fa5a598be8231961f58a4bd1c5a4d84bf13dbd0 Mon Sep 17 00:00:00 2001 From: Anurag Negi <55235060+Negi-Anurag@users.noreply.github.com> Date: Thu, 6 Feb 2020 10:45:00 +0530 Subject: [PATCH 028/305] UNLOCK USER BUG FIX (#1951) --- server/routes/admin/unlock-account/index.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/server/routes/admin/unlock-account/index.js b/server/routes/admin/unlock-account/index.js index 3ed7024041..b4576c19c4 100644 --- a/server/routes/admin/unlock-account/index.js +++ b/server/routes/admin/unlock-account/index.js @@ -23,7 +23,8 @@ const unlockAccount = async (req, res) => { try { const updateduser = await login.update({ isActive: true, - invalidAttempt: 9 + invalidAttempt: 9, + status: null }); if (updateduser) { res.status(200); From 543af49fbb8d01a0f1434ba9643f260d95520c08 Mon Sep 17 00:00:00 2001 From: rchitranshi <53287302+rchitranshi@users.noreply.github.com> Date: Thu, 6 Feb 2020 12:19:01 +0530 Subject: [PATCH 029/305] Completed with Mandatory Training Create POST API (#1953) * Completed with Mandatory Training Create POST API * Removed debugger --- server/models/classes/mandatoryTraining.js | 262 ++++++++++++++++++ server/models/mandatoryTraining.js | 71 +++++ server/routes/establishments/index.js | 2 + .../establishments/mandatoryTraining/index.js | 34 +++ 4 files changed, 369 insertions(+) create mode 100644 server/models/classes/mandatoryTraining.js create mode 100644 server/models/mandatoryTraining.js create mode 100644 server/routes/establishments/mandatoryTraining/index.js diff --git a/server/models/classes/mandatoryTraining.js b/server/models/classes/mandatoryTraining.js new file mode 100644 index 0000000000..46457a4b75 --- /dev/null +++ b/server/models/classes/mandatoryTraining.js @@ -0,0 +1,262 @@ +/* + * mandatoryTraining.js + * + * The encapsulation of a establishment's Mandatory Training record, including all properties, all specific validation (not API, but object validation), + * saving & restoring of data to database (via sequelize model), construction and deletion. + * + * Also includes representation as JSON, in one or more presentations. + * + */ + + // database models +const models = require('../index'); +const EntityValidator = require('./validations/entityValidator').EntityValidator; +class MandatoryTraining extends EntityValidator { + constructor(establishmentId) { + super(); + this._establishmentId = establishmentId; + this._id = null; + this._trainingId = null; + this._jobId = null; + this._created = null; + this._updated = null; + this._createdBy = null; + this._updatedBy = null; + } + + // private logging + static get LOG_ERROR() { return 100; } + static get LOG_WARN() { return 200; } + static get LOG_INFO() { return 300; } + static get LOG_TRACE() { return 400; } + static get LOG_DEBUG() { return 500; } + + set logLevel(logLevel) { + this._logLevel = logLevel; + } + + _log(level, msg) { + if (this._logLevel >= level) { + console.log(`TODO: (${level}) - Mandatory Training class: `, msg); + } + } + + set mandatorytrainingDetails(obj) { + this._mandatorytrainingDetails = obj; + } + + get mandatorytrainingDetails() { + return this._mandatorytrainingDetails; + } + + set establishmentId(newId) { + this._establishmentId = newId; + } + + get establishmentId() { + return this._establishmentId; + } + + get id() { + return this._id; + } + + get created() { + return this._created; + } + get updated() { + return this._updated; + } + get createdBy() { + return this._createdBy; + } + get updatedBy() { + return this._updatedBy; + } + + // used by save to initialise a new Mandatory Trainign Record; returns true if having initialised this Training Record + _initialise() { + if (this._id === null) { + this._isNew = true; + return true; + } else { + return false; + } + } + + // validates a given mandatory training record; returns the training record if valid + async validateMandatoryTrainingRecord(document) { + let validatedMandatoryTrainingRecord = []; + let returnStatus = true; + //validate all posted training ids + if(document && Array.isArray(document)){ + for(let i = 0; i < document.length; i++){ + let doc = document[i]; + if(!doc.trainingCategoryID){ + console.error('POST:: create mandatoryTraining - Failed Validation - Training Category ID missing'); + this._log(MandatoryTraining.LOG_ERROR, 'Failed Validation - Training Category ID missing'); + returnStatus = false; + } + // get training details + const trainingCategoryDetails = await models.workerTrainingCategories.findOne({ + where: { + id: doc.trainingCategoryID + }, + attributes: ['id'] + }); + + if (trainingCategoryDetails && trainingCategoryDetails.id) { + // get job details if doc.selectedJobRoles === true + if(!doc.allJobRoles){ + if(doc.selectedJobRoles && Array.isArray(doc.jobs)){ + for(let j = 0; j < doc.jobs.length; j++){ + let job = doc.jobs[j]; + const jobDetails = await models.job.findOne({ + where: { + id: job.id + }, + attributes: ['id'] + }); + + if (jobDetails && jobDetails.id) { + validatedMandatoryTrainingRecord.push(doc); + }else{ + console.error('POST:: create mandatoryTraining - Failed Validation - Job role record not found'); + this._log(MandatoryTraining.LOG_ERROR, 'Failed Validation - Job role record not found'); + returnStatus = false; + } + } + }else{ + console.error('POST:: create mandatoryTraining - Failed Validation - Selected job roles record not found'); + this._log(MandatoryTraining.LOG_ERROR, 'Failed Validation - Selected job roles record not found'); + returnStatus = false; + } + }else{ + validatedMandatoryTrainingRecord.push(doc); + } + }else{ + console.error('POST:: create mandatoryTraining - Failed Validation - Training record not found'); + this._log(MandatoryTraining.LOG_ERROR, 'Failed Validation - Training record not found'); + returnStatus = false; + } + } + }else{ + console.error('POST:: create mandatoryTraining - Failed Validation - Invalid Input'); + this._log(MandatoryTraining.LOG_ERROR, 'Invalid Input'); + returnStatus = false; + } + + if (returnStatus === false) { + return false; + } else { + return validatedMandatoryTrainingRecord; + } + } + + // takes the given JSON document and updates self (internal properties) + // Thows "Error" on error. + async load(document) { + try { + const validatedTrainingRecord = await this.validateMandatoryTrainingRecord(document); + + if (validatedTrainingRecord !== false) { + return this.mandatorytrainingDetails = validatedTrainingRecord; + } else { + this._log(MandatoryTraining.LOG_ERROR, `Failed Validation::load - failed`); + return false + } + } catch (err) { + console.error(`POST:: create mandatoryTraining - Failed Validation::load - error: ${err}`); + this._log(MandatoryTraining.LOG_ERROR, `Failed Validation::load - error: ${err}`); + throw new Error('Failed Validation'); + } + } + + // saves the Training record to DB. Returns true if saved; false is not. + // Throws "Error" on error + async save(savedBy, externalTransaction=null) { + let returnSavedResponse = []; + let failedWhileSave = false; + let initializedRecords = this._initialise(); + if(initializedRecords && this._isNew){ + // create new Mandatory Training Record + try{ + // save new mandatory training details + for(let i = 0; i < this.mandatorytrainingDetails.length; i++){ + let row = this.mandatorytrainingDetails[i]; + if(row.allJobRoles){ + // fetch all job roles + let allJobRoles = await models.job.findAll({ + attributes: ['id'], + }); + if (allJobRoles && Array.isArray(allJobRoles) && allJobRoles.length > 0) { + row.jobs = allJobRoles; + } else { + failedWhileSave = true; + throw new Error('No Job roles found'); + } + } + + if(Array.isArray(row.jobs) && row.jobs.length > 0){ + for(let j = 0; j < row.jobs.length; j++){ + let job = row.jobs[j]; + const now = new Date(); + let creationDocument = { + establishmentFK: this.establishmentId, + trainingCategoryFK: row.trainingCategoryID, + jobFK: job.id, + created: now, + updated: now, + createdBy: savedBy.toLowerCase(), + updatedBy: savedBy.toLowerCase() + } + + // need to create the Training record only + // in one transaction + await models.sequelize.transaction(async t => { + // the saving of an Mandatory Training record can be initiated within + // an external transaction + const thisTransaction = externalTransaction ? externalTransaction : t; + + // now save the document + let creation = await models.MandatoryTraining.create(creationDocument, {transaction: thisTransaction}); + + const sanitisedResults = creation.get({plain: true}); + returnSavedResponse.push({ + id: sanitisedResults.ID, + created: sanitisedResults.created, + updated: sanitisedResults.updated, + createdBy: savedBy.toLowerCase(), + updatedBy: savedBy.toLowerCase() + }); + this._isNew = false; + + this._log(MandatoryTraining.LOG_INFO, `Created Mandatory Training Record with id (${sanitisedResults.ID})`); + }); + } + } + } + if(!failedWhileSave){ + return returnSavedResponse; + } + } + catch (err) { + console.error(`POST:: create mandatoryTraining - Failed to save new Mandatory training record: ${err}`); + this._log(MandatoryTraining.LOG_ERROR, `Failed to save new Mandatory training record: ${err}`); + throw new Error('Failed to save new Mandatory Training record'); + } + }else{ + // we are updating an existing Mandatory Training Record + try{ + + } + catch (err) { + console.error(`POST:: create mandatoryTraining - Failed to update Mandatory Training record with id (${this._id})`); + this._log(MandatoryTraining.LOG_ERROR, `Failed to update Mandatory Training record with id (${this._id})`); + throw new Error('Failed to update Mandatory Training record'); + } + } + } +} + +module.exports.MandatoryTraining = MandatoryTraining; diff --git a/server/models/mandatoryTraining.js b/server/models/mandatoryTraining.js new file mode 100644 index 0000000000..c0b0207eef --- /dev/null +++ b/server/models/mandatoryTraining.js @@ -0,0 +1,71 @@ +module.exports = function(sequelize, DataTypes) { + const MandatoryTraining = sequelize.define('MandatoryTraining', { + id: { + type: DataTypes.INTEGER, + allowNull: false, + primaryKey: true, + autoIncrement: true, + field: '"ID"' + }, + establishmentFK : { + type: DataTypes.INTEGER, + allowNull: false, + field: '"EstablishmentFK"' + }, + trainingCategoryFK : { + type: DataTypes.INTEGER, + allowNull: false, + field: '"TrainingCategoryFK"' + }, + jobFK : { + type: DataTypes.INTEGER, + allowNull: false, + field: '"JobFK"' + }, + created: { + type: DataTypes.DATE, + allowNull: false, + field: 'created' + }, + updated: { + type: DataTypes.DATE, + allowNull: false, + field: 'updated' + }, + createdBy: { + type: DataTypes.UUID, + allowNull: false, + field: '"CreatedByUserUID"' + }, + updatedBy: { + type: DataTypes.UUID, + allowNull: false, + field: '"UpdatedByUserUID"' + }, + }, { + tableName: 'MandatoryTraining', + schema: 'cqc', + createdAt: false, + updatedAt: false + }); + + MandatoryTraining.associate = (models) => { + MandatoryTraining.belongsTo(models.establishment, { + foreignKey: 'establishmentFK', + targetKey: 'id', + as: 'establishment' + }); + MandatoryTraining.belongsTo(models.workerTrainingCategories, { + foreignKey: 'trainingCategoryFk', + targetKey: 'id', + as: 'workerTrainingCategories' + }); + MandatoryTraining.belongsTo(models.job, { + foreignKey: 'jobFk', + targetKey: 'id', + as: 'job' + }); + }; + + return MandatoryTraining; +}; diff --git a/server/routes/establishments/index.js b/server/routes/establishments/index.js index 3c47ab449b..f307c65224 100644 --- a/server/routes/establishments/index.js +++ b/server/routes/establishments/index.js @@ -28,6 +28,7 @@ const OwnershipChange = require('./ownershipChange'); const LinkToParent = require('./linkToParent') const DataPermissions = require('./dataPermissions'); const LocationDetails = require('./locationdetails'); +const MandatoryTraining = require('./mandatoryTraining'); const Approve = require('./approve'); const Reject = require('./reject'); @@ -83,6 +84,7 @@ router.use('/:id/ownershipChange', OwnershipChange); router.use('/:id/linkToParent', LinkToParent); router.use('/:id/dataPermissions', DataPermissions); router.use('/:id/locationDetails', LocationDetails); +router.use('/:id/mandatoryTraining', MandatoryTraining); router.route('/:id').post(async (req, res) => { if (!req.body.isRegulated) { diff --git a/server/routes/establishments/mandatoryTraining/index.js b/server/routes/establishments/mandatoryTraining/index.js new file mode 100644 index 0000000000..a6407b5061 --- /dev/null +++ b/server/routes/establishments/mandatoryTraining/index.js @@ -0,0 +1,34 @@ +/** + * Default route file for manage mandatory training + */ +const express = require('express'); +const router = express.Router({mergeParams: true}); + +const MandatoryTraining = require('../../../models/classes/mandatoryTraining').MandatoryTraining; + +/** + * Handle POST request for creating new mandatory training + */ +router.route('/').post(async (req, res) => { + const establishmentId = req.establishmentId; + + const thisMandatoryTrainingRecord = new MandatoryTraining(establishmentId); + + try{ + //validate posted records + const isValidRecord = await thisMandatoryTrainingRecord.load(req.body); + // records validated + if (isValidRecord) { + const saveRecords = await thisMandatoryTrainingRecord.save(req.userUid); + + return res.status(200).json(saveRecords); + } else { + return res.status(400).send('Unexpected Input.'); + } + }catch(err){ + console.error(err); + return res.status(503).send(); + } +}); + +module.exports = router; From a1e6eb578b312bb03daed9ec1daeb05c31004bbd Mon Sep 17 00:00:00 2001 From: Aaron Russell Date: Thu, 6 Feb 2020 12:10:21 +0000 Subject: [PATCH 030/305] Updated validations to async to help with database connection and updated when check for existing locationId --- .../models/BulkImport/csv/establishments.js | 29 ++++++++++--------- server/routes/establishments/bulkUpload.js | 2 +- 2 files changed, 17 insertions(+), 14 deletions(-) diff --git a/server/models/BulkImport/csv/establishments.js b/server/models/BulkImport/csv/establishments.js index 34a1970aee..d1fb11f8b4 100644 --- a/server/models/BulkImport/csv/establishments.js +++ b/server/models/BulkImport/csv/establishments.js @@ -852,10 +852,12 @@ class Establishment { // do not use const mainServiceIsHeadOffice = parseInt(this._currentLine.MAINSERVICE, 10) === 72; + console.log('Checking for locationId'); const locationExists = await models.establishment.findAll({ where: { locationId: myLocationID - } + }, + attributes: ['id', 'locationId'] }); if (this._regType === 2) { // ignore location i @@ -880,18 +882,19 @@ class Establishment { name: this._currentLine.LOCALESTID }); return false; - } else if (locationExists.length > 0) { - this._validationErrors.push({ - lineNumber: this._lineNumber, - errCode: Establishment.LOCATION_ID_ERROR, - errType: 'LOCATION_ID_ERROR', - error: 'LOCATIONID already exists in ASC-WDS please contact Support on 0113 241 0969', - source: myLocationID, - name: this._currentLine.LOCALESTID - }); - return false; } } + if (locationExists.length > 0) { + this._validationErrors.push({ + lineNumber: this._lineNumber, + errCode: Establishment.LOCATION_ID_ERROR, + errType: 'LOCATION_ID_ERROR', + error: 'LOCATIONID already exists in ASC-WDS please contact Support on 0113 241 0969', + source: myLocationID, + name: this._currentLine.LOCALESTID + }); + return false; + } this._locationID = myLocationID; return true; @@ -2016,7 +2019,7 @@ class Establishment { } // returns true on success, false is any attribute of Establishment fails - validate () { + async validate () { let status = true; status = !this._validateLocalisedId() ? false : status; @@ -2035,7 +2038,7 @@ class Establishment { status = !this._validateMainService() ? false : status; status = !this._validateRegType() ? false : status; status = !this._validateProvID() ? false : status; - status = !this._validateLocationID() ? false : status; + status = await this._validateLocationID() ? false : status; status = !this._validateAllServices() ? false : status; status = !this._validateServiceUsers() ? false : status; diff --git a/server/routes/establishments/bulkUpload.js b/server/routes/establishments/bulkUpload.js index 47ebc84f8b..e48a674b61 100644 --- a/server/routes/establishments/bulkUpload.js +++ b/server/routes/establishments/bulkUpload.js @@ -842,7 +842,7 @@ const validateEstablishmentCsv = async ( keepAlive('establishment loaded', currentLineNumber); - if (thisApiEstablishment.validate()) { + if (await thisApiEstablishment.validate()) { // No validation errors in the entity itself, so add it ready for completion myAPIEstablishments[thisApiEstablishment.key] = thisApiEstablishment; } else { From b787ace66bb8f2882dd1fd2e280e724fdffafafe Mon Sep 17 00:00:00 2001 From: Aaron Russell Date: Thu, 6 Feb 2020 12:10:33 +0000 Subject: [PATCH 031/305] Removed console log --- server/models/BulkImport/csv/establishments.js | 1 - 1 file changed, 1 deletion(-) diff --git a/server/models/BulkImport/csv/establishments.js b/server/models/BulkImport/csv/establishments.js index d1fb11f8b4..72589c2959 100644 --- a/server/models/BulkImport/csv/establishments.js +++ b/server/models/BulkImport/csv/establishments.js @@ -852,7 +852,6 @@ class Establishment { // do not use const mainServiceIsHeadOffice = parseInt(this._currentLine.MAINSERVICE, 10) === 72; - console.log('Checking for locationId'); const locationExists = await models.establishment.findAll({ where: { locationId: myLocationID From c3c4b35d92e96a04ed88805a8d158509020d12de Mon Sep 17 00:00:00 2001 From: Aaron Russell Date: Thu, 6 Feb 2020 12:11:12 +0000 Subject: [PATCH 032/305] Added test for locationId --- .../Bulkimport/csv/establishments.spec.js | 174 +++++++++++++++++- 1 file changed, 173 insertions(+), 1 deletion(-) diff --git a/server/test/unit/models/Bulkimport/csv/establishments.spec.js b/server/test/unit/models/Bulkimport/csv/establishments.spec.js index 64381ae1ce..c6907c32cb 100644 --- a/server/test/unit/models/Bulkimport/csv/establishments.spec.js +++ b/server/test/unit/models/Bulkimport/csv/establishments.spec.js @@ -1466,9 +1466,181 @@ describe('/server/models/Bulkimport/csv/establishment.js', () => { // assert a warning was returned expect(validationErrors).to.deep.equal([ - + { + "errCode": 1110, + "errType": "LOCATION_ID_ERROR", + "error": "LOCATIONID already exists in ASC-WDS please contact Support on 0113 241 0969", + "lineNumber": 2, + "name": "omar3", + "origin": "Establishments", + "source": "1-123456780" + } ]); }); + it('should not emit an error if locationId has not already been used in the database', async () => { + const bulkUpload = new (testUtils.sandBox( + filename, + { + locals: { + require: testUtils.wrapRequire({ + '../BUDI': { + BUDI + }, + '../../index': { + establishment: models.establishment + } + }) + } + } + ).Establishment)( + { + LOCALESTID: 'omar3', + STATUS: 'NEW', + ESTNAME: 'WOZiTech, with even more care', + ADDRESS1: 'First Line', + ADDRESS2: 'Second Line', + ADDRESS3: '', + POSTTOWN: 'My Town', + POSTCODE: 'LN11 9JG', + ESTTYPE: '6', + OTHERTYPE: '', + PERMCQC: '1', + PERMLA: '1', + SHARELA: '708;721;720', + REGTYPE: '2', + PROVNUM: '1-123456781', + LOCATIONID: '1-123456781', + MAINSERVICE: '8', + ALLSERVICES: '12;13', + CAPACITY: '0;0', + UTILISATION: '0;0', + SERVICEDESC: '1;1', + SERVICEUSERS: '', + OTHERUSERDESC: '', + TOTALPERMTEMP: '1', + ALLJOBROLES: '34;8;4', + STARTERS: '0;0;0', + LEAVERS: '999;0;0', + VACANCIES: '999;333;1', + REASONS: '', + REASONNOS: '' + }, + 2, + [ + { + _validations: [], + _username: 'aylingw', + _id: 479, + _uid: '98a83eef-e1e1-49f3-89c5-b1287a3cc8dd', + _ustatus: null, + _created: '2019-03-15T09:54:10.562Z', + _updated: '2019-10-04T15:46:16.158Z', + _updatedBy: 'aylingw', + _auditEvents: null, + _name: 'WOZiTech, with even more care', + _address1: 'First Line', + _address2: 'Second Line', + _address3: '', + _town: 'My Town', + _county: '', + _locationId: null, + _provId: null, + _postcode: 'LN11 9JG', + _isRegulated: false, + _mainService: { id: 16, name: 'Head office services' }, + _nmdsId: 'G1001114', + _lastWdfEligibility: '2019-08-16T07:17:38.014Z', + _overallWdfEligibility: '2019-08-16T07:17:38.340Z', + _establishmentWdfEligibility: null, + _staffWdfEligibility: '2019-08-13T12:41:24.836Z', + _isParent: true, + _parentUid: null, + _parentId: null, + _parentName: null, + _dataOwner: 'Workplace', + _dataPermissions: 'None', + _archived: false, + _dataOwnershipRequested: null, + _reasonsForLeaving: '', + _properties: { + _properties: [Object], + _propertyTypes: [Array], + _auditEvents: null, + _modifiedProperties: [], + _additionalModels: null + }, + _isNew: false, + _workerEntities: { + }, + _readyForDeletionWorkers: null, + _status: 'NEW', + _logLevel: 300 + }, + { + _validations: [], + _username: 'aylingw', + _id: 1446, + _uid: 'a415435f-40f2-4de5-abf7-bff611e85591', + _ustatus: null, + _created: '2019-07-31T15:09:57.405Z', + _updated: '2019-10-04T15:46:16.797Z', + _updatedBy: 'aylingw', + _auditEvents: null, + _name: 'WOZiTech Cares Sub 100', + _address1: 'Number 1', + _address2: 'My street', + _address3: '', + _town: 'My Town', + _county: '', + _locationId: '1-888777666', + _provId: '1-999888777', + _postcode: 'LN11 9JG', + _isRegulated: true, + _mainService: { id: 1, name: 'Carers support' }, + _nmdsId: 'G1002110', + _lastWdfEligibility: '2019-10-04T15:46:16.797Z', + _overallWdfEligibility: null, + _establishmentWdfEligibility: '2019-10-04T14:46:16.797Z', + _staffWdfEligibility: null, + _isParent: false, + _parentUid: '98a83eef-e1e1-49f3-89c5-b1287a3cc8dd', + _parentId: 479, + _parentName: null, + _dataOwner: 'Parent', + _dataPermissions: 'None', + _archived: false, + _dataOwnershipRequested: null, + _reasonsForLeaving: '', + _properties: { + _properties: [Object], + _propertyTypes: [Array], + _auditEvents: null, + _modifiedProperties: [], + _additionalModels: null + }, + _isNew: false, + _workerEntities: {}, + _readyForDeletionWorkers: null, + _status: 'COMPLETE', + _logLevel: 300 + } + ]); + + expect(bulkUpload).to.have.property('validate'); + + const csvEstablishmentSchemaErrors = []; + + const myWorkers = []; + + // call the validation to ensure the proper error is shown + await bulkUpload.validate(); + + const validationErrors = bulkUpload.validationErrors; + + // assert a warning was returned + + expect(validationErrors).to.deep.equal([]); +}); // it('should emit an error if SLV is greater than zero and this ALLJOBROLES is blank', async () => { // const bulkUpload = new (testUtils.sandBox( From e851c868925bfa71f62e46e0d758e4cf50c25a2e Mon Sep 17 00:00:00 2001 From: Aaron Russell Date: Thu, 6 Feb 2020 12:11:24 +0000 Subject: [PATCH 033/305] Removed polling from front end --- .../files-upload/files-upload.component.ts | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/src/app/features/bulk-upload/files-upload/files-upload.component.ts b/src/app/features/bulk-upload/files-upload/files-upload.component.ts index 90034347df..269d87b70a 100644 --- a/src/app/features/bulk-upload/files-upload/files-upload.component.ts +++ b/src/app/features/bulk-upload/files-upload/files-upload.component.ts @@ -19,7 +19,7 @@ import { tap } from 'rxjs/operators'; selector: 'app-files-upload', templateUrl: './files-upload.component.html', }) -export class FilesUploadComponent implements OnInit, OnDestroy, AfterViewInit { +export class FilesUploadComponent implements OnInit, AfterViewInit { @ViewChild('formEl', { static: false }) formEl: ElementRef; public form: FormGroup; public filesUploading = false; @@ -45,15 +45,6 @@ export class FilesUploadComponent implements OnInit, OnDestroy, AfterViewInit { ngOnInit() { this.setupForm(); this.checkForUploadedFiles(); - this.status = interval(5000).subscribe(() => { - if (!this.stopPolling) { - this.checkForUploadedFiles(); - } - }); - } - - ngOnDestroy() { - this.status.unsubscribe(); } ngAfterViewInit() { From 5d4aa8082cab3cbb56593d4636ed32c867c23aac Mon Sep 17 00:00:00 2001 From: Aaron Russell Date: Thu, 6 Feb 2020 14:29:05 +0000 Subject: [PATCH 034/305] Changed await to right positoin --- server/routes/establishments/bulkUpload.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/server/routes/establishments/bulkUpload.js b/server/routes/establishments/bulkUpload.js index e48a674b61..6adee64570 100644 --- a/server/routes/establishments/bulkUpload.js +++ b/server/routes/establishments/bulkUpload.js @@ -819,7 +819,7 @@ const validateEstablishmentCsv = async ( const lineValidator = new EstablishmentCsvValidator(thisLine, currentLineNumber, myCurrentEstablishments); // the parsing/validation needs to be forgiving in that it needs to return as many errors in one pass as possible - lineValidator.validate(); + await lineValidator.validate(); lineValidator.transform(); const thisEstablishmentAsAPI = lineValidator.toAPI(); @@ -842,7 +842,7 @@ const validateEstablishmentCsv = async ( keepAlive('establishment loaded', currentLineNumber); - if (await thisApiEstablishment.validate()) { + if (thisApiEstablishment.validate()) { // No validation errors in the entity itself, so add it ready for completion myAPIEstablishments[thisApiEstablishment.key] = thisApiEstablishment; } else { From e8bdf28a75b78c2fb9aced9f34106a2dc1734f3b Mon Sep 17 00:00:00 2001 From: Aaron Russell Date: Thu, 6 Feb 2020 14:51:22 +0000 Subject: [PATCH 035/305] Added check for if it's the establishment you're updating --- .../models/BulkImport/csv/establishments.js | 8 +- .../Bulkimport/csv/establishments.spec.js | 184 +++++++++++++++++- 2 files changed, 187 insertions(+), 5 deletions(-) diff --git a/server/models/BulkImport/csv/establishments.js b/server/models/BulkImport/csv/establishments.js index 72589c2959..7f155b5b04 100644 --- a/server/models/BulkImport/csv/establishments.js +++ b/server/models/BulkImport/csv/establishments.js @@ -858,6 +858,12 @@ class Establishment { }, attributes: ['id', 'locationId'] }); + console.log(this._id); + console.log(locationExists); + let existingEstablishment = false; + await locationExists.map(async (establishment) => { + if (establishment.id === this._id) existingEstablishment = true; + }); if (this._regType === 2) { // ignore location i if (!mainServiceIsHeadOffice) { @@ -883,7 +889,7 @@ class Establishment { return false; } } - if (locationExists.length > 0) { + if (locationExists.length > 0 && !existingEstablishment) { this._validationErrors.push({ lineNumber: this._lineNumber, errCode: Establishment.LOCATION_ID_ERROR, diff --git a/server/test/unit/models/Bulkimport/csv/establishments.spec.js b/server/test/unit/models/Bulkimport/csv/establishments.spec.js index c6907c32cb..909412c457 100644 --- a/server/test/unit/models/Bulkimport/csv/establishments.spec.js +++ b/server/test/unit/models/Bulkimport/csv/establishments.spec.js @@ -13,7 +13,8 @@ const BUDI_TO_ASC = 100; const BUSI_FROM_ASC = 200; const establishment = [{ - locationId: '1-123456780' + locationId: '1-123456780', + id: 123 }]; const models = { @@ -1303,7 +1304,7 @@ describe('/server/models/Bulkimport/csv/establishment.js', () => { ]); }); - it('should emit an error if locationId has already been used in the database', async () => { + it('should emit an error if locationId has already been used in the database and not this establishment', async () => { const bulkUpload = new (testUtils.sandBox( filename, { @@ -1321,7 +1322,7 @@ describe('/server/models/Bulkimport/csv/establishment.js', () => { ).Establishment)( { LOCALESTID: 'omar3', - STATUS: 'NEW', + STATUS: 'UPDATE', ESTNAME: 'WOZiTech, with even more care', ADDRESS1: 'First Line', ADDRESS2: 'Second Line', @@ -1337,7 +1338,7 @@ describe('/server/models/Bulkimport/csv/establishment.js', () => { PROVNUM: '1-123456780', LOCATIONID: '1-123456780', MAINSERVICE: '8', - ALLSERVICES: '12;13', + ALLSERVICES: '12;13', CAPACITY: '0;0', UTILISATION: '0;0', SERVICEDESC: '1;1', @@ -1466,6 +1467,15 @@ describe('/server/models/Bulkimport/csv/establishment.js', () => { // assert a warning was returned expect(validationErrors).to.deep.equal([ + { + "errCode": 1020, + "errType": "STATUS_ERROR", + "error": "Workplace has a STATUS of UPDATE but does not exist, please change to NEW to add it", + "lineNumber": 2, + "name": "omar3", + "origin": "Establishments", + "source": "UPDATE" + }, { "errCode": 1110, "errType": "LOCATION_ID_ERROR", @@ -1477,6 +1487,172 @@ describe('/server/models/Bulkimport/csv/establishment.js', () => { } ]); }); + it('should not emit an error if locationId has already been used in the database and is this establishment', async () => { + const bulkUpload = new (testUtils.sandBox( + filename, + { + locals: { + require: testUtils.wrapRequire({ + '../BUDI': { + BUDI + }, + '../../index': { + establishment: models.establishment + } + }) + } + } + ).Establishment)( + { + LOCALESTID: '123', + STATUS: 'UPDATE', + ESTNAME: 'WOZiTech, with even more care', + ADDRESS1: 'First Line', + ADDRESS2: 'Second Line', + ADDRESS3: '', + POSTTOWN: 'My Town', + POSTCODE: 'LN11 9JG', + ESTTYPE: '6', + OTHERTYPE: '', + PERMCQC: '1', + PERMLA: '1', + SHARELA: '708;721;720', + REGTYPE: '2', + PROVNUM: '1-123456780', + LOCATIONID: '1-123456780', + MAINSERVICE: '8', + ALLSERVICES: '12;13', + CAPACITY: '0;0', + UTILISATION: '0;0', + SERVICEDESC: '1;1', + SERVICEUSERS: '', + OTHERUSERDESC: '', + TOTALPERMTEMP: '1', + ALLJOBROLES: '34;8;4', + STARTERS: '0;0;0', + LEAVERS: '999;0;0', + VACANCIES: '999;333;1', + REASONS: '', + REASONNOS: '' + }, + 2, + [ + { + _validations: [], + _username: 'aylingw', + _id: 123, + _uid: '98a83eef-e1e1-49f3-89c5-b1287a3cc8dd', + _ustatus: null, + _created: '2019-03-15T09:54:10.562Z', + _updated: '2019-10-04T15:46:16.158Z', + _updatedBy: 'aylingw', + _auditEvents: null, + _name: 'WOZiTech, with even more care', + _address1: 'First Line', + _address2: 'Second Line', + _address3: '', + _town: 'My Town', + _county: '', + _locationId: null, + _provId: null, + _postcode: 'LN11 9JG', + _isRegulated: false, + _mainService: { id: 16, name: 'Head office services' }, + _nmdsId: 'G1001114', + _lastWdfEligibility: '2019-08-16T07:17:38.014Z', + _overallWdfEligibility: '2019-08-16T07:17:38.340Z', + _establishmentWdfEligibility: null, + _staffWdfEligibility: '2019-08-13T12:41:24.836Z', + _isParent: true, + _parentUid: null, + _parentId: null, + _parentName: null, + _dataOwner: 'Workplace', + _dataPermissions: 'None', + _archived: false, + _dataOwnershipRequested: null, + _reasonsForLeaving: '', + _properties: { + _properties: [Object], + _propertyTypes: [Array], + _auditEvents: null, + _modifiedProperties: [], + _additionalModels: null + }, + _isNew: false, + _workerEntities: { + }, + _readyForDeletionWorkers: null, + _status: 'NEW', + _logLevel: 300, + key: '123' + }, + { + _validations: [], + _username: 'aylingw', + _id: 1446, + _uid: 'a415435f-40f2-4de5-abf7-bff611e85591', + _ustatus: null, + _created: '2019-07-31T15:09:57.405Z', + _updated: '2019-10-04T15:46:16.797Z', + _updatedBy: 'aylingw', + _auditEvents: null, + _name: 'WOZiTech Cares Sub 100', + _address1: 'Number 1', + _address2: 'My street', + _address3: '', + _town: 'My Town', + _county: '', + _locationId: '1-888777666', + _provId: '1-999888777', + _postcode: 'LN11 9JG', + _isRegulated: true, + _mainService: { id: 1, name: 'Carers support' }, + _nmdsId: 'G1002110', + _lastWdfEligibility: '2019-10-04T15:46:16.797Z', + _overallWdfEligibility: null, + _establishmentWdfEligibility: '2019-10-04T14:46:16.797Z', + _staffWdfEligibility: null, + _isParent: false, + _parentUid: '98a83eef-e1e1-49f3-89c5-b1287a3cc8dd', + _parentId: 479, + _parentName: null, + _dataOwner: 'Parent', + _dataPermissions: 'None', + _archived: false, + _dataOwnershipRequested: null, + _reasonsForLeaving: '', + _properties: { + _properties: [Object], + _propertyTypes: [Array], + _auditEvents: null, + _modifiedProperties: [], + _additionalModels: null + }, + _isNew: false, + _workerEntities: {}, + _readyForDeletionWorkers: null, + _status: 'COMPLETE', + _logLevel: 300 + } + ]); + + expect(bulkUpload).to.have.property('validate'); + + const csvEstablishmentSchemaErrors = []; + + const myWorkers = []; + + // call the validation to ensure the proper error is shown + await bulkUpload.validate(); + + const validationErrors = bulkUpload.validationErrors; + + // assert a warning was returned + + expect(validationErrors).to.deep.equal([]); +}); + it('should not emit an error if locationId has not already been used in the database', async () => { const bulkUpload = new (testUtils.sandBox( filename, From ad3abe0d3a6d0e8ccc7d3ccdbd5d881656c5dbc3 Mon Sep 17 00:00:00 2001 From: Aaron Russell Date: Thu, 6 Feb 2020 14:28:20 +0000 Subject: [PATCH 036/305] Started adding postcode validations --- .../models/BulkImport/csv/establishments.js | 24 ++++++++++++++++--- server/routes/establishments/bulkUpload.js | 6 +++-- 2 files changed, 25 insertions(+), 5 deletions(-) diff --git a/server/models/BulkImport/csv/establishments.js b/server/models/BulkImport/csv/establishments.js index 7f155b5b04..9a6477fe08 100644 --- a/server/models/BulkImport/csv/establishments.js +++ b/server/models/BulkImport/csv/establishments.js @@ -92,6 +92,7 @@ class Establishment { this._reasonsForLeaving = null; this._id = null; + this._ignore = false; // console.log(`WA DEBUG - current establishment (${this._lineNumber}:`, this._currentLine); } @@ -457,7 +458,7 @@ class Establishment { } } - _validateAddress () { + async _validateAddress () { const myAddress1 = this._currentLine.ADDRESS1; const myAddress2 = this._currentLine.ADDRESS2; const myAddress3 = this._currentLine.ADDRESS3; @@ -469,6 +470,14 @@ class Establishment { // adddress 1 is mandatory and no more than 40 characters const MAX_LENGTH = 40; + const postcodeExists = await models.pcodedata.findAll({ + where: { + postcode: myPostcode + }, + order: [ + ['uprn', 'ASC'] + ] + }); const localValidationErrors = []; if (!myAddress1 || myAddress1.length === 0) { @@ -522,7 +531,6 @@ class Establishment { name: this._currentLine.LOCALESTID }); } - // TODO - registration/establishment APIs do not validate postcode (relies on the frontend - this must be fixed) const postcodeRegex = /^[A-Za-z]{1,2}[0-9]{1,2}\s{1}[0-9][A-Za-z]{2}$/; const POSTCODE_MAX_LENGTH = 10; @@ -553,6 +561,16 @@ class Establishment { source: myPostcode, name: this._currentLine.LOCALESTID }); + } else if (this._status === 'NEW' && !postcodeExists.length) { + localValidationErrors.push({ + lineNumber: this._lineNumber, + warnCode: Establishment.ADDRESS_ERROR, + warnType: 'ADDRESS_ERROR', + warning: 'Workplace will be ignored. The Postcode for this workplace cannot be found in our database and must be registered manually.', + source: myPostcode, + name: this._currentLine.LOCALESTID + }); + this._ignore = true; } if (localValidationErrors.length > 0) { @@ -2033,7 +2051,7 @@ class Establishment { // if the status is unchecked or deleted, then don't continue validation if (!STOP_VALIDATING_ON.includes(this._status)) { - status = !this._validateAddress() ? false : status; + status = await this._validateAddress() ? false : status; status = !this._validateEstablishmentType() ? false : status; status = !this._validateShareWithCQC() ? false : status; diff --git a/server/routes/establishments/bulkUpload.js b/server/routes/establishments/bulkUpload.js index 6adee64570..6256014294 100644 --- a/server/routes/establishments/bulkUpload.js +++ b/server/routes/establishments/bulkUpload.js @@ -820,6 +820,7 @@ const validateEstablishmentCsv = async ( // the parsing/validation needs to be forgiving in that it needs to return as many errors in one pass as possible await lineValidator.validate(); + console.log(lineValidator); lineValidator.transform(); const thisEstablishmentAsAPI = lineValidator.toAPI(); @@ -864,8 +865,9 @@ const validateEstablishmentCsv = async ( if (lineValidator.validationErrors.length > 0) { lineValidator.validationErrors.forEach(thisError => csvEstablishmentSchemaErrors.push(thisError)); } - - myEstablishments.push(lineValidator); + if (!lineValidator._ignore) { + myEstablishments.push(lineValidator); + } }; const loadWorkerQualifications = async ( From 637c0f1b08efdd5dcaea67791868917dc4ff0136 Mon Sep 17 00:00:00 2001 From: Aaron Russell Date: Thu, 6 Feb 2020 15:05:11 +0000 Subject: [PATCH 037/305] Enabled WDF logging --- server/routes/reports/wdf/parent.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/server/routes/reports/wdf/parent.js b/server/routes/reports/wdf/parent.js index e11f3e8f7b..deffd844be 100644 --- a/server/routes/reports/wdf/parent.js +++ b/server/routes/reports/wdf/parent.js @@ -27,8 +27,8 @@ const workersSheetName = path.join('xl', 'worksheets', 'sheet3.xml'); const sharedStringsName = path.join('xl', 'sharedStrings.xml'); const schema = 'http://schemas.openxmlformats.org/spreadsheetml/2006/main'; const isNumberRegex = /^[0-9]+(\.[0-9]+)?$/; -//const debuglog = console.log.bind(console); -const debuglog = () => {}; +const debuglog = console.log.bind(console); +// const debuglog = () => {}; const buStates = [ 'READY', From d63cdd7f910a57c8efc0906bc7202e9292f083df Mon Sep 17 00:00:00 2001 From: Aaron Russell Date: Thu, 6 Feb 2020 15:47:11 +0000 Subject: [PATCH 038/305] Updated so it ignores a workplace if ignore flag is set --- server/routes/establishments/bulkUpload.js | 68 ++++++++++++---------- 1 file changed, 36 insertions(+), 32 deletions(-) diff --git a/server/routes/establishments/bulkUpload.js b/server/routes/establishments/bulkUpload.js index 6256014294..a101d31227 100644 --- a/server/routes/establishments/bulkUpload.js +++ b/server/routes/establishments/bulkUpload.js @@ -821,46 +821,49 @@ const validateEstablishmentCsv = async ( // the parsing/validation needs to be forgiving in that it needs to return as many errors in one pass as possible await lineValidator.validate(); console.log(lineValidator); - lineValidator.transform(); + if (!lineValidator._ignore) { + lineValidator.transform(); - const thisEstablishmentAsAPI = lineValidator.toAPI(); + const thisEstablishmentAsAPI = lineValidator.toAPI(); - try { - const thisApiEstablishment = new Establishment(); - thisApiEstablishment.initialise( - thisEstablishmentAsAPI.Address1, - thisEstablishmentAsAPI.Address2, - thisEstablishmentAsAPI.Address3, - thisEstablishmentAsAPI.Town, - null, - thisEstablishmentAsAPI.LocationId, - thisEstablishmentAsAPI.ProvId, - thisEstablishmentAsAPI.Postcode, - thisEstablishmentAsAPI.IsCQCRegulated - ); + try { + const thisApiEstablishment = new Establishment(); + thisApiEstablishment.initialise( + thisEstablishmentAsAPI.Address1, + thisEstablishmentAsAPI.Address2, + thisEstablishmentAsAPI.Address3, + thisEstablishmentAsAPI.Town, + null, + thisEstablishmentAsAPI.LocationId, + thisEstablishmentAsAPI.ProvId, + thisEstablishmentAsAPI.Postcode, + thisEstablishmentAsAPI.IsCQCRegulated + ); - await thisApiEstablishment.load(thisEstablishmentAsAPI); + await thisApiEstablishment.load(thisEstablishmentAsAPI); - keepAlive('establishment loaded', currentLineNumber); + keepAlive('establishment loaded', currentLineNumber); - if (thisApiEstablishment.validate()) { - // No validation errors in the entity itself, so add it ready for completion - myAPIEstablishments[thisApiEstablishment.key] = thisApiEstablishment; - } else { - const errors = thisApiEstablishment.errors; + if (thisApiEstablishment.validate()) { + // No validation errors in the entity itself, so add it ready for completion + myAPIEstablishments[thisApiEstablishment.key] = thisApiEstablishment; + } else { + const errors = thisApiEstablishment.errors; - if (errors.length === 0) { - myAPIEstablishments[thisApiEstablishment.key] = thisApiEstablishment; - } else { - // TODO: Remove this when capacities and services are fixed; temporarily adding establishments - // even though they're in error (because service/capacity validations put all in error) - myAPIEstablishments[thisApiEstablishment.key] = thisApiEstablishment; - } + if (errors.length === 0) { + myAPIEstablishments[thisApiEstablishment.key] = thisApiEstablishment; + } else { + // TODO: Remove this when capacities and services are fixed; temporarily adding establishments + // even though they're in error (because service/capacity validations put all in error) + myAPIEstablishments[thisApiEstablishment.key] = thisApiEstablishment; + } + } + } catch (err) { + console.error('WA - localised validate establishment error until validation card', err); } - } catch (err) { - console.error('WA - localised validate establishment error until validation card', err); + } else { + console.log('Ignoring', lineValidator._name); } - // collate all bulk upload validation errors/warnings if (lineValidator.validationErrors.length > 0) { lineValidator.validationErrors.forEach(thisError => csvEstablishmentSchemaErrors.push(thisError)); @@ -868,6 +871,7 @@ const validateEstablishmentCsv = async ( if (!lineValidator._ignore) { myEstablishments.push(lineValidator); } + }; const loadWorkerQualifications = async ( From bf837f0e5f204a06e6fb8cef48a94122f1a8975d Mon Sep 17 00:00:00 2001 From: Aaron Russell Date: Thu, 6 Feb 2020 15:49:10 +0000 Subject: [PATCH 039/305] Removed console log --- server/routes/establishments/bulkUpload.js | 1 - 1 file changed, 1 deletion(-) diff --git a/server/routes/establishments/bulkUpload.js b/server/routes/establishments/bulkUpload.js index a101d31227..02867b26f5 100644 --- a/server/routes/establishments/bulkUpload.js +++ b/server/routes/establishments/bulkUpload.js @@ -820,7 +820,6 @@ const validateEstablishmentCsv = async ( // the parsing/validation needs to be forgiving in that it needs to return as many errors in one pass as possible await lineValidator.validate(); - console.log(lineValidator); if (!lineValidator._ignore) { lineValidator.transform(); From ee3ab5084572dc8f6bb2c5db0a50fd299800a22f Mon Sep 17 00:00:00 2001 From: rchitranshi <53287302+rchitranshi@users.noreply.github.com> Date: Fri, 7 Feb 2020 11:37:59 +0530 Subject: [PATCH 040/305] Added GET API to fetch all saved Mandatory Training (#1956) * Added GET API to fetch all saved Mandatory Training * Removed extra semicolon. --- server/models/classes/mandatoryTraining.js | 82 ++++++++++++++++++- server/models/mandatoryTraining.js | 4 +- .../establishments/mandatoryTraining/index.js | 16 ++++ 3 files changed, 97 insertions(+), 5 deletions(-) diff --git a/server/models/classes/mandatoryTraining.js b/server/models/classes/mandatoryTraining.js index 46457a4b75..c64ad452c6 100644 --- a/server/models/classes/mandatoryTraining.js +++ b/server/models/classes/mandatoryTraining.js @@ -108,6 +108,7 @@ class MandatoryTraining extends EntityValidator { if (trainingCategoryDetails && trainingCategoryDetails.id) { // get job details if doc.selectedJobRoles === true if(!doc.allJobRoles){ + let foundJobRoles = true; if(doc.selectedJobRoles && Array.isArray(doc.jobs)){ for(let j = 0; j < doc.jobs.length; j++){ let job = doc.jobs[j]; @@ -118,9 +119,8 @@ class MandatoryTraining extends EntityValidator { attributes: ['id'] }); - if (jobDetails && jobDetails.id) { - validatedMandatoryTrainingRecord.push(doc); - }else{ + if (!jobDetails || !jobDetails.id) { + foundJobRoles = false; console.error('POST:: create mandatoryTraining - Failed Validation - Job role record not found'); this._log(MandatoryTraining.LOG_ERROR, 'Failed Validation - Job role record not found'); returnStatus = false; @@ -131,6 +131,10 @@ class MandatoryTraining extends EntityValidator { this._log(MandatoryTraining.LOG_ERROR, 'Failed Validation - Selected job roles record not found'); returnStatus = false; } + + if(foundJobRoles){ + validatedMandatoryTrainingRecord.push(doc); + } }else{ validatedMandatoryTrainingRecord.push(doc); } @@ -257,6 +261,78 @@ class MandatoryTraining extends EntityValidator { } } } + + /** + * Returns all saved mandatory training list including training category name, job name and establishment id + */ + static async fetch(establishmentId){ + const allMandatoryTrainingRecords = []; + const fetchResults = await models.MandatoryTraining.findAll({ + include: [ + { + model: models.workerTrainingCategories, + as: 'workerTrainingCategories', + attributes: ['id', 'category'] + }, + { + model: models.job, + as: 'job', + attributes: ['id', 'title'] + } + ], + order: [ + ['updated', 'DESC'] + ], + where: { + establishmentFK: establishmentId + } + }); + + if(fetchResults){ + fetchResults.forEach(result => { + if(allMandatoryTrainingRecords.length > 0){ + const foundCategory = allMandatoryTrainingRecords.filter(el => el.trainingCategoryId === result.trainingCategoryFK); + if (foundCategory.length === 0){ + allMandatoryTrainingRecords.push({ + establishmentId: result.establishmentFK, + trainingCategoryId: result.trainingCategoryFK, + category: result.workerTrainingCategories.category, + jobs: [{id: result.jobFK, title: result.job.title}] + }); + }else{ + foundCategory[0].jobs.push({id: result.jobFK, title: result.job.title}); + } + }else{ + allMandatoryTrainingRecords.push({ + establishmentId: result.establishmentFK, + trainingCategoryId: result.trainingCategoryFK, + category: result.workerTrainingCategories.category, + jobs: [{id: result.jobFK, title: result.job.title}] + }); + } + }); + } + + let lastUpdated = null; + if (fetchResults && fetchResults.length === 1) { + lastUpdated = fetchResults[0]; + } else if (fetchResults && fetchResults.length > 1) { + lastUpdated = fetchResults.reduce((a, b) => { return a.updated > b.updated ? a : b; }); + } + + const allJobRoles = await models.job.findAll(); + if(allJobRoles){ + const response = { + mandatoryTrainingCount: allMandatoryTrainingRecords.length, + allJobRolesCount: allJobRoles.length, + lastUpdated: lastUpdated ? lastUpdated.updated.toISOString() : undefined, + mandatoryTraining: allMandatoryTrainingRecords + }; + + return response; + } + } + } module.exports.MandatoryTraining = MandatoryTraining; diff --git a/server/models/mandatoryTraining.js b/server/models/mandatoryTraining.js index c0b0207eef..0ed2f3e657 100644 --- a/server/models/mandatoryTraining.js +++ b/server/models/mandatoryTraining.js @@ -56,12 +56,12 @@ module.exports = function(sequelize, DataTypes) { as: 'establishment' }); MandatoryTraining.belongsTo(models.workerTrainingCategories, { - foreignKey: 'trainingCategoryFk', + foreignKey: 'trainingCategoryFK', targetKey: 'id', as: 'workerTrainingCategories' }); MandatoryTraining.belongsTo(models.job, { - foreignKey: 'jobFk', + foreignKey: 'jobFK', targetKey: 'id', as: 'job' }); diff --git a/server/routes/establishments/mandatoryTraining/index.js b/server/routes/establishments/mandatoryTraining/index.js index a6407b5061..86aeb5a8d9 100644 --- a/server/routes/establishments/mandatoryTraining/index.js +++ b/server/routes/establishments/mandatoryTraining/index.js @@ -6,6 +6,22 @@ const router = express.Router({mergeParams: true}); const MandatoryTraining = require('../../../models/classes/mandatoryTraining').MandatoryTraining; + +/** + * Handle GET request for getting all saved mandatory training + */ +router.route('/').get(async (req, res) => { + const establishmentId = req.establishmentId; + try{ + const allMandatoryTrainingRecords = await MandatoryTraining.fetch(establishmentId); + return res.status(200).json(allMandatoryTrainingRecords); + }catch(err){ + console.error(err); + return res.status(503).send(); + } +}); + + /** * Handle POST request for creating new mandatory training */ From c615dcb459e04a3825ef4eb8661cab4646f83794 Mon Sep 17 00:00:00 2001 From: Rishabh Chitranshi Date: Fri, 7 Feb 2020 15:27:23 +0530 Subject: [PATCH 041/305] Fixed some issue. --- server/models/classes/mandatoryTraining.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/server/models/classes/mandatoryTraining.js b/server/models/classes/mandatoryTraining.js index c64ad452c6..8f65ac9d74 100644 --- a/server/models/classes/mandatoryTraining.js +++ b/server/models/classes/mandatoryTraining.js @@ -95,7 +95,7 @@ class MandatoryTraining extends EntityValidator { if(!doc.trainingCategoryID){ console.error('POST:: create mandatoryTraining - Failed Validation - Training Category ID missing'); this._log(MandatoryTraining.LOG_ERROR, 'Failed Validation - Training Category ID missing'); - returnStatus = false; + return false; } // get training details const trainingCategoryDetails = await models.workerTrainingCategories.findOne({ @@ -139,15 +139,15 @@ class MandatoryTraining extends EntityValidator { validatedMandatoryTrainingRecord.push(doc); } }else{ - console.error('POST:: create mandatoryTraining - Failed Validation - Training record not found'); + console.error('POST:: create mandatoryTraining - Failed Validation - Training Category record not found'); this._log(MandatoryTraining.LOG_ERROR, 'Failed Validation - Training record not found'); - returnStatus = false; + return false; } } }else{ console.error('POST:: create mandatoryTraining - Failed Validation - Invalid Input'); this._log(MandatoryTraining.LOG_ERROR, 'Invalid Input'); - returnStatus = false; + return false; } if (returnStatus === false) { From c02807faf258c9dba4c31c70cedf64f02c747a23 Mon Sep 17 00:00:00 2001 From: Aaron Russell Date: Fri, 7 Feb 2020 09:59:16 +0000 Subject: [PATCH 042/305] Added unit tests for bulk upload route --- server/data/bulkUploadLock.js | 4 +- server/routes/establishments/bulkUpload.js | 2 + .../Bulkimport/csv/establishments.spec.js | 378 +++++++++++++++++- .../routes/establishments/bulkUpload.spec.js | 203 ++++++++++ 4 files changed, 578 insertions(+), 9 deletions(-) create mode 100644 server/test/unit/routes/establishments/bulkUpload.spec.js diff --git a/server/data/bulkUploadLock.js b/server/data/bulkUploadLock.js index fa5cd146bd..626ab5feb1 100644 --- a/server/data/bulkUploadLock.js +++ b/server/data/bulkUploadLock.js @@ -1,5 +1,7 @@ 'use strict'; +const rfr = require('rfr'); + const db = rfr('server/utils/datastore'); module.exports = { @@ -87,4 +89,4 @@ module.exports = { type: db.QueryTypes.UPDATE }); } -}; +}; diff --git a/server/routes/establishments/bulkUpload.js b/server/routes/establishments/bulkUpload.js index 02867b26f5..6c29ddcce7 100644 --- a/server/routes/establishments/bulkUpload.js +++ b/server/routes/establishments/bulkUpload.js @@ -3,6 +3,7 @@ const moment = require('moment'); const csv = require('csvtojson'); const uuid = require('uuid'); +const rfr = require('rfr'); const config = rfr('server/config/config'); const dbModels = rfr('server/models'); @@ -2425,3 +2426,4 @@ router.route('/unlock').get(releaseLock); router.route('/response/:buRequestId').get(responseGet); module.exports = router; +module.exports.validateEstablishmentCsv = validateEstablishmentCsv; diff --git a/server/test/unit/models/Bulkimport/csv/establishments.spec.js b/server/test/unit/models/Bulkimport/csv/establishments.spec.js index 909412c457..fcefb3b01f 100644 --- a/server/test/unit/models/Bulkimport/csv/establishments.spec.js +++ b/server/test/unit/models/Bulkimport/csv/establishments.spec.js @@ -16,6 +16,9 @@ const establishment = [{ locationId: '1-123456780', id: 123 }]; +const postcode = [{ + postcode: 'AB13 4NJ' +}]; const models = { establishment: { @@ -26,6 +29,15 @@ const models = { return []; } } + }, + pcodedata: { + async findAll(args) { + if (args.where.postcode === postcode[0].postcode) { + return []; + } else { + return postcode; + } + } } }; @@ -471,7 +483,8 @@ describe('/server/models/Bulkimport/csv/establishment.js', () => { BUDI }, '../../index': { - establishment: models.establishment + establishment: models.establishment, + pcodedata: models.pcodedata } }) } @@ -646,7 +659,8 @@ describe('/server/models/Bulkimport/csv/establishment.js', () => { BUDI }, '../../index': { - establishment: models.establishment + establishment: models.establishment, + pcodedata: models.pcodedata } }) } @@ -810,7 +824,8 @@ describe('/server/models/Bulkimport/csv/establishment.js', () => { BUDI }, '../../index': { - establishment: models.establishment + establishment: models.establishment, + pcodedata: models.pcodedata } }) } @@ -974,7 +989,8 @@ describe('/server/models/Bulkimport/csv/establishment.js', () => { BUDI }, '../../index': { - establishment: models.establishment + establishment: models.establishment, + pcodedata: models.pcodedata } }) } @@ -1148,7 +1164,8 @@ describe('/server/models/Bulkimport/csv/establishment.js', () => { BUDI }, '../../index': { - establishment: models.establishment + establishment: models.establishment, + pcodedata: models.pcodedata } }) } @@ -1314,7 +1331,8 @@ describe('/server/models/Bulkimport/csv/establishment.js', () => { BUDI }, '../../index': { - establishment: models.establishment + establishment: models.establishment, + pcodedata: models.pcodedata } }) } @@ -1497,7 +1515,8 @@ describe('/server/models/Bulkimport/csv/establishment.js', () => { BUDI }, '../../index': { - establishment: models.establishment + establishment: models.establishment, + pcodedata: models.pcodedata } }) } @@ -1663,7 +1682,8 @@ describe('/server/models/Bulkimport/csv/establishment.js', () => { BUDI }, '../../index': { - establishment: models.establishment + establishment: models.establishment, + pcodedata: models.pcodedata } }) } @@ -1818,6 +1838,348 @@ describe('/server/models/Bulkimport/csv/establishment.js', () => { expect(validationErrors).to.deep.equal([]); }); +it('should emit an error if postcode cannot be found in the reference data', async () => { + const bulkUpload = new (testUtils.sandBox( + filename, + { + locals: { + require: testUtils.wrapRequire({ + '../BUDI': { + BUDI + }, + '../../index': { + establishment: models.establishment, + pcodedata: models.pcodedata + } + }) + } + } + ).Establishment)( + { + LOCALESTID: 'omar3', + STATUS: 'NEW', + ESTNAME: 'WOZiTech, with even more care', + ADDRESS1: 'First Line', + ADDRESS2: 'Second Line', + ADDRESS3: '', + POSTTOWN: 'My Town', + POSTCODE: 'AB13 4NJ', + ESTTYPE: '6', + OTHERTYPE: '', + PERMCQC: '1', + PERMLA: '1', + SHARELA: '708;721;720', + REGTYPE: '2', + PROVNUM: '1-123456781', + LOCATIONID: '1-123456781', + MAINSERVICE: '8', + ALLSERVICES: '12;13', + CAPACITY: '0;0', + UTILISATION: '0;0', + SERVICEDESC: '1;1', + SERVICEUSERS: '', + OTHERUSERDESC: '', + TOTALPERMTEMP: '1', + ALLJOBROLES: '34;8;4', + STARTERS: '0;0;0', + LEAVERS: '999;0;0', + VACANCIES: '999;333;1', + REASONS: '', + REASONNOS: '' + }, + 2, + [ + { + _validations: [], + _username: 'aylingw', + _id: 479, + _uid: '98a83eef-e1e1-49f3-89c5-b1287a3cc8dd', + _ustatus: null, + _created: '2019-03-15T09:54:10.562Z', + _updated: '2019-10-04T15:46:16.158Z', + _updatedBy: 'aylingw', + _auditEvents: null, + _name: 'WOZiTech, with even more care', + _address1: 'First Line', + _address2: 'Second Line', + _address3: '', + _town: 'My Town', + _county: '', + _locationId: null, + _provId: null, + _postcode: 'LN11 9JG', + _isRegulated: false, + _mainService: { id: 16, name: 'Head office services' }, + _nmdsId: 'G1001114', + _lastWdfEligibility: '2019-08-16T07:17:38.014Z', + _overallWdfEligibility: '2019-08-16T07:17:38.340Z', + _establishmentWdfEligibility: null, + _staffWdfEligibility: '2019-08-13T12:41:24.836Z', + _isParent: true, + _parentUid: null, + _parentId: null, + _parentName: null, + _dataOwner: 'Workplace', + _dataPermissions: 'None', + _archived: false, + _dataOwnershipRequested: null, + _reasonsForLeaving: '', + _properties: { + _properties: [Object], + _propertyTypes: [Array], + _auditEvents: null, + _modifiedProperties: [], + _additionalModels: null + }, + _isNew: false, + _workerEntities: { + }, + _readyForDeletionWorkers: null, + _status: 'NEW', + _logLevel: 300 + }, + { + _validations: [], + _username: 'aylingw', + _id: 1446, + _uid: 'a415435f-40f2-4de5-abf7-bff611e85591', + _ustatus: null, + _created: '2019-07-31T15:09:57.405Z', + _updated: '2019-10-04T15:46:16.797Z', + _updatedBy: 'aylingw', + _auditEvents: null, + _name: 'WOZiTech Cares Sub 100', + _address1: 'Number 1', + _address2: 'My street', + _address3: '', + _town: 'My Town', + _county: '', + _locationId: '1-888777666', + _provId: '1-999888777', + _postcode: 'LN11 9JG', + _isRegulated: true, + _mainService: { id: 1, name: 'Carers support' }, + _nmdsId: 'G1002110', + _lastWdfEligibility: '2019-10-04T15:46:16.797Z', + _overallWdfEligibility: null, + _establishmentWdfEligibility: '2019-10-04T14:46:16.797Z', + _staffWdfEligibility: null, + _isParent: false, + _parentUid: '98a83eef-e1e1-49f3-89c5-b1287a3cc8dd', + _parentId: 479, + _parentName: null, + _dataOwner: 'Parent', + _dataPermissions: 'None', + _archived: false, + _dataOwnershipRequested: null, + _reasonsForLeaving: '', + _properties: { + _properties: [Object], + _propertyTypes: [Array], + _auditEvents: null, + _modifiedProperties: [], + _additionalModels: null + }, + _isNew: false, + _workerEntities: {}, + _readyForDeletionWorkers: null, + _status: 'COMPLETE', + _logLevel: 300 + } + ]); + + expect(bulkUpload).to.have.property('validate'); + + const csvEstablishmentSchemaErrors = []; + + const myWorkers = []; + + // call the validation to ensure the proper error is shown + await bulkUpload.validate(); + + const validationErrors = bulkUpload.validationErrors; + + // assert a warning was returned + + expect(validationErrors).to.deep.equal([ + { + "lineNumber": 2, + "name": "omar3", + "origin": "Establishments", + "source": "AB13 4NJ", + "warnCode": 1040, + "warnType": "ADDRESS_ERROR", + "warning": "Workplace will be ignored. The Postcode for this workplace cannot be found in our database and must be registered manually." + } + ]); +}); + +it('should not emit an error if postcode can be found in the reference data', async () => { + const bulkUpload = new (testUtils.sandBox( + filename, + { + locals: { + require: testUtils.wrapRequire({ + '../BUDI': { + BUDI + }, + '../../index': { + establishment: models.establishment, + pcodedata: models.pcodedata + } + }) + } + } + ).Establishment)( + { + LOCALESTID: 'omar3', + STATUS: 'NEW', + ESTNAME: 'WOZiTech, with even more care', + ADDRESS1: 'First Line', + ADDRESS2: 'Second Line', + ADDRESS3: '', + POSTTOWN: 'My Town', + POSTCODE: 'AB13 4MJ', + ESTTYPE: '6', + OTHERTYPE: '', + PERMCQC: '1', + PERMLA: '1', + SHARELA: '708;721;720', + REGTYPE: '2', + PROVNUM: '1-123456781', + LOCATIONID: '1-123456781', + MAINSERVICE: '8', + ALLSERVICES: '12;13', + CAPACITY: '0;0', + UTILISATION: '0;0', + SERVICEDESC: '1;1', + SERVICEUSERS: '', + OTHERUSERDESC: '', + TOTALPERMTEMP: '1', + ALLJOBROLES: '34;8;4', + STARTERS: '0;0;0', + LEAVERS: '999;0;0', + VACANCIES: '999;333;1', + REASONS: '', + REASONNOS: '' + }, + 2, + [ + { + _validations: [], + _username: 'aylingw', + _id: 479, + _uid: '98a83eef-e1e1-49f3-89c5-b1287a3cc8dd', + _ustatus: null, + _created: '2019-03-15T09:54:10.562Z', + _updated: '2019-10-04T15:46:16.158Z', + _updatedBy: 'aylingw', + _auditEvents: null, + _name: 'WOZiTech, with even more care', + _address1: 'First Line', + _address2: 'Second Line', + _address3: '', + _town: 'My Town', + _county: '', + _locationId: null, + _provId: null, + _postcode: 'LN11 9JG', + _isRegulated: false, + _mainService: { id: 16, name: 'Head office services' }, + _nmdsId: 'G1001114', + _lastWdfEligibility: '2019-08-16T07:17:38.014Z', + _overallWdfEligibility: '2019-08-16T07:17:38.340Z', + _establishmentWdfEligibility: null, + _staffWdfEligibility: '2019-08-13T12:41:24.836Z', + _isParent: true, + _parentUid: null, + _parentId: null, + _parentName: null, + _dataOwner: 'Workplace', + _dataPermissions: 'None', + _archived: false, + _dataOwnershipRequested: null, + _reasonsForLeaving: '', + _properties: { + _properties: [Object], + _propertyTypes: [Array], + _auditEvents: null, + _modifiedProperties: [], + _additionalModels: null + }, + _isNew: false, + _workerEntities: { + }, + _readyForDeletionWorkers: null, + _status: 'NEW', + _logLevel: 300 + }, + { + _validations: [], + _username: 'aylingw', + _id: 1446, + _uid: 'a415435f-40f2-4de5-abf7-bff611e85591', + _ustatus: null, + _created: '2019-07-31T15:09:57.405Z', + _updated: '2019-10-04T15:46:16.797Z', + _updatedBy: 'aylingw', + _auditEvents: null, + _name: 'WOZiTech Cares Sub 100', + _address1: 'Number 1', + _address2: 'My street', + _address3: '', + _town: 'My Town', + _county: '', + _locationId: '1-888777666', + _provId: '1-999888777', + _postcode: 'LN11 9JG', + _isRegulated: true, + _mainService: { id: 1, name: 'Carers support' }, + _nmdsId: 'G1002110', + _lastWdfEligibility: '2019-10-04T15:46:16.797Z', + _overallWdfEligibility: null, + _establishmentWdfEligibility: '2019-10-04T14:46:16.797Z', + _staffWdfEligibility: null, + _isParent: false, + _parentUid: '98a83eef-e1e1-49f3-89c5-b1287a3cc8dd', + _parentId: 479, + _parentName: null, + _dataOwner: 'Parent', + _dataPermissions: 'None', + _archived: false, + _dataOwnershipRequested: null, + _reasonsForLeaving: '', + _properties: { + _properties: [Object], + _propertyTypes: [Array], + _auditEvents: null, + _modifiedProperties: [], + _additionalModels: null + }, + _isNew: false, + _workerEntities: {}, + _readyForDeletionWorkers: null, + _status: 'COMPLETE', + _logLevel: 300 + } + ]); + + expect(bulkUpload).to.have.property('validate'); + + const csvEstablishmentSchemaErrors = []; + + const myWorkers = []; + + // call the validation to ensure the proper error is shown + await bulkUpload.validate(); + + const validationErrors = bulkUpload.validationErrors; + + // assert a warning was returned + + expect(validationErrors).to.deep.equal([]); +}); + // it('should emit an error if SLV is greater than zero and this ALLJOBROLES is blank', async () => { // const bulkUpload = new (testUtils.sandBox( // filename, diff --git a/server/test/unit/routes/establishments/bulkUpload.spec.js b/server/test/unit/routes/establishments/bulkUpload.spec.js new file mode 100644 index 0000000000..2ac41d4712 --- /dev/null +++ b/server/test/unit/routes/establishments/bulkUpload.spec.js @@ -0,0 +1,203 @@ +'use strict'; + +const expect = require('chai').expect; +const sinon = require('sinon'); +const models = require('../../../../models'); +const rfr = require('rfr'); + +const bulkUpload =require('../../../../routes/establishments/bulkUpload'); +const EstablishmentCsvValidator = require('../../../../models/BulkImport/csv/establishments'); +const {Establishment} = require('../../../../models/classes/establishment'); + + + +describe('/server/routes/establishment/bulkUpload.js', () => { + describe('validateEstablishmentCsv()', () => { + it('should validate each line of the establishments CSV', async () => { + const workplace = { Address1: 'First Line', + Address2: 'Second Line', + Address3: '', + Town: 'My Town', + Postcode: 'LN11 9JG', + LocationId: '1-12345678', + ProvId: '1-12345678', + IsCQCRegulated: true, + reasonsForLeaving: '', + status: null, + name: 'WOZiTech, with even more care', + localIdentifier: 'omar3', + isRegulated: false, + employerType: { value: null, other: undefined }, + localAuthorities: [], + mainService: null, + services: [], + serviceUsers: [], + numberOfStaff: null, + vacancies: 'None', + starters: 'None', + leavers: 'None', + share: { enabled: false }, + capacities: [] + }; + sinon.stub(EstablishmentCsvValidator.Establishment.prototype, 'validate').resolves(); + sinon.stub(EstablishmentCsvValidator.Establishment.prototype, 'transform').resolves({}); + sinon.stub(Establishment.prototype, 'initialise').callsFake((Address1, Address2, Address3, Town, test, LocationId, ProvId, Postcode, IsCQCRegulated) => { + expect(Address1).to.deep.equal(workplace.Address1); + expect(Address2).to.deep.equal(workplace.Address2); + expect(Address3).to.deep.equal(workplace.Address3); + expect(Town).to.deep.equal(workplace.Town); + expect(test).to.deep.equal(null); + expect(LocationId).to.deep.equal(workplace.LocationId); + expect(ProvId).to.deep.equal(workplace.ProvId); + expect(Postcode).to.deep.equal(workplace.Postcode); + expect(IsCQCRegulated).to.deep.equal(workplace.IsCQCRegulated); + }); + sinon.stub(EstablishmentCsvValidator.Establishment.prototype, 'toAPI').callsFake(() => { + return workplace; + }); + sinon.stub(Establishment.prototype, 'load').callsFake(args => { + expect(args).to.deep.equal(workplace); + }); + sinon.stub(Establishment.prototype, 'validate').resolves({}); + sinon.stub(Establishment.prototype, 'key').get(() =>{ + return 'omar3'; + }); + + const bu = await bulkUpload.validateEstablishmentCsv({ + LOCALESTID: 'omar3', + STATUS: 'NEW', + ESTNAME: 'WOZiTech, with even more care', + ADDRESS1: 'First Line', + ADDRESS2: 'Second Line', + ADDRESS3: '', + POSTTOWN: 'My Town', + POSTCODE: 'LN11 9JG', + ESTTYPE: '6', + OTHERTYPE: '', + PERMCQC: '1', + PERMLA: '1', + SHARELA: '708;721;720', + REGTYPE: '2', + PROVNUM: '1-12345678', + LOCATIONID: '1-12345678', + MAINSERVICE: '8', + ALLSERVICES: '12;13', + CAPACITY: '0;0', + UTILISATION: '0;0', + SERVICEDESC: '1;1', + SERVICEUSERS: '', + OTHERUSERDESC: '', + TOTALPERMTEMP: '1', + ALLJOBROLES: '34;8;4', + STARTERS: '0;0;0', + LEAVERS: '999;0;0', + VACANCIES: '999;333;1', + REASONS: '', + REASONNOS: '' + }, + 2, + [], + [], + [ + { + _validations: [], + _username: 'aylingw', + _id: 479, + _uid: '98a83eef-e1e1-49f3-89c5-b1287a3cc8dd', + _ustatus: null, + _created: '2019-03-15T09:54:10.562Z', + _updated: '2019-10-04T15:46:16.158Z', + _updatedBy: 'aylingw', + _auditEvents: null, + _name: 'WOZiTech, with even more care', + _address1: 'First Line', + _address2: 'Second Line', + _address3: '', + _town: 'My Town', + _county: '', + _locationId: null, + _provId: null, + _postcode: 'LN11 9JG', + _isRegulated: false, + _mainService: { id: 16, name: 'Head office services' }, + _nmdsId: 'G1001114', + _lastWdfEligibility: '2019-08-16T07:17:38.014Z', + _overallWdfEligibility: '2019-08-16T07:17:38.340Z', + _establishmentWdfEligibility: null, + _staffWdfEligibility: '2019-08-13T12:41:24.836Z', + _isParent: true, + _parentUid: null, + _parentId: null, + _parentName: null, + _dataOwner: 'Workplace', + _dataPermissions: 'None', + _archived: false, + _dataOwnershipRequested: null, + _reasonsForLeaving: '', + _properties: { + _properties: [Object], + _propertyTypes: [Array], + _auditEvents: null, + _modifiedProperties: [], + _additionalModels: null + }, + _isNew: false, + _workerEntities: { + }, + _readyForDeletionWorkers: null, + _status: 'NEW', + _logLevel: 300 + }, + { + _validations: [], + _username: 'aylingw', + _id: 1446, + _uid: 'a415435f-40f2-4de5-abf7-bff611e85591', + _ustatus: null, + _created: '2019-07-31T15:09:57.405Z', + _updated: '2019-10-04T15:46:16.797Z', + _updatedBy: 'aylingw', + _auditEvents: null, + _name: 'WOZiTech Cares Sub 100', + _address1: 'Number 1', + _address2: 'My street', + _address3: '', + _town: 'My Town', + _county: '', + _locationId: '1-888777666', + _provId: '1-999888777', + _postcode: 'LN11 9JG', + _isRegulated: true, + _mainService: { id: 1, name: 'Carers support' }, + _nmdsId: 'G1002110', + _lastWdfEligibility: '2019-10-04T15:46:16.797Z', + _overallWdfEligibility: null, + _establishmentWdfEligibility: '2019-10-04T14:46:16.797Z', + _staffWdfEligibility: null, + _isParent: false, + _parentUid: '98a83eef-e1e1-49f3-89c5-b1287a3cc8dd', + _parentId: 479, + _parentName: null, + _dataOwner: 'Parent', + _dataPermissions: 'None', + _archived: false, + _dataOwnershipRequested: null, + _reasonsForLeaving: '', + _properties: { + _properties: [Object], + _propertyTypes: [Array], + _auditEvents: null, + _modifiedProperties: [], + _additionalModels: null + }, + _isNew: false, + _workerEntities: {}, + _readyForDeletionWorkers: null, + _status: 'COMPLETE', + _logLevel: 300 + } + ]); + console.log(bu); + }); + }); +}); From 775ee9bc73ab357dc3a02ddce7012fa1db6586ad Mon Sep 17 00:00:00 2001 From: Aaron Russell Date: Fri, 7 Feb 2020 10:00:03 +0000 Subject: [PATCH 043/305] Upgraded old space to 8gb --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 3aaebf8ac4..8763ff0ff7 100644 --- a/package.json +++ b/package.json @@ -3,7 +3,7 @@ "version": "0.0.1", "scripts": { "ng": "ng", - "start": "npm run build && node --max-old-space-size=4096 server.js", + "start": "npm run build && node --max-old-space-size=8192 server.js", "dev": "npm-run-all -p -l build:watch api:proxy", "build": "ng build --extract-css", "build:clean": "rimraf dist", From a39353ae0d9ac8c48f2fd5e07952c882abfc2c8d Mon Sep 17 00:00:00 2001 From: Anurag Negi <55235060+Negi-Anurag@users.noreply.github.com> Date: Fri, 7 Feb 2020 16:47:25 +0530 Subject: [PATCH 044/305] CQC Sharing permission defect (#1959) --- server/models/classes/establishment.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/server/models/classes/establishment.js b/server/models/classes/establishment.js index 4bdd2500ca..f292eed199 100644 --- a/server/models/classes/establishment.js +++ b/server/models/classes/establishment.js @@ -914,9 +914,12 @@ class Establishment extends EntityValidator { // the saving of an Establishment can be initiated within // an external transaction const thisTransaction = externalTransaction || t; - // now append the extendable properties const modifedUpdateDocument = this._properties.save(savedBy.toLowerCase(), {}); + if(modifedUpdateDocument && !modifedUpdateDocument.ShareDataValue){ + modifedUpdateDocument.shareWithCQC = false; + modifedUpdateDocument.shareWithLA = false; + } // note - if the establishment was created online, but then updated via bulk upload, the source become bulk and vice-versa. const updateDocument = { From 03c135793e28c6ac880324c2f776c83f49bda633 Mon Sep 17 00:00:00 2001 From: Aaron Russell Date: Fri, 7 Feb 2020 13:36:13 +0000 Subject: [PATCH 045/305] Revert "Enabled WDF logging" This reverts commit 637c0f1b08efdd5dcaea67791868917dc4ff0136. --- server/routes/reports/wdf/parent.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/server/routes/reports/wdf/parent.js b/server/routes/reports/wdf/parent.js index deffd844be..e11f3e8f7b 100644 --- a/server/routes/reports/wdf/parent.js +++ b/server/routes/reports/wdf/parent.js @@ -27,8 +27,8 @@ const workersSheetName = path.join('xl', 'worksheets', 'sheet3.xml'); const sharedStringsName = path.join('xl', 'sharedStrings.xml'); const schema = 'http://schemas.openxmlformats.org/spreadsheetml/2006/main'; const isNumberRegex = /^[0-9]+(\.[0-9]+)?$/; -const debuglog = console.log.bind(console); -// const debuglog = () => {}; +//const debuglog = console.log.bind(console); +const debuglog = () => {}; const buStates = [ 'READY', From a81acd8e3d989776486aacf529724aec3ffc08cd Mon Sep 17 00:00:00 2001 From: Anurag Negi <55235060+Negi-Anurag@users.noreply.github.com> Date: Fri, 7 Feb 2020 16:47:25 +0530 Subject: [PATCH 046/305] CQC Sharing permission defect (#1959) --- server/models/classes/establishment.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/server/models/classes/establishment.js b/server/models/classes/establishment.js index b96283d965..6dc2c36fc0 100644 --- a/server/models/classes/establishment.js +++ b/server/models/classes/establishment.js @@ -914,9 +914,12 @@ class Establishment extends EntityValidator { // the saving of an Establishment can be initiated within // an external transaction const thisTransaction = externalTransaction || t; - // now append the extendable properties const modifedUpdateDocument = this._properties.save(savedBy.toLowerCase(), {}); + if(modifedUpdateDocument && !modifedUpdateDocument.ShareDataValue){ + modifedUpdateDocument.shareWithCQC = false; + modifedUpdateDocument.shareWithLA = false; + } // note - if the establishment was created online, but then updated via bulk upload, the source become bulk and vice-versa. const updateDocument = { From 1152a9dbc745dc6f3cc2b57e9ac79b3d9439e061 Mon Sep 17 00:00:00 2001 From: rchitranshi <53287302+rchitranshi@users.noreply.github.com> Date: Mon, 10 Feb 2020 16:10:47 +0530 Subject: [PATCH 047/305] Added some code optimizations for parent wdf report. (#1963) --- server/data/parentWDFReport.js | 112 +++++++++++----------------- server/routes/reports/wdf/parent.js | 89 +++++++--------------- 2 files changed, 70 insertions(+), 131 deletions(-) diff --git a/server/data/parentWDFReport.js b/server/data/parentWDFReport.js index 1ec4a18fc9..1539335365 100644 --- a/server/data/parentWDFReport.js +++ b/server/data/parentWDFReport.js @@ -7,7 +7,7 @@ const effectiveDate = rfr('server/models/classes/wdfCalculator').WdfCalculator.e const getEstablishmentDataQuery = ` SELECT - "Establishment"."EstablishmentID", + e."EstablishmentID", "NmdsID", "NameValue" AS "SubsidiaryName", "DataOwner", @@ -24,7 +24,7 @@ SELECT FROM cqc."Worker" WHERE - "Worker"."EstablishmentFK" = "Establishment"."EstablishmentID" + "Worker"."EstablishmentFK" = e."EstablishmentID" and "Archived" = false ) AS "TotalIndividualWorkerRecord", ( @@ -33,7 +33,7 @@ SELECT FROM cqc."Worker" WHERE - "EstablishmentFK" = "Establishment"."EstablishmentID" AND + "EstablishmentFK" = e."EstablishmentID" AND "LastWdfEligibility" IS NOT NULL AND "LastWdfEligibility" > :effectiveDate AND "Archived" = :falseFlag @@ -47,12 +47,8 @@ SELECT cqc."services" AS b ON a."ServiceID" = b.id - JOIN - cqc."Establishment" AS c - ON - a."EstablishmentID" = c."EstablishmentID" WHERE - c."EstablishmentID" = "Establishment"."EstablishmentID" + a."EstablishmentID" = e."EstablishmentID" ), :separator) AS "OtherServices", array_to_string(array( SELECT @@ -64,7 +60,7 @@ SELECT ON a."ServiceUserID" = b."ID" WHERE - a."EstablishmentID" = "Establishment"."EstablishmentID" + a."EstablishmentID" = e."EstablishmentID" ), :separator) AS "ServiceUsers", ( SELECT @@ -72,7 +68,7 @@ SELECT FROM cqc."EstablishmentJobs" WHERE - "EstablishmentJobs"."EstablishmentID" = "Establishment"."EstablishmentID" AND + "EstablishmentJobs"."EstablishmentID" = e."EstablishmentID" AND "EstablishmentJobs"."JobType" = :Vacancies ) AS "VacanciesCount", ( @@ -81,7 +77,7 @@ SELECT FROM cqc."EstablishmentJobs" WHERE - "EstablishmentJobs"."EstablishmentID" = "Establishment"."EstablishmentID" AND + "EstablishmentJobs"."EstablishmentID" = e."EstablishmentID" AND "EstablishmentJobs"."JobType" = :Starters ) AS "StartersCount", ( @@ -90,35 +86,26 @@ SELECT FROM cqc."EstablishmentJobs" WHERE - "EstablishmentJobs"."EstablishmentID" = "Establishment"."EstablishmentID" AND + "EstablishmentJobs"."EstablishmentID" = e."EstablishmentID" AND "EstablishmentJobs"."JobType" = :Leavers ) AS "LeaversCount", "VacanciesValue", "StartersValue", "LeaversValue", "NumberOfStaffValue", - updated, - CASE WHEN updated > :effectiveDate THEN to_char(updated, :timeFormat) ELSE NULL END AS "LastUpdatedDate", + CASE WHEN updated > :effectiveDate THEN to_char(updated, :timeFormat) ELSE NULL END "LastUpdatedDate", "ShareDataWithCQC", "ShareDataWithLA", - (select count("LeaveReasonFK") from cqc."Worker" where "EstablishmentFK" = "Establishment"."EstablishmentID") as "ReasonsForLeaving", - "Status" -FROM - cqc."Establishment" -LEFT JOIN - cqc.services as MainService -ON - "Establishment"."MainServiceFKValue" = MainService.id -WHERE - ("Establishment"."EstablishmentID" = :establishmentId OR "Establishment"."ParentID" = :establishmentId) AND - "Archived" = :falseFlag -ORDER BY - "EstablishmentID"; -`; - -const getCapicityOrUtilisationDataQuery = -`SELECT + (select count(:zero) from cqc."Worker" where "EstablishmentFK" = e."EstablishmentID") "ReasonsForLeaving", + "Status", + array_to_string(array(SELECT "ServiceCapacityID" + FROM cqc."ServicesCapacity" + WHERE "ServiceID" = e."MainServiceFKValue"), :separator) "ServicesCapacity", + array_to_string(array(SELECT "Type" + FROM cqc."ServicesCapacity" + WHERE "ServiceID" = e."MainServiceFKValue"), :separator) "Type", + (SELECT b."Answer" FROM cqc."ServicesCapacity" AS a @@ -127,14 +114,31 @@ const getCapicityOrUtilisationDataQuery = ON a."ServiceCapacityID" = b."ServiceCapacityID" WHERE - b."EstablishmentID" = :establishmentId AND - "ServiceID" = :mainServiceId AND - a."Type" = :type`; - -const getServiceCapacityDetailsQuery = - `SELECT "ServiceCapacityID", "Type" - FROM cqc."ServicesCapacity" - WHERE "ServiceID" = :mainServiceId`; + b."EstablishmentID" = e."EstablishmentID" AND + "ServiceID" = e."MainServiceFKValue" AND a."Type" = :Capacity) "Capacity", + (SELECT + b."Answer" + FROM + cqc."ServicesCapacity" AS a + JOIN + cqc."EstablishmentCapacity" AS b + ON + a."ServiceCapacityID" = b."ServiceCapacityID" + WHERE + b."EstablishmentID" = e."EstablishmentID" AND + "ServiceID" = e."MainServiceFKValue" AND a."Type" = :Utilisation) "Utilisation" +FROM + cqc."Establishment" e +LEFT JOIN + cqc.services as MainService +ON + e."MainServiceFKValue" = MainService.id +WHERE + (e."EstablishmentID" = :establishmentId OR e."ParentID" = :establishmentId) AND + "Archived" = :falseFlag AND e."Status" IS NULL +ORDER BY + "EstablishmentID"; +`; exports.getEstablishmentData = async establishmentId => db.query(getEstablishmentDataQuery, { @@ -148,34 +152,8 @@ exports.getEstablishmentData = async establishmentId => Vacancies: 'Vacancies', Starters: 'Starters', Leavers: 'Leavers', - }, - type: db.QueryTypes.SELECT - }); - -exports.getCapicityData = async (establishmentId, mainServiceId) => - db.query(getCapicityOrUtilisationDataQuery, { - replacements: { - establishmentId, - mainServiceId, - type: 'Capacity' - }, - type: db.QueryTypes.SELECT - }); - -exports.getUtilisationData = async (establishmentId, mainServiceId) => - db.query(getCapicityOrUtilisationDataQuery, { - replacements: { - establishmentId, - mainServiceId, - type: 'Utilisation' - }, - type: db.QueryTypes.SELECT - }); - -exports.getServiceCapacityDetails = async (mainServiceId) => - db.query(getServiceCapacityDetailsQuery, { - replacements: { - mainServiceId + Capacity: 'Capacity', + Utilisation: 'Utilisation' }, type: db.QueryTypes.SELECT }); diff --git a/server/routes/reports/wdf/parent.js b/server/routes/reports/wdf/parent.js index e11f3e8f7b..916661218a 100644 --- a/server/routes/reports/wdf/parent.js +++ b/server/routes/reports/wdf/parent.js @@ -16,7 +16,7 @@ const s3 = new AWS.S3({ const Bucket = String(config.get('bulkupload.bucketname')); const { Establishment } = require('../../../models/classes/establishment'); -const { getEstablishmentData, getWorkerData, getCapicityData, getUtilisationData, getServiceCapacityDetails } = rfr('server/data/parentWDFReport'); +const { getEstablishmentData, getWorkerData } = rfr('server/data/parentWDFReport'); const { attemptToAcquireLock, updateLockState, lockStatus, releaseLockQuery } = rfr('server/data/parentWDFReportLock'); // Constants string needed by this file in several places @@ -103,60 +103,32 @@ const getReportData = async (date, thisEstablishment) => { }; }; -const propsNeededToComplete = ('MainService,EmployerTypeValue,Capacities,ServiceUsers,' + -'NumberOfStaffValue').split(','); - const getEstablishmentReportData = async establishmentId => { - const establishmentReturnData = await getEstablishmentData(establishmentId); - const establishmentData = establishmentReturnData.filter(est => est.Status !== "PENDING"); + const establishmentData = await getEstablishmentData(establishmentId); for(let i = 0; i< establishmentData.length; i++) { let value = establishmentData[i]; - let getServiceCapacityData = await getServiceCapacityDetails(value.MainServiceFKValue); - if(getServiceCapacityData && getServiceCapacityData.length === 0){ + if(value.ServicesCapacity === ""){ value.Capacities = 'N/A'; value.Utilisations = 'N/A'; }else{ - let capicityDetails = []; - let utilisationDetails = []; - if(getServiceCapacityData.length === 2){ - capicityDetails = await getCapicityData(value.EstablishmentID, value.MainServiceFKValue); - utilisationDetails = await getUtilisationData(value.EstablishmentID, value.MainServiceFKValue); - }else if(getServiceCapacityData[0].Type === 'Capacity'){ - capicityDetails = await getCapicityData(value.EstablishmentID, value.MainServiceFKValue); - utilisationDetails = [{"Answer": 'N/A'}]; - }else if(getServiceCapacityData[0].Type === 'Utilisation'){ - utilisationDetails = await getUtilisationData(value.EstablishmentID, value.MainServiceFKValue); - capicityDetails = [{"Answer": 'N/A'}]; - } - - if(capicityDetails && capicityDetails.length > 0){ - if(capicityDetails[0].Answer === null){ - value.Capacities = 'Missing'; - }else if(capicityDetails[0].Answer === 'N/A'){ - value.Capacities = 'N/A'; - }else{ - value.Capacities = capicityDetails[0].Answer; - } - }else{ - value.Capacities = 'Missing'; - } - if(utilisationDetails && utilisationDetails.length > 0){ - if(utilisationDetails[0].Answer === null){ - value.Utilisations = 'Missing'; - }else if(utilisationDetails[0].Answer === 'N/A'){ - value.Utilisations = 'N/A'; - }else{ - value.Utilisations = utilisationDetails[0].Answer; - } - }else{ - value.Utilisations = 'Missing'; + let ServicesCapacityValue = value.Type.indexOf(','); + if(ServicesCapacityValue !== -1){ + value.Capacities = (value.Capacity !== null)? value.Capacity: 'Missing'; + value.Utilisations = (value.Utilisation !== null)? value.Utilisation: 'Missing'; + }else if(value.Type === 'Capacity'){ + value.Capacities = (value.Capacity !== null)? value.Capacity: 'Missing'; + value.Utilisations = 'N/A'; + }else if(value.Type === 'Utilisation'){ + value.Utilisations = (value.Utilisation !== null)? value.Utilisation: 'Missing'; + value.Capacities = 'N/A'; } } + if (value.ShareDataWithCQC && value.ShareDataWithLA) { value.SubsidiarySharingPermissions = 'All'; - } else if (value.ShareDataWithCQC && !value.ShareDataWithLA) { + } else if (value.ShareDataWithCQC) { value.SubsidiarySharingPermissions = 'CQC'; - } else if (!value.ShareDataWithCQC && value.ShareDataWithLA) { + } else if (value.ShareDataWithLA) { value.SubsidiarySharingPermissions = 'LA'; } else { value.SubsidiarySharingPermissions = 'None'; @@ -164,11 +136,9 @@ const getEstablishmentReportData = async establishmentId => { value.EstablishmentDataFullyCompleted = 'Yes'; - propsNeededToComplete.forEach(prop => { - if (value[prop] === null) { - value.EstablishmentDataFullyCompleted = 'No'; - } - }); + if(value.MainService === null || value.EmployerTypeValue === null || value.Capacities === null || value.ServiceUsers === null || value.NumberOfStaffValue === null){ + value.EstablishmentDataFullyCompleted = 'No'; + } value.CurrentWdfEligibilityStatus = value.CurrentWdfEligibilityStatus === null ? 'Not Eligible' : 'Eligible'; @@ -178,10 +148,7 @@ const getEstablishmentReportData = async establishmentId => { value.NumberOfStaffValue = (value.NumberOfStaffValue === null) ? 0: value.NumberOfStaffValue; - if ( - value.NumberOfStaffValue !== 0 && - value.NumberOfStaffValue !== null && - (value.TotalIndividualWorkerRecord !== 0 || value.TotalIndividualWorkerRecord !== null)) { + if (value.NumberOfStaffValue !== 0 && value.TotalIndividualWorkerRecord !== null) { value.PercentageOfWorkerRecords = `${parseFloat(+value.TotalIndividualWorkerRecord / +value.NumberOfStaffValue * 100).toFixed(1)}%`; } else { value.PercentageOfWorkerRecords = '0.0%'; @@ -215,10 +182,9 @@ const getEstablishmentReportData = async establishmentId => { value.EmployerTypeValue = ''; } + value.ServiceUsers = 'Yes'; if(value.ServiceUsers === ''){ value.ServiceUsers = 'Missing'; - }else{ - value.ServiceUsers = 'Yes'; } value.LeavingReasonsCountEqualsLeavers = (value.ReasonsForLeaving === value.LeaversValue) ? 'Yes' : 'No'; @@ -227,7 +193,7 @@ const getEstablishmentReportData = async establishmentId => { value.UpdatedInCurrentFinancialYear = value.LastUpdatedDate !== null ? 'Yes' : 'No'; value.CompletedWorkerRecordsPercentage = - (value.CompletedWorkerRecords === 0 || value.NumberOfStaffValue === 0 || value.NumberOfStaffValue === null) + (value.CompletedWorkerRecords === 0 || value.NumberOfStaffValue === 0) ? '0.0%' : `${parseFloat(+value.CompletedWorkerRecords / +value.NumberOfStaffValue * 100).toFixed(1)}%`; } @@ -250,7 +216,8 @@ const getWorkersReportData = async establishmentId => { } }); - workersArray.forEach((value, key) => { + for(let i = 0; i < workersArray.length; i++){ + let value = workersArray[i]; if(value.QualificationInSocialCareValue === 'No' || value.QualificationInSocialCareValue === "Don't know"){ value.QualificationInSocialCare = 'N/A'; } @@ -297,7 +264,7 @@ const getWorkersReportData = async establishmentId => { value[prop] = 'Missing'; } }); - }); + } return workersArray; }; @@ -572,10 +539,6 @@ const updateOverviewSheet = ( const templateRow = overviewSheet.querySelector("row[r='11']"); - // move the footer rows down appropriately - //no rows = -1 - //one row = 0 - //two rows = 1 let currentRow = overviewSheet.querySelector("row[r='16']"); let rowIndex = 16; let updateRowIndex = 16 + reportData.establishments.length - 1; @@ -608,8 +571,6 @@ const updateOverviewSheet = ( } } - // TODO: fix the page footer timestamp - // clone the row the apropriate number of times currentRow = templateRow; rowIndex = 12; From e6bab39414ce442bd5622bb0312bc6353296961f Mon Sep 17 00:00:00 2001 From: Aaron Russell Date: Mon, 10 Feb 2020 11:33:17 +0000 Subject: [PATCH 048/305] Revert "Upgraded old space to 8gb" This reverts commit 775ee9bc73ab357dc3a02ddce7012fa1db6586ad. --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 8763ff0ff7..3aaebf8ac4 100644 --- a/package.json +++ b/package.json @@ -3,7 +3,7 @@ "version": "0.0.1", "scripts": { "ng": "ng", - "start": "npm run build && node --max-old-space-size=8192 server.js", + "start": "npm run build && node --max-old-space-size=4096 server.js", "dev": "npm-run-all -p -l build:watch api:proxy", "build": "ng build --extract-css", "build:clean": "rimraf dist", From 7c980db41b48c756e0192915a3a88b32a52ad4f3 Mon Sep 17 00:00:00 2001 From: rchitranshi <53287302+rchitranshi@users.noreply.github.com> Date: Tue, 11 Feb 2020 11:05:26 +0530 Subject: [PATCH 049/305] Added update/delete mandatory training functionality on POST API. (#1965) --- server/models/classes/mandatoryTraining.js | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/server/models/classes/mandatoryTraining.js b/server/models/classes/mandatoryTraining.js index 8f65ac9d74..970e207a35 100644 --- a/server/models/classes/mandatoryTraining.js +++ b/server/models/classes/mandatoryTraining.js @@ -92,7 +92,7 @@ class MandatoryTraining extends EntityValidator { if(document && Array.isArray(document)){ for(let i = 0; i < document.length; i++){ let doc = document[i]; - if(!doc.trainingCategoryID){ + if(!doc.trainingCategoryId){ console.error('POST:: create mandatoryTraining - Failed Validation - Training Category ID missing'); this._log(MandatoryTraining.LOG_ERROR, 'Failed Validation - Training Category ID missing'); return false; @@ -100,7 +100,7 @@ class MandatoryTraining extends EntityValidator { // get training details const trainingCategoryDetails = await models.workerTrainingCategories.findOne({ where: { - id: doc.trainingCategoryID + id: doc.trainingCategoryId }, attributes: ['id'] }); @@ -185,6 +185,19 @@ class MandatoryTraining extends EntityValidator { if(initializedRecords && this._isNew){ // create new Mandatory Training Record try{ + + //find already existing mandatory details, if found delete them + for(let i = 0; i < this.mandatorytrainingDetails.length; i++){ + let row = this.mandatorytrainingDetails[i]; + const fetchQuery = { + where: { + establishmentFK: this.establishmentId, + trainingCategoryFK: row.trainingCategoryId + } + }; + await models.MandatoryTraining.destroy(fetchQuery); + } + // save new mandatory training details for(let i = 0; i < this.mandatorytrainingDetails.length; i++){ let row = this.mandatorytrainingDetails[i]; @@ -207,7 +220,7 @@ class MandatoryTraining extends EntityValidator { const now = new Date(); let creationDocument = { establishmentFK: this.establishmentId, - trainingCategoryFK: row.trainingCategoryID, + trainingCategoryFK: row.trainingCategoryId, jobFK: job.id, created: now, updated: now, From 5ef946f445c71656efbdda4ab58e69f33516951c Mon Sep 17 00:00:00 2001 From: rchitranshi <53287302+rchitranshi@users.noreply.github.com> Date: Wed, 12 Feb 2020 16:18:09 +0530 Subject: [PATCH 050/305] Fixed :: Duplicate Local Identifiers are not downloading in BU (#1966) --- server/models/classes/establishment.js | 12 ++++-------- server/models/worker.js | 1 - 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/server/models/classes/establishment.js b/server/models/classes/establishment.js index f292eed199..aa20ff0a29 100644 --- a/server/models/classes/establishment.js +++ b/server/models/classes/establishment.js @@ -100,7 +100,7 @@ class Establishment extends EntityValidator { this._isNew = false; // all known workers for this establishment - an associative object (property key is the worker's key) - this._workerEntities = {}; + this._workerEntities = []; this._readyForDeletionWorkers = null; // bulk upload status - this is never stored in database @@ -362,11 +362,8 @@ class Establishment extends EntityValidator { } // this method add this given worker (entity) as an association to this establishment entity - (bulk import) - associateWorker(key, worker) { - if (key && worker) { - // worker not yet associated; take as is - this._workerEntities[key] = worker; - } + associateWorker(worker) { + this._workerEntities.push(worker); } // returns just the set of keys of the associated workers @@ -524,7 +521,7 @@ class Establishment extends EntityValidator { const newWorker = new Worker(null); // TODO - until we have Worker.localIdentifier we only have Worker.nameOrId to use as key - this.associateWorker(thisWorker.key, newWorker); + this.associateWorker(newWorker); promises.push(newWorker.load(thisWorker, true)); } }); @@ -1199,7 +1196,6 @@ class Establishment extends EntityValidator { }, }; } - const fetchResults = await models.establishment.findOne(fetchQuery); if (fetchResults && fetchResults.id && Number.isInteger(fetchResults.id)) { // update self - don't use setters because they modify the change state diff --git a/server/models/worker.js b/server/models/worker.js index 17a28205a4..9fb252522f 100644 --- a/server/models/worker.js +++ b/server/models/worker.js @@ -16,7 +16,6 @@ module.exports = function(sequelize, DataTypes) { LocalIdentifierValue: { type: DataTypes.TEXT, allowNull: true, - unique: true, field: '"LocalIdentifierValue"' }, LocalIdentifierSavedAt : { From 84c5be71a35fc8a84f4b0a444893a6e1ceddfa1e Mon Sep 17 00:00:00 2001 From: rchitranshi <53287302+rchitranshi@users.noreply.github.com> Date: Wed, 12 Feb 2020 16:36:16 +0530 Subject: [PATCH 051/305] Fixed some issue. (#1967) * Fixed :: Duplicate Local Identifiers are not downloading in BU * Fixed some issue. * Removed co conflict code --- server/models/classes/establishment.js | 4 ++-- server/routes/establishments/bulkUpload.js | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/server/models/classes/establishment.js b/server/models/classes/establishment.js index aa20ff0a29..29e8971920 100644 --- a/server/models/classes/establishment.js +++ b/server/models/classes/establishment.js @@ -521,7 +521,7 @@ class Establishment extends EntityValidator { const newWorker = new Worker(null); // TODO - until we have Worker.localIdentifier we only have Worker.nameOrId to use as key - this.associateWorker(newWorker); + this.associateWorker(thisWorker); promises.push(newWorker.load(thisWorker, true)); } }); @@ -1492,7 +1492,7 @@ class Establishment extends EntityValidator { // TODO: once we have the unique worder id property, use that instead; for now, we only have the name or id. // without whitespace - this.associateWorker(newWorker.key, newWorker); + this.associateWorker(newWorker); return {}; }) diff --git a/server/routes/establishments/bulkUpload.js b/server/routes/establishments/bulkUpload.js index 3574dff668..3db24de4d4 100644 --- a/server/routes/establishments/bulkUpload.js +++ b/server/routes/establishments/bulkUpload.js @@ -2332,7 +2332,7 @@ const exportToCsv = async (NEWLINE, allMyEstablishments, primaryEstablishmentId, responseSend(NEWLINE + WorkerCsvValidator.toCSV(thisEstablishment.localIdentifier, thisWorker, MAX_QUALS), 'worker'); } else if (thisWorker.training) { // or for this Worker's training records thisWorker.training.forEach(thisTrainingRecord => { - responseSend(NEWLINE + TrainingCsvValidator.toCSV(thisEstablishment.key, thisWorker.key, thisTrainingRecord), 'training'); + responseSend(NEWLINE + TrainingCsvValidator.toCSV(thisEstablishment.key, thisWorker, thisTrainingRecord), 'training'); }); } }); From 2d3fd0698bb14a786dcae5287688892f5c6f61d1 Mon Sep 17 00:00:00 2001 From: Anurag Negi <55235060+Negi-Anurag@users.noreply.github.com> Date: Wed, 12 Feb 2020 17:14:08 +0530 Subject: [PATCH 052/305] Missing mandatory training (#1968) * Missing mandatory training * CHANGED SPEC FILE --- .../mandatory-training.component.html | 69 ++++++++++++++++ .../mandatory-training.component.spec.ts | 24 ++++++ .../mandatory-training.component.ts | 79 +++++++++++++++++++ ...g-and-qualifications-record.component.html | 4 + src/app/features/workers/workers.module.ts | 2 + 5 files changed, 178 insertions(+) create mode 100644 src/app/features/workers/training-qualifications-record/mandatory-training/mandatory-training.component.html create mode 100644 src/app/features/workers/training-qualifications-record/mandatory-training/mandatory-training.component.spec.ts create mode 100644 src/app/features/workers/training-qualifications-record/mandatory-training/mandatory-training.component.ts diff --git a/src/app/features/workers/training-qualifications-record/mandatory-training/mandatory-training.component.html b/src/app/features/workers/training-qualifications-record/mandatory-training/mandatory-training.component.html new file mode 100644 index 0000000000..b237476517 --- /dev/null +++ b/src/app/features/workers/training-qualifications-record/mandatory-training/mandatory-training.component.html @@ -0,0 +1,69 @@ + +
+
+

Mandatory training ({{ qualifications.length }})

+
+
+

Last updated on {{ lastUpdated | date: 'd MMMM y' }}

+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + +
Training categoryTraining nameStatusQuantity
+ {{ qualification.qualification.group }} + + {{ qualification.qualification.title }} + + {{ qualification?.year ? qualification.year : '-' }} + + {{'-' }} + + {{ + qualificationDetailsLabel[qualification.uid] ? qualificationDetailsLabel[qualification.uid] : 'Open' + }} +
+
+
+ Worker ID +
+
+ Job role +
+
+ Status +
+
+
+
+
+ diff --git a/src/app/features/workers/training-qualifications-record/mandatory-training/mandatory-training.component.spec.ts b/src/app/features/workers/training-qualifications-record/mandatory-training/mandatory-training.component.spec.ts new file mode 100644 index 0000000000..9d7ac676ab --- /dev/null +++ b/src/app/features/workers/training-qualifications-record/mandatory-training/mandatory-training.component.spec.ts @@ -0,0 +1,24 @@ +import { async, ComponentFixture, TestBed } from '@angular/core/testing'; + +import { MandatoryTrainingComponent } from './mandatory-training.component'; + +describe('MandatoryTrainingComponent', () => { + let component: MandatoryTrainingComponent; + let fixture: ComponentFixture; + + beforeEach(async(() => { + TestBed.configureTestingModule({ + declarations: [MandatoryTrainingComponent], + }).compileComponents(); + })); + + beforeEach(() => { + fixture = TestBed.createComponent(MandatoryTrainingComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/features/workers/training-qualifications-record/mandatory-training/mandatory-training.component.ts b/src/app/features/workers/training-qualifications-record/mandatory-training/mandatory-training.component.ts new file mode 100644 index 0000000000..cd7118e22e --- /dev/null +++ b/src/app/features/workers/training-qualifications-record/mandatory-training/mandatory-training.component.ts @@ -0,0 +1,79 @@ +import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core'; +import { Router } from '@angular/router'; +import { Establishment } from '@core/model/establishment.model'; +import { Qualification } from '@core/model/qualification.model'; +import { Worker } from '@core/model/worker.model'; +import { DialogService } from '@core/services/dialog.service'; +import { PermissionsService } from '@core/services/permissions/permissions.service'; +import { WorkerService } from '@core/services/worker.service'; +import { + DeleteQualificationDialogComponent, +} from '@features/workers/delete-qualification-dialog/delete-qualification-dialog.component'; +import * as moment from 'moment'; +import { take } from 'rxjs/operators'; + +@Component({ + selector: 'app-mandatory-training', + templateUrl: './mandatory-training.component.html', +}) +export class MandatoryTrainingComponent implements OnInit { + @Input() worker: Worker; + @Input() workplace: Establishment; + @Output() mandatoryTrainingChanged: EventEmitter = new EventEmitter(); + public canEditWorker: boolean; + public lastUpdated: moment.Moment; + public qualifications: Qualification[]; + public qualificationDetails = []; + public qualificationDetailsLabel = []; + + constructor( + private workerService: WorkerService, + private permissionsService: PermissionsService, + private router: Router, + private dialogService: DialogService + ) {} + + ngOnInit() { + this.fetchAllRecords(); + + this.canEditWorker = this.permissionsService.can(this.workplace.uid, 'canEditWorker'); + } + + deleteQualification(record, event) { + event.preventDefault(); + const dialog = this.dialogService.open(DeleteQualificationDialogComponent, { + nameOrId: this.worker.nameOrId, + record, + }); + dialog.afterClosed.pipe(take(1)).subscribe(confirm => { + if (confirm) { + this.workerService.deleteQualification(this.workplace.uid, this.worker.uid, record.uid).subscribe(() => { + this.workerService.alert = { type: 'success', message: 'Qualification has been deleted.' }; + this.fetchAllRecords(); + this.mandatoryTrainingChanged.emit(true); + }); + } + }); + } + + fetchAllRecords() { + this.workerService.getQualifications(this.workplace.uid, this.worker.uid).subscribe(data => { + this.lastUpdated = moment(data.lastUpdated); + this.qualifications = data.qualifications; + }); + } + + /** + * Function used to hadle toggle for traing details view and change training details lable + * @param {string} qualification uid of clicked row + * @param {event} refrance of event handler + */ + public toggleDetails(uid: string, event) { + event.preventDefault(); + this.qualificationDetails[uid] = !this.qualificationDetails[uid]; + this.qualificationDetailsLabel[uid] = this.qualificationDetailsLabel[uid] === 'Close' ? 'Open' : 'Close'; + } + public getRoute() { + this.workerService.getRoute$.next(this.router.url); + } +} diff --git a/src/app/features/workers/training-qualifications-record/training-and-qualifications-record.component.html b/src/app/features/workers/training-qualifications-record/training-and-qualifications-record.component.html index 5fd66b37d1..42925a016c 100644 --- a/src/app/features/workers/training-qualifications-record/training-and-qualifications-record.component.html +++ b/src/app/features/workers/training-qualifications-record/training-and-qualifications-record.component.html @@ -23,6 +23,10 @@

+ + + diff --git a/src/app/features/workers/workers.module.ts b/src/app/features/workers/workers.module.ts index 9ee416c4d8..b3600540cf 100644 --- a/src/app/features/workers/workers.module.ts +++ b/src/app/features/workers/workers.module.ts @@ -57,6 +57,7 @@ import { StaffDetailsComponent } from './staff-details/staff-details.component'; import { StaffRecordComponent } from './staff-record/staff-record.component'; import { TotalStaffComponent } from './total-staff/total-staff.component'; import { QualificationsComponent } from './training-qualifications-record/qualifications/qualifications.component'; +import { MandatoryTrainingComponent } from './training-qualifications-record/mandatory-training/mandatory-training.component'; import { TrainingAndQualificationsRecordComponent, } from './training-qualifications-record/training-and-qualifications-record.component'; @@ -107,6 +108,7 @@ import { YearArrivedUkComponent } from './year-arrived-uk/year-arrived-uk.compon OtherQualificationsLevelComponent, QualificationFormComponent, QualificationsComponent, + MandatoryTrainingComponent, RecruitedFromComponent, SalaryComponent, SocialCareQualificationComponent, From b17b68fb229c2d1de68812ce10fa443d51952770 Mon Sep 17 00:00:00 2001 From: Aaron Russell Date: Wed, 12 Feb 2020 12:42:05 +0000 Subject: [PATCH 053/305] Updated the WDF report to use a new DOM parser --- package-lock.json | 16903 ++++++++++++++------------ package.json | 1 + server/routes/reports/wdf/parent.js | 179 +- 3 files changed, 9465 insertions(+), 7618 deletions(-) diff --git a/package-lock.json b/package-lock.json index b572b168d9..98459812ab 100644 --- a/package-lock.json +++ b/package-lock.json @@ -114,11 +114,19 @@ "integrity": "sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk=", "dev": true }, - "json-schema-traverse": { - "version": "0.4.1", - "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz", - "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==", - "dev": true + "glob": { + "version": "7.1.4", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.4.tgz", + "integrity": "sha512-hkLPepehmnKk41pUGm3sYxoFs/umurYfYJCerbXEyFIWcAzvpipAgVkBqqT9RBKMGjnq6kMuyYwha6csxbiM1A==", + "dev": true, + "requires": { + "fs.realpath": "^1.0.0", + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "^3.0.4", + "once": "^1.3.0", + "path-is-absolute": "^1.0.0" + } }, "parse5": { "version": "4.0.0", @@ -141,15 +149,17 @@ "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", "dev": true }, - "source-map-support": { - "version": "0.5.12", - "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.12.tgz", - "integrity": "sha512-4h2Pbvyy15EE02G+JOZpUCmqWJuqrs+sEkzewTm++BPi7Hvn/HwcqLAcNxYAyI0x13CpPPn+kMjl+hplXMHITQ==", - "dev": true, - "requires": { - "buffer-from": "^1.0.0", - "source-map": "^0.6.0" - } + "source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "dev": true + }, + "tree-kill": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/tree-kill/-/tree-kill-1.2.1.tgz", + "integrity": "sha512-4hjqbObwlh2dLyW4tcz0Ymw0ggoaVDMveUB9w8kFSQScdRLo0gxO9J7WFcUBo+W3C1TLdFIEwNOWebgZZ0RH9Q==", + "dev": true } } }, @@ -228,10 +238,10 @@ "integrity": "sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk=", "dev": true }, - "json-schema-traverse": { - "version": "0.4.1", - "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz", - "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==", + "fast-json-stable-stringify": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz", + "integrity": "sha1-1RQsDK7msRifh9OnYREGT4bIu/I=", "dev": true }, "rxjs": { @@ -261,43 +271,6 @@ "rxjs": "6.4.0" }, "dependencies": { - "@angular-devkit/core": { - "version": "8.2.2", - "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-8.2.2.tgz", - "integrity": "sha512-qA1lK/OQhNptCxoEGbTryn6yeFS1F/e/EiUTwgU/j4DkBwPyYGE8iqWBd/cgI9AVqQaRSLLhVWXtDPxoNL0TKg==", - "dev": true, - "requires": { - "ajv": "6.10.2", - "fast-json-stable-stringify": "2.0.0", - "magic-string": "0.25.3", - "rxjs": "6.4.0", - "source-map": "0.7.3" - } - }, - "ajv": { - "version": "6.10.2", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.10.2.tgz", - "integrity": "sha512-TXtUUEYHuaTEbLZWIKUr5pmBuhDLy+8KYtPYdcV8qC+pOZL+NKqYwvWSRrVXHn+ZmRRAu8vJTAznH7Oag6RVRw==", - "dev": true, - "requires": { - "fast-deep-equal": "^2.0.1", - "fast-json-stable-stringify": "^2.0.0", - "json-schema-traverse": "^0.4.1", - "uri-js": "^4.2.2" - } - }, - "fast-deep-equal": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz", - "integrity": "sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk=", - "dev": true - }, - "json-schema-traverse": { - "version": "0.4.1", - "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz", - "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==", - "dev": true - }, "rxjs": { "version": "6.4.0", "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.4.0.tgz", @@ -306,19 +279,13 @@ "requires": { "tslib": "^1.9.0" } - }, - "source-map": { - "version": "0.7.3", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz", - "integrity": "sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==", - "dev": true } } }, "@angular/animations": { - "version": "8.2.3", - "resolved": "https://registry.npmjs.org/@angular/animations/-/animations-8.2.3.tgz", - "integrity": "sha512-kumEi9s8/cCNkndmETbAN7eSBfPkHGgX1up8ynsRgpjX7PTiGpsKMP0rxJBt281fqQPL/D6G3yZOyC5YfsP5+g==", + "version": "8.2.14", + "resolved": "https://registry.npmjs.org/@angular/animations/-/animations-8.2.14.tgz", + "integrity": "sha512-3Vc9TnNpKdtvKIXcWDFINSsnwgEMiDmLzjceWg1iYKwpeZGQahUXPoesLwQazBMmxJzQiA4HOMj0TTXKZ+Jzkg==", "requires": { "tslib": "^1.9.0" } @@ -358,41 +325,6 @@ "uuid": "^3.3.2" }, "dependencies": { - "@angular-devkit/architect": { - "version": "0.802.2", - "resolved": "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.802.2.tgz", - "integrity": "sha512-bMMo8BejHi3+n4xqewgcfat5+OYDmQQCLxWQ2W+qr7/u08vmTQTix3Q/wClp0nxgN0Zc9/1gSPaeudHLAlEizg==", - "dev": true, - "requires": { - "@angular-devkit/core": "8.2.2", - "rxjs": "6.4.0" - } - }, - "@angular-devkit/core": { - "version": "8.2.2", - "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-8.2.2.tgz", - "integrity": "sha512-qA1lK/OQhNptCxoEGbTryn6yeFS1F/e/EiUTwgU/j4DkBwPyYGE8iqWBd/cgI9AVqQaRSLLhVWXtDPxoNL0TKg==", - "dev": true, - "requires": { - "ajv": "6.10.2", - "fast-json-stable-stringify": "2.0.0", - "magic-string": "0.25.3", - "rxjs": "6.4.0", - "source-map": "0.7.3" - } - }, - "ajv": { - "version": "6.10.2", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.10.2.tgz", - "integrity": "sha512-TXtUUEYHuaTEbLZWIKUr5pmBuhDLy+8KYtPYdcV8qC+pOZL+NKqYwvWSRrVXHn+ZmRRAu8vJTAznH7Oag6RVRw==", - "dev": true, - "requires": { - "fast-deep-equal": "^2.0.1", - "fast-json-stable-stringify": "^2.0.0", - "json-schema-traverse": "^0.4.1", - "uri-js": "^4.2.2" - } - }, "ansi-colors": { "version": "4.1.1", "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.1.tgz", @@ -408,76 +340,40 @@ "ms": "^2.1.1" } }, - "fast-deep-equal": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz", - "integrity": "sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk=", - "dev": true - }, - "json-schema-traverse": { - "version": "0.4.1", - "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz", - "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==", - "dev": true - }, "ms": { "version": "2.1.2", "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", "dev": true }, - "open": { - "version": "6.4.0", - "resolved": "https://registry.npmjs.org/open/-/open-6.4.0.tgz", - "integrity": "sha512-IFenVPgF70fSm1keSd2iDBIDIBZkroLeuffXq+wKTzTJlBpesFWojV9lb8mzOfaAzM1sr7HQHuO0vtV0zYekGg==", - "dev": true, - "requires": { - "is-wsl": "^1.1.0" - } - }, - "rxjs": { - "version": "6.4.0", - "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.4.0.tgz", - "integrity": "sha512-Z9Yfa11F6B9Sg/BK9MnqnQ+aQYicPLtilXBp2yUtDt2JRCE0h26d33EnfO3ZxoNxG0T92OUucP3Ct7cpfkdFfw==", - "dev": true, - "requires": { - "tslib": "^1.9.0" - } - }, "semver": { "version": "6.3.0", "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", "dev": true - }, - "source-map": { - "version": "0.7.3", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz", - "integrity": "sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==", - "dev": true } } }, "@angular/common": { - "version": "8.2.3", - "resolved": "https://registry.npmjs.org/@angular/common/-/common-8.2.3.tgz", - "integrity": "sha512-Y8ttd66bAApnJgxjndVnBP0aMsID8AzttR2TKp1KpdDKy4n6td22+1DeHZJqPMOBwoTDEdjHZqFQ7XRNYe3IVw==", + "version": "8.2.14", + "resolved": "https://registry.npmjs.org/@angular/common/-/common-8.2.14.tgz", + "integrity": "sha512-Qmt+aX2quUW54kaNT7QH7WGXnFxr/cC2C6sf5SW5SdkZfDQSiz8IaItvieZfXVQUbBOQKFRJ7TlSkt0jI/yjvw==", "requires": { "tslib": "^1.9.0" } }, "@angular/compiler": { - "version": "8.2.3", - "resolved": "https://registry.npmjs.org/@angular/compiler/-/compiler-8.2.3.tgz", - "integrity": "sha512-CDUiYXdy7jIwhK3aeBwz4Bik3eQUORVWDVuO8fsVot7CODE4jIkETUdeWuYuEpwPX7dkjsFvuT4btiwzZfrCUg==", + "version": "8.2.14", + "resolved": "https://registry.npmjs.org/@angular/compiler/-/compiler-8.2.14.tgz", + "integrity": "sha512-ABZO4E7eeFA1QyJ2trDezxeQM5ZFa1dXw1Mpl/+1vuXDKNjJgNyWYwKp/NwRkLmrsuV0yv4UDCDe4kJOGbPKnw==", "requires": { "tslib": "^1.9.0" } }, "@angular/compiler-cli": { - "version": "8.2.3", - "resolved": "https://registry.npmjs.org/@angular/compiler-cli/-/compiler-cli-8.2.3.tgz", - "integrity": "sha512-KdUBhno+b9hIjM3lQOm39IHgSCex6vJa5dmjfCfcNUhT3BVs2nTtJ4uLMqJMI776KCf3y3zNJ5XUd8jMpgoxdQ==", + "version": "8.2.14", + "resolved": "https://registry.npmjs.org/@angular/compiler-cli/-/compiler-cli-8.2.14.tgz", + "integrity": "sha512-XDrTyrlIZM+0NquVT+Kbg5bn48AaWFT+B3bAT288PENrTdkuxuF9AhjFRZj8jnMdmaE4O2rioEkXBtl6z3zptA==", "dev": true, "requires": { "canonical-path": "1.0.0", @@ -498,6 +394,51 @@ "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=", "dev": true }, + "anymatch": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-2.0.0.tgz", + "integrity": "sha512-5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw==", + "dev": true, + "requires": { + "micromatch": "^3.1.4", + "normalize-path": "^2.1.1" + }, + "dependencies": { + "normalize-path": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz", + "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=", + "dev": true, + "requires": { + "remove-trailing-separator": "^1.0.1" + } + } + } + }, + "binary-extensions": { + "version": "1.13.1", + "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.13.1.tgz", + "integrity": "sha512-Un7MIEDdUC5gNpcGDV97op1Ywk748MpHcFTHoYs6qnj1Z3j7I53VG3nwZhKzoBZmbdRNnb6WRdFlwl7tSDuZGw==", + "dev": true + }, + "braces": { + "version": "2.3.2", + "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz", + "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==", + "dev": true, + "requires": { + "arr-flatten": "^1.1.0", + "array-unique": "^0.3.2", + "extend-shallow": "^2.0.1", + "fill-range": "^4.0.0", + "isobject": "^3.0.1", + "repeat-element": "^1.1.2", + "snapdragon": "^0.8.1", + "snapdragon-node": "^2.0.1", + "split-string": "^3.0.2", + "to-regex": "^3.0.1" + } + }, "chokidar": { "version": "2.1.8", "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.1.8.tgz", @@ -541,4182 +482,3325 @@ } } }, - "minimist": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", - "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=", - "dev": true - }, - "normalize-path": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz", - "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==", - "dev": true + "extend-shallow": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", + "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", + "dev": true, + "requires": { + "is-extendable": "^0.1.0" + } }, - "strip-ansi": { + "fill-range": { "version": "4.0.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz", - "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", + "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz", + "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=", "dev": true, "requires": { - "ansi-regex": "^3.0.0" + "extend-shallow": "^2.0.1", + "is-number": "^3.0.0", + "repeat-string": "^1.6.1", + "to-regex-range": "^2.1.0" } }, - "wrap-ansi": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz", - "integrity": "sha1-2Pw9KE3QV5T+hJc8rs3Rz4JP3YU=", + "fsevents": { + "version": "1.2.11", + "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.11.tgz", + "integrity": "sha512-+ux3lx6peh0BpvY0JebGyZoiR4D+oYzdPZMKJwkZ+sFkNJzpL7tXc/wehS49gUAxg3tmMHPHZkA8JU2rhhgDHw==", "dev": true, + "optional": true, "requires": { - "string-width": "^1.0.1", - "strip-ansi": "^3.0.1" + "bindings": "^1.5.0", + "nan": "^2.12.1", + "node-pre-gyp": "*" }, "dependencies": { + "abbrev": { + "version": "1.1.1", + "bundled": true, + "dev": true, + "optional": true + }, "ansi-regex": { "version": "2.1.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz", - "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=", - "dev": true + "bundled": true, + "dev": true, + "optional": true }, - "is-fullwidth-code-point": { + "aproba": { + "version": "1.2.0", + "bundled": true, + "dev": true, + "optional": true + }, + "are-we-there-yet": { + "version": "1.1.5", + "bundled": true, + "dev": true, + "optional": true, + "requires": { + "delegates": "^1.0.0", + "readable-stream": "^2.0.6" + } + }, + "balanced-match": { "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz", - "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=", + "bundled": true, + "dev": true, + "optional": true + }, + "brace-expansion": { + "version": "1.1.11", + "bundled": true, "dev": true, + "optional": true, "requires": { - "number-is-nan": "^1.0.0" + "balanced-match": "^1.0.0", + "concat-map": "0.0.1" } }, - "string-width": { + "chownr": { + "version": "1.1.3", + "bundled": true, + "dev": true, + "optional": true + }, + "code-point-at": { + "version": "1.1.0", + "bundled": true, + "dev": true, + "optional": true + }, + "concat-map": { + "version": "0.0.1", + "bundled": true, + "dev": true, + "optional": true + }, + "console-control-strings": { + "version": "1.1.0", + "bundled": true, + "dev": true, + "optional": true + }, + "core-util-is": { "version": "1.0.2", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz", - "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=", + "bundled": true, "dev": true, + "optional": true + }, + "debug": { + "version": "3.2.6", + "bundled": true, + "dev": true, + "optional": true, "requires": { - "code-point-at": "^1.0.0", - "is-fullwidth-code-point": "^1.0.0", - "strip-ansi": "^3.0.0" + "ms": "^2.1.1" } }, - "strip-ansi": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz", - "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=", + "deep-extend": { + "version": "0.6.0", + "bundled": true, + "dev": true, + "optional": true + }, + "delegates": { + "version": "1.0.0", + "bundled": true, + "dev": true, + "optional": true + }, + "detect-libc": { + "version": "1.0.3", + "bundled": true, + "dev": true, + "optional": true + }, + "fs-minipass": { + "version": "1.2.7", + "bundled": true, "dev": true, + "optional": true, "requires": { - "ansi-regex": "^2.0.0" + "minipass": "^2.6.0" } - } - } - }, - "yargs": { - "version": "13.1.0", - "resolved": "https://registry.npmjs.org/yargs/-/yargs-13.1.0.tgz", - "integrity": "sha512-1UhJbXfzHiPqkfXNHYhiz79qM/kZqjTE8yGlEjZa85Q+3+OwcV6NRkV7XOV1W2Eom2bzILeUn55pQYffjVOLAg==", - "dev": true, - "requires": { - "cliui": "^4.0.0", - "find-up": "^3.0.0", - "get-caller-file": "^2.0.1", - "os-locale": "^3.1.0", - "require-directory": "^2.1.1", - "require-main-filename": "^2.0.0", - "set-blocking": "^2.0.0", - "string-width": "^3.0.0", - "which-module": "^2.0.0", - "y18n": "^4.0.0", - "yargs-parser": "^13.0.0" - } - }, - "yargs-parser": { - "version": "13.1.1", - "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-13.1.1.tgz", - "integrity": "sha512-oVAVsHz6uFrg3XQheFII8ESO2ssAf9luWuAd6Wexsu4F3OtIW0o8IribPXYrD4WC24LWtPrJlGy87y5udK+dxQ==", - "dev": true, - "requires": { - "camelcase": "^5.0.0", - "decamelize": "^1.2.0" - } - } - } - }, - "@angular/core": { - "version": "8.2.3", - "resolved": "https://registry.npmjs.org/@angular/core/-/core-8.2.3.tgz", - "integrity": "sha512-wNlq6r0RI8q0BCr3I16NHfteliJLVjZN3MsLfzYi4u08LcGTemGL9YwcVjCOPEH4xREo3xX0ebvmuLwObu75lQ==", - "requires": { - "tslib": "^1.9.0" - } - }, - "@angular/forms": { - "version": "8.2.3", - "resolved": "https://registry.npmjs.org/@angular/forms/-/forms-8.2.3.tgz", - "integrity": "sha512-BDphHWx6FI3wfOd9XqhiUBKuIg4dnpr9Aw5+n1by4y9e2avBwWoefHJ15FtEZdop5qMwVWlCcHjdwZ2+q65f4g==", - "requires": { - "tslib": "^1.9.0" - } - }, - "@angular/language-service": { - "version": "8.2.3", - "resolved": "https://registry.npmjs.org/@angular/language-service/-/language-service-8.2.3.tgz", - "integrity": "sha512-2yLeAFFe0IF+1u/4+TusIjfi6XjUnwupIAyxDVe+G4KLh4nt+Co+tBQROBXjbhHbyypx3Z9BBZCSEXFAH5IOxw==", - "dev": true - }, - "@angular/platform-browser": { - "version": "8.2.3", - "resolved": "https://registry.npmjs.org/@angular/platform-browser/-/platform-browser-8.2.3.tgz", - "integrity": "sha512-hKC5V2n0jfrFc9DXvHW+NtHDSfC417WZz8onmUhMR2Eo3fjBm5cuZi5CNgnbZt9zUoXXOfwCy6p3N7FbPDXxLQ==", - "requires": { - "tslib": "^1.9.0" - } - }, - "@angular/platform-browser-dynamic": { - "version": "8.2.3", - "resolved": "https://registry.npmjs.org/@angular/platform-browser-dynamic/-/platform-browser-dynamic-8.2.3.tgz", - "integrity": "sha512-rH7tpOwJ6r8+085bOmXUI9/v9MxFfsL+BYzi6bG2vCU280cSblvZR2Rx9nqx3/+Xd97ISWkUZiQhyRVJWYk6UQ==", - "requires": { - "tslib": "^1.9.0" - } - }, - "@angular/router": { - "version": "8.2.3", - "resolved": "https://registry.npmjs.org/@angular/router/-/router-8.2.3.tgz", - "integrity": "sha512-PMZ5JA0GonaNpwV3VfGWUkL6eo2KbtYUZERu6AnTYpQTTzGBiS6pakQTczE7lb9KZ9u+LIhKBaxQ8hrGLWqgKw==", - "requires": { - "tslib": "^1.9.0" - } - }, - "@auth0/angular-jwt": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/@auth0/angular-jwt/-/angular-jwt-3.0.0.tgz", - "integrity": "sha512-Ky8hghnEx+CtCd097YXji08/LvLTG98IAEX/j1UgnutRDhQ31eczOohDn98v3i3MHNfLjfI3HdyxPK1Qc0IkZw==", - "requires": { - "url": "^0.11.0" - } - }, - "@babel/code-frame": { - "version": "7.5.5", - "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.5.5.tgz", - "integrity": "sha512-27d4lZoomVyo51VegxI20xZPuSHusqbQag/ztrBC7wegWoQ1nLREPVSKSW8byhTlzTKyNE4ifaTA6lCp7JjpFw==", - "dev": true, - "requires": { - "@babel/highlight": "^7.0.0" - } - }, - "@babel/generator": { - "version": "7.5.5", - "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.5.5.tgz", - "integrity": "sha512-ETI/4vyTSxTzGnU2c49XHv2zhExkv9JHLTwDAFz85kmcwuShvYG2H08FwgIguQf4JC75CBnXAUM5PqeF4fj0nQ==", - "dev": true, - "requires": { - "@babel/types": "^7.5.5", - "jsesc": "^2.5.1", - "lodash": "^4.17.13", - "source-map": "^0.5.0", - "trim-right": "^1.0.1" - }, - "dependencies": { - "jsesc": { - "version": "2.5.2", - "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz", - "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==", - "dev": true - }, - "source-map": { - "version": "0.5.7", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz", - "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=", - "dev": true - } - } - }, - "@babel/helper-function-name": { - "version": "7.1.0", - "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.1.0.tgz", - "integrity": "sha512-A95XEoCpb3TO+KZzJ4S/5uW5fNe26DjBGqf1o9ucyLyCmi1dXq/B3c8iaWTfBk3VvetUxl16e8tIrd5teOCfGw==", - "dev": true, - "requires": { - "@babel/helper-get-function-arity": "^7.0.0", - "@babel/template": "^7.1.0", - "@babel/types": "^7.0.0" - } - }, - "@babel/helper-get-function-arity": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.0.0.tgz", - "integrity": "sha512-r2DbJeg4svYvt3HOS74U4eWKsUAMRH01Z1ds1zx8KNTPtpTL5JAsdFv8BNyOpVqdFhHkkRDIg5B4AsxmkjAlmQ==", - "dev": true, - "requires": { - "@babel/types": "^7.0.0" - } - }, - "@babel/helper-split-export-declaration": { - "version": "7.4.4", - "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.4.4.tgz", - "integrity": "sha512-Ro/XkzLf3JFITkW6b+hNxzZ1n5OQ80NvIUdmHspih1XAhtN3vPTuUFT4eQnela+2MaZ5ulH+iyP513KJrxbN7Q==", - "dev": true, - "requires": { - "@babel/types": "^7.4.4" - } - }, - "@babel/highlight": { - "version": "7.5.0", - "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.5.0.tgz", - "integrity": "sha512-7dV4eu9gBxoM0dAnj/BCFDW9LFU0zvTrkq0ugM7pnHEgguOEeOz1so2ZghEdzviYzQEED0r4EAgpsBChKy1TRQ==", - "dev": true, - "requires": { - "chalk": "^2.0.0", - "esutils": "^2.0.2", - "js-tokens": "^4.0.0" - }, - "dependencies": { - "js-tokens": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", - "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==", - "dev": true - } - } - }, - "@babel/parser": { - "version": "7.5.5", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.5.5.tgz", - "integrity": "sha512-E5BN68cqR7dhKan1SfqgPGhQ178bkVKpXTPEXnFJBrEt8/DKRZlybmy+IgYLTeN7tp1R5Ccmbm2rBk17sHYU3g==", - "dev": true - }, - "@babel/template": { - "version": "7.4.4", - "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.4.4.tgz", - "integrity": "sha512-CiGzLN9KgAvgZsnivND7rkA+AeJ9JB0ciPOD4U59GKbQP2iQl+olF1l76kJOupqidozfZ32ghwBEJDhnk9MEcw==", - "dev": true, - "requires": { - "@babel/code-frame": "^7.0.0", - "@babel/parser": "^7.4.4", - "@babel/types": "^7.4.4" - } - }, - "@babel/traverse": { - "version": "7.5.5", - "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.5.5.tgz", - "integrity": "sha512-MqB0782whsfffYfSjH4TM+LMjrJnhCNEDMDIjeTpl+ASaUvxcjoiVCo/sM1GhS1pHOXYfWVCYneLjMckuUxDaQ==", - "dev": true, - "requires": { - "@babel/code-frame": "^7.5.5", - "@babel/generator": "^7.5.5", - "@babel/helper-function-name": "^7.1.0", - "@babel/helper-split-export-declaration": "^7.4.4", - "@babel/parser": "^7.5.5", - "@babel/types": "^7.5.5", - "debug": "^4.1.0", - "globals": "^11.1.0", - "lodash": "^4.17.13" - }, - "dependencies": { - "debug": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz", - "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==", - "dev": true, - "requires": { - "ms": "^2.1.1" - } - }, - "globals": { - "version": "11.12.0", - "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz", - "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==", - "dev": true - }, - "ms": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", - "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", - "dev": true - } - } - }, - "@babel/types": { - "version": "7.5.5", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.5.5.tgz", - "integrity": "sha512-s63F9nJioLqOlW3UkyMd+BYhXt44YuaFm/VV0VwuteqjYwRrObkU7ra9pY4wAJR3oXi8hJrMcrcJdO/HH33vtw==", - "dev": true, - "requires": { - "esutils": "^2.0.2", - "lodash": "^4.17.13", - "to-fast-properties": "^2.0.0" - }, - "dependencies": { - "to-fast-properties": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz", - "integrity": "sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4=", - "dev": true - } - } - }, - "@bcoe/v8-coverage": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/@bcoe/v8-coverage/-/v8-coverage-0.1.0.tgz", - "integrity": "sha512-UdVB1rSL7H8TS8674fH02p5lRbhfIqQ18YKLxLKEnHFztHUH6bhMqjebMxgSTmWVrs5raS5JSLJIKKHFT4WfPg==" - }, - "@ngtools/webpack": { - "version": "8.2.2", - "resolved": "https://registry.npmjs.org/@ngtools/webpack/-/webpack-8.2.2.tgz", - "integrity": "sha512-ksPFlZbH0+Rj+0qTGmkbtU3GHLjQKF4nN047AZn8Q4QnPynKqItHskSlyVi0CMnKfJxOr2VTxlSkiKN+pUb0sA==", - "dev": true, - "requires": { - "@angular-devkit/core": "8.2.2", - "enhanced-resolve": "4.1.0", - "rxjs": "6.4.0", - "tree-kill": "1.2.1", - "webpack-sources": "1.3.0" - }, - "dependencies": { - "rxjs": { - "version": "6.4.0", - "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.4.0.tgz", - "integrity": "sha512-Z9Yfa11F6B9Sg/BK9MnqnQ+aQYicPLtilXBp2yUtDt2JRCE0h26d33EnfO3ZxoNxG0T92OUucP3Ct7cpfkdFfw==", - "dev": true, - "requires": { - "tslib": "^1.9.0" - } - } - } - }, - "@schematics/angular": { - "version": "8.2.2", - "resolved": "https://registry.npmjs.org/@schematics/angular/-/angular-8.2.2.tgz", - "integrity": "sha512-0kZoGXwYRDLREwMYT+m0MyGenpPidLEulrWxgYWoLhsJAFKax7lTy2YYljtFTd+AlZYyB3PTpDsDip8uT743tA==", - "dev": true, - "requires": { - "@angular-devkit/core": "8.2.2", - "@angular-devkit/schematics": "8.2.2" - }, - "dependencies": { - "@angular-devkit/core": { - "version": "8.2.2", - "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-8.2.2.tgz", - "integrity": "sha512-qA1lK/OQhNptCxoEGbTryn6yeFS1F/e/EiUTwgU/j4DkBwPyYGE8iqWBd/cgI9AVqQaRSLLhVWXtDPxoNL0TKg==", - "dev": true, - "requires": { - "ajv": "6.10.2", - "fast-json-stable-stringify": "2.0.0", - "magic-string": "0.25.3", - "rxjs": "6.4.0", - "source-map": "0.7.3" - } - }, - "ajv": { - "version": "6.10.2", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.10.2.tgz", - "integrity": "sha512-TXtUUEYHuaTEbLZWIKUr5pmBuhDLy+8KYtPYdcV8qC+pOZL+NKqYwvWSRrVXHn+ZmRRAu8vJTAznH7Oag6RVRw==", - "dev": true, - "requires": { - "fast-deep-equal": "^2.0.1", - "fast-json-stable-stringify": "^2.0.0", - "json-schema-traverse": "^0.4.1", - "uri-js": "^4.2.2" - } - }, - "fast-deep-equal": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz", - "integrity": "sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk=", - "dev": true - }, - "json-schema-traverse": { - "version": "0.4.1", - "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz", - "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==", - "dev": true - }, - "rxjs": { - "version": "6.4.0", - "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.4.0.tgz", - "integrity": "sha512-Z9Yfa11F6B9Sg/BK9MnqnQ+aQYicPLtilXBp2yUtDt2JRCE0h26d33EnfO3ZxoNxG0T92OUucP3Ct7cpfkdFfw==", - "dev": true, - "requires": { - "tslib": "^1.9.0" - } - }, - "source-map": { - "version": "0.7.3", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz", - "integrity": "sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==", - "dev": true - } - } - }, - "@schematics/update": { - "version": "0.802.2", - "resolved": "https://registry.npmjs.org/@schematics/update/-/update-0.802.2.tgz", - "integrity": "sha512-ohwdxf0+uQ0aCTk27evs1l04rJ1nB3S95ihDr3rSQOl0WWizdto6TbXURtQ4PubORehjqvhrqqKGVp+QL2npGw==", - "dev": true, - "requires": { - "@angular-devkit/core": "8.2.2", - "@angular-devkit/schematics": "8.2.2", - "@yarnpkg/lockfile": "1.1.0", - "ini": "1.3.5", - "pacote": "9.5.4", - "rxjs": "6.4.0", - "semver": "6.3.0", - "semver-intersect": "1.4.0" - }, - "dependencies": { - "@angular-devkit/core": { - "version": "8.2.2", - "resolved": "https://registry.npmjs.org/@angular-devkit/core/-/core-8.2.2.tgz", - "integrity": "sha512-qA1lK/OQhNptCxoEGbTryn6yeFS1F/e/EiUTwgU/j4DkBwPyYGE8iqWBd/cgI9AVqQaRSLLhVWXtDPxoNL0TKg==", - "dev": true, - "requires": { - "ajv": "6.10.2", - "fast-json-stable-stringify": "2.0.0", - "magic-string": "0.25.3", - "rxjs": "6.4.0", - "source-map": "0.7.3" - } - }, - "ajv": { - "version": "6.10.2", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.10.2.tgz", - "integrity": "sha512-TXtUUEYHuaTEbLZWIKUr5pmBuhDLy+8KYtPYdcV8qC+pOZL+NKqYwvWSRrVXHn+ZmRRAu8vJTAznH7Oag6RVRw==", - "dev": true, - "requires": { - "fast-deep-equal": "^2.0.1", - "fast-json-stable-stringify": "^2.0.0", - "json-schema-traverse": "^0.4.1", - "uri-js": "^4.2.2" - } - }, - "fast-deep-equal": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz", - "integrity": "sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk=", - "dev": true - }, - "json-schema-traverse": { - "version": "0.4.1", - "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz", - "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==", - "dev": true - }, - "rxjs": { - "version": "6.4.0", - "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.4.0.tgz", - "integrity": "sha512-Z9Yfa11F6B9Sg/BK9MnqnQ+aQYicPLtilXBp2yUtDt2JRCE0h26d33EnfO3ZxoNxG0T92OUucP3Ct7cpfkdFfw==", - "dev": true, - "requires": { - "tslib": "^1.9.0" - } - }, - "semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", - "dev": true - }, - "source-map": { - "version": "0.7.3", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz", - "integrity": "sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==", - "dev": true - } - } - }, - "@sinonjs/commons": { - "version": "1.6.0", - "resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-1.6.0.tgz", - "integrity": "sha512-w4/WHG7C4WWFyE5geCieFJF6MZkbW4VAriol5KlmQXpAQdxvV0p26sqNZOW6Qyw6Y0l9K4g+cHvvczR2sEEpqg==", - "dev": true, - "requires": { - "type-detect": "4.0.8" - } - }, - "@sinonjs/formatio": { - "version": "3.2.2", - "resolved": "https://registry.npmjs.org/@sinonjs/formatio/-/formatio-3.2.2.tgz", - "integrity": "sha512-B8SEsgd8gArBLMD6zpRw3juQ2FVSsmdd7qlevyDqzS9WTCtvF55/gAL+h6gue8ZvPYcdiPdvueM/qm//9XzyTQ==", - "dev": true, - "requires": { - "@sinonjs/commons": "^1", - "@sinonjs/samsam": "^3.1.0" - } - }, - "@sinonjs/samsam": { - "version": "3.3.3", - "resolved": "https://registry.npmjs.org/@sinonjs/samsam/-/samsam-3.3.3.tgz", - "integrity": "sha512-bKCMKZvWIjYD0BLGnNrxVuw4dkWCYsLqFOUWw8VgKF/+5Y+mE7LfHWPIYoDXowH+3a9LsWDMo0uAP8YDosPvHQ==", - "dev": true, - "requires": { - "@sinonjs/commons": "^1.3.0", - "array-from": "^2.1.1", - "lodash": "^4.17.15" - } - }, - "@sinonjs/text-encoding": { - "version": "0.7.1", - "resolved": "https://registry.npmjs.org/@sinonjs/text-encoding/-/text-encoding-0.7.1.tgz", - "integrity": "sha512-+iTbntw2IZPb/anVDbypzfQa+ay64MW0Zo8aJ8gZPWMMK6/OubMVb6lUPMagqjOPnmtauXnFCACVl3O7ogjeqQ==", - "dev": true - }, - "@types/events": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/@types/events/-/events-3.0.0.tgz", - "integrity": "sha512-EaObqwIvayI5a8dCzhFrjKzVwKLxjoG9T6Ppd5CEo07LRKfQ8Yokw54r5+Wq7FaBQ+yXRvQAYPrHwya1/UFt9g==", - "dev": true - }, - "@types/file-saver": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/@types/file-saver/-/file-saver-2.0.1.tgz", - "integrity": "sha512-g1QUuhYVVAamfCifK7oB7G3aIl4BbOyzDOqVyUfEr4tfBKrXfeH+M+Tg7HKCXSrbzxYdhyCP7z9WbKo0R2hBCw==", - "dev": true - }, - "@types/geojson": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/@types/geojson/-/geojson-1.0.6.tgz", - "integrity": "sha512-Xqg/lIZMrUd0VRmSRbCAewtwGZiAk3mEUDvV4op1tGl+LvyPcb/MIOSxTl9z+9+J+R4/vpjiCAT4xeKzH9ji1w==" - }, - "@types/glob": { - "version": "7.1.1", - "resolved": "https://registry.npmjs.org/@types/glob/-/glob-7.1.1.tgz", - "integrity": "sha512-1Bh06cbWJUHMC97acuD6UMG29nMt0Aqz1vF3guLfG+kHHJhy3AyohZFFxYk2f7Q1SQIrNwvncxAE0N/9s70F2w==", - "dev": true, - "requires": { - "@types/events": "*", - "@types/minimatch": "*", - "@types/node": "*" - } - }, - "@types/is-windows": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/@types/is-windows/-/is-windows-0.2.0.tgz", - "integrity": "sha1-byTuSHMdMRaOpRBhDW3RXl/Jxv8=" - }, - "@types/jasmine": { - "version": "2.8.16", - "resolved": "https://registry.npmjs.org/@types/jasmine/-/jasmine-2.8.16.tgz", - "integrity": "sha512-056oRlBBp7MDzr+HoU5su099s/s7wjZ3KcHxLfv+Byqb9MwdLUvsfLgw1VS97hsh3ddxSPyQu+olHMnoVTUY6g==", - "dev": true - }, - "@types/jasminewd2": { - "version": "2.0.6", - "resolved": "https://registry.npmjs.org/@types/jasminewd2/-/jasminewd2-2.0.6.tgz", - "integrity": "sha512-2ZOKrxb8bKRmP/po5ObYnRDgFE4i+lQiEB27bAMmtMWLgJSqlIDqlLx6S0IRorpOmOPRQ6O80NujTmQAtBkeNw==", - "dev": true, - "requires": { - "@types/jasmine": "*" - } - }, - "@types/mime-types": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/@types/mime-types/-/mime-types-2.1.0.tgz", - "integrity": "sha1-nKUs2jY/aZxpRmwqbM2q2RPqenM=", - "dev": true - }, - "@types/minimatch": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/@types/minimatch/-/minimatch-3.0.3.tgz", - "integrity": "sha512-tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA==", - "dev": true - }, - "@types/node": { - "version": "8.9.5", - "resolved": "https://registry.npmjs.org/@types/node/-/node-8.9.5.tgz", - "integrity": "sha512-jRHfWsvyMtXdbhnz5CVHxaBgnV6duZnPlQuRSo/dm/GnmikNcmZhxIES4E9OZjUmQ8C+HCl4KJux+cXN/ErGDQ==" - }, - "@types/q": { - "version": "0.0.32", - "resolved": "https://registry.npmjs.org/@types/q/-/q-0.0.32.tgz", - "integrity": "sha1-vShOV8hPEyXacCur/IKlMoGQwMU=", - "dev": true - }, - "@types/selenium-webdriver": { - "version": "3.0.16", - "resolved": "https://registry.npmjs.org/@types/selenium-webdriver/-/selenium-webdriver-3.0.16.tgz", - "integrity": "sha512-lMC2G0ItF2xv4UCiwbJGbnJlIuUixHrioOhNGHSCsYCJ8l4t9hMCUimCytvFv7qy6AfSzRxhRHoGa+UqaqwyeA==", - "dev": true - }, - "@types/source-list-map": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/@types/source-list-map/-/source-list-map-0.1.2.tgz", - "integrity": "sha512-K5K+yml8LTo9bWJI/rECfIPrGgxdpeNbj+d53lwN4QjW1MCwlkhUms+gtdzigTeUyBr09+u8BwOIY3MXvHdcsA==", - "dev": true - }, - "@types/webpack-sources": { - "version": "0.1.5", - "resolved": "https://registry.npmjs.org/@types/webpack-sources/-/webpack-sources-0.1.5.tgz", - "integrity": "sha512-zfvjpp7jiafSmrzJ2/i3LqOyTYTuJ7u1KOXlKgDlvsj9Rr0x7ZiYu5lZbXwobL7lmsRNtPXlBfmaUD8eU2Hu8w==", - "dev": true, - "requires": { - "@types/node": "*", - "@types/source-list-map": "*", - "source-map": "^0.6.1" - } - }, - "@webassemblyjs/ast": { - "version": "1.8.5", - "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.8.5.tgz", - "integrity": "sha512-aJMfngIZ65+t71C3y2nBBg5FFG0Okt9m0XEgWZ7Ywgn1oMAT8cNwx00Uv1cQyHtidq0Xn94R4TAywO+LCQ+ZAQ==", - "dev": true, - "requires": { - "@webassemblyjs/helper-module-context": "1.8.5", - "@webassemblyjs/helper-wasm-bytecode": "1.8.5", - "@webassemblyjs/wast-parser": "1.8.5" - } - }, - "@webassemblyjs/floating-point-hex-parser": { - "version": "1.8.5", - "resolved": "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.8.5.tgz", - "integrity": "sha512-9p+79WHru1oqBh9ewP9zW95E3XAo+90oth7S5Re3eQnECGq59ly1Ri5tsIipKGpiStHsUYmY3zMLqtk3gTcOtQ==", - "dev": true - }, - "@webassemblyjs/helper-api-error": { - "version": "1.8.5", - "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.8.5.tgz", - "integrity": "sha512-Za/tnzsvnqdaSPOUXHyKJ2XI7PDX64kWtURyGiJJZKVEdFOsdKUCPTNEVFZq3zJ2R0G5wc2PZ5gvdTRFgm81zA==", - "dev": true - }, - "@webassemblyjs/helper-buffer": { - "version": "1.8.5", - "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.8.5.tgz", - "integrity": "sha512-Ri2R8nOS0U6G49Q86goFIPNgjyl6+oE1abW1pS84BuhP1Qcr5JqMwRFT3Ah3ADDDYGEgGs1iyb1DGX+kAi/c/Q==", - "dev": true - }, - "@webassemblyjs/helper-code-frame": { - "version": "1.8.5", - "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-code-frame/-/helper-code-frame-1.8.5.tgz", - "integrity": "sha512-VQAadSubZIhNpH46IR3yWO4kZZjMxN1opDrzePLdVKAZ+DFjkGD/rf4v1jap744uPVU6yjL/smZbRIIJTOUnKQ==", - "dev": true, - "requires": { - "@webassemblyjs/wast-printer": "1.8.5" - } - }, - "@webassemblyjs/helper-fsm": { - "version": "1.8.5", - "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-fsm/-/helper-fsm-1.8.5.tgz", - "integrity": "sha512-kRuX/saORcg8se/ft6Q2UbRpZwP4y7YrWsLXPbbmtepKr22i8Z4O3V5QE9DbZK908dh5Xya4Un57SDIKwB9eow==", - "dev": true - }, - "@webassemblyjs/helper-module-context": { - "version": "1.8.5", - "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-module-context/-/helper-module-context-1.8.5.tgz", - "integrity": "sha512-/O1B236mN7UNEU4t9X7Pj38i4VoU8CcMHyy3l2cV/kIF4U5KoHXDVqcDuOs1ltkac90IM4vZdHc52t1x8Yfs3g==", - "dev": true, - "requires": { - "@webassemblyjs/ast": "1.8.5", - "mamacro": "^0.0.3" - } - }, - "@webassemblyjs/helper-wasm-bytecode": { - "version": "1.8.5", - "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.8.5.tgz", - "integrity": "sha512-Cu4YMYG3Ddl72CbmpjU/wbP6SACcOPVbHN1dI4VJNJVgFwaKf1ppeFJrwydOG3NDHxVGuCfPlLZNyEdIYlQ6QQ==", - "dev": true - }, - "@webassemblyjs/helper-wasm-section": { - "version": "1.8.5", - "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.8.5.tgz", - "integrity": "sha512-VV083zwR+VTrIWWtgIUpqfvVdK4ff38loRmrdDBgBT8ADXYsEZ5mPQ4Nde90N3UYatHdYoDIFb7oHzMncI02tA==", - "dev": true, - "requires": { - "@webassemblyjs/ast": "1.8.5", - "@webassemblyjs/helper-buffer": "1.8.5", - "@webassemblyjs/helper-wasm-bytecode": "1.8.5", - "@webassemblyjs/wasm-gen": "1.8.5" - } - }, - "@webassemblyjs/ieee754": { - "version": "1.8.5", - "resolved": "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.8.5.tgz", - "integrity": "sha512-aaCvQYrvKbY/n6wKHb/ylAJr27GglahUO89CcGXMItrOBqRarUMxWLJgxm9PJNuKULwN5n1csT9bYoMeZOGF3g==", - "dev": true, - "requires": { - "@xtuc/ieee754": "^1.2.0" - } - }, - "@webassemblyjs/leb128": { - "version": "1.8.5", - "resolved": "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.8.5.tgz", - "integrity": "sha512-plYUuUwleLIziknvlP8VpTgO4kqNaH57Y3JnNa6DLpu/sGcP6hbVdfdX5aHAV716pQBKrfuU26BJK29qY37J7A==", - "dev": true, - "requires": { - "@xtuc/long": "4.2.2" - } - }, - "@webassemblyjs/utf8": { - "version": "1.8.5", - "resolved": "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.8.5.tgz", - "integrity": "sha512-U7zgftmQriw37tfD934UNInokz6yTmn29inT2cAetAsaU9YeVCveWEwhKL1Mg4yS7q//NGdzy79nlXh3bT8Kjw==", - "dev": true - }, - "@webassemblyjs/wasm-edit": { - "version": "1.8.5", - "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.8.5.tgz", - "integrity": "sha512-A41EMy8MWw5yvqj7MQzkDjU29K7UJq1VrX2vWLzfpRHt3ISftOXqrtojn7nlPsZ9Ijhp5NwuODuycSvfAO/26Q==", - "dev": true, - "requires": { - "@webassemblyjs/ast": "1.8.5", - "@webassemblyjs/helper-buffer": "1.8.5", - "@webassemblyjs/helper-wasm-bytecode": "1.8.5", - "@webassemblyjs/helper-wasm-section": "1.8.5", - "@webassemblyjs/wasm-gen": "1.8.5", - "@webassemblyjs/wasm-opt": "1.8.5", - "@webassemblyjs/wasm-parser": "1.8.5", - "@webassemblyjs/wast-printer": "1.8.5" - } - }, - "@webassemblyjs/wasm-gen": { - "version": "1.8.5", - "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.8.5.tgz", - "integrity": "sha512-BCZBT0LURC0CXDzj5FXSc2FPTsxwp3nWcqXQdOZE4U7h7i8FqtFK5Egia6f9raQLpEKT1VL7zr4r3+QX6zArWg==", - "dev": true, - "requires": { - "@webassemblyjs/ast": "1.8.5", - "@webassemblyjs/helper-wasm-bytecode": "1.8.5", - "@webassemblyjs/ieee754": "1.8.5", - "@webassemblyjs/leb128": "1.8.5", - "@webassemblyjs/utf8": "1.8.5" - } - }, - "@webassemblyjs/wasm-opt": { - "version": "1.8.5", - "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.8.5.tgz", - "integrity": "sha512-HKo2mO/Uh9A6ojzu7cjslGaHaUU14LdLbGEKqTR7PBKwT6LdPtLLh9fPY33rmr5wcOMrsWDbbdCHq4hQUdd37Q==", - "dev": true, - "requires": { - "@webassemblyjs/ast": "1.8.5", - "@webassemblyjs/helper-buffer": "1.8.5", - "@webassemblyjs/wasm-gen": "1.8.5", - "@webassemblyjs/wasm-parser": "1.8.5" - } - }, - "@webassemblyjs/wasm-parser": { - "version": "1.8.5", - "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.8.5.tgz", - "integrity": "sha512-pi0SYE9T6tfcMkthwcgCpL0cM9nRYr6/6fjgDtL6q/ZqKHdMWvxitRi5JcZ7RI4SNJJYnYNaWy5UUrHQy998lw==", - "dev": true, - "requires": { - "@webassemblyjs/ast": "1.8.5", - "@webassemblyjs/helper-api-error": "1.8.5", - "@webassemblyjs/helper-wasm-bytecode": "1.8.5", - "@webassemblyjs/ieee754": "1.8.5", - "@webassemblyjs/leb128": "1.8.5", - "@webassemblyjs/utf8": "1.8.5" - } - }, - "@webassemblyjs/wast-parser": { - "version": "1.8.5", - "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-parser/-/wast-parser-1.8.5.tgz", - "integrity": "sha512-daXC1FyKWHF1i11obK086QRlsMsY4+tIOKgBqI1lxAnkp9xe9YMcgOxm9kLe+ttjs5aWV2KKE1TWJCN57/Btsg==", - "dev": true, - "requires": { - "@webassemblyjs/ast": "1.8.5", - "@webassemblyjs/floating-point-hex-parser": "1.8.5", - "@webassemblyjs/helper-api-error": "1.8.5", - "@webassemblyjs/helper-code-frame": "1.8.5", - "@webassemblyjs/helper-fsm": "1.8.5", - "@xtuc/long": "4.2.2" - } - }, - "@webassemblyjs/wast-printer": { - "version": "1.8.5", - "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.8.5.tgz", - "integrity": "sha512-w0U0pD4EhlnvRyeJzBqaVSJAo9w/ce7/WPogeXLzGkO6hzhr4GnQIZ4W4uUt5b9ooAaXPtnXlj0gzsXEOUNYMg==", - "dev": true, - "requires": { - "@webassemblyjs/ast": "1.8.5", - "@webassemblyjs/wast-parser": "1.8.5", - "@xtuc/long": "4.2.2" - } - }, - "@xtuc/ieee754": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/@xtuc/ieee754/-/ieee754-1.2.0.tgz", - "integrity": "sha512-DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA==", - "dev": true - }, - "@xtuc/long": { - "version": "4.2.2", - "resolved": "https://registry.npmjs.org/@xtuc/long/-/long-4.2.2.tgz", - "integrity": "sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==", - "dev": true - }, - "@yarnpkg/lockfile": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/@yarnpkg/lockfile/-/lockfile-1.1.0.tgz", - "integrity": "sha512-GpSwvyXOcOOlV70vbnzjj4fW5xW/FdUF6nQEt1ENy7m4ZCczi1+/buVUPAqmGfqznsORNFzUMjctTIp8a9tuCQ==", - "dev": true - }, - "JSONStream": { - "version": "1.3.5", - "resolved": "https://registry.npmjs.org/JSONStream/-/JSONStream-1.3.5.tgz", - "integrity": "sha512-E+iruNOY8VV9s4JEbe1aNEm6MiszPRr/UfcHMz0TQh1BXSxHK+ASV1R6W4HpjBhSeS+54PIsAMCBmwD06LLsqQ==", - "dev": true, - "requires": { - "jsonparse": "^1.2.0", - "through": ">=2.2.7 <3" - } - }, - "abab": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/abab/-/abab-2.0.1.tgz", - "integrity": "sha512-1zSbbCuoIjafKZ3mblY5ikvAb0ODUbqBnFuUb7f6uLeQhhGJ0vEV4ntmtxKLT2WgXCO94E07BjunsIw1jOMPZw==" - }, - "abbrev": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz", - "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==", - "dev": true - }, - "accepts": { - "version": "1.3.7", - "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.7.tgz", - "integrity": "sha512-Il80Qs2WjYlJIBNzNkK6KYqlVMTbZLXgHx2oT0pU/fjRHyEp+PEfEPY0R3WCwAGVOtauxh1hOxNgIf5bv7dQpA==", - "dev": true, - "requires": { - "mime-types": "~2.1.24", - "negotiator": "0.6.2" - } - }, - "acorn": { - "version": "2.7.0", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-2.7.0.tgz", - "integrity": "sha1-q259nYhqrKiwhbwzEreaGYQz8Oc=" - }, - "acorn-globals": { - "version": "1.0.9", - "resolved": "https://registry.npmjs.org/acorn-globals/-/acorn-globals-1.0.9.tgz", - "integrity": "sha1-VbtemGkVB7dFedBRNBMhfDgMVM8=", - "requires": { - "acorn": "^2.1.0" - } - }, - "acorn-walk": { - "version": "6.2.0", - "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-6.2.0.tgz", - "integrity": "sha512-7evsyfH1cLOCdAzZAd43Cic04yKydNx0cF+7tiA19p1XnLLPU4dpCQOqpjqwokFe//vS0QqfqqjCS2JkiIs0cA==" - }, - "adm-zip": { - "version": "0.4.13", - "resolved": "https://registry.npmjs.org/adm-zip/-/adm-zip-0.4.13.tgz", - "integrity": "sha512-fERNJX8sOXfel6qCBCMPvZLzENBEhZTzKqg6vrOW5pvoEaQuJhRU4ndTAh6lHOxn1I6jnz2NHra56ZODM751uw==", - "dev": true - }, - "after": { - "version": "0.8.2", - "resolved": "https://registry.npmjs.org/after/-/after-0.8.2.tgz", - "integrity": "sha1-/ts5T58OAqqXaOcCvaI7UF+ufh8=", - "dev": true - }, - "agent-base": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-4.3.0.tgz", - "integrity": "sha512-salcGninV0nPrwpGNn4VTXBb1SOuXQBiqbrNXoeizJsHrsL6ERFM2Ne3JUSBWRE6aeNJI2ROP/WEEIDUiDe3cg==", - "dev": true, - "requires": { - "es6-promisify": "^5.0.0" - } - }, - "agentkeepalive": { - "version": "3.5.2", - "resolved": "https://registry.npmjs.org/agentkeepalive/-/agentkeepalive-3.5.2.tgz", - "integrity": "sha512-e0L/HNe6qkQ7H19kTlRRqUibEAwDK5AFk6y3PtMsuut2VAH6+Q4xZml1tNDJD7kSAyqmbG/K08K5WEJYtUrSlQ==", - "dev": true, - "requires": { - "humanize-ms": "^1.2.1" - } - }, - "ajv": { - "version": "6.10.2", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.10.2.tgz", - "integrity": "sha512-TXtUUEYHuaTEbLZWIKUr5pmBuhDLy+8KYtPYdcV8qC+pOZL+NKqYwvWSRrVXHn+ZmRRAu8vJTAznH7Oag6RVRw==", - "requires": { - "fast-deep-equal": "^2.0.1", - "fast-json-stable-stringify": "^2.0.0", - "json-schema-traverse": "^0.4.1", - "uri-js": "^4.2.2" - } - }, - "ajv-errors": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/ajv-errors/-/ajv-errors-1.0.1.tgz", - "integrity": "sha512-DCRfO/4nQ+89p/RK43i8Ezd41EqdGIU4ld7nGF8OQ14oc/we5rEntLCUa7+jrn3nn83BosfwZA0wb4pon2o8iQ==", - "dev": true - }, - "ajv-keywords": { - "version": "3.4.1", - "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.4.1.tgz", - "integrity": "sha512-RO1ibKvd27e6FEShVFfPALuHI3WjSVNeK5FIsmme/LYRNxjKuNj+Dt7bucLa6NdSv3JcVTyMlm9kGR84z1XpaQ==", - "dev": true - }, - "align-text": { - "version": "0.1.4", - "resolved": "https://registry.npmjs.org/align-text/-/align-text-0.1.4.tgz", - "integrity": "sha1-DNkKVhCT810KmSVsIrcGlDP60Rc=", - "requires": { - "kind-of": "^3.0.2", - "longest": "^1.0.1", - "repeat-string": "^1.5.2" - } - }, - "amdefine": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/amdefine/-/amdefine-1.0.1.tgz", - "integrity": "sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU=" - }, - "angulartics2": { - "version": "7.5.2", - "resolved": "https://registry.npmjs.org/angulartics2/-/angulartics2-7.5.2.tgz", - "integrity": "sha512-gfQ/kRtrKD0fLOGZsWlcD8obIWTAJGSdiVRp6lH+LxLD8shKnl1/StWlUJeOioUkU0ps4QGRb0tCSlCdnI5DAw==", - "requires": { - "tslib": "^1.9.0" - } - }, - "ansi-align": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ansi-align/-/ansi-align-2.0.0.tgz", - "integrity": "sha1-w2rsy6VjuJzrVW82kPCx2eNUf38=", - "dev": true, - "requires": { - "string-width": "^2.0.0" - }, - "dependencies": { - "ansi-regex": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz", - "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=", - "dev": true - }, - "string-width": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz", - "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==", - "dev": true, - "requires": { - "is-fullwidth-code-point": "^2.0.0", - "strip-ansi": "^4.0.0" - } - }, - "strip-ansi": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz", - "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", - "dev": true, - "requires": { - "ansi-regex": "^3.0.0" - } - } - } - }, - "ansi-colors": { - "version": "3.2.4", - "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-3.2.4.tgz", - "integrity": "sha512-hHUXGagefjN2iRrID63xckIvotOXOojhQKWIPUZ4mNUZ9nLZW+7FMNoE1lOkEhNWYsx/7ysGIuJYCiMAA9FnrA==", - "dev": true - }, - "ansi-escapes": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-3.2.0.tgz", - "integrity": "sha512-cBhpre4ma+U0T1oM5fXg7Dy1Jw7zzwv7lt/GoCpr+hDQJoYnKVPLL4dCvSEFMmQurOQvSrwT7SL/DAlhBI97RQ==", - "dev": true - }, - "ansi-html": { - "version": "0.0.7", - "resolved": "https://registry.npmjs.org/ansi-html/-/ansi-html-0.0.7.tgz", - "integrity": "sha1-gTWEAhliqenm/QOflA0S9WynhZ4=", - "dev": true - }, - "ansi-regex": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz", - "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==" - }, - "ansi-styles": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", - "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", - "requires": { - "color-convert": "^1.9.0" - } - }, - "anymatch": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-2.0.0.tgz", - "integrity": "sha512-5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw==", - "dev": true, - "requires": { - "micromatch": "^3.1.4", - "normalize-path": "^2.1.1" - } - }, - "app-root-path": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/app-root-path/-/app-root-path-2.2.1.tgz", - "integrity": "sha512-91IFKeKk7FjfmezPKkwtaRvSpnUc4gDwPAjA1YZ9Gn0q0PPeW+vbeUsZuyDwjI7+QTHhcLen2v25fi/AmhvbJA==", - "dev": true - }, - "append-transform": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/append-transform/-/append-transform-1.0.0.tgz", - "integrity": "sha512-P009oYkeHyU742iSZJzZZywj4QRJdnTWffaKuJQLablCZ1uz6/cW4yaRgcDaoQ+uwOxxnt0gRUcwfsNP2ri0gw==", - "dev": true, - "requires": { - "default-require-extensions": "^2.0.0" - } - }, - "aproba": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/aproba/-/aproba-1.2.0.tgz", - "integrity": "sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==", - "dev": true - }, - "archy": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/archy/-/archy-1.0.0.tgz", - "integrity": "sha1-+cjBN1fMHde8N5rHeyxipcKGjEA=", - "dev": true - }, - "argparse": { - "version": "1.0.10", - "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz", - "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==", - "requires": { - "sprintf-js": "~1.0.2" - } - }, - "aria-query": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/aria-query/-/aria-query-3.0.0.tgz", - "integrity": "sha1-ZbP8wcoRVajJrmTW7uKX8V1RM8w=", - "dev": true, - "requires": { - "ast-types-flow": "0.0.7", - "commander": "^2.11.0" - } - }, - "arr-diff": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz", - "integrity": "sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=", - "dev": true - }, - "arr-flatten": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/arr-flatten/-/arr-flatten-1.1.0.tgz", - "integrity": "sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg==", - "dev": true - }, - "arr-union": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/arr-union/-/arr-union-3.1.0.tgz", - "integrity": "sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ=", - "dev": true - }, - "array-equal": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/array-equal/-/array-equal-1.0.0.tgz", - "integrity": "sha1-jCpe8kcv2ep0KwTHenUJO6J1fJM=" - }, - "array-filter": { - "version": "0.0.1", - "resolved": "https://registry.npmjs.org/array-filter/-/array-filter-0.0.1.tgz", - "integrity": "sha1-fajPLiZijtcygDWB/SH2fKzS7uw=", - "dev": true - }, - "array-flatten": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-2.1.2.tgz", - "integrity": "sha512-hNfzcOV8W4NdualtqBFPyVO+54DSJuZGY9qT4pRroB6S9e3iiido2ISIC5h9R2sPJ8H3FHCIiEnsv1lPXO3KtQ==", - "dev": true - }, - "array-from": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/array-from/-/array-from-2.1.1.tgz", - "integrity": "sha1-z+nYwmYoudxa7MYqn12PHzUsEZU=", - "dev": true - }, - "array-map": { - "version": "0.0.0", - "resolved": "https://registry.npmjs.org/array-map/-/array-map-0.0.0.tgz", - "integrity": "sha1-iKK6tz0c97zVwbEYoAP2b2ZfpmI=", - "dev": true - }, - "array-reduce": { - "version": "0.0.0", - "resolved": "https://registry.npmjs.org/array-reduce/-/array-reduce-0.0.0.tgz", - "integrity": "sha1-FziZ0//Rx9k4PkR5Ul2+J4yrXys=", - "dev": true - }, - "array-union": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/array-union/-/array-union-1.0.2.tgz", - "integrity": "sha1-mjRBDk9OPaI96jdb5b5w8kd47Dk=", - "dev": true, - "requires": { - "array-uniq": "^1.0.1" - } - }, - "array-uniq": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/array-uniq/-/array-uniq-1.0.3.tgz", - "integrity": "sha1-r2rId6Jcx/dOBYiUdThY39sk/bY=", - "dev": true - }, - "array-unique": { - "version": "0.3.2", - "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz", - "integrity": "sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=", - "dev": true - }, - "arraybuffer.slice": { - "version": "0.0.7", - "resolved": "https://registry.npmjs.org/arraybuffer.slice/-/arraybuffer.slice-0.0.7.tgz", - "integrity": "sha512-wGUIVQXuehL5TCqQun8OW81jGzAWycqzFF8lFp+GOM5BXLYj3bKNsYC4daB7n6XjCqxQA/qgTJ+8ANR3acjrog==", - "dev": true - }, - "arrify": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz", - "integrity": "sha1-iYUI2iIm84DfkEcoRWhJwVAaSw0=", - "dev": true - }, - "asap": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/asap/-/asap-1.0.0.tgz", - "integrity": "sha1-sqRdpf36ILBJb8N2jMJ8EvqRan0=" - }, - "asn1": { - "version": "0.2.4", - "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.4.tgz", - "integrity": "sha512-jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg==", - "requires": { - "safer-buffer": "~2.1.0" - } - }, - "asn1.js": { - "version": "4.10.1", - "resolved": "https://registry.npmjs.org/asn1.js/-/asn1.js-4.10.1.tgz", - "integrity": "sha512-p32cOF5q0Zqs9uBiONKYLm6BClCoBCM5O9JfeUSlnQLBTxYdTK+pW+nXflm8UkKd2UYlEbYz5qEi0JuZR9ckSw==", - "dev": true, - "requires": { - "bn.js": "^4.0.0", - "inherits": "^2.0.1", - "minimalistic-assert": "^1.0.0" - } - }, - "assert": { - "version": "1.5.0", - "resolved": "https://registry.npmjs.org/assert/-/assert-1.5.0.tgz", - "integrity": "sha512-EDsgawzwoun2CZkCgtxJbv392v4nbk9XDD06zI+kQYoBM/3RBWLlEyJARDOmhAAosBjWACEkKL6S+lIZtcAubA==", - "dev": true, - "requires": { - "object-assign": "^4.1.1", - "util": "0.10.3" - }, - "dependencies": { - "inherits": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz", - "integrity": "sha1-sX0I0ya0Qj5Wjv9xn5GwscvfafE=", - "dev": true - }, - "util": { - "version": "0.10.3", - "resolved": "https://registry.npmjs.org/util/-/util-0.10.3.tgz", - "integrity": "sha1-evsa/lCAUkZInj23/g7TeTNqwPk=", - "dev": true, - "requires": { - "inherits": "2.0.1" - } - } - } - }, - "assert-plus": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz", - "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=" - }, - "assertion-error": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/assertion-error/-/assertion-error-1.1.0.tgz", - "integrity": "sha512-jgsaNduz+ndvGyFt3uSuWqvy4lCnIJiovtouQN5JZHOKCS2QuhEdbcQHFhVksz2N2U9hXJo8odG7ETyWlEeuDw==", - "dev": true - }, - "assign-symbols": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/assign-symbols/-/assign-symbols-1.0.0.tgz", - "integrity": "sha1-WWZ/QfrdTyDMvCu5a41Pf3jsA2c=", - "dev": true - }, - "ast-types-flow": { - "version": "0.0.7", - "resolved": "https://registry.npmjs.org/ast-types-flow/-/ast-types-flow-0.0.7.tgz", - "integrity": "sha1-9wtzXGvKGlycItmCw+Oef+ujva0=", - "dev": true - }, - "async": { - "version": "2.6.3", - "resolved": "https://registry.npmjs.org/async/-/async-2.6.3.tgz", - "integrity": "sha512-zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg==", - "dev": true, - "requires": { - "lodash": "^4.17.14" - } - }, - "async-each": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/async-each/-/async-each-1.0.3.tgz", - "integrity": "sha512-z/WhQ5FPySLdvREByI2vZiTWwCnF0moMJ1hK9YQwDTHKh6I7/uSckMetoRGb5UBZPC1z0jlw+n/XCgjeH7y1AQ==", - "dev": true - }, - "async-limiter": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/async-limiter/-/async-limiter-1.0.1.tgz", - "integrity": "sha512-csOlWGAcRFJaI6m+F2WKdnMKr4HhdhFVBk0H/QbJFMCr+uO2kwohwXQPxw/9OCxp05r5ghVBFSyioixx3gfkNQ==" - }, - "asynckit": { - "version": "0.4.0", - "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz", - "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k=" - }, - "atob": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/atob/-/atob-2.1.2.tgz", - "integrity": "sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==", - "dev": true - }, - "autoprefixer": { - "version": "9.6.1", - "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-9.6.1.tgz", - "integrity": "sha512-aVo5WxR3VyvyJxcJC3h4FKfwCQvQWb1tSI5VHNibddCVWrcD1NvlxEweg3TSgiPztMnWfjpy2FURKA2kvDE+Tw==", - "dev": true, - "requires": { - "browserslist": "^4.6.3", - "caniuse-lite": "^1.0.30000980", - "chalk": "^2.4.2", - "normalize-range": "^0.1.2", - "num2fraction": "^1.2.2", - "postcss": "^7.0.17", - "postcss-value-parser": "^4.0.0" - } - }, - "aws-sdk": { - "version": "2.515.0", - "resolved": "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.515.0.tgz", - "integrity": "sha512-ek/mSJIjJEQpUJTyl9uFw+mENcpTb/InThEKiDKBYoCSvJVPbkxcke9GYvb+1nyL0B+WJbPmboFpFm6r06pjrg==", - "requires": { - "buffer": "4.9.1", - "events": "1.1.1", - "ieee754": "1.1.8", - "jmespath": "0.15.0", - "querystring": "0.2.0", - "sax": "1.2.1", - "url": "0.10.3", - "uuid": "3.3.2", - "xml2js": "0.4.19" - }, - "dependencies": { - "url": { - "version": "0.10.3", - "resolved": "https://registry.npmjs.org/url/-/url-0.10.3.tgz", - "integrity": "sha1-Ah5NnHcF8hu/N9A861h2dAJ3TGQ=", - "requires": { - "punycode": "1.3.2", - "querystring": "0.2.0" - } - }, - "uuid": { - "version": "3.3.2", - "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.3.2.tgz", - "integrity": "sha512-yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA==" - } - } - }, - "aws-sdk-mock": { - "version": "4.5.0", - "resolved": "https://registry.npmjs.org/aws-sdk-mock/-/aws-sdk-mock-4.5.0.tgz", - "integrity": "sha512-PAZKbQsdaVVoMr1JZbi04FUrkxCK16qnwBWLm4keeBrEfqYab/cFNsn5IVp/ThdMQpJGYHnmqUPyFq1plKaHZg==", - "dev": true, - "requires": { - "aws-sdk": "^2.483.0", - "sinon": "^7.3.2", - "traverse": "^0.6.6" - } - }, - "aws-sign2": { - "version": "0.7.0", - "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz", - "integrity": "sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg=" - }, - "aws4": { - "version": "1.8.0", - "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.8.0.tgz", - "integrity": "sha512-ReZxvNHIOv88FlT7rxcXIIC0fPt4KZqZbOlivyWtXLt8ESx84zd3kMC6iK5jVeS2qt+g7ftS7ye4fi06X5rtRQ==" - }, - "axios": { - "version": "0.19.0", - "resolved": "https://registry.npmjs.org/axios/-/axios-0.19.0.tgz", - "integrity": "sha512-1uvKqKQta3KBxIz14F2v06AEHZ/dIoeKfbTRkK1E5oqjDnuEerLmYTgJB5AiQZHJcljpg1TuRzdjDR06qNk0DQ==", - "requires": { - "follow-redirects": "1.5.10", - "is-buffer": "^2.0.2" - } - }, - "axobject-query": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/axobject-query/-/axobject-query-2.0.2.tgz", - "integrity": "sha512-MCeek8ZH7hKyO1rWUbKNQBbl4l2eY0ntk7OGi+q0RlafrCnfPxC06WZA+uebCfmYp4mNU9jRBP1AhGyf8+W3ww==", - "dev": true, - "requires": { - "ast-types-flow": "0.0.7" - } - }, - "babel-code-frame": { - "version": "6.26.0", - "resolved": "https://registry.npmjs.org/babel-code-frame/-/babel-code-frame-6.26.0.tgz", - "integrity": "sha1-Y/1D99weO7fONZR9uP42mj9Yx0s=", - "dev": true, - "requires": { - "chalk": "^1.1.3", - "esutils": "^2.0.2", - "js-tokens": "^3.0.2" - }, - "dependencies": { - "ansi-regex": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz", - "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=", - "dev": true - }, - "ansi-styles": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz", - "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=", - "dev": true - }, - "chalk": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz", - "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=", - "dev": true, - "requires": { - "ansi-styles": "^2.2.1", - "escape-string-regexp": "^1.0.2", - "has-ansi": "^2.0.0", - "strip-ansi": "^3.0.0", - "supports-color": "^2.0.0" - } - }, - "strip-ansi": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz", - "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=", - "dev": true, - "requires": { - "ansi-regex": "^2.0.0" - } - }, - "supports-color": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz", - "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=", - "dev": true - } - } - }, - "babel-generator": { - "version": "6.26.1", - "resolved": "https://registry.npmjs.org/babel-generator/-/babel-generator-6.26.1.tgz", - "integrity": "sha512-HyfwY6ApZj7BYTcJURpM5tznulaBvyio7/0d4zFOeMPUmfxkCjHocCuoLa2SAGzBI8AREcH3eP3758F672DppA==", - "dev": true, - "requires": { - "babel-messages": "^6.23.0", - "babel-runtime": "^6.26.0", - "babel-types": "^6.26.0", - "detect-indent": "^4.0.0", - "jsesc": "^1.3.0", - "lodash": "^4.17.4", - "source-map": "^0.5.7", - "trim-right": "^1.0.1" - }, - "dependencies": { - "source-map": { - "version": "0.5.7", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz", - "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=", - "dev": true - } - } - }, - "babel-messages": { - "version": "6.23.0", - "resolved": "https://registry.npmjs.org/babel-messages/-/babel-messages-6.23.0.tgz", - "integrity": "sha1-8830cDhYA1sqKVHG7F7fbGLyYw4=", - "dev": true, - "requires": { - "babel-runtime": "^6.22.0" - } - }, - "babel-runtime": { - "version": "6.26.0", - "resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.26.0.tgz", - "integrity": "sha1-llxwWGaOgrVde/4E/yM3vItWR/4=", - "dev": true, - "requires": { - "core-js": "^2.4.0", - "regenerator-runtime": "^0.11.0" - } - }, - "babel-template": { - "version": "6.26.0", - "resolved": "https://registry.npmjs.org/babel-template/-/babel-template-6.26.0.tgz", - "integrity": "sha1-3gPi0WOWsGn0bdn/+FIfsaDjXgI=", - "dev": true, - "requires": { - "babel-runtime": "^6.26.0", - "babel-traverse": "^6.26.0", - "babel-types": "^6.26.0", - "babylon": "^6.18.0", - "lodash": "^4.17.4" - } - }, - "babel-traverse": { - "version": "6.26.0", - "resolved": "https://registry.npmjs.org/babel-traverse/-/babel-traverse-6.26.0.tgz", - "integrity": "sha1-RqnL1+3MYsjlwGTi0tjQ9ANXZu4=", - "dev": true, - "requires": { - "babel-code-frame": "^6.26.0", - "babel-messages": "^6.23.0", - "babel-runtime": "^6.26.0", - "babel-types": "^6.26.0", - "babylon": "^6.18.0", - "debug": "^2.6.8", - "globals": "^9.18.0", - "invariant": "^2.2.2", - "lodash": "^4.17.4" - }, - "dependencies": { - "debug": { - "version": "2.6.9", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", - "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", - "dev": true, - "requires": { - "ms": "2.0.0" - } - } - } - }, - "babel-types": { - "version": "6.26.0", - "resolved": "https://registry.npmjs.org/babel-types/-/babel-types-6.26.0.tgz", - "integrity": "sha1-o7Bz+Uq0nrb6Vc1lInozQ4BjJJc=", - "dev": true, - "requires": { - "babel-runtime": "^6.26.0", - "esutils": "^2.0.2", - "lodash": "^4.17.4", - "to-fast-properties": "^1.0.3" - } - }, - "babylon": { - "version": "6.18.0", - "resolved": "https://registry.npmjs.org/babylon/-/babylon-6.18.0.tgz", - "integrity": "sha512-q/UEjfGJ2Cm3oKV71DJz9d25TPnq5rhBVL2Q4fA5wcC3jcrdn7+SssEybFIxwAvvP+YCsCYNKughoF33GxgycQ==", - "dev": true - }, - "backo2": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/backo2/-/backo2-1.0.2.tgz", - "integrity": "sha1-MasayLEpNjRj41s+u2n038+6eUc=", - "dev": true - }, - "balanced-match": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz", - "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=" - }, - "base": { - "version": "0.11.2", - "resolved": "https://registry.npmjs.org/base/-/base-0.11.2.tgz", - "integrity": "sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg==", - "dev": true, - "requires": { - "cache-base": "^1.0.1", - "class-utils": "^0.3.5", - "component-emitter": "^1.2.1", - "define-property": "^1.0.0", - "isobject": "^3.0.1", - "mixin-deep": "^1.2.0", - "pascalcase": "^0.1.1" - }, - "dependencies": { - "define-property": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz", - "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=", - "dev": true, - "requires": { - "is-descriptor": "^1.0.0" - } - }, - "is-accessor-descriptor": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz", - "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==", - "dev": true, - "requires": { - "kind-of": "^6.0.0" - } - }, - "is-data-descriptor": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz", - "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==", - "dev": true, - "requires": { - "kind-of": "^6.0.0" - } - }, - "is-descriptor": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz", - "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==", - "dev": true, - "requires": { - "is-accessor-descriptor": "^1.0.0", - "is-data-descriptor": "^1.0.0", - "kind-of": "^6.0.2" - } - }, - "kind-of": { - "version": "6.0.2", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz", - "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==", - "dev": true - } - } - }, - "base64-arraybuffer": { - "version": "0.1.5", - "resolved": "https://registry.npmjs.org/base64-arraybuffer/-/base64-arraybuffer-0.1.5.tgz", - "integrity": "sha1-c5JncZI7Whl0etZmqlzUv5xunOg=", - "dev": true - }, - "base64-js": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.3.1.tgz", - "integrity": "sha512-mLQ4i2QO1ytvGWFWmcngKO//JXAQueZvwEKtjgQFM4jIK0kU+ytMfplL8j+n5mspOfjHwoAg+9yhb7BwAHm36g==" - }, - "base64id": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/base64id/-/base64id-1.0.0.tgz", - "integrity": "sha1-R2iMuZu2gE8OBtPnY7HDLlfY5rY=", - "dev": true - }, - "basic-auth": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/basic-auth/-/basic-auth-2.0.1.tgz", - "integrity": "sha512-NF+epuEdnUYVlGuhaxbbq+dvJttwLnGY+YixlXlME5KpQ5W3CnXA5cVTneY3SPbPDRkcjMbifrwmFYcClgOZeg==", - "requires": { - "safe-buffer": "5.1.2" - }, - "dependencies": { - "safe-buffer": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", - "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==" - } - } - }, - "batch": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/batch/-/batch-0.6.1.tgz", - "integrity": "sha1-3DQxT05nkxgJP8dgJyUl+UvyXBY=", - "dev": true - }, - "bcrypt-nodejs": { - "version": "0.0.3", - "resolved": "https://registry.npmjs.org/bcrypt-nodejs/-/bcrypt-nodejs-0.0.3.tgz", - "integrity": "sha1-xgkX8m3CNWYVZsaBBhwwPCsohCs=" - }, - "bcrypt-pbkdf": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz", - "integrity": "sha1-pDAdOJtqQ/m2f/PKEaP2Y342Dp4=", - "requires": { - "tweetnacl": "^0.14.3" - } - }, - "better-assert": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/better-assert/-/better-assert-1.0.2.tgz", - "integrity": "sha1-QIZrnhueC1W0gYlDEeaPr/rrxSI=", - "dev": true, - "requires": { - "callsite": "1.0.0" - } - }, - "big.js": { - "version": "5.2.2", - "resolved": "https://registry.npmjs.org/big.js/-/big.js-5.2.2.tgz", - "integrity": "sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==", - "dev": true - }, - "binary-extensions": { - "version": "1.13.1", - "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.13.1.tgz", - "integrity": "sha512-Un7MIEDdUC5gNpcGDV97op1Ywk748MpHcFTHoYs6qnj1Z3j7I53VG3nwZhKzoBZmbdRNnb6WRdFlwl7tSDuZGw==", - "dev": true - }, - "bintrees": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/bintrees/-/bintrees-1.0.1.tgz", - "integrity": "sha1-DmVcm5wkNeqraL9AJyJtK1WjRSQ=" - }, - "blob": { - "version": "0.0.5", - "resolved": "https://registry.npmjs.org/blob/-/blob-0.0.5.tgz", - "integrity": "sha512-gaqbzQPqOoamawKg0LGVd7SzLgXS+JH61oWprSLH+P+abTczqJbhTR8CmJ2u9/bUYNmHTGJx/UEmn6doAvvuig==", - "dev": true - }, - "blocking-proxy": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/blocking-proxy/-/blocking-proxy-1.0.1.tgz", - "integrity": "sha512-KE8NFMZr3mN2E0HcvCgRtX7DjhiIQrwle+nSVJVC/yqFb9+xznHl2ZcoBp2L9qzkI4t4cBFJ1efXF8Dwi132RA==", - "dev": true, - "requires": { - "minimist": "^1.2.0" - }, - "dependencies": { - "minimist": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", - "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=", - "dev": true - } - } - }, - "bluebird": { - "version": "3.5.5", - "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.5.5.tgz", - "integrity": "sha512-5am6HnnfN+urzt4yfg7IgTbotDjIT/u8AJpEt0sIU9FtXfVeezXAPKswrG+xKUCOYAINpSdgZVDU6QFh+cuH3w==" - }, - "bn.js": { - "version": "4.11.8", - "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.8.tgz", - "integrity": "sha512-ItfYfPLkWHUjckQCk8xC+LwxgK8NYcXywGigJgSwOP8Y2iyWT4f2vsZnoOXTTbo+o5yXmIUJ4gn5538SO5S3gA==", - "dev": true - }, - "body-parser": { - "version": "1.19.0", - "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.19.0.tgz", - "integrity": "sha512-dhEPs72UPbDnAQJ9ZKMNTP6ptJaionhP5cBb541nXPlW60Jepo9RV/a4fX4XWW9CuFNK22krhrj1+rgzifNCsw==", - "dev": true, - "requires": { - "bytes": "3.1.0", - "content-type": "~1.0.4", - "debug": "2.6.9", - "depd": "~1.1.2", - "http-errors": "1.7.2", - "iconv-lite": "0.4.24", - "on-finished": "~2.3.0", - "qs": "6.7.0", - "raw-body": "2.4.0", - "type-is": "~1.6.17" - }, - "dependencies": { - "debug": { - "version": "2.6.9", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", - "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", + }, + "fs.realpath": { + "version": "1.0.0", + "bundled": true, + "dev": true, + "optional": true + }, + "gauge": { + "version": "2.7.4", + "bundled": true, + "dev": true, + "optional": true, + "requires": { + "aproba": "^1.0.3", + "console-control-strings": "^1.0.0", + "has-unicode": "^2.0.0", + "object-assign": "^4.1.0", + "signal-exit": "^3.0.0", + "string-width": "^1.0.1", + "strip-ansi": "^3.0.1", + "wide-align": "^1.1.0" + } + }, + "glob": { + "version": "7.1.6", + "bundled": true, + "dev": true, + "optional": true, + "requires": { + "fs.realpath": "^1.0.0", + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "^3.0.4", + "once": "^1.3.0", + "path-is-absolute": "^1.0.0" + } + }, + "has-unicode": { + "version": "2.0.1", + "bundled": true, + "dev": true, + "optional": true + }, + "iconv-lite": { + "version": "0.4.24", + "bundled": true, + "dev": true, + "optional": true, + "requires": { + "safer-buffer": ">= 2.1.2 < 3" + } + }, + "ignore-walk": { + "version": "3.0.3", + "bundled": true, + "dev": true, + "optional": true, + "requires": { + "minimatch": "^3.0.4" + } + }, + "inflight": { + "version": "1.0.6", + "bundled": true, + "dev": true, + "optional": true, + "requires": { + "once": "^1.3.0", + "wrappy": "1" + } + }, + "inherits": { + "version": "2.0.4", + "bundled": true, + "dev": true, + "optional": true + }, + "ini": { + "version": "1.3.5", + "bundled": true, + "dev": true, + "optional": true + }, + "is-fullwidth-code-point": { + "version": "1.0.0", + "bundled": true, + "dev": true, + "optional": true, + "requires": { + "number-is-nan": "^1.0.0" + } + }, + "isarray": { + "version": "1.0.0", + "bundled": true, + "dev": true, + "optional": true + }, + "minimatch": { + "version": "3.0.4", + "bundled": true, + "dev": true, + "optional": true, + "requires": { + "brace-expansion": "^1.1.7" + } + }, + "minimist": { + "version": "0.0.8", + "bundled": true, + "dev": true, + "optional": true + }, + "minipass": { + "version": "2.9.0", + "bundled": true, + "dev": true, + "optional": true, + "requires": { + "safe-buffer": "^5.1.2", + "yallist": "^3.0.0" + } + }, + "minizlib": { + "version": "1.3.3", + "bundled": true, + "dev": true, + "optional": true, + "requires": { + "minipass": "^2.9.0" + } + }, + "mkdirp": { + "version": "0.5.1", + "bundled": true, + "dev": true, + "optional": true, + "requires": { + "minimist": "0.0.8" + } + }, + "ms": { + "version": "2.1.2", + "bundled": true, + "dev": true, + "optional": true + }, + "needle": { + "version": "2.4.0", + "bundled": true, + "dev": true, + "optional": true, + "requires": { + "debug": "^3.2.6", + "iconv-lite": "^0.4.4", + "sax": "^1.2.4" + } + }, + "node-pre-gyp": { + "version": "0.14.0", + "bundled": true, + "dev": true, + "optional": true, + "requires": { + "detect-libc": "^1.0.2", + "mkdirp": "^0.5.1", + "needle": "^2.2.1", + "nopt": "^4.0.1", + "npm-packlist": "^1.1.6", + "npmlog": "^4.0.2", + "rc": "^1.2.7", + "rimraf": "^2.6.1", + "semver": "^5.3.0", + "tar": "^4.4.2" + } + }, + "nopt": { + "version": "4.0.1", + "bundled": true, + "dev": true, + "optional": true, + "requires": { + "abbrev": "1", + "osenv": "^0.1.4" + } + }, + "npm-bundled": { + "version": "1.1.1", + "bundled": true, + "dev": true, + "optional": true, + "requires": { + "npm-normalize-package-bin": "^1.0.1" + } + }, + "npm-normalize-package-bin": { + "version": "1.0.1", + "bundled": true, + "dev": true, + "optional": true + }, + "npm-packlist": { + "version": "1.4.7", + "bundled": true, + "dev": true, + "optional": true, + "requires": { + "ignore-walk": "^3.0.1", + "npm-bundled": "^1.0.1" + } + }, + "npmlog": { + "version": "4.1.2", + "bundled": true, + "dev": true, + "optional": true, + "requires": { + "are-we-there-yet": "~1.1.2", + "console-control-strings": "~1.1.0", + "gauge": "~2.7.3", + "set-blocking": "~2.0.0" + } + }, + "number-is-nan": { + "version": "1.0.1", + "bundled": true, + "dev": true, + "optional": true + }, + "object-assign": { + "version": "4.1.1", + "bundled": true, + "dev": true, + "optional": true + }, + "once": { + "version": "1.4.0", + "bundled": true, + "dev": true, + "optional": true, + "requires": { + "wrappy": "1" + } + }, + "os-homedir": { + "version": "1.0.2", + "bundled": true, + "dev": true, + "optional": true + }, + "os-tmpdir": { + "version": "1.0.2", + "bundled": true, + "dev": true, + "optional": true + }, + "osenv": { + "version": "0.1.5", + "bundled": true, + "dev": true, + "optional": true, + "requires": { + "os-homedir": "^1.0.0", + "os-tmpdir": "^1.0.0" + } + }, + "path-is-absolute": { + "version": "1.0.1", + "bundled": true, + "dev": true, + "optional": true + }, + "process-nextick-args": { + "version": "2.0.1", + "bundled": true, + "dev": true, + "optional": true + }, + "rc": { + "version": "1.2.8", + "bundled": true, + "dev": true, + "optional": true, + "requires": { + "deep-extend": "^0.6.0", + "ini": "~1.3.0", + "minimist": "^1.2.0", + "strip-json-comments": "~2.0.1" + }, + "dependencies": { + "minimist": { + "version": "1.2.0", + "bundled": true, + "dev": true, + "optional": true + } + } + }, + "readable-stream": { + "version": "2.3.6", + "bundled": true, + "dev": true, + "optional": true, + "requires": { + "core-util-is": "~1.0.0", + "inherits": "~2.0.3", + "isarray": "~1.0.0", + "process-nextick-args": "~2.0.0", + "safe-buffer": "~5.1.1", + "string_decoder": "~1.1.1", + "util-deprecate": "~1.0.1" + } + }, + "rimraf": { + "version": "2.7.1", + "bundled": true, + "dev": true, + "optional": true, + "requires": { + "glob": "^7.1.3" + } + }, + "safe-buffer": { + "version": "5.1.2", + "bundled": true, + "dev": true, + "optional": true + }, + "safer-buffer": { + "version": "2.1.2", + "bundled": true, + "dev": true, + "optional": true + }, + "sax": { + "version": "1.2.4", + "bundled": true, + "dev": true, + "optional": true + }, + "semver": { + "version": "5.7.1", + "bundled": true, + "dev": true, + "optional": true + }, + "set-blocking": { + "version": "2.0.0", + "bundled": true, + "dev": true, + "optional": true + }, + "signal-exit": { + "version": "3.0.2", + "bundled": true, + "dev": true, + "optional": true + }, + "string-width": { + "version": "1.0.2", + "bundled": true, + "dev": true, + "optional": true, + "requires": { + "code-point-at": "^1.0.0", + "is-fullwidth-code-point": "^1.0.0", + "strip-ansi": "^3.0.0" + } + }, + "string_decoder": { + "version": "1.1.1", + "bundled": true, + "dev": true, + "optional": true, + "requires": { + "safe-buffer": "~5.1.0" + } + }, + "strip-ansi": { + "version": "3.0.1", + "bundled": true, + "dev": true, + "optional": true, + "requires": { + "ansi-regex": "^2.0.0" + } + }, + "strip-json-comments": { + "version": "2.0.1", + "bundled": true, + "dev": true, + "optional": true + }, + "tar": { + "version": "4.4.13", + "bundled": true, + "dev": true, + "optional": true, + "requires": { + "chownr": "^1.1.1", + "fs-minipass": "^1.2.5", + "minipass": "^2.8.6", + "minizlib": "^1.2.1", + "mkdirp": "^0.5.0", + "safe-buffer": "^5.1.2", + "yallist": "^3.0.3" + } + }, + "util-deprecate": { + "version": "1.0.2", + "bundled": true, + "dev": true, + "optional": true + }, + "wide-align": { + "version": "1.1.3", + "bundled": true, + "dev": true, + "optional": true, + "requires": { + "string-width": "^1.0.2 || 2" + } + }, + "wrappy": { + "version": "1.0.2", + "bundled": true, + "dev": true, + "optional": true + }, + "yallist": { + "version": "3.1.1", + "bundled": true, + "dev": true, + "optional": true + } + } + }, + "is-binary-path": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-1.0.1.tgz", + "integrity": "sha1-dfFmQrSA8YenEcgUFh/TpKdlWJg=", "dev": true, "requires": { - "ms": "2.0.0" + "binary-extensions": "^1.0.0" } }, - "http-errors": { - "version": "1.7.2", - "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.7.2.tgz", - "integrity": "sha512-uUQBt3H/cSIVfch6i1EuPNy/YsRSOUBXTVfZ+yR7Zjez3qjBz6i9+i4zjNaoqcoFVI4lQJ5plg63TvGfRSDCRg==", + "is-number": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz", + "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=", "dev": true, "requires": { - "depd": "~1.1.2", - "inherits": "2.0.3", - "setprototypeof": "1.1.1", - "statuses": ">= 1.5.0 < 2", - "toidentifier": "1.0.0" + "kind-of": "^3.0.2" } }, - "inherits": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz", - "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=", - "dev": true + "readdirp": { + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-2.2.1.tgz", + "integrity": "sha512-1JU/8q+VgFZyxwrJ+SVIOsh+KywWGpds3NTqikiKpDMZWScmAYyKIgqkO+ARvNWJfXeXR1zxz7aHF4u4CyH6vQ==", + "dev": true, + "requires": { + "graceful-fs": "^4.1.11", + "micromatch": "^3.1.10", + "readable-stream": "^2.0.2" + } }, - "qs": { - "version": "6.7.0", - "resolved": "https://registry.npmjs.org/qs/-/qs-6.7.0.tgz", - "integrity": "sha512-VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ==", + "source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", "dev": true }, - "raw-body": { - "version": "2.4.0", - "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.4.0.tgz", - "integrity": "sha512-4Oz8DUIwdvoa5qMJelxipzi/iJIi40O5cGV1wNYp5hvZP8ZN0T+jiNkL0QepXs+EsQ9XJ8ipEDoiH70ySUJP3Q==", + "strip-ansi": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz", + "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", "dev": true, "requires": { - "bytes": "3.1.0", - "http-errors": "1.7.2", - "iconv-lite": "0.4.24", - "unpipe": "1.0.0" + "ansi-regex": "^3.0.0" } - } - } - }, - "bonjour": { - "version": "3.5.0", - "resolved": "https://registry.npmjs.org/bonjour/-/bonjour-3.5.0.tgz", - "integrity": "sha1-jokKGD2O6aI5OzhExpGkK897yfU=", - "dev": true, - "requires": { - "array-flatten": "^2.1.0", - "deep-equal": "^1.0.1", - "dns-equal": "^1.0.0", - "dns-txt": "^2.0.2", - "multicast-dns": "^6.0.1", - "multicast-dns-service-types": "^1.1.0" - } - }, - "boxen": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/boxen/-/boxen-1.3.0.tgz", - "integrity": "sha512-TNPjfTr432qx7yOjQyaXm3dSR0MH9vXp7eT1BFSl/C51g+EFnOR9hTg1IreahGBmDNCehscshe45f+C1TBZbLw==", - "dev": true, - "requires": { - "ansi-align": "^2.0.0", - "camelcase": "^4.0.0", - "chalk": "^2.0.1", - "cli-boxes": "^1.0.0", - "string-width": "^2.0.0", - "term-size": "^1.2.0", - "widest-line": "^2.0.0" - }, - "dependencies": { - "ansi-regex": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz", - "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=", - "dev": true - }, - "camelcase": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-4.1.0.tgz", - "integrity": "sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0=", - "dev": true }, - "string-width": { + "to-regex-range": { "version": "2.1.1", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz", - "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==", + "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz", + "integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=", "dev": true, "requires": { - "is-fullwidth-code-point": "^2.0.0", - "strip-ansi": "^4.0.0" + "is-number": "^3.0.0", + "repeat-string": "^1.6.1" + } + }, + "wrap-ansi": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz", + "integrity": "sha1-2Pw9KE3QV5T+hJc8rs3Rz4JP3YU=", + "dev": true, + "requires": { + "string-width": "^1.0.1", + "strip-ansi": "^3.0.1" + }, + "dependencies": { + "ansi-regex": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz", + "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=", + "dev": true + }, + "is-fullwidth-code-point": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz", + "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=", + "dev": true, + "requires": { + "number-is-nan": "^1.0.0" + } + }, + "string-width": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz", + "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=", + "dev": true, + "requires": { + "code-point-at": "^1.0.0", + "is-fullwidth-code-point": "^1.0.0", + "strip-ansi": "^3.0.0" + } + }, + "strip-ansi": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz", + "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=", + "dev": true, + "requires": { + "ansi-regex": "^2.0.0" + } + } + } + }, + "yargs": { + "version": "13.1.0", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-13.1.0.tgz", + "integrity": "sha512-1UhJbXfzHiPqkfXNHYhiz79qM/kZqjTE8yGlEjZa85Q+3+OwcV6NRkV7XOV1W2Eom2bzILeUn55pQYffjVOLAg==", + "dev": true, + "requires": { + "cliui": "^4.0.0", + "find-up": "^3.0.0", + "get-caller-file": "^2.0.1", + "os-locale": "^3.1.0", + "require-directory": "^2.1.1", + "require-main-filename": "^2.0.0", + "set-blocking": "^2.0.0", + "string-width": "^3.0.0", + "which-module": "^2.0.0", + "y18n": "^4.0.0", + "yargs-parser": "^13.0.0" } }, - "strip-ansi": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz", - "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", + "yargs-parser": { + "version": "13.1.1", + "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-13.1.1.tgz", + "integrity": "sha512-oVAVsHz6uFrg3XQheFII8ESO2ssAf9luWuAd6Wexsu4F3OtIW0o8IribPXYrD4WC24LWtPrJlGy87y5udK+dxQ==", "dev": true, "requires": { - "ansi-regex": "^3.0.0" + "camelcase": "^5.0.0", + "decamelize": "^1.2.0" } } } }, - "brace-expansion": { - "version": "1.1.11", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", - "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", + "@angular/core": { + "version": "8.2.14", + "resolved": "https://registry.npmjs.org/@angular/core/-/core-8.2.14.tgz", + "integrity": "sha512-zeePkigi+hPh3rN7yoNENG/YUBUsIvUXdxx+AZq+QPaFeKEA2FBSrKn36ojHFrdJUjKzl0lPMEiGC2b6a6bo6g==", "requires": { - "balanced-match": "^1.0.0", - "concat-map": "0.0.1" + "tslib": "^1.9.0" } }, - "braces": { - "version": "2.3.2", - "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz", - "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==", - "dev": true, + "@angular/forms": { + "version": "8.2.14", + "resolved": "https://registry.npmjs.org/@angular/forms/-/forms-8.2.14.tgz", + "integrity": "sha512-zhyKL3CFIqcyHJ/TQF/h1OZztK611a6rxuPHCrt/5Sn1SuBTJJQ1pPTkOYIDy6IrCrtyANc8qB6P17Mao71DNQ==", "requires": { - "arr-flatten": "^1.1.0", - "array-unique": "^0.3.2", - "extend-shallow": "^2.0.1", - "fill-range": "^4.0.0", - "isobject": "^3.0.1", - "repeat-element": "^1.1.2", - "snapdragon": "^0.8.1", - "snapdragon-node": "^2.0.1", - "split-string": "^3.0.2", - "to-regex": "^3.0.1" - }, - "dependencies": { - "extend-shallow": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", - "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", - "dev": true, - "requires": { - "is-extendable": "^0.1.0" - } - } + "tslib": "^1.9.0" } }, - "brorand": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/brorand/-/brorand-1.1.0.tgz", - "integrity": "sha1-EsJe/kCkXjwyPrhnWgoM5XsiNx8=", - "dev": true - }, - "browser-process-hrtime": { - "version": "0.1.3", - "resolved": "https://registry.npmjs.org/browser-process-hrtime/-/browser-process-hrtime-0.1.3.tgz", - "integrity": "sha512-bRFnI4NnjO6cnyLmOV/7PVoDEMJChlcfN0z4s1YMBY989/SvlfMI1lgCnkFUs53e9gQF+w7qu7XdllSTiSl8Aw==" - }, - "browser-stdout": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/browser-stdout/-/browser-stdout-1.3.1.tgz", - "integrity": "sha512-qhAVI1+Av2X7qelOfAIYwXONood6XlZE/fXaBSmW/T5SzLAmCgzi+eiWE7fUvbHaeNBQH13UftjpXxsfLkMpgw==", + "@angular/language-service": { + "version": "8.2.14", + "resolved": "https://registry.npmjs.org/@angular/language-service/-/language-service-8.2.14.tgz", + "integrity": "sha512-7EhN9JJbAJcH2xCa+rIOmekjiEuB0qwPdHuD5qn/wwMfRzMZo+Db4hHbR9KHrLH6H82PTwYKye/LLpDaZqoHOA==", "dev": true }, - "browserify-aes": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/browserify-aes/-/browserify-aes-1.2.0.tgz", - "integrity": "sha512-+7CHXqGuspUn/Sl5aO7Ea0xWGAtETPXNSAjHo48JfLdPWcMng33Xe4znFvQweqc/uzk5zSOI3H52CYnjCfb5hA==", - "dev": true, + "@angular/platform-browser": { + "version": "8.2.14", + "resolved": "https://registry.npmjs.org/@angular/platform-browser/-/platform-browser-8.2.14.tgz", + "integrity": "sha512-MtJptptyKzsE37JZ2VB/tI4cvMrdAH+cT9pMBYZd66YSZfKjIj5s+AZo7z8ncoskQSB1o3HMfDjSK7QXGx1mLQ==", "requires": { - "buffer-xor": "^1.0.3", - "cipher-base": "^1.0.0", - "create-hash": "^1.1.0", - "evp_bytestokey": "^1.0.3", - "inherits": "^2.0.1", - "safe-buffer": "^5.0.1" + "tslib": "^1.9.0" } }, - "browserify-cipher": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/browserify-cipher/-/browserify-cipher-1.0.1.tgz", - "integrity": "sha512-sPhkz0ARKbf4rRQt2hTpAHqn47X3llLkUGn+xEJzLjwY8LRs2p0v7ljvI5EyoRO/mexrNunNECisZs+gw2zz1w==", - "dev": true, + "@angular/platform-browser-dynamic": { + "version": "8.2.14", + "resolved": "https://registry.npmjs.org/@angular/platform-browser-dynamic/-/platform-browser-dynamic-8.2.14.tgz", + "integrity": "sha512-mO2JPR5kLU/A3AQngy9+R/Q5gaF9csMStBQjwsCRI0wNtlItOIGL6+wTYpiTuh/ux+WVN1F2sLcEYU4Zf1ud9A==", "requires": { - "browserify-aes": "^1.0.4", - "browserify-des": "^1.0.0", - "evp_bytestokey": "^1.0.0" + "tslib": "^1.9.0" } }, - "browserify-des": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/browserify-des/-/browserify-des-1.0.2.tgz", - "integrity": "sha512-BioO1xf3hFwz4kc6iBhI3ieDFompMhrMlnDFC4/0/vd5MokpuAc3R+LYbwTA9A5Yc9pq9UYPqffKpW2ObuwX5A==", - "dev": true, + "@angular/router": { + "version": "8.2.14", + "resolved": "https://registry.npmjs.org/@angular/router/-/router-8.2.14.tgz", + "integrity": "sha512-DHA2BhODqV7F0g6ZKgFaZgbsqzHHWRcfWchCOrOVKu2rYiKUTwwHVLBgZAhrpNeinq2pWanVYSIhMr7wy+LfEA==", "requires": { - "cipher-base": "^1.0.1", - "des.js": "^1.0.0", - "inherits": "^2.0.1", - "safe-buffer": "^5.1.2" + "tslib": "^1.9.0" } }, - "browserify-rsa": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.0.1.tgz", - "integrity": "sha1-IeCr+vbyApzy+vsTNWenAdQTVSQ=", - "dev": true, + "@auth0/angular-jwt": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/@auth0/angular-jwt/-/angular-jwt-3.0.1.tgz", + "integrity": "sha512-hfWfgbpgtcvyU/agNxQ6cBk81mmASiNxQeZ6xn/3zJo8uLFHk2eQIy2yt2ztktcOQ6V2uc6GlKLRKjVIgyc1Sw==", "requires": { - "bn.js": "^4.1.0", - "randombytes": "^2.0.1" + "url": "^0.11.0" } }, - "browserify-sign": { - "version": "4.0.4", - "resolved": "https://registry.npmjs.org/browserify-sign/-/browserify-sign-4.0.4.tgz", - "integrity": "sha1-qk62jl17ZYuqa/alfmMMvXqT0pg=", + "@babel/code-frame": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.8.3.tgz", + "integrity": "sha512-a9gxpmdXtZEInkCSHUJDLHZVBgb1QS0jhss4cPP93EW7s+uC5bikET2twEF3KV+7rDblJcmNvTR7VJejqd2C2g==", "dev": true, "requires": { - "bn.js": "^4.1.1", - "browserify-rsa": "^4.0.0", - "create-hash": "^1.1.0", - "create-hmac": "^1.1.2", - "elliptic": "^6.0.0", - "inherits": "^2.0.1", - "parse-asn1": "^5.0.0" + "@babel/highlight": "^7.8.3" } }, - "browserify-zlib": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/browserify-zlib/-/browserify-zlib-0.2.0.tgz", - "integrity": "sha512-Z942RysHXmJrhqk88FmKBVq/v5tqmSkDz7p54G/MGyjMnCFFnC79XWNbg+Vta8W6Wb2qtSZTSxIGkJrRpCFEiA==", + "@babel/generator": { + "version": "7.8.4", + "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.8.4.tgz", + "integrity": "sha512-PwhclGdRpNAf3IxZb0YVuITPZmmrXz9zf6fH8lT4XbrmfQKr6ryBzhv593P5C6poJRciFCL/eHGW2NuGrgEyxA==", "dev": true, "requires": { - "pako": "~1.0.5" + "@babel/types": "^7.8.3", + "jsesc": "^2.5.1", + "lodash": "^4.17.13", + "source-map": "^0.5.0" + }, + "dependencies": { + "jsesc": { + "version": "2.5.2", + "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz", + "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==", + "dev": true + }, + "source-map": { + "version": "0.5.7", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz", + "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=", + "dev": true + } } }, - "browserslist": { - "version": "4.6.6", - "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.6.6.tgz", - "integrity": "sha512-D2Nk3W9JL9Fp/gIcWei8LrERCS+eXu9AM5cfXA8WEZ84lFks+ARnZ0q/R69m2SV3Wjma83QDDPxsNKXUwdIsyA==", + "@babel/helper-function-name": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.8.3.tgz", + "integrity": "sha512-BCxgX1BC2hD/oBlIFUgOCQDOPV8nSINxCwM3o93xP4P9Fq6aV5sgv2cOOITDMtCfQ+3PvHp3l689XZvAM9QyOA==", "dev": true, "requires": { - "caniuse-lite": "^1.0.30000984", - "electron-to-chromium": "^1.3.191", - "node-releases": "^1.1.25" + "@babel/helper-get-function-arity": "^7.8.3", + "@babel/template": "^7.8.3", + "@babel/types": "^7.8.3" } }, - "browserstack": { - "version": "1.5.2", - "resolved": "https://registry.npmjs.org/browserstack/-/browserstack-1.5.2.tgz", - "integrity": "sha512-+6AFt9HzhKykcPF79W6yjEUJcdvZOV0lIXdkORXMJftGrDl0OKWqRF4GHqpDNkxiceDT/uB7Fb/aDwktvXX7dg==", + "@babel/helper-get-function-arity": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.8.3.tgz", + "integrity": "sha512-FVDR+Gd9iLjUMY1fzE2SR0IuaJToR4RkCDARVfsBBPSP53GEqSFjD8gNyxg246VUyc/ALRxFaAK8rVG7UT7xRA==", "dev": true, "requires": { - "https-proxy-agent": "^2.2.1" + "@babel/types": "^7.8.3" } }, - "buffer": { - "version": "4.9.1", - "resolved": "https://registry.npmjs.org/buffer/-/buffer-4.9.1.tgz", - "integrity": "sha1-bRu2AbB6TvztlwlBMgkwJ8lbwpg=", + "@babel/helper-split-export-declaration": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.8.3.tgz", + "integrity": "sha512-3x3yOeyBhW851hroze7ElzdkeRXQYQbFIb7gLK1WQYsw2GWDay5gAJNw1sWJ0VFP6z5J1whqeXH/WCdCjZv6dA==", + "dev": true, "requires": { - "base64-js": "^1.0.2", - "ieee754": "^1.1.4", - "isarray": "^1.0.0" + "@babel/types": "^7.8.3" } }, - "buffer-alloc": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/buffer-alloc/-/buffer-alloc-1.2.0.tgz", - "integrity": "sha512-CFsHQgjtW1UChdXgbyJGtnm+O/uLQeZdtbDo8mfUgYXCHSM1wgrVxXm6bSyrUuErEb+4sYVGCzASBRot7zyrow==", + "@babel/highlight": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.8.3.tgz", + "integrity": "sha512-PX4y5xQUvy0fnEVHrYOarRPXVWafSjTW9T0Hab8gVIawpl2Sj0ORyrygANq+KjcNlSSTw0YCLSNA8OyZ1I4yEg==", "dev": true, "requires": { - "buffer-alloc-unsafe": "^1.1.0", - "buffer-fill": "^1.0.0" + "chalk": "^2.0.0", + "esutils": "^2.0.2", + "js-tokens": "^4.0.0" + }, + "dependencies": { + "js-tokens": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", + "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==", + "dev": true + } } - }, - "buffer-alloc-unsafe": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/buffer-alloc-unsafe/-/buffer-alloc-unsafe-1.1.0.tgz", - "integrity": "sha512-TEM2iMIEQdJ2yjPJoSIsldnleVaAk1oW3DBVUykyOLsEsFmEc9kn+SFFPz+gl54KQNxlDnAwCXosOS9Okx2xAg==", - "dev": true - }, - "buffer-equal-constant-time": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/buffer-equal-constant-time/-/buffer-equal-constant-time-1.0.1.tgz", - "integrity": "sha1-+OcRMvf/5uAaXJaXpMbz5I1cyBk=" - }, - "buffer-fill": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/buffer-fill/-/buffer-fill-1.0.0.tgz", - "integrity": "sha1-+PeLdniYiO858gXNY39o5wISKyw=", - "dev": true - }, - "buffer-from": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.1.tgz", - "integrity": "sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A==", - "dev": true - }, - "buffer-indexof": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/buffer-indexof/-/buffer-indexof-1.1.1.tgz", - "integrity": "sha512-4/rOEg86jivtPTeOUUT61jJO1Ya1TrR/OkqCSZDyq84WJh3LuuiphBYJN+fm5xufIk4XAFcEwte/8WzC8If/1g==", - "dev": true - }, - "buffer-writer": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/buffer-writer/-/buffer-writer-2.0.0.tgz", - "integrity": "sha512-a7ZpuTZU1TRtnwyCNW3I5dc0wWNC3VR9S++Ewyk2HHZdrO3CQJqSpd+95Us590V6AL7JqUAH2IwZ/398PmNFgw==" - }, - "buffer-xor": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/buffer-xor/-/buffer-xor-1.0.3.tgz", - "integrity": "sha1-JuYe0UIvtw3ULm42cp7VHYVf6Nk=", - "dev": true - }, - "builtin-modules": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-1.1.1.tgz", - "integrity": "sha1-Jw8HbFpywC9bZaR9+Uxf46J4iS8=", - "dev": true - }, - "builtin-status-codes": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz", - "integrity": "sha1-hZgoeOIbmOHGZCXgPQF0eI9Wnug=", - "dev": true - }, - "builtins": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/builtins/-/builtins-1.0.3.tgz", - "integrity": "sha1-y5T662HIaWRR2zZTThQi+U8K7og=", - "dev": true - }, - "bytes": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.0.tgz", - "integrity": "sha512-zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg==" - }, - "c8": { - "version": "3.5.0", - "resolved": "https://registry.npmjs.org/c8/-/c8-3.5.0.tgz", - "integrity": "sha512-51eNphsa3rbMnCsvDLE3kqwYt9VPQGsKstc91SRTsmbc/AE5T5c9SSDasCcSQCOw5BQE3imLqOagOU1NcGyDjA==", - "requires": { - "@bcoe/v8-coverage": "^0.1.0", - "find-up": "^3.0.0", - "foreground-child": "^1.5.6", - "furi": "^1.3.0", - "istanbul-lib-coverage": "^2.0.1", - "istanbul-lib-report": "^2.0.1", - "istanbul-reports": "^2.0.0", - "rimraf": "^2.6.2", - "test-exclude": "^5.0.0", - "uuid": "^3.3.2", - "v8-to-istanbul": "^2.0.4", - "yargs": "^13.1.0", - "yargs-parser": "^10.1.0" + }, + "@babel/parser": { + "version": "7.8.4", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.8.4.tgz", + "integrity": "sha512-0fKu/QqildpXmPVaRBoXOlyBb3MC+J0A66x97qEfLOMkn3u6nfY5esWogQwi/K0BjASYy4DbnsEWnpNL6qT5Mw==", + "dev": true + }, + "@babel/template": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.8.3.tgz", + "integrity": "sha512-04m87AcQgAFdvuoyiQ2kgELr2tV8B4fP/xJAVUL3Yb3bkNdMedD3d0rlSQr3PegP0cms3eHjl1F7PWlvWbU8FQ==", + "dev": true, + "requires": { + "@babel/code-frame": "^7.8.3", + "@babel/parser": "^7.8.3", + "@babel/types": "^7.8.3" } }, - "cacache": { - "version": "11.3.3", - "resolved": "https://registry.npmjs.org/cacache/-/cacache-11.3.3.tgz", - "integrity": "sha512-p8WcneCytvzPxhDvYp31PD039vi77I12W+/KfR9S8AZbaiARFBCpsPJS+9uhWfeBfeAtW7o/4vt3MUqLkbY6nA==", + "@babel/traverse": { + "version": "7.8.4", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.8.4.tgz", + "integrity": "sha512-NGLJPZwnVEyBPLI+bl9y9aSnxMhsKz42so7ApAv9D+b4vAFPpY013FTS9LdKxcABoIYFU52HcYga1pPlx454mg==", "dev": true, "requires": { - "bluebird": "^3.5.5", - "chownr": "^1.1.1", - "figgy-pudding": "^3.5.1", - "glob": "^7.1.4", - "graceful-fs": "^4.1.15", - "lru-cache": "^5.1.1", - "mississippi": "^3.0.0", - "mkdirp": "^0.5.1", - "move-concurrently": "^1.0.1", - "promise-inflight": "^1.0.1", - "rimraf": "^2.6.3", - "ssri": "^6.0.1", - "unique-filename": "^1.1.1", - "y18n": "^4.0.0" + "@babel/code-frame": "^7.8.3", + "@babel/generator": "^7.8.4", + "@babel/helper-function-name": "^7.8.3", + "@babel/helper-split-export-declaration": "^7.8.3", + "@babel/parser": "^7.8.4", + "@babel/types": "^7.8.3", + "debug": "^4.1.0", + "globals": "^11.1.0", + "lodash": "^4.17.13" }, "dependencies": { - "lru-cache": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz", - "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==", + "debug": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz", + "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==", "dev": true, "requires": { - "yallist": "^3.0.2" + "ms": "^2.1.1" } }, - "yallist": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.0.3.tgz", - "integrity": "sha512-S+Zk8DEWE6oKpV+vI3qWkaK+jSbIK86pCwe2IF/xwIpQ8jEuxpw9NyaGjmp9+BoJv5FV2piqCDcoCtStppiq2A==", + "globals": { + "version": "11.12.0", + "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz", + "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==", + "dev": true + }, + "ms": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", + "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", "dev": true } } }, - "cache-base": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/cache-base/-/cache-base-1.0.1.tgz", - "integrity": "sha512-AKcdTnFSWATd5/GCPRxr2ChwIJ85CeyrEyjRHlKxQ56d4XJMGym0uAiKn0xbLOGOl3+yRpOTi484dVCEc5AUzQ==", + "@babel/types": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.8.3.tgz", + "integrity": "sha512-jBD+G8+LWpMBBWvVcdr4QysjUE4mU/syrhN17o1u3gx0/WzJB1kwiVZAXRtWbsIPOwW8pF/YJV5+nmetPzepXg==", "dev": true, "requires": { - "collection-visit": "^1.0.0", - "component-emitter": "^1.2.1", - "get-value": "^2.0.6", - "has-value": "^1.0.0", - "isobject": "^3.0.1", - "set-value": "^2.0.0", - "to-object-path": "^0.3.0", - "union-value": "^1.0.0", - "unset-value": "^1.0.0" + "esutils": "^2.0.2", + "lodash": "^4.17.13", + "to-fast-properties": "^2.0.0" + }, + "dependencies": { + "to-fast-properties": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz", + "integrity": "sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4=", + "dev": true + } } }, - "caching-transform": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/caching-transform/-/caching-transform-3.0.2.tgz", - "integrity": "sha512-Mtgcv3lh3U0zRii/6qVgQODdPA4G3zhG+jtbCWj39RXuUFTMzH0vcdMtaJS1jPowd+It2Pqr6y3NJMQqOqCE2w==", + "@bcoe/v8-coverage": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/@bcoe/v8-coverage/-/v8-coverage-0.1.0.tgz", + "integrity": "sha512-UdVB1rSL7H8TS8674fH02p5lRbhfIqQ18YKLxLKEnHFztHUH6bhMqjebMxgSTmWVrs5raS5JSLJIKKHFT4WfPg==" + }, + "@ngtools/webpack": { + "version": "8.2.2", + "resolved": "https://registry.npmjs.org/@ngtools/webpack/-/webpack-8.2.2.tgz", + "integrity": "sha512-ksPFlZbH0+Rj+0qTGmkbtU3GHLjQKF4nN047AZn8Q4QnPynKqItHskSlyVi0CMnKfJxOr2VTxlSkiKN+pUb0sA==", "dev": true, "requires": { - "hasha": "^3.0.0", - "make-dir": "^2.0.0", - "package-hash": "^3.0.0", - "write-file-atomic": "^2.4.2" + "@angular-devkit/core": "8.2.2", + "enhanced-resolve": "4.1.0", + "rxjs": "6.4.0", + "tree-kill": "1.2.1", + "webpack-sources": "1.3.0" + }, + "dependencies": { + "rxjs": { + "version": "6.4.0", + "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.4.0.tgz", + "integrity": "sha512-Z9Yfa11F6B9Sg/BK9MnqnQ+aQYicPLtilXBp2yUtDt2JRCE0h26d33EnfO3ZxoNxG0T92OUucP3Ct7cpfkdFfw==", + "dev": true, + "requires": { + "tslib": "^1.9.0" + } + }, + "tree-kill": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/tree-kill/-/tree-kill-1.2.1.tgz", + "integrity": "sha512-4hjqbObwlh2dLyW4tcz0Ymw0ggoaVDMveUB9w8kFSQScdRLo0gxO9J7WFcUBo+W3C1TLdFIEwNOWebgZZ0RH9Q==", + "dev": true + } } }, - "caller-callsite": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/caller-callsite/-/caller-callsite-2.0.0.tgz", - "integrity": "sha1-hH4PzgoiN1CpoCfFSzNzGtMVQTQ=", + "@schematics/angular": { + "version": "8.2.2", + "resolved": "https://registry.npmjs.org/@schematics/angular/-/angular-8.2.2.tgz", + "integrity": "sha512-0kZoGXwYRDLREwMYT+m0MyGenpPidLEulrWxgYWoLhsJAFKax7lTy2YYljtFTd+AlZYyB3PTpDsDip8uT743tA==", "dev": true, "requires": { - "callsites": "^2.0.0" + "@angular-devkit/core": "8.2.2", + "@angular-devkit/schematics": "8.2.2" } }, - "caller-path": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/caller-path/-/caller-path-2.0.0.tgz", - "integrity": "sha1-Ro+DBE42mrIBD6xfBs7uFbsssfQ=", + "@schematics/update": { + "version": "0.802.2", + "resolved": "https://registry.npmjs.org/@schematics/update/-/update-0.802.2.tgz", + "integrity": "sha512-ohwdxf0+uQ0aCTk27evs1l04rJ1nB3S95ihDr3rSQOl0WWizdto6TbXURtQ4PubORehjqvhrqqKGVp+QL2npGw==", "dev": true, "requires": { - "caller-callsite": "^2.0.0" + "@angular-devkit/core": "8.2.2", + "@angular-devkit/schematics": "8.2.2", + "@yarnpkg/lockfile": "1.1.0", + "ini": "1.3.5", + "pacote": "9.5.4", + "rxjs": "6.4.0", + "semver": "6.3.0", + "semver-intersect": "1.4.0" + }, + "dependencies": { + "rxjs": { + "version": "6.4.0", + "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.4.0.tgz", + "integrity": "sha512-Z9Yfa11F6B9Sg/BK9MnqnQ+aQYicPLtilXBp2yUtDt2JRCE0h26d33EnfO3ZxoNxG0T92OUucP3Ct7cpfkdFfw==", + "dev": true, + "requires": { + "tslib": "^1.9.0" + } + }, + "semver": { + "version": "6.3.0", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", + "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", + "dev": true + } } }, - "callsite": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/callsite/-/callsite-1.0.0.tgz", - "integrity": "sha1-KAOY5dZkvXQDi28JBRU+borxvCA=", - "dev": true - }, - "callsites": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/callsites/-/callsites-2.0.0.tgz", - "integrity": "sha1-BuuE8A7qQT2oav/vrL/7Ngk7PFA=", - "dev": true + "@sinonjs/commons": { + "version": "1.7.0", + "resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-1.7.0.tgz", + "integrity": "sha512-qbk9AP+cZUsKdW1GJsBpxPKFmCJ0T8swwzVje3qFd+AkQb74Q/tiuzrdfFg8AD2g5HH/XbE/I8Uc1KYHVYWfhg==", + "dev": true, + "requires": { + "type-detect": "4.0.8" + } }, - "camelcase": { - "version": "5.3.1", - "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz", - "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==" + "@sinonjs/formatio": { + "version": "3.2.2", + "resolved": "https://registry.npmjs.org/@sinonjs/formatio/-/formatio-3.2.2.tgz", + "integrity": "sha512-B8SEsgd8gArBLMD6zpRw3juQ2FVSsmdd7qlevyDqzS9WTCtvF55/gAL+h6gue8ZvPYcdiPdvueM/qm//9XzyTQ==", + "dev": true, + "requires": { + "@sinonjs/commons": "^1", + "@sinonjs/samsam": "^3.1.0" + } }, - "camelize": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/camelize/-/camelize-1.0.0.tgz", - "integrity": "sha1-FkpUg+Yw+kMh5a8HAg5TGDGyYJs=" + "@sinonjs/samsam": { + "version": "3.3.3", + "resolved": "https://registry.npmjs.org/@sinonjs/samsam/-/samsam-3.3.3.tgz", + "integrity": "sha512-bKCMKZvWIjYD0BLGnNrxVuw4dkWCYsLqFOUWw8VgKF/+5Y+mE7LfHWPIYoDXowH+3a9LsWDMo0uAP8YDosPvHQ==", + "dev": true, + "requires": { + "@sinonjs/commons": "^1.3.0", + "array-from": "^2.1.1", + "lodash": "^4.17.15" + } }, - "caniuse-lite": { - "version": "1.0.30000986", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30000986.tgz", - "integrity": "sha512-pM+LnkoAX0+QnIH3tpW5EnkmfpEoqOD8FAcoBvsl3Xh6DXkgctiCxeCbXphP/k3XJtJzm+zOAJbi6U6IVkpWZQ==", + "@sinonjs/text-encoding": { + "version": "0.7.1", + "resolved": "https://registry.npmjs.org/@sinonjs/text-encoding/-/text-encoding-0.7.1.tgz", + "integrity": "sha512-+iTbntw2IZPb/anVDbypzfQa+ay64MW0Zo8aJ8gZPWMMK6/OubMVb6lUPMagqjOPnmtauXnFCACVl3O7ogjeqQ==", "dev": true }, - "canonical-path": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/canonical-path/-/canonical-path-1.0.0.tgz", - "integrity": "sha512-feylzsbDxi1gPZ1IjystzIQZagYYLvfKrSuygUCgf7z6x790VEzze5QEkdSV1U58RA7Hi0+v6fv4K54atOzATg==", + "@types/events": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/@types/events/-/events-3.0.0.tgz", + "integrity": "sha512-EaObqwIvayI5a8dCzhFrjKzVwKLxjoG9T6Ppd5CEo07LRKfQ8Yokw54r5+Wq7FaBQ+yXRvQAYPrHwya1/UFt9g==", "dev": true }, - "capture-stack-trace": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/capture-stack-trace/-/capture-stack-trace-1.0.1.tgz", - "integrity": "sha512-mYQLZnx5Qt1JgB1WEiMCf2647plpGeQ2NMR/5L0HNZzGQo4fuSPnK+wjfPnKZV0aiJDgzmWqqkV/g7JD+DW0qw==", + "@types/file-saver": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/@types/file-saver/-/file-saver-2.0.1.tgz", + "integrity": "sha512-g1QUuhYVVAamfCifK7oB7G3aIl4BbOyzDOqVyUfEr4tfBKrXfeH+M+Tg7HKCXSrbzxYdhyCP7z9WbKo0R2hBCw==", "dev": true }, - "caseless": { - "version": "0.12.0", - "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz", - "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=" + "@types/geojson": { + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/@types/geojson/-/geojson-1.0.6.tgz", + "integrity": "sha512-Xqg/lIZMrUd0VRmSRbCAewtwGZiAk3mEUDvV4op1tGl+LvyPcb/MIOSxTl9z+9+J+R4/vpjiCAT4xeKzH9ji1w==" }, - "center-align": { - "version": "0.1.3", - "resolved": "https://registry.npmjs.org/center-align/-/center-align-0.1.3.tgz", - "integrity": "sha1-qg0yYptu6XIgBBHL1EYckHvCt60=", + "@types/glob": { + "version": "7.1.1", + "resolved": "https://registry.npmjs.org/@types/glob/-/glob-7.1.1.tgz", + "integrity": "sha512-1Bh06cbWJUHMC97acuD6UMG29nMt0Aqz1vF3guLfG+kHHJhy3AyohZFFxYk2f7Q1SQIrNwvncxAE0N/9s70F2w==", + "dev": true, "requires": { - "align-text": "^0.1.3", - "lazy-cache": "^1.0.3" + "@types/events": "*", + "@types/minimatch": "*", + "@types/node": "*" } }, - "chai": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/chai/-/chai-4.2.0.tgz", - "integrity": "sha512-XQU3bhBukrOsQCuwZndwGcCVQHyZi53fQ6Ys1Fym7E4olpIqqZZhhoFJoaKVvV17lWQoXYwgWN2nF5crA8J2jw==", + "@types/is-windows": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/@types/is-windows/-/is-windows-0.2.0.tgz", + "integrity": "sha1-byTuSHMdMRaOpRBhDW3RXl/Jxv8=" + }, + "@types/jasmine": { + "version": "2.8.16", + "resolved": "https://registry.npmjs.org/@types/jasmine/-/jasmine-2.8.16.tgz", + "integrity": "sha512-056oRlBBp7MDzr+HoU5su099s/s7wjZ3KcHxLfv+Byqb9MwdLUvsfLgw1VS97hsh3ddxSPyQu+olHMnoVTUY6g==", + "dev": true + }, + "@types/jasminewd2": { + "version": "2.0.8", + "resolved": "https://registry.npmjs.org/@types/jasminewd2/-/jasminewd2-2.0.8.tgz", + "integrity": "sha512-d9p31r7Nxk0ZH0U39PTH0hiDlJ+qNVGjlt1ucOoTUptxb2v+Y5VMnsxfwN+i3hK4yQnqBi3FMmoMFcd1JHDxdg==", "dev": true, "requires": { - "assertion-error": "^1.1.0", - "check-error": "^1.0.2", - "deep-eql": "^3.0.1", - "get-func-name": "^2.0.0", - "pathval": "^1.1.0", - "type-detect": "^4.0.5" + "@types/jasmine": "*" } }, - "chalk": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz", - "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", - "requires": { - "ansi-styles": "^3.2.1", - "escape-string-regexp": "^1.0.5", - "supports-color": "^5.3.0" - }, - "dependencies": { - "supports-color": { - "version": "5.5.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", - "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", - "requires": { - "has-flag": "^3.0.0" - } - } - } + "@types/mime-types": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/@types/mime-types/-/mime-types-2.1.0.tgz", + "integrity": "sha1-nKUs2jY/aZxpRmwqbM2q2RPqenM=", + "dev": true }, - "character-parser": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/character-parser/-/character-parser-1.2.1.tgz", - "integrity": "sha1-wN3kqxgnE7kZuXCVmhI+zBow/NY=" + "@types/minimatch": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/@types/minimatch/-/minimatch-3.0.3.tgz", + "integrity": "sha512-tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA==", + "dev": true }, - "chardet": { - "version": "0.7.0", - "resolved": "https://registry.npmjs.org/chardet/-/chardet-0.7.0.tgz", - "integrity": "sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==", + "@types/node": { + "version": "8.9.5", + "resolved": "https://registry.npmjs.org/@types/node/-/node-8.9.5.tgz", + "integrity": "sha512-jRHfWsvyMtXdbhnz5CVHxaBgnV6duZnPlQuRSo/dm/GnmikNcmZhxIES4E9OZjUmQ8C+HCl4KJux+cXN/ErGDQ==" + }, + "@types/q": { + "version": "0.0.32", + "resolved": "https://registry.npmjs.org/@types/q/-/q-0.0.32.tgz", + "integrity": "sha1-vShOV8hPEyXacCur/IKlMoGQwMU=", "dev": true }, - "check-error": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/check-error/-/check-error-1.0.2.tgz", - "integrity": "sha1-V00xLt2Iu13YkS6Sht1sCu1KrII=", + "@types/selenium-webdriver": { + "version": "3.0.16", + "resolved": "https://registry.npmjs.org/@types/selenium-webdriver/-/selenium-webdriver-3.0.16.tgz", + "integrity": "sha512-lMC2G0ItF2xv4UCiwbJGbnJlIuUixHrioOhNGHSCsYCJ8l4t9hMCUimCytvFv7qy6AfSzRxhRHoGa+UqaqwyeA==", "dev": true }, - "chokidar": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.0.2.tgz", - "integrity": "sha512-c4PR2egjNjI1um6bamCQ6bUNPDiyofNQruHvKgHQ4gDUP/ITSVSzNsiI5OWtHOsX323i5ha/kk4YmOZ1Ktg7KA==", + "@types/source-list-map": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/@types/source-list-map/-/source-list-map-0.1.2.tgz", + "integrity": "sha512-K5K+yml8LTo9bWJI/rECfIPrGgxdpeNbj+d53lwN4QjW1MCwlkhUms+gtdzigTeUyBr09+u8BwOIY3MXvHdcsA==", + "dev": true + }, + "@types/webpack-sources": { + "version": "0.1.6", + "resolved": "https://registry.npmjs.org/@types/webpack-sources/-/webpack-sources-0.1.6.tgz", + "integrity": "sha512-FtAWR7wR5ocJ9+nP137DV81tveD/ZgB1sadnJ/axUGM3BUVfRPx8oQNMtv3JNfTeHx3VP7cXiyfR/jmtEsVHsQ==", "dev": true, "requires": { - "anymatch": "^3.0.1", - "braces": "^3.0.2", - "fsevents": "^2.0.6", - "glob-parent": "^5.0.0", - "is-binary-path": "^2.1.0", - "is-glob": "^4.0.1", - "normalize-path": "^3.0.0", - "readdirp": "^3.1.1" + "@types/node": "*", + "@types/source-list-map": "*", + "source-map": "^0.6.1" }, "dependencies": { - "anymatch": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.0.3.tgz", - "integrity": "sha512-c6IvoeBECQlMVuYUjSwimnhmztImpErfxJzWZhIQinIvQWoGOnB0dLIgifbPHQt5heS6mNlaZG16f06H3C8t1g==", - "dev": true, - "requires": { - "normalize-path": "^3.0.0", - "picomatch": "^2.0.4" - } - }, - "binary-extensions": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.0.0.tgz", - "integrity": "sha512-Phlt0plgpIIBOGTT/ehfFnbNlfsDEiqmzE2KRXoX1bLIlir4X/MR+zSyBEkL05ffWgnRSf/DXv+WrUAVr93/ow==", - "dev": true - }, - "braces": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz", - "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==", - "dev": true, - "requires": { - "fill-range": "^7.0.1" - } - }, - "fill-range": { - "version": "7.0.1", - "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz", - "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==", - "dev": true, - "requires": { - "to-regex-range": "^5.0.1" - } - }, - "fsevents": { - "version": "2.0.7", - "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.0.7.tgz", - "integrity": "sha512-a7YT0SV3RB+DjYcppwVDLtn13UQnmg0SWZS7ezZD0UjnLwXmy8Zm21GMVGLaFGimIqcvyMQaOJBrop8MyOp1kQ==", - "dev": true, - "optional": true - }, - "glob-parent": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.0.0.tgz", - "integrity": "sha512-Z2RwiujPRGluePM6j699ktJYxmPpJKCfpGA13jz2hmFZC7gKetzrWvg5KN3+OsIFmydGyZ1AVwERCq1w/ZZwRg==", - "dev": true, - "requires": { - "is-glob": "^4.0.1" - } - }, - "is-binary-path": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz", - "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==", - "dev": true, - "requires": { - "binary-extensions": "^2.0.0" - } - }, - "is-number": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz", - "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==", - "dev": true - }, - "normalize-path": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz", - "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==", + "source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", "dev": true - }, - "readdirp": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.1.2.tgz", - "integrity": "sha512-8rhl0xs2cxfVsqzreYCvs8EwBfn/DhVdqtoLmw19uI3SC5avYX9teCurlErfpPXGmYtMHReGaP2RsLnFvz/lnw==", - "dev": true, - "requires": { - "picomatch": "^2.0.4" - } - }, - "to-regex-range": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz", - "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==", - "dev": true, - "requires": { - "is-number": "^7.0.0" - } } } }, - "chownr": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.2.tgz", - "integrity": "sha512-GkfeAQh+QNy3wquu9oIZr6SS5x7wGdSgNQvD10X3r+AZr1Oys22HW8kAmDMvNg2+Dm0TeGaEuO8gFwdBXxwO8A==", - "dev": true - }, - "chrome-trace-event": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/chrome-trace-event/-/chrome-trace-event-1.0.2.tgz", - "integrity": "sha512-9e/zx1jw7B4CO+c/RXoCsfg/x1AfUBioy4owYH0bJprEYAx5hRFLRhWBqHAG57D0ZM4H7vxbP7bPe0VwhQRYDQ==", + "@webassemblyjs/ast": { + "version": "1.8.5", + "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.8.5.tgz", + "integrity": "sha512-aJMfngIZ65+t71C3y2nBBg5FFG0Okt9m0XEgWZ7Ywgn1oMAT8cNwx00Uv1cQyHtidq0Xn94R4TAywO+LCQ+ZAQ==", "dev": true, "requires": { - "tslib": "^1.9.0" + "@webassemblyjs/helper-module-context": "1.8.5", + "@webassemblyjs/helper-wasm-bytecode": "1.8.5", + "@webassemblyjs/wast-parser": "1.8.5" } }, - "ci-info": { - "version": "1.6.0", - "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-1.6.0.tgz", - "integrity": "sha512-vsGdkwSCDpWmP80ncATX7iea5DWQemg1UgCW5J8tqjU3lYw4FBYuj89J0CTVomA7BEfvSZd84GmHko+MxFQU2A==", + "@webassemblyjs/floating-point-hex-parser": { + "version": "1.8.5", + "resolved": "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.8.5.tgz", + "integrity": "sha512-9p+79WHru1oqBh9ewP9zW95E3XAo+90oth7S5Re3eQnECGq59ly1Ri5tsIipKGpiStHsUYmY3zMLqtk3gTcOtQ==", "dev": true }, - "cipher-base": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/cipher-base/-/cipher-base-1.0.4.tgz", - "integrity": "sha512-Kkht5ye6ZGmwv40uUDZztayT2ThLQGfnj/T71N/XzeZeo3nf8foyW7zGTsPYkEya3m5f3cAypH+qe7YOrM1U2Q==", + "@webassemblyjs/helper-api-error": { + "version": "1.8.5", + "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.8.5.tgz", + "integrity": "sha512-Za/tnzsvnqdaSPOUXHyKJ2XI7PDX64kWtURyGiJJZKVEdFOsdKUCPTNEVFZq3zJ2R0G5wc2PZ5gvdTRFgm81zA==", + "dev": true + }, + "@webassemblyjs/helper-buffer": { + "version": "1.8.5", + "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.8.5.tgz", + "integrity": "sha512-Ri2R8nOS0U6G49Q86goFIPNgjyl6+oE1abW1pS84BuhP1Qcr5JqMwRFT3Ah3ADDDYGEgGs1iyb1DGX+kAi/c/Q==", + "dev": true + }, + "@webassemblyjs/helper-code-frame": { + "version": "1.8.5", + "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-code-frame/-/helper-code-frame-1.8.5.tgz", + "integrity": "sha512-VQAadSubZIhNpH46IR3yWO4kZZjMxN1opDrzePLdVKAZ+DFjkGD/rf4v1jap744uPVU6yjL/smZbRIIJTOUnKQ==", "dev": true, "requires": { - "inherits": "^2.0.1", - "safe-buffer": "^5.0.1" + "@webassemblyjs/wast-printer": "1.8.5" } }, - "circular-dependency-plugin": { - "version": "5.0.2", - "resolved": "https://registry.npmjs.org/circular-dependency-plugin/-/circular-dependency-plugin-5.0.2.tgz", - "integrity": "sha512-oC7/DVAyfcY3UWKm0sN/oVoDedQDQiw/vIiAnuTWTpE5s0zWf7l3WY417Xw/Fbi/QbAjctAkxgMiS9P0s3zkmA==", + "@webassemblyjs/helper-fsm": { + "version": "1.8.5", + "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-fsm/-/helper-fsm-1.8.5.tgz", + "integrity": "sha512-kRuX/saORcg8se/ft6Q2UbRpZwP4y7YrWsLXPbbmtepKr22i8Z4O3V5QE9DbZK908dh5Xya4Un57SDIKwB9eow==", "dev": true }, - "class-utils": { - "version": "0.3.6", - "resolved": "https://registry.npmjs.org/class-utils/-/class-utils-0.3.6.tgz", - "integrity": "sha512-qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg==", + "@webassemblyjs/helper-module-context": { + "version": "1.8.5", + "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-module-context/-/helper-module-context-1.8.5.tgz", + "integrity": "sha512-/O1B236mN7UNEU4t9X7Pj38i4VoU8CcMHyy3l2cV/kIF4U5KoHXDVqcDuOs1ltkac90IM4vZdHc52t1x8Yfs3g==", "dev": true, "requires": { - "arr-union": "^3.1.0", - "define-property": "^0.2.5", - "isobject": "^3.0.0", - "static-extend": "^0.1.1" - }, - "dependencies": { - "define-property": { - "version": "0.2.5", - "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz", - "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=", - "dev": true, - "requires": { - "is-descriptor": "^0.1.0" - } - } + "@webassemblyjs/ast": "1.8.5", + "mamacro": "^0.0.3" } }, - "clean-css": { - "version": "3.4.28", - "resolved": "https://registry.npmjs.org/clean-css/-/clean-css-3.4.28.tgz", - "integrity": "sha1-vxlF6C/ICPVWlebd6uwBQA79A/8=", + "@webassemblyjs/helper-wasm-bytecode": { + "version": "1.8.5", + "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.8.5.tgz", + "integrity": "sha512-Cu4YMYG3Ddl72CbmpjU/wbP6SACcOPVbHN1dI4VJNJVgFwaKf1ppeFJrwydOG3NDHxVGuCfPlLZNyEdIYlQ6QQ==", + "dev": true + }, + "@webassemblyjs/helper-wasm-section": { + "version": "1.8.5", + "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.8.5.tgz", + "integrity": "sha512-VV083zwR+VTrIWWtgIUpqfvVdK4ff38loRmrdDBgBT8ADXYsEZ5mPQ4Nde90N3UYatHdYoDIFb7oHzMncI02tA==", + "dev": true, "requires": { - "commander": "2.8.x", - "source-map": "0.4.x" - }, - "dependencies": { - "commander": { - "version": "2.8.1", - "resolved": "https://registry.npmjs.org/commander/-/commander-2.8.1.tgz", - "integrity": "sha1-Br42f+v9oMMwqh4qBy09yXYkJdQ=", - "requires": { - "graceful-readlink": ">= 1.0.0" - } - }, - "source-map": { - "version": "0.4.4", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.4.4.tgz", - "integrity": "sha1-66T12pwNyZneaAMti092FzZSA2s=", - "requires": { - "amdefine": ">=0.0.4" - } - } + "@webassemblyjs/ast": "1.8.5", + "@webassemblyjs/helper-buffer": "1.8.5", + "@webassemblyjs/helper-wasm-bytecode": "1.8.5", + "@webassemblyjs/wasm-gen": "1.8.5" } }, - "cli-boxes": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/cli-boxes/-/cli-boxes-1.0.0.tgz", - "integrity": "sha1-T6kXw+WclKAEzWH47lCdplFocUM=", - "dev": true - }, - "cli-cursor": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-2.1.0.tgz", - "integrity": "sha1-s12sN2R5+sw+lHR9QdDQ9SOP/LU=", + "@webassemblyjs/ieee754": { + "version": "1.8.5", + "resolved": "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.8.5.tgz", + "integrity": "sha512-aaCvQYrvKbY/n6wKHb/ylAJr27GglahUO89CcGXMItrOBqRarUMxWLJgxm9PJNuKULwN5n1csT9bYoMeZOGF3g==", "dev": true, "requires": { - "restore-cursor": "^2.0.0" + "@xtuc/ieee754": "^1.2.0" } }, - "cli-width": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/cli-width/-/cli-width-2.2.0.tgz", - "integrity": "sha1-/xnt6Kml5XkyQUewwR8PvLq+1jk=", - "dev": true - }, - "cliui": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/cliui/-/cliui-5.0.0.tgz", - "integrity": "sha512-PYeGSEmmHM6zvoef2w8TPzlrnNpXIjTipYK780YswmIP9vjxmd6Y2a3CB2Ks6/AU8NHjZugXvo8w3oWM2qnwXA==", + "@webassemblyjs/leb128": { + "version": "1.8.5", + "resolved": "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.8.5.tgz", + "integrity": "sha512-plYUuUwleLIziknvlP8VpTgO4kqNaH57Y3JnNa6DLpu/sGcP6hbVdfdX5aHAV716pQBKrfuU26BJK29qY37J7A==", + "dev": true, "requires": { - "string-width": "^3.1.0", - "strip-ansi": "^5.2.0", - "wrap-ansi": "^5.1.0" + "@xtuc/long": "4.2.2" } }, - "clone": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/clone/-/clone-2.1.2.tgz", - "integrity": "sha1-G39Ln1kfHo+DZwQBYANFoCiHQ18=", + "@webassemblyjs/utf8": { + "version": "1.8.5", + "resolved": "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.8.5.tgz", + "integrity": "sha512-U7zgftmQriw37tfD934UNInokz6yTmn29inT2cAetAsaU9YeVCveWEwhKL1Mg4yS7q//NGdzy79nlXh3bT8Kjw==", "dev": true }, - "clone-deep": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/clone-deep/-/clone-deep-2.0.2.tgz", - "integrity": "sha512-SZegPTKjCgpQH63E+eN6mVEEPdQBOUzjyJm5Pora4lrwWRFS8I0QAxV/KD6vV/i0WuijHZWQC1fMsPEdxfdVCQ==", + "@webassemblyjs/wasm-edit": { + "version": "1.8.5", + "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.8.5.tgz", + "integrity": "sha512-A41EMy8MWw5yvqj7MQzkDjU29K7UJq1VrX2vWLzfpRHt3ISftOXqrtojn7nlPsZ9Ijhp5NwuODuycSvfAO/26Q==", "dev": true, "requires": { - "for-own": "^1.0.0", - "is-plain-object": "^2.0.4", - "kind-of": "^6.0.0", - "shallow-clone": "^1.0.0" - }, - "dependencies": { - "kind-of": { - "version": "6.0.2", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz", - "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==", - "dev": true - } + "@webassemblyjs/ast": "1.8.5", + "@webassemblyjs/helper-buffer": "1.8.5", + "@webassemblyjs/helper-wasm-bytecode": "1.8.5", + "@webassemblyjs/helper-wasm-section": "1.8.5", + "@webassemblyjs/wasm-gen": "1.8.5", + "@webassemblyjs/wasm-opt": "1.8.5", + "@webassemblyjs/wasm-parser": "1.8.5", + "@webassemblyjs/wast-printer": "1.8.5" } }, - "cls-bluebird": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/cls-bluebird/-/cls-bluebird-2.1.0.tgz", - "integrity": "sha1-N+8eCAqP+1XC9BZPU28ZGeeWiu4=", + "@webassemblyjs/wasm-gen": { + "version": "1.8.5", + "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.8.5.tgz", + "integrity": "sha512-BCZBT0LURC0CXDzj5FXSc2FPTsxwp3nWcqXQdOZE4U7h7i8FqtFK5Egia6f9raQLpEKT1VL7zr4r3+QX6zArWg==", + "dev": true, "requires": { - "is-bluebird": "^1.0.2", - "shimmer": "^1.1.0" + "@webassemblyjs/ast": "1.8.5", + "@webassemblyjs/helper-wasm-bytecode": "1.8.5", + "@webassemblyjs/ieee754": "1.8.5", + "@webassemblyjs/leb128": "1.8.5", + "@webassemblyjs/utf8": "1.8.5" } }, - "co": { - "version": "4.6.0", - "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz", - "integrity": "sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ=" - }, - "code-point-at": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz", - "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=" + "@webassemblyjs/wasm-opt": { + "version": "1.8.5", + "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.8.5.tgz", + "integrity": "sha512-HKo2mO/Uh9A6ojzu7cjslGaHaUU14LdLbGEKqTR7PBKwT6LdPtLLh9fPY33rmr5wcOMrsWDbbdCHq4hQUdd37Q==", + "dev": true, + "requires": { + "@webassemblyjs/ast": "1.8.5", + "@webassemblyjs/helper-buffer": "1.8.5", + "@webassemblyjs/wasm-gen": "1.8.5", + "@webassemblyjs/wasm-parser": "1.8.5" + } }, - "codelyzer": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/codelyzer/-/codelyzer-5.1.0.tgz", - "integrity": "sha512-QiyY2/oDQnYx4mAVEDqr+z9MwrOto18tQFjExiuRChXCy0yvngS5fQpWIxvAGpbOmZFiR1PRTRLbEI71u10maA==", + "@webassemblyjs/wasm-parser": { + "version": "1.8.5", + "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.8.5.tgz", + "integrity": "sha512-pi0SYE9T6tfcMkthwcgCpL0cM9nRYr6/6fjgDtL6q/ZqKHdMWvxitRi5JcZ7RI4SNJJYnYNaWy5UUrHQy998lw==", "dev": true, "requires": { - "app-root-path": "^2.2.1", - "aria-query": "^3.0.0", - "axobject-query": "^2.0.2", - "css-selector-tokenizer": "^0.7.1", - "cssauron": "^1.4.0", - "damerau-levenshtein": "^1.0.4", - "semver-dsl": "^1.0.1", - "source-map": "^0.5.7", - "sprintf-js": "^1.1.2" - }, - "dependencies": { - "source-map": { - "version": "0.5.7", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz", - "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=", - "dev": true - }, - "sprintf-js": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.1.2.tgz", - "integrity": "sha512-VE0SOVEHCk7Qc8ulkWw3ntAzXuqf7S2lvwQaDLRnUeIEaKNQJzV6BwmLKhOqT61aGhfUMrXeaBk+oDGCzvhcug==", - "dev": true - } + "@webassemblyjs/ast": "1.8.5", + "@webassemblyjs/helper-api-error": "1.8.5", + "@webassemblyjs/helper-wasm-bytecode": "1.8.5", + "@webassemblyjs/ieee754": "1.8.5", + "@webassemblyjs/leb128": "1.8.5", + "@webassemblyjs/utf8": "1.8.5" } }, - "collection-visit": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/collection-visit/-/collection-visit-1.0.0.tgz", - "integrity": "sha1-S8A3PBZLwykbTTaMgpzxqApZ3KA=", + "@webassemblyjs/wast-parser": { + "version": "1.8.5", + "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-parser/-/wast-parser-1.8.5.tgz", + "integrity": "sha512-daXC1FyKWHF1i11obK086QRlsMsY4+tIOKgBqI1lxAnkp9xe9YMcgOxm9kLe+ttjs5aWV2KKE1TWJCN57/Btsg==", "dev": true, "requires": { - "map-visit": "^1.0.0", - "object-visit": "^1.0.0" + "@webassemblyjs/ast": "1.8.5", + "@webassemblyjs/floating-point-hex-parser": "1.8.5", + "@webassemblyjs/helper-api-error": "1.8.5", + "@webassemblyjs/helper-code-frame": "1.8.5", + "@webassemblyjs/helper-fsm": "1.8.5", + "@xtuc/long": "4.2.2" } }, - "color-convert": { - "version": "1.9.3", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz", - "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==", + "@webassemblyjs/wast-printer": { + "version": "1.8.5", + "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.8.5.tgz", + "integrity": "sha512-w0U0pD4EhlnvRyeJzBqaVSJAo9w/ce7/WPogeXLzGkO6hzhr4GnQIZ4W4uUt5b9ooAaXPtnXlj0gzsXEOUNYMg==", + "dev": true, "requires": { - "color-name": "1.1.3" + "@webassemblyjs/ast": "1.8.5", + "@webassemblyjs/wast-parser": "1.8.5", + "@xtuc/long": "4.2.2" } }, - "color-name": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz", - "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=" + "@xtuc/ieee754": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/@xtuc/ieee754/-/ieee754-1.2.0.tgz", + "integrity": "sha512-DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA==", + "dev": true }, - "colors": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/colors/-/colors-1.1.2.tgz", - "integrity": "sha1-FopHAXVran9RoSzgyXv6KMCE7WM=", + "@xtuc/long": { + "version": "4.2.2", + "resolved": "https://registry.npmjs.org/@xtuc/long/-/long-4.2.2.tgz", + "integrity": "sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==", "dev": true }, - "combined-stream": { - "version": "1.0.8", - "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz", - "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==", + "@yarnpkg/lockfile": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@yarnpkg/lockfile/-/lockfile-1.1.0.tgz", + "integrity": "sha512-GpSwvyXOcOOlV70vbnzjj4fW5xW/FdUF6nQEt1ENy7m4ZCczi1+/buVUPAqmGfqznsORNFzUMjctTIp8a9tuCQ==", + "dev": true + }, + "JSONStream": { + "version": "1.3.5", + "resolved": "https://registry.npmjs.org/JSONStream/-/JSONStream-1.3.5.tgz", + "integrity": "sha512-E+iruNOY8VV9s4JEbe1aNEm6MiszPRr/UfcHMz0TQh1BXSxHK+ASV1R6W4HpjBhSeS+54PIsAMCBmwD06LLsqQ==", + "dev": true, "requires": { - "delayed-stream": "~1.0.0" + "jsonparse": "^1.2.0", + "through": ">=2.2.7 <3" } }, - "commander": { - "version": "2.20.0", - "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.0.tgz", - "integrity": "sha512-7j2y+40w61zy6YC2iRNpUe/NwhNyoXrYpHMrSunaMG64nRnaf96zO/KMQR4OyN/UnE5KLyEBnKHd4aG3rskjpQ==" + "abab": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/abab/-/abab-2.0.3.tgz", + "integrity": "sha512-tsFzPpcttalNjFBCFMqsKYQcWxxen1pgJR56by//QwvJc4/OUS3kPOOttx2tSIfjsylB0pYu7f5D3K1RCxUnUg==" }, - "commondir": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/commondir/-/commondir-1.0.1.tgz", - "integrity": "sha1-3dgA2gxmEnOTzKWVDqloo6rxJTs=", + "abbrev": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz", + "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==", "dev": true }, - "compare-versions": { - "version": "3.5.1", - "resolved": "https://registry.npmjs.org/compare-versions/-/compare-versions-3.5.1.tgz", - "integrity": "sha512-9fGPIB7C6AyM18CJJBHt5EnCZDG3oiTJYy0NjfIAGjKpzv0tkxWko7TNQHF5ymqm7IH03tqmeuBxtvD+Izh6mg==", - "dev": true + "accepts": { + "version": "1.3.7", + "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.7.tgz", + "integrity": "sha512-Il80Qs2WjYlJIBNzNkK6KYqlVMTbZLXgHx2oT0pU/fjRHyEp+PEfEPY0R3WCwAGVOtauxh1hOxNgIf5bv7dQpA==", + "dev": true, + "requires": { + "mime-types": "~2.1.24", + "negotiator": "0.6.2" + } }, - "component-bind": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/component-bind/-/component-bind-1.0.0.tgz", - "integrity": "sha1-AMYIq33Nk4l8AAllGx06jh5zu9E=", - "dev": true + "acorn": { + "version": "2.7.0", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-2.7.0.tgz", + "integrity": "sha1-q259nYhqrKiwhbwzEreaGYQz8Oc=" }, - "component-emitter": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.3.0.tgz", - "integrity": "sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==", + "acorn-globals": { + "version": "1.0.9", + "resolved": "https://registry.npmjs.org/acorn-globals/-/acorn-globals-1.0.9.tgz", + "integrity": "sha1-VbtemGkVB7dFedBRNBMhfDgMVM8=", + "requires": { + "acorn": "^2.1.0" + } + }, + "acorn-walk": { + "version": "6.2.0", + "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-6.2.0.tgz", + "integrity": "sha512-7evsyfH1cLOCdAzZAd43Cic04yKydNx0cF+7tiA19p1XnLLPU4dpCQOqpjqwokFe//vS0QqfqqjCS2JkiIs0cA==" + }, + "adm-zip": { + "version": "0.4.14", + "resolved": "https://registry.npmjs.org/adm-zip/-/adm-zip-0.4.14.tgz", + "integrity": "sha512-/9aQCnQHF+0IiCl0qhXoK7qs//SwYE7zX8lsr/DNk1BRAHYxeLZPL4pguwK29gUEqasYQjqPtEpDRSWEkdHn9g==", "dev": true }, - "component-inherit": { - "version": "0.0.3", - "resolved": "https://registry.npmjs.org/component-inherit/-/component-inherit-0.0.3.tgz", - "integrity": "sha1-ZF/ErfWLcrZJ1crmUTVhnbJv8UM=", + "after": { + "version": "0.8.2", + "resolved": "https://registry.npmjs.org/after/-/after-0.8.2.tgz", + "integrity": "sha1-/ts5T58OAqqXaOcCvaI7UF+ufh8=", "dev": true }, - "compressible": { - "version": "2.0.17", - "resolved": "https://registry.npmjs.org/compressible/-/compressible-2.0.17.tgz", - "integrity": "sha512-BGHeLCK1GV7j1bSmQQAi26X+GgWcTjLr/0tzSvMCl3LH1w1IJ4PFSPoV5316b30cneTziC+B1a+3OjoSUcQYmw==", + "agent-base": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-4.3.0.tgz", + "integrity": "sha512-salcGninV0nPrwpGNn4VTXBb1SOuXQBiqbrNXoeizJsHrsL6ERFM2Ne3JUSBWRE6aeNJI2ROP/WEEIDUiDe3cg==", "dev": true, "requires": { - "mime-db": ">= 1.40.0 < 2" + "es6-promisify": "^5.0.0" } }, - "compression": { - "version": "1.7.4", - "resolved": "https://registry.npmjs.org/compression/-/compression-1.7.4.tgz", - "integrity": "sha512-jaSIDzP9pZVS4ZfQ+TzvtiWhdpFhE2RDHz8QJkpX9SIpLq88VueF5jJw6t+6CUQcAoA6t+x89MLrWAqpfDE8iQ==", + "agentkeepalive": { + "version": "3.5.2", + "resolved": "https://registry.npmjs.org/agentkeepalive/-/agentkeepalive-3.5.2.tgz", + "integrity": "sha512-e0L/HNe6qkQ7H19kTlRRqUibEAwDK5AFk6y3PtMsuut2VAH6+Q4xZml1tNDJD7kSAyqmbG/K08K5WEJYtUrSlQ==", "dev": true, "requires": { - "accepts": "~1.3.5", - "bytes": "3.0.0", - "compressible": "~2.0.16", - "debug": "2.6.9", - "on-headers": "~1.0.2", - "safe-buffer": "5.1.2", - "vary": "~1.1.2" - }, - "dependencies": { - "bytes": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.0.0.tgz", - "integrity": "sha1-0ygVQE1olpn4Wk6k+odV3ROpYEg=", - "dev": true - }, - "debug": { - "version": "2.6.9", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", - "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", - "dev": true, - "requires": { - "ms": "2.0.0" - } - }, - "safe-buffer": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", - "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==", - "dev": true - } + "humanize-ms": "^1.2.1" } }, - "concat-map": { - "version": "0.0.1", - "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", - "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=" + "ajv": { + "version": "6.11.0", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.11.0.tgz", + "integrity": "sha512-nCprB/0syFYy9fVYU1ox1l2KN8S9I+tziH8D4zdZuLT3N6RMlGSGt5FSTpAiHB/Whv8Qs1cWHma1aMKZyaHRKA==", + "requires": { + "fast-deep-equal": "^3.1.1", + "fast-json-stable-stringify": "^2.0.0", + "json-schema-traverse": "^0.4.1", + "uri-js": "^4.2.2" + } }, - "concat-stream": { - "version": "1.6.2", - "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.2.tgz", - "integrity": "sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==", - "dev": true, + "ajv-errors": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/ajv-errors/-/ajv-errors-1.0.1.tgz", + "integrity": "sha512-DCRfO/4nQ+89p/RK43i8Ezd41EqdGIU4ld7nGF8OQ14oc/we5rEntLCUa7+jrn3nn83BosfwZA0wb4pon2o8iQ==", + "dev": true + }, + "ajv-keywords": { + "version": "3.4.1", + "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.4.1.tgz", + "integrity": "sha512-RO1ibKvd27e6FEShVFfPALuHI3WjSVNeK5FIsmme/LYRNxjKuNj+Dt7bucLa6NdSv3JcVTyMlm9kGR84z1XpaQ==", + "dev": true + }, + "align-text": { + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/align-text/-/align-text-0.1.4.tgz", + "integrity": "sha1-DNkKVhCT810KmSVsIrcGlDP60Rc=", "requires": { - "buffer-from": "^1.0.0", - "inherits": "^2.0.3", - "readable-stream": "^2.2.2", - "typedarray": "^0.0.6" + "kind-of": "^3.0.2", + "longest": "^1.0.1", + "repeat-string": "^1.5.2" } }, - "concurrently": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/concurrently/-/concurrently-4.1.2.tgz", - "integrity": "sha512-Kim9SFrNr2jd8/0yNYqDTFALzUX1tvimmwFWxmp/D4mRI+kbqIIwE2RkBDrxS2ic25O1UgQMI5AtBqdtX3ynYg==", + "amdefine": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/amdefine/-/amdefine-1.0.1.tgz", + "integrity": "sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU=" + }, + "angulartics2": { + "version": "7.5.2", + "resolved": "https://registry.npmjs.org/angulartics2/-/angulartics2-7.5.2.tgz", + "integrity": "sha512-gfQ/kRtrKD0fLOGZsWlcD8obIWTAJGSdiVRp6lH+LxLD8shKnl1/StWlUJeOioUkU0ps4QGRb0tCSlCdnI5DAw==", "requires": { - "chalk": "^2.4.2", - "date-fns": "^1.30.1", - "lodash": "^4.17.15", - "read-pkg": "^4.0.1", - "rxjs": "^6.5.2", - "spawn-command": "^0.0.2-1", - "supports-color": "^4.5.0", - "tree-kill": "^1.2.1", - "yargs": "^12.0.5" - }, - "dependencies": { - "ansi-regex": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz", - "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=" - }, - "cliui": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/cliui/-/cliui-4.1.0.tgz", - "integrity": "sha512-4FG+RSG9DL7uEwRUZXZn3SS34DiDPfzP0VOiEwtUWlE+AR2EIg+hSyvrIgUUfhdgR/UkAeW2QHgeP+hWrXs7jQ==", - "requires": { - "string-width": "^2.1.1", - "strip-ansi": "^4.0.0", - "wrap-ansi": "^2.0.0" - } - }, - "get-caller-file": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-1.0.3.tgz", - "integrity": "sha512-3t6rVToeoZfYSGd8YoLFR2DJkiQrIiUrGcjvFX2mDw3bn6k2OtwHN0TNCLbBO+w8qTvimhDkv+LSscbJY1vE6w==" - }, - "has-flag": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-2.0.0.tgz", - "integrity": "sha1-6CB68cx7MNRGzHC3NLXovhj4jVE=" - }, - "pify": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz", - "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=" - }, - "read-pkg": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-4.0.1.tgz", - "integrity": "sha1-ljYlN48+HE1IyFhytabsfV0JMjc=", - "requires": { - "normalize-package-data": "^2.3.2", - "parse-json": "^4.0.0", - "pify": "^3.0.0" - } - }, - "require-main-filename": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-1.0.1.tgz", - "integrity": "sha1-l/cXtp1IeE9fUmpsWqj/3aBVpNE=" - }, - "string-width": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz", - "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==", - "requires": { - "is-fullwidth-code-point": "^2.0.0", - "strip-ansi": "^4.0.0" - } - }, - "strip-ansi": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz", - "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", - "requires": { - "ansi-regex": "^3.0.0" - } - }, - "supports-color": { - "version": "4.5.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.5.0.tgz", - "integrity": "sha1-vnoN5ITexcXN34s9WRJQRJEvY1s=", - "requires": { - "has-flag": "^2.0.0" - } - }, - "wrap-ansi": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz", - "integrity": "sha1-2Pw9KE3QV5T+hJc8rs3Rz4JP3YU=", - "requires": { - "string-width": "^1.0.1", - "strip-ansi": "^3.0.1" - }, - "dependencies": { - "ansi-regex": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz", - "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=" - }, - "is-fullwidth-code-point": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz", - "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=", - "requires": { - "number-is-nan": "^1.0.0" - } - }, - "string-width": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz", - "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=", - "requires": { - "code-point-at": "^1.0.0", - "is-fullwidth-code-point": "^1.0.0", - "strip-ansi": "^3.0.0" - } - }, - "strip-ansi": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz", - "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=", - "requires": { - "ansi-regex": "^2.0.0" - } - } - } - }, - "yargs": { - "version": "12.0.5", - "resolved": "https://registry.npmjs.org/yargs/-/yargs-12.0.5.tgz", - "integrity": "sha512-Lhz8TLaYnxq/2ObqHDql8dX8CJi97oHxrjUcYtzKbbykPtVW9WB+poxI+NM2UIzsMgNCZTIf0AQwsjK5yMAqZw==", - "requires": { - "cliui": "^4.0.0", - "decamelize": "^1.2.0", - "find-up": "^3.0.0", - "get-caller-file": "^1.0.1", - "os-locale": "^3.0.0", - "require-directory": "^2.1.1", - "require-main-filename": "^1.0.1", - "set-blocking": "^2.0.0", - "string-width": "^2.0.0", - "which-module": "^2.0.0", - "y18n": "^3.2.1 || ^4.0.0", - "yargs-parser": "^11.1.1" - } - }, - "yargs-parser": { - "version": "11.1.1", - "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-11.1.1.tgz", - "integrity": "sha512-C6kB/WJDiaxONLJQnF8ccx9SEeoTTLek8RVbaOIsrAUS8VrBEXfmeSnCZxygc+XC2sNMBIwOOnfcxiynjHsVSQ==", - "requires": { - "camelcase": "^5.0.0", - "decamelize": "^1.2.0" - } - } + "tslib": "^1.9.0" } }, - "configstore": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/configstore/-/configstore-3.1.2.tgz", - "integrity": "sha512-vtv5HtGjcYUgFrXc6Kx747B83MRRVS5R1VTEQoXvuP+kMI+if6uywV0nDGoiydJRy4yk7h9od5Og0kxx4zUXmw==", + "ansi-align": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ansi-align/-/ansi-align-2.0.0.tgz", + "integrity": "sha1-w2rsy6VjuJzrVW82kPCx2eNUf38=", "dev": true, "requires": { - "dot-prop": "^4.1.0", - "graceful-fs": "^4.1.2", - "make-dir": "^1.0.0", - "unique-string": "^1.0.0", - "write-file-atomic": "^2.0.0", - "xdg-basedir": "^3.0.0" + "string-width": "^2.0.0" }, "dependencies": { - "make-dir": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-1.3.0.tgz", - "integrity": "sha512-2w31R7SJtieJJnQtGc7RVL2StM2vGYVfqUOvUDxH6bC6aJTxPxTF0GnIgCyu7tjockiUWAYQRbxa7vKn34s5sQ==", + "ansi-regex": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz", + "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=", + "dev": true + }, + "string-width": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz", + "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==", "dev": true, "requires": { - "pify": "^3.0.0" + "is-fullwidth-code-point": "^2.0.0", + "strip-ansi": "^4.0.0" } }, - "pify": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz", - "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=", - "dev": true + "strip-ansi": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz", + "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", + "dev": true, + "requires": { + "ansi-regex": "^3.0.0" + } } } }, - "connect": { - "version": "3.7.0", - "resolved": "https://registry.npmjs.org/connect/-/connect-3.7.0.tgz", - "integrity": "sha512-ZqRXc+tZukToSNmh5C2iWMSoV3X1YUcPbqEM4DkEG5tNQXrQUZCNVGGv3IuicnkMtPfGf3Xtp8WCXs295iQ1pQ==", + "ansi-colors": { + "version": "3.2.4", + "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-3.2.4.tgz", + "integrity": "sha512-hHUXGagefjN2iRrID63xckIvotOXOojhQKWIPUZ4mNUZ9nLZW+7FMNoE1lOkEhNWYsx/7ysGIuJYCiMAA9FnrA==", + "dev": true + }, + "ansi-escapes": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-3.2.0.tgz", + "integrity": "sha512-cBhpre4ma+U0T1oM5fXg7Dy1Jw7zzwv7lt/GoCpr+hDQJoYnKVPLL4dCvSEFMmQurOQvSrwT7SL/DAlhBI97RQ==", + "dev": true + }, + "ansi-html": { + "version": "0.0.7", + "resolved": "https://registry.npmjs.org/ansi-html/-/ansi-html-0.0.7.tgz", + "integrity": "sha1-gTWEAhliqenm/QOflA0S9WynhZ4=", + "dev": true + }, + "ansi-regex": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz", + "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==" + }, + "ansi-styles": { + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", + "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", + "requires": { + "color-convert": "^1.9.0" + } + }, + "anymatch": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.1.tgz", + "integrity": "sha512-mM8522psRCqzV+6LhomX5wgp25YVibjh8Wj23I5RPkPppSVSjyKD2A2mBJmWGa+KN7f2D6LNh9jkBCeyLktzjg==", "dev": true, "requires": { - "debug": "2.6.9", - "finalhandler": "1.1.2", - "parseurl": "~1.3.3", - "utils-merge": "1.0.1" + "normalize-path": "^3.0.0", + "picomatch": "^2.0.4" + } + }, + "app-root-path": { + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/app-root-path/-/app-root-path-2.2.1.tgz", + "integrity": "sha512-91IFKeKk7FjfmezPKkwtaRvSpnUc4gDwPAjA1YZ9Gn0q0PPeW+vbeUsZuyDwjI7+QTHhcLen2v25fi/AmhvbJA==", + "dev": true + }, + "append-transform": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/append-transform/-/append-transform-1.0.0.tgz", + "integrity": "sha512-P009oYkeHyU742iSZJzZZywj4QRJdnTWffaKuJQLablCZ1uz6/cW4yaRgcDaoQ+uwOxxnt0gRUcwfsNP2ri0gw==", + "dev": true, + "requires": { + "default-require-extensions": "^2.0.0" + } + }, + "aproba": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/aproba/-/aproba-1.2.0.tgz", + "integrity": "sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==", + "dev": true + }, + "archy": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/archy/-/archy-1.0.0.tgz", + "integrity": "sha1-+cjBN1fMHde8N5rHeyxipcKGjEA=", + "dev": true + }, + "argparse": { + "version": "1.0.10", + "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz", + "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==", + "requires": { + "sprintf-js": "~1.0.2" + } + }, + "aria-query": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/aria-query/-/aria-query-3.0.0.tgz", + "integrity": "sha1-ZbP8wcoRVajJrmTW7uKX8V1RM8w=", + "dev": true, + "requires": { + "ast-types-flow": "0.0.7", + "commander": "^2.11.0" }, "dependencies": { - "debug": { - "version": "2.6.9", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", - "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", - "dev": true, - "requires": { - "ms": "2.0.0" - } + "commander": { + "version": "2.20.3", + "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz", + "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==", + "dev": true } } }, - "connect-history-api-fallback": { - "version": "1.6.0", - "resolved": "https://registry.npmjs.org/connect-history-api-fallback/-/connect-history-api-fallback-1.6.0.tgz", - "integrity": "sha512-e54B99q/OUoH64zYYRf3HBP5z24G38h5D3qXu23JGRoigpX5Ss4r9ZnDk3g0Z8uQC2x2lPaJ+UlWBc1ZWBWdLg==", + "arr-diff": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz", + "integrity": "sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=", "dev": true }, - "console-browserify": { + "arr-flatten": { "version": "1.1.0", - "resolved": "https://registry.npmjs.org/console-browserify/-/console-browserify-1.1.0.tgz", - "integrity": "sha1-8CQcRXMKn8YyOyBtvzjtx0HQuxA=", + "resolved": "https://registry.npmjs.org/arr-flatten/-/arr-flatten-1.1.0.tgz", + "integrity": "sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg==", + "dev": true + }, + "arr-union": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/arr-union/-/arr-union-3.1.0.tgz", + "integrity": "sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ=", + "dev": true + }, + "array-equal": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/array-equal/-/array-equal-1.0.0.tgz", + "integrity": "sha1-jCpe8kcv2ep0KwTHenUJO6J1fJM=" + }, + "array-flatten": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-2.1.2.tgz", + "integrity": "sha512-hNfzcOV8W4NdualtqBFPyVO+54DSJuZGY9qT4pRroB6S9e3iiido2ISIC5h9R2sPJ8H3FHCIiEnsv1lPXO3KtQ==", + "dev": true + }, + "array-from": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/array-from/-/array-from-2.1.1.tgz", + "integrity": "sha1-z+nYwmYoudxa7MYqn12PHzUsEZU=", + "dev": true + }, + "array-union": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/array-union/-/array-union-1.0.2.tgz", + "integrity": "sha1-mjRBDk9OPaI96jdb5b5w8kd47Dk=", + "dev": true, + "requires": { + "array-uniq": "^1.0.1" + } + }, + "array-uniq": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/array-uniq/-/array-uniq-1.0.3.tgz", + "integrity": "sha1-r2rId6Jcx/dOBYiUdThY39sk/bY=", + "dev": true + }, + "array-unique": { + "version": "0.3.2", + "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz", + "integrity": "sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=", + "dev": true + }, + "arraybuffer.slice": { + "version": "0.0.7", + "resolved": "https://registry.npmjs.org/arraybuffer.slice/-/arraybuffer.slice-0.0.7.tgz", + "integrity": "sha512-wGUIVQXuehL5TCqQun8OW81jGzAWycqzFF8lFp+GOM5BXLYj3bKNsYC4daB7n6XjCqxQA/qgTJ+8ANR3acjrog==", + "dev": true + }, + "arrify": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz", + "integrity": "sha1-iYUI2iIm84DfkEcoRWhJwVAaSw0=", + "dev": true + }, + "asap": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/asap/-/asap-1.0.0.tgz", + "integrity": "sha1-sqRdpf36ILBJb8N2jMJ8EvqRan0=" + }, + "asn1": { + "version": "0.2.4", + "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.4.tgz", + "integrity": "sha512-jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg==", + "requires": { + "safer-buffer": "~2.1.0" + } + }, + "asn1.js": { + "version": "4.10.1", + "resolved": "https://registry.npmjs.org/asn1.js/-/asn1.js-4.10.1.tgz", + "integrity": "sha512-p32cOF5q0Zqs9uBiONKYLm6BClCoBCM5O9JfeUSlnQLBTxYdTK+pW+nXflm8UkKd2UYlEbYz5qEi0JuZR9ckSw==", + "dev": true, + "requires": { + "bn.js": "^4.0.0", + "inherits": "^2.0.1", + "minimalistic-assert": "^1.0.0" + } + }, + "assert": { + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/assert/-/assert-1.5.0.tgz", + "integrity": "sha512-EDsgawzwoun2CZkCgtxJbv392v4nbk9XDD06zI+kQYoBM/3RBWLlEyJARDOmhAAosBjWACEkKL6S+lIZtcAubA==", "dev": true, "requires": { - "date-now": "^0.1.4" + "object-assign": "^4.1.1", + "util": "0.10.3" + }, + "dependencies": { + "inherits": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz", + "integrity": "sha1-sX0I0ya0Qj5Wjv9xn5GwscvfafE=", + "dev": true + }, + "util": { + "version": "0.10.3", + "resolved": "https://registry.npmjs.org/util/-/util-0.10.3.tgz", + "integrity": "sha1-evsa/lCAUkZInj23/g7TeTNqwPk=", + "dev": true, + "requires": { + "inherits": "2.0.1" + } + } } }, - "constantinople": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/constantinople/-/constantinople-3.0.2.tgz", - "integrity": "sha1-S5RdmTeQe82Y7ldRIsOBdRZUQUE=", - "requires": { - "acorn": "^2.1.0" - } + "assert-plus": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz", + "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=" }, - "constants-browserify": { + "assertion-error": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/assertion-error/-/assertion-error-1.1.0.tgz", + "integrity": "sha512-jgsaNduz+ndvGyFt3uSuWqvy4lCnIJiovtouQN5JZHOKCS2QuhEdbcQHFhVksz2N2U9hXJo8odG7ETyWlEeuDw==", + "dev": true + }, + "assign-symbols": { "version": "1.0.0", - "resolved": "https://registry.npmjs.org/constants-browserify/-/constants-browserify-1.0.0.tgz", - "integrity": "sha1-wguW2MYXdIqvHBYCF2DNJ/y4y3U=", + "resolved": "https://registry.npmjs.org/assign-symbols/-/assign-symbols-1.0.0.tgz", + "integrity": "sha1-WWZ/QfrdTyDMvCu5a41Pf3jsA2c=", "dev": true }, - "content-disposition": { - "version": "0.5.3", - "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.3.tgz", - "integrity": "sha512-ExO0774ikEObIAEV9kDo50o+79VCUdEB6n6lzKgGwupcVeRlhrj3qGAfwq8G6uBJjkqLrhT0qEYFcWng8z1z0g==", + "ast-types-flow": { + "version": "0.0.7", + "resolved": "https://registry.npmjs.org/ast-types-flow/-/ast-types-flow-0.0.7.tgz", + "integrity": "sha1-9wtzXGvKGlycItmCw+Oef+ujva0=", + "dev": true + }, + "async": { + "version": "2.6.3", + "resolved": "https://registry.npmjs.org/async/-/async-2.6.3.tgz", + "integrity": "sha512-zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg==", "dev": true, "requires": { - "safe-buffer": "5.1.2" - }, - "dependencies": { - "safe-buffer": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", - "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==", - "dev": true - } + "lodash": "^4.17.14" } }, - "content-security-policy-builder": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/content-security-policy-builder/-/content-security-policy-builder-2.1.0.tgz", - "integrity": "sha512-/MtLWhJVvJNkA9dVLAp6fg9LxD2gfI6R2Fi1hPmfjYXSahJJzcfvoeDOxSyp4NvxMuwWv3WMssE9o31DoULHrQ==" + "async-each": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/async-each/-/async-each-1.0.3.tgz", + "integrity": "sha512-z/WhQ5FPySLdvREByI2vZiTWwCnF0moMJ1hK9YQwDTHKh6I7/uSckMetoRGb5UBZPC1z0jlw+n/XCgjeH7y1AQ==", + "dev": true }, - "content-type": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.4.tgz", - "integrity": "sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA==", + "async-limiter": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/async-limiter/-/async-limiter-1.0.1.tgz", + "integrity": "sha512-csOlWGAcRFJaI6m+F2WKdnMKr4HhdhFVBk0H/QbJFMCr+uO2kwohwXQPxw/9OCxp05r5ghVBFSyioixx3gfkNQ==", "dev": true }, - "convert-source-map": { - "version": "1.6.0", - "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.6.0.tgz", - "integrity": "sha512-eFu7XigvxdZ1ETfbgPBohgyQ/Z++C0eEhTor0qRwBw9unw+L0/6V8wkSuGgzdThkiS5lSpdptOQPD8Ak40a+7A==", + "asynckit": { + "version": "0.4.0", + "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz", + "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k=" + }, + "atob": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/atob/-/atob-2.1.2.tgz", + "integrity": "sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==", + "dev": true + }, + "autoprefixer": { + "version": "9.6.1", + "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-9.6.1.tgz", + "integrity": "sha512-aVo5WxR3VyvyJxcJC3h4FKfwCQvQWb1tSI5VHNibddCVWrcD1NvlxEweg3TSgiPztMnWfjpy2FURKA2kvDE+Tw==", "dev": true, "requires": { - "safe-buffer": "~5.1.1" - }, - "dependencies": { - "safe-buffer": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", - "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==", - "dev": true - } + "browserslist": "^4.6.3", + "caniuse-lite": "^1.0.30000980", + "chalk": "^2.4.2", + "normalize-range": "^0.1.2", + "num2fraction": "^1.2.2", + "postcss": "^7.0.17", + "postcss-value-parser": "^4.0.0" } }, - "convict": { - "version": "4.4.1", - "resolved": "https://registry.npmjs.org/convict/-/convict-4.4.1.tgz", - "integrity": "sha512-celpR4hOWWwb/S8azhzgQwDon6muAJlNe2LTLeOGyoSgH390TsaqoieAe9BLbAv7+9wNfG7DTA2q3IfFp2viKw==", + "aws-sdk": { + "version": "2.615.0", + "resolved": "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.615.0.tgz", + "integrity": "sha512-ktkOQgJLTcsfLzy/GPfUiEJd09SeJPnUj7ZeXa0Wb2/JVIRDbSmyG/IYQqAvXWUcD4thuv2h9wbLgXyzvX8dtw==", "requires": { - "depd": "1.1.2", - "json5": "1.0.1", - "lodash.clonedeep": "4.5.0", - "moment": "2.22.2", - "validator": "10.8.0", - "yargs-parser": "11.0.0" + "buffer": "4.9.1", + "events": "1.1.1", + "ieee754": "1.1.13", + "jmespath": "0.15.0", + "querystring": "0.2.0", + "sax": "1.2.1", + "url": "0.10.3", + "uuid": "3.3.2", + "xml2js": "0.4.19" }, "dependencies": { - "moment": { - "version": "2.22.2", - "resolved": "https://registry.npmjs.org/moment/-/moment-2.22.2.tgz", - "integrity": "sha1-PCV/mDn8DpP/UxSWMiOeuQeD/2Y=" - }, - "yargs-parser": { - "version": "11.0.0", - "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-11.0.0.tgz", - "integrity": "sha512-dvsafRjM45h79WOTvS/dP35Sb31SlGAKz6tFjI97kGC4MJFBuzTZY6TTYHrz0QSMQdkyd8Y+RsOMLr+JY0nPFQ==", + "url": { + "version": "0.10.3", + "resolved": "https://registry.npmjs.org/url/-/url-0.10.3.tgz", + "integrity": "sha1-Ah5NnHcF8hu/N9A861h2dAJ3TGQ=", "requires": { - "camelcase": "^5.0.0", - "decamelize": "^1.2.0" + "punycode": "1.3.2", + "querystring": "0.2.0" } + }, + "uuid": { + "version": "3.3.2", + "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.3.2.tgz", + "integrity": "sha512-yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA==" } } }, - "cookie": { - "version": "0.3.1", - "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.3.1.tgz", - "integrity": "sha1-5+Ch+e9DtMi6klxcWpboBtFoc7s=" - }, - "cookie-parser": { - "version": "1.4.4", - "resolved": "https://registry.npmjs.org/cookie-parser/-/cookie-parser-1.4.4.tgz", - "integrity": "sha512-lo13tqF3JEtFO7FyA49CqbhaFkskRJ0u/UAiINgrIXeRCY41c88/zxtrECl8AKH3B0hj9q10+h3Kt8I7KlW4tw==", + "aws-sdk-mock": { + "version": "4.5.0", + "resolved": "https://registry.npmjs.org/aws-sdk-mock/-/aws-sdk-mock-4.5.0.tgz", + "integrity": "sha512-PAZKbQsdaVVoMr1JZbi04FUrkxCK16qnwBWLm4keeBrEfqYab/cFNsn5IVp/ThdMQpJGYHnmqUPyFq1plKaHZg==", + "dev": true, "requires": { - "cookie": "0.3.1", - "cookie-signature": "1.0.6" + "aws-sdk": "^2.483.0", + "sinon": "^7.3.2", + "traverse": "^0.6.6" } }, - "cookie-signature": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz", - "integrity": "sha1-4wOogrNCzD7oylE6eZmXNNqzriw=" + "aws-sign2": { + "version": "0.7.0", + "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz", + "integrity": "sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg=" }, - "cookiejar": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/cookiejar/-/cookiejar-2.1.2.tgz", - "integrity": "sha512-Mw+adcfzPxcPeI+0WlvRrr/3lGVO0bD75SxX6811cxSh1Wbxx7xZBGK1eVtDf6si8rg2lhnUjsVLMFMfbRIuwA==", - "dev": true + "aws4": { + "version": "1.9.1", + "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.9.1.tgz", + "integrity": "sha512-wMHVg2EOHaMRxbzgFJ9gtjOOCrI80OHLG14rxi28XwOW8ux6IiEbRCGGGqCtdAIg4FQCbW20k9RsT4y3gJlFug==" }, - "cookies": { - "version": "0.7.3", - "resolved": "https://registry.npmjs.org/cookies/-/cookies-0.7.3.tgz", - "integrity": "sha512-+gixgxYSgQLTaTIilDHAdlNPZDENDQernEMiIcZpYYP14zgHsCt4Ce1FEjFtcp6GefhozebB6orvhAAWx/IS0A==", + "axios": { + "version": "0.19.2", + "resolved": "https://registry.npmjs.org/axios/-/axios-0.19.2.tgz", + "integrity": "sha512-fjgm5MvRHLhx+osE2xoekY70AhARk3a6hkN+3Io1jc00jtquGvxYlKlsFUhmUET0V5te6CcZI7lcv2Ym61mjHA==", "requires": { - "depd": "~1.1.2", - "keygrip": "~1.0.3" + "follow-redirects": "1.5.10" } }, - "copy-concurrently": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/copy-concurrently/-/copy-concurrently-1.0.5.tgz", - "integrity": "sha512-f2domd9fsVDFtaFcbaRZuYXwtdmnzqbADSwhSWYxYB/Q8zsdUUFMXVRwXGDMWmbEzAn1kdRrtI1T/KTFOL4X2A==", + "axobject-query": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/axobject-query/-/axobject-query-2.0.2.tgz", + "integrity": "sha512-MCeek8ZH7hKyO1rWUbKNQBbl4l2eY0ntk7OGi+q0RlafrCnfPxC06WZA+uebCfmYp4mNU9jRBP1AhGyf8+W3ww==", "dev": true, "requires": { - "aproba": "^1.1.1", - "fs-write-stream-atomic": "^1.0.8", - "iferr": "^0.1.5", - "mkdirp": "^0.5.1", - "rimraf": "^2.5.4", - "run-queue": "^1.0.0" + "ast-types-flow": "0.0.7" } }, - "copy-descriptor": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/copy-descriptor/-/copy-descriptor-0.1.1.tgz", - "integrity": "sha1-Z29us8OZl8LuGsOpJP1hJHSPV40=", - "dev": true - }, - "copy-webpack-plugin": { - "version": "5.0.4", - "resolved": "https://registry.npmjs.org/copy-webpack-plugin/-/copy-webpack-plugin-5.0.4.tgz", - "integrity": "sha512-YBuYGpSzoCHSSDGyHy6VJ7SHojKp6WHT4D7ItcQFNAYx2hrwkMe56e97xfVR0/ovDuMTrMffXUiltvQljtAGeg==", + "babel-code-frame": { + "version": "6.26.0", + "resolved": "https://registry.npmjs.org/babel-code-frame/-/babel-code-frame-6.26.0.tgz", + "integrity": "sha1-Y/1D99weO7fONZR9uP42mj9Yx0s=", "dev": true, "requires": { - "cacache": "^11.3.3", - "find-cache-dir": "^2.1.0", - "glob-parent": "^3.1.0", - "globby": "^7.1.1", - "is-glob": "^4.0.1", - "loader-utils": "^1.2.3", - "minimatch": "^3.0.4", - "normalize-path": "^3.0.0", - "p-limit": "^2.2.0", - "schema-utils": "^1.0.0", - "serialize-javascript": "^1.7.0", - "webpack-log": "^2.0.0" + "chalk": "^1.1.3", + "esutils": "^2.0.2", + "js-tokens": "^3.0.2" }, "dependencies": { - "normalize-path": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz", - "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==", + "ansi-regex": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz", + "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=", + "dev": true + }, + "ansi-styles": { + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz", + "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=", + "dev": true + }, + "chalk": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz", + "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=", + "dev": true, + "requires": { + "ansi-styles": "^2.2.1", + "escape-string-regexp": "^1.0.2", + "has-ansi": "^2.0.0", + "strip-ansi": "^3.0.0", + "supports-color": "^2.0.0" + } + }, + "strip-ansi": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz", + "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=", + "dev": true, + "requires": { + "ansi-regex": "^2.0.0" + } + }, + "supports-color": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz", + "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=", "dev": true } } }, - "core-js": { - "version": "2.6.9", - "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.9.tgz", - "integrity": "sha512-HOpZf6eXmnl7la+cUdMnLvUxKNqLUzJvgIziQ0DiF3JwSImNphIqdGqzj6hIKyX04MmV0poclQ7+wjWvxQyR2A==" - }, - "core-util-is": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz", - "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=" - }, - "cosmiconfig": { - "version": "5.2.1", - "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-5.2.1.tgz", - "integrity": "sha512-H65gsXo1SKjf8zmrJ67eJk8aIRKV5ff2D4uKZIBZShbhGSpEmsQOPW/SKMKYhSTrqR7ufy6RP69rPogdaPh/kA==", + "babel-generator": { + "version": "6.26.1", + "resolved": "https://registry.npmjs.org/babel-generator/-/babel-generator-6.26.1.tgz", + "integrity": "sha512-HyfwY6ApZj7BYTcJURpM5tznulaBvyio7/0d4zFOeMPUmfxkCjHocCuoLa2SAGzBI8AREcH3eP3758F672DppA==", "dev": true, "requires": { - "import-fresh": "^2.0.0", - "is-directory": "^0.3.1", - "js-yaml": "^3.13.1", - "parse-json": "^4.0.0" + "babel-messages": "^6.23.0", + "babel-runtime": "^6.26.0", + "babel-types": "^6.26.0", + "detect-indent": "^4.0.0", + "jsesc": "^1.3.0", + "lodash": "^4.17.4", + "source-map": "^0.5.7", + "trim-right": "^1.0.1" + }, + "dependencies": { + "source-map": { + "version": "0.5.7", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz", + "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=", + "dev": true + } } }, - "cp-file": { - "version": "6.2.0", - "resolved": "https://registry.npmjs.org/cp-file/-/cp-file-6.2.0.tgz", - "integrity": "sha512-fmvV4caBnofhPe8kOcitBwSn2f39QLjnAnGq3gO9dfd75mUytzKNZB1hde6QHunW2Rt+OwuBOMc3i1tNElbszA==", + "babel-messages": { + "version": "6.23.0", + "resolved": "https://registry.npmjs.org/babel-messages/-/babel-messages-6.23.0.tgz", + "integrity": "sha1-8830cDhYA1sqKVHG7F7fbGLyYw4=", "dev": true, "requires": { - "graceful-fs": "^4.1.2", - "make-dir": "^2.0.0", - "nested-error-stacks": "^2.0.0", - "pify": "^4.0.1", - "safe-buffer": "^5.0.1" + "babel-runtime": "^6.22.0" } }, - "create-ecdh": { - "version": "4.0.3", - "resolved": "https://registry.npmjs.org/create-ecdh/-/create-ecdh-4.0.3.tgz", - "integrity": "sha512-GbEHQPMOswGpKXM9kCWVrremUcBmjteUaQ01T9rkKCPDXfUHX0IoP9LpHYo2NPFampa4e+/pFDc3jQdxrxQLaw==", + "babel-runtime": { + "version": "6.26.0", + "resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.26.0.tgz", + "integrity": "sha1-llxwWGaOgrVde/4E/yM3vItWR/4=", "dev": true, "requires": { - "bn.js": "^4.1.0", - "elliptic": "^6.0.0" + "core-js": "^2.4.0", + "regenerator-runtime": "^0.11.0" } }, - "create-error-class": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/create-error-class/-/create-error-class-3.0.2.tgz", - "integrity": "sha1-Br56vvlHo/FKMP1hBnHUAbyot7Y=", + "babel-template": { + "version": "6.26.0", + "resolved": "https://registry.npmjs.org/babel-template/-/babel-template-6.26.0.tgz", + "integrity": "sha1-3gPi0WOWsGn0bdn/+FIfsaDjXgI=", "dev": true, "requires": { - "capture-stack-trace": "^1.0.0" + "babel-runtime": "^6.26.0", + "babel-traverse": "^6.26.0", + "babel-types": "^6.26.0", + "babylon": "^6.18.0", + "lodash": "^4.17.4" } }, - "create-hash": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/create-hash/-/create-hash-1.2.0.tgz", - "integrity": "sha512-z00bCGNHDG8mHAkP7CtT1qVu+bFQUPjYq/4Iv3C3kWjTFV10zIjfSoeqXo9Asws8gwSHDGj/hl2u4OGIjapeCg==", + "babel-traverse": { + "version": "6.26.0", + "resolved": "https://registry.npmjs.org/babel-traverse/-/babel-traverse-6.26.0.tgz", + "integrity": "sha1-RqnL1+3MYsjlwGTi0tjQ9ANXZu4=", "dev": true, "requires": { - "cipher-base": "^1.0.1", - "inherits": "^2.0.1", - "md5.js": "^1.3.4", - "ripemd160": "^2.0.1", - "sha.js": "^2.4.0" + "babel-code-frame": "^6.26.0", + "babel-messages": "^6.23.0", + "babel-runtime": "^6.26.0", + "babel-types": "^6.26.0", + "babylon": "^6.18.0", + "debug": "^2.6.8", + "globals": "^9.18.0", + "invariant": "^2.2.2", + "lodash": "^4.17.4" + }, + "dependencies": { + "debug": { + "version": "2.6.9", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", + "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", + "dev": true, + "requires": { + "ms": "2.0.0" + } + } } }, - "create-hmac": { - "version": "1.1.7", - "resolved": "https://registry.npmjs.org/create-hmac/-/create-hmac-1.1.7.tgz", - "integrity": "sha512-MJG9liiZ+ogc4TzUwuvbER1JRdgvUFSB5+VR/g5h82fGaIRWMWddtKBHi7/sVhfjQZ6SehlyhvQYrcYkaUIpLg==", + "babel-types": { + "version": "6.26.0", + "resolved": "https://registry.npmjs.org/babel-types/-/babel-types-6.26.0.tgz", + "integrity": "sha1-o7Bz+Uq0nrb6Vc1lInozQ4BjJJc=", "dev": true, "requires": { - "cipher-base": "^1.0.3", - "create-hash": "^1.1.0", - "inherits": "^2.0.1", - "ripemd160": "^2.0.0", - "safe-buffer": "^5.0.1", - "sha.js": "^2.4.8" + "babel-runtime": "^6.26.0", + "esutils": "^2.0.2", + "lodash": "^4.17.4", + "to-fast-properties": "^1.0.3" } }, - "cross-env": { - "version": "5.2.1", - "resolved": "https://registry.npmjs.org/cross-env/-/cross-env-5.2.1.tgz", - "integrity": "sha512-1yHhtcfAd1r4nwQgknowuUNfIT9E8dOMMspC36g45dN+iD1blloi7xp8X/xAIDnjHWyt1uQ8PHk2fkNaym7soQ==", + "babylon": { + "version": "6.18.0", + "resolved": "https://registry.npmjs.org/babylon/-/babylon-6.18.0.tgz", + "integrity": "sha512-q/UEjfGJ2Cm3oKV71DJz9d25TPnq5rhBVL2Q4fA5wcC3jcrdn7+SssEybFIxwAvvP+YCsCYNKughoF33GxgycQ==", + "dev": true + }, + "backo2": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/backo2/-/backo2-1.0.2.tgz", + "integrity": "sha1-MasayLEpNjRj41s+u2n038+6eUc=", + "dev": true + }, + "balanced-match": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz", + "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=" + }, + "base": { + "version": "0.11.2", + "resolved": "https://registry.npmjs.org/base/-/base-0.11.2.tgz", + "integrity": "sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg==", "dev": true, "requires": { - "cross-spawn": "^6.0.5" + "cache-base": "^1.0.1", + "class-utils": "^0.3.5", + "component-emitter": "^1.2.1", + "define-property": "^1.0.0", + "isobject": "^3.0.1", + "mixin-deep": "^1.2.0", + "pascalcase": "^0.1.1" }, "dependencies": { - "cross-spawn": { - "version": "6.0.5", - "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz", - "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==", + "define-property": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz", + "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=", "dev": true, "requires": { - "nice-try": "^1.0.4", - "path-key": "^2.0.1", - "semver": "^5.5.0", - "shebang-command": "^1.2.0", - "which": "^1.2.9" + "is-descriptor": "^1.0.0" + } + }, + "is-accessor-descriptor": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz", + "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==", + "dev": true, + "requires": { + "kind-of": "^6.0.0" + } + }, + "is-data-descriptor": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz", + "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==", + "dev": true, + "requires": { + "kind-of": "^6.0.0" + } + }, + "is-descriptor": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz", + "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==", + "dev": true, + "requires": { + "is-accessor-descriptor": "^1.0.0", + "is-data-descriptor": "^1.0.0", + "kind-of": "^6.0.2" } + }, + "kind-of": { + "version": "6.0.3", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz", + "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==", + "dev": true } } }, - "cross-spawn": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-4.0.2.tgz", - "integrity": "sha1-e5JHYhwjrf3ThWAEqCPL45dCTUE=", - "requires": { - "lru-cache": "^4.0.1", - "which": "^1.2.9" - } + "base64-arraybuffer": { + "version": "0.1.5", + "resolved": "https://registry.npmjs.org/base64-arraybuffer/-/base64-arraybuffer-0.1.5.tgz", + "integrity": "sha1-c5JncZI7Whl0etZmqlzUv5xunOg=", + "dev": true }, - "crypto-browserify": { - "version": "3.12.0", - "resolved": "https://registry.npmjs.org/crypto-browserify/-/crypto-browserify-3.12.0.tgz", - "integrity": "sha512-fz4spIh+znjO2VjL+IdhEpRJ3YN6sMzITSBijk6FK2UvTqruSQW+/cCZTSNsMiZNvUeq0CqurF+dAbyiGOY6Wg==", - "dev": true, + "base64-js": { + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.3.1.tgz", + "integrity": "sha512-mLQ4i2QO1ytvGWFWmcngKO//JXAQueZvwEKtjgQFM4jIK0kU+ytMfplL8j+n5mspOfjHwoAg+9yhb7BwAHm36g==" + }, + "base64id": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/base64id/-/base64id-1.0.0.tgz", + "integrity": "sha1-R2iMuZu2gE8OBtPnY7HDLlfY5rY=", + "dev": true + }, + "basic-auth": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/basic-auth/-/basic-auth-2.0.1.tgz", + "integrity": "sha512-NF+epuEdnUYVlGuhaxbbq+dvJttwLnGY+YixlXlME5KpQ5W3CnXA5cVTneY3SPbPDRkcjMbifrwmFYcClgOZeg==", "requires": { - "browserify-cipher": "^1.0.0", - "browserify-sign": "^4.0.0", - "create-ecdh": "^4.0.0", - "create-hash": "^1.1.0", - "create-hmac": "^1.1.0", - "diffie-hellman": "^5.0.0", - "inherits": "^2.0.1", - "pbkdf2": "^3.0.3", - "public-encrypt": "^4.0.0", - "randombytes": "^2.0.0", - "randomfill": "^1.0.3" + "safe-buffer": "5.1.2" + }, + "dependencies": { + "safe-buffer": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", + "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==" + } } }, - "crypto-random-string": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/crypto-random-string/-/crypto-random-string-1.0.0.tgz", - "integrity": "sha1-ojD2T1aDEOFJgAmUB5DsmVRbyn4=", + "batch": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/batch/-/batch-0.6.1.tgz", + "integrity": "sha1-3DQxT05nkxgJP8dgJyUl+UvyXBY=", "dev": true }, - "css": { - "version": "1.0.8", - "resolved": "https://registry.npmjs.org/css/-/css-1.0.8.tgz", - "integrity": "sha1-k4aBHKgrzMnuf7WnMrHioxfIo+c=", + "bcrypt-nodejs": { + "version": "0.0.3", + "resolved": "https://registry.npmjs.org/bcrypt-nodejs/-/bcrypt-nodejs-0.0.3.tgz", + "integrity": "sha1-xgkX8m3CNWYVZsaBBhwwPCsohCs=" + }, + "bcrypt-pbkdf": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz", + "integrity": "sha1-pDAdOJtqQ/m2f/PKEaP2Y342Dp4=", "requires": { - "css-parse": "1.0.4", - "css-stringify": "1.0.5" + "tweetnacl": "^0.14.3" } }, - "css-parse": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/css-parse/-/css-parse-1.0.4.tgz", - "integrity": "sha1-OLBQP7+dqfVOnB29pg4UXHcRe90=" - }, - "css-selector-tokenizer": { - "version": "0.7.1", - "resolved": "https://registry.npmjs.org/css-selector-tokenizer/-/css-selector-tokenizer-0.7.1.tgz", - "integrity": "sha512-xYL0AMZJ4gFzJQsHUKa5jiWWi2vH77WVNg7JYRyewwj6oPh4yb/y6Y9ZCw9dsj/9UauMhtuxR+ogQd//EdEVNA==", + "better-assert": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/better-assert/-/better-assert-1.0.2.tgz", + "integrity": "sha1-QIZrnhueC1W0gYlDEeaPr/rrxSI=", "dev": true, "requires": { - "cssesc": "^0.1.0", - "fastparse": "^1.1.1", - "regexpu-core": "^1.0.0" + "callsite": "1.0.0" } }, - "css-stringify": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/css-stringify/-/css-stringify-1.0.5.tgz", - "integrity": "sha1-sNBClG2ylTu50pKQCmy19tASIDE=" + "big.js": { + "version": "5.2.2", + "resolved": "https://registry.npmjs.org/big.js/-/big.js-5.2.2.tgz", + "integrity": "sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==", + "dev": true }, - "cssauron": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/cssauron/-/cssauron-1.4.0.tgz", - "integrity": "sha1-pmAt/34EqDBtwNuaVR6S6LVmKtg=", + "binary-extensions": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.0.0.tgz", + "integrity": "sha512-Phlt0plgpIIBOGTT/ehfFnbNlfsDEiqmzE2KRXoX1bLIlir4X/MR+zSyBEkL05ffWgnRSf/DXv+WrUAVr93/ow==", + "dev": true + }, + "bindings": { + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/bindings/-/bindings-1.5.0.tgz", + "integrity": "sha512-p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ==", "dev": true, + "optional": true, "requires": { - "through": "X.X.X" + "file-uri-to-path": "1.0.0" } }, - "cssesc": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/cssesc/-/cssesc-0.1.0.tgz", - "integrity": "sha1-yBSQPkViM3GgR3tAEJqq++6t27Q=", - "dev": true + "bintrees": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/bintrees/-/bintrees-1.0.1.tgz", + "integrity": "sha1-DmVcm5wkNeqraL9AJyJtK1WjRSQ=" }, - "cssom": { - "version": "0.3.8", - "resolved": "https://registry.npmjs.org/cssom/-/cssom-0.3.8.tgz", - "integrity": "sha512-b0tGHbfegbhPJpxpiBPU2sCkigAqtM9O121le6bbOlgyV+NyGyCmVfJ6QW9eRjz8CpNfWEOYBIMIGRYkLwsIYg==" + "blob": { + "version": "0.0.5", + "resolved": "https://registry.npmjs.org/blob/-/blob-0.0.5.tgz", + "integrity": "sha512-gaqbzQPqOoamawKg0LGVd7SzLgXS+JH61oWprSLH+P+abTczqJbhTR8CmJ2u9/bUYNmHTGJx/UEmn6doAvvuig==", + "dev": true }, - "cssstyle": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/cssstyle/-/cssstyle-1.4.0.tgz", - "integrity": "sha512-GBrLZYZ4X4x6/QEoBnIrqb8B/f5l4+8me2dkom/j1Gtbxy0kBv6OGzKuAsGM75bkGwGAFkt56Iwg28S3XTZgSA==", + "blocking-proxy": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/blocking-proxy/-/blocking-proxy-1.0.1.tgz", + "integrity": "sha512-KE8NFMZr3mN2E0HcvCgRtX7DjhiIQrwle+nSVJVC/yqFb9+xznHl2ZcoBp2L9qzkI4t4cBFJ1efXF8Dwi132RA==", + "dev": true, "requires": { - "cssom": "0.3.x" + "minimist": "^1.2.0" } }, - "csvtojson": { - "version": "2.0.10", - "resolved": "https://registry.npmjs.org/csvtojson/-/csvtojson-2.0.10.tgz", - "integrity": "sha512-lUWFxGKyhraKCW8Qghz6Z0f2l/PqB1W3AO0HKJzGIQ5JRSlR651ekJDiGJbBT4sRNNv5ddnSGVEnsxP9XRCVpQ==", + "bluebird": { + "version": "3.7.2", + "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.7.2.tgz", + "integrity": "sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==" + }, + "bn.js": { + "version": "4.11.8", + "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.8.tgz", + "integrity": "sha512-ItfYfPLkWHUjckQCk8xC+LwxgK8NYcXywGigJgSwOP8Y2iyWT4f2vsZnoOXTTbo+o5yXmIUJ4gn5538SO5S3gA==", + "dev": true + }, + "body-parser": { + "version": "1.19.0", + "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.19.0.tgz", + "integrity": "sha512-dhEPs72UPbDnAQJ9ZKMNTP6ptJaionhP5cBb541nXPlW60Jepo9RV/a4fX4XWW9CuFNK22krhrj1+rgzifNCsw==", + "dev": true, "requires": { - "bluebird": "^3.5.1", - "lodash": "^4.17.3", - "strip-bom": "^2.0.0" + "bytes": "3.1.0", + "content-type": "~1.0.4", + "debug": "2.6.9", + "depd": "~1.1.2", + "http-errors": "1.7.2", + "iconv-lite": "0.4.24", + "on-finished": "~2.3.0", + "qs": "6.7.0", + "raw-body": "2.4.0", + "type-is": "~1.6.17" }, "dependencies": { - "strip-bom": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz", - "integrity": "sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=", + "debug": { + "version": "2.6.9", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", + "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", + "dev": true, "requires": { - "is-utf8": "^0.2.0" + "ms": "2.0.0" + } + }, + "http-errors": { + "version": "1.7.2", + "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.7.2.tgz", + "integrity": "sha512-uUQBt3H/cSIVfch6i1EuPNy/YsRSOUBXTVfZ+yR7Zjez3qjBz6i9+i4zjNaoqcoFVI4lQJ5plg63TvGfRSDCRg==", + "dev": true, + "requires": { + "depd": "~1.1.2", + "inherits": "2.0.3", + "setprototypeof": "1.1.1", + "statuses": ">= 1.5.0 < 2", + "toidentifier": "1.0.0" + } + }, + "inherits": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz", + "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=", + "dev": true + }, + "qs": { + "version": "6.7.0", + "resolved": "https://registry.npmjs.org/qs/-/qs-6.7.0.tgz", + "integrity": "sha512-VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ==", + "dev": true + }, + "raw-body": { + "version": "2.4.0", + "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.4.0.tgz", + "integrity": "sha512-4Oz8DUIwdvoa5qMJelxipzi/iJIi40O5cGV1wNYp5hvZP8ZN0T+jiNkL0QepXs+EsQ9XJ8ipEDoiH70ySUJP3Q==", + "dev": true, + "requires": { + "bytes": "3.1.0", + "http-errors": "1.7.2", + "iconv-lite": "0.4.24", + "unpipe": "1.0.0" } } } }, - "custom-event": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/custom-event/-/custom-event-1.0.1.tgz", - "integrity": "sha1-XQKkaFCt8bSjF5RqOSj8y1v9BCU=", - "dev": true - }, - "cyclist": { - "version": "0.2.2", - "resolved": "https://registry.npmjs.org/cyclist/-/cyclist-0.2.2.tgz", - "integrity": "sha1-GzN5LhHpFKL9bW7WRHRkRE5fpkA=", - "dev": true - }, - "damerau-levenshtein": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/damerau-levenshtein/-/damerau-levenshtein-1.0.5.tgz", - "integrity": "sha512-CBCRqFnpu715iPmw1KrdOrzRqbdFwQTwAWyyyYS42+iAgHCuXZ+/TdMgQkUENPomxEz9z1BEzuQU2Xw0kUuAgA==", - "dev": true - }, - "dashdash": { - "version": "1.14.1", - "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz", - "integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=", + "bonjour": { + "version": "3.5.0", + "resolved": "https://registry.npmjs.org/bonjour/-/bonjour-3.5.0.tgz", + "integrity": "sha1-jokKGD2O6aI5OzhExpGkK897yfU=", + "dev": true, "requires": { - "assert-plus": "^1.0.0" + "array-flatten": "^2.1.0", + "deep-equal": "^1.0.1", + "dns-equal": "^1.0.0", + "dns-txt": "^2.0.2", + "multicast-dns": "^6.0.1", + "multicast-dns-service-types": "^1.1.0" } }, - "dasherize": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/dasherize/-/dasherize-2.0.0.tgz", - "integrity": "sha1-bYCcnNDPe7iVLYD8hPoT1H3bEwg=" + "boolbase": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz", + "integrity": "sha1-aN/1++YMUes3cl6p4+0xDcwed24=" }, - "data-urls": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/data-urls/-/data-urls-1.1.0.tgz", - "integrity": "sha512-YTWYI9se1P55u58gL5GkQHW4P6VJBJ5iBT+B5a7i2Tjadhv52paJG0qHX4A0OR6/t52odI64KP2YvFpkDOi3eQ==", + "bowser": { + "version": "2.9.0", + "resolved": "https://registry.npmjs.org/bowser/-/bowser-2.9.0.tgz", + "integrity": "sha512-2ld76tuLBNFekRgmJfT2+3j5MIrP6bFict8WAIT3beq+srz1gcKNAdNKMqHqauQt63NmAa88HfP1/Ypa9Er3HA==" + }, + "boxen": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/boxen/-/boxen-1.3.0.tgz", + "integrity": "sha512-TNPjfTr432qx7yOjQyaXm3dSR0MH9vXp7eT1BFSl/C51g+EFnOR9hTg1IreahGBmDNCehscshe45f+C1TBZbLw==", + "dev": true, "requires": { - "abab": "^2.0.0", - "whatwg-mimetype": "^2.2.0", - "whatwg-url": "^7.0.0" + "ansi-align": "^2.0.0", + "camelcase": "^4.0.0", + "chalk": "^2.0.1", + "cli-boxes": "^1.0.0", + "string-width": "^2.0.0", + "term-size": "^1.2.0", + "widest-line": "^2.0.0" + }, + "dependencies": { + "ansi-regex": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz", + "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=", + "dev": true + }, + "camelcase": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-4.1.0.tgz", + "integrity": "sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0=", + "dev": true + }, + "string-width": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz", + "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==", + "dev": true, + "requires": { + "is-fullwidth-code-point": "^2.0.0", + "strip-ansi": "^4.0.0" + } + }, + "strip-ansi": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz", + "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", + "dev": true, + "requires": { + "ansi-regex": "^3.0.0" + } + } } }, - "date-fns": { - "version": "1.30.1", - "resolved": "https://registry.npmjs.org/date-fns/-/date-fns-1.30.1.tgz", - "integrity": "sha512-hBSVCvSmWC+QypYObzwGOd9wqdDpOt+0wl0KbU+R+uuZBS1jN8VsD1ss3irQDknRj5NvxiTF6oj/nDRnN/UQNw==" - }, - "date-format": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/date-format/-/date-format-2.1.0.tgz", - "integrity": "sha512-bYQuGLeFxhkxNOF3rcMtiZxvCBAquGzZm6oWA1oZ0g2THUzivaRhv8uOhdr19LmoobSOLoIAxeUK2RdbM8IFTA==", - "dev": true - }, - "date-now": { - "version": "0.1.4", - "resolved": "https://registry.npmjs.org/date-now/-/date-now-0.1.4.tgz", - "integrity": "sha1-6vQ5/U1ISK105cx9vvIAZyueNFs=", - "dev": true + "brace-expansion": { + "version": "1.1.11", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", + "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", + "requires": { + "balanced-match": "^1.0.0", + "concat-map": "0.0.1" + } }, - "debug": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz", - "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==", + "braces": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz", + "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==", + "dev": true, "requires": { - "ms": "2.0.0" + "fill-range": "^7.0.1" } }, - "debuglog": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/debuglog/-/debuglog-1.0.1.tgz", - "integrity": "sha1-qiT/uaw9+aI1GDfPstJ5NgzXhJI=", + "brorand": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/brorand/-/brorand-1.1.0.tgz", + "integrity": "sha1-EsJe/kCkXjwyPrhnWgoM5XsiNx8=", "dev": true }, - "decamelize": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz", - "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=" + "browser-process-hrtime": { + "version": "0.1.3", + "resolved": "https://registry.npmjs.org/browser-process-hrtime/-/browser-process-hrtime-0.1.3.tgz", + "integrity": "sha512-bRFnI4NnjO6cnyLmOV/7PVoDEMJChlcfN0z4s1YMBY989/SvlfMI1lgCnkFUs53e9gQF+w7qu7XdllSTiSl8Aw==" }, - "decode-uri-component": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.0.tgz", - "integrity": "sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU=", + "browser-stdout": { + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/browser-stdout/-/browser-stdout-1.3.1.tgz", + "integrity": "sha512-qhAVI1+Av2X7qelOfAIYwXONood6XlZE/fXaBSmW/T5SzLAmCgzi+eiWE7fUvbHaeNBQH13UftjpXxsfLkMpgw==", "dev": true }, - "deep-eql": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/deep-eql/-/deep-eql-3.0.1.tgz", - "integrity": "sha512-+QeIQyN5ZuO+3Uk5DYh6/1eKO0m0YmJFGNmFHGACpf1ClL1nmlV/p4gNgbl2pJGxgXb4faqo6UE+M5ACEMyVcw==", + "browserify-aes": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/browserify-aes/-/browserify-aes-1.2.0.tgz", + "integrity": "sha512-+7CHXqGuspUn/Sl5aO7Ea0xWGAtETPXNSAjHo48JfLdPWcMng33Xe4znFvQweqc/uzk5zSOI3H52CYnjCfb5hA==", "dev": true, "requires": { - "type-detect": "^4.0.0" + "buffer-xor": "^1.0.3", + "cipher-base": "^1.0.0", + "create-hash": "^1.1.0", + "evp_bytestokey": "^1.0.3", + "inherits": "^2.0.1", + "safe-buffer": "^5.0.1" } }, - "deep-equal": { + "browserify-cipher": { "version": "1.0.1", - "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-1.0.1.tgz", - "integrity": "sha1-9dJgKStmDghO/0zbyfCK0yR0SLU=", - "dev": true + "resolved": "https://registry.npmjs.org/browserify-cipher/-/browserify-cipher-1.0.1.tgz", + "integrity": "sha512-sPhkz0ARKbf4rRQt2hTpAHqn47X3llLkUGn+xEJzLjwY8LRs2p0v7ljvI5EyoRO/mexrNunNECisZs+gw2zz1w==", + "dev": true, + "requires": { + "browserify-aes": "^1.0.4", + "browserify-des": "^1.0.0", + "evp_bytestokey": "^1.0.0" + } }, - "deep-extend": { - "version": "0.6.0", - "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz", - "integrity": "sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==", - "dev": true + "browserify-des": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/browserify-des/-/browserify-des-1.0.2.tgz", + "integrity": "sha512-BioO1xf3hFwz4kc6iBhI3ieDFompMhrMlnDFC4/0/vd5MokpuAc3R+LYbwTA9A5Yc9pq9UYPqffKpW2ObuwX5A==", + "dev": true, + "requires": { + "cipher-base": "^1.0.1", + "des.js": "^1.0.0", + "inherits": "^2.0.1", + "safe-buffer": "^5.1.2" + } }, - "deep-is": { - "version": "0.1.3", - "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.3.tgz", - "integrity": "sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ=" + "browserify-rsa": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.0.1.tgz", + "integrity": "sha1-IeCr+vbyApzy+vsTNWenAdQTVSQ=", + "dev": true, + "requires": { + "bn.js": "^4.1.0", + "randombytes": "^2.0.1" + } }, - "default-gateway": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/default-gateway/-/default-gateway-4.2.0.tgz", - "integrity": "sha512-h6sMrVB1VMWVrW13mSc6ia/DwYYw5MN6+exNu1OaJeFac5aSAvwM7lZ0NVfTABuSkQelr4h5oebg3KB1XPdjgA==", + "browserify-sign": { + "version": "4.0.4", + "resolved": "https://registry.npmjs.org/browserify-sign/-/browserify-sign-4.0.4.tgz", + "integrity": "sha1-qk62jl17ZYuqa/alfmMMvXqT0pg=", "dev": true, "requires": { - "execa": "^1.0.0", - "ip-regex": "^2.1.0" + "bn.js": "^4.1.1", + "browserify-rsa": "^4.0.0", + "create-hash": "^1.1.0", + "create-hmac": "^1.1.2", + "elliptic": "^6.0.0", + "inherits": "^2.0.1", + "parse-asn1": "^5.0.0" } }, - "default-require-extensions": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/default-require-extensions/-/default-require-extensions-2.0.0.tgz", - "integrity": "sha1-9fj7sYp9bVCyH2QfZJ67Uiz+JPc=", + "browserify-zlib": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/browserify-zlib/-/browserify-zlib-0.2.0.tgz", + "integrity": "sha512-Z942RysHXmJrhqk88FmKBVq/v5tqmSkDz7p54G/MGyjMnCFFnC79XWNbg+Vta8W6Wb2qtSZTSxIGkJrRpCFEiA==", "dev": true, "requires": { - "strip-bom": "^3.0.0" + "pako": "~1.0.5" } }, - "define-properties": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.3.tgz", - "integrity": "sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ==", + "browserslist": { + "version": "4.6.6", + "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.6.6.tgz", + "integrity": "sha512-D2Nk3W9JL9Fp/gIcWei8LrERCS+eXu9AM5cfXA8WEZ84lFks+ARnZ0q/R69m2SV3Wjma83QDDPxsNKXUwdIsyA==", "dev": true, "requires": { - "object-keys": "^1.0.12" + "caniuse-lite": "^1.0.30000984", + "electron-to-chromium": "^1.3.191", + "node-releases": "^1.1.25" } }, - "define-property": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/define-property/-/define-property-2.0.2.tgz", - "integrity": "sha512-jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ==", + "browserstack": { + "version": "1.5.3", + "resolved": "https://registry.npmjs.org/browserstack/-/browserstack-1.5.3.tgz", + "integrity": "sha512-AO+mECXsW4QcqC9bxwM29O7qWa7bJT94uBFzeb5brylIQwawuEziwq20dPYbins95GlWzOawgyDNdjYAo32EKg==", "dev": true, "requires": { - "is-descriptor": "^1.0.2", - "isobject": "^3.0.1" - }, - "dependencies": { - "is-accessor-descriptor": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz", - "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==", - "dev": true, - "requires": { - "kind-of": "^6.0.0" - } - }, - "is-data-descriptor": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz", - "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==", - "dev": true, - "requires": { - "kind-of": "^6.0.0" - } - }, - "is-descriptor": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz", - "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==", - "dev": true, - "requires": { - "is-accessor-descriptor": "^1.0.0", - "is-data-descriptor": "^1.0.0", - "kind-of": "^6.0.2" - } - }, - "kind-of": { - "version": "6.0.2", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz", - "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==", - "dev": true - } + "https-proxy-agent": "^2.2.1" } }, - "del": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/del/-/del-4.1.1.tgz", - "integrity": "sha512-QwGuEUouP2kVwQenAsOof5Fv8K9t3D8Ca8NxcXKrIpEHjTXK5J2nXLdP+ALI1cgv8wj7KuwBhTwBkOZSJKM5XQ==", + "buffer": { + "version": "4.9.1", + "resolved": "https://registry.npmjs.org/buffer/-/buffer-4.9.1.tgz", + "integrity": "sha1-bRu2AbB6TvztlwlBMgkwJ8lbwpg=", + "requires": { + "base64-js": "^1.0.2", + "ieee754": "^1.1.4", + "isarray": "^1.0.0" + } + }, + "buffer-alloc": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/buffer-alloc/-/buffer-alloc-1.2.0.tgz", + "integrity": "sha512-CFsHQgjtW1UChdXgbyJGtnm+O/uLQeZdtbDo8mfUgYXCHSM1wgrVxXm6bSyrUuErEb+4sYVGCzASBRot7zyrow==", "dev": true, "requires": { - "@types/glob": "^7.1.1", - "globby": "^6.1.0", - "is-path-cwd": "^2.0.0", - "is-path-in-cwd": "^2.0.0", - "p-map": "^2.0.0", - "pify": "^4.0.1", - "rimraf": "^2.6.3" - }, - "dependencies": { - "globby": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/globby/-/globby-6.1.0.tgz", - "integrity": "sha1-9abXDoOV4hyFj7BInWTfAkJNUGw=", - "dev": true, - "requires": { - "array-union": "^1.0.1", - "glob": "^7.0.3", - "object-assign": "^4.0.1", - "pify": "^2.0.0", - "pinkie-promise": "^2.0.0" - }, - "dependencies": { - "pify": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz", - "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=", - "dev": true - } - } - }, - "is-path-cwd": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/is-path-cwd/-/is-path-cwd-2.2.0.tgz", - "integrity": "sha512-w942bTcih8fdJPJmQHFzkS76NEP8Kzzvmw92cXsazb8intwLqPibPPdXf4ANdKV3rYMuuQYGIWtvz9JilB3NFQ==", - "dev": true - }, - "is-path-in-cwd": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/is-path-in-cwd/-/is-path-in-cwd-2.1.0.tgz", - "integrity": "sha512-rNocXHgipO+rvnP6dk3zI20RpOtrAM/kzbB258Uw5BWr3TpXi861yzjo16Dn4hUox07iw5AyeMLHWsujkjzvRQ==", - "dev": true, - "requires": { - "is-path-inside": "^2.1.0" - } - }, - "is-path-inside": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-2.1.0.tgz", - "integrity": "sha512-wiyhTzfDWsvwAW53OBWF5zuvaOGlZ6PwYxAbPVDhpm+gM09xKQGjBq/8uYN12aDvMxnAnq3dxTyoSoRNmg5YFg==", - "dev": true, - "requires": { - "path-is-inside": "^1.0.2" - } - } + "buffer-alloc-unsafe": "^1.1.0", + "buffer-fill": "^1.0.0" } }, - "delayed-stream": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz", - "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk=" + "buffer-alloc-unsafe": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/buffer-alloc-unsafe/-/buffer-alloc-unsafe-1.1.0.tgz", + "integrity": "sha512-TEM2iMIEQdJ2yjPJoSIsldnleVaAk1oW3DBVUykyOLsEsFmEc9kn+SFFPz+gl54KQNxlDnAwCXosOS9Okx2xAg==", + "dev": true }, - "depd": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz", - "integrity": "sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak=" + "buffer-equal-constant-time": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/buffer-equal-constant-time/-/buffer-equal-constant-time-1.0.1.tgz", + "integrity": "sha1-+OcRMvf/5uAaXJaXpMbz5I1cyBk=" }, - "dependency-graph": { - "version": "0.7.2", - "resolved": "https://registry.npmjs.org/dependency-graph/-/dependency-graph-0.7.2.tgz", - "integrity": "sha512-KqtH4/EZdtdfWX0p6MGP9jljvxSY6msy/pRUD4jgNwVpv3v1QmNLlsB3LDSSUg79BRVSn7jI1QPRtArGABovAQ==", + "buffer-fill": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/buffer-fill/-/buffer-fill-1.0.0.tgz", + "integrity": "sha1-+PeLdniYiO858gXNY39o5wISKyw=", "dev": true }, - "des.js": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/des.js/-/des.js-1.0.0.tgz", - "integrity": "sha1-wHTS4qpqipoH29YfmhXCzYPsjsw=", - "dev": true, - "requires": { - "inherits": "^2.0.1", - "minimalistic-assert": "^1.0.0" - } + "buffer-from": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.1.tgz", + "integrity": "sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A==", + "dev": true }, - "destroy": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.0.4.tgz", - "integrity": "sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA=", + "buffer-indexof": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/buffer-indexof/-/buffer-indexof-1.1.1.tgz", + "integrity": "sha512-4/rOEg86jivtPTeOUUT61jJO1Ya1TrR/OkqCSZDyq84WJh3LuuiphBYJN+fm5xufIk4XAFcEwte/8WzC8If/1g==", "dev": true }, - "details-element-polyfill": { - "version": "2.4.0", - "resolved": "https://registry.npmjs.org/details-element-polyfill/-/details-element-polyfill-2.4.0.tgz", - "integrity": "sha512-jnZ/m0+b1gz3EcooitqL7oDEkKHEro659dt8bWB/T/HjiILucoQhHvvi5MEOAIFJXxxO+rIYJ/t3qCgfUOSU5g==" + "buffer-writer": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/buffer-writer/-/buffer-writer-2.0.0.tgz", + "integrity": "sha512-a7ZpuTZU1TRtnwyCNW3I5dc0wWNC3VR9S++Ewyk2HHZdrO3CQJqSpd+95Us590V6AL7JqUAH2IwZ/398PmNFgw==" }, - "detect-indent": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/detect-indent/-/detect-indent-4.0.0.tgz", - "integrity": "sha1-920GQ1LN9Docts5hnE7jqUdd4gg=", - "dev": true, - "requires": { - "repeating": "^2.0.0" - } + "buffer-xor": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/buffer-xor/-/buffer-xor-1.0.3.tgz", + "integrity": "sha1-JuYe0UIvtw3ULm42cp7VHYVf6Nk=", + "dev": true }, - "detect-node": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/detect-node/-/detect-node-2.0.4.tgz", - "integrity": "sha512-ZIzRpLJrOj7jjP2miAtgqIfmzbxa4ZOr5jJc601zklsfEx9oTzmmj2nVpIPRpNlRTIh8lc1kyViIY7BWSGNmKw==", + "builtin-modules": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-1.1.1.tgz", + "integrity": "sha1-Jw8HbFpywC9bZaR9+Uxf46J4iS8=", "dev": true }, - "dezalgo": { + "builtin-status-codes": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz", + "integrity": "sha1-hZgoeOIbmOHGZCXgPQF0eI9Wnug=", + "dev": true + }, + "builtins": { "version": "1.0.3", - "resolved": "https://registry.npmjs.org/dezalgo/-/dezalgo-1.0.3.tgz", - "integrity": "sha1-f3Qt4Gb8dIvI24IFad3c5Jvw1FY=", + "resolved": "https://registry.npmjs.org/builtins/-/builtins-1.0.3.tgz", + "integrity": "sha1-y5T662HIaWRR2zZTThQi+U8K7og=", + "dev": true + }, + "bytes": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.0.tgz", + "integrity": "sha512-zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg==" + }, + "c8": { + "version": "3.5.0", + "resolved": "https://registry.npmjs.org/c8/-/c8-3.5.0.tgz", + "integrity": "sha512-51eNphsa3rbMnCsvDLE3kqwYt9VPQGsKstc91SRTsmbc/AE5T5c9SSDasCcSQCOw5BQE3imLqOagOU1NcGyDjA==", + "requires": { + "@bcoe/v8-coverage": "^0.1.0", + "find-up": "^3.0.0", + "foreground-child": "^1.5.6", + "furi": "^1.3.0", + "istanbul-lib-coverage": "^2.0.1", + "istanbul-lib-report": "^2.0.1", + "istanbul-reports": "^2.0.0", + "rimraf": "^2.6.2", + "test-exclude": "^5.0.0", + "uuid": "^3.3.2", + "v8-to-istanbul": "^2.0.4", + "yargs": "^13.1.0", + "yargs-parser": "^10.1.0" + } + }, + "cacache": { + "version": "11.3.3", + "resolved": "https://registry.npmjs.org/cacache/-/cacache-11.3.3.tgz", + "integrity": "sha512-p8WcneCytvzPxhDvYp31PD039vi77I12W+/KfR9S8AZbaiARFBCpsPJS+9uhWfeBfeAtW7o/4vt3MUqLkbY6nA==", "dev": true, "requires": { - "asap": "^2.0.0", - "wrappy": "1" + "bluebird": "^3.5.5", + "chownr": "^1.1.1", + "figgy-pudding": "^3.5.1", + "glob": "^7.1.4", + "graceful-fs": "^4.1.15", + "lru-cache": "^5.1.1", + "mississippi": "^3.0.0", + "mkdirp": "^0.5.1", + "move-concurrently": "^1.0.1", + "promise-inflight": "^1.0.1", + "rimraf": "^2.6.3", + "ssri": "^6.0.1", + "unique-filename": "^1.1.1", + "y18n": "^4.0.0" }, "dependencies": { - "asap": { - "version": "2.0.6", - "resolved": "https://registry.npmjs.org/asap/-/asap-2.0.6.tgz", - "integrity": "sha1-5QNHYR1+aQlDIIu9r+vLwvuGbUY=", + "lru-cache": { + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz", + "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==", + "dev": true, + "requires": { + "yallist": "^3.0.2" + } + }, + "yallist": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz", + "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==", "dev": true } } }, - "di": { - "version": "0.0.1", - "resolved": "https://registry.npmjs.org/di/-/di-0.0.1.tgz", - "integrity": "sha1-gGZJMmzqp8qjMG112YXqJ0i6kTw=", - "dev": true - }, - "diff": { - "version": "3.5.0", - "resolved": "https://registry.npmjs.org/diff/-/diff-3.5.0.tgz", - "integrity": "sha512-A46qtFgd+g7pDZinpnwiRJtxbC1hpgf0uzP3iG89scHk0AUC7A1TGxf5OiiOUv/JMZR8GOt8hL900hV0bOy5xA==", - "dev": true - }, - "diffie-hellman": { - "version": "5.0.3", - "resolved": "https://registry.npmjs.org/diffie-hellman/-/diffie-hellman-5.0.3.tgz", - "integrity": "sha512-kqag/Nl+f3GwyK25fhUMYj81BUOrZ9IuJsjIcDE5icNM9FJHAVm3VcUDxdLPoQtTuUylWm6ZIknYJwwaPxsUzg==", + "cache-base": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/cache-base/-/cache-base-1.0.1.tgz", + "integrity": "sha512-AKcdTnFSWATd5/GCPRxr2ChwIJ85CeyrEyjRHlKxQ56d4XJMGym0uAiKn0xbLOGOl3+yRpOTi484dVCEc5AUzQ==", "dev": true, "requires": { - "bn.js": "^4.1.0", - "miller-rabin": "^4.0.0", - "randombytes": "^2.0.0" + "collection-visit": "^1.0.0", + "component-emitter": "^1.2.1", + "get-value": "^2.0.6", + "has-value": "^1.0.0", + "isobject": "^3.0.1", + "set-value": "^2.0.0", + "to-object-path": "^0.3.0", + "union-value": "^1.0.0", + "unset-value": "^1.0.0" } }, - "dir-glob": { - "version": "2.2.2", - "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-2.2.2.tgz", - "integrity": "sha512-f9LBi5QWzIW3I6e//uxZoLBlUt9kcp66qo0sSCxL6YZKc75R1c4MFCoe/LaZiBGmgujvQdxc5Bn3QhfyvK5Hsw==", + "caching-transform": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/caching-transform/-/caching-transform-3.0.2.tgz", + "integrity": "sha512-Mtgcv3lh3U0zRii/6qVgQODdPA4G3zhG+jtbCWj39RXuUFTMzH0vcdMtaJS1jPowd+It2Pqr6y3NJMQqOqCE2w==", "dev": true, "requires": { - "path-type": "^3.0.0" + "hasha": "^3.0.0", + "make-dir": "^2.0.0", + "package-hash": "^3.0.0", + "write-file-atomic": "^2.4.2" } }, - "dns-equal": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/dns-equal/-/dns-equal-1.0.0.tgz", - "integrity": "sha1-s55/HabrCnW6nBcySzR1PEfgZU0=", - "dev": true - }, - "dns-packet": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/dns-packet/-/dns-packet-1.3.1.tgz", - "integrity": "sha512-0UxfQkMhYAUaZI+xrNZOz/as5KgDU0M/fQ9b6SpkyLbk3GEswDi6PADJVaYJradtRVsRIlF1zLyOodbcTCDzUg==", + "caller-callsite": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/caller-callsite/-/caller-callsite-2.0.0.tgz", + "integrity": "sha1-hH4PzgoiN1CpoCfFSzNzGtMVQTQ=", "dev": true, "requires": { - "ip": "^1.1.0", - "safe-buffer": "^5.0.1" + "callsites": "^2.0.0" } }, - "dns-prefetch-control": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/dns-prefetch-control/-/dns-prefetch-control-0.2.0.tgz", - "integrity": "sha512-hvSnros73+qyZXhHFjx2CMLwoj3Fe7eR9EJsFsqmcI1bB2OBWL/+0YzaEaKssCHnj/6crawNnUyw74Gm2EKe+Q==" - }, - "dns-txt": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/dns-txt/-/dns-txt-2.0.2.tgz", - "integrity": "sha1-uR2Ab10nGI5Ks+fRB9iBocxGQrY=", + "caller-path": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/caller-path/-/caller-path-2.0.0.tgz", + "integrity": "sha1-Ro+DBE42mrIBD6xfBs7uFbsssfQ=", "dev": true, "requires": { - "buffer-indexof": "^1.0.0" + "caller-callsite": "^2.0.0" } }, - "dom-serialize": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/dom-serialize/-/dom-serialize-2.2.1.tgz", - "integrity": "sha1-ViromZ9Evl6jB29UGdzVnrQ6yVs=", - "dev": true, - "requires": { - "custom-event": "~1.0.0", - "ent": "~2.2.0", - "extend": "^3.0.0", - "void-elements": "^2.0.0" - } + "callsite": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/callsite/-/callsite-1.0.0.tgz", + "integrity": "sha1-KAOY5dZkvXQDi28JBRU+borxvCA=", + "dev": true + }, + "callsites": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/callsites/-/callsites-2.0.0.tgz", + "integrity": "sha1-BuuE8A7qQT2oav/vrL/7Ngk7PFA=", + "dev": true + }, + "camelcase": { + "version": "5.3.1", + "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz", + "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==" + }, + "camelize": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/camelize/-/camelize-1.0.0.tgz", + "integrity": "sha1-FkpUg+Yw+kMh5a8HAg5TGDGyYJs=" }, - "domain-browser": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/domain-browser/-/domain-browser-1.2.0.tgz", - "integrity": "sha512-jnjyiM6eRyZl2H+W8Q/zLMA481hzi0eszAaBUzIVnmYVDBbnLxVNnfu1HgEBvCbL+71FrxMl3E6lpKH7Ge3OXA==", + "caniuse-lite": { + "version": "1.0.30000986", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30000986.tgz", + "integrity": "sha512-pM+LnkoAX0+QnIH3tpW5EnkmfpEoqOD8FAcoBvsl3Xh6DXkgctiCxeCbXphP/k3XJtJzm+zOAJbi6U6IVkpWZQ==", "dev": true }, - "domexception": { + "canonical-path": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/canonical-path/-/canonical-path-1.0.0.tgz", + "integrity": "sha512-feylzsbDxi1gPZ1IjystzIQZagYYLvfKrSuygUCgf7z6x790VEzze5QEkdSV1U58RA7Hi0+v6fv4K54atOzATg==", + "dev": true + }, + "capture-stack-trace": { "version": "1.0.1", - "resolved": "https://registry.npmjs.org/domexception/-/domexception-1.0.1.tgz", - "integrity": "sha512-raigMkn7CJNNo6Ihro1fzG7wr3fHuYVytzquZKX5n0yizGsTcYgzdIUwj1X9pK0VvjeihV+XiclP+DjwbsSKug==", - "requires": { - "webidl-conversions": "^4.0.2" - } + "resolved": "https://registry.npmjs.org/capture-stack-trace/-/capture-stack-trace-1.0.1.tgz", + "integrity": "sha512-mYQLZnx5Qt1JgB1WEiMCf2647plpGeQ2NMR/5L0HNZzGQo4fuSPnK+wjfPnKZV0aiJDgzmWqqkV/g7JD+DW0qw==", + "dev": true }, - "dont-sniff-mimetype": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/dont-sniff-mimetype/-/dont-sniff-mimetype-1.1.0.tgz", - "integrity": "sha512-ZjI4zqTaxveH2/tTlzS1wFp+7ncxNZaIEWYg3lzZRHkKf5zPT/MnEG6WL0BhHMJUabkh8GeU5NL5j+rEUCb7Ug==" + "caseless": { + "version": "0.12.0", + "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz", + "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=" }, - "dot-prop": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/dot-prop/-/dot-prop-4.2.0.tgz", - "integrity": "sha512-tUMXrxlExSW6U2EXiiKGSBVdYgtV8qlHL+C10TsW4PURY/ic+eaysnSkwB4kA/mBlCyy/IKDJ+Lc3wbWeaXtuQ==", - "dev": true, + "center-align": { + "version": "0.1.3", + "resolved": "https://registry.npmjs.org/center-align/-/center-align-0.1.3.tgz", + "integrity": "sha1-qg0yYptu6XIgBBHL1EYckHvCt60=", "requires": { - "is-obj": "^1.0.0" + "align-text": "^0.1.3", + "lazy-cache": "^1.0.3" } }, - "dottie": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/dottie/-/dottie-2.0.1.tgz", - "integrity": "sha512-ch5OQgvGDK2u8pSZeSYAQaV/lczImd7pMJ7BcEPXmnFVjy4yJIzP6CsODJUTH8mg1tyH1Z2abOiuJO3DjZ/GBw==" - }, - "duplexer3": { - "version": "0.1.4", - "resolved": "https://registry.npmjs.org/duplexer3/-/duplexer3-0.1.4.tgz", - "integrity": "sha1-7gHdHKwO08vH/b6jfcCo8c4ALOI=", - "dev": true - }, - "duplexify": { - "version": "3.7.1", - "resolved": "https://registry.npmjs.org/duplexify/-/duplexify-3.7.1.tgz", - "integrity": "sha512-07z8uv2wMyS51kKhD1KsdXJg5WQ6t93RneqRxUHnskXVtlYYkLqM0gqStQZ3pj073g687jPCHrqNfCzawLYh5g==", + "chai": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/chai/-/chai-4.2.0.tgz", + "integrity": "sha512-XQU3bhBukrOsQCuwZndwGcCVQHyZi53fQ6Ys1Fym7E4olpIqqZZhhoFJoaKVvV17lWQoXYwgWN2nF5crA8J2jw==", "dev": true, "requires": { - "end-of-stream": "^1.0.0", - "inherits": "^2.0.1", - "readable-stream": "^2.0.0", - "stream-shift": "^1.0.0" + "assertion-error": "^1.1.0", + "check-error": "^1.0.2", + "deep-eql": "^3.0.1", + "get-func-name": "^2.0.0", + "pathval": "^1.1.0", + "type-detect": "^4.0.5" } }, - "ecc-jsbn": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz", - "integrity": "sha1-OoOpBOVDUyh4dMVkt1SThoSamMk=", + "chalk": { + "version": "2.4.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz", + "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", "requires": { - "jsbn": "~0.1.0", - "safer-buffer": "^2.1.0" + "ansi-styles": "^3.2.1", + "escape-string-regexp": "^1.0.5", + "supports-color": "^5.3.0" + }, + "dependencies": { + "supports-color": { + "version": "5.5.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", + "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", + "requires": { + "has-flag": "^3.0.0" + } + } } }, - "ecdsa-sig-formatter": { - "version": "1.0.11", - "resolved": "https://registry.npmjs.org/ecdsa-sig-formatter/-/ecdsa-sig-formatter-1.0.11.tgz", - "integrity": "sha512-nagl3RYrbNv6kQkeJIpt6NJZy8twLB/2vtz6yN9Z4vRKHN4/QZJIEbqohALSgwKdnksuY3k5Addp5lg8sVoVcQ==", - "requires": { - "safe-buffer": "^5.0.1" - } + "character-parser": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/character-parser/-/character-parser-1.2.1.tgz", + "integrity": "sha1-wN3kqxgnE7kZuXCVmhI+zBow/NY=" }, - "ee-first": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz", - "integrity": "sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=" + "chardet": { + "version": "0.7.0", + "resolved": "https://registry.npmjs.org/chardet/-/chardet-0.7.0.tgz", + "integrity": "sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==", + "dev": true }, - "electron-to-chromium": { - "version": "1.3.237", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.237.tgz", - "integrity": "sha512-SPAFjDr/7iiVK2kgTluwxela6eaWjjFkS9rO/iYpB/KGXgccUom5YC7OIf19c8m8GGptWxLU0Em8xM64A/N7Fg==", + "check-error": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/check-error/-/check-error-1.0.2.tgz", + "integrity": "sha1-V00xLt2Iu13YkS6Sht1sCu1KrII=", "dev": true }, - "elliptic": { - "version": "6.5.0", - "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.5.0.tgz", - "integrity": "sha512-eFOJTMyCYb7xtE/caJ6JJu+bhi67WCYNbkGSknu20pmM8Ke/bqOfdnZWxyoGN26JgfxTbXrsCkEw4KheCT/KGg==", - "dev": true, + "cheerio": { + "version": "1.0.0-rc.3", + "resolved": "https://registry.npmjs.org/cheerio/-/cheerio-1.0.0-rc.3.tgz", + "integrity": "sha512-0td5ijfUPuubwLUu0OBoe98gZj8C/AA+RW3v67GPlGOrvxWjZmBXiBCRU+I8VEiNyJzjth40POfHiz2RB3gImA==", "requires": { - "bn.js": "^4.4.0", - "brorand": "^1.0.1", - "hash.js": "^1.0.0", - "hmac-drbg": "^1.0.0", - "inherits": "^2.0.1", - "minimalistic-assert": "^1.0.0", - "minimalistic-crypto-utils": "^1.0.0" + "css-select": "~1.2.0", + "dom-serializer": "~0.1.1", + "entities": "~1.1.1", + "htmlparser2": "^3.9.1", + "lodash": "^4.15.0", + "parse5": "^3.0.1" + }, + "dependencies": { + "parse5": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/parse5/-/parse5-3.0.3.tgz", + "integrity": "sha512-rgO9Zg5LLLkfJF9E6CCmXlSE4UVceloys8JrFqCcHloC3usd/kJCyPDwH2SOlzix2j3xaP9sUX3e8+kvkuleAA==", + "requires": { + "@types/node": "*" + } + } } }, - "emoji-regex": { - "version": "7.0.3", - "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz", - "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==" + "chokidar": { + "version": "3.3.1", + "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.3.1.tgz", + "integrity": "sha512-4QYCEWOcK3OJrxwvyyAOxFuhpvOVCYkr33LPfFNBjAD/w3sEzWsp2BUOkI4l9bHvWioAd0rc6NlHUOEaWkTeqg==", + "dev": true, + "requires": { + "anymatch": "~3.1.1", + "braces": "~3.0.2", + "fsevents": "~2.1.2", + "glob-parent": "~5.1.0", + "is-binary-path": "~2.1.0", + "is-glob": "~4.0.1", + "normalize-path": "~3.0.0", + "readdirp": "~3.3.0" + }, + "dependencies": { + "glob-parent": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.0.tgz", + "integrity": "sha512-qjtRgnIVmOfnKUE3NJAQEdk+lKrxfw8t5ke7SXtfMTHcjsBfOfWXCQfdb30zfDoZQ2IRSIiidmjtbHZPZ++Ihw==", + "dev": true, + "requires": { + "is-glob": "^4.0.1" + } + } + } }, - "emojis-list": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-2.1.0.tgz", - "integrity": "sha1-TapNnbAPmBmIDHn6RXrlsJof04k=", + "chownr": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.3.tgz", + "integrity": "sha512-i70fVHhmV3DtTl6nqvZOnIjbY0Pe4kAUjwHj8z0zAdgBtYrJyYwLKCCuRBQ5ppkyL0AkN7HKRnETdmdp1zqNXw==", "dev": true }, - "encodeurl": { + "chrome-trace-event": { "version": "1.0.2", - "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz", - "integrity": "sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k=", - "dev": true - }, - "encoding": { - "version": "0.1.12", - "resolved": "https://registry.npmjs.org/encoding/-/encoding-0.1.12.tgz", - "integrity": "sha1-U4tm8+5izRq1HsMjgp0flIDHS+s=", + "resolved": "https://registry.npmjs.org/chrome-trace-event/-/chrome-trace-event-1.0.2.tgz", + "integrity": "sha512-9e/zx1jw7B4CO+c/RXoCsfg/x1AfUBioy4owYH0bJprEYAx5hRFLRhWBqHAG57D0ZM4H7vxbP7bPe0VwhQRYDQ==", "dev": true, "requires": { - "iconv-lite": "~0.4.13" + "tslib": "^1.9.0" } }, - "end-of-stream": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.1.tgz", - "integrity": "sha512-1MkrZNvWTKCaigbn+W15elq2BB/L22nqrSY5DKlo3X6+vclJm8Bb5djXJBmEX6fS3+zCh/F4VBK5Z2KxJt4s2Q==", - "requires": { - "once": "^1.4.0" - } + "ci-info": { + "version": "1.6.0", + "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-1.6.0.tgz", + "integrity": "sha512-vsGdkwSCDpWmP80ncATX7iea5DWQemg1UgCW5J8tqjU3lYw4FBYuj89J0CTVomA7BEfvSZd84GmHko+MxFQU2A==", + "dev": true }, - "engine.io": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/engine.io/-/engine.io-3.2.1.tgz", - "integrity": "sha512-+VlKzHzMhaU+GsCIg4AoXF1UdDFjHHwMmMKqMJNDNLlUlejz58FCy4LBqB2YVJskHGYl06BatYWKP2TVdVXE5w==", + "cipher-base": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/cipher-base/-/cipher-base-1.0.4.tgz", + "integrity": "sha512-Kkht5ye6ZGmwv40uUDZztayT2ThLQGfnj/T71N/XzeZeo3nf8foyW7zGTsPYkEya3m5f3cAypH+qe7YOrM1U2Q==", "dev": true, "requires": { - "accepts": "~1.3.4", - "base64id": "1.0.0", - "cookie": "0.3.1", - "debug": "~3.1.0", - "engine.io-parser": "~2.1.0", - "ws": "~3.3.1" + "inherits": "^2.0.1", + "safe-buffer": "^5.0.1" } }, - "engine.io-client": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/engine.io-client/-/engine.io-client-3.2.1.tgz", - "integrity": "sha512-y5AbkytWeM4jQr7m/koQLc5AxpRKC1hEVUb/s1FUAWEJq5AzJJ4NLvzuKPuxtDi5Mq755WuDvZ6Iv2rXj4PTzw==", + "circular-dependency-plugin": { + "version": "5.0.2", + "resolved": "https://registry.npmjs.org/circular-dependency-plugin/-/circular-dependency-plugin-5.0.2.tgz", + "integrity": "sha512-oC7/DVAyfcY3UWKm0sN/oVoDedQDQiw/vIiAnuTWTpE5s0zWf7l3WY417Xw/Fbi/QbAjctAkxgMiS9P0s3zkmA==", + "dev": true + }, + "class-utils": { + "version": "0.3.6", + "resolved": "https://registry.npmjs.org/class-utils/-/class-utils-0.3.6.tgz", + "integrity": "sha512-qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg==", "dev": true, "requires": { - "component-emitter": "1.2.1", - "component-inherit": "0.0.3", - "debug": "~3.1.0", - "engine.io-parser": "~2.1.1", - "has-cors": "1.1.0", - "indexof": "0.0.1", - "parseqs": "0.0.5", - "parseuri": "0.0.5", - "ws": "~3.3.1", - "xmlhttprequest-ssl": "~1.5.4", - "yeast": "0.1.2" + "arr-union": "^3.1.0", + "define-property": "^0.2.5", + "isobject": "^3.0.0", + "static-extend": "^0.1.1" }, "dependencies": { - "component-emitter": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.2.1.tgz", - "integrity": "sha1-E3kY1teCg/ffemt8WmPhQOaUJeY=", - "dev": true + "define-property": { + "version": "0.2.5", + "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz", + "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=", + "dev": true, + "requires": { + "is-descriptor": "^0.1.0" + } } } }, - "engine.io-parser": { - "version": "2.1.3", - "resolved": "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-2.1.3.tgz", - "integrity": "sha512-6HXPre2O4Houl7c4g7Ic/XzPnHBvaEmN90vtRO9uLmwtRqQmTOw0QMevL1TOfL2Cpu1VzsaTmMotQgMdkzGkVA==", - "dev": true, + "clean-css": { + "version": "3.4.28", + "resolved": "https://registry.npmjs.org/clean-css/-/clean-css-3.4.28.tgz", + "integrity": "sha1-vxlF6C/ICPVWlebd6uwBQA79A/8=", "requires": { - "after": "0.8.2", - "arraybuffer.slice": "~0.0.7", - "base64-arraybuffer": "0.1.5", - "blob": "0.0.5", - "has-binary2": "~1.0.2" + "commander": "2.8.x", + "source-map": "0.4.x" + }, + "dependencies": { + "commander": { + "version": "2.8.1", + "resolved": "https://registry.npmjs.org/commander/-/commander-2.8.1.tgz", + "integrity": "sha1-Br42f+v9oMMwqh4qBy09yXYkJdQ=", + "requires": { + "graceful-readlink": ">= 1.0.0" + } + } } }, - "enhanced-resolve": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-4.1.0.tgz", - "integrity": "sha512-F/7vkyTtyc/llOIn8oWclcB25KdRaiPBpZYDgJHgh/UHtpgT2p2eldQgtQnLtUvfMKPKxbRaQM/hHkvLHt1Vng==", + "cli-boxes": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/cli-boxes/-/cli-boxes-1.0.0.tgz", + "integrity": "sha1-T6kXw+WclKAEzWH47lCdplFocUM=", + "dev": true + }, + "cli-cursor": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-2.1.0.tgz", + "integrity": "sha1-s12sN2R5+sw+lHR9QdDQ9SOP/LU=", "dev": true, "requires": { - "graceful-fs": "^4.1.2", - "memory-fs": "^0.4.0", - "tapable": "^1.0.0" + "restore-cursor": "^2.0.0" } }, - "ent": { + "cli-width": { "version": "2.2.0", - "resolved": "https://registry.npmjs.org/ent/-/ent-2.2.0.tgz", - "integrity": "sha1-6WQhkyWiHQX0RGai9obtbOX13R0=", - "dev": true - }, - "err-code": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/err-code/-/err-code-1.1.2.tgz", - "integrity": "sha1-BuARbTAo9q70gGhJ6w6mp0iuaWA=", + "resolved": "https://registry.npmjs.org/cli-width/-/cli-width-2.2.0.tgz", + "integrity": "sha1-/xnt6Kml5XkyQUewwR8PvLq+1jk=", "dev": true }, - "errno": { - "version": "0.1.7", - "resolved": "https://registry.npmjs.org/errno/-/errno-0.1.7.tgz", - "integrity": "sha512-MfrRBDWzIWifgq6tJj60gkAwtLNb6sQPlcFrSOflcP1aFmmruKQ2wRnze/8V6kgyz7H3FF8Npzv78mZ7XLLflg==", - "dev": true, + "cliui": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/cliui/-/cliui-5.0.0.tgz", + "integrity": "sha512-PYeGSEmmHM6zvoef2w8TPzlrnNpXIjTipYK780YswmIP9vjxmd6Y2a3CB2Ks6/AU8NHjZugXvo8w3oWM2qnwXA==", "requires": { - "prr": "~1.0.1" + "string-width": "^3.1.0", + "strip-ansi": "^5.2.0", + "wrap-ansi": "^5.1.0" } }, - "error-ex": { - "version": "1.3.2", - "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz", - "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==", - "requires": { - "is-arrayish": "^0.2.1" - } + "clone": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/clone/-/clone-2.1.2.tgz", + "integrity": "sha1-G39Ln1kfHo+DZwQBYANFoCiHQ18=", + "dev": true }, - "es-abstract": { - "version": "1.13.0", - "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.13.0.tgz", - "integrity": "sha512-vDZfg/ykNxQVwup/8E1BZhVzFfBxs9NqMzGcvIJrqg5k2/5Za2bWo40dK2J1pgLngZ7c+Shh8lwYtLGyrwPutg==", + "clone-deep": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/clone-deep/-/clone-deep-2.0.2.tgz", + "integrity": "sha512-SZegPTKjCgpQH63E+eN6mVEEPdQBOUzjyJm5Pora4lrwWRFS8I0QAxV/KD6vV/i0WuijHZWQC1fMsPEdxfdVCQ==", "dev": true, "requires": { - "es-to-primitive": "^1.2.0", - "function-bind": "^1.1.1", - "has": "^1.0.3", - "is-callable": "^1.1.4", - "is-regex": "^1.0.4", - "object-keys": "^1.0.12" + "for-own": "^1.0.0", + "is-plain-object": "^2.0.4", + "kind-of": "^6.0.0", + "shallow-clone": "^1.0.0" + }, + "dependencies": { + "kind-of": { + "version": "6.0.3", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz", + "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==", + "dev": true + } } }, - "es-to-primitive": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.0.tgz", - "integrity": "sha512-qZryBOJjV//LaxLTV6UC//WewneB3LcXOL9NP++ozKVXsIIIpm/2c13UDiD9Jp2eThsecw9m3jPqDwTyobcdbg==", - "dev": true, + "cls-bluebird": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/cls-bluebird/-/cls-bluebird-2.1.0.tgz", + "integrity": "sha1-N+8eCAqP+1XC9BZPU28ZGeeWiu4=", "requires": { - "is-callable": "^1.1.4", - "is-date-object": "^1.0.1", - "is-symbol": "^1.0.2" + "is-bluebird": "^1.0.2", + "shimmer": "^1.1.0" } }, - "es6-error": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/es6-error/-/es6-error-4.1.1.tgz", - "integrity": "sha512-Um/+FxMr9CISWh0bi5Zv0iOD+4cFh5qLeks1qhAopKVAJw3drgKbKySikp7wGhDL0HPeaja0P5ULZrxLkniUVg==", - "dev": true + "co": { + "version": "4.6.0", + "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz", + "integrity": "sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ=" }, - "es6-promise": { - "version": "4.2.8", - "resolved": "https://registry.npmjs.org/es6-promise/-/es6-promise-4.2.8.tgz", - "integrity": "sha512-HJDGx5daxeIvxdBxvG2cb9g4tEvwIk3i8+nhX0yGrYmZUzbkdg8QbDevheDB8gd0//uPj4c1EQua8Q+MViT0/w==" + "code-point-at": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz", + "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=" }, - "es6-promisify": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/es6-promisify/-/es6-promisify-5.0.0.tgz", - "integrity": "sha1-UQnWLz5W6pZ8S2NQWu8IKRyKUgM=", + "codelyzer": { + "version": "5.2.1", + "resolved": "https://registry.npmjs.org/codelyzer/-/codelyzer-5.2.1.tgz", + "integrity": "sha512-awBZXFcJUyC5HMYXiHzjr3D24tww2l1D1OqtfA9vUhEtYr32a65A+Gblm/OvsO+HuKLYzn8EDMw1inSM3VbxWA==", "dev": true, "requires": { - "es6-promise": "^4.0.3" - } - }, - "escape-html": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz", - "integrity": "sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg=", - "dev": true - }, - "escape-string-regexp": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz", - "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=" - }, - "escodegen": { - "version": "1.12.0", - "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-1.12.0.tgz", - "integrity": "sha512-TuA+EhsanGcme5T3R0L80u4t8CpbXQjegRmf7+FPTJrtCTErXFeelblRgHQa1FofEzqYYJmJ/OqjTwREp9qgmg==", - "requires": { - "esprima": "^3.1.3", - "estraverse": "^4.2.0", - "esutils": "^2.0.2", - "optionator": "^0.8.1", - "source-map": "~0.6.1" + "app-root-path": "^2.2.1", + "aria-query": "^3.0.0", + "axobject-query": "2.0.2", + "css-selector-tokenizer": "^0.7.1", + "cssauron": "^1.4.0", + "damerau-levenshtein": "^1.0.4", + "semver-dsl": "^1.0.1", + "source-map": "^0.5.7", + "sprintf-js": "^1.1.2" }, "dependencies": { - "esprima": { - "version": "3.1.3", - "resolved": "https://registry.npmjs.org/esprima/-/esprima-3.1.3.tgz", - "integrity": "sha1-/cpRzuYTOJXjyI1TXOSdv/YqRjM=" + "source-map": { + "version": "0.5.7", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz", + "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=", + "dev": true + }, + "sprintf-js": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.1.2.tgz", + "integrity": "sha512-VE0SOVEHCk7Qc8ulkWw3ntAzXuqf7S2lvwQaDLRnUeIEaKNQJzV6BwmLKhOqT61aGhfUMrXeaBk+oDGCzvhcug==", + "dev": true } } }, - "eslint-scope": { - "version": "4.0.3", - "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-4.0.3.tgz", - "integrity": "sha512-p7VutNr1O/QrxysMo3E45FjYDTeXBy0iTltPFNSqKAIfjDSXC+4dj+qfyuD8bfAXrW/y6lW3O76VaYNPKfpKrg==", + "collection-visit": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/collection-visit/-/collection-visit-1.0.0.tgz", + "integrity": "sha1-S8A3PBZLwykbTTaMgpzxqApZ3KA=", "dev": true, "requires": { - "esrecurse": "^4.1.0", - "estraverse": "^4.1.1" + "map-visit": "^1.0.0", + "object-visit": "^1.0.0" } }, - "esprima": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz", - "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==" + "color-convert": { + "version": "1.9.3", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz", + "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==", + "requires": { + "color-name": "1.1.3" + } }, - "esrecurse": { - "version": "4.2.1", - "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.2.1.tgz", - "integrity": "sha512-64RBB++fIOAXPw3P9cy89qfMlvZEXZkqqJkjqqXIvzP5ezRZjW+lPWjw35UX/3EhUPFYbg5ER4JYgDw4007/DQ==", - "dev": true, + "color-name": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz", + "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=" + }, + "colors": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/colors/-/colors-1.1.2.tgz", + "integrity": "sha1-FopHAXVran9RoSzgyXv6KMCE7WM=", + "dev": true + }, + "combined-stream": { + "version": "1.0.8", + "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz", + "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==", "requires": { - "estraverse": "^4.1.0" + "delayed-stream": "~1.0.0" } }, - "estraverse": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz", - "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==" + "commander": { + "version": "2.6.0", + "resolved": "https://registry.npmjs.org/commander/-/commander-2.6.0.tgz", + "integrity": "sha1-nfflL7Kgyw+4kFjugMMQQiXzfh0=" }, - "esutils": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz", - "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==" + "commondir": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/commondir/-/commondir-1.0.1.tgz", + "integrity": "sha1-3dgA2gxmEnOTzKWVDqloo6rxJTs=", + "dev": true }, - "etag": { - "version": "1.8.1", - "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz", - "integrity": "sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc=" + "compare-versions": { + "version": "3.5.1", + "resolved": "https://registry.npmjs.org/compare-versions/-/compare-versions-3.5.1.tgz", + "integrity": "sha512-9fGPIB7C6AyM18CJJBHt5EnCZDG3oiTJYy0NjfIAGjKpzv0tkxWko7TNQHF5ymqm7IH03tqmeuBxtvD+Izh6mg==", + "dev": true }, - "eventemitter3": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-3.1.2.tgz", - "integrity": "sha512-tvtQIeLVHjDkJYnzf2dgVMxfuSGJeM/7UCG17TT4EumTfNtF+0nebF/4zWOIkCreAbtNqhGEboB6BWrwqNaw4Q==", + "component-bind": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/component-bind/-/component-bind-1.0.0.tgz", + "integrity": "sha1-AMYIq33Nk4l8AAllGx06jh5zu9E=", "dev": true }, - "events": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/events/-/events-1.1.1.tgz", - "integrity": "sha1-nr23Y1rQmccNzEwqH1AEKI6L2SQ=" + "component-emitter": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.3.0.tgz", + "integrity": "sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==", + "dev": true }, - "eventsource": { - "version": "1.0.7", - "resolved": "https://registry.npmjs.org/eventsource/-/eventsource-1.0.7.tgz", - "integrity": "sha512-4Ln17+vVT0k8aWq+t/bF5arcS3EpT9gYtW66EPacdj/mAFevznsnyoHLPy2BA8gbIQeIHoPsvwmfBftfcG//BQ==", - "dev": true, - "requires": { - "original": "^1.0.0" - } + "component-inherit": { + "version": "0.0.3", + "resolved": "https://registry.npmjs.org/component-inherit/-/component-inherit-0.0.3.tgz", + "integrity": "sha1-ZF/ErfWLcrZJ1crmUTVhnbJv8UM=", + "dev": true }, - "evp_bytestokey": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/evp_bytestokey/-/evp_bytestokey-1.0.3.tgz", - "integrity": "sha512-/f2Go4TognH/KvCISP7OUsHn85hT9nUkxxA9BEWxFn+Oj9o8ZNLm/40hdlgSLyuOimsrTKLUMEorQexp/aPQeA==", + "compressible": { + "version": "2.0.18", + "resolved": "https://registry.npmjs.org/compressible/-/compressible-2.0.18.tgz", + "integrity": "sha512-AF3r7P5dWxL8MxyITRMlORQNaOA2IkAFaTr4k7BUumjPtRpGDTZpl0Pb1XCO6JeDCBdp126Cgs9sMxqSjgYyRg==", "dev": true, "requires": { - "md5.js": "^1.3.4", - "safe-buffer": "^5.1.1" + "mime-db": ">= 1.43.0 < 2" } }, - "execa": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/execa/-/execa-1.0.0.tgz", - "integrity": "sha512-adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA==", + "compression": { + "version": "1.7.4", + "resolved": "https://registry.npmjs.org/compression/-/compression-1.7.4.tgz", + "integrity": "sha512-jaSIDzP9pZVS4ZfQ+TzvtiWhdpFhE2RDHz8QJkpX9SIpLq88VueF5jJw6t+6CUQcAoA6t+x89MLrWAqpfDE8iQ==", + "dev": true, "requires": { - "cross-spawn": "^6.0.0", - "get-stream": "^4.0.0", - "is-stream": "^1.1.0", - "npm-run-path": "^2.0.0", - "p-finally": "^1.0.0", - "signal-exit": "^3.0.0", - "strip-eof": "^1.0.0" + "accepts": "~1.3.5", + "bytes": "3.0.0", + "compressible": "~2.0.16", + "debug": "2.6.9", + "on-headers": "~1.0.2", + "safe-buffer": "5.1.2", + "vary": "~1.1.2" }, "dependencies": { - "cross-spawn": { - "version": "6.0.5", - "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz", - "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==", + "bytes": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.0.0.tgz", + "integrity": "sha1-0ygVQE1olpn4Wk6k+odV3ROpYEg=", + "dev": true + }, + "debug": { + "version": "2.6.9", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", + "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", + "dev": true, "requires": { - "nice-try": "^1.0.4", - "path-key": "^2.0.1", - "semver": "^5.5.0", - "shebang-command": "^1.2.0", - "which": "^1.2.9" + "ms": "2.0.0" } + }, + "safe-buffer": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", + "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==", + "dev": true } } }, - "exit": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/exit/-/exit-0.1.2.tgz", - "integrity": "sha1-BjJjj42HfMghB9MKD/8aF8uhzQw=", - "dev": true + "concat-map": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", + "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=" }, - "expand-brackets": { - "version": "2.1.4", - "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz", - "integrity": "sha1-t3c14xXOMPa27/D4OwQVGiJEliI=", + "concat-stream": { + "version": "1.6.2", + "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.2.tgz", + "integrity": "sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==", "dev": true, "requires": { - "debug": "^2.3.3", - "define-property": "^0.2.5", - "extend-shallow": "^2.0.1", - "posix-character-classes": "^0.1.0", - "regex-not": "^1.0.0", - "snapdragon": "^0.8.1", - "to-regex": "^3.0.1" + "buffer-from": "^1.0.0", + "inherits": "^2.0.3", + "readable-stream": "^2.2.2", + "typedarray": "^0.0.6" + } + }, + "concurrently": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/concurrently/-/concurrently-4.1.2.tgz", + "integrity": "sha512-Kim9SFrNr2jd8/0yNYqDTFALzUX1tvimmwFWxmp/D4mRI+kbqIIwE2RkBDrxS2ic25O1UgQMI5AtBqdtX3ynYg==", + "requires": { + "chalk": "^2.4.2", + "date-fns": "^1.30.1", + "lodash": "^4.17.15", + "read-pkg": "^4.0.1", + "rxjs": "^6.5.2", + "spawn-command": "^0.0.2-1", + "supports-color": "^4.5.0", + "tree-kill": "^1.2.1", + "yargs": "^12.0.5" }, "dependencies": { - "debug": { - "version": "2.6.9", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", - "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", - "dev": true, + "ansi-regex": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz", + "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=" + }, + "cliui": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/cliui/-/cliui-4.1.0.tgz", + "integrity": "sha512-4FG+RSG9DL7uEwRUZXZn3SS34DiDPfzP0VOiEwtUWlE+AR2EIg+hSyvrIgUUfhdgR/UkAeW2QHgeP+hWrXs7jQ==", "requires": { - "ms": "2.0.0" + "string-width": "^2.1.1", + "strip-ansi": "^4.0.0", + "wrap-ansi": "^2.0.0" } }, - "define-property": { - "version": "0.2.5", - "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz", - "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=", + "get-caller-file": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-1.0.3.tgz", + "integrity": "sha512-3t6rVToeoZfYSGd8YoLFR2DJkiQrIiUrGcjvFX2mDw3bn6k2OtwHN0TNCLbBO+w8qTvimhDkv+LSscbJY1vE6w==" + }, + "has-flag": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-2.0.0.tgz", + "integrity": "sha1-6CB68cx7MNRGzHC3NLXovhj4jVE=" + }, + "pify": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz", + "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=" + }, + "read-pkg": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-4.0.1.tgz", + "integrity": "sha1-ljYlN48+HE1IyFhytabsfV0JMjc=", + "requires": { + "normalize-package-data": "^2.3.2", + "parse-json": "^4.0.0", + "pify": "^3.0.0" + } + }, + "require-main-filename": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-1.0.1.tgz", + "integrity": "sha1-l/cXtp1IeE9fUmpsWqj/3aBVpNE=" + }, + "string-width": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz", + "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==", + "requires": { + "is-fullwidth-code-point": "^2.0.0", + "strip-ansi": "^4.0.0" + } + }, + "strip-ansi": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz", + "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", + "requires": { + "ansi-regex": "^3.0.0" + } + }, + "supports-color": { + "version": "4.5.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.5.0.tgz", + "integrity": "sha1-vnoN5ITexcXN34s9WRJQRJEvY1s=", + "requires": { + "has-flag": "^2.0.0" + } + }, + "wrap-ansi": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz", + "integrity": "sha1-2Pw9KE3QV5T+hJc8rs3Rz4JP3YU=", + "requires": { + "string-width": "^1.0.1", + "strip-ansi": "^3.0.1" + }, + "dependencies": { + "ansi-regex": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz", + "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=" + }, + "is-fullwidth-code-point": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz", + "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=", + "requires": { + "number-is-nan": "^1.0.0" + } + }, + "string-width": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz", + "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=", + "requires": { + "code-point-at": "^1.0.0", + "is-fullwidth-code-point": "^1.0.0", + "strip-ansi": "^3.0.0" + } + }, + "strip-ansi": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz", + "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=", + "requires": { + "ansi-regex": "^2.0.0" + } + } + } + }, + "yargs": { + "version": "12.0.5", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-12.0.5.tgz", + "integrity": "sha512-Lhz8TLaYnxq/2ObqHDql8dX8CJi97oHxrjUcYtzKbbykPtVW9WB+poxI+NM2UIzsMgNCZTIf0AQwsjK5yMAqZw==", + "requires": { + "cliui": "^4.0.0", + "decamelize": "^1.2.0", + "find-up": "^3.0.0", + "get-caller-file": "^1.0.1", + "os-locale": "^3.0.0", + "require-directory": "^2.1.1", + "require-main-filename": "^1.0.1", + "set-blocking": "^2.0.0", + "string-width": "^2.0.0", + "which-module": "^2.0.0", + "y18n": "^3.2.1 || ^4.0.0", + "yargs-parser": "^11.1.1" + } + }, + "yargs-parser": { + "version": "11.1.1", + "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-11.1.1.tgz", + "integrity": "sha512-C6kB/WJDiaxONLJQnF8ccx9SEeoTTLek8RVbaOIsrAUS8VrBEXfmeSnCZxygc+XC2sNMBIwOOnfcxiynjHsVSQ==", + "requires": { + "camelcase": "^5.0.0", + "decamelize": "^1.2.0" + } + } + } + }, + "configstore": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/configstore/-/configstore-3.1.2.tgz", + "integrity": "sha512-vtv5HtGjcYUgFrXc6Kx747B83MRRVS5R1VTEQoXvuP+kMI+if6uywV0nDGoiydJRy4yk7h9od5Og0kxx4zUXmw==", + "dev": true, + "requires": { + "dot-prop": "^4.1.0", + "graceful-fs": "^4.1.2", + "make-dir": "^1.0.0", + "unique-string": "^1.0.0", + "write-file-atomic": "^2.0.0", + "xdg-basedir": "^3.0.0" + }, + "dependencies": { + "make-dir": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-1.3.0.tgz", + "integrity": "sha512-2w31R7SJtieJJnQtGc7RVL2StM2vGYVfqUOvUDxH6bC6aJTxPxTF0GnIgCyu7tjockiUWAYQRbxa7vKn34s5sQ==", "dev": true, "requires": { - "is-descriptor": "^0.1.0" + "pify": "^3.0.0" } }, - "extend-shallow": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", - "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", - "dev": true, - "requires": { - "is-extendable": "^0.1.0" - } + "pify": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz", + "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=", + "dev": true } } }, - "expect-ct": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/expect-ct/-/expect-ct-0.2.0.tgz", - "integrity": "sha512-6SK3MG/Bbhm8MsgyJAylg+ucIOU71/FzyFalcfu5nY19dH8y/z0tBJU0wrNBXD4B27EoQtqPF/9wqH0iYAd04g==" - }, - "express": { - "version": "4.17.1", - "resolved": "https://registry.npmjs.org/express/-/express-4.17.1.tgz", - "integrity": "sha512-mHJ9O79RqluphRrcw2X/GTh3k9tVv8YcoyY4Kkh4WDMUYKRZUq0h1o0w2rrrxBqM7VoeUVqgb27xlEMXTnYt4g==", + "connect": { + "version": "3.7.0", + "resolved": "https://registry.npmjs.org/connect/-/connect-3.7.0.tgz", + "integrity": "sha512-ZqRXc+tZukToSNmh5C2iWMSoV3X1YUcPbqEM4DkEG5tNQXrQUZCNVGGv3IuicnkMtPfGf3Xtp8WCXs295iQ1pQ==", "dev": true, "requires": { - "accepts": "~1.3.7", - "array-flatten": "1.1.1", - "body-parser": "1.19.0", - "content-disposition": "0.5.3", - "content-type": "~1.0.4", - "cookie": "0.4.0", - "cookie-signature": "1.0.6", "debug": "2.6.9", - "depd": "~1.1.2", - "encodeurl": "~1.0.2", - "escape-html": "~1.0.3", - "etag": "~1.8.1", - "finalhandler": "~1.1.2", - "fresh": "0.5.2", - "merge-descriptors": "1.0.1", - "methods": "~1.1.2", - "on-finished": "~2.3.0", + "finalhandler": "1.1.2", "parseurl": "~1.3.3", - "path-to-regexp": "0.1.7", - "proxy-addr": "~2.0.5", - "qs": "6.7.0", - "range-parser": "~1.2.1", - "safe-buffer": "5.1.2", - "send": "0.17.1", - "serve-static": "1.14.1", - "setprototypeof": "1.1.1", - "statuses": "~1.5.0", - "type-is": "~1.6.18", - "utils-merge": "1.0.1", - "vary": "~1.1.2" + "utils-merge": "1.0.1" }, "dependencies": { - "array-flatten": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz", - "integrity": "sha1-ml9pkFGx5wczKPKgCJaLZOopVdI=", - "dev": true - }, - "cookie": { - "version": "0.4.0", - "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.4.0.tgz", - "integrity": "sha512-+Hp8fLp57wnUSt0tY0tHEXh4voZRDnoIrZPqlo3DPiI4y9lwg/jqx+1Om94/W6ZaPDOUbnjOt/99w66zk+l1Xg==", - "dev": true - }, "debug": { "version": "2.6.9", "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", @@ -4725,1088 +3809,1898 @@ "requires": { "ms": "2.0.0" } - }, - "path-to-regexp": { - "version": "0.1.7", - "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz", - "integrity": "sha1-32BBeABfUi8V60SQ5yR6G/qmf4w=", - "dev": true - }, - "qs": { - "version": "6.7.0", - "resolved": "https://registry.npmjs.org/qs/-/qs-6.7.0.tgz", - "integrity": "sha512-VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ==", - "dev": true - }, - "safe-buffer": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", - "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==", - "dev": true } } }, - "express-http-proxy": { - "version": "1.5.1", - "resolved": "https://registry.npmjs.org/express-http-proxy/-/express-http-proxy-1.5.1.tgz", - "integrity": "sha512-k1RdysZWZ8wdPnsLa4iyrrYyUFih/sYKkn6WfkU/q5A8eUdh3l+oXhrRuQmEYEsZmiexVvpiOCkogl03jYfcbg==", - "requires": { - "debug": "^3.0.1", - "es6-promise": "^4.1.1", - "raw-body": "^2.3.0" - } + "connect-history-api-fallback": { + "version": "1.6.0", + "resolved": "https://registry.npmjs.org/connect-history-api-fallback/-/connect-history-api-fallback-1.6.0.tgz", + "integrity": "sha512-e54B99q/OUoH64zYYRf3HBP5z24G38h5D3qXu23JGRoigpX5Ss4r9ZnDk3g0Z8uQC2x2lPaJ+UlWBc1ZWBWdLg==", + "dev": true }, - "express-sanitizer": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/express-sanitizer/-/express-sanitizer-1.0.5.tgz", - "integrity": "sha512-48/Tf1DZ7JklRVTcXQLHAxhq4GNJTuHq2jjIYhyTmu0Bw+X06YPDD/e/tdn1QLYk706xw4N8JFxtjslRrDGb8g==", + "console-browserify": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/console-browserify/-/console-browserify-1.2.0.tgz", + "integrity": "sha512-ZMkYO/LkF17QvCPqM0gxw8yUzigAOZOSWSHg91FH6orS7vcEj5dVZTidN2fQ14yBSdg97RqhSNwLUXInd52OTA==", + "dev": true + }, + "constantinople": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/constantinople/-/constantinople-3.0.2.tgz", + "integrity": "sha1-S5RdmTeQe82Y7ldRIsOBdRZUQUE=", "requires": { - "sanitizer": "0.1.3", - "underscore": "1.8.3" + "acorn": "^2.1.0" } }, - "extend": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz", - "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==" + "constants-browserify": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/constants-browserify/-/constants-browserify-1.0.0.tgz", + "integrity": "sha1-wguW2MYXdIqvHBYCF2DNJ/y4y3U=", + "dev": true }, - "extend-shallow": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz", - "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=", + "content-disposition": { + "version": "0.5.3", + "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.3.tgz", + "integrity": "sha512-ExO0774ikEObIAEV9kDo50o+79VCUdEB6n6lzKgGwupcVeRlhrj3qGAfwq8G6uBJjkqLrhT0qEYFcWng8z1z0g==", "dev": true, "requires": { - "assign-symbols": "^1.0.0", - "is-extendable": "^1.0.1" + "safe-buffer": "5.1.2" }, "dependencies": { - "is-extendable": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz", - "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==", - "dev": true, - "requires": { - "is-plain-object": "^2.0.4" - } + "safe-buffer": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", + "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==", + "dev": true } } }, - "external-editor": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/external-editor/-/external-editor-3.1.0.tgz", - "integrity": "sha512-hMQ4CX1p1izmuLYyZqLMO/qGNw10wSv9QDCPfzXfyFrOaCSSoRfqE1Kf1s5an66J5JZC62NewG+mK49jOCtQew==", - "dev": true, - "requires": { - "chardet": "^0.7.0", - "iconv-lite": "^0.4.24", - "tmp": "^0.0.33" - } + "content-security-policy-builder": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/content-security-policy-builder/-/content-security-policy-builder-2.1.0.tgz", + "integrity": "sha512-/MtLWhJVvJNkA9dVLAp6fg9LxD2gfI6R2Fi1hPmfjYXSahJJzcfvoeDOxSyp4NvxMuwWv3WMssE9o31DoULHrQ==" }, - "extglob": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz", - "integrity": "sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==", + "content-type": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.4.tgz", + "integrity": "sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA==", + "dev": true + }, + "convert-source-map": { + "version": "1.7.0", + "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.7.0.tgz", + "integrity": "sha512-4FJkXzKXEDB1snCFZlLP4gpC3JILicCpGbzG9f9G7tGqGCzETQ2hWPrcinA9oU4wtf2biUaEH5065UnMeR33oA==", "dev": true, "requires": { - "array-unique": "^0.3.2", - "define-property": "^1.0.0", - "expand-brackets": "^2.1.4", - "extend-shallow": "^2.0.1", - "fragment-cache": "^0.2.1", - "regex-not": "^1.0.0", - "snapdragon": "^0.8.1", - "to-regex": "^3.0.1" + "safe-buffer": "~5.1.1" }, "dependencies": { - "define-property": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz", - "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=", - "dev": true, - "requires": { - "is-descriptor": "^1.0.0" - } - }, - "extend-shallow": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", - "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", - "dev": true, - "requires": { - "is-extendable": "^0.1.0" - } - }, - "is-accessor-descriptor": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz", - "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==", - "dev": true, - "requires": { - "kind-of": "^6.0.0" - } - }, - "is-data-descriptor": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz", - "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==", - "dev": true, - "requires": { - "kind-of": "^6.0.0" - } - }, - "is-descriptor": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz", - "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==", - "dev": true, - "requires": { - "is-accessor-descriptor": "^1.0.0", - "is-data-descriptor": "^1.0.0", - "kind-of": "^6.0.2" - } - }, - "kind-of": { - "version": "6.0.2", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz", - "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==", + "safe-buffer": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", + "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==", "dev": true } } }, - "extract-zip": { - "version": "1.6.7", - "resolved": "https://registry.npmjs.org/extract-zip/-/extract-zip-1.6.7.tgz", - "integrity": "sha1-qEC0uK9kAyZMjbV/Txp0Mz74H+k=", - "dev": true, + "convict": { + "version": "4.4.1", + "resolved": "https://registry.npmjs.org/convict/-/convict-4.4.1.tgz", + "integrity": "sha512-celpR4hOWWwb/S8azhzgQwDon6muAJlNe2LTLeOGyoSgH390TsaqoieAe9BLbAv7+9wNfG7DTA2q3IfFp2viKw==", "requires": { - "concat-stream": "1.6.2", - "debug": "2.6.9", - "mkdirp": "0.5.1", - "yauzl": "2.4.1" + "depd": "1.1.2", + "json5": "1.0.1", + "lodash.clonedeep": "4.5.0", + "moment": "2.22.2", + "validator": "10.8.0", + "yargs-parser": "11.0.0" }, "dependencies": { - "debug": { - "version": "2.6.9", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", - "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", - "dev": true, + "moment": { + "version": "2.22.2", + "resolved": "https://registry.npmjs.org/moment/-/moment-2.22.2.tgz", + "integrity": "sha1-PCV/mDn8DpP/UxSWMiOeuQeD/2Y=" + }, + "yargs-parser": { + "version": "11.0.0", + "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-11.0.0.tgz", + "integrity": "sha512-dvsafRjM45h79WOTvS/dP35Sb31SlGAKz6tFjI97kGC4MJFBuzTZY6TTYHrz0QSMQdkyd8Y+RsOMLr+JY0nPFQ==", "requires": { - "ms": "2.0.0" + "camelcase": "^5.0.0", + "decamelize": "^1.2.0" } } } }, - "extsprintf": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz", - "integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=" - }, - "faker": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/faker/-/faker-4.1.0.tgz", - "integrity": "sha1-HkW7vsxndLPBlfrSg1EJxtdIzD8=", - "dev": true - }, - "fast-deep-equal": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz", - "integrity": "sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk=" + "cookie": { + "version": "0.3.1", + "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.3.1.tgz", + "integrity": "sha1-5+Ch+e9DtMi6klxcWpboBtFoc7s=" }, - "fast-json-stable-stringify": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz", - "integrity": "sha1-1RQsDK7msRifh9OnYREGT4bIu/I=" + "cookie-parser": { + "version": "1.4.4", + "resolved": "https://registry.npmjs.org/cookie-parser/-/cookie-parser-1.4.4.tgz", + "integrity": "sha512-lo13tqF3JEtFO7FyA49CqbhaFkskRJ0u/UAiINgrIXeRCY41c88/zxtrECl8AKH3B0hj9q10+h3Kt8I7KlW4tw==", + "requires": { + "cookie": "0.3.1", + "cookie-signature": "1.0.6" + } }, - "fast-levenshtein": { - "version": "2.0.6", - "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz", - "integrity": "sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=" + "cookie-signature": { + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz", + "integrity": "sha1-4wOogrNCzD7oylE6eZmXNNqzriw=" }, - "fastparse": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/fastparse/-/fastparse-1.1.2.tgz", - "integrity": "sha512-483XLLxTVIwWK3QTrMGRqUfUpoOs/0hbQrl2oz4J0pAcm3A3bu84wxTFqGqkJzewCLdME38xJLJAxBABfQT8sQ==", + "cookiejar": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/cookiejar/-/cookiejar-2.1.2.tgz", + "integrity": "sha512-Mw+adcfzPxcPeI+0WlvRrr/3lGVO0bD75SxX6811cxSh1Wbxx7xZBGK1eVtDf6si8rg2lhnUjsVLMFMfbRIuwA==", "dev": true }, - "faye-websocket": { - "version": "0.10.0", - "resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.10.0.tgz", - "integrity": "sha1-TkkvjQTftviQA1B/btvy1QHnxvQ=", + "cookies": { + "version": "0.8.0", + "resolved": "https://registry.npmjs.org/cookies/-/cookies-0.8.0.tgz", + "integrity": "sha512-8aPsApQfebXnuI+537McwYsDtjVxGm8gTIzQI3FDW6t5t/DAhERxtnbEPN/8RX+uZthoz4eCOgloXaE5cYyNow==", + "requires": { + "depd": "~2.0.0", + "keygrip": "~1.1.0" + }, + "dependencies": { + "depd": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz", + "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==" + } + } + }, + "copy-concurrently": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/copy-concurrently/-/copy-concurrently-1.0.5.tgz", + "integrity": "sha512-f2domd9fsVDFtaFcbaRZuYXwtdmnzqbADSwhSWYxYB/Q8zsdUUFMXVRwXGDMWmbEzAn1kdRrtI1T/KTFOL4X2A==", "dev": true, "requires": { - "websocket-driver": ">=0.5.1" + "aproba": "^1.1.1", + "fs-write-stream-atomic": "^1.0.8", + "iferr": "^0.1.5", + "mkdirp": "^0.5.1", + "rimraf": "^2.5.4", + "run-queue": "^1.0.0" } }, - "fd-slicer": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.0.1.tgz", - "integrity": "sha1-i1vL2ewyfFBBv5qwI/1nUPEXfmU=", + "copy-descriptor": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/copy-descriptor/-/copy-descriptor-0.1.1.tgz", + "integrity": "sha1-Z29us8OZl8LuGsOpJP1hJHSPV40=", + "dev": true + }, + "copy-webpack-plugin": { + "version": "5.0.4", + "resolved": "https://registry.npmjs.org/copy-webpack-plugin/-/copy-webpack-plugin-5.0.4.tgz", + "integrity": "sha512-YBuYGpSzoCHSSDGyHy6VJ7SHojKp6WHT4D7ItcQFNAYx2hrwkMe56e97xfVR0/ovDuMTrMffXUiltvQljtAGeg==", "dev": true, "requires": { - "pend": "~1.2.0" + "cacache": "^11.3.3", + "find-cache-dir": "^2.1.0", + "glob-parent": "^3.1.0", + "globby": "^7.1.1", + "is-glob": "^4.0.1", + "loader-utils": "^1.2.3", + "minimatch": "^3.0.4", + "normalize-path": "^3.0.0", + "p-limit": "^2.2.0", + "schema-utils": "^1.0.0", + "serialize-javascript": "^1.7.0", + "webpack-log": "^2.0.0" } }, - "feature-policy": { - "version": "0.3.0", - "resolved": "https://registry.npmjs.org/feature-policy/-/feature-policy-0.3.0.tgz", - "integrity": "sha512-ZtijOTFN7TzCujt1fnNhfWPFPSHeZkesff9AXZj+UEjYBynWNUIYpC87Ve4wHzyexQsImicLu7WsC2LHq7/xrQ==" + "core-js": { + "version": "2.6.11", + "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.11.tgz", + "integrity": "sha512-5wjnpaT/3dV+XB4borEsnAYQchn00XSgTAWKDkEqv+K8KevjbzmofK6hfJ9TZIlpj2N0xQpazy7PiRQiWHqzWg==" }, - "figgy-pudding": { - "version": "3.5.1", - "resolved": "https://registry.npmjs.org/figgy-pudding/-/figgy-pudding-3.5.1.tgz", - "integrity": "sha512-vNKxJHTEKNThjfrdJwHc7brvM6eVevuO5nTj6ez8ZQ1qbXTvGthucRF7S4vf2cr71QVnT70V34v0S1DyQsti0w==", - "dev": true + "core-util-is": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz", + "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=" }, - "figures": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/figures/-/figures-2.0.0.tgz", - "integrity": "sha1-OrGi0qYsi/tDGgyUy3l6L84nyWI=", + "cosmiconfig": { + "version": "5.2.1", + "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-5.2.1.tgz", + "integrity": "sha512-H65gsXo1SKjf8zmrJ67eJk8aIRKV5ff2D4uKZIBZShbhGSpEmsQOPW/SKMKYhSTrqR7ufy6RP69rPogdaPh/kA==", "dev": true, "requires": { - "escape-string-regexp": "^1.0.5" + "import-fresh": "^2.0.0", + "is-directory": "^0.3.1", + "js-yaml": "^3.13.1", + "parse-json": "^4.0.0" } }, - "file-loader": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/file-loader/-/file-loader-4.1.0.tgz", - "integrity": "sha512-ajDk1nlByoalZAGR4b0H6oD+EGlWnyW1qbSxzaUc7RFiqmn+RbXQQRbTc72jsiUIlVusJ4Et58ltds8ZwTfnAw==", + "cp-file": { + "version": "6.2.0", + "resolved": "https://registry.npmjs.org/cp-file/-/cp-file-6.2.0.tgz", + "integrity": "sha512-fmvV4caBnofhPe8kOcitBwSn2f39QLjnAnGq3gO9dfd75mUytzKNZB1hde6QHunW2Rt+OwuBOMc3i1tNElbszA==", "dev": true, "requires": { - "loader-utils": "^1.2.3", - "schema-utils": "^2.0.0" - }, - "dependencies": { - "ajv": { - "version": "6.10.2", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.10.2.tgz", - "integrity": "sha512-TXtUUEYHuaTEbLZWIKUr5pmBuhDLy+8KYtPYdcV8qC+pOZL+NKqYwvWSRrVXHn+ZmRRAu8vJTAznH7Oag6RVRw==", - "dev": true, - "requires": { - "fast-deep-equal": "^2.0.1", - "fast-json-stable-stringify": "^2.0.0", - "json-schema-traverse": "^0.4.1", - "uri-js": "^4.2.2" - } - }, - "fast-deep-equal": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz", - "integrity": "sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk=", - "dev": true - }, - "json-schema-traverse": { - "version": "0.4.1", - "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz", - "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==", - "dev": true - }, - "schema-utils": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-2.1.0.tgz", - "integrity": "sha512-g6SViEZAfGNrToD82ZPUjq52KUPDYc+fN5+g6Euo5mLokl/9Yx14z0Cu4RR1m55HtBXejO0sBt+qw79axN+Fiw==", - "dev": true, - "requires": { - "ajv": "^6.1.0", - "ajv-keywords": "^3.1.0" - } - } + "graceful-fs": "^4.1.2", + "make-dir": "^2.0.0", + "nested-error-stacks": "^2.0.0", + "pify": "^4.0.1", + "safe-buffer": "^5.0.1" } }, - "file-saver": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/file-saver/-/file-saver-2.0.2.tgz", - "integrity": "sha512-Wz3c3XQ5xroCxd1G8b7yL0Ehkf0TC9oYC6buPFkNnU9EnaPlifeAFCyCh+iewXTyFRcg0a6j3J7FmJsIhlhBdw==" + "create-ecdh": { + "version": "4.0.3", + "resolved": "https://registry.npmjs.org/create-ecdh/-/create-ecdh-4.0.3.tgz", + "integrity": "sha512-GbEHQPMOswGpKXM9kCWVrremUcBmjteUaQ01T9rkKCPDXfUHX0IoP9LpHYo2NPFampa4e+/pFDc3jQdxrxQLaw==", + "dev": true, + "requires": { + "bn.js": "^4.1.0", + "elliptic": "^6.0.0" + } }, - "fileset": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/fileset/-/fileset-2.0.3.tgz", - "integrity": "sha1-jnVIqW08wjJ+5eZ0FocjozO7oqA=", + "create-error-class": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/create-error-class/-/create-error-class-3.0.2.tgz", + "integrity": "sha1-Br56vvlHo/FKMP1hBnHUAbyot7Y=", "dev": true, "requires": { - "glob": "^7.0.3", - "minimatch": "^3.0.3" + "capture-stack-trace": "^1.0.0" } }, - "fill-range": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz", - "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=", + "create-hash": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/create-hash/-/create-hash-1.2.0.tgz", + "integrity": "sha512-z00bCGNHDG8mHAkP7CtT1qVu+bFQUPjYq/4Iv3C3kWjTFV10zIjfSoeqXo9Asws8gwSHDGj/hl2u4OGIjapeCg==", "dev": true, "requires": { - "extend-shallow": "^2.0.1", - "is-number": "^3.0.0", - "repeat-string": "^1.6.1", - "to-regex-range": "^2.1.0" - }, - "dependencies": { - "extend-shallow": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", - "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", - "dev": true, - "requires": { - "is-extendable": "^0.1.0" - } - } + "cipher-base": "^1.0.1", + "inherits": "^2.0.1", + "md5.js": "^1.3.4", + "ripemd160": "^2.0.1", + "sha.js": "^2.4.0" } }, - "finalhandler": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.2.tgz", - "integrity": "sha512-aAWcW57uxVNrQZqFXjITpW3sIUQmHGG3qSb9mUah9MgMC4NeWhNOlNjXEYq3HjRAvL6arUviZGGJsBg6z0zsWA==", + "create-hmac": { + "version": "1.1.7", + "resolved": "https://registry.npmjs.org/create-hmac/-/create-hmac-1.1.7.tgz", + "integrity": "sha512-MJG9liiZ+ogc4TzUwuvbER1JRdgvUFSB5+VR/g5h82fGaIRWMWddtKBHi7/sVhfjQZ6SehlyhvQYrcYkaUIpLg==", + "dev": true, + "requires": { + "cipher-base": "^1.0.3", + "create-hash": "^1.1.0", + "inherits": "^2.0.1", + "ripemd160": "^2.0.0", + "safe-buffer": "^5.0.1", + "sha.js": "^2.4.8" + } + }, + "cross-env": { + "version": "5.2.1", + "resolved": "https://registry.npmjs.org/cross-env/-/cross-env-5.2.1.tgz", + "integrity": "sha512-1yHhtcfAd1r4nwQgknowuUNfIT9E8dOMMspC36g45dN+iD1blloi7xp8X/xAIDnjHWyt1uQ8PHk2fkNaym7soQ==", "dev": true, "requires": { - "debug": "2.6.9", - "encodeurl": "~1.0.2", - "escape-html": "~1.0.3", - "on-finished": "~2.3.0", - "parseurl": "~1.3.3", - "statuses": "~1.5.0", - "unpipe": "~1.0.0" + "cross-spawn": "^6.0.5" }, "dependencies": { - "debug": { - "version": "2.6.9", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", - "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", + "cross-spawn": { + "version": "6.0.5", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz", + "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==", "dev": true, "requires": { - "ms": "2.0.0" + "nice-try": "^1.0.4", + "path-key": "^2.0.1", + "semver": "^5.5.0", + "shebang-command": "^1.2.0", + "which": "^1.2.9" } } } }, - "find-cache-dir": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-2.1.0.tgz", - "integrity": "sha512-Tq6PixE0w/VMFfCgbONnkiQIVol/JJL7nRMi20fqzA4NRs9AfeqMGeRdPi3wIhYkxjeBaWh2rxwapn5Tu3IqOQ==", - "dev": true, + "cross-spawn": { + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-4.0.2.tgz", + "integrity": "sha1-e5JHYhwjrf3ThWAEqCPL45dCTUE=", "requires": { - "commondir": "^1.0.1", - "make-dir": "^2.0.0", - "pkg-dir": "^3.0.0" + "lru-cache": "^4.0.1", + "which": "^1.2.9" } }, - "find-up": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz", - "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==", + "crypto-browserify": { + "version": "3.12.0", + "resolved": "https://registry.npmjs.org/crypto-browserify/-/crypto-browserify-3.12.0.tgz", + "integrity": "sha512-fz4spIh+znjO2VjL+IdhEpRJ3YN6sMzITSBijk6FK2UvTqruSQW+/cCZTSNsMiZNvUeq0CqurF+dAbyiGOY6Wg==", + "dev": true, "requires": { - "locate-path": "^3.0.0" + "browserify-cipher": "^1.0.0", + "browserify-sign": "^4.0.0", + "create-ecdh": "^4.0.0", + "create-hash": "^1.1.0", + "create-hmac": "^1.1.0", + "diffie-hellman": "^5.0.0", + "inherits": "^2.0.1", + "pbkdf2": "^3.0.3", + "public-encrypt": "^4.0.0", + "randombytes": "^2.0.0", + "randomfill": "^1.0.3" } }, - "flat": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/flat/-/flat-4.1.0.tgz", - "integrity": "sha512-Px/TiLIznH7gEDlPXcUD4KnBusa6kR6ayRUVcnEAbreRIuhkqow/mun59BuRXwoYk7ZQOLW1ZM05ilIvK38hFw==", - "dev": true, + "crypto-random-string": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/crypto-random-string/-/crypto-random-string-1.0.0.tgz", + "integrity": "sha1-ojD2T1aDEOFJgAmUB5DsmVRbyn4=", + "dev": true + }, + "css": { + "version": "1.0.8", + "resolved": "https://registry.npmjs.org/css/-/css-1.0.8.tgz", + "integrity": "sha1-k4aBHKgrzMnuf7WnMrHioxfIo+c=", "requires": { - "is-buffer": "~2.0.3" + "css-parse": "1.0.4", + "css-stringify": "1.0.5" } }, - "flatted": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/flatted/-/flatted-2.0.1.tgz", - "integrity": "sha512-a1hQMktqW9Nmqr5aktAux3JMNqaucxGcjtjWnZLHX7yyPCmlSV3M54nGYbqT8K+0GhF3NBgmJCc3ma+WOgX8Jg==", - "dev": true + "css-parse": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/css-parse/-/css-parse-1.0.4.tgz", + "integrity": "sha1-OLBQP7+dqfVOnB29pg4UXHcRe90=" }, - "flush-write-stream": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/flush-write-stream/-/flush-write-stream-1.1.1.tgz", - "integrity": "sha512-3Z4XhFZ3992uIq0XOqb9AreonueSYphE6oYbpt5+3u06JWklbsPkNv3ZKkP9Bz/r+1MWCaMoSQ28P85+1Yc77w==", - "dev": true, + "css-select": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/css-select/-/css-select-1.2.0.tgz", + "integrity": "sha1-KzoRBTnFNV8c2NMUYj6HCxIeyFg=", "requires": { - "inherits": "^2.0.3", - "readable-stream": "^2.3.6" + "boolbase": "~1.0.0", + "css-what": "2.1", + "domutils": "1.5.1", + "nth-check": "~1.0.1" } }, - "follow-redirects": { - "version": "1.5.10", - "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.5.10.tgz", - "integrity": "sha512-0V5l4Cizzvqt5D44aTXbFZz+FtyXV1vrDN6qrelxtfYQKW0KO0W2T/hkE8xvGa/540LkZlkaUjO4ailYTFtHVQ==", + "css-selector-tokenizer": { + "version": "0.7.1", + "resolved": "https://registry.npmjs.org/css-selector-tokenizer/-/css-selector-tokenizer-0.7.1.tgz", + "integrity": "sha512-xYL0AMZJ4gFzJQsHUKa5jiWWi2vH77WVNg7JYRyewwj6oPh4yb/y6Y9ZCw9dsj/9UauMhtuxR+ogQd//EdEVNA==", + "dev": true, "requires": { - "debug": "=3.1.0" + "cssesc": "^0.1.0", + "fastparse": "^1.1.1", + "regexpu-core": "^1.0.0" } }, - "for-in": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz", - "integrity": "sha1-gQaNKVqBQuwKxybG4iAMMPttXoA=", - "dev": true + "css-stringify": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/css-stringify/-/css-stringify-1.0.5.tgz", + "integrity": "sha1-sNBClG2ylTu50pKQCmy19tASIDE=" }, - "for-own": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/for-own/-/for-own-1.0.0.tgz", - "integrity": "sha1-xjMy9BXO3EsE2/5wz4NklMU8tEs=", + "css-what": { + "version": "2.1.3", + "resolved": "https://registry.npmjs.org/css-what/-/css-what-2.1.3.tgz", + "integrity": "sha512-a+EPoD+uZiNfh+5fxw2nO9QwFa6nJe2Or35fGY6Ipw1R3R4AGz1d1TEZrCegvw2YTmZ0jXirGYlzxxpYSHwpEg==" + }, + "cssauron": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/cssauron/-/cssauron-1.4.0.tgz", + "integrity": "sha1-pmAt/34EqDBtwNuaVR6S6LVmKtg=", "dev": true, "requires": { - "for-in": "^1.0.1" + "through": "X.X.X" } }, - "foreachasync": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/foreachasync/-/foreachasync-3.0.0.tgz", - "integrity": "sha1-VQKYfchxS+M5IJfzLgBxyd7gfPY=" + "cssesc": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/cssesc/-/cssesc-0.1.0.tgz", + "integrity": "sha1-yBSQPkViM3GgR3tAEJqq++6t27Q=", + "dev": true }, - "foreground-child": { - "version": "1.5.6", - "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-1.5.6.tgz", - "integrity": "sha1-T9ca0t/elnibmApcCilZN8svXOk=", + "cssom": { + "version": "0.4.4", + "resolved": "https://registry.npmjs.org/cssom/-/cssom-0.4.4.tgz", + "integrity": "sha512-p3pvU7r1MyyqbTk+WbNJIgJjG2VmTIaB10rI93LzVPrmDJKkzKYMtxxyAvQXR/NS6otuzveI7+7BBq3SjBS2mw==" + }, + "cssstyle": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/cssstyle/-/cssstyle-2.2.0.tgz", + "integrity": "sha512-sEb3XFPx3jNnCAMtqrXPDeSgQr+jojtCeNf8cvMNMh1cG970+lljssvQDzPq6lmmJu2Vhqood/gtEomBiHOGnA==", "requires": { - "cross-spawn": "^4", - "signal-exit": "^3.0.0" + "cssom": "~0.3.6" + }, + "dependencies": { + "cssom": { + "version": "0.3.8", + "resolved": "https://registry.npmjs.org/cssom/-/cssom-0.3.8.tgz", + "integrity": "sha512-b0tGHbfegbhPJpxpiBPU2sCkigAqtM9O121le6bbOlgyV+NyGyCmVfJ6QW9eRjz8CpNfWEOYBIMIGRYkLwsIYg==" + } } }, - "forever-agent": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz", - "integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=" - }, - "form-data": { - "version": "2.3.3", - "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.3.tgz", - "integrity": "sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==", + "csvtojson": { + "version": "2.0.10", + "resolved": "https://registry.npmjs.org/csvtojson/-/csvtojson-2.0.10.tgz", + "integrity": "sha512-lUWFxGKyhraKCW8Qghz6Z0f2l/PqB1W3AO0HKJzGIQ5JRSlR651ekJDiGJbBT4sRNNv5ddnSGVEnsxP9XRCVpQ==", "requires": { - "asynckit": "^0.4.0", - "combined-stream": "^1.0.6", - "mime-types": "^2.1.12" + "bluebird": "^3.5.1", + "lodash": "^4.17.3", + "strip-bom": "^2.0.0" + }, + "dependencies": { + "strip-bom": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz", + "integrity": "sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=", + "requires": { + "is-utf8": "^0.2.0" + } + } } }, - "formidable": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/formidable/-/formidable-1.2.1.tgz", - "integrity": "sha512-Fs9VRguL0gqGHkXS5GQiMCr1VhZBxz0JnJs4JmMp/2jL18Fmbzvv7vOFRU+U8TBkHEE/CX1qDXzJplVULgsLeg==", + "custom-event": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/custom-event/-/custom-event-1.0.1.tgz", + "integrity": "sha1-XQKkaFCt8bSjF5RqOSj8y1v9BCU=", "dev": true }, - "forwarded": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.1.2.tgz", - "integrity": "sha1-mMI9qxF1ZXuMBXPozszZGw/xjIQ=", + "cyclist": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/cyclist/-/cyclist-1.0.1.tgz", + "integrity": "sha1-WW6WmP0MgOEgOMK4LW6xs1tiJNk=", "dev": true }, - "fragment-cache": { - "version": "0.2.1", - "resolved": "https://registry.npmjs.org/fragment-cache/-/fragment-cache-0.2.1.tgz", - "integrity": "sha1-QpD60n8T6Jvn8zeZxrxaCr//DRk=", - "dev": true, + "damerau-levenshtein": { + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/damerau-levenshtein/-/damerau-levenshtein-1.0.6.tgz", + "integrity": "sha512-JVrozIeElnj3QzfUIt8tB8YMluBJom4Vw9qTPpjGYQ9fYlB3D/rb6OordUxf3xeFB35LKWs0xqcO5U6ySvBtug==", + "dev": true + }, + "dashdash": { + "version": "1.14.1", + "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz", + "integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=", "requires": { - "map-cache": "^0.2.2" + "assert-plus": "^1.0.0" } }, - "frameguard": { + "dasherize": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/dasherize/-/dasherize-2.0.0.tgz", + "integrity": "sha1-bYCcnNDPe7iVLYD8hPoT1H3bEwg=" + }, + "data-urls": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/data-urls/-/data-urls-1.1.0.tgz", + "integrity": "sha512-YTWYI9se1P55u58gL5GkQHW4P6VJBJ5iBT+B5a7i2Tjadhv52paJG0qHX4A0OR6/t52odI64KP2YvFpkDOi3eQ==", + "requires": { + "abab": "^2.0.0", + "whatwg-mimetype": "^2.2.0", + "whatwg-url": "^7.0.0" + } + }, + "date-fns": { + "version": "1.30.1", + "resolved": "https://registry.npmjs.org/date-fns/-/date-fns-1.30.1.tgz", + "integrity": "sha512-hBSVCvSmWC+QypYObzwGOd9wqdDpOt+0wl0KbU+R+uuZBS1jN8VsD1ss3irQDknRj5NvxiTF6oj/nDRnN/UQNw==" + }, + "date-format": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/date-format/-/date-format-2.1.0.tgz", + "integrity": "sha512-bYQuGLeFxhkxNOF3rcMtiZxvCBAquGzZm6oWA1oZ0g2THUzivaRhv8uOhdr19LmoobSOLoIAxeUK2RdbM8IFTA==", + "dev": true + }, + "debug": { "version": "3.1.0", - "resolved": "https://registry.npmjs.org/frameguard/-/frameguard-3.1.0.tgz", - "integrity": "sha512-TxgSKM+7LTA6sidjOiSZK9wxY0ffMPY3Wta//MqwmX0nZuEHc8QrkV8Fh3ZhMJeiH+Uyh/tcaarImRy8u77O7g==" + "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz", + "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==", + "requires": { + "ms": "2.0.0" + } + }, + "debuglog": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/debuglog/-/debuglog-1.0.1.tgz", + "integrity": "sha1-qiT/uaw9+aI1GDfPstJ5NgzXhJI=", + "dev": true + }, + "decamelize": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz", + "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=" }, - "fresh": { - "version": "0.5.2", - "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz", - "integrity": "sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac=" + "decode-uri-component": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.0.tgz", + "integrity": "sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU=", + "dev": true }, - "from2": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/from2/-/from2-2.3.0.tgz", - "integrity": "sha1-i/tVAr3kpNNs/e6gB/zKIdfjgq8=", + "deep-eql": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/deep-eql/-/deep-eql-3.0.1.tgz", + "integrity": "sha512-+QeIQyN5ZuO+3Uk5DYh6/1eKO0m0YmJFGNmFHGACpf1ClL1nmlV/p4gNgbl2pJGxgXb4faqo6UE+M5ACEMyVcw==", "dev": true, "requires": { - "inherits": "^2.0.1", - "readable-stream": "^2.0.0" + "type-detect": "^4.0.0" } }, - "fs-access": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/fs-access/-/fs-access-1.0.1.tgz", - "integrity": "sha1-1qh/JiJxzv6+wwxVNAf7mV2od3o=", + "deep-equal": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-1.1.1.tgz", + "integrity": "sha512-yd9c5AdiqVcR+JjcwUQb9DkhJc8ngNr0MahEBGvDiJw8puWab2yZlh+nkasOnZP+EGTAP6rRp2JzJhJZzvNF8g==", "dev": true, "requires": { - "null-check": "^1.0.0" + "is-arguments": "^1.0.4", + "is-date-object": "^1.0.1", + "is-regex": "^1.0.4", + "object-is": "^1.0.1", + "object-keys": "^1.1.1", + "regexp.prototype.flags": "^1.2.0" } }, - "fs-extra": { - "version": "7.0.1", - "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-7.0.1.tgz", - "integrity": "sha512-YJDaCJZEnBmcbw13fvdAM9AwNOJwOzrE4pqMqBq5nFiEqXUqHwlK4B+3pUw6JNvfSPtX05xFHtYy/1ni01eGCw==", + "deep-extend": { + "version": "0.6.0", + "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz", + "integrity": "sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==", + "dev": true + }, + "deep-is": { + "version": "0.1.3", + "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.3.tgz", + "integrity": "sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ=" + }, + "default-gateway": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/default-gateway/-/default-gateway-4.2.0.tgz", + "integrity": "sha512-h6sMrVB1VMWVrW13mSc6ia/DwYYw5MN6+exNu1OaJeFac5aSAvwM7lZ0NVfTABuSkQelr4h5oebg3KB1XPdjgA==", "dev": true, "requires": { - "graceful-fs": "^4.1.2", - "jsonfile": "^4.0.0", - "universalify": "^0.1.0" + "execa": "^1.0.0", + "ip-regex": "^2.1.0" } }, - "fs-minipass": { - "version": "1.2.6", - "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-1.2.6.tgz", - "integrity": "sha512-crhvyXcMejjv3Z5d2Fa9sf5xLYVCF5O1c71QxbVnbLsmYMBEvDAftewesN/HhY03YRoA7zOMxjNGrF5svGaaeQ==", + "default-require-extensions": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/default-require-extensions/-/default-require-extensions-2.0.0.tgz", + "integrity": "sha1-9fj7sYp9bVCyH2QfZJ67Uiz+JPc=", "dev": true, "requires": { - "minipass": "^2.2.1" + "strip-bom": "^3.0.0" } }, - "fs-write-stream-atomic": { - "version": "1.0.10", - "resolved": "https://registry.npmjs.org/fs-write-stream-atomic/-/fs-write-stream-atomic-1.0.10.tgz", - "integrity": "sha1-tH31NJPvkR33VzHnCp3tAYnbQMk=", + "define-properties": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.3.tgz", + "integrity": "sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ==", "dev": true, "requires": { - "graceful-fs": "^4.1.2", - "iferr": "^0.1.5", - "imurmurhash": "^0.1.4", - "readable-stream": "1 || 2" + "object-keys": "^1.0.12" } }, - "fs.realpath": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", - "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=" - }, - "fsevents": { - "version": "1.2.9", - "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.9.tgz", - "integrity": "sha512-oeyj2H3EjjonWcFjD5NvZNE9Rqe4UW+nQBU2HNeKw0koVLEFIhtyETyAakeAM3de7Z/SW5kcA+fZUait9EApnw==", + "define-property": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/define-property/-/define-property-2.0.2.tgz", + "integrity": "sha512-jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ==", "dev": true, - "optional": true, "requires": { - "nan": "^2.12.1", - "node-pre-gyp": "^0.12.0" + "is-descriptor": "^1.0.2", + "isobject": "^3.0.1" }, "dependencies": { - "abbrev": { - "version": "1.1.1", - "bundled": true, - "dev": true, - "optional": true - }, - "ansi-regex": { - "version": "2.1.1", - "bundled": true, - "dev": true, - "optional": true - }, - "aproba": { - "version": "1.2.0", - "bundled": true, - "dev": true, - "optional": true - }, - "are-we-there-yet": { - "version": "1.1.5", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "delegates": "^1.0.0", - "readable-stream": "^2.0.6" - } - }, - "balanced-match": { - "version": "1.0.0", - "bundled": true, - "dev": true, - "optional": true - }, - "brace-expansion": { - "version": "1.1.11", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "balanced-match": "^1.0.0", - "concat-map": "0.0.1" - } - }, - "chownr": { - "version": "1.1.1", - "bundled": true, - "dev": true, - "optional": true - }, - "code-point-at": { - "version": "1.1.0", - "bundled": true, - "dev": true, - "optional": true - }, - "concat-map": { - "version": "0.0.1", - "bundled": true, - "dev": true, - "optional": true - }, - "console-control-strings": { - "version": "1.1.0", - "bundled": true, - "dev": true, - "optional": true - }, - "core-util-is": { - "version": "1.0.2", - "bundled": true, - "dev": true, - "optional": true - }, - "debug": { - "version": "4.1.1", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "ms": "^2.1.1" - } - }, - "deep-extend": { - "version": "0.6.0", - "bundled": true, - "dev": true, - "optional": true - }, - "delegates": { - "version": "1.0.0", - "bundled": true, - "dev": true, - "optional": true - }, - "detect-libc": { - "version": "1.0.3", - "bundled": true, - "dev": true, - "optional": true - }, - "fs-minipass": { - "version": "1.2.5", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "minipass": "^2.2.1" - } - }, - "fs.realpath": { + "is-accessor-descriptor": { "version": "1.0.0", - "bundled": true, - "dev": true, - "optional": true - }, - "gauge": { - "version": "2.7.4", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "aproba": "^1.0.3", - "console-control-strings": "^1.0.0", - "has-unicode": "^2.0.0", - "object-assign": "^4.1.0", - "signal-exit": "^3.0.0", - "string-width": "^1.0.1", - "strip-ansi": "^3.0.1", - "wide-align": "^1.1.0" - } - }, - "glob": { - "version": "7.1.3", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "fs.realpath": "^1.0.0", - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "^3.0.4", - "once": "^1.3.0", - "path-is-absolute": "^1.0.0" - } - }, - "has-unicode": { - "version": "2.0.1", - "bundled": true, - "dev": true, - "optional": true - }, - "iconv-lite": { - "version": "0.4.24", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "safer-buffer": ">= 2.1.2 < 3" - } - }, - "ignore-walk": { - "version": "3.0.1", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "minimatch": "^3.0.4" - } - }, - "inflight": { - "version": "1.0.6", - "bundled": true, + "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz", + "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==", "dev": true, - "optional": true, "requires": { - "once": "^1.3.0", - "wrappy": "1" + "kind-of": "^6.0.0" } }, - "inherits": { - "version": "2.0.3", - "bundled": true, - "dev": true, - "optional": true - }, - "ini": { - "version": "1.3.5", - "bundled": true, - "dev": true, - "optional": true - }, - "is-fullwidth-code-point": { + "is-data-descriptor": { "version": "1.0.0", - "bundled": true, + "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz", + "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==", "dev": true, - "optional": true, "requires": { - "number-is-nan": "^1.0.0" + "kind-of": "^6.0.0" } }, - "isarray": { - "version": "1.0.0", - "bundled": true, - "dev": true, - "optional": true - }, - "minimatch": { - "version": "3.0.4", - "bundled": true, + "is-descriptor": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz", + "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==", "dev": true, - "optional": true, "requires": { - "brace-expansion": "^1.1.7" + "is-accessor-descriptor": "^1.0.0", + "is-data-descriptor": "^1.0.0", + "kind-of": "^6.0.2" } }, - "minimist": { - "version": "0.0.8", - "bundled": true, + "kind-of": { + "version": "6.0.3", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz", + "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==", + "dev": true + } + } + }, + "del": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/del/-/del-4.1.1.tgz", + "integrity": "sha512-QwGuEUouP2kVwQenAsOof5Fv8K9t3D8Ca8NxcXKrIpEHjTXK5J2nXLdP+ALI1cgv8wj7KuwBhTwBkOZSJKM5XQ==", + "dev": true, + "requires": { + "@types/glob": "^7.1.1", + "globby": "^6.1.0", + "is-path-cwd": "^2.0.0", + "is-path-in-cwd": "^2.0.0", + "p-map": "^2.0.0", + "pify": "^4.0.1", + "rimraf": "^2.6.3" + }, + "dependencies": { + "globby": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/globby/-/globby-6.1.0.tgz", + "integrity": "sha1-9abXDoOV4hyFj7BInWTfAkJNUGw=", "dev": true, - "optional": true + "requires": { + "array-union": "^1.0.1", + "glob": "^7.0.3", + "object-assign": "^4.0.1", + "pify": "^2.0.0", + "pinkie-promise": "^2.0.0" + }, + "dependencies": { + "pify": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz", + "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=", + "dev": true + } + } + } + } + }, + "delayed-stream": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz", + "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk=" + }, + "depd": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz", + "integrity": "sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak=" + }, + "dependency-graph": { + "version": "0.7.2", + "resolved": "https://registry.npmjs.org/dependency-graph/-/dependency-graph-0.7.2.tgz", + "integrity": "sha512-KqtH4/EZdtdfWX0p6MGP9jljvxSY6msy/pRUD4jgNwVpv3v1QmNLlsB3LDSSUg79BRVSn7jI1QPRtArGABovAQ==", + "dev": true + }, + "des.js": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/des.js/-/des.js-1.0.1.tgz", + "integrity": "sha512-Q0I4pfFrv2VPd34/vfLrFOoRmlYj3OV50i7fskps1jZWK1kApMWWT9G6RRUeYedLcBDIhnSDaUvJMb3AhUlaEA==", + "dev": true, + "requires": { + "inherits": "^2.0.1", + "minimalistic-assert": "^1.0.0" + } + }, + "destroy": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.0.4.tgz", + "integrity": "sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA=" + }, + "details-element-polyfill": { + "version": "2.4.0", + "resolved": "https://registry.npmjs.org/details-element-polyfill/-/details-element-polyfill-2.4.0.tgz", + "integrity": "sha512-jnZ/m0+b1gz3EcooitqL7oDEkKHEro659dt8bWB/T/HjiILucoQhHvvi5MEOAIFJXxxO+rIYJ/t3qCgfUOSU5g==" + }, + "detect-indent": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/detect-indent/-/detect-indent-4.0.0.tgz", + "integrity": "sha1-920GQ1LN9Docts5hnE7jqUdd4gg=", + "dev": true, + "requires": { + "repeating": "^2.0.0" + } + }, + "detect-node": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/detect-node/-/detect-node-2.0.4.tgz", + "integrity": "sha512-ZIzRpLJrOj7jjP2miAtgqIfmzbxa4ZOr5jJc601zklsfEx9oTzmmj2nVpIPRpNlRTIh8lc1kyViIY7BWSGNmKw==", + "dev": true + }, + "dezalgo": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/dezalgo/-/dezalgo-1.0.3.tgz", + "integrity": "sha1-f3Qt4Gb8dIvI24IFad3c5Jvw1FY=", + "dev": true, + "requires": { + "asap": "^2.0.0", + "wrappy": "1" + }, + "dependencies": { + "asap": { + "version": "2.0.6", + "resolved": "https://registry.npmjs.org/asap/-/asap-2.0.6.tgz", + "integrity": "sha1-5QNHYR1+aQlDIIu9r+vLwvuGbUY=", + "dev": true + } + } + }, + "di": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/di/-/di-0.0.1.tgz", + "integrity": "sha1-gGZJMmzqp8qjMG112YXqJ0i6kTw=", + "dev": true + }, + "diff": { + "version": "3.5.0", + "resolved": "https://registry.npmjs.org/diff/-/diff-3.5.0.tgz", + "integrity": "sha512-A46qtFgd+g7pDZinpnwiRJtxbC1hpgf0uzP3iG89scHk0AUC7A1TGxf5OiiOUv/JMZR8GOt8hL900hV0bOy5xA==", + "dev": true + }, + "diffie-hellman": { + "version": "5.0.3", + "resolved": "https://registry.npmjs.org/diffie-hellman/-/diffie-hellman-5.0.3.tgz", + "integrity": "sha512-kqag/Nl+f3GwyK25fhUMYj81BUOrZ9IuJsjIcDE5icNM9FJHAVm3VcUDxdLPoQtTuUylWm6ZIknYJwwaPxsUzg==", + "dev": true, + "requires": { + "bn.js": "^4.1.0", + "miller-rabin": "^4.0.0", + "randombytes": "^2.0.0" + } + }, + "dir-glob": { + "version": "2.2.2", + "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-2.2.2.tgz", + "integrity": "sha512-f9LBi5QWzIW3I6e//uxZoLBlUt9kcp66qo0sSCxL6YZKc75R1c4MFCoe/LaZiBGmgujvQdxc5Bn3QhfyvK5Hsw==", + "dev": true, + "requires": { + "path-type": "^3.0.0" + } + }, + "dns-equal": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/dns-equal/-/dns-equal-1.0.0.tgz", + "integrity": "sha1-s55/HabrCnW6nBcySzR1PEfgZU0=", + "dev": true + }, + "dns-packet": { + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/dns-packet/-/dns-packet-1.3.1.tgz", + "integrity": "sha512-0UxfQkMhYAUaZI+xrNZOz/as5KgDU0M/fQ9b6SpkyLbk3GEswDi6PADJVaYJradtRVsRIlF1zLyOodbcTCDzUg==", + "dev": true, + "requires": { + "ip": "^1.1.0", + "safe-buffer": "^5.0.1" + } + }, + "dns-prefetch-control": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/dns-prefetch-control/-/dns-prefetch-control-0.2.0.tgz", + "integrity": "sha512-hvSnros73+qyZXhHFjx2CMLwoj3Fe7eR9EJsFsqmcI1bB2OBWL/+0YzaEaKssCHnj/6crawNnUyw74Gm2EKe+Q==" + }, + "dns-txt": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/dns-txt/-/dns-txt-2.0.2.tgz", + "integrity": "sha1-uR2Ab10nGI5Ks+fRB9iBocxGQrY=", + "dev": true, + "requires": { + "buffer-indexof": "^1.0.0" + } + }, + "dom-serialize": { + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/dom-serialize/-/dom-serialize-2.2.1.tgz", + "integrity": "sha1-ViromZ9Evl6jB29UGdzVnrQ6yVs=", + "dev": true, + "requires": { + "custom-event": "~1.0.0", + "ent": "~2.2.0", + "extend": "^3.0.0", + "void-elements": "^2.0.0" + } + }, + "dom-serializer": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.1.1.tgz", + "integrity": "sha512-l0IU0pPzLWSHBcieZbpOKgkIn3ts3vAh7ZuFyXNwJxJXk/c4Gwj9xaTJwIDVQCXawWD0qb3IzMGH5rglQaO0XA==", + "requires": { + "domelementtype": "^1.3.0", + "entities": "^1.1.1" + } + }, + "domain-browser": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/domain-browser/-/domain-browser-1.2.0.tgz", + "integrity": "sha512-jnjyiM6eRyZl2H+W8Q/zLMA481hzi0eszAaBUzIVnmYVDBbnLxVNnfu1HgEBvCbL+71FrxMl3E6lpKH7Ge3OXA==", + "dev": true + }, + "domelementtype": { + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.3.1.tgz", + "integrity": "sha512-BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w==" + }, + "domexception": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/domexception/-/domexception-1.0.1.tgz", + "integrity": "sha512-raigMkn7CJNNo6Ihro1fzG7wr3fHuYVytzquZKX5n0yizGsTcYgzdIUwj1X9pK0VvjeihV+XiclP+DjwbsSKug==", + "requires": { + "webidl-conversions": "^4.0.2" + } + }, + "domhandler": { + "version": "2.4.2", + "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-2.4.2.tgz", + "integrity": "sha512-JiK04h0Ht5u/80fdLMCEmV4zkNh2BcoMFBmZ/91WtYZ8qVXSKjiw7fXMgFPnHcSZgOo3XdinHvmnDUeMf5R4wA==", + "requires": { + "domelementtype": "1" + } + }, + "domutils": { + "version": "1.5.1", + "resolved": "https://registry.npmjs.org/domutils/-/domutils-1.5.1.tgz", + "integrity": "sha1-3NhIiib1Y9YQeeSMn3t+Mjc2gs8=", + "requires": { + "dom-serializer": "0", + "domelementtype": "1" + } + }, + "dont-sniff-mimetype": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/dont-sniff-mimetype/-/dont-sniff-mimetype-1.1.0.tgz", + "integrity": "sha512-ZjI4zqTaxveH2/tTlzS1wFp+7ncxNZaIEWYg3lzZRHkKf5zPT/MnEG6WL0BhHMJUabkh8GeU5NL5j+rEUCb7Ug==" + }, + "dot-prop": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/dot-prop/-/dot-prop-4.2.0.tgz", + "integrity": "sha512-tUMXrxlExSW6U2EXiiKGSBVdYgtV8qlHL+C10TsW4PURY/ic+eaysnSkwB4kA/mBlCyy/IKDJ+Lc3wbWeaXtuQ==", + "dev": true, + "requires": { + "is-obj": "^1.0.0" + } + }, + "dottie": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/dottie/-/dottie-2.0.2.tgz", + "integrity": "sha512-fmrwR04lsniq/uSr8yikThDTrM7epXHBAAjH9TbeH3rEA8tdCO7mRzB9hdmdGyJCxF8KERo9CITcm3kGuoyMhg==" + }, + "duplexer3": { + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/duplexer3/-/duplexer3-0.1.4.tgz", + "integrity": "sha1-7gHdHKwO08vH/b6jfcCo8c4ALOI=", + "dev": true + }, + "duplexify": { + "version": "3.7.1", + "resolved": "https://registry.npmjs.org/duplexify/-/duplexify-3.7.1.tgz", + "integrity": "sha512-07z8uv2wMyS51kKhD1KsdXJg5WQ6t93RneqRxUHnskXVtlYYkLqM0gqStQZ3pj073g687jPCHrqNfCzawLYh5g==", + "dev": true, + "requires": { + "end-of-stream": "^1.0.0", + "inherits": "^2.0.1", + "readable-stream": "^2.0.0", + "stream-shift": "^1.0.0" + } + }, + "ecc-jsbn": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz", + "integrity": "sha1-OoOpBOVDUyh4dMVkt1SThoSamMk=", + "requires": { + "jsbn": "~0.1.0", + "safer-buffer": "^2.1.0" + } + }, + "ecdsa-sig-formatter": { + "version": "1.0.11", + "resolved": "https://registry.npmjs.org/ecdsa-sig-formatter/-/ecdsa-sig-formatter-1.0.11.tgz", + "integrity": "sha512-nagl3RYrbNv6kQkeJIpt6NJZy8twLB/2vtz6yN9Z4vRKHN4/QZJIEbqohALSgwKdnksuY3k5Addp5lg8sVoVcQ==", + "requires": { + "safe-buffer": "^5.0.1" + } + }, + "ee-first": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz", + "integrity": "sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=" + }, + "electron-to-chromium": { + "version": "1.3.348", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.348.tgz", + "integrity": "sha512-6O0IInybavGdYtcbI4ryF/9e3Qi8/soi6C68ELRseJuTwQPKq39uGgVVeQHG28t69Sgsky09nXBRhUiFXsZyFQ==", + "dev": true + }, + "elliptic": { + "version": "6.5.2", + "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.5.2.tgz", + "integrity": "sha512-f4x70okzZbIQl/NSRLkI/+tteV/9WqL98zx+SQ69KbXxmVrmjwsNUPn/gYJJ0sHvEak24cZgHIPegRePAtA/xw==", + "dev": true, + "requires": { + "bn.js": "^4.4.0", + "brorand": "^1.0.1", + "hash.js": "^1.0.0", + "hmac-drbg": "^1.0.0", + "inherits": "^2.0.1", + "minimalistic-assert": "^1.0.0", + "minimalistic-crypto-utils": "^1.0.0" + } + }, + "emoji-regex": { + "version": "7.0.3", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz", + "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==" + }, + "emojis-list": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-2.1.0.tgz", + "integrity": "sha1-TapNnbAPmBmIDHn6RXrlsJof04k=", + "dev": true + }, + "encodeurl": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz", + "integrity": "sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k=" + }, + "encoding": { + "version": "0.1.12", + "resolved": "https://registry.npmjs.org/encoding/-/encoding-0.1.12.tgz", + "integrity": "sha1-U4tm8+5izRq1HsMjgp0flIDHS+s=", + "dev": true, + "requires": { + "iconv-lite": "~0.4.13" + } + }, + "end-of-stream": { + "version": "1.4.4", + "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz", + "integrity": "sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==", + "requires": { + "once": "^1.4.0" + } + }, + "engine.io": { + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/engine.io/-/engine.io-3.2.1.tgz", + "integrity": "sha512-+VlKzHzMhaU+GsCIg4AoXF1UdDFjHHwMmMKqMJNDNLlUlejz58FCy4LBqB2YVJskHGYl06BatYWKP2TVdVXE5w==", + "dev": true, + "requires": { + "accepts": "~1.3.4", + "base64id": "1.0.0", + "cookie": "0.3.1", + "debug": "~3.1.0", + "engine.io-parser": "~2.1.0", + "ws": "~3.3.1" + }, + "dependencies": { + "safe-buffer": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", + "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==", + "dev": true }, - "minipass": { - "version": "2.3.5", - "bundled": true, + "ws": { + "version": "3.3.3", + "resolved": "https://registry.npmjs.org/ws/-/ws-3.3.3.tgz", + "integrity": "sha512-nnWLa/NwZSt4KQJu51MYlCcSQ5g7INpOrOMt4XV8j4dqTXdmlUmSHQ8/oLC069ckre0fRsgfvsKwbTdtKLCDkA==", "dev": true, - "optional": true, "requires": { - "safe-buffer": "^5.1.2", - "yallist": "^3.0.0" + "async-limiter": "~1.0.0", + "safe-buffer": "~5.1.0", + "ultron": "~1.1.0" } - }, - "minizlib": { + } + } + }, + "engine.io-client": { + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/engine.io-client/-/engine.io-client-3.2.1.tgz", + "integrity": "sha512-y5AbkytWeM4jQr7m/koQLc5AxpRKC1hEVUb/s1FUAWEJq5AzJJ4NLvzuKPuxtDi5Mq755WuDvZ6Iv2rXj4PTzw==", + "dev": true, + "requires": { + "component-emitter": "1.2.1", + "component-inherit": "0.0.3", + "debug": "~3.1.0", + "engine.io-parser": "~2.1.1", + "has-cors": "1.1.0", + "indexof": "0.0.1", + "parseqs": "0.0.5", + "parseuri": "0.0.5", + "ws": "~3.3.1", + "xmlhttprequest-ssl": "~1.5.4", + "yeast": "0.1.2" + }, + "dependencies": { + "component-emitter": { "version": "1.2.1", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "minipass": "^2.2.1" - } + "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.2.1.tgz", + "integrity": "sha1-E3kY1teCg/ffemt8WmPhQOaUJeY=", + "dev": true }, - "mkdirp": { - "version": "0.5.1", - "bundled": true, + "safe-buffer": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", + "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==", + "dev": true + }, + "ws": { + "version": "3.3.3", + "resolved": "https://registry.npmjs.org/ws/-/ws-3.3.3.tgz", + "integrity": "sha512-nnWLa/NwZSt4KQJu51MYlCcSQ5g7INpOrOMt4XV8j4dqTXdmlUmSHQ8/oLC069ckre0fRsgfvsKwbTdtKLCDkA==", "dev": true, - "optional": true, "requires": { - "minimist": "0.0.8" + "async-limiter": "~1.0.0", + "safe-buffer": "~5.1.0", + "ultron": "~1.1.0" } - }, - "ms": { - "version": "2.1.1", - "bundled": true, - "dev": true, + } + } + }, + "engine.io-parser": { + "version": "2.1.3", + "resolved": "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-2.1.3.tgz", + "integrity": "sha512-6HXPre2O4Houl7c4g7Ic/XzPnHBvaEmN90vtRO9uLmwtRqQmTOw0QMevL1TOfL2Cpu1VzsaTmMotQgMdkzGkVA==", + "dev": true, + "requires": { + "after": "0.8.2", + "arraybuffer.slice": "~0.0.7", + "base64-arraybuffer": "0.1.5", + "blob": "0.0.5", + "has-binary2": "~1.0.2" + } + }, + "enhanced-resolve": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-4.1.0.tgz", + "integrity": "sha512-F/7vkyTtyc/llOIn8oWclcB25KdRaiPBpZYDgJHgh/UHtpgT2p2eldQgtQnLtUvfMKPKxbRaQM/hHkvLHt1Vng==", + "dev": true, + "requires": { + "graceful-fs": "^4.1.2", + "memory-fs": "^0.4.0", + "tapable": "^1.0.0" + } + }, + "ent": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/ent/-/ent-2.2.0.tgz", + "integrity": "sha1-6WQhkyWiHQX0RGai9obtbOX13R0=", + "dev": true + }, + "entities": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/entities/-/entities-1.1.2.tgz", + "integrity": "sha512-f2LZMYl1Fzu7YSBKg+RoROelpOaNrcGmE9AZubeDfrCEia483oW4MI4VyFd5VNHIgQ/7qm1I0wUHK1eJnn2y2w==" + }, + "err-code": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/err-code/-/err-code-1.1.2.tgz", + "integrity": "sha1-BuARbTAo9q70gGhJ6w6mp0iuaWA=", + "dev": true + }, + "errno": { + "version": "0.1.7", + "resolved": "https://registry.npmjs.org/errno/-/errno-0.1.7.tgz", + "integrity": "sha512-MfrRBDWzIWifgq6tJj60gkAwtLNb6sQPlcFrSOflcP1aFmmruKQ2wRnze/8V6kgyz7H3FF8Npzv78mZ7XLLflg==", + "dev": true, + "requires": { + "prr": "~1.0.1" + } + }, + "error-ex": { + "version": "1.3.2", + "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz", + "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==", + "requires": { + "is-arrayish": "^0.2.1" + } + }, + "es-abstract": { + "version": "1.17.4", + "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.4.tgz", + "integrity": "sha512-Ae3um/gb8F0mui/jPL+QiqmglkUsaQf7FwBEHYIFkztkneosu9imhqHpBzQ3h1vit8t5iQ74t6PEVvphBZiuiQ==", + "dev": true, + "requires": { + "es-to-primitive": "^1.2.1", + "function-bind": "^1.1.1", + "has": "^1.0.3", + "has-symbols": "^1.0.1", + "is-callable": "^1.1.5", + "is-regex": "^1.0.5", + "object-inspect": "^1.7.0", + "object-keys": "^1.1.1", + "object.assign": "^4.1.0", + "string.prototype.trimleft": "^2.1.1", + "string.prototype.trimright": "^2.1.1" + } + }, + "es-to-primitive": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz", + "integrity": "sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==", + "dev": true, + "requires": { + "is-callable": "^1.1.4", + "is-date-object": "^1.0.1", + "is-symbol": "^1.0.2" + } + }, + "es6-error": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/es6-error/-/es6-error-4.1.1.tgz", + "integrity": "sha512-Um/+FxMr9CISWh0bi5Zv0iOD+4cFh5qLeks1qhAopKVAJw3drgKbKySikp7wGhDL0HPeaja0P5ULZrxLkniUVg==", + "dev": true + }, + "es6-promise": { + "version": "4.2.8", + "resolved": "https://registry.npmjs.org/es6-promise/-/es6-promise-4.2.8.tgz", + "integrity": "sha512-HJDGx5daxeIvxdBxvG2cb9g4tEvwIk3i8+nhX0yGrYmZUzbkdg8QbDevheDB8gd0//uPj4c1EQua8Q+MViT0/w==" + }, + "es6-promisify": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/es6-promisify/-/es6-promisify-5.0.0.tgz", + "integrity": "sha1-UQnWLz5W6pZ8S2NQWu8IKRyKUgM=", + "dev": true, + "requires": { + "es6-promise": "^4.0.3" + } + }, + "escape-html": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz", + "integrity": "sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg=" + }, + "escape-string-regexp": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz", + "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=" + }, + "escodegen": { + "version": "1.14.1", + "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-1.14.1.tgz", + "integrity": "sha512-Bmt7NcRySdIfNPfU2ZoXDrrXsG9ZjvDxcAlMfDUgRBjLOWTuIACXPBFJH7Z+cLb40JeQco5toikyc9t9P8E9SQ==", + "requires": { + "esprima": "^4.0.1", + "estraverse": "^4.2.0", + "esutils": "^2.0.2", + "optionator": "^0.8.1", + "source-map": "~0.6.1" + }, + "dependencies": { + "source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", "optional": true - }, - "needle": { - "version": "2.3.0", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "debug": "^4.1.0", - "iconv-lite": "^0.4.4", - "sax": "^1.2.4" - } - }, - "node-pre-gyp": { - "version": "0.12.0", - "bundled": true, - "dev": true, - "optional": true, + } + } + }, + "eslint-scope": { + "version": "4.0.3", + "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-4.0.3.tgz", + "integrity": "sha512-p7VutNr1O/QrxysMo3E45FjYDTeXBy0iTltPFNSqKAIfjDSXC+4dj+qfyuD8bfAXrW/y6lW3O76VaYNPKfpKrg==", + "dev": true, + "requires": { + "esrecurse": "^4.1.0", + "estraverse": "^4.1.1" + } + }, + "esprima": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz", + "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==" + }, + "esrecurse": { + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.2.1.tgz", + "integrity": "sha512-64RBB++fIOAXPw3P9cy89qfMlvZEXZkqqJkjqqXIvzP5ezRZjW+lPWjw35UX/3EhUPFYbg5ER4JYgDw4007/DQ==", + "dev": true, + "requires": { + "estraverse": "^4.1.0" + } + }, + "estraverse": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz", + "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==" + }, + "esutils": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz", + "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==" + }, + "etag": { + "version": "1.8.1", + "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz", + "integrity": "sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc=" + }, + "eventemitter3": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-4.0.0.tgz", + "integrity": "sha512-qerSRB0p+UDEssxTtm6EDKcE7W4OaoisfIMl4CngyEhjpYglocpNg6UEqCvemdGhosAsg4sO2dXJOdyBifPGCg==", + "dev": true + }, + "events": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/events/-/events-1.1.1.tgz", + "integrity": "sha1-nr23Y1rQmccNzEwqH1AEKI6L2SQ=" + }, + "eventsource": { + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/eventsource/-/eventsource-1.0.7.tgz", + "integrity": "sha512-4Ln17+vVT0k8aWq+t/bF5arcS3EpT9gYtW66EPacdj/mAFevznsnyoHLPy2BA8gbIQeIHoPsvwmfBftfcG//BQ==", + "dev": true, + "requires": { + "original": "^1.0.0" + } + }, + "evp_bytestokey": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/evp_bytestokey/-/evp_bytestokey-1.0.3.tgz", + "integrity": "sha512-/f2Go4TognH/KvCISP7OUsHn85hT9nUkxxA9BEWxFn+Oj9o8ZNLm/40hdlgSLyuOimsrTKLUMEorQexp/aPQeA==", + "dev": true, + "requires": { + "md5.js": "^1.3.4", + "safe-buffer": "^5.1.1" + } + }, + "execa": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/execa/-/execa-1.0.0.tgz", + "integrity": "sha512-adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA==", + "requires": { + "cross-spawn": "^6.0.0", + "get-stream": "^4.0.0", + "is-stream": "^1.1.0", + "npm-run-path": "^2.0.0", + "p-finally": "^1.0.0", + "signal-exit": "^3.0.0", + "strip-eof": "^1.0.0" + }, + "dependencies": { + "cross-spawn": { + "version": "6.0.5", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz", + "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==", "requires": { - "detect-libc": "^1.0.2", - "mkdirp": "^0.5.1", - "needle": "^2.2.1", - "nopt": "^4.0.1", - "npm-packlist": "^1.1.6", - "npmlog": "^4.0.2", - "rc": "^1.2.7", - "rimraf": "^2.6.1", - "semver": "^5.3.0", - "tar": "^4" + "nice-try": "^1.0.4", + "path-key": "^2.0.1", + "semver": "^5.5.0", + "shebang-command": "^1.2.0", + "which": "^1.2.9" } - }, - "nopt": { - "version": "4.0.1", - "bundled": true, + } + } + }, + "exit": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/exit/-/exit-0.1.2.tgz", + "integrity": "sha1-BjJjj42HfMghB9MKD/8aF8uhzQw=", + "dev": true + }, + "expand-brackets": { + "version": "2.1.4", + "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz", + "integrity": "sha1-t3c14xXOMPa27/D4OwQVGiJEliI=", + "dev": true, + "requires": { + "debug": "^2.3.3", + "define-property": "^0.2.5", + "extend-shallow": "^2.0.1", + "posix-character-classes": "^0.1.0", + "regex-not": "^1.0.0", + "snapdragon": "^0.8.1", + "to-regex": "^3.0.1" + }, + "dependencies": { + "debug": { + "version": "2.6.9", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", + "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", "dev": true, - "optional": true, "requires": { - "abbrev": "1", - "osenv": "^0.1.4" + "ms": "2.0.0" } }, - "npm-bundled": { - "version": "1.0.6", - "bundled": true, - "dev": true, - "optional": true - }, - "npm-packlist": { - "version": "1.4.1", - "bundled": true, + "define-property": { + "version": "0.2.5", + "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz", + "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=", "dev": true, - "optional": true, "requires": { - "ignore-walk": "^3.0.1", - "npm-bundled": "^1.0.1" + "is-descriptor": "^0.1.0" } }, - "npmlog": { - "version": "4.1.2", - "bundled": true, + "extend-shallow": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", + "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", "dev": true, - "optional": true, "requires": { - "are-we-there-yet": "~1.1.2", - "console-control-strings": "~1.1.0", - "gauge": "~2.7.3", - "set-blocking": "~2.0.0" + "is-extendable": "^0.1.0" } + } + } + }, + "expect-ct": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/expect-ct/-/expect-ct-0.2.0.tgz", + "integrity": "sha512-6SK3MG/Bbhm8MsgyJAylg+ucIOU71/FzyFalcfu5nY19dH8y/z0tBJU0wrNBXD4B27EoQtqPF/9wqH0iYAd04g==" + }, + "express": { + "version": "4.17.1", + "resolved": "https://registry.npmjs.org/express/-/express-4.17.1.tgz", + "integrity": "sha512-mHJ9O79RqluphRrcw2X/GTh3k9tVv8YcoyY4Kkh4WDMUYKRZUq0h1o0w2rrrxBqM7VoeUVqgb27xlEMXTnYt4g==", + "dev": true, + "requires": { + "accepts": "~1.3.7", + "array-flatten": "1.1.1", + "body-parser": "1.19.0", + "content-disposition": "0.5.3", + "content-type": "~1.0.4", + "cookie": "0.4.0", + "cookie-signature": "1.0.6", + "debug": "2.6.9", + "depd": "~1.1.2", + "encodeurl": "~1.0.2", + "escape-html": "~1.0.3", + "etag": "~1.8.1", + "finalhandler": "~1.1.2", + "fresh": "0.5.2", + "merge-descriptors": "1.0.1", + "methods": "~1.1.2", + "on-finished": "~2.3.0", + "parseurl": "~1.3.3", + "path-to-regexp": "0.1.7", + "proxy-addr": "~2.0.5", + "qs": "6.7.0", + "range-parser": "~1.2.1", + "safe-buffer": "5.1.2", + "send": "0.17.1", + "serve-static": "1.14.1", + "setprototypeof": "1.1.1", + "statuses": "~1.5.0", + "type-is": "~1.6.18", + "utils-merge": "1.0.1", + "vary": "~1.1.2" + }, + "dependencies": { + "array-flatten": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz", + "integrity": "sha1-ml9pkFGx5wczKPKgCJaLZOopVdI=", + "dev": true }, - "number-is-nan": { - "version": "1.0.1", - "bundled": true, - "dev": true, - "optional": true - }, - "object-assign": { - "version": "4.1.1", - "bundled": true, - "dev": true, - "optional": true + "cookie": { + "version": "0.4.0", + "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.4.0.tgz", + "integrity": "sha512-+Hp8fLp57wnUSt0tY0tHEXh4voZRDnoIrZPqlo3DPiI4y9lwg/jqx+1Om94/W6ZaPDOUbnjOt/99w66zk+l1Xg==", + "dev": true }, - "once": { - "version": "1.4.0", - "bundled": true, + "debug": { + "version": "2.6.9", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", + "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", "dev": true, - "optional": true, "requires": { - "wrappy": "1" + "ms": "2.0.0" } }, - "os-homedir": { - "version": "1.0.2", - "bundled": true, - "dev": true, - "optional": true + "path-to-regexp": { + "version": "0.1.7", + "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz", + "integrity": "sha1-32BBeABfUi8V60SQ5yR6G/qmf4w=", + "dev": true }, - "os-tmpdir": { - "version": "1.0.2", - "bundled": true, - "dev": true, - "optional": true + "qs": { + "version": "6.7.0", + "resolved": "https://registry.npmjs.org/qs/-/qs-6.7.0.tgz", + "integrity": "sha512-VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ==", + "dev": true }, - "osenv": { - "version": "0.1.5", - "bundled": true, + "safe-buffer": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", + "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==", + "dev": true + } + } + }, + "express-http-proxy": { + "version": "1.6.0", + "resolved": "https://registry.npmjs.org/express-http-proxy/-/express-http-proxy-1.6.0.tgz", + "integrity": "sha512-7Re6Lepg96NA2wiv7DC5csChAScn4K76/UgYnC71XiITCT1cgGTJUGK6GS0pIixudg3Fbx3Q6mmEW3mZv5tHFQ==", + "requires": { + "debug": "^3.0.1", + "es6-promise": "^4.1.1", + "raw-body": "^2.3.0" + } + }, + "express-sanitizer": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/express-sanitizer/-/express-sanitizer-1.0.5.tgz", + "integrity": "sha512-48/Tf1DZ7JklRVTcXQLHAxhq4GNJTuHq2jjIYhyTmu0Bw+X06YPDD/e/tdn1QLYk706xw4N8JFxtjslRrDGb8g==", + "requires": { + "sanitizer": "0.1.3", + "underscore": "1.8.3" + } + }, + "extend": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz", + "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==" + }, + "extend-shallow": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz", + "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=", + "dev": true, + "requires": { + "assign-symbols": "^1.0.0", + "is-extendable": "^1.0.1" + }, + "dependencies": { + "is-extendable": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz", + "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==", "dev": true, - "optional": true, "requires": { - "os-homedir": "^1.0.0", - "os-tmpdir": "^1.0.0" + "is-plain-object": "^2.0.4" } - }, - "path-is-absolute": { - "version": "1.0.1", - "bundled": true, - "dev": true, - "optional": true - }, - "process-nextick-args": { - "version": "2.0.0", - "bundled": true, - "dev": true, - "optional": true - }, - "rc": { - "version": "1.2.8", - "bundled": true, + } + } + }, + "external-editor": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/external-editor/-/external-editor-3.1.0.tgz", + "integrity": "sha512-hMQ4CX1p1izmuLYyZqLMO/qGNw10wSv9QDCPfzXfyFrOaCSSoRfqE1Kf1s5an66J5JZC62NewG+mK49jOCtQew==", + "dev": true, + "requires": { + "chardet": "^0.7.0", + "iconv-lite": "^0.4.24", + "tmp": "^0.0.33" + } + }, + "extglob": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz", + "integrity": "sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==", + "dev": true, + "requires": { + "array-unique": "^0.3.2", + "define-property": "^1.0.0", + "expand-brackets": "^2.1.4", + "extend-shallow": "^2.0.1", + "fragment-cache": "^0.2.1", + "regex-not": "^1.0.0", + "snapdragon": "^0.8.1", + "to-regex": "^3.0.1" + }, + "dependencies": { + "define-property": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz", + "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=", "dev": true, - "optional": true, "requires": { - "deep-extend": "^0.6.0", - "ini": "~1.3.0", - "minimist": "^1.2.0", - "strip-json-comments": "~2.0.1" - }, - "dependencies": { - "minimist": { - "version": "1.2.0", - "bundled": true, - "dev": true, - "optional": true - } + "is-descriptor": "^1.0.0" } }, - "readable-stream": { - "version": "2.3.6", - "bundled": true, + "extend-shallow": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", + "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", "dev": true, - "optional": true, "requires": { - "core-util-is": "~1.0.0", - "inherits": "~2.0.3", - "isarray": "~1.0.0", - "process-nextick-args": "~2.0.0", - "safe-buffer": "~5.1.1", - "string_decoder": "~1.1.1", - "util-deprecate": "~1.0.1" + "is-extendable": "^0.1.0" } }, - "rimraf": { - "version": "2.6.3", - "bundled": true, + "is-accessor-descriptor": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz", + "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==", "dev": true, - "optional": true, "requires": { - "glob": "^7.1.3" + "kind-of": "^6.0.0" } }, - "safe-buffer": { - "version": "5.1.2", - "bundled": true, - "dev": true, - "optional": true - }, - "safer-buffer": { - "version": "2.1.2", - "bundled": true, - "dev": true, - "optional": true - }, - "sax": { - "version": "1.2.4", - "bundled": true, - "dev": true, - "optional": true - }, - "semver": { - "version": "5.7.0", - "bundled": true, - "dev": true, - "optional": true - }, - "set-blocking": { - "version": "2.0.0", - "bundled": true, - "dev": true, - "optional": true - }, - "signal-exit": { - "version": "3.0.2", - "bundled": true, - "dev": true, - "optional": true - }, - "string-width": { - "version": "1.0.2", - "bundled": true, + "is-data-descriptor": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz", + "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==", "dev": true, - "optional": true, "requires": { - "code-point-at": "^1.0.0", - "is-fullwidth-code-point": "^1.0.0", - "strip-ansi": "^3.0.0" + "kind-of": "^6.0.0" } }, - "string_decoder": { - "version": "1.1.1", - "bundled": true, + "is-descriptor": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz", + "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==", "dev": true, - "optional": true, "requires": { - "safe-buffer": "~5.1.0" + "is-accessor-descriptor": "^1.0.0", + "is-data-descriptor": "^1.0.0", + "kind-of": "^6.0.2" } }, - "strip-ansi": { - "version": "3.0.1", - "bundled": true, + "kind-of": { + "version": "6.0.3", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz", + "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==", + "dev": true + } + } + }, + "extract-zip": { + "version": "1.6.7", + "resolved": "https://registry.npmjs.org/extract-zip/-/extract-zip-1.6.7.tgz", + "integrity": "sha1-qEC0uK9kAyZMjbV/Txp0Mz74H+k=", + "dev": true, + "requires": { + "concat-stream": "1.6.2", + "debug": "2.6.9", + "mkdirp": "0.5.1", + "yauzl": "2.4.1" + }, + "dependencies": { + "debug": { + "version": "2.6.9", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", + "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", "dev": true, - "optional": true, "requires": { - "ansi-regex": "^2.0.0" + "ms": "2.0.0" } - }, - "strip-json-comments": { - "version": "2.0.1", - "bundled": true, - "dev": true, - "optional": true - }, - "tar": { - "version": "4.4.8", - "bundled": true, + } + } + }, + "extsprintf": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz", + "integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=" + }, + "faker": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/faker/-/faker-4.1.0.tgz", + "integrity": "sha1-HkW7vsxndLPBlfrSg1EJxtdIzD8=", + "dev": true + }, + "fast-deep-equal": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.1.tgz", + "integrity": "sha512-8UEa58QDLauDNfpbrX55Q9jrGHThw2ZMdOky5Gl1CDtVeJDPVrG4Jxx1N8jw2gkWaff5UUuX1KJd+9zGe2B+ZA==" + }, + "fast-json-stable-stringify": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz", + "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==" + }, + "fast-levenshtein": { + "version": "2.0.6", + "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz", + "integrity": "sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=" + }, + "fastparse": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/fastparse/-/fastparse-1.1.2.tgz", + "integrity": "sha512-483XLLxTVIwWK3QTrMGRqUfUpoOs/0hbQrl2oz4J0pAcm3A3bu84wxTFqGqkJzewCLdME38xJLJAxBABfQT8sQ==", + "dev": true + }, + "faye-websocket": { + "version": "0.10.0", + "resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.10.0.tgz", + "integrity": "sha1-TkkvjQTftviQA1B/btvy1QHnxvQ=", + "dev": true, + "requires": { + "websocket-driver": ">=0.5.1" + } + }, + "fd-slicer": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.0.1.tgz", + "integrity": "sha1-i1vL2ewyfFBBv5qwI/1nUPEXfmU=", + "dev": true, + "requires": { + "pend": "~1.2.0" + } + }, + "feature-policy": { + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/feature-policy/-/feature-policy-0.3.0.tgz", + "integrity": "sha512-ZtijOTFN7TzCujt1fnNhfWPFPSHeZkesff9AXZj+UEjYBynWNUIYpC87Ve4wHzyexQsImicLu7WsC2LHq7/xrQ==" + }, + "figgy-pudding": { + "version": "3.5.1", + "resolved": "https://registry.npmjs.org/figgy-pudding/-/figgy-pudding-3.5.1.tgz", + "integrity": "sha512-vNKxJHTEKNThjfrdJwHc7brvM6eVevuO5nTj6ez8ZQ1qbXTvGthucRF7S4vf2cr71QVnT70V34v0S1DyQsti0w==", + "dev": true + }, + "figures": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/figures/-/figures-2.0.0.tgz", + "integrity": "sha1-OrGi0qYsi/tDGgyUy3l6L84nyWI=", + "dev": true, + "requires": { + "escape-string-regexp": "^1.0.5" + } + }, + "file-loader": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/file-loader/-/file-loader-4.1.0.tgz", + "integrity": "sha512-ajDk1nlByoalZAGR4b0H6oD+EGlWnyW1qbSxzaUc7RFiqmn+RbXQQRbTc72jsiUIlVusJ4Et58ltds8ZwTfnAw==", + "dev": true, + "requires": { + "loader-utils": "^1.2.3", + "schema-utils": "^2.0.0" + }, + "dependencies": { + "schema-utils": { + "version": "2.6.4", + "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-2.6.4.tgz", + "integrity": "sha512-VNjcaUxVnEeun6B2fiiUDjXXBtD4ZSH7pdbfIu1pOFwgptDPLMo/z9jr4sUfsjFVPqDCEin/F7IYlq7/E6yDbQ==", "dev": true, - "optional": true, "requires": { - "chownr": "^1.1.1", - "fs-minipass": "^1.2.5", - "minipass": "^2.3.4", - "minizlib": "^1.1.1", - "mkdirp": "^0.5.0", - "safe-buffer": "^5.1.2", - "yallist": "^3.0.2" + "ajv": "^6.10.2", + "ajv-keywords": "^3.4.1" } - }, - "util-deprecate": { - "version": "1.0.2", - "bundled": true, - "dev": true, - "optional": true - }, - "wide-align": { - "version": "1.1.3", - "bundled": true, + } + } + }, + "file-saver": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/file-saver/-/file-saver-2.0.2.tgz", + "integrity": "sha512-Wz3c3XQ5xroCxd1G8b7yL0Ehkf0TC9oYC6buPFkNnU9EnaPlifeAFCyCh+iewXTyFRcg0a6j3J7FmJsIhlhBdw==" + }, + "file-uri-to-path": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz", + "integrity": "sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw==", + "dev": true, + "optional": true + }, + "fileset": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/fileset/-/fileset-2.0.3.tgz", + "integrity": "sha1-jnVIqW08wjJ+5eZ0FocjozO7oqA=", + "dev": true, + "requires": { + "glob": "^7.0.3", + "minimatch": "^3.0.3" + } + }, + "fill-range": { + "version": "7.0.1", + "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz", + "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==", + "dev": true, + "requires": { + "to-regex-range": "^5.0.1" + } + }, + "finalhandler": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.2.tgz", + "integrity": "sha512-aAWcW57uxVNrQZqFXjITpW3sIUQmHGG3qSb9mUah9MgMC4NeWhNOlNjXEYq3HjRAvL6arUviZGGJsBg6z0zsWA==", + "dev": true, + "requires": { + "debug": "2.6.9", + "encodeurl": "~1.0.2", + "escape-html": "~1.0.3", + "on-finished": "~2.3.0", + "parseurl": "~1.3.3", + "statuses": "~1.5.0", + "unpipe": "~1.0.0" + }, + "dependencies": { + "debug": { + "version": "2.6.9", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", + "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", "dev": true, - "optional": true, "requires": { - "string-width": "^1.0.2 || 2" + "ms": "2.0.0" } - }, - "wrappy": { - "version": "1.0.2", - "bundled": true, - "dev": true, - "optional": true - }, - "yallist": { - "version": "3.0.3", - "bundled": true, - "dev": true, - "optional": true } } }, + "find-cache-dir": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-2.1.0.tgz", + "integrity": "sha512-Tq6PixE0w/VMFfCgbONnkiQIVol/JJL7nRMi20fqzA4NRs9AfeqMGeRdPi3wIhYkxjeBaWh2rxwapn5Tu3IqOQ==", + "dev": true, + "requires": { + "commondir": "^1.0.1", + "make-dir": "^2.0.0", + "pkg-dir": "^3.0.0" + } + }, + "find-up": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz", + "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==", + "requires": { + "locate-path": "^3.0.0" + } + }, + "flat": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/flat/-/flat-4.1.0.tgz", + "integrity": "sha512-Px/TiLIznH7gEDlPXcUD4KnBusa6kR6ayRUVcnEAbreRIuhkqow/mun59BuRXwoYk7ZQOLW1ZM05ilIvK38hFw==", + "dev": true, + "requires": { + "is-buffer": "~2.0.3" + }, + "dependencies": { + "is-buffer": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-2.0.4.tgz", + "integrity": "sha512-Kq1rokWXOPXWuaMAqZiJW4XxsmD9zGx9q4aePabbn3qCRGedtH7Cm+zV8WETitMfu1wdh+Rvd6w5egwSngUX2A==", + "dev": true + } + } + }, + "flatted": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/flatted/-/flatted-2.0.1.tgz", + "integrity": "sha512-a1hQMktqW9Nmqr5aktAux3JMNqaucxGcjtjWnZLHX7yyPCmlSV3M54nGYbqT8K+0GhF3NBgmJCc3ma+WOgX8Jg==", + "dev": true + }, + "flush-write-stream": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/flush-write-stream/-/flush-write-stream-1.1.1.tgz", + "integrity": "sha512-3Z4XhFZ3992uIq0XOqb9AreonueSYphE6oYbpt5+3u06JWklbsPkNv3ZKkP9Bz/r+1MWCaMoSQ28P85+1Yc77w==", + "dev": true, + "requires": { + "inherits": "^2.0.3", + "readable-stream": "^2.3.6" + } + }, + "follow-redirects": { + "version": "1.5.10", + "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.5.10.tgz", + "integrity": "sha512-0V5l4Cizzvqt5D44aTXbFZz+FtyXV1vrDN6qrelxtfYQKW0KO0W2T/hkE8xvGa/540LkZlkaUjO4ailYTFtHVQ==", + "requires": { + "debug": "=3.1.0" + } + }, + "for-in": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz", + "integrity": "sha1-gQaNKVqBQuwKxybG4iAMMPttXoA=", + "dev": true + }, + "for-own": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/for-own/-/for-own-1.0.0.tgz", + "integrity": "sha1-xjMy9BXO3EsE2/5wz4NklMU8tEs=", + "dev": true, + "requires": { + "for-in": "^1.0.1" + } + }, + "foreachasync": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/foreachasync/-/foreachasync-3.0.0.tgz", + "integrity": "sha1-VQKYfchxS+M5IJfzLgBxyd7gfPY=" + }, + "foreground-child": { + "version": "1.5.6", + "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-1.5.6.tgz", + "integrity": "sha1-T9ca0t/elnibmApcCilZN8svXOk=", + "requires": { + "cross-spawn": "^4", + "signal-exit": "^3.0.0" + } + }, + "forever-agent": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz", + "integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=" + }, + "form-data": { + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.3.tgz", + "integrity": "sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==", + "requires": { + "asynckit": "^0.4.0", + "combined-stream": "^1.0.6", + "mime-types": "^2.1.12" + } + }, + "formidable": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/formidable/-/formidable-1.2.1.tgz", + "integrity": "sha512-Fs9VRguL0gqGHkXS5GQiMCr1VhZBxz0JnJs4JmMp/2jL18Fmbzvv7vOFRU+U8TBkHEE/CX1qDXzJplVULgsLeg==", + "dev": true + }, + "forwarded": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.1.2.tgz", + "integrity": "sha1-mMI9qxF1ZXuMBXPozszZGw/xjIQ=", + "dev": true + }, + "fragment-cache": { + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/fragment-cache/-/fragment-cache-0.2.1.tgz", + "integrity": "sha1-QpD60n8T6Jvn8zeZxrxaCr//DRk=", + "dev": true, + "requires": { + "map-cache": "^0.2.2" + } + }, + "frameguard": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/frameguard/-/frameguard-3.1.0.tgz", + "integrity": "sha512-TxgSKM+7LTA6sidjOiSZK9wxY0ffMPY3Wta//MqwmX0nZuEHc8QrkV8Fh3ZhMJeiH+Uyh/tcaarImRy8u77O7g==" + }, + "fresh": { + "version": "0.5.2", + "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz", + "integrity": "sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac=" + }, + "from2": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/from2/-/from2-2.3.0.tgz", + "integrity": "sha1-i/tVAr3kpNNs/e6gB/zKIdfjgq8=", + "dev": true, + "requires": { + "inherits": "^2.0.1", + "readable-stream": "^2.0.0" + } + }, + "fs-access": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/fs-access/-/fs-access-1.0.1.tgz", + "integrity": "sha1-1qh/JiJxzv6+wwxVNAf7mV2od3o=", + "dev": true, + "requires": { + "null-check": "^1.0.0" + } + }, + "fs-extra": { + "version": "7.0.1", + "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-7.0.1.tgz", + "integrity": "sha512-YJDaCJZEnBmcbw13fvdAM9AwNOJwOzrE4pqMqBq5nFiEqXUqHwlK4B+3pUw6JNvfSPtX05xFHtYy/1ni01eGCw==", + "dev": true, + "requires": { + "graceful-fs": "^4.1.2", + "jsonfile": "^4.0.0", + "universalify": "^0.1.0" + } + }, + "fs-minipass": { + "version": "1.2.7", + "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-1.2.7.tgz", + "integrity": "sha512-GWSSJGFy4e9GUeCcbIkED+bgAoFyj7XF1mV8rma3QW4NIqX9Kyx79N/PF61H5udOV3aY1IaMLs6pGbH71nlCTA==", + "dev": true, + "requires": { + "minipass": "^2.6.0" + } + }, + "fs-write-stream-atomic": { + "version": "1.0.10", + "resolved": "https://registry.npmjs.org/fs-write-stream-atomic/-/fs-write-stream-atomic-1.0.10.tgz", + "integrity": "sha1-tH31NJPvkR33VzHnCp3tAYnbQMk=", + "dev": true, + "requires": { + "graceful-fs": "^4.1.2", + "iferr": "^0.1.5", + "imurmurhash": "^0.1.4", + "readable-stream": "1 || 2" + } + }, + "fs.realpath": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", + "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=" + }, + "fsevents": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.1.2.tgz", + "integrity": "sha512-R4wDiBwZ0KzpgOWetKDug1FZcYhqYnUYKtfZYt4mD5SBz76q0KR4Q9o7GIPamsVPGmW3EYPPJ0dOOjvx32ldZA==", + "dev": true, + "optional": true + }, "function-bind": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz", @@ -5867,9 +5761,9 @@ } }, "glob": { - "version": "7.1.4", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.4.tgz", - "integrity": "sha512-hkLPepehmnKk41pUGm3sYxoFs/umurYfYJCerbXEyFIWcAzvpipAgVkBqqT9RBKMGjnq6kMuyYwha6csxbiM1A==", + "version": "7.1.6", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz", + "integrity": "sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==", "requires": { "fs.realpath": "^1.0.0", "inflight": "^1.0.4", @@ -5970,9 +5864,9 @@ "integrity": "sha512-6XDtTt5plSrPQvPgLFN4LCtb9ULuqoXCgkHy5c7XE/70/sVm47RPbLR11tYGPcmV8cOApBhW0wL8y8ryspHfpw==" }, "graceful-fs": { - "version": "4.2.1", - "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.1.tgz", - "integrity": "sha512-b9usnbDGnD928gJB3LrCmxoibr3VE4U2SMo5PBuBnokWyDADTqDPXg4YpwKF1trpH+UbGp7QLicO3+aWEy0+mw==" + "version": "4.2.3", + "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.3.tgz", + "integrity": "sha512-a30VEBm4PEdx1dRB7MFK7BejejvCvBronbLjht+sHuGYj8PHs7M/5Z+rt5lw551vZ7yfTCj4Vuyy3mSJytDWRQ==" }, "graceful-readlink": { "version": "1.0.1", @@ -5991,52 +5885,18 @@ "integrity": "sha512-d4sze1JNC454Wdo2fkuyzCr6aHcbL6PGGuFAz0Li/NcOm1tCHGnWDRmJP85dh9IhQErTc2svWFEX5xHIOo//kQ==", "dev": true }, - "handlebars": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.1.2.tgz", - "integrity": "sha512-nvfrjqvt9xQ8Z/w0ijewdD/vvWDTOweBUm96NTr66Wfvo1mJenBLwcYmPs3TIBP5ruzYGD7Hx/DaM9RmhroGPw==", - "requires": { - "neo-async": "^2.6.0", - "optimist": "^0.6.1", - "source-map": "^0.6.1", - "uglify-js": "^3.1.4" - } - }, "har-schema": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz", "integrity": "sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI=" }, "har-validator": { - "version": "5.0.3", - "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.0.3.tgz", - "integrity": "sha1-ukAsJmGU8VlW7xXg/PJCmT9qff0=", + "version": "5.1.3", + "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.1.3.tgz", + "integrity": "sha512-sNvOCzEQNr/qrvJgc3UG/kD4QtlHycrzwS+6mfTrrSq97BvaYcPZZI1ZSqGSPR73Cxn4LKTD4PttRwfU7jWq5g==", "requires": { - "ajv": "^5.1.0", + "ajv": "^6.5.5", "har-schema": "^2.0.0" - }, - "dependencies": { - "ajv": { - "version": "5.5.2", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-5.5.2.tgz", - "integrity": "sha1-c7Xuyj+rZT49P5Qis0GtQiBdyWU=", - "requires": { - "co": "^4.6.0", - "fast-deep-equal": "^1.0.0", - "fast-json-stable-stringify": "^2.0.0", - "json-schema-traverse": "^0.3.0" - } - }, - "fast-deep-equal": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-1.1.0.tgz", - "integrity": "sha1-wFNHeBfIa1HaqFPIHgWbcz0CNhQ=" - }, - "json-schema-traverse": { - "version": "0.3.1", - "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.3.1.tgz", - "integrity": "sha1-NJptRMU6Ud6JtAgFxdXlm0F9M0A=" - } } }, "has": { @@ -6094,9 +5954,9 @@ "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=" }, "has-symbols": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.0.tgz", - "integrity": "sha1-uhqPGvKg/DllD1yFA2dwQSIGO0Q=", + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.1.tgz", + "integrity": "sha512-PLcsoqu++dmEIZB+6totNFKq/7Do+Z0u4oT0zKOJNl3lYK6vGwwu2hjHs+68OEZbTjiUE9bgOABXbP/GvrS0Kg==", "dev": true }, "has-value": { @@ -6120,11 +5980,25 @@ "kind-of": "^4.0.0" }, "dependencies": { - "is-buffer": { - "version": "1.1.6", - "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz", - "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==", - "dev": true + "is-number": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz", + "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=", + "dev": true, + "requires": { + "kind-of": "^3.0.2" + }, + "dependencies": { + "kind-of": { + "version": "3.2.2", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", + "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", + "dev": true, + "requires": { + "is-buffer": "^1.1.5" + } + } + } }, "kind-of": { "version": "4.0.0", @@ -6173,9 +6047,9 @@ "dev": true }, "helmet": { - "version": "3.20.0", - "resolved": "https://registry.npmjs.org/helmet/-/helmet-3.20.0.tgz", - "integrity": "sha512-Ob+TqmQFZ5f7WgP8kBbAzNPsbf6p1lOj5r+327/ymw/IILWih3wcx9u/u/S8Mwv5wbBkO7Li6x5s23t3COhUKw==", + "version": "3.21.2", + "resolved": "https://registry.npmjs.org/helmet/-/helmet-3.21.2.tgz", + "integrity": "sha512-okUo+MeWgg00cKB8Csblu8EXgcIoDyb5ZS/3u0W4spCimeVuCUvVZ6Vj3O2VJ1Sxpyb8jCDvzu0L1KKT11pkIg==", "requires": { "depd": "2.0.0", "dns-prefetch-control": "0.2.0", @@ -6184,14 +6058,14 @@ "feature-policy": "0.3.0", "frameguard": "3.1.0", "helmet-crossdomain": "0.4.0", - "helmet-csp": "2.8.0", + "helmet-csp": "2.9.4", "hide-powered-by": "1.1.0", "hpkp": "2.0.0", "hsts": "2.2.0", "ienoopen": "1.1.0", "nocache": "2.1.0", "referrer-policy": "1.2.0", - "x-xss-protection": "1.2.0" + "x-xss-protection": "1.3.0" }, "dependencies": { "depd": { @@ -6207,14 +6081,14 @@ "integrity": "sha512-AB4DTykRw3HCOxovD1nPR16hllrVImeFp5VBV9/twj66lJ2nU75DP8FPL0/Jp4jj79JhTfG+pFI2MD02kWJ+fA==" }, "helmet-csp": { - "version": "2.8.0", - "resolved": "https://registry.npmjs.org/helmet-csp/-/helmet-csp-2.8.0.tgz", - "integrity": "sha512-MlCPeM0Sm3pS9RACRihx70VeTHmkQwa7sum9EK1tfw1VZyvFU0dBWym9nHh3CRkTRNlyNm/WFCMvuh9zXkOjNw==", + "version": "2.9.4", + "resolved": "https://registry.npmjs.org/helmet-csp/-/helmet-csp-2.9.4.tgz", + "integrity": "sha512-qUgGx8+yk7Xl8XFEGI4MFu1oNmulxhQVTlV8HP8tV3tpfslCs30OZz/9uQqsWPvDISiu/NwrrCowsZBhFADYqg==", "requires": { + "bowser": "^2.7.0", "camelize": "1.0.0", "content-security-policy-builder": "2.1.0", - "dasherize": "2.0.0", - "platform": "1.3.5" + "dasherize": "2.0.0" } }, "hide-powered-by": { @@ -6234,27 +6108,9 @@ } }, "hosted-git-info": { - "version": "2.8.2", - "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.2.tgz", - "integrity": "sha512-CyjlXII6LMsPMyUzxpTt8fzh5QwzGqPmQXgY/Jyf4Zfp27t/FvfhwoE/8laaMUcMy816CkWF20I7NeQhwwY88w==", - "requires": { - "lru-cache": "^5.1.1" - }, - "dependencies": { - "lru-cache": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz", - "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==", - "requires": { - "yallist": "^3.0.2" - } - }, - "yallist": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.0.3.tgz", - "integrity": "sha512-S+Zk8DEWE6oKpV+vI3qWkaK+jSbIK86pCwe2IF/xwIpQ8jEuxpw9NyaGjmp9+BoJv5FV2piqCDcoCtStppiq2A==" - } - } + "version": "2.8.5", + "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.5.tgz", + "integrity": "sha512-kssjab8CvdXfcXMXVcvsXum4Hwdq9XGtRD3TteMEvEbq0LXyiNQr6AprqKqfeaDXze7SxWvRxdpwE6ku7ikLkg==" }, "hpack.js": { "version": "2.1.6", @@ -6302,6 +6158,36 @@ "integrity": "sha1-DfKTUfByEWNRXfueVUPl9u7VFi8=", "dev": true }, + "html-escaper": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/html-escaper/-/html-escaper-2.0.0.tgz", + "integrity": "sha512-a4u9BeERWGu/S8JiWEAQcdrg9v4QArtP9keViQjGMdff20fBdd8waotXaNmODqBe6uZ3Nafi7K/ho4gCQHV3Ig==" + }, + "htmlparser2": { + "version": "3.10.1", + "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-3.10.1.tgz", + "integrity": "sha512-IgieNijUMbkDovyoKObU1DUhm1iwNYE/fuifEoEHfd1oZKZDaONBSkal7Y01shxsM49R4XaMdGez3WnF9UfiCQ==", + "requires": { + "domelementtype": "^1.3.1", + "domhandler": "^2.3.0", + "domutils": "^1.5.1", + "entities": "^1.1.1", + "inherits": "^2.0.1", + "readable-stream": "^3.1.1" + }, + "dependencies": { + "readable-stream": { + "version": "3.5.0", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.5.0.tgz", + "integrity": "sha512-gSz026xs2LfxBPudDuI41V1lka8cxg64E66SGe78zJlsUofOg/yqwezdIcdfwik6B4h8LFmWPA9ef9X3FiNFLA==", + "requires": { + "inherits": "^2.0.3", + "string_decoder": "^1.1.1", + "util-deprecate": "^1.0.1" + } + } + } + }, "http-cache-semantics": { "version": "3.8.1", "resolved": "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-3.8.1.tgz", @@ -6333,12 +6219,12 @@ "dev": true }, "http-proxy": { - "version": "1.17.0", - "resolved": "https://registry.npmjs.org/http-proxy/-/http-proxy-1.17.0.tgz", - "integrity": "sha512-Taqn+3nNvYRfJ3bGvKfBSRwy1v6eePlm3oc/aWVxZp57DQr5Eq3xhKJi7Z4hZpS8PC3H4qI+Yly5EmFacGuA/g==", + "version": "1.18.0", + "resolved": "https://registry.npmjs.org/http-proxy/-/http-proxy-1.18.0.tgz", + "integrity": "sha512-84I2iJM/n1d4Hdgc6y2+qY5mDaz2PUVjlg9znE9byl+q0uC3DeByqBGReQu5tpLK0TAqTIXScRUV+dg7+bUPpQ==", "dev": true, "requires": { - "eventemitter3": "^3.0.0", + "eventemitter3": "^4.0.0", "follow-redirects": "^1.0.0", "requires-port": "^1.0.0" } @@ -6382,9 +6268,9 @@ "dev": true }, "https-proxy-agent": { - "version": "2.2.2", - "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-2.2.2.tgz", - "integrity": "sha512-c8Ndjc9Bkpfx/vCJueCPy0jlP4ccCCSNDp8xwCZzPjKJUm+B+u9WX2x98Qx4n1PiMNTWo3D7KK5ifNV/yJyRzg==", + "version": "2.2.4", + "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-2.2.4.tgz", + "integrity": "sha512-OmvfoQ53WLjtA9HeYP9RNrWMJzzAz1JGaSFr1nijg0PVR1JaD/xbJq1mdEIIlxGpXp9eSe/O2LgU9DJmTPd0Eg==", "dev": true, "requires": { "agent-base": "^4.3.0", @@ -6409,9 +6295,9 @@ } }, "ieee754": { - "version": "1.1.8", - "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.1.8.tgz", - "integrity": "sha1-vjPUCsEO8ZJnAfbwii2G+/0a0+Q=" + "version": "1.1.13", + "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.1.13.tgz", + "integrity": "sha512-4vf7I2LYV/HaWerSo3XmlMkp5eZ83i+/CDluXi/IGTs/O1sejBNhTtnxzmRZfvOUqj7lZjqHkeTvpgSFDlWZTg==" }, "ienoopen": { "version": "1.1.0", @@ -6437,9 +6323,9 @@ "dev": true }, "ignore-walk": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/ignore-walk/-/ignore-walk-3.0.1.tgz", - "integrity": "sha512-DTVlMx3IYPe0/JJcYP7Gxg7ttZZu3IInhuEhbchuqneY9wWe5Ojy2mXLBaQFUQmo0AW2r3qG7m1mg86js+gnlQ==", + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/ignore-walk/-/ignore-walk-3.0.3.tgz", + "integrity": "sha512-m7o6xuOaT1aqheYHKf8W6J5pYH85ZI9w077erOzLje3JsB1gkafkAhHHY19dqjulgIZHFm32Cp5uNZgcQqdJKw==", "dev": true, "requires": { "minimatch": "^3.0.4" @@ -6644,18 +6530,24 @@ "kind-of": "^3.0.2" } }, + "is-arguments": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/is-arguments/-/is-arguments-1.0.4.tgz", + "integrity": "sha512-xPh0Rmt8NE65sNzvyUmWgI1tz3mKq74lGA0mL8LYZcoIzKOzDh6HmrYm3d18k60nHerC8A9Km8kYu87zfSFnLA==", + "dev": true + }, "is-arrayish": { "version": "0.2.1", "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz", "integrity": "sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0=" }, "is-binary-path": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-1.0.1.tgz", - "integrity": "sha1-dfFmQrSA8YenEcgUFh/TpKdlWJg=", + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz", + "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==", "dev": true, "requires": { - "binary-extensions": "^1.0.0" + "binary-extensions": "^2.0.0" } }, "is-bluebird": { @@ -6664,14 +6556,14 @@ "integrity": "sha1-CWQ5Bg9KpBGr7hkUOoTWpVNG1uI=" }, "is-buffer": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-2.0.3.tgz", - "integrity": "sha512-U15Q7MXTuZlrbymiz95PJpZxu8IlipAp4dtS3wOdgPXx3mqBnslrWU14kxfHB+Py/+2PVKSr37dMAgM2A4uArw==" + "version": "1.1.6", + "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz", + "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==" }, "is-callable": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.1.4.tgz", - "integrity": "sha512-r5p9sxJjYnArLjObpjA4xu5EKI3CuKHkJXMhT7kwbpUyIFD1n5PMAsoPvWnvtZiNz7LjkYDRZhd7FlI0eMijEA==", + "version": "1.1.5", + "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.1.5.tgz", + "integrity": "sha512-ESKv5sMCJB2jnHTWZ3O5itG+O128Hsus4K4Qh1h2/cgn2vbgnLSVqfV46AeJA9D5EeeLa9w81KUXMtn34zhX+Q==", "dev": true }, "is-ci": { @@ -6693,9 +6585,9 @@ } }, "is-date-object": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.1.tgz", - "integrity": "sha1-mqIOtq7rv/d/vTPnTKAbM1gdOhY=", + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.2.tgz", + "integrity": "sha512-USlDT524woQ08aoZFzh3/Z6ch9Y/EWXEHQ/AaRN0SkKq4t2Jw2R2339tSXmwuVoY7LLlBCbOIlx2myP/L5zk0g==", "dev": true }, "is-descriptor": { @@ -6736,13 +6628,10 @@ "dev": true }, "is-finite": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/is-finite/-/is-finite-1.0.2.tgz", - "integrity": "sha1-zGZ3aVYCvlUO8R6LSqYwU0K20Ko=", - "dev": true, - "requires": { - "number-is-nan": "^1.0.0" - } + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/is-finite/-/is-finite-1.1.0.tgz", + "integrity": "sha512-cdyMtqX/BOqqNBBiKlIVkytNHm49MtMlYyn1zxzvJKWmFMlGzm+ry5BBfYyeY9YmNKbRSo/o7OX9w9ale0wg3w==", + "dev": true }, "is-fullwidth-code-point": { "version": "2.0.0", @@ -6766,6 +6655,17 @@ "requires": { "global-dirs": "^0.1.0", "is-path-inside": "^1.0.0" + }, + "dependencies": { + "is-path-inside": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-1.0.1.tgz", + "integrity": "sha1-jvW33lBDej/cprToZe96pVy0gDY=", + "dev": true, + "requires": { + "path-is-inside": "^1.0.1" + } + } } }, "is-npm": { @@ -6775,13 +6675,10 @@ "dev": true }, "is-number": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz", - "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=", - "dev": true, - "requires": { - "kind-of": "^3.0.2" - } + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz", + "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==", + "dev": true }, "is-obj": { "version": "1.0.1", @@ -6790,27 +6687,27 @@ "dev": true }, "is-path-cwd": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-path-cwd/-/is-path-cwd-1.0.0.tgz", - "integrity": "sha1-0iXsIxMuie3Tj9p2dHLmLmXxEG0=", + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/is-path-cwd/-/is-path-cwd-2.2.0.tgz", + "integrity": "sha512-w942bTcih8fdJPJmQHFzkS76NEP8Kzzvmw92cXsazb8intwLqPibPPdXf4ANdKV3rYMuuQYGIWtvz9JilB3NFQ==", "dev": true }, "is-path-in-cwd": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/is-path-in-cwd/-/is-path-in-cwd-1.0.1.tgz", - "integrity": "sha512-FjV1RTW48E7CWM7eE/J2NJvAEEVektecDBVBE5Hh3nM1Jd0kvhHtX68Pr3xsDf857xt3Y4AkwVULK1Vku62aaQ==", + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/is-path-in-cwd/-/is-path-in-cwd-2.1.0.tgz", + "integrity": "sha512-rNocXHgipO+rvnP6dk3zI20RpOtrAM/kzbB258Uw5BWr3TpXi861yzjo16Dn4hUox07iw5AyeMLHWsujkjzvRQ==", "dev": true, "requires": { - "is-path-inside": "^1.0.0" + "is-path-inside": "^2.1.0" } }, "is-path-inside": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-1.0.1.tgz", - "integrity": "sha1-jvW33lBDej/cprToZe96pVy0gDY=", + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-2.1.0.tgz", + "integrity": "sha512-wiyhTzfDWsvwAW53OBWF5zuvaOGlZ6PwYxAbPVDhpm+gM09xKQGjBq/8uYN12aDvMxnAnq3dxTyoSoRNmg5YFg==", "dev": true, "requires": { - "path-is-inside": "^1.0.1" + "path-is-inside": "^1.0.2" } }, "is-plain-obj": { @@ -6840,18 +6737,18 @@ "dev": true }, "is-regex": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.0.4.tgz", - "integrity": "sha1-VRdIm1RwkbCTDglWVM7SXul+lJE=", + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.0.5.tgz", + "integrity": "sha512-vlKW17SNq44owv5AQR3Cq0bQPEb8+kF3UKZ2fiZNOWtztYE5i0CzCZxFDwO58qAOWtxdBRVO/V5Qin1wjCqFYQ==", "dev": true, "requires": { - "has": "^1.0.1" + "has": "^1.0.3" } }, "is-retry-allowed": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/is-retry-allowed/-/is-retry-allowed-1.1.0.tgz", - "integrity": "sha1-EaBgVotnM5REAz0BJaYaINVk+zQ=", + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/is-retry-allowed/-/is-retry-allowed-1.2.0.tgz", + "integrity": "sha512-RUbUeKwvm3XG2VYamhJL1xFktgjvPzL0Hq8C+6yrWIswDy3BIXGqCxhxkc30N9jqK311gVU137K8Ei55/zVJRg==", "dev": true }, "is-stream": { @@ -6860,12 +6757,12 @@ "integrity": "sha1-EtSj3U5o4Lec6428hBc66A2RykQ=" }, "is-symbol": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.2.tgz", - "integrity": "sha512-HS8bZ9ox60yCJLH9snBpIwv9pYUAkcuLhSA1oero1UB5y9aiQpRA8y2ex945AOtCZL1lJDeIk3G5LthswI46Lw==", + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.3.tgz", + "integrity": "sha512-OwijhaRSgqvhm/0ZdAcXNZt9lYdKFpcRDT5ULUuYXPoT794UNOdU+gpT6Rzo7b4V2HUl/op6GqY894AZwv9faQ==", "dev": true, "requires": { - "has-symbols": "^1.0.0" + "has-symbols": "^1.0.1" } }, "is-typedarray": { @@ -6975,6 +6872,18 @@ "schema-utils": "^0.3.0" }, "dependencies": { + "ajv": { + "version": "5.5.2", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-5.5.2.tgz", + "integrity": "sha1-c7Xuyj+rZT49P5Qis0GtQiBdyWU=", + "dev": true, + "requires": { + "co": "^4.6.0", + "fast-deep-equal": "^1.0.0", + "fast-json-stable-stringify": "^2.0.0", + "json-schema-traverse": "^0.3.0" + } + }, "fast-deep-equal": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-1.1.0.tgz", @@ -6992,22 +6901,8 @@ "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-0.3.0.tgz", "integrity": "sha1-9YdyIs4+kx7a4DnxfrNxbnE3+M8=", "dev": true, - "requires": { - "ajv": "^5.0.0" - }, - "dependencies": { - "ajv": { - "version": "5.5.2", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-5.5.2.tgz", - "integrity": "sha1-c7Xuyj+rZT49P5Qis0GtQiBdyWU=", - "dev": true, - "requires": { - "co": "^4.6.0", - "fast-deep-equal": "^1.0.0", - "fast-json-stable-stringify": "^2.0.0", - "json-schema-traverse": "^0.3.0" - } - } + "requires": { + "ajv": "^5.0.0" } } } @@ -7086,15 +6981,21 @@ "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", "dev": true + }, + "source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "dev": true } } }, "istanbul-reports": { - "version": "2.2.6", - "resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-2.2.6.tgz", - "integrity": "sha512-SKi4rnMyLBKe0Jy2uUdx28h8oG7ph2PPuQPvIAh31d+Ci+lSiEu4C+h3oBPuJ9+mPKhOyW0M8gY4U5NM1WLeXA==", + "version": "2.2.7", + "resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-2.2.7.tgz", + "integrity": "sha512-uu1F/L1o5Y6LzPVSVZXNOoD/KXpJue9aeLRd0sM9uMXfZvzomB0WxVamWb5ue8kA2vVWEmW7EG+A5n3f1kqHKg==", "requires": { - "handlebars": "^4.1.2" + "html-escaper": "^2.0.0" } }, "jade": { @@ -7112,59 +7013,6 @@ "uglify-js": "^2.4.19", "void-elements": "~2.0.1", "with": "~4.0.0" - }, - "dependencies": { - "camelcase": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-1.2.1.tgz", - "integrity": "sha1-m7UwTS4LVmmLLHWLCKPqqdqlijk=" - }, - "cliui": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/cliui/-/cliui-2.1.0.tgz", - "integrity": "sha1-S0dXYP+AJkx2LDoXGQMukcf+oNE=", - "requires": { - "center-align": "^0.1.1", - "right-align": "^0.1.1", - "wordwrap": "0.0.2" - } - }, - "commander": { - "version": "2.6.0", - "resolved": "https://registry.npmjs.org/commander/-/commander-2.6.0.tgz", - "integrity": "sha1-nfflL7Kgyw+4kFjugMMQQiXzfh0=" - }, - "source-map": { - "version": "0.5.7", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz", - "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=" - }, - "uglify-js": { - "version": "2.8.29", - "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-2.8.29.tgz", - "integrity": "sha1-KcVzMUgFe7Th913zW3qcty5qWd0=", - "requires": { - "source-map": "~0.5.1", - "uglify-to-browserify": "~1.0.0", - "yargs": "~3.10.0" - } - }, - "wordwrap": { - "version": "0.0.2", - "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz", - "integrity": "sha1-t5Zpu0LstAn4PVg8rVLKF+qhZD8=" - }, - "yargs": { - "version": "3.10.0", - "resolved": "https://registry.npmjs.org/yargs/-/yargs-3.10.0.tgz", - "integrity": "sha1-9+572FfdfB0tOMDnTvvWgdFDH9E=", - "requires": { - "camelcase": "^1.0.2", - "cliui": "^2.1.0", - "decamelize": "^1.0.0", - "window-size": "0.1.0" - } - } } }, "jasmine": { @@ -7233,21 +7081,21 @@ "integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM=" }, "jsdom": { - "version": "15.1.1", - "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-15.1.1.tgz", - "integrity": "sha512-cQZRBB33arrDAeCrAEWn1U3SvrvC8XysBua9Oqg1yWrsY/gYcusloJC3RZJXuY5eehSCmws8f2YeliCqGSkrtQ==", + "version": "15.2.1", + "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-15.2.1.tgz", + "integrity": "sha512-fAl1W0/7T2G5vURSyxBzrJ1LSdQn6Tr5UX/xD4PXDx/PDgwygedfW6El/KIj3xJ7FU61TTYnc/l/B7P49Eqt6g==", "requires": { "abab": "^2.0.0", - "acorn": "^6.1.1", + "acorn": "^7.1.0", "acorn-globals": "^4.3.2", "array-equal": "^1.0.0", - "cssom": "^0.3.6", - "cssstyle": "^1.2.2", + "cssom": "^0.4.1", + "cssstyle": "^2.0.0", "data-urls": "^1.1.0", "domexception": "^1.0.1", "escodegen": "^1.11.1", "html-encoding-sniffer": "^1.0.2", - "nwsapi": "^2.1.4", + "nwsapi": "^2.2.0", "parse5": "5.1.0", "pn": "^1.1.0", "request": "^2.88.0", @@ -7266,121 +7114,30 @@ }, "dependencies": { "acorn": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.3.0.tgz", - "integrity": "sha512-/czfa8BwS88b9gWQVhc8eknunSA2DoJpJyTQkhheIf5E48u1N0R4q/YxxsAeqRrmK9TQ/uYfgLDfZo91UlANIA==" + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.1.0.tgz", + "integrity": "sha512-kL5CuoXA/dgxlBbVrflsflzQ3PAas7RYZB52NOm/6839iVYJgKMJ3cQJD+t2i5+qFa8h3MDpEOJiS64E8JLnSQ==" }, "acorn-globals": { - "version": "4.3.3", - "resolved": "https://registry.npmjs.org/acorn-globals/-/acorn-globals-4.3.3.tgz", - "integrity": "sha512-vkR40VwS2SYO98AIeFvzWWh+xyc2qi9s7OoXSFEGIP/rOJKzjnhykaZJNnHdoq4BL2gGxI5EZOU16z896EYnOQ==", + "version": "4.3.4", + "resolved": "https://registry.npmjs.org/acorn-globals/-/acorn-globals-4.3.4.tgz", + "integrity": "sha512-clfQEh21R+D0leSbUdWf3OcfqyaCSAQ8Ryq00bofSekfr9W8u1jyYZo6ir0xu9Gtcf7BjcHJpnbZH7JOCpP60A==", "requires": { "acorn": "^6.0.1", "acorn-walk": "^6.0.1" - } - }, - "ajv": { - "version": "6.10.2", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.10.2.tgz", - "integrity": "sha512-TXtUUEYHuaTEbLZWIKUr5pmBuhDLy+8KYtPYdcV8qC+pOZL+NKqYwvWSRrVXHn+ZmRRAu8vJTAznH7Oag6RVRw==", - "requires": { - "fast-deep-equal": "^2.0.1", - "fast-json-stable-stringify": "^2.0.0", - "json-schema-traverse": "^0.4.1", - "uri-js": "^4.2.2" - } - }, - "fast-deep-equal": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz", - "integrity": "sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk=" - }, - "har-validator": { - "version": "5.1.3", - "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.1.3.tgz", - "integrity": "sha512-sNvOCzEQNr/qrvJgc3UG/kD4QtlHycrzwS+6mfTrrSq97BvaYcPZZI1ZSqGSPR73Cxn4LKTD4PttRwfU7jWq5g==", - "requires": { - "ajv": "^6.5.5", - "har-schema": "^2.0.0" - } - }, - "json-schema-traverse": { - "version": "0.4.1", - "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz", - "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==" - }, - "oauth-sign": { - "version": "0.9.0", - "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.9.0.tgz", - "integrity": "sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==" - }, - "punycode": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz", - "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4=" - }, - "request": { - "version": "2.88.0", - "resolved": "https://registry.npmjs.org/request/-/request-2.88.0.tgz", - "integrity": "sha512-NAqBSrijGLZdM0WZNsInLJpkJokL72XYjUpnB0iwsRgxh7dB6COrHnTBNwN0E+lHDAJzu7kLAkDeY08z2/A0hg==", - "requires": { - "aws-sign2": "~0.7.0", - "aws4": "^1.8.0", - "caseless": "~0.12.0", - "combined-stream": "~1.0.6", - "extend": "~3.0.2", - "forever-agent": "~0.6.1", - "form-data": "~2.3.2", - "har-validator": "~5.1.0", - "http-signature": "~1.2.0", - "is-typedarray": "~1.0.0", - "isstream": "~0.1.2", - "json-stringify-safe": "~5.0.1", - "mime-types": "~2.1.19", - "oauth-sign": "~0.9.0", - "performance-now": "^2.1.0", - "qs": "~6.5.2", - "safe-buffer": "^5.1.2", - "tough-cookie": "~2.4.3", - "tunnel-agent": "^0.6.0", - "uuid": "^3.3.2" - }, - "dependencies": { - "tough-cookie": { - "version": "2.4.3", - "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.4.3.tgz", - "integrity": "sha512-Q5srk/4vDM54WJsJio3XNn6K2sCG+CQ8G5Wz6bZhRZoAe/+TxjWB/GlFAnYEbkYVlON9FMk/fE3h2RLpPXo4lQ==", - "requires": { - "psl": "^1.1.24", - "punycode": "^1.4.1" - } - } - } - }, - "tough-cookie": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-3.0.1.tgz", - "integrity": "sha512-yQyJ0u4pZsv9D4clxO69OEjLWYw+jbgspjTue4lTQZLfV0c5l1VmK2y1JK8E9ahdpltPOaAThPcp5nKPUgSnsg==", - "requires": { - "ip-regex": "^2.1.0", - "psl": "^1.1.28", - "punycode": "^2.1.1" }, "dependencies": { - "punycode": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz", - "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==" + "acorn": { + "version": "6.4.0", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.4.0.tgz", + "integrity": "sha512-gac8OEcQ2Li1dxIEWGZzsp2BitJxwkwcOm0zHAJLcPJaVvm58FRnk6RkuLRpU1EujipU2ZFODv2P9DLMfnV8mw==" } } }, - "ws": { - "version": "7.1.2", - "resolved": "https://registry.npmjs.org/ws/-/ws-7.1.2.tgz", - "integrity": "sha512-gftXq3XI81cJCgkUiAVixA0raD9IVmXqsylCrjRygw4+UOOGzPoxnQ6r/CnVL9i+mDncJo94tSkyrtuuQVBmrg==", - "requires": { - "async-limiter": "^1.0.0" - } + "parse5": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/parse5/-/parse5-5.1.0.tgz", + "integrity": "sha512-fxNG2sQjHvlVAYmzBZS9YlDp6PTSSDwa98vkD4QgVDDCAo84z5X1t5XyJQ62ImdLXx5NdIIfihey6xpum9/gRQ==" } } }, @@ -7422,13 +7179,6 @@ "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==", "requires": { "minimist": "^1.2.0" - }, - "dependencies": { - "minimist": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", - "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=" - } } }, "jsonfile": { @@ -7440,12 +7190,6 @@ "graceful-fs": "^4.1.6" } }, - "jsonify": { - "version": "0.0.0", - "resolved": "https://registry.npmjs.org/jsonify/-/jsonify-0.0.0.tgz", - "integrity": "sha1-LHS27kHZPKUbe1qu6PUDYx0lKnM=", - "dev": true - }, "jsonparse": { "version": "1.3.1", "resolved": "https://registry.npmjs.org/jsonparse/-/jsonparse-1.3.1.tgz", @@ -7533,9 +7277,9 @@ } }, "karma": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/karma/-/karma-4.2.0.tgz", - "integrity": "sha512-fmCuxN1rwJxTdZfOXK5LjlmS4Ana/OvzNMpkyLL/TLE8hmgSkpVpMYQ7RTVa8TNKRVQDZNl5W1oF5cfKfgIMlA==", + "version": "4.4.1", + "resolved": "https://registry.npmjs.org/karma/-/karma-4.4.1.tgz", + "integrity": "sha512-L5SIaXEYqzrh6b1wqYC42tNsFMx2PWuxky84pK9coK09MvmL7mxii3G3bZBh/0rvD27lqDd0le9jyhzvwif73A==", "dev": true, "requires": { "bluebird": "^3.3.0", @@ -7544,7 +7288,6 @@ "chokidar": "^3.0.0", "colors": "^1.1.0", "connect": "^3.6.0", - "core-js": "^3.1.3", "di": "^0.0.1", "dom-serialize": "^2.2.0", "flatted": "^2.0.0", @@ -7552,7 +7295,7 @@ "graceful-fs": "^4.1.2", "http-proxy": "^1.13.0", "isbinaryfile": "^3.0.0", - "lodash": "^4.17.11", + "lodash": "^4.17.14", "log4js": "^4.0.0", "mime": "^2.3.1", "minimatch": "^3.0.2", @@ -7567,122 +7310,33 @@ "useragent": "2.3.0" }, "dependencies": { - "anymatch": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.0.3.tgz", - "integrity": "sha512-c6IvoeBECQlMVuYUjSwimnhmztImpErfxJzWZhIQinIvQWoGOnB0dLIgifbPHQt5heS6mNlaZG16f06H3C8t1g==", - "dev": true, - "requires": { - "normalize-path": "^3.0.0", - "picomatch": "^2.0.4" - } - }, - "binary-extensions": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.0.0.tgz", - "integrity": "sha512-Phlt0plgpIIBOGTT/ehfFnbNlfsDEiqmzE2KRXoX1bLIlir4X/MR+zSyBEkL05ffWgnRSf/DXv+WrUAVr93/ow==", - "dev": true - }, - "braces": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz", - "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==", - "dev": true, - "requires": { - "fill-range": "^7.0.1" - } - }, - "chokidar": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.0.2.tgz", - "integrity": "sha512-c4PR2egjNjI1um6bamCQ6bUNPDiyofNQruHvKgHQ4gDUP/ITSVSzNsiI5OWtHOsX323i5ha/kk4YmOZ1Ktg7KA==", - "dev": true, - "requires": { - "anymatch": "^3.0.1", - "braces": "^3.0.2", - "fsevents": "^2.0.6", - "glob-parent": "^5.0.0", - "is-binary-path": "^2.1.0", - "is-glob": "^4.0.1", - "normalize-path": "^3.0.0", - "readdirp": "^3.1.1" - } - }, - "core-js": { - "version": "3.1.4", - "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.1.4.tgz", - "integrity": "sha512-YNZN8lt82XIMLnLirj9MhKDFZHalwzzrL9YLt6eb0T5D0EDl4IQ90IGkua8mHbnxNrkj1d8hbdizMc0Qmg1WnQ==", - "dev": true - }, - "fill-range": { - "version": "7.0.1", - "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz", - "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==", - "dev": true, - "requires": { - "to-regex-range": "^5.0.1" - } - }, - "fsevents": { - "version": "2.0.7", - "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.0.7.tgz", - "integrity": "sha512-a7YT0SV3RB+DjYcppwVDLtn13UQnmg0SWZS7ezZD0UjnLwXmy8Zm21GMVGLaFGimIqcvyMQaOJBrop8MyOp1kQ==", - "dev": true, - "optional": true - }, - "glob-parent": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.0.0.tgz", - "integrity": "sha512-Z2RwiujPRGluePM6j699ktJYxmPpJKCfpGA13jz2hmFZC7gKetzrWvg5KN3+OsIFmydGyZ1AVwERCq1w/ZZwRg==", - "dev": true, - "requires": { - "is-glob": "^4.0.1" - } - }, - "is-binary-path": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz", - "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==", - "dev": true, - "requires": { - "binary-extensions": "^2.0.0" - } - }, - "is-number": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz", - "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==", - "dev": true - }, "mime": { "version": "2.4.4", "resolved": "https://registry.npmjs.org/mime/-/mime-2.4.4.tgz", "integrity": "sha512-LRxmNwziLPT828z+4YkNzloCFC2YM4wrB99k+AV5ZbEyfGNWfG8SO1FUXLmLDBSo89NrJZ4DIWeLjy1CHGhMGA==", "dev": true }, - "normalize-path": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz", - "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==", + "minimist": { + "version": "0.0.10", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz", + "integrity": "sha1-3j+YVD2/lggr5IrRoMfNqDYwHc8=", "dev": true }, - "readdirp": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.1.1.tgz", - "integrity": "sha512-XXdSXZrQuvqoETj50+JAitxz1UPdt5dupjT6T5nVB+WvjMv2XKYj+s7hPeAVCXvmJrL36O4YYyWlIC3an2ePiQ==", + "optimist": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/optimist/-/optimist-0.6.1.tgz", + "integrity": "sha1-2j6nRob6IaGaERwybpDrFaAZZoY=", "dev": true, "requires": { - "picomatch": "^2.0.4" + "minimist": "~0.0.1", + "wordwrap": "~0.0.2" } }, - "to-regex-range": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz", - "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==", - "dev": true, - "requires": { - "is-number": "^7.0.0" - } + "source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "dev": true } } }, @@ -7740,9 +7394,12 @@ } }, "keygrip": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/keygrip/-/keygrip-1.0.3.tgz", - "integrity": "sha512-/PpesirAIfaklxUzp4Yb7xBper9MwP6hNRA6BGGUFCgbJ+BM5CKBtsoxinNXkLHAr+GXS1/lSlF2rP7cv5Fl+g==" + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/keygrip/-/keygrip-1.1.0.tgz", + "integrity": "sha512-iYSchDJ+liQ8iwbSI2QqsQOvqv58eJCEanyJPJi+Khyu8smkcKSFUCbPwzFcL7YVtZ6eONjqRX/38caJ7QjRAQ==", + "requires": { + "tsscmp": "1.0.6" + } }, "killable": { "version": "1.0.1", @@ -7756,13 +7413,6 @@ "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", "requires": { "is-buffer": "^1.1.5" - }, - "dependencies": { - "is-buffer": { - "version": "1.1.6", - "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz", - "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==" - } } }, "latest-version": { @@ -7820,6 +7470,13 @@ "requires": { "asap": "~2.0.3" } + }, + "source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "dev": true, + "optional": true } } }, @@ -8007,9 +7664,9 @@ } }, "loglevel": { - "version": "1.6.3", - "resolved": "https://registry.npmjs.org/loglevel/-/loglevel-1.6.3.tgz", - "integrity": "sha512-LoEDv5pgpvWgPF4kNYuIp0qqSJVWak/dML0RY74xlzMZiT9w77teNAwKYKWBTYjlokMirg+o3jBwp+vlLrcfAA==", + "version": "1.6.7", + "resolved": "https://registry.npmjs.org/loglevel/-/loglevel-1.6.7.tgz", + "integrity": "sha512-cY2eLFrQSAfVPhCgH1s7JI73tMbg9YC3v3+ZHVW67sBS7UxWzNEk/ZBbSfLykBWHp33dqqtOv82gjhKEi81T/A==", "dev": true }, "lolex": { @@ -8072,16 +7729,16 @@ "dev": true }, "make-fetch-happen": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-5.0.0.tgz", - "integrity": "sha512-nFr/vpL1Jc60etMVKeaLOqfGjMMb3tAHFVJWxHOFCFS04Zmd7kGlMxo0l1tzfhoQje0/UPnd0X8OeGUiXXnfPA==", + "version": "5.0.2", + "resolved": "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-5.0.2.tgz", + "integrity": "sha512-07JHC0r1ykIoruKO8ifMXu+xEU8qOXDFETylktdug6vJDACnP+HKevOu3PXyNPzFyTSlz8vrBYlBO1JZRe8Cag==", "dev": true, "requires": { "agentkeepalive": "^3.4.1", "cacache": "^12.0.0", "http-cache-semantics": "^3.8.1", "http-proxy-agent": "^2.1.0", - "https-proxy-agent": "^2.2.1", + "https-proxy-agent": "^2.2.3", "lru-cache": "^5.1.1", "mississippi": "^3.0.0", "node-fetch-npm": "^2.0.2", @@ -8102,57 +7759,30 @@ "glob": "^7.1.4", "graceful-fs": "^4.1.15", "infer-owner": "^1.0.3", - "lru-cache": "^5.1.1", - "mississippi": "^3.0.0", - "mkdirp": "^0.5.1", - "move-concurrently": "^1.0.1", - "promise-inflight": "^1.0.1", - "rimraf": "^2.6.3", - "ssri": "^6.0.1", - "unique-filename": "^1.1.1", - "y18n": "^4.0.0" - } - }, - "lru-cache": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz", - "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==", - "dev": true, - "requires": { - "yallist": "^3.0.2" - } - }, - "mississippi": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/mississippi/-/mississippi-3.0.0.tgz", - "integrity": "sha512-x471SsVjUtBRtcvd4BzKE9kFC+/2TeWgKCgw0bZcw1b9l2X3QX5vCWgF+KaZaYm87Ss//rHnWryupDrgLvmSkA==", - "dev": true, - "requires": { - "concat-stream": "^1.5.0", - "duplexify": "^3.4.2", - "end-of-stream": "^1.1.0", - "flush-write-stream": "^1.0.0", - "from2": "^2.1.0", - "parallel-transform": "^1.1.0", - "pump": "^3.0.0", - "pumpify": "^1.3.3", - "stream-each": "^1.1.0", - "through2": "^2.0.0" + "lru-cache": "^5.1.1", + "mississippi": "^3.0.0", + "mkdirp": "^0.5.1", + "move-concurrently": "^1.0.1", + "promise-inflight": "^1.0.1", + "rimraf": "^2.6.3", + "ssri": "^6.0.1", + "unique-filename": "^1.1.1", + "y18n": "^4.0.0" } }, - "ssri": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/ssri/-/ssri-6.0.1.tgz", - "integrity": "sha512-3Wge10hNcT1Kur4PDFwEieXSCMCJs/7WvSACcrMYrNp+b8kDL1/0wJch5Ni2WrtwEa2IO8OsVfeKIciKCDx/QA==", + "lru-cache": { + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz", + "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==", "dev": true, "requires": { - "figgy-pudding": "^3.5.1" + "yallist": "^3.0.2" } }, "yallist": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.0.3.tgz", - "integrity": "sha512-S+Zk8DEWE6oKpV+vI3qWkaK+jSbIK86pCwe2IF/xwIpQ8jEuxpw9NyaGjmp9+BoJv5FV2piqCDcoCtStppiq2A==", + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz", + "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==", "dev": true } } @@ -8242,6 +7872,14 @@ "dev": true, "requires": { "source-map": "^0.6.1" + }, + "dependencies": { + "source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "dev": true + } } }, "methods": { @@ -8271,11 +7909,93 @@ "to-regex": "^3.0.2" }, "dependencies": { + "braces": { + "version": "2.3.2", + "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz", + "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==", + "dev": true, + "requires": { + "arr-flatten": "^1.1.0", + "array-unique": "^0.3.2", + "extend-shallow": "^2.0.1", + "fill-range": "^4.0.0", + "isobject": "^3.0.1", + "repeat-element": "^1.1.2", + "snapdragon": "^0.8.1", + "snapdragon-node": "^2.0.1", + "split-string": "^3.0.2", + "to-regex": "^3.0.1" + }, + "dependencies": { + "extend-shallow": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", + "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", + "dev": true, + "requires": { + "is-extendable": "^0.1.0" + } + } + } + }, + "fill-range": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz", + "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=", + "dev": true, + "requires": { + "extend-shallow": "^2.0.1", + "is-number": "^3.0.0", + "repeat-string": "^1.6.1", + "to-regex-range": "^2.1.0" + }, + "dependencies": { + "extend-shallow": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", + "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", + "dev": true, + "requires": { + "is-extendable": "^0.1.0" + } + } + } + }, + "is-number": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz", + "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=", + "dev": true, + "requires": { + "kind-of": "^3.0.2" + }, + "dependencies": { + "kind-of": { + "version": "3.2.2", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", + "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", + "dev": true, + "requires": { + "is-buffer": "^1.1.5" + } + } + } + }, "kind-of": { - "version": "6.0.2", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz", - "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==", + "version": "6.0.3", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz", + "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==", "dev": true + }, + "to-regex-range": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz", + "integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=", + "dev": true, + "requires": { + "is-number": "^3.0.0", + "repeat-string": "^1.6.1" + } } } }, @@ -8292,20 +8012,19 @@ "mime": { "version": "1.6.0", "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz", - "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==", - "dev": true + "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==" }, "mime-db": { - "version": "1.40.0", - "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.40.0.tgz", - "integrity": "sha512-jYdeOMPy9vnxEqFRRo6ZvTZ8d9oPb+k18PKoYNYUe2stVEBPPwsln/qWzdbmaIvnhZ9v2P+CuecK+fpUfsV2mA==" + "version": "1.43.0", + "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.43.0.tgz", + "integrity": "sha512-+5dsGEEovYbT8UY9yD7eE4XTc4UwJ1jBYlgaQQF38ENsKR3wj/8q8RFZrF9WIZpB2V1ArTVFUva8sAul1NzRzQ==" }, "mime-types": { - "version": "2.1.24", - "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.24.tgz", - "integrity": "sha512-WaFHS3MCl5fapm3oLxU4eYDw77IQM2ACcxQ9RIxfaC3ooc6PFuBMGZZsYpvoXS5D5QTWPieo1jjLdAm3TBP3cQ==", + "version": "2.1.26", + "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.26.tgz", + "integrity": "sha512-01paPWYgLrkqAyrlDorC1uDwl2p3qZT7yl806vW7DvDoxwXi46jsjFbg+WdwotBIk6/MbEhO/dh5aZ5sNj/dWQ==", "requires": { - "mime-db": "1.40.0" + "mime-db": "1.43.0" } }, "mimic-fn": { @@ -8346,14 +8065,14 @@ } }, "minimist": { - "version": "0.0.10", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz", - "integrity": "sha1-3j+YVD2/lggr5IrRoMfNqDYwHc8=" + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", + "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=" }, "minipass": { - "version": "2.3.5", - "resolved": "https://registry.npmjs.org/minipass/-/minipass-2.3.5.tgz", - "integrity": "sha512-Gi1W4k059gyRbyVUZQ4mEqLm0YIUiGYfvxhF6SIlk3ui1WVxMTGfGdQ2SInh3PDrRTVvPKgULkpJtT4RH10+VA==", + "version": "2.9.0", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-2.9.0.tgz", + "integrity": "sha512-wxfUjg9WebH+CUDX/CdbRlh5SmfZiy/hpkxaRI16Y9W56Pa75sWgd/rvFilSgrauD9NyFymP/+JFV3KwzIsJeg==", "dev": true, "requires": { "safe-buffer": "^5.1.2", @@ -8361,20 +8080,20 @@ }, "dependencies": { "yallist": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.0.3.tgz", - "integrity": "sha512-S+Zk8DEWE6oKpV+vI3qWkaK+jSbIK86pCwe2IF/xwIpQ8jEuxpw9NyaGjmp9+BoJv5FV2piqCDcoCtStppiq2A==", + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz", + "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==", "dev": true } } }, "minizlib": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-1.2.1.tgz", - "integrity": "sha512-7+4oTUOWKg7AuL3vloEWekXY2/D20cevzsrNT2kGWm+39J9hGTCBv8VI5Pm5lXZ/o3/mdR4f8rflAPhnQb8mPA==", + "version": "1.3.3", + "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-1.3.3.tgz", + "integrity": "sha512-6ZYMOEnmVsdCeTJVE0W9ZD+pVnE8h9Hma/iOwwRDsdQoePpoX56/8B6z3P9VNwppJuBKNRuFDRNRqRWexT9G9Q==", "dev": true, "requires": { - "minipass": "^2.2.1" + "minipass": "^2.9.0" } }, "mississippi": { @@ -8542,9 +8261,9 @@ "integrity": "sha512-bV7f+6l2QigeBBZSM/6yTNq4P2fNpSWj/0e7jQcy87A8e7o2nAfP/34/2ky5Vw4B9S446EtIhodAzkFCcR4dQg==" }, "moment-timezone": { - "version": "0.5.26", - "resolved": "https://registry.npmjs.org/moment-timezone/-/moment-timezone-0.5.26.tgz", - "integrity": "sha512-sFP4cgEKTCymBBKgoxZjYzlSovC20Y6J7y3nanDc5RoBIXKlZhoYwBoZGe3flwU6A372AcRwScH8KiwV6zjy1g==", + "version": "0.5.27", + "resolved": "https://registry.npmjs.org/moment-timezone/-/moment-timezone-0.5.27.tgz", + "integrity": "sha512-EIKQs7h5sAsjhPCqN6ggx6cEbs94GK050254TIJySD1bzoM5JTYDwAU1IoVOeTOL6Gm27kYJ51/uuvq1kIlrbw==", "requires": { "moment": ">= 2.9.0" } @@ -8639,18 +8358,13 @@ }, "dependencies": { "kind-of": { - "version": "6.0.2", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz", - "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==", + "version": "6.0.3", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz", + "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==", "dev": true } } }, - "natives": { - "version": "1.1.6", - "resolved": "https://registry.npmjs.org/natives/-/natives-1.1.6.tgz", - "integrity": "sha512-6+TDFewD4yxY14ptjKaS63GVdtKiES1pTPyxn9Jb0rBqPMZ7VcCiooEhPNsr+mqHtMGxa/5c/HhcC4uPEUw/nA==" - }, "negotiator": { "version": "0.6.2", "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.2.tgz", @@ -8660,7 +8374,8 @@ "neo-async": { "version": "2.6.1", "resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.6.1.tgz", - "integrity": "sha512-iyam8fBuCUpWeKPGpaNMetEocMt364qkCsfL9JuhjXX6dRnguRVOfk2GZaDpPjcOKiiXCPINZC1GczQ7iTq3Zw==" + "integrity": "sha512-iyam8fBuCUpWeKPGpaNMetEocMt364qkCsfL9JuhjXX6dRnguRVOfk2GZaDpPjcOKiiXCPINZC1GczQ7iTq3Zw==", + "dev": true }, "nested-error-stacks": { "version": "2.1.0", @@ -8669,9 +8384,9 @@ "dev": true }, "ngx-moment": { - "version": "3.4.0", - "resolved": "https://registry.npmjs.org/ngx-moment/-/ngx-moment-3.4.0.tgz", - "integrity": "sha512-GEqzSsu12VsXXP35aerlQpuZ1ienEYQZxHmp+RH7EuJD7hWamKgLOpmbiDI9Ij3KLW/UApvonYzZvyRSv3ea/w==", + "version": "3.5.0", + "resolved": "https://registry.npmjs.org/ngx-moment/-/ngx-moment-3.5.0.tgz", + "integrity": "sha512-QC/5XNC0BW6WkJkwZT4r2A29j/8sJAmhuQJrEnEdpW35GvkemccuxEUAwo/PwkzPB/CHaquR00E6P2HVEQ1iEg==", "requires": { "tslib": "^1.9.0" } @@ -8682,15 +8397,15 @@ "integrity": "sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==" }, "nise": { - "version": "1.5.2", - "resolved": "https://registry.npmjs.org/nise/-/nise-1.5.2.tgz", - "integrity": "sha512-/6RhOUlicRCbE9s+94qCUsyE+pKlVJ5AhIv+jEE7ESKwnbXqulKZ1FYU+XAtHHWE9TinYvAxDUJAb912PwPoWA==", + "version": "1.5.3", + "resolved": "https://registry.npmjs.org/nise/-/nise-1.5.3.tgz", + "integrity": "sha512-Ymbac/94xeIrMf59REBPOv0thr+CJVFMhrlAkW/gjCIE58BGQdCj0x7KRCb3yz+Ga2Rz3E9XXSvUyyxqqhjQAQ==", "dev": true, "requires": { "@sinonjs/formatio": "^3.2.1", "@sinonjs/text-encoding": "^0.7.1", "just-extend": "^4.0.2", - "lolex": "^4.1.0", + "lolex": "^5.0.1", "path-to-regexp": "^1.7.0" }, "dependencies": { @@ -8700,10 +8415,19 @@ "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=", "dev": true }, + "lolex": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/lolex/-/lolex-5.1.2.tgz", + "integrity": "sha512-h4hmjAvHTmd+25JSwrtTIuwbKdwg5NzZVRMLn9saij4SZaepCrTCxPr35H/3bjwfMJtN+t3CX8672UIkglz28A==", + "dev": true, + "requires": { + "@sinonjs/commons": "^1.7.0" + } + }, "path-to-regexp": { - "version": "1.7.0", - "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-1.7.0.tgz", - "integrity": "sha1-Wf3g9DW62suhA6hOnTvGTpa5k30=", + "version": "1.8.0", + "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-1.8.0.tgz", + "integrity": "sha512-n43JRhlUKUAlibEJhPeir1ncUID16QnEjNpwzNdO3Lm4ywrBpBZ5oLD0I6br9evr1Y9JTqwRtAh7JLoOzAQdVA==", "dev": true, "requires": { "isarray": "0.0.1" @@ -8738,9 +8462,9 @@ } }, "node-forge": { - "version": "0.7.5", - "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-0.7.5.tgz", - "integrity": "sha512-MmbQJ2MTESTjt3Gi/3yG1wGpIMhUfcIypUCGtTizFR9IiccFwxSpfp0vtIZlkFclEqERemxfnSdZEMR9VqqEFQ==", + "version": "0.9.0", + "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-0.9.0.tgz", + "integrity": "sha512-7ASaDa3pD+lJ3WvXFsxekJQelBKRpne+GOVbLbtHYdd7pFspyeuJHnWfLplGf3SwKGbfs/aYl5V/JCIaHVUKKQ==", "dev": true }, "node-libs-browser": { @@ -8775,66 +8499,736 @@ }, "dependencies": { "events": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/events/-/events-3.0.0.tgz", - "integrity": "sha512-Dc381HFWJzEOhQ+d8pkNon++bk9h6cdAoAj4iE6Q4y6xgTzySWXlKn05/TVNpjnfRqi/X0EpJEJohPjNI3zpVA==", + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/events/-/events-3.1.0.tgz", + "integrity": "sha512-Rv+u8MLHNOdMjTAFeT3nCjHn2aGlx435FP/sDHNaRhDEMwyI/aB22Kj2qIN8R0cw3z28psEQLYwxVKLsKrMgWg==", "dev": true } } }, "node-releases": { - "version": "1.1.28", - "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.28.tgz", - "integrity": "sha512-AQw4emh6iSXnCpDiFe0phYcThiccmkNWMZnFZ+lDJjAP8J0m2fVd59duvUUyuTirQOhIAajTFkzG6FHCLBO59g==", + "version": "1.1.48", + "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.48.tgz", + "integrity": "sha512-Hr8BbmUl1ujAST0K0snItzEA5zkJTQup8VNTKNfT6Zw8vTJkIiagUPNfxHmgDOyfFYNfKAul40sD0UEYTvwebw==", "dev": true, "requires": { - "semver": "^5.3.0" + "semver": "^6.3.0" + }, + "dependencies": { + "semver": { + "version": "6.3.0", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", + "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", + "dev": true + } } }, "nodemon": { - "version": "1.19.1", - "resolved": "https://registry.npmjs.org/nodemon/-/nodemon-1.19.1.tgz", - "integrity": "sha512-/DXLzd/GhiaDXXbGId5BzxP1GlsqtMGM9zTmkWrgXtSqjKmGSbLicM/oAy4FR0YWm14jCHRwnR31AHS2dYFHrg==", + "version": "1.19.4", + "resolved": "https://registry.npmjs.org/nodemon/-/nodemon-1.19.4.tgz", + "integrity": "sha512-VGPaqQBNk193lrJFotBU8nvWZPqEZY2eIzymy2jjY0fJ9qIsxA0sxQ8ATPl0gZC645gijYEc1jtZvpS8QWzJGQ==", "dev": true, "requires": { - "chokidar": "^2.1.5", - "debug": "^3.1.0", + "chokidar": "^2.1.8", + "debug": "^3.2.6", "ignore-by-default": "^1.0.1", "minimatch": "^3.0.4", - "pstree.remy": "^1.1.6", - "semver": "^5.5.0", - "supports-color": "^5.2.0", + "pstree.remy": "^1.1.7", + "semver": "^5.7.1", + "supports-color": "^5.5.0", "touch": "^3.1.0", "undefsafe": "^2.0.2", "update-notifier": "^2.5.0" }, "dependencies": { + "anymatch": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-2.0.0.tgz", + "integrity": "sha512-5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw==", + "dev": true, + "requires": { + "micromatch": "^3.1.4", + "normalize-path": "^2.1.1" + }, + "dependencies": { + "normalize-path": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz", + "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=", + "dev": true, + "requires": { + "remove-trailing-separator": "^1.0.1" + } + } + } + }, + "binary-extensions": { + "version": "1.13.1", + "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.13.1.tgz", + "integrity": "sha512-Un7MIEDdUC5gNpcGDV97op1Ywk748MpHcFTHoYs6qnj1Z3j7I53VG3nwZhKzoBZmbdRNnb6WRdFlwl7tSDuZGw==", + "dev": true + }, + "braces": { + "version": "2.3.2", + "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz", + "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==", + "dev": true, + "requires": { + "arr-flatten": "^1.1.0", + "array-unique": "^0.3.2", + "extend-shallow": "^2.0.1", + "fill-range": "^4.0.0", + "isobject": "^3.0.1", + "repeat-element": "^1.1.2", + "snapdragon": "^0.8.1", + "snapdragon-node": "^2.0.1", + "split-string": "^3.0.2", + "to-regex": "^3.0.1" + } + }, "chokidar": { - "version": "2.1.6", - "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.1.6.tgz", - "integrity": "sha512-V2jUo67OKkc6ySiRpJrjlpJKl9kDuG+Xb8VgsGzb+aEouhgS1D0weyPU4lEzdAcsCAvrih2J2BqyXqHWvVLw5g==", + "version": "2.1.8", + "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.1.8.tgz", + "integrity": "sha512-ZmZUazfOzf0Nve7duiCKD23PFSCs4JPoYyccjUFF3aQkQadqBhfzhjkwBH2mNOG9cTBwhamM37EIsIkZw3nRgg==", + "dev": true, + "requires": { + "anymatch": "^2.0.0", + "async-each": "^1.0.1", + "braces": "^2.3.2", + "fsevents": "^1.2.7", + "glob-parent": "^3.1.0", + "inherits": "^2.0.3", + "is-binary-path": "^1.0.0", + "is-glob": "^4.0.0", + "normalize-path": "^3.0.0", + "path-is-absolute": "^1.0.0", + "readdirp": "^2.2.1", + "upath": "^1.1.1" + } + }, + "debug": { + "version": "3.2.6", + "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz", + "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==", + "dev": true, + "requires": { + "ms": "^2.1.1" + } + }, + "extend-shallow": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", + "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", + "dev": true, + "requires": { + "is-extendable": "^0.1.0" + } + }, + "fill-range": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz", + "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=", + "dev": true, + "requires": { + "extend-shallow": "^2.0.1", + "is-number": "^3.0.0", + "repeat-string": "^1.6.1", + "to-regex-range": "^2.1.0" + } + }, + "fsevents": { + "version": "1.2.11", + "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.11.tgz", + "integrity": "sha512-+ux3lx6peh0BpvY0JebGyZoiR4D+oYzdPZMKJwkZ+sFkNJzpL7tXc/wehS49gUAxg3tmMHPHZkA8JU2rhhgDHw==", + "dev": true, + "optional": true, + "requires": { + "bindings": "^1.5.0", + "nan": "^2.12.1", + "node-pre-gyp": "*" + }, + "dependencies": { + "abbrev": { + "version": "1.1.1", + "bundled": true, + "dev": true, + "optional": true + }, + "ansi-regex": { + "version": "2.1.1", + "bundled": true, + "dev": true, + "optional": true + }, + "aproba": { + "version": "1.2.0", + "bundled": true, + "dev": true, + "optional": true + }, + "are-we-there-yet": { + "version": "1.1.5", + "bundled": true, + "dev": true, + "optional": true, + "requires": { + "delegates": "^1.0.0", + "readable-stream": "^2.0.6" + } + }, + "balanced-match": { + "version": "1.0.0", + "bundled": true, + "dev": true, + "optional": true + }, + "brace-expansion": { + "version": "1.1.11", + "bundled": true, + "dev": true, + "optional": true, + "requires": { + "balanced-match": "^1.0.0", + "concat-map": "0.0.1" + } + }, + "chownr": { + "version": "1.1.3", + "bundled": true, + "dev": true, + "optional": true + }, + "code-point-at": { + "version": "1.1.0", + "bundled": true, + "dev": true, + "optional": true + }, + "concat-map": { + "version": "0.0.1", + "bundled": true, + "dev": true, + "optional": true + }, + "console-control-strings": { + "version": "1.1.0", + "bundled": true, + "dev": true, + "optional": true + }, + "core-util-is": { + "version": "1.0.2", + "bundled": true, + "dev": true, + "optional": true + }, + "debug": { + "version": "3.2.6", + "bundled": true, + "dev": true, + "optional": true, + "requires": { + "ms": "^2.1.1" + } + }, + "deep-extend": { + "version": "0.6.0", + "bundled": true, + "dev": true, + "optional": true + }, + "delegates": { + "version": "1.0.0", + "bundled": true, + "dev": true, + "optional": true + }, + "detect-libc": { + "version": "1.0.3", + "bundled": true, + "dev": true, + "optional": true + }, + "fs-minipass": { + "version": "1.2.7", + "bundled": true, + "dev": true, + "optional": true, + "requires": { + "minipass": "^2.6.0" + } + }, + "fs.realpath": { + "version": "1.0.0", + "bundled": true, + "dev": true, + "optional": true + }, + "gauge": { + "version": "2.7.4", + "bundled": true, + "dev": true, + "optional": true, + "requires": { + "aproba": "^1.0.3", + "console-control-strings": "^1.0.0", + "has-unicode": "^2.0.0", + "object-assign": "^4.1.0", + "signal-exit": "^3.0.0", + "string-width": "^1.0.1", + "strip-ansi": "^3.0.1", + "wide-align": "^1.1.0" + } + }, + "glob": { + "version": "7.1.6", + "bundled": true, + "dev": true, + "optional": true, + "requires": { + "fs.realpath": "^1.0.0", + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "^3.0.4", + "once": "^1.3.0", + "path-is-absolute": "^1.0.0" + } + }, + "has-unicode": { + "version": "2.0.1", + "bundled": true, + "dev": true, + "optional": true + }, + "iconv-lite": { + "version": "0.4.24", + "bundled": true, + "dev": true, + "optional": true, + "requires": { + "safer-buffer": ">= 2.1.2 < 3" + } + }, + "ignore-walk": { + "version": "3.0.3", + "bundled": true, + "dev": true, + "optional": true, + "requires": { + "minimatch": "^3.0.4" + } + }, + "inflight": { + "version": "1.0.6", + "bundled": true, + "dev": true, + "optional": true, + "requires": { + "once": "^1.3.0", + "wrappy": "1" + } + }, + "inherits": { + "version": "2.0.4", + "bundled": true, + "dev": true, + "optional": true + }, + "ini": { + "version": "1.3.5", + "bundled": true, + "dev": true, + "optional": true + }, + "is-fullwidth-code-point": { + "version": "1.0.0", + "bundled": true, + "dev": true, + "optional": true, + "requires": { + "number-is-nan": "^1.0.0" + } + }, + "isarray": { + "version": "1.0.0", + "bundled": true, + "dev": true, + "optional": true + }, + "minimatch": { + "version": "3.0.4", + "bundled": true, + "dev": true, + "optional": true, + "requires": { + "brace-expansion": "^1.1.7" + } + }, + "minimist": { + "version": "0.0.8", + "bundled": true, + "dev": true, + "optional": true + }, + "minipass": { + "version": "2.9.0", + "bundled": true, + "dev": true, + "optional": true, + "requires": { + "safe-buffer": "^5.1.2", + "yallist": "^3.0.0" + } + }, + "minizlib": { + "version": "1.3.3", + "bundled": true, + "dev": true, + "optional": true, + "requires": { + "minipass": "^2.9.0" + } + }, + "mkdirp": { + "version": "0.5.1", + "bundled": true, + "dev": true, + "optional": true, + "requires": { + "minimist": "0.0.8" + } + }, + "ms": { + "version": "2.1.2", + "bundled": true, + "dev": true, + "optional": true + }, + "needle": { + "version": "2.4.0", + "bundled": true, + "dev": true, + "optional": true, + "requires": { + "debug": "^3.2.6", + "iconv-lite": "^0.4.4", + "sax": "^1.2.4" + } + }, + "node-pre-gyp": { + "version": "0.14.0", + "bundled": true, + "dev": true, + "optional": true, + "requires": { + "detect-libc": "^1.0.2", + "mkdirp": "^0.5.1", + "needle": "^2.2.1", + "nopt": "^4.0.1", + "npm-packlist": "^1.1.6", + "npmlog": "^4.0.2", + "rc": "^1.2.7", + "rimraf": "^2.6.1", + "semver": "^5.3.0", + "tar": "^4.4.2" + } + }, + "nopt": { + "version": "4.0.1", + "bundled": true, + "dev": true, + "optional": true, + "requires": { + "abbrev": "1", + "osenv": "^0.1.4" + } + }, + "npm-bundled": { + "version": "1.1.1", + "bundled": true, + "dev": true, + "optional": true, + "requires": { + "npm-normalize-package-bin": "^1.0.1" + } + }, + "npm-normalize-package-bin": { + "version": "1.0.1", + "bundled": true, + "dev": true, + "optional": true + }, + "npm-packlist": { + "version": "1.4.7", + "bundled": true, + "dev": true, + "optional": true, + "requires": { + "ignore-walk": "^3.0.1", + "npm-bundled": "^1.0.1" + } + }, + "npmlog": { + "version": "4.1.2", + "bundled": true, + "dev": true, + "optional": true, + "requires": { + "are-we-there-yet": "~1.1.2", + "console-control-strings": "~1.1.0", + "gauge": "~2.7.3", + "set-blocking": "~2.0.0" + } + }, + "number-is-nan": { + "version": "1.0.1", + "bundled": true, + "dev": true, + "optional": true + }, + "object-assign": { + "version": "4.1.1", + "bundled": true, + "dev": true, + "optional": true + }, + "once": { + "version": "1.4.0", + "bundled": true, + "dev": true, + "optional": true, + "requires": { + "wrappy": "1" + } + }, + "os-homedir": { + "version": "1.0.2", + "bundled": true, + "dev": true, + "optional": true + }, + "os-tmpdir": { + "version": "1.0.2", + "bundled": true, + "dev": true, + "optional": true + }, + "osenv": { + "version": "0.1.5", + "bundled": true, + "dev": true, + "optional": true, + "requires": { + "os-homedir": "^1.0.0", + "os-tmpdir": "^1.0.0" + } + }, + "path-is-absolute": { + "version": "1.0.1", + "bundled": true, + "dev": true, + "optional": true + }, + "process-nextick-args": { + "version": "2.0.1", + "bundled": true, + "dev": true, + "optional": true + }, + "rc": { + "version": "1.2.8", + "bundled": true, + "dev": true, + "optional": true, + "requires": { + "deep-extend": "^0.6.0", + "ini": "~1.3.0", + "minimist": "^1.2.0", + "strip-json-comments": "~2.0.1" + }, + "dependencies": { + "minimist": { + "version": "1.2.0", + "bundled": true, + "dev": true, + "optional": true + } + } + }, + "readable-stream": { + "version": "2.3.6", + "bundled": true, + "dev": true, + "optional": true, + "requires": { + "core-util-is": "~1.0.0", + "inherits": "~2.0.3", + "isarray": "~1.0.0", + "process-nextick-args": "~2.0.0", + "safe-buffer": "~5.1.1", + "string_decoder": "~1.1.1", + "util-deprecate": "~1.0.1" + } + }, + "rimraf": { + "version": "2.7.1", + "bundled": true, + "dev": true, + "optional": true, + "requires": { + "glob": "^7.1.3" + } + }, + "safe-buffer": { + "version": "5.1.2", + "bundled": true, + "dev": true, + "optional": true + }, + "safer-buffer": { + "version": "2.1.2", + "bundled": true, + "dev": true, + "optional": true + }, + "sax": { + "version": "1.2.4", + "bundled": true, + "dev": true, + "optional": true + }, + "semver": { + "version": "5.7.1", + "bundled": true, + "dev": true, + "optional": true + }, + "set-blocking": { + "version": "2.0.0", + "bundled": true, + "dev": true, + "optional": true + }, + "signal-exit": { + "version": "3.0.2", + "bundled": true, + "dev": true, + "optional": true + }, + "string-width": { + "version": "1.0.2", + "bundled": true, + "dev": true, + "optional": true, + "requires": { + "code-point-at": "^1.0.0", + "is-fullwidth-code-point": "^1.0.0", + "strip-ansi": "^3.0.0" + } + }, + "string_decoder": { + "version": "1.1.1", + "bundled": true, + "dev": true, + "optional": true, + "requires": { + "safe-buffer": "~5.1.0" + } + }, + "strip-ansi": { + "version": "3.0.1", + "bundled": true, + "dev": true, + "optional": true, + "requires": { + "ansi-regex": "^2.0.0" + } + }, + "strip-json-comments": { + "version": "2.0.1", + "bundled": true, + "dev": true, + "optional": true + }, + "tar": { + "version": "4.4.13", + "bundled": true, + "dev": true, + "optional": true, + "requires": { + "chownr": "^1.1.1", + "fs-minipass": "^1.2.5", + "minipass": "^2.8.6", + "minizlib": "^1.2.1", + "mkdirp": "^0.5.0", + "safe-buffer": "^5.1.2", + "yallist": "^3.0.3" + } + }, + "util-deprecate": { + "version": "1.0.2", + "bundled": true, + "dev": true, + "optional": true + }, + "wide-align": { + "version": "1.1.3", + "bundled": true, + "dev": true, + "optional": true, + "requires": { + "string-width": "^1.0.2 || 2" + } + }, + "wrappy": { + "version": "1.0.2", + "bundled": true, + "dev": true, + "optional": true + }, + "yallist": { + "version": "3.1.1", + "bundled": true, + "dev": true, + "optional": true + } + } + }, + "is-binary-path": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-1.0.1.tgz", + "integrity": "sha1-dfFmQrSA8YenEcgUFh/TpKdlWJg=", "dev": true, "requires": { - "anymatch": "^2.0.0", - "async-each": "^1.0.1", - "braces": "^2.3.2", - "fsevents": "^1.2.7", - "glob-parent": "^3.1.0", - "inherits": "^2.0.3", - "is-binary-path": "^1.0.0", - "is-glob": "^4.0.0", - "normalize-path": "^3.0.0", - "path-is-absolute": "^1.0.0", - "readdirp": "^2.2.1", - "upath": "^1.1.1" + "binary-extensions": "^1.0.0" } }, - "normalize-path": { + "is-number": { "version": "3.0.0", - "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz", - "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==", + "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz", + "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=", + "dev": true, + "requires": { + "kind-of": "^3.0.2" + } + }, + "ms": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", + "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", "dev": true }, + "readdirp": { + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-2.2.1.tgz", + "integrity": "sha512-1JU/8q+VgFZyxwrJ+SVIOsh+KywWGpds3NTqikiKpDMZWScmAYyKIgqkO+ARvNWJfXeXR1zxz7aHF4u4CyH6vQ==", + "dev": true, + "requires": { + "graceful-fs": "^4.1.11", + "micromatch": "^3.1.10", + "readable-stream": "^2.0.2" + } + }, "supports-color": { "version": "5.5.0", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", @@ -8843,9 +9237,28 @@ "requires": { "has-flag": "^3.0.0" } + }, + "to-regex-range": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz", + "integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=", + "dev": true, + "requires": { + "is-number": "^3.0.0", + "repeat-string": "^1.6.1" + } } } }, + "nopt": { + "version": "1.0.10", + "resolved": "https://registry.npmjs.org/nopt/-/nopt-1.0.10.tgz", + "integrity": "sha1-bd0hvSoxQXuScn3Vhfim83YI6+4=", + "dev": true, + "requires": { + "abbrev": "1" + } + }, "normalize-package-data": { "version": "2.5.0", "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz", @@ -8858,13 +9271,10 @@ } }, "normalize-path": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz", - "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=", - "dev": true, - "requires": { - "remove-trailing-separator": "^1.0.1" - } + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz", + "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==", + "dev": true }, "normalize-range": { "version": "0.1.2", @@ -8885,9 +9295,9 @@ } }, "notifications-node-client": { - "version": "4.6.0", - "resolved": "https://registry.npmjs.org/notifications-node-client/-/notifications-node-client-4.6.0.tgz", - "integrity": "sha512-O5aRzQc7rJxyrmlBHXbXsGJu3/mmTtoEYzuWawNA+gVx894dFoflGDN+QBiMuB9t0aDPdjpgCB081zIbDKc/Jw==", + "version": "4.7.2", + "resolved": "https://registry.npmjs.org/notifications-node-client/-/notifications-node-client-4.7.2.tgz", + "integrity": "sha512-6dFYh3/kq6XlkwHFePSLSwF+zt5QhL0wD1XDB/UoDtE5ztlsAc7MHu6im+ecpZ/ZwSJ7L8hKpg0jy45I4jUXuw==", "requires": { "jsonwebtoken": "8.2.1", "request": "2.87.0", @@ -8895,6 +9305,36 @@ "underscore": "^1.9.0" }, "dependencies": { + "ajv": { + "version": "5.5.2", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-5.5.2.tgz", + "integrity": "sha1-c7Xuyj+rZT49P5Qis0GtQiBdyWU=", + "requires": { + "co": "^4.6.0", + "fast-deep-equal": "^1.0.0", + "fast-json-stable-stringify": "^2.0.0", + "json-schema-traverse": "^0.3.0" + } + }, + "fast-deep-equal": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-1.1.0.tgz", + "integrity": "sha1-wFNHeBfIa1HaqFPIHgWbcz0CNhQ=" + }, + "har-validator": { + "version": "5.0.3", + "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.0.3.tgz", + "integrity": "sha1-ukAsJmGU8VlW7xXg/PJCmT9qff0=", + "requires": { + "ajv": "^5.1.0", + "har-schema": "^2.0.0" + } + }, + "json-schema-traverse": { + "version": "0.3.1", + "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.3.1.tgz", + "integrity": "sha1-NJptRMU6Ud6JtAgFxdXlm0F9M0A=" + }, "jsonwebtoken": { "version": "8.2.1", "resolved": "https://registry.npmjs.org/jsonwebtoken/-/jsonwebtoken-8.2.1.tgz", @@ -8917,17 +9357,62 @@ "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==" }, + "oauth-sign": { + "version": "0.8.2", + "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.8.2.tgz", + "integrity": "sha1-Rqarfwrq2N6unsBWV4C31O/rnUM=" + }, + "punycode": { + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz", + "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4=" + }, + "request": { + "version": "2.87.0", + "resolved": "https://registry.npmjs.org/request/-/request-2.87.0.tgz", + "integrity": "sha512-fcogkm7Az5bsS6Sl0sibkbhcKsnyon/jV1kF3ajGmF0c8HrttdKTPRT9hieOaQHA5HEq6r8OyWOo/o781C1tNw==", + "requires": { + "aws-sign2": "~0.7.0", + "aws4": "^1.6.0", + "caseless": "~0.12.0", + "combined-stream": "~1.0.5", + "extend": "~3.0.1", + "forever-agent": "~0.6.1", + "form-data": "~2.3.1", + "har-validator": "~5.0.3", + "http-signature": "~1.2.0", + "is-typedarray": "~1.0.0", + "isstream": "~0.1.2", + "json-stringify-safe": "~5.0.1", + "mime-types": "~2.1.17", + "oauth-sign": "~0.8.2", + "performance-now": "^2.1.0", + "qs": "~6.5.1", + "safe-buffer": "^5.1.1", + "tough-cookie": "~2.3.3", + "tunnel-agent": "^0.6.0", + "uuid": "^3.1.0" + } + }, + "tough-cookie": { + "version": "2.3.4", + "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.4.tgz", + "integrity": "sha512-TZ6TTfI5NtZnuyy/Kecv+CnoROnyXn2DN97LontgQpCwsX2XyLYCC0ENhYkehSOwAp8rTQKc/NUIF7BkQ5rKLA==", + "requires": { + "punycode": "^1.4.1" + } + }, "underscore": { - "version": "1.9.1", - "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.9.1.tgz", - "integrity": "sha512-5/4etnCkd9c8gwgowi5/om/mYO5ajCaOgdzj/oW+0eQV9WxKBDZw5+ycmKmeaTXjInS/W0BzpGLo2xR2aBwZdg==" + "version": "1.9.2", + "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.9.2.tgz", + "integrity": "sha512-D39qtimx0c1fI3ya1Lnhk3E9nONswSKhnffBI0gME9C99fYOkNi04xs8K6pePLhvl1frbDemkaBQ5ikWllR2HQ==" } } }, "npm": { - "version": "6.11.1", - "resolved": "https://registry.npmjs.org/npm/-/npm-6.11.1.tgz", - "integrity": "sha512-ckV89fITMaOMa1UAbOEvGHtepWhCrlG34fGvr/K4UbD6LiS8Vv85uftpNqK6bbvej9lsXg5MPuFfuq88W91qyA==", + "version": "6.13.7", + "resolved": "https://registry.npmjs.org/npm/-/npm-6.13.7.tgz", + "integrity": "sha512-X967EKTT407CvgrWFjXusnPh0VLERcmR9hZFSVgkEquOomZkvpwLJ5zrQ3qrG9SpPLKJE4bPLUu76exKQ4a3Cg==", "dev": true, "requires": { "JSONStream": "^1.3.5", @@ -8936,16 +9421,16 @@ "ansistyles": "~0.1.3", "aproba": "^2.0.0", "archy": "~1.0.0", - "bin-links": "^1.1.3", + "bin-links": "^1.1.7", "bluebird": "^3.5.5", "byte-size": "^5.0.1", "cacache": "^12.0.3", "call-limit": "^1.1.1", - "chownr": "^1.1.2", + "chownr": "^1.1.3", "ci-info": "^2.0.0", "cli-columns": "^3.1.2", "cli-table3": "^0.5.1", - "cmd-shim": "^3.0.2", + "cmd-shim": "^3.0.3", "columnify": "~1.5.4", "config-chain": "^1.1.12", "debuglog": "*", @@ -8957,11 +9442,11 @@ "find-npm-prefix": "^1.0.2", "fs-vacuum": "~1.2.10", "fs-write-stream-atomic": "~1.0.10", - "gentle-fs": "^2.2.1", + "gentle-fs": "^2.3.0", "glob": "^7.1.4", - "graceful-fs": "^4.2.2", + "graceful-fs": "^4.2.3", "has-unicode": "~2.0.1", - "hosted-git-info": "^2.8.2", + "hosted-git-info": "^2.8.5", "iferr": "^1.0.2", "imurmurhash": "*", "infer-owner": "^1.0.4", @@ -8972,14 +9457,14 @@ "is-cidr": "^3.0.0", "json-parse-better-errors": "^1.0.2", "lazy-property": "~1.0.0", - "libcipm": "^4.0.3", + "libcipm": "^4.0.7", "libnpm": "^3.0.1", "libnpmaccess": "^3.0.2", "libnpmhook": "^5.0.3", "libnpmorg": "^1.0.1", "libnpmsearch": "^2.0.2", "libnpmteam": "^1.0.2", - "libnpx": "^10.2.0", + "libnpx": "^10.2.2", "lock-verify": "^2.1.0", "lockfile": "^1.0.4", "lodash._baseindexof": "*", @@ -8998,33 +9483,33 @@ "mississippi": "^3.0.0", "mkdirp": "~0.5.1", "move-concurrently": "^1.0.1", - "node-gyp": "^5.0.3", + "node-gyp": "^5.0.7", "nopt": "~4.0.1", "normalize-package-data": "^2.5.0", "npm-audit-report": "^1.3.2", "npm-cache-filename": "~1.0.2", - "npm-install-checks": "~3.0.0", - "npm-lifecycle": "^3.1.3", - "npm-package-arg": "^6.1.0", - "npm-packlist": "^1.4.4", - "npm-pick-manifest": "^3.0.0", + "npm-install-checks": "^3.0.2", + "npm-lifecycle": "^3.1.4", + "npm-package-arg": "^6.1.1", + "npm-packlist": "^1.4.7", + "npm-pick-manifest": "^3.0.2", "npm-profile": "^4.0.2", - "npm-registry-fetch": "^4.0.0", + "npm-registry-fetch": "^4.0.2", "npm-user-validate": "~1.0.0", "npmlog": "~4.1.2", "once": "~1.4.0", "opener": "^1.5.1", "osenv": "^0.1.5", - "pacote": "^9.5.8", + "pacote": "^9.5.12", "path-is-inside": "~1.0.2", "promise-inflight": "~1.0.1", "qrcode-terminal": "^0.12.0", "query-string": "^6.8.2", "qw": "~1.0.1", "read": "~1.0.7", - "read-cmd-shim": "^1.0.3", + "read-cmd-shim": "^1.0.5", "read-installed": "~4.0.3", - "read-package-json": "^2.1.0", + "read-package-json": "^2.1.1", "read-package-tree": "^5.3.1", "readable-stream": "^3.4.0", "readdir-scoped-modules": "^1.1.0", @@ -9038,8 +9523,8 @@ "sorted-object": "~2.0.1", "sorted-union-stream": "~2.1.3", "ssri": "^6.0.1", - "stringify-package": "^1.0.0", - "tar": "^4.4.10", + "stringify-package": "^1.0.1", + "tar": "^4.4.13", "text-table": "~0.2.0", "tiny-relative-date": "^1.3.0", "uid-number": "0.0.6", @@ -9047,7 +9532,7 @@ "unique-filename": "^1.1.1", "unpipe": "~1.0.0", "update-notifier": "^2.5.0", - "uuid": "^3.3.2", + "uuid": "^3.3.3", "validate-npm-package-license": "^3.0.4", "validate-npm-package-name": "~3.0.0", "which": "^1.3.1", @@ -9218,14 +9703,15 @@ } }, "bin-links": { - "version": "1.1.3", + "version": "1.1.7", "bundled": true, "dev": true, "requires": { "bluebird": "^3.5.3", "cmd-shim": "^3.0.0", - "gentle-fs": "^2.0.1", + "gentle-fs": "^2.3.0", "graceful-fs": "^4.1.15", + "npm-normalize-package-bin": "^1.0.0", "write-file-atomic": "^2.3.0" } }, @@ -9330,7 +9816,7 @@ } }, "chownr": { - "version": "1.1.2", + "version": "1.1.3", "bundled": true, "dev": true }, @@ -9402,7 +9888,7 @@ "dev": true }, "cmd-shim": { - "version": "3.0.2", + "version": "3.0.3", "bundled": true, "dev": true, "requires": { @@ -9770,7 +10256,7 @@ } }, "env-paths": { - "version": "1.0.0", + "version": "2.2.0", "bundled": true, "dev": true }, @@ -9968,11 +10454,22 @@ } }, "fs-minipass": { - "version": "1.2.6", + "version": "1.2.7", "bundled": true, "dev": true, "requires": { - "minipass": "^2.2.1" + "minipass": "^2.6.0" + }, + "dependencies": { + "minipass": { + "version": "2.9.0", + "bundled": true, + "dev": true, + "requires": { + "safe-buffer": "^5.1.2", + "yallist": "^3.0.0" + } + } } }, "fs-vacuum": { @@ -10073,12 +10570,13 @@ "dev": true }, "gentle-fs": { - "version": "2.2.1", + "version": "2.3.0", "bundled": true, "dev": true, "requires": { "aproba": "^1.1.2", "chownr": "^1.1.2", + "cmd-shim": "^3.0.3", "fs-vacuum": "^1.2.10", "graceful-fs": "^4.1.11", "iferr": "^0.1.5", @@ -10102,7 +10600,7 @@ } }, "get-caller-file": { - "version": "1.0.2", + "version": "1.0.3", "bundled": true, "dev": true }, @@ -10169,7 +10667,7 @@ } }, "graceful-fs": { - "version": "4.2.2", + "version": "4.2.3", "bundled": true, "dev": true }, @@ -10211,12 +10709,9 @@ "dev": true }, "hosted-git-info": { - "version": "2.8.2", + "version": "2.8.5", "bundled": true, - "dev": true, - "requires": { - "lru-cache": "^5.1.1" - } + "dev": true }, "http-cache-semantics": { "version": "3.8.1", @@ -10243,7 +10738,7 @@ } }, "https-proxy-agent": { - "version": "2.2.2", + "version": "2.2.4", "bundled": true, "dev": true, "requires": { @@ -10273,7 +10768,7 @@ "dev": true }, "ignore-walk": { - "version": "3.0.1", + "version": "3.0.3", "bundled": true, "dev": true, "requires": { @@ -10330,7 +10825,7 @@ } }, "invert-kv": { - "version": "1.0.0", + "version": "2.0.0", "bundled": true, "dev": true }, @@ -10519,15 +11014,15 @@ "dev": true }, "lcid": { - "version": "1.0.0", + "version": "2.0.0", "bundled": true, "dev": true, "requires": { - "invert-kv": "^1.0.0" + "invert-kv": "^2.0.0" } }, "libcipm": { - "version": "4.0.3", + "version": "4.0.7", "bundled": true, "dev": true, "requires": { @@ -10696,7 +11191,7 @@ } }, "libnpx": { - "version": "10.2.0", + "version": "10.2.2", "bundled": true, "dev": true, "requires": { @@ -10830,7 +11325,7 @@ } }, "make-fetch-happen": { - "version": "5.0.0", + "version": "5.0.2", "bundled": true, "dev": true, "requires": { @@ -10838,7 +11333,7 @@ "cacache": "^12.0.0", "http-cache-semantics": "^3.8.1", "http-proxy-agent": "^2.1.0", - "https-proxy-agent": "^2.2.1", + "https-proxy-agent": "^2.2.3", "lru-cache": "^5.1.1", "mississippi": "^3.0.0", "node-fetch-npm": "^2.0.2", @@ -10847,17 +11342,34 @@ "ssri": "^6.0.0" } }, + "map-age-cleaner": { + "version": "0.1.3", + "bundled": true, + "dev": true, + "requires": { + "p-defer": "^1.0.0" + } + }, "meant": { "version": "1.0.1", "bundled": true, "dev": true }, "mem": { - "version": "1.1.0", + "version": "4.3.0", "bundled": true, "dev": true, "requires": { - "mimic-fn": "^1.0.0" + "map-age-cleaner": "^0.1.1", + "mimic-fn": "^2.0.0", + "p-is-promise": "^2.0.0" + }, + "dependencies": { + "mimic-fn": { + "version": "2.1.0", + "bundled": true, + "dev": true + } } }, "mime-db": { @@ -10873,11 +11385,6 @@ "mime-db": "~1.35.0" } }, - "mimic-fn": { - "version": "1.2.0", - "bundled": true, - "dev": true - }, "minimatch": { "version": "3.0.4", "bundled": true, @@ -10891,30 +11398,25 @@ "bundled": true, "dev": true }, - "minipass": { - "version": "2.3.3", + "minizlib": { + "version": "1.3.3", "bundled": true, "dev": true, "requires": { - "safe-buffer": "^5.1.2", - "yallist": "^3.0.0" + "minipass": "^2.9.0" }, "dependencies": { - "yallist": { - "version": "3.0.2", + "minipass": { + "version": "2.9.0", "bundled": true, - "dev": true + "dev": true, + "requires": { + "safe-buffer": "^5.1.2", + "yallist": "^3.0.0" + } } } }, - "minizlib": { - "version": "1.2.1", - "bundled": true, - "dev": true, - "requires": { - "minipass": "^2.2.1" - } - }, "mississippi": { "version": "3.0.0", "bundled": true, @@ -10970,6 +11472,11 @@ "bundled": true, "dev": true }, + "nice-try": { + "version": "1.0.5", + "bundled": true, + "dev": true + }, "node-fetch-npm": { "version": "2.0.2", "bundled": true, @@ -10981,36 +11488,21 @@ } }, "node-gyp": { - "version": "5.0.3", + "version": "5.0.7", "bundled": true, "dev": true, "requires": { - "env-paths": "^1.0.0", - "glob": "^7.0.3", - "graceful-fs": "^4.1.2", - "mkdirp": "^0.5.0", - "nopt": "2 || 3", - "npmlog": "0 || 1 || 2 || 3 || 4", - "request": "^2.87.0", - "rimraf": "2", - "semver": "~5.3.0", - "tar": "^4.4.8", - "which": "1" - }, - "dependencies": { - "nopt": { - "version": "3.0.6", - "bundled": true, - "dev": true, - "requires": { - "abbrev": "1" - } - }, - "semver": { - "version": "5.3.0", - "bundled": true, - "dev": true - } + "env-paths": "^2.2.0", + "glob": "^7.1.4", + "graceful-fs": "^4.2.2", + "mkdirp": "^0.5.1", + "nopt": "^4.0.1", + "npmlog": "^4.1.2", + "request": "^2.88.0", + "rimraf": "^2.6.3", + "semver": "^5.7.1", + "tar": "^4.4.12", + "which": "^1.3.1" } }, "nopt": { @@ -11053,9 +11545,12 @@ } }, "npm-bundled": { - "version": "1.0.6", + "version": "1.1.1", "bundled": true, - "dev": true + "dev": true, + "requires": { + "npm-normalize-package-bin": "^1.0.1" + } }, "npm-cache-filename": { "version": "1.0.2", @@ -11063,7 +11558,7 @@ "dev": true }, "npm-install-checks": { - "version": "3.0.0", + "version": "3.0.2", "bundled": true, "dev": true, "requires": { @@ -11071,7 +11566,7 @@ } }, "npm-lifecycle": { - "version": "3.1.3", + "version": "3.1.4", "bundled": true, "dev": true, "requires": { @@ -11090,19 +11585,24 @@ "bundled": true, "dev": true }, + "npm-normalize-package-bin": { + "version": "1.0.1", + "bundled": true, + "dev": true + }, "npm-package-arg": { - "version": "6.1.0", + "version": "6.1.1", "bundled": true, "dev": true, "requires": { - "hosted-git-info": "^2.6.0", + "hosted-git-info": "^2.7.1", "osenv": "^0.1.5", - "semver": "^5.5.0", + "semver": "^5.6.0", "validate-npm-package-name": "^3.0.0" } }, "npm-packlist": { - "version": "1.4.4", + "version": "1.4.7", "bundled": true, "dev": true, "requires": { @@ -11111,7 +11611,7 @@ } }, "npm-pick-manifest": { - "version": "3.0.0", + "version": "3.0.2", "bundled": true, "dev": true, "requires": { @@ -11131,7 +11631,7 @@ } }, "npm-registry-fetch": { - "version": "4.0.0", + "version": "4.0.2", "bundled": true, "dev": true, "requires": { @@ -11140,7 +11640,15 @@ "figgy-pudding": "^3.4.1", "lru-cache": "^5.1.1", "make-fetch-happen": "^5.0.0", - "npm-package-arg": "^6.1.0" + "npm-package-arg": "^6.1.0", + "safe-buffer": "^5.2.0" + }, + "dependencies": { + "safe-buffer": { + "version": "5.2.0", + "bundled": true, + "dev": true + } } }, "npm-run-path": { @@ -11215,13 +11723,41 @@ "dev": true }, "os-locale": { - "version": "2.1.0", + "version": "3.1.0", "bundled": true, "dev": true, "requires": { - "execa": "^0.7.0", - "lcid": "^1.0.0", - "mem": "^1.1.0" + "execa": "^1.0.0", + "lcid": "^2.0.0", + "mem": "^4.0.0" + }, + "dependencies": { + "cross-spawn": { + "version": "6.0.5", + "bundled": true, + "dev": true, + "requires": { + "nice-try": "^1.0.4", + "path-key": "^2.0.1", + "semver": "^5.5.0", + "shebang-command": "^1.2.0", + "which": "^1.2.9" + } + }, + "execa": { + "version": "1.0.0", + "bundled": true, + "dev": true, + "requires": { + "cross-spawn": "^6.0.0", + "get-stream": "^4.0.0", + "is-stream": "^1.1.0", + "npm-run-path": "^2.0.0", + "p-finally": "^1.0.0", + "signal-exit": "^3.0.0", + "strip-eof": "^1.0.0" + } + } } }, "os-tmpdir": { @@ -11238,11 +11774,21 @@ "os-tmpdir": "^1.0.0" } }, + "p-defer": { + "version": "1.0.0", + "bundled": true, + "dev": true + }, "p-finally": { "version": "1.0.0", "bundled": true, "dev": true }, + "p-is-promise": { + "version": "2.1.0", + "bundled": true, + "dev": true + }, "p-limit": { "version": "1.2.0", "bundled": true, @@ -11276,7 +11822,7 @@ } }, "pacote": { - "version": "9.5.8", + "version": "9.5.12", "bundled": true, "dev": true, "requires": { @@ -11294,6 +11840,7 @@ "mississippi": "^3.0.0", "mkdirp": "^0.5.1", "normalize-package-data": "^2.4.0", + "npm-normalize-package-bin": "^1.0.0", "npm-package-arg": "^6.1.0", "npm-packlist": "^1.1.12", "npm-pick-manifest": "^3.0.0", @@ -11312,7 +11859,7 @@ }, "dependencies": { "minipass": { - "version": "2.3.5", + "version": "2.9.0", "bundled": true, "dev": true, "requires": { @@ -11545,7 +12092,7 @@ } }, "read-cmd-shim": { - "version": "1.0.3", + "version": "1.0.5", "bundled": true, "dev": true, "requires": { @@ -11567,7 +12114,7 @@ } }, "read-package-json": { - "version": "2.1.0", + "version": "2.1.1", "bundled": true, "dev": true, "requires": { @@ -11575,7 +12122,7 @@ "graceful-fs": "^4.1.2", "json-parse-better-errors": "^1.0.1", "normalize-package-data": "^2.0.0", - "slash": "^1.0.0" + "npm-normalize-package-bin": "^1.0.0" } }, "read-package-tree": { @@ -11750,28 +12297,23 @@ "bundled": true, "dev": true }, - "slash": { - "version": "1.0.0", - "bundled": true, - "dev": true - }, "slide": { "version": "1.1.6", "bundled": true, "dev": true }, "smart-buffer": { - "version": "4.0.2", + "version": "4.1.0", "bundled": true, "dev": true }, "socks": { - "version": "2.3.2", + "version": "2.3.3", "bundled": true, "dev": true, "requires": { - "ip": "^1.1.5", - "smart-buffer": "4.0.2" + "ip": "1.1.5", + "smart-buffer": "^4.1.0" } }, "socks-proxy-agent": { @@ -11986,7 +12528,7 @@ } }, "stringify-package": { - "version": "1.0.0", + "version": "1.0.1", "bundled": true, "dev": true }, @@ -12017,13 +12559,13 @@ } }, "tar": { - "version": "4.4.10", + "version": "4.4.13", "bundled": true, "dev": true, "requires": { "chownr": "^1.1.1", "fs-minipass": "^1.2.5", - "minipass": "^2.3.5", + "minipass": "^2.8.6", "minizlib": "^1.2.1", "mkdirp": "^0.5.0", "safe-buffer": "^5.1.2", @@ -12031,18 +12573,13 @@ }, "dependencies": { "minipass": { - "version": "2.3.5", + "version": "2.9.0", "bundled": true, "dev": true, "requires": { "safe-buffer": "^5.1.2", "yallist": "^3.0.0" } - }, - "yallist": { - "version": "3.0.3", - "bundled": true, - "dev": true } } }, @@ -12223,7 +12760,7 @@ } }, "uuid": { - "version": "3.3.2", + "version": "3.3.3", "bundled": true, "dev": true }, @@ -12368,7 +12905,7 @@ "dev": true }, "yargs": { - "version": "11.0.0", + "version": "11.1.1", "bundled": true, "dev": true, "requires": { @@ -12376,7 +12913,7 @@ "decamelize": "^1.1.1", "find-up": "^2.1.0", "get-caller-file": "^1.0.1", - "os-locale": "^2.0.0", + "os-locale": "^3.1.0", "require-directory": "^2.1.1", "require-main-filename": "^1.0.1", "set-blocking": "^2.0.0", @@ -12404,9 +12941,18 @@ } }, "npm-bundled": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/npm-bundled/-/npm-bundled-1.0.6.tgz", - "integrity": "sha512-8/JCaftHwbd//k6y2rEWp6k1wxVfpFzB6t1p825+cUb7Ym2XQfhwIC5KwhrvzZRJu+LtDE585zVaS32+CGtf0g==", + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/npm-bundled/-/npm-bundled-1.1.1.tgz", + "integrity": "sha512-gqkfgGePhTpAEgUsGEgcq1rqPXA+tv/aVBlgEzfXwA1yiUJF7xtEt3CtVwOjNYQOVknDk0F20w58Fnm3EtG0fA==", + "dev": true, + "requires": { + "npm-normalize-package-bin": "^1.0.1" + } + }, + "npm-normalize-package-bin": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/npm-normalize-package-bin/-/npm-normalize-package-bin-1.0.1.tgz", + "integrity": "sha512-EPfafl6JL5/rU+ot6P3gRSCpPDW5VmIzX959Ob1+ySFUuuYHWHekXpwdUZcKP5C+DS4GEtdJluwBjnsNDl+fSA==", "dev": true }, "npm-package-arg": { @@ -12422,13 +12968,14 @@ } }, "npm-packlist": { - "version": "1.4.4", - "resolved": "https://registry.npmjs.org/npm-packlist/-/npm-packlist-1.4.4.tgz", - "integrity": "sha512-zTLo8UcVYtDU3gdeaFu2Xu0n0EvelfHDGuqtNIn5RO7yQj4H1TqNdBc/yZjxnWA0PVB8D3Woyp0i5B43JwQ6Vw==", + "version": "1.4.8", + "resolved": "https://registry.npmjs.org/npm-packlist/-/npm-packlist-1.4.8.tgz", + "integrity": "sha512-5+AZgwru5IevF5ZdnFglB5wNlHG1AOOuw28WhUq8/8emhBmLv6jX5by4WJCh7lW0uSYZYS6DXqIsyZVIXRZU9A==", "dev": true, "requires": { "ignore-walk": "^3.0.1", - "npm-bundled": "^1.0.1" + "npm-bundled": "^1.0.1", + "npm-normalize-package-bin": "^1.0.1" } }, "npm-pick-manifest": { @@ -12443,9 +12990,9 @@ } }, "npm-registry-fetch": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/npm-registry-fetch/-/npm-registry-fetch-4.0.0.tgz", - "integrity": "sha512-Jllq35Jag8dtv0M17ue74XtdQTyqKzuAYGiX9mAjOhkmNjib3bBUgK6mUY61+AHnXeSRobQkpY3/xIOS/omptw==", + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/npm-registry-fetch/-/npm-registry-fetch-4.0.2.tgz", + "integrity": "sha512-Z0IFtPEozNdeZRPh3aHHxdG+ZRpzcbQaJLthsm3VhNf6DScicTFRHZzK82u8RsJUsUHkX+QH/zcB/5pmd20H4A==", "dev": true, "requires": { "JSONStream": "^1.3.4", @@ -12453,7 +13000,8 @@ "figgy-pudding": "^3.4.1", "lru-cache": "^5.1.1", "make-fetch-happen": "^5.0.0", - "npm-package-arg": "^6.1.0" + "npm-package-arg": "^6.1.0", + "safe-buffer": "^5.2.0" }, "dependencies": { "lru-cache": { @@ -12466,9 +13014,9 @@ } }, "yallist": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.0.3.tgz", - "integrity": "sha512-S+Zk8DEWE6oKpV+vI3qWkaK+jSbIK86pCwe2IF/xwIpQ8jEuxpw9NyaGjmp9+BoJv5FV2piqCDcoCtStppiq2A==", + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz", + "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==", "dev": true } } @@ -12513,6 +13061,14 @@ "path-key": "^2.0.0" } }, + "nth-check": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/nth-check/-/nth-check-1.0.2.tgz", + "integrity": "sha512-WeBOdju8SnzPN5vTUJYxYUxLeXpCaVP5i5e0LF8fg7WORF2Wd7wFX/pk0tYZk7s8T+J7VLy0Da6J1+wCT0AtHg==", + "requires": { + "boolbase": "~1.0.0" + } + }, "null-check": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/null-check/-/null-check-1.0.0.tgz", @@ -12531,9 +13087,9 @@ "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=" }, "nwsapi": { - "version": "2.1.4", - "resolved": "https://registry.npmjs.org/nwsapi/-/nwsapi-2.1.4.tgz", - "integrity": "sha512-iGfd9Y6SFdTNldEy2L0GUhcarIutFmk+MPWIn9dmj8NMIup03G08uUF2KGbbmv/Ux4RT0VZJoP/sVbWA6d/VIw==" + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/nwsapi/-/nwsapi-2.2.0.tgz", + "integrity": "sha512-h2AatdwYH+JHiZpv7pt/gSX1XoRGb7L/qSIeuqA6GwYoF9w1vP1cw42TO0aI2pNyshRK5893hNSl+1//vHK7hQ==" }, "nyc": { "version": "14.1.1", @@ -12608,9 +13164,9 @@ } }, "oauth-sign": { - "version": "0.8.2", - "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.8.2.tgz", - "integrity": "sha1-Rqarfwrq2N6unsBWV4C31O/rnUM=" + "version": "0.9.0", + "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.9.0.tgz", + "integrity": "sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==" }, "object-assign": { "version": "4.1.1", @@ -12646,6 +13202,18 @@ } } }, + "object-inspect": { + "version": "1.7.0", + "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.7.0.tgz", + "integrity": "sha512-a7pEHdh1xKIAgTySUGgLMx/xwDZskN1Ud6egYYN3EdRW4ZMPNEDUTF+hwy2LUC+Bl+SyLXANnwz/jyh/qutKUw==", + "dev": true + }, + "object-is": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/object-is/-/object-is-1.0.2.tgz", + "integrity": "sha512-Epah+btZd5wrrfjkJZq1AOB9O6OxUQto45hzFd7lXGrpHPGE0W1k+426yrZV+k6NJOzLNNW/nVsmZdIWsAqoOQ==", + "dev": true + }, "object-keys": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz", @@ -12674,13 +13242,13 @@ } }, "object.getownpropertydescriptors": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.0.3.tgz", - "integrity": "sha1-h1jIRvW0B62rDyNuCYbxSwUcqhY=", + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.0.tgz", + "integrity": "sha512-Z53Oah9A3TdLoblT7VKJaTDdXdT+lQO+cNpKVnya5JDe9uLvzu1YyY1yFDFrcxrlRgWrEFH0jJtD/IbuwjcEVg==", "dev": true, "requires": { - "define-properties": "^1.1.2", - "es-abstract": "^1.5.1" + "define-properties": "^1.1.3", + "es-abstract": "^1.17.0-next.1" } }, "object.pick": { @@ -12761,32 +13329,24 @@ } }, "optimist": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/optimist/-/optimist-0.6.1.tgz", - "integrity": "sha1-2j6nRob6IaGaERwybpDrFaAZZoY=", + "version": "0.3.7", + "resolved": "https://registry.npmjs.org/optimist/-/optimist-0.3.7.tgz", + "integrity": "sha1-yQlBrVnkJzMokjB00s8ufLxuwNk=", "requires": { - "minimist": "~0.0.1", "wordwrap": "~0.0.2" } }, "optionator": { - "version": "0.8.2", - "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.8.2.tgz", - "integrity": "sha1-NkxeQJ0/TWMB1sC0wFu6UBgK62Q=", + "version": "0.8.3", + "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.8.3.tgz", + "integrity": "sha512-+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA==", "requires": { "deep-is": "~0.1.3", - "fast-levenshtein": "~2.0.4", + "fast-levenshtein": "~2.0.6", "levn": "~0.3.0", "prelude-ls": "~1.1.2", "type-check": "~0.3.2", - "wordwrap": "~1.0.0" - }, - "dependencies": { - "wordwrap": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-1.0.0.tgz", - "integrity": "sha1-J1hIEIkUVqQXHI0CJkQa3pDLyus=" - } + "word-wrap": "~1.2.3" } }, "original": { @@ -12852,9 +13412,9 @@ "integrity": "sha512-Y3W0wlRPK8ZMRbNq97l4M5otioeA5lm1z7bkNkxCka8HSPjR0xRWmpCmc9utiaLP9Jb1eD8BgeIxTW4AIF45Pg==" }, "p-limit": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.2.0.tgz", - "integrity": "sha512-pZbTJpoUsCzV48Mc9Nh51VbwO0X9cuPFE8gYwx9BTCt9SF8/b7Zljd2fVgOxhIF/HDTKgpVzs+GPhyKfjLLFRQ==", + "version": "2.2.2", + "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.2.2.tgz", + "integrity": "sha512-WGR+xHecKTr7EbUEhyLSh5Dube9JtdiG78ufaeLxTgpudf/20KqyMioIUZJAezlTIi6evxuoUs9YXc11cU+yzQ==", "requires": { "p-try": "^2.0.0" } @@ -12880,14 +13440,6 @@ "dev": true, "requires": { "retry": "^0.12.0" - }, - "dependencies": { - "retry": { - "version": "0.12.0", - "resolved": "https://registry.npmjs.org/retry/-/retry-0.12.0.tgz", - "integrity": "sha1-G0KmJmoh8HQh0bC1S33BZ7AcATs=", - "dev": true - } } }, "p-try": { @@ -12991,76 +13543,34 @@ "yallist": "^3.0.2" } }, - "mississippi": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/mississippi/-/mississippi-3.0.0.tgz", - "integrity": "sha512-x471SsVjUtBRtcvd4BzKE9kFC+/2TeWgKCgw0bZcw1b9l2X3QX5vCWgF+KaZaYm87Ss//rHnWryupDrgLvmSkA==", - "dev": true, - "requires": { - "concat-stream": "^1.5.0", - "duplexify": "^3.4.2", - "end-of-stream": "^1.1.0", - "flush-write-stream": "^1.0.0", - "from2": "^2.1.0", - "parallel-transform": "^1.1.0", - "pump": "^3.0.0", - "pumpify": "^1.3.3", - "stream-each": "^1.1.0", - "through2": "^2.0.0" - } - }, - "ssri": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/ssri/-/ssri-6.0.1.tgz", - "integrity": "sha512-3Wge10hNcT1Kur4PDFwEieXSCMCJs/7WvSACcrMYrNp+b8kDL1/0wJch5Ni2WrtwEa2IO8OsVfeKIciKCDx/QA==", - "dev": true, - "requires": { - "figgy-pudding": "^3.5.1" - } - }, - "tar": { - "version": "4.4.10", - "resolved": "https://registry.npmjs.org/tar/-/tar-4.4.10.tgz", - "integrity": "sha512-g2SVs5QIxvo6OLp0GudTqEf05maawKUxXru104iaayWA09551tFCTI8f1Asb4lPfkBr91k07iL4c11XO3/b0tA==", - "dev": true, - "requires": { - "chownr": "^1.1.1", - "fs-minipass": "^1.2.5", - "minipass": "^2.3.5", - "minizlib": "^1.2.1", - "mkdirp": "^0.5.0", - "safe-buffer": "^5.1.2", - "yallist": "^3.0.3" - } - }, "yallist": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.0.3.tgz", - "integrity": "sha512-S+Zk8DEWE6oKpV+vI3qWkaK+jSbIK86pCwe2IF/xwIpQ8jEuxpw9NyaGjmp9+BoJv5FV2piqCDcoCtStppiq2A==", + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz", + "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==", "dev": true } } }, "pako": { - "version": "1.0.10", - "resolved": "https://registry.npmjs.org/pako/-/pako-1.0.10.tgz", - "integrity": "sha512-0DTvPVU3ed8+HNXOu5Bs+o//Mbdj9VNQMUOe9oKCwh8l0GNwpTDMKCWbRjgtD291AWnkAgkqA/LOnQS8AmS1tw==" + "version": "1.0.11", + "resolved": "https://registry.npmjs.org/pako/-/pako-1.0.11.tgz", + "integrity": "sha512-4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw==" }, "parallel-transform": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/parallel-transform/-/parallel-transform-1.1.0.tgz", - "integrity": "sha1-1BDwZbBdojCB/NEPKIVMKb2jOwY=", + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/parallel-transform/-/parallel-transform-1.2.0.tgz", + "integrity": "sha512-P2vSmIu38uIlvdcU7fDkyrxj33gTUy/ABO5ZUbGowxNCopBq/OoD42bP4UmMrJoPyk4Uqf0mu3mtWBhHCZD8yg==", "dev": true, "requires": { - "cyclist": "~0.2.2", + "cyclist": "^1.0.1", "inherits": "^2.0.3", "readable-stream": "^2.1.5" } }, "parse-asn1": { - "version": "5.1.4", - "resolved": "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.4.tgz", - "integrity": "sha512-Qs5duJcuvNExRfFZ99HDD3z4mAi3r9Wl/FOjEOijlxwCZs7E7mW2vjTpgQ4J8LpTF8x5v+1Vn5UQFejmWT11aw==", + "version": "5.1.5", + "resolved": "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.5.tgz", + "integrity": "sha512-jkMYn1dcJqF6d5CpU689bq7w/b5ALS9ROVSpQDPrZsqqesUJii9qutvoT5ltGedNXMO2e16YUWIghG9KxaViTQ==", "dev": true, "requires": { "asn1.js": "^4.0.0", @@ -13081,9 +13591,10 @@ } }, "parse5": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/parse5/-/parse5-5.1.0.tgz", - "integrity": "sha512-fxNG2sQjHvlVAYmzBZS9YlDp6PTSSDwa98vkD4QgVDDCAo84z5X1t5XyJQ62ImdLXx5NdIIfihey6xpum9/gRQ==" + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/parse5/-/parse5-5.1.1.tgz", + "integrity": "sha512-ugq4DFI0Ptb+WWjAdOK16+u/nHfiIrcE+sh8kZMaM0WllQKLI9rOUq6c2b7cwPkXdzfQESqvoqK6ug7U/Yyzug==", + "optional": true }, "parseqs": { "version": "0.0.5", @@ -13115,9 +13626,9 @@ "dev": true }, "passport": { - "version": "0.4.0", - "resolved": "https://registry.npmjs.org/passport/-/passport-0.4.0.tgz", - "integrity": "sha1-xQlWkTR71a07XhgCOMORTRbwWBE=", + "version": "0.4.1", + "resolved": "https://registry.npmjs.org/passport/-/passport-0.4.1.tgz", + "integrity": "sha512-IxXgZZs8d7uFSt3eqNjM9NQ3g3uQCW5avD8mRNoXV99Yig50vjuaez6dQK2qC0kVWPRTujxY0dWgGfT09adjYg==", "requires": { "passport-strategy": "1.x.x", "pause": "0.0.1" @@ -13176,9 +13687,9 @@ "integrity": "sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw==" }, "path-to-regexp": { - "version": "2.4.0", - "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-2.4.0.tgz", - "integrity": "sha512-G6zHoVqC6GGTQkZwF4lkuEyMbVOjoBKAEybQUypI1WTkqinCOrq2x6U2+phkJ1XsEMTy4LjtwPI7HW+NVrRR2w==" + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-6.1.0.tgz", + "integrity": "sha512-h9DqehX3zZZDCEm+xbfU0ZmwCGFCAAraPJWMXJ4+v32NjZJilVg3k1TcKsRgIb8IQ/izZSaydDc1OhJCZvs2Dw==" }, "path-type": { "version": "3.0.0", @@ -13231,14 +13742,15 @@ "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=" }, "pg": { - "version": "7.12.1", - "resolved": "https://registry.npmjs.org/pg/-/pg-7.12.1.tgz", - "integrity": "sha512-l1UuyfEvoswYfcUe6k+JaxiN+5vkOgYcVSbSuw3FvdLqDbaoa2RJo1zfJKfPsSYPFVERd4GHvX3s2PjG1asSDA==", + "version": "7.18.1", + "resolved": "https://registry.npmjs.org/pg/-/pg-7.18.1.tgz", + "integrity": "sha512-1KtKBKg/zWrjEEv//klBbVOPGucuc7HHeJf6OEMueVcUeyF3yueHf+DvhVwBjIAe9/97RAydO/lWjkcMwssuEw==", "requires": { "buffer-writer": "2.0.0", "packet-reader": "1.0.0", "pg-connection-string": "0.1.3", - "pg-pool": "^2.0.4", + "pg-packet-stream": "^1.1.0", + "pg-pool": "^2.0.10", "pg-types": "^2.1.0", "pgpass": "1.x", "semver": "4.3.2" @@ -13269,10 +13781,15 @@ "resolved": "https://registry.npmjs.org/pg-int8/-/pg-int8-1.0.1.tgz", "integrity": "sha512-WCtabS6t3c8SkpDBUlb1kjOs7l66xsGdKpIPZsg4wR+B3+u9UAum2odSsF9tnvxg80h4ZxLWMy4pRjOsFIqQpw==" }, + "pg-packet-stream": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/pg-packet-stream/-/pg-packet-stream-1.1.0.tgz", + "integrity": "sha512-kRBH0tDIW/8lfnnOyTwKD23ygJ/kexQVXZs7gEyBljw4FYqimZFxnMMx50ndZ8In77QgfGuItS5LLclC2TtjYg==" + }, "pg-pool": { - "version": "2.0.7", - "resolved": "https://registry.npmjs.org/pg-pool/-/pg-pool-2.0.7.tgz", - "integrity": "sha512-UiJyO5B9zZpu32GSlP0tXy8J2NsJ9EFGFfz5v6PSbdz/1hBLX1rNiiy5+mAm5iJJYwfCv4A0EBcQLGWwjbpzZw==" + "version": "2.0.10", + "resolved": "https://registry.npmjs.org/pg-pool/-/pg-pool-2.0.10.tgz", + "integrity": "sha512-qdwzY92bHf3nwzIUcj+zJ0Qo5lpG/YxchahxIN8+ZVmXqkahKXsnl2aiJPHLYN9o5mB/leG+Xh6XKxtP7e0sjg==" }, "pg-types": { "version": "2.2.0", @@ -13295,9 +13812,9 @@ } }, "picomatch": { - "version": "2.0.7", - "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.0.7.tgz", - "integrity": "sha512-oLHIdio3tZ0qH76NybpeneBhYVj0QFTfXEFTc/B3zKQspYfYYkWYgFsmzo+4kvId/bQRcNkVeguI3y+CD22BtA==", + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.2.1.tgz", + "integrity": "sha512-ISBaA8xQNmwELC7eOjqFKMESB2VIqt4PPDD0nsS95b/9dZXvVKOlz9keMSnoGGKcOHXfTvDD6WMaRoSc9UuhRA==", "dev": true }, "pidtree": { @@ -13335,41 +13852,36 @@ "find-up": "^3.0.0" } }, - "platform": { - "version": "1.3.5", - "resolved": "https://registry.npmjs.org/platform/-/platform-1.3.5.tgz", - "integrity": "sha512-TuvHS8AOIZNAlE77WUDiR4rySV/VMptyMfcfeoMgs4P8apaZM3JrnbzBiixKUv+XR6i+BXrQh8WAnjaSPFO65Q==" - }, "pn": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/pn/-/pn-1.1.0.tgz", "integrity": "sha512-2qHaIQr2VLRFoxe2nASzsV6ef4yOOH+Fi9FBOVH6cqeSgUnoyySPZkxzLuzd+RYOQTRpROA0ztTMqxROKSb/nA==" }, "portfinder": { - "version": "1.0.23", - "resolved": "https://registry.npmjs.org/portfinder/-/portfinder-1.0.23.tgz", - "integrity": "sha512-B729mL/uLklxtxuiJKfQ84WPxNw5a7Yhx3geQZdcA4GjNjZSTSSMMWyoennMVnTWSmAR0lMdzWYN0JLnHrg1KQ==", + "version": "1.0.25", + "resolved": "https://registry.npmjs.org/portfinder/-/portfinder-1.0.25.tgz", + "integrity": "sha512-6ElJnHBbxVA1XSLgBp7G1FiCkQdlqGzuF7DswL5tcea+E8UpuvPU7beVAjjRwCioTS9ZluNbu+ZyRvgTsmqEBg==", "dev": true, "requires": { - "async": "^1.5.2", - "debug": "^2.2.0", - "mkdirp": "0.5.x" + "async": "^2.6.2", + "debug": "^3.1.1", + "mkdirp": "^0.5.1" }, "dependencies": { - "async": { - "version": "1.5.2", - "resolved": "https://registry.npmjs.org/async/-/async-1.5.2.tgz", - "integrity": "sha1-7GphrlZIDAw8skHJVhjiCJL5Zyo=", - "dev": true - }, "debug": { - "version": "2.6.9", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", - "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", + "version": "3.2.6", + "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz", + "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==", "dev": true, "requires": { - "ms": "2.0.0" + "ms": "^2.1.1" } + }, + "ms": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", + "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", + "dev": true } } }, @@ -13388,6 +13900,14 @@ "chalk": "^2.4.2", "source-map": "^0.6.1", "supports-color": "^6.1.0" + }, + "dependencies": { + "source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "dev": true + } } }, "postcss-import": { @@ -13519,6 +14039,14 @@ "requires": { "err-code": "^1.0.0", "retry": "^0.10.0" + }, + "dependencies": { + "retry": { + "version": "0.10.1", + "resolved": "https://registry.npmjs.org/retry/-/retry-0.10.1.tgz", + "integrity": "sha1-52OI0heZLCUnUCQdPTlW/tmNj/Q=", + "dev": true + } } }, "protoduck": { @@ -13531,9 +14059,9 @@ } }, "protractor": { - "version": "5.4.2", - "resolved": "https://registry.npmjs.org/protractor/-/protractor-5.4.2.tgz", - "integrity": "sha512-zlIj64Cr6IOWP7RwxVeD8O4UskLYPoyIcg0HboWJL9T79F1F0VWtKkGTr/9GN6BKL+/Q/GmM7C9kFVCfDbP5sA==", + "version": "5.4.3", + "resolved": "https://registry.npmjs.org/protractor/-/protractor-5.4.3.tgz", + "integrity": "sha512-7pMAolv8Ah1yJIqaorDTzACtn3gk7BamVKPTeO5lqIGOrfosjPgXFx/z1dqSI+m5EeZc2GMJHPr5DYlodujDNA==", "dev": true, "requires": { "@types/q": "^0.0.32", @@ -13607,12 +14135,46 @@ "pinkie-promise": "^2.0.0" } }, + "is-path-cwd": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-path-cwd/-/is-path-cwd-1.0.0.tgz", + "integrity": "sha1-0iXsIxMuie3Tj9p2dHLmLmXxEG0=", + "dev": true + }, + "is-path-in-cwd": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/is-path-in-cwd/-/is-path-in-cwd-1.0.1.tgz", + "integrity": "sha512-FjV1RTW48E7CWM7eE/J2NJvAEEVektecDBVBE5Hh3nM1Jd0kvhHtX68Pr3xsDf857xt3Y4AkwVULK1Vku62aaQ==", + "dev": true, + "requires": { + "is-path-inside": "^1.0.0" + } + }, + "is-path-inside": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-1.0.1.tgz", + "integrity": "sha1-jvW33lBDej/cprToZe96pVy0gDY=", + "dev": true, + "requires": { + "path-is-inside": "^1.0.1" + } + }, "minimist": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", - "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=", + "version": "0.0.10", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz", + "integrity": "sha1-3j+YVD2/lggr5IrRoMfNqDYwHc8=", "dev": true }, + "optimist": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/optimist/-/optimist-0.6.1.tgz", + "integrity": "sha1-2j6nRob6IaGaERwybpDrFaAZZoY=", + "dev": true, + "requires": { + "minimist": "~0.0.1", + "wordwrap": "~0.0.2" + } + }, "pify": { "version": "2.3.0", "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz", @@ -13650,9 +14212,9 @@ "dev": true }, "webdriver-manager": { - "version": "12.1.6", - "resolved": "https://registry.npmjs.org/webdriver-manager/-/webdriver-manager-12.1.6.tgz", - "integrity": "sha512-B1mOycNCrbk7xODw7Jgq/mdD3qzPxMaTsnKIQDy2nXlQoyjTrJTTD0vRpEZI9b8RibPEyQvh9zIZ0M1mpOxS3w==", + "version": "12.1.7", + "resolved": "https://registry.npmjs.org/webdriver-manager/-/webdriver-manager-12.1.7.tgz", + "integrity": "sha512-XINj6b8CYuUYC93SG3xPkxlyUc3IJbD6Vvo75CVGuG9uzsefDzWQrhz0Lq8vbPxtb4d63CZdYophF8k8Or/YiA==", "dev": true, "requires": { "adm-zip": "^0.4.9", @@ -13666,6 +14228,14 @@ "rimraf": "^2.5.2", "semver": "^5.3.0", "xml2js": "^0.4.17" + }, + "dependencies": { + "minimist": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", + "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=", + "dev": true + } } } } @@ -13698,9 +14268,9 @@ "integrity": "sha1-8FKijacOYYkX7wqKw0wa5aaChrM=" }, "psl": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/psl/-/psl-1.3.0.tgz", - "integrity": "sha512-avHdspHO+9rQTLbv1RO+MPYeP/SzsCoxofjVnHanETfQhTJrmB0HlDoW+EiN/R+C0BZ+gERab9NY0lPN2TxNag==" + "version": "1.7.0", + "resolved": "https://registry.npmjs.org/psl/-/psl-1.7.0.tgz", + "integrity": "sha512-5NsSEDv8zY70ScRnOTn7bK7eanl2MvFrOrS/R6x+dBt5g1ghnj9Zv90kO8GwT8gxcu2ANyFprnFYB85IogIJOQ==" }, "pstree.remy": { "version": "1.1.7", @@ -13760,9 +14330,9 @@ "integrity": "sha1-llOgNvt8HuQjQvIyXM7v6jkmxI0=" }, "puppeteer": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/puppeteer/-/puppeteer-2.1.0.tgz", - "integrity": "sha512-PC4oKMtwAElo8YtS/cYnk2/dew/3TonsGKKzjpFLWwkhBCteFsOZCVOXTt2QlP6w53mH0YsJE+fPLPzOW+DCug==", + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/puppeteer/-/puppeteer-2.1.1.tgz", + "integrity": "sha512-LWzaDVQkk1EPiuYeTOj+CZRIjda4k2s5w4MK4xoH2+kgWV/SDlkYHmxatDdtYrciHUKSXTsGgPgPP8ILVdBsxg==", "dev": true, "requires": { "@types/mime-types": "^2.1.0", @@ -13808,21 +14378,6 @@ "integrity": "sha512-LRxmNwziLPT828z+4YkNzloCFC2YM4wrB99k+AV5ZbEyfGNWfG8SO1FUXLmLDBSo89NrJZ4DIWeLjy1CHGhMGA==", "dev": true }, - "mime-db": { - "version": "1.43.0", - "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.43.0.tgz", - "integrity": "sha512-+5dsGEEovYbT8UY9yD7eE4XTc4UwJ1jBYlgaQQF38ENsKR3wj/8q8RFZrF9WIZpB2V1ArTVFUva8sAul1NzRzQ==", - "dev": true - }, - "mime-types": { - "version": "2.1.26", - "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.26.tgz", - "integrity": "sha512-01paPWYgLrkqAyrlDorC1uDwl2p3qZT7yl806vW7DvDoxwXi46jsjFbg+WdwotBIk6/MbEhO/dh5aZ5sNj/dWQ==", - "dev": true, - "requires": { - "mime-db": "1.43.0" - } - }, "ms": { "version": "2.1.2", "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", @@ -13905,8 +14460,7 @@ "range-parser": { "version": "1.2.1", "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz", - "integrity": "sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==", - "dev": true + "integrity": "sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==" }, "rate-limiter-flexible": { "version": "1.3.2", @@ -13944,14 +14498,6 @@ "ini": "~1.3.0", "minimist": "^1.2.0", "strip-json-comments": "~2.0.1" - }, - "dependencies": { - "minimist": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", - "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=", - "dev": true - } } }, "read-cache": { @@ -13972,16 +14518,16 @@ } }, "read-package-json": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/read-package-json/-/read-package-json-2.1.0.tgz", - "integrity": "sha512-KLhu8M1ZZNkMcrq1+0UJbR8Dii8KZUqB0Sha4mOx/bknfKI/fyrQVrG/YIt2UOtG667sD8+ee4EXMM91W9dC+A==", + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/read-package-json/-/read-package-json-2.1.1.tgz", + "integrity": "sha512-dAiqGtVc/q5doFz6096CcnXhpYk0ZN8dEKVkGLU0CsASt8SrgF6SF7OTKAYubfvFhWaqofl+Y8HK19GR8jwW+A==", "dev": true, "requires": { "glob": "^7.1.1", "graceful-fs": "^4.1.2", "json-parse-better-errors": "^1.0.1", "normalize-package-data": "^2.0.0", - "slash": "^1.0.0" + "npm-normalize-package-bin": "^1.0.0" } }, "read-package-tree": { @@ -14015,9 +14561,9 @@ } }, "readable-stream": { - "version": "2.3.6", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz", - "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==", + "version": "2.3.7", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz", + "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==", "requires": { "core-util-is": "~1.0.0", "inherits": "~2.0.3", @@ -14048,14 +14594,12 @@ } }, "readdirp": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-2.2.1.tgz", - "integrity": "sha512-1JU/8q+VgFZyxwrJ+SVIOsh+KywWGpds3NTqikiKpDMZWScmAYyKIgqkO+ARvNWJfXeXR1zxz7aHF4u4CyH6vQ==", + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.3.0.tgz", + "integrity": "sha512-zz0pAkSPOXXm1viEwygWIPSPkcBYjW1xU5j/JBh5t9bGCJwa6f9+BJa6VaB2g+b55yVrmXzqkyLf4xaWYM0IkQ==", "dev": true, "requires": { - "graceful-fs": "^4.1.11", - "micromatch": "^3.1.10", - "readable-stream": "^2.0.2" + "picomatch": "^2.0.7" } }, "referrer-policy": { @@ -14091,6 +14635,16 @@ "safe-regex": "^1.1.0" } }, + "regexp.prototype.flags": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.3.0.tgz", + "integrity": "sha512-2+Q0C5g951OlYlJz6yu5/M33IcsESLlLfsyIaLJaG4FA2r4yP8MvVMJUUP/fVBkSpbbbZlS5gynbEWLipiiXiQ==", + "dev": true, + "requires": { + "define-properties": "^1.1.3", + "es-abstract": "^1.17.0-next.1" + } + }, "regexpu-core": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-1.0.0.tgz", @@ -14180,30 +14734,46 @@ } }, "request": { - "version": "2.87.0", - "resolved": "https://registry.npmjs.org/request/-/request-2.87.0.tgz", - "integrity": "sha512-fcogkm7Az5bsS6Sl0sibkbhcKsnyon/jV1kF3ajGmF0c8HrttdKTPRT9hieOaQHA5HEq6r8OyWOo/o781C1tNw==", + "version": "2.88.0", + "resolved": "https://registry.npmjs.org/request/-/request-2.88.0.tgz", + "integrity": "sha512-NAqBSrijGLZdM0WZNsInLJpkJokL72XYjUpnB0iwsRgxh7dB6COrHnTBNwN0E+lHDAJzu7kLAkDeY08z2/A0hg==", "requires": { "aws-sign2": "~0.7.0", - "aws4": "^1.6.0", + "aws4": "^1.8.0", "caseless": "~0.12.0", - "combined-stream": "~1.0.5", - "extend": "~3.0.1", + "combined-stream": "~1.0.6", + "extend": "~3.0.2", "forever-agent": "~0.6.1", - "form-data": "~2.3.1", - "har-validator": "~5.0.3", + "form-data": "~2.3.2", + "har-validator": "~5.1.0", "http-signature": "~1.2.0", "is-typedarray": "~1.0.0", "isstream": "~0.1.2", "json-stringify-safe": "~5.0.1", - "mime-types": "~2.1.17", - "oauth-sign": "~0.8.2", + "mime-types": "~2.1.19", + "oauth-sign": "~0.9.0", "performance-now": "^2.1.0", - "qs": "~6.5.1", - "safe-buffer": "^5.1.1", - "tough-cookie": "~2.3.3", + "qs": "~6.5.2", + "safe-buffer": "^5.1.2", + "tough-cookie": "~2.4.3", "tunnel-agent": "^0.6.0", - "uuid": "^3.1.0" + "uuid": "^3.3.2" + }, + "dependencies": { + "punycode": { + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz", + "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4=" + }, + "tough-cookie": { + "version": "2.4.3", + "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.4.3.tgz", + "integrity": "sha512-Q5srk/4vDM54WJsJio3XNn6K2sCG+CQ8G5Wz6bZhRZoAe/+TxjWB/GlFAnYEbkYVlON9FMk/fE3h2RLpPXo4lQ==", + "requires": { + "psl": "^1.1.24", + "punycode": "^1.4.1" + } + } } }, "request-promise": { @@ -14215,32 +14785,48 @@ "request-promise-core": "1.1.1", "stealthy-require": "^1.1.0", "tough-cookie": ">=2.3.3" + }, + "dependencies": { + "request-promise-core": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/request-promise-core/-/request-promise-core-1.1.1.tgz", + "integrity": "sha1-Pu4AssWqgyOc+wTFcA2jb4HNCLY=", + "requires": { + "lodash": "^4.13.1" + } + } } }, "request-promise-core": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/request-promise-core/-/request-promise-core-1.1.1.tgz", - "integrity": "sha1-Pu4AssWqgyOc+wTFcA2jb4HNCLY=", + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/request-promise-core/-/request-promise-core-1.1.3.tgz", + "integrity": "sha512-QIs2+ArIGQVp5ZYbWD5ZLCY29D5CfWizP8eWnm8FoGD1TX61veauETVQbrV60662V0oFBkrDOuaBI8XgtuyYAQ==", "requires": { - "lodash": "^4.13.1" + "lodash": "^4.17.15" } }, "request-promise-native": { - "version": "1.0.7", - "resolved": "https://registry.npmjs.org/request-promise-native/-/request-promise-native-1.0.7.tgz", - "integrity": "sha512-rIMnbBdgNViL37nZ1b3L/VfPOpSi0TqVDQPAvO6U14lMzOLrt5nilxCQqtDKhZeDiW0/hkCXGoQjhgJd/tCh6w==", + "version": "1.0.8", + "resolved": "https://registry.npmjs.org/request-promise-native/-/request-promise-native-1.0.8.tgz", + "integrity": "sha512-dapwLGqkHtwL5AEbfenuzjTYg35Jd6KPytsC2/TLkVMz8rm+tNt72MGUWT1RP/aYawMpN6HqbNGBQaRcBtjQMQ==", "requires": { - "request-promise-core": "1.1.2", + "request-promise-core": "1.1.3", "stealthy-require": "^1.1.1", "tough-cookie": "^2.3.3" }, "dependencies": { - "request-promise-core": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/request-promise-core/-/request-promise-core-1.1.2.tgz", - "integrity": "sha512-UHYyq1MO8GsefGEt7EprS8UrXsm1TxEvFUX1IMTuSLU2Rh7fTIdFtl8xD7JiEYiWU2dl+NYAjCTksTehQUxPag==", + "punycode": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz", + "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==" + }, + "tough-cookie": { + "version": "2.5.0", + "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.5.0.tgz", + "integrity": "sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==", "requires": { - "lodash": "^4.17.11" + "psl": "^1.1.28", + "punycode": "^2.1.1" } } } @@ -14273,9 +14859,9 @@ "integrity": "sha1-kl0mAdOaxIXgkc8NpcbmlNw9yv8=" }, "resolve": { - "version": "1.12.0", - "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.12.0.tgz", - "integrity": "sha512-B/dOmuoAik5bKcD6s6nXDCjzUKnaDvdkRyAk6rsmsKLipWj4797iothd7jmmUhWTfinVMU+wc56rYKsit2Qy4w==", + "version": "1.15.1", + "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.15.1.tgz", + "integrity": "sha512-84oo6ZTtoTUpjgNEr5SJyzQhzL72gaRodsSfyxC/AXRvwu0Yse9H8eF9IpGo7b8YetZhlI6v7ZQ6bKBFV/6S7w==", "requires": { "path-parse": "^1.0.6" } @@ -14307,29 +14893,295 @@ "integrity": "sha1-n37ih/gv0ybU/RYpI9YhKe7g368=", "dev": true, "requires": { - "onetime": "^2.0.0", - "signal-exit": "^3.0.2" + "onetime": "^2.0.0", + "signal-exit": "^3.0.2" + } + }, + "ret": { + "version": "0.1.15", + "resolved": "https://registry.npmjs.org/ret/-/ret-0.1.15.tgz", + "integrity": "sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg==", + "dev": true + }, + "retry": { + "version": "0.12.0", + "resolved": "https://registry.npmjs.org/retry/-/retry-0.12.0.tgz", + "integrity": "sha1-G0KmJmoh8HQh0bC1S33BZ7AcATs=", + "dev": true + }, + "retry-as-promised": { + "version": "2.3.2", + "resolved": "https://registry.npmjs.org/retry-as-promised/-/retry-as-promised-2.3.2.tgz", + "integrity": "sha1-zZdO5P2bX+A8vzGHHuSCIcB3N7c=", + "requires": { + "bluebird": "^3.4.6", + "debug": "^2.6.9" + }, + "dependencies": { + "debug": { + "version": "2.6.9", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", + "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", + "requires": { + "ms": "2.0.0" + } + } + } + }, + "rfdc": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/rfdc/-/rfdc-1.1.4.tgz", + "integrity": "sha512-5C9HXdzK8EAqN7JDif30jqsBzavB7wLpaubisuQIGHWf2gUXSpzy6ArX/+Da8RjFpagWsCn+pIgxTMAmKw9Zug==", + "dev": true + }, + "rfr": { + "version": "1.2.3", + "resolved": "https://registry.npmjs.org/rfr/-/rfr-1.2.3.tgz", + "integrity": "sha1-57txkzft6XcJH68S6si2zS26kBE=" + }, + "right-align": { + "version": "0.1.3", + "resolved": "https://registry.npmjs.org/right-align/-/right-align-0.1.3.tgz", + "integrity": "sha1-YTObci/mo1FWiSENJOFMlhSGE+8=", + "requires": { + "align-text": "^0.1.1" + } + }, + "rimraf": { + "version": "2.7.1", + "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz", + "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==", + "requires": { + "glob": "^7.1.3" + } + }, + "ripemd160": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/ripemd160/-/ripemd160-2.0.2.tgz", + "integrity": "sha512-ii4iagi25WusVoiC4B4lq7pbXfAp3D9v5CwfkY33vffw2+pkDjY1D8GaN7spsxvCSx8dkPqOZCEZyfxcmJG2IA==", + "dev": true, + "requires": { + "hash-base": "^3.0.0", + "inherits": "^2.0.1" + } + }, + "run-async": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/run-async/-/run-async-2.3.0.tgz", + "integrity": "sha1-A3GrSuC91yDUFm19/aZP96RFpsA=", + "dev": true, + "requires": { + "is-promise": "^2.1.0" + } + }, + "run-queue": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/run-queue/-/run-queue-1.0.3.tgz", + "integrity": "sha1-6Eg5bwV9Ij8kOGkkYY4laUFh7Ec=", + "dev": true, + "requires": { + "aproba": "^1.1.1" + } + }, + "rxjs": { + "version": "6.5.4", + "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.5.4.tgz", + "integrity": "sha512-naMQXcgEo3csAEGvw/NydRA0fuS2nDZJiw1YUWFKU7aPPAPGZEsD4Iimit96qwCieH6y614MCLYwdkrWx7z/7Q==", + "requires": { + "tslib": "^1.9.0" + } + }, + "rxjs-compat": { + "version": "6.5.4", + "resolved": "https://registry.npmjs.org/rxjs-compat/-/rxjs-compat-6.5.4.tgz", + "integrity": "sha512-rkn+lbOHUQOurdd74J/hjmDsG9nFx0z66fvnbs8M95nrtKvNqCKdk7iZqdY51CGmDemTQk+kUPy4s8HVOHtkfA==" + }, + "safe-buffer": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.0.tgz", + "integrity": "sha512-fZEwUGbVl7kouZs1jCdMLdt95hdIv0ZeHg6L7qPeciMZhZ+/gdesW4wgTARkrFWEpspjEATAzUGPG8N2jJiwbg==" + }, + "safe-regex": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/safe-regex/-/safe-regex-1.1.0.tgz", + "integrity": "sha1-QKNmnzsHfR6UPURinhV91IAjvy4=", + "dev": true, + "requires": { + "ret": "~0.1.10" + } + }, + "safer-buffer": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz", + "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==" + }, + "sandboxed-module": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/sandboxed-module/-/sandboxed-module-2.0.3.tgz", + "integrity": "sha1-x+VFkzm7y6KMUwPusz9ug4e/upY=", + "dev": true, + "requires": { + "require-like": "0.1.2", + "stack-trace": "0.0.9" + } + }, + "sanitizer": { + "version": "0.1.3", + "resolved": "https://registry.npmjs.org/sanitizer/-/sanitizer-0.1.3.tgz", + "integrity": "sha1-1PCvdHXZp7ryqeWmEXGLqheKOeE=" + }, + "sass": { + "version": "1.22.7", + "resolved": "https://registry.npmjs.org/sass/-/sass-1.22.7.tgz", + "integrity": "sha512-ahREi0AdG7RTovSv14+yd1prQSfIvFcrDpOsth5EQf1+RM7SvOxsSttzNQaFmK1aa/k/3vyYwlYF5l0Xl+6c+g==", + "dev": true, + "requires": { + "chokidar": ">=2.0.0 <4.0.0" + } + }, + "sass-loader": { + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/sass-loader/-/sass-loader-7.1.0.tgz", + "integrity": "sha512-+G+BKGglmZM2GUSfT9TLuEp6tzehHPjAMoRRItOojWIqIGPloVCMhNIQuG639eJ+y033PaGTSjLaTHts8Kw79w==", + "dev": true, + "requires": { + "clone-deep": "^2.0.1", + "loader-utils": "^1.0.1", + "lodash.tail": "^4.1.1", + "neo-async": "^2.5.0", + "pify": "^3.0.0", + "semver": "^5.5.0" + }, + "dependencies": { + "pify": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz", + "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=", + "dev": true + } + } + }, + "saucelabs": { + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/saucelabs/-/saucelabs-1.5.0.tgz", + "integrity": "sha512-jlX3FGdWvYf4Q3LFfFWS1QvPg3IGCGWxIc8QBFdPTbpTJnt/v17FHXYVAn7C8sHf1yUXo2c7yIM0isDryfYtHQ==", + "dev": true, + "requires": { + "https-proxy-agent": "^2.2.1" + } + }, + "sax": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.1.tgz", + "integrity": "sha1-e45lYZCyKOgaZq6nSEgNgozS03o=" + }, + "saxes": { + "version": "3.1.11", + "resolved": "https://registry.npmjs.org/saxes/-/saxes-3.1.11.tgz", + "integrity": "sha512-Ydydq3zC+WYDJK1+gRxRapLIED9PWeSuuS41wqyoRmzvhhh9nc+QQrVMKJYzJFULazeGhzSV0QleN2wD3boh2g==", + "requires": { + "xmlchars": "^2.1.1" + } + }, + "schema-utils": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-1.0.0.tgz", + "integrity": "sha512-i27Mic4KovM/lnGsy8whRCHhc7VicJajAjTrYg11K9zfZXnYIt4k5F+kZkwjnrhKzLic/HLU4j11mjsz2G/75g==", + "dev": true, + "requires": { + "ajv": "^6.1.0", + "ajv-errors": "^1.0.0", + "ajv-keywords": "^3.1.0" + } + }, + "select-hose": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/select-hose/-/select-hose-2.0.0.tgz", + "integrity": "sha1-Yl2GWPhlr0Psliv8N2o3NZpJlMo=", + "dev": true + }, + "selenium-webdriver": { + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/selenium-webdriver/-/selenium-webdriver-3.6.0.tgz", + "integrity": "sha512-WH7Aldse+2P5bbFBO4Gle/nuQOdVwpHMTL6raL3uuBj/vPG07k6uzt3aiahu352ONBr5xXh0hDlM3LhtXPOC4Q==", + "dev": true, + "requires": { + "jszip": "^3.1.3", + "rimraf": "^2.5.4", + "tmp": "0.0.30", + "xml2js": "^0.4.17" + }, + "dependencies": { + "tmp": { + "version": "0.0.30", + "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.30.tgz", + "integrity": "sha1-ckGdSovn1s51FI/YsyTlk6cRwu0=", + "dev": true, + "requires": { + "os-tmpdir": "~1.0.1" + } + } + } + }, + "selfsigned": { + "version": "1.10.7", + "resolved": "https://registry.npmjs.org/selfsigned/-/selfsigned-1.10.7.tgz", + "integrity": "sha512-8M3wBCzeWIJnQfl43IKwOmC4H/RAp50S8DF60znzjW5GVqTcSe2vWclt7hmYVPkKPlHWOu5EaWOMZ2Y6W8ZXTA==", + "dev": true, + "requires": { + "node-forge": "0.9.0" + } + }, + "semver": { + "version": "5.7.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", + "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==" + }, + "semver-diff": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/semver-diff/-/semver-diff-2.1.0.tgz", + "integrity": "sha1-S7uEN8jTfksM8aaP1ybsbWRdbTY=", + "dev": true, + "requires": { + "semver": "^5.0.3" + } + }, + "semver-dsl": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/semver-dsl/-/semver-dsl-1.0.1.tgz", + "integrity": "sha1-02eN5VVeimH2Ke7QJTZq5fJzQKA=", + "dev": true, + "requires": { + "semver": "^5.3.0" } }, - "ret": { - "version": "0.1.15", - "resolved": "https://registry.npmjs.org/ret/-/ret-0.1.15.tgz", - "integrity": "sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg==", - "dev": true - }, - "retry": { - "version": "0.10.1", - "resolved": "https://registry.npmjs.org/retry/-/retry-0.10.1.tgz", - "integrity": "sha1-52OI0heZLCUnUCQdPTlW/tmNj/Q=", - "dev": true + "semver-intersect": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/semver-intersect/-/semver-intersect-1.4.0.tgz", + "integrity": "sha512-d8fvGg5ycKAq0+I6nfWeCx6ffaWJCsBYU0H2Rq56+/zFePYfT8mXkB3tWBSjR5BerkHNZ5eTPIk1/LBYas35xQ==", + "dev": true, + "requires": { + "semver": "^5.0.0" + } }, - "retry-as-promised": { - "version": "2.3.2", - "resolved": "https://registry.npmjs.org/retry-as-promised/-/retry-as-promised-2.3.2.tgz", - "integrity": "sha1-zZdO5P2bX+A8vzGHHuSCIcB3N7c=", + "send": { + "version": "0.17.1", + "resolved": "https://registry.npmjs.org/send/-/send-0.17.1.tgz", + "integrity": "sha512-BsVKsiGcQMFwT8UxypobUKyv7irCNRHk1T0G680vk88yf6LBByGcZJOTJCrTP2xVN6yI+XjPJcNuE3V4fT9sAg==", "requires": { - "bluebird": "^3.4.6", - "debug": "^2.6.9" + "debug": "2.6.9", + "depd": "~1.1.2", + "destroy": "~1.0.4", + "encodeurl": "~1.0.2", + "escape-html": "~1.0.3", + "etag": "~1.8.1", + "fresh": "0.5.2", + "http-errors": "~1.7.2", + "mime": "1.6.0", + "ms": "2.1.1", + "on-finished": "~2.3.0", + "range-parser": "~1.2.1", + "statuses": "~1.5.0" }, "dependencies": { "debug": { @@ -14338,807 +15190,902 @@ "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", "requires": { "ms": "2.0.0" + }, + "dependencies": { + "ms": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", + "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=" + } } + }, + "ms": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz", + "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==" } } }, - "rfdc": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/rfdc/-/rfdc-1.1.4.tgz", - "integrity": "sha512-5C9HXdzK8EAqN7JDif30jqsBzavB7wLpaubisuQIGHWf2gUXSpzy6ArX/+Da8RjFpagWsCn+pIgxTMAmKw9Zug==", - "dev": true - }, - "rfr": { - "version": "1.2.3", - "resolved": "https://registry.npmjs.org/rfr/-/rfr-1.2.3.tgz", - "integrity": "sha1-57txkzft6XcJH68S6si2zS26kBE=" - }, - "right-align": { - "version": "0.1.3", - "resolved": "https://registry.npmjs.org/right-align/-/right-align-0.1.3.tgz", - "integrity": "sha1-YTObci/mo1FWiSENJOFMlhSGE+8=", + "sequelize": { + "version": "4.44.3", + "resolved": "https://registry.npmjs.org/sequelize/-/sequelize-4.44.3.tgz", + "integrity": "sha512-r2A4EVDKRCcABcZhY4ItvbcosvMJKpQMooxg/S8ouRFrZzqMPQ9O2thOUfgW59q8ZcEa5ccNeqwg15MCciqPMg==", "requires": { - "align-text": "^0.1.1" + "bluebird": "^3.5.0", + "cls-bluebird": "^2.1.0", + "debug": "^3.1.0", + "depd": "^1.1.0", + "dottie": "^2.0.0", + "generic-pool": "3.5.0", + "inflection": "1.12.0", + "lodash": "^4.17.1", + "moment": "^2.20.0", + "moment-timezone": "^0.5.14", + "retry-as-promised": "^2.3.2", + "semver": "^5.5.0", + "terraformer-wkt-parser": "^1.1.2", + "toposort-class": "^1.0.1", + "uuid": "^3.2.1", + "validator": "^10.4.0", + "wkx": "^0.4.1" } }, - "rimraf": { - "version": "2.7.1", - "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz", - "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==", - "requires": { - "glob": "^7.1.3" - } + "serialize-javascript": { + "version": "1.9.1", + "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-1.9.1.tgz", + "integrity": "sha512-0Vb/54WJ6k5v8sSWN09S0ora+Hnr+cX40r9F170nT+mSkaxltoE/7R3OrIdBSUv1OoiobH1QoWQbCnAO+e8J1A==", + "dev": true }, - "ripemd160": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/ripemd160/-/ripemd160-2.0.2.tgz", - "integrity": "sha512-ii4iagi25WusVoiC4B4lq7pbXfAp3D9v5CwfkY33vffw2+pkDjY1D8GaN7spsxvCSx8dkPqOZCEZyfxcmJG2IA==", - "dev": true, + "serve-favicon": { + "version": "2.5.0", + "resolved": "https://registry.npmjs.org/serve-favicon/-/serve-favicon-2.5.0.tgz", + "integrity": "sha1-k10kDN/g9YBTB/3+ln2IlCosvPA=", "requires": { - "hash-base": "^3.0.0", - "inherits": "^2.0.1" + "etag": "~1.8.1", + "fresh": "0.5.2", + "ms": "2.1.1", + "parseurl": "~1.3.2", + "safe-buffer": "5.1.1" + }, + "dependencies": { + "ms": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz", + "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==" + }, + "safe-buffer": { + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz", + "integrity": "sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg==" + } } }, - "run-async": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/run-async/-/run-async-2.3.0.tgz", - "integrity": "sha1-A3GrSuC91yDUFm19/aZP96RFpsA=", + "serve-index": { + "version": "1.9.1", + "resolved": "https://registry.npmjs.org/serve-index/-/serve-index-1.9.1.tgz", + "integrity": "sha1-03aNabHn2C5c4FD/9bRTvqEqkjk=", "dev": true, "requires": { - "is-promise": "^2.1.0" + "accepts": "~1.3.4", + "batch": "0.6.1", + "debug": "2.6.9", + "escape-html": "~1.0.3", + "http-errors": "~1.6.2", + "mime-types": "~2.1.17", + "parseurl": "~1.3.2" + }, + "dependencies": { + "debug": { + "version": "2.6.9", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", + "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", + "dev": true, + "requires": { + "ms": "2.0.0" + } + }, + "http-errors": { + "version": "1.6.3", + "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.6.3.tgz", + "integrity": "sha1-i1VoC7S+KDoLW/TqLjhYC+HZMg0=", + "dev": true, + "requires": { + "depd": "~1.1.2", + "inherits": "2.0.3", + "setprototypeof": "1.1.0", + "statuses": ">= 1.4.0 < 2" + } + }, + "inherits": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz", + "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=", + "dev": true + }, + "setprototypeof": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.0.tgz", + "integrity": "sha512-BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ==", + "dev": true + } } }, - "run-queue": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/run-queue/-/run-queue-1.0.3.tgz", - "integrity": "sha1-6Eg5bwV9Ij8kOGkkYY4laUFh7Ec=", + "serve-static": { + "version": "1.14.1", + "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.14.1.tgz", + "integrity": "sha512-JMrvUwE54emCYWlTI+hGrGv5I8dEwmco/00EvkzIIsR7MqrHonbD9pO2MOfFnpFntl7ecpZs+3mW+XbQZu9QCg==", "dev": true, "requires": { - "aproba": "^1.1.1" - } - }, - "rxjs": { - "version": "6.5.2", - "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.5.2.tgz", - "integrity": "sha512-HUb7j3kvb7p7eCUHE3FqjoDsC1xfZQ4AHFWfTKSpZ+sAhhz5X1WX0ZuUqWbzB2QhSLp3DoLUG+hMdEDKqWo2Zg==", - "requires": { - "tslib": "^1.9.0" + "encodeurl": "~1.0.2", + "escape-html": "~1.0.3", + "parseurl": "~1.3.3", + "send": "0.17.1" } }, - "rxjs-compat": { - "version": "6.5.2", - "resolved": "https://registry.npmjs.org/rxjs-compat/-/rxjs-compat-6.5.2.tgz", - "integrity": "sha512-TRMkTp4FgSxE2HtGvxmgRukh3JqdFM7ejAj1Ti/VdodbPGfWvZR5+KdLKRV9jVDFyu2SknM8RD+PR54KGnoLjg==" + "set-blocking": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz", + "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=" }, - "safe-buffer": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.0.tgz", - "integrity": "sha512-fZEwUGbVl7kouZs1jCdMLdt95hdIv0ZeHg6L7qPeciMZhZ+/gdesW4wgTARkrFWEpspjEATAzUGPG8N2jJiwbg==" + "set-immediate-shim": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/set-immediate-shim/-/set-immediate-shim-1.0.1.tgz", + "integrity": "sha1-SysbJ+uAip+NzEgaWOXlb1mfP2E=" }, - "safe-regex": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/safe-regex/-/safe-regex-1.1.0.tgz", - "integrity": "sha1-QKNmnzsHfR6UPURinhV91IAjvy4=", + "set-value": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/set-value/-/set-value-2.0.1.tgz", + "integrity": "sha512-JxHc1weCN68wRY0fhCoXpyK55m/XPHafOmK4UWD7m2CI14GMcFypt4w/0+NV5f/ZMby2F6S2wwA7fgynh9gWSw==", "dev": true, "requires": { - "ret": "~0.1.10" + "extend-shallow": "^2.0.1", + "is-extendable": "^0.1.1", + "is-plain-object": "^2.0.3", + "split-string": "^3.0.1" + }, + "dependencies": { + "extend-shallow": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", + "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", + "dev": true, + "requires": { + "is-extendable": "^0.1.0" + } + } } }, - "safer-buffer": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz", - "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==" - }, - "sandboxed-module": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/sandboxed-module/-/sandboxed-module-2.0.3.tgz", - "integrity": "sha1-x+VFkzm7y6KMUwPusz9ug4e/upY=", - "dev": true, - "requires": { - "require-like": "0.1.2", - "stack-trace": "0.0.9" - } + "setimmediate": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.5.tgz", + "integrity": "sha1-KQy7Iy4waULX1+qbg3Mqt4VvgoU=", + "dev": true }, - "sanitizer": { - "version": "0.1.3", - "resolved": "https://registry.npmjs.org/sanitizer/-/sanitizer-0.1.3.tgz", - "integrity": "sha1-1PCvdHXZp7ryqeWmEXGLqheKOeE=" + "setprototypeof": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.1.tgz", + "integrity": "sha512-JvdAWfbXeIGaZ9cILp38HntZSFSo3mWg6xGcJJsd+d4aRMOqauag1C63dJfDw7OaMYwEbHMOxEZ1lqVRYP2OAw==" }, - "sass": { - "version": "1.22.7", - "resolved": "https://registry.npmjs.org/sass/-/sass-1.22.7.tgz", - "integrity": "sha512-ahREi0AdG7RTovSv14+yd1prQSfIvFcrDpOsth5EQf1+RM7SvOxsSttzNQaFmK1aa/k/3vyYwlYF5l0Xl+6c+g==", + "sha.js": { + "version": "2.4.11", + "resolved": "https://registry.npmjs.org/sha.js/-/sha.js-2.4.11.tgz", + "integrity": "sha512-QMEp5B7cftE7APOjk5Y6xgrbWu+WkLVQwk8JNjZ8nKRciZaByEW6MubieAiToS7+dwvrjGhH8jRXz3MVd0AYqQ==", "dev": true, "requires": { - "chokidar": ">=2.0.0 <4.0.0" + "inherits": "^2.0.1", + "safe-buffer": "^5.0.1" } }, - "sass-loader": { - "version": "7.1.0", - "resolved": "https://registry.npmjs.org/sass-loader/-/sass-loader-7.1.0.tgz", - "integrity": "sha512-+G+BKGglmZM2GUSfT9TLuEp6tzehHPjAMoRRItOojWIqIGPloVCMhNIQuG639eJ+y033PaGTSjLaTHts8Kw79w==", + "shallow-clone": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/shallow-clone/-/shallow-clone-1.0.0.tgz", + "integrity": "sha512-oeXreoKR/SyNJtRJMAKPDSvd28OqEwG4eR/xc856cRGBII7gX9lvAqDxusPm0846z/w/hWYjI1NpKwJ00NHzRA==", "dev": true, "requires": { - "clone-deep": "^2.0.1", - "loader-utils": "^1.0.1", - "lodash.tail": "^4.1.1", - "neo-async": "^2.5.0", - "pify": "^3.0.0", - "semver": "^5.5.0" + "is-extendable": "^0.1.1", + "kind-of": "^5.0.0", + "mixin-object": "^2.0.1" }, "dependencies": { - "pify": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz", - "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=", + "kind-of": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz", + "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==", "dev": true } } }, - "saucelabs": { - "version": "1.5.0", - "resolved": "https://registry.npmjs.org/saucelabs/-/saucelabs-1.5.0.tgz", - "integrity": "sha512-jlX3FGdWvYf4Q3LFfFWS1QvPg3IGCGWxIc8QBFdPTbpTJnt/v17FHXYVAn7C8sHf1yUXo2c7yIM0isDryfYtHQ==", - "dev": true, + "shebang-command": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz", + "integrity": "sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=", "requires": { - "https-proxy-agent": "^2.2.1" + "shebang-regex": "^1.0.0" } }, - "sax": { + "shebang-regex": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz", + "integrity": "sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM=" + }, + "shell-quote": { + "version": "1.7.2", + "resolved": "https://registry.npmjs.org/shell-quote/-/shell-quote-1.7.2.tgz", + "integrity": "sha512-mRz/m/JVscCrkMyPqHc/bczi3OQHkLTqXHEFu0zDhK/qfv3UcOA4SVmRCLmos4bhjr9ekVQubj/R7waKapmiQg==", + "dev": true + }, + "shimmer": { "version": "1.2.1", - "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.1.tgz", - "integrity": "sha1-e45lYZCyKOgaZq6nSEgNgozS03o=" + "resolved": "https://registry.npmjs.org/shimmer/-/shimmer-1.2.1.tgz", + "integrity": "sha512-sQTKC1Re/rM6XyFM6fIAGHRPVGvyXfgzIDvzoq608vM+jeyVD0Tu1E6Np0Kc2zAIFWIj963V2800iF/9LPieQw==" }, - "saxes": { - "version": "3.1.11", - "resolved": "https://registry.npmjs.org/saxes/-/saxes-3.1.11.tgz", - "integrity": "sha512-Ydydq3zC+WYDJK1+gRxRapLIED9PWeSuuS41wqyoRmzvhhh9nc+QQrVMKJYzJFULazeGhzSV0QleN2wD3boh2g==", + "signal-exit": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz", + "integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=" + }, + "sinon": { + "version": "7.5.0", + "resolved": "https://registry.npmjs.org/sinon/-/sinon-7.5.0.tgz", + "integrity": "sha512-AoD0oJWerp0/rY9czP/D6hDTTUYGpObhZjMpd7Cl/A6+j0xBE+ayL/ldfggkBXUs0IkvIiM1ljM8+WkOc5k78Q==", + "dev": true, "requires": { - "xmlchars": "^2.1.1" + "@sinonjs/commons": "^1.4.0", + "@sinonjs/formatio": "^3.2.1", + "@sinonjs/samsam": "^3.3.3", + "diff": "^3.5.0", + "lolex": "^4.2.0", + "nise": "^1.5.2", + "supports-color": "^5.5.0" + }, + "dependencies": { + "supports-color": { + "version": "5.5.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", + "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", + "dev": true, + "requires": { + "has-flag": "^3.0.0" + } + } } }, - "schema-utils": { + "slack": { + "version": "11.0.2", + "resolved": "https://registry.npmjs.org/slack/-/slack-11.0.2.tgz", + "integrity": "sha512-rv842+S+AGyZCmMMd8xPtW5DvJ9LzWTAKfxi8Gw57oYlXgcKtFuHd4nqk6lTPpRKdUGn3tx/Drd0rjQR3dQPqw==", + "requires": { + "tiny-json-http": "^7.0.2" + } + }, + "slash": { "version": "1.0.0", - "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-1.0.0.tgz", - "integrity": "sha512-i27Mic4KovM/lnGsy8whRCHhc7VicJajAjTrYg11K9zfZXnYIt4k5F+kZkwjnrhKzLic/HLU4j11mjsz2G/75g==", + "resolved": "https://registry.npmjs.org/slash/-/slash-1.0.0.tgz", + "integrity": "sha1-xB8vbDn8FtHNF61LXYlhFK5HDVU=", + "dev": true + }, + "slugify": { + "version": "1.3.6", + "resolved": "https://registry.npmjs.org/slugify/-/slugify-1.3.6.tgz", + "integrity": "sha512-wA9XS475ZmGNlEnYYLPReSfuz/c3VQsEMoU43mi6OnKMCdbnFXd4/Yg7J0lBv8jkPolacMpOrWEaoYxuE1+hoQ==" + }, + "smart-buffer": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/smart-buffer/-/smart-buffer-4.1.0.tgz", + "integrity": "sha512-iVICrxOzCynf/SNaBQCw34eM9jROU/s5rzIhpOvzhzuYHfJR/DhZfDkXiZSgKXfgv26HT3Yni3AV/DGw0cGnnw==", + "dev": true + }, + "snapdragon": { + "version": "0.8.2", + "resolved": "https://registry.npmjs.org/snapdragon/-/snapdragon-0.8.2.tgz", + "integrity": "sha512-FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg==", "dev": true, "requires": { - "ajv": "^6.1.0", - "ajv-errors": "^1.0.0", - "ajv-keywords": "^3.1.0" + "base": "^0.11.1", + "debug": "^2.2.0", + "define-property": "^0.2.5", + "extend-shallow": "^2.0.1", + "map-cache": "^0.2.2", + "source-map": "^0.5.6", + "source-map-resolve": "^0.5.0", + "use": "^3.1.0" }, "dependencies": { - "ajv": { - "version": "6.10.2", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.10.2.tgz", - "integrity": "sha512-TXtUUEYHuaTEbLZWIKUr5pmBuhDLy+8KYtPYdcV8qC+pOZL+NKqYwvWSRrVXHn+ZmRRAu8vJTAznH7Oag6RVRw==", + "debug": { + "version": "2.6.9", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", + "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", "dev": true, "requires": { - "fast-deep-equal": "^2.0.1", - "fast-json-stable-stringify": "^2.0.0", - "json-schema-traverse": "^0.4.1", - "uri-js": "^4.2.2" + "ms": "2.0.0" } }, - "fast-deep-equal": { + "define-property": { + "version": "0.2.5", + "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz", + "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=", + "dev": true, + "requires": { + "is-descriptor": "^0.1.0" + } + }, + "extend-shallow": { "version": "2.0.1", - "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz", - "integrity": "sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk=", - "dev": true + "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", + "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", + "dev": true, + "requires": { + "is-extendable": "^0.1.0" + } }, - "json-schema-traverse": { - "version": "0.4.1", - "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz", - "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==", + "source-map": { + "version": "0.5.7", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz", + "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=", "dev": true } } }, - "select-hose": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/select-hose/-/select-hose-2.0.0.tgz", - "integrity": "sha1-Yl2GWPhlr0Psliv8N2o3NZpJlMo=", - "dev": true - }, - "selenium-webdriver": { - "version": "3.6.0", - "resolved": "https://registry.npmjs.org/selenium-webdriver/-/selenium-webdriver-3.6.0.tgz", - "integrity": "sha512-WH7Aldse+2P5bbFBO4Gle/nuQOdVwpHMTL6raL3uuBj/vPG07k6uzt3aiahu352ONBr5xXh0hDlM3LhtXPOC4Q==", + "snapdragon-node": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/snapdragon-node/-/snapdragon-node-2.1.1.tgz", + "integrity": "sha512-O27l4xaMYt/RSQ5TR3vpWCAB5Kb/czIcqUFOM/C4fYcLnbZUc1PkjTAMjof2pBWaSTwOUd6qUHcFGVGj7aIwnw==", "dev": true, "requires": { - "jszip": "^3.1.3", - "rimraf": "^2.5.4", - "tmp": "0.0.30", - "xml2js": "^0.4.17" + "define-property": "^1.0.0", + "isobject": "^3.0.0", + "snapdragon-util": "^3.0.1" }, "dependencies": { - "tmp": { - "version": "0.0.30", - "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.30.tgz", - "integrity": "sha1-ckGdSovn1s51FI/YsyTlk6cRwu0=", + "define-property": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz", + "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=", "dev": true, "requires": { - "os-tmpdir": "~1.0.1" + "is-descriptor": "^1.0.0" + } + }, + "is-accessor-descriptor": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz", + "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==", + "dev": true, + "requires": { + "kind-of": "^6.0.0" + } + }, + "is-data-descriptor": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz", + "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==", + "dev": true, + "requires": { + "kind-of": "^6.0.0" + } + }, + "is-descriptor": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz", + "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==", + "dev": true, + "requires": { + "is-accessor-descriptor": "^1.0.0", + "is-data-descriptor": "^1.0.0", + "kind-of": "^6.0.2" } + }, + "kind-of": { + "version": "6.0.3", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz", + "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==", + "dev": true } } }, - "selfsigned": { - "version": "1.10.4", - "resolved": "https://registry.npmjs.org/selfsigned/-/selfsigned-1.10.4.tgz", - "integrity": "sha512-9AukTiDmHXGXWtWjembZ5NDmVvP2695EtpgbCsxCa68w3c88B+alqbmZ4O3hZ4VWGXeGWzEVdvqgAJD8DQPCDw==", - "dev": true, - "requires": { - "node-forge": "0.7.5" - } - }, - "semver": { - "version": "5.7.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.0.tgz", - "integrity": "sha512-Ya52jSX2u7QKghxeoFGpLwCtGlt7j0oY9DYb5apt9nPlJ42ID+ulTXESnt/qAQcoSERyZ5sl3LDIOw0nAn/5DA==" - }, - "semver-diff": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/semver-diff/-/semver-diff-2.1.0.tgz", - "integrity": "sha1-S7uEN8jTfksM8aaP1ybsbWRdbTY=", - "dev": true, - "requires": { - "semver": "^5.0.3" - } - }, - "semver-dsl": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/semver-dsl/-/semver-dsl-1.0.1.tgz", - "integrity": "sha1-02eN5VVeimH2Ke7QJTZq5fJzQKA=", + "snapdragon-util": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/snapdragon-util/-/snapdragon-util-3.0.1.tgz", + "integrity": "sha512-mbKkMdQKsjX4BAL4bRYTj21edOf8cN7XHdYUJEe+Zn99hVEYcMvKPct1IqNe7+AZPirn8BCDOQBHQZknqmKlZQ==", "dev": true, "requires": { - "semver": "^5.3.0" + "kind-of": "^3.2.0" } }, - "semver-intersect": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/semver-intersect/-/semver-intersect-1.4.0.tgz", - "integrity": "sha512-d8fvGg5ycKAq0+I6nfWeCx6ffaWJCsBYU0H2Rq56+/zFePYfT8mXkB3tWBSjR5BerkHNZ5eTPIk1/LBYas35xQ==", + "socket.io": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/socket.io/-/socket.io-2.1.1.tgz", + "integrity": "sha512-rORqq9c+7W0DAK3cleWNSyfv/qKXV99hV4tZe+gGLfBECw3XEhBy7x85F3wypA9688LKjtwO9pX9L33/xQI8yA==", "dev": true, "requires": { - "semver": "^5.0.0" + "debug": "~3.1.0", + "engine.io": "~3.2.0", + "has-binary2": "~1.0.2", + "socket.io-adapter": "~1.1.0", + "socket.io-client": "2.1.1", + "socket.io-parser": "~3.2.0" } }, - "send": { - "version": "0.17.1", - "resolved": "https://registry.npmjs.org/send/-/send-0.17.1.tgz", - "integrity": "sha512-BsVKsiGcQMFwT8UxypobUKyv7irCNRHk1T0G680vk88yf6LBByGcZJOTJCrTP2xVN6yI+XjPJcNuE3V4fT9sAg==", + "socket.io-adapter": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/socket.io-adapter/-/socket.io-adapter-1.1.2.tgz", + "integrity": "sha512-WzZRUj1kUjrTIrUKpZLEzFZ1OLj5FwLlAFQs9kuZJzJi5DKdU7FsWc36SNmA8iDOtwBQyT8FkrriRM8vXLYz8g==", + "dev": true + }, + "socket.io-client": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/socket.io-client/-/socket.io-client-2.1.1.tgz", + "integrity": "sha512-jxnFyhAuFxYfjqIgduQlhzqTcOEQSn+OHKVfAxWaNWa7ecP7xSNk2Dx/3UEsDcY7NcFafxvNvKPmmO7HTwTxGQ==", "dev": true, "requires": { - "debug": "2.6.9", - "depd": "~1.1.2", - "destroy": "~1.0.4", - "encodeurl": "~1.0.2", - "escape-html": "~1.0.3", - "etag": "~1.8.1", - "fresh": "0.5.2", - "http-errors": "~1.7.2", - "mime": "1.6.0", - "ms": "2.1.1", - "on-finished": "~2.3.0", - "range-parser": "~1.2.1", - "statuses": "~1.5.0" + "backo2": "1.0.2", + "base64-arraybuffer": "0.1.5", + "component-bind": "1.0.0", + "component-emitter": "1.2.1", + "debug": "~3.1.0", + "engine.io-client": "~3.2.0", + "has-binary2": "~1.0.2", + "has-cors": "1.1.0", + "indexof": "0.0.1", + "object-component": "0.0.3", + "parseqs": "0.0.5", + "parseuri": "0.0.5", + "socket.io-parser": "~3.2.0", + "to-array": "0.1.4" }, "dependencies": { - "debug": { - "version": "2.6.9", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", - "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", - "dev": true, - "requires": { - "ms": "2.0.0" - }, - "dependencies": { - "ms": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=", - "dev": true - } - } - }, - "ms": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz", - "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==", + "component-emitter": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.2.1.tgz", + "integrity": "sha1-E3kY1teCg/ffemt8WmPhQOaUJeY=", "dev": true } } }, - "sequelize": { - "version": "4.44.3", - "resolved": "https://registry.npmjs.org/sequelize/-/sequelize-4.44.3.tgz", - "integrity": "sha512-r2A4EVDKRCcABcZhY4ItvbcosvMJKpQMooxg/S8ouRFrZzqMPQ9O2thOUfgW59q8ZcEa5ccNeqwg15MCciqPMg==", - "requires": { - "bluebird": "^3.5.0", - "cls-bluebird": "^2.1.0", - "debug": "^3.1.0", - "depd": "^1.1.0", - "dottie": "^2.0.0", - "generic-pool": "3.5.0", - "inflection": "1.12.0", - "lodash": "^4.17.1", - "moment": "^2.20.0", - "moment-timezone": "^0.5.14", - "retry-as-promised": "^2.3.2", - "semver": "^5.5.0", - "terraformer-wkt-parser": "^1.1.2", - "toposort-class": "^1.0.1", - "uuid": "^3.2.1", - "validator": "^10.4.0", - "wkx": "^0.4.1" - } - }, - "serialize-javascript": { - "version": "1.8.0", - "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-1.8.0.tgz", - "integrity": "sha512-3tHgtF4OzDmeKYj6V9nSyceRS0UJ3C7VqyD2Yj28vC/z2j6jG5FmFGahOKMD9CrglxTm3tETr87jEypaYV8DUg==", - "dev": true - }, - "serve-favicon": { - "version": "2.5.0", - "resolved": "https://registry.npmjs.org/serve-favicon/-/serve-favicon-2.5.0.tgz", - "integrity": "sha1-k10kDN/g9YBTB/3+ln2IlCosvPA=", + "socket.io-parser": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-3.2.0.tgz", + "integrity": "sha512-FYiBx7rc/KORMJlgsXysflWx/RIvtqZbyGLlHZvjfmPTPeuD/I8MaW7cfFrj5tRltICJdgwflhfZ3NVVbVLFQA==", + "dev": true, "requires": { - "etag": "~1.8.1", - "fresh": "0.5.2", - "ms": "2.1.1", - "parseurl": "~1.3.2", - "safe-buffer": "5.1.1" + "component-emitter": "1.2.1", + "debug": "~3.1.0", + "isarray": "2.0.1" }, "dependencies": { - "ms": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz", - "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==" + "component-emitter": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.2.1.tgz", + "integrity": "sha1-E3kY1teCg/ffemt8WmPhQOaUJeY=", + "dev": true }, - "safe-buffer": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz", - "integrity": "sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg==" + "isarray": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.1.tgz", + "integrity": "sha1-o32U7ZzaLVmGXJ92/llu4fM4dB4=", + "dev": true } } }, - "serve-index": { - "version": "1.9.1", - "resolved": "https://registry.npmjs.org/serve-index/-/serve-index-1.9.1.tgz", - "integrity": "sha1-03aNabHn2C5c4FD/9bRTvqEqkjk=", + "sockjs": { + "version": "0.3.19", + "resolved": "https://registry.npmjs.org/sockjs/-/sockjs-0.3.19.tgz", + "integrity": "sha512-V48klKZl8T6MzatbLlzzRNhMepEys9Y4oGFpypBFFn1gLI/QQ9HtLLyWJNbPlwGLelOVOEijUbTTJeLLI59jLw==", "dev": true, "requires": { - "accepts": "~1.3.4", - "batch": "0.6.1", - "debug": "2.6.9", - "escape-html": "~1.0.3", - "http-errors": "~1.6.2", - "mime-types": "~2.1.17", - "parseurl": "~1.3.2" + "faye-websocket": "^0.10.0", + "uuid": "^3.0.1" + } + }, + "sockjs-client": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/sockjs-client/-/sockjs-client-1.3.0.tgz", + "integrity": "sha512-R9jxEzhnnrdxLCNln0xg5uGHqMnkhPSTzUZH2eXcR03S/On9Yvoq2wyUZILRUhZCNVu2PmwWVoyuiPz8th8zbg==", + "dev": true, + "requires": { + "debug": "^3.2.5", + "eventsource": "^1.0.7", + "faye-websocket": "~0.11.1", + "inherits": "^2.0.3", + "json3": "^3.3.2", + "url-parse": "^1.4.3" }, "dependencies": { "debug": { - "version": "2.6.9", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", - "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", + "version": "3.2.6", + "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz", + "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==", "dev": true, "requires": { - "ms": "2.0.0" + "ms": "^2.1.1" } }, - "http-errors": { - "version": "1.6.3", - "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.6.3.tgz", - "integrity": "sha1-i1VoC7S+KDoLW/TqLjhYC+HZMg0=", + "faye-websocket": { + "version": "0.11.3", + "resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.11.3.tgz", + "integrity": "sha512-D2y4bovYpzziGgbHYtGCMjlJM36vAl/y+xUyn1C+FVx8szd1E+86KwVw6XvYSzOP8iMpm1X0I4xJD+QtUb36OA==", "dev": true, "requires": { - "depd": "~1.1.2", - "inherits": "2.0.3", - "setprototypeof": "1.1.0", - "statuses": ">= 1.4.0 < 2" + "websocket-driver": ">=0.5.1" } }, - "inherits": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz", - "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=", - "dev": true - }, - "setprototypeof": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.0.tgz", - "integrity": "sha512-BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ==", + "ms": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", + "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", "dev": true } } }, - "serve-static": { - "version": "1.14.1", - "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.14.1.tgz", - "integrity": "sha512-JMrvUwE54emCYWlTI+hGrGv5I8dEwmco/00EvkzIIsR7MqrHonbD9pO2MOfFnpFntl7ecpZs+3mW+XbQZu9QCg==", + "socks": { + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/socks/-/socks-2.3.3.tgz", + "integrity": "sha512-o5t52PCNtVdiOvzMry7wU4aOqYWL0PeCXRWBEiJow4/i/wr+wpsJQ9awEu1EonLIqsfGd5qSgDdxEOvCdmBEpA==", "dev": true, "requires": { - "encodeurl": "~1.0.2", - "escape-html": "~1.0.3", - "parseurl": "~1.3.3", - "send": "0.17.1" + "ip": "1.1.5", + "smart-buffer": "^4.1.0" } }, - "set-blocking": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz", - "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=" - }, - "set-immediate-shim": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/set-immediate-shim/-/set-immediate-shim-1.0.1.tgz", - "integrity": "sha1-SysbJ+uAip+NzEgaWOXlb1mfP2E=" - }, - "set-value": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/set-value/-/set-value-2.0.1.tgz", - "integrity": "sha512-JxHc1weCN68wRY0fhCoXpyK55m/XPHafOmK4UWD7m2CI14GMcFypt4w/0+NV5f/ZMby2F6S2wwA7fgynh9gWSw==", + "socks-proxy-agent": { + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-4.0.2.tgz", + "integrity": "sha512-NT6syHhI9LmuEMSK6Kd2V7gNv5KFZoLE7V5udWmn0de+3Mkj3UMA/AJPLyeNUVmElCurSHtUdM3ETpR3z770Wg==", "dev": true, "requires": { - "extend-shallow": "^2.0.1", - "is-extendable": "^0.1.1", - "is-plain-object": "^2.0.3", - "split-string": "^3.0.1" + "agent-base": "~4.2.1", + "socks": "~2.3.2" }, "dependencies": { - "extend-shallow": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", - "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", + "agent-base": { + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-4.2.1.tgz", + "integrity": "sha512-JVwXMr9nHYTUXsBFKUqhJwvlcYU/blreOEUkhNR2eXZIvwd+c+o5V4MgDPKWnMS/56awN3TRzIP+KoPn+roQtg==", "dev": true, "requires": { - "is-extendable": "^0.1.0" + "es6-promisify": "^5.0.0" } } } }, - "setimmediate": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.5.tgz", - "integrity": "sha1-KQy7Iy4waULX1+qbg3Mqt4VvgoU=", - "dev": true + "sort-keys": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/sort-keys/-/sort-keys-1.1.2.tgz", + "integrity": "sha1-RBttTTRnmPG05J6JIK37oOVD+a0=", + "dev": true, + "requires": { + "is-plain-obj": "^1.0.0" + } }, - "setprototypeof": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.1.tgz", - "integrity": "sha512-JvdAWfbXeIGaZ9cILp38HntZSFSo3mWg6xGcJJsd+d4aRMOqauag1C63dJfDw7OaMYwEbHMOxEZ1lqVRYP2OAw==" + "source-list-map": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/source-list-map/-/source-list-map-2.0.1.tgz", + "integrity": "sha512-qnQ7gVMxGNxsiL4lEuJwe/To8UnK7fAnmbGEEH8RpLouuKbeEm0lhbQVFIrNSuB+G7tVrAlVsZgETT5nljf+Iw==", + "dev": true }, - "sha.js": { - "version": "2.4.11", - "resolved": "https://registry.npmjs.org/sha.js/-/sha.js-2.4.11.tgz", - "integrity": "sha512-QMEp5B7cftE7APOjk5Y6xgrbWu+WkLVQwk8JNjZ8nKRciZaByEW6MubieAiToS7+dwvrjGhH8jRXz3MVd0AYqQ==", - "dev": true, + "source-map": { + "version": "0.4.4", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.4.4.tgz", + "integrity": "sha1-66T12pwNyZneaAMti092FzZSA2s=", "requires": { - "inherits": "^2.0.1", - "safe-buffer": "^5.0.1" + "amdefine": ">=0.0.4" } }, - "shallow-clone": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/shallow-clone/-/shallow-clone-1.0.0.tgz", - "integrity": "sha512-oeXreoKR/SyNJtRJMAKPDSvd28OqEwG4eR/xc856cRGBII7gX9lvAqDxusPm0846z/w/hWYjI1NpKwJ00NHzRA==", + "source-map-loader": { + "version": "0.2.4", + "resolved": "https://registry.npmjs.org/source-map-loader/-/source-map-loader-0.2.4.tgz", + "integrity": "sha512-OU6UJUty+i2JDpTItnizPrlpOIBLmQbWMuBg9q5bVtnHACqw1tn9nNwqJLbv0/00JjnJb/Ee5g5WS5vrRv7zIQ==", "dev": true, "requires": { - "is-extendable": "^0.1.1", - "kind-of": "^5.0.0", - "mixin-object": "^2.0.1" - }, - "dependencies": { - "kind-of": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz", - "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==", - "dev": true - } + "async": "^2.5.0", + "loader-utils": "^1.1.0" } }, - "shebang-command": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz", - "integrity": "sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=", + "source-map-resolve": { + "version": "0.5.3", + "resolved": "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.5.3.tgz", + "integrity": "sha512-Htz+RnsXWk5+P2slx5Jh3Q66vhQj1Cllm0zvnaY98+NFx+Dv2CF/f5O/t8x+KaNdrdIAsruNzoh/KpialbqAnw==", + "dev": true, "requires": { - "shebang-regex": "^1.0.0" + "atob": "^2.1.2", + "decode-uri-component": "^0.2.0", + "resolve-url": "^0.2.1", + "source-map-url": "^0.4.0", + "urix": "^0.1.0" } }, - "shebang-regex": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz", - "integrity": "sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM=" - }, - "shell-quote": { - "version": "1.6.1", - "resolved": "https://registry.npmjs.org/shell-quote/-/shell-quote-1.6.1.tgz", - "integrity": "sha1-9HgZSczkAmlxJ0MOo7PFR29IF2c=", + "source-map-support": { + "version": "0.5.12", + "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.12.tgz", + "integrity": "sha512-4h2Pbvyy15EE02G+JOZpUCmqWJuqrs+sEkzewTm++BPi7Hvn/HwcqLAcNxYAyI0x13CpPPn+kMjl+hplXMHITQ==", "dev": true, "requires": { - "array-filter": "~0.0.0", - "array-map": "~0.0.0", - "array-reduce": "~0.0.0", - "jsonify": "~0.0.0" + "buffer-from": "^1.0.0", + "source-map": "^0.6.0" + }, + "dependencies": { + "source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "dev": true + } } }, - "shimmer": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/shimmer/-/shimmer-1.2.1.tgz", - "integrity": "sha512-sQTKC1Re/rM6XyFM6fIAGHRPVGvyXfgzIDvzoq608vM+jeyVD0Tu1E6Np0Kc2zAIFWIj963V2800iF/9LPieQw==" + "source-map-url": { + "version": "0.4.0", + "resolved": "https://registry.npmjs.org/source-map-url/-/source-map-url-0.4.0.tgz", + "integrity": "sha1-PpNdfd1zYxuXZZlW1VEo6HtQhKM=", + "dev": true }, - "signal-exit": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz", - "integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=" + "sourcemap-codec": { + "version": "1.4.8", + "resolved": "https://registry.npmjs.org/sourcemap-codec/-/sourcemap-codec-1.4.8.tgz", + "integrity": "sha512-9NykojV5Uih4lgo5So5dtw+f0JgJX30KCNI8gwhz2J9A15wD0Ml6tjHKwf6fTSa6fAdVBdZeNOs9eJ71qCk8vA==", + "dev": true }, - "sinon": { - "version": "7.5.0", - "resolved": "https://registry.npmjs.org/sinon/-/sinon-7.5.0.tgz", - "integrity": "sha512-AoD0oJWerp0/rY9czP/D6hDTTUYGpObhZjMpd7Cl/A6+j0xBE+ayL/ldfggkBXUs0IkvIiM1ljM8+WkOc5k78Q==", + "spawn-command": { + "version": "0.0.2-1", + "resolved": "https://registry.npmjs.org/spawn-command/-/spawn-command-0.0.2-1.tgz", + "integrity": "sha1-YvXpRmmBwbeW3Fkpk34RycaSG9A=" + }, + "spawn-wrap": { + "version": "1.4.3", + "resolved": "https://registry.npmjs.org/spawn-wrap/-/spawn-wrap-1.4.3.tgz", + "integrity": "sha512-IgB8md0QW/+tWqcavuFgKYR/qIRvJkRLPJDFaoXtLLUaVcCDK0+HeFTkmQHj3eprcYhc+gOl0aEA1w7qZlYezw==", "dev": true, "requires": { - "@sinonjs/commons": "^1.4.0", - "@sinonjs/formatio": "^3.2.1", - "@sinonjs/samsam": "^3.3.3", - "diff": "^3.5.0", - "lolex": "^4.2.0", - "nise": "^1.5.2", - "supports-color": "^5.5.0" - }, - "dependencies": { - "supports-color": { - "version": "5.5.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", - "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", - "dev": true, - "requires": { - "has-flag": "^3.0.0" - } - } + "foreground-child": "^1.5.6", + "mkdirp": "^0.5.0", + "os-homedir": "^1.0.1", + "rimraf": "^2.6.2", + "signal-exit": "^3.0.2", + "which": "^1.3.0" } }, - "slack": { - "version": "11.0.2", - "resolved": "https://registry.npmjs.org/slack/-/slack-11.0.2.tgz", - "integrity": "sha512-rv842+S+AGyZCmMMd8xPtW5DvJ9LzWTAKfxi8Gw57oYlXgcKtFuHd4nqk6lTPpRKdUGn3tx/Drd0rjQR3dQPqw==", + "spdx-correct": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.1.0.tgz", + "integrity": "sha512-lr2EZCctC2BNR7j7WzJ2FpDznxky1sjfxvvYEyzxNyb6lZXHODmEoJeFu4JupYlkfha1KZpJyoqiJ7pgA1qq8Q==", "requires": { - "tiny-json-http": "^7.0.2" + "spdx-expression-parse": "^3.0.0", + "spdx-license-ids": "^3.0.0" } }, - "slash": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/slash/-/slash-1.0.0.tgz", - "integrity": "sha1-xB8vbDn8FtHNF61LXYlhFK5HDVU=", - "dev": true + "spdx-exceptions": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.2.0.tgz", + "integrity": "sha512-2XQACfElKi9SlVb1CYadKDXvoajPgBVPn/gOQLrTvHdElaVhr7ZEbqJaRnJLVNeaI4cMEAgVCeBMKF6MWRDCRA==" }, - "slugify": { - "version": "1.3.4", - "resolved": "https://registry.npmjs.org/slugify/-/slugify-1.3.4.tgz", - "integrity": "sha512-KP0ZYk5hJNBS8/eIjGkFDCzGQIoZ1mnfQRYS5WM3273z+fxGWXeN0fkwf2ebEweydv9tioZIHGZKoF21U07/nw==" + "spdx-expression-parse": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.0.tgz", + "integrity": "sha512-Yg6D3XpRD4kkOmTpdgbUiEJFKghJH03fiC1OPll5h/0sO6neh2jqRDVHOQ4o/LMea0tgCkbMgea5ip/e+MkWyg==", + "requires": { + "spdx-exceptions": "^2.1.0", + "spdx-license-ids": "^3.0.0" + } }, - "smart-buffer": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/smart-buffer/-/smart-buffer-4.0.2.tgz", - "integrity": "sha512-JDhEpTKzXusOqXZ0BUIdH+CjFdO/CR3tLlf5CN34IypI+xMmXW1uB16OOY8z3cICbJlDAVJzNbwBhNO0wt9OAw==", - "dev": true + "spdx-license-ids": { + "version": "3.0.5", + "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.5.tgz", + "integrity": "sha512-J+FWzZoynJEXGphVIS+XEh3kFSjZX/1i9gFBaWQcB+/tmpe2qUsSBABpcxqxnAxFdiUFEgAX1bjYGQvIZmoz9Q==" }, - "snapdragon": { - "version": "0.8.2", - "resolved": "https://registry.npmjs.org/snapdragon/-/snapdragon-0.8.2.tgz", - "integrity": "sha512-FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg==", + "spdy": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/spdy/-/spdy-4.0.1.tgz", + "integrity": "sha512-HeZS3PBdMA+sZSu0qwpCxl3DeALD5ASx8pAX0jZdKXSpPWbQ6SYGnlg3BBmYLx5LtiZrmkAZfErCm2oECBcioA==", "dev": true, "requires": { - "base": "^0.11.1", - "debug": "^2.2.0", - "define-property": "^0.2.5", - "extend-shallow": "^2.0.1", - "map-cache": "^0.2.2", - "source-map": "^0.5.6", - "source-map-resolve": "^0.5.0", - "use": "^3.1.0" + "debug": "^4.1.0", + "handle-thing": "^2.0.0", + "http-deceiver": "^1.2.7", + "select-hose": "^2.0.0", + "spdy-transport": "^3.0.0" }, "dependencies": { "debug": { - "version": "2.6.9", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", - "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", - "dev": true, - "requires": { - "ms": "2.0.0" - } - }, - "define-property": { - "version": "0.2.5", - "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz", - "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=", - "dev": true, - "requires": { - "is-descriptor": "^0.1.0" - } - }, - "extend-shallow": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", - "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz", + "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==", "dev": true, "requires": { - "is-extendable": "^0.1.0" + "ms": "^2.1.1" } }, - "source-map": { - "version": "0.5.7", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz", - "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=", + "ms": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", + "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", "dev": true } } }, - "snapdragon-node": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/snapdragon-node/-/snapdragon-node-2.1.1.tgz", - "integrity": "sha512-O27l4xaMYt/RSQ5TR3vpWCAB5Kb/czIcqUFOM/C4fYcLnbZUc1PkjTAMjof2pBWaSTwOUd6qUHcFGVGj7aIwnw==", + "spdy-transport": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/spdy-transport/-/spdy-transport-3.0.0.tgz", + "integrity": "sha512-hsLVFE5SjA6TCisWeJXFKniGGOpBgMLmerfO2aCyCU5s7nJ/rpAepqmFifv/GCbSbueEeAJJnmSQ2rKC/g8Fcw==", "dev": true, "requires": { - "define-property": "^1.0.0", - "isobject": "^3.0.0", - "snapdragon-util": "^3.0.1" - }, - "dependencies": { - "define-property": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz", - "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=", - "dev": true, - "requires": { - "is-descriptor": "^1.0.0" - } - }, - "is-accessor-descriptor": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz", - "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==", + "debug": "^4.1.0", + "detect-node": "^2.0.4", + "hpack.js": "^2.1.6", + "obuf": "^1.1.2", + "readable-stream": "^3.0.6", + "wbuf": "^1.7.3" + }, + "dependencies": { + "debug": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz", + "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==", "dev": true, "requires": { - "kind-of": "^6.0.0" + "ms": "^2.1.1" } }, - "is-data-descriptor": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz", - "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==", - "dev": true, - "requires": { - "kind-of": "^6.0.0" - } + "ms": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", + "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", + "dev": true }, - "is-descriptor": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz", - "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==", + "readable-stream": { + "version": "3.5.0", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.5.0.tgz", + "integrity": "sha512-gSz026xs2LfxBPudDuI41V1lka8cxg64E66SGe78zJlsUofOg/yqwezdIcdfwik6B4h8LFmWPA9ef9X3FiNFLA==", "dev": true, "requires": { - "is-accessor-descriptor": "^1.0.0", - "is-data-descriptor": "^1.0.0", - "kind-of": "^6.0.2" + "inherits": "^2.0.3", + "string_decoder": "^1.1.1", + "util-deprecate": "^1.0.1" } - }, - "kind-of": { - "version": "6.0.2", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz", - "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==", - "dev": true } } }, - "snapdragon-util": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/snapdragon-util/-/snapdragon-util-3.0.1.tgz", - "integrity": "sha512-mbKkMdQKsjX4BAL4bRYTj21edOf8cN7XHdYUJEe+Zn99hVEYcMvKPct1IqNe7+AZPirn8BCDOQBHQZknqmKlZQ==", + "speed-measure-webpack-plugin": { + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/speed-measure-webpack-plugin/-/speed-measure-webpack-plugin-1.3.1.tgz", + "integrity": "sha512-qVIkJvbtS9j/UeZumbdfz0vg+QfG/zxonAjzefZrqzkr7xOncLVXkeGbTpzd1gjCBM4PmVNkWlkeTVhgskAGSQ==", "dev": true, "requires": { - "kind-of": "^3.2.0" + "chalk": "^2.0.1" } }, - "socket.io": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/socket.io/-/socket.io-2.1.1.tgz", - "integrity": "sha512-rORqq9c+7W0DAK3cleWNSyfv/qKXV99hV4tZe+gGLfBECw3XEhBy7x85F3wypA9688LKjtwO9pX9L33/xQI8yA==", + "split": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/split/-/split-1.0.1.tgz", + "integrity": "sha512-mTyOoPbrivtXnwnIxZRFYRrPNtEFKlpB2fvjSnCQUiAA6qAZzqwna5envK4uk6OIeP17CsdF3rSBGYVBsU0Tkg==", + "requires": { + "through": "2" + } + }, + "split-string": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/split-string/-/split-string-3.1.0.tgz", + "integrity": "sha512-NzNVhJDYpwceVVii8/Hu6DKfD2G+NrQHlS/V/qgv763EYudVwEcMQNxd2lh+0VrUByXN/oJkl5grOhYWvQUYiw==", "dev": true, "requires": { - "debug": "~3.1.0", - "engine.io": "~3.2.0", - "has-binary2": "~1.0.2", - "socket.io-adapter": "~1.1.0", - "socket.io-client": "2.1.1", - "socket.io-parser": "~3.2.0" + "extend-shallow": "^3.0.0" } }, - "socket.io-adapter": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/socket.io-adapter/-/socket.io-adapter-1.1.1.tgz", - "integrity": "sha1-KoBeihTWNyEk3ZFZrUUC+MsH8Gs=", + "sprintf-js": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz", + "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=" + }, + "sshpk": { + "version": "1.16.1", + "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.16.1.tgz", + "integrity": "sha512-HXXqVUq7+pcKeLqqZj6mHFUMvXtOJt1uoUx09pFW6011inTMxqI8BA8PM95myrIyyKwdnzjdFjLiE6KBPVtJIg==", + "requires": { + "asn1": "~0.2.3", + "assert-plus": "^1.0.0", + "bcrypt-pbkdf": "^1.0.0", + "dashdash": "^1.12.0", + "ecc-jsbn": "~0.1.1", + "getpass": "^0.1.1", + "jsbn": "~0.1.0", + "safer-buffer": "^2.0.2", + "tweetnacl": "~0.14.0" + } + }, + "ssri": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/ssri/-/ssri-6.0.1.tgz", + "integrity": "sha512-3Wge10hNcT1Kur4PDFwEieXSCMCJs/7WvSACcrMYrNp+b8kDL1/0wJch5Ni2WrtwEa2IO8OsVfeKIciKCDx/QA==", + "dev": true, + "requires": { + "figgy-pudding": "^3.5.1" + } + }, + "stack-trace": { + "version": "0.0.9", + "resolved": "https://registry.npmjs.org/stack-trace/-/stack-trace-0.0.9.tgz", + "integrity": "sha1-qPbq7KkGdMMz58Q5U/J1tFFRBpU=", "dev": true }, - "socket.io-client": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/socket.io-client/-/socket.io-client-2.1.1.tgz", - "integrity": "sha512-jxnFyhAuFxYfjqIgduQlhzqTcOEQSn+OHKVfAxWaNWa7ecP7xSNk2Dx/3UEsDcY7NcFafxvNvKPmmO7HTwTxGQ==", + "static-extend": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/static-extend/-/static-extend-0.1.2.tgz", + "integrity": "sha1-YICcOcv/VTNyJv1eC1IPNB8ftcY=", "dev": true, "requires": { - "backo2": "1.0.2", - "base64-arraybuffer": "0.1.5", - "component-bind": "1.0.0", - "component-emitter": "1.2.1", - "debug": "~3.1.0", - "engine.io-client": "~3.2.0", - "has-binary2": "~1.0.2", - "has-cors": "1.1.0", - "indexof": "0.0.1", - "object-component": "0.0.3", - "parseqs": "0.0.5", - "parseuri": "0.0.5", - "socket.io-parser": "~3.2.0", - "to-array": "0.1.4" + "define-property": "^0.2.5", + "object-copy": "^0.1.0" }, "dependencies": { - "component-emitter": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.2.1.tgz", - "integrity": "sha1-E3kY1teCg/ffemt8WmPhQOaUJeY=", - "dev": true + "define-property": { + "version": "0.2.5", + "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz", + "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=", + "dev": true, + "requires": { + "is-descriptor": "^0.1.0" + } } } }, - "socket.io-parser": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-3.2.0.tgz", - "integrity": "sha512-FYiBx7rc/KORMJlgsXysflWx/RIvtqZbyGLlHZvjfmPTPeuD/I8MaW7cfFrj5tRltICJdgwflhfZ3NVVbVLFQA==", + "statuses": { + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz", + "integrity": "sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow=" + }, + "stealthy-require": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/stealthy-require/-/stealthy-require-1.1.1.tgz", + "integrity": "sha1-NbCYdbT/SfJqd35QmzCQoyJr8ks=" + }, + "stream-browserify": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/stream-browserify/-/stream-browserify-2.0.2.tgz", + "integrity": "sha512-nX6hmklHs/gr2FuxYDltq8fJA1GDlxKQCz8O/IM4atRqBH8OORmBNgfvW5gG10GT/qQ9u0CzIvr2X5Pkt6ntqg==", "dev": true, "requires": { - "component-emitter": "1.2.1", - "debug": "~3.1.0", - "isarray": "2.0.1" - }, - "dependencies": { - "component-emitter": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.2.1.tgz", - "integrity": "sha1-E3kY1teCg/ffemt8WmPhQOaUJeY=", - "dev": true - }, - "isarray": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.1.tgz", - "integrity": "sha1-o32U7ZzaLVmGXJ92/llu4fM4dB4=", - "dev": true - } + "inherits": "~2.0.1", + "readable-stream": "^2.0.2" } }, - "sockjs": { - "version": "0.3.19", - "resolved": "https://registry.npmjs.org/sockjs/-/sockjs-0.3.19.tgz", - "integrity": "sha512-V48klKZl8T6MzatbLlzzRNhMepEys9Y4oGFpypBFFn1gLI/QQ9HtLLyWJNbPlwGLelOVOEijUbTTJeLLI59jLw==", + "stream-each": { + "version": "1.2.3", + "resolved": "https://registry.npmjs.org/stream-each/-/stream-each-1.2.3.tgz", + "integrity": "sha512-vlMC2f8I2u/bZGqkdfLQW/13Zihpej/7PmSiMQsbYddxuTsJp8vRe2x2FvVExZg7FaOds43ROAuFJwPR4MTZLw==", "dev": true, "requires": { - "faye-websocket": "^0.10.0", - "uuid": "^3.0.1" + "end-of-stream": "^1.1.0", + "stream-shift": "^1.0.0" } }, - "sockjs-client": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/sockjs-client/-/sockjs-client-1.3.0.tgz", - "integrity": "sha512-R9jxEzhnnrdxLCNln0xg5uGHqMnkhPSTzUZH2eXcR03S/On9Yvoq2wyUZILRUhZCNVu2PmwWVoyuiPz8th8zbg==", + "stream-http": { + "version": "2.8.3", + "resolved": "https://registry.npmjs.org/stream-http/-/stream-http-2.8.3.tgz", + "integrity": "sha512-+TSkfINHDo4J+ZobQLWiMouQYB+UVYFttRA94FpEzzJ7ZdqcL4uUUQ7WkdkI4DSozGmgBUE/a47L+38PenXhUw==", "dev": true, "requires": { - "debug": "^3.2.5", - "eventsource": "^1.0.7", - "faye-websocket": "~0.11.1", - "inherits": "^2.0.3", - "json3": "^3.3.2", - "url-parse": "^1.4.3" + "builtin-status-codes": "^3.0.0", + "inherits": "^2.0.1", + "readable-stream": "^2.3.6", + "to-arraybuffer": "^1.0.0", + "xtend": "^4.0.0" + } + }, + "stream-shift": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/stream-shift/-/stream-shift-1.0.1.tgz", + "integrity": "sha512-AiisoFqQ0vbGcZgQPY1cdP2I76glaVA/RauYR4G4thNFgkTqr90yXTo4LYX60Jl+sIlPNHHdGSwo01AvbKUSVQ==", + "dev": true + }, + "streamroller": { + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/streamroller/-/streamroller-1.0.6.tgz", + "integrity": "sha512-3QC47Mhv3/aZNFpDDVO44qQb9gwB9QggMEE0sQmkTAwBVYdBRWISdsywlkfm5II1Q5y/pmrHflti/IgmIzdDBg==", + "dev": true, + "requires": { + "async": "^2.6.2", + "date-format": "^2.0.0", + "debug": "^3.2.6", + "fs-extra": "^7.0.1", + "lodash": "^4.17.14" }, "dependencies": { "debug": { @@ -15150,15 +16097,6 @@ "ms": "^2.1.1" } }, - "faye-websocket": { - "version": "0.11.3", - "resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.11.3.tgz", - "integrity": "sha512-D2y4bovYpzziGgbHYtGCMjlJM36vAl/y+xUyn1C+FVx8szd1E+86KwVw6XvYSzOP8iMpm1X0I4xJD+QtUb36OA==", - "dev": true, - "requires": { - "websocket-driver": ">=0.5.1" - } - }, "ms": { "version": "2.1.2", "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", @@ -15167,167 +16105,220 @@ } } }, - "socks": { - "version": "2.3.2", - "resolved": "https://registry.npmjs.org/socks/-/socks-2.3.2.tgz", - "integrity": "sha512-pCpjxQgOByDHLlNqlnh/mNSAxIUkyBBuwwhTcV+enZGbDaClPvHdvm6uvOwZfFJkam7cGhBNbb4JxiP8UZkRvQ==", + "strict-uri-encode": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz", + "integrity": "sha1-J5siXfHVgrH1TmWt3UNS4Y+qBxM=", + "dev": true + }, + "string-width": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz", + "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==", + "requires": { + "emoji-regex": "^7.0.1", + "is-fullwidth-code-point": "^2.0.0", + "strip-ansi": "^5.1.0" + } + }, + "string.prototype.padend": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/string.prototype.padend/-/string.prototype.padend-3.1.0.tgz", + "integrity": "sha512-3aIv8Ffdp8EZj8iLwREGpQaUZiPyrWrpzMBHvkiSW/bK/EGve9np07Vwy7IJ5waydpGXzQZu/F8Oze2/IWkBaA==", + "dev": true, + "requires": { + "define-properties": "^1.1.3", + "es-abstract": "^1.17.0-next.1" + } + }, + "string.prototype.trimleft": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/string.prototype.trimleft/-/string.prototype.trimleft-2.1.1.tgz", + "integrity": "sha512-iu2AGd3PuP5Rp7x2kEZCrB2Nf41ehzh+goo8TV7z8/XDBbsvc6HQIlUl9RjkZ4oyrW1XM5UwlGl1oVEaDjg6Ag==", "dev": true, "requires": { - "ip": "^1.1.5", - "smart-buffer": "4.0.2" + "define-properties": "^1.1.3", + "function-bind": "^1.1.1" } }, - "socks-proxy-agent": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-4.0.2.tgz", - "integrity": "sha512-NT6syHhI9LmuEMSK6Kd2V7gNv5KFZoLE7V5udWmn0de+3Mkj3UMA/AJPLyeNUVmElCurSHtUdM3ETpR3z770Wg==", + "string.prototype.trimright": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/string.prototype.trimright/-/string.prototype.trimright-2.1.1.tgz", + "integrity": "sha512-qFvWL3/+QIgZXVmJBfpHmxLB7xsUXz6HsUmP8+5dRaC3Q7oKUv9Vo6aMCRZC1smrtyECFsIT30PqBJ1gTjAs+g==", "dev": true, "requires": { - "agent-base": "~4.2.1", - "socks": "~2.3.2" + "define-properties": "^1.1.3", + "function-bind": "^1.1.1" + } + }, + "string_decoder": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", + "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", + "requires": { + "safe-buffer": "~5.1.0" }, "dependencies": { - "agent-base": { - "version": "4.2.1", - "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-4.2.1.tgz", - "integrity": "sha512-JVwXMr9nHYTUXsBFKUqhJwvlcYU/blreOEUkhNR2eXZIvwd+c+o5V4MgDPKWnMS/56awN3TRzIP+KoPn+roQtg==", - "dev": true, - "requires": { - "es6-promisify": "^5.0.0" - } + "safe-buffer": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", + "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==" } } }, - "sort-keys": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/sort-keys/-/sort-keys-1.1.2.tgz", - "integrity": "sha1-RBttTTRnmPG05J6JIK37oOVD+a0=", - "dev": true, + "strip-ansi": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz", + "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==", "requires": { - "is-plain-obj": "^1.0.0" + "ansi-regex": "^4.1.0" } }, - "source-list-map": { + "strip-bom": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz", + "integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=" + }, + "strip-eof": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/strip-eof/-/strip-eof-1.0.0.tgz", + "integrity": "sha1-u0P/VZim6wXYm1n80SnJgzE2Br8=" + }, + "strip-json-comments": { "version": "2.0.1", - "resolved": "https://registry.npmjs.org/source-list-map/-/source-list-map-2.0.1.tgz", - "integrity": "sha512-qnQ7gVMxGNxsiL4lEuJwe/To8UnK7fAnmbGEEH8RpLouuKbeEm0lhbQVFIrNSuB+G7tVrAlVsZgETT5nljf+Iw==", + "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz", + "integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo=", "dev": true }, - "source-map": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", - "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==" - }, - "source-map-loader": { - "version": "0.2.4", - "resolved": "https://registry.npmjs.org/source-map-loader/-/source-map-loader-0.2.4.tgz", - "integrity": "sha512-OU6UJUty+i2JDpTItnizPrlpOIBLmQbWMuBg9q5bVtnHACqw1tn9nNwqJLbv0/00JjnJb/Ee5g5WS5vrRv7zIQ==", + "style-loader": { + "version": "0.23.1", + "resolved": "https://registry.npmjs.org/style-loader/-/style-loader-0.23.1.tgz", + "integrity": "sha512-XK+uv9kWwhZMZ1y7mysB+zoihsEj4wneFWAS5qoiLwzW0WzSqMrrsIy+a3zkQJq0ipFtBpX5W3MqyRIBF/WFGg==", "dev": true, "requires": { - "async": "^2.5.0", - "loader-utils": "^1.1.0" + "loader-utils": "^1.1.0", + "schema-utils": "^1.0.0" } }, - "source-map-resolve": { - "version": "0.5.2", - "resolved": "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.5.2.tgz", - "integrity": "sha512-MjqsvNwyz1s0k81Goz/9vRBe9SZdB09Bdw+/zYyO+3CuPk6fouTaxscHkgtE8jKvf01kVfl8riHzERQ/kefaSA==", + "stylus": { + "version": "0.54.5", + "resolved": "https://registry.npmjs.org/stylus/-/stylus-0.54.5.tgz", + "integrity": "sha1-QrlWCTHKcJDOhRWnmLqeaqPW3Hk=", "dev": true, "requires": { - "atob": "^2.1.1", - "decode-uri-component": "^0.2.0", - "resolve-url": "^0.2.1", - "source-map-url": "^0.4.0", - "urix": "^0.1.0" + "css-parse": "1.7.x", + "debug": "*", + "glob": "7.0.x", + "mkdirp": "0.5.x", + "sax": "0.5.x", + "source-map": "0.1.x" + }, + "dependencies": { + "css-parse": { + "version": "1.7.0", + "resolved": "https://registry.npmjs.org/css-parse/-/css-parse-1.7.0.tgz", + "integrity": "sha1-Mh9s9zeCpv91ERE5D8BeLGV9jJs=", + "dev": true + }, + "glob": { + "version": "7.0.6", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.0.6.tgz", + "integrity": "sha1-IRuvr0nlJbjNkyYNFKsTYVKz9Xo=", + "dev": true, + "requires": { + "fs.realpath": "^1.0.0", + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "^3.0.2", + "once": "^1.3.0", + "path-is-absolute": "^1.0.0" + } + }, + "sax": { + "version": "0.5.8", + "resolved": "https://registry.npmjs.org/sax/-/sax-0.5.8.tgz", + "integrity": "sha1-1HLbIo6zMcJQaw6MFVJK25OdEsE=", + "dev": true + }, + "source-map": { + "version": "0.1.43", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.1.43.tgz", + "integrity": "sha1-wkvBRspRfBRx9drL4lcbK3+eM0Y=", + "dev": true, + "requires": { + "amdefine": ">=0.0.4" + } + } } }, - "source-map-support": { - "version": "0.5.10", - "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.10.tgz", - "integrity": "sha512-YfQ3tQFTK/yzlGJuX8pTwa4tifQj4QS2Mj7UegOu8jAz59MqIiMGPXxQhVQiIMNzayuUSF/jEuVnfFF5JqybmQ==", + "stylus-loader": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/stylus-loader/-/stylus-loader-3.0.2.tgz", + "integrity": "sha512-+VomPdZ6a0razP+zinir61yZgpw2NfljeSsdUF5kJuEzlo3khXhY19Fn6l8QQz1GRJGtMCo8nG5C04ePyV7SUA==", "dev": true, "requires": { - "buffer-from": "^1.0.0", - "source-map": "^0.6.0" + "loader-utils": "^1.0.2", + "lodash.clonedeep": "^4.5.0", + "when": "~3.6.x" } }, - "source-map-url": { - "version": "0.4.0", - "resolved": "https://registry.npmjs.org/source-map-url/-/source-map-url-0.4.0.tgz", - "integrity": "sha1-PpNdfd1zYxuXZZlW1VEo6HtQhKM=", - "dev": true - }, - "sourcemap-codec": { - "version": "1.4.6", - "resolved": "https://registry.npmjs.org/sourcemap-codec/-/sourcemap-codec-1.4.6.tgz", - "integrity": "sha512-1ZooVLYFxC448piVLBbtOxFcXwnymH9oUF8nRd3CuYDVvkRBxRl6pB4Mtas5a4drtL+E8LDgFkQNcgIw6tc8Hg==", - "dev": true - }, - "spawn-command": { - "version": "0.0.2-1", - "resolved": "https://registry.npmjs.org/spawn-command/-/spawn-command-0.0.2-1.tgz", - "integrity": "sha1-YvXpRmmBwbeW3Fkpk34RycaSG9A=" - }, - "spawn-wrap": { - "version": "1.4.3", - "resolved": "https://registry.npmjs.org/spawn-wrap/-/spawn-wrap-1.4.3.tgz", - "integrity": "sha512-IgB8md0QW/+tWqcavuFgKYR/qIRvJkRLPJDFaoXtLLUaVcCDK0+HeFTkmQHj3eprcYhc+gOl0aEA1w7qZlYezw==", + "superagent": { + "version": "3.8.3", + "resolved": "https://registry.npmjs.org/superagent/-/superagent-3.8.3.tgz", + "integrity": "sha512-GLQtLMCoEIK4eDv6OGtkOoSMt3D+oq0y3dsxMuYuDvaNUvuT8eFBuLmfR0iYYzHC1e8hpzC6ZsxbuP6DIalMFA==", "dev": true, "requires": { - "foreground-child": "^1.5.6", - "mkdirp": "^0.5.0", - "os-homedir": "^1.0.1", - "rimraf": "^2.6.2", - "signal-exit": "^3.0.2", - "which": "^1.3.0" + "component-emitter": "^1.2.0", + "cookiejar": "^2.1.0", + "debug": "^3.1.0", + "extend": "^3.0.0", + "form-data": "^2.3.1", + "formidable": "^1.2.0", + "methods": "^1.1.1", + "mime": "^1.4.1", + "qs": "^6.5.1", + "readable-stream": "^2.3.5" } }, - "spdx-correct": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.1.0.tgz", - "integrity": "sha512-lr2EZCctC2BNR7j7WzJ2FpDznxky1sjfxvvYEyzxNyb6lZXHODmEoJeFu4JupYlkfha1KZpJyoqiJ7pgA1qq8Q==", + "supertest": { + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/supertest/-/supertest-4.0.2.tgz", + "integrity": "sha512-1BAbvrOZsGA3YTCWqbmh14L0YEq0EGICX/nBnfkfVJn7SrxQV1I3pMYjSzG9y/7ZU2V9dWqyqk2POwxlb09duQ==", + "dev": true, "requires": { - "spdx-expression-parse": "^3.0.0", - "spdx-license-ids": "^3.0.0" + "methods": "^1.1.2", + "superagent": "^3.8.3" } }, - "spdx-exceptions": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.2.0.tgz", - "integrity": "sha512-2XQACfElKi9SlVb1CYadKDXvoajPgBVPn/gOQLrTvHdElaVhr7ZEbqJaRnJLVNeaI4cMEAgVCeBMKF6MWRDCRA==" - }, - "spdx-expression-parse": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.0.tgz", - "integrity": "sha512-Yg6D3XpRD4kkOmTpdgbUiEJFKghJH03fiC1OPll5h/0sO6neh2jqRDVHOQ4o/LMea0tgCkbMgea5ip/e+MkWyg==", + "supports-color": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz", + "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==", "requires": { - "spdx-exceptions": "^2.1.0", - "spdx-license-ids": "^3.0.0" + "has-flag": "^3.0.0" } }, - "spdx-license-ids": { - "version": "3.0.5", - "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.5.tgz", - "integrity": "sha512-J+FWzZoynJEXGphVIS+XEh3kFSjZX/1i9gFBaWQcB+/tmpe2qUsSBABpcxqxnAxFdiUFEgAX1bjYGQvIZmoz9Q==" - }, - "spdy": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/spdy/-/spdy-4.0.1.tgz", - "integrity": "sha512-HeZS3PBdMA+sZSu0qwpCxl3DeALD5ASx8pAX0jZdKXSpPWbQ6SYGnlg3BBmYLx5LtiZrmkAZfErCm2oECBcioA==", - "dev": true, + "swagger-stats": { + "version": "0.95.16", + "resolved": "https://registry.npmjs.org/swagger-stats/-/swagger-stats-0.95.16.tgz", + "integrity": "sha512-HRcz3hGPA0fcONocwjeRC5NV47gSgY786LqPUQC4nNQh0nTHz7sqTES83rGXOQ1b6ZR8y9D3OS+dyEIFB4gwJw==", "requires": { - "debug": "^4.1.0", - "handle-thing": "^2.0.0", - "http-deceiver": "^1.2.7", - "select-hose": "^2.0.0", - "spdy-transport": "^3.0.0" + "basic-auth": "^2.0.1", + "cookies": "^0.8.0", + "debug": "^4.1.1", + "moment": "^2.24.0", + "path-to-regexp": "^6.1.0", + "prom-client": "^11.5.3", + "qs": "^6.9.1", + "request": "^2.88.0", + "send": "^0.17.1", + "uuid": "^3.4.0" }, "dependencies": { "debug": { "version": "4.1.1", "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz", "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==", - "dev": true, "requires": { "ms": "^2.1.1" } @@ -15335,1371 +16326,1610 @@ "ms": { "version": "2.1.2", "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", - "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", + "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==" + }, + "qs": { + "version": "6.9.1", + "resolved": "https://registry.npmjs.org/qs/-/qs-6.9.1.tgz", + "integrity": "sha512-Cxm7/SS/y/Z3MHWSxXb8lIFqgqBowP5JMlTUFyJN88y0SGQhVmZnqFK/PeuMX9LzUyWsqqhNxIyg0jlzq946yA==" + } + } + }, + "symbol-observable": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/symbol-observable/-/symbol-observable-1.2.0.tgz", + "integrity": "sha512-e900nM8RRtGhlV36KGEU9k65K3mPb1WV70OdjfxlG2EAuM1noi/E/BaW/uMhL7bPEssK8QV57vN3esixjUvcXQ==", + "dev": true + }, + "symbol-tree": { + "version": "3.2.4", + "resolved": "https://registry.npmjs.org/symbol-tree/-/symbol-tree-3.2.4.tgz", + "integrity": "sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw==" + }, + "tapable": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/tapable/-/tapable-1.1.3.tgz", + "integrity": "sha512-4WK/bYZmj8xLr+HUCODHGF1ZFzsYffasLUgEiMBY4fgtltdO6B4WJtlSbPaDTLpYTcGVwM2qLnFTICEcNxs3kA==", + "dev": true + }, + "tar": { + "version": "4.4.13", + "resolved": "https://registry.npmjs.org/tar/-/tar-4.4.13.tgz", + "integrity": "sha512-w2VwSrBoHa5BsSyH+KxEqeQBAllHhccyMFVHtGtdMpF4W7IRWfZjFiQceJPChOeTsSDVUpER2T8FA93pr0L+QA==", + "dev": true, + "requires": { + "chownr": "^1.1.1", + "fs-minipass": "^1.2.5", + "minipass": "^2.8.6", + "minizlib": "^1.2.1", + "mkdirp": "^0.5.0", + "safe-buffer": "^5.1.2", + "yallist": "^3.0.3" + }, + "dependencies": { + "yallist": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz", + "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==", "dev": true } } }, - "spdy-transport": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/spdy-transport/-/spdy-transport-3.0.0.tgz", - "integrity": "sha512-hsLVFE5SjA6TCisWeJXFKniGGOpBgMLmerfO2aCyCU5s7nJ/rpAepqmFifv/GCbSbueEeAJJnmSQ2rKC/g8Fcw==", + "tdigest": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/tdigest/-/tdigest-0.1.1.tgz", + "integrity": "sha1-Ljyyw56kSeVdHmzZEReszKRYgCE=", + "requires": { + "bintrees": "1.0.1" + } + }, + "term-size": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/term-size/-/term-size-1.2.0.tgz", + "integrity": "sha1-RYuDiH8oj8Vtb/+/rSYuJmOO+mk=", "dev": true, "requires": { - "debug": "^4.1.0", - "detect-node": "^2.0.4", - "hpack.js": "^2.1.6", - "obuf": "^1.1.2", - "readable-stream": "^3.0.6", - "wbuf": "^1.7.3" + "execa": "^0.7.0" }, "dependencies": { - "debug": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz", - "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==", + "cross-spawn": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz", + "integrity": "sha1-6L0O/uWPz/b4+UUQoKVUu/ojVEk=", "dev": true, "requires": { - "ms": "^2.1.1" + "lru-cache": "^4.0.1", + "shebang-command": "^1.2.0", + "which": "^1.2.9" } }, - "ms": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", - "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", - "dev": true - }, - "readable-stream": { - "version": "3.4.0", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.4.0.tgz", - "integrity": "sha512-jItXPLmrSR8jmTRmRWJXCnGJsfy85mB3Wd/uINMXA65yrnFo0cPClFIUWzo2najVNSl+mx7/4W8ttlLWJe99pQ==", + "execa": { + "version": "0.7.0", + "resolved": "https://registry.npmjs.org/execa/-/execa-0.7.0.tgz", + "integrity": "sha1-lEvs00zEHuMqY6n68nrVpl/Fl3c=", "dev": true, "requires": { - "inherits": "^2.0.3", - "string_decoder": "^1.1.1", - "util-deprecate": "^1.0.1" + "cross-spawn": "^5.0.1", + "get-stream": "^3.0.0", + "is-stream": "^1.1.0", + "npm-run-path": "^2.0.0", + "p-finally": "^1.0.0", + "signal-exit": "^3.0.0", + "strip-eof": "^1.0.0" } + }, + "get-stream": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz", + "integrity": "sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ=", + "dev": true } } }, - "speed-measure-webpack-plugin": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/speed-measure-webpack-plugin/-/speed-measure-webpack-plugin-1.3.1.tgz", - "integrity": "sha512-qVIkJvbtS9j/UeZumbdfz0vg+QfG/zxonAjzefZrqzkr7xOncLVXkeGbTpzd1gjCBM4PmVNkWlkeTVhgskAGSQ==", - "dev": true, - "requires": { - "chalk": "^2.0.1" - } - }, - "split": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/split/-/split-1.0.1.tgz", - "integrity": "sha512-mTyOoPbrivtXnwnIxZRFYRrPNtEFKlpB2fvjSnCQUiAA6qAZzqwna5envK4uk6OIeP17CsdF3rSBGYVBsU0Tkg==", - "requires": { - "through": "2" - } - }, - "split-string": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/split-string/-/split-string-3.1.0.tgz", - "integrity": "sha512-NzNVhJDYpwceVVii8/Hu6DKfD2G+NrQHlS/V/qgv763EYudVwEcMQNxd2lh+0VrUByXN/oJkl5grOhYWvQUYiw==", - "dev": true, - "requires": { - "extend-shallow": "^3.0.0" - } - }, - "sprintf-js": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz", - "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=" - }, - "sshpk": { - "version": "1.16.1", - "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.16.1.tgz", - "integrity": "sha512-HXXqVUq7+pcKeLqqZj6mHFUMvXtOJt1uoUx09pFW6011inTMxqI8BA8PM95myrIyyKwdnzjdFjLiE6KBPVtJIg==", + "terraformer": { + "version": "1.0.10", + "resolved": "https://registry.npmjs.org/terraformer/-/terraformer-1.0.10.tgz", + "integrity": "sha512-5c6cAfKTZHAeRdT8sIRRidhN1w+vsmf3RmQn+PKksFhTUnsBtjQdbJG2vaxM6T47IU2EeR1S8t8UjTYY9Q1yJA==", "requires": { - "asn1": "~0.2.3", - "assert-plus": "^1.0.0", - "bcrypt-pbkdf": "^1.0.0", - "dashdash": "^1.12.0", - "ecc-jsbn": "~0.1.1", - "getpass": "^0.1.1", - "jsbn": "~0.1.0", - "safer-buffer": "^2.0.2", - "tweetnacl": "~0.14.0" + "@types/geojson": "^7946.0.0 || ^1.0.0" } }, - "ssri": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/ssri/-/ssri-6.0.1.tgz", - "integrity": "sha512-3Wge10hNcT1Kur4PDFwEieXSCMCJs/7WvSACcrMYrNp+b8kDL1/0wJch5Ni2WrtwEa2IO8OsVfeKIciKCDx/QA==", - "dev": true, + "terraformer-wkt-parser": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/terraformer-wkt-parser/-/terraformer-wkt-parser-1.2.1.tgz", + "integrity": "sha512-+CJyNLWb3lJ9RsZMTM66BY0MT3yIo4l4l22Jd9CrZuwzk54fsu4Sc7zejuS9fCITTuTQy3p06d4MZMVI7v5wSg==", "requires": { - "figgy-pudding": "^3.5.1" + "@types/geojson": "^1.0.0", + "terraformer": "~1.0.5" } }, - "stack-trace": { - "version": "0.0.9", - "resolved": "https://registry.npmjs.org/stack-trace/-/stack-trace-0.0.9.tgz", - "integrity": "sha1-qPbq7KkGdMMz58Q5U/J1tFFRBpU=", - "dev": true - }, - "static-extend": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/static-extend/-/static-extend-0.1.2.tgz", - "integrity": "sha1-YICcOcv/VTNyJv1eC1IPNB8ftcY=", + "terser": { + "version": "4.6.3", + "resolved": "https://registry.npmjs.org/terser/-/terser-4.6.3.tgz", + "integrity": "sha512-Lw+ieAXmY69d09IIc/yqeBqXpEQIpDGZqT34ui1QWXIUpR2RjbqEkT8X7Lgex19hslSqcWM5iMN2kM11eMsESQ==", "dev": true, "requires": { - "define-property": "^0.2.5", - "object-copy": "^0.1.0" + "commander": "^2.20.0", + "source-map": "~0.6.1", + "source-map-support": "~0.5.12" }, "dependencies": { - "define-property": { - "version": "0.2.5", - "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz", - "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=", - "dev": true, - "requires": { - "is-descriptor": "^0.1.0" - } + "commander": { + "version": "2.20.3", + "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz", + "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==", + "dev": true + }, + "source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "dev": true } } }, - "statuses": { - "version": "1.5.0", - "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz", - "integrity": "sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow=" - }, - "stealthy-require": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/stealthy-require/-/stealthy-require-1.1.1.tgz", - "integrity": "sha1-NbCYdbT/SfJqd35QmzCQoyJr8ks=" - }, - "stream-browserify": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/stream-browserify/-/stream-browserify-2.0.2.tgz", - "integrity": "sha512-nX6hmklHs/gr2FuxYDltq8fJA1GDlxKQCz8O/IM4atRqBH8OORmBNgfvW5gG10GT/qQ9u0CzIvr2X5Pkt6ntqg==", - "dev": true, - "requires": { - "inherits": "~2.0.1", - "readable-stream": "^2.0.2" - } - }, - "stream-each": { - "version": "1.2.3", - "resolved": "https://registry.npmjs.org/stream-each/-/stream-each-1.2.3.tgz", - "integrity": "sha512-vlMC2f8I2u/bZGqkdfLQW/13Zihpej/7PmSiMQsbYddxuTsJp8vRe2x2FvVExZg7FaOds43ROAuFJwPR4MTZLw==", + "terser-webpack-plugin": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-1.3.0.tgz", + "integrity": "sha512-W2YWmxPjjkUcOWa4pBEv4OP4er1aeQJlSo2UhtCFQCuRXEHjOFscO8VyWHj9JLlA0RzQb8Y2/Ta78XZvT54uGg==", "dev": true, "requires": { - "end-of-stream": "^1.1.0", - "stream-shift": "^1.0.0" + "cacache": "^11.3.2", + "find-cache-dir": "^2.0.0", + "is-wsl": "^1.1.0", + "loader-utils": "^1.2.3", + "schema-utils": "^1.0.0", + "serialize-javascript": "^1.7.0", + "source-map": "^0.6.1", + "terser": "^4.0.0", + "webpack-sources": "^1.3.0", + "worker-farm": "^1.7.0" + }, + "dependencies": { + "source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "dev": true + } } }, - "stream-http": { - "version": "2.8.3", - "resolved": "https://registry.npmjs.org/stream-http/-/stream-http-2.8.3.tgz", - "integrity": "sha512-+TSkfINHDo4J+ZobQLWiMouQYB+UVYFttRA94FpEzzJ7ZdqcL4uUUQ7WkdkI4DSozGmgBUE/a47L+38PenXhUw==", - "dev": true, + "test-exclude": { + "version": "5.2.3", + "resolved": "https://registry.npmjs.org/test-exclude/-/test-exclude-5.2.3.tgz", + "integrity": "sha512-M+oxtseCFO3EDtAaGH7iiej3CBkzXqFMbzqYAACdzKui4eZA+pq3tZEwChvOdNfa7xxy8BfbmgJSIr43cC/+2g==", "requires": { - "builtin-status-codes": "^3.0.0", - "inherits": "^2.0.1", - "readable-stream": "^2.3.6", - "to-arraybuffer": "^1.0.0", - "xtend": "^4.0.0" + "glob": "^7.1.3", + "minimatch": "^3.0.4", + "read-pkg-up": "^4.0.0", + "require-main-filename": "^2.0.0" } }, - "stream-shift": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/stream-shift/-/stream-shift-1.0.0.tgz", - "integrity": "sha1-1cdSgl5TZ+eG944Y5EXqIjoVWVI=", - "dev": true + "through": { + "version": "2.3.8", + "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz", + "integrity": "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=" }, - "streamroller": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/streamroller/-/streamroller-1.0.6.tgz", - "integrity": "sha512-3QC47Mhv3/aZNFpDDVO44qQb9gwB9QggMEE0sQmkTAwBVYdBRWISdsywlkfm5II1Q5y/pmrHflti/IgmIzdDBg==", + "through2": { + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz", + "integrity": "sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==", "dev": true, "requires": { - "async": "^2.6.2", - "date-format": "^2.0.0", - "debug": "^3.2.6", - "fs-extra": "^7.0.1", - "lodash": "^4.17.14" - }, - "dependencies": { - "debug": { - "version": "3.2.6", - "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz", - "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==", - "dev": true, - "requires": { - "ms": "^2.1.1" - } - }, - "ms": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", - "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", - "dev": true - } + "readable-stream": "~2.3.6", + "xtend": "~4.0.1" } }, - "strict-uri-encode": { + "thunky": { "version": "1.1.0", - "resolved": "https://registry.npmjs.org/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz", - "integrity": "sha1-J5siXfHVgrH1TmWt3UNS4Y+qBxM=", + "resolved": "https://registry.npmjs.org/thunky/-/thunky-1.1.0.tgz", + "integrity": "sha512-eHY7nBftgThBqOyHGVN+l8gF0BucP09fMo0oO/Lb0w1OF80dJv+lDVpXG60WMQvkcxAkNybKsrEIE3ZtKGmPrA==", "dev": true }, - "string-width": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz", - "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==", - "requires": { - "emoji-regex": "^7.0.1", - "is-fullwidth-code-point": "^2.0.0", - "strip-ansi": "^5.1.0" - } + "timed-out": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/timed-out/-/timed-out-4.0.1.tgz", + "integrity": "sha1-8y6srFoXW+ol1/q1Zas+2HQe9W8=", + "dev": true }, - "string.prototype.padend": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/string.prototype.padend/-/string.prototype.padend-3.0.0.tgz", - "integrity": "sha1-86rvfBcZ8XDF6rHDK/eA2W4h8vA=", + "timers-browserify": { + "version": "2.0.11", + "resolved": "https://registry.npmjs.org/timers-browserify/-/timers-browserify-2.0.11.tgz", + "integrity": "sha512-60aV6sgJ5YEbzUdn9c8kYGIqOubPoUdqQCul3SBAsRCZ40s6Y5cMcrW4dt3/k/EsbLVJNl9n6Vz3fTc+k2GeKQ==", "dev": true, "requires": { - "define-properties": "^1.1.2", - "es-abstract": "^1.4.3", - "function-bind": "^1.0.2" + "setimmediate": "^1.0.4" } }, - "string_decoder": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", - "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", - "requires": { - "safe-buffer": "~5.1.0" - }, - "dependencies": { - "safe-buffer": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", - "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==" - } - } + "tiny-json-http": { + "version": "7.1.2", + "resolved": "https://registry.npmjs.org/tiny-json-http/-/tiny-json-http-7.1.2.tgz", + "integrity": "sha512-XB9Bu+ohdQso6ziPFNVqK+pcTt0l8BSRkW/CCBq0pUVlLxcYDsorpo7ae5yPhu2CF1xYgJuKVLF7cfOGeLCTlA==" }, - "strip-ansi": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz", - "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==", + "tmp": { + "version": "0.0.33", + "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz", + "integrity": "sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==", + "dev": true, "requires": { - "ansi-regex": "^4.1.0" + "os-tmpdir": "~1.0.2" } }, - "strip-bom": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz", - "integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=" - }, - "strip-eof": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/strip-eof/-/strip-eof-1.0.0.tgz", - "integrity": "sha1-u0P/VZim6wXYm1n80SnJgzE2Br8=" + "to-array": { + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/to-array/-/to-array-0.1.4.tgz", + "integrity": "sha1-F+bBH3PdTz10zaek/zI46a2b+JA=", + "dev": true }, - "strip-json-comments": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz", - "integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo=", + "to-arraybuffer": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/to-arraybuffer/-/to-arraybuffer-1.0.1.tgz", + "integrity": "sha1-fSKbH8xjfkZsoIEYCDanqr/4P0M=", "dev": true }, - "style-loader": { - "version": "0.23.1", - "resolved": "https://registry.npmjs.org/style-loader/-/style-loader-0.23.1.tgz", - "integrity": "sha512-XK+uv9kWwhZMZ1y7mysB+zoihsEj4wneFWAS5qoiLwzW0WzSqMrrsIy+a3zkQJq0ipFtBpX5W3MqyRIBF/WFGg==", - "dev": true, - "requires": { - "loader-utils": "^1.1.0", - "schema-utils": "^1.0.0" - } + "to-fast-properties": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-1.0.3.tgz", + "integrity": "sha1-uDVx+k2MJbguIxsG46MFXeTKGkc=", + "dev": true }, - "stylus": { - "version": "0.54.5", - "resolved": "https://registry.npmjs.org/stylus/-/stylus-0.54.5.tgz", - "integrity": "sha1-QrlWCTHKcJDOhRWnmLqeaqPW3Hk=", + "to-object-path": { + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/to-object-path/-/to-object-path-0.3.0.tgz", + "integrity": "sha1-KXWIt7Dn4KwI4E5nL4XB9JmeF68=", "dev": true, "requires": { - "css-parse": "1.7.x", - "debug": "*", - "glob": "7.0.x", - "mkdirp": "0.5.x", - "sax": "0.5.x", - "source-map": "0.1.x" - }, - "dependencies": { - "css-parse": { - "version": "1.7.0", - "resolved": "https://registry.npmjs.org/css-parse/-/css-parse-1.7.0.tgz", - "integrity": "sha1-Mh9s9zeCpv91ERE5D8BeLGV9jJs=", - "dev": true - }, - "glob": { - "version": "7.0.6", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.0.6.tgz", - "integrity": "sha1-IRuvr0nlJbjNkyYNFKsTYVKz9Xo=", - "dev": true, - "requires": { - "fs.realpath": "^1.0.0", - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "^3.0.2", - "once": "^1.3.0", - "path-is-absolute": "^1.0.0" - } - }, - "sax": { - "version": "0.5.8", - "resolved": "https://registry.npmjs.org/sax/-/sax-0.5.8.tgz", - "integrity": "sha1-1HLbIo6zMcJQaw6MFVJK25OdEsE=", - "dev": true - }, - "source-map": { - "version": "0.1.43", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.1.43.tgz", - "integrity": "sha1-wkvBRspRfBRx9drL4lcbK3+eM0Y=", - "dev": true, - "requires": { - "amdefine": ">=0.0.4" - } - } + "kind-of": "^3.0.2" } }, - "stylus-loader": { + "to-regex": { "version": "3.0.2", - "resolved": "https://registry.npmjs.org/stylus-loader/-/stylus-loader-3.0.2.tgz", - "integrity": "sha512-+VomPdZ6a0razP+zinir61yZgpw2NfljeSsdUF5kJuEzlo3khXhY19Fn6l8QQz1GRJGtMCo8nG5C04ePyV7SUA==", + "resolved": "https://registry.npmjs.org/to-regex/-/to-regex-3.0.2.tgz", + "integrity": "sha512-FWtleNAtZ/Ki2qtqej2CXTOayOH9bHDQF+Q48VpWyDXjbYxA4Yz8iDB31zXOBUlOHHKidDbqGVrTUvQMPmBGBw==", "dev": true, "requires": { - "loader-utils": "^1.0.2", - "lodash.clonedeep": "^4.5.0", - "when": "~3.6.x" + "define-property": "^2.0.2", + "extend-shallow": "^3.0.2", + "regex-not": "^1.0.2", + "safe-regex": "^1.1.0" } }, - "superagent": { - "version": "3.8.3", - "resolved": "https://registry.npmjs.org/superagent/-/superagent-3.8.3.tgz", - "integrity": "sha512-GLQtLMCoEIK4eDv6OGtkOoSMt3D+oq0y3dsxMuYuDvaNUvuT8eFBuLmfR0iYYzHC1e8hpzC6ZsxbuP6DIalMFA==", + "to-regex-range": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz", + "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==", "dev": true, "requires": { - "component-emitter": "^1.2.0", - "cookiejar": "^2.1.0", - "debug": "^3.1.0", - "extend": "^3.0.0", - "form-data": "^2.3.1", - "formidable": "^1.2.0", - "methods": "^1.1.1", - "mime": "^1.4.1", - "qs": "^6.5.1", - "readable-stream": "^2.3.5" + "is-number": "^7.0.0" } }, - "supertest": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/supertest/-/supertest-4.0.2.tgz", - "integrity": "sha512-1BAbvrOZsGA3YTCWqbmh14L0YEq0EGICX/nBnfkfVJn7SrxQV1I3pMYjSzG9y/7ZU2V9dWqyqk2POwxlb09duQ==", - "dev": true, - "requires": { - "methods": "^1.1.2", - "superagent": "^3.8.3" - } + "toidentifier": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.0.tgz", + "integrity": "sha512-yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw==" }, - "supports-color": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz", - "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==", + "toposort-class": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/toposort-class/-/toposort-class-1.0.1.tgz", + "integrity": "sha1-f/0feMi+KMO6Rc1OGj9e4ZO9mYg=" + }, + "touch": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/touch/-/touch-3.1.0.tgz", + "integrity": "sha512-WBx8Uy5TLtOSRtIq+M03/sKDrXCLHxwDcquSP2c43Le03/9serjQBIztjRz6FkJez9D/hleyAXTBGLwwZUw9lA==", + "dev": true, "requires": { - "has-flag": "^3.0.0" + "nopt": "~1.0.10" } }, - "swagger-stats": { - "version": "0.95.7", - "resolved": "https://registry.npmjs.org/swagger-stats/-/swagger-stats-0.95.7.tgz", - "integrity": "sha512-HGt3sZ8pcMEZCLpuAbISyuyiwYJMAjmNDI+8IPGnd+glrIeGdEEyqPBsxi0+2UT1SYjnrmjxtjPvBf/aHz51Og==", + "tough-cookie": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-3.0.1.tgz", + "integrity": "sha512-yQyJ0u4pZsv9D4clxO69OEjLWYw+jbgspjTue4lTQZLfV0c5l1VmK2y1JK8E9ahdpltPOaAThPcp5nKPUgSnsg==", "requires": { - "basic-auth": "^2.0.0", - "cookies": "^0.7.1", - "debug": "^3.1.0", - "moment": "^2.19.3", - "natives": "^1.1.6", - "path-to-regexp": "^2.1.0", - "prom-client": "^11.0.0", - "request": "^2.85.0", - "uuid": "^3.1.0" + "ip-regex": "^2.1.0", + "psl": "^1.1.28", + "punycode": "^2.1.1" + }, + "dependencies": { + "punycode": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz", + "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==" + } } }, - "symbol-observable": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/symbol-observable/-/symbol-observable-1.2.0.tgz", - "integrity": "sha512-e900nM8RRtGhlV36KGEU9k65K3mPb1WV70OdjfxlG2EAuM1noi/E/BaW/uMhL7bPEssK8QV57vN3esixjUvcXQ==", - "dev": true - }, - "symbol-tree": { - "version": "3.2.4", - "resolved": "https://registry.npmjs.org/symbol-tree/-/symbol-tree-3.2.4.tgz", - "integrity": "sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw==" - }, - "tapable": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/tapable/-/tapable-1.1.3.tgz", - "integrity": "sha512-4WK/bYZmj8xLr+HUCODHGF1ZFzsYffasLUgEiMBY4fgtltdO6B4WJtlSbPaDTLpYTcGVwM2qLnFTICEcNxs3kA==", - "dev": true - }, - "tdigest": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/tdigest/-/tdigest-0.1.1.tgz", - "integrity": "sha1-Ljyyw56kSeVdHmzZEReszKRYgCE=", + "tr46": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/tr46/-/tr46-1.0.1.tgz", + "integrity": "sha1-qLE/1r/SSJUZZ0zN5VujaTtwbQk=", "requires": { - "bintrees": "1.0.1" + "punycode": "^2.1.0" + }, + "dependencies": { + "punycode": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz", + "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==" + } } }, - "term-size": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/term-size/-/term-size-1.2.0.tgz", - "integrity": "sha1-RYuDiH8oj8Vtb/+/rSYuJmOO+mk=", - "dev": true, + "transformers": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/transformers/-/transformers-2.1.0.tgz", + "integrity": "sha1-XSPLNVYd2F3Gf7hIIwm0fVPM6ac=", "requires": { - "execa": "^0.7.0" + "css": "~1.0.8", + "promise": "~2.0", + "uglify-js": "~2.2.5" }, "dependencies": { - "cross-spawn": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz", - "integrity": "sha1-6L0O/uWPz/b4+UUQoKVUu/ojVEk=", - "dev": true, + "is-promise": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/is-promise/-/is-promise-1.0.1.tgz", + "integrity": "sha1-MVc3YcBX4zwukaq56W2gjO++duU=" + }, + "promise": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/promise/-/promise-2.0.0.tgz", + "integrity": "sha1-RmSKqdYFr10ucMMCS/WUNtoCuA4=", "requires": { - "lru-cache": "^4.0.1", - "shebang-command": "^1.2.0", - "which": "^1.2.9" + "is-promise": "~1" } }, - "execa": { - "version": "0.7.0", - "resolved": "https://registry.npmjs.org/execa/-/execa-0.7.0.tgz", - "integrity": "sha1-lEvs00zEHuMqY6n68nrVpl/Fl3c=", - "dev": true, + "source-map": { + "version": "0.1.43", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.1.43.tgz", + "integrity": "sha1-wkvBRspRfBRx9drL4lcbK3+eM0Y=", "requires": { - "cross-spawn": "^5.0.1", - "get-stream": "^3.0.0", - "is-stream": "^1.1.0", - "npm-run-path": "^2.0.0", - "p-finally": "^1.0.0", - "signal-exit": "^3.0.0", - "strip-eof": "^1.0.0" + "amdefine": ">=0.0.4" } }, - "get-stream": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz", - "integrity": "sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ=", - "dev": true + "uglify-js": { + "version": "2.2.5", + "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-2.2.5.tgz", + "integrity": "sha1-puAqcNg5eSuXgEiLe4sYTAlcmcc=", + "requires": { + "optimist": "~0.3.5", + "source-map": "~0.1.7" + } } } }, - "terraformer": { - "version": "1.0.9", - "resolved": "https://registry.npmjs.org/terraformer/-/terraformer-1.0.9.tgz", - "integrity": "sha512-YlmQ1fsMWTkKGDGibCRWgmLzrpDRUr63Q025LJ/taYQ6j1Yb8q9McKF7NBi6ACAyUXO6F/bl9w6v4MY307y5Ag==", - "requires": { - "@types/geojson": "^1.0.0" - } + "traverse": { + "version": "0.6.6", + "resolved": "https://registry.npmjs.org/traverse/-/traverse-0.6.6.tgz", + "integrity": "sha1-y99WD9e5r2MlAv7UD5GMFX6pcTc=", + "dev": true }, - "terraformer-wkt-parser": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/terraformer-wkt-parser/-/terraformer-wkt-parser-1.2.0.tgz", - "integrity": "sha512-QU3iA54St5lF8Za1jg1oj4NYc8sn5tCZ08aNSWDeGzrsaV48eZk1iAVWasxhNspYBoCqdHuoot1pUTUrE1AJ4w==", + "tree-kill": { + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/tree-kill/-/tree-kill-1.2.2.tgz", + "integrity": "sha512-L0Orpi8qGpRG//Nd+H90vFB+3iHnue1zSSGmNOOCh1GLJ7rUKVwV2HvijphGQS2UmhUZewS9VgvxYIdgr+fG1A==" + }, + "trim-right": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/trim-right/-/trim-right-1.0.1.tgz", + "integrity": "sha1-yy4SAwZ+DI3h9hQJS5/kVwTqYAM=", + "dev": true + }, + "ts-node": { + "version": "7.0.1", + "resolved": "https://registry.npmjs.org/ts-node/-/ts-node-7.0.1.tgz", + "integrity": "sha512-BVwVbPJRspzNh2yfslyT1PSbl5uIk03EZlb493RKHN4qej/D06n1cEhjlOJG69oFsE7OT8XjpTUcYf6pKTLMhw==", + "dev": true, "requires": { - "@types/geojson": "^1.0.0", - "terraformer": "~1.0.5" + "arrify": "^1.0.0", + "buffer-from": "^1.1.0", + "diff": "^3.1.0", + "make-error": "^1.1.1", + "minimist": "^1.2.0", + "mkdirp": "^0.5.1", + "source-map-support": "^0.5.6", + "yn": "^2.0.0" } }, - "terser": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/terser/-/terser-4.2.0.tgz", - "integrity": "sha512-6lPt7lZdZ/13icQJp8XasFOwZjFJkxFFIb/N1fhYEQNoNI3Ilo3KABZ9OocZvZoB39r6SiIk/0+v/bt8nZoSeA==", + "tslib": { + "version": "1.10.0", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.10.0.tgz", + "integrity": "sha512-qOebF53frne81cf0S9B41ByenJ3/IuH8yJKngAX35CmiZySA0khhkovshKK+jGCaMnVomla7gVlIcc3EvKPbTQ==" + }, + "tslint": { + "version": "5.11.0", + "resolved": "https://registry.npmjs.org/tslint/-/tslint-5.11.0.tgz", + "integrity": "sha1-mPMMAurjzecAYgHkwzywi0hYHu0=", "dev": true, "requires": { - "commander": "^2.20.0", - "source-map": "~0.6.1", - "source-map-support": "~0.5.12" + "babel-code-frame": "^6.22.0", + "builtin-modules": "^1.1.1", + "chalk": "^2.3.0", + "commander": "^2.12.1", + "diff": "^3.2.0", + "glob": "^7.1.1", + "js-yaml": "^3.7.0", + "minimatch": "^3.0.4", + "resolve": "^1.3.2", + "semver": "^5.3.0", + "tslib": "^1.8.0", + "tsutils": "^2.27.2" }, "dependencies": { - "source-map-support": { - "version": "0.5.13", - "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.13.tgz", - "integrity": "sha512-SHSKFHadjVA5oR4PPqhtAVdcBWwRYVd6g6cAXnIbRiIwc2EhPrTuKUBdSLvlEKyIP3GCf89fltvcZiP9MMFA1w==", - "dev": true, - "requires": { - "buffer-from": "^1.0.0", - "source-map": "^0.6.0" - } + "commander": { + "version": "2.20.3", + "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz", + "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==", + "dev": true } } }, - "terser-webpack-plugin": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-1.3.0.tgz", - "integrity": "sha512-W2YWmxPjjkUcOWa4pBEv4OP4er1aeQJlSo2UhtCFQCuRXEHjOFscO8VyWHj9JLlA0RzQb8Y2/Ta78XZvT54uGg==", + "tsscmp": { + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/tsscmp/-/tsscmp-1.0.6.tgz", + "integrity": "sha512-LxhtAkPDTkVCMQjt2h6eBVY28KCjikZqZfMcC15YBeNjkgUpdCfBu5HoiOTDu86v6smE8yOjyEktJ8hlbANHQA==" + }, + "tsutils": { + "version": "2.29.0", + "resolved": "https://registry.npmjs.org/tsutils/-/tsutils-2.29.0.tgz", + "integrity": "sha512-g5JVHCIJwzfISaXpXE1qvNalca5Jwob6FjI4AoPlqMusJ6ftFE7IkkFoMhVLRgK+4Kx3gkzb8UZK5t5yTTvEmA==", "dev": true, "requires": { - "cacache": "^11.3.2", - "find-cache-dir": "^2.0.0", - "is-wsl": "^1.1.0", - "loader-utils": "^1.2.3", - "schema-utils": "^1.0.0", - "serialize-javascript": "^1.7.0", - "source-map": "^0.6.1", - "terser": "^4.0.0", - "webpack-sources": "^1.3.0", - "worker-farm": "^1.7.0" + "tslib": "^1.8.1" } }, - "test-exclude": { - "version": "5.2.3", - "resolved": "https://registry.npmjs.org/test-exclude/-/test-exclude-5.2.3.tgz", - "integrity": "sha512-M+oxtseCFO3EDtAaGH7iiej3CBkzXqFMbzqYAACdzKui4eZA+pq3tZEwChvOdNfa7xxy8BfbmgJSIr43cC/+2g==", + "tty-browserify": { + "version": "0.0.0", + "resolved": "https://registry.npmjs.org/tty-browserify/-/tty-browserify-0.0.0.tgz", + "integrity": "sha1-oVe6QC2iTpv5V/mqadUk7tQpAaY=", + "dev": true + }, + "tunnel-agent": { + "version": "0.6.0", + "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz", + "integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=", "requires": { - "glob": "^7.1.3", - "minimatch": "^3.0.4", - "read-pkg-up": "^4.0.0", - "require-main-filename": "^2.0.0" + "safe-buffer": "^5.0.1" } }, - "through": { - "version": "2.3.8", - "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz", - "integrity": "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=" + "tweetnacl": { + "version": "0.14.5", + "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz", + "integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=" }, - "through2": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz", - "integrity": "sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==", + "type-check": { + "version": "0.3.2", + "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz", + "integrity": "sha1-WITKtRLPHTVeP7eE8wgEsrUg23I=", + "requires": { + "prelude-ls": "~1.1.2" + } + }, + "type-detect": { + "version": "4.0.8", + "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.0.8.tgz", + "integrity": "sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==", + "dev": true + }, + "type-is": { + "version": "1.6.18", + "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz", + "integrity": "sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==", "dev": true, "requires": { - "readable-stream": "~2.3.6", - "xtend": "~4.0.1" + "media-typer": "0.3.0", + "mime-types": "~2.1.24" } }, - "thunky": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/thunky/-/thunky-1.0.3.tgz", - "integrity": "sha512-YwT8pjmNcAXBZqrubu22P4FYsh2D4dxRmnWBOL8Jk8bUcRUtc5326kx32tuTmFDAZtLOGEVNl8POAR8j896Iow==", + "typedarray": { + "version": "0.0.6", + "resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz", + "integrity": "sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=", "dev": true }, - "timed-out": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/timed-out/-/timed-out-4.0.1.tgz", - "integrity": "sha1-8y6srFoXW+ol1/q1Zas+2HQe9W8=", + "typescript": { + "version": "3.5.3", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.5.3.tgz", + "integrity": "sha512-ACzBtm/PhXBDId6a6sDJfroT2pOWt/oOnk4/dElG5G33ZL776N3Y6/6bKZJBFpd+b05F3Ct9qDjMeJmRWtE2/g==", "dev": true }, - "timers-browserify": { - "version": "2.0.11", - "resolved": "https://registry.npmjs.org/timers-browserify/-/timers-browserify-2.0.11.tgz", - "integrity": "sha512-60aV6sgJ5YEbzUdn9c8kYGIqOubPoUdqQCul3SBAsRCZ40s6Y5cMcrW4dt3/k/EsbLVJNl9n6Vz3fTc+k2GeKQ==", - "dev": true, + "ua-parser-js": { + "version": "0.7.21", + "resolved": "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-0.7.21.tgz", + "integrity": "sha512-+O8/qh/Qj8CgC6eYBVBykMrNtp5Gebn4dlGD/kKXVkJNDwyrAwSIqwz8CDf+tsAIWVycKcku6gIXJ0qwx/ZXaQ==" + }, + "uglify-js": { + "version": "2.8.29", + "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-2.8.29.tgz", + "integrity": "sha1-KcVzMUgFe7Th913zW3qcty5qWd0=", "requires": { - "setimmediate": "^1.0.4" + "source-map": "~0.5.1", + "uglify-to-browserify": "~1.0.0", + "yargs": "~3.10.0" + }, + "dependencies": { + "camelcase": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-1.2.1.tgz", + "integrity": "sha1-m7UwTS4LVmmLLHWLCKPqqdqlijk=" + }, + "cliui": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/cliui/-/cliui-2.1.0.tgz", + "integrity": "sha1-S0dXYP+AJkx2LDoXGQMukcf+oNE=", + "requires": { + "center-align": "^0.1.1", + "right-align": "^0.1.1", + "wordwrap": "0.0.2" + } + }, + "source-map": { + "version": "0.5.7", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz", + "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=" + }, + "wordwrap": { + "version": "0.0.2", + "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz", + "integrity": "sha1-t5Zpu0LstAn4PVg8rVLKF+qhZD8=" + }, + "yargs": { + "version": "3.10.0", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-3.10.0.tgz", + "integrity": "sha1-9+572FfdfB0tOMDnTvvWgdFDH9E=", + "requires": { + "camelcase": "^1.0.2", + "cliui": "^2.1.0", + "decamelize": "^1.0.0", + "window-size": "0.1.0" + } + } } }, - "tiny-json-http": { - "version": "7.1.2", - "resolved": "https://registry.npmjs.org/tiny-json-http/-/tiny-json-http-7.1.2.tgz", - "integrity": "sha512-XB9Bu+ohdQso6ziPFNVqK+pcTt0l8BSRkW/CCBq0pUVlLxcYDsorpo7ae5yPhu2CF1xYgJuKVLF7cfOGeLCTlA==" + "uglify-to-browserify": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz", + "integrity": "sha1-bgkk1r2mta/jSeOabWMoUKD4grc=", + "optional": true + }, + "ultron": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/ultron/-/ultron-1.1.1.tgz", + "integrity": "sha512-UIEXBNeYmKptWH6z8ZnqTeS8fV74zG0/eRU9VGkpzz+LIJNs8W/zM/L+7ctCkRrgbNnnR0xxw4bKOr0cW0N0Og==", + "dev": true }, - "tmp": { - "version": "0.0.33", - "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz", - "integrity": "sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==", + "undefsafe": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/undefsafe/-/undefsafe-2.0.2.tgz", + "integrity": "sha1-Il9rngM3Zj4Njnz9aG/Cg2zKznY=", "dev": true, "requires": { - "os-tmpdir": "~1.0.2" + "debug": "^2.2.0" + }, + "dependencies": { + "debug": { + "version": "2.6.9", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", + "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", + "dev": true, + "requires": { + "ms": "2.0.0" + } + } } }, - "to-array": { - "version": "0.1.4", - "resolved": "https://registry.npmjs.org/to-array/-/to-array-0.1.4.tgz", - "integrity": "sha1-F+bBH3PdTz10zaek/zI46a2b+JA=", - "dev": true + "underscore": { + "version": "1.8.3", + "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.8.3.tgz", + "integrity": "sha1-Tz+1OxBuYJf8+ctBCfKl6b36UCI=" }, - "to-arraybuffer": { + "union-value": { "version": "1.0.1", - "resolved": "https://registry.npmjs.org/to-arraybuffer/-/to-arraybuffer-1.0.1.tgz", - "integrity": "sha1-fSKbH8xjfkZsoIEYCDanqr/4P0M=", - "dev": true - }, - "to-fast-properties": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-1.0.3.tgz", - "integrity": "sha1-uDVx+k2MJbguIxsG46MFXeTKGkc=", - "dev": true - }, - "to-object-path": { - "version": "0.3.0", - "resolved": "https://registry.npmjs.org/to-object-path/-/to-object-path-0.3.0.tgz", - "integrity": "sha1-KXWIt7Dn4KwI4E5nL4XB9JmeF68=", + "resolved": "https://registry.npmjs.org/union-value/-/union-value-1.0.1.tgz", + "integrity": "sha512-tJfXmxMeWYnczCVs7XAEvIV7ieppALdyepWMkHkwciRpZraG/xwT+s2JN8+pr1+8jCRf80FFzvr+MpQeeoF4Xg==", "dev": true, "requires": { - "kind-of": "^3.0.2" + "arr-union": "^3.1.0", + "get-value": "^2.0.6", + "is-extendable": "^0.1.1", + "set-value": "^2.0.1" } }, - "to-regex": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/to-regex/-/to-regex-3.0.2.tgz", - "integrity": "sha512-FWtleNAtZ/Ki2qtqej2CXTOayOH9bHDQF+Q48VpWyDXjbYxA4Yz8iDB31zXOBUlOHHKidDbqGVrTUvQMPmBGBw==", + "unique-filename": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/unique-filename/-/unique-filename-1.1.1.tgz", + "integrity": "sha512-Vmp0jIp2ln35UTXuryvjzkjGdRyf9b2lTXuSYUiPmzRcl3FDtYqAwOnTJkAngD9SWhnoJzDbTKwaOrZ+STtxNQ==", "dev": true, "requires": { - "define-property": "^2.0.2", - "extend-shallow": "^3.0.2", - "regex-not": "^1.0.2", - "safe-regex": "^1.1.0" + "unique-slug": "^2.0.0" } }, - "to-regex-range": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz", - "integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=", + "unique-slug": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/unique-slug/-/unique-slug-2.0.2.tgz", + "integrity": "sha512-zoWr9ObaxALD3DOPfjPSqxt4fnZiWblxHIgeWqW8x7UqDzEtHEQLzji2cuJYQFCU6KmoJikOYAZlrTHHebjx2w==", "dev": true, "requires": { - "is-number": "^3.0.0", - "repeat-string": "^1.6.1" + "imurmurhash": "^0.1.4" } }, - "toidentifier": { + "unique-string": { "version": "1.0.0", - "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.0.tgz", - "integrity": "sha512-yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw==" - }, - "toposort-class": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/toposort-class/-/toposort-class-1.0.1.tgz", - "integrity": "sha1-f/0feMi+KMO6Rc1OGj9e4ZO9mYg=" - }, - "touch": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/touch/-/touch-3.1.0.tgz", - "integrity": "sha512-WBx8Uy5TLtOSRtIq+M03/sKDrXCLHxwDcquSP2c43Le03/9serjQBIztjRz6FkJez9D/hleyAXTBGLwwZUw9lA==", + "resolved": "https://registry.npmjs.org/unique-string/-/unique-string-1.0.0.tgz", + "integrity": "sha1-nhBXzKhRq7kzmPizOuGHuZyuwRo=", "dev": true, "requires": { - "nopt": "~1.0.10" - }, - "dependencies": { - "nopt": { - "version": "1.0.10", - "resolved": "https://registry.npmjs.org/nopt/-/nopt-1.0.10.tgz", - "integrity": "sha1-bd0hvSoxQXuScn3Vhfim83YI6+4=", - "dev": true, - "requires": { - "abbrev": "1" - } - } + "crypto-random-string": "^1.0.0" } }, - "tough-cookie": { - "version": "2.3.4", - "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.4.tgz", - "integrity": "sha512-TZ6TTfI5NtZnuyy/Kecv+CnoROnyXn2DN97LontgQpCwsX2XyLYCC0ENhYkehSOwAp8rTQKc/NUIF7BkQ5rKLA==", + "universal-analytics": { + "version": "0.4.20", + "resolved": "https://registry.npmjs.org/universal-analytics/-/universal-analytics-0.4.20.tgz", + "integrity": "sha512-gE91dtMvNkjO+kWsPstHRtSwHXz0l2axqptGYp5ceg4MsuurloM0PU3pdOfpb5zBXUvyjT4PwhWK2m39uczZuw==", + "dev": true, "requires": { - "punycode": "^1.4.1" - }, - "dependencies": { - "punycode": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz", - "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4=" - } + "debug": "^3.0.0", + "request": "^2.88.0", + "uuid": "^3.0.0" } }, - "tr46": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/tr46/-/tr46-1.0.1.tgz", - "integrity": "sha1-qLE/1r/SSJUZZ0zN5VujaTtwbQk=", - "requires": { - "punycode": "^2.1.0" - }, - "dependencies": { - "punycode": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz", - "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==" - } - } + "universalify": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz", + "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==", + "dev": true }, - "transformers": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/transformers/-/transformers-2.1.0.tgz", - "integrity": "sha1-XSPLNVYd2F3Gf7hIIwm0fVPM6ac=", + "unpipe": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz", + "integrity": "sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw=" + }, + "unset-value": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/unset-value/-/unset-value-1.0.0.tgz", + "integrity": "sha1-g3aHP30jNRef+x5vw6jtDfyKtVk=", + "dev": true, "requires": { - "css": "~1.0.8", - "promise": "~2.0", - "uglify-js": "~2.2.5" + "has-value": "^0.3.1", + "isobject": "^3.0.0" }, "dependencies": { - "is-promise": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/is-promise/-/is-promise-1.0.1.tgz", - "integrity": "sha1-MVc3YcBX4zwukaq56W2gjO++duU=" - }, - "optimist": { - "version": "0.3.7", - "resolved": "https://registry.npmjs.org/optimist/-/optimist-0.3.7.tgz", - "integrity": "sha1-yQlBrVnkJzMokjB00s8ufLxuwNk=", - "requires": { - "wordwrap": "~0.0.2" - } - }, - "promise": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/promise/-/promise-2.0.0.tgz", - "integrity": "sha1-RmSKqdYFr10ucMMCS/WUNtoCuA4=", - "requires": { - "is-promise": "~1" - } - }, - "source-map": { - "version": "0.1.43", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.1.43.tgz", - "integrity": "sha1-wkvBRspRfBRx9drL4lcbK3+eM0Y=", + "has-value": { + "version": "0.3.1", + "resolved": "https://registry.npmjs.org/has-value/-/has-value-0.3.1.tgz", + "integrity": "sha1-ex9YutpiyoJ+wKIHgCVlSEWZXh8=", + "dev": true, "requires": { - "amdefine": ">=0.0.4" + "get-value": "^2.0.3", + "has-values": "^0.1.4", + "isobject": "^2.0.0" + }, + "dependencies": { + "isobject": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz", + "integrity": "sha1-8GVWEJaj8dou9GJy+BXIQNh+DIk=", + "dev": true, + "requires": { + "isarray": "1.0.0" + } + } } }, - "uglify-js": { - "version": "2.2.5", - "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-2.2.5.tgz", - "integrity": "sha1-puAqcNg5eSuXgEiLe4sYTAlcmcc=", - "requires": { - "optimist": "~0.3.5", - "source-map": "~0.1.7" - } + "has-values": { + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/has-values/-/has-values-0.1.4.tgz", + "integrity": "sha1-bWHeldkd/Km5oCCJrThL/49it3E=", + "dev": true } } }, - "traverse": { - "version": "0.6.6", - "resolved": "https://registry.npmjs.org/traverse/-/traverse-0.6.6.tgz", - "integrity": "sha1-y99WD9e5r2MlAv7UD5GMFX6pcTc=", + "unzip-response": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/unzip-response/-/unzip-response-2.0.1.tgz", + "integrity": "sha1-0vD3N9FrBhXnKmk17QQhRXLVb5c=", "dev": true }, - "tree-kill": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/tree-kill/-/tree-kill-1.2.1.tgz", - "integrity": "sha512-4hjqbObwlh2dLyW4tcz0Ymw0ggoaVDMveUB9w8kFSQScdRLo0gxO9J7WFcUBo+W3C1TLdFIEwNOWebgZZ0RH9Q==" - }, - "trim-right": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/trim-right/-/trim-right-1.0.1.tgz", - "integrity": "sha1-yy4SAwZ+DI3h9hQJS5/kVwTqYAM=", + "upath": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/upath/-/upath-1.2.0.tgz", + "integrity": "sha512-aZwGpamFO61g3OlfT7OQCHqhGnW43ieH9WZeP7QxN/G/jS4jfqUkZxoryvJgVPEcrl5NL/ggHsSmLMHuH64Lhg==", "dev": true }, - "ts-node": { - "version": "7.0.1", - "resolved": "https://registry.npmjs.org/ts-node/-/ts-node-7.0.1.tgz", - "integrity": "sha512-BVwVbPJRspzNh2yfslyT1PSbl5uIk03EZlb493RKHN4qej/D06n1cEhjlOJG69oFsE7OT8XjpTUcYf6pKTLMhw==", + "update-notifier": { + "version": "2.5.0", + "resolved": "https://registry.npmjs.org/update-notifier/-/update-notifier-2.5.0.tgz", + "integrity": "sha512-gwMdhgJHGuj/+wHJJs9e6PcCszpxR1b236igrOkUofGhqJuG+amlIKwApH1IW1WWl7ovZxsX49lMBWLxSdm5Dw==", "dev": true, "requires": { - "arrify": "^1.0.0", - "buffer-from": "^1.1.0", - "diff": "^3.1.0", - "make-error": "^1.1.1", - "minimist": "^1.2.0", - "mkdirp": "^0.5.1", - "source-map-support": "^0.5.6", - "yn": "^2.0.0" + "boxen": "^1.2.1", + "chalk": "^2.0.1", + "configstore": "^3.0.0", + "import-lazy": "^2.1.0", + "is-ci": "^1.0.10", + "is-installed-globally": "^0.1.0", + "is-npm": "^1.0.0", + "latest-version": "^3.0.0", + "semver-diff": "^2.0.0", + "xdg-basedir": "^3.0.0" + } + }, + "uri-js": { + "version": "4.2.2", + "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.2.2.tgz", + "integrity": "sha512-KY9Frmirql91X2Qgjry0Wd4Y+YTdrdZheS8TFwvkbLWf/G5KNJDCh6pKL5OZctEW4+0Baa5idK2ZQuELRwPznQ==", + "requires": { + "punycode": "^2.1.0" }, "dependencies": { - "minimist": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", - "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=", - "dev": true + "punycode": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz", + "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==" } } }, - "tslib": { - "version": "1.10.0", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.10.0.tgz", - "integrity": "sha512-qOebF53frne81cf0S9B41ByenJ3/IuH8yJKngAX35CmiZySA0khhkovshKK+jGCaMnVomla7gVlIcc3EvKPbTQ==" + "urix": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/urix/-/urix-0.1.0.tgz", + "integrity": "sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI=", + "dev": true }, - "tslint": { - "version": "5.11.0", - "resolved": "https://registry.npmjs.org/tslint/-/tslint-5.11.0.tgz", - "integrity": "sha1-mPMMAurjzecAYgHkwzywi0hYHu0=", - "dev": true, + "url": { + "version": "0.11.0", + "resolved": "https://registry.npmjs.org/url/-/url-0.11.0.tgz", + "integrity": "sha1-ODjpfPxgUh63PFJajlW/3Z4uKPE=", "requires": { - "babel-code-frame": "^6.22.0", - "builtin-modules": "^1.1.1", - "chalk": "^2.3.0", - "commander": "^2.12.1", - "diff": "^3.2.0", - "glob": "^7.1.1", - "js-yaml": "^3.7.0", - "minimatch": "^3.0.4", - "resolve": "^1.3.2", - "semver": "^5.3.0", - "tslib": "^1.8.0", - "tsutils": "^2.27.2" + "punycode": "1.3.2", + "querystring": "0.2.0" } }, - "tsutils": { - "version": "2.29.0", - "resolved": "https://registry.npmjs.org/tsutils/-/tsutils-2.29.0.tgz", - "integrity": "sha512-g5JVHCIJwzfISaXpXE1qvNalca5Jwob6FjI4AoPlqMusJ6ftFE7IkkFoMhVLRgK+4Kx3gkzb8UZK5t5yTTvEmA==", + "url-parse": { + "version": "1.4.7", + "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.4.7.tgz", + "integrity": "sha512-d3uaVyzDB9tQoSXFvuSUNFibTd9zxd2bkVrDRvF5TmvWWQwqE4lgYJ5m+x1DbecWkw+LK4RNl2CU1hHuOKPVlg==", + "requires": { + "querystringify": "^2.1.1", + "requires-port": "^1.0.0" + } + }, + "url-parse-lax": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/url-parse-lax/-/url-parse-lax-1.0.0.tgz", + "integrity": "sha1-evjzA2Rem9eaJy56FKxovAYJ2nM=", "dev": true, "requires": { - "tslib": "^1.8.1" + "prepend-http": "^1.0.1" } }, - "tty-browserify": { - "version": "0.0.0", - "resolved": "https://registry.npmjs.org/tty-browserify/-/tty-browserify-0.0.0.tgz", - "integrity": "sha1-oVe6QC2iTpv5V/mqadUk7tQpAaY=", + "use": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/use/-/use-3.1.1.tgz", + "integrity": "sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ==", "dev": true }, - "tunnel-agent": { - "version": "0.6.0", - "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz", - "integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=", + "useragent": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/useragent/-/useragent-2.3.0.tgz", + "integrity": "sha512-4AoH4pxuSvHCjqLO04sU6U/uE65BYza8l/KKBS0b0hnUPWi+cQ2BpeTEwejCSx9SPV5/U03nniDTrWx5NrmKdw==", + "dev": true, "requires": { - "safe-buffer": "^5.0.1" + "lru-cache": "4.1.x", + "tmp": "0.0.x" } }, - "tweetnacl": { - "version": "0.14.5", - "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz", - "integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=" - }, - "type-check": { - "version": "0.3.2", - "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz", - "integrity": "sha1-WITKtRLPHTVeP7eE8wgEsrUg23I=", + "util": { + "version": "0.11.1", + "resolved": "https://registry.npmjs.org/util/-/util-0.11.1.tgz", + "integrity": "sha512-HShAsny+zS2TZfaXxD9tYj4HQGlBezXZMZuM/S5PKLLoZkShZiGk9o5CzukI1LVHZvjdvZ2Sj1aW/Ndn2NB/HQ==", "requires": { - "prelude-ls": "~1.1.2" + "inherits": "2.0.3" + }, + "dependencies": { + "inherits": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz", + "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=" + } } }, - "type-detect": { - "version": "4.0.8", - "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.0.8.tgz", - "integrity": "sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==", - "dev": true + "util-deprecate": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", + "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=" }, - "type-is": { - "version": "1.6.18", - "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz", - "integrity": "sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==", + "util-promisify": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/util-promisify/-/util-promisify-2.1.0.tgz", + "integrity": "sha1-PCI2R2xNMsX/PEcAKt18E7moKlM=", "dev": true, "requires": { - "media-typer": "0.3.0", - "mime-types": "~2.1.24" + "object.getownpropertydescriptors": "^2.0.3" } }, - "typedarray": { - "version": "0.0.6", - "resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz", - "integrity": "sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=", + "utils-merge": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz", + "integrity": "sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM=", "dev": true }, - "typescript": { - "version": "3.5.3", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.5.3.tgz", - "integrity": "sha512-ACzBtm/PhXBDId6a6sDJfroT2pOWt/oOnk4/dElG5G33ZL776N3Y6/6bKZJBFpd+b05F3Ct9qDjMeJmRWtE2/g==", - "dev": true + "uuid": { + "version": "3.4.0", + "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz", + "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==" }, - "ua-parser-js": { - "version": "0.7.20", - "resolved": "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-0.7.20.tgz", - "integrity": "sha512-8OaIKfzL5cpx8eCMAhhvTlft8GYF8b2eQr6JkCyVdrgjcytyOmPCXrqXFcUnhonRpLlh5yxEZVohm6mzaowUOw==" + "v8-to-istanbul": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/v8-to-istanbul/-/v8-to-istanbul-2.1.0.tgz", + "integrity": "sha512-3XHoQH/BjY5vO26v2puZ4hs54z5O4s5R8AfKH5ktu0hANWNtYDOFwB1iBstkGISgEpohs/U81vY8B0KbQz3N2A==" }, - "uglify-js": { - "version": "3.6.0", - "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.6.0.tgz", - "integrity": "sha512-W+jrUHJr3DXKhrsS7NUVxn3zqMOFn0hL/Ei6v0anCIMoKC93TjcflTagwIHLW7SfMFfiQuktQyFVCFHGUE0+yg==", - "optional": true, + "validate-npm-package-license": { + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz", + "integrity": "sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==", "requires": { - "commander": "~2.20.0", - "source-map": "~0.6.1" + "spdx-correct": "^3.0.0", + "spdx-expression-parse": "^3.0.0" } }, - "uglify-to-browserify": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz", - "integrity": "sha1-bgkk1r2mta/jSeOabWMoUKD4grc=", - "optional": true - }, - "ultron": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/ultron/-/ultron-1.1.1.tgz", - "integrity": "sha512-UIEXBNeYmKptWH6z8ZnqTeS8fV74zG0/eRU9VGkpzz+LIJNs8W/zM/L+7ctCkRrgbNnnR0xxw4bKOr0cW0N0Og==", - "dev": true - }, - "undefsafe": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/undefsafe/-/undefsafe-2.0.2.tgz", - "integrity": "sha1-Il9rngM3Zj4Njnz9aG/Cg2zKznY=", + "validate-npm-package-name": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/validate-npm-package-name/-/validate-npm-package-name-3.0.0.tgz", + "integrity": "sha1-X6kS2B630MdK/BQN5zF/DKffQ34=", "dev": true, "requires": { - "debug": "^2.2.0" - }, - "dependencies": { - "debug": { - "version": "2.6.9", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", - "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", - "dev": true, - "requires": { - "ms": "2.0.0" - } - } + "builtins": "^1.0.3" } }, - "underscore": { - "version": "1.8.3", - "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.8.3.tgz", - "integrity": "sha1-Tz+1OxBuYJf8+ctBCfKl6b36UCI=" + "validator": { + "version": "10.8.0", + "resolved": "https://registry.npmjs.org/validator/-/validator-10.8.0.tgz", + "integrity": "sha512-mXqMxfCh5NLsVgYVKl9WvnHNDPCcbNppHSPPowu0VjtSsGWVY+z8hJF44edLR1nbLNzi3jYoYsIl8KZpioIk6g==" }, - "union-value": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/union-value/-/union-value-1.0.1.tgz", - "integrity": "sha512-tJfXmxMeWYnczCVs7XAEvIV7ieppALdyepWMkHkwciRpZraG/xwT+s2JN8+pr1+8jCRf80FFzvr+MpQeeoF4Xg==", - "dev": true, + "vary": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz", + "integrity": "sha1-IpnwLG3tMNSllhsLn3RSShj2NPw=", + "dev": true + }, + "verror": { + "version": "1.10.0", + "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz", + "integrity": "sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=", "requires": { - "arr-union": "^3.1.0", - "get-value": "^2.0.6", - "is-extendable": "^0.1.1", - "set-value": "^2.0.1" + "assert-plus": "^1.0.0", + "core-util-is": "1.0.2", + "extsprintf": "^1.2.0" } }, - "unique-filename": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/unique-filename/-/unique-filename-1.1.1.tgz", - "integrity": "sha512-Vmp0jIp2ln35UTXuryvjzkjGdRyf9b2lTXuSYUiPmzRcl3FDtYqAwOnTJkAngD9SWhnoJzDbTKwaOrZ+STtxNQ==", - "dev": true, + "vm-browserify": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/vm-browserify/-/vm-browserify-1.1.2.tgz", + "integrity": "sha512-2ham8XPWTONajOR0ohOKOHXkm3+gaBmGut3SRuu75xLd/RRaY6vqgh8NBYYk7+RW3u5AtzPQZG8F10LHkl0lAQ==", + "dev": true + }, + "void-elements": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/void-elements/-/void-elements-2.0.1.tgz", + "integrity": "sha1-wGavtYK7HLQSjWDqkjkulNXp2+w=" + }, + "w3c-hr-time": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/w3c-hr-time/-/w3c-hr-time-1.0.1.tgz", + "integrity": "sha1-gqwr/2PZUOqeMYmlimViX+3xkEU=", "requires": { - "unique-slug": "^2.0.0" + "browser-process-hrtime": "^0.1.2" } }, - "unique-slug": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/unique-slug/-/unique-slug-2.0.2.tgz", - "integrity": "sha512-zoWr9ObaxALD3DOPfjPSqxt4fnZiWblxHIgeWqW8x7UqDzEtHEQLzji2cuJYQFCU6KmoJikOYAZlrTHHebjx2w==", - "dev": true, + "w3c-xmlserializer": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/w3c-xmlserializer/-/w3c-xmlserializer-1.1.2.tgz", + "integrity": "sha512-p10l/ayESzrBMYWRID6xbuCKh2Fp77+sA0doRuGn4tTIMrrZVeqfpKjXHY+oDh3K4nLdPgNwMTVP6Vp4pvqbNg==", "requires": { - "imurmurhash": "^0.1.4" + "domexception": "^1.0.1", + "webidl-conversions": "^4.0.2", + "xml-name-validator": "^3.0.0" } }, - "unique-string": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/unique-string/-/unique-string-1.0.0.tgz", - "integrity": "sha1-nhBXzKhRq7kzmPizOuGHuZyuwRo=", - "dev": true, + "walk": { + "version": "2.3.14", + "resolved": "https://registry.npmjs.org/walk/-/walk-2.3.14.tgz", + "integrity": "sha512-5skcWAUmySj6hkBdH6B6+3ddMjVQYH5Qy9QGbPmN8kVmLteXk+yVXg+yfk1nbX30EYakahLrr8iPcCxJQSCBeg==", "requires": { - "crypto-random-string": "^1.0.0" + "foreachasync": "^3.0.0" } }, - "universal-analytics": { - "version": "0.4.20", - "resolved": "https://registry.npmjs.org/universal-analytics/-/universal-analytics-0.4.20.tgz", - "integrity": "sha512-gE91dtMvNkjO+kWsPstHRtSwHXz0l2axqptGYp5ceg4MsuurloM0PU3pdOfpb5zBXUvyjT4PwhWK2m39uczZuw==", + "watchpack": { + "version": "1.6.0", + "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-1.6.0.tgz", + "integrity": "sha512-i6dHe3EyLjMmDlU1/bGQpEw25XSjkJULPuAVKCbNRefQVq48yXKUpwg538F7AZTf9kyr57zj++pQFltUa5H7yA==", "dev": true, "requires": { - "debug": "^3.0.0", - "request": "^2.88.0", - "uuid": "^3.0.0" + "chokidar": "^2.0.2", + "graceful-fs": "^4.1.2", + "neo-async": "^2.5.0" }, "dependencies": { - "ajv": { - "version": "6.10.2", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.10.2.tgz", - "integrity": "sha512-TXtUUEYHuaTEbLZWIKUr5pmBuhDLy+8KYtPYdcV8qC+pOZL+NKqYwvWSRrVXHn+ZmRRAu8vJTAznH7Oag6RVRw==", + "anymatch": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-2.0.0.tgz", + "integrity": "sha512-5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw==", "dev": true, "requires": { - "fast-deep-equal": "^2.0.1", - "fast-json-stable-stringify": "^2.0.0", - "json-schema-traverse": "^0.4.1", - "uri-js": "^4.2.2" + "micromatch": "^3.1.4", + "normalize-path": "^2.1.1" + }, + "dependencies": { + "normalize-path": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz", + "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=", + "dev": true, + "requires": { + "remove-trailing-separator": "^1.0.1" + } + } } }, - "fast-deep-equal": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz", - "integrity": "sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk=", + "binary-extensions": { + "version": "1.13.1", + "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.13.1.tgz", + "integrity": "sha512-Un7MIEDdUC5gNpcGDV97op1Ywk748MpHcFTHoYs6qnj1Z3j7I53VG3nwZhKzoBZmbdRNnb6WRdFlwl7tSDuZGw==", "dev": true }, - "har-validator": { - "version": "5.1.3", - "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.1.3.tgz", - "integrity": "sha512-sNvOCzEQNr/qrvJgc3UG/kD4QtlHycrzwS+6mfTrrSq97BvaYcPZZI1ZSqGSPR73Cxn4LKTD4PttRwfU7jWq5g==", + "braces": { + "version": "2.3.2", + "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz", + "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==", "dev": true, "requires": { - "ajv": "^6.5.5", - "har-schema": "^2.0.0" + "arr-flatten": "^1.1.0", + "array-unique": "^0.3.2", + "extend-shallow": "^2.0.1", + "fill-range": "^4.0.0", + "isobject": "^3.0.1", + "repeat-element": "^1.1.2", + "snapdragon": "^0.8.1", + "snapdragon-node": "^2.0.1", + "split-string": "^3.0.2", + "to-regex": "^3.0.1" } }, - "json-schema-traverse": { - "version": "0.4.1", - "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz", - "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==", - "dev": true - }, - "oauth-sign": { - "version": "0.9.0", - "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.9.0.tgz", - "integrity": "sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==", - "dev": true - }, - "punycode": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz", - "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4=", - "dev": true + "chokidar": { + "version": "2.1.8", + "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.1.8.tgz", + "integrity": "sha512-ZmZUazfOzf0Nve7duiCKD23PFSCs4JPoYyccjUFF3aQkQadqBhfzhjkwBH2mNOG9cTBwhamM37EIsIkZw3nRgg==", + "dev": true, + "requires": { + "anymatch": "^2.0.0", + "async-each": "^1.0.1", + "braces": "^2.3.2", + "fsevents": "^1.2.7", + "glob-parent": "^3.1.0", + "inherits": "^2.0.3", + "is-binary-path": "^1.0.0", + "is-glob": "^4.0.0", + "normalize-path": "^3.0.0", + "path-is-absolute": "^1.0.0", + "readdirp": "^2.2.1", + "upath": "^1.1.1" + } }, - "request": { - "version": "2.88.0", - "resolved": "https://registry.npmjs.org/request/-/request-2.88.0.tgz", - "integrity": "sha512-NAqBSrijGLZdM0WZNsInLJpkJokL72XYjUpnB0iwsRgxh7dB6COrHnTBNwN0E+lHDAJzu7kLAkDeY08z2/A0hg==", + "extend-shallow": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", + "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", "dev": true, "requires": { - "aws-sign2": "~0.7.0", - "aws4": "^1.8.0", - "caseless": "~0.12.0", - "combined-stream": "~1.0.6", - "extend": "~3.0.2", - "forever-agent": "~0.6.1", - "form-data": "~2.3.2", - "har-validator": "~5.1.0", - "http-signature": "~1.2.0", - "is-typedarray": "~1.0.0", - "isstream": "~0.1.2", - "json-stringify-safe": "~5.0.1", - "mime-types": "~2.1.19", - "oauth-sign": "~0.9.0", - "performance-now": "^2.1.0", - "qs": "~6.5.2", - "safe-buffer": "^5.1.2", - "tough-cookie": "~2.4.3", - "tunnel-agent": "^0.6.0", - "uuid": "^3.3.2" + "is-extendable": "^0.1.0" } }, - "tough-cookie": { - "version": "2.4.3", - "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.4.3.tgz", - "integrity": "sha512-Q5srk/4vDM54WJsJio3XNn6K2sCG+CQ8G5Wz6bZhRZoAe/+TxjWB/GlFAnYEbkYVlON9FMk/fE3h2RLpPXo4lQ==", + "fill-range": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz", + "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=", "dev": true, "requires": { - "psl": "^1.1.24", - "punycode": "^1.4.1" + "extend-shallow": "^2.0.1", + "is-number": "^3.0.0", + "repeat-string": "^1.6.1", + "to-regex-range": "^2.1.0" } - } - } - }, - "universalify": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz", - "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==", - "dev": true - }, - "unpipe": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz", - "integrity": "sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw=" - }, - "unset-value": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/unset-value/-/unset-value-1.0.0.tgz", - "integrity": "sha1-g3aHP30jNRef+x5vw6jtDfyKtVk=", - "dev": true, - "requires": { - "has-value": "^0.3.1", - "isobject": "^3.0.0" - }, - "dependencies": { - "has-value": { - "version": "0.3.1", - "resolved": "https://registry.npmjs.org/has-value/-/has-value-0.3.1.tgz", - "integrity": "sha1-ex9YutpiyoJ+wKIHgCVlSEWZXh8=", + }, + "fsevents": { + "version": "1.2.11", + "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.11.tgz", + "integrity": "sha512-+ux3lx6peh0BpvY0JebGyZoiR4D+oYzdPZMKJwkZ+sFkNJzpL7tXc/wehS49gUAxg3tmMHPHZkA8JU2rhhgDHw==", "dev": true, + "optional": true, "requires": { - "get-value": "^2.0.3", - "has-values": "^0.1.4", - "isobject": "^2.0.0" + "bindings": "^1.5.0", + "nan": "^2.12.1", + "node-pre-gyp": "*" }, "dependencies": { - "isobject": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz", - "integrity": "sha1-8GVWEJaj8dou9GJy+BXIQNh+DIk=", + "abbrev": { + "version": "1.1.1", + "bundled": true, + "dev": true, + "optional": true + }, + "ansi-regex": { + "version": "2.1.1", + "bundled": true, + "dev": true, + "optional": true + }, + "aproba": { + "version": "1.2.0", + "bundled": true, + "dev": true, + "optional": true + }, + "are-we-there-yet": { + "version": "1.1.5", + "bundled": true, + "dev": true, + "optional": true, + "requires": { + "delegates": "^1.0.0", + "readable-stream": "^2.0.6" + } + }, + "balanced-match": { + "version": "1.0.0", + "bundled": true, + "dev": true, + "optional": true + }, + "brace-expansion": { + "version": "1.1.11", + "bundled": true, + "dev": true, + "optional": true, + "requires": { + "balanced-match": "^1.0.0", + "concat-map": "0.0.1" + } + }, + "chownr": { + "version": "1.1.3", + "bundled": true, + "dev": true, + "optional": true + }, + "code-point-at": { + "version": "1.1.0", + "bundled": true, + "dev": true, + "optional": true + }, + "concat-map": { + "version": "0.0.1", + "bundled": true, + "dev": true, + "optional": true + }, + "console-control-strings": { + "version": "1.1.0", + "bundled": true, + "dev": true, + "optional": true + }, + "core-util-is": { + "version": "1.0.2", + "bundled": true, + "dev": true, + "optional": true + }, + "debug": { + "version": "3.2.6", + "bundled": true, + "dev": true, + "optional": true, + "requires": { + "ms": "^2.1.1" + } + }, + "deep-extend": { + "version": "0.6.0", + "bundled": true, + "dev": true, + "optional": true + }, + "delegates": { + "version": "1.0.0", + "bundled": true, + "dev": true, + "optional": true + }, + "detect-libc": { + "version": "1.0.3", + "bundled": true, + "dev": true, + "optional": true + }, + "fs-minipass": { + "version": "1.2.7", + "bundled": true, + "dev": true, + "optional": true, + "requires": { + "minipass": "^2.6.0" + } + }, + "fs.realpath": { + "version": "1.0.0", + "bundled": true, + "dev": true, + "optional": true + }, + "gauge": { + "version": "2.7.4", + "bundled": true, + "dev": true, + "optional": true, + "requires": { + "aproba": "^1.0.3", + "console-control-strings": "^1.0.0", + "has-unicode": "^2.0.0", + "object-assign": "^4.1.0", + "signal-exit": "^3.0.0", + "string-width": "^1.0.1", + "strip-ansi": "^3.0.1", + "wide-align": "^1.1.0" + } + }, + "glob": { + "version": "7.1.6", + "bundled": true, + "dev": true, + "optional": true, + "requires": { + "fs.realpath": "^1.0.0", + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "^3.0.4", + "once": "^1.3.0", + "path-is-absolute": "^1.0.0" + } + }, + "has-unicode": { + "version": "2.0.1", + "bundled": true, + "dev": true, + "optional": true + }, + "iconv-lite": { + "version": "0.4.24", + "bundled": true, "dev": true, + "optional": true, "requires": { - "isarray": "1.0.0" + "safer-buffer": ">= 2.1.2 < 3" + } + }, + "ignore-walk": { + "version": "3.0.3", + "bundled": true, + "dev": true, + "optional": true, + "requires": { + "minimatch": "^3.0.4" + } + }, + "inflight": { + "version": "1.0.6", + "bundled": true, + "dev": true, + "optional": true, + "requires": { + "once": "^1.3.0", + "wrappy": "1" + } + }, + "inherits": { + "version": "2.0.4", + "bundled": true, + "dev": true, + "optional": true + }, + "ini": { + "version": "1.3.5", + "bundled": true, + "dev": true, + "optional": true + }, + "is-fullwidth-code-point": { + "version": "1.0.0", + "bundled": true, + "dev": true, + "optional": true, + "requires": { + "number-is-nan": "^1.0.0" + } + }, + "isarray": { + "version": "1.0.0", + "bundled": true, + "dev": true, + "optional": true + }, + "minimatch": { + "version": "3.0.4", + "bundled": true, + "dev": true, + "optional": true, + "requires": { + "brace-expansion": "^1.1.7" + } + }, + "minimist": { + "version": "0.0.8", + "bundled": true, + "dev": true, + "optional": true + }, + "minipass": { + "version": "2.9.0", + "bundled": true, + "dev": true, + "optional": true, + "requires": { + "safe-buffer": "^5.1.2", + "yallist": "^3.0.0" + } + }, + "minizlib": { + "version": "1.3.3", + "bundled": true, + "dev": true, + "optional": true, + "requires": { + "minipass": "^2.9.0" + } + }, + "mkdirp": { + "version": "0.5.1", + "bundled": true, + "dev": true, + "optional": true, + "requires": { + "minimist": "0.0.8" + } + }, + "ms": { + "version": "2.1.2", + "bundled": true, + "dev": true, + "optional": true + }, + "needle": { + "version": "2.4.0", + "bundled": true, + "dev": true, + "optional": true, + "requires": { + "debug": "^3.2.6", + "iconv-lite": "^0.4.4", + "sax": "^1.2.4" + } + }, + "node-pre-gyp": { + "version": "0.14.0", + "bundled": true, + "dev": true, + "optional": true, + "requires": { + "detect-libc": "^1.0.2", + "mkdirp": "^0.5.1", + "needle": "^2.2.1", + "nopt": "^4.0.1", + "npm-packlist": "^1.1.6", + "npmlog": "^4.0.2", + "rc": "^1.2.7", + "rimraf": "^2.6.1", + "semver": "^5.3.0", + "tar": "^4.4.2" + } + }, + "nopt": { + "version": "4.0.1", + "bundled": true, + "dev": true, + "optional": true, + "requires": { + "abbrev": "1", + "osenv": "^0.1.4" + } + }, + "npm-bundled": { + "version": "1.1.1", + "bundled": true, + "dev": true, + "optional": true, + "requires": { + "npm-normalize-package-bin": "^1.0.1" + } + }, + "npm-normalize-package-bin": { + "version": "1.0.1", + "bundled": true, + "dev": true, + "optional": true + }, + "npm-packlist": { + "version": "1.4.7", + "bundled": true, + "dev": true, + "optional": true, + "requires": { + "ignore-walk": "^3.0.1", + "npm-bundled": "^1.0.1" + } + }, + "npmlog": { + "version": "4.1.2", + "bundled": true, + "dev": true, + "optional": true, + "requires": { + "are-we-there-yet": "~1.1.2", + "console-control-strings": "~1.1.0", + "gauge": "~2.7.3", + "set-blocking": "~2.0.0" + } + }, + "number-is-nan": { + "version": "1.0.1", + "bundled": true, + "dev": true, + "optional": true + }, + "object-assign": { + "version": "4.1.1", + "bundled": true, + "dev": true, + "optional": true + }, + "once": { + "version": "1.4.0", + "bundled": true, + "dev": true, + "optional": true, + "requires": { + "wrappy": "1" + } + }, + "os-homedir": { + "version": "1.0.2", + "bundled": true, + "dev": true, + "optional": true + }, + "os-tmpdir": { + "version": "1.0.2", + "bundled": true, + "dev": true, + "optional": true + }, + "osenv": { + "version": "0.1.5", + "bundled": true, + "dev": true, + "optional": true, + "requires": { + "os-homedir": "^1.0.0", + "os-tmpdir": "^1.0.0" + } + }, + "path-is-absolute": { + "version": "1.0.1", + "bundled": true, + "dev": true, + "optional": true + }, + "process-nextick-args": { + "version": "2.0.1", + "bundled": true, + "dev": true, + "optional": true + }, + "rc": { + "version": "1.2.8", + "bundled": true, + "dev": true, + "optional": true, + "requires": { + "deep-extend": "^0.6.0", + "ini": "~1.3.0", + "minimist": "^1.2.0", + "strip-json-comments": "~2.0.1" + }, + "dependencies": { + "minimist": { + "version": "1.2.0", + "bundled": true, + "dev": true, + "optional": true + } + } + }, + "readable-stream": { + "version": "2.3.6", + "bundled": true, + "dev": true, + "optional": true, + "requires": { + "core-util-is": "~1.0.0", + "inherits": "~2.0.3", + "isarray": "~1.0.0", + "process-nextick-args": "~2.0.0", + "safe-buffer": "~5.1.1", + "string_decoder": "~1.1.1", + "util-deprecate": "~1.0.1" + } + }, + "rimraf": { + "version": "2.7.1", + "bundled": true, + "dev": true, + "optional": true, + "requires": { + "glob": "^7.1.3" + } + }, + "safe-buffer": { + "version": "5.1.2", + "bundled": true, + "dev": true, + "optional": true + }, + "safer-buffer": { + "version": "2.1.2", + "bundled": true, + "dev": true, + "optional": true + }, + "sax": { + "version": "1.2.4", + "bundled": true, + "dev": true, + "optional": true + }, + "semver": { + "version": "5.7.1", + "bundled": true, + "dev": true, + "optional": true + }, + "set-blocking": { + "version": "2.0.0", + "bundled": true, + "dev": true, + "optional": true + }, + "signal-exit": { + "version": "3.0.2", + "bundled": true, + "dev": true, + "optional": true + }, + "string-width": { + "version": "1.0.2", + "bundled": true, + "dev": true, + "optional": true, + "requires": { + "code-point-at": "^1.0.0", + "is-fullwidth-code-point": "^1.0.0", + "strip-ansi": "^3.0.0" + } + }, + "string_decoder": { + "version": "1.1.1", + "bundled": true, + "dev": true, + "optional": true, + "requires": { + "safe-buffer": "~5.1.0" + } + }, + "strip-ansi": { + "version": "3.0.1", + "bundled": true, + "dev": true, + "optional": true, + "requires": { + "ansi-regex": "^2.0.0" + } + }, + "strip-json-comments": { + "version": "2.0.1", + "bundled": true, + "dev": true, + "optional": true + }, + "tar": { + "version": "4.4.13", + "bundled": true, + "dev": true, + "optional": true, + "requires": { + "chownr": "^1.1.1", + "fs-minipass": "^1.2.5", + "minipass": "^2.8.6", + "minizlib": "^1.2.1", + "mkdirp": "^0.5.0", + "safe-buffer": "^5.1.2", + "yallist": "^3.0.3" + } + }, + "util-deprecate": { + "version": "1.0.2", + "bundled": true, + "dev": true, + "optional": true + }, + "wide-align": { + "version": "1.1.3", + "bundled": true, + "dev": true, + "optional": true, + "requires": { + "string-width": "^1.0.2 || 2" } + }, + "wrappy": { + "version": "1.0.2", + "bundled": true, + "dev": true, + "optional": true + }, + "yallist": { + "version": "3.1.1", + "bundled": true, + "dev": true, + "optional": true } } }, - "has-values": { - "version": "0.1.4", - "resolved": "https://registry.npmjs.org/has-values/-/has-values-0.1.4.tgz", - "integrity": "sha1-bWHeldkd/Km5oCCJrThL/49it3E=", - "dev": true - } - } - }, - "unzip-response": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/unzip-response/-/unzip-response-2.0.1.tgz", - "integrity": "sha1-0vD3N9FrBhXnKmk17QQhRXLVb5c=", - "dev": true - }, - "upath": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/upath/-/upath-1.1.2.tgz", - "integrity": "sha512-kXpym8nmDmlCBr7nKdIx8P2jNBa+pBpIUFRnKJ4dr8htyYGJFokkr2ZvERRtUN+9SY+JqXouNgUPtv6JQva/2Q==", - "dev": true - }, - "update-notifier": { - "version": "2.5.0", - "resolved": "https://registry.npmjs.org/update-notifier/-/update-notifier-2.5.0.tgz", - "integrity": "sha512-gwMdhgJHGuj/+wHJJs9e6PcCszpxR1b236igrOkUofGhqJuG+amlIKwApH1IW1WWl7ovZxsX49lMBWLxSdm5Dw==", - "dev": true, - "requires": { - "boxen": "^1.2.1", - "chalk": "^2.0.1", - "configstore": "^3.0.0", - "import-lazy": "^2.1.0", - "is-ci": "^1.0.10", - "is-installed-globally": "^0.1.0", - "is-npm": "^1.0.0", - "latest-version": "^3.0.0", - "semver-diff": "^2.0.0", - "xdg-basedir": "^3.0.0" - } - }, - "uri-js": { - "version": "4.2.2", - "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.2.2.tgz", - "integrity": "sha512-KY9Frmirql91X2Qgjry0Wd4Y+YTdrdZheS8TFwvkbLWf/G5KNJDCh6pKL5OZctEW4+0Baa5idK2ZQuELRwPznQ==", - "requires": { - "punycode": "^2.1.0" - }, - "dependencies": { - "punycode": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz", - "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==" - } - } - }, - "urix": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/urix/-/urix-0.1.0.tgz", - "integrity": "sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI=", - "dev": true - }, - "url": { - "version": "0.11.0", - "resolved": "https://registry.npmjs.org/url/-/url-0.11.0.tgz", - "integrity": "sha1-ODjpfPxgUh63PFJajlW/3Z4uKPE=", - "requires": { - "punycode": "1.3.2", - "querystring": "0.2.0" - } - }, - "url-parse": { - "version": "1.4.7", - "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.4.7.tgz", - "integrity": "sha512-d3uaVyzDB9tQoSXFvuSUNFibTd9zxd2bkVrDRvF5TmvWWQwqE4lgYJ5m+x1DbecWkw+LK4RNl2CU1hHuOKPVlg==", - "requires": { - "querystringify": "^2.1.1", - "requires-port": "^1.0.0" - } - }, - "url-parse-lax": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/url-parse-lax/-/url-parse-lax-1.0.0.tgz", - "integrity": "sha1-evjzA2Rem9eaJy56FKxovAYJ2nM=", - "dev": true, - "requires": { - "prepend-http": "^1.0.1" - } - }, - "use": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/use/-/use-3.1.1.tgz", - "integrity": "sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ==", - "dev": true - }, - "useragent": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/useragent/-/useragent-2.3.0.tgz", - "integrity": "sha512-4AoH4pxuSvHCjqLO04sU6U/uE65BYza8l/KKBS0b0hnUPWi+cQ2BpeTEwejCSx9SPV5/U03nniDTrWx5NrmKdw==", - "dev": true, - "requires": { - "lru-cache": "4.1.x", - "tmp": "0.0.x" - } - }, - "util": { - "version": "0.11.1", - "resolved": "https://registry.npmjs.org/util/-/util-0.11.1.tgz", - "integrity": "sha512-HShAsny+zS2TZfaXxD9tYj4HQGlBezXZMZuM/S5PKLLoZkShZiGk9o5CzukI1LVHZvjdvZ2Sj1aW/Ndn2NB/HQ==", - "requires": { - "inherits": "2.0.3" - }, - "dependencies": { - "inherits": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz", - "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=" - } - } - }, - "util-deprecate": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", - "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=" - }, - "util-promisify": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/util-promisify/-/util-promisify-2.1.0.tgz", - "integrity": "sha1-PCI2R2xNMsX/PEcAKt18E7moKlM=", - "dev": true, - "requires": { - "object.getownpropertydescriptors": "^2.0.3" - } - }, - "utils-merge": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz", - "integrity": "sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM=", - "dev": true - }, - "uuid": { - "version": "3.3.3", - "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.3.3.tgz", - "integrity": "sha512-pW0No1RGHgzlpHJO1nsVrHKpOEIxkGg1xB+v0ZmdNH5OAeAwzAVrCnI2/6Mtx+Uys6iaylxa+D3g4j63IKKjSQ==" - }, - "v8-to-istanbul": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/v8-to-istanbul/-/v8-to-istanbul-2.1.0.tgz", - "integrity": "sha512-3XHoQH/BjY5vO26v2puZ4hs54z5O4s5R8AfKH5ktu0hANWNtYDOFwB1iBstkGISgEpohs/U81vY8B0KbQz3N2A==" - }, - "validate-npm-package-license": { - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz", - "integrity": "sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==", - "requires": { - "spdx-correct": "^3.0.0", - "spdx-expression-parse": "^3.0.0" - } - }, - "validate-npm-package-name": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/validate-npm-package-name/-/validate-npm-package-name-3.0.0.tgz", - "integrity": "sha1-X6kS2B630MdK/BQN5zF/DKffQ34=", - "dev": true, - "requires": { - "builtins": "^1.0.3" - } - }, - "validator": { - "version": "10.8.0", - "resolved": "https://registry.npmjs.org/validator/-/validator-10.8.0.tgz", - "integrity": "sha512-mXqMxfCh5NLsVgYVKl9WvnHNDPCcbNppHSPPowu0VjtSsGWVY+z8hJF44edLR1nbLNzi3jYoYsIl8KZpioIk6g==" - }, - "vary": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz", - "integrity": "sha1-IpnwLG3tMNSllhsLn3RSShj2NPw=", - "dev": true - }, - "verror": { - "version": "1.10.0", - "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz", - "integrity": "sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=", - "requires": { - "assert-plus": "^1.0.0", - "core-util-is": "1.0.2", - "extsprintf": "^1.2.0" - } - }, - "vm-browserify": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/vm-browserify/-/vm-browserify-1.1.0.tgz", - "integrity": "sha512-iq+S7vZJE60yejDYM0ek6zg308+UZsdtPExWP9VZoCFCz1zkJoXFnAX7aZfd/ZwrkidzdUZL0C/ryW+JwAiIGw==", - "dev": true - }, - "void-elements": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/void-elements/-/void-elements-2.0.1.tgz", - "integrity": "sha1-wGavtYK7HLQSjWDqkjkulNXp2+w=" - }, - "w3c-hr-time": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/w3c-hr-time/-/w3c-hr-time-1.0.1.tgz", - "integrity": "sha1-gqwr/2PZUOqeMYmlimViX+3xkEU=", - "requires": { - "browser-process-hrtime": "^0.1.2" - } - }, - "w3c-xmlserializer": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/w3c-xmlserializer/-/w3c-xmlserializer-1.1.2.tgz", - "integrity": "sha512-p10l/ayESzrBMYWRID6xbuCKh2Fp77+sA0doRuGn4tTIMrrZVeqfpKjXHY+oDh3K4nLdPgNwMTVP6Vp4pvqbNg==", - "requires": { - "domexception": "^1.0.1", - "webidl-conversions": "^4.0.2", - "xml-name-validator": "^3.0.0" - } - }, - "walk": { - "version": "2.3.14", - "resolved": "https://registry.npmjs.org/walk/-/walk-2.3.14.tgz", - "integrity": "sha512-5skcWAUmySj6hkBdH6B6+3ddMjVQYH5Qy9QGbPmN8kVmLteXk+yVXg+yfk1nbX30EYakahLrr8iPcCxJQSCBeg==", - "requires": { - "foreachasync": "^3.0.0" - } - }, - "watchpack": { - "version": "1.6.0", - "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-1.6.0.tgz", - "integrity": "sha512-i6dHe3EyLjMmDlU1/bGQpEw25XSjkJULPuAVKCbNRefQVq48yXKUpwg538F7AZTf9kyr57zj++pQFltUa5H7yA==", - "dev": true, - "requires": { - "chokidar": "^2.0.2", - "graceful-fs": "^4.1.2", - "neo-async": "^2.5.0" - }, - "dependencies": { - "chokidar": { - "version": "2.1.8", - "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.1.8.tgz", - "integrity": "sha512-ZmZUazfOzf0Nve7duiCKD23PFSCs4JPoYyccjUFF3aQkQadqBhfzhjkwBH2mNOG9cTBwhamM37EIsIkZw3nRgg==", + "is-binary-path": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-1.0.1.tgz", + "integrity": "sha1-dfFmQrSA8YenEcgUFh/TpKdlWJg=", + "dev": true, + "requires": { + "binary-extensions": "^1.0.0" + } + }, + "is-number": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz", + "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=", "dev": true, "requires": { - "anymatch": "^2.0.0", - "async-each": "^1.0.1", - "braces": "^2.3.2", - "fsevents": "^1.2.7", - "glob-parent": "^3.1.0", - "inherits": "^2.0.3", - "is-binary-path": "^1.0.0", - "is-glob": "^4.0.0", - "normalize-path": "^3.0.0", - "path-is-absolute": "^1.0.0", - "readdirp": "^2.2.1", - "upath": "^1.1.1" + "kind-of": "^3.0.2" + } + }, + "readdirp": { + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-2.2.1.tgz", + "integrity": "sha512-1JU/8q+VgFZyxwrJ+SVIOsh+KywWGpds3NTqikiKpDMZWScmAYyKIgqkO+ARvNWJfXeXR1zxz7aHF4u4CyH6vQ==", + "dev": true, + "requires": { + "graceful-fs": "^4.1.11", + "micromatch": "^3.1.10", + "readable-stream": "^2.0.2" } }, - "normalize-path": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz", - "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==", - "dev": true + "to-regex-range": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz", + "integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=", + "dev": true, + "requires": { + "is-number": "^3.0.0", + "repeat-string": "^1.6.1" + } } } }, @@ -16759,33 +17989,9 @@ }, "dependencies": { "acorn": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.3.0.tgz", - "integrity": "sha512-/czfa8BwS88b9gWQVhc8eknunSA2DoJpJyTQkhheIf5E48u1N0R4q/YxxsAeqRrmK9TQ/uYfgLDfZo91UlANIA==", - "dev": true - }, - "ajv": { - "version": "6.10.2", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.10.2.tgz", - "integrity": "sha512-TXtUUEYHuaTEbLZWIKUr5pmBuhDLy+8KYtPYdcV8qC+pOZL+NKqYwvWSRrVXHn+ZmRRAu8vJTAznH7Oag6RVRw==", - "dev": true, - "requires": { - "fast-deep-equal": "^2.0.1", - "fast-json-stable-stringify": "^2.0.0", - "json-schema-traverse": "^0.4.1", - "uri-js": "^4.2.2" - } - }, - "fast-deep-equal": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz", - "integrity": "sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk=", - "dev": true - }, - "json-schema-traverse": { - "version": "0.4.1", - "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz", - "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==", + "version": "6.4.0", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.4.0.tgz", + "integrity": "sha512-gac8OEcQ2Li1dxIEWGZzsp2BitJxwkwcOm0zHAJLcPJaVvm58FRnk6RkuLRpU1EujipU2ZFODv2P9DLMfnV8mw==", "dev": true } } @@ -16805,15 +18011,6 @@ "resolved": "https://registry.npmjs.org/source-list-map/-/source-list-map-0.1.8.tgz", "integrity": "sha1-xVCyq1Qn9rPyH1r+rYjE9Vh7IQY=", "dev": true - }, - "source-map": { - "version": "0.4.4", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.4.4.tgz", - "integrity": "sha1-66T12pwNyZneaAMti092FzZSA2s=", - "dev": true, - "requires": { - "amdefine": ">=0.0.4" - } } } }, @@ -16882,6 +18079,51 @@ "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=", "dev": true }, + "anymatch": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-2.0.0.tgz", + "integrity": "sha512-5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw==", + "dev": true, + "requires": { + "micromatch": "^3.1.4", + "normalize-path": "^2.1.1" + }, + "dependencies": { + "normalize-path": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz", + "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=", + "dev": true, + "requires": { + "remove-trailing-separator": "^1.0.1" + } + } + } + }, + "binary-extensions": { + "version": "1.13.1", + "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.13.1.tgz", + "integrity": "sha512-Un7MIEDdUC5gNpcGDV97op1Ywk748MpHcFTHoYs6qnj1Z3j7I53VG3nwZhKzoBZmbdRNnb6WRdFlwl7tSDuZGw==", + "dev": true + }, + "braces": { + "version": "2.3.2", + "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz", + "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==", + "dev": true, + "requires": { + "arr-flatten": "^1.1.0", + "array-unique": "^0.3.2", + "extend-shallow": "^2.0.1", + "fill-range": "^4.0.0", + "isobject": "^3.0.1", + "repeat-element": "^1.1.2", + "snapdragon": "^0.8.1", + "snapdragon-node": "^2.0.1", + "split-string": "^3.0.2", + "to-regex": "^3.0.1" + } + }, "chokidar": { "version": "2.1.8", "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.1.8.tgz", @@ -16920,42 +18162,644 @@ "dev": true }, "strip-ansi": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz", - "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz", + "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", + "dev": true, + "requires": { + "ansi-regex": "^3.0.0" + } + } + } + }, + "debug": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz", + "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==", + "dev": true, + "requires": { + "ms": "^2.1.1" + } + }, + "extend-shallow": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", + "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", + "dev": true, + "requires": { + "is-extendable": "^0.1.0" + } + }, + "fill-range": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz", + "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=", + "dev": true, + "requires": { + "extend-shallow": "^2.0.1", + "is-number": "^3.0.0", + "repeat-string": "^1.6.1", + "to-regex-range": "^2.1.0" + } + }, + "fsevents": { + "version": "1.2.11", + "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.11.tgz", + "integrity": "sha512-+ux3lx6peh0BpvY0JebGyZoiR4D+oYzdPZMKJwkZ+sFkNJzpL7tXc/wehS49gUAxg3tmMHPHZkA8JU2rhhgDHw==", + "dev": true, + "optional": true, + "requires": { + "bindings": "^1.5.0", + "nan": "^2.12.1", + "node-pre-gyp": "*" + }, + "dependencies": { + "abbrev": { + "version": "1.1.1", + "bundled": true, + "dev": true, + "optional": true + }, + "ansi-regex": { + "version": "2.1.1", + "bundled": true, + "dev": true, + "optional": true + }, + "aproba": { + "version": "1.2.0", + "bundled": true, + "dev": true, + "optional": true + }, + "are-we-there-yet": { + "version": "1.1.5", + "bundled": true, + "dev": true, + "optional": true, + "requires": { + "delegates": "^1.0.0", + "readable-stream": "^2.0.6" + } + }, + "balanced-match": { + "version": "1.0.0", + "bundled": true, + "dev": true, + "optional": true + }, + "brace-expansion": { + "version": "1.1.11", + "bundled": true, + "dev": true, + "optional": true, + "requires": { + "balanced-match": "^1.0.0", + "concat-map": "0.0.1" + } + }, + "chownr": { + "version": "1.1.3", + "bundled": true, + "dev": true, + "optional": true + }, + "code-point-at": { + "version": "1.1.0", + "bundled": true, + "dev": true, + "optional": true + }, + "concat-map": { + "version": "0.0.1", + "bundled": true, + "dev": true, + "optional": true + }, + "console-control-strings": { + "version": "1.1.0", + "bundled": true, + "dev": true, + "optional": true + }, + "core-util-is": { + "version": "1.0.2", + "bundled": true, + "dev": true, + "optional": true + }, + "debug": { + "version": "3.2.6", + "bundled": true, + "dev": true, + "optional": true, + "requires": { + "ms": "^2.1.1" + } + }, + "deep-extend": { + "version": "0.6.0", + "bundled": true, + "dev": true, + "optional": true + }, + "delegates": { + "version": "1.0.0", + "bundled": true, + "dev": true, + "optional": true + }, + "detect-libc": { + "version": "1.0.3", + "bundled": true, + "dev": true, + "optional": true + }, + "fs-minipass": { + "version": "1.2.7", + "bundled": true, + "dev": true, + "optional": true, + "requires": { + "minipass": "^2.6.0" + } + }, + "fs.realpath": { + "version": "1.0.0", + "bundled": true, + "dev": true, + "optional": true + }, + "gauge": { + "version": "2.7.4", + "bundled": true, + "dev": true, + "optional": true, + "requires": { + "aproba": "^1.0.3", + "console-control-strings": "^1.0.0", + "has-unicode": "^2.0.0", + "object-assign": "^4.1.0", + "signal-exit": "^3.0.0", + "string-width": "^1.0.1", + "strip-ansi": "^3.0.1", + "wide-align": "^1.1.0" + } + }, + "glob": { + "version": "7.1.6", + "bundled": true, + "dev": true, + "optional": true, + "requires": { + "fs.realpath": "^1.0.0", + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "^3.0.4", + "once": "^1.3.0", + "path-is-absolute": "^1.0.0" + } + }, + "has-unicode": { + "version": "2.0.1", + "bundled": true, + "dev": true, + "optional": true + }, + "iconv-lite": { + "version": "0.4.24", + "bundled": true, + "dev": true, + "optional": true, + "requires": { + "safer-buffer": ">= 2.1.2 < 3" + } + }, + "ignore-walk": { + "version": "3.0.3", + "bundled": true, + "dev": true, + "optional": true, + "requires": { + "minimatch": "^3.0.4" + } + }, + "inflight": { + "version": "1.0.6", + "bundled": true, + "dev": true, + "optional": true, + "requires": { + "once": "^1.3.0", + "wrappy": "1" + } + }, + "inherits": { + "version": "2.0.4", + "bundled": true, + "dev": true, + "optional": true + }, + "ini": { + "version": "1.3.5", + "bundled": true, + "dev": true, + "optional": true + }, + "is-fullwidth-code-point": { + "version": "1.0.0", + "bundled": true, + "dev": true, + "optional": true, + "requires": { + "number-is-nan": "^1.0.0" + } + }, + "isarray": { + "version": "1.0.0", + "bundled": true, + "dev": true, + "optional": true + }, + "minimatch": { + "version": "3.0.4", + "bundled": true, + "dev": true, + "optional": true, + "requires": { + "brace-expansion": "^1.1.7" + } + }, + "minimist": { + "version": "0.0.8", + "bundled": true, + "dev": true, + "optional": true + }, + "minipass": { + "version": "2.9.0", + "bundled": true, + "dev": true, + "optional": true, + "requires": { + "safe-buffer": "^5.1.2", + "yallist": "^3.0.0" + } + }, + "minizlib": { + "version": "1.3.3", + "bundled": true, + "dev": true, + "optional": true, + "requires": { + "minipass": "^2.9.0" + } + }, + "mkdirp": { + "version": "0.5.1", + "bundled": true, + "dev": true, + "optional": true, + "requires": { + "minimist": "0.0.8" + } + }, + "ms": { + "version": "2.1.2", + "bundled": true, + "dev": true, + "optional": true + }, + "needle": { + "version": "2.4.0", + "bundled": true, + "dev": true, + "optional": true, + "requires": { + "debug": "^3.2.6", + "iconv-lite": "^0.4.4", + "sax": "^1.2.4" + } + }, + "node-pre-gyp": { + "version": "0.14.0", + "bundled": true, + "dev": true, + "optional": true, + "requires": { + "detect-libc": "^1.0.2", + "mkdirp": "^0.5.1", + "needle": "^2.2.1", + "nopt": "^4.0.1", + "npm-packlist": "^1.1.6", + "npmlog": "^4.0.2", + "rc": "^1.2.7", + "rimraf": "^2.6.1", + "semver": "^5.3.0", + "tar": "^4.4.2" + } + }, + "nopt": { + "version": "4.0.1", + "bundled": true, + "dev": true, + "optional": true, + "requires": { + "abbrev": "1", + "osenv": "^0.1.4" + } + }, + "npm-bundled": { + "version": "1.1.1", + "bundled": true, + "dev": true, + "optional": true, + "requires": { + "npm-normalize-package-bin": "^1.0.1" + } + }, + "npm-normalize-package-bin": { + "version": "1.0.1", + "bundled": true, + "dev": true, + "optional": true + }, + "npm-packlist": { + "version": "1.4.7", + "bundled": true, + "dev": true, + "optional": true, + "requires": { + "ignore-walk": "^3.0.1", + "npm-bundled": "^1.0.1" + } + }, + "npmlog": { + "version": "4.1.2", + "bundled": true, + "dev": true, + "optional": true, + "requires": { + "are-we-there-yet": "~1.1.2", + "console-control-strings": "~1.1.0", + "gauge": "~2.7.3", + "set-blocking": "~2.0.0" + } + }, + "number-is-nan": { + "version": "1.0.1", + "bundled": true, + "dev": true, + "optional": true + }, + "object-assign": { + "version": "4.1.1", + "bundled": true, + "dev": true, + "optional": true + }, + "once": { + "version": "1.4.0", + "bundled": true, + "dev": true, + "optional": true, + "requires": { + "wrappy": "1" + } + }, + "os-homedir": { + "version": "1.0.2", + "bundled": true, + "dev": true, + "optional": true + }, + "os-tmpdir": { + "version": "1.0.2", + "bundled": true, + "dev": true, + "optional": true + }, + "osenv": { + "version": "0.1.5", + "bundled": true, + "dev": true, + "optional": true, + "requires": { + "os-homedir": "^1.0.0", + "os-tmpdir": "^1.0.0" + } + }, + "path-is-absolute": { + "version": "1.0.1", + "bundled": true, + "dev": true, + "optional": true + }, + "process-nextick-args": { + "version": "2.0.1", + "bundled": true, + "dev": true, + "optional": true + }, + "rc": { + "version": "1.2.8", + "bundled": true, + "dev": true, + "optional": true, + "requires": { + "deep-extend": "^0.6.0", + "ini": "~1.3.0", + "minimist": "^1.2.0", + "strip-json-comments": "~2.0.1" + }, + "dependencies": { + "minimist": { + "version": "1.2.0", + "bundled": true, + "dev": true, + "optional": true + } + } + }, + "readable-stream": { + "version": "2.3.6", + "bundled": true, + "dev": true, + "optional": true, + "requires": { + "core-util-is": "~1.0.0", + "inherits": "~2.0.3", + "isarray": "~1.0.0", + "process-nextick-args": "~2.0.0", + "safe-buffer": "~5.1.1", + "string_decoder": "~1.1.1", + "util-deprecate": "~1.0.1" + } + }, + "rimraf": { + "version": "2.7.1", + "bundled": true, + "dev": true, + "optional": true, + "requires": { + "glob": "^7.1.3" + } + }, + "safe-buffer": { + "version": "5.1.2", + "bundled": true, + "dev": true, + "optional": true + }, + "safer-buffer": { + "version": "2.1.2", + "bundled": true, + "dev": true, + "optional": true + }, + "sax": { + "version": "1.2.4", + "bundled": true, + "dev": true, + "optional": true + }, + "semver": { + "version": "5.7.1", + "bundled": true, + "dev": true, + "optional": true + }, + "set-blocking": { + "version": "2.0.0", + "bundled": true, + "dev": true, + "optional": true + }, + "signal-exit": { + "version": "3.0.2", + "bundled": true, + "dev": true, + "optional": true + }, + "string-width": { + "version": "1.0.2", + "bundled": true, + "dev": true, + "optional": true, + "requires": { + "code-point-at": "^1.0.0", + "is-fullwidth-code-point": "^1.0.0", + "strip-ansi": "^3.0.0" + } + }, + "string_decoder": { + "version": "1.1.1", + "bundled": true, + "dev": true, + "optional": true, + "requires": { + "safe-buffer": "~5.1.0" + } + }, + "strip-ansi": { + "version": "3.0.1", + "bundled": true, "dev": true, + "optional": true, "requires": { - "ansi-regex": "^3.0.0" + "ansi-regex": "^2.0.0" + } + }, + "strip-json-comments": { + "version": "2.0.1", + "bundled": true, + "dev": true, + "optional": true + }, + "tar": { + "version": "4.4.13", + "bundled": true, + "dev": true, + "optional": true, + "requires": { + "chownr": "^1.1.1", + "fs-minipass": "^1.2.5", + "minipass": "^2.8.6", + "minizlib": "^1.2.1", + "mkdirp": "^0.5.0", + "safe-buffer": "^5.1.2", + "yallist": "^3.0.3" + } + }, + "util-deprecate": { + "version": "1.0.2", + "bundled": true, + "dev": true, + "optional": true + }, + "wide-align": { + "version": "1.1.3", + "bundled": true, + "dev": true, + "optional": true, + "requires": { + "string-width": "^1.0.2 || 2" } + }, + "wrappy": { + "version": "1.0.2", + "bundled": true, + "dev": true, + "optional": true + }, + "yallist": { + "version": "3.1.1", + "bundled": true, + "dev": true, + "optional": true } } }, - "debug": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz", - "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==", - "dev": true, - "requires": { - "ms": "^2.1.1" - } - }, "get-caller-file": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-1.0.3.tgz", "integrity": "sha512-3t6rVToeoZfYSGd8YoLFR2DJkiQrIiUrGcjvFX2mDw3bn6k2OtwHN0TNCLbBO+w8qTvimhDkv+LSscbJY1vE6w==", "dev": true }, + "is-binary-path": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-1.0.1.tgz", + "integrity": "sha1-dfFmQrSA8YenEcgUFh/TpKdlWJg=", + "dev": true, + "requires": { + "binary-extensions": "^1.0.0" + } + }, + "is-number": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz", + "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=", + "dev": true, + "requires": { + "kind-of": "^3.0.2" + } + }, "ms": { "version": "2.1.2", "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", "dev": true }, - "normalize-path": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz", - "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==", - "dev": true + "readdirp": { + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-2.2.1.tgz", + "integrity": "sha512-1JU/8q+VgFZyxwrJ+SVIOsh+KywWGpds3NTqikiKpDMZWScmAYyKIgqkO+ARvNWJfXeXR1zxz7aHF4u4CyH6vQ==", + "dev": true, + "requires": { + "graceful-fs": "^4.1.11", + "micromatch": "^3.1.10", + "readable-stream": "^2.0.2" + } }, "require-main-filename": { "version": "1.0.1", @@ -17005,6 +18849,16 @@ "ansi-regex": "^2.0.0" } }, + "to-regex-range": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz", + "integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=", + "dev": true, + "requires": { + "is-number": "^3.0.0", + "repeat-string": "^1.6.1" + } + }, "wrap-ansi": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz", @@ -17096,6 +18950,14 @@ "requires": { "source-list-map": "^2.0.0", "source-map": "~0.6.1" + }, + "dependencies": { + "source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "dev": true + } } }, "webpack-subresource-integrity": { @@ -17138,9 +19000,9 @@ "integrity": "sha512-M4yMwr6mAnQz76TbJm914+gPpB/nCwvZbJU28cUD6dR004SAxDLOOSUaB1JDRqLtaOV/vi0IC5lEAGFgrjGv/g==" }, "whatwg-url": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-7.0.0.tgz", - "integrity": "sha512-37GeVSIJ3kn1JgKyjiYNmSLP1yzbpb29jdmwBSgkD9h40/hyrR/OifpVUndji3tmwGgD8qpw7iQu3RSbCrBpsQ==", + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-7.1.0.tgz", + "integrity": "sha512-WUu7Rg1DroM7oQvGWfOiAK21n74Gg+T4elXEQYkOhtyLeWiJFoOGLXPKI/9gzIie9CtwVLm8wtw6YJdKyxSjeg==", "requires": { "lodash.sortby": "^4.7.0", "tr46": "^1.0.1", @@ -17267,6 +19129,11 @@ "@types/node": "*" } }, + "word-wrap": { + "version": "1.2.3", + "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz", + "integrity": "sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==" + }, "wordwrap": { "version": "0.0.3", "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.3.tgz", @@ -17317,28 +19184,14 @@ } }, "ws": { - "version": "3.3.3", - "resolved": "https://registry.npmjs.org/ws/-/ws-3.3.3.tgz", - "integrity": "sha512-nnWLa/NwZSt4KQJu51MYlCcSQ5g7INpOrOMt4XV8j4dqTXdmlUmSHQ8/oLC069ckre0fRsgfvsKwbTdtKLCDkA==", - "dev": true, - "requires": { - "async-limiter": "~1.0.0", - "safe-buffer": "~5.1.0", - "ultron": "~1.1.0" - }, - "dependencies": { - "safe-buffer": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", - "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==", - "dev": true - } - } + "version": "7.2.1", + "resolved": "https://registry.npmjs.org/ws/-/ws-7.2.1.tgz", + "integrity": "sha512-sucePNSafamSKoOqoNfBd8V0StlkzJKL2ZAhGQinCfNQ+oacw+Pk7lcdAElecBF2VkLNZRiIb5Oi1Q5lVUVt2A==" }, "x-xss-protection": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/x-xss-protection/-/x-xss-protection-1.2.0.tgz", - "integrity": "sha512-xN0kV+8XfOQM2OPPBdEbGtbvJNNP1pvZR7sE6d44cjJFQG4OiGDdienPg5iOUGswBTiGbBvtYDURd30BMJwwqg==" + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/x-xss-protection/-/x-xss-protection-1.3.0.tgz", + "integrity": "sha512-kpyBI9TlVipZO4diReZMAHWtS0MMa/7Kgx8hwG/EuZLiA6sg4Ah/4TRdASHhRRN3boobzcYgFRUFSgHRge6Qhg==" }, "xdg-basedir": { "version": "3.0.0", @@ -17366,9 +19219,9 @@ "integrity": "sha1-Ey7mPS7FVlxVfiD0wi35rKaGsQ0=" }, "xmlchars": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/xmlchars/-/xmlchars-2.1.1.tgz", - "integrity": "sha512-7hew1RPJ1iIuje/Y01bGD/mXokXxegAgVS+e+E0wSi2ILHQkYAH1+JXARwTjZSM4Z4Z+c73aKspEcqj+zPPL/w==" + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/xmlchars/-/xmlchars-2.2.0.tgz", + "integrity": "sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw==" }, "xmlhttprequest-ssl": { "version": "1.5.5", diff --git a/package.json b/package.json index b55627e753..16c21b4385 100644 --- a/package.json +++ b/package.json @@ -43,6 +43,7 @@ "axios": "^0.19.0", "bcrypt-nodejs": "0.0.3", "c8": "^3.2.1", + "cheerio": "^1.0.0-rc.3", "concurrently": "^4.1.2", "convict": "^4.4.1", "cookie-parser": "^1.4.3", diff --git a/server/routes/reports/wdf/parent.js b/server/routes/reports/wdf/parent.js index 916661218a..e9b246b17f 100644 --- a/server/routes/reports/wdf/parent.js +++ b/server/routes/reports/wdf/parent.js @@ -9,7 +9,9 @@ const walk = require('walk'); const JsZip = require('jszip'); const config = require('../../../../server/config/config'); const uuid = require('uuid'); -const AWS = require('aws-sdk') +const AWS = require('aws-sdk'); +const cheerio = require('cheerio'); + const s3 = new AWS.S3({ region: String(config.get('bulkupload.region')) }); @@ -27,8 +29,8 @@ const workersSheetName = path.join('xl', 'worksheets', 'sheet3.xml'); const sharedStringsName = path.join('xl', 'sharedStrings.xml'); const schema = 'http://schemas.openxmlformats.org/spreadsheetml/2006/main'; const isNumberRegex = /^[0-9]+(\.[0-9]+)?$/; -//const debuglog = console.log.bind(console); -const debuglog = () => {}; +const debuglog = console.log.bind(console); +// const debuglog = () => {}; const buStates = [ 'READY', @@ -47,11 +49,11 @@ const buStates = [ const { DOMParser, XMLSerializer } = new (require('jsdom').JSDOM)().window; const parseXML = fileContent => - (new DOMParser()).parseFromString(fileContent.toString('utf8'), 'application/xml'); - -const serializeXML = dom => - '\n' + - (new XMLSerializer()).serializeToString(dom); + cheerio.load(fileContent, { + xml: { + normalizeWhitespace: true, + } + }); // helper function to set a spreadsheet cell's value const putStringTemplate = ( @@ -62,31 +64,32 @@ const putStringTemplate = ( element, value ) => { - let vTag = element.querySelector('v'); + let vTag = element.children('v').first(); const hasVTag = vTag !== null; const textValue = String(value); const isNumber = isNumberRegex.test(textValue); if (!hasVTag) { - vTag = sheetDoc.createElementNS(schema, 'v'); + vTag = sheetDoc(''); + vTag.text(sharedStringsUniqueCount[0]); - element.appendChild(vTag); + element.append(vTag); + } else { + vTag.text(sharedStringsUniqueCount[0]); } if (isNumber) { - element.removeAttribute('t'); + element.attr('t'); vTag.textContent = textValue; } else { - element.setAttribute('t', 's'); + element.attr('t', 's'); - const si = stringsDoc.createElementNS(schema, 'si'); - const t = stringsDoc.createElementNS(schema, 't'); + const si = stringsDoc(''); + const t = stringsDoc(''); + t.text(textValue); - sst.appendChild(si); - si.appendChild(t); - - t.textContent = textValue; - vTag.textContent = sharedStringsUniqueCount[0]; + sst.append(si); + si.append(t); sharedStringsUniqueCount[0] += 1; } @@ -489,7 +492,7 @@ const styleLookup = { }; const setStyle = (cellToChange, columnText, rowType, isRed) => { - cellToChange.setAttribute('s', styleLookup[isRed ? 'RED' : 'BLACK'][rowType][columnText]); + cellToChange.attr('s', styleLookup[isRed ? 'RED' : 'BLACK'][rowType][columnText]); }; const basicValidationUpdate = (putString, cellToChange, value, columnText, rowType, percentColumn = false) => { @@ -528,44 +531,44 @@ const updateOverviewSheet = ( // set headers putString( - overviewSheet.querySelector("c[r='B6']"), + overviewSheet("c[r='B6']"), `Parent name : ${reportData.parentName}` ); putString( - overviewSheet.querySelector("c[r='B7']"), + overviewSheet("c[r='B7']"), `Date: ${moment(reportData.date).format('DD/MM/YYYY')}` ); - const templateRow = overviewSheet.querySelector("row[r='11']"); + const templateRow = overviewSheet("row[r='11']"); - let currentRow = overviewSheet.querySelector("row[r='16']"); + let currentRow = overviewSheet("row[r='16']"); let rowIndex = 16; let updateRowIndex = 16 + reportData.establishments.length - 1; - + // Move the information at the bottom to the correct place for(; rowIndex > 11; rowIndex--, updateRowIndex--) { if(rowIndex === 16) { // fix the dimensions tag value - const dimension = overviewSheet.querySelector('dimension'); - dimension.setAttribute('ref', String(dimension.getAttribute('ref')).replace(/\d+$/, '') + updateRowIndex); + const dimension = overviewSheet('dimension'); + dimension.attr('ref', String(dimension.attr('ref')).replace(/\d+$/, '') + updateRowIndex); + } + if (currentRow.children('c').length) { + currentRow.children('c').each((index, element) => { + overviewSheet(element).attr('r', String(overviewSheet(element).attr('r')).replace(/\d+$/, '') + updateRowIndex); + }); } - currentRow.querySelectorAll('c').forEach(elem => { - elem.setAttribute('r', String(elem.getAttribute('r')).replace(/\d+$/, '') + updateRowIndex); - }); - - currentRow.setAttribute('r', updateRowIndex); + currentRow.attr('r', updateRowIndex); - const mergeCell = overviewSheet.querySelector(`mergeCell[ref='B${rowIndex}:L${rowIndex}']`); + const mergeCell = overviewSheet(`mergeCell[ref='B${rowIndex}:L${rowIndex}']`); if(mergeCell !== null) { - mergeCell.setAttribute('ref', `B${updateRowIndex}:L${updateRowIndex}`); + mergeCell.attr('ref', `B${updateRowIndex}:L${updateRowIndex}`); } - while(currentRow.previousSibling !== null) { - currentRow = currentRow.previousSibling; - - if(currentRow.nodeName === 'row') { + if (currentRow.prev().length !== 0) { + currentRow = currentRow.prev(); + if(currentRow.name === 'row') { break; } } @@ -577,15 +580,15 @@ const updateOverviewSheet = ( if (reportData.establishments.length > 1) { for (let i = 0; i < (reportData.establishments.length - 1); i++) { - const tempRow = templateRow.cloneNode(true); + const tempRow = templateRow.clone(true); - tempRow.setAttribute('r', rowIndex); + tempRow.attr('r', rowIndex); - tempRow.querySelectorAll('c').forEach(elem => { - elem.setAttribute('r', String(elem.getAttribute('r')).replace(/\d+$/, '') + rowIndex); + tempRow.children('c').each((index, element) => { + overviewSheet(element).attr('r', String(overviewSheet(element).attr('r')).replace(/\d+$/, '') + rowIndex); }); - templateRow.parentNode.insertBefore(tempRow, currentRow.nextSibling); + currentRow.after(tempRow); currentRow = tempRow; rowIndex++; @@ -599,13 +602,12 @@ const updateOverviewSheet = ( debuglog('updating overview', row); const rowType = row === reportData.establishments.length - 1 ? 'OVRLAST' : 'OVRREGULAR'; - let nextSibling = {}; + // let nextSibling = {}; for (let column = 0; column < 10; column++) { const columnText = String.fromCharCode(column + 66); const isRed = false; - - const cellToChange = (typeof nextSibling.querySelector === 'function') ? nextSibling : currentRow.querySelector(`c[r='${columnText}${row + 11}']`); + const cellToChange = currentRow.children(`c[r='${columnText}${row + 11}']`); switch (columnText) { case 'B': { putString( @@ -696,10 +698,9 @@ const updateOverviewSheet = ( // TODO: duplicate the hyperlinked fields // ////////////////////////////////////// - nextSibling = cellToChange ? cellToChange.nextSibling : {}; } - currentRow = currentRow.nextSibling; + currentRow = currentRow.next(); } debuglog('overview updated'); @@ -721,17 +722,17 @@ const updateEstablishmentsSheet = ( // set headers putString( - establishmentsSheet.querySelector("c[r='B6']"), + establishmentsSheet("c[r='B6']"), `Parent name : ${reportData.parentName}` ); putString( - establishmentsSheet.querySelector("c[r='B7']"), + establishmentsSheet("c[r='B7']"), `Date: ${moment(reportData.date).format('DD/MM/YYYY')}` ); // clone the row the apropriate number of times - const templateRow = establishmentsSheet.querySelector("row[r='11']"); + const templateRow = establishmentsSheet("row[r='11']"); let currentRow = templateRow; let rowIndex = 12; let establishmentReportData = [...reportData.establishments]; @@ -745,15 +746,15 @@ const updateEstablishmentsSheet = ( }); if (establishmentArray.length > 1) { for (let i = 0; i < establishmentArray.length - 1; i++) { - const tempRow = templateRow.cloneNode(true); + const tempRow = templateRow.clone(true); - tempRow.setAttribute('r', rowIndex); + tempRow.attr('r', rowIndex); - tempRow.querySelectorAll('c').forEach(elem => { - elem.setAttribute('r', String(elem.getAttribute('r')).replace(/\d+$/, '') + rowIndex); + tempRow.children('c').each((index, element) => { + establishmentsSheet(element).attr('r', String(establishmentsSheet(element).attr('r')).replace(/\d+$/, '') + rowIndex); }); - templateRow.parentNode.insertBefore(tempRow, currentRow.nextSibling); + currentRow.after(tempRow); currentRow = tempRow; rowIndex++; @@ -763,24 +764,23 @@ const updateEstablishmentsSheet = ( } // fix the last row in the table - establishmentsSheet.querySelector('sheetData row:last-child').setAttribute('r', rowIndex); + establishmentsSheet('sheetData row:last-child').attr('r', rowIndex); // fix the dimensions tag value - const dimension = establishmentsSheet.querySelector('dimension'); - dimension.setAttribute('ref', String(dimension.getAttribute('ref')).replace(/\d+$/, '') + rowIndex); + const dimension = establishmentsSheet('dimension'); + dimension.attr('ref', String(dimension.attr('ref')).replace(/\d+$/, '') + rowIndex); // update the cell values for (let row = 0; row < establishmentArray.length; row++) { debuglog('updating establishment', row); const rowType = row === establishmentArray.length - 1 ? 'ESTLAST' : 'ESTREGULAR'; - let nextSibling = {}; for (let column = 0; column < 17; column++) { const columnText = String.fromCharCode(column + 65); const isRed = false; - const cellToChange = (typeof nextSibling.querySelector === 'function') ? nextSibling : currentRow.querySelector(`c[r='${columnText}${row + 11}']`); + const cellToChange = currentRow.children(`c[r='${columnText}${row + 11}']`); switch (columnText) { case 'B': { @@ -926,11 +926,8 @@ const updateEstablishmentsSheet = ( ); } break; } - - nextSibling = cellToChange ? cellToChange.nextSibling : {}; } - - currentRow = currentRow.nextSibling; + currentRow = currentRow.next(); } debuglog('establishments updated'); @@ -951,31 +948,31 @@ const updateWorkersSheet = ( // set headers putString( - workersSheet.querySelector("c[r='B6']"), + workersSheet("c[r='B6']"), `Parent name : ${reportData.parentName}` ); putString( - workersSheet.querySelector("c[r='B7']"), + workersSheet("c[r='B7']"), `Date: ${moment(reportData.date).format('DD/MM/YYYY')}` ); // clone the row the apropriate number of times - const templateRow = workersSheet.querySelector("row[r='10']"); + const templateRow = workersSheet("row[r='10']"); let currentRow = templateRow; let rowIndex = 11; if (reportData.workers.length > 1) { for (let i = 0; i < reportData.workers.length - 1; i++) { - const tempRow = templateRow.cloneNode(true); + const tempRow = templateRow.clone(true); - tempRow.setAttribute('r', rowIndex); + tempRow.attr('r', rowIndex); - tempRow.querySelectorAll('c').forEach(elem => { - elem.setAttribute('r', String(elem.getAttribute('r')).replace(/\d+$/, '') + rowIndex); + tempRow.children('c').each((index, element) => { + workersSheet(element).attr('r', String(workersSheet(element).attr('r')).replace(/\d+$/, '') + rowIndex); }); - templateRow.parentNode.insertBefore(tempRow, currentRow.nextSibling); + currentRow.after(tempRow); currentRow = tempRow; rowIndex++; @@ -985,21 +982,19 @@ const updateWorkersSheet = ( } // fix the dimensions tag value - const dimension = workersSheet.querySelector('dimension'); - dimension.setAttribute('ref', String(dimension.getAttribute('ref')).replace(/\d+$/, '') + (rowIndex - 1)); + const dimension = workersSheet('dimension'); + dimension.attr('ref', String(dimension.attr('ref')).replace(/\d+$/, '') + (rowIndex - 1)); // update the cell values for (let row = 0; row < reportData.workers.length; row++) { debuglog('updating worker', row); const rowType = row === reportData.workers.length - 1 ? 'WKRLAST' : 'WKRREGULAR'; - let nextSibling = {}; for (let column = 0; column < 19; column++) { const columnText = String.fromCharCode(column + 65); let isRed = false; - - const cellToChange = (typeof nextSibling.querySelector === 'function') ? nextSibling : currentRow.querySelector(`c[r='${columnText}${row + 10}']`); + const cellToChange = currentRow.children(`c[r='${columnText}${row + 10}']`); switch (columnText) { case 'B': { @@ -1188,11 +1183,9 @@ const updateWorkersSheet = ( setStyle(cellToChange, columnText, rowType, isRed); } break; } - - nextSibling = cellToChange ? cellToChange.nextSibling : {}; } - currentRow = currentRow.nextSibling; + currentRow = currentRow.next(); } debuglog('workers updated'); @@ -1253,50 +1246,50 @@ const getReport = async (date, thisEstablishment) => { }); }); - walker.on('end', () => { + walker.on('end', async () => { debuglog('all files read'); if (sharedStrings) { - const sst = sharedStrings.querySelector('sst'); + const sst = sharedStrings('sst'); - const sharedStringsUniqueCount = [parseInt(sst.getAttribute('uniqueCount'), 10)]; + const sharedStringsUniqueCount = [parseInt(sst.attr('uniqueCount'), 10)]; // update the overview sheet with the report data and add it to the zip - outputZip.file(overviewSheetName, serializeXML(updateOverviewSheet( + outputZip.file(overviewSheetName, updateOverviewSheet( overviewSheet, reportData, sharedStrings, sst, sharedStringsUniqueCount // pass unique count by reference rather than by value - ))); + ).xml()); //outputZip.file(establishmentsSheetName, serializeXML(establishmentsSheet)); //outputZip.file(workersSheetName, serializeXML(workersSheet)); // update the establishments sheet with the report data and add it to the zip - outputZip.file(establishmentsSheetName, serializeXML(updateEstablishmentsSheet( + outputZip.file(establishmentsSheetName, updateEstablishmentsSheet( establishmentsSheet, reportData, sharedStrings, sst, sharedStringsUniqueCount, // pass unique count by reference rather than by value thisEstablishment - ))); + ).xml()); // update the workplaces sheet with the report data and add it to the zip - outputZip.file(workersSheetName, serializeXML(updateWorkersSheet( + outputZip.file(workersSheetName, updateWorkersSheet( workersSheet, reportData, sharedStrings, sst, sharedStringsUniqueCount // pass unique count by reference rather than by value - ))); + ).xml()) // update the shared strings counts we've been keeping track of - sst.setAttribute('uniqueCount', sharedStringsUniqueCount[0]); + sst.attr('uniqueCount', sharedStringsUniqueCount[0]); // add the updated shared strings to the zip - outputZip.file(sharedStringsName, serializeXML(sharedStrings)); + outputZip.file(sharedStringsName, sharedStrings.xml()); } debuglog('wdf parent report: creating zip file'); From 26879d375fcde44372b4bccf51d02ebc3c468d6e Mon Sep 17 00:00:00 2001 From: Aaron Russell Date: Wed, 12 Feb 2020 12:44:40 +0000 Subject: [PATCH 054/305] Turned debug logging off --- server/routes/reports/wdf/parent.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/server/routes/reports/wdf/parent.js b/server/routes/reports/wdf/parent.js index e9b246b17f..eede5e8ad8 100644 --- a/server/routes/reports/wdf/parent.js +++ b/server/routes/reports/wdf/parent.js @@ -29,8 +29,8 @@ const workersSheetName = path.join('xl', 'worksheets', 'sheet3.xml'); const sharedStringsName = path.join('xl', 'sharedStrings.xml'); const schema = 'http://schemas.openxmlformats.org/spreadsheetml/2006/main'; const isNumberRegex = /^[0-9]+(\.[0-9]+)?$/; -const debuglog = console.log.bind(console); -// const debuglog = () => {}; +// const debuglog = console.log.bind(console); +const debuglog = () => {}; const buStates = [ 'READY', From 72dc89777fc580362f05a179955ace2d2c7ea878 Mon Sep 17 00:00:00 2001 From: Aaron Russell Date: Wed, 12 Feb 2020 15:51:49 +0000 Subject: [PATCH 055/305] Added fix so that numbers were replaced --- server/routes/reports/wdf/parent.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/server/routes/reports/wdf/parent.js b/server/routes/reports/wdf/parent.js index eede5e8ad8..b5a7e13b07 100644 --- a/server/routes/reports/wdf/parent.js +++ b/server/routes/reports/wdf/parent.js @@ -79,8 +79,8 @@ const putStringTemplate = ( } if (isNumber) { - element.attr('t'); - vTag.textContent = textValue; + element.attr('t', ''); + vTag.text(textValue); } else { element.attr('t', 's'); From 3da01c071dc092208e523e243573c4f2244861aa Mon Sep 17 00:00:00 2001 From: Aaron Russell Date: Thu, 13 Feb 2020 11:03:51 +0000 Subject: [PATCH 056/305] Added validation for updating a postcode that can't be found --- .../models/BulkImport/csv/establishments.js | 16 +- .../Bulkimport/csv/establishments.spec.js | 360 ++++++++++++++++++ 2 files changed, 374 insertions(+), 2 deletions(-) diff --git a/server/models/BulkImport/csv/establishments.js b/server/models/BulkImport/csv/establishments.js index 9a6477fe08..c32d8d849c 100644 --- a/server/models/BulkImport/csv/establishments.js +++ b/server/models/BulkImport/csv/establishments.js @@ -464,9 +464,9 @@ class Establishment { const myAddress3 = this._currentLine.ADDRESS3; const myTown = this._currentLine.POSTTOWN; const myPostcode = this._currentLine.POSTCODE; + let ignorePostcode = false; // TODO - if town is empty, match against PAF - // TODO - validate postcode against PAF // adddress 1 is mandatory and no more than 40 characters const MAX_LENGTH = 40; @@ -571,6 +571,16 @@ class Establishment { name: this._currentLine.LOCALESTID }); this._ignore = true; + } else if (this._status === 'UPDATE' && !postcodeExists.length) { + localValidationErrors.push({ + lineNumber: this._lineNumber, + warnCode: Establishment.ADDRESS_ERROR, + warnType: 'ADDRESS_ERROR', + warning: 'The POSTCODE cannot be found in our database and will be ignored.', + source: myPostcode, + name: this._currentLine.LOCALESTID + }); + ignorePostcode = true; } if (localValidationErrors.length > 0) { @@ -583,7 +593,9 @@ class Establishment { this._address2 = myAddress2; this._address3 = myAddress3; this._town = myTown; - this._postcode = myPostcode; + if (!ignorePostcode) { + this._postcode = myPostcode; + } return true; } diff --git a/server/test/unit/models/Bulkimport/csv/establishments.spec.js b/server/test/unit/models/Bulkimport/csv/establishments.spec.js index fcefb3b01f..d86a32658e 100644 --- a/server/test/unit/models/Bulkimport/csv/establishments.spec.js +++ b/server/test/unit/models/Bulkimport/csv/establishments.spec.js @@ -2180,6 +2180,366 @@ it('should not emit an error if postcode can be found in the reference data', as expect(validationErrors).to.deep.equal([]); }); +it('should emit an warning if postcode cannot be found in the reference data', async () => { + const bulkUpload = new (testUtils.sandBox( + filename, + { + locals: { + require: testUtils.wrapRequire({ + '../BUDI': { + BUDI + }, + '../../index': { + establishment: models.establishment, + pcodedata: models.pcodedata + } + }) + } + } + ).Establishment)( + { + LOCALESTID: 'omar3', + STATUS: 'UPDATE', + ESTNAME: 'WOZiTech, with even more care', + ADDRESS1: 'First Line', + ADDRESS2: 'Second Line', + ADDRESS3: '', + POSTTOWN: 'My Town', + POSTCODE: 'AB13 4NJ', + ESTTYPE: '6', + OTHERTYPE: '', + PERMCQC: '1', + PERMLA: '1', + SHARELA: '708;721;720', + REGTYPE: '2', + PROVNUM: '1-123456781', + LOCATIONID: '1-123456781', + MAINSERVICE: '8', + ALLSERVICES: '12;13', + CAPACITY: '0;0', + UTILISATION: '0;0', + SERVICEDESC: '1;1', + SERVICEUSERS: '', + OTHERUSERDESC: '', + TOTALPERMTEMP: '1', + ALLJOBROLES: '34;8;4', + STARTERS: '0;0;0', + LEAVERS: '999;0;0', + VACANCIES: '999;333;1', + REASONS: '', + REASONNOS: '' + }, + 2, + [ + { + _validations: [], + _username: 'aylingw', + _id: 479, + _uid: '98a83eef-e1e1-49f3-89c5-b1287a3cc8dd', + _ustatus: null, + _created: '2019-03-15T09:54:10.562Z', + _updated: '2019-10-04T15:46:16.158Z', + _updatedBy: 'aylingw', + _auditEvents: null, + _name: 'WOZiTech, with even more care', + _address1: 'First Line', + _address2: 'Second Line', + _address3: '', + _town: 'My Town', + _county: '', + _locationId: null, + _provId: null, + _postcode: 'LN11 9JG', + _isRegulated: false, + _mainService: { id: 16, name: 'Head office services' }, + _nmdsId: 'G1001114', + _lastWdfEligibility: '2019-08-16T07:17:38.014Z', + _overallWdfEligibility: '2019-08-16T07:17:38.340Z', + _establishmentWdfEligibility: null, + _staffWdfEligibility: '2019-08-13T12:41:24.836Z', + _isParent: true, + _parentUid: null, + _parentId: null, + _parentName: null, + _dataOwner: 'Workplace', + _dataPermissions: 'None', + _archived: false, + _dataOwnershipRequested: null, + _reasonsForLeaving: '', + _properties: { + _properties: [Object], + _propertyTypes: [Array], + _auditEvents: null, + _modifiedProperties: [], + _additionalModels: null + }, + _isNew: false, + _workerEntities: { + }, + _readyForDeletionWorkers: null, + _status: 'NEW', + _logLevel: 300 + }, + { + _validations: [], + _username: 'aylingw', + _id: 1446, + _uid: 'a415435f-40f2-4de5-abf7-bff611e85591', + _ustatus: null, + _created: '2019-07-31T15:09:57.405Z', + _updated: '2019-10-04T15:46:16.797Z', + _updatedBy: 'aylingw', + _auditEvents: null, + _name: 'WOZiTech Cares Sub 100', + _address1: 'Number 1', + _address2: 'My street', + _address3: '', + _town: 'My Town', + _county: '', + _locationId: '1-888777666', + _provId: '1-999888777', + _postcode: 'AB13 4NJ', + _isRegulated: true, + _mainService: { id: 1, name: 'Carers support' }, + _nmdsId: 'G1002110', + _lastWdfEligibility: '2019-10-04T15:46:16.797Z', + _overallWdfEligibility: null, + _establishmentWdfEligibility: '2019-10-04T14:46:16.797Z', + _staffWdfEligibility: null, + _isParent: false, + _parentUid: '98a83eef-e1e1-49f3-89c5-b1287a3cc8dd', + _parentId: 479, + _parentName: null, + _dataOwner: 'Parent', + _dataPermissions: 'None', + _archived: false, + _dataOwnershipRequested: null, + _reasonsForLeaving: '', + _properties: { + _properties: [Object], + _propertyTypes: [Array], + _auditEvents: null, + _modifiedProperties: [], + _additionalModels: null + }, + _isNew: false, + _workerEntities: {}, + _readyForDeletionWorkers: null, + _status: 'COMPLETE', + _logLevel: 300 + } + ]); + + expect(bulkUpload).to.have.property('validate'); + + const csvEstablishmentSchemaErrors = []; + + const myWorkers = []; + + // call the validation to ensure the proper error is shown + await bulkUpload.validate(); + + const validationErrors = bulkUpload.validationErrors; + + // assert a warning was returned + + expect(validationErrors).to.deep.equal([ + { + "errCode": 1020, + "errType": "STATUS_ERROR", + "error": "Workplace has a STATUS of UPDATE but does not exist, please change to NEW to add it", + "lineNumber": 2, + "name": "omar3", + "origin": "Establishments", + "source": "UPDATE" + }, + { + "lineNumber": 2, + "name": "omar3", + "origin": "Establishments", + "source": "AB13 4NJ", + "warnCode": 1040, + "warnType": "ADDRESS_ERROR", + "warning": "The POSTCODE cannot be found in our database and will be ignored." + } + ]); +}); + +it('should not emit an error if postcode can be found in the reference data', async () => { + const bulkUpload = new (testUtils.sandBox( + filename, + { + locals: { + require: testUtils.wrapRequire({ + '../BUDI': { + BUDI + }, + '../../index': { + establishment: models.establishment, + pcodedata: models.pcodedata + } + }) + } + } + ).Establishment)( + { + LOCALESTID: 'omar3', + STATUS: 'UPDATE', + ESTNAME: 'WOZiTech, with even more care', + ADDRESS1: 'First Line', + ADDRESS2: 'Second Line', + ADDRESS3: '', + POSTTOWN: 'My Town', + POSTCODE: 'AB13 4MJ', + ESTTYPE: '6', + OTHERTYPE: '', + PERMCQC: '1', + PERMLA: '1', + SHARELA: '708;721;720', + REGTYPE: '2', + PROVNUM: '1-123456781', + LOCATIONID: '1-123456781', + MAINSERVICE: '8', + ALLSERVICES: '12;13', + CAPACITY: '0;0', + UTILISATION: '0;0', + SERVICEDESC: '1;1', + SERVICEUSERS: '', + OTHERUSERDESC: '', + TOTALPERMTEMP: '1', + ALLJOBROLES: '34;8;4', + STARTERS: '0;0;0', + LEAVERS: '999;0;0', + VACANCIES: '999;333;1', + REASONS: '', + REASONNOS: '' + }, + 2, + [ + { + _validations: [], + _username: 'aylingw', + _id: 479, + _uid: '98a83eef-e1e1-49f3-89c5-b1287a3cc8dd', + _ustatus: null, + _created: '2019-03-15T09:54:10.562Z', + _updated: '2019-10-04T15:46:16.158Z', + _updatedBy: 'aylingw', + _auditEvents: null, + _name: 'WOZiTech, with even more care', + _address1: 'First Line', + _address2: 'Second Line', + _address3: '', + _town: 'My Town', + _county: '', + _locationId: null, + _provId: null, + _postcode: 'LN11 9JG', + _isRegulated: false, + _mainService: { id: 16, name: 'Head office services' }, + _nmdsId: 'G1001114', + _lastWdfEligibility: '2019-08-16T07:17:38.014Z', + _overallWdfEligibility: '2019-08-16T07:17:38.340Z', + _establishmentWdfEligibility: null, + _staffWdfEligibility: '2019-08-13T12:41:24.836Z', + _isParent: true, + _parentUid: null, + _parentId: null, + _parentName: null, + _dataOwner: 'Workplace', + _dataPermissions: 'None', + _archived: false, + _dataOwnershipRequested: null, + _reasonsForLeaving: '', + _properties: { + _properties: [Object], + _propertyTypes: [Array], + _auditEvents: null, + _modifiedProperties: [], + _additionalModels: null + }, + _isNew: false, + _workerEntities: { + }, + _readyForDeletionWorkers: null, + _status: 'NEW', + _logLevel: 300 + }, + { + _validations: [], + _username: 'aylingw', + _id: 1446, + _uid: 'a415435f-40f2-4de5-abf7-bff611e85591', + _ustatus: null, + _created: '2019-07-31T15:09:57.405Z', + _updated: '2019-10-04T15:46:16.797Z', + _updatedBy: 'aylingw', + _auditEvents: null, + _name: 'WOZiTech Cares Sub 100', + _address1: 'Number 1', + _address2: 'My street', + _address3: '', + _town: 'My Town', + _county: '', + _locationId: '1-888777666', + _provId: '1-999888777', + _postcode: 'LN11 9JG', + _isRegulated: true, + _mainService: { id: 1, name: 'Carers support' }, + _nmdsId: 'G1002110', + _lastWdfEligibility: '2019-10-04T15:46:16.797Z', + _overallWdfEligibility: null, + _establishmentWdfEligibility: '2019-10-04T14:46:16.797Z', + _staffWdfEligibility: null, + _isParent: false, + _parentUid: '98a83eef-e1e1-49f3-89c5-b1287a3cc8dd', + _parentId: 479, + _parentName: null, + _dataOwner: 'Parent', + _dataPermissions: 'None', + _archived: false, + _dataOwnershipRequested: null, + _reasonsForLeaving: '', + _properties: { + _properties: [Object], + _propertyTypes: [Array], + _auditEvents: null, + _modifiedProperties: [], + _additionalModels: null + }, + _isNew: false, + _workerEntities: {}, + _readyForDeletionWorkers: null, + _status: 'COMPLETE', + _logLevel: 300 + } + ]); + + expect(bulkUpload).to.have.property('validate'); + + const csvEstablishmentSchemaErrors = []; + + const myWorkers = []; + + // call the validation to ensure the proper error is shown + await bulkUpload.validate(); + + const validationErrors = bulkUpload.validationErrors; + + // assert a warning was returned + + expect(validationErrors).to.deep.equal([ + { + "errCode": 1020, + "errType": "STATUS_ERROR", + "error": "Workplace has a STATUS of UPDATE but does not exist, please change to NEW to add it", + "lineNumber": 2, + "name": "omar3", + "origin": "Establishments", + "source": "UPDATE" + } + ]); +}); // it('should emit an error if SLV is greater than zero and this ALLJOBROLES is blank', async () => { // const bulkUpload = new (testUtils.sandBox( // filename, From 975d30298060ffd59bc92838aed9c0e8ed481056 Mon Sep 17 00:00:00 2001 From: Aaron Russell Date: Thu, 13 Feb 2020 13:44:57 +0000 Subject: [PATCH 057/305] Revert "Fixed :: Duplicate Local Identifiers are not downloading in BU (#1966)" This reverts commit 5ef946f445c71656efbdda4ab58e69f33516951c. --- server/models/classes/establishment.js | 12 ++++++++---- server/models/worker.js | 1 + 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/server/models/classes/establishment.js b/server/models/classes/establishment.js index 29e8971920..25cfd0e664 100644 --- a/server/models/classes/establishment.js +++ b/server/models/classes/establishment.js @@ -100,7 +100,7 @@ class Establishment extends EntityValidator { this._isNew = false; // all known workers for this establishment - an associative object (property key is the worker's key) - this._workerEntities = []; + this._workerEntities = {}; this._readyForDeletionWorkers = null; // bulk upload status - this is never stored in database @@ -362,8 +362,11 @@ class Establishment extends EntityValidator { } // this method add this given worker (entity) as an association to this establishment entity - (bulk import) - associateWorker(worker) { - this._workerEntities.push(worker); + associateWorker(key, worker) { + if (key && worker) { + // worker not yet associated; take as is + this._workerEntities[key] = worker; + } } // returns just the set of keys of the associated workers @@ -521,7 +524,7 @@ class Establishment extends EntityValidator { const newWorker = new Worker(null); // TODO - until we have Worker.localIdentifier we only have Worker.nameOrId to use as key - this.associateWorker(thisWorker); + this.associateWorker(thisWorker.key, newWorker); promises.push(newWorker.load(thisWorker, true)); } }); @@ -1196,6 +1199,7 @@ class Establishment extends EntityValidator { }, }; } + const fetchResults = await models.establishment.findOne(fetchQuery); if (fetchResults && fetchResults.id && Number.isInteger(fetchResults.id)) { // update self - don't use setters because they modify the change state diff --git a/server/models/worker.js b/server/models/worker.js index 9fb252522f..17a28205a4 100644 --- a/server/models/worker.js +++ b/server/models/worker.js @@ -16,6 +16,7 @@ module.exports = function(sequelize, DataTypes) { LocalIdentifierValue: { type: DataTypes.TEXT, allowNull: true, + unique: true, field: '"LocalIdentifierValue"' }, LocalIdentifierSavedAt : { From 6044a4c946e35c861a3533b49c2a8012c3d06c74 Mon Sep 17 00:00:00 2001 From: Aaron Russell Date: Thu, 13 Feb 2020 13:45:32 +0000 Subject: [PATCH 058/305] Revert "Fixed some issue. (#1967)" This reverts commit 84c5be71a35fc8a84f4b0a444893a6e1ceddfa1e. --- server/models/classes/establishment.js | 2 +- server/routes/establishments/bulkUpload.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/server/models/classes/establishment.js b/server/models/classes/establishment.js index 25cfd0e664..f292eed199 100644 --- a/server/models/classes/establishment.js +++ b/server/models/classes/establishment.js @@ -1496,7 +1496,7 @@ class Establishment extends EntityValidator { // TODO: once we have the unique worder id property, use that instead; for now, we only have the name or id. // without whitespace - this.associateWorker(newWorker); + this.associateWorker(newWorker.key, newWorker); return {}; }) diff --git a/server/routes/establishments/bulkUpload.js b/server/routes/establishments/bulkUpload.js index 3db24de4d4..3574dff668 100644 --- a/server/routes/establishments/bulkUpload.js +++ b/server/routes/establishments/bulkUpload.js @@ -2332,7 +2332,7 @@ const exportToCsv = async (NEWLINE, allMyEstablishments, primaryEstablishmentId, responseSend(NEWLINE + WorkerCsvValidator.toCSV(thisEstablishment.localIdentifier, thisWorker, MAX_QUALS), 'worker'); } else if (thisWorker.training) { // or for this Worker's training records thisWorker.training.forEach(thisTrainingRecord => { - responseSend(NEWLINE + TrainingCsvValidator.toCSV(thisEstablishment.key, thisWorker, thisTrainingRecord), 'training'); + responseSend(NEWLINE + TrainingCsvValidator.toCSV(thisEstablishment.key, thisWorker.key, thisTrainingRecord), 'training'); }); } }); From 473afd8a5bc1d84d8b3250301e55a96746e62afe Mon Sep 17 00:00:00 2001 From: Aaron Russell Date: Thu, 13 Feb 2020 15:50:19 +0000 Subject: [PATCH 059/305] Revert "Added some code optimizations for parent wdf report. (#1963)" This reverts commit 1152a9dbc745dc6f3cc2b57e9ac79b3d9439e061. --- server/data/parentWDFReport.js | 112 +++++++++++++++++----------- server/routes/reports/wdf/parent.js | 85 ++++++++++++++------- 2 files changed, 127 insertions(+), 70 deletions(-) diff --git a/server/data/parentWDFReport.js b/server/data/parentWDFReport.js index 1539335365..1ec4a18fc9 100644 --- a/server/data/parentWDFReport.js +++ b/server/data/parentWDFReport.js @@ -7,7 +7,7 @@ const effectiveDate = rfr('server/models/classes/wdfCalculator').WdfCalculator.e const getEstablishmentDataQuery = ` SELECT - e."EstablishmentID", + "Establishment"."EstablishmentID", "NmdsID", "NameValue" AS "SubsidiaryName", "DataOwner", @@ -24,7 +24,7 @@ SELECT FROM cqc."Worker" WHERE - "Worker"."EstablishmentFK" = e."EstablishmentID" + "Worker"."EstablishmentFK" = "Establishment"."EstablishmentID" and "Archived" = false ) AS "TotalIndividualWorkerRecord", ( @@ -33,7 +33,7 @@ SELECT FROM cqc."Worker" WHERE - "EstablishmentFK" = e."EstablishmentID" AND + "EstablishmentFK" = "Establishment"."EstablishmentID" AND "LastWdfEligibility" IS NOT NULL AND "LastWdfEligibility" > :effectiveDate AND "Archived" = :falseFlag @@ -47,8 +47,12 @@ SELECT cqc."services" AS b ON a."ServiceID" = b.id + JOIN + cqc."Establishment" AS c + ON + a."EstablishmentID" = c."EstablishmentID" WHERE - a."EstablishmentID" = e."EstablishmentID" + c."EstablishmentID" = "Establishment"."EstablishmentID" ), :separator) AS "OtherServices", array_to_string(array( SELECT @@ -60,7 +64,7 @@ SELECT ON a."ServiceUserID" = b."ID" WHERE - a."EstablishmentID" = e."EstablishmentID" + a."EstablishmentID" = "Establishment"."EstablishmentID" ), :separator) AS "ServiceUsers", ( SELECT @@ -68,7 +72,7 @@ SELECT FROM cqc."EstablishmentJobs" WHERE - "EstablishmentJobs"."EstablishmentID" = e."EstablishmentID" AND + "EstablishmentJobs"."EstablishmentID" = "Establishment"."EstablishmentID" AND "EstablishmentJobs"."JobType" = :Vacancies ) AS "VacanciesCount", ( @@ -77,7 +81,7 @@ SELECT FROM cqc."EstablishmentJobs" WHERE - "EstablishmentJobs"."EstablishmentID" = e."EstablishmentID" AND + "EstablishmentJobs"."EstablishmentID" = "Establishment"."EstablishmentID" AND "EstablishmentJobs"."JobType" = :Starters ) AS "StartersCount", ( @@ -86,60 +90,52 @@ SELECT FROM cqc."EstablishmentJobs" WHERE - "EstablishmentJobs"."EstablishmentID" = e."EstablishmentID" AND + "EstablishmentJobs"."EstablishmentID" = "Establishment"."EstablishmentID" AND "EstablishmentJobs"."JobType" = :Leavers ) AS "LeaversCount", "VacanciesValue", "StartersValue", "LeaversValue", "NumberOfStaffValue", + updated, - CASE WHEN updated > :effectiveDate THEN to_char(updated, :timeFormat) ELSE NULL END "LastUpdatedDate", + CASE WHEN updated > :effectiveDate THEN to_char(updated, :timeFormat) ELSE NULL END AS "LastUpdatedDate", "ShareDataWithCQC", "ShareDataWithLA", - (select count(:zero) from cqc."Worker" where "EstablishmentFK" = e."EstablishmentID") "ReasonsForLeaving", - "Status", - array_to_string(array(SELECT "ServiceCapacityID" - FROM cqc."ServicesCapacity" - WHERE "ServiceID" = e."MainServiceFKValue"), :separator) "ServicesCapacity", - array_to_string(array(SELECT "Type" - FROM cqc."ServicesCapacity" - WHERE "ServiceID" = e."MainServiceFKValue"), :separator) "Type", - (SELECT - b."Answer" - FROM - cqc."ServicesCapacity" AS a - JOIN - cqc."EstablishmentCapacity" AS b - ON - a."ServiceCapacityID" = b."ServiceCapacityID" - WHERE - b."EstablishmentID" = e."EstablishmentID" AND - "ServiceID" = e."MainServiceFKValue" AND a."Type" = :Capacity) "Capacity", - (SELECT - b."Answer" - FROM - cqc."ServicesCapacity" AS a - JOIN - cqc."EstablishmentCapacity" AS b - ON - a."ServiceCapacityID" = b."ServiceCapacityID" - WHERE - b."EstablishmentID" = e."EstablishmentID" AND - "ServiceID" = e."MainServiceFKValue" AND a."Type" = :Utilisation) "Utilisation" + (select count("LeaveReasonFK") from cqc."Worker" where "EstablishmentFK" = "Establishment"."EstablishmentID") as "ReasonsForLeaving", + "Status" FROM - cqc."Establishment" e + cqc."Establishment" LEFT JOIN cqc.services as MainService ON - e."MainServiceFKValue" = MainService.id + "Establishment"."MainServiceFKValue" = MainService.id WHERE - (e."EstablishmentID" = :establishmentId OR e."ParentID" = :establishmentId) AND - "Archived" = :falseFlag AND e."Status" IS NULL + ("Establishment"."EstablishmentID" = :establishmentId OR "Establishment"."ParentID" = :establishmentId) AND + "Archived" = :falseFlag ORDER BY "EstablishmentID"; `; +const getCapicityOrUtilisationDataQuery = +`SELECT + b."Answer" + FROM + cqc."ServicesCapacity" AS a + JOIN + cqc."EstablishmentCapacity" AS b + ON + a."ServiceCapacityID" = b."ServiceCapacityID" + WHERE + b."EstablishmentID" = :establishmentId AND + "ServiceID" = :mainServiceId AND + a."Type" = :type`; + +const getServiceCapacityDetailsQuery = + `SELECT "ServiceCapacityID", "Type" + FROM cqc."ServicesCapacity" + WHERE "ServiceID" = :mainServiceId`; + exports.getEstablishmentData = async establishmentId => db.query(getEstablishmentDataQuery, { replacements: { @@ -152,8 +148,34 @@ exports.getEstablishmentData = async establishmentId => Vacancies: 'Vacancies', Starters: 'Starters', Leavers: 'Leavers', - Capacity: 'Capacity', - Utilisation: 'Utilisation' + }, + type: db.QueryTypes.SELECT + }); + +exports.getCapicityData = async (establishmentId, mainServiceId) => + db.query(getCapicityOrUtilisationDataQuery, { + replacements: { + establishmentId, + mainServiceId, + type: 'Capacity' + }, + type: db.QueryTypes.SELECT + }); + +exports.getUtilisationData = async (establishmentId, mainServiceId) => + db.query(getCapicityOrUtilisationDataQuery, { + replacements: { + establishmentId, + mainServiceId, + type: 'Utilisation' + }, + type: db.QueryTypes.SELECT + }); + +exports.getServiceCapacityDetails = async (mainServiceId) => + db.query(getServiceCapacityDetailsQuery, { + replacements: { + mainServiceId }, type: db.QueryTypes.SELECT }); diff --git a/server/routes/reports/wdf/parent.js b/server/routes/reports/wdf/parent.js index b5a7e13b07..c38beaae2c 100644 --- a/server/routes/reports/wdf/parent.js +++ b/server/routes/reports/wdf/parent.js @@ -18,7 +18,7 @@ const s3 = new AWS.S3({ const Bucket = String(config.get('bulkupload.bucketname')); const { Establishment } = require('../../../models/classes/establishment'); -const { getEstablishmentData, getWorkerData } = rfr('server/data/parentWDFReport'); +const { getEstablishmentData, getWorkerData, getCapicityData, getUtilisationData, getServiceCapacityDetails } = rfr('server/data/parentWDFReport'); const { attemptToAcquireLock, updateLockState, lockStatus, releaseLockQuery } = rfr('server/data/parentWDFReportLock'); // Constants string needed by this file in several places @@ -106,32 +106,60 @@ const getReportData = async (date, thisEstablishment) => { }; }; +const propsNeededToComplete = ('MainService,EmployerTypeValue,Capacities,ServiceUsers,' + +'NumberOfStaffValue').split(','); + const getEstablishmentReportData = async establishmentId => { - const establishmentData = await getEstablishmentData(establishmentId); + const establishmentReturnData = await getEstablishmentData(establishmentId); + const establishmentData = establishmentReturnData.filter(est => est.Status !== "PENDING"); for(let i = 0; i< establishmentData.length; i++) { let value = establishmentData[i]; - if(value.ServicesCapacity === ""){ + let getServiceCapacityData = await getServiceCapacityDetails(value.MainServiceFKValue); + if(getServiceCapacityData && getServiceCapacityData.length === 0){ value.Capacities = 'N/A'; value.Utilisations = 'N/A'; }else{ - let ServicesCapacityValue = value.Type.indexOf(','); - if(ServicesCapacityValue !== -1){ - value.Capacities = (value.Capacity !== null)? value.Capacity: 'Missing'; - value.Utilisations = (value.Utilisation !== null)? value.Utilisation: 'Missing'; - }else if(value.Type === 'Capacity'){ - value.Capacities = (value.Capacity !== null)? value.Capacity: 'Missing'; - value.Utilisations = 'N/A'; - }else if(value.Type === 'Utilisation'){ - value.Utilisations = (value.Utilisation !== null)? value.Utilisation: 'Missing'; - value.Capacities = 'N/A'; + let capicityDetails = []; + let utilisationDetails = []; + if(getServiceCapacityData.length === 2){ + capicityDetails = await getCapicityData(value.EstablishmentID, value.MainServiceFKValue); + utilisationDetails = await getUtilisationData(value.EstablishmentID, value.MainServiceFKValue); + }else if(getServiceCapacityData[0].Type === 'Capacity'){ + capicityDetails = await getCapicityData(value.EstablishmentID, value.MainServiceFKValue); + utilisationDetails = [{"Answer": 'N/A'}]; + }else if(getServiceCapacityData[0].Type === 'Utilisation'){ + utilisationDetails = await getUtilisationData(value.EstablishmentID, value.MainServiceFKValue); + capicityDetails = [{"Answer": 'N/A'}]; } - } + if(capicityDetails && capicityDetails.length > 0){ + if(capicityDetails[0].Answer === null){ + value.Capacities = 'Missing'; + }else if(capicityDetails[0].Answer === 'N/A'){ + value.Capacities = 'N/A'; + }else{ + value.Capacities = capicityDetails[0].Answer; + } + }else{ + value.Capacities = 'Missing'; + } + if(utilisationDetails && utilisationDetails.length > 0){ + if(utilisationDetails[0].Answer === null){ + value.Utilisations = 'Missing'; + }else if(utilisationDetails[0].Answer === 'N/A'){ + value.Utilisations = 'N/A'; + }else{ + value.Utilisations = utilisationDetails[0].Answer; + } + }else{ + value.Utilisations = 'Missing'; + } + } if (value.ShareDataWithCQC && value.ShareDataWithLA) { value.SubsidiarySharingPermissions = 'All'; - } else if (value.ShareDataWithCQC) { + } else if (value.ShareDataWithCQC && !value.ShareDataWithLA) { value.SubsidiarySharingPermissions = 'CQC'; - } else if (value.ShareDataWithLA) { + } else if (!value.ShareDataWithCQC && value.ShareDataWithLA) { value.SubsidiarySharingPermissions = 'LA'; } else { value.SubsidiarySharingPermissions = 'None'; @@ -139,9 +167,11 @@ const getEstablishmentReportData = async establishmentId => { value.EstablishmentDataFullyCompleted = 'Yes'; - if(value.MainService === null || value.EmployerTypeValue === null || value.Capacities === null || value.ServiceUsers === null || value.NumberOfStaffValue === null){ - value.EstablishmentDataFullyCompleted = 'No'; - } + propsNeededToComplete.forEach(prop => { + if (value[prop] === null) { + value.EstablishmentDataFullyCompleted = 'No'; + } + }); value.CurrentWdfEligibilityStatus = value.CurrentWdfEligibilityStatus === null ? 'Not Eligible' : 'Eligible'; @@ -151,7 +181,10 @@ const getEstablishmentReportData = async establishmentId => { value.NumberOfStaffValue = (value.NumberOfStaffValue === null) ? 0: value.NumberOfStaffValue; - if (value.NumberOfStaffValue !== 0 && value.TotalIndividualWorkerRecord !== null) { + if ( + value.NumberOfStaffValue !== 0 && + value.NumberOfStaffValue !== null && + (value.TotalIndividualWorkerRecord !== 0 || value.TotalIndividualWorkerRecord !== null)) { value.PercentageOfWorkerRecords = `${parseFloat(+value.TotalIndividualWorkerRecord / +value.NumberOfStaffValue * 100).toFixed(1)}%`; } else { value.PercentageOfWorkerRecords = '0.0%'; @@ -185,9 +218,10 @@ const getEstablishmentReportData = async establishmentId => { value.EmployerTypeValue = ''; } - value.ServiceUsers = 'Yes'; if(value.ServiceUsers === ''){ value.ServiceUsers = 'Missing'; + }else{ + value.ServiceUsers = 'Yes'; } value.LeavingReasonsCountEqualsLeavers = (value.ReasonsForLeaving === value.LeaversValue) ? 'Yes' : 'No'; @@ -196,7 +230,7 @@ const getEstablishmentReportData = async establishmentId => { value.UpdatedInCurrentFinancialYear = value.LastUpdatedDate !== null ? 'Yes' : 'No'; value.CompletedWorkerRecordsPercentage = - (value.CompletedWorkerRecords === 0 || value.NumberOfStaffValue === 0) + (value.CompletedWorkerRecords === 0 || value.NumberOfStaffValue === 0 || value.NumberOfStaffValue === null) ? '0.0%' : `${parseFloat(+value.CompletedWorkerRecords / +value.NumberOfStaffValue * 100).toFixed(1)}%`; } @@ -219,8 +253,7 @@ const getWorkersReportData = async establishmentId => { } }); - for(let i = 0; i < workersArray.length; i++){ - let value = workersArray[i]; + workersArray.forEach((value, key) => { if(value.QualificationInSocialCareValue === 'No' || value.QualificationInSocialCareValue === "Don't know"){ value.QualificationInSocialCare = 'N/A'; } @@ -267,7 +300,7 @@ const getWorkersReportData = async establishmentId => { value[prop] = 'Missing'; } }); - } + }); return workersArray; }; @@ -574,6 +607,8 @@ const updateOverviewSheet = ( } } + // TODO: fix the page footer timestamp + // clone the row the apropriate number of times currentRow = templateRow; rowIndex = 12; From aca519a22b90465d94bd31c000c802677c0165a2 Mon Sep 17 00:00:00 2001 From: rchitranshi <53287302+rchitranshi@users.noreply.github.com> Date: Fri, 14 Feb 2020 12:00:46 +0530 Subject: [PATCH 060/305] Added Missing Mandatory count on GET:: :estId/worker API. (#1979) * Added Missing Mandatory count on GET:: :estId/worker API. * Removed debugger. --- server/models/classes/training.js | 57 +++++++++++++++++++++----- server/routes/establishments/worker.js | 2 +- 2 files changed, 47 insertions(+), 12 deletions(-) diff --git a/server/models/classes/training.js b/server/models/classes/training.js index 367ff4a8f5..e57b6cd2c8 100644 --- a/server/models/classes/training.js +++ b/server/models/classes/training.js @@ -812,20 +812,23 @@ class Training extends EntityValidator { * Function used to get all training expired and expiring soon counts for a worker id * @param {number} establishmentId * @param {object} workerRecords - * @return {array} Modified worker records while adding training counts for each worker object + * @return {array} Modified worker records while adding training counts & missing mandatory training counts for each worker object */ - static async getExpiringAndExpiredTrainingCounts(establishmentId, workerRecords){ + static async getAllRequiredCounts(establishmentId, workerRecords){ if(workerRecords.length !== 0){ let currentDate = moment(); for(let i = 0; i < workerRecords.length; i++){ const allTrainingRecords = await Training.fetch(establishmentId, workerRecords[i].uid); + workerRecords[i].trainingCount = 0; + workerRecords[i].expiredTrainingCount = 0; + workerRecords[i].expiringTrainingCount = 0; + workerRecords[i].missingMandatoryTrainingCount = 0; if(allTrainingRecords && allTrainingRecords.training.length > 0){ + workerRecords[i].missingMandatoryTrainingCount = await Training.getAllMissingMandatoryTrainingCounts(establishmentId, workerRecords[i], allTrainingRecords.training); workerRecords[i].trainingCount = allTrainingRecords.training.length; - workerRecords[i].expiredTrainingCount = 0; - workerRecords[i].expiringTrainingCount = 0; - //calculate all expired and expiring soon trainings count - let trainings = allTrainingRecords.training.length; - for(let j = 0; j < trainings; j++){ + //calculate all expired and expiring soon training count + let trainings = allTrainingRecords.training; + for(let j = 0; j < trainings.length; j++){ if(allTrainingRecords.training[j].expires){ let expiringDate = moment(allTrainingRecords.training[j].expires); let daysDiffrence = expiringDate.diff(currentDate, 'days'); @@ -836,15 +839,47 @@ class Training extends EntityValidator { } } } - }else{ - workerRecords[i].trainingCount = 0; - workerRecords[i].expiredTrainingCount = 0; - workerRecords[i].expiringTrainingCount = 0; } } return workerRecords; } } + + /** + * Function used to get all missing mandatory training counts for a worker id + * @param {number} establishmentId + * @param {object} workerRecords + * @param {array} trainingLists + * @return {array} Modified worker records while adding training counts & missing mandatory training counts for each worker object + */ + static async getAllMissingMandatoryTrainingCounts(establishmentId, workerRecords, trainingLists){ + // check for missing mandatory training + const fetchMandatoryTrainingResults = await models.MandatoryTraining.findAll({ + where: { + establishmentFK: establishmentId, + jobFK: workerRecords.mainJob.jobId + } + }); + let mandatoryTrainingLength = fetchMandatoryTrainingResults ? fetchMandatoryTrainingResults.length: 0; + let trainingLength = trainingLists.length; + if(mandatoryTrainingLength > 0){ + let missingMandatoryTrainingCount = 0; + for(let i = 0; i < mandatoryTrainingLength; i++){ + let foundMandatoryTraining = false; + for(let j = 0; j < trainingLength; j++){ + if(fetchMandatoryTrainingResults[i].trainingCategoryFK === trainingLists[j].trainingCategory.id){ + foundMandatoryTraining = true; + } + } + if(!foundMandatoryTraining){ + missingMandatoryTrainingCount++; + } + } + return missingMandatoryTrainingCount; + }else{ + return 0; + } + } }; module.exports.Training = Training; diff --git a/server/routes/establishments/worker.js b/server/routes/establishments/worker.js index 725f021c95..2fb1aa0528 100644 --- a/server/routes/establishments/worker.js +++ b/server/routes/establishments/worker.js @@ -100,7 +100,7 @@ router.route('/').get(async (req, res) => { try { let allTheseWorkers = await Workers.Worker.fetch(establishmentId); if(allTheseWorkers && allTheseWorkers.length){ - const updateTrainingRecords = await Training.getExpiringAndExpiredTrainingCounts(establishmentId, allTheseWorkers); + const updateTrainingRecords = await Training.getAllRequiredCounts(establishmentId, allTheseWorkers); if(updateTrainingRecords){ const updateQualsRecords = await Qualification.getQualsCounts(establishmentId, updateTrainingRecords); if(updateQualsRecords){ From bc07f189c24b9203b7b6fb9dc36b8c3cb799434a Mon Sep 17 00:00:00 2001 From: Anurag Negi <55235060+Negi-Anurag@users.noreply.github.com> Date: Fri, 14 Feb 2020 15:29:08 +0530 Subject: [PATCH 061/305] Mandatory Training - Missing Status (#1980) --- src/app/core/model/worker.model.ts | 1 + src/app/features/dashboard/dashboard.component.ts | 5 +++-- ...aining-and-qualifications-summary.component.html | 13 +++++++++++-- .../training-and-qualifications-tab.component.html | 1 + .../training-and-qualifications-tab.component.ts | 3 +++ .../training-info-panel.component.html | 7 +++++++ .../training-info-panel.component.ts | 1 + 7 files changed, 27 insertions(+), 4 deletions(-) diff --git a/src/app/core/model/worker.model.ts b/src/app/core/model/worker.model.ts index e728e3d323..096f4981ac 100644 --- a/src/app/core/model/worker.model.ts +++ b/src/app/core/model/worker.model.ts @@ -90,6 +90,7 @@ export interface Worker { trainingCount: number; expiredTrainingCount: number; expiringTrainingCount: number; + missingMandatoryTrainingCount: number; qualificationCount: number; } diff --git a/src/app/features/dashboard/dashboard.component.ts b/src/app/features/dashboard/dashboard.component.ts index 9fb66a7504..8e70fc1cc9 100644 --- a/src/app/features/dashboard/dashboard.component.ts +++ b/src/app/features/dashboard/dashboard.component.ts @@ -73,13 +73,14 @@ export class DashboardComponent implements OnInit, OnDestroy { /** * Function used to display training alert flag over the traing and qualifications tab * @param {workers} list of workers - * @return {number} 0 for up-to-date, 1 for expiring soon and 2 for expired. + * @return {number} 0 for up-to-date, 1 for expiring soon and 2 for expired and missing mandatory training. */ public getTrainingAlertFlag(workers) { if (workers.length > 0) { const expariedTrainingCount = workers.filter(worker => worker.expiredTrainingCount > 0).length || 0; const expiringTrainingCount = workers.filter(worker => worker.expiringTrainingCount > 0).length || 0; - if (expariedTrainingCount > 0) { + const missingMandatoryTrainingCount = workers.filter(worker => worker.missingMandatoryTrainingCount > 0).length || 0; + if (expariedTrainingCount > 0 || missingMandatoryTrainingCount > 0) { return 2; } else if (expiringTrainingCount > 0) { return 1; diff --git a/src/app/shared/components/training-and-qualifications-summary/training-and-qualifications-summary.component.html b/src/app/shared/components/training-and-qualifications-summary/training-and-qualifications-summary.component.html index 45c3e8e5b4..f3ae7fd244 100644 --- a/src/app/shared/components/training-and-qualifications-summary/training-and-qualifications-summary.component.html +++ b/src/app/shared/components/training-and-qualifications-summary/training-and-qualifications-summary.component.html @@ -48,7 +48,7 @@ {{ worker.expiredTrainingCount }} Expired -
+
expiring {{ worker.expiringTrainingCount }} Expiring soon
-
Up-to-date
+
+ missing mandatory training + {{ worker.missingMandatoryTrainingCount }} + Missing +
+
Up-to-date
diff --git a/src/app/shared/components/training-and-qualifications-tab/training-and-qualifications-tab.component.html b/src/app/shared/components/training-and-qualifications-tab/training-and-qualifications-tab.component.html index 4096346561..cd9447ff50 100644 --- a/src/app/shared/components/training-and-qualifications-tab/training-and-qualifications-tab.component.html +++ b/src/app/shared/components/training-and-qualifications-tab/training-and-qualifications-tab.component.html @@ -32,6 +32,7 @@

Click on a staff name to add a record.

[workplace]="workplace" [totalExpiredTraining]="totalExpiredTraining" [totalExpiringTraining]="totalExpiringTraining" + [missingMandatoryTraining] ="missingMandatoryTraining" > { this.totalRecords += worker.trainingCount + worker.qualificationCount; this.totalExpiredTraining += worker.expiredTrainingCount; this.totalExpiringTraining += worker.expiringTrainingCount; + this.missingMandatoryTraining += worker.missingMandatoryTrainingCount; }); }, error => { diff --git a/src/app/shared/components/training-info-panel/training-info-panel.component.html b/src/app/shared/components/training-info-panel/training-info-panel.component.html index 0b519dac5e..7a26e62544 100644 --- a/src/app/shared/components/training-info-panel/training-info-panel.component.html +++ b/src/app/shared/components/training-info-panel/training-info-panel.component.html @@ -13,4 +13,11 @@ {{ totalExpiringTraining }} + +
Missing
+
+ Expired + {{ missingMandatoryTraining }} +
+ diff --git a/src/app/shared/components/training-info-panel/training-info-panel.component.ts b/src/app/shared/components/training-info-panel/training-info-panel.component.ts index 94a1e15871..2111bba80c 100644 --- a/src/app/shared/components/training-info-panel/training-info-panel.component.ts +++ b/src/app/shared/components/training-info-panel/training-info-panel.component.ts @@ -9,6 +9,7 @@ export class TainingInfoPanelComponent implements OnInit { @Input() workplace: Establishment; @Input() totalExpiredTraining = 0; @Input() totalExpiringTraining = 0; + @Input() missingMandatoryTraining = 0; constructor() {} From bf6458abfc9cf65003c24403e0dd0d114fd56e30 Mon Sep 17 00:00:00 2001 From: Aaron Russell Date: Fri, 14 Feb 2020 15:00:22 +0000 Subject: [PATCH 062/305] Added cross validation check for RM and unit test for it --- .../models/BulkImport/csv/establishments.js | 50 +- .../Bulkimport/csv/establishments.spec.js | 566 +++++++++++++++++- 2 files changed, 613 insertions(+), 3 deletions(-) diff --git a/server/models/BulkImport/csv/establishments.js b/server/models/BulkImport/csv/establishments.js index c32d8d849c..36bfe8508d 100644 --- a/server/models/BulkImport/csv/establishments.js +++ b/server/models/BulkImport/csv/establishments.js @@ -1455,6 +1455,42 @@ class Establishment { return true; } + _crossValidateAllJobRoles ( + csvEstablishmentSchemaErrors, + registeredManager + ) + { + const template = { + origin: 'Establishments', + lineNumber: this._lineNumber, + errCode: Establishment.ALL_JOBS_ERROR, + errType: 'ALL_JOBS_ERROR', + source: this._currentLine.ALLJOBROLES, + name: this._currentLine.LOCALESTID + }; + const allJobs = this._currentLine.ALLJOBROLES.split(';'); + const vacancies = this._currentLine.VACANCIES.split(';'); + const myRegType = parseInt(this._currentLine.REGTYPE, 10); + + const regManager = 4; + const isCQCRegulated = myRegType === 2; + + const hasRegisteredManagerVacancy =() => { + let regManagerVacancies = 0; + allJobs.map((job, index) => { + if (parseInt(job, 10) === regManager && parseInt(vacancies[index], 10) > 0) regManagerVacancies++; + }); + return regManagerVacancies > 0; + }; + + if(isCQCRegulated && !hasRegisteredManagerVacancy() && registeredManager === 0) { + console.log('They have no RMs'); + csvEstablishmentSchemaErrors.unshift(Object.assign(template, { + error: 'You do not have a staff record for a Registered Manager therefore must record a vacancy for one' + })); + } + } + // includes perm, temp, pool, agency, student, voluntary and other counts // includes vacancies, starters and leavers, total vacancies, total starters and total leavers _validateJobRoleTotals () { @@ -2108,6 +2144,8 @@ class Establishment { nonEmployedWorkers: 0 }; + let registeredManagers = 0; + // ignoreDBWorkers is used as a hashmap of workers that are being modified // as part of this bulk upload process. It allows us to prevent a worker's // details @@ -2115,7 +2153,6 @@ class Establishment { // the establishment // i.e. ignore the worker record that comes back from the database result set. const ignoreDBWorkers = Object.create(null); - myWorkers.forEach(worker => { if (this.key === worker.establishmentKey) { switch (worker.status) { @@ -2123,6 +2160,13 @@ class Establishment { case 'UPDATE': { /* update totals */ updateWorkerTotals(totals, worker); + if (worker.mainJobRoleId === 4) { + registeredManagers++; + } else { + worker.otherJobIds.map(otherJobId => { + otherJobId === 4 ? registeredManagers++ : null; + }); + } } /* fall through */ @@ -2134,6 +2178,7 @@ class Establishment { }); // get all the other records that may already exist in the db but aren't being updated or deleted + // and check how many registered managers there is (await fetchMyEstablishmentsWorkers(this.id, this._key)) .forEach(worker => { worker.contractTypeId = BUDI.contractType(BUDI.FROM_ASC, worker.contractTypeId); @@ -2146,8 +2191,11 @@ class Establishment { } }); + + // ensure worker jobs tally up on TOTALPERMTEMP field, but only do it for new or updated establishments this._crossValidateTotalPermTemp(csvEstablishmentSchemaErrors, totals); + this._crossValidateAllJobRoles(csvEstablishmentSchemaErrors, registeredManagers); } // returns true on success, false is any attribute of Establishment fails diff --git a/server/test/unit/models/Bulkimport/csv/establishments.spec.js b/server/test/unit/models/Bulkimport/csv/establishments.spec.js index d86a32658e..461648fe48 100644 --- a/server/test/unit/models/Bulkimport/csv/establishments.spec.js +++ b/server/test/unit/models/Bulkimport/csv/establishments.spec.js @@ -2714,7 +2714,569 @@ it('should not emit an error if postcode can be found in the reference data', as // }); }); - // describe('cross entity validations', () => { + describe('cross entity validations', () => { + it('should an error if cqc registered and have no registered manager vacancy or registered manager staff member', async () => { + const bulkUpload = new (testUtils.sandBox( + filename, + { + locals: { + require: testUtils.wrapRequire({ + '../BUDI': { + BUDI + }, + '../../index': { + establishment: models.establishment, + pcodedata: models.pcodedata + } + }) + } + } + ).Establishment)( + { + LOCALESTID: 'omar3', + STATUS: 'UPDATE', + ESTNAME: 'WOZiTech, with even more care', + ADDRESS1: 'First Line', + ADDRESS2: 'Second Line', + ADDRESS3: '', + POSTTOWN: 'My Town', + POSTCODE: 'AB13 4NJ', + ESTTYPE: '6', + OTHERTYPE: '', + PERMCQC: '1', + PERMLA: '1', + SHARELA: '708;721;720', + REGTYPE: '2', + PROVNUM: '1-123456781', + LOCATIONID: '1-123456781', + MAINSERVICE: '8', + ALLSERVICES: '12;13', + CAPACITY: '0;0', + UTILISATION: '0;0', + SERVICEDESC: '1;1', + SERVICEUSERS: '', + OTHERUSERDESC: '', + TOTALPERMTEMP: '1', + ALLJOBROLES: '34;8', + STARTERS: '0;0', + LEAVERS: '999;0', + VACANCIES: '999;333', + REASONS: '', + REASONNOS: '' + }, + 2, + [ + { + _validations: [], + _username: 'aylingw', + _id: 479, + _uid: '98a83eef-e1e1-49f3-89c5-b1287a3cc8dd', + _ustatus: null, + _created: '2019-03-15T09:54:10.562Z', + _updated: '2019-10-04T15:46:16.158Z', + _updatedBy: 'aylingw', + _auditEvents: null, + _name: 'WOZiTech, with even more care', + _address1: 'First Line', + _address2: 'Second Line', + _address3: '', + _town: 'My Town', + _county: '', + _locationId: 'A-328849599', + _provId: null, + _postcode: 'LN11 9JG', + _isRegulated: false, + _mainService: { id: 16, name: 'Head office services' }, + _nmdsId: 'G1001114', + _lastWdfEligibility: '2019-08-16T07:17:38.014Z', + _overallWdfEligibility: '2019-08-16T07:17:38.340Z', + _establishmentWdfEligibility: null, + _staffWdfEligibility: '2019-08-13T12:41:24.836Z', + _isParent: true, + _parentUid: null, + _parentId: null, + _parentName: null, + _dataOwner: 'Workplace', + _dataPermissions: 'None', + _archived: false, + _dataOwnershipRequested: null, + _reasonsForLeaving: '', + _properties: { + _properties: [Object], + _propertyTypes: [Array], + _auditEvents: null, + _modifiedProperties: [], + _additionalModels: null + }, + _isNew: false, + _workerEntities: { + }, + _readyForDeletionWorkers: null, + _status: 'NEW', + _logLevel: 300 + }, + { + _validations: [], + _username: 'aylingw', + _id: 1446, + _uid: 'a415435f-40f2-4de5-abf7-bff611e85591', + _ustatus: null, + _created: '2019-07-31T15:09:57.405Z', + _updated: '2019-10-04T15:46:16.797Z', + _updatedBy: 'aylingw', + _auditEvents: null, + _name: 'WOZiTech Cares Sub 100', + _address1: 'Number 1', + _address2: 'My street', + _address3: '', + _town: 'My Town', + _county: '', + _locationId: '1-888777666', + _provId: '1-999888777', + _postcode: 'LN11 9JG', + _isRegulated: true, + _mainService: { id: 1, name: 'Carers support' }, + _nmdsId: 'G1002110', + _lastWdfEligibility: '2019-10-04T15:46:16.797Z', + _overallWdfEligibility: null, + _establishmentWdfEligibility: '2019-10-04T14:46:16.797Z', + _staffWdfEligibility: null, + _isParent: false, + _parentUid: '98a83eef-e1e1-49f3-89c5-b1287a3cc8dd', + _parentId: 479, + _parentName: null, + _dataOwner: 'Parent', + _dataPermissions: 'None', + _archived: false, + _dataOwnershipRequested: null, + _reasonsForLeaving: '', + _properties: { + _properties: [Object], + _propertyTypes: [Array], + _auditEvents: null, + _modifiedProperties: [], + _additionalModels: null + }, + _isNew: false, + _workerEntities: {}, + _readyForDeletionWorkers: null, + _status: 'COMPLETE', + _logLevel: 300 + } + ]); + + expect(bulkUpload).to.have.property('crossValidate'); + + const csvEstablishmentSchemaErrors = []; + + const myWorkers = [{ + status: 'UPDATE', + establishmentKey: 'omar3', + mainJobRoleId: 3, + otherJobIds: [6] + }]; + + // the real version of this code is in the api Establishment business object and runs a sql query. + // We just return a 'fake result set' + const fetchMyEstablishmentsWorkers = sinon.spy(async (establishmentId, establishmentKey) => { + return []; + }); + + // Regular validation has to run first for the establishment to populate the internal properties correctly + await bulkUpload.validate(); + + // call the method + await bulkUpload.crossValidate({ + csvEstablishmentSchemaErrors, + myWorkers, + fetchMyEstablishmentsWorkers + }); + + // assert the fetchMyEstalishmentsWorkers function was called + expect(fetchMyEstablishmentsWorkers.callCount).to.equal(1); + + // assert a warning was returned + expect(csvEstablishmentSchemaErrors.length).to.equal(1); + + expect(csvEstablishmentSchemaErrors[0]).to.deep.equal({ + lineNumber: 2, + name: 'omar3', + origin: 'Establishments', + source: '34;8', + errCode: 1280, + errType: 'ALL_JOBS_ERROR', + error: 'You do not have a staff record for a Registered Manager therefore must record a vacancy for one' + }); + }); + it('should not an error if cqc registered and have registered manager vacancy or registered manager staff member (as main)', async () => { + const bulkUpload = new (testUtils.sandBox( + filename, + { + locals: { + require: testUtils.wrapRequire({ + '../BUDI': { + BUDI + }, + '../../index': { + establishment: models.establishment, + pcodedata: models.pcodedata + } + }) + } + } + ).Establishment)( + { + LOCALESTID: 'omar3', + STATUS: 'UPDATE', + ESTNAME: 'WOZiTech, with even more care', + ADDRESS1: 'First Line', + ADDRESS2: 'Second Line', + ADDRESS3: '', + POSTTOWN: 'My Town', + POSTCODE: 'AB13 4NJ', + ESTTYPE: '6', + OTHERTYPE: '', + PERMCQC: '1', + PERMLA: '1', + SHARELA: '708;721;720', + REGTYPE: '2', + PROVNUM: '1-123456781', + LOCATIONID: '1-123456781', + MAINSERVICE: '8', + ALLSERVICES: '12;13', + CAPACITY: '0;0', + UTILISATION: '0;0', + SERVICEDESC: '1;1', + SERVICEUSERS: '', + OTHERUSERDESC: '', + TOTALPERMTEMP: '1', + ALLJOBROLES: '34;8', + STARTERS: '0;0', + LEAVERS: '999;0', + VACANCIES: '999;333', + REASONS: '', + REASONNOS: '' + }, + 2, + [ + { + _validations: [], + _username: 'aylingw', + _id: 479, + _uid: '98a83eef-e1e1-49f3-89c5-b1287a3cc8dd', + _ustatus: null, + _created: '2019-03-15T09:54:10.562Z', + _updated: '2019-10-04T15:46:16.158Z', + _updatedBy: 'aylingw', + _auditEvents: null, + _name: 'WOZiTech, with even more care', + _address1: 'First Line', + _address2: 'Second Line', + _address3: '', + _town: 'My Town', + _county: '', + _locationId: 'A-328849599', + _provId: null, + _postcode: 'LN11 9JG', + _isRegulated: false, + _mainService: { id: 16, name: 'Head office services' }, + _nmdsId: 'G1001114', + _lastWdfEligibility: '2019-08-16T07:17:38.014Z', + _overallWdfEligibility: '2019-08-16T07:17:38.340Z', + _establishmentWdfEligibility: null, + _staffWdfEligibility: '2019-08-13T12:41:24.836Z', + _isParent: true, + _parentUid: null, + _parentId: null, + _parentName: null, + _dataOwner: 'Workplace', + _dataPermissions: 'None', + _archived: false, + _dataOwnershipRequested: null, + _reasonsForLeaving: '', + _properties: { + _properties: [Object], + _propertyTypes: [Array], + _auditEvents: null, + _modifiedProperties: [], + _additionalModels: null + }, + _isNew: false, + _workerEntities: { + }, + _readyForDeletionWorkers: null, + _status: 'NEW', + _logLevel: 300 + }, + { + _validations: [], + _username: 'aylingw', + _id: 1446, + _uid: 'a415435f-40f2-4de5-abf7-bff611e85591', + _ustatus: null, + _created: '2019-07-31T15:09:57.405Z', + _updated: '2019-10-04T15:46:16.797Z', + _updatedBy: 'aylingw', + _auditEvents: null, + _name: 'WOZiTech Cares Sub 100', + _address1: 'Number 1', + _address2: 'My street', + _address3: '', + _town: 'My Town', + _county: '', + _locationId: '1-888777666', + _provId: '1-999888777', + _postcode: 'LN11 9JG', + _isRegulated: true, + _mainService: { id: 1, name: 'Carers support' }, + _nmdsId: 'G1002110', + _lastWdfEligibility: '2019-10-04T15:46:16.797Z', + _overallWdfEligibility: null, + _establishmentWdfEligibility: '2019-10-04T14:46:16.797Z', + _staffWdfEligibility: null, + _isParent: false, + _parentUid: '98a83eef-e1e1-49f3-89c5-b1287a3cc8dd', + _parentId: 479, + _parentName: null, + _dataOwner: 'Parent', + _dataPermissions: 'None', + _archived: false, + _dataOwnershipRequested: null, + _reasonsForLeaving: '', + _properties: { + _properties: [Object], + _propertyTypes: [Array], + _auditEvents: null, + _modifiedProperties: [], + _additionalModels: null + }, + _isNew: false, + _workerEntities: {}, + _readyForDeletionWorkers: null, + _status: 'COMPLETE', + _logLevel: 300 + } + ]); + + expect(bulkUpload).to.have.property('crossValidate'); + + const csvEstablishmentSchemaErrors = []; + + const myWorkers = [{ + status: 'UPDATE', + establishmentKey: 'omar3', + mainJobRoleId: 4, + otherJobIds: [] + }]; + + // the real version of this code is in the api Establishment business object and runs a sql query. + // We just return a 'fake result set' + const fetchMyEstablishmentsWorkers = sinon.spy(async (establishmentId, establishmentKey) => { + return []; + }); + + // Regular validation has to run first for the establishment to populate the internal properties correctly + await bulkUpload.validate(); + + // call the method + await bulkUpload.crossValidate({ + csvEstablishmentSchemaErrors, + myWorkers, + fetchMyEstablishmentsWorkers + }); + + // assert the fetchMyEstalishmentsWorkers function was called + expect(fetchMyEstablishmentsWorkers.callCount).to.equal(1); + // assert a warning was returned + expect(csvEstablishmentSchemaErrors.length).to.equal(0); + + expect(csvEstablishmentSchemaErrors[0]).to.deep.equal(); + }); + it('should not an error if cqc registered and have registered manager vacancy or registered manager staff member (as other)', async () => { + const bulkUpload = new (testUtils.sandBox( + filename, + { + locals: { + require: testUtils.wrapRequire({ + '../BUDI': { + BUDI + }, + '../../index': { + establishment: models.establishment, + pcodedata: models.pcodedata + } + }) + } + } + ).Establishment)( + { + LOCALESTID: 'omar3', + STATUS: 'UPDATE', + ESTNAME: 'WOZiTech, with even more care', + ADDRESS1: 'First Line', + ADDRESS2: 'Second Line', + ADDRESS3: '', + POSTTOWN: 'My Town', + POSTCODE: 'AB13 4NJ', + ESTTYPE: '6', + OTHERTYPE: '', + PERMCQC: '1', + PERMLA: '1', + SHARELA: '708;721;720', + REGTYPE: '2', + PROVNUM: '1-123456781', + LOCATIONID: '1-123456781', + MAINSERVICE: '8', + ALLSERVICES: '12;13', + CAPACITY: '0;0', + UTILISATION: '0;0', + SERVICEDESC: '1;1', + SERVICEUSERS: '', + OTHERUSERDESC: '', + TOTALPERMTEMP: '1', + ALLJOBROLES: '34;8', + STARTERS: '0;0', + LEAVERS: '999;0', + VACANCIES: '999;333', + REASONS: '', + REASONNOS: '' + }, + 2, + [ + { + _validations: [], + _username: 'aylingw', + _id: 479, + _uid: '98a83eef-e1e1-49f3-89c5-b1287a3cc8dd', + _ustatus: null, + _created: '2019-03-15T09:54:10.562Z', + _updated: '2019-10-04T15:46:16.158Z', + _updatedBy: 'aylingw', + _auditEvents: null, + _name: 'WOZiTech, with even more care', + _address1: 'First Line', + _address2: 'Second Line', + _address3: '', + _town: 'My Town', + _county: '', + _locationId: 'A-328849599', + _provId: null, + _postcode: 'LN11 9JG', + _isRegulated: false, + _mainService: { id: 16, name: 'Head office services' }, + _nmdsId: 'G1001114', + _lastWdfEligibility: '2019-08-16T07:17:38.014Z', + _overallWdfEligibility: '2019-08-16T07:17:38.340Z', + _establishmentWdfEligibility: null, + _staffWdfEligibility: '2019-08-13T12:41:24.836Z', + _isParent: true, + _parentUid: null, + _parentId: null, + _parentName: null, + _dataOwner: 'Workplace', + _dataPermissions: 'None', + _archived: false, + _dataOwnershipRequested: null, + _reasonsForLeaving: '', + _properties: { + _properties: [Object], + _propertyTypes: [Array], + _auditEvents: null, + _modifiedProperties: [], + _additionalModels: null + }, + _isNew: false, + _workerEntities: { + }, + _readyForDeletionWorkers: null, + _status: 'NEW', + _logLevel: 300 + }, + { + _validations: [], + _username: 'aylingw', + _id: 1446, + _uid: 'a415435f-40f2-4de5-abf7-bff611e85591', + _ustatus: null, + _created: '2019-07-31T15:09:57.405Z', + _updated: '2019-10-04T15:46:16.797Z', + _updatedBy: 'aylingw', + _auditEvents: null, + _name: 'WOZiTech Cares Sub 100', + _address1: 'Number 1', + _address2: 'My street', + _address3: '', + _town: 'My Town', + _county: '', + _locationId: '1-888777666', + _provId: '1-999888777', + _postcode: 'LN11 9JG', + _isRegulated: true, + _mainService: { id: 1, name: 'Carers support' }, + _nmdsId: 'G1002110', + _lastWdfEligibility: '2019-10-04T15:46:16.797Z', + _overallWdfEligibility: null, + _establishmentWdfEligibility: '2019-10-04T14:46:16.797Z', + _staffWdfEligibility: null, + _isParent: false, + _parentUid: '98a83eef-e1e1-49f3-89c5-b1287a3cc8dd', + _parentId: 479, + _parentName: null, + _dataOwner: 'Parent', + _dataPermissions: 'None', + _archived: false, + _dataOwnershipRequested: null, + _reasonsForLeaving: '', + _properties: { + _properties: [Object], + _propertyTypes: [Array], + _auditEvents: null, + _modifiedProperties: [], + _additionalModels: null + }, + _isNew: false, + _workerEntities: {}, + _readyForDeletionWorkers: null, + _status: 'COMPLETE', + _logLevel: 300 + } + ]); + + expect(bulkUpload).to.have.property('crossValidate'); + + const csvEstablishmentSchemaErrors = []; + + const myWorkers = [{ + status: 'UPDATE', + establishmentKey: 'omar3', + mainJobRoleId: 3, + otherJobIds: [4] + }]; + + // the real version of this code is in the api Establishment business object and runs a sql query. + // We just return a 'fake result set' + const fetchMyEstablishmentsWorkers = sinon.spy(async (establishmentId, establishmentKey) => { + return []; + }); + + // Regular validation has to run first for the establishment to populate the internal properties correctly + await bulkUpload.validate(); + + // call the method + await bulkUpload.crossValidate({ + csvEstablishmentSchemaErrors, + myWorkers, + fetchMyEstablishmentsWorkers + }); + + // assert the fetchMyEstalishmentsWorkers function was called + expect(fetchMyEstablishmentsWorkers.callCount).to.equal(1); + + // assert a warning was returned + expect(csvEstablishmentSchemaErrors.length).to.equal(0); + + expect(csvEstablishmentSchemaErrors[0]).to.deep.equal(); + }); // it('should emit a warning if there are zero staff', async () => { // const bulkUpload = new (testUtils.sandBox( // filename, @@ -3544,5 +4106,5 @@ it('should not emit an error if postcode can be found in the reference data', as // warning: 'The number of employed staff is less than the number of non-employed staff please check your staff records' // }); // }); - // }); + }); }); From 0db85206c959f2eccef6ebca7377165eea8be2f7 Mon Sep 17 00:00:00 2001 From: Aaron Russell Date: Mon, 17 Feb 2020 07:28:54 +0000 Subject: [PATCH 063/305] Bulk upload validations (#1945) * Started adding validations for CQC RM * Added validation for non CQC reg with RM * Changed so it on splices if not CQC registered * Srarted adding validation * Added removal of RM * Added validation rule if locationID already exists * Made the location ID function async to allow for database query * Added fix for cqc reg but on cqc service * Updated for unit test on allJobs * Started adding unit test for locationId already existing * Updated validations to async to help with database connection and updated when check for existing locationId * Removed console log * Added test for locationId * Removed polling from front end * Changed await to right positoin * Added check for if it's the establishment you're updating --- .../models/BulkImport/csv/establishments.js | 146 +- server/routes/establishments/bulkUpload.js | 2 +- .../Bulkimport/csv/establishments.spec.js | 2140 ++++++++++++----- .../files-upload/files-upload.component.ts | 11 +- 4 files changed, 1702 insertions(+), 597 deletions(-) diff --git a/server/models/BulkImport/csv/establishments.js b/server/models/BulkImport/csv/establishments.js index ac6e596a2b..7f155b5b04 100644 --- a/server/models/BulkImport/csv/establishments.js +++ b/server/models/BulkImport/csv/establishments.js @@ -3,13 +3,14 @@ const hasProp = (obj, prop) => Object.prototype.hasOwnProperty.bind(obj)(prop); const BUDI = require('../BUDI').BUDI; +const models = require('../../index'); const STOP_VALIDATING_ON = ['UNCHECKED', 'DELETE', 'NOCHANGE']; const localAuthorityEmployerTypes = [1, 3]; const nonDirectCareJobRoles = [1, 2, 4, 5, 7, 8, 9, 13, 14, 15, 17, 18, 19, 21, 22, 23, 24, 26, 27, 28]; const employedContractStatusIds = [1, 2]; -const dbNotCqcRegulatedServiceCodes = [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18]; +const cqcRegulatedServiceCodes = [24, 25, 20, 22, 21, 23, 19, 27, 28, 26, 29, 30, 32, 31, 33, 34]; const csvQuote = toCsv => { if (toCsv && toCsv.replace(/ /g, '').match(/[\s,"]/)) { @@ -785,9 +786,8 @@ class Establishment { name: this._currentLine.LOCALESTID }); return false; - } else if( - false && - myRegType === 2 && dbNotCqcRegulatedServiceCodes.includes(dbServiceCode) && dbServiceCode !== dbMainServiceCode) { + } else if(myRegType === 2 && + !cqcRegulatedServiceCodes.includes(dbServiceCode) && (dbServiceCode !== dbMainServiceCode)) { this._validationErrors.push({ lineNumber: this._lineNumber, errCode: Establishment.REGTYPE_ERROR, @@ -844,52 +844,78 @@ class Establishment { } } - _validateLocationID () { - // must be given if "share with CQC" - but if given must be in the format "n-nnnnnnnnn" - const locationIDRegex = /^[0-9]{1}-[0-9]{8,10}$/; - const myLocationID = this._currentLine.LOCATIONID; + async _validateLocationID () { + try { + // must be given if "share with CQC" - but if given must be in the format "n-nnnnnnnnn" + const locationIDRegex = /^[0-9]{1}-[0-9]{8,10}$/; + const myLocationID = this._currentLine.LOCATIONID; - // do not use - const mainServiceIsHeadOffice = parseInt(this._currentLine.MAINSERVICE, 10) === 72; - - if (this._regType === 2) { - // ignore location i - if (!mainServiceIsHeadOffice) { - if (!myLocationID || myLocationID.length === 0) { - this._validationErrors.push({ - lineNumber: this._lineNumber, - errCode: Establishment.LOCATION_ID_ERROR, - errType: 'LOCATION_ID_ERROR', - error: 'LOCATIONID has not been supplied', - source: myLocationID, - name: this._currentLine.LOCALESTID - }); - return false; - } else if (!locationIDRegex.test(myLocationID)) { + // do not use + const mainServiceIsHeadOffice = parseInt(this._currentLine.MAINSERVICE, 10) === 72; + const locationExists = await models.establishment.findAll({ + where: { + locationId: myLocationID + }, + attributes: ['id', 'locationId'] + }); + console.log(this._id); + console.log(locationExists); + let existingEstablishment = false; + await locationExists.map(async (establishment) => { + if (establishment.id === this._id) existingEstablishment = true; + }); + if (this._regType === 2) { + // ignore location i + if (!mainServiceIsHeadOffice) { + if (!myLocationID || myLocationID.length === 0) { + this._validationErrors.push({ + lineNumber: this._lineNumber, + errCode: Establishment.LOCATION_ID_ERROR, + errType: 'LOCATION_ID_ERROR', + error: 'LOCATIONID has not been supplied', + source: myLocationID, + name: this._currentLine.LOCALESTID + }); + return false; + } else if (!locationIDRegex.test(myLocationID)) { + this._validationErrors.push({ + lineNumber: this._lineNumber, + errCode: Establishment.LOCATION_ID_ERROR, + errType: 'LOCATION_ID_ERROR', + error: 'LOCATIONID is incorrectly formatted', + source: myLocationID, + name: this._currentLine.LOCALESTID + }); + return false; + } + } + if (locationExists.length > 0 && !existingEstablishment) { this._validationErrors.push({ lineNumber: this._lineNumber, errCode: Establishment.LOCATION_ID_ERROR, errType: 'LOCATION_ID_ERROR', - error: 'LOCATIONID is incorrectly formatted', + error: 'LOCATIONID already exists in ASC-WDS please contact Support on 0113 241 0969', source: myLocationID, name: this._currentLine.LOCALESTID }); return false; } - } - this._locationID = myLocationID; - return true; - } else if (this._regType === 0 && myLocationID && myLocationID.length > 0) { - this._validationErrors.push({ - lineNumber: this._lineNumber, - warnCode: Establishment.LOCATION_ID_WARNING, - warnType: 'LOCATION_ID_WARNING', - warning: 'LOCATIONID will be ignored as not required for this REGTYPE', - source: myLocationID, - name: this._currentLine.LOCALESTID - }); - return false; + this._locationID = myLocationID; + return true; + } else if (this._regType === 0 && myLocationID && myLocationID.length > 0) { + this._validationErrors.push({ + lineNumber: this._lineNumber, + warnCode: Establishment.LOCATION_ID_WARNING, + warnType: 'LOCATION_ID_WARNING', + warning: 'LOCATIONID will be ignored as not required for this REGTYPE', + source: myLocationID, + name: this._currentLine.LOCALESTID + }); + return false; + } + } catch (error) { + throw new Error(error); } } @@ -1310,6 +1336,16 @@ class Establishment { const vacancies = this._currentLine.VACANCIES.split(';'); const starters = this._currentLine.STARTERS.split(';'); const leavers = this._currentLine.LEAVERS.split(';'); + const myRegType = parseInt(this._currentLine.REGTYPE, 10); + + const regManager = 4; + const isCQCRegulated = myRegType === 2; + + const hasRegisteredManagerVacancy = () => { + return allJobs.map((job, index) => { + if (parseInt(job, 10) === regManager && parseInt(vacancies[index], 10) > 0) return true; + }); + }; // allJobs can only be empty, if TOTALPERMTEMP is 0 if (!this._currentLine.ALLJOBROLES || this._currentLine.ALLJOBROLES.length === 0) { @@ -1356,8 +1392,29 @@ class Establishment { name: this._currentLine.LOCALESTID }); } + if (!isCQCRegulated && hasRegisteredManagerVacancy()) { + localValidationErrors.push({ + lineNumber: this._lineNumber, + warnCode: Establishment.ALL_JOBS_WARNING, + warnType: 'ALL_JOBS_WARNING', + warning: 'Vacancy for Registered Manager should not be included for this service and will be ignored', + source: this._currentLine.ALLJOBROLES, + name: this._currentLine.LOCALESTID + }); + } } + // Need to add if they currently have a registered manager + // if (this._currentLine.ALLJOBROLES && this._currentLine.ALLJOBROLES.length > 0 && isCQCRegulated && !hasRegisteredManagerVacancy()) { + // localValidationErrors.push({ + // lineNumber: this._lineNumber, + // errCode: Establishment.ALL_JOBS_ERROR, + // errType: 'ALL_JOBS_ERROR', + // error: 'You do not have a staff record for a Registered Manager therefore must record a vacancy for one', + // source: this._currentLine.ALLJOBROLES, + // name: this._currentLine.LOCALESTID + // }); + // } if (localValidationErrors.length > 0) { localValidationErrors.forEach(thisValidation => this._validationErrors.push(thisValidation)); return false; @@ -1467,6 +1524,13 @@ class Establishment { this._starters = starters.map(thisCount => parseInt(thisCount, 10)); this._leavers = leavers.map(thisCount => parseInt(thisCount, 10)); + // remove RM vacancy + if (this._allJobs && this._allJobs.length) { + this._allJobs.map((job, index) => { + if (job === regManager && this._vacancies[index] > 0) this._vacancies[index] = 0; + }); + } + if (localValidationErrors.length > 0) { localValidationErrors.forEach(thisValidation => this._validationErrors.push(thisValidation)); return false; @@ -1960,7 +2024,7 @@ class Establishment { } // returns true on success, false is any attribute of Establishment fails - validate () { + async validate () { let status = true; status = !this._validateLocalisedId() ? false : status; @@ -1979,7 +2043,7 @@ class Establishment { status = !this._validateMainService() ? false : status; status = !this._validateRegType() ? false : status; status = !this._validateProvID() ? false : status; - status = !this._validateLocationID() ? false : status; + status = await this._validateLocationID() ? false : status; status = !this._validateAllServices() ? false : status; status = !this._validateServiceUsers() ? false : status; diff --git a/server/routes/establishments/bulkUpload.js b/server/routes/establishments/bulkUpload.js index 3574dff668..ced2139f6b 100644 --- a/server/routes/establishments/bulkUpload.js +++ b/server/routes/establishments/bulkUpload.js @@ -819,7 +819,7 @@ const validateEstablishmentCsv = async ( const lineValidator = new EstablishmentCsvValidator(thisLine, currentLineNumber, myCurrentEstablishments); // the parsing/validation needs to be forgiving in that it needs to return as many errors in one pass as possible - lineValidator.validate(); + await lineValidator.validate(); lineValidator.transform(); const thisEstablishmentAsAPI = lineValidator.toAPI(); diff --git a/server/test/unit/models/Bulkimport/csv/establishments.spec.js b/server/test/unit/models/Bulkimport/csv/establishments.spec.js index 94c68335d5..909412c457 100644 --- a/server/test/unit/models/Bulkimport/csv/establishments.spec.js +++ b/server/test/unit/models/Bulkimport/csv/establishments.spec.js @@ -12,6 +12,23 @@ const ALL_UTILISATIONS = null; const BUDI_TO_ASC = 100; const BUSI_FROM_ASC = 200; +const establishment = [{ + locationId: '1-123456780', + id: 123 +}]; + +const models = { + establishment: { + async findAll(args) { + if (args.where.locationId === establishment[0].locationId) { + return establishment; + } else { + return []; + } + } + } +}; + const BUDI = { contractType (direction, originalCode) { const fixedMapping = [ @@ -212,6 +229,9 @@ const getUnitInstance = () => { require: testUtils.wrapRequire({ '../BUDI': { BUDI + }, + '../../index': { + models } }) } @@ -222,6 +242,10 @@ const getUnitInstance = () => { expect(bulkUpload.Establishment).to.be.a('function'); + expect(BUDI.contractType).to.be.a('function'); + + expect(models.establishment.findAll).to.be.a('function'); + return new (bulkUpload.Establishment)(); }; @@ -445,6 +469,9 @@ describe('/server/models/Bulkimport/csv/establishment.js', () => { require: testUtils.wrapRequire({ '../BUDI': { BUDI + }, + '../../index': { + establishment: models.establishment } }) } @@ -475,10 +502,10 @@ describe('/server/models/Bulkimport/csv/establishment.js', () => { SERVICEUSERS: '', OTHERUSERDESC: '', TOTALPERMTEMP: '1', - ALLJOBROLES: '34;8', - STARTERS: '0;0', - LEAVERS: '999', - VACANCIES: '999;333', + ALLJOBROLES: '34;8;4', + STARTERS: '0;0;0', + LEAVERS: '999;0;0', + VACANCIES: '999;333;1', REASONS: '', REASONNOS: '' }, @@ -501,7 +528,7 @@ describe('/server/models/Bulkimport/csv/establishment.js', () => { _town: 'My Town', _county: '', _locationId: 'A-328849599', - _provId: null, + _provId: 'A-328849599', _postcode: 'LN11 9JG', _isRegulated: false, _mainService: { id: 16, name: 'Head office services' }, @@ -617,6 +644,9 @@ describe('/server/models/Bulkimport/csv/establishment.js', () => { require: testUtils.wrapRequire({ '../BUDI': { BUDI + }, + '../../index': { + establishment: models.establishment } }) } @@ -647,10 +677,10 @@ describe('/server/models/Bulkimport/csv/establishment.js', () => { SERVICEUSERS: '', OTHERUSERDESC: '', TOTALPERMTEMP: '1', - ALLJOBROLES: '34;8', - STARTERS: '0;0', - LEAVERS: '999', - VACANCIES: '999;333', + ALLJOBROLES: '34;8;4', + STARTERS: '0;0;0', + LEAVERS: '999;0;0', + VACANCIES: '999;333;1', REASONS: '', REASONNOS: '' }, @@ -770,8 +800,7 @@ describe('/server/models/Bulkimport/csv/establishment.js', () => { expect(validationErrors).to.deep.equal([]); }); - - it('should emit an error if SLV is greater than zero and this ALLJOBROLES is blank', async () => { + it('should not emit an error if REGTYPE is 2 (CQC) but a CQC regulated main service has been specified', async () => { const bulkUpload = new (testUtils.sandBox( filename, { @@ -779,6 +808,9 @@ describe('/server/models/Bulkimport/csv/establishment.js', () => { require: testUtils.wrapRequire({ '../BUDI': { BUDI + }, + '../../index': { + establishment: models.establishment } }) } @@ -798,18 +830,18 @@ describe('/server/models/Bulkimport/csv/establishment.js', () => { PERMCQC: '1', PERMLA: '1', SHARELA: '708;721;720', - REGTYPE: '0', - PROVNUM: '', - LOCATIONID: '', - MAINSERVICE: '72', - ALLSERVICES: '72;13', + REGTYPE: '2', + PROVNUM: '1-123456789', + LOCATIONID: '1-123456789', + MAINSERVICE: '8', + ALLSERVICES: '12;13', CAPACITY: '0;0', UTILISATION: '0;0', SERVICEDESC: '1;1', SERVICEUSERS: '', OTHERUSERDESC: '', - TOTALPERMTEMP: '10', - ALLJOBROLES: '', + TOTALPERMTEMP: '1', + ALLJOBROLES: '34;8', STARTERS: '0;0', LEAVERS: '999', VACANCIES: '999;333', @@ -914,8 +946,8 @@ describe('/server/models/Bulkimport/csv/establishment.js', () => { _readyForDeletionWorkers: null, _status: 'COMPLETE', _logLevel: 300 - }] - ); + } + ]); expect(bulkUpload).to.have.property('validate'); @@ -930,20 +962,9 @@ describe('/server/models/Bulkimport/csv/establishment.js', () => { // assert a warning was returned - expect(validationErrors).to.deep.equal([{ - lineNumber: 2, - name: 'omar3', - origin: 'Establishments', - source: '', - errCode: 1280, - errType: 'ALL_JOBS_ERROR', - error: 'ALLJOBROLES cannot be blank as you have STARTERS, LEAVERS, VACANCIES greater than zero' - }]); + expect(validationErrors).to.deep.equal([]); }); - }); - - describe('cross entity validations', () => { - it('should emit a warning if there are zero staff', async () => { + it('should emit an error if REGTYPE is not 2 (CQC) but a registered manager vacancy has been specified', async () => { const bulkUpload = new (testUtils.sandBox( filename, { @@ -951,6 +972,9 @@ describe('/server/models/Bulkimport/csv/establishment.js', () => { require: testUtils.wrapRequire({ '../BUDI': { BUDI + }, + '../../index': { + establishment: models.establishment } }) } @@ -958,7 +982,7 @@ describe('/server/models/Bulkimport/csv/establishment.js', () => { ).Establishment)( { LOCALESTID: 'omar3', - STATUS: 'UPDATE', + STATUS: 'NEW', ESTNAME: 'WOZiTech, with even more care', ADDRESS1: 'First Line', ADDRESS2: 'Second Line', @@ -973,18 +997,18 @@ describe('/server/models/Bulkimport/csv/establishment.js', () => { REGTYPE: '0', PROVNUM: '', LOCATIONID: '', - MAINSERVICE: '72', - ALLSERVICES: '72;13', - CAPACITY: '', - UTILISATION: '', + MAINSERVICE: '12', + ALLSERVICES: '12;13', + CAPACITY: '0;0', + UTILISATION: '0;0', SERVICEDESC: '1;1', SERVICEUSERS: '', OTHERUSERDESC: '', - TOTALPERMTEMP: '0', - ALLJOBROLES: '34;8', - STARTERS: '0;0', - LEAVERS: '999', - VACANCIES: '999;333', + TOTALPERMTEMP: '1', + ALLJOBROLES: '34;8;4', + STARTERS: '0;0;0', + LEAVERS: '999;0;0', + VACANCIES: '999;333;1', REASONS: '', REASONNOS: '' }, @@ -1006,7 +1030,7 @@ describe('/server/models/Bulkimport/csv/establishment.js', () => { _address3: '', _town: 'My Town', _county: '', - _locationId: 'A-328849599', + _locationId: null, _provId: null, _postcode: 'LN11 9JG', _isRegulated: false, @@ -1089,238 +1113,198 @@ describe('/server/models/Bulkimport/csv/establishment.js', () => { } ]); - expect(bulkUpload).to.have.property('crossValidate'); + expect(bulkUpload).to.have.property('validate'); const csvEstablishmentSchemaErrors = []; const myWorkers = []; - // the real version of this code is in the api Establishment business object and runs a sql query. - // We just return a 'fake result set' - const fetchMyEstablishmentsWorkers = sinon.spy(async (establishmentId, establishmentKey) => { - return []; - }); - - // Regular validation has to run first for the establishment to populate the internal properties correctly + // call the validation to ensure the proper error is shown await bulkUpload.validate(); - // call the method - await bulkUpload.crossValidate({ - csvEstablishmentSchemaErrors, - myWorkers, - fetchMyEstablishmentsWorkers - }); - - // assert the fetchMyEstalishmentsWorkers function was called - expect(fetchMyEstablishmentsWorkers.callCount).to.equal(1); + const validationErrors = bulkUpload.validationErrors; // assert a warning was returned - expect(csvEstablishmentSchemaErrors.length).to.equal(1); - - expect(csvEstablishmentSchemaErrors[0]).to.deep.equal({ - lineNumber: 2, - name: 'omar3', - origin: 'Establishments', - source: '0', - warnCode: 2200, - warnType: 'TOTAL_PERM_TEMP_WARNING', - warning: 'The number of employed staff is 0 please check your staff records' - }); - }); - it('should emit a warning if there are no direct care staff', async () => { - const bulkUpload = new (testUtils.sandBox( - filename, + expect(validationErrors).to.deep.equal([ { - locals: { - require: testUtils.wrapRequire({ - '../BUDI': { - BUDI - } - }) - } + origin: 'Establishments', + lineNumber: 2, + warnCode: 2180, + warnType: 'ALL_JOBS_WARNING', + warning: 'Vacancy for Registered Manager should not be included for this service and will be ignored', + source: '34;8;4', + name: 'omar3' } - ).Establishment)( - { - LOCALESTID: 'omar3', - STATUS: 'UPDATE', - ESTNAME: 'WOZiTech, with even more care', - ADDRESS1: 'First Line', - ADDRESS2: 'Second Line', - ADDRESS3: '', - POSTTOWN: 'My Town', - POSTCODE: 'LN11 9JG', - ESTTYPE: '6', - OTHERTYPE: '', - PERMCQC: '1', - PERMLA: '1', - SHARELA: '708;721;720', - REGTYPE: '2', - PROVNUM: '', - LOCATIONID: '', - MAINSERVICE: '72', - ALLSERVICES: '72;13', - CAPACITY: '', - UTILISATION: '', - SERVICEDESC: '1;1', - SERVICEUSERS: '', - OTHERUSERDESC: '', - TOTALPERMTEMP: '1', - ALLJOBROLES: '34;8', - STARTERS: '0;0', - LEAVERS: '999', - VACANCIES: '999;333', - REASONS: '', - REASONNOS: '' - }, - 2, - [ + ]); + }); + it('should not emit an error if REGTYPE is 2 (CQC) but a registered manager vacancy has been specified', async () => { + const bulkUpload = new (testUtils.sandBox( + filename, { - _validations: [], - _username: 'aylingw', - _id: 479, - _uid: '98a83eef-e1e1-49f3-89c5-b1287a3cc8dd', - _ustatus: null, - _created: '2019-03-15T09:54:10.562Z', - _updated: '2019-10-04T15:46:16.158Z', - _updatedBy: 'aylingw', - _auditEvents: null, - _name: 'WOZiTech, with even more care', - _address1: 'First Line', - _address2: 'Second Line', - _address3: '', - _town: 'My Town', - _county: '', - _locationId: 'A-328849599', - _provId: null, - _postcode: 'LN11 9JG', - _isRegulated: false, - _mainService: { id: 16, name: 'Head office services' }, - _nmdsId: 'G1001114', - _lastWdfEligibility: '2019-08-16T07:17:38.014Z', - _overallWdfEligibility: '2019-08-16T07:17:38.340Z', - _establishmentWdfEligibility: null, - _staffWdfEligibility: '2019-08-13T12:41:24.836Z', - _isParent: true, - _parentUid: null, - _parentId: null, - _parentName: null, - _dataOwner: 'Workplace', - _dataPermissions: 'None', - _archived: false, - _dataOwnershipRequested: null, - _reasonsForLeaving: '', - _properties: { - _properties: [Object], - _propertyTypes: [Array], - _auditEvents: null, - _modifiedProperties: [], - _additionalModels: null - }, - _isNew: false, - _workerEntities: { - }, - _readyForDeletionWorkers: null, - _status: 'NEW', - _logLevel: 300 - }, + locals: { + require: testUtils.wrapRequire({ + '../BUDI': { + BUDI + }, + '../../index': { + establishment: models.establishment + } + }) + } + } + ).Establishment)( { - _validations: [], - _username: 'aylingw', - _id: 1446, - _uid: 'a415435f-40f2-4de5-abf7-bff611e85591', - _ustatus: null, - _created: '2019-07-31T15:09:57.405Z', - _updated: '2019-10-04T15:46:16.797Z', - _updatedBy: 'aylingw', - _auditEvents: null, - _name: 'WOZiTech Cares Sub 100', - _address1: 'Number 1', - _address2: 'My street', - _address3: '', - _town: 'My Town', - _county: '', - _locationId: '1-888777666', - _provId: '1-999888777', - _postcode: 'LN11 9JG', - _isRegulated: true, - _mainService: { id: 1, name: 'Carers support' }, - _nmdsId: 'G1002110', - _lastWdfEligibility: '2019-10-04T15:46:16.797Z', - _overallWdfEligibility: null, - _establishmentWdfEligibility: '2019-10-04T14:46:16.797Z', - _staffWdfEligibility: null, - _isParent: false, - _parentUid: '98a83eef-e1e1-49f3-89c5-b1287a3cc8dd', - _parentId: 479, - _parentName: null, - _dataOwner: 'Parent', - _dataPermissions: 'None', - _archived: false, - _dataOwnershipRequested: null, - _reasonsForLeaving: '', - _properties: { - _properties: [Object], - _propertyTypes: [Array], + LOCALESTID: 'omar3', + STATUS: 'NEW', + ESTNAME: 'WOZiTech, with even more care', + ADDRESS1: 'First Line', + ADDRESS2: 'Second Line', + ADDRESS3: '', + POSTTOWN: 'My Town', + POSTCODE: 'LN11 9JG', + ESTTYPE: '6', + OTHERTYPE: '', + PERMCQC: '1', + PERMLA: '1', + SHARELA: '708;721;720', + REGTYPE: '2', + PROVNUM: '1-12345678', + LOCATIONID: '1-12345678', + MAINSERVICE: '8', + ALLSERVICES: '12;13', + CAPACITY: '0;0', + UTILISATION: '0;0', + SERVICEDESC: '1;1', + SERVICEUSERS: '', + OTHERUSERDESC: '', + TOTALPERMTEMP: '1', + ALLJOBROLES: '34;8;4', + STARTERS: '0;0;0', + LEAVERS: '999;0;0', + VACANCIES: '999;333;1', + REASONS: '', + REASONNOS: '' + }, + 2, + [ + { + _validations: [], + _username: 'aylingw', + _id: 479, + _uid: '98a83eef-e1e1-49f3-89c5-b1287a3cc8dd', + _ustatus: null, + _created: '2019-03-15T09:54:10.562Z', + _updated: '2019-10-04T15:46:16.158Z', + _updatedBy: 'aylingw', _auditEvents: null, - _modifiedProperties: [], - _additionalModels: null + _name: 'WOZiTech, with even more care', + _address1: 'First Line', + _address2: 'Second Line', + _address3: '', + _town: 'My Town', + _county: '', + _locationId: null, + _provId: null, + _postcode: 'LN11 9JG', + _isRegulated: false, + _mainService: { id: 16, name: 'Head office services' }, + _nmdsId: 'G1001114', + _lastWdfEligibility: '2019-08-16T07:17:38.014Z', + _overallWdfEligibility: '2019-08-16T07:17:38.340Z', + _establishmentWdfEligibility: null, + _staffWdfEligibility: '2019-08-13T12:41:24.836Z', + _isParent: true, + _parentUid: null, + _parentId: null, + _parentName: null, + _dataOwner: 'Workplace', + _dataPermissions: 'None', + _archived: false, + _dataOwnershipRequested: null, + _reasonsForLeaving: '', + _properties: { + _properties: [Object], + _propertyTypes: [Array], + _auditEvents: null, + _modifiedProperties: [], + _additionalModels: null + }, + _isNew: false, + _workerEntities: { + }, + _readyForDeletionWorkers: null, + _status: 'NEW', + _logLevel: 300 }, - _isNew: false, - _workerEntities: {}, - _readyForDeletionWorkers: null, - _status: 'COMPLETE', - _logLevel: 300 - } - ]); + { + _validations: [], + _username: 'aylingw', + _id: 1446, + _uid: 'a415435f-40f2-4de5-abf7-bff611e85591', + _ustatus: null, + _created: '2019-07-31T15:09:57.405Z', + _updated: '2019-10-04T15:46:16.797Z', + _updatedBy: 'aylingw', + _auditEvents: null, + _name: 'WOZiTech Cares Sub 100', + _address1: 'Number 1', + _address2: 'My street', + _address3: '', + _town: 'My Town', + _county: '', + _locationId: '1-888777666', + _provId: '1-999888777', + _postcode: 'LN11 9JG', + _isRegulated: true, + _mainService: { id: 1, name: 'Carers support' }, + _nmdsId: 'G1002110', + _lastWdfEligibility: '2019-10-04T15:46:16.797Z', + _overallWdfEligibility: null, + _establishmentWdfEligibility: '2019-10-04T14:46:16.797Z', + _staffWdfEligibility: null, + _isParent: false, + _parentUid: '98a83eef-e1e1-49f3-89c5-b1287a3cc8dd', + _parentId: 479, + _parentName: null, + _dataOwner: 'Parent', + _dataPermissions: 'None', + _archived: false, + _dataOwnershipRequested: null, + _reasonsForLeaving: '', + _properties: { + _properties: [Object], + _propertyTypes: [Array], + _auditEvents: null, + _modifiedProperties: [], + _additionalModels: null + }, + _isNew: false, + _workerEntities: {}, + _readyForDeletionWorkers: null, + _status: 'COMPLETE', + _logLevel: 300 + } + ]); - expect(bulkUpload).to.have.property('crossValidate'); + expect(bulkUpload).to.have.property('validate'); - const csvEstablishmentSchemaErrors = []; + const csvEstablishmentSchemaErrors = []; - const myWorkers = [{ - establishmentKey: 'omar3', - status: 'UPDATE', - uniqueWorker: '3', - contractTypeId: 1, - mainJobRoleId: 1, - otherJobIds: [] - }]; - - // the real version of this code is in the api Establishment business object and runs a sql query. - // We just return a 'fake result set' - const fetchMyEstablishmentsWorkers = sinon.spy(async (establishmentId, establishmentKey) => { - return []; - }); + const myWorkers = []; - // Regular validation has to run first for the establishment to populate the internal properties correctly - await bulkUpload.validate(); + // call the validation to ensure the proper error is shown + await bulkUpload.validate(); - // call the method - await bulkUpload.crossValidate({ - csvEstablishmentSchemaErrors, - myWorkers, - fetchMyEstablishmentsWorkers - }); + const validationErrors = bulkUpload.validationErrors; - // assert the fetchMyEstalishmentsWorkers function was called - expect(fetchMyEstablishmentsWorkers.callCount).to.equal(1); + // assert a warning was returned - // assert a warning was returned - expect(csvEstablishmentSchemaErrors.length).to.equal(1); - - expect(csvEstablishmentSchemaErrors[0]).to.deep.equal({ - lineNumber: 2, - name: 'omar3', - origin: 'Establishments', - source: '1', - warnCode: 2200, - warnType: 'TOTAL_PERM_TEMP_WARNING', - warning: 'The number of direct care staff is 0 please check your staff records' - }); - }); + expect(validationErrors).to.deep.equal([ - it('should emit a warning if there no non-direct care staff', async () => { + ]); + }); + it('should emit an error if locationId has already been used in the database and not this establishment', async () => { const bulkUpload = new (testUtils.sandBox( filename, { @@ -1328,6 +1312,9 @@ describe('/server/models/Bulkimport/csv/establishment.js', () => { require: testUtils.wrapRequire({ '../BUDI': { BUDI + }, + '../../index': { + establishment: models.establishment } }) } @@ -1342,26 +1329,26 @@ describe('/server/models/Bulkimport/csv/establishment.js', () => { ADDRESS3: '', POSTTOWN: 'My Town', POSTCODE: 'LN11 9JG', - ESTTYPE: '1', + ESTTYPE: '6', OTHERTYPE: '', PERMCQC: '1', PERMLA: '1', SHARELA: '708;721;720', REGTYPE: '2', - PROVNUM: '', - LOCATIONID: '', - MAINSERVICE: '72', - ALLSERVICES: '72;13', - CAPACITY: '', - UTILISATION: '', + PROVNUM: '1-123456780', + LOCATIONID: '1-123456780', + MAINSERVICE: '8', + ALLSERVICES: '12;13', + CAPACITY: '0;0', + UTILISATION: '0;0', SERVICEDESC: '1;1', SERVICEUSERS: '', OTHERUSERDESC: '', TOTALPERMTEMP: '1', - ALLJOBROLES: '34;8', - STARTERS: '0;0', - LEAVERS: '999', - VACANCIES: '999;333', + ALLJOBROLES: '34;8;4', + STARTERS: '0;0;0', + LEAVERS: '999;0;0', + VACANCIES: '999;333;1', REASONS: '', REASONNOS: '' }, @@ -1383,7 +1370,7 @@ describe('/server/models/Bulkimport/csv/establishment.js', () => { _address3: '', _town: 'My Town', _county: '', - _locationId: 'A-328849599', + _locationId: null, _provId: null, _postcode: 'LN11 9JG', _isRegulated: false, @@ -1466,311 +1453,1374 @@ describe('/server/models/Bulkimport/csv/establishment.js', () => { } ]); - expect(bulkUpload).to.have.property('crossValidate'); + expect(bulkUpload).to.have.property('validate'); const csvEstablishmentSchemaErrors = []; - const myWorkers = [{ - establishmentKey: 'omar3', - status: 'UPDATE', - uniqueWorker: '3', - contractTypeId: 1, - mainJobRoleId: 10, - otherJobIds: [] - }]; - - // the real version of this code is in the api Establishment business object and runs a sql query. - // We just return a 'fake result set' - const fetchMyEstablishmentsWorkers = sinon.spy(async (establishmentId, establishmentKey) => { - return []; - }); + const myWorkers = []; - // Regular validation has to run first for the establishment to populate the internal properties correctly + // call the validation to ensure the proper error is shown await bulkUpload.validate(); - // call the method - await bulkUpload.crossValidate({ - csvEstablishmentSchemaErrors, - myWorkers, - fetchMyEstablishmentsWorkers - }); - - // assert the fetchMyEstalishmentsWorkers function was called - expect(fetchMyEstablishmentsWorkers.callCount).to.equal(1); + const validationErrors = bulkUpload.validationErrors; // assert a warning was returned - expect(csvEstablishmentSchemaErrors.length).to.equal(1); - - expect(csvEstablishmentSchemaErrors[0]).to.deep.equal({ - lineNumber: 2, - name: 'omar3', - origin: 'Establishments', - source: '1', - warnCode: 2200, - warnType: 'TOTAL_PERM_TEMP_WARNING', - warning: 'The number of non-direct care staff is 0 please check your staff records' - }); - }); - it('should emit a warning if there are fewer employed staff than non employed staff', async () => { - const bulkUpload = new (testUtils.sandBox( - filename, + expect(validationErrors).to.deep.equal([ { - locals: { - require: testUtils.wrapRequire({ - '../BUDI': { - BUDI - } - }) - } + "errCode": 1020, + "errType": "STATUS_ERROR", + "error": "Workplace has a STATUS of UPDATE but does not exist, please change to NEW to add it", + "lineNumber": 2, + "name": "omar3", + "origin": "Establishments", + "source": "UPDATE" + }, + { + "errCode": 1110, + "errType": "LOCATION_ID_ERROR", + "error": "LOCATIONID already exists in ASC-WDS please contact Support on 0113 241 0969", + "lineNumber": 2, + "name": "omar3", + "origin": "Establishments", + "source": "1-123456780" } - ).Establishment)( + ]); + }); + it('should not emit an error if locationId has already been used in the database and is this establishment', async () => { + const bulkUpload = new (testUtils.sandBox( + filename, + { + locals: { + require: testUtils.wrapRequire({ + '../BUDI': { + BUDI + }, + '../../index': { + establishment: models.establishment + } + }) + } + } + ).Establishment)( + { + LOCALESTID: '123', + STATUS: 'UPDATE', + ESTNAME: 'WOZiTech, with even more care', + ADDRESS1: 'First Line', + ADDRESS2: 'Second Line', + ADDRESS3: '', + POSTTOWN: 'My Town', + POSTCODE: 'LN11 9JG', + ESTTYPE: '6', + OTHERTYPE: '', + PERMCQC: '1', + PERMLA: '1', + SHARELA: '708;721;720', + REGTYPE: '2', + PROVNUM: '1-123456780', + LOCATIONID: '1-123456780', + MAINSERVICE: '8', + ALLSERVICES: '12;13', + CAPACITY: '0;0', + UTILISATION: '0;0', + SERVICEDESC: '1;1', + SERVICEUSERS: '', + OTHERUSERDESC: '', + TOTALPERMTEMP: '1', + ALLJOBROLES: '34;8;4', + STARTERS: '0;0;0', + LEAVERS: '999;0;0', + VACANCIES: '999;333;1', + REASONS: '', + REASONNOS: '' + }, + 2, + [ { - LOCALESTID: 'omar3', - STATUS: 'UPDATE', - ESTNAME: 'WOZiTech, with even more care', - ADDRESS1: 'First Line', - ADDRESS2: 'Second Line', - ADDRESS3: '', - POSTTOWN: 'My Town', - POSTCODE: 'LN11 9JG', - ESTTYPE: '6', - OTHERTYPE: '', - PERMCQC: '1', - PERMLA: '1', - SHARELA: '708;721;720', - REGTYPE: '0', - PROVNUM: '', - LOCATIONID: '', - MAINSERVICE: '72', - ALLSERVICES: '72;13', - CAPACITY: '', - UTILISATION: '', - SERVICEDESC: '1;1', - SERVICEUSERS: '', - OTHERUSERDESC: '', - TOTALPERMTEMP: '10', - ALLJOBROLES: '34;8', - STARTERS: '0;0', - LEAVERS: '999', - VACANCIES: '999;333', - REASONS: '', - REASONNOS: '' - }, - 2, - [ - { - _validations: [], - _username: 'aylingw', - _id: 479, - _uid: '98a83eef-e1e1-49f3-89c5-b1287a3cc8dd', - _ustatus: null, - _created: '2019-03-15T09:54:10.562Z', - _updated: '2019-10-04T15:46:16.158Z', - _updatedBy: 'aylingw', + _validations: [], + _username: 'aylingw', + _id: 123, + _uid: '98a83eef-e1e1-49f3-89c5-b1287a3cc8dd', + _ustatus: null, + _created: '2019-03-15T09:54:10.562Z', + _updated: '2019-10-04T15:46:16.158Z', + _updatedBy: 'aylingw', + _auditEvents: null, + _name: 'WOZiTech, with even more care', + _address1: 'First Line', + _address2: 'Second Line', + _address3: '', + _town: 'My Town', + _county: '', + _locationId: null, + _provId: null, + _postcode: 'LN11 9JG', + _isRegulated: false, + _mainService: { id: 16, name: 'Head office services' }, + _nmdsId: 'G1001114', + _lastWdfEligibility: '2019-08-16T07:17:38.014Z', + _overallWdfEligibility: '2019-08-16T07:17:38.340Z', + _establishmentWdfEligibility: null, + _staffWdfEligibility: '2019-08-13T12:41:24.836Z', + _isParent: true, + _parentUid: null, + _parentId: null, + _parentName: null, + _dataOwner: 'Workplace', + _dataPermissions: 'None', + _archived: false, + _dataOwnershipRequested: null, + _reasonsForLeaving: '', + _properties: { + _properties: [Object], + _propertyTypes: [Array], _auditEvents: null, - _name: 'WOZiTech, with even more care', - _address1: 'First Line', - _address2: 'Second Line', - _address3: '', - _town: 'My Town', - _county: '', - _locationId: 'A-328849599', - _provId: null, - _postcode: 'LN11 9JG', - _isRegulated: false, - _mainService: { id: 16, name: 'Head office services' }, - _nmdsId: 'G1001114', - _lastWdfEligibility: '2019-08-16T07:17:38.014Z', - _overallWdfEligibility: '2019-08-16T07:17:38.340Z', - _establishmentWdfEligibility: null, - _staffWdfEligibility: '2019-08-13T12:41:24.836Z', - _isParent: true, - _parentUid: null, - _parentId: null, - _parentName: null, - _dataOwner: 'Workplace', - _dataPermissions: 'None', - _archived: false, - _dataOwnershipRequested: null, - _reasonsForLeaving: '', - _properties: { - _properties: [Object], - _propertyTypes: [Array], - _auditEvents: null, - _modifiedProperties: [], - _additionalModels: null - }, - _isNew: false, - _workerEntities: { - }, - _readyForDeletionWorkers: null, - _status: 'NEW', - _logLevel: 300 + _modifiedProperties: [], + _additionalModels: null }, - { - _validations: [], - _username: 'aylingw', - _id: 1446, - _uid: 'a415435f-40f2-4de5-abf7-bff611e85591', - _ustatus: null, - _created: '2019-07-31T15:09:57.405Z', - _updated: '2019-10-04T15:46:16.797Z', - _updatedBy: 'aylingw', + _isNew: false, + _workerEntities: { + }, + _readyForDeletionWorkers: null, + _status: 'NEW', + _logLevel: 300, + key: '123' + }, + { + _validations: [], + _username: 'aylingw', + _id: 1446, + _uid: 'a415435f-40f2-4de5-abf7-bff611e85591', + _ustatus: null, + _created: '2019-07-31T15:09:57.405Z', + _updated: '2019-10-04T15:46:16.797Z', + _updatedBy: 'aylingw', + _auditEvents: null, + _name: 'WOZiTech Cares Sub 100', + _address1: 'Number 1', + _address2: 'My street', + _address3: '', + _town: 'My Town', + _county: '', + _locationId: '1-888777666', + _provId: '1-999888777', + _postcode: 'LN11 9JG', + _isRegulated: true, + _mainService: { id: 1, name: 'Carers support' }, + _nmdsId: 'G1002110', + _lastWdfEligibility: '2019-10-04T15:46:16.797Z', + _overallWdfEligibility: null, + _establishmentWdfEligibility: '2019-10-04T14:46:16.797Z', + _staffWdfEligibility: null, + _isParent: false, + _parentUid: '98a83eef-e1e1-49f3-89c5-b1287a3cc8dd', + _parentId: 479, + _parentName: null, + _dataOwner: 'Parent', + _dataPermissions: 'None', + _archived: false, + _dataOwnershipRequested: null, + _reasonsForLeaving: '', + _properties: { + _properties: [Object], + _propertyTypes: [Array], _auditEvents: null, - _name: 'WOZiTech Cares Sub 100', - _address1: 'Number 1', - _address2: 'My street', - _address3: '', - _town: 'My Town', - _county: '', - _locationId: '1-888777666', - _provId: '1-999888777', - _postcode: 'LN11 9JG', - _isRegulated: true, - _mainService: { id: 1, name: 'Carers support' }, - _nmdsId: 'G1002110', - _lastWdfEligibility: '2019-10-04T15:46:16.797Z', - _overallWdfEligibility: null, - _establishmentWdfEligibility: '2019-10-04T14:46:16.797Z', - _staffWdfEligibility: null, - _isParent: false, - _parentUid: '98a83eef-e1e1-49f3-89c5-b1287a3cc8dd', - _parentId: 479, - _parentName: null, - _dataOwner: 'Parent', - _dataPermissions: 'None', - _archived: false, - _dataOwnershipRequested: null, - _reasonsForLeaving: '', - _properties: { - _properties: [Object], - _propertyTypes: [Array], - _auditEvents: null, - _modifiedProperties: [], - _additionalModels: null - }, - _isNew: false, - _workerEntities: {}, - _readyForDeletionWorkers: null, - _status: 'COMPLETE', - _logLevel: 300 - } - ]); + _modifiedProperties: [], + _additionalModels: null + }, + _isNew: false, + _workerEntities: {}, + _readyForDeletionWorkers: null, + _status: 'COMPLETE', + _logLevel: 300 + } + ]); - expect(bulkUpload).to.have.property('crossValidate'); + expect(bulkUpload).to.have.property('validate'); - const csvEstablishmentSchemaErrors = []; + const csvEstablishmentSchemaErrors = []; - const myWorkers = [{ - establishmentKey: 'omar3', - status: 'UPDATE', - uniqueWorker: '3', - contractTypeId: 2, - mainJobRoleId: 10, - otherJobIds: [] - }]; - - // the real version of this code is in the api Establishment business object and runs a sql query. - // We just return a 'fake result set' - const fetchMyEstablishmentsWorkers = sinon.spy(async (establishmentId, establishmentKey) => { - return [{ - establishmentKey: 'omar3', - uniqueWorker: '3', - contractTypeId: 'Permanent', - mainJobRoleId: 10, - otherJobIds: '' - }, - { - establishmentKey: 'omar3', - uniqueWorker: 'WA100', - contractTypeId: 'Temporary', - mainJobRoleId: 26, - otherJobIds: '' - }, - { - establishmentKey: 'omar3', - uniqueWorker: '5', - contractTypeId: 'Pool/Bank', - mainJobRoleId: 7, - otherJobIds: '' - }, - { - establishmentKey: 'omar3', - uniqueWorker: '6', - contractTypeId: 'Temporary', - mainJobRoleId: 17, - otherJobIds: '' - }, - { - establishmentKey: 'omar3', - uniqueWorker: 'WA103', - contractTypeId: 'Temporary', - mainJobRoleId: 26, - otherJobIds: '' - }, - { - establishmentKey: 'omar3', - uniqueWorker: '10', - contractTypeId: 'Other', - mainJobRoleId: 18, - otherJobIds: '' - }, - { - establishmentKey: 'omar3', - uniqueWorker: '4', - contractTypeId: 'Other', - mainJobRoleId: 1, - otherJobIds: '' - }, - { - establishmentKey: 'omar3', - uniqueWorker: 'SA 4', - contractTypeId: 'Other', - mainJobRoleId: 23, - otherJobIds: '' - }, + const myWorkers = []; + + // call the validation to ensure the proper error is shown + await bulkUpload.validate(); + + const validationErrors = bulkUpload.validationErrors; + + // assert a warning was returned + + expect(validationErrors).to.deep.equal([]); +}); + + it('should not emit an error if locationId has not already been used in the database', async () => { + const bulkUpload = new (testUtils.sandBox( + filename, + { + locals: { + require: testUtils.wrapRequire({ + '../BUDI': { + BUDI + }, + '../../index': { + establishment: models.establishment + } + }) + } + } + ).Establishment)( + { + LOCALESTID: 'omar3', + STATUS: 'NEW', + ESTNAME: 'WOZiTech, with even more care', + ADDRESS1: 'First Line', + ADDRESS2: 'Second Line', + ADDRESS3: '', + POSTTOWN: 'My Town', + POSTCODE: 'LN11 9JG', + ESTTYPE: '6', + OTHERTYPE: '', + PERMCQC: '1', + PERMLA: '1', + SHARELA: '708;721;720', + REGTYPE: '2', + PROVNUM: '1-123456781', + LOCATIONID: '1-123456781', + MAINSERVICE: '8', + ALLSERVICES: '12;13', + CAPACITY: '0;0', + UTILISATION: '0;0', + SERVICEDESC: '1;1', + SERVICEUSERS: '', + OTHERUSERDESC: '', + TOTALPERMTEMP: '1', + ALLJOBROLES: '34;8;4', + STARTERS: '0;0;0', + LEAVERS: '999;0;0', + VACANCIES: '999;333;1', + REASONS: '', + REASONNOS: '' + }, + 2, + [ { - establishmentKey: 'omar3', - uniqueWorker: 'FTSpecial', - contractTypeId: 'Other', - mainJobRoleId: 24, - otherJobIds: '' + _validations: [], + _username: 'aylingw', + _id: 479, + _uid: '98a83eef-e1e1-49f3-89c5-b1287a3cc8dd', + _ustatus: null, + _created: '2019-03-15T09:54:10.562Z', + _updated: '2019-10-04T15:46:16.158Z', + _updatedBy: 'aylingw', + _auditEvents: null, + _name: 'WOZiTech, with even more care', + _address1: 'First Line', + _address2: 'Second Line', + _address3: '', + _town: 'My Town', + _county: '', + _locationId: null, + _provId: null, + _postcode: 'LN11 9JG', + _isRegulated: false, + _mainService: { id: 16, name: 'Head office services' }, + _nmdsId: 'G1001114', + _lastWdfEligibility: '2019-08-16T07:17:38.014Z', + _overallWdfEligibility: '2019-08-16T07:17:38.340Z', + _establishmentWdfEligibility: null, + _staffWdfEligibility: '2019-08-13T12:41:24.836Z', + _isParent: true, + _parentUid: null, + _parentId: null, + _parentName: null, + _dataOwner: 'Workplace', + _dataPermissions: 'None', + _archived: false, + _dataOwnershipRequested: null, + _reasonsForLeaving: '', + _properties: { + _properties: [Object], + _propertyTypes: [Array], + _auditEvents: null, + _modifiedProperties: [], + _additionalModels: null + }, + _isNew: false, + _workerEntities: { + }, + _readyForDeletionWorkers: null, + _status: 'NEW', + _logLevel: 300 }, { - establishmentKey: 'omar3', - uniqueWorker: '1', - contractTypeId: 'Other', - mainJobRoleId: 2, - otherJobIds: '' - }]; - }); + _validations: [], + _username: 'aylingw', + _id: 1446, + _uid: 'a415435f-40f2-4de5-abf7-bff611e85591', + _ustatus: null, + _created: '2019-07-31T15:09:57.405Z', + _updated: '2019-10-04T15:46:16.797Z', + _updatedBy: 'aylingw', + _auditEvents: null, + _name: 'WOZiTech Cares Sub 100', + _address1: 'Number 1', + _address2: 'My street', + _address3: '', + _town: 'My Town', + _county: '', + _locationId: '1-888777666', + _provId: '1-999888777', + _postcode: 'LN11 9JG', + _isRegulated: true, + _mainService: { id: 1, name: 'Carers support' }, + _nmdsId: 'G1002110', + _lastWdfEligibility: '2019-10-04T15:46:16.797Z', + _overallWdfEligibility: null, + _establishmentWdfEligibility: '2019-10-04T14:46:16.797Z', + _staffWdfEligibility: null, + _isParent: false, + _parentUid: '98a83eef-e1e1-49f3-89c5-b1287a3cc8dd', + _parentId: 479, + _parentName: null, + _dataOwner: 'Parent', + _dataPermissions: 'None', + _archived: false, + _dataOwnershipRequested: null, + _reasonsForLeaving: '', + _properties: { + _properties: [Object], + _propertyTypes: [Array], + _auditEvents: null, + _modifiedProperties: [], + _additionalModels: null + }, + _isNew: false, + _workerEntities: {}, + _readyForDeletionWorkers: null, + _status: 'COMPLETE', + _logLevel: 300 + } + ]); - // Regular validation has to run first for the establishment to populate the internal properties correctly - await bulkUpload.validate(); + expect(bulkUpload).to.have.property('validate'); - // call the method - await bulkUpload.crossValidate({ - csvEstablishmentSchemaErrors, - myWorkers, - fetchMyEstablishmentsWorkers - }); + const csvEstablishmentSchemaErrors = []; - // assert the fetchMyEstalishmentsWorkers function was called - expect(fetchMyEstablishmentsWorkers.callCount).to.equal(1); + const myWorkers = []; - // assert a warning was returned - expect(csvEstablishmentSchemaErrors.length).to.equal(1); - - expect(csvEstablishmentSchemaErrors[0]).to.deep.equal({ - lineNumber: 2, - name: 'omar3', - origin: 'Establishments', - source: '10', - warnCode: 2200, - warnType: 'TOTAL_PERM_TEMP_WARNING', - warning: 'The number of employed staff is less than the number of non-employed staff please check your staff records' - }); - }); + // call the validation to ensure the proper error is shown + await bulkUpload.validate(); + + const validationErrors = bulkUpload.validationErrors; + + // assert a warning was returned + + expect(validationErrors).to.deep.equal([]); +}); + + // it('should emit an error if SLV is greater than zero and this ALLJOBROLES is blank', async () => { + // const bulkUpload = new (testUtils.sandBox( + // filename, + // { + // locals: { + // require: testUtils.wrapRequire({ + // '../BUDI': { + // BUDI + // }, + // '../../index': { + // models + // } + // }) + // } + // } + // ).Establishment)( + // { + // LOCALESTID: 'omar3', + // STATUS: 'NEW', + // ESTNAME: 'WOZiTech, with even more care', + // ADDRESS1: 'First Line', + // ADDRESS2: 'Second Line', + // ADDRESS3: '', + // POSTTOWN: 'My Town', + // POSTCODE: 'LN11 9JG', + // ESTTYPE: '6', + // OTHERTYPE: '', + // PERMCQC: '1', + // PERMLA: '1', + // SHARELA: '708;721;720', + // REGTYPE: '0', + // PROVNUM: '', + // LOCATIONID: '', + // MAINSERVICE: '72', + // ALLSERVICES: '72;13', + // CAPACITY: '0;0', + // UTILISATION: '0;0', + // SERVICEDESC: '1;1', + // SERVICEUSERS: '', + // OTHERUSERDESC: '', + // TOTALPERMTEMP: '10', + // ALLJOBROLES: '', + // STARTERS: '0;0', + // LEAVERS: '999', + // VACANCIES: '999;333', + // REASONS: '', + // REASONNOS: '' + // }, + // 2, + // [ + // { + // _validations: [], + // _username: 'aylingw', + // _id: 479, + // _uid: '98a83eef-e1e1-49f3-89c5-b1287a3cc8dd', + // _ustatus: null, + // _created: '2019-03-15T09:54:10.562Z', + // _updated: '2019-10-04T15:46:16.158Z', + // _updatedBy: 'aylingw', + // _auditEvents: null, + // _name: 'WOZiTech, with even more care', + // _address1: 'First Line', + // _address2: 'Second Line', + // _address3: '', + // _town: 'My Town', + // _county: '', + // _locationId: 'A-328849599', + // _provId: null, + // _postcode: 'LN11 9JG', + // _isRegulated: false, + // _mainService: { id: 72, name: 'Head office services' }, + // _nmdsId: 'G1001114', + // _lastWdfEligibility: '2019-08-16T07:17:38.014Z', + // _overallWdfEligibility: '2019-08-16T07:17:38.340Z', + // _establishmentWdfEligibility: null, + // _staffWdfEligibility: '2019-08-13T12:41:24.836Z', + // _isParent: true, + // _parentUid: null, + // _parentId: null, + // _parentName: null, + // _dataOwner: 'Workplace', + // _dataPermissions: 'None', + // _archived: false, + // _dataOwnershipRequested: null, + // _reasonsForLeaving: '', + // _properties: { + // _properties: [Object], + // _propertyTypes: [Array], + // _auditEvents: null, + // _modifiedProperties: [], + // _additionalModels: null + // }, + // _isNew: false, + // _workerEntities: { + // }, + // _readyForDeletionWorkers: null, + // _status: 'NEW', + // _logLevel: 300 + // }, + // { + // _validations: [], + // _username: 'aylingw', + // _id: 1446, + // _uid: 'a415435f-40f2-4de5-abf7-bff611e85591', + // _ustatus: null, + // _created: '2019-07-31T15:09:57.405Z', + // _updated: '2019-10-04T15:46:16.797Z', + // _updatedBy: 'aylingw', + // _auditEvents: null, + // _name: 'WOZiTech Cares Sub 100', + // _address1: 'Number 1', + // _address2: 'My street', + // _address3: '', + // _town: 'My Town', + // _county: '', + // _locationId: '1-888777666', + // _provId: '1-999888777', + // _postcode: 'LN11 9JG', + // _isRegulated: true, + // _mainService: { id: 1, name: 'Carers support' }, + // _nmdsId: 'G1002110', + // _lastWdfEligibility: '2019-10-04T15:46:16.797Z', + // _overallWdfEligibility: null, + // _establishmentWdfEligibility: '2019-10-04T14:46:16.797Z', + // _staffWdfEligibility: null, + // _isParent: false, + // _parentUid: '98a83eef-e1e1-49f3-89c5-b1287a3cc8dd', + // _parentId: 479, + // _parentName: null, + // _dataOwner: 'Parent', + // _dataPermissions: 'None', + // _archived: false, + // _dataOwnershipRequested: null, + // _reasonsForLeaving: '', + // _properties: { + // _properties: [Object], + // _propertyTypes: [Array], + // _auditEvents: null, + // _modifiedProperties: [], + // _additionalModels: null + // }, + // _isNew: false, + // _workerEntities: {}, + // _readyForDeletionWorkers: null, + // _status: 'COMPLETE', + // _logLevel: 300 + // }] + // ); + + // expect(bulkUpload).to.have.property('validate'); + + // const csvEstablishmentSchemaErrors = []; + + // const myWorkers = []; + + // // call the validation to ensure the proper error is shown + // await bulkUpload.validate(); + + // const validationErrors = bulkUpload.validationErrors; + + // // assert a warning was returned + + // expect(validationErrors).to.deep.equal([{ + // lineNumber: 2, + // name: 'omar3', + // origin: 'Establishments', + // source: '', + // errCode: 1280, + // errType: 'ALL_JOBS_ERROR', + // error: 'ALLJOBROLES cannot be blank as you have STARTERS, LEAVERS, VACANCIES greater than zero' + // }]); + // }); }); + + // describe('cross entity validations', () => { + // it('should emit a warning if there are zero staff', async () => { + // const bulkUpload = new (testUtils.sandBox( + // filename, + // { + // locals: { + // require: testUtils.wrapRequire({ + // '../BUDI': { + // BUDI + // } + // }) + // } + // } + // ).Establishment)( + // { + // LOCALESTID: 'omar3', + // STATUS: 'UPDATE', + // ESTNAME: 'WOZiTech, with even more care', + // ADDRESS1: 'First Line', + // ADDRESS2: 'Second Line', + // ADDRESS3: '', + // POSTTOWN: 'My Town', + // POSTCODE: 'LN11 9JG', + // ESTTYPE: '6', + // OTHERTYPE: '', + // PERMCQC: '1', + // PERMLA: '1', + // SHARELA: '708;721;720', + // REGTYPE: '0', + // PROVNUM: '', + // LOCATIONID: '', + // MAINSERVICE: '72', + // ALLSERVICES: '72;13', + // CAPACITY: '', + // UTILISATION: '', + // SERVICEDESC: '1;1', + // SERVICEUSERS: '', + // OTHERUSERDESC: '', + // TOTALPERMTEMP: '0', + // ALLJOBROLES: '34;8', + // STARTERS: '0;0', + // LEAVERS: '999', + // VACANCIES: '999;333', + // REASONS: '', + // REASONNOS: '' + // }, + // 2, + // [ + // { + // _validations: [], + // _username: 'aylingw', + // _id: 479, + // _uid: '98a83eef-e1e1-49f3-89c5-b1287a3cc8dd', + // _ustatus: null, + // _created: '2019-03-15T09:54:10.562Z', + // _updated: '2019-10-04T15:46:16.158Z', + // _updatedBy: 'aylingw', + // _auditEvents: null, + // _name: 'WOZiTech, with even more care', + // _address1: 'First Line', + // _address2: 'Second Line', + // _address3: '', + // _town: 'My Town', + // _county: '', + // _locationId: 'A-328849599', + // _provId: null, + // _postcode: 'LN11 9JG', + // _isRegulated: false, + // _mainService: { id: 16, name: 'Head office services' }, + // _nmdsId: 'G1001114', + // _lastWdfEligibility: '2019-08-16T07:17:38.014Z', + // _overallWdfEligibility: '2019-08-16T07:17:38.340Z', + // _establishmentWdfEligibility: null, + // _staffWdfEligibility: '2019-08-13T12:41:24.836Z', + // _isParent: true, + // _parentUid: null, + // _parentId: null, + // _parentName: null, + // _dataOwner: 'Workplace', + // _dataPermissions: 'None', + // _archived: false, + // _dataOwnershipRequested: null, + // _reasonsForLeaving: '', + // _properties: { + // _properties: [Object], + // _propertyTypes: [Array], + // _auditEvents: null, + // _modifiedProperties: [], + // _additionalModels: null + // }, + // _isNew: false, + // _workerEntities: { + // }, + // _readyForDeletionWorkers: null, + // _status: 'NEW', + // _logLevel: 300 + // }, + // { + // _validations: [], + // _username: 'aylingw', + // _id: 1446, + // _uid: 'a415435f-40f2-4de5-abf7-bff611e85591', + // _ustatus: null, + // _created: '2019-07-31T15:09:57.405Z', + // _updated: '2019-10-04T15:46:16.797Z', + // _updatedBy: 'aylingw', + // _auditEvents: null, + // _name: 'WOZiTech Cares Sub 100', + // _address1: 'Number 1', + // _address2: 'My street', + // _address3: '', + // _town: 'My Town', + // _county: '', + // _locationId: '1-888777666', + // _provId: '1-999888777', + // _postcode: 'LN11 9JG', + // _isRegulated: true, + // _mainService: { id: 1, name: 'Carers support' }, + // _nmdsId: 'G1002110', + // _lastWdfEligibility: '2019-10-04T15:46:16.797Z', + // _overallWdfEligibility: null, + // _establishmentWdfEligibility: '2019-10-04T14:46:16.797Z', + // _staffWdfEligibility: null, + // _isParent: false, + // _parentUid: '98a83eef-e1e1-49f3-89c5-b1287a3cc8dd', + // _parentId: 479, + // _parentName: null, + // _dataOwner: 'Parent', + // _dataPermissions: 'None', + // _archived: false, + // _dataOwnershipRequested: null, + // _reasonsForLeaving: '', + // _properties: { + // _properties: [Object], + // _propertyTypes: [Array], + // _auditEvents: null, + // _modifiedProperties: [], + // _additionalModels: null + // }, + // _isNew: false, + // _workerEntities: {}, + // _readyForDeletionWorkers: null, + // _status: 'COMPLETE', + // _logLevel: 300 + // } + // ]); + + // expect(bulkUpload).to.have.property('crossValidate'); + + // const csvEstablishmentSchemaErrors = []; + + // const myWorkers = []; + + // // the real version of this code is in the api Establishment business object and runs a sql query. + // // We just return a 'fake result set' + // const fetchMyEstablishmentsWorkers = sinon.spy(async (establishmentId, establishmentKey) => { + // return []; + // }); + + // // Regular validation has to run first for the establishment to populate the internal properties correctly + // await bulkUpload.validate(); + + // // call the method + // await bulkUpload.crossValidate({ + // csvEstablishmentSchemaErrors, + // myWorkers, + // fetchMyEstablishmentsWorkers + // }); + + // // assert the fetchMyEstalishmentsWorkers function was called + // expect(fetchMyEstablishmentsWorkers.callCount).to.equal(1); + + // // assert a warning was returned + // expect(csvEstablishmentSchemaErrors.length).to.equal(1); + + // expect(csvEstablishmentSchemaErrors[0]).to.deep.equal({ + // lineNumber: 2, + // name: 'omar3', + // origin: 'Establishments', + // source: '0', + // warnCode: 2200, + // warnType: 'TOTAL_PERM_TEMP_WARNING', + // warning: 'The number of employed staff is 0 please check your staff records' + // }); + // }); + + // it('should emit a warning if there are no direct care staff', async () => { + // const bulkUpload = new (testUtils.sandBox( + // filename, + // { + // locals: { + // require: testUtils.wrapRequire({ + // '../BUDI': { + // BUDI + // } + // }) + // } + // } + // ).Establishment)( + // { + // LOCALESTID: 'omar3', + // STATUS: 'UPDATE', + // ESTNAME: 'WOZiTech, with even more care', + // ADDRESS1: 'First Line', + // ADDRESS2: 'Second Line', + // ADDRESS3: '', + // POSTTOWN: 'My Town', + // POSTCODE: 'LN11 9JG', + // ESTTYPE: '6', + // OTHERTYPE: '', + // PERMCQC: '1', + // PERMLA: '1', + // SHARELA: '708;721;720', + // REGTYPE: '2', + // PROVNUM: '', + // LOCATIONID: '', + // MAINSERVICE: '72', + // ALLSERVICES: '72;13', + // CAPACITY: '', + // UTILISATION: '', + // SERVICEDESC: '1;1', + // SERVICEUSERS: '', + // OTHERUSERDESC: '', + // TOTALPERMTEMP: '1', + // ALLJOBROLES: '34;8', + // STARTERS: '0;0', + // LEAVERS: '999', + // VACANCIES: '999;333', + // REASONS: '', + // REASONNOS: '' + // }, + // 2, + // [ + // { + // _validations: [], + // _username: 'aylingw', + // _id: 479, + // _uid: '98a83eef-e1e1-49f3-89c5-b1287a3cc8dd', + // _ustatus: null, + // _created: '2019-03-15T09:54:10.562Z', + // _updated: '2019-10-04T15:46:16.158Z', + // _updatedBy: 'aylingw', + // _auditEvents: null, + // _name: 'WOZiTech, with even more care', + // _address1: 'First Line', + // _address2: 'Second Line', + // _address3: '', + // _town: 'My Town', + // _county: '', + // _locationId: 'A-328849599', + // _provId: null, + // _postcode: 'LN11 9JG', + // _isRegulated: false, + // _mainService: { id: 16, name: 'Head office services' }, + // _nmdsId: 'G1001114', + // _lastWdfEligibility: '2019-08-16T07:17:38.014Z', + // _overallWdfEligibility: '2019-08-16T07:17:38.340Z', + // _establishmentWdfEligibility: null, + // _staffWdfEligibility: '2019-08-13T12:41:24.836Z', + // _isParent: true, + // _parentUid: null, + // _parentId: null, + // _parentName: null, + // _dataOwner: 'Workplace', + // _dataPermissions: 'None', + // _archived: false, + // _dataOwnershipRequested: null, + // _reasonsForLeaving: '', + // _properties: { + // _properties: [Object], + // _propertyTypes: [Array], + // _auditEvents: null, + // _modifiedProperties: [], + // _additionalModels: null + // }, + // _isNew: false, + // _workerEntities: { + // }, + // _readyForDeletionWorkers: null, + // _status: 'NEW', + // _logLevel: 300 + // }, + // { + // _validations: [], + // _username: 'aylingw', + // _id: 1446, + // _uid: 'a415435f-40f2-4de5-abf7-bff611e85591', + // _ustatus: null, + // _created: '2019-07-31T15:09:57.405Z', + // _updated: '2019-10-04T15:46:16.797Z', + // _updatedBy: 'aylingw', + // _auditEvents: null, + // _name: 'WOZiTech Cares Sub 100', + // _address1: 'Number 1', + // _address2: 'My street', + // _address3: '', + // _town: 'My Town', + // _county: '', + // _locationId: '1-888777666', + // _provId: '1-999888777', + // _postcode: 'LN11 9JG', + // _isRegulated: true, + // _mainService: { id: 1, name: 'Carers support' }, + // _nmdsId: 'G1002110', + // _lastWdfEligibility: '2019-10-04T15:46:16.797Z', + // _overallWdfEligibility: null, + // _establishmentWdfEligibility: '2019-10-04T14:46:16.797Z', + // _staffWdfEligibility: null, + // _isParent: false, + // _parentUid: '98a83eef-e1e1-49f3-89c5-b1287a3cc8dd', + // _parentId: 479, + // _parentName: null, + // _dataOwner: 'Parent', + // _dataPermissions: 'None', + // _archived: false, + // _dataOwnershipRequested: null, + // _reasonsForLeaving: '', + // _properties: { + // _properties: [Object], + // _propertyTypes: [Array], + // _auditEvents: null, + // _modifiedProperties: [], + // _additionalModels: null + // }, + // _isNew: false, + // _workerEntities: {}, + // _readyForDeletionWorkers: null, + // _status: 'COMPLETE', + // _logLevel: 300 + // } + // ]); + + // expect(bulkUpload).to.have.property('crossValidate'); + + // const csvEstablishmentSchemaErrors = []; + + // const myWorkers = [{ + // establishmentKey: 'omar3', + // status: 'UPDATE', + // uniqueWorker: '3', + // contractTypeId: 1, + // mainJobRoleId: 1, + // otherJobIds: [] + // }]; + + // // the real version of this code is in the api Establishment business object and runs a sql query. + // // We just return a 'fake result set' + // const fetchMyEstablishmentsWorkers = sinon.spy(async (establishmentId, establishmentKey) => { + // return []; + // }); + + // // Regular validation has to run first for the establishment to populate the internal properties correctly + // await bulkUpload.validate(); + + // // call the method + // await bulkUpload.crossValidate({ + // csvEstablishmentSchemaErrors, + // myWorkers, + // fetchMyEstablishmentsWorkers + // }); + + // // assert the fetchMyEstalishmentsWorkers function was called + // expect(fetchMyEstablishmentsWorkers.callCount).to.equal(1); + + // // assert a warning was returned + // expect(csvEstablishmentSchemaErrors.length).to.equal(1); + + // expect(csvEstablishmentSchemaErrors[0]).to.deep.equal({ + // lineNumber: 2, + // name: 'omar3', + // origin: 'Establishments', + // source: '1', + // warnCode: 2200, + // warnType: 'TOTAL_PERM_TEMP_WARNING', + // warning: 'The number of direct care staff is 0 please check your staff records' + // }); + // }); + + // it('should emit a warning if there no non-direct care staff', async () => { + // const bulkUpload = new (testUtils.sandBox( + // filename, + // { + // locals: { + // require: testUtils.wrapRequire({ + // '../BUDI': { + // BUDI + // } + // }) + // } + // } + // ).Establishment)( + // { + // LOCALESTID: 'omar3', + // STATUS: 'UPDATE', + // ESTNAME: 'WOZiTech, with even more care', + // ADDRESS1: 'First Line', + // ADDRESS2: 'Second Line', + // ADDRESS3: '', + // POSTTOWN: 'My Town', + // POSTCODE: 'LN11 9JG', + // ESTTYPE: '1', + // OTHERTYPE: '', + // PERMCQC: '1', + // PERMLA: '1', + // SHARELA: '708;721;720', + // REGTYPE: '2', + // PROVNUM: '', + // LOCATIONID: '', + // MAINSERVICE: '72', + // ALLSERVICES: '72;13', + // CAPACITY: '', + // UTILISATION: '', + // SERVICEDESC: '1;1', + // SERVICEUSERS: '', + // OTHERUSERDESC: '', + // TOTALPERMTEMP: '1', + // ALLJOBROLES: '34;8', + // STARTERS: '0;0', + // LEAVERS: '999', + // VACANCIES: '999;333', + // REASONS: '', + // REASONNOS: '' + // }, + // 2, + // [ + // { + // _validations: [], + // _username: 'aylingw', + // _id: 479, + // _uid: '98a83eef-e1e1-49f3-89c5-b1287a3cc8dd', + // _ustatus: null, + // _created: '2019-03-15T09:54:10.562Z', + // _updated: '2019-10-04T15:46:16.158Z', + // _updatedBy: 'aylingw', + // _auditEvents: null, + // _name: 'WOZiTech, with even more care', + // _address1: 'First Line', + // _address2: 'Second Line', + // _address3: '', + // _town: 'My Town', + // _county: '', + // _locationId: 'A-328849599', + // _provId: null, + // _postcode: 'LN11 9JG', + // _isRegulated: false, + // _mainService: { id: 16, name: 'Head office services' }, + // _nmdsId: 'G1001114', + // _lastWdfEligibility: '2019-08-16T07:17:38.014Z', + // _overallWdfEligibility: '2019-08-16T07:17:38.340Z', + // _establishmentWdfEligibility: null, + // _staffWdfEligibility: '2019-08-13T12:41:24.836Z', + // _isParent: true, + // _parentUid: null, + // _parentId: null, + // _parentName: null, + // _dataOwner: 'Workplace', + // _dataPermissions: 'None', + // _archived: false, + // _dataOwnershipRequested: null, + // _reasonsForLeaving: '', + // _properties: { + // _properties: [Object], + // _propertyTypes: [Array], + // _auditEvents: null, + // _modifiedProperties: [], + // _additionalModels: null + // }, + // _isNew: false, + // _workerEntities: { + // }, + // _readyForDeletionWorkers: null, + // _status: 'NEW', + // _logLevel: 300 + // }, + // { + // _validations: [], + // _username: 'aylingw', + // _id: 1446, + // _uid: 'a415435f-40f2-4de5-abf7-bff611e85591', + // _ustatus: null, + // _created: '2019-07-31T15:09:57.405Z', + // _updated: '2019-10-04T15:46:16.797Z', + // _updatedBy: 'aylingw', + // _auditEvents: null, + // _name: 'WOZiTech Cares Sub 100', + // _address1: 'Number 1', + // _address2: 'My street', + // _address3: '', + // _town: 'My Town', + // _county: '', + // _locationId: '1-888777666', + // _provId: '1-999888777', + // _postcode: 'LN11 9JG', + // _isRegulated: true, + // _mainService: { id: 1, name: 'Carers support' }, + // _nmdsId: 'G1002110', + // _lastWdfEligibility: '2019-10-04T15:46:16.797Z', + // _overallWdfEligibility: null, + // _establishmentWdfEligibility: '2019-10-04T14:46:16.797Z', + // _staffWdfEligibility: null, + // _isParent: false, + // _parentUid: '98a83eef-e1e1-49f3-89c5-b1287a3cc8dd', + // _parentId: 479, + // _parentName: null, + // _dataOwner: 'Parent', + // _dataPermissions: 'None', + // _archived: false, + // _dataOwnershipRequested: null, + // _reasonsForLeaving: '', + // _properties: { + // _properties: [Object], + // _propertyTypes: [Array], + // _auditEvents: null, + // _modifiedProperties: [], + // _additionalModels: null + // }, + // _isNew: false, + // _workerEntities: {}, + // _readyForDeletionWorkers: null, + // _status: 'COMPLETE', + // _logLevel: 300 + // } + // ]); + + // expect(bulkUpload).to.have.property('crossValidate'); + + // const csvEstablishmentSchemaErrors = []; + + // const myWorkers = [{ + // establishmentKey: 'omar3', + // status: 'UPDATE', + // uniqueWorker: '3', + // contractTypeId: 1, + // mainJobRoleId: 10, + // otherJobIds: [] + // }]; + + // // the real version of this code is in the api Establishment business object and runs a sql query. + // // We just return a 'fake result set' + // const fetchMyEstablishmentsWorkers = sinon.spy(async (establishmentId, establishmentKey) => { + // return []; + // }); + + // // Regular validation has to run first for the establishment to populate the internal properties correctly + // await bulkUpload.validate(); + + // // call the method + // await bulkUpload.crossValidate({ + // csvEstablishmentSchemaErrors, + // myWorkers, + // fetchMyEstablishmentsWorkers + // }); + + // // assert the fetchMyEstalishmentsWorkers function was called + // expect(fetchMyEstablishmentsWorkers.callCount).to.equal(1); + + // // assert a warning was returned + // expect(csvEstablishmentSchemaErrors.length).to.equal(1); + + // expect(csvEstablishmentSchemaErrors[0]).to.deep.equal({ + // lineNumber: 2, + // name: 'omar3', + // origin: 'Establishments', + // source: '1', + // warnCode: 2200, + // warnType: 'TOTAL_PERM_TEMP_WARNING', + // warning: 'The number of non-direct care staff is 0 please check your staff records' + // }); + // }); + + // it('should emit a warning if there are fewer employed staff than non employed staff', async () => { + // const bulkUpload = new (testUtils.sandBox( + // filename, + // { + // locals: { + // require: testUtils.wrapRequire({ + // '../BUDI': { + // BUDI + // } + // }) + // } + // } + // ).Establishment)( + // { + // LOCALESTID: 'omar3', + // STATUS: 'UPDATE', + // ESTNAME: 'WOZiTech, with even more care', + // ADDRESS1: 'First Line', + // ADDRESS2: 'Second Line', + // ADDRESS3: '', + // POSTTOWN: 'My Town', + // POSTCODE: 'LN11 9JG', + // ESTTYPE: '6', + // OTHERTYPE: '', + // PERMCQC: '1', + // PERMLA: '1', + // SHARELA: '708;721;720', + // REGTYPE: '0', + // PROVNUM: '', + // LOCATIONID: '', + // MAINSERVICE: '72', + // ALLSERVICES: '72;13', + // CAPACITY: '', + // UTILISATION: '', + // SERVICEDESC: '1;1', + // SERVICEUSERS: '', + // OTHERUSERDESC: '', + // TOTALPERMTEMP: '10', + // ALLJOBROLES: '34;8', + // STARTERS: '0;0', + // LEAVERS: '999', + // VACANCIES: '999;333', + // REASONS: '', + // REASONNOS: '' + // }, + // 2, + // [ + // { + // _validations: [], + // _username: 'aylingw', + // _id: 479, + // _uid: '98a83eef-e1e1-49f3-89c5-b1287a3cc8dd', + // _ustatus: null, + // _created: '2019-03-15T09:54:10.562Z', + // _updated: '2019-10-04T15:46:16.158Z', + // _updatedBy: 'aylingw', + // _auditEvents: null, + // _name: 'WOZiTech, with even more care', + // _address1: 'First Line', + // _address2: 'Second Line', + // _address3: '', + // _town: 'My Town', + // _county: '', + // _locationId: 'A-328849599', + // _provId: null, + // _postcode: 'LN11 9JG', + // _isRegulated: false, + // _mainService: { id: 16, name: 'Head office services' }, + // _nmdsId: 'G1001114', + // _lastWdfEligibility: '2019-08-16T07:17:38.014Z', + // _overallWdfEligibility: '2019-08-16T07:17:38.340Z', + // _establishmentWdfEligibility: null, + // _staffWdfEligibility: '2019-08-13T12:41:24.836Z', + // _isParent: true, + // _parentUid: null, + // _parentId: null, + // _parentName: null, + // _dataOwner: 'Workplace', + // _dataPermissions: 'None', + // _archived: false, + // _dataOwnershipRequested: null, + // _reasonsForLeaving: '', + // _properties: { + // _properties: [Object], + // _propertyTypes: [Array], + // _auditEvents: null, + // _modifiedProperties: [], + // _additionalModels: null + // }, + // _isNew: false, + // _workerEntities: { + // }, + // _readyForDeletionWorkers: null, + // _status: 'NEW', + // _logLevel: 300 + // }, + // { + // _validations: [], + // _username: 'aylingw', + // _id: 1446, + // _uid: 'a415435f-40f2-4de5-abf7-bff611e85591', + // _ustatus: null, + // _created: '2019-07-31T15:09:57.405Z', + // _updated: '2019-10-04T15:46:16.797Z', + // _updatedBy: 'aylingw', + // _auditEvents: null, + // _name: 'WOZiTech Cares Sub 100', + // _address1: 'Number 1', + // _address2: 'My street', + // _address3: '', + // _town: 'My Town', + // _county: '', + // _locationId: '1-888777666', + // _provId: '1-999888777', + // _postcode: 'LN11 9JG', + // _isRegulated: true, + // _mainService: { id: 1, name: 'Carers support' }, + // _nmdsId: 'G1002110', + // _lastWdfEligibility: '2019-10-04T15:46:16.797Z', + // _overallWdfEligibility: null, + // _establishmentWdfEligibility: '2019-10-04T14:46:16.797Z', + // _staffWdfEligibility: null, + // _isParent: false, + // _parentUid: '98a83eef-e1e1-49f3-89c5-b1287a3cc8dd', + // _parentId: 479, + // _parentName: null, + // _dataOwner: 'Parent', + // _dataPermissions: 'None', + // _archived: false, + // _dataOwnershipRequested: null, + // _reasonsForLeaving: '', + // _properties: { + // _properties: [Object], + // _propertyTypes: [Array], + // _auditEvents: null, + // _modifiedProperties: [], + // _additionalModels: null + // }, + // _isNew: false, + // _workerEntities: {}, + // _readyForDeletionWorkers: null, + // _status: 'COMPLETE', + // _logLevel: 300 + // } + // ]); + + // expect(bulkUpload).to.have.property('crossValidate'); + + // const csvEstablishmentSchemaErrors = []; + + // const myWorkers = [{ + // establishmentKey: 'omar3', + // status: 'UPDATE', + // uniqueWorker: '3', + // contractTypeId: 2, + // mainJobRoleId: 10, + // otherJobIds: [] + // }]; + + // // the real version of this code is in the api Establishment business object and runs a sql query. + // // We just return a 'fake result set' + // const fetchMyEstablishmentsWorkers = sinon.spy(async (establishmentId, establishmentKey) => { + // return [{ + // establishmentKey: 'omar3', + // uniqueWorker: '3', + // contractTypeId: 'Permanent', + // mainJobRoleId: 10, + // otherJobIds: '' + // }, + // { + // establishmentKey: 'omar3', + // uniqueWorker: 'WA100', + // contractTypeId: 'Temporary', + // mainJobRoleId: 26, + // otherJobIds: '' + // }, + // { + // establishmentKey: 'omar3', + // uniqueWorker: '5', + // contractTypeId: 'Pool/Bank', + // mainJobRoleId: 7, + // otherJobIds: '' + // }, + // { + // establishmentKey: 'omar3', + // uniqueWorker: '6', + // contractTypeId: 'Temporary', + // mainJobRoleId: 17, + // otherJobIds: '' + // }, + // { + // establishmentKey: 'omar3', + // uniqueWorker: 'WA103', + // contractTypeId: 'Temporary', + // mainJobRoleId: 26, + // otherJobIds: '' + // }, + // { + // establishmentKey: 'omar3', + // uniqueWorker: '10', + // contractTypeId: 'Other', + // mainJobRoleId: 18, + // otherJobIds: '' + // }, + // { + // establishmentKey: 'omar3', + // uniqueWorker: '4', + // contractTypeId: 'Other', + // mainJobRoleId: 1, + // otherJobIds: '' + // }, + // { + // establishmentKey: 'omar3', + // uniqueWorker: 'SA 4', + // contractTypeId: 'Other', + // mainJobRoleId: 23, + // otherJobIds: '' + // }, + // { + // establishmentKey: 'omar3', + // uniqueWorker: 'FTSpecial', + // contractTypeId: 'Other', + // mainJobRoleId: 24, + // otherJobIds: '' + // }, + // { + // establishmentKey: 'omar3', + // uniqueWorker: '1', + // contractTypeId: 'Other', + // mainJobRoleId: 2, + // otherJobIds: '' + // }]; + // }); + + // // Regular validation has to run first for the establishment to populate the internal properties correctly + // await bulkUpload.validate(); + + // // call the method + // await bulkUpload.crossValidate({ + // csvEstablishmentSchemaErrors, + // myWorkers, + // fetchMyEstablishmentsWorkers + // }); + + // // assert the fetchMyEstalishmentsWorkers function was called + // expect(fetchMyEstablishmentsWorkers.callCount).to.equal(1); + + // // assert a warning was returned + // expect(csvEstablishmentSchemaErrors.length).to.equal(1); + + // expect(csvEstablishmentSchemaErrors[0]).to.deep.equal({ + // lineNumber: 2, + // name: 'omar3', + // origin: 'Establishments', + // source: '10', + // warnCode: 2200, + // warnType: 'TOTAL_PERM_TEMP_WARNING', + // warning: 'The number of employed staff is less than the number of non-employed staff please check your staff records' + // }); + // }); + // }); }); diff --git a/src/app/features/bulk-upload/files-upload/files-upload.component.ts b/src/app/features/bulk-upload/files-upload/files-upload.component.ts index e67cc2cfa3..f1e1b03cf4 100644 --- a/src/app/features/bulk-upload/files-upload/files-upload.component.ts +++ b/src/app/features/bulk-upload/files-upload/files-upload.component.ts @@ -19,7 +19,7 @@ import { tap } from 'rxjs/operators'; selector: 'app-files-upload', templateUrl: './files-upload.component.html', }) -export class FilesUploadComponent implements OnInit, OnDestroy, AfterViewInit { +export class FilesUploadComponent implements OnInit, AfterViewInit { @ViewChild('formEl', { static: false }) formEl: ElementRef; public form: FormGroup; public filesUploading = false; @@ -45,15 +45,6 @@ export class FilesUploadComponent implements OnInit, OnDestroy, AfterViewInit { ngOnInit() { this.setupForm(); this.checkForUploadedFiles(); - this.status = interval(5000).subscribe(() => { - if (!this.stopPolling) { - this.checkForUploadedFiles(); - } - }); - } - - ngOnDestroy() { - this.status.unsubscribe(); } ngAfterViewInit() { From f723c5ecae701beecc1b366ff24c974b5a6ef71f Mon Sep 17 00:00:00 2001 From: rchitranshi <53287302+rchitranshi@users.noreply.github.com> Date: Mon, 17 Feb 2020 13:03:38 +0530 Subject: [PATCH 064/305] Fixed :: Download WDF report not showing correct data (#1983) --- server/data/parentWDFReport.js | 35 ++++++++++++++++++++++++++++- server/routes/reports/wdf/parent.js | 2 +- 2 files changed, 35 insertions(+), 2 deletions(-) diff --git a/server/data/parentWDFReport.js b/server/data/parentWDFReport.js index 1ec4a18fc9..524c2d7d65 100644 --- a/server/data/parentWDFReport.js +++ b/server/data/parentWDFReport.js @@ -32,10 +32,37 @@ SELECT COUNT(:zero) FROM cqc."Worker" + LEFT JOIN + cqc."Job" + ON + "Worker"."MainJobFKValue" = "Job"."JobID" + LEFT JOIN + cqc."Nationality" + ON + cqc."Worker"."NationalityOtherFK" = "Nationality"."ID" + LEFT JOIN + cqc."Qualification" + ON + "Worker"."SocialCareQualificationFKValue" = "Qualification"."ID" WHERE "EstablishmentFK" = "Establishment"."EstablishmentID" AND - "LastWdfEligibility" IS NOT NULL AND + ("GenderValue" IS NOT NULL) AND + ("DateOfBirthValue" IS NOT NULL) AND + ("NationalityValue" IS NOT NULL OR ("NationalityValue" = :Other AND ("Nationality"."Nationality" IS NOT NULL OR "Nationality"."Nationality" != :emptyValue))) AND + ("Job"."JobName" IS NOT NULL OR "Job"."JobName" != :emptyValue) AND + ("MainJobStartDateValue" IS NOT NULL) AND + ("RecruitedFromValue" IS NOT NULL) AND + ("ContractValue" IS NOT NULL) AND + ("WeeklyHoursContractedValue" IS NOT NULL OR "WeeklyHoursAverageValue" IS NOT NULL) AND + ("ZeroHoursContractValue" IS NOT NULL) AND + ("DaysSickValue" IS NOT NULL) AND + ("AnnualHourlyPayValue" IS NOT NULL) AND + ("AnnualHourlyPayRate" IS NOT NULL) AND + ("CareCertificateValue" IS NOT NULL) AND + ("QualificationInSocialCareValue" IS NOT NULL OR ("QualificationInSocialCareValue" = :No OR "QualificationInSocialCareValue" = :Dont) OR ("Qualification"."Level" IS NOT NULL OR "Qualification"."Level" != :emptyValue)) AND + ("OtherQualificationsValue" IS NOT NULL) AND "LastWdfEligibility" > :effectiveDate AND + ("DataOwner" = :Parent OR "DataPermissions" = :WorkplaceStaff) AND "Archived" = :falseFlag ) AS "CompletedWorkerRecords", array_to_string(array( @@ -148,6 +175,12 @@ exports.getEstablishmentData = async establishmentId => Vacancies: 'Vacancies', Starters: 'Starters', Leavers: 'Leavers', + Dont: 'Don\'t know', + Other: 'Other', + No: 'No', + emptyValue: '', + WorkplaceStaff: 'Workplace and Staff', + Parent: 'Parent' }, type: db.QueryTypes.SELECT }); diff --git a/server/routes/reports/wdf/parent.js b/server/routes/reports/wdf/parent.js index c38beaae2c..25bceda0d4 100644 --- a/server/routes/reports/wdf/parent.js +++ b/server/routes/reports/wdf/parent.js @@ -168,7 +168,7 @@ const getEstablishmentReportData = async establishmentId => { value.EstablishmentDataFullyCompleted = 'Yes'; propsNeededToComplete.forEach(prop => { - if (value[prop] === null) { + if (value[prop] === null || value[prop] === '') { value.EstablishmentDataFullyCompleted = 'No'; } }); From 7afa27825a97c6e2c09db73a8c9643613c298f17 Mon Sep 17 00:00:00 2001 From: Anurag Negi <55235060+Negi-Anurag@users.noreply.github.com> Date: Mon, 17 Feb 2020 15:08:58 +0530 Subject: [PATCH 065/305] BE-FE-MOVED-TRAINING-LOGIC-BE (#1984) --- server/routes/establishments/worker.js | 23 ++++++++++++++-- src/app/core/model/worker.model.ts | 1 + .../features/dashboard/dashboard.component.ts | 26 +++---------------- 3 files changed, 25 insertions(+), 25 deletions(-) diff --git a/server/routes/establishments/worker.js b/server/routes/establishments/worker.js index 2fb1aa0528..404eeb40e8 100644 --- a/server/routes/establishments/worker.js +++ b/server/routes/establishments/worker.js @@ -98,6 +98,7 @@ router.route('/').get(async (req, res) => { const establishmentId = req.establishmentId; try { + let trainingAlert; let allTheseWorkers = await Workers.Worker.fetch(establishmentId); if(allTheseWorkers && allTheseWorkers.length){ const updateTrainingRecords = await Training.getAllRequiredCounts(establishmentId, allTheseWorkers); @@ -111,9 +112,27 @@ router.route('/').get(async (req, res) => { if(b.expiringTrainingCount > a.expiringTrainingCount){return 1;} if(b.expiringTrainingCount < a.expiringTrainingCount){return -1;} return 0; - }) + }); + + if(updateQualsRecords.length > 0 ) { + const expiriedTrainingCountFlag = updateQualsRecords.filter(worker => worker.expiredTrainingCount > 0).length || 0; + const expiringTrainingCountFlag = updateQualsRecords.filter(worker => worker.expiringTrainingCount > 0).length || 0; + const missingMandatoryTrainingCountFlag = updateQualsRecords.filter(worker => worker.missingMandatoryTrainingCount > 0).length || 0; + if (expiriedTrainingCountFlag > 0 || missingMandatoryTrainingCountFlag > 0) { + trainingAlert = 2; + } else if (expiringTrainingCountFlag > 0) { + trainingAlert = 1; + } else { + trainingAlert = 0; + } + } else { + trainingAlert = 0; + } + if(updateQualsRecords.length > 0 ) { + updateQualsRecords[0].trainingAlert = trainingAlert; + } return res.status(200).json({ - workers: updateQualsRecords + workers: updateQualsRecords, }); } } diff --git a/src/app/core/model/worker.model.ts b/src/app/core/model/worker.model.ts index 096f4981ac..7847fbfa33 100644 --- a/src/app/core/model/worker.model.ts +++ b/src/app/core/model/worker.model.ts @@ -3,6 +3,7 @@ import { JobRole } from './job.model'; import { WDFValue } from './wdf.model'; export interface Worker { + trainingAlert?: number; uid?: string; ustatus?: string; nameOrId: string; diff --git a/src/app/features/dashboard/dashboard.component.ts b/src/app/features/dashboard/dashboard.component.ts index 8e70fc1cc9..f331858ff2 100644 --- a/src/app/features/dashboard/dashboard.component.ts +++ b/src/app/features/dashboard/dashboard.component.ts @@ -52,7 +52,9 @@ export class DashboardComponent implements OnInit, OnDestroy { this.workerService.getAllWorkers(this.workplace.uid).subscribe( workers => { this.workerService.setWorkers(workers); - this.trainingAlert = this.getTrainingAlertFlag(workers); + if (workers.length > 0) { + this.trainingAlert = workers[0].trainingAlert; + } }, error => { console.error(error.error); @@ -70,28 +72,6 @@ export class DashboardComponent implements OnInit, OnDestroy { }); } - /** - * Function used to display training alert flag over the traing and qualifications tab - * @param {workers} list of workers - * @return {number} 0 for up-to-date, 1 for expiring soon and 2 for expired and missing mandatory training. - */ - public getTrainingAlertFlag(workers) { - if (workers.length > 0) { - const expariedTrainingCount = workers.filter(worker => worker.expiredTrainingCount > 0).length || 0; - const expiringTrainingCount = workers.filter(worker => worker.expiringTrainingCount > 0).length || 0; - const missingMandatoryTrainingCount = workers.filter(worker => worker.missingMandatoryTrainingCount > 0).length || 0; - if (expariedTrainingCount > 0 || missingMandatoryTrainingCount > 0) { - return 2; - } else if (expiringTrainingCount > 0) { - return 1; - } else { - return 0; - } - } else { - return 0; - } - } - ngOnDestroy(): void { this.subscriptions.unsubscribe(); } From 50d32d84b460dc9018081c6ef996dde928d2a46a Mon Sep 17 00:00:00 2001 From: Anurag Negi <55235060+Negi-Anurag@users.noreply.github.com> Date: Mon, 17 Feb 2020 16:48:48 +0530 Subject: [PATCH 066/305] Live issue rate limiting for username api (#1985) --- server/routes/registration.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/server/routes/registration.js b/server/routes/registration.js index 52f4ad4b48..14136d56b7 100644 --- a/server/routes/registration.js +++ b/server/routes/registration.js @@ -22,7 +22,7 @@ const generateJWT = require('../utils/security/generateJWT'); const passwordCheck = require('../utils/security/passwordValidation').isPasswordValid; const usernameCheck = require('../utils/security/usernameValidation').isUsernameValid; const sendMail = require('../utils/email/notify-email').sendPasswordReset; -const rateLimiting = require('../utils/middleware/rateLimiting').rateLimiting; +// const rateLimiting = require('../utils/middleware/rateLimiting').rateLimiting; // const pCodeCheck = require('../utils/postcodeSanitizer'); class RegistrationException { @@ -75,7 +75,7 @@ router.get('/username', (req, res) => { }); }); -router.use('/username/:username', rateLimiting); +//router.use('/username/:username', rateLimiting); router.get('/username/:username', async (req, res) => { const requestedUsername = req.params.username.toLowerCase(); try { From aa48a885c636c2ffe146d6df6e4bebc68e37bf7e Mon Sep 17 00:00:00 2001 From: Anurag Negi Date: Mon, 17 Feb 2020 17:07:26 +0530 Subject: [PATCH 067/305] RATELIMITIMG ISSUE LIVE --- server/routes/registration.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/server/routes/registration.js b/server/routes/registration.js index 52f4ad4b48..b34f710728 100644 --- a/server/routes/registration.js +++ b/server/routes/registration.js @@ -22,7 +22,7 @@ const generateJWT = require('../utils/security/generateJWT'); const passwordCheck = require('../utils/security/passwordValidation').isPasswordValid; const usernameCheck = require('../utils/security/usernameValidation').isUsernameValid; const sendMail = require('../utils/email/notify-email').sendPasswordReset; -const rateLimiting = require('../utils/middleware/rateLimiting').rateLimiting; +//const rateLimiting = require('../utils/middleware/rateLimiting').rateLimiting; // const pCodeCheck = require('../utils/postcodeSanitizer'); class RegistrationException { @@ -75,7 +75,7 @@ router.get('/username', (req, res) => { }); }); -router.use('/username/:username', rateLimiting); +//router.use('/username/:username', rateLimiting); router.get('/username/:username', async (req, res) => { const requestedUsername = req.params.username.toLowerCase(); try { From ced19c89662a3fcac08039fdb2d4e5544070e036 Mon Sep 17 00:00:00 2001 From: Anurag Negi <55235060+Negi-Anurag@users.noreply.github.com> Date: Tue, 18 Feb 2020 11:29:19 +0530 Subject: [PATCH 068/305] Be live issue fix username ratelimitting (#1987) * Live issue rate limiting for username api * Added new secure key --- .travis.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 808792bbc2..1374a0c2e4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -54,7 +54,7 @@ deploy: edge: false username: nmdsdevopsserviceadm@hotmail.com password: - secure: CBpAGvgpe+AoJlNvuGKh9U9WpkU+toSoSRxtpmVoDhB9ayv6+pGsl+7X/eOfvZbHV1gYVw2HdDmeK1+Fkwd58FOKCTRpQDvuVC4+cZ/Eb8vWsnX3vw0DXZX22zhzUOIyT2fbOjygJx9g2xeuMWza6yMBY5rbPkdJKPU6rYCfxSGl5qFY/hnV6B9qzbQo2ekv0XVfwqAQ1fBQlRkEDUJYLGsXyARPrEasvN9XCF1NaUeVP1Inz14MIdefisJMUyEn2zGUAXqogDKfYfqfSf/TD2e7iiK/j3wpXh1x48vqfw/DqDix3Yvo811bvb6SPeM+srIOfIkVcTDRQOniLM0lZUcNoXKXqYQeELRFdh6t6WezHB4iZ60+K6/ijT1D1KIoCo7CXAyCivfG+5omB7sAwW6GZwHsbdO8scSAxwTlwTyhzmO8L5/xjA/H3o2oq3Zjn1Ga6qDpfBeDDOgV+G6uoehZCtnNvDGRHsHwwOVlKg1dk5gtVrdnrWSKwvwwvXYajIxoqz8QyaEaYrsBXHtBNAa39pxNAit9TjAuxb/CR1LCjggxZwjwY+lREYf1J4xQs/keDp/sIqRuxqf2evMiZjqSMdGgE7e6XRtztgQiOn2JZcnEdveaT4IA7HcOLkvksy3zLjBAMGiG44jPnzV135Xtxl6FpNkCuRPqXVUgg3M= + secure: euupelcc1CzVzI0EvM0UqrkuJhZW9hIt3hPq9+5/zb2RcI5LifklivcWlQLcoGyf3TNbxgJaW3CjfObzHXHFkDxhKHLSig82jbBaZ06qaCAbvtlXjUhd5ETu8+J1Bk0AqmyhyHJcJPk4JFyxGktcyFdhr/T+uM6AI3ggPyh4AkXQVQysUJx7oAJ8xiqupF7zOaiQ779rfriJMZh+72soTb59skoOgWqjTIpFtA9WuVKVgzPuFY4jL7qfws8OTsFYsrae8Ucp0e4flX2r8JW757zUgORtYj4A8QxuGGWiC0bhV5d6KNmuxeVYSvaodvl5SM+wxPMxFS6uCldp+5p7SW+3ZXsqxmb9JDEkv7kr5aW6bc5N0W8niyvuZM7cH/zPCClTOCi1xXPFhMh379XdT8zTYpWK5YBz/IwksjdU/7K65KRKvPl2CFksAL/2xcGLnW5TkiBNfFsJAU/W2zWyjKDQGPtUngZA0I3X3M4zaXaECRxPqqisSSJtuNQnxypmid+tucJ30vS/V2VHi97I3CWTZ/qt7D9s3Ee+mZTxxSzMScU0BXn/qyGE9vZzo7OCKlvKho5+AMH15Yq/shdTJJ71sSmwc4+HtXMYsfbUU//+afjggH5cTq3P7Hi+YrYUpIz4infhVmtjLMV4a/BG8l0t8Ed9SZj/2FVdIAmJr5E= api: https://api.cloud.service.gov.uk organization: dhsc-skills-for-care-nmds-sc-2 space: sandbox @@ -65,7 +65,7 @@ deploy: edge: false username: nmdsdevopsserviceadm@hotmail.com password: - secure: CBpAGvgpe+AoJlNvuGKh9U9WpkU+toSoSRxtpmVoDhB9ayv6+pGsl+7X/eOfvZbHV1gYVw2HdDmeK1+Fkwd58FOKCTRpQDvuVC4+cZ/Eb8vWsnX3vw0DXZX22zhzUOIyT2fbOjygJx9g2xeuMWza6yMBY5rbPkdJKPU6rYCfxSGl5qFY/hnV6B9qzbQo2ekv0XVfwqAQ1fBQlRkEDUJYLGsXyARPrEasvN9XCF1NaUeVP1Inz14MIdefisJMUyEn2zGUAXqogDKfYfqfSf/TD2e7iiK/j3wpXh1x48vqfw/DqDix3Yvo811bvb6SPeM+srIOfIkVcTDRQOniLM0lZUcNoXKXqYQeELRFdh6t6WezHB4iZ60+K6/ijT1D1KIoCo7CXAyCivfG+5omB7sAwW6GZwHsbdO8scSAxwTlwTyhzmO8L5/xjA/H3o2oq3Zjn1Ga6qDpfBeDDOgV+G6uoehZCtnNvDGRHsHwwOVlKg1dk5gtVrdnrWSKwvwwvXYajIxoqz8QyaEaYrsBXHtBNAa39pxNAit9TjAuxb/CR1LCjggxZwjwY+lREYf1J4xQs/keDp/sIqRuxqf2evMiZjqSMdGgE7e6XRtztgQiOn2JZcnEdveaT4IA7HcOLkvksy3zLjBAMGiG44jPnzV135Xtxl6FpNkCuRPqXVUgg3M= + secure: euupelcc1CzVzI0EvM0UqrkuJhZW9hIt3hPq9+5/zb2RcI5LifklivcWlQLcoGyf3TNbxgJaW3CjfObzHXHFkDxhKHLSig82jbBaZ06qaCAbvtlXjUhd5ETu8+J1Bk0AqmyhyHJcJPk4JFyxGktcyFdhr/T+uM6AI3ggPyh4AkXQVQysUJx7oAJ8xiqupF7zOaiQ779rfriJMZh+72soTb59skoOgWqjTIpFtA9WuVKVgzPuFY4jL7qfws8OTsFYsrae8Ucp0e4flX2r8JW757zUgORtYj4A8QxuGGWiC0bhV5d6KNmuxeVYSvaodvl5SM+wxPMxFS6uCldp+5p7SW+3ZXsqxmb9JDEkv7kr5aW6bc5N0W8niyvuZM7cH/zPCClTOCi1xXPFhMh379XdT8zTYpWK5YBz/IwksjdU/7K65KRKvPl2CFksAL/2xcGLnW5TkiBNfFsJAU/W2zWyjKDQGPtUngZA0I3X3M4zaXaECRxPqqisSSJtuNQnxypmid+tucJ30vS/V2VHi97I3CWTZ/qt7D9s3Ee+mZTxxSzMScU0BXn/qyGE9vZzo7OCKlvKho5+AMH15Yq/shdTJJ71sSmwc4+HtXMYsfbUU//+afjggH5cTq3P7Hi+YrYUpIz4infhVmtjLMV4a/BG8l0t8Ed9SZj/2FVdIAmJr5E= api: https://api.cloud.service.gov.uk organization: dhsc-skills-for-care-nmds-sc-2 space: sandbox @@ -76,7 +76,7 @@ deploy: edge: false username: nmdsdevopsserviceadm@hotmail.com password: - secure: CBpAGvgpe+AoJlNvuGKh9U9WpkU+toSoSRxtpmVoDhB9ayv6+pGsl+7X/eOfvZbHV1gYVw2HdDmeK1+Fkwd58FOKCTRpQDvuVC4+cZ/Eb8vWsnX3vw0DXZX22zhzUOIyT2fbOjygJx9g2xeuMWza6yMBY5rbPkdJKPU6rYCfxSGl5qFY/hnV6B9qzbQo2ekv0XVfwqAQ1fBQlRkEDUJYLGsXyARPrEasvN9XCF1NaUeVP1Inz14MIdefisJMUyEn2zGUAXqogDKfYfqfSf/TD2e7iiK/j3wpXh1x48vqfw/DqDix3Yvo811bvb6SPeM+srIOfIkVcTDRQOniLM0lZUcNoXKXqYQeELRFdh6t6WezHB4iZ60+K6/ijT1D1KIoCo7CXAyCivfG+5omB7sAwW6GZwHsbdO8scSAxwTlwTyhzmO8L5/xjA/H3o2oq3Zjn1Ga6qDpfBeDDOgV+G6uoehZCtnNvDGRHsHwwOVlKg1dk5gtVrdnrWSKwvwwvXYajIxoqz8QyaEaYrsBXHtBNAa39pxNAit9TjAuxb/CR1LCjggxZwjwY+lREYf1J4xQs/keDp/sIqRuxqf2evMiZjqSMdGgE7e6XRtztgQiOn2JZcnEdveaT4IA7HcOLkvksy3zLjBAMGiG44jPnzV135Xtxl6FpNkCuRPqXVUgg3M= + secure: euupelcc1CzVzI0EvM0UqrkuJhZW9hIt3hPq9+5/zb2RcI5LifklivcWlQLcoGyf3TNbxgJaW3CjfObzHXHFkDxhKHLSig82jbBaZ06qaCAbvtlXjUhd5ETu8+J1Bk0AqmyhyHJcJPk4JFyxGktcyFdhr/T+uM6AI3ggPyh4AkXQVQysUJx7oAJ8xiqupF7zOaiQ779rfriJMZh+72soTb59skoOgWqjTIpFtA9WuVKVgzPuFY4jL7qfws8OTsFYsrae8Ucp0e4flX2r8JW757zUgORtYj4A8QxuGGWiC0bhV5d6KNmuxeVYSvaodvl5SM+wxPMxFS6uCldp+5p7SW+3ZXsqxmb9JDEkv7kr5aW6bc5N0W8niyvuZM7cH/zPCClTOCi1xXPFhMh379XdT8zTYpWK5YBz/IwksjdU/7K65KRKvPl2CFksAL/2xcGLnW5TkiBNfFsJAU/W2zWyjKDQGPtUngZA0I3X3M4zaXaECRxPqqisSSJtuNQnxypmid+tucJ30vS/V2VHi97I3CWTZ/qt7D9s3Ee+mZTxxSzMScU0BXn/qyGE9vZzo7OCKlvKho5+AMH15Yq/shdTJJ71sSmwc4+HtXMYsfbUU//+afjggH5cTq3P7Hi+YrYUpIz4infhVmtjLMV4a/BG8l0t8Ed9SZj/2FVdIAmJr5E= api: https://api.cloud.service.gov.uk organization: dhsc-skills-for-care-nmds-sc-2 space: sandbox From 16c286d9ced2fac2a45df83372310f5b05fdf560 Mon Sep 17 00:00:00 2001 From: Anurag Negi <55235060+Negi-Anurag@users.noreply.github.com> Date: Tue, 18 Feb 2020 11:49:09 +0530 Subject: [PATCH 069/305] Added secure key (#1988) --- .travis.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 808792bbc2..1374a0c2e4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -54,7 +54,7 @@ deploy: edge: false username: nmdsdevopsserviceadm@hotmail.com password: - secure: CBpAGvgpe+AoJlNvuGKh9U9WpkU+toSoSRxtpmVoDhB9ayv6+pGsl+7X/eOfvZbHV1gYVw2HdDmeK1+Fkwd58FOKCTRpQDvuVC4+cZ/Eb8vWsnX3vw0DXZX22zhzUOIyT2fbOjygJx9g2xeuMWza6yMBY5rbPkdJKPU6rYCfxSGl5qFY/hnV6B9qzbQo2ekv0XVfwqAQ1fBQlRkEDUJYLGsXyARPrEasvN9XCF1NaUeVP1Inz14MIdefisJMUyEn2zGUAXqogDKfYfqfSf/TD2e7iiK/j3wpXh1x48vqfw/DqDix3Yvo811bvb6SPeM+srIOfIkVcTDRQOniLM0lZUcNoXKXqYQeELRFdh6t6WezHB4iZ60+K6/ijT1D1KIoCo7CXAyCivfG+5omB7sAwW6GZwHsbdO8scSAxwTlwTyhzmO8L5/xjA/H3o2oq3Zjn1Ga6qDpfBeDDOgV+G6uoehZCtnNvDGRHsHwwOVlKg1dk5gtVrdnrWSKwvwwvXYajIxoqz8QyaEaYrsBXHtBNAa39pxNAit9TjAuxb/CR1LCjggxZwjwY+lREYf1J4xQs/keDp/sIqRuxqf2evMiZjqSMdGgE7e6XRtztgQiOn2JZcnEdveaT4IA7HcOLkvksy3zLjBAMGiG44jPnzV135Xtxl6FpNkCuRPqXVUgg3M= + secure: euupelcc1CzVzI0EvM0UqrkuJhZW9hIt3hPq9+5/zb2RcI5LifklivcWlQLcoGyf3TNbxgJaW3CjfObzHXHFkDxhKHLSig82jbBaZ06qaCAbvtlXjUhd5ETu8+J1Bk0AqmyhyHJcJPk4JFyxGktcyFdhr/T+uM6AI3ggPyh4AkXQVQysUJx7oAJ8xiqupF7zOaiQ779rfriJMZh+72soTb59skoOgWqjTIpFtA9WuVKVgzPuFY4jL7qfws8OTsFYsrae8Ucp0e4flX2r8JW757zUgORtYj4A8QxuGGWiC0bhV5d6KNmuxeVYSvaodvl5SM+wxPMxFS6uCldp+5p7SW+3ZXsqxmb9JDEkv7kr5aW6bc5N0W8niyvuZM7cH/zPCClTOCi1xXPFhMh379XdT8zTYpWK5YBz/IwksjdU/7K65KRKvPl2CFksAL/2xcGLnW5TkiBNfFsJAU/W2zWyjKDQGPtUngZA0I3X3M4zaXaECRxPqqisSSJtuNQnxypmid+tucJ30vS/V2VHi97I3CWTZ/qt7D9s3Ee+mZTxxSzMScU0BXn/qyGE9vZzo7OCKlvKho5+AMH15Yq/shdTJJ71sSmwc4+HtXMYsfbUU//+afjggH5cTq3P7Hi+YrYUpIz4infhVmtjLMV4a/BG8l0t8Ed9SZj/2FVdIAmJr5E= api: https://api.cloud.service.gov.uk organization: dhsc-skills-for-care-nmds-sc-2 space: sandbox @@ -65,7 +65,7 @@ deploy: edge: false username: nmdsdevopsserviceadm@hotmail.com password: - secure: CBpAGvgpe+AoJlNvuGKh9U9WpkU+toSoSRxtpmVoDhB9ayv6+pGsl+7X/eOfvZbHV1gYVw2HdDmeK1+Fkwd58FOKCTRpQDvuVC4+cZ/Eb8vWsnX3vw0DXZX22zhzUOIyT2fbOjygJx9g2xeuMWza6yMBY5rbPkdJKPU6rYCfxSGl5qFY/hnV6B9qzbQo2ekv0XVfwqAQ1fBQlRkEDUJYLGsXyARPrEasvN9XCF1NaUeVP1Inz14MIdefisJMUyEn2zGUAXqogDKfYfqfSf/TD2e7iiK/j3wpXh1x48vqfw/DqDix3Yvo811bvb6SPeM+srIOfIkVcTDRQOniLM0lZUcNoXKXqYQeELRFdh6t6WezHB4iZ60+K6/ijT1D1KIoCo7CXAyCivfG+5omB7sAwW6GZwHsbdO8scSAxwTlwTyhzmO8L5/xjA/H3o2oq3Zjn1Ga6qDpfBeDDOgV+G6uoehZCtnNvDGRHsHwwOVlKg1dk5gtVrdnrWSKwvwwvXYajIxoqz8QyaEaYrsBXHtBNAa39pxNAit9TjAuxb/CR1LCjggxZwjwY+lREYf1J4xQs/keDp/sIqRuxqf2evMiZjqSMdGgE7e6XRtztgQiOn2JZcnEdveaT4IA7HcOLkvksy3zLjBAMGiG44jPnzV135Xtxl6FpNkCuRPqXVUgg3M= + secure: euupelcc1CzVzI0EvM0UqrkuJhZW9hIt3hPq9+5/zb2RcI5LifklivcWlQLcoGyf3TNbxgJaW3CjfObzHXHFkDxhKHLSig82jbBaZ06qaCAbvtlXjUhd5ETu8+J1Bk0AqmyhyHJcJPk4JFyxGktcyFdhr/T+uM6AI3ggPyh4AkXQVQysUJx7oAJ8xiqupF7zOaiQ779rfriJMZh+72soTb59skoOgWqjTIpFtA9WuVKVgzPuFY4jL7qfws8OTsFYsrae8Ucp0e4flX2r8JW757zUgORtYj4A8QxuGGWiC0bhV5d6KNmuxeVYSvaodvl5SM+wxPMxFS6uCldp+5p7SW+3ZXsqxmb9JDEkv7kr5aW6bc5N0W8niyvuZM7cH/zPCClTOCi1xXPFhMh379XdT8zTYpWK5YBz/IwksjdU/7K65KRKvPl2CFksAL/2xcGLnW5TkiBNfFsJAU/W2zWyjKDQGPtUngZA0I3X3M4zaXaECRxPqqisSSJtuNQnxypmid+tucJ30vS/V2VHi97I3CWTZ/qt7D9s3Ee+mZTxxSzMScU0BXn/qyGE9vZzo7OCKlvKho5+AMH15Yq/shdTJJ71sSmwc4+HtXMYsfbUU//+afjggH5cTq3P7Hi+YrYUpIz4infhVmtjLMV4a/BG8l0t8Ed9SZj/2FVdIAmJr5E= api: https://api.cloud.service.gov.uk organization: dhsc-skills-for-care-nmds-sc-2 space: sandbox @@ -76,7 +76,7 @@ deploy: edge: false username: nmdsdevopsserviceadm@hotmail.com password: - secure: CBpAGvgpe+AoJlNvuGKh9U9WpkU+toSoSRxtpmVoDhB9ayv6+pGsl+7X/eOfvZbHV1gYVw2HdDmeK1+Fkwd58FOKCTRpQDvuVC4+cZ/Eb8vWsnX3vw0DXZX22zhzUOIyT2fbOjygJx9g2xeuMWza6yMBY5rbPkdJKPU6rYCfxSGl5qFY/hnV6B9qzbQo2ekv0XVfwqAQ1fBQlRkEDUJYLGsXyARPrEasvN9XCF1NaUeVP1Inz14MIdefisJMUyEn2zGUAXqogDKfYfqfSf/TD2e7iiK/j3wpXh1x48vqfw/DqDix3Yvo811bvb6SPeM+srIOfIkVcTDRQOniLM0lZUcNoXKXqYQeELRFdh6t6WezHB4iZ60+K6/ijT1D1KIoCo7CXAyCivfG+5omB7sAwW6GZwHsbdO8scSAxwTlwTyhzmO8L5/xjA/H3o2oq3Zjn1Ga6qDpfBeDDOgV+G6uoehZCtnNvDGRHsHwwOVlKg1dk5gtVrdnrWSKwvwwvXYajIxoqz8QyaEaYrsBXHtBNAa39pxNAit9TjAuxb/CR1LCjggxZwjwY+lREYf1J4xQs/keDp/sIqRuxqf2evMiZjqSMdGgE7e6XRtztgQiOn2JZcnEdveaT4IA7HcOLkvksy3zLjBAMGiG44jPnzV135Xtxl6FpNkCuRPqXVUgg3M= + secure: euupelcc1CzVzI0EvM0UqrkuJhZW9hIt3hPq9+5/zb2RcI5LifklivcWlQLcoGyf3TNbxgJaW3CjfObzHXHFkDxhKHLSig82jbBaZ06qaCAbvtlXjUhd5ETu8+J1Bk0AqmyhyHJcJPk4JFyxGktcyFdhr/T+uM6AI3ggPyh4AkXQVQysUJx7oAJ8xiqupF7zOaiQ779rfriJMZh+72soTb59skoOgWqjTIpFtA9WuVKVgzPuFY4jL7qfws8OTsFYsrae8Ucp0e4flX2r8JW757zUgORtYj4A8QxuGGWiC0bhV5d6KNmuxeVYSvaodvl5SM+wxPMxFS6uCldp+5p7SW+3ZXsqxmb9JDEkv7kr5aW6bc5N0W8niyvuZM7cH/zPCClTOCi1xXPFhMh379XdT8zTYpWK5YBz/IwksjdU/7K65KRKvPl2CFksAL/2xcGLnW5TkiBNfFsJAU/W2zWyjKDQGPtUngZA0I3X3M4zaXaECRxPqqisSSJtuNQnxypmid+tucJ30vS/V2VHi97I3CWTZ/qt7D9s3Ee+mZTxxSzMScU0BXn/qyGE9vZzo7OCKlvKho5+AMH15Yq/shdTJJ71sSmwc4+HtXMYsfbUU//+afjggH5cTq3P7Hi+YrYUpIz4infhVmtjLMV4a/BG8l0t8Ed9SZj/2FVdIAmJr5E= api: https://api.cloud.service.gov.uk organization: dhsc-skills-for-care-nmds-sc-2 space: sandbox From f3abaa24609938ce8fd27010daf4897485ec4712 Mon Sep 17 00:00:00 2001 From: Manish Kumar Srivastava Date: Tue, 18 Feb 2020 15:43:26 +0530 Subject: [PATCH 070/305] Fixed :: Duplicate Local Identifiers are not downloading in BU (#1966) (#1989) (cherry picked from commit 5ef946f445c71656efbdda4ab58e69f33516951c) Co-authored-by: rchitranshi <53287302+rchitranshi@users.noreply.github.com> --- server/models/classes/establishment.js | 12 ++++-------- server/models/worker.js | 1 - 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/server/models/classes/establishment.js b/server/models/classes/establishment.js index f292eed199..aa20ff0a29 100644 --- a/server/models/classes/establishment.js +++ b/server/models/classes/establishment.js @@ -100,7 +100,7 @@ class Establishment extends EntityValidator { this._isNew = false; // all known workers for this establishment - an associative object (property key is the worker's key) - this._workerEntities = {}; + this._workerEntities = []; this._readyForDeletionWorkers = null; // bulk upload status - this is never stored in database @@ -362,11 +362,8 @@ class Establishment extends EntityValidator { } // this method add this given worker (entity) as an association to this establishment entity - (bulk import) - associateWorker(key, worker) { - if (key && worker) { - // worker not yet associated; take as is - this._workerEntities[key] = worker; - } + associateWorker(worker) { + this._workerEntities.push(worker); } // returns just the set of keys of the associated workers @@ -524,7 +521,7 @@ class Establishment extends EntityValidator { const newWorker = new Worker(null); // TODO - until we have Worker.localIdentifier we only have Worker.nameOrId to use as key - this.associateWorker(thisWorker.key, newWorker); + this.associateWorker(newWorker); promises.push(newWorker.load(thisWorker, true)); } }); @@ -1199,7 +1196,6 @@ class Establishment extends EntityValidator { }, }; } - const fetchResults = await models.establishment.findOne(fetchQuery); if (fetchResults && fetchResults.id && Number.isInteger(fetchResults.id)) { // update self - don't use setters because they modify the change state diff --git a/server/models/worker.js b/server/models/worker.js index 17a28205a4..9fb252522f 100644 --- a/server/models/worker.js +++ b/server/models/worker.js @@ -16,7 +16,6 @@ module.exports = function(sequelize, DataTypes) { LocalIdentifierValue: { type: DataTypes.TEXT, allowNull: true, - unique: true, field: '"LocalIdentifierValue"' }, LocalIdentifierSavedAt : { From 478fd95c8de7425ffd3cdaa79147f541a378f15c Mon Sep 17 00:00:00 2001 From: Manish Kumar Srivastava Date: Tue, 18 Feb 2020 15:48:32 +0530 Subject: [PATCH 071/305] Feature/new home page (#1990) * Home Page & Notification Shift (#1952) * BE added canDownloadWdfReport flag in permission (#1955) * Permission matrix (#1957) * canDownloadWdf permission * Added Permission Co-authored-by: Anurag Negi <55235060+Negi-Anurag@users.noreply.github.com> --- server/models/cache/singletons/permissions.js | 8 ++ server/routes/establishments/permissions.js | 13 ++- src/app/core/model/permissions.model.ts | 3 +- .../dashboard/dashboard.component.html | 34 +++++-- .../features/dashboard/dashboard.component.ts | 30 ++++++- .../home-tab/home-tab.component.html | 88 +++++++++---------- .../dashboard/home-tab/home-tab.component.ts | 8 +- .../workplaces/workplaces.component.html | 2 +- .../pages/workplaces/workplaces.component.ts | 6 +- .../workplace-info-panel.component.html | 2 +- src/assets/images/envelope.svg | 18 ++++ .../scss/components/_notifications.scss | 2 + src/assets/scss/modules/_utils.scss | 4 + 13 files changed, 152 insertions(+), 66 deletions(-) create mode 100644 src/assets/images/envelope.svg diff --git a/server/models/cache/singletons/permissions.js b/server/models/cache/singletons/permissions.js index 563fef3e41..5cddc7a5c5 100644 --- a/server/models/cache/singletons/permissions.js +++ b/server/models/cache/singletons/permissions.js @@ -256,6 +256,14 @@ let ALL_PERMISSIONS = [ subOwnedByWorkplaceAccessByParent: [], subOwnedByParentAccessBySub: ['Workplace and Staff', 'Workplace', 'None'], isAdmin: false, + }, + { + code: 'canDownloadWdfReport', + description: 'download wdf report', + role: ['Edit','Read'], + subOwnedByWorkplaceAccessByParent: [], + subOwnedByParentAccessBySub: [], + isAdmin: false, } ]; diff --git a/server/routes/establishments/permissions.js b/server/routes/establishments/permissions.js index 90422f49d1..60d1e35ae1 100644 --- a/server/routes/establishments/permissions.js +++ b/server/routes/establishments/permissions.js @@ -1,15 +1,17 @@ const express = require('express'); const router = express.Router({mergeParams: true}); const Establishment = require('../../models/classes/establishment'); - +const User = require('../../models/classes/user'); const PermissionCache = require('../../models/cache/singletons/permissions').PermissionCache; router.route('/').get(async (req, res) => { const establishmentId = req.establishmentId; const thisEstablishment = new Establishment.Establishment(req.username); - + const thisUser = new User.User(establishmentId); try { if (await thisEstablishment.restore(establishmentId)) { + if(await thisUser.restore(null,thisEstablishment.username, null)) { + let userData = thisUser.toJSON(); const permissions = await PermissionCache.myPermissions(req).map(item => { if (item.code === 'canChangeDataOwner' && thisEstablishment.dataOwnershipRequested !== null) { return { [item.code]: false }; @@ -28,12 +30,19 @@ router.route('/').get(async (req, res) => { ? true : false; } + if (permission.canDownloadWdfReport) { + permission.canDownloadWdfReport = + (permission.canDownloadWdfReport && thisEstablishment.isParent && userData.role === 'Edit') + ? true + : false; + } }); return res.status(200).json({ uid: thisEstablishment.uid, permissions: Object.assign({}, ...permissions), }); + } } else { return res.status(404).send('Not Found'); } diff --git a/src/app/core/model/permissions.model.ts b/src/app/core/model/permissions.model.ts index 478e5513e2..aed585c31e 100644 --- a/src/app/core/model/permissions.model.ts +++ b/src/app/core/model/permissions.model.ts @@ -37,4 +37,5 @@ export type PermissionType = | 'canViewWdfReport' | 'canViewWorker' | 'canLinkToParent' - | 'canRemoveParentAssociation'; + | 'canRemoveParentAssociation' + | 'canDownloadWdfReport'; diff --git a/src/app/features/dashboard/dashboard.component.html b/src/app/features/dashboard/dashboard.component.html index 7e4f9219e4..7a7ab22477 100644 --- a/src/app/features/dashboard/dashboard.component.html +++ b/src/app/features/dashboard/dashboard.component.html @@ -25,7 +25,31 @@

ascwds-support@skillsforcare.org.uk

+

+ + + You have + + {{ numberOfNewNotifications }}new + {{ + numberOfNewNotifications + | i18nPlural + : { + '=1': 'notification', + other: 'notifications' + } + }} + + + + Notifications + +

+ +
+ +
@@ -42,12 +66,8 @@

- + @@ -56,4 +76,4 @@

- + \ No newline at end of file diff --git a/src/app/features/dashboard/dashboard.component.ts b/src/app/features/dashboard/dashboard.component.ts index 9fb66a7504..cadd7f869d 100644 --- a/src/app/features/dashboard/dashboard.component.ts +++ b/src/app/features/dashboard/dashboard.component.ts @@ -1,10 +1,11 @@ import { Component, OnDestroy, OnInit } from '@angular/core'; import { Establishment } from '@core/model/establishment.model'; import { EstablishmentService } from '@core/services/establishment.service'; +import { NotificationsService } from '@core/services/notifications/notifications.service'; import { PermissionsService } from '@core/services/permissions/permissions.service'; import { UserService } from '@core/services/user.service'; import { WorkerService } from '@core/services/worker.service'; -import { Subscription } from 'rxjs'; +import { interval, Subscription } from 'rxjs'; @Component({ selector: 'app-dashboard', @@ -21,12 +22,14 @@ export class DashboardComponent implements OnInit, OnDestroy { public workplace: Establishment; public trainingAlert: number; + constructor( private establishmentService: EstablishmentService, private permissionsService: PermissionsService, private userService: UserService, - private workerService: WorkerService - ) {} + private workerService: WorkerService, + private notificationsService: NotificationsService, + ) { } ngOnInit() { this.workplace = this.establishmentService.primaryWorkplace; @@ -68,6 +71,22 @@ export class DashboardComponent implements OnInit, OnDestroy { url: ['/dashboard'], fragment: 'user-accounts', }); + + //get latest notification after every 30 seconds + this.subscriptions.add( + interval(30000).subscribe( + () => { + this.notificationsService.getAllNotifications().subscribe( + notifications => { + this.notificationsService.notifications$.next(notifications); + }, + error => { + console.error(error.error); + } + ); + } + ) + ); } /** @@ -91,6 +110,11 @@ export class DashboardComponent implements OnInit, OnDestroy { } } + get numberOfNewNotifications() { + const newNotifications = this.notificationsService.notifications.filter(notification => !notification.isViewed); + return newNotifications.length; + } + ngOnDestroy(): void { this.subscriptions.unsubscribe(); } diff --git a/src/app/features/dashboard/home-tab/home-tab.component.html b/src/app/features/dashboard/home-tab/home-tab.component.html index 2909bb3f06..6a9d10a292 100644 --- a/src/app/features/dashboard/home-tab/home-tab.component.html +++ b/src/app/features/dashboard/home-tab/home-tab.component.html @@ -3,61 +3,61 @@

Home

What you need to do first.

- - You need to provide information on your workplace.
- Add workplace information - - - - You need to provide information on all your staff.
- + + Add workplace + information +
Add staff records + + +
+
+

+ Add a staff records +

+

+ Create staff records for your workplace by providing current work + information, personal details, employment and qualifications and + training information. +

+
+
+

+ View reports +

+

+ Access the Workplace Development Fund report, the CQC Provider + Information Return report and the Local Authority Progress Report. +

+
+
+

+ Bulk upload +

+

+ Bulk upload is used to edit large quantities of staff, workplace and + training information. +

+
+
-

Notifications

- -

- - You have {{ numberOfNewNotifications }} new - {{ - numberOfNewNotifications - | i18nPlural - : { - '=1': 'notification', - other: 'notifications' - } - }} - -

- - -

- You have no new notifications -

- - -

Other things you can do

+ "> +

Related content

 @@ -88,4 +88,4 @@

Other things you can do

  • Registrations
    • - + \ No newline at end of file diff --git a/src/app/features/dashboard/home-tab/home-tab.component.ts b/src/app/features/dashboard/home-tab/home-tab.component.ts index 652a94d904..10cdd3b4d6 100644 --- a/src/app/features/dashboard/home-tab/home-tab.component.ts +++ b/src/app/features/dashboard/home-tab/home-tab.component.ts @@ -8,7 +8,6 @@ import { AlertService } from '@core/services/alert.service'; import { BulkUploadService } from '@core/services/bulk-upload.service'; import { DialogService } from '@core/services/dialog.service'; import { EstablishmentService } from '@core/services/establishment.service'; -import { NotificationsService } from '@core/services/notifications/notifications.service'; import { PermissionsService } from '@core/services/permissions/permissions.service'; import { UserService } from '@core/services/user.service'; import { WorkerService } from '@core/services/worker.service'; @@ -60,13 +59,13 @@ export class HomeTabComponent implements OnInit, OnDestroy { public canLinkToParent: boolean; public linkToParentRequestedStatus: boolean; public canRemoveParentAssociation: boolean; + public canAddWorker: boolean; constructor( private bulkUploadService: BulkUploadService, private permissionsService: PermissionsService, private userService: UserService, private workerService: WorkerService, - private notificationsService: NotificationsService, private dialogService: DialogService, private alertService: AlertService, private router: Router, @@ -155,10 +154,6 @@ export class HomeTabComponent implements OnInit, OnDestroy { this.bulkUploadService.setReturnTo({ url: ['/dashboard'] }); } - get numberOfNewNotifications() { - const newNotifications = this.notificationsService.notifications.filter(notification => !notification.isViewed); - return newNotifications.length; - } /** * Function used to open modal box for link a workplace to parent organisation * @param {event} triggred event @@ -250,6 +245,7 @@ export class HomeTabComponent implements OnInit, OnDestroy { public setPermissionLinks() { const workplaceUid: string = this.workplace ? this.workplace.uid : null; this.canEditEstablishment = this.permissionsService.can(workplaceUid, 'canEditEstablishment'); + this.canAddWorker = this.permissionsService.can(this.workplace.uid, 'canAddWorker'); this.canBulkUpload = this.permissionsService.can(workplaceUid, 'canBulkUpload'); this.canViewWorkplaces = this.workplace && this.workplace.isParent; this.canViewChangeDataOwner = diff --git a/src/app/features/reports/pages/workplaces/workplaces.component.html b/src/app/features/reports/pages/workplaces/workplaces.component.html index 282d5f64ba..fcf056db82 100644 --- a/src/app/features/reports/pages/workplaces/workplaces.component.html +++ b/src/app/features/reports/pages/workplaces/workplaces.component.html @@ -5,7 +5,7 @@

    Workplaces

    -
    +
    - View all workplace training + View all workplace training
    Click on a staff name to add a record.

    [totalExpiringTraining]="totalExpiringTraining" > - - + + + + + + + + + + + + + You need to start adding your staff records. diff --git a/src/app/shared/components/training-and-qualifications-tab/training-and-qualifications-tab.component.ts b/src/app/shared/components/training-and-qualifications-tab/training-and-qualifications-tab.component.ts index 1039e4c8c9..26326ed6b3 100644 --- a/src/app/shared/components/training-and-qualifications-tab/training-and-qualifications-tab.component.ts +++ b/src/app/shared/components/training-and-qualifications-tab/training-and-qualifications-tab.component.ts @@ -21,6 +21,7 @@ export class TrainingAndQualificationsTabComponent implements OnInit, OnDestroy public totalExpiredTraining; public totalExpiringTraining; public totalStaff: number; + public isShowAllTrainings: boolean; constructor( private workerService: WorkerService, private establishmentService: EstablishmentService, @@ -66,6 +67,10 @@ export class TrainingAndQualificationsTabComponent implements OnInit, OnDestroy const blob = new Blob([response.body], { type: 'text/plain;charset=utf-8' }); saveAs(blob, filename); } + + public showAllTrainings() { + this.isShowAllTrainings = true; + } ngOnDestroy() { this.subscriptions.unsubscribe(); } diff --git a/src/app/shared/components/training-info-panel/training-info-panel.component.html b/src/app/shared/components/training-info-panel/training-info-panel.component.html index 0b519dac5e..d231ce0702 100644 --- a/src/app/shared/components/training-info-panel/training-info-panel.component.html +++ b/src/app/shared/components/training-info-panel/training-info-panel.component.html @@ -13,4 +13,11 @@ {{ totalExpiringTraining }} + +
    Missing
    +
    + Missing + {{ missingMandatoryTraining }} +
    +     diff --git a/src/app/shared/shared.module.ts b/src/app/shared/shared.module.ts index 66eba77138..360cf0d2ca 100644 --- a/src/app/shared/shared.module.ts +++ b/src/app/shared/shared.module.ts @@ -5,7 +5,7 @@ import { RouterModule } from '@angular/router'; import { AlertComponent } from '@shared/components/alert/alert.component'; import { SummaryRecordValueComponent } from '@shared/components/summary-record-value/summary-record-value.component'; import { WorkplaceTabComponent } from '@shared/components/workplace-tab/workplace-tab.component'; - +import { DialogService } from '@core/services/dialog.service'; import { AutoSuggestComponent } from './components/auto-suggest/auto-suggest.component'; import { BackLinkComponent } from './components/back-link/back-link.component'; import { BreadcrumbsComponent } from './components/breadcrumbs/breadcrumbs.component'; @@ -17,6 +17,7 @@ import { DetailsComponent } from './components/details/details.component'; import { EligibilityIconComponent } from './components/eligibility-icon/eligibility-icon.component'; import { ErrorSummaryComponent } from './components/error-summary/error-summary.component'; import { InsetTextComponent } from './components/inset-text/inset-text.component'; +import { OverlayModule } from '@angular/cdk/overlay'; import { LinkToParentCancelDialogComponent, } from './components/link-to-parent-cancel/link-to-parent-cancel-dialog.component'; @@ -71,9 +72,10 @@ import { SelectRecordTypePipe } from './pipes/select-record-type.pipe'; import { WorkerDaysPipe } from './pipes/worker-days.pipe'; import { WorkerPayPipe } from './pipes/worker-pay.pipe'; import { WorkplacePermissionsBearerPipe } from './pipes/workplace-permissions-bearer.pipe'; +import { ViewAllMandatoryTrainingComponent } from '@features/workplace/view-all-mandatory-trainings/view-all-mandatory-training.component'; @NgModule({ - imports: [CommonModule, ReactiveFormsModule, RouterModule], + imports: [CommonModule, ReactiveFormsModule, RouterModule, OverlayModule], declarations: [ AbsoluteNumberPipe, AlertComponent, @@ -132,6 +134,7 @@ import { WorkplacePermissionsBearerPipe } from './pipes/workplace-permissions-be LinkToParentCancelDialogComponent, LinkToParentRemoveDialogComponent, OwnershipChangeMessageDialogComponent, + ViewAllMandatoryTrainingComponent, ], exports: [ AlertComponent, @@ -189,7 +192,9 @@ import { WorkplacePermissionsBearerPipe } from './pipes/workplace-permissions-be LinkToParentCancelDialogComponent, LinkToParentRemoveDialogComponent, OwnershipChangeMessageDialogComponent, + ViewAllMandatoryTrainingComponent, ], + providers: [DialogService], entryComponents: [ ChangeDataOwnerDialogComponent, CancelDataOwnerDialogComponent, From 8df7f2b690b5441ebd9c9f3584bacc3c9f1f1153 Mon Sep 17 00:00:00 2001 From: Anurag Negi <55235060+Negi-Anurag@users.noreply.github.com> Date: Wed, 4 Mar 2020 15:41:17 +0530 Subject: [PATCH 106/305] HIDING OTHER TABS (#2017) --- .../training-and-qualifications-tab.component.html | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/src/app/shared/components/training-and-qualifications-tab/training-and-qualifications-tab.component.html b/src/app/shared/components/training-and-qualifications-tab/training-and-qualifications-tab.component.html index 9ba563b832..1d6fff3549 100644 --- a/src/app/shared/components/training-and-qualifications-tab/training-and-qualifications-tab.component.html +++ b/src/app/shared/components/training-and-qualifications-tab/training-and-qualifications-tab.component.html @@ -52,17 +52,14 @@

    Click on a staff name to add a record.

    > - - + - - + + From b87652f773ae0025e177b4f7a1a7f2a2bf079bbe Mon Sep 17 00:00:00 2001 From: Anurag Negi <55235060+Negi-Anurag@users.noreply.github.com> Date: Wed, 4 Mar 2020 16:14:16 +0530 Subject: [PATCH 107/305] Fe hiding other tab (#2018) * HIDING OTHER TABS * added css --- .../view-all-mandatory-training.component.html | 6 +++--- src/assets/scss/components/_tables.scss | 7 +++++++ 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/src/app/features/workplace/view-all-mandatory-trainings/view-all-mandatory-training.component.html b/src/app/features/workplace/view-all-mandatory-trainings/view-all-mandatory-training.component.html index 17fcc357b7..84f53b627f 100644 --- a/src/app/features/workplace/view-all-mandatory-trainings/view-all-mandatory-training.component.html +++ b/src/app/features/workplace/view-all-mandatory-trainings/view-all-mandatory-training.component.html @@ -49,9 +49,9 @@

    Mandatory training ({{ mandatoryTrainings.length }}) - - - + + + diff --git a/src/assets/scss/components/_tables.scss b/src/assets/scss/components/_tables.scss index e205b409a3..e0285a57e7 100644 --- a/src/assets/scss/components/_tables.scss +++ b/src/assets/scss/components/_tables.scss @@ -80,3 +80,10 @@ $error_row_padding: $govuk-gutter-half; height: 100%; } } +.govuk-table-header-custom-1 { + width: 20% !important; +} + +.govuk-table-header-custom-2 { + width: 60% !important; +} From eaf92993dcd30c9ba0df60a982879bc1daad7e6c Mon Sep 17 00:00:00 2001 From: Anurag Negi <55235060+Negi-Anurag@users.noreply.github.com> Date: Thu, 5 Mar 2020 17:39:13 +0530 Subject: [PATCH 108/305] Added check to display only those mandatory training which has workers (#2021) * Added check to display only those mandatory training which has workers * added missing mandatory flag details --- src/app/core/model/worker.model.ts | 1 + .../view-all-mandatory-training.component.ts | 9 ++++++--- ...aining-and-qualifications-summary.component.html | 13 +++++++++++-- .../training-and-qualifications-tab.component.html | 3 ++- .../training-and-qualifications-tab.component.ts | 12 ++++++++++++ .../training-info-panel.component.ts | 1 + 6 files changed, 33 insertions(+), 6 deletions(-) diff --git a/src/app/core/model/worker.model.ts b/src/app/core/model/worker.model.ts index d3bb9cda4e..7847fbfa33 100644 --- a/src/app/core/model/worker.model.ts +++ b/src/app/core/model/worker.model.ts @@ -91,6 +91,7 @@ export interface Worker { trainingCount: number; expiredTrainingCount: number; expiringTrainingCount: number; + missingMandatoryTrainingCount: number; qualificationCount: number; } diff --git a/src/app/features/workplace/view-all-mandatory-trainings/view-all-mandatory-training.component.ts b/src/app/features/workplace/view-all-mandatory-trainings/view-all-mandatory-training.component.ts index 1a8a94b7a6..e5f9fb317b 100644 --- a/src/app/features/workplace/view-all-mandatory-trainings/view-all-mandatory-training.component.ts +++ b/src/app/features/workplace/view-all-mandatory-trainings/view-all-mandatory-training.component.ts @@ -13,7 +13,7 @@ import { Subscription } from 'rxjs'; }) export class ViewAllMandatoryTrainingComponent implements OnInit, OnDestroy { @Input() wdfView = false; - @Output() mandatoryTrainingChanged: EventEmitter = new EventEmitter(); + @Output() mandatoryTrainingChanged: EventEmitter = new EventEmitter(); public canEditWorker: boolean; public lastUpdated: moment.Moment; public mandatoryTrainings; @@ -23,6 +23,7 @@ export class ViewAllMandatoryTrainingComponent implements OnInit, OnDestroy { public mandatoryTrainingsDetailsLabel = []; public establishmentId: number; public establishmentUid: string; + public totalMissingMandatoryTrainingCount: number = 0; private subscriptions: Subscription = new Subscription(); constructor( @@ -64,7 +65,7 @@ export class ViewAllMandatoryTrainingComponent implements OnInit, OnDestroy { category: '', status: '', quantity: '', - workers: '' + workers: '', }; let missingMandatoryTrainingCount = 0; mandatoryTrainingObj.id = training.id; @@ -79,13 +80,15 @@ export class ViewAllMandatoryTrainingComponent implements OnInit, OnDestroy { mandatoryTrainingObj.status = 'Up-to-date'; } else { mandatoryTrainingObj.status = `${missingMandatoryTrainingCount} Missing`; + this.totalMissingMandatoryTrainingCount += missingMandatoryTrainingCount; } } else { mandatoryTrainingObj.status = 'Up-to-date'; } this.mandatoryTrainingsDetails.push(mandatoryTrainingObj); }); - this.mandatoryTrainings = this.mandatoryTrainingsDetails; + this.mandatoryTrainings = this.mandatoryTrainingsDetails.filter(item => item.workers.length > 0); + this.mandatoryTrainingChanged.next(this.totalMissingMandatoryTrainingCount); }) ); } diff --git a/src/app/shared/components/training-and-qualifications-summary/training-and-qualifications-summary.component.html b/src/app/shared/components/training-and-qualifications-summary/training-and-qualifications-summary.component.html index 45c3e8e5b4..4600898c11 100644 --- a/src/app/shared/components/training-and-qualifications-summary/training-and-qualifications-summary.component.html +++ b/src/app/shared/components/training-and-qualifications-summary/training-and-qualifications-summary.component.html @@ -48,7 +48,7 @@ {{ worker.expiredTrainingCount }} Expired -
    +
    expiring {{ worker.expiringTrainingCount }} Expiring soon
    -
    Up-to-date
    +
    + missing mandatory training + {{ worker.missingMandatoryTrainingCount }} + Missing +
    +
    Up-to-date
    diff --git a/src/app/shared/components/training-and-qualifications-tab/training-and-qualifications-tab.component.html b/src/app/shared/components/training-and-qualifications-tab/training-and-qualifications-tab.component.html index 1d6fff3549..eddf3c69e2 100644 --- a/src/app/shared/components/training-and-qualifications-tab/training-and-qualifications-tab.component.html +++ b/src/app/shared/components/training-and-qualifications-tab/training-and-qualifications-tab.component.html @@ -43,6 +43,7 @@

    Click on a staff name to add a record.

    [workplace]="workplace" [totalExpiredTraining]="totalExpiredTraining" [totalExpiringTraining]="totalExpiringTraining" + [missingMandatoryTraining] ="missingMandatoryTraining" > Click on a staff name to add a record. + (mandatoryTrainingChanged)="mandatoryTrainingChangedHandler($event)"> diff --git a/src/app/shared/components/training-and-qualifications-tab/training-and-qualifications-tab.component.ts b/src/app/shared/components/training-and-qualifications-tab/training-and-qualifications-tab.component.ts index 26326ed6b3..0f130abbb3 100644 --- a/src/app/shared/components/training-and-qualifications-tab/training-and-qualifications-tab.component.ts +++ b/src/app/shared/components/training-and-qualifications-tab/training-and-qualifications-tab.component.ts @@ -20,6 +20,7 @@ export class TrainingAndQualificationsTabComponent implements OnInit, OnDestroy public totalRecords; public totalExpiredTraining; public totalExpiringTraining; + public missingMandatoryTraining; public totalStaff: number; public isShowAllTrainings: boolean; constructor( @@ -36,10 +37,12 @@ export class TrainingAndQualificationsTabComponent implements OnInit, OnDestroy this.totalRecords = 0; this.totalExpiredTraining = 0; this.totalExpiringTraining = 0; + this.missingMandatoryTraining = 0; this.workers.forEach((worker: Worker) => { this.totalRecords += worker.trainingCount + worker.qualificationCount; this.totalExpiredTraining += worker.expiredTrainingCount; this.totalExpiringTraining += worker.expiringTrainingCount; + this.missingMandatoryTraining += worker.missingMandatoryTrainingCount; }); }, error => { @@ -70,6 +73,15 @@ export class TrainingAndQualificationsTabComponent implements OnInit, OnDestroy public showAllTrainings() { this.isShowAllTrainings = true; + this.missingMandatoryTraining = 0; + this.totalExpiredTraining = 0; + this.totalExpiringTraining = 0; + } + + public mandatoryTrainingChangedHandler($event) { + this.missingMandatoryTraining = $event; + this.totalExpiredTraining = 0; + this.totalExpiringTraining = 0; } ngOnDestroy() { this.subscriptions.unsubscribe(); diff --git a/src/app/shared/components/training-info-panel/training-info-panel.component.ts b/src/app/shared/components/training-info-panel/training-info-panel.component.ts index 94a1e15871..2111bba80c 100644 --- a/src/app/shared/components/training-info-panel/training-info-panel.component.ts +++ b/src/app/shared/components/training-info-panel/training-info-panel.component.ts @@ -9,6 +9,7 @@ export class TainingInfoPanelComponent implements OnInit { @Input() workplace: Establishment; @Input() totalExpiredTraining = 0; @Input() totalExpiringTraining = 0; + @Input() missingMandatoryTraining = 0; constructor() {} From 01bc799717745a7152fb69f83f997a96dfdc45f0 Mon Sep 17 00:00:00 2001 From: rchitranshi <53287302+rchitranshi@users.noreply.github.com> Date: Fri, 6 Mar 2020 11:24:18 +0530 Subject: [PATCH 109/305] Changed view all mandatory training GET API. (#2024) --- server/models/classes/mandatoryTraining.js | 106 ++++++--------------- 1 file changed, 29 insertions(+), 77 deletions(-) diff --git a/server/models/classes/mandatoryTraining.js b/server/models/classes/mandatoryTraining.js index 52398580d6..487c68ee33 100644 --- a/server/models/classes/mandatoryTraining.js +++ b/server/models/classes/mandatoryTraining.js @@ -11,6 +11,7 @@ // database models const models = require('../index'); const EntityValidator = require('./validations/entityValidator').EntityValidator; +const Training = require('../../models/classes/training').Training; class MandatoryTraining extends EntityValidator { constructor(establishmentId) { super(); @@ -351,88 +352,39 @@ class MandatoryTraining extends EntityValidator { * Calculate missing mandatory training counts if not available on those worker records */ static async fetchAllMandatoryTrainings(establishmentId){ - // Fetch all training categories - const responseToReturn = []; - let lastUpdated = null; - const trainingCategories = await models.workerTrainingCategories.findAll({ - attributes: ['id', 'category'] - }); - if(trainingCategories && trainingCategories.length > 0){ - for(let i = 0; i < trainingCategories.length; i++){ - responseToReturn.push({ - id: trainingCategories[i].id, - category: trainingCategories[i].category, - workers: [] - }); - //find all workers for these categories from training table - const allCategoryDetails = await models.workerTraining.findAll({ - include: [ - { - model: models.worker, - as: 'worker', - attributes: ['id', 'uid', 'NameOrIdValue'], - include: [{ - model: models.job, - as: 'mainJob', - attributes: ['id', 'title'] - }], - where: { - establishmentFk: establishmentId - } - } - ], - order: [ - ['updated', 'DESC'] - ], - where: { - categoryFk: trainingCategories[i].id - } - }); - - if(allCategoryDetails && allCategoryDetails.length > 0){ - for(let j = 0 ; j < allCategoryDetails.length; j++){ - let findAddedCategory = responseToReturn.filter(thisRecord => thisRecord.id === trainingCategories[i].id); - if(findAddedCategory.length > 0){ - let includedWorkerIds = findAddedCategory[0].workers.map((worker) => worker.id); - if (!includedWorkerIds.includes(allCategoryDetails[j].worker.id)) { - const mandatoryTrainingDetails = await models.MandatoryTraining.findOne({ - where:{ - establishmentFK: establishmentId, - trainingCategoryFK: findAddedCategory[0].id, - jobFK: allCategoryDetails[j].worker.mainJob.id - } - }); - allCategoryDetails[j].worker.missingMandatoryTrainingCount = 0; - if(!mandatoryTrainingDetails || mandatoryTrainingDetails.length === 0){ - allCategoryDetails[j].worker.missingMandatoryTrainingCount++; - } - findAddedCategory[0].workers.push({ - id: allCategoryDetails[j].worker.id, - uid: allCategoryDetails[j].worker.uid, - name: allCategoryDetails[j].worker.NameOrIdValue, - mainJob: { - id: allCategoryDetails[j].worker.mainJob.id, - title: allCategoryDetails[j].worker.mainJob.title, - }, - missingMandatoryTrainingCount: allCategoryDetails[j].worker.missingMandatoryTrainingCount - }); - } + // Fetch all saved mandatory training + const mandatoryTrainingDetails = await MandatoryTraining.fetch(establishmentId); + if(mandatoryTrainingDetails && mandatoryTrainingDetails.mandatoryTraining.length > 0){ + let mandatoryTraining = mandatoryTrainingDetails.mandatoryTraining; + for(let i = 0; i < mandatoryTraining.length; i++){ + let tempWorkers = []; + let jobs = mandatoryTraining[i].jobs; + for(let j = 0; j < jobs.length; j++){ + const thisWorker = await models.worker.findOne({ + attributes: ['id', 'uid', 'NameOrIdValue'], + where:{ + establishmentFk: establishmentId, + MainJobFkValue: jobs[j].id } - } - if (allCategoryDetails && allCategoryDetails.length === 1) { - lastUpdated = allCategoryDetails[0]; - } else if (allCategoryDetails && allCategoryDetails.length > 1) { - lastUpdated = allCategoryDetails.reduce((a, b) => { return a.updated > b.updated ? a : b; }); + }); + if(thisWorker){ + tempWorkers.push({ + id: thisWorker.id, + uid: thisWorker.uid, + NameOrIdValue: thisWorker.NameOrIdValue, + mainJob:{jobId: jobs[j].id, title: jobs[j].title} + }); + mandatoryTraining[i].workers = await Training.getAllRequiredCounts(establishmentId, tempWorkers); + }else{ + mandatoryTraining[i].workers = []; } } + delete mandatoryTraining[i].jobs; } } - const response = { - lastUpdated: lastUpdated ? lastUpdated.updated.toISOString() : undefined, - mandatoryTraining: responseToReturn - }; - - return response; + delete mandatoryTrainingDetails.mandatoryTrainingCount; + delete mandatoryTrainingDetails.allJobRolesCount; + return mandatoryTrainingDetails; } } From 145c3c6ad9d423eeb3323a38adc61a7d9d82015e Mon Sep 17 00:00:00 2001 From: rchitranshi <53287302+rchitranshi@users.noreply.github.com> Date: Fri, 6 Mar 2020 15:54:23 +0530 Subject: [PATCH 110/305] One more fix for view all mandatory training API. (#2025) * Changed view all mandatory training GET API. * One more fix for view all mandatory training API. --- server/models/classes/mandatoryTraining.js | 23 ++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/server/models/classes/mandatoryTraining.js b/server/models/classes/mandatoryTraining.js index 487c68ee33..1a60e9c17d 100644 --- a/server/models/classes/mandatoryTraining.js +++ b/server/models/classes/mandatoryTraining.js @@ -360,26 +360,29 @@ class MandatoryTraining extends EntityValidator { let tempWorkers = []; let jobs = mandatoryTraining[i].jobs; for(let j = 0; j < jobs.length; j++){ - const thisWorker = await models.worker.findOne({ + const thisWorker = await models.worker.findAll({ attributes: ['id', 'uid', 'NameOrIdValue'], where:{ establishmentFk: establishmentId, MainJobFkValue: jobs[j].id } }); - if(thisWorker){ - tempWorkers.push({ - id: thisWorker.id, - uid: thisWorker.uid, - NameOrIdValue: thisWorker.NameOrIdValue, - mainJob:{jobId: jobs[j].id, title: jobs[j].title} + if(thisWorker && thisWorker.length > 0){ + thisWorker.forEach(async worker => { + tempWorkers.push({ + id: worker.id, + uid: worker.uid, + NameOrIdValue: worker.NameOrIdValue, + mainJob:{jobId: jobs[j].id, title: jobs[j].title} + }); }); - mandatoryTraining[i].workers = await Training.getAllRequiredCounts(establishmentId, tempWorkers); - }else{ - mandatoryTraining[i].workers = []; } } delete mandatoryTraining[i].jobs; + mandatoryTraining[i].workers = []; + if(tempWorkers.length > 0){ + mandatoryTraining[i].workers = await Training.getAllRequiredCounts(establishmentId, tempWorkers); + } } } delete mandatoryTrainingDetails.mandatoryTrainingCount; From 94230f32da40d57dfe2cad81a9fe2df63270abb5 Mon Sep 17 00:00:00 2001 From: Anurag Negi <55235060+Negi-Anurag@users.noreply.github.com> Date: Fri, 6 Mar 2020 17:33:37 +0530 Subject: [PATCH 111/305] Fe view mandatory changes (#2026) * Mandatory training ui changes * ui changes * removed changes --- .../core/services/establishment.service.ts | 8 +- .../add-mandatory-training.component.ts | 18 ++- ...view-all-mandatory-training.component.html | 128 +++++++++++++----- .../view-all-mandatory-training.component.ts | 93 +++++++------ .../workplace/workplace-routing.module.ts | 5 + ...ning-and-qualifications-tab.component.html | 43 +----- ...aining-and-qualifications-tab.component.ts | 35 +---- .../training-info-panel.component.html | 4 +- .../training-info-panel.component.ts | 2 +- ...trianing-link-panel.component.component.ts | 63 +++++++++ .../trianing-link-panel.component.html | 43 ++++++ src/app/shared/shared.module.ts | 27 ++-- src/assets/scss/components/_tables.scss | 6 +- 13 files changed, 297 insertions(+), 178 deletions(-) create mode 100644 src/app/shared/components/trianing-link-panel/trianing-link-panel.component.component.ts create mode 100644 src/app/shared/components/trianing-link-panel/trianing-link-panel.component.html diff --git a/src/app/core/services/establishment.service.ts b/src/app/core/services/establishment.service.ts index 8080fcf888..5bdef00c86 100644 --- a/src/app/core/services/establishment.service.ts +++ b/src/app/core/services/establishment.service.ts @@ -74,7 +74,7 @@ export class EstablishmentService { public previousEstablishmentId: string; public isSameLoggedInUser: boolean; private _primaryWorkplace$: BehaviorSubject = new BehaviorSubject(null); - + public isMandatoryTrainingView = new BehaviorSubject(false); constructor(private http: HttpClient) {} private _establishmentId: string = null; @@ -98,7 +98,7 @@ export class EstablishmentService { return this.getEstablishment(this.establishmentId.toString()).pipe( tap(establishment => { this.setState(establishment); - }) + }), ); } @@ -224,7 +224,7 @@ export class EstablishmentService { public updateLocalIdentifiers(request: LocalIdentifiersRequest): Observable { return this.http.put( `/api/establishment/${this.establishmentId}/localIdentifier`, - request + request, ); } @@ -250,7 +250,7 @@ export class EstablishmentService { public cancelOwnership(establishmentId, ownershipChangeId, data: CancelOwnerShip): Observable { return this.http.post( `/api/establishment/${establishmentId}/ownershipChange/${ownershipChangeId}`, - data + data, ); } diff --git a/src/app/features/add-mandatory-training/add-mandatory-training.component.ts b/src/app/features/add-mandatory-training/add-mandatory-training.component.ts index eaa400c2a8..408bb4b6eb 100644 --- a/src/app/features/add-mandatory-training/add-mandatory-training.component.ts +++ b/src/app/features/add-mandatory-training/add-mandatory-training.component.ts @@ -19,6 +19,7 @@ import { JobService } from '@core/services/job.service'; import { TrainingService } from '@core/services/training.service'; import { Subscription } from 'rxjs'; import { take } from 'rxjs/internal/operators/take'; +import { BackService } from '@core/services/back.service'; @Component({ selector: 'app-add-mandatory-training', @@ -49,7 +50,7 @@ export class AddMandatoryTrainingComponent implements OnInit { }, ]; constructor( - private breadcrumbService: BreadcrumbService, + protected backService: BackService, private trainingService: TrainingService, protected formBuilder: FormBuilder, protected errorSummaryService: ErrorSummaryService, @@ -67,8 +68,15 @@ export class AddMandatoryTrainingComponent implements OnInit { } ngOnInit(): void { - this.breadcrumbService.show(JourneyType.MANDATORY_TRAINING); - this.return = { url: ['/dashboard'], fragment: 'staff-training-and-qualifications' }; + this.establishmentService.isMandatoryTrainingView.subscribe(value => { + if (value === true) { + this.return = { url: ['/workplace/view-all-mandatory-training'] }; + } else { + this.return = { url: ['/dashboard'], fragment: 'staff-training-and-qualifications' }; + } + }); + + this.setBackLink(); this.getAllTrainingCategories(); this.getAlJobs(); this.setupForm(); @@ -91,6 +99,10 @@ export class AddMandatoryTrainingComponent implements OnInit { ); } + private setBackLink(): void { + this.backService.setBackLink(this.return); + } + //Setup form for mandatory category private setupForm(): void { this.form = this.formBuilder.group({ diff --git a/src/app/features/workplace/view-all-mandatory-trainings/view-all-mandatory-training.component.html b/src/app/features/workplace/view-all-mandatory-trainings/view-all-mandatory-training.component.html index 84f53b627f..796db4ba49 100644 --- a/src/app/features/workplace/view-all-mandatory-trainings/view-all-mandatory-training.component.html +++ b/src/app/features/workplace/view-all-mandatory-trainings/view-all-mandatory-training.component.html @@ -1,18 +1,27 @@
    -

    Mandatory training ({{ mandatoryTrainings.length }})

    +

    + {{ workplceName }} + Mandatory training ({{ mandatoryTrainings.length }}) +

    -
    +

    Last updated on {{ lastUpdated | date: 'd MMMM y' }}

    - + +
    Worker IDJob roleStatusWorker IDJob roleStatus
    - - + + @@ -25,8 +34,35 @@

    Mandatory training ({{ mandatoryTrainings.length }})

    - + diff --git a/src/app/features/workplace/view-all-mandatory-trainings/view-all-mandatory-training.component.ts b/src/app/features/workplace/view-all-mandatory-trainings/view-all-mandatory-training.component.ts index e5f9fb317b..0ca7f198bd 100644 --- a/src/app/features/workplace/view-all-mandatory-trainings/view-all-mandatory-training.component.ts +++ b/src/app/features/workplace/view-all-mandatory-trainings/view-all-mandatory-training.component.ts @@ -1,10 +1,12 @@ -import { Component, EventEmitter, Input, OnInit, Output, OnDestroy } from '@angular/core'; +import { Component, Input, OnInit, OnDestroy } from '@angular/core'; import { Qualification } from '@core/model/qualification.model'; import { Worker } from '@core/model/worker.model'; import { PermissionsService } from '@core/services/permissions/permissions.service'; import { WorkplaceService } from '@core/services/workplace.service'; import { EstablishmentService } from '@core/services/establishment.service'; +import { BreadcrumbService } from '@core/services/breadcrumb.service'; import * as moment from 'moment'; +import { JourneyType } from '@core/breadcrumb/breadcrumb.model'; import { Subscription } from 'rxjs'; @Component({ @@ -13,7 +15,6 @@ import { Subscription } from 'rxjs'; }) export class ViewAllMandatoryTrainingComponent implements OnInit, OnDestroy { @Input() wdfView = false; - @Output() mandatoryTrainingChanged: EventEmitter = new EventEmitter(); public canEditWorker: boolean; public lastUpdated: moment.Moment; public mandatoryTrainings; @@ -23,25 +24,32 @@ export class ViewAllMandatoryTrainingComponent implements OnInit, OnDestroy { public mandatoryTrainingsDetailsLabel = []; public establishmentId: number; public establishmentUid: string; + public workplceName: string; public totalMissingMandatoryTrainingCount: number = 0; + public totalExpiredTraining = 0; + public totalExpiringTraining = 0; + public totalMissingMandatoryTraining = 0; private subscriptions: Subscription = new Subscription(); constructor( private permissionsService: PermissionsService, private establishmentService: EstablishmentService, + private breadcrumbService: BreadcrumbService, private workplaceService: WorkplaceService, ) {} ngOnInit() { + this.breadcrumbService.show(JourneyType.MANDATORY_TRAINING); this.subscriptions.add( - this.establishmentService.establishment$.subscribe(data => { - if (data && data.id) { - this.establishmentId = data.id; - this.establishmentUid = data.uid; - this.canEditWorker = this.permissionsService.can(data.uid, 'canEditWorker'); - this.fetchAllRecords(); - } - }) + this.establishmentService.establishment$.subscribe(data => { + if (data && data.id) { + this.establishmentId = data.id; + this.establishmentUid = data.uid; + this.workplceName = data.name; + this.canEditWorker = this.permissionsService.can(data.uid, 'canEditWorker'); + this.fetchAllRecords(); + } + }), ); } @@ -56,40 +64,41 @@ export class ViewAllMandatoryTrainingComponent implements OnInit, OnDestroy { public fetchAllRecords() { this.subscriptions.add( - this.workplaceService.getAllMandatoryTrainings(this.establishmentId).subscribe(data => { - this.lastUpdated = moment(data.lastUpdated); - this.mandatoryTrainings = data.mandatoryTraining; - this.mandatoryTrainings.forEach(training => { - let mandatoryTrainingObj = { - id: '', - category: '', - status: '', - quantity: '', - workers: '', + this.workplaceService.getAllMandatoryTrainings(this.establishmentId).subscribe(data => { + this.lastUpdated = moment(data.lastUpdated); + this.mandatoryTrainings = data.mandatoryTraining; + this.mandatoryTrainings.forEach(training => { + let mandatoryTrainingObj = { + trainingCategoryId: '', + category: '', + status: '', + quantity: '', + workers: '', + catMissingMandatoryTrainingCount: 0, + catExpiredTrainingCount: 0, + catExpiringTrainingCount: 0, + catTrainingCount: 0, }; - let missingMandatoryTrainingCount = 0; - mandatoryTrainingObj.id = training.id; - mandatoryTrainingObj.category = training.category; - mandatoryTrainingObj.quantity = training.workers.length; - if (training.workers && training.workers.length > 0) { - mandatoryTrainingObj.workers = training.workers; - training.workers.forEach(worker => { - missingMandatoryTrainingCount += worker.missingMandatoryTrainingCount; - }); - if (missingMandatoryTrainingCount === 0) { - mandatoryTrainingObj.status = 'Up-to-date'; - } else { - mandatoryTrainingObj.status = `${missingMandatoryTrainingCount} Missing`; - this.totalMissingMandatoryTrainingCount += missingMandatoryTrainingCount; + + mandatoryTrainingObj.trainingCategoryId = training.trainingCategoryId; + mandatoryTrainingObj.category = training.category; + mandatoryTrainingObj.quantity = training.workers.length; + if (training.workers && training.workers.length > 0) { + mandatoryTrainingObj.workers = training.workers; + training.workers.forEach(worker => { + mandatoryTrainingObj.catMissingMandatoryTrainingCount += worker.missingMandatoryTrainingCount; + mandatoryTrainingObj.catExpiredTrainingCount += worker.expiredTrainingCount; + mandatoryTrainingObj.catExpiringTrainingCount += worker.expiringTrainingCount; + mandatoryTrainingObj.catTrainingCount += worker.trainingCount; + }); } - } else { - mandatoryTrainingObj.status = 'Up-to-date'; - } - this.mandatoryTrainingsDetails.push(mandatoryTrainingObj); - }); - this.mandatoryTrainings = this.mandatoryTrainingsDetails.filter(item => item.workers.length > 0); - this.mandatoryTrainingChanged.next(this.totalMissingMandatoryTrainingCount); - }) + this.totalExpiredTraining += mandatoryTrainingObj.catExpiredTrainingCount; + this.totalExpiringTraining += mandatoryTrainingObj.catExpiringTrainingCount; + this.totalMissingMandatoryTraining += mandatoryTrainingObj.catMissingMandatoryTrainingCount; + this.mandatoryTrainingsDetails.push(mandatoryTrainingObj); + }); + this.mandatoryTrainings = this.mandatoryTrainingsDetails; + }), ); } diff --git a/src/app/features/workplace/workplace-routing.module.ts b/src/app/features/workplace/workplace-routing.module.ts index d952285fab..912c2f853f 100644 --- a/src/app/features/workplace/workplace-routing.module.ts +++ b/src/app/features/workplace/workplace-routing.module.ts @@ -43,6 +43,7 @@ import { } from './user-account-edit-permissions/user-account-edit-permissions.component'; import { VacanciesComponent } from './vacancies/vacancies.component'; import { WorkplaceNotFoundComponent } from './workplace-not-found/workplace-not-found.component'; +import { ViewAllMandatoryTrainingComponent } from './view-all-mandatory-trainings/view-all-mandatory-training.component'; const routes: Routes = [ { @@ -51,6 +52,10 @@ const routes: Routes = [ canActivate: [ParentGuard], data: { title: 'View My Workplaces' }, }, + { + path: 'view-all-mandatory-training', + component: ViewAllMandatoryTrainingComponent, + }, { path: 'start-screen', data: { title: 'Start' }, diff --git a/src/app/shared/components/training-and-qualifications-tab/training-and-qualifications-tab.component.html b/src/app/shared/components/training-and-qualifications-tab/training-and-qualifications-tab.component.html index eddf3c69e2..62ea75fb60 100644 --- a/src/app/shared/components/training-and-qualifications-tab/training-and-qualifications-tab.component.html +++ b/src/app/shared/components/training-and-qualifications-tab/training-and-qualifications-tab.component.html @@ -1,32 +1,7 @@

    Staff training and qualifications ({{ totalRecords || 0 }})

    -
    -
    - View all workplace training -
    -
    - Set up mandatory training - -
    -
    - - - Download training report - - -
    -
    +
    @@ -43,26 +18,14 @@

    Click on a staff name to add a record.

    [workplace]="workplace" [totalExpiredTraining]="totalExpiredTraining" [totalExpiringTraining]="totalExpiringTraining" - [missingMandatoryTraining] ="missingMandatoryTraining" + [totalMissingMandatoryTraining]="missingMandatoryTraining" > - - - - - - - - - - - You need to start adding your staff records. diff --git a/src/app/shared/components/training-and-qualifications-tab/training-and-qualifications-tab.component.ts b/src/app/shared/components/training-and-qualifications-tab/training-and-qualifications-tab.component.ts index 0f130abbb3..fa4f70a31d 100644 --- a/src/app/shared/components/training-and-qualifications-tab/training-and-qualifications-tab.component.ts +++ b/src/app/shared/components/training-and-qualifications-tab/training-and-qualifications-tab.component.ts @@ -1,12 +1,9 @@ -import { HttpResponse } from '@angular/common/http'; import { Component, Input, OnDestroy, OnInit } from '@angular/core'; import { Establishment } from '@core/model/establishment.model'; import { Worker } from '@core/model/worker.model'; -import { EstablishmentService } from '@core/services/establishment.service'; -import { ReportService } from '@core/services/report.service'; import { WorkerService } from '@core/services/worker.service'; -import { saveAs } from 'file-saver'; import { Subscription } from 'rxjs'; +import { EstablishmentService } from '@core/services/establishment.service'; @Component({ selector: 'app-training-and-qualifications-tab', @@ -23,13 +20,10 @@ export class TrainingAndQualificationsTabComponent implements OnInit, OnDestroy public missingMandatoryTraining; public totalStaff: number; public isShowAllTrainings: boolean; - constructor( - private workerService: WorkerService, - private establishmentService: EstablishmentService, - private reportService: ReportService - ) {} + constructor(private workerService: WorkerService, protected establishmentService: EstablishmentService) {} ngOnInit() { + this.establishmentService.isMandatoryTrainingView.next(false); this.subscriptions.add( this.workerService.getAllWorkers(this.workplace.uid).subscribe( workers => { @@ -47,29 +41,10 @@ export class TrainingAndQualificationsTabComponent implements OnInit, OnDestroy }, error => { console.error(error.error); - } - ) - ); - } - //Download Training Report - public downloadTrainingReport(event: Event) { - event.preventDefault(); - this.subscriptions.add( - this.reportService.getTrainingReport(this.workplace.uid).subscribe( - response => this.saveFile(response), - () => {} - ) + }, + ), ); } - //set content type and save file - private saveFile(response: HttpResponse) { - const filenameRegEx = /filename[^;=\n]*=((['"]).*?\2|[^;\n]*)/; - const header = response.headers.get('content-disposition'); - const filenameMatches = header && header.match(filenameRegEx); - const filename = filenameMatches && filenameMatches.length > 1 ? filenameMatches[1] : null; - const blob = new Blob([response.body], { type: 'text/plain;charset=utf-8' }); - saveAs(blob, filename); - } public showAllTrainings() { this.isShowAllTrainings = true; diff --git a/src/app/shared/components/training-info-panel/training-info-panel.component.html b/src/app/shared/components/training-info-panel/training-info-panel.component.html index d231ce0702..2c14f59e64 100644 --- a/src/app/shared/components/training-info-panel/training-info-panel.component.html +++ b/src/app/shared/components/training-info-panel/training-info-panel.component.html @@ -13,11 +13,11 @@ {{ totalExpiringTraining }} - +
    Missing
    Missing - {{ missingMandatoryTraining }} + {{ totalMissingMandatoryTraining }}
    diff --git a/src/app/shared/components/training-info-panel/training-info-panel.component.ts b/src/app/shared/components/training-info-panel/training-info-panel.component.ts index 2111bba80c..751606f769 100644 --- a/src/app/shared/components/training-info-panel/training-info-panel.component.ts +++ b/src/app/shared/components/training-info-panel/training-info-panel.component.ts @@ -9,7 +9,7 @@ export class TainingInfoPanelComponent implements OnInit { @Input() workplace: Establishment; @Input() totalExpiredTraining = 0; @Input() totalExpiringTraining = 0; - @Input() missingMandatoryTraining = 0; + @Input() totalMissingMandatoryTraining = 0; constructor() {} diff --git a/src/app/shared/components/trianing-link-panel/trianing-link-panel.component.component.ts b/src/app/shared/components/trianing-link-panel/trianing-link-panel.component.component.ts new file mode 100644 index 0000000000..1dad1b721d --- /dev/null +++ b/src/app/shared/components/trianing-link-panel/trianing-link-panel.component.component.ts @@ -0,0 +1,63 @@ +import { Component, OnDestroy, OnInit } from '@angular/core'; +import { saveAs } from 'file-saver'; +import { Subscription } from 'rxjs'; +import { HttpResponse } from '@angular/common/http'; +import { ReportService } from '@core/services/report.service'; +import { EstablishmentService } from '@core/services/establishment.service'; +import { Router } from '@angular/router'; + +@Component({ + selector: 'app-trianing-link-panel', + templateUrl: './trianing-link-panel.component.html', +}) +export class TrainingLinkPanelComponent implements OnInit, OnDestroy { + private subscriptions: Subscription = new Subscription(); + public establishmentUid: string; + public url: string; + public fromStaffRecord: boolean; + + constructor( + private reportService: ReportService, + private establishmentService: EstablishmentService, + private router: Router, + ) {} + + ngOnInit() { + this.url = this.router.url; + if (this.url.includes('view-all-mandatory-training')) { + this.fromStaffRecord = true; + this.establishmentService.isMandatoryTrainingView.next(true); + } + this.subscriptions.add( + this.establishmentService.establishment$.subscribe(data => { + if (data && data.id) { + this.establishmentUid = data.uid; + } + }), + ); + } + + //Download Training Report + public downloadTrainingReport(event: Event) { + event.preventDefault(); + this.subscriptions.add( + this.reportService.getTrainingReport(this.establishmentUid).subscribe( + response => this.saveFile(response), + () => {}, + ), + ); + } + + //set content type and save file + private saveFile(response: HttpResponse) { + const filenameRegEx = /filename[^;=\n]*=((['"]).*?\2|[^;\n]*)/; + const header = response.headers.get('content-disposition'); + const filenameMatches = header && header.match(filenameRegEx); + const filename = filenameMatches && filenameMatches.length > 1 ? filenameMatches[1] : null; + const blob = new Blob([response.body], { type: 'text/plain;charset=utf-8' }); + saveAs(blob, filename); + } + ngOnDestroy() { + this.subscriptions.unsubscribe(); + } +} diff --git a/src/app/shared/components/trianing-link-panel/trianing-link-panel.component.html b/src/app/shared/components/trianing-link-panel/trianing-link-panel.component.html new file mode 100644 index 0000000000..2bc3c96292 --- /dev/null +++ b/src/app/shared/components/trianing-link-panel/trianing-link-panel.component.html @@ -0,0 +1,43 @@ +
    +
    + + View all workplace training + + + View staff training and qualification + +
    +
    + Set up mandatory training + +
    +
    + + + Download training report + + +
    +
    diff --git a/src/app/shared/shared.module.ts b/src/app/shared/shared.module.ts index 360cf0d2ca..c436a9b8d2 100644 --- a/src/app/shared/shared.module.ts +++ b/src/app/shared/shared.module.ts @@ -18,17 +18,11 @@ import { EligibilityIconComponent } from './components/eligibility-icon/eligibil import { ErrorSummaryComponent } from './components/error-summary/error-summary.component'; import { InsetTextComponent } from './components/inset-text/inset-text.component'; import { OverlayModule } from '@angular/cdk/overlay'; -import { - LinkToParentCancelDialogComponent, -} from './components/link-to-parent-cancel/link-to-parent-cancel-dialog.component'; -import { - LinkToParentRemoveDialogComponent, -} from './components/link-to-parent-remove/link-to-parent-remove-dialog.component'; +import { LinkToParentCancelDialogComponent } from './components/link-to-parent-cancel/link-to-parent-cancel-dialog.component'; +import { LinkToParentRemoveDialogComponent } from './components/link-to-parent-remove/link-to-parent-remove-dialog.component'; import { LinkToParentDialogComponent } from './components/link-to-parent/link-to-parent-dialog.component'; import { MessagesComponent } from './components/messages/messages.component'; -import { - OwnershipChangeMessageDialogComponent, -} from './components/ownership-change-message/ownership-change-message-dialog.component'; +import { OwnershipChangeMessageDialogComponent } from './components/ownership-change-message/ownership-change-message-dialog.component'; import { PanelComponent } from './components/panel/panel.component'; import { PhaseBannerComponent } from './components/phase-banner/phase-banner.component'; import { ProgressComponent } from './components/progress/progress.component'; @@ -37,9 +31,7 @@ import { SetDataPermissionDialogComponent } from './components/set-data-permissi import { BasicRecordComponent } from './components/staff-record-summary/basic-record/basic-record.component'; import { EmploymentComponent } from './components/staff-record-summary/employment/employment.component'; import { PersonalDetailsComponent } from './components/staff-record-summary/personal-details/personal-details.component'; -import { - QualificationsAndTrainingComponent, -} from './components/staff-record-summary/qualifications-and-training/qualifications-and-training.component'; +import { QualificationsAndTrainingComponent } from './components/staff-record-summary/qualifications-and-training/qualifications-and-training.component'; import { StaffRecordSummaryComponent } from './components/staff-record-summary/staff-record-summary.component'; import { StaffRecordsTabComponent } from './components/staff-records-tab/staff-records-tab.component'; import { StaffSummaryComponent } from './components/staff-summary/staff-summary.component'; @@ -50,12 +42,8 @@ import { SummaryListComponent } from './components/summary-list/summary-list.com import { TabComponent } from './components/tabs/tab.component'; import { TabsComponent } from './components/tabs/tabs.component'; import { TotalStaffPanelComponent } from './components/total-staff-panel/total-staff-panel.component'; -import { - TrainingAndQualificationsSummaryComponent, -} from './components/training-and-qualifications-summary/training-and-qualifications-summary.component'; -import { - TrainingAndQualificationsTabComponent, -} from './components/training-and-qualifications-tab/training-and-qualifications-tab.component'; +import { TrainingAndQualificationsSummaryComponent } from './components/training-and-qualifications-summary/training-and-qualifications-summary.component'; +import { TrainingAndQualificationsTabComponent } from './components/training-and-qualifications-tab/training-and-qualifications-tab.component'; import { TainingInfoPanelComponent } from './components/training-info-panel/training-info-panel.component'; import { UserAccountsSummaryComponent } from './components/user-accounts-summary/user-accounts-summary.component'; import { WdfConfirmationPanelComponent } from './components/wdf-confirmation-panel/wdf-confirmation-panel.component'; @@ -73,6 +61,7 @@ import { WorkerDaysPipe } from './pipes/worker-days.pipe'; import { WorkerPayPipe } from './pipes/worker-pay.pipe'; import { WorkplacePermissionsBearerPipe } from './pipes/workplace-permissions-bearer.pipe'; import { ViewAllMandatoryTrainingComponent } from '@features/workplace/view-all-mandatory-trainings/view-all-mandatory-training.component'; +import { TrainingLinkPanelComponent } from './components/trianing-link-panel/trianing-link-panel.component.component'; @NgModule({ imports: [CommonModule, ReactiveFormsModule, RouterModule, OverlayModule], @@ -115,6 +104,7 @@ import { ViewAllMandatoryTrainingComponent } from '@features/workplace/view-all- SummaryRecordValueComponent, TabComponent, TabsComponent, + TrainingLinkPanelComponent, TotalStaffPanelComponent, UserAccountsSummaryComponent, WdfConfirmationPanelComponent, @@ -182,6 +172,7 @@ import { ViewAllMandatoryTrainingComponent } from '@features/workplace/view-all- WorkplaceSummaryComponent, WorkplaceTabComponent, OrderOtherPipe, + TrainingLinkPanelComponent, LongDatePipe, RejectRequestDialogComponent, SetDataPermissionDialogComponent, diff --git a/src/assets/scss/components/_tables.scss b/src/assets/scss/components/_tables.scss index e0285a57e7..f24d041c34 100644 --- a/src/assets/scss/components/_tables.scss +++ b/src/assets/scss/components/_tables.scss @@ -80,10 +80,6 @@ $error_row_padding: $govuk-gutter-half; height: 100%; } } -.govuk-table-header-custom-1 { +.govuk-table-custom-width { width: 20% !important; } - -.govuk-table-header-custom-2 { - width: 60% !important; -} From b08e4328ddf4f964da4634fe9fc1be907260d6a7 Mon Sep 17 00:00:00 2001 From: Aaron Russell Date: Mon, 9 Mar 2020 11:04:11 +0000 Subject: [PATCH 112/305] Added logging around WDF --- server/models/classes/worker.js | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/server/models/classes/worker.js b/server/models/classes/worker.js index a713e5e2cc..b954b5dfa2 100644 --- a/server/models/classes/worker.js +++ b/server/models/classes/worker.js @@ -640,7 +640,12 @@ class Worker extends EntityValidator { const effectiveDateTime = WdfCalculator.effectiveTime; let wdfAudit = null; + console.log('Current WDF Eligibility: ', JSON.stringify(currentWdfEligibiity)); + console.log('Last WDF Eligibility: ', this._lastWdfEligibility); + console.log('WorkerID: ', this._id); + console.log('Effective Time: ', new Date(effectiveDateTime).toISOString()); if (currentWdfEligibiity.isEligible && (this._lastWdfEligibility === null || this._lastWdfEligibility.getTime() < effectiveDateTime)) { + console.log('Worker is WDF Eligible. Updating lastEligibilityDate and adding to Audit table.'); updateDocument.lastWdfEligibility = updatedTimestamp; wdfAudit = { username: savedBy.toLowerCase(), @@ -1335,6 +1340,7 @@ class Worker extends EntityValidator { const wdfPropertyValues = Object.values(wdfByProperty); // NOTE - the worker does not have to be completed before it can be eligible for WDF + console.log('WDF Properties: ', JSON.stringify(wdfByProperty)); return { lastEligibility: this._lastWdfEligibility ? this._lastWdfEligibility.toISOString() : null, isEligible: wdfPropertyValues.every(thisWdfProperty => { From 6101a89cb32be82f3dc08df3ed0c8a1286c6ef51 Mon Sep 17 00:00:00 2001 From: mksrivastava Date: Mon, 9 Mar 2020 16:13:35 +0530 Subject: [PATCH 113/305] Changed view report content (cherry picked from commit bed1042657bc3e080b344c6e4db017f1de722037) --- .../home-tab/home-tab.component.html | 57 +++++++++++-------- 1 file changed, 32 insertions(+), 25 deletions(-) diff --git a/src/app/features/dashboard/home-tab/home-tab.component.html b/src/app/features/dashboard/home-tab/home-tab.component.html index 5524f049da..5e001b7ccf 100644 --- a/src/app/features/dashboard/home-tab/home-tab.component.html +++ b/src/app/features/dashboard/home-tab/home-tab.component.html @@ -4,55 +4,62 @@

    Home

    What you need to do first.

    - Add workplace - information -
    + Add workplace information +
    Add staff records     - -
    -

    - Add a staff record -

    +

    + + Add a staff record + +

    - Create staff records for your workplace by providing current work - information, personal details, employment and qualifications and - training information. + Create staff records for your workplace by providing current work information, personal details, employment + and qualifications and training information.

    -

    - View reports -

    +

    + + View reports + +

    - Access the Workplace Development Fund report, the CQC Provider - Information Return report and the Local Authority Progress Report. + View your Workplace Development Fund report to check whether you’re eligible to claim funding towards training + and qualifications.

    -

    - Bulk upload -

    +

    + + Bulk upload + +

    - Bulk upload is used to edit large quantities of staff, workplace and - training information. + Bulk upload is used to edit large quantities of staff, workplace and training information.

    - + " + >

    Related content

    -
    \ No newline at end of file + From d40fc93b51a229066f551942f9beca12757b8b6d Mon Sep 17 00:00:00 2001 From: Manish Kumar Srivastava Date: Mon, 9 Mar 2020 17:26:10 +0530 Subject: [PATCH 114/305] Changed view report content (#2028) (cherry picked from commit bed1042657bc3e080b344c6e4db017f1de722037) --- .../home-tab/home-tab.component.html | 57 +++++++++++-------- 1 file changed, 32 insertions(+), 25 deletions(-) diff --git a/src/app/features/dashboard/home-tab/home-tab.component.html b/src/app/features/dashboard/home-tab/home-tab.component.html index 5524f049da..5e001b7ccf 100644 --- a/src/app/features/dashboard/home-tab/home-tab.component.html +++ b/src/app/features/dashboard/home-tab/home-tab.component.html @@ -4,55 +4,62 @@

    Home

    What you need to do first.

    - Add workplace - information -
    + Add workplace information +
    Add staff records     - -
    -

    - Add a staff record -

    +

    + + Add a staff record + +

    - Create staff records for your workplace by providing current work - information, personal details, employment and qualifications and - training information. + Create staff records for your workplace by providing current work information, personal details, employment + and qualifications and training information.

    -

    - View reports -

    +

    + + View reports + +

    - Access the Workplace Development Fund report, the CQC Provider - Information Return report and the Local Authority Progress Report. + View your Workplace Development Fund report to check whether you’re eligible to claim funding towards training + and qualifications.

    -

    - Bulk upload -

    +

    + + Bulk upload + +

    - Bulk upload is used to edit large quantities of staff, workplace and - training information. + Bulk upload is used to edit large quantities of staff, workplace and training information.

    - + " + >

    Related content

    - \ No newline at end of file + From 3eb9840eb3100fbecb85b0a056478e83c5b403af Mon Sep 17 00:00:00 2001 From: Aaron Russell Date: Tue, 10 Mar 2020 10:39:42 +0000 Subject: [PATCH 115/305] Changes workplace to workforce --- src/app/features/dashboard/home-tab/home-tab.component.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/features/dashboard/home-tab/home-tab.component.html b/src/app/features/dashboard/home-tab/home-tab.component.html index 5e001b7ccf..db9978f8d7 100644 --- a/src/app/features/dashboard/home-tab/home-tab.component.html +++ b/src/app/features/dashboard/home-tab/home-tab.component.html @@ -34,7 +34,7 @@

    - View your Workplace Development Fund report to check whether you’re eligible to claim funding towards training + View your Workforce Development Fund report to check whether you’re eligible to claim funding towards training and qualifications.

    From 3759f0d5213e06544b20f278e197b4f596446c84 Mon Sep 17 00:00:00 2001 From: Aaron Russell Date: Mon, 2 Mar 2020 14:11:46 +0000 Subject: [PATCH 116/305] Fixed other jobs nurse specialism, reg nurse and AMHP --- server/models/classes/worker.js | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/server/models/classes/worker.js b/server/models/classes/worker.js index a713e5e2cc..39eb539324 100644 --- a/server/models/classes/worker.js +++ b/server/models/classes/worker.js @@ -306,17 +306,26 @@ class Worker extends EntityValidator { this._status = document.status; } - // Consequential updates when one value means another should be empty or null // If their job isn't a registered nurse, remove their specialism and category - if (document.mainJob) { - if (document.mainJob.jobId !== 23) { + if (document.mainJob || document.otherJobs) { + let otherRegNurse = false; + let otherSocialWorker = false; + const mainJob = document.mainJob ? document.mainJob : this.mainJob; + const otherJobs = document.otherJobs ? document.otherJobs : this.otherJobs; + if (otherJobs && otherJobs.jobs) { + otherJobs.jobs.map(otherJob => { + if (otherJob.jobId === 23) otherRegNurse = true; + if (otherJob.jobId === 27) otherSocialWorker = true; + }); + } + if (mainJob && mainJob.jobId !== 23 && !otherRegNurse) { document.registeredNurse = null; document.nurseSpecialism = { id: null, specialism: null }; } // If their job isn't a social worker - remove the approved mental health worker - if (document.mainJob.jobId !== 27) { + if (mainJob && mainJob.jobId !== 27 && !otherSocialWorker) { document.approvedMentalHealthWorker = null; } } From ba518a503a99e58ff99806c1351ab461dc76d06b Mon Sep 17 00:00:00 2001 From: Aaron Russell Date: Mon, 2 Mar 2020 14:22:33 +0000 Subject: [PATCH 117/305] Added Pool/Bank to remove contracted hours --- server/models/classes/worker.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/server/models/classes/worker.js b/server/models/classes/worker.js index 39eb539324..056e20da58 100644 --- a/server/models/classes/worker.js +++ b/server/models/classes/worker.js @@ -342,9 +342,9 @@ class Worker extends EntityValidator { document.yearArrived = { value: null, year: null }; } } - + const notContract = ['Agency', 'Pool/Bank'] // Remove contracted hours If on a zero hour contract - if (document.zeroHoursContract === 'Yes' || document.contract === 'Agency') { + if (document.zeroHoursContract === 'Yes' || notContract.includes(document.contract)) { document.weeklyHoursContracted = { value: null, hours: null }; } From 1ae2c6b6b894c5cdb1e05c8d27d81fcfd493f1ed Mon Sep 17 00:00:00 2001 From: Aaron Russell Date: Mon, 2 Mar 2020 15:32:48 +0000 Subject: [PATCH 118/305] Changed error message for uniqie worker ID's --- server/models/BulkImport/csv/workers.js | 8 ++++---- server/routes/establishments/bulkUpload.js | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/server/models/BulkImport/csv/workers.js b/server/models/BulkImport/csv/workers.js index 6cbd6e1e97..4bf6485db1 100644 --- a/server/models/BulkImport/csv/workers.js +++ b/server/models/BulkImport/csv/workers.js @@ -2489,13 +2489,13 @@ class Worker { } // add a duplicate validation error to the current set - addDuplicate (originalLineNumber) { + addDuplicate (UNIQUEWORKERID) { return { origin: 'Workers', lineNumber: this._lineNumber, errCode: Worker.DUPLICATE_ERROR, errType: 'DUPLICATE_ERROR', - error: 'UNIQUEWORKERID is not unique', + error: `UNIQUEWORKERID ${UNIQUEWORKERID} is not unique`, source: this._currentLine.UNIQUEWORKERID, worker: this._currentLine.UNIQUEWORKERID, name: this._currentLine.LOCALESTID @@ -2503,13 +2503,13 @@ class Worker { } // add a duplicate validation error to the current set - addChgDuplicate (originalLineNumber) { + addChgDuplicate (CHGUNIQUEWORKERID) { return { origin: 'Workers', lineNumber: this._lineNumber, errCode: Worker.DUPLICATE_ERROR, errType: 'DUPLICATE_ERROR', - error: 'CHGUNIQUEWORKERID is not unique', + error: `CHGUNIQUEWORKERID ${CHGUNIQUEWORKERID} is not unique`, source: this._currentLine.UNIQUEWORKERID, worker: this._currentLine.UNIQUEWORKERID, name: this._currentLine.LOCALESTID diff --git a/server/routes/establishments/bulkUpload.js b/server/routes/establishments/bulkUpload.js index 4aeb1ffe28..8310329647 100644 --- a/server/routes/establishments/bulkUpload.js +++ b/server/routes/establishments/bulkUpload.js @@ -1120,7 +1120,7 @@ const validateBulkUploadFiles = async ( if (allWorkersByKey[keyNoWhitespace]) { // this worker is a duplicate - csvWorkerSchemaErrors.push(thisWorker.addDuplicate(allWorkersByKey[keyNoWhitespace])); + csvWorkerSchemaErrors.push(thisWorker.addDuplicate(thisWorker.uniqueWorker)); // remove the entity delete myAPIWorkers[thisWorker.lineNumber]; @@ -1128,7 +1128,7 @@ const validateBulkUploadFiles = async ( // the worker will be known by LOCALSTID and UNIQUEWORKERID, but if CHGUNIQUEWORKERID is given, then it's combination of LOCALESTID and CHGUNIQUEWORKERID must be unique } else if (changeKeyNoWhitespace && allWorkersByKey[changeKeyNoWhitespace]) { // this worker is a duplicate - csvWorkerSchemaErrors.push(thisWorker.addChgDuplicate(allWorkersByKey[keyNoWhitespace])); + csvWorkerSchemaErrors.push(thisWorker.addChgDuplicate(thisWorker.changeUniqueWorker)); // remove the entity delete myAPIWorkers[thisWorker.lineNumber]; From 0800483d2ddc1486808d63e7b246805c5939a91f Mon Sep 17 00:00:00 2001 From: Manish Kumar Srivastava Date: Mon, 9 Mar 2020 17:26:10 +0530 Subject: [PATCH 119/305] Changed view report content (#2028) (cherry picked from commit bed1042657bc3e080b344c6e4db017f1de722037) --- .../home-tab/home-tab.component.html | 57 +++++++++++-------- 1 file changed, 32 insertions(+), 25 deletions(-) diff --git a/src/app/features/dashboard/home-tab/home-tab.component.html b/src/app/features/dashboard/home-tab/home-tab.component.html index 5524f049da..5e001b7ccf 100644 --- a/src/app/features/dashboard/home-tab/home-tab.component.html +++ b/src/app/features/dashboard/home-tab/home-tab.component.html @@ -4,55 +4,62 @@

    Home

    What you need to do first.

    - Add workplace - information -
    + Add workplace information +
    Add staff records     - -
    -

    - Add a staff record -

    +

    + + Add a staff record + +

    - Create staff records for your workplace by providing current work - information, personal details, employment and qualifications and - training information. + Create staff records for your workplace by providing current work information, personal details, employment + and qualifications and training information.

    -

    - View reports -

    +

    + + View reports + +

    - Access the Workplace Development Fund report, the CQC Provider - Information Return report and the Local Authority Progress Report. + View your Workplace Development Fund report to check whether you’re eligible to claim funding towards training + and qualifications.

    -

    - Bulk upload -

    +

    + + Bulk upload + +

    - Bulk upload is used to edit large quantities of staff, workplace and - training information. + Bulk upload is used to edit large quantities of staff, workplace and training information.

    - + " + >

    Related content

    - \ No newline at end of file + From 7ad4e254ea2bfd068da975a7df439bdec8b7fe5c Mon Sep 17 00:00:00 2001 From: Aaron Russell Date: Tue, 10 Mar 2020 10:39:42 +0000 Subject: [PATCH 120/305] Changes workplace to workforce --- src/app/features/dashboard/home-tab/home-tab.component.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/features/dashboard/home-tab/home-tab.component.html b/src/app/features/dashboard/home-tab/home-tab.component.html index 5e001b7ccf..db9978f8d7 100644 --- a/src/app/features/dashboard/home-tab/home-tab.component.html +++ b/src/app/features/dashboard/home-tab/home-tab.component.html @@ -34,7 +34,7 @@

    - View your Workplace Development Fund report to check whether you’re eligible to claim funding towards training + View your Workforce Development Fund report to check whether you’re eligible to claim funding towards training and qualifications.

    From bccb5f053fcc12fde9d45c6c61398983c9d340af Mon Sep 17 00:00:00 2001 From: Aaron Russell Date: Wed, 26 Feb 2020 11:58:02 +0000 Subject: [PATCH 121/305] Added rule for service uers, need to sort TOTALPERMTEMP --- server/models/BulkImport/csv/establishments.js | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/server/models/BulkImport/csv/establishments.js b/server/models/BulkImport/csv/establishments.js index cd30d45951..91eada1629 100644 --- a/server/models/BulkImport/csv/establishments.js +++ b/server/models/BulkImport/csv/establishments.js @@ -1069,6 +1069,7 @@ class Establishment { const localValidationErrors = []; if (this._currentLine.SERVICEUSERS && this._currentLine.SERVICEUSERS.length > 0) { + // which is not valid const isValid = this._currentLine.SERVICEUSERS.length ? listOfServiceUsers.every(thisService => !Number.isNaN(parseInt(thisService, 10))) : true; if (!isValid) { localValidationErrors.push({ @@ -1258,23 +1259,24 @@ class Establishment { const MAX_TOTAL = 999; const myTotalPermTemp = parseInt(this._currentLine.TOTALPERMTEMP, 10); const HEAD_OFFICE_MAIN_SERVICE = 72; + console.log('Total Perm Temp', this._currentLine.TOTALPERMTEMP); - if (Number.isNaN(myTotalPermTemp)) { + if (myTotalPermTemp.length === 0) { this._validationErrors.push({ lineNumber: this._lineNumber, errCode: Establishment.TOTAL_PERM_TEMP_ERROR, errType: 'TOTAL_PERM_TEMP_ERROR', - error: 'Total Permanent and Temporary (TOTALPERMTEMP) must be an whole number', + error: 'TOTALPERMTEMP is missing', source: this._currentLine.PERMCQC, name: this._currentLine.LOCALESTID }); return false; - } else if (myTotalPermTemp < 0 || myTotalPermTemp > MAX_TOTAL) { + } else if (myTotalPermTemp < 0 || myTotalPermTemp > MAX_TOTAL || Number.isNaN(myTotalPermTemp)) { this._validationErrors.push({ lineNumber: this._lineNumber, errCode: Establishment.TOTAL_PERM_TEMP_ERROR, errType: 'TOTAL_PERM_TEMP_ERROR', - error: `Total Permanent and Temporary (TOTALPERMTEMP) must be 0 or more, but less than ${MAX_TOTAL}`, + error: `TOTALPERMTEMP must be a number from 0 to ${MAX_TOTAL} if this is correct call support on 0113 241 0969`, source: myTotalPermTemp, name: this._currentLine.LOCALESTID }); @@ -1764,9 +1766,9 @@ class Establishment { } else { this._validationErrors.push({ lineNumber: this._lineNumber, - errCode: Establishment.SERVICE_USERS_ERROR, - errType: 'SERVICE_USERS_ERROR', - error: `Service Users (SERVICEUSERS): ${thisService} is unknown`, + warnCode: Establishment.SERVICE_USERS_ERROR, + warnType: 'SERVICE_USERS_ERROR', + warning: `Entry for code ${thisService} in SERVICEUSERS will be ignored as this is invalid`, source: this._currentLine.SERVICEUSERS, name: this._currentLine.LOCALESTID }); From 75090fe865bfd1319d2bb86ea072d5b5d68aa3b2 Mon Sep 17 00:00:00 2001 From: Aaron Russell Date: Fri, 28 Feb 2020 09:12:14 +0000 Subject: [PATCH 122/305] Added worker validation if not CQC regulaated but have RM --- server/models/BulkImport/csv/workers.js | 48 ++++++++++++++++++++++ server/routes/establishments/bulkUpload.js | 10 ++++- 2 files changed, 57 insertions(+), 1 deletion(-) diff --git a/server/models/BulkImport/csv/workers.js b/server/models/BulkImport/csv/workers.js index 4bf6485db1..f3561c1060 100644 --- a/server/models/BulkImport/csv/workers.js +++ b/server/models/BulkImport/csv/workers.js @@ -1414,6 +1414,24 @@ class Worker { } } + async _crossValidateMainJobRole(csvWorkerSchemaErrors, cqcRegEstablishment) { + const template = { + worker: this._currentLine.UNIQUEWORKERID, + name: this._currentLine.LOCALESTID, + lineNumber: this._lineNumber, + errCode: Worker.MAIN_JOB_ROLE_ERROR, + errType: 'MAIN_JOB_ROLE_ERROR', + source: this._currentLine.MAINJOBROLE + }; + + console.log(cqcRegEstablishment, this.mainJobRoleId); + if (!cqcRegEstablishment && this.mainJobRoleId === 4) { + csvWorkerSchemaErrors.unshift(Object.assign(template, { + error: 'Workers MAINJOBROLE is Registered Manager but you are not providing a CQC regulated service. Please change to another Job Role' + })); + } + } + _validateMainJobDesc () { const myMainJobDesc = this._currentLine.MAINJRDESC; const MAX_LENGTH = 120; @@ -2611,6 +2629,36 @@ class Worker { return true; } + async crossValidate ({ + csvWorkerSchemaErrors, + myEstablishments + }) { + // if worker isn't being added or updated then exit early + if (!(['NEW', 'UPDATE'].includes(this._status))) { + return; + } + let cqcRegEstablishment = false; + + myEstablishments.forEach(establishment => { + if (this.establishmentKey === establishment.key) { + console.log('Found establishment'); + switch (establishment.status) { + case 'NEW': + case 'UPDATE': { + cqcRegEstablishment = establishment.regType === 2; + } + /* fall through */ + + case 'DELETE': + break; + } + } + }); + + // ensure worker jobs tally up on TOTALPERMTEMP field, but only do it for new or updated establishments + this._crossValidateMainJobRole(csvWorkerSchemaErrors, cqcRegEstablishment); + } + // returns true on success, false is any attribute of Worker fails validate () { let status = true; diff --git a/server/routes/establishments/bulkUpload.js b/server/routes/establishments/bulkUpload.js index 8310329647..9ccd56c184 100644 --- a/server/routes/establishments/bulkUpload.js +++ b/server/routes/establishments/bulkUpload.js @@ -823,7 +823,7 @@ const validateEstablishmentCsv = async ( await lineValidator.validate(); if (!lineValidator._ignore) { lineValidator.transform(); - + const thisEstablishmentAsAPI = lineValidator.toAPI(); try { @@ -1321,6 +1321,14 @@ const validateBulkUploadFiles = async ( }); })); + // Run validations that require information about establishments + await Promise.all(myWorkers.map(async worker => { + await worker.crossValidate({ + csvWorkerSchemaErrors, + myEstablishments + }); + })); + // ///////////////////////// // Prepare validation results From d42f2a3a1015fa0f931d0540eb6439fb499e9607 Mon Sep 17 00:00:00 2001 From: Aaron Russell Date: Fri, 28 Feb 2020 09:12:27 +0000 Subject: [PATCH 123/305] Fixed establishment unit tests --- .../Bulkimport/csv/establishments.spec.js | 1580 +---------------- 1 file changed, 48 insertions(+), 1532 deletions(-) diff --git a/server/test/unit/models/Bulkimport/csv/establishments.spec.js b/server/test/unit/models/Bulkimport/csv/establishments.spec.js index 90c00cbfd3..d86a32658e 100644 --- a/server/test/unit/models/Bulkimport/csv/establishments.spec.js +++ b/server/test/unit/models/Bulkimport/csv/establishments.spec.js @@ -1141,6 +1141,7 @@ describe('/server/models/Bulkimport/csv/establishment.js', () => { const validationErrors = bulkUpload.validationErrors; // assert a warning was returned + expect(validationErrors).to.deep.equal([ { origin: 'Establishments', @@ -1421,141 +1422,58 @@ describe('/server/models/Bulkimport/csv/establishment.js', () => { _logLevel: 300 }, { - LOCALESTID: 'omar3', - STATUS: 'NEW', - ESTNAME: 'WOZiTech, with even more care', - ADDRESS1: 'First Line', - ADDRESS2: 'Second Line', - ADDRESS3: '', - POSTTOWN: 'My Town', - POSTCODE: 'LN11 9JG', - ESTTYPE: '6', - OTHERTYPE: '', - PERMCQC: '1', - PERMLA: '1', - SHARELA: '708;721;720', - REGTYPE: '2', - PROVNUM: '1-12345678', - LOCATIONID: '1-12345678', - MAINSERVICE: '8', - ALLSERVICES: '12;13', - CAPACITY: '0;0', - UTILISATION: '0;0', - SERVICEDESC: '1;1', - SERVICEUSERS: '', - OTHERUSERDESC: '', - TOTALPERMTEMP: '1', - ALLJOBROLES: '34;8;4', - STARTERS: '0;0;0', - LEAVERS: '999;0;0', - VACANCIES: '999;333;1', - REASONS: '', - REASONNOS: '' - }, - 2, - [ - { - _validations: [], - _username: 'aylingw', - _id: 479, - _uid: '98a83eef-e1e1-49f3-89c5-b1287a3cc8dd', - _ustatus: null, - _created: '2019-03-15T09:54:10.562Z', - _updated: '2019-10-04T15:46:16.158Z', - _updatedBy: 'aylingw', + _validations: [], + _username: 'aylingw', + _id: 1446, + _uid: 'a415435f-40f2-4de5-abf7-bff611e85591', + _ustatus: null, + _created: '2019-07-31T15:09:57.405Z', + _updated: '2019-10-04T15:46:16.797Z', + _updatedBy: 'aylingw', + _auditEvents: null, + _name: 'WOZiTech Cares Sub 100', + _address1: 'Number 1', + _address2: 'My street', + _address3: '', + _town: 'My Town', + _county: '', + _locationId: '1-888777666', + _provId: '1-999888777', + _postcode: 'LN11 9JG', + _isRegulated: true, + _mainService: { id: 1, name: 'Carers support' }, + _nmdsId: 'G1002110', + _lastWdfEligibility: '2019-10-04T15:46:16.797Z', + _overallWdfEligibility: null, + _establishmentWdfEligibility: '2019-10-04T14:46:16.797Z', + _staffWdfEligibility: null, + _isParent: false, + _parentUid: '98a83eef-e1e1-49f3-89c5-b1287a3cc8dd', + _parentId: 479, + _parentName: null, + _dataOwner: 'Parent', + _dataPermissions: 'None', + _archived: false, + _dataOwnershipRequested: null, + _reasonsForLeaving: '', + _properties: { + _properties: [Object], + _propertyTypes: [Array], _auditEvents: null, - _name: 'WOZiTech, with even more care', - _address1: 'First Line', - _address2: 'Second Line', - _address3: '', - _town: 'My Town', - _county: '', - _locationId: null, - _provId: null, - _postcode: 'LN11 9JG', - _isRegulated: false, - _mainService: { id: 16, name: 'Head office services' }, - _nmdsId: 'G1001114', - _lastWdfEligibility: '2019-08-16T07:17:38.014Z', - _overallWdfEligibility: '2019-08-16T07:17:38.340Z', - _establishmentWdfEligibility: null, - _staffWdfEligibility: '2019-08-13T12:41:24.836Z', - _isParent: true, - _parentUid: null, - _parentId: null, - _parentName: null, - _dataOwner: 'Workplace', - _dataPermissions: 'None', - _archived: false, - _dataOwnershipRequested: null, - _reasonsForLeaving: '', - _properties: { - _properties: [Object], - _propertyTypes: [Array], - _auditEvents: null, - _modifiedProperties: [], - _additionalModels: null - }, - _isNew: false, - _workerEntities: { - }, - _readyForDeletionWorkers: null, - _status: 'NEW', - _logLevel: 300 + _modifiedProperties: [], + _additionalModels: null }, - { - _validations: [], - _username: 'aylingw', - _id: 1446, - _uid: 'a415435f-40f2-4de5-abf7-bff611e85591', - _ustatus: null, - _created: '2019-07-31T15:09:57.405Z', - _updated: '2019-10-04T15:46:16.797Z', - _updatedBy: 'aylingw', - _auditEvents: null, - _name: 'WOZiTech Cares Sub 100', - _address1: 'Number 1', - _address2: 'My street', - _address3: '', - _town: 'My Town', - _county: '', - _locationId: '1-888777666', - _provId: '1-999888777', - _postcode: 'LN11 9JG', - _isRegulated: true, - _mainService: { id: 1, name: 'Carers support' }, - _nmdsId: 'G1002110', - _lastWdfEligibility: '2019-10-04T15:46:16.797Z', - _overallWdfEligibility: null, - _establishmentWdfEligibility: '2019-10-04T14:46:16.797Z', - _staffWdfEligibility: null, - _isParent: false, - _parentUid: '98a83eef-e1e1-49f3-89c5-b1287a3cc8dd', - _parentId: 479, - _parentName: null, - _dataOwner: 'Parent', - _dataPermissions: 'None', - _archived: false, - _dataOwnershipRequested: null, - _reasonsForLeaving: '', - _properties: { - _properties: [Object], - _propertyTypes: [Array], - _auditEvents: null, - _modifiedProperties: [], - _additionalModels: null - }, - _isNew: false, - _workerEntities: {}, - _readyForDeletionWorkers: null, - _status: 'COMPLETE', - _logLevel: 300 - } - ]); + _isNew: false, + _workerEntities: {}, + _readyForDeletionWorkers: null, + _status: 'COMPLETE', + _logLevel: 300 + } + ]); expect(bulkUpload).to.have.property('validate'); - const csvEstablishmentSchemaErrors = []; + const csvEstablishmentSchemaErrors = []; const myWorkers = []; @@ -2796,1408 +2714,6 @@ it('should not emit an error if postcode can be found in the reference data', as // }); }); - describe('cross entity validations', () => { - it('should an error if cqc registered and have no registered manager vacancy or registered manager staff member', async () => { - const bulkUpload = new (testUtils.sandBox( - filename, - { - locals: { - require: testUtils.wrapRequire({ - '../BUDI': { - BUDI - }, - '../../index': { - establishment: models.establishment, - pcodedata: models.pcodedata - } - }) - } - } - ).Establishment)( - { - LOCALESTID: 'omar3', - STATUS: 'UPDATE', - ESTNAME: 'WOZiTech, with even more care', - ADDRESS1: 'First Line', - ADDRESS2: 'Second Line', - ADDRESS3: '', - POSTTOWN: 'My Town', - POSTCODE: 'AB13 4NJ', - ESTTYPE: '6', - OTHERTYPE: '', - PERMCQC: '1', - PERMLA: '1', - SHARELA: '708;721;720', - REGTYPE: '2', - PROVNUM: '1-123456781', - LOCATIONID: '1-123456781', - MAINSERVICE: '8', - ALLSERVICES: '12;13', - CAPACITY: '0;0', - UTILISATION: '0;0', - SERVICEDESC: '1;1', - SERVICEUSERS: '', - OTHERUSERDESC: '', - TOTALPERMTEMP: '1', - ALLJOBROLES: '34;8', - STARTERS: '0;0', - LEAVERS: '999;0', - VACANCIES: '999;333', - REASONS: '', - REASONNOS: '' - }, - 2, - [ - { - _validations: [], - _username: 'aylingw', - _id: 479, - _uid: '98a83eef-e1e1-49f3-89c5-b1287a3cc8dd', - _ustatus: null, - _created: '2019-03-15T09:54:10.562Z', - _updated: '2019-10-04T15:46:16.158Z', - _updatedBy: 'aylingw', - _auditEvents: null, - _name: 'WOZiTech, with even more care', - _address1: 'First Line', - _address2: 'Second Line', - _address3: '', - _town: 'My Town', - _county: '', - _locationId: 'A-328849599', - _provId: null, - _postcode: 'LN11 9JG', - _isRegulated: false, - _mainService: { id: 16, name: 'Head office services' }, - _nmdsId: 'G1001114', - _lastWdfEligibility: '2019-08-16T07:17:38.014Z', - _overallWdfEligibility: '2019-08-16T07:17:38.340Z', - _establishmentWdfEligibility: null, - _staffWdfEligibility: '2019-08-13T12:41:24.836Z', - _isParent: true, - _parentUid: null, - _parentId: null, - _parentName: null, - _dataOwner: 'Workplace', - _dataPermissions: 'None', - _archived: false, - _dataOwnershipRequested: null, - _reasonsForLeaving: '', - _properties: { - _properties: [Object], - _propertyTypes: [Array], - _auditEvents: null, - _modifiedProperties: [], - _additionalModels: null - }, - _isNew: false, - _workerEntities: { - }, - _readyForDeletionWorkers: null, - _status: 'NEW', - _logLevel: 300 - }, - { - _validations: [], - _username: 'aylingw', - _id: 1446, - _uid: 'a415435f-40f2-4de5-abf7-bff611e85591', - _ustatus: null, - _created: '2019-07-31T15:09:57.405Z', - _updated: '2019-10-04T15:46:16.797Z', - _updatedBy: 'aylingw', - _auditEvents: null, - _name: 'WOZiTech Cares Sub 100', - _address1: 'Number 1', - _address2: 'My street', - _address3: '', - _town: 'My Town', - _county: '', - _locationId: '1-888777666', - _provId: '1-999888777', - _postcode: 'LN11 9JG', - _isRegulated: true, - _mainService: { id: 1, name: 'Carers support' }, - _nmdsId: 'G1002110', - _lastWdfEligibility: '2019-10-04T15:46:16.797Z', - _overallWdfEligibility: null, - _establishmentWdfEligibility: '2019-10-04T14:46:16.797Z', - _staffWdfEligibility: null, - _isParent: false, - _parentUid: '98a83eef-e1e1-49f3-89c5-b1287a3cc8dd', - _parentId: 479, - _parentName: null, - _dataOwner: 'Parent', - _dataPermissions: 'None', - _archived: false, - _dataOwnershipRequested: null, - _reasonsForLeaving: '', - _properties: { - _properties: [Object], - _propertyTypes: [Array], - _auditEvents: null, - _modifiedProperties: [], - _additionalModels: null - }, - _isNew: false, - _workerEntities: {}, - _readyForDeletionWorkers: null, - _status: 'COMPLETE', - _logLevel: 300 - } - ]); - - expect(bulkUpload).to.have.property('validate'); - - const csvEstablishmentSchemaErrors = []; - - const myWorkers = [{ - status: 'UPDATE', - establishmentKey: 'omar3', - mainJobRoleId: 3, - otherJobIds: [6] - }]; - - // the real version of this code is in the api Establishment business object and runs a sql query. - // We just return a 'fake result set' - const fetchMyEstablishmentsWorkers = sinon.spy(async (establishmentId, establishmentKey) => { - return []; - }); - - // call the validation to ensure the proper error is shown - await bulkUpload.validate(); - - const validationErrors = bulkUpload.validationErrors; - - // assert a warning was returned - expect(csvEstablishmentSchemaErrors.length).to.equal(1); - - expect(csvEstablishmentSchemaErrors[0]).to.deep.equal({ - lineNumber: 2, - name: 'omar3', - origin: 'Establishments', - source: '34;8', - errCode: 1280, - errType: 'ALL_JOBS_ERROR', - error: 'You do not have a staff record for a Registered Manager therefore must record a vacancy for one' - }); - }); - it('should not an error if cqc registered and have registered manager vacancy or registered manager staff member (as main)', async () => { - const bulkUpload = new (testUtils.sandBox( - filename, - { - locals: { - require: testUtils.wrapRequire({ - '../BUDI': { - BUDI - }, - '../../index': { - establishment: models.establishment, - pcodedata: models.pcodedata - } - }) - } - } - ]); - }); - it('should not emit an error if locationId has already been used in the database and is this establishment', async () => { - const bulkUpload = new (testUtils.sandBox( - filename, - { - locals: { - require: testUtils.wrapRequire({ - '../BUDI': { - BUDI - }, - '../../index': { - establishment: models.establishment - } - }) - } - } - ).Establishment)( - { - LOCALESTID: '123', - STATUS: 'UPDATE', - ESTNAME: 'WOZiTech, with even more care', - ADDRESS1: 'First Line', - ADDRESS2: 'Second Line', - ADDRESS3: '', - POSTTOWN: 'My Town', - POSTCODE: 'LN11 9JG', - ESTTYPE: '6', - OTHERTYPE: '', - PERMCQC: '1', - PERMLA: '1', - SHARELA: '708;721;720', - REGTYPE: '2', - PROVNUM: '1-123456780', - LOCATIONID: '1-123456780', - MAINSERVICE: '8', - ALLSERVICES: '12;13', - CAPACITY: '0;0', - UTILISATION: '0;0', - SERVICEDESC: '1;1', - SERVICEUSERS: '', - OTHERUSERDESC: '', - TOTALPERMTEMP: '1', - ALLJOBROLES: '34;8;4', - STARTERS: '0;0;0', - LEAVERS: '999;0;0', - VACANCIES: '999;333;1', - REASONS: '', - REASONNOS: '' - }, - 2, - [ - { - LOCALESTID: 'omar3', - STATUS: 'UPDATE', - ESTNAME: 'WOZiTech, with even more care', - ADDRESS1: 'First Line', - ADDRESS2: 'Second Line', - ADDRESS3: '', - POSTTOWN: 'My Town', - POSTCODE: 'AB13 4NJ', - ESTTYPE: '6', - OTHERTYPE: '', - PERMCQC: '1', - PERMLA: '1', - SHARELA: '708;721;720', - REGTYPE: '2', - PROVNUM: '1-123456781', - LOCATIONID: '1-123456781', - MAINSERVICE: '8', - ALLSERVICES: '12;13', - CAPACITY: '0;0', - UTILISATION: '0;0', - SERVICEDESC: '1;1', - SERVICEUSERS: '', - OTHERUSERDESC: '', - TOTALPERMTEMP: '1', - ALLJOBROLES: '34;8', - STARTERS: '0;0', - LEAVERS: '999;0', - VACANCIES: '999;333', - REASONS: '', - REASONNOS: '' - }, - 2, - [ - { - _validations: [], - _username: 'aylingw', - _id: 479, - _uid: '98a83eef-e1e1-49f3-89c5-b1287a3cc8dd', - _ustatus: null, - _created: '2019-03-15T09:54:10.562Z', - _updated: '2019-10-04T15:46:16.158Z', - _updatedBy: 'aylingw', - _auditEvents: null, - _modifiedProperties: [], - _additionalModels: null - }, - _isNew: false, - _workerEntities: { - }, - _readyForDeletionWorkers: null, - _status: 'NEW', - _logLevel: 300, - key: '123' - }, - { - _validations: [], - _username: 'aylingw', - _id: 1446, - _uid: 'a415435f-40f2-4de5-abf7-bff611e85591', - _ustatus: null, - _created: '2019-07-31T15:09:57.405Z', - _updated: '2019-10-04T15:46:16.797Z', - _updatedBy: 'aylingw', - _auditEvents: null, - _name: 'WOZiTech Cares Sub 100', - _address1: 'Number 1', - _address2: 'My street', - _address3: '', - _town: 'My Town', - _county: '', - _locationId: '1-888777666', - _provId: '1-999888777', - _postcode: 'LN11 9JG', - _isRegulated: true, - _mainService: { id: 1, name: 'Carers support' }, - _nmdsId: 'G1002110', - _lastWdfEligibility: '2019-10-04T15:46:16.797Z', - _overallWdfEligibility: null, - _establishmentWdfEligibility: '2019-10-04T14:46:16.797Z', - _staffWdfEligibility: null, - _isParent: false, - _parentUid: '98a83eef-e1e1-49f3-89c5-b1287a3cc8dd', - _parentId: 479, - _parentName: null, - _dataOwner: 'Parent', - _dataPermissions: 'None', - _archived: false, - _dataOwnershipRequested: null, - _reasonsForLeaving: '', - _properties: { - _properties: [Object], - _propertyTypes: [Array], - _auditEvents: null, - _modifiedProperties: [], - _additionalModels: null - }, - _isNew: false, - _workerEntities: {}, - _readyForDeletionWorkers: null, - _status: 'COMPLETE', - _logLevel: 300 - } - ]); - - expect(bulkUpload).to.have.property('validate'); - - const csvEstablishmentSchemaErrors = []; - - const myWorkers = [{ - status: 'UPDATE', - establishmentKey: 'omar3', - mainJobRoleId: 4, - otherJobIds: [] - }]; - - // the real version of this code is in the api Establishment business object and runs a sql query. - // We just return a 'fake result set' - const fetchMyEstablishmentsWorkers = sinon.spy(async (establishmentId, establishmentKey) => { - return []; - }); - - // Regular validation has to run first for the establishment to populate the internal properties correctly - await bulkUpload.validate(); - - // call the method - await bulkUpload.crossValidate({ - csvEstablishmentSchemaErrors, - myWorkers, - fetchMyEstablishmentsWorkers - }); - - // assert the fetchMyEstalishmentsWorkers function was called - expect(fetchMyEstablishmentsWorkers.callCount).to.equal(1); - // assert a warning was returned - expect(csvEstablishmentSchemaErrors.length).to.equal(0); - - expect(csvEstablishmentSchemaErrors[0]).to.deep.equal(); - }); - it('should not an error if cqc registered and have registered manager vacancy or registered manager staff member (as other)', async () => { - const bulkUpload = new (testUtils.sandBox( - filename, - { - locals: { - require: testUtils.wrapRequire({ - '../BUDI': { - BUDI - }, - '../../index': { - establishment: models.establishment, - pcodedata: models.pcodedata - } - }) - } - } - ).Establishment)( - { - LOCALESTID: 'omar3', - STATUS: 'UPDATE', - ESTNAME: 'WOZiTech, with even more care', - ADDRESS1: 'First Line', - ADDRESS2: 'Second Line', - ADDRESS3: '', - POSTTOWN: 'My Town', - POSTCODE: 'AB13 4NJ', - ESTTYPE: '6', - OTHERTYPE: '', - PERMCQC: '1', - PERMLA: '1', - SHARELA: '708;721;720', - REGTYPE: '2', - PROVNUM: '1-123456781', - LOCATIONID: '1-123456781', - MAINSERVICE: '8', - ALLSERVICES: '12;13', - CAPACITY: '0;0', - UTILISATION: '0;0', - SERVICEDESC: '1;1', - SERVICEUSERS: '', - OTHERUSERDESC: '', - TOTALPERMTEMP: '1', - ALLJOBROLES: '34;8', - STARTERS: '0;0', - LEAVERS: '999;0', - VACANCIES: '999;333', - REASONS: '', - REASONNOS: '' - }, - 2, - [ - { - _validations: [], - _username: 'aylingw', - _id: 479, - _uid: '98a83eef-e1e1-49f3-89c5-b1287a3cc8dd', - _ustatus: null, - _created: '2019-03-15T09:54:10.562Z', - _updated: '2019-10-04T15:46:16.158Z', - _updatedBy: 'aylingw', - _auditEvents: null, - _name: 'WOZiTech, with even more care', - _address1: 'First Line', - _address2: 'Second Line', - _address3: '', - _town: 'My Town', - _county: '', - _locationId: 'A-328849599', - _provId: null, - _postcode: 'LN11 9JG', - _isRegulated: false, - _mainService: { id: 16, name: 'Head office services' }, - _nmdsId: 'G1001114', - _lastWdfEligibility: '2019-08-16T07:17:38.014Z', - _overallWdfEligibility: '2019-08-16T07:17:38.340Z', - _establishmentWdfEligibility: null, - _staffWdfEligibility: '2019-08-13T12:41:24.836Z', - _isParent: true, - _parentUid: null, - _parentId: null, - _parentName: null, - _dataOwner: 'Workplace', - _dataPermissions: 'None', - _archived: false, - _dataOwnershipRequested: null, - _reasonsForLeaving: '', - _properties: { - _properties: [Object], - _propertyTypes: [Array], - _auditEvents: null, - _modifiedProperties: [], - _additionalModels: null - }, - _isNew: false, - _workerEntities: { - }, - _readyForDeletionWorkers: null, - _status: 'NEW', - _logLevel: 300 - }, - { - _validations: [], - _username: 'aylingw', - _id: 1446, - _uid: 'a415435f-40f2-4de5-abf7-bff611e85591', - _ustatus: null, - _created: '2019-07-31T15:09:57.405Z', - _updated: '2019-10-04T15:46:16.797Z', - _updatedBy: 'aylingw', - _auditEvents: null, - _name: 'WOZiTech Cares Sub 100', - _address1: 'Number 1', - _address2: 'My street', - _address3: '', - _town: 'My Town', - _county: '', - _locationId: '1-888777666', - _provId: '1-999888777', - _postcode: 'LN11 9JG', - _isRegulated: true, - _mainService: { id: 1, name: 'Carers support' }, - _nmdsId: 'G1002110', - _lastWdfEligibility: '2019-10-04T15:46:16.797Z', - _overallWdfEligibility: null, - _establishmentWdfEligibility: '2019-10-04T14:46:16.797Z', - _staffWdfEligibility: null, - _isParent: false, - _parentUid: '98a83eef-e1e1-49f3-89c5-b1287a3cc8dd', - _parentId: 479, - _parentName: null, - _dataOwner: 'Parent', - _dataPermissions: 'None', - _archived: false, - _dataOwnershipRequested: null, - _reasonsForLeaving: '', - _properties: { - _properties: [Object], - _propertyTypes: [Array], - _auditEvents: null, - _modifiedProperties: [], - _additionalModels: null - }, - _isNew: false, - _workerEntities: {}, - _readyForDeletionWorkers: null, - _status: 'COMPLETE', - _logLevel: 300 - } - ]); - - expect(bulkUpload).to.have.property('crossValidate'); - - const csvEstablishmentSchemaErrors = []; - - const myWorkers = [{ - status: 'UPDATE', - establishmentKey: 'omar3', - mainJobRoleId: 3, - otherJobIds: [4] - }]; - - // the real version of this code is in the api Establishment business object and runs a sql query. - // We just return a 'fake result set' - const fetchMyEstablishmentsWorkers = sinon.spy(async (establishmentId, establishmentKey) => { - return []; - }); - - expect(bulkUpload).to.have.property('validate'); - - const csvEstablishmentSchemaErrors = []; - - const myWorkers = []; - - // assert a warning was returned - expect(csvEstablishmentSchemaErrors.length).to.equal(0); - - expect(csvEstablishmentSchemaErrors[0]).to.deep.equal(); - }); - // it('should emit a warning if there are zero staff', async () => { - // const bulkUpload = new (testUtils.sandBox( - // filename, - // { - // locals: { - // require: testUtils.wrapRequire({ - // '../BUDI': { - // BUDI - // } - // }) - // } - // } - // ).Establishment)( - // { - // LOCALESTID: 'omar3', - // STATUS: 'UPDATE', - // ESTNAME: 'WOZiTech, with even more care', - // ADDRESS1: 'First Line', - // ADDRESS2: 'Second Line', - // ADDRESS3: '', - // POSTTOWN: 'My Town', - // POSTCODE: 'LN11 9JG', - // ESTTYPE: '6', - // OTHERTYPE: '', - // PERMCQC: '1', - // PERMLA: '1', - // SHARELA: '708;721;720', - // REGTYPE: '0', - // PROVNUM: '', - // LOCATIONID: '', - // MAINSERVICE: '72', - // ALLSERVICES: '72;13', - // CAPACITY: '', - // UTILISATION: '', - // SERVICEDESC: '1;1', - // SERVICEUSERS: '', - // OTHERUSERDESC: '', - // TOTALPERMTEMP: '0', - // ALLJOBROLES: '34;8', - // STARTERS: '0;0', - // LEAVERS: '999', - // VACANCIES: '999;333', - // REASONS: '', - // REASONNOS: '' - // }, - // 2, - // [ - // { - // _validations: [], - // _username: 'aylingw', - // _id: 479, - // _uid: '98a83eef-e1e1-49f3-89c5-b1287a3cc8dd', - // _ustatus: null, - // _created: '2019-03-15T09:54:10.562Z', - // _updated: '2019-10-04T15:46:16.158Z', - // _updatedBy: 'aylingw', - // _auditEvents: null, - // _name: 'WOZiTech, with even more care', - // _address1: 'First Line', - // _address2: 'Second Line', - // _address3: '', - // _town: 'My Town', - // _county: '', - // _locationId: 'A-328849599', - // _provId: null, - // _postcode: 'LN11 9JG', - // _isRegulated: false, - // _mainService: { id: 16, name: 'Head office services' }, - // _nmdsId: 'G1001114', - // _lastWdfEligibility: '2019-08-16T07:17:38.014Z', - // _overallWdfEligibility: '2019-08-16T07:17:38.340Z', - // _establishmentWdfEligibility: null, - // _staffWdfEligibility: '2019-08-13T12:41:24.836Z', - // _isParent: true, - // _parentUid: null, - // _parentId: null, - // _parentName: null, - // _dataOwner: 'Workplace', - // _dataPermissions: 'None', - // _archived: false, - // _dataOwnershipRequested: null, - // _reasonsForLeaving: '', - // _properties: { - // _properties: [Object], - // _propertyTypes: [Array], - // _auditEvents: null, - // _modifiedProperties: [], - // _additionalModels: null - // }, - // _isNew: false, - // _workerEntities: { - // }, - // _readyForDeletionWorkers: null, - // _status: 'NEW', - // _logLevel: 300 - // }, - // { - // _validations: [], - // _username: 'aylingw', - // _id: 1446, - // _uid: 'a415435f-40f2-4de5-abf7-bff611e85591', - // _ustatus: null, - // _created: '2019-07-31T15:09:57.405Z', - // _updated: '2019-10-04T15:46:16.797Z', - // _updatedBy: 'aylingw', - // _auditEvents: null, - // _name: 'WOZiTech Cares Sub 100', - // _address1: 'Number 1', - // _address2: 'My street', - // _address3: '', - // _town: 'My Town', - // _county: '', - // _locationId: '1-888777666', - // _provId: '1-999888777', - // _postcode: 'LN11 9JG', - // _isRegulated: true, - // _mainService: { id: 1, name: 'Carers support' }, - // _nmdsId: 'G1002110', - // _lastWdfEligibility: '2019-10-04T15:46:16.797Z', - // _overallWdfEligibility: null, - // _establishmentWdfEligibility: '2019-10-04T14:46:16.797Z', - // _staffWdfEligibility: null, - // _isParent: false, - // _parentUid: '98a83eef-e1e1-49f3-89c5-b1287a3cc8dd', - // _parentId: 479, - // _parentName: null, - // _dataOwner: 'Parent', - // _dataPermissions: 'None', - // _archived: false, - // _dataOwnershipRequested: null, - // _reasonsForLeaving: '', - // _properties: { - // _properties: [Object], - // _propertyTypes: [Array], - // _auditEvents: null, - // _modifiedProperties: [], - // _additionalModels: null - // }, - // _isNew: false, - // _workerEntities: {}, - // _readyForDeletionWorkers: null, - // _status: 'COMPLETE', - // _logLevel: 300 - // } - // ]); - - // expect(bulkUpload).to.have.property('crossValidate'); - - // const csvEstablishmentSchemaErrors = []; - - // const myWorkers = []; - - // // the real version of this code is in the api Establishment business object and runs a sql query. - // // We just return a 'fake result set' - // const fetchMyEstablishmentsWorkers = sinon.spy(async (establishmentId, establishmentKey) => { - // return []; - // }); - - // // Regular validation has to run first for the establishment to populate the internal properties correctly - // await bulkUpload.validate(); - - // // call the method - // await bulkUpload.crossValidate({ - // csvEstablishmentSchemaErrors, - // myWorkers, - // fetchMyEstablishmentsWorkers - // }); - - // // assert the fetchMyEstalishmentsWorkers function was called - // expect(fetchMyEstablishmentsWorkers.callCount).to.equal(1); - - // // assert a warning was returned - // expect(csvEstablishmentSchemaErrors.length).to.equal(1); - - // expect(csvEstablishmentSchemaErrors[0]).to.deep.equal({ - // lineNumber: 2, - // name: 'omar3', - // origin: 'Establishments', - // source: '0', - // warnCode: 2200, - // warnType: 'TOTAL_PERM_TEMP_WARNING', - // warning: 'The number of employed staff is 0 please check your staff records' - // }); - // }); - - // it('should emit a warning if there are no direct care staff', async () => { - // const bulkUpload = new (testUtils.sandBox( - // filename, - // { - // locals: { - // require: testUtils.wrapRequire({ - // '../BUDI': { - // BUDI - // } - // }) - // } - // } - // ).Establishment)( - // { - // LOCALESTID: 'omar3', - // STATUS: 'UPDATE', - // ESTNAME: 'WOZiTech, with even more care', - // ADDRESS1: 'First Line', - // ADDRESS2: 'Second Line', - // ADDRESS3: '', - // POSTTOWN: 'My Town', - // POSTCODE: 'LN11 9JG', - // ESTTYPE: '6', - // OTHERTYPE: '', - // PERMCQC: '1', - // PERMLA: '1', - // SHARELA: '708;721;720', - // REGTYPE: '2', - // PROVNUM: '', - // LOCATIONID: '', - // MAINSERVICE: '72', - // ALLSERVICES: '72;13', - // CAPACITY: '', - // UTILISATION: '', - // SERVICEDESC: '1;1', - // SERVICEUSERS: '', - // OTHERUSERDESC: '', - // TOTALPERMTEMP: '1', - // ALLJOBROLES: '34;8', - // STARTERS: '0;0', - // LEAVERS: '999', - // VACANCIES: '999;333', - // REASONS: '', - // REASONNOS: '' - // }, - // 2, - // [ - // { - // _validations: [], - // _username: 'aylingw', - // _id: 479, - // _uid: '98a83eef-e1e1-49f3-89c5-b1287a3cc8dd', - // _ustatus: null, - // _created: '2019-03-15T09:54:10.562Z', - // _updated: '2019-10-04T15:46:16.158Z', - // _updatedBy: 'aylingw', - // _auditEvents: null, - // _name: 'WOZiTech, with even more care', - // _address1: 'First Line', - // _address2: 'Second Line', - // _address3: '', - // _town: 'My Town', - // _county: '', - // _locationId: 'A-328849599', - // _provId: null, - // _postcode: 'LN11 9JG', - // _isRegulated: false, - // _mainService: { id: 16, name: 'Head office services' }, - // _nmdsId: 'G1001114', - // _lastWdfEligibility: '2019-08-16T07:17:38.014Z', - // _overallWdfEligibility: '2019-08-16T07:17:38.340Z', - // _establishmentWdfEligibility: null, - // _staffWdfEligibility: '2019-08-13T12:41:24.836Z', - // _isParent: true, - // _parentUid: null, - // _parentId: null, - // _parentName: null, - // _dataOwner: 'Workplace', - // _dataPermissions: 'None', - // _archived: false, - // _dataOwnershipRequested: null, - // _reasonsForLeaving: '', - // _properties: { - // _properties: [Object], - // _propertyTypes: [Array], - // _auditEvents: null, - // _modifiedProperties: [], - // _additionalModels: null - // }, - // _isNew: false, - // _workerEntities: { - // }, - // _readyForDeletionWorkers: null, - // _status: 'NEW', - // _logLevel: 300 - // }, - // { - // _validations: [], - // _username: 'aylingw', - // _id: 1446, - // _uid: 'a415435f-40f2-4de5-abf7-bff611e85591', - // _ustatus: null, - // _created: '2019-07-31T15:09:57.405Z', - // _updated: '2019-10-04T15:46:16.797Z', - // _updatedBy: 'aylingw', - // _auditEvents: null, - // _name: 'WOZiTech Cares Sub 100', - // _address1: 'Number 1', - // _address2: 'My street', - // _address3: '', - // _town: 'My Town', - // _county: '', - // _locationId: '1-888777666', - // _provId: '1-999888777', - // _postcode: 'LN11 9JG', - // _isRegulated: true, - // _mainService: { id: 1, name: 'Carers support' }, - // _nmdsId: 'G1002110', - // _lastWdfEligibility: '2019-10-04T15:46:16.797Z', - // _overallWdfEligibility: null, - // _establishmentWdfEligibility: '2019-10-04T14:46:16.797Z', - // _staffWdfEligibility: null, - // _isParent: false, - // _parentUid: '98a83eef-e1e1-49f3-89c5-b1287a3cc8dd', - // _parentId: 479, - // _parentName: null, - // _dataOwner: 'Parent', - // _dataPermissions: 'None', - // _archived: false, - // _dataOwnershipRequested: null, - // _reasonsForLeaving: '', - // _properties: { - // _properties: [Object], - // _propertyTypes: [Array], - // _auditEvents: null, - // _modifiedProperties: [], - // _additionalModels: null - // }, - // _isNew: false, - // _workerEntities: {}, - // _readyForDeletionWorkers: null, - // _status: 'COMPLETE', - // _logLevel: 300 - // } - // ]); - - // expect(bulkUpload).to.have.property('crossValidate'); - - // const csvEstablishmentSchemaErrors = []; - - // const myWorkers = [{ - // establishmentKey: 'omar3', - // status: 'UPDATE', - // uniqueWorker: '3', - // contractTypeId: 1, - // mainJobRoleId: 1, - // otherJobIds: [] - // }]; - - // // the real version of this code is in the api Establishment business object and runs a sql query. - // // We just return a 'fake result set' - // const fetchMyEstablishmentsWorkers = sinon.spy(async (establishmentId, establishmentKey) => { - // return []; - // }); - - // // Regular validation has to run first for the establishment to populate the internal properties correctly - // await bulkUpload.validate(); - - // // call the method - // await bulkUpload.crossValidate({ - // csvEstablishmentSchemaErrors, - // myWorkers, - // fetchMyEstablishmentsWorkers - // }); - - // // assert the fetchMyEstalishmentsWorkers function was called - // expect(fetchMyEstablishmentsWorkers.callCount).to.equal(1); - - // // assert a warning was returned - // expect(csvEstablishmentSchemaErrors.length).to.equal(1); - - // expect(csvEstablishmentSchemaErrors[0]).to.deep.equal({ - // lineNumber: 2, - // name: 'omar3', - // origin: 'Establishments', - // source: '1', - // warnCode: 2200, - // warnType: 'TOTAL_PERM_TEMP_WARNING', - // warning: 'The number of direct care staff is 0 please check your staff records' - // }); - // }); - - // it('should emit a warning if there no non-direct care staff', async () => { - // const bulkUpload = new (testUtils.sandBox( - // filename, - // { - // locals: { - // require: testUtils.wrapRequire({ - // '../BUDI': { - // BUDI - // } - // }) - // } - // } - // ).Establishment)( - // { - // LOCALESTID: 'omar3', - // STATUS: 'UPDATE', - // ESTNAME: 'WOZiTech, with even more care', - // ADDRESS1: 'First Line', - // ADDRESS2: 'Second Line', - // ADDRESS3: '', - // POSTTOWN: 'My Town', - // POSTCODE: 'LN11 9JG', - // ESTTYPE: '1', - // OTHERTYPE: '', - // PERMCQC: '1', - // PERMLA: '1', - // SHARELA: '708;721;720', - // REGTYPE: '2', - // PROVNUM: '', - // LOCATIONID: '', - // MAINSERVICE: '72', - // ALLSERVICES: '72;13', - // CAPACITY: '', - // UTILISATION: '', - // SERVICEDESC: '1;1', - // SERVICEUSERS: '', - // OTHERUSERDESC: '', - // TOTALPERMTEMP: '1', - // ALLJOBROLES: '34;8', - // STARTERS: '0;0', - // LEAVERS: '999', - // VACANCIES: '999;333', - // REASONS: '', - // REASONNOS: '' - // }, - // 2, - // [ - // { - // _validations: [], - // _username: 'aylingw', - // _id: 479, - // _uid: '98a83eef-e1e1-49f3-89c5-b1287a3cc8dd', - // _ustatus: null, - // _created: '2019-03-15T09:54:10.562Z', - // _updated: '2019-10-04T15:46:16.158Z', - // _updatedBy: 'aylingw', - // _auditEvents: null, - // _name: 'WOZiTech, with even more care', - // _address1: 'First Line', - // _address2: 'Second Line', - // _address3: '', - // _town: 'My Town', - // _county: '', - // _locationId: 'A-328849599', - // _provId: null, - // _postcode: 'LN11 9JG', - // _isRegulated: false, - // _mainService: { id: 16, name: 'Head office services' }, - // _nmdsId: 'G1001114', - // _lastWdfEligibility: '2019-08-16T07:17:38.014Z', - // _overallWdfEligibility: '2019-08-16T07:17:38.340Z', - // _establishmentWdfEligibility: null, - // _staffWdfEligibility: '2019-08-13T12:41:24.836Z', - // _isParent: true, - // _parentUid: null, - // _parentId: null, - // _parentName: null, - // _dataOwner: 'Workplace', - // _dataPermissions: 'None', - // _archived: false, - // _dataOwnershipRequested: null, - // _reasonsForLeaving: '', - // _properties: { - // _properties: [Object], - // _propertyTypes: [Array], - // _auditEvents: null, - // _modifiedProperties: [], - // _additionalModels: null - // }, - // _isNew: false, - // _workerEntities: { - // }, - // _readyForDeletionWorkers: null, - // _status: 'NEW', - // _logLevel: 300 - // }, - // { - // _validations: [], - // _username: 'aylingw', - // _id: 1446, - // _uid: 'a415435f-40f2-4de5-abf7-bff611e85591', - // _ustatus: null, - // _created: '2019-07-31T15:09:57.405Z', - // _updated: '2019-10-04T15:46:16.797Z', - // _updatedBy: 'aylingw', - // _auditEvents: null, - // _name: 'WOZiTech Cares Sub 100', - // _address1: 'Number 1', - // _address2: 'My street', - // _address3: '', - // _town: 'My Town', - // _county: '', - // _locationId: '1-888777666', - // _provId: '1-999888777', - // _postcode: 'LN11 9JG', - // _isRegulated: true, - // _mainService: { id: 1, name: 'Carers support' }, - // _nmdsId: 'G1002110', - // _lastWdfEligibility: '2019-10-04T15:46:16.797Z', - // _overallWdfEligibility: null, - // _establishmentWdfEligibility: '2019-10-04T14:46:16.797Z', - // _staffWdfEligibility: null, - // _isParent: false, - // _parentUid: '98a83eef-e1e1-49f3-89c5-b1287a3cc8dd', - // _parentId: 479, - // _parentName: null, - // _dataOwner: 'Parent', - // _dataPermissions: 'None', - // _archived: false, - // _dataOwnershipRequested: null, - // _reasonsForLeaving: '', - // _properties: { - // _properties: [Object], - // _propertyTypes: [Array], - // _auditEvents: null, - // _modifiedProperties: [], - // _additionalModels: null - // }, - // _isNew: false, - // _workerEntities: {}, - // _readyForDeletionWorkers: null, - // _status: 'COMPLETE', - // _logLevel: 300 - // } - // ]); - - // expect(bulkUpload).to.have.property('crossValidate'); - - // const csvEstablishmentSchemaErrors = []; - - // const myWorkers = [{ - // establishmentKey: 'omar3', - // status: 'UPDATE', - // uniqueWorker: '3', - // contractTypeId: 1, - // mainJobRoleId: 10, - // otherJobIds: [] - // }]; - - // // the real version of this code is in the api Establishment business object and runs a sql query. - // // We just return a 'fake result set' - // const fetchMyEstablishmentsWorkers = sinon.spy(async (establishmentId, establishmentKey) => { - // return []; - // }); - - // // Regular validation has to run first for the establishment to populate the internal properties correctly - // await bulkUpload.validate(); - - // // call the method - // await bulkUpload.crossValidate({ - // csvEstablishmentSchemaErrors, - // myWorkers, - // fetchMyEstablishmentsWorkers - // }); - - // // assert the fetchMyEstalishmentsWorkers function was called - // expect(fetchMyEstablishmentsWorkers.callCount).to.equal(1); - - // // assert a warning was returned - // expect(csvEstablishmentSchemaErrors.length).to.equal(1); - - // expect(csvEstablishmentSchemaErrors[0]).to.deep.equal({ - // lineNumber: 2, - // name: 'omar3', - // origin: 'Establishments', - // source: '1', - // warnCode: 2200, - // warnType: 'TOTAL_PERM_TEMP_WARNING', - // warning: 'The number of non-direct care staff is 0 please check your staff records' - // }); - // }); - - // it('should emit a warning if there are fewer employed staff than non employed staff', async () => { - // const bulkUpload = new (testUtils.sandBox( - // filename, - // { - // locals: { - // require: testUtils.wrapRequire({ - // '../BUDI': { - // BUDI - // } - // }) - // } - // } - // ).Establishment)( - // { - // LOCALESTID: 'omar3', - // STATUS: 'UPDATE', - // ESTNAME: 'WOZiTech, with even more care', - // ADDRESS1: 'First Line', - // ADDRESS2: 'Second Line', - // ADDRESS3: '', - // POSTTOWN: 'My Town', - // POSTCODE: 'LN11 9JG', - // ESTTYPE: '6', - // OTHERTYPE: '', - // PERMCQC: '1', - // PERMLA: '1', - // SHARELA: '708;721;720', - // REGTYPE: '0', - // PROVNUM: '', - // LOCATIONID: '', - // MAINSERVICE: '72', - // ALLSERVICES: '72;13', - // CAPACITY: '', - // UTILISATION: '', - // SERVICEDESC: '1;1', - // SERVICEUSERS: '', - // OTHERUSERDESC: '', - // TOTALPERMTEMP: '10', - // ALLJOBROLES: '34;8', - // STARTERS: '0;0', - // LEAVERS: '999', - // VACANCIES: '999;333', - // REASONS: '', - // REASONNOS: '' - // }, - // 2, - // [ - // { - // _validations: [], - // _username: 'aylingw', - // _id: 479, - // _uid: '98a83eef-e1e1-49f3-89c5-b1287a3cc8dd', - // _ustatus: null, - // _created: '2019-03-15T09:54:10.562Z', - // _updated: '2019-10-04T15:46:16.158Z', - // _updatedBy: 'aylingw', - // _auditEvents: null, - // _name: 'WOZiTech, with even more care', - // _address1: 'First Line', - // _address2: 'Second Line', - // _address3: '', - // _town: 'My Town', - // _county: '', - // _locationId: 'A-328849599', - // _provId: null, - // _postcode: 'LN11 9JG', - // _isRegulated: false, - // _mainService: { id: 16, name: 'Head office services' }, - // _nmdsId: 'G1001114', - // _lastWdfEligibility: '2019-08-16T07:17:38.014Z', - // _overallWdfEligibility: '2019-08-16T07:17:38.340Z', - // _establishmentWdfEligibility: null, - // _staffWdfEligibility: '2019-08-13T12:41:24.836Z', - // _isParent: true, - // _parentUid: null, - // _parentId: null, - // _parentName: null, - // _dataOwner: 'Workplace', - // _dataPermissions: 'None', - // _archived: false, - // _dataOwnershipRequested: null, - // _reasonsForLeaving: '', - // _properties: { - // _properties: [Object], - // _propertyTypes: [Array], - // _auditEvents: null, - // _modifiedProperties: [], - // _additionalModels: null - // }, - // _isNew: false, - // _workerEntities: { - // }, - // _readyForDeletionWorkers: null, - // _status: 'NEW', - // _logLevel: 300 - // }, - // { - // _validations: [], - // _username: 'aylingw', - // _id: 1446, - // _uid: 'a415435f-40f2-4de5-abf7-bff611e85591', - // _ustatus: null, - // _created: '2019-07-31T15:09:57.405Z', - // _updated: '2019-10-04T15:46:16.797Z', - // _updatedBy: 'aylingw', - // _auditEvents: null, - // _name: 'WOZiTech Cares Sub 100', - // _address1: 'Number 1', - // _address2: 'My street', - // _address3: '', - // _town: 'My Town', - // _county: '', - // _locationId: '1-888777666', - // _provId: '1-999888777', - // _postcode: 'LN11 9JG', - // _isRegulated: true, - // _mainService: { id: 1, name: 'Carers support' }, - // _nmdsId: 'G1002110', - // _lastWdfEligibility: '2019-10-04T15:46:16.797Z', - // _overallWdfEligibility: null, - // _establishmentWdfEligibility: '2019-10-04T14:46:16.797Z', - // _staffWdfEligibility: null, - // _isParent: false, - // _parentUid: '98a83eef-e1e1-49f3-89c5-b1287a3cc8dd', - // _parentId: 479, - // _parentName: null, - // _dataOwner: 'Parent', - // _dataPermissions: 'None', - // _archived: false, - // _dataOwnershipRequested: null, - // _reasonsForLeaving: '', - // _properties: { - // _properties: [Object], - // _propertyTypes: [Array], - // _auditEvents: null, - // _modifiedProperties: [], - // _additionalModels: null - // }, - // _isNew: false, - // _workerEntities: {}, - // _readyForDeletionWorkers: null, - // _status: 'COMPLETE', - // _logLevel: 300 - // } - // ]); - - // expect(bulkUpload).to.have.property('crossValidate'); - - // const csvEstablishmentSchemaErrors = []; - - // const myWorkers = [{ - // establishmentKey: 'omar3', - // status: 'UPDATE', - // uniqueWorker: '3', - // contractTypeId: 2, - // mainJobRoleId: 10, - // otherJobIds: [] - // }]; - - // // the real version of this code is in the api Establishment business object and runs a sql query. - // // We just return a 'fake result set' - // const fetchMyEstablishmentsWorkers = sinon.spy(async (establishmentId, establishmentKey) => { - // return [{ - // establishmentKey: 'omar3', - // uniqueWorker: '3', - // contractTypeId: 'Permanent', - // mainJobRoleId: 10, - // otherJobIds: '' - // }, - // { - // establishmentKey: 'omar3', - // uniqueWorker: 'WA100', - // contractTypeId: 'Temporary', - // mainJobRoleId: 26, - // otherJobIds: '' - // }, - // { - // establishmentKey: 'omar3', - // uniqueWorker: '5', - // contractTypeId: 'Pool/Bank', - // mainJobRoleId: 7, - // otherJobIds: '' - // }, - // { - // establishmentKey: 'omar3', - // uniqueWorker: '6', - // contractTypeId: 'Temporary', - // mainJobRoleId: 17, - // otherJobIds: '' - // }, - // { - // establishmentKey: 'omar3', - // uniqueWorker: 'WA103', - // contractTypeId: 'Temporary', - // mainJobRoleId: 26, - // otherJobIds: '' - // }, - // { - // establishmentKey: 'omar3', - // uniqueWorker: '10', - // contractTypeId: 'Other', - // mainJobRoleId: 18, - // otherJobIds: '' - // }, - // { - // establishmentKey: 'omar3', - // uniqueWorker: '4', - // contractTypeId: 'Other', - // mainJobRoleId: 1, - // otherJobIds: '' - // }, - // { - // establishmentKey: 'omar3', - // uniqueWorker: 'SA 4', - // contractTypeId: 'Other', - // mainJobRoleId: 23, - // otherJobIds: '' - // }, - // { - // establishmentKey: 'omar3', - // uniqueWorker: 'FTSpecial', - // contractTypeId: 'Other', - // mainJobRoleId: 24, - // otherJobIds: '' - // }, - // { - // establishmentKey: 'omar3', - // uniqueWorker: '1', - // contractTypeId: 'Other', - // mainJobRoleId: 2, - // otherJobIds: '' - // }]; - // }); - - // // Regular validation has to run first for the establishment to populate the internal properties correctly - // await bulkUpload.validate(); - - // // call the method - // await bulkUpload.crossValidate({ - // csvEstablishmentSchemaErrors, - // myWorkers, - // fetchMyEstablishmentsWorkers - // }); - - // // assert the fetchMyEstalishmentsWorkers function was called - // expect(fetchMyEstablishmentsWorkers.callCount).to.equal(1); - - // // assert a warning was returned - // expect(csvEstablishmentSchemaErrors.length).to.equal(1); - - // expect(csvEstablishmentSchemaErrors[0]).to.deep.equal({ - // lineNumber: 2, - // name: 'omar3', - // origin: 'Establishments', - // source: '10', - // warnCode: 2200, - // warnType: 'TOTAL_PERM_TEMP_WARNING', - // warning: 'The number of employed staff is less than the number of non-employed staff please check your staff records' - // }); - // }); - }); - // describe('cross entity validations', () => { // it('should emit a warning if there are zero staff', async () => { // const bulkUpload = new (testUtils.sandBox( From 9274540f1a28b2eebb5ca22978c83be0913aa6bb Mon Sep 17 00:00:00 2001 From: Aaron Russell Date: Fri, 28 Feb 2020 11:33:19 +0000 Subject: [PATCH 124/305] Removed console logs --- server/models/BulkImport/csv/workers.js | 2 -- 1 file changed, 2 deletions(-) diff --git a/server/models/BulkImport/csv/workers.js b/server/models/BulkImport/csv/workers.js index f3561c1060..5f4ea6149a 100644 --- a/server/models/BulkImport/csv/workers.js +++ b/server/models/BulkImport/csv/workers.js @@ -1424,7 +1424,6 @@ class Worker { source: this._currentLine.MAINJOBROLE }; - console.log(cqcRegEstablishment, this.mainJobRoleId); if (!cqcRegEstablishment && this.mainJobRoleId === 4) { csvWorkerSchemaErrors.unshift(Object.assign(template, { error: 'Workers MAINJOBROLE is Registered Manager but you are not providing a CQC regulated service. Please change to another Job Role' @@ -2641,7 +2640,6 @@ class Worker { myEstablishments.forEach(establishment => { if (this.establishmentKey === establishment.key) { - console.log('Found establishment'); switch (establishment.status) { case 'NEW': case 'UPDATE': { From 88625538a69f982cb159b3e3671dfe9793316f3d Mon Sep 17 00:00:00 2001 From: Aaron Russell Date: Fri, 28 Feb 2020 11:33:41 +0000 Subject: [PATCH 125/305] Added unit tests for cqc reg manager for non cqc --- .../models/Bulkimport/csv/workers.spec.js | 1450 ++++++++++++++--- 1 file changed, 1188 insertions(+), 262 deletions(-) diff --git a/server/test/unit/models/Bulkimport/csv/workers.spec.js b/server/test/unit/models/Bulkimport/csv/workers.spec.js index 661e202337..b85964af2f 100644 --- a/server/test/unit/models/Bulkimport/csv/workers.spec.js +++ b/server/test/unit/models/Bulkimport/csv/workers.spec.js @@ -4,6 +4,7 @@ const establishmentId = require('../../../mockdata/workers').establishmentId; const maxquals = require('../../../mockdata/workers').maxquals; const knownHeaders = require('../../../mockdata/workers').knownHeaders; const moment = require('moment'); +const filename = 'server/models/BulkImport/csv/workers.js'; const testUtils = require('../../../../../utils/testUtils'); const csv = require('csvtojson'); @@ -18,278 +19,278 @@ function mapCsvToWorker(worker, headers) { return mapped; } +const BUDI = { + ethnicity: (direction, originalCode) => { + const fixedMapping = [ + { ASC: 1, BUDI: 31 }, + { ASC: 3, BUDI: 32 }, + { ASC: 4, BUDI: 33 }, + { ASC: 5, BUDI: 34 }, + { ASC: 6, BUDI: 35 }, + { ASC: 7, BUDI: 36 }, + { ASC: 8, BUDI: 37 }, + { ASC: 9, BUDI: 38 }, + { ASC: 10, BUDI: 39 }, + { ASC: 11, BUDI: 40 }, + { ASC: 12, BUDI: 41 }, + { ASC: 13, BUDI: 42 }, + { ASC: 14, BUDI: 43 }, + { ASC: 15, BUDI: 44 }, + { ASC: 16, BUDI: 45 }, + { ASC: 17, BUDI: 46 }, + { ASC: 18, BUDI: 47 }, + { ASC: 19, BUDI: 98 }, + { ASC: 2, BUDI: 99 } + ]; + + if (direction === BUDI_TO_ASC) { + const found = fixedMapping.find(thisEthnicity => thisEthnicity.BUDI === originalCode); + return found ? found.ASC : null; + } + + const found = fixedMapping.find(thisEthnicity => thisEthnicity.ASC === originalCode); + return found ? found.BUDI : null; + }, + + jobRoles: (direction, originalCode) => { + const fixedMapping = [ + { ASC: 26, BUDI: 1 }, + { ASC: 15, BUDI: 2 }, + { ASC: 13, BUDI: 3 }, + { ASC: 22, BUDI: 4 }, + { ASC: 28, BUDI: 5 }, + { ASC: 27, BUDI: 6 }, + { ASC: 25, BUDI: 7 }, + { ASC: 10, BUDI: 8 }, + { ASC: 11, BUDI: 9 }, + { ASC: 12, BUDI: 10 }, + { ASC: 3, BUDI: 11 }, + { ASC: 18, BUDI: 15 }, + { ASC: 23, BUDI: 16 }, + { ASC: 4, BUDI: 17 }, + { ASC: 29, BUDI: 22 }, + { ASC: 20, BUDI: 23 }, + { ASC: 14, BUDI: 24 }, + { ASC: 2, BUDI: 25 }, + { ASC: 5, BUDI: 26 }, + { ASC: 21, BUDI: 27 }, + { ASC: 1, BUDI: 34 }, + { ASC: 24, BUDI: 35 }, + { ASC: 19, BUDI: 36 }, + { ASC: 17, BUDI: 37 }, + { ASC: 16, BUDI: 38 }, + { ASC: 7, BUDI: 39 }, + { ASC: 8, BUDI: 40 }, + { ASC: 9, BUDI: 41 }, + { ASC: 6, BUDI: 42 } + ]; + + if (direction === BUDI_TO_ASC) { + const found = fixedMapping.find(thisJob => thisJob.BUDI === originalCode); + return found ? found.ASC : null; + } + + const found = fixedMapping.find(thisJob => thisJob.ASC === originalCode); + return found ? found.BUDI : null; + }, + nursingSpecialist: (direction, originalCode) => { + const fixedMapping = [ + { BUDI: 1, ASC: 1 }, + { BUDI: 2, ASC: 2 }, + { BUDI: 3, ASC: 3 }, + { BUDI: 4, ASC: 4 }, + { BUDI: 5, ASC: 5 }, + { BUDI: 6, ASC: 6 }, + { BUDI: 7, ASC: 7 }, + { BUDI: 8, ASC: 8 } + ]; + + if (direction === BUDI_TO_ASC) { + const found = fixedMapping.find(thisSpecialist => thisSpecialist.BUDI === originalCode); + return found ? found.ASC : null; + } + + const found = fixedMapping.find(thisSpecialist => thisSpecialist.ASC === originalCode); + return found ? found.BUDI : null; + }, + qualificationLevels: (direction, originalCode) => { + const fixedMapping = [ + { BUDI: 0, ASC: 1 }, + { BUDI: 1, ASC: 2 }, + { BUDI: 2, ASC: 3 }, + { BUDI: 3, ASC: 4 }, + { BUDI: 4, ASC: 5 }, + { BUDI: 5, ASC: 6 }, + { BUDI: 6, ASC: 7 }, + { BUDI: 7, ASC: 8 }, + { BUDI: 8, ASC: 9 }, + { BUDI: 999, ASC: 10 } + ]; + + if (direction === BUDI_TO_ASC) { + const found = fixedMapping.find(thisSpecialist => thisSpecialist.BUDI === originalCode); + return found ? found.ASC : null; + } + + const found = fixedMapping.find(thisSpecialist => thisSpecialist.ASC === originalCode); + return found ? found.BUDI : null; + }, + qualifications: (direction, originalCode) => { + const fixedMapping = [ + { BUDI: 1, ASC: 97 }, + { BUDI: 2, ASC: 98 }, + { BUDI: 3, ASC: 96 }, + { BUDI: 4, ASC: 93 }, + { BUDI: 5, ASC: 94 }, + { BUDI: 6, ASC: 95 }, + { BUDI: 8, ASC: 24 }, + { BUDI: 9, ASC: 99 }, + { BUDI: 10, ASC: 100 }, + { BUDI: 12, ASC: 25 }, + { BUDI: 13, ASC: 102 }, + { BUDI: 14, ASC: 107 }, + { BUDI: 15, ASC: 106 }, + { BUDI: 16, ASC: 72 }, + { BUDI: 17, ASC: 89 }, + { BUDI: 18, ASC: 71 }, + { BUDI: 19, ASC: 16 }, + { BUDI: 20, ASC: 1 }, + { BUDI: 22, ASC: 14 }, + { BUDI: 25, ASC: 15 }, + { BUDI: 26, ASC: 26 }, + { BUDI: 27, ASC: 114 }, + { BUDI: 28, ASC: 116 }, + { BUDI: 32, ASC: 115 }, + { BUDI: 33, ASC: 113 }, + { BUDI: 34, ASC: 111 }, + { BUDI: 35, ASC: 109 }, + { BUDI: 36, ASC: 110 }, + { BUDI: 37, ASC: 117 }, + { BUDI: 38, ASC: 118 }, + { BUDI: 39, ASC: 119 }, + { BUDI: 41, ASC: 20 }, + { BUDI: 42, ASC: 30 }, + { BUDI: 48, ASC: 4 }, + { BUDI: 49, ASC: 5 }, + { BUDI: 50, ASC: 60 }, + { BUDI: 51, ASC: 61 }, + { BUDI: 52, ASC: 10 }, + { BUDI: 53, ASC: 80 }, + { BUDI: 54, ASC: 81 }, + { BUDI: 55, ASC: 82 }, + { BUDI: 56, ASC: 83 }, + { BUDI: 57, ASC: 84 }, + { BUDI: 58, ASC: 85 }, + { BUDI: 62, ASC: 86 }, + { BUDI: 63, ASC: 87 }, + { BUDI: 64, ASC: 88 }, + { BUDI: 67, ASC: 21 }, + { BUDI: 68, ASC: 22 }, + { BUDI: 72, ASC: 23 }, + { BUDI: 73, ASC: 32 }, + { BUDI: 74, ASC: 19 }, + { BUDI: 76, ASC: 64 }, + { BUDI: 77, ASC: 65 }, + { BUDI: 82, ASC: 103 }, + { BUDI: 83, ASC: 104 }, + { BUDI: 84, ASC: 105 }, + { BUDI: 85, ASC: 17 }, + { BUDI: 86, ASC: 2 }, + { BUDI: 87, ASC: 45 }, + { BUDI: 88, ASC: 9 }, + { BUDI: 89, ASC: 69 }, + { BUDI: 90, ASC: 12 }, + { BUDI: 91, ASC: 18 }, + { BUDI: 92, ASC: 130 }, + { BUDI: 93, ASC: 62 }, + { BUDI: 94, ASC: 66 }, + { BUDI: 95, ASC: 67 }, + { BUDI: 96, ASC: 11 }, + { BUDI: 98, ASC: 59 }, + { BUDI: 99, ASC: 6 }, + { BUDI: 100, ASC: 7 }, + { BUDI: 101, ASC: 68 }, + { BUDI: 102, ASC: 63 }, + { BUDI: 103, ASC: 8 }, + { BUDI: 104, ASC: 75 }, + { BUDI: 105, ASC: 76 }, + { BUDI: 107, ASC: 3 }, + { BUDI: 108, ASC: 47 }, + { BUDI: 109, ASC: 74 }, + { BUDI: 110, ASC: 31 }, + { BUDI: 111, ASC: 27 }, + { BUDI: 112, ASC: 28 }, + { BUDI: 113, ASC: 134 }, + { BUDI: 114, ASC: 135 }, + { BUDI: 115, ASC: 90 }, + { BUDI: 116, ASC: 91 }, + { BUDI: 92, ASC: 13 }, + { BUDI: 119, ASC: 33 }, + { BUDI: 121, ASC: 34 }, + { BUDI: 136, ASC: 35 }, + { BUDI: 123, ASC: 36 }, + { BUDI: 124, ASC: 37 }, + { BUDI: 125, ASC: 38 }, + { BUDI: 118, ASC: 39 }, + { BUDI: 137, ASC: 40 }, + { BUDI: 131, ASC: 41 }, + { BUDI: 134, ASC: 42 }, + { BUDI: 138, ASC: 43 }, + { BUDI: 143, ASC: 44 }, + { BUDI: 141, ASC: 48 }, + { BUDI: 120, ASC: 49 }, + { BUDI: 122, ASC: 50 }, + { BUDI: 126, ASC: 51 }, + { BUDI: 128, ASC: 52 }, + { BUDI: 127, ASC: 53 }, + { BUDI: 142, ASC: 54 }, + { BUDI: 133, ASC: 55 }, + { BUDI: 135, ASC: 56 }, + { BUDI: 139, ASC: 57 }, + { BUDI: 140, ASC: 58 }, + { BUDI: 129, ASC: 77 }, + { BUDI: 130, ASC: 78 }, + { BUDI: 132, ASC: 79 }, + { BUDI: 117, ASC: 112 }, + { BUDI: 302, ASC: 121 }, + { BUDI: 304, ASC: 122 }, + { BUDI: 303, ASC: 123 }, + { BUDI: 310, ASC: 124 }, + { BUDI: 308, ASC: 125 }, + { BUDI: 306, ASC: 126 }, + { BUDI: 301, ASC: 127 }, + { BUDI: 305, ASC: 128 }, + { BUDI: 307, ASC: 129 }, + { BUDI: 312, ASC: 131 }, + { BUDI: 313, ASC: 132 }, + { BUDI: 311, ASC: 133 } + ]; + + if (direction === BUDI_TO_ASC) { + const found = fixedMapping.find(thisQualification => thisQualification.BUDI === originalCode); + return found ? found.ASC : null; + } + + const found = fixedMapping.find(thisQualification => thisQualification.ASC === originalCode); + return found ? found.BUDI : null; + } +}; + const getUnitInstance = () => { const ALL_CAPACITIES = null; const ALL_UTILISATIONS = null; const BUDI_TO_ASC = 100; const bulkUpload = testUtils.sandBox( - 'server/models/BulkImport/csv/workers.js', + filename, { locals: { require: testUtils.wrapRequire({ '../BUDI': { - BUDI: { - - ethnicity: (direction, originalCode) => { - const fixedMapping = [ - { ASC: 1, BUDI: 31 }, - { ASC: 3, BUDI: 32 }, - { ASC: 4, BUDI: 33 }, - { ASC: 5, BUDI: 34 }, - { ASC: 6, BUDI: 35 }, - { ASC: 7, BUDI: 36 }, - { ASC: 8, BUDI: 37 }, - { ASC: 9, BUDI: 38 }, - { ASC: 10, BUDI: 39 }, - { ASC: 11, BUDI: 40 }, - { ASC: 12, BUDI: 41 }, - { ASC: 13, BUDI: 42 }, - { ASC: 14, BUDI: 43 }, - { ASC: 15, BUDI: 44 }, - { ASC: 16, BUDI: 45 }, - { ASC: 17, BUDI: 46 }, - { ASC: 18, BUDI: 47 }, - { ASC: 19, BUDI: 98 }, - { ASC: 2, BUDI: 99 } - ]; - - if (direction === BUDI_TO_ASC) { - const found = fixedMapping.find(thisEthnicity => thisEthnicity.BUDI === originalCode); - return found ? found.ASC : null; - } - - const found = fixedMapping.find(thisEthnicity => thisEthnicity.ASC === originalCode); - return found ? found.BUDI : null; - }, - - jobRoles: (direction, originalCode) => { - const fixedMapping = [ - { ASC: 26, BUDI: 1 }, - { ASC: 15, BUDI: 2 }, - { ASC: 13, BUDI: 3 }, - { ASC: 22, BUDI: 4 }, - { ASC: 28, BUDI: 5 }, - { ASC: 27, BUDI: 6 }, - { ASC: 25, BUDI: 7 }, - { ASC: 10, BUDI: 8 }, - { ASC: 11, BUDI: 9 }, - { ASC: 12, BUDI: 10 }, - { ASC: 3, BUDI: 11 }, - { ASC: 18, BUDI: 15 }, - { ASC: 23, BUDI: 16 }, - { ASC: 4, BUDI: 17 }, - { ASC: 29, BUDI: 22 }, - { ASC: 20, BUDI: 23 }, - { ASC: 14, BUDI: 24 }, - { ASC: 2, BUDI: 25 }, - { ASC: 5, BUDI: 26 }, - { ASC: 21, BUDI: 27 }, - { ASC: 1, BUDI: 34 }, - { ASC: 24, BUDI: 35 }, - { ASC: 19, BUDI: 36 }, - { ASC: 17, BUDI: 37 }, - { ASC: 16, BUDI: 38 }, - { ASC: 7, BUDI: 39 }, - { ASC: 8, BUDI: 40 }, - { ASC: 9, BUDI: 41 }, - { ASC: 6, BUDI: 42 } - ]; - - if (direction === BUDI_TO_ASC) { - const found = fixedMapping.find(thisJob => thisJob.BUDI === originalCode); - return found ? found.ASC : null; - } - - const found = fixedMapping.find(thisJob => thisJob.ASC === originalCode); - return found ? found.BUDI : null; - }, - nursingSpecialist: (direction, originalCode) => { - const fixedMapping = [ - { BUDI: 1, ASC: 1 }, - { BUDI: 2, ASC: 2 }, - { BUDI: 3, ASC: 3 }, - { BUDI: 4, ASC: 4 }, - { BUDI: 5, ASC: 5 }, - { BUDI: 6, ASC: 6 }, - { BUDI: 7, ASC: 7 }, - { BUDI: 8, ASC: 8 } - ]; - - if (direction === BUDI_TO_ASC) { - const found = fixedMapping.find(thisSpecialist => thisSpecialist.BUDI === originalCode); - return found ? found.ASC : null; - } - - const found = fixedMapping.find(thisSpecialist => thisSpecialist.ASC === originalCode); - return found ? found.BUDI : null; - }, - qualificationLevels: (direction, originalCode) => { - const fixedMapping = [ - { BUDI: 0, ASC: 1 }, - { BUDI: 1, ASC: 2 }, - { BUDI: 2, ASC: 3 }, - { BUDI: 3, ASC: 4 }, - { BUDI: 4, ASC: 5 }, - { BUDI: 5, ASC: 6 }, - { BUDI: 6, ASC: 7 }, - { BUDI: 7, ASC: 8 }, - { BUDI: 8, ASC: 9 }, - { BUDI: 999, ASC: 10 } - ]; - - if (direction === BUDI_TO_ASC) { - const found = fixedMapping.find(thisSpecialist => thisSpecialist.BUDI === originalCode); - return found ? found.ASC : null; - } - - const found = fixedMapping.find(thisSpecialist => thisSpecialist.ASC === originalCode); - return found ? found.BUDI : null; - }, - qualifications: (direction, originalCode) => { - const fixedMapping = [ - { BUDI: 1, ASC: 97 }, - { BUDI: 2, ASC: 98 }, - { BUDI: 3, ASC: 96 }, - { BUDI: 4, ASC: 93 }, - { BUDI: 5, ASC: 94 }, - { BUDI: 6, ASC: 95 }, - { BUDI: 8, ASC: 24 }, - { BUDI: 9, ASC: 99 }, - { BUDI: 10, ASC: 100 }, - { BUDI: 12, ASC: 25 }, - { BUDI: 13, ASC: 102 }, - { BUDI: 14, ASC: 107 }, - { BUDI: 15, ASC: 106 }, - { BUDI: 16, ASC: 72 }, - { BUDI: 17, ASC: 89 }, - { BUDI: 18, ASC: 71 }, - { BUDI: 19, ASC: 16 }, - { BUDI: 20, ASC: 1 }, - { BUDI: 22, ASC: 14 }, - { BUDI: 25, ASC: 15 }, - { BUDI: 26, ASC: 26 }, - { BUDI: 27, ASC: 114 }, - { BUDI: 28, ASC: 116 }, - { BUDI: 32, ASC: 115 }, - { BUDI: 33, ASC: 113 }, - { BUDI: 34, ASC: 111 }, - { BUDI: 35, ASC: 109 }, - { BUDI: 36, ASC: 110 }, - { BUDI: 37, ASC: 117 }, - { BUDI: 38, ASC: 118 }, - { BUDI: 39, ASC: 119 }, - { BUDI: 41, ASC: 20 }, - { BUDI: 42, ASC: 30 }, - { BUDI: 48, ASC: 4 }, - { BUDI: 49, ASC: 5 }, - { BUDI: 50, ASC: 60 }, - { BUDI: 51, ASC: 61 }, - { BUDI: 52, ASC: 10 }, - { BUDI: 53, ASC: 80 }, - { BUDI: 54, ASC: 81 }, - { BUDI: 55, ASC: 82 }, - { BUDI: 56, ASC: 83 }, - { BUDI: 57, ASC: 84 }, - { BUDI: 58, ASC: 85 }, - { BUDI: 62, ASC: 86 }, - { BUDI: 63, ASC: 87 }, - { BUDI: 64, ASC: 88 }, - { BUDI: 67, ASC: 21 }, - { BUDI: 68, ASC: 22 }, - { BUDI: 72, ASC: 23 }, - { BUDI: 73, ASC: 32 }, - { BUDI: 74, ASC: 19 }, - { BUDI: 76, ASC: 64 }, - { BUDI: 77, ASC: 65 }, - { BUDI: 82, ASC: 103 }, - { BUDI: 83, ASC: 104 }, - { BUDI: 84, ASC: 105 }, - { BUDI: 85, ASC: 17 }, - { BUDI: 86, ASC: 2 }, - { BUDI: 87, ASC: 45 }, - { BUDI: 88, ASC: 9 }, - { BUDI: 89, ASC: 69 }, - { BUDI: 90, ASC: 12 }, - { BUDI: 91, ASC: 18 }, - { BUDI: 92, ASC: 130 }, - { BUDI: 93, ASC: 62 }, - { BUDI: 94, ASC: 66 }, - { BUDI: 95, ASC: 67 }, - { BUDI: 96, ASC: 11 }, - { BUDI: 98, ASC: 59 }, - { BUDI: 99, ASC: 6 }, - { BUDI: 100, ASC: 7 }, - { BUDI: 101, ASC: 68 }, - { BUDI: 102, ASC: 63 }, - { BUDI: 103, ASC: 8 }, - { BUDI: 104, ASC: 75 }, - { BUDI: 105, ASC: 76 }, - { BUDI: 107, ASC: 3 }, - { BUDI: 108, ASC: 47 }, - { BUDI: 109, ASC: 74 }, - { BUDI: 110, ASC: 31 }, - { BUDI: 111, ASC: 27 }, - { BUDI: 112, ASC: 28 }, - { BUDI: 113, ASC: 134 }, - { BUDI: 114, ASC: 135 }, - { BUDI: 115, ASC: 90 }, - { BUDI: 116, ASC: 91 }, - { BUDI: 92, ASC: 13 }, - { BUDI: 119, ASC: 33 }, - { BUDI: 121, ASC: 34 }, - { BUDI: 136, ASC: 35 }, - { BUDI: 123, ASC: 36 }, - { BUDI: 124, ASC: 37 }, - { BUDI: 125, ASC: 38 }, - { BUDI: 118, ASC: 39 }, - { BUDI: 137, ASC: 40 }, - { BUDI: 131, ASC: 41 }, - { BUDI: 134, ASC: 42 }, - { BUDI: 138, ASC: 43 }, - { BUDI: 143, ASC: 44 }, - { BUDI: 141, ASC: 48 }, - { BUDI: 120, ASC: 49 }, - { BUDI: 122, ASC: 50 }, - { BUDI: 126, ASC: 51 }, - { BUDI: 128, ASC: 52 }, - { BUDI: 127, ASC: 53 }, - { BUDI: 142, ASC: 54 }, - { BUDI: 133, ASC: 55 }, - { BUDI: 135, ASC: 56 }, - { BUDI: 139, ASC: 57 }, - { BUDI: 140, ASC: 58 }, - { BUDI: 129, ASC: 77 }, - { BUDI: 130, ASC: 78 }, - { BUDI: 132, ASC: 79 }, - { BUDI: 117, ASC: 112 }, - { BUDI: 302, ASC: 121 }, - { BUDI: 304, ASC: 122 }, - { BUDI: 303, ASC: 123 }, - { BUDI: 310, ASC: 124 }, - { BUDI: 308, ASC: 125 }, - { BUDI: 306, ASC: 126 }, - { BUDI: 301, ASC: 127 }, - { BUDI: 305, ASC: 128 }, - { BUDI: 307, ASC: 129 }, - { BUDI: 312, ASC: 131 }, - { BUDI: 313, ASC: 132 }, - { BUDI: 311, ASC: 133 } - ]; - - if (direction === BUDI_TO_ASC) { - const found = fixedMapping.find(thisQualification => thisQualification.BUDI === originalCode); - return found ? found.ASC : null; - } - - const found = fixedMapping.find(thisQualification => thisQualification.ASC === originalCode); - return found ? found.BUDI : null; - } - - - } - }, - moment + BUDI + }, 'moment': { + moment + } }) } } @@ -323,6 +324,931 @@ describe('/server/models/Bulkimport/csv/workers.js', () => { }); }); + describe('validations', () => { + it('should emit an error if REGTYPE is not 2 (CQC) but worker has registered manager main job role', async () => { + const bulkUpload = new (testUtils.sandBox( + filename, + { + locals: { + require: testUtils.wrapRequire({ + '../BUDI': { + BUDI + }, + 'moment': moment + }), + }, + } + ).Worker)( + { + AMHP: "", + APPRENTICE: "2", + AVGHOURS: "", + BRITISHCITIZENSHIP: "", + CARECERT: "3", + CONTHOURS: "23", + COUNTRYOFBIRTH: "826", + DAYSSICK: "1", + DISABLED: "0", + DISPLAYID: "Aaron Russell", + DOB: "10/12/1982", + EMPLSTATUS: "1", + ETHNICITY: "41", + GENDER: "1", + HOURLYRATE: "", + LOCALESTID: "MARMA", + MAINJOBROLE: "4", + MAINJRDESC: "", + NATIONALITY: "826", + NINUMBER: "JA622112A", + NMCREG: "", + NONSCQUAL: "2", + NURSESPEC: "", + OTHERJOBROLE: "10", + OTHERJRDESC: "", + POSTCODE: "LS1 1AA", + QUALACH01: "", + QUALACH01NOTES: "", + QUALACH02: "", + QUALACH02NOTES: "", + QUALACH03: "", + QUALACH03NOTES: "", + RECSOURCE: "16", + SALARY: "20000", + SALARYINT: "1", + SCQUAL: "2", + STARTDATE: "12/11/2001", + STARTINSECT: "2001", + STATUS: "UPDATE", + UNIQUEWORKERID: "3", + YEAROFENTRY: "", + ZEROHRCONT: "2" + }, + 2, + [ + { + _validations: [], + _username: 'aylingw', + _id: 479, + _uid: '98a83eef-e1e1-49f3-89c5-b1287a3cc8dd', + _ustatus: null, + _created: '2019-03-15T09:54:10.562Z', + _updated: '2019-10-04T15:46:16.158Z', + _updatedBy: 'aylingw', + _auditEvents: null, + _name: 'WOZiTech, with even more care', + _address1: 'First Line', + _address2: 'Second Line', + _address3: '', + _town: 'My Town', + _county: '', + _locationId: 'A-328849599', + _provId: null, + _postcode: 'LN11 9JG', + _isRegulated: false, + _mainService: { id: 16, name: 'Head office services' }, + _nmdsId: 'G1001114', + _lastWdfEligibility: '2019-08-16T07:17:38.014Z', + _overallWdfEligibility: '2019-08-16T07:17:38.340Z', + _establishmentWdfEligibility: null, + _staffWdfEligibility: '2019-08-13T12:41:24.836Z', + _isParent: true, + _parentUid: null, + _parentId: null, + _parentName: null, + _dataOwner: 'Workplace', + _dataPermissions: 'None', + _archived: false, + _dataOwnershipRequested: null, + _reasonsForLeaving: '', + _properties: { + _properties: [Object], + _propertyTypes: [Array], + _auditEvents: null, + _modifiedProperties: [], + _additionalModels: null + }, + _isNew: false, + _workerEntities: { + }, + _readyForDeletionWorkers: null, + _status: 'NEW', + _logLevel: 300 + }, + { + _validations: [], + _username: 'aylingw', + _id: 1446, + _uid: 'a415435f-40f2-4de5-abf7-bff611e85591', + _ustatus: null, + _created: '2019-07-31T15:09:57.405Z', + _updated: '2019-10-04T15:46:16.797Z', + _updatedBy: 'aylingw', + _auditEvents: null, + _name: 'WOZiTech Cares Sub 100', + _address1: 'Number 1', + _address2: 'My street', + _address3: '', + _town: 'My Town', + _county: '', + _locationId: '1-888777666', + _provId: '1-999888777', + _postcode: 'LN11 9JG', + _isRegulated: true, + _mainService: { id: 1, name: 'Carers support' }, + _nmdsId: 'G1002110', + _lastWdfEligibility: '2019-10-04T15:46:16.797Z', + _overallWdfEligibility: null, + _establishmentWdfEligibility: '2019-10-04T14:46:16.797Z', + _staffWdfEligibility: null, + _isParent: false, + _parentUid: '98a83eef-e1e1-49f3-89c5-b1287a3cc8dd', + _parentId: 479, + _parentName: null, + _dataOwner: 'Parent', + _dataPermissions: 'None', + _archived: false, + _dataOwnershipRequested: null, + _reasonsForLeaving: '', + _properties: { + _properties: [Object], + _propertyTypes: [Array], + _auditEvents: null, + _modifiedProperties: [], + _additionalModels: null + }, + _isNew: false, + _workerEntities: {}, + _readyForDeletionWorkers: null, + _status: 'COMPLETE', + _logLevel: 300 + } + ]); + + expect(bulkUpload).to.have.property('crossValidate'); + + const csvWorkerSchemaErrors = []; + + const myEstablishments = [{ + key: 'MARMA', + status: 'UPDATE', + regtype: 1 + }]; + + // Regular validation has to run first for the establishment to populate the internal properties correctly + await bulkUpload.validate(); + + // call the method + await bulkUpload.crossValidate({ + csvWorkerSchemaErrors, + myEstablishments, + }); + + // assert a error was returned + expect(csvWorkerSchemaErrors.length).to.equal(1); + + expect(csvWorkerSchemaErrors[0]).to.deep.equal({ + lineNumber: 2, + name: 'MARMA', + source: '4', + worker: "3", + errCode: 1280, + errType: 'MAIN_JOB_ROLE_ERROR', + error: 'Workers MAINJOBROLE is Registered Manager but you are not providing a CQC regulated service. Please change to another Job Role' + }); + }); + it('should not emit an error if REGTYPE is 2 (CQC) but worker has registered manager main job role', async () => { + const bulkUpload = new (testUtils.sandBox( + filename, + { + locals: { + require: testUtils.wrapRequire({ + '../BUDI': { + BUDI + }, + 'moment': moment + }), + }, + } + ).Worker)( + { + AMHP: "", + APPRENTICE: "2", + AVGHOURS: "", + BRITISHCITIZENSHIP: "", + CARECERT: "3", + CONTHOURS: "23", + COUNTRYOFBIRTH: "826", + DAYSSICK: "1", + DISABLED: "0", + DISPLAYID: "Aaron Russell", + DOB: "10/12/1982", + EMPLSTATUS: "1", + ETHNICITY: "41", + GENDER: "1", + HOURLYRATE: "", + LOCALESTID: "MARMA", + MAINJOBROLE: "4", + MAINJRDESC: "", + NATIONALITY: "826", + NINUMBER: "JA622112A", + NMCREG: "", + NONSCQUAL: "2", + NURSESPEC: "", + OTHERJOBROLE: "10", + OTHERJRDESC: "", + POSTCODE: "LS1 1AA", + QUALACH01: "", + QUALACH01NOTES: "", + QUALACH02: "", + QUALACH02NOTES: "", + QUALACH03: "", + QUALACH03NOTES: "", + RECSOURCE: "16", + SALARY: "20000", + SALARYINT: "1", + SCQUAL: "2", + STARTDATE: "12/11/2001", + STARTINSECT: "2001", + STATUS: "UPDATE", + UNIQUEWORKERID: "3", + YEAROFENTRY: "", + ZEROHRCONT: "2" + }, + 2, + [ + { + _validations: [], + _username: 'aylingw', + _id: 479, + _uid: '98a83eef-e1e1-49f3-89c5-b1287a3cc8dd', + _ustatus: null, + _created: '2019-03-15T09:54:10.562Z', + _updated: '2019-10-04T15:46:16.158Z', + _updatedBy: 'aylingw', + _auditEvents: null, + _name: 'WOZiTech, with even more care', + _address1: 'First Line', + _address2: 'Second Line', + _address3: '', + _town: 'My Town', + _county: '', + _locationId: 'A-328849599', + _provId: null, + _postcode: 'LN11 9JG', + _isRegulated: true, + _mainService: { id: 16, name: 'Head office services' }, + _nmdsId: 'G1001114', + _lastWdfEligibility: '2019-08-16T07:17:38.014Z', + _overallWdfEligibility: '2019-08-16T07:17:38.340Z', + _establishmentWdfEligibility: null, + _staffWdfEligibility: '2019-08-13T12:41:24.836Z', + _isParent: true, + _parentUid: null, + _parentId: null, + _parentName: null, + _dataOwner: 'Workplace', + _dataPermissions: 'None', + _archived: false, + _dataOwnershipRequested: null, + _reasonsForLeaving: '', + _properties: { + _properties: [Object], + _propertyTypes: [Array], + _auditEvents: null, + _modifiedProperties: [], + _additionalModels: null + }, + _isNew: false, + _workerEntities: { + }, + _readyForDeletionWorkers: null, + _status: 'NEW', + _logLevel: 300 + }, + { + _validations: [], + _username: 'aylingw', + _id: 1446, + _uid: 'a415435f-40f2-4de5-abf7-bff611e85591', + _ustatus: null, + _created: '2019-07-31T15:09:57.405Z', + _updated: '2019-10-04T15:46:16.797Z', + _updatedBy: 'aylingw', + _auditEvents: null, + _name: 'WOZiTech Cares Sub 100', + _address1: 'Number 1', + _address2: 'My street', + _address3: '', + _town: 'My Town', + _county: '', + _locationId: '1-888777666', + _provId: '1-999888777', + _postcode: 'LN11 9JG', + _isRegulated: true, + _mainService: { id: 1, name: 'Carers support' }, + _nmdsId: 'G1002110', + _lastWdfEligibility: '2019-10-04T15:46:16.797Z', + _overallWdfEligibility: null, + _establishmentWdfEligibility: '2019-10-04T14:46:16.797Z', + _staffWdfEligibility: null, + _isParent: false, + _parentUid: '98a83eef-e1e1-49f3-89c5-b1287a3cc8dd', + _parentId: 479, + _parentName: null, + _dataOwner: 'Parent', + _dataPermissions: 'None', + _archived: false, + _dataOwnershipRequested: null, + _reasonsForLeaving: '', + _properties: { + _properties: [Object], + _propertyTypes: [Array], + _auditEvents: null, + _modifiedProperties: [], + _additionalModels: null + }, + _isNew: false, + _workerEntities: {}, + _readyForDeletionWorkers: null, + _status: 'COMPLETE', + _logLevel: 300 + } + ]); + + expect(bulkUpload).to.have.property('crossValidate'); + + const csvWorkerSchemaErrors = []; + + const myEstablishments = [{ + key: 'MARMA', + status: 'UPDATE', + regType: 2 + }]; + + // Regular validation has to run first for the establishment to populate the internal properties correctly + await bulkUpload.validate(); + + // call the method + await bulkUpload.crossValidate({ + csvWorkerSchemaErrors, + myEstablishments, + }); + + // assert a error was returned + expect(csvWorkerSchemaErrors.length).to.equal(0); + + expect(csvWorkerSchemaErrors).to.deep.equal([]); + }); + it('should not emit an error if REGTYPE is 2 (CQC) but worker has registered manager main job role', async () => { + const bulkUpload = new (testUtils.sandBox( + filename, + { + locals: { + require: testUtils.wrapRequire({ + '../BUDI': { + BUDI + }, + 'moment': moment + }), + }, + } + ).Worker)( + { + AMHP: "", + APPRENTICE: "2", + AVGHOURS: "", + BRITISHCITIZENSHIP: "", + CARECERT: "3", + CONTHOURS: "23", + COUNTRYOFBIRTH: "826", + DAYSSICK: "1", + DISABLED: "0", + DISPLAYID: "Aaron Russell", + DOB: "10/12/1982", + EMPLSTATUS: "1", + ETHNICITY: "41", + GENDER: "1", + HOURLYRATE: "", + LOCALESTID: "MARMA", + MAINJOBROLE: "4", + MAINJRDESC: "", + NATIONALITY: "826", + NINUMBER: "JA622112A", + NMCREG: "", + NONSCQUAL: "2", + NURSESPEC: "", + OTHERJOBROLE: "10", + OTHERJRDESC: "", + POSTCODE: "LS1 1AA", + QUALACH01: "", + QUALACH01NOTES: "", + QUALACH02: "", + QUALACH02NOTES: "", + QUALACH03: "", + QUALACH03NOTES: "", + RECSOURCE: "16", + SALARY: "20000", + SALARYINT: "1", + SCQUAL: "2", + STARTDATE: "12/11/2001", + STARTINSECT: "2001", + STATUS: "UPDATE", + UNIQUEWORKERID: "3", + YEAROFENTRY: "", + ZEROHRCONT: "2" + }, + 2, + [ + { + _validations: [], + _username: 'aylingw', + _id: 479, + _uid: '98a83eef-e1e1-49f3-89c5-b1287a3cc8dd', + _ustatus: null, + _created: '2019-03-15T09:54:10.562Z', + _updated: '2019-10-04T15:46:16.158Z', + _updatedBy: 'aylingw', + _auditEvents: null, + _name: 'WOZiTech, with even more care', + _address1: 'First Line', + _address2: 'Second Line', + _address3: '', + _town: 'My Town', + _county: '', + _locationId: 'A-328849599', + _provId: null, + _postcode: 'LN11 9JG', + _isRegulated: true, + _mainService: { id: 16, name: 'Head office services' }, + _nmdsId: 'G1001114', + _lastWdfEligibility: '2019-08-16T07:17:38.014Z', + _overallWdfEligibility: '2019-08-16T07:17:38.340Z', + _establishmentWdfEligibility: null, + _staffWdfEligibility: '2019-08-13T12:41:24.836Z', + _isParent: true, + _parentUid: null, + _parentId: null, + _parentName: null, + _dataOwner: 'Workplace', + _dataPermissions: 'None', + _archived: false, + _dataOwnershipRequested: null, + _reasonsForLeaving: '', + _properties: { + _properties: [Object], + _propertyTypes: [Array], + _auditEvents: null, + _modifiedProperties: [], + _additionalModels: null + }, + _isNew: false, + _workerEntities: { + }, + _readyForDeletionWorkers: null, + _status: 'NEW', + _logLevel: 300 + }, + { + _validations: [], + _username: 'aylingw', + _id: 1446, + _uid: 'a415435f-40f2-4de5-abf7-bff611e85591', + _ustatus: null, + _created: '2019-07-31T15:09:57.405Z', + _updated: '2019-10-04T15:46:16.797Z', + _updatedBy: 'aylingw', + _auditEvents: null, + _name: 'WOZiTech Cares Sub 100', + _address1: 'Number 1', + _address2: 'My street', + _address3: '', + _town: 'My Town', + _county: '', + _locationId: '1-888777666', + _provId: '1-999888777', + _postcode: 'LN11 9JG', + _isRegulated: true, + _mainService: { id: 1, name: 'Carers support' }, + _nmdsId: 'G1002110', + _lastWdfEligibility: '2019-10-04T15:46:16.797Z', + _overallWdfEligibility: null, + _establishmentWdfEligibility: '2019-10-04T14:46:16.797Z', + _staffWdfEligibility: null, + _isParent: false, + _parentUid: '98a83eef-e1e1-49f3-89c5-b1287a3cc8dd', + _parentId: 479, + _parentName: null, + _dataOwner: 'Parent', + _dataPermissions: 'None', + _archived: false, + _dataOwnershipRequested: null, + _reasonsForLeaving: '', + _properties: { + _properties: [Object], + _propertyTypes: [Array], + _auditEvents: null, + _modifiedProperties: [], + _additionalModels: null + }, + _isNew: false, + _workerEntities: {}, + _readyForDeletionWorkers: null, + _status: 'COMPLETE', + _logLevel: 300 + } + ]); + + expect(bulkUpload).to.have.property('crossValidate'); + + const csvWorkerSchemaErrors = []; + + const myEstablishments = [{ + key: 'MARMA', + status: 'UPDATE', + regType: 2 + }]; + + // Regular validation has to run first for the establishment to populate the internal properties correctly + await bulkUpload.validate(); + + // call the method + await bulkUpload.crossValidate({ + csvWorkerSchemaErrors, + myEstablishments, + }); + + // assert a error was returned + expect(csvWorkerSchemaErrors.length).to.equal(0); + + expect(csvWorkerSchemaErrors).to.deep.equal([]); + }); + it('should not emit an error if REGTYPE is 2 (CQC) but worker doesn\'t have registered manager main job role', async () => { + const bulkUpload = new (testUtils.sandBox( + filename, + { + locals: { + require: testUtils.wrapRequire({ + '../BUDI': { + BUDI + }, + 'moment': moment + }), + }, + } + ).Worker)( + { + AMHP: "", + APPRENTICE: "2", + AVGHOURS: "", + BRITISHCITIZENSHIP: "", + CARECERT: "3", + CONTHOURS: "23", + COUNTRYOFBIRTH: "826", + DAYSSICK: "1", + DISABLED: "0", + DISPLAYID: "Aaron Russell", + DOB: "10/12/1982", + EMPLSTATUS: "1", + ETHNICITY: "41", + GENDER: "1", + HOURLYRATE: "", + LOCALESTID: "MARMA", + MAINJOBROLE: "3", + MAINJRDESC: "", + NATIONALITY: "826", + NINUMBER: "JA622112A", + NMCREG: "", + NONSCQUAL: "2", + NURSESPEC: "", + OTHERJOBROLE: "10", + OTHERJRDESC: "", + POSTCODE: "LS1 1AA", + QUALACH01: "", + QUALACH01NOTES: "", + QUALACH02: "", + QUALACH02NOTES: "", + QUALACH03: "", + QUALACH03NOTES: "", + RECSOURCE: "16", + SALARY: "20000", + SALARYINT: "1", + SCQUAL: "2", + STARTDATE: "12/11/2001", + STARTINSECT: "2001", + STATUS: "UPDATE", + UNIQUEWORKERID: "3", + YEAROFENTRY: "", + ZEROHRCONT: "2" + }, + 2, + [ + { + _validations: [], + _username: 'aylingw', + _id: 479, + _uid: '98a83eef-e1e1-49f3-89c5-b1287a3cc8dd', + _ustatus: null, + _created: '2019-03-15T09:54:10.562Z', + _updated: '2019-10-04T15:46:16.158Z', + _updatedBy: 'aylingw', + _auditEvents: null, + _name: 'WOZiTech, with even more care', + _address1: 'First Line', + _address2: 'Second Line', + _address3: '', + _town: 'My Town', + _county: '', + _locationId: 'A-328849599', + _provId: null, + _postcode: 'LN11 9JG', + _isRegulated: true, + _mainService: { id: 16, name: 'Head office services' }, + _nmdsId: 'G1001114', + _lastWdfEligibility: '2019-08-16T07:17:38.014Z', + _overallWdfEligibility: '2019-08-16T07:17:38.340Z', + _establishmentWdfEligibility: null, + _staffWdfEligibility: '2019-08-13T12:41:24.836Z', + _isParent: true, + _parentUid: null, + _parentId: null, + _parentName: null, + _dataOwner: 'Workplace', + _dataPermissions: 'None', + _archived: false, + _dataOwnershipRequested: null, + _reasonsForLeaving: '', + _properties: { + _properties: [Object], + _propertyTypes: [Array], + _auditEvents: null, + _modifiedProperties: [], + _additionalModels: null + }, + _isNew: false, + _workerEntities: { + }, + _readyForDeletionWorkers: null, + _status: 'NEW', + _logLevel: 300 + }, + { + _validations: [], + _username: 'aylingw', + _id: 1446, + _uid: 'a415435f-40f2-4de5-abf7-bff611e85591', + _ustatus: null, + _created: '2019-07-31T15:09:57.405Z', + _updated: '2019-10-04T15:46:16.797Z', + _updatedBy: 'aylingw', + _auditEvents: null, + _name: 'WOZiTech Cares Sub 100', + _address1: 'Number 1', + _address2: 'My street', + _address3: '', + _town: 'My Town', + _county: '', + _locationId: '1-888777666', + _provId: '1-999888777', + _postcode: 'LN11 9JG', + _isRegulated: true, + _mainService: { id: 1, name: 'Carers support' }, + _nmdsId: 'G1002110', + _lastWdfEligibility: '2019-10-04T15:46:16.797Z', + _overallWdfEligibility: null, + _establishmentWdfEligibility: '2019-10-04T14:46:16.797Z', + _staffWdfEligibility: null, + _isParent: false, + _parentUid: '98a83eef-e1e1-49f3-89c5-b1287a3cc8dd', + _parentId: 479, + _parentName: null, + _dataOwner: 'Parent', + _dataPermissions: 'None', + _archived: false, + _dataOwnershipRequested: null, + _reasonsForLeaving: '', + _properties: { + _properties: [Object], + _propertyTypes: [Array], + _auditEvents: null, + _modifiedProperties: [], + _additionalModels: null + }, + _isNew: false, + _workerEntities: {}, + _readyForDeletionWorkers: null, + _status: 'COMPLETE', + _logLevel: 300 + } + ]); + + expect(bulkUpload).to.have.property('crossValidate'); + + const csvWorkerSchemaErrors = []; + + const myEstablishments = [{ + key: 'MARMA', + status: 'UPDATE', + regType: 2 + }]; + + // Regular validation has to run first for the establishment to populate the internal properties correctly + await bulkUpload.validate(); + + // call the method + await bulkUpload.crossValidate({ + csvWorkerSchemaErrors, + myEstablishments, + }); + + // assert a error was returned + expect(csvWorkerSchemaErrors.length).to.equal(0); + + expect(csvWorkerSchemaErrors).to.deep.equal([]); + }); + it('should not emit an error if REGTYPE is not 2 (CQC) but worker doesn\'t have registered manager main job role', async () => { + const bulkUpload = new (testUtils.sandBox( + filename, + { + locals: { + require: testUtils.wrapRequire({ + '../BUDI': { + BUDI + }, + 'moment': moment + }), + }, + } + ).Worker)( + { + AMHP: "", + APPRENTICE: "2", + AVGHOURS: "", + BRITISHCITIZENSHIP: "", + CARECERT: "3", + CONTHOURS: "23", + COUNTRYOFBIRTH: "826", + DAYSSICK: "1", + DISABLED: "0", + DISPLAYID: "Aaron Russell", + DOB: "10/12/1982", + EMPLSTATUS: "1", + ETHNICITY: "41", + GENDER: "1", + HOURLYRATE: "", + LOCALESTID: "MARMA", + MAINJOBROLE: "3", + MAINJRDESC: "", + NATIONALITY: "826", + NINUMBER: "JA622112A", + NMCREG: "", + NONSCQUAL: "2", + NURSESPEC: "", + OTHERJOBROLE: "10", + OTHERJRDESC: "", + POSTCODE: "LS1 1AA", + QUALACH01: "", + QUALACH01NOTES: "", + QUALACH02: "", + QUALACH02NOTES: "", + QUALACH03: "", + QUALACH03NOTES: "", + RECSOURCE: "16", + SALARY: "20000", + SALARYINT: "1", + SCQUAL: "2", + STARTDATE: "12/11/2001", + STARTINSECT: "2001", + STATUS: "UPDATE", + UNIQUEWORKERID: "3", + YEAROFENTRY: "", + ZEROHRCONT: "2" + }, + 2, + [ + { + _validations: [], + _username: 'aylingw', + _id: 479, + _uid: '98a83eef-e1e1-49f3-89c5-b1287a3cc8dd', + _ustatus: null, + _created: '2019-03-15T09:54:10.562Z', + _updated: '2019-10-04T15:46:16.158Z', + _updatedBy: 'aylingw', + _auditEvents: null, + _name: 'WOZiTech, with even more care', + _address1: 'First Line', + _address2: 'Second Line', + _address3: '', + _town: 'My Town', + _county: '', + _locationId: 'A-328849599', + _provId: null, + _postcode: 'LN11 9JG', + _isRegulated: true, + _mainService: { id: 16, name: 'Head office services' }, + _nmdsId: 'G1001114', + _lastWdfEligibility: '2019-08-16T07:17:38.014Z', + _overallWdfEligibility: '2019-08-16T07:17:38.340Z', + _establishmentWdfEligibility: null, + _staffWdfEligibility: '2019-08-13T12:41:24.836Z', + _isParent: true, + _parentUid: null, + _parentId: null, + _parentName: null, + _dataOwner: 'Workplace', + _dataPermissions: 'None', + _archived: false, + _dataOwnershipRequested: null, + _reasonsForLeaving: '', + _properties: { + _properties: [Object], + _propertyTypes: [Array], + _auditEvents: null, + _modifiedProperties: [], + _additionalModels: null + }, + _isNew: false, + _workerEntities: { + }, + _readyForDeletionWorkers: null, + _status: 'NEW', + _logLevel: 300 + }, + { + _validations: [], + _username: 'aylingw', + _id: 1446, + _uid: 'a415435f-40f2-4de5-abf7-bff611e85591', + _ustatus: null, + _created: '2019-07-31T15:09:57.405Z', + _updated: '2019-10-04T15:46:16.797Z', + _updatedBy: 'aylingw', + _auditEvents: null, + _name: 'WOZiTech Cares Sub 100', + _address1: 'Number 1', + _address2: 'My street', + _address3: '', + _town: 'My Town', + _county: '', + _locationId: '1-888777666', + _provId: '1-999888777', + _postcode: 'LN11 9JG', + _isRegulated: true, + _mainService: { id: 1, name: 'Carers support' }, + _nmdsId: 'G1002110', + _lastWdfEligibility: '2019-10-04T15:46:16.797Z', + _overallWdfEligibility: null, + _establishmentWdfEligibility: '2019-10-04T14:46:16.797Z', + _staffWdfEligibility: null, + _isParent: false, + _parentUid: '98a83eef-e1e1-49f3-89c5-b1287a3cc8dd', + _parentId: 479, + _parentName: null, + _dataOwner: 'Parent', + _dataPermissions: 'None', + _archived: false, + _dataOwnershipRequested: null, + _reasonsForLeaving: '', + _properties: { + _properties: [Object], + _propertyTypes: [Array], + _auditEvents: null, + _modifiedProperties: [], + _additionalModels: null + }, + _isNew: false, + _workerEntities: {}, + _readyForDeletionWorkers: null, + _status: 'COMPLETE', + _logLevel: 300 + } + ]); + + expect(bulkUpload).to.have.property('crossValidate'); + + const csvWorkerSchemaErrors = []; + + const myEstablishments = [{ + key: 'MARMA', + status: 'UPDATE', + regType: 1 + }]; + + // Regular validation has to run first for the establishment to populate the internal properties correctly + await bulkUpload.validate(); + + // call the method + await bulkUpload.crossValidate({ + csvWorkerSchemaErrors, + myEstablishments, + }); + + // assert a error was returned + expect(csvWorkerSchemaErrors.length).to.equal(0); + + expect(csvWorkerSchemaErrors).to.deep.equal([]); + }); + }); workers.forEach((worker, index) => { describe('toCSV(establishmentId, entity, MAX_QUALIFICATIONS) with worker ' + index, () => { it('should match the header values', async () => { From cf21d460f25e50a4ddfc2d7f13adcf73f59ba32e Mon Sep 17 00:00:00 2001 From: Aaron Russell Date: Fri, 28 Feb 2020 11:52:35 +0000 Subject: [PATCH 126/305] Removed console logs based on review on #2005 --- server/models/BulkImport/csv/establishments.js | 4 ---- 1 file changed, 4 deletions(-) diff --git a/server/models/BulkImport/csv/establishments.js b/server/models/BulkImport/csv/establishments.js index 91eada1629..989a34c90f 100644 --- a/server/models/BulkImport/csv/establishments.js +++ b/server/models/BulkImport/csv/establishments.js @@ -888,8 +888,6 @@ class Establishment { }, attributes: ['id', 'locationId'] }); - console.log(this._id); - console.log(locationExists); let existingEstablishment = false; await locationExists.map(async (establishment) => { if (establishment.id === this._id) existingEstablishment = true; @@ -1259,7 +1257,6 @@ class Establishment { const MAX_TOTAL = 999; const myTotalPermTemp = parseInt(this._currentLine.TOTALPERMTEMP, 10); const HEAD_OFFICE_MAIN_SERVICE = 72; - console.log('Total Perm Temp', this._currentLine.TOTALPERMTEMP); if (myTotalPermTemp.length === 0) { this._validationErrors.push({ @@ -1488,7 +1485,6 @@ class Establishment { }; if(isCQCRegulated && !hasRegisteredManagerVacancy() && registeredManager === 0) { - console.log('They have no RMs'); csvEstablishmentSchemaErrors.unshift(Object.assign(template, { error: 'You do not have a staff record for a Registered Manager therefore must record a vacancy for one' })); From 294508e9987ab8c33afd47894e4ea040522f8bc6 Mon Sep 17 00:00:00 2001 From: Aaron Russell Date: Fri, 28 Feb 2020 12:01:18 +0000 Subject: [PATCH 127/305] Updated establishments to latest version --- .../Bulkimport/csv/establishments.spec.js | 566 +++++++++++++++++- 1 file changed, 564 insertions(+), 2 deletions(-) diff --git a/server/test/unit/models/Bulkimport/csv/establishments.spec.js b/server/test/unit/models/Bulkimport/csv/establishments.spec.js index d86a32658e..461648fe48 100644 --- a/server/test/unit/models/Bulkimport/csv/establishments.spec.js +++ b/server/test/unit/models/Bulkimport/csv/establishments.spec.js @@ -2714,7 +2714,569 @@ it('should not emit an error if postcode can be found in the reference data', as // }); }); - // describe('cross entity validations', () => { + describe('cross entity validations', () => { + it('should an error if cqc registered and have no registered manager vacancy or registered manager staff member', async () => { + const bulkUpload = new (testUtils.sandBox( + filename, + { + locals: { + require: testUtils.wrapRequire({ + '../BUDI': { + BUDI + }, + '../../index': { + establishment: models.establishment, + pcodedata: models.pcodedata + } + }) + } + } + ).Establishment)( + { + LOCALESTID: 'omar3', + STATUS: 'UPDATE', + ESTNAME: 'WOZiTech, with even more care', + ADDRESS1: 'First Line', + ADDRESS2: 'Second Line', + ADDRESS3: '', + POSTTOWN: 'My Town', + POSTCODE: 'AB13 4NJ', + ESTTYPE: '6', + OTHERTYPE: '', + PERMCQC: '1', + PERMLA: '1', + SHARELA: '708;721;720', + REGTYPE: '2', + PROVNUM: '1-123456781', + LOCATIONID: '1-123456781', + MAINSERVICE: '8', + ALLSERVICES: '12;13', + CAPACITY: '0;0', + UTILISATION: '0;0', + SERVICEDESC: '1;1', + SERVICEUSERS: '', + OTHERUSERDESC: '', + TOTALPERMTEMP: '1', + ALLJOBROLES: '34;8', + STARTERS: '0;0', + LEAVERS: '999;0', + VACANCIES: '999;333', + REASONS: '', + REASONNOS: '' + }, + 2, + [ + { + _validations: [], + _username: 'aylingw', + _id: 479, + _uid: '98a83eef-e1e1-49f3-89c5-b1287a3cc8dd', + _ustatus: null, + _created: '2019-03-15T09:54:10.562Z', + _updated: '2019-10-04T15:46:16.158Z', + _updatedBy: 'aylingw', + _auditEvents: null, + _name: 'WOZiTech, with even more care', + _address1: 'First Line', + _address2: 'Second Line', + _address3: '', + _town: 'My Town', + _county: '', + _locationId: 'A-328849599', + _provId: null, + _postcode: 'LN11 9JG', + _isRegulated: false, + _mainService: { id: 16, name: 'Head office services' }, + _nmdsId: 'G1001114', + _lastWdfEligibility: '2019-08-16T07:17:38.014Z', + _overallWdfEligibility: '2019-08-16T07:17:38.340Z', + _establishmentWdfEligibility: null, + _staffWdfEligibility: '2019-08-13T12:41:24.836Z', + _isParent: true, + _parentUid: null, + _parentId: null, + _parentName: null, + _dataOwner: 'Workplace', + _dataPermissions: 'None', + _archived: false, + _dataOwnershipRequested: null, + _reasonsForLeaving: '', + _properties: { + _properties: [Object], + _propertyTypes: [Array], + _auditEvents: null, + _modifiedProperties: [], + _additionalModels: null + }, + _isNew: false, + _workerEntities: { + }, + _readyForDeletionWorkers: null, + _status: 'NEW', + _logLevel: 300 + }, + { + _validations: [], + _username: 'aylingw', + _id: 1446, + _uid: 'a415435f-40f2-4de5-abf7-bff611e85591', + _ustatus: null, + _created: '2019-07-31T15:09:57.405Z', + _updated: '2019-10-04T15:46:16.797Z', + _updatedBy: 'aylingw', + _auditEvents: null, + _name: 'WOZiTech Cares Sub 100', + _address1: 'Number 1', + _address2: 'My street', + _address3: '', + _town: 'My Town', + _county: '', + _locationId: '1-888777666', + _provId: '1-999888777', + _postcode: 'LN11 9JG', + _isRegulated: true, + _mainService: { id: 1, name: 'Carers support' }, + _nmdsId: 'G1002110', + _lastWdfEligibility: '2019-10-04T15:46:16.797Z', + _overallWdfEligibility: null, + _establishmentWdfEligibility: '2019-10-04T14:46:16.797Z', + _staffWdfEligibility: null, + _isParent: false, + _parentUid: '98a83eef-e1e1-49f3-89c5-b1287a3cc8dd', + _parentId: 479, + _parentName: null, + _dataOwner: 'Parent', + _dataPermissions: 'None', + _archived: false, + _dataOwnershipRequested: null, + _reasonsForLeaving: '', + _properties: { + _properties: [Object], + _propertyTypes: [Array], + _auditEvents: null, + _modifiedProperties: [], + _additionalModels: null + }, + _isNew: false, + _workerEntities: {}, + _readyForDeletionWorkers: null, + _status: 'COMPLETE', + _logLevel: 300 + } + ]); + + expect(bulkUpload).to.have.property('crossValidate'); + + const csvEstablishmentSchemaErrors = []; + + const myWorkers = [{ + status: 'UPDATE', + establishmentKey: 'omar3', + mainJobRoleId: 3, + otherJobIds: [6] + }]; + + // the real version of this code is in the api Establishment business object and runs a sql query. + // We just return a 'fake result set' + const fetchMyEstablishmentsWorkers = sinon.spy(async (establishmentId, establishmentKey) => { + return []; + }); + + // Regular validation has to run first for the establishment to populate the internal properties correctly + await bulkUpload.validate(); + + // call the method + await bulkUpload.crossValidate({ + csvEstablishmentSchemaErrors, + myWorkers, + fetchMyEstablishmentsWorkers + }); + + // assert the fetchMyEstalishmentsWorkers function was called + expect(fetchMyEstablishmentsWorkers.callCount).to.equal(1); + + // assert a warning was returned + expect(csvEstablishmentSchemaErrors.length).to.equal(1); + + expect(csvEstablishmentSchemaErrors[0]).to.deep.equal({ + lineNumber: 2, + name: 'omar3', + origin: 'Establishments', + source: '34;8', + errCode: 1280, + errType: 'ALL_JOBS_ERROR', + error: 'You do not have a staff record for a Registered Manager therefore must record a vacancy for one' + }); + }); + it('should not an error if cqc registered and have registered manager vacancy or registered manager staff member (as main)', async () => { + const bulkUpload = new (testUtils.sandBox( + filename, + { + locals: { + require: testUtils.wrapRequire({ + '../BUDI': { + BUDI + }, + '../../index': { + establishment: models.establishment, + pcodedata: models.pcodedata + } + }) + } + } + ).Establishment)( + { + LOCALESTID: 'omar3', + STATUS: 'UPDATE', + ESTNAME: 'WOZiTech, with even more care', + ADDRESS1: 'First Line', + ADDRESS2: 'Second Line', + ADDRESS3: '', + POSTTOWN: 'My Town', + POSTCODE: 'AB13 4NJ', + ESTTYPE: '6', + OTHERTYPE: '', + PERMCQC: '1', + PERMLA: '1', + SHARELA: '708;721;720', + REGTYPE: '2', + PROVNUM: '1-123456781', + LOCATIONID: '1-123456781', + MAINSERVICE: '8', + ALLSERVICES: '12;13', + CAPACITY: '0;0', + UTILISATION: '0;0', + SERVICEDESC: '1;1', + SERVICEUSERS: '', + OTHERUSERDESC: '', + TOTALPERMTEMP: '1', + ALLJOBROLES: '34;8', + STARTERS: '0;0', + LEAVERS: '999;0', + VACANCIES: '999;333', + REASONS: '', + REASONNOS: '' + }, + 2, + [ + { + _validations: [], + _username: 'aylingw', + _id: 479, + _uid: '98a83eef-e1e1-49f3-89c5-b1287a3cc8dd', + _ustatus: null, + _created: '2019-03-15T09:54:10.562Z', + _updated: '2019-10-04T15:46:16.158Z', + _updatedBy: 'aylingw', + _auditEvents: null, + _name: 'WOZiTech, with even more care', + _address1: 'First Line', + _address2: 'Second Line', + _address3: '', + _town: 'My Town', + _county: '', + _locationId: 'A-328849599', + _provId: null, + _postcode: 'LN11 9JG', + _isRegulated: false, + _mainService: { id: 16, name: 'Head office services' }, + _nmdsId: 'G1001114', + _lastWdfEligibility: '2019-08-16T07:17:38.014Z', + _overallWdfEligibility: '2019-08-16T07:17:38.340Z', + _establishmentWdfEligibility: null, + _staffWdfEligibility: '2019-08-13T12:41:24.836Z', + _isParent: true, + _parentUid: null, + _parentId: null, + _parentName: null, + _dataOwner: 'Workplace', + _dataPermissions: 'None', + _archived: false, + _dataOwnershipRequested: null, + _reasonsForLeaving: '', + _properties: { + _properties: [Object], + _propertyTypes: [Array], + _auditEvents: null, + _modifiedProperties: [], + _additionalModels: null + }, + _isNew: false, + _workerEntities: { + }, + _readyForDeletionWorkers: null, + _status: 'NEW', + _logLevel: 300 + }, + { + _validations: [], + _username: 'aylingw', + _id: 1446, + _uid: 'a415435f-40f2-4de5-abf7-bff611e85591', + _ustatus: null, + _created: '2019-07-31T15:09:57.405Z', + _updated: '2019-10-04T15:46:16.797Z', + _updatedBy: 'aylingw', + _auditEvents: null, + _name: 'WOZiTech Cares Sub 100', + _address1: 'Number 1', + _address2: 'My street', + _address3: '', + _town: 'My Town', + _county: '', + _locationId: '1-888777666', + _provId: '1-999888777', + _postcode: 'LN11 9JG', + _isRegulated: true, + _mainService: { id: 1, name: 'Carers support' }, + _nmdsId: 'G1002110', + _lastWdfEligibility: '2019-10-04T15:46:16.797Z', + _overallWdfEligibility: null, + _establishmentWdfEligibility: '2019-10-04T14:46:16.797Z', + _staffWdfEligibility: null, + _isParent: false, + _parentUid: '98a83eef-e1e1-49f3-89c5-b1287a3cc8dd', + _parentId: 479, + _parentName: null, + _dataOwner: 'Parent', + _dataPermissions: 'None', + _archived: false, + _dataOwnershipRequested: null, + _reasonsForLeaving: '', + _properties: { + _properties: [Object], + _propertyTypes: [Array], + _auditEvents: null, + _modifiedProperties: [], + _additionalModels: null + }, + _isNew: false, + _workerEntities: {}, + _readyForDeletionWorkers: null, + _status: 'COMPLETE', + _logLevel: 300 + } + ]); + + expect(bulkUpload).to.have.property('crossValidate'); + + const csvEstablishmentSchemaErrors = []; + + const myWorkers = [{ + status: 'UPDATE', + establishmentKey: 'omar3', + mainJobRoleId: 4, + otherJobIds: [] + }]; + + // the real version of this code is in the api Establishment business object and runs a sql query. + // We just return a 'fake result set' + const fetchMyEstablishmentsWorkers = sinon.spy(async (establishmentId, establishmentKey) => { + return []; + }); + + // Regular validation has to run first for the establishment to populate the internal properties correctly + await bulkUpload.validate(); + + // call the method + await bulkUpload.crossValidate({ + csvEstablishmentSchemaErrors, + myWorkers, + fetchMyEstablishmentsWorkers + }); + + // assert the fetchMyEstalishmentsWorkers function was called + expect(fetchMyEstablishmentsWorkers.callCount).to.equal(1); + // assert a warning was returned + expect(csvEstablishmentSchemaErrors.length).to.equal(0); + + expect(csvEstablishmentSchemaErrors[0]).to.deep.equal(); + }); + it('should not an error if cqc registered and have registered manager vacancy or registered manager staff member (as other)', async () => { + const bulkUpload = new (testUtils.sandBox( + filename, + { + locals: { + require: testUtils.wrapRequire({ + '../BUDI': { + BUDI + }, + '../../index': { + establishment: models.establishment, + pcodedata: models.pcodedata + } + }) + } + } + ).Establishment)( + { + LOCALESTID: 'omar3', + STATUS: 'UPDATE', + ESTNAME: 'WOZiTech, with even more care', + ADDRESS1: 'First Line', + ADDRESS2: 'Second Line', + ADDRESS3: '', + POSTTOWN: 'My Town', + POSTCODE: 'AB13 4NJ', + ESTTYPE: '6', + OTHERTYPE: '', + PERMCQC: '1', + PERMLA: '1', + SHARELA: '708;721;720', + REGTYPE: '2', + PROVNUM: '1-123456781', + LOCATIONID: '1-123456781', + MAINSERVICE: '8', + ALLSERVICES: '12;13', + CAPACITY: '0;0', + UTILISATION: '0;0', + SERVICEDESC: '1;1', + SERVICEUSERS: '', + OTHERUSERDESC: '', + TOTALPERMTEMP: '1', + ALLJOBROLES: '34;8', + STARTERS: '0;0', + LEAVERS: '999;0', + VACANCIES: '999;333', + REASONS: '', + REASONNOS: '' + }, + 2, + [ + { + _validations: [], + _username: 'aylingw', + _id: 479, + _uid: '98a83eef-e1e1-49f3-89c5-b1287a3cc8dd', + _ustatus: null, + _created: '2019-03-15T09:54:10.562Z', + _updated: '2019-10-04T15:46:16.158Z', + _updatedBy: 'aylingw', + _auditEvents: null, + _name: 'WOZiTech, with even more care', + _address1: 'First Line', + _address2: 'Second Line', + _address3: '', + _town: 'My Town', + _county: '', + _locationId: 'A-328849599', + _provId: null, + _postcode: 'LN11 9JG', + _isRegulated: false, + _mainService: { id: 16, name: 'Head office services' }, + _nmdsId: 'G1001114', + _lastWdfEligibility: '2019-08-16T07:17:38.014Z', + _overallWdfEligibility: '2019-08-16T07:17:38.340Z', + _establishmentWdfEligibility: null, + _staffWdfEligibility: '2019-08-13T12:41:24.836Z', + _isParent: true, + _parentUid: null, + _parentId: null, + _parentName: null, + _dataOwner: 'Workplace', + _dataPermissions: 'None', + _archived: false, + _dataOwnershipRequested: null, + _reasonsForLeaving: '', + _properties: { + _properties: [Object], + _propertyTypes: [Array], + _auditEvents: null, + _modifiedProperties: [], + _additionalModels: null + }, + _isNew: false, + _workerEntities: { + }, + _readyForDeletionWorkers: null, + _status: 'NEW', + _logLevel: 300 + }, + { + _validations: [], + _username: 'aylingw', + _id: 1446, + _uid: 'a415435f-40f2-4de5-abf7-bff611e85591', + _ustatus: null, + _created: '2019-07-31T15:09:57.405Z', + _updated: '2019-10-04T15:46:16.797Z', + _updatedBy: 'aylingw', + _auditEvents: null, + _name: 'WOZiTech Cares Sub 100', + _address1: 'Number 1', + _address2: 'My street', + _address3: '', + _town: 'My Town', + _county: '', + _locationId: '1-888777666', + _provId: '1-999888777', + _postcode: 'LN11 9JG', + _isRegulated: true, + _mainService: { id: 1, name: 'Carers support' }, + _nmdsId: 'G1002110', + _lastWdfEligibility: '2019-10-04T15:46:16.797Z', + _overallWdfEligibility: null, + _establishmentWdfEligibility: '2019-10-04T14:46:16.797Z', + _staffWdfEligibility: null, + _isParent: false, + _parentUid: '98a83eef-e1e1-49f3-89c5-b1287a3cc8dd', + _parentId: 479, + _parentName: null, + _dataOwner: 'Parent', + _dataPermissions: 'None', + _archived: false, + _dataOwnershipRequested: null, + _reasonsForLeaving: '', + _properties: { + _properties: [Object], + _propertyTypes: [Array], + _auditEvents: null, + _modifiedProperties: [], + _additionalModels: null + }, + _isNew: false, + _workerEntities: {}, + _readyForDeletionWorkers: null, + _status: 'COMPLETE', + _logLevel: 300 + } + ]); + + expect(bulkUpload).to.have.property('crossValidate'); + + const csvEstablishmentSchemaErrors = []; + + const myWorkers = [{ + status: 'UPDATE', + establishmentKey: 'omar3', + mainJobRoleId: 3, + otherJobIds: [4] + }]; + + // the real version of this code is in the api Establishment business object and runs a sql query. + // We just return a 'fake result set' + const fetchMyEstablishmentsWorkers = sinon.spy(async (establishmentId, establishmentKey) => { + return []; + }); + + // Regular validation has to run first for the establishment to populate the internal properties correctly + await bulkUpload.validate(); + + // call the method + await bulkUpload.crossValidate({ + csvEstablishmentSchemaErrors, + myWorkers, + fetchMyEstablishmentsWorkers + }); + + // assert the fetchMyEstalishmentsWorkers function was called + expect(fetchMyEstablishmentsWorkers.callCount).to.equal(1); + + // assert a warning was returned + expect(csvEstablishmentSchemaErrors.length).to.equal(0); + + expect(csvEstablishmentSchemaErrors[0]).to.deep.equal(); + }); // it('should emit a warning if there are zero staff', async () => { // const bulkUpload = new (testUtils.sandBox( // filename, @@ -3544,5 +4106,5 @@ it('should not emit an error if postcode can be found in the reference data', as // warning: 'The number of employed staff is less than the number of non-employed staff please check your staff records' // }); // }); - // }); + }); }); From ae23adaffeebc8b792984674857bff6ed663ef8e Mon Sep 17 00:00:00 2001 From: Aaron Russell Date: Wed, 11 Mar 2020 13:12:21 +0000 Subject: [PATCH 128/305] Added WDF date to worker on creation --- server/models/classes/worker.js | 44 ++++++++++++++++++++++++++------- 1 file changed, 35 insertions(+), 9 deletions(-) diff --git a/server/models/classes/worker.js b/server/models/classes/worker.js index b954b5dfa2..b054e01c36 100644 --- a/server/models/classes/worker.js +++ b/server/models/classes/worker.js @@ -526,6 +526,7 @@ class Worker extends EntityValidator { // create new Worker try { const creationDate = new Date(); + const updatedTimestamp = new Date(); const creationDocument = { establishmentFk: this._establishmentId, uid: this.uid, @@ -550,6 +551,32 @@ class Worker extends EntityValidator { // why we cannot create a Worker record with more properties const modifedCreationDocument = this._properties.save(savedBy.toLowerCase(), creationDocument); + // always recalculate WDF - if not bulk upload (this._status) + if (this._status === null) { + await WdfCalculator.calculate(savedBy, this._establishmentId, null, thisTransaction, WdfCalculator.WORKER_ADD, false); + } + + // every time the worker is saved, need to calculate + // it's current WDF Eligibility, and if it is eligible, update + // the last WDF Eligibility status + const currentWdfEligibiity = await this.isWdfEligible(WdfCalculator.effectiveDate); + + const effectiveDateTime = WdfCalculator.effectiveTime; + + let wdfAudit = null; + console.log('Current WDF Eligibility: ', JSON.stringify(currentWdfEligibiity)); + console.log('Last WDF Eligibility: ', this._lastWdfEligibility); + console.log('WorkerID: ', this._id); + console.log('Effective Time: ', new Date(effectiveDateTime).toISOString()); + if (currentWdfEligibiity.isEligible && (this._lastWdfEligibility === null || this._lastWdfEligibility.getTime() < effectiveDateTime)) { + console.log('Worker is WDF Eligible. Updating lastEligibilityDate and adding to Audit table.'); + modifedCreationDocument.lastWdfEligibility = updatedTimestamp; + wdfAudit = { + username: savedBy.toLowerCase(), + type: 'wdfEligible' + }; + } + // now save the document const creation = await models.worker.create(modifedCreationDocument, { transaction: thisTransaction }); @@ -561,6 +588,10 @@ class Worker extends EntityValidator { this._updatedBy = savedBy.toLowerCase(); this._isNew = false; + if (associatedEntities) { + await this.saveAssociatedEntities(savedBy, bulkUploaded, thisTransaction); + } + // having the worker id we can now create the audit record; inserting the workerFk const allAuditEvents = [{ workerFk: this._id, @@ -572,16 +603,11 @@ class Worker extends EntityValidator { workerFk: this._id }; })); - await models.workerAudit.bulkCreate(allAuditEvents, { transaction: thisTransaction }); - - if (associatedEntities) { - await this.saveAssociatedEntities(savedBy, bulkUploaded, thisTransaction); - } - - // always recalculate WDF - if not bulk upload (this._status) - if (this._status === null) { - await WdfCalculator.calculate(savedBy, this._establishmentId, null, thisTransaction, WdfCalculator.WORKER_ADD, false); + if (wdfAudit) { + wdfAudit.workerFk = this._id; + allAuditEvents.push(wdfAudit); } + await models.workerAudit.bulkCreate(allAuditEvents, { transaction: thisTransaction }); // this is an async method - don't wait for it to return AWSKinesis.workerPump(AWSKinesis.CREATED, this.toJSON()); From 2922eeb906fe18e8cfcb7caa7fc7c2330e5167c7 Mon Sep 17 00:00:00 2001 From: rchitranshi <53287302+rchitranshi@users.noreply.github.com> Date: Thu, 12 Mar 2020 12:18:30 +0530 Subject: [PATCH 129/305] Fixed issues on view all mandatory training API. (#2038) --- server/models/classes/mandatoryTraining.js | 768 ++++++++++----------- server/models/classes/training.js | 46 +- 2 files changed, 424 insertions(+), 390 deletions(-) diff --git a/server/models/classes/mandatoryTraining.js b/server/models/classes/mandatoryTraining.js index 1a60e9c17d..51a78591e1 100644 --- a/server/models/classes/mandatoryTraining.js +++ b/server/models/classes/mandatoryTraining.js @@ -9,387 +9,387 @@ */ // database models -const models = require('../index'); -const EntityValidator = require('./validations/entityValidator').EntityValidator; -const Training = require('../../models/classes/training').Training; -class MandatoryTraining extends EntityValidator { - constructor(establishmentId) { - super(); - this._establishmentId = establishmentId; - this._id = null; - this._trainingId = null; - this._jobId = null; - this._created = null; - this._updated = null; - this._createdBy = null; - this._updatedBy = null; - } - - // private logging - static get LOG_ERROR() { return 100; } - static get LOG_WARN() { return 200; } - static get LOG_INFO() { return 300; } - static get LOG_TRACE() { return 400; } - static get LOG_DEBUG() { return 500; } - - set logLevel(logLevel) { - this._logLevel = logLevel; - } - - _log(level, msg) { - if (this._logLevel >= level) { - console.log(`TODO: (${level}) - Mandatory Training class: `, msg); - } - } - - set mandatorytrainingDetails(obj) { - this._mandatorytrainingDetails = obj; - } - - get mandatorytrainingDetails() { - return this._mandatorytrainingDetails; - } - - set establishmentId(newId) { - this._establishmentId = newId; - } - - get establishmentId() { - return this._establishmentId; - } - - get id() { - return this._id; - } - - get created() { - return this._created; - } - get updated() { - return this._updated; - } - get createdBy() { - return this._createdBy; - } - get updatedBy() { - return this._updatedBy; - } - - // used by save to initialise a new Mandatory Trainign Record; returns true if having initialised this Training Record - _initialise() { - if (this._id === null) { - this._isNew = true; - return true; - } else { - return false; - } - } - - // validates a given mandatory training record; returns the training record if valid - async validateMandatoryTrainingRecord(document) { - let validatedMandatoryTrainingRecord = []; - let returnStatus = true; - //validate all posted training ids - if(document && Array.isArray(document)){ - for(let i = 0; i < document.length; i++){ - let doc = document[i]; - if(!doc.trainingCategoryId){ - console.error('POST:: create mandatoryTraining - Failed Validation - Training Category ID missing'); - this._log(MandatoryTraining.LOG_ERROR, 'Failed Validation - Training Category ID missing'); - return false; - } - // get training details - const trainingCategoryDetails = await models.workerTrainingCategories.findOne({ - where: { - id: doc.trainingCategoryId - }, - attributes: ['id'] - }); - - if (trainingCategoryDetails && trainingCategoryDetails.id) { - // get job details if doc.allJobRoles === false - if(!doc.allJobRoles){ - let foundJobRoles = true; - if(!doc.allJobRoles && Array.isArray(doc.jobs) && doc.jobs.length > 0){ - - for(let j = 0; j < doc.jobs.length; j++){ - let job = doc.jobs[j]; - const jobDetails = await models.job.findOne({ - where: { - id: job.id - }, - attributes: ['id'] - }); - - if (!jobDetails || !jobDetails.id) { - foundJobRoles = false; - console.error('POST:: create mandatoryTraining - Failed Validation - Job role record not found'); - this._log(MandatoryTraining.LOG_ERROR, 'Failed Validation - Job role record not found'); - returnStatus = false; - } - } - }else{ - console.error('POST:: create mandatoryTraining - Failed Validation - Selected job roles record not found'); - this._log(MandatoryTraining.LOG_ERROR, 'Failed Validation - Selected job roles record not found'); - returnStatus = false; - } - - if(foundJobRoles){ - validatedMandatoryTrainingRecord.push(doc); - } - }else{ - validatedMandatoryTrainingRecord.push(doc); - } - }else{ - console.error('POST:: create mandatoryTraining - Failed Validation - Training Category record not found'); - this._log(MandatoryTraining.LOG_ERROR, 'Failed Validation - Training record not found'); - return false; - } - } - }else{ - console.error('POST:: create mandatoryTraining - Failed Validation - Invalid Input'); - this._log(MandatoryTraining.LOG_ERROR, 'Invalid Input'); - return false; - } - - if (returnStatus === false) { - return false; - } else { - return validatedMandatoryTrainingRecord; - } - } - - // takes the given JSON document and updates self (internal properties) - // Thows "Error" on error. - async load(document) { - try { - const validatedTrainingRecord = await this.validateMandatoryTrainingRecord(document); - - if (validatedTrainingRecord !== false) { - return this.mandatorytrainingDetails = validatedTrainingRecord; - } else { - this._log(MandatoryTraining.LOG_ERROR, `Failed Validation::load - failed`); - return false - } - } catch (err) { - console.error(`POST:: create mandatoryTraining - Failed Validation::load - error: ${err}`); - this._log(MandatoryTraining.LOG_ERROR, `Failed Validation::load - error: ${err}`); - throw new Error('Failed Validation'); - } - } - - // saves the Training record to DB. Returns true if saved; false is not. - // Throws "Error" on error - async save(savedBy, externalTransaction=null) { - let returnSavedResponse = []; - let failedWhileSave = false; - let initializedRecords = this._initialise(); - if(initializedRecords && this._isNew){ - // create new Mandatory Training Record - try{ - - //find already existing mandatory details, if found delete them - for(let i = 0; i < this.mandatorytrainingDetails.length; i++){ - let row = this.mandatorytrainingDetails[i]; - const fetchQuery = { - where: { - establishmentFK: this.establishmentId - } - }; - await models.MandatoryTraining.destroy(fetchQuery); - } - - // save new mandatory training details - for(let i = 0; i < this.mandatorytrainingDetails.length; i++){ - let row = this.mandatorytrainingDetails[i]; - if(row.allJobRoles){ - // fetch all job roles - let allJobRoles = await models.job.findAll({ - attributes: ['id'], - }); - if (allJobRoles && Array.isArray(allJobRoles) && allJobRoles.length > 0) { - row.jobs = allJobRoles; - } else { - failedWhileSave = true; - throw new Error('No Job roles found'); - } - } - - if(Array.isArray(row.jobs) && row.jobs.length > 0){ - for(let j = 0; j < row.jobs.length; j++){ - let job = row.jobs[j]; - const now = new Date(); - let creationDocument = { - establishmentFK: this.establishmentId, - trainingCategoryFK: row.trainingCategoryId, - jobFK: job.id, - created: now, - updated: now, - createdBy: savedBy.toLowerCase(), - updatedBy: savedBy.toLowerCase() - } - - // need to create the Training record only - // in one transaction - await models.sequelize.transaction(async t => { - // the saving of an Mandatory Training record can be initiated within - // an external transaction - const thisTransaction = externalTransaction ? externalTransaction : t; - - // now save the document - let creation = await models.MandatoryTraining.create(creationDocument, {transaction: thisTransaction}); - - const sanitisedResults = creation.get({plain: true}); - returnSavedResponse.push({ - id: sanitisedResults.ID, - created: sanitisedResults.created, - updated: sanitisedResults.updated, - createdBy: savedBy.toLowerCase(), - updatedBy: savedBy.toLowerCase() - }); - this._isNew = false; - - this._log(MandatoryTraining.LOG_INFO, `Created Mandatory Training Record with id (${sanitisedResults.ID})`); - }); - } - } - } - if(!failedWhileSave){ - return returnSavedResponse; - } - } - catch (err) { - console.error(`POST:: create mandatoryTraining - Failed to save new Mandatory training record: ${err}`); - this._log(MandatoryTraining.LOG_ERROR, `Failed to save new Mandatory training record: ${err}`); - throw new Error('Failed to save new Mandatory Training record'); - } - }else{ - // we are updating an existing Mandatory Training Record - try{ - - } - catch (err) { - console.error(`POST:: create mandatoryTraining - Failed to update Mandatory Training record with id (${this._id})`); - this._log(MandatoryTraining.LOG_ERROR, `Failed to update Mandatory Training record with id (${this._id})`); - throw new Error('Failed to update Mandatory Training record'); - } - } - } - - /** - * Returns all saved mandatory training list including training category name, job name and establishment id - */ - static async fetch(establishmentId){ - const allMandatoryTrainingRecords = []; - const fetchResults = await models.MandatoryTraining.findAll({ - include: [ - { - model: models.workerTrainingCategories, - as: 'workerTrainingCategories', - attributes: ['id', 'category'] - }, - { - model: models.job, - as: 'job', - attributes: ['id', 'title'] - } - ], - order: [ - ['updated', 'DESC'] - ], - where: { - establishmentFK: establishmentId - } - }); - - if(fetchResults){ - fetchResults.forEach(result => { - if(allMandatoryTrainingRecords.length > 0){ - const foundCategory = allMandatoryTrainingRecords.filter(el => el.trainingCategoryId === result.trainingCategoryFK); - if (foundCategory.length === 0){ - allMandatoryTrainingRecords.push({ - establishmentId: result.establishmentFK, - trainingCategoryId: result.trainingCategoryFK, - category: result.workerTrainingCategories.category, - jobs: [{id: result.jobFK, title: result.job.title}] - }); - }else{ - foundCategory[0].jobs.push({id: result.jobFK, title: result.job.title}); - } - }else{ - allMandatoryTrainingRecords.push({ - establishmentId: result.establishmentFK, - trainingCategoryId: result.trainingCategoryFK, - category: result.workerTrainingCategories.category, - jobs: [{id: result.jobFK, title: result.job.title}] - }); - } - }); - } - - let lastUpdated = null; - if (fetchResults && fetchResults.length === 1) { - lastUpdated = fetchResults[0]; - } else if (fetchResults && fetchResults.length > 1) { - lastUpdated = fetchResults.reduce((a, b) => { return a.updated > b.updated ? a : b; }); - } - - const allJobRoles = await models.job.findAll(); - if(allJobRoles){ - const response = { - mandatoryTrainingCount: allMandatoryTrainingRecords.length, - allJobRolesCount: allJobRoles.length, - lastUpdated: lastUpdated ? lastUpdated.updated.toISOString() : undefined, - mandatoryTraining: allMandatoryTrainingRecords - }; - - return response; - } - } - - /** - * Returns all saved mandatory training list including worker details - * Calculate missing mandatory training counts if not available on those worker records - */ - static async fetchAllMandatoryTrainings(establishmentId){ - // Fetch all saved mandatory training - const mandatoryTrainingDetails = await MandatoryTraining.fetch(establishmentId); - if(mandatoryTrainingDetails && mandatoryTrainingDetails.mandatoryTraining.length > 0){ - let mandatoryTraining = mandatoryTrainingDetails.mandatoryTraining; - for(let i = 0; i < mandatoryTraining.length; i++){ - let tempWorkers = []; - let jobs = mandatoryTraining[i].jobs; - for(let j = 0; j < jobs.length; j++){ - const thisWorker = await models.worker.findAll({ - attributes: ['id', 'uid', 'NameOrIdValue'], - where:{ - establishmentFk: establishmentId, - MainJobFkValue: jobs[j].id - } - }); - if(thisWorker && thisWorker.length > 0){ - thisWorker.forEach(async worker => { - tempWorkers.push({ - id: worker.id, - uid: worker.uid, - NameOrIdValue: worker.NameOrIdValue, - mainJob:{jobId: jobs[j].id, title: jobs[j].title} - }); - }); - } - } - delete mandatoryTraining[i].jobs; - mandatoryTraining[i].workers = []; - if(tempWorkers.length > 0){ - mandatoryTraining[i].workers = await Training.getAllRequiredCounts(establishmentId, tempWorkers); - } - } - } - delete mandatoryTrainingDetails.mandatoryTrainingCount; - delete mandatoryTrainingDetails.allJobRolesCount; - return mandatoryTrainingDetails; - } - -} - -module.exports.MandatoryTraining = MandatoryTraining; + const models = require('../index'); + const EntityValidator = require('./validations/entityValidator').EntityValidator; + const Training = require('../../models/classes/training').Training; + class MandatoryTraining extends EntityValidator { + constructor(establishmentId) { + super(); + this._establishmentId = establishmentId; + this._id = null; + this._trainingId = null; + this._jobId = null; + this._created = null; + this._updated = null; + this._createdBy = null; + this._updatedBy = null; + } + + // private logging + static get LOG_ERROR() { return 100; } + static get LOG_WARN() { return 200; } + static get LOG_INFO() { return 300; } + static get LOG_TRACE() { return 400; } + static get LOG_DEBUG() { return 500; } + + set logLevel(logLevel) { + this._logLevel = logLevel; + } + + _log(level, msg) { + if (this._logLevel >= level) { + console.log(`TODO: (${level}) - Mandatory Training class: `, msg); + } + } + + set mandatorytrainingDetails(obj) { + this._mandatorytrainingDetails = obj; + } + + get mandatorytrainingDetails() { + return this._mandatorytrainingDetails; + } + + set establishmentId(newId) { + this._establishmentId = newId; + } + + get establishmentId() { + return this._establishmentId; + } + + get id() { + return this._id; + } + + get created() { + return this._created; + } + get updated() { + return this._updated; + } + get createdBy() { + return this._createdBy; + } + get updatedBy() { + return this._updatedBy; + } + + // used by save to initialise a new Mandatory Trainign Record; returns true if having initialised this Training Record + _initialise() { + if (this._id === null) { + this._isNew = true; + return true; + } else { + return false; + } + } + + // validates a given mandatory training record; returns the training record if valid + async validateMandatoryTrainingRecord(document) { + let validatedMandatoryTrainingRecord = []; + let returnStatus = true; + //validate all posted training ids + if(document && Array.isArray(document)){ + for(let i = 0; i < document.length; i++){ + let doc = document[i]; + if(!doc.trainingCategoryId){ + console.error('POST:: create mandatoryTraining - Failed Validation - Training Category ID missing'); + this._log(MandatoryTraining.LOG_ERROR, 'Failed Validation - Training Category ID missing'); + return false; + } + // get training details + const trainingCategoryDetails = await models.workerTrainingCategories.findOne({ + where: { + id: doc.trainingCategoryId + }, + attributes: ['id'] + }); + + if (trainingCategoryDetails && trainingCategoryDetails.id) { + // get job details if doc.allJobRoles === false + if(!doc.allJobRoles){ + let foundJobRoles = true; + if(!doc.allJobRoles && Array.isArray(doc.jobs) && doc.jobs.length > 0){ + + for(let j = 0; j < doc.jobs.length; j++){ + let job = doc.jobs[j]; + const jobDetails = await models.job.findOne({ + where: { + id: job.id + }, + attributes: ['id'] + }); + + if (!jobDetails || !jobDetails.id) { + foundJobRoles = false; + console.error('POST:: create mandatoryTraining - Failed Validation - Job role record not found'); + this._log(MandatoryTraining.LOG_ERROR, 'Failed Validation - Job role record not found'); + returnStatus = false; + } + } + }else{ + console.error('POST:: create mandatoryTraining - Failed Validation - Selected job roles record not found'); + this._log(MandatoryTraining.LOG_ERROR, 'Failed Validation - Selected job roles record not found'); + returnStatus = false; + } + + if(foundJobRoles){ + validatedMandatoryTrainingRecord.push(doc); + } + }else{ + validatedMandatoryTrainingRecord.push(doc); + } + }else{ + console.error('POST:: create mandatoryTraining - Failed Validation - Training Category record not found'); + this._log(MandatoryTraining.LOG_ERROR, 'Failed Validation - Training record not found'); + return false; + } + } + }else{ + console.error('POST:: create mandatoryTraining - Failed Validation - Invalid Input'); + this._log(MandatoryTraining.LOG_ERROR, 'Invalid Input'); + return false; + } + + if (returnStatus === false) { + return false; + } else { + return validatedMandatoryTrainingRecord; + } + } + + // takes the given JSON document and updates self (internal properties) + // Thows "Error" on error. + async load(document) { + try { + const validatedTrainingRecord = await this.validateMandatoryTrainingRecord(document); + + if (validatedTrainingRecord !== false) { + return this.mandatorytrainingDetails = validatedTrainingRecord; + } else { + this._log(MandatoryTraining.LOG_ERROR, `Failed Validation::load - failed`); + return false + } + } catch (err) { + console.error(`POST:: create mandatoryTraining - Failed Validation::load - error: ${err}`); + this._log(MandatoryTraining.LOG_ERROR, `Failed Validation::load - error: ${err}`); + throw new Error('Failed Validation'); + } + } + + // saves the Training record to DB. Returns true if saved; false is not. + // Throws "Error" on error + async save(savedBy, externalTransaction=null) { + let returnSavedResponse = []; + let failedWhileSave = false; + let initializedRecords = this._initialise(); + if(initializedRecords && this._isNew){ + // create new Mandatory Training Record + try{ + + //find already existing mandatory details, if found delete them + for(let i = 0; i < this.mandatorytrainingDetails.length; i++){ + let row = this.mandatorytrainingDetails[i]; + const fetchQuery = { + where: { + establishmentFK: this.establishmentId + } + }; + await models.MandatoryTraining.destroy(fetchQuery); + } + + // save new mandatory training details + for(let i = 0; i < this.mandatorytrainingDetails.length; i++){ + let row = this.mandatorytrainingDetails[i]; + if(row.allJobRoles){ + // fetch all job roles + let allJobRoles = await models.job.findAll({ + attributes: ['id'], + }); + if (allJobRoles && Array.isArray(allJobRoles) && allJobRoles.length > 0) { + row.jobs = allJobRoles; + } else { + failedWhileSave = true; + throw new Error('No Job roles found'); + } + } + + if(Array.isArray(row.jobs) && row.jobs.length > 0){ + for(let j = 0; j < row.jobs.length; j++){ + let job = row.jobs[j]; + const now = new Date(); + let creationDocument = { + establishmentFK: this.establishmentId, + trainingCategoryFK: row.trainingCategoryId, + jobFK: job.id, + created: now, + updated: now, + createdBy: savedBy.toLowerCase(), + updatedBy: savedBy.toLowerCase() + } + + // need to create the Training record only + // in one transaction + await models.sequelize.transaction(async t => { + // the saving of an Mandatory Training record can be initiated within + // an external transaction + const thisTransaction = externalTransaction ? externalTransaction : t; + + // now save the document + let creation = await models.MandatoryTraining.create(creationDocument, {transaction: thisTransaction}); + + const sanitisedResults = creation.get({plain: true}); + returnSavedResponse.push({ + id: sanitisedResults.ID, + created: sanitisedResults.created, + updated: sanitisedResults.updated, + createdBy: savedBy.toLowerCase(), + updatedBy: savedBy.toLowerCase() + }); + this._isNew = false; + + this._log(MandatoryTraining.LOG_INFO, `Created Mandatory Training Record with id (${sanitisedResults.ID})`); + }); + } + } + } + if(!failedWhileSave){ + return returnSavedResponse; + } + } + catch (err) { + console.error(`POST:: create mandatoryTraining - Failed to save new Mandatory training record: ${err}`); + this._log(MandatoryTraining.LOG_ERROR, `Failed to save new Mandatory training record: ${err}`); + throw new Error('Failed to save new Mandatory Training record'); + } + }else{ + // we are updating an existing Mandatory Training Record + try{ + + } + catch (err) { + console.error(`POST:: create mandatoryTraining - Failed to update Mandatory Training record with id (${this._id})`); + this._log(MandatoryTraining.LOG_ERROR, `Failed to update Mandatory Training record with id (${this._id})`); + throw new Error('Failed to update Mandatory Training record'); + } + } + } + + /** + * Returns all saved mandatory training list including training category name, job name and establishment id + */ + static async fetch(establishmentId){ + const allMandatoryTrainingRecords = []; + const fetchResults = await models.MandatoryTraining.findAll({ + include: [ + { + model: models.workerTrainingCategories, + as: 'workerTrainingCategories', + attributes: ['id', 'category'] + }, + { + model: models.job, + as: 'job', + attributes: ['id', 'title'] + } + ], + order: [ + ['updated', 'DESC'] + ], + where: { + establishmentFK: establishmentId + } + }); + + if(fetchResults){ + fetchResults.forEach(result => { + if(allMandatoryTrainingRecords.length > 0){ + const foundCategory = allMandatoryTrainingRecords.filter(el => el.trainingCategoryId === result.trainingCategoryFK); + if (foundCategory.length === 0){ + allMandatoryTrainingRecords.push({ + establishmentId: result.establishmentFK, + trainingCategoryId: result.trainingCategoryFK, + category: result.workerTrainingCategories.category, + jobs: [{id: result.jobFK, title: result.job.title}] + }); + }else{ + foundCategory[0].jobs.push({id: result.jobFK, title: result.job.title}); + } + }else{ + allMandatoryTrainingRecords.push({ + establishmentId: result.establishmentFK, + trainingCategoryId: result.trainingCategoryFK, + category: result.workerTrainingCategories.category, + jobs: [{id: result.jobFK, title: result.job.title}] + }); + } + }); + } + + let lastUpdated = null; + if (fetchResults && fetchResults.length === 1) { + lastUpdated = fetchResults[0]; + } else if (fetchResults && fetchResults.length > 1) { + lastUpdated = fetchResults.reduce((a, b) => { return a.updated > b.updated ? a : b; }); + } + + const allJobRoles = await models.job.findAll(); + if(allJobRoles){ + const response = { + mandatoryTrainingCount: allMandatoryTrainingRecords.length, + allJobRolesCount: allJobRoles.length, + lastUpdated: lastUpdated ? lastUpdated.updated.toISOString() : undefined, + mandatoryTraining: allMandatoryTrainingRecords + }; + + return response; + } + } + + /** + * Returns all saved mandatory training list including worker details + * Calculate missing mandatory training counts if not available on those worker records + */ + static async fetchAllMandatoryTrainings(establishmentId){ + // Fetch all saved mandatory training + const mandatoryTrainingDetails = await MandatoryTraining.fetch(establishmentId); + if(mandatoryTrainingDetails && mandatoryTrainingDetails.mandatoryTraining.length > 0){ + let mandatoryTraining = mandatoryTrainingDetails.mandatoryTraining; + for(let i = 0; i < mandatoryTraining.length; i++){ + let tempWorkers = []; + let jobs = mandatoryTraining[i].jobs; + for(let j = 0; j < jobs.length; j++){ + const thisWorker = await models.worker.findAll({ + attributes: ['id', 'uid', 'NameOrIdValue'], + where:{ + establishmentFk: establishmentId, + MainJobFkValue: jobs[j].id + } + }); + if(thisWorker && thisWorker.length > 0){ + thisWorker.forEach(async worker => { + tempWorkers.push({ + id: worker.id, + uid: worker.uid, + NameOrIdValue: worker.NameOrIdValue, + mainJob:{jobId: jobs[j].id, title: jobs[j].title} + }); + }); + } + } + delete mandatoryTraining[i].jobs; + mandatoryTraining[i].workers = []; + if(tempWorkers.length > 0){ + mandatoryTraining[i].workers = await Training.getAllRequiredCounts(establishmentId, tempWorkers, mandatoryTraining[i].trainingCategoryId); + } + } + } + delete mandatoryTrainingDetails.mandatoryTrainingCount; + delete mandatoryTrainingDetails.allJobRolesCount; + return mandatoryTrainingDetails; + } + + } + + module.exports.MandatoryTraining = MandatoryTraining; diff --git a/server/models/classes/training.js b/server/models/classes/training.js index e57b6cd2c8..23e5238b7d 100644 --- a/server/models/classes/training.js +++ b/server/models/classes/training.js @@ -713,11 +713,13 @@ class Training extends EntityValidator { }; // returns a set of Workers' Training Records based on given filter criteria (all if no filters defined) - restricted to the given Worker - static async fetch(establishmentId, workerId, filters=null) { + static async fetch(establishmentId, workerId, categoryId = null, filters=null) { if (filters) throw new Error("Filters not implemented"); const allTrainingRecords = []; - const fetchResults = await models.workerTraining.findAll({ + let fetchResults; + if(categoryId === null){ + fetchResults = await models.workerTraining.findAll({ include: [ { model: models.worker, @@ -737,7 +739,33 @@ class Training extends EntityValidator { //['completed', 'DESC'], ['updated', 'DESC'] ] + }); + }else{ + fetchResults = await models.workerTraining.findAll({ + include: [ + { + model: models.worker, + as: 'worker', + attributes: ['id', 'uid'], + where: { + uid: workerId + } + }, + { + model: models.workerTrainingCategories, + as: 'category', + attributes: ['id', 'category'] + } + ], + order: [ + //['completed', 'DESC'], + ['updated', 'DESC'] + ], + where:{ + categoryFk: categoryId + } }); + } if (fetchResults) { fetchResults.forEach(thisRecord => { @@ -814,18 +842,19 @@ class Training extends EntityValidator { * @param {object} workerRecords * @return {array} Modified worker records while adding training counts & missing mandatory training counts for each worker object */ - static async getAllRequiredCounts(establishmentId, workerRecords){ + static async getAllRequiredCounts(establishmentId, workerRecords, categoryId = null){ if(workerRecords.length !== 0){ let currentDate = moment(); for(let i = 0; i < workerRecords.length; i++){ - const allTrainingRecords = await Training.fetch(establishmentId, workerRecords[i].uid); + const allTrainingRecords = await Training.fetch(establishmentId, workerRecords[i].uid, categoryId); workerRecords[i].trainingCount = 0; workerRecords[i].expiredTrainingCount = 0; workerRecords[i].expiringTrainingCount = 0; workerRecords[i].missingMandatoryTrainingCount = 0; if(allTrainingRecords && allTrainingRecords.training.length > 0){ - workerRecords[i].missingMandatoryTrainingCount = await Training.getAllMissingMandatoryTrainingCounts(establishmentId, workerRecords[i], allTrainingRecords.training); - workerRecords[i].trainingCount = allTrainingRecords.training.length; + if(categoryId === null){ + workerRecords[i].missingMandatoryTrainingCount = await Training.getAllMissingMandatoryTrainingCounts(establishmentId, workerRecords[i], allTrainingRecords.training); + } //calculate all expired and expiring soon training count let trainings = allTrainingRecords.training; for(let j = 0; j < trainings.length; j++){ @@ -839,7 +868,12 @@ class Training extends EntityValidator { } } } + }else{ + if(categoryId !== null){ + workerRecords[i].missingMandatoryTrainingCount++; + } } + workerRecords[i].trainingCount = workerRecords[i].expiredTrainingCount + workerRecords[i].expiringTrainingCount + workerRecords[i].missingMandatoryTrainingCount; } return workerRecords; } From 73d4938db694d80b19567ef1c095878f27b065eb Mon Sep 17 00:00:00 2001 From: Manish Kumar Srivastava Date: Thu, 12 Mar 2020 15:41:26 +0530 Subject: [PATCH 130/305] Bugfix/cosmetic defects (#2022) * Fixed 2/3 grid on content for Select Main Service question * Changed title of your details to 'Add user account Your details - Remove 'Your' from form fields Create a username should be Create a username and password Add full stop to username and password content. * Regulated by CQC error message (cherry picked from commit b9661026a8c50677b61e59267be1c96ed424c7be) * footer fix. (#2023) * Bugfix/cosmetic defects workplace (#2039) * footer fix. * Fixed workplace ui defect * Corrected alignment * Workplace UI changes Co-authored-by: Anurag Negi <55235060+Negi-Anurag@users.noreply.github.com> --- .../account-details/account-details.ts | 8 +- .../regulated-by-cqc.component.html | 8 +- .../home-tab/home-tab.component.html | 8 +- .../accessibility-statement.component.html | 30 ++++---- .../contact-us/contact-us.component.html | 4 +- .../cookie-policy.component.html | 8 +- .../create-username.component.html | 6 +- .../enter-workplace-address.component.html | 2 +- .../regulated-by-cqc.component.html | 7 +- .../your-details/your-details.component.html | 2 +- .../enter-workplace-address.component.html | 75 +++++++++---------- .../regulated-by-cqc/regulated-by-cqc.ts | 64 ++++++++-------- .../select-main-service.component.html | 8 +- ...ring-with-local-authorities.component.html | 67 ++++++++--------- ...haring-with-local-authorities.component.ts | 17 +++-- .../data-sharing/data-sharing.component.html | 34 ++++----- .../workplace/leavers/leavers.component.html | 39 +++++++--- .../workplace/leavers/leavers.component.ts | 29 +++---- .../other-services.component.html | 2 +- .../regulated-by-cqc.component.html | 7 +- .../service-users.component.html | 4 +- .../starters/starters.component.html | 43 ++++++++--- .../workplace/starters/starters.component.ts | 29 +++---- .../vacancies/vacancies.component.html | 44 ++++++++--- .../vacancies/vacancies.component.ts | 27 +++---- .../workplace-not-found.component.html | 8 +- .../workplace-summary.component.html | 25 +++---- 27 files changed, 333 insertions(+), 272 deletions(-) diff --git a/src/app/features/account/account-details/account-details.ts b/src/app/features/account/account-details/account-details.ts index 77856346e6..35b243786a 100644 --- a/src/app/features/account/account-details/account-details.ts +++ b/src/app/features/account/account-details/account-details.ts @@ -21,15 +21,15 @@ export class AccountDetails implements OnInit, OnDestroy, AfterViewInit { public form: FormGroup; public formControlsMap: any[] = [ { - label: 'Your full name', + label: 'Full name', name: 'fullname', }, { - label: 'Your job title', + label: 'Job title', name: 'jobTitle', }, { - label: 'Your email address', + label: 'Email address', name: 'email', }, { @@ -44,7 +44,7 @@ export class AccountDetails implements OnInit, OnDestroy, AfterViewInit { protected backService: BackService, protected errorSummaryService: ErrorSummaryService, protected fb: FormBuilder, - protected router: Router + protected router: Router, ) {} ngOnInit() { diff --git a/src/app/features/add-workplace/regulated-by-cqc/regulated-by-cqc.component.html b/src/app/features/add-workplace/regulated-by-cqc/regulated-by-cqc.component.html index ab2b1ac2a8..b6efcf5fbd 100644 --- a/src/app/features/add-workplace/regulated-by-cqc/regulated-by-cqc.component.html +++ b/src/app/features/add-workplace/regulated-by-cqc/regulated-by-cqc.component.html @@ -17,9 +17,13 @@

    - - Error: {{ getFirstErrorMessage('regulatedByCQC') }} + + {{ + getFirstErrorMessage('regulatedByCQC') + }} + {{ getFirstErrorMessage('group') }} +
    diff --git a/src/app/features/dashboard/home-tab/home-tab.component.html b/src/app/features/dashboard/home-tab/home-tab.component.html index db9978f8d7..96c12deb68 100644 --- a/src/app/features/dashboard/home-tab/home-tab.component.html +++ b/src/app/features/dashboard/home-tab/home-tab.component.html @@ -22,7 +22,9 @@

    Add a staff record

    -

    + +

    + Create staff records for your workplace by providing current work information, personal details, employment and qualifications and training information.

    @@ -33,7 +35,7 @@

    View reports

    -

    +

    View your Workforce Development Fund report to check whether you’re eligible to claim funding towards training and qualifications.

    @@ -44,7 +46,7 @@

    Bulk upload

    -

    +

    Bulk upload is used to edit large quantities of staff, workplace and training information.

    diff --git a/src/app/features/public/accessibility-statement/accessibility-statement.component.html b/src/app/features/public/accessibility-statement/accessibility-statement.component.html index 6e2b741cc9..5d740a8ddb 100644 --- a/src/app/features/public/accessibility-statement/accessibility-statement.component.html +++ b/src/app/features/public/accessibility-statement/accessibility-statement.component.html @@ -7,11 +7,11 @@

    Summary

    as possible to be able to use this service. For example, that means you should be able to:

      -
    • Access the service on a range of mobile, tablet and desktop devices
      • +
    • access the service on a range of mobile, tablet and desktop devices
    • change colours, contrast levels, fonts and adapt your display settings
    • zoom in up to 300% without the text spilling off the screen
    • navigate most of the service using just a keyboard
      • -
    • Skip to the main content using a keyboard accessible link at the top of each page
      • +
    • skip to the main content using a keyboard accessible link at the top of each page
    • navigate most of the service using speech recognition software
    • listen to most of the content using a screen reader (including the most recent versions of JAWS, NVDA and @@ -20,7 +20,7 @@

      Summary

    Advice on making your device easier to use if you have a disability can be found at - AbilityNet. + AbilityNet

    How accessible this service is

    @@ -29,31 +29,31 @@

    How accessible this service is

    • - Forms may be difficult to submit without keyboard, mouse or touch interactions with form elements when using - speech recognition software (e.g. Dragon Naturally Speaking). + forms may be difficult to submit without keyboard, mouse or touch interactions with form elements when using + speech recognition software (e.g. Dragon Naturally Speaking)
    • - When using a keyboard to activate error summary panel links, you may encounter problems accessing links and form + when using a keyboard to activate error summary panel links, you may encounter problems accessing links and form elements further down the page. You may need to navigate manually down to page content after an error message is - displayed to work around this issue. + displayed to work around this issue
      • -
    • PDF documents aren't tagged and may not read aloud in a logical order.
      • +
    • PDF documents aren't tagged and may not read aloud in a logical order
    • - The bulk uploads section uses legacy functionality that may be difficult to use with screen readers, for example + the bulk uploads section uses legacy functionality that may be difficult to use with screen readers, for example validating status updates are not announced. Some users may find the bulk uploads instructions difficult to use - as they are contained in the PDF documents and error messages may not always describe the error in detail. + as they are contained in the PDF documents and error messages may not always describe the error in detail
    • - The bulk uploads staff summary report is provided in a plain text download file. This file isn't formatted using + the bulk uploads staff summary report is provided in a plain text download file. This file isn't formatted using standard plain text formatting conventions and screen reader users may have difficulty understanding the - document structure. + document structure
    • - If you accidentally or otherwise, refresh the bulk uploads page, you may be directed to the dashboard and have + if you accidentally or otherwise, refresh the bulk uploads page, you may be directed to the dashboard and have to manually sign out and in again to activate the bulk uploads navigation link. This applies to all users - including keyboard, mouse and assistive technology users. + including keyboard, mouse and assistive technology users
      • -
    • This service requires JavaScript enabled and is not progressively enhanced.
      • +
    • this service requires JavaScript enabled and is not progressively enhanced

    What to do if you can't access parts of this website

    diff --git a/src/app/features/public/contact-us/contact-us.component.html b/src/app/features/public/contact-us/contact-us.component.html index c62e9688ee..e5d6ede521 100644 --- a/src/app/features/public/contact-us/contact-us.component.html +++ b/src/app/features/public/contact-us/contact-us.component.html @@ -3,7 +3,9 @@

    Contact us

    If you require direct assistance, please call 0113 241 0969, to speak to a member of the ASC-WDS Support Team or - you can email us at ascwds-support@skillsforcare.org.uk. + you can email us at
    ascwds-support@skillsforcare.org.uk.

    Our support staff are available Monday to Friday 9.00am - 5.00pm excluding bank holidays. diff --git a/src/app/features/public/cookie-policy/cookie-policy.component.html b/src/app/features/public/cookie-policy/cookie-policy.component.html index 2ddd423ae2..76c8445738 100644 --- a/src/app/features/public/cookie-policy/cookie-policy.component.html +++ b/src/app/features/public/cookie-policy/cookie-policy.component.html @@ -46,7 +46,7 @@

    Functionality cookies

     - + - + - +
    Training categoryStatusTraining categoryStatus Quantity
    - Missing - {{ mandatoryTraining.status }} +
    + expired + {{ mandatoryTraining.catExpiredTrainingCount }} + Expired +
    +
    + expiring + {{ mandatoryTraining.catExpiringTrainingCount }} Expiring soon +
    +
    + missing mandatory training + {{ mandatoryTraining.catMissingMandatoryTrainingCount }} + Missing +
    +
    + Up-to-date +
    		{{ mandatoryTraining.quantity }} @@ -36,48 +72,74 @@

    Mandatory training ({{ mandatoryTrainings.length }}) *ngIf="canEditWorker && mandatoryTraining.workers.length > 0" class="govuk-link--no-visited-state" href="#" - (click)="toggleDetails(mandatoryTraining.id, $event)" + (click)="toggleDetails(mandatoryTraining.trainingCategoryId, $event)" >{{ - mandatoryTrainingsDetailsLabel[mandatoryTraining.id] ? mandatoryTrainingsDetailsLabel[mandatoryTraining.id] : 'Open' + mandatoryTrainingsDetailsLabel[mandatoryTraining.trainingCategoryId] + ? mandatoryTrainingsDetailsLabel[mandatoryTraining.trainingCategoryId] + : 'Open' }}

    - - - - - - - - - - - - +
    Worker IDJob roleStatus
    + + + + + + + + + - - + +
    Worker IDJob roleStatus
    - {{ worker.name }} + {{ + worker.NameOrIdValue + }} {{ worker.mainJob?.title }} - - Missing - {{ worker.missingMandatoryTrainingCount }} Missing - - - Up-to-date - +
    + expired + {{ worker.expiredTrainingCount }} + Expired +
    +
    + expiring + {{ worker.expiringTrainingCount }} Expiring soon +
    +
    + missing mandatory training + {{ worker.missingMandatoryTrainingCount }} + Missing +
    +
    + Up-to-date +
    Essential CookiesEssential Cookies This cookie is essential for our site. It stores a AuthToken so our website can remember you from one page request to the next. @@ -54,12 +54,14 @@

    Functionality cookies
    Google AnalyticsGoogle Analytics This cookie enables us to collect standard internet log information and details of visitor behaviour patterns. We do this to find out things such as the number of visitors to the various parts of the site. https://bit.ly/1dm9wka + https://bit.ly/1dm9wka +
    diff --git a/src/app/features/registration/create-username/create-username.component.html b/src/app/features/registration/create-username/create-username.component.html index 7697ecee80..44c123a6c9 100644 --- a/src/app/features/registration/create-username/create-username.component.html +++ b/src/app/features/registration/create-username/create-username.component.html @@ -13,7 +13,7 @@ User account

    - Create a username + Create a username and password

    @@ -22,7 +22,7 @@

    Username - You will use this to sign in. It should be unique to you + You will use this to sign in. It should be unique to you. Error: @@ -44,7 +44,7 @@

    Password - This must be at least 8 characters, contain one uppercase and one lowercase letter and a number + This must be at least 8 characters, contain one uppercase and one lowercase letter and a number.
    - +

    Enter your workplace address

    diff --git a/src/app/features/registration/regulated-by-cqc/regulated-by-cqc.component.html b/src/app/features/registration/regulated-by-cqc/regulated-by-cqc.component.html index ab2b1ac2a8..b2911d02b4 100644 --- a/src/app/features/registration/regulated-by-cqc/regulated-by-cqc.component.html +++ b/src/app/features/registration/regulated-by-cqc/regulated-by-cqc.component.html @@ -17,8 +17,11 @@

    - - Error: {{ getFirstErrorMessage('regulatedByCQC') }} + + {{ + getFirstErrorMessage('regulatedByCQC') + }} + {{ getFirstErrorMessage('group') }}
    diff --git a/src/app/features/registration/your-details/your-details.component.html b/src/app/features/registration/your-details/your-details.component.html index a689e7e45b..df8a1bd9dd 100644 --- a/src/app/features/registration/your-details/your-details.component.html +++ b/src/app/features/registration/your-details/your-details.component.html @@ -13,7 +13,7 @@ User account

    - Your details + Add user account

    diff --git a/src/app/features/workplace-find-and-select/enter-workplace-address/enter-workplace-address.component.html b/src/app/features/workplace-find-and-select/enter-workplace-address/enter-workplace-address.component.html index a7e433a4ed..5834bce414 100644 --- a/src/app/features/workplace-find-and-select/enter-workplace-address/enter-workplace-address.component.html +++ b/src/app/features/workplace-find-and-select/enter-workplace-address/enter-workplace-address.component.html @@ -1,41 +1,36 @@
    + +
    + +

    + Workplace details +

    +

    + Enter your workplace address +

    +     - -
    - -

    - Workplace details -

    -

    - Enter your workplace address -

    -     - - -
    - - - Error: {{ getFirstErrorMessage(item.name) }} - - -
    -     -
    - - + +
    + + + Error: {{ getFirstErrorMessage(item.name) }} + + +
    +     +
    + + - - - - - - - + + + + +
    diff --git a/src/app/features/workplace-find-and-select/regulated-by-cqc/regulated-by-cqc.ts b/src/app/features/workplace-find-and-select/regulated-by-cqc/regulated-by-cqc.ts index 824f44d0b5..47b331f593 100644 --- a/src/app/features/workplace-find-and-select/regulated-by-cqc/regulated-by-cqc.ts +++ b/src/app/features/workplace-find-and-select/regulated-by-cqc/regulated-by-cqc.ts @@ -28,7 +28,7 @@ export class RegulatedByCQC implements OnInit, OnDestroy, AfterViewInit { protected formBuilder: FormBuilder, protected locationService: LocationService, protected route: ActivatedRoute, - protected router: Router + protected router: Router, ) {} get regulatedByCQC() { @@ -119,11 +119,11 @@ export class RegulatedByCQC implements OnInit, OnDestroy, AfterViewInit { type: [ { name: 'bothAreEmpty', - message: 'Postcode and location ID are both empty. Please fill out one field.', + message: 'Please enter either your postcode or location ID.', }, { name: 'bothHaveContent', - message: 'Postcode and location ID are both entered. Please fill out one field.', + message: 'Please enter either your postcode or location ID.', }, ], }, @@ -206,47 +206,45 @@ export class RegulatedByCQC implements OnInit, OnDestroy, AfterViewInit { private save(): void { if (this.regulatedByCQC.value === 'yes') { if (this.regulatedPostcode.value.length) { - if(this.isCQCLocationUpdate){ + if (this.isCQCLocationUpdate) { this.subscriptions.add( - this.locationService.getUnassignedLocationByPostCode(this.regulatedPostcode.value).subscribe( - (data: LocationSearchResponse) => this.onSuccess(data), - (error: HttpErrorResponse) => this.onError(error) - ) - ); + this.locationService.getUnassignedLocationByPostCode(this.regulatedPostcode.value).subscribe( + (data: LocationSearchResponse) => this.onSuccess(data), + (error: HttpErrorResponse) => this.onError(error), + ), + ); } else { this.subscriptions.add( - this.locationService.getLocationByPostCode(this.regulatedPostcode.value).subscribe( - (data: LocationSearchResponse) => this.onSuccess(data), - (error: HttpErrorResponse) => this.onError(error) - ) - ); + this.locationService.getLocationByPostCode(this.regulatedPostcode.value).subscribe( + (data: LocationSearchResponse) => this.onSuccess(data), + (error: HttpErrorResponse) => this.onError(error), + ), + ); } - } else if (this.locationId.value.length) { - if(this.isCQCLocationUpdate){ - this.subscriptions.add( - this.locationService.getUnassignedLocationByLocationId(this.locationId.value).subscribe( - (data: LocationSearchResponse) => this.onSuccess(data), - (error: HttpErrorResponse) => this.onError(error) - ) - ); - } else { - this.subscriptions.add( - this.locationService.getLocationByLocationId(this.locationId.value).subscribe( - (data: LocationSearchResponse) => this.onSuccess(data), - (error: HttpErrorResponse) => this.onError(error) - ) - ); - } - + if (this.isCQCLocationUpdate) { + this.subscriptions.add( + this.locationService.getUnassignedLocationByLocationId(this.locationId.value).subscribe( + (data: LocationSearchResponse) => this.onSuccess(data), + (error: HttpErrorResponse) => this.onError(error), + ), + ); + } else { + this.subscriptions.add( + this.locationService.getLocationByLocationId(this.locationId.value).subscribe( + (data: LocationSearchResponse) => this.onSuccess(data), + (error: HttpErrorResponse) => this.onError(error), + ), + ); + } } } else if (this.regulatedByCQC.value === 'no') { if (this.nonRegulatedPostcode.value.length) { this.subscriptions.add( this.locationService.getAddressesByPostCode(this.nonRegulatedPostcode.value).subscribe( (data: LocationSearchResponse) => this.onSuccess(data), - (error: HttpErrorResponse) => this.onError(error) - ) + (error: HttpErrorResponse) => this.onError(error), + ), ); } } diff --git a/src/app/features/workplace-find-and-select/select-main-service/select-main-service.component.html b/src/app/features/workplace-find-and-select/select-main-service/select-main-service.component.html index b70ea61479..7d7f125bf5 100644 --- a/src/app/features/workplace-find-and-select/select-main-service/select-main-service.component.html +++ b/src/app/features/workplace-find-and-select/select-main-service/select-main-service.component.html @@ -7,14 +7,12 @@
    -
    +
    - -

    - Select your main service -

    + +

    Select your main service

    diff --git a/src/app/features/workplace/data-sharing-with-local-authorities/data-sharing-with-local-authorities.component.html b/src/app/features/workplace/data-sharing-with-local-authorities/data-sharing-with-local-authorities.component.html index 6893929fc7..3af8dbd4a1 100644 --- a/src/app/features/workplace/data-sharing-with-local-authorities/data-sharing-with-local-authorities.component.html +++ b/src/app/features/workplace/data-sharing-with-local-authorities/data-sharing-with-local-authorities.component.html @@ -7,7 +7,7 @@

    -
    +

    Sharing data with local authorities

    @@ -32,43 +32,40 @@

    Sharing data with local authorities

    -

    Add more local authorities to share your data with.

    -

    Local Authorities

    - -
    - - -
    -     -
    +
    +

    Add more local authorities to share your data with.

    +

    Local authorities

    + +
    +
    + +
    +
    + Remove +
    +
    +     + +
    diff --git a/src/app/features/workplace/data-sharing-with-local-authorities/data-sharing-with-local-authorities.component.ts b/src/app/features/workplace/data-sharing-with-local-authorities/data-sharing-with-local-authorities.component.ts index 3499d4c773..8091e412b9 100644 --- a/src/app/features/workplace/data-sharing-with-local-authorities/data-sharing-with-local-authorities.component.ts +++ b/src/app/features/workplace/data-sharing-with-local-authorities/data-sharing-with-local-authorities.component.ts @@ -25,7 +25,7 @@ export class DataSharingWithLocalAuthoritiesComponent extends Question { protected backService: BackService, protected errorSummaryService: ErrorSummaryService, protected establishmentService: EstablishmentService, - private localAuthorityService: LocalAuthorityService + private localAuthorityService: LocalAuthorityService, ) { super(formBuilder, router, backService, errorSummaryService, establishmentService); @@ -62,11 +62,11 @@ export class DataSharingWithLocalAuthoritiesComponent extends Question { this.localAuthorityService.getAuthorities().subscribe(authorities => { const index = findIndex( authorities, - authority => authority.custodianCode === this.primaryAuthority.custodianCode + authority => authority.custodianCode === this.primaryAuthority.custodianCode, ); authorities.splice(index, 1); this.authorities = authorities; - }) + }), ); this.establishment.localAuthorities.forEach(authority => { @@ -117,17 +117,18 @@ export class DataSharingWithLocalAuthoritiesComponent extends Question { !this.localAuthoritiesArray.controls.some( localAuth => localAuth !== this.localAuthoritiesArray.controls[index] && - parseInt(localAuth.get('custodianCode').value, 10) === authority.custodianCode - ) + parseInt(localAuth.get('custodianCode').value, 10) === authority.custodianCode, + ), ); } } protected updateEstablishment(props) { this.subscriptions.add( - this.establishmentService - .updateLocalAuthorities(this.establishment.uid, props) - .subscribe(data => this._onSuccess(data), error => this.onError(error)) + this.establishmentService.updateLocalAuthorities(this.establishment.uid, props).subscribe( + data => this._onSuccess(data), + error => this.onError(error), + ), ); } } diff --git a/src/app/features/workplace/data-sharing/data-sharing.component.html b/src/app/features/workplace/data-sharing/data-sharing.component.html index 65e7e6e60f..1e70ab0d0e 100644 --- a/src/app/features/workplace/data-sharing/data-sharing.component.html +++ b/src/app/features/workplace/data-sharing/data-sharing.component.html @@ -25,29 +25,29 @@

    Sharing your data

    We share all data, including individual worker records, with the exception of:

      -
    • Record ID
      • -
    • Pay
      • -
    • Sickness absence
      • -
    • Date of birth
      • -
    • National Insurance number
      • -
    • Ethnicity
      • -
    • Nationality
      • -
    • Country of birth
      • -
    • Year of arrival in UK
      • -
    • Hours worked in the last 7 days
      • +
    • record ID
      • +
    • pay
      • +
    • sickness absence
      • +
    • date of birth
      • +
    • national Insurance number
      • +
    • ethnicity
      • +
    • nationality
      • +
    • country of birth
      • +
    • year of arrival in UK
      • +
    • hours worked in the last 7 days

    CQC cannot identify workers through this process

    We will share the following data with your local authority:

      -
    • Your unique workplace reference
      • -
    • Workplace name
      • -
    • Address
      • -
    • Main service
      • -
    • Number of staff
      • -
    • Percentage of worker records completed
      • -
    • When your account was last updated
      • +
    • your unique workplace reference
      • +
    • workplace name
      • +
    • address
      • +
    • main service
      • +
    • number of staff
      • +
    • percentage of worker records completed
      • +
    • when your account was last updated
    diff --git a/src/app/features/workplace/leavers/leavers.component.html b/src/app/features/workplace/leavers/leavers.component.html index 835733c51a..da08a69d33 100644 --- a/src/app/features/workplace/leavers/leavers.component.html +++ b/src/app/features/workplace/leavers/leavers.component.html @@ -8,12 +8,14 @@
    - -

    Staff who have left in the last 12 months

    -     - -

    This should only be for permanent or temporary staff.

    - +
    +
    + +

    Staff who have left in the last 12 months

    +

    This should only be for permanent or temporary staff.

    +     +
    +
    @@ -30,6 +32,11 @@

    Staff who have left in the last 12 months
    + + + {{ getFormErrorMessage('leavers.jobRole', 'required') }} + + Staff who have left in the last 12 months -

    diff --git a/src/app/features/workplace/leavers/leavers.component.ts b/src/app/features/workplace/leavers/leavers.component.ts index 7ae3c053e8..5d6e0d26cc 100644 --- a/src/app/features/workplace/leavers/leavers.component.ts +++ b/src/app/features/workplace/leavers/leavers.component.ts @@ -37,7 +37,7 @@ export class LeaversComponent extends Question implements OnInit, OnDestroy { protected backService: BackService, protected errorSummaryService: ErrorSummaryService, protected establishmentService: EstablishmentService, - private jobService: JobService + private jobService: JobService, ) { super(formBuilder, router, backService, errorSummaryService, establishmentService); @@ -71,7 +71,7 @@ export class LeaversComponent extends Question implements OnInit, OnDestroy { this.leavers.reset([], { emitEvent: false }); this.form.get('leaversKnown').setValue(value, { emitEvent: false }); - }) + }), ); this.subscriptions.add( @@ -82,7 +82,7 @@ export class LeaversComponent extends Question implements OnInit, OnDestroy { .setValidators([Validators.required, Validators.min(this.minTotal), Validators.max(this.maxTotal)]); this.form.get('leaversKnown').setValue(null, { emitEvent: false }); - }) + }), ); } @@ -102,14 +102,14 @@ export class LeaversComponent extends Question implements OnInit, OnDestroy { this.jobService .getJobs() .pipe(take(1)) - .subscribe(jobs => (this.jobs = jobs)) + .subscribe(jobs => (this.jobs = jobs)), ); } private prefill(): void { if (Array.isArray(this.establishment.leavers) && this.establishment.leavers.length) { this.establishment.leavers.forEach(leaver => - this.leavers.push(this.createLeaverControl(leaver.jobId, leaver.total)) + this.leavers.push(this.createLeaverControl(leaver.jobId, leaver.total)), ); } else { this.leavers.push(this.createLeaverControl()); @@ -130,7 +130,7 @@ export class LeaversComponent extends Question implements OnInit, OnDestroy { type: [ { name: 'required', - message: 'Job Role is required', + message: 'Job role is required.', }, ], }, @@ -139,15 +139,15 @@ export class LeaversComponent extends Question implements OnInit, OnDestroy { type: [ { name: 'required', - message: 'Total is required', + message: 'Enter number of leavers.', }, { name: 'min', - message: `Total must be ${this.minTotal} or above`, + message: `Leavers must be ${this.minTotal} or above.`, }, { name: 'max', - message: `Total must be ${this.maxTotal} or lower`, + message: `Leavers must be ${this.maxTotal} or lower.`, }, ], }, @@ -158,8 +158,8 @@ export class LeaversComponent extends Question implements OnInit, OnDestroy { return this.jobs.filter( job => !this.leavers.controls.some( - leaver => leaver !== this.leavers.controls[index] && parseInt(leaver.get('jobRole').value, 10) === job.id - ) + leaver => leaver !== this.leavers.controls[index] && parseInt(leaver.get('jobRole').value, 10) === job.id, + ), ); } @@ -200,9 +200,10 @@ export class LeaversComponent extends Question implements OnInit, OnDestroy { protected updateEstablishment(props: UpdateJobsRequest): void { this.subscriptions.add( - this.establishmentService - .updateJobs(this.establishment.uid, props) - .subscribe(data => this._onSuccess(data), error => this.onError(error)) + this.establishmentService.updateJobs(this.establishment.uid, props).subscribe( + data => this._onSuccess(data), + error => this.onError(error), + ), ); } diff --git a/src/app/features/workplace/other-services/other-services.component.html b/src/app/features/workplace/other-services/other-services.component.html index 9b22f7b110..c09678fd8f 100644 --- a/src/app/features/workplace/other-services/other-services.component.html +++ b/src/app/features/workplace/other-services/other-services.component.html @@ -11,7 +11,7 @@
    -

    Your services

    +

    Other services

    You told us your main service is {{ establishment.mainService.name }}. Do you provide any other services?

    diff --git a/src/app/features/workplace/regulated-by-cqc/regulated-by-cqc.component.html b/src/app/features/workplace/regulated-by-cqc/regulated-by-cqc.component.html index f7d020ebe6..0ba78a2cb2 100644 --- a/src/app/features/workplace/regulated-by-cqc/regulated-by-cqc.component.html +++ b/src/app/features/workplace/regulated-by-cqc/regulated-by-cqc.component.html @@ -16,8 +16,11 @@

    - - Error: {{ getFirstErrorMessage('regulatedByCQC') }} + + {{ + getFirstErrorMessage('regulatedByCQC') + }} + {{ getFirstErrorMessage('group') }} diff --git a/src/app/features/workplace/service-users/service-users.component.html b/src/app/features/workplace/service-users/service-users.component.html index d4c7a60d2e..2300c86fc9 100644 --- a/src/app/features/workplace/service-users/service-users.component.html +++ b/src/app/features/workplace/service-users/service-users.component.html @@ -11,7 +11,7 @@
    -

    Who are your service users?

    +

    Who uses your service?

    Select all that apply.

    @@ -61,7 +61,7 @@

    {{ getFormErrorMessage('serviceUsers-' + service.id + '-otherService', 'maxlength') }}
    - -

    Add new starters in the last 12 months

    -     - -

    This should only be for permanent or temporary staff.

    - +
    +
    + +

    Add new starters in the last 12 months

    +

    This should only be for permanent or temporary staff.

    +     +
    +
    - +
    @@ -30,6 +32,11 @@

    Add new starters in the last 12 months

    >
    + + + {{ getFormErrorMessage('starterRecords.jobId', 'required') }} + +
    + + + + {{ getFormErrorMessage('starterRecords.total', 'required') }} + + {{ getFormErrorMessage('starterRecords.total', 'min') }} + + {{ getFormErrorMessage('starterRecords.total', 'max') }} + + + Add new starters in the last 12 months

    name="total" type="number" /> -
    diff --git a/src/app/features/workplace/starters/starters.component.ts b/src/app/features/workplace/starters/starters.component.ts index 1ae45ca736..cb495161f8 100644 --- a/src/app/features/workplace/starters/starters.component.ts +++ b/src/app/features/workplace/starters/starters.component.ts @@ -36,7 +36,7 @@ export class StartersComponent extends Question { protected backService: BackService, protected errorSummaryService: ErrorSummaryService, protected establishmentService: EstablishmentService, - private jobService: JobService + private jobService: JobService, ) { super(formBuilder, router, backService, errorSummaryService, establishmentService); @@ -74,7 +74,7 @@ export class StartersComponent extends Question { this.starterRecords.reset([], { emitEvent: false }); this.form.get('noRecordsReason').setValue(value, { emitEvent: false }); - }) + }), ); this.subscriptions.add( @@ -85,7 +85,7 @@ export class StartersComponent extends Question { .setValidators([Validators.required, Validators.min(this.minStarters), Validators.max(this.maxStarters)]); this.form.get('noRecordsReason').setValue(null, { emitEvent: false }); - }) + }), ); } @@ -105,14 +105,14 @@ export class StartersComponent extends Question { this.jobService .getJobs() .pipe(take(1)) - .subscribe(jobs => (this.jobs = jobs)) + .subscribe(jobs => (this.jobs = jobs)), ); } private prefill(): void { if (Array.isArray(this.establishment.starters) && this.establishment.starters.length) { this.establishment.starters.forEach(starter => - this.starterRecords.push(this.createRecordItem(starter.jobId, starter.total)) + this.starterRecords.push(this.createRecordItem(starter.jobId, starter.total)), ); } else { this.starterRecords.push(this.createRecordItem()); @@ -133,7 +133,7 @@ export class StartersComponent extends Question { type: [ { name: 'required', - message: 'Job Role is required', + message: 'Job role is required.', }, ], }, @@ -142,15 +142,15 @@ export class StartersComponent extends Question { type: [ { name: 'required', - message: 'Total is required', + message: 'Enter number of new starters.', }, { name: 'min', - message: `Total must be ${this.minStarters} or above`, + message: `New starters must be ${this.minStarters} or above.`, }, { name: 'max', - message: `Total must be ${this.maxStarters} or lower`, + message: `New starters must be ${this.maxStarters} or lower.`, }, ], }, @@ -162,8 +162,8 @@ export class StartersComponent extends Question { job => !this.starterRecords.controls.some( starter => - starter !== this.starterRecords.controls[index] && parseInt(starter.get('jobId').value, 10) === job.id - ) + starter !== this.starterRecords.controls[index] && parseInt(starter.get('jobId').value, 10) === job.id, + ), ); } @@ -215,9 +215,10 @@ export class StartersComponent extends Question { protected updateEstablishment(props: UpdateJobsRequest): void { this.subscriptions.add( - this.establishmentService - .updateJobs(this.establishment.uid, props) - .subscribe(data => this._onSuccess(data), error => this.onError(error)) + this.establishmentService.updateJobs(this.establishment.uid, props).subscribe( + data => this._onSuccess(data), + error => this.onError(error), + ), ); } diff --git a/src/app/features/workplace/vacancies/vacancies.component.html b/src/app/features/workplace/vacancies/vacancies.component.html index d086e680c5..3ede97b821 100644 --- a/src/app/features/workplace/vacancies/vacancies.component.html +++ b/src/app/features/workplace/vacancies/vacancies.component.html @@ -8,16 +8,18 @@
    - -

    Add current staff vacancies

    -     - -

    This should only be for permanent or temporary staff.

    - +
    +
    + +

    Add current staff vacancies

    +

    This should only be for permanent or temporary staff.

    +     +
    +
    - +
    @@ -30,6 +32,11 @@

    Add current staff vacancies

    >
    + + + {{ getFormErrorMessage('vacancies.jobRole', 'required') }} + +
    +
    + + + + {{ getFormErrorMessage('vacancies.total', 'required') }} + + {{ getFormErrorMessage('vacancies.total', 'min') }} + + {{ getFormErrorMessage('vacancies.total', 'max') }} + + + Add current staff vacancies

    name="total" type="number" /> -
    diff --git a/src/app/features/workplace/vacancies/vacancies.component.ts b/src/app/features/workplace/vacancies/vacancies.component.ts index 465a051ee4..33038d1eb2 100644 --- a/src/app/features/workplace/vacancies/vacancies.component.ts +++ b/src/app/features/workplace/vacancies/vacancies.component.ts @@ -38,7 +38,7 @@ export class VacanciesComponent extends Question implements OnInit, OnDestroy { protected backService: BackService, protected errorSummaryService: ErrorSummaryService, protected establishmentService: EstablishmentService, - private jobService: JobService + private jobService: JobService, ) { super(formBuilder, router, backService, errorSummaryService, establishmentService); @@ -72,7 +72,7 @@ export class VacanciesComponent extends Question implements OnInit, OnDestroy { this.vacanciesArray.reset([], { emitEvent: false }); this.form.get('vacanciesKnown').setValue(value, { emitEvent: false }); - }) + }), ); this.subscriptions.add( @@ -83,7 +83,7 @@ export class VacanciesComponent extends Question implements OnInit, OnDestroy { .setValidators([Validators.required, Validators.min(this.minVacancies), Validators.max(this.maxVacancies)]); this.form.get('vacanciesKnown').setValue(null, { emitEvent: false }); - }) + }), ); } @@ -105,14 +105,14 @@ export class VacanciesComponent extends Question implements OnInit, OnDestroy { this.jobService .getJobs() .pipe(take(1)) - .subscribe(jobs => (this.jobs = jobs)) + .subscribe(jobs => (this.jobs = jobs)), ); } private prefill(): void { if (Array.isArray(this.establishment.vacancies) && this.establishment.vacancies.length) { this.establishment.vacancies.forEach(vacancy => - this.vacanciesArray.push(this.createVacancyControl(vacancy.jobId, vacancy.total)) + this.vacanciesArray.push(this.createVacancyControl(vacancy.jobId, vacancy.total)), ); } else { this.vacanciesArray.push(this.createVacancyControl()); @@ -133,7 +133,7 @@ export class VacanciesComponent extends Question implements OnInit, OnDestroy { type: [ { name: 'required', - message: 'Job Role is required', + message: 'Job role is required.', }, ], }, @@ -142,15 +142,15 @@ export class VacanciesComponent extends Question implements OnInit, OnDestroy { type: [ { name: 'required', - message: 'Total is required', + message: 'Enter number of vacancies.', }, { name: 'min', - message: `Total must be ${this.minVacancies} or above`, + message: `Vacancies must be ${this.minVacancies} or above`, }, { name: 'max', - message: `Total must be ${this.maxVacancies} or lower`, + message: `Vacancies must be ${this.maxVacancies} or lower`, }, ], }, @@ -162,8 +162,8 @@ export class VacanciesComponent extends Question implements OnInit, OnDestroy { job => !this.vacanciesArray.controls.some( vacancy => - vacancy !== this.vacanciesArray.controls[index] && parseInt(vacancy.get('jobRole').value, 10) === job.id - ) + vacancy !== this.vacanciesArray.controls[index] && parseInt(vacancy.get('jobRole').value, 10) === job.id, + ), ); } @@ -206,8 +206,9 @@ export class VacanciesComponent extends Question implements OnInit, OnDestroy { this.subscriptions.add( this.establishmentService.updateJobs(this.establishment.uid, props).subscribe( data => this._onSuccess(data), - error => this.onError(error) - ) + error => this.onError(error), + ), + ); } diff --git a/src/app/features/workplace/workplace-not-found/workplace-not-found.component.html b/src/app/features/workplace/workplace-not-found/workplace-not-found.component.html index 46ceeb366c..994259b04a 100644 --- a/src/app/features/workplace/workplace-not-found/workplace-not-found.component.html +++ b/src/app/features/workplace/workplace-not-found/workplace-not-found.component.html @@ -1,14 +1,14 @@

    - We could not find your workplace in our CQC database. + CQC ID. Workplace not found.

    -

    To continue, you can :

    +

    To continue, you can:

      -
    • go back and try again.
      • +
    • go back and try again
      • -
    • go to home.
      • +
    • go to home
    • contact the ASC-WDS Support Team on 0113 241 0969 or email us at ascwds-support@skillsforcare.org.uk diff --git a/src/app/shared/components/workplace-summary/workplace-summary.component.html b/src/app/shared/components/workplace-summary/workplace-summary.component.html index 50b2639581..3ddfb7c4ad 100644 --- a/src/app/shared/components/workplace-summary/workplace-summary.component.html +++ b/src/app/shared/components/workplace-summary/workplace-summary.component.html @@ -2,34 +2,33 @@
      - Workplace name + Workplace name
      - Workplace address + Workplace address
      - {{ workplace.name }} + {{ workplace.name }}
      -
      {{ workplace.address1 }}
      -
      {{ workplace.address2 }}
      -
      {{ workplace.address3 }}
      -
      {{ workplace.town }}
      -
      {{ workplace.county }}
      -
      {{ workplace.postcode }}
      +
      {{ workplace.address1 }}
      +
      {{ workplace.address2 }}
      +
      {{ workplace.address3 }}
      +
      {{ workplace.town }}
      +
      {{ workplace.county }}
      +
      {{ workplace.postcode }}
      - + Provide information Change -
      @@ -203,7 +202,7 @@

      Care Quality Commission (CQC)

      -

      Local Authorities

      +

      Local authorities
      @@ -222,7 +221,7 @@
      - Local Authorities shared with + Local authorities shared with
      From 8951d6ccb47a5f74b594b1840bc5cb05606ae942 Mon Sep 17 00:00:00 2001 From: Anurag Negi <55235060+Negi-Anurag@users.noreply.github.com> Date: Thu, 12 Mar 2020 16:44:13 +0530 Subject: [PATCH 131/305] CHANGED LABEL (#2040) --- .../trianing-link-panel/trianing-link-panel.component.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/shared/components/trianing-link-panel/trianing-link-panel.component.html b/src/app/shared/components/trianing-link-panel/trianing-link-panel.component.html index 2bc3c96292..613a0661b4 100644 --- a/src/app/shared/components/trianing-link-panel/trianing-link-panel.component.html +++ b/src/app/shared/components/trianing-link-panel/trianing-link-panel.component.html @@ -6,7 +6,7 @@ role="button" draggable="false" [routerLink]="['/workplace/view-all-mandatory-training']" - >View all workplace trainingView mandatory training From e24865dc35cce77176b63225d32f70be3223e11f Mon Sep 17 00:00:00 2001 From: Anurag Negi <55235060+Negi-Anurag@users.noreply.github.com> Date: Fri, 13 Mar 2020 10:55:27 +0530 Subject: [PATCH 132/305] ADDED UP TO DATE FLAG (#2041) --- .../view-all-mandatory-training.component.html | 7 +++++-- .../view-all-mandatory-training.component.ts | 8 ++++++++ 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/src/app/features/workplace/view-all-mandatory-trainings/view-all-mandatory-training.component.html b/src/app/features/workplace/view-all-mandatory-trainings/view-all-mandatory-training.component.html index 796db4ba49..5a303fef10 100644 --- a/src/app/features/workplace/view-all-mandatory-trainings/view-all-mandatory-training.component.html +++ b/src/app/features/workplace/view-all-mandatory-trainings/view-all-mandatory-training.component.html @@ -60,8 +60,11 @@

      {{ mandatoryTraining.catMissingMandatoryTrainingCount }} Missing

    -
    - Up-to-date +
    + {{ mandatoryTraining.upToDateTrainingCount }} Up-to-date
    diff --git a/src/app/features/workplace/view-all-mandatory-trainings/view-all-mandatory-training.component.ts b/src/app/features/workplace/view-all-mandatory-trainings/view-all-mandatory-training.component.ts index 0ca7f198bd..f9adeef556 100644 --- a/src/app/features/workplace/view-all-mandatory-trainings/view-all-mandatory-training.component.ts +++ b/src/app/features/workplace/view-all-mandatory-trainings/view-all-mandatory-training.component.ts @@ -78,6 +78,7 @@ export class ViewAllMandatoryTrainingComponent implements OnInit, OnDestroy { catExpiredTrainingCount: 0, catExpiringTrainingCount: 0, catTrainingCount: 0, + upToDateTrainingCount: 0, }; mandatoryTrainingObj.trainingCategoryId = training.trainingCategoryId; @@ -90,6 +91,13 @@ export class ViewAllMandatoryTrainingComponent implements OnInit, OnDestroy { mandatoryTrainingObj.catExpiredTrainingCount += worker.expiredTrainingCount; mandatoryTrainingObj.catExpiringTrainingCount += worker.expiringTrainingCount; mandatoryTrainingObj.catTrainingCount += worker.trainingCount; + if ( + worker.missingMandatoryTrainingCount === 0 && + worker.expiredTrainingCount === 0 && + worker.expiringTrainingCount === 0 + ) { + mandatoryTrainingObj.upToDateTrainingCount++; + } }); } this.totalExpiredTraining += mandatoryTrainingObj.catExpiredTrainingCount; From 17e78549355583dc5967c70fdbc0af8076da9714 Mon Sep 17 00:00:00 2001 From: Anurag Negi <55235060+Negi-Anurag@users.noreply.github.com> Date: Fri, 13 Mar 2020 17:14:51 +0530 Subject: [PATCH 133/305] ADDED CHECK FOR ARCHIVED WORKER (#2042) --- server/models/classes/mandatoryTraining.js | 1 + 1 file changed, 1 insertion(+) diff --git a/server/models/classes/mandatoryTraining.js b/server/models/classes/mandatoryTraining.js index 51a78591e1..602e2dab90 100644 --- a/server/models/classes/mandatoryTraining.js +++ b/server/models/classes/mandatoryTraining.js @@ -364,6 +364,7 @@ attributes: ['id', 'uid', 'NameOrIdValue'], where:{ establishmentFk: establishmentId, + archived: false, MainJobFkValue: jobs[j].id } }); From f509211a6920d7af6f9ef686402df793096d985f Mon Sep 17 00:00:00 2001 From: Anurag Negi <55235060+Negi-Anurag@users.noreply.github.com> Date: Mon, 16 Mar 2020 11:47:15 +0530 Subject: [PATCH 134/305] Added fix (#2043) --- server/models/classes/training.js | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/server/models/classes/training.js b/server/models/classes/training.js index 23e5238b7d..75d97491d8 100644 --- a/server/models/classes/training.js +++ b/server/models/classes/training.js @@ -852,9 +852,6 @@ class Training extends EntityValidator { workerRecords[i].expiringTrainingCount = 0; workerRecords[i].missingMandatoryTrainingCount = 0; if(allTrainingRecords && allTrainingRecords.training.length > 0){ - if(categoryId === null){ - workerRecords[i].missingMandatoryTrainingCount = await Training.getAllMissingMandatoryTrainingCounts(establishmentId, workerRecords[i], allTrainingRecords.training); - } //calculate all expired and expiring soon training count let trainings = allTrainingRecords.training; for(let j = 0; j < trainings.length; j++){ @@ -873,6 +870,9 @@ class Training extends EntityValidator { workerRecords[i].missingMandatoryTrainingCount++; } } + if(categoryId === null){ + workerRecords[i].missingMandatoryTrainingCount = await Training.getAllMissingMandatoryTrainingCounts(establishmentId, workerRecords[i], allTrainingRecords.training); + } workerRecords[i].trainingCount = workerRecords[i].expiredTrainingCount + workerRecords[i].expiringTrainingCount + workerRecords[i].missingMandatoryTrainingCount; } return workerRecords; @@ -897,6 +897,9 @@ class Training extends EntityValidator { let mandatoryTrainingLength = fetchMandatoryTrainingResults ? fetchMandatoryTrainingResults.length: 0; let trainingLength = trainingLists.length; if(mandatoryTrainingLength > 0){ + if(trainingLength === 0){ + return mandatoryTrainingLength; + } let missingMandatoryTrainingCount = 0; for(let i = 0; i < mandatoryTrainingLength; i++){ let foundMandatoryTraining = false; From a80fbb3ad4962a0891361f0df39c5d60d99e7020 Mon Sep 17 00:00:00 2001 From: Anurag Negi <55235060+Negi-Anurag@users.noreply.github.com> Date: Tue, 17 Mar 2020 10:35:01 +0530 Subject: [PATCH 135/305] CHANGED THE REDIRECT URL (#2044) --- .../view-all-mandatory-training.component.ts | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/app/features/workplace/view-all-mandatory-trainings/view-all-mandatory-training.component.ts b/src/app/features/workplace/view-all-mandatory-trainings/view-all-mandatory-training.component.ts index f9adeef556..3f78fe768e 100644 --- a/src/app/features/workplace/view-all-mandatory-trainings/view-all-mandatory-training.component.ts +++ b/src/app/features/workplace/view-all-mandatory-trainings/view-all-mandatory-training.component.ts @@ -1,12 +1,12 @@ -import { Component, Input, OnInit, OnDestroy } from '@angular/core'; +import { Component, Input, OnDestroy, OnInit } from '@angular/core'; +import { JourneyType } from '@core/breadcrumb/breadcrumb.model'; import { Qualification } from '@core/model/qualification.model'; import { Worker } from '@core/model/worker.model'; +import { BreadcrumbService } from '@core/services/breadcrumb.service'; +import { EstablishmentService } from '@core/services/establishment.service'; import { PermissionsService } from '@core/services/permissions/permissions.service'; import { WorkplaceService } from '@core/services/workplace.service'; -import { EstablishmentService } from '@core/services/establishment.service'; -import { BreadcrumbService } from '@core/services/breadcrumb.service'; import * as moment from 'moment'; -import { JourneyType } from '@core/breadcrumb/breadcrumb.model'; import { Subscription } from 'rxjs'; @Component({ @@ -54,7 +54,7 @@ export class ViewAllMandatoryTrainingComponent implements OnInit, OnDestroy { } public getWorkerRecordPath(worker: Worker) { - const path = ['/workplace', this.establishmentUid, 'staff-record', worker.uid]; + const path = ['/workplace', this.establishmentUid, 'training-and-qualifications-record', worker.uid, 'training']; return this.wdfView ? [...path, ...['wdf-summary']] : path; } From 7c476de4f58d5a6340eb7b89530ba9b71ac5a0e5 Mon Sep 17 00:00:00 2001 From: rchitranshi <53287302+rchitranshi@users.noreply.github.com> Date: Tue, 17 Mar 2020 12:14:00 +0530 Subject: [PATCH 136/305] Added Mandatory training columns on training report. (#2045) --- server/data/trainingReport.js | 20 +- .../template/xl/worksheets/sheet1.xml | 166 +++++++++----- .../template/xl/worksheets/sheet2.xml | 16 +- .../routes/reports/trainingReport/training.js | 204 +++++++++++++----- 4 files changed, 291 insertions(+), 115 deletions(-) diff --git a/server/data/trainingReport.js b/server/data/trainingReport.js index 0a411cc91f..730eb0881c 100644 --- a/server/data/trainingReport.js +++ b/server/data/trainingReport.js @@ -5,7 +5,7 @@ const db = rfr('server/utils/datastore'); const getTrainingDataQuery = ` SELECT - a."NameOrIdValue", a."ID", c."Category", b."Title", to_char(b."Completed", :timeFormat) as "Completed", + a."NameOrIdValue", a."ID", c."Category", c."ID", b."Title", to_char(b."Completed", :timeFormat) as "Completed", to_char(b."Expires", :timeFormat) as "ExpiredOn", b."Accredited", b."Expires", a."MainJobFKValue" FROM cqc."Worker" a @@ -22,6 +22,13 @@ WHERE a."Archived" = :falseValue; `; +const getMndatoryTrainingDetailsQuery = +`SELECT count(:zero) +FROM cqc."MandatoryTraining" +WHERE "EstablishmentFK" = :establishmentId +AND "TrainingCategoryFK" = :categoryId +AND "JobFK" = :jobId` + const getJobNameQuery = ` select "JobName" from cqc."Job" where "JobID" = :jobId @@ -37,6 +44,17 @@ exports.getTrainingData = async establishmentId => type: db.QueryTypes.SELECT }); +exports.getMndatoryTrainingDetails = async (trainingData, establishmentId) => + db.query(getMndatoryTrainingDetailsQuery, { + replacements: { + establishmentId, + jobId: trainingData.MainJobFKValue, + categoryId: trainingData.ID, + zero: 0 + }, + type: db.QueryTypes.SELECT + }); + exports.getJobName = async jobId => db.query(getJobNameQuery, { replacements: { diff --git a/server/routes/reports/trainingReport/template/xl/worksheets/sheet1.xml b/server/routes/reports/trainingReport/template/xl/worksheets/sheet1.xml index 5e82518404..74c0b92589 100644 --- a/server/routes/reports/trainingReport/template/xl/worksheets/sheet1.xml +++ b/server/routes/reports/trainingReport/template/xl/worksheets/sheet1.xml @@ -1,6 +1,6 @@ - + @@ -29,20 +29,28 @@ + + + 2 + + + 3 + + 4 - - + + @@ -53,14 +61,20 @@ 20 - - - + + 20 + + + 20 + + + + 21 - - + + @@ -71,12 +85,18 @@ 20 - - - + + 20 + + + 20 + + - - + + + + @@ -87,14 +107,20 @@ 20 - - - + + 20 + + + 20 + + + + 22 - - + + @@ -105,12 +131,18 @@ 20 - - - - - - + + 20 + + + 20 + + + + + + + @@ -119,10 +151,12 @@ - - + + + + @@ -130,12 +164,14 @@ - + + + 23 - - - + + + @@ -144,38 +180,48 @@ 7 - - - - - - + + + + + + + + + 2 + + + 3 + + 4 - - - - - - + + + + + + - - + + + + @@ -186,46 +232,56 @@ 0 - - + + + + + 2 + + + 3 + + 4 - - + + - - + + + + - - - - - + + + + + diff --git a/server/routes/reports/trainingReport/template/xl/worksheets/sheet2.xml b/server/routes/reports/trainingReport/template/xl/worksheets/sheet2.xml index 5d5a125b8a..b69f4f3a87 100644 --- a/server/routes/reports/trainingReport/template/xl/worksheets/sheet2.xml +++ b/server/routes/reports/trainingReport/template/xl/worksheets/sheet2.xml @@ -40,17 +40,22 @@ 13 - + - 15 + 2 - 16 + 15 + + 16 + + + 17 @@ -62,9 +67,10 @@ - + - + + diff --git a/server/routes/reports/trainingReport/training.js b/server/routes/reports/trainingReport/training.js index 3909e42c30..d375548438 100644 --- a/server/routes/reports/trainingReport/training.js +++ b/server/routes/reports/trainingReport/training.js @@ -19,7 +19,7 @@ const s3 = new AWS.S3({ const Bucket = String(config.get('bulkupload.bucketname')); const { Establishment } = require('../../../models/classes/establishment'); -const { getTrainingData, getJobName } = rfr('server/data/trainingReport'); +const { getTrainingData, getJobName, getMndatoryTrainingDetails } = rfr('server/data/trainingReport'); const { attemptToAcquireLock, updateLockState, lockStatus, releaseLockQuery } = rfr('server/data/trainingReportLock'); // Constants string needed by this file in several places @@ -40,9 +40,13 @@ const buStates = ['READY', 'DOWNLOADING', 'FAILED', 'WARNINGS', 'PASSED', 'COMPL const trainingCounts = { expiredTrainingCount: 0, expiringTrainingCount: 0, - missingMandatoryTrainingCount: 0, - missingExpiringMandatoryTrainingCount: 0, - upToDateTrainingCount: 0 + expiredMandatoryTrainingCount: 0, + expiredNonMandatoryTrainingCount: 0, + expiringMandatoryTrainingCount: 0, + expiringNonMandatoryTrainingCount: 0, + upToDateTrainingCount: 0, + upToDateMandatoryTrainingCount: 0, + upToDateNonMandatoryTrainingCount: 0 }; let expiredWorkerTrainings = []; @@ -126,7 +130,7 @@ const createExpireExpiringData = async (trainingData, reportData) => { if (trainingData.length && trainingData.length > 0) { trainingData.forEach(async value => { if (reportData.length === 0) { - reportData.push({ ID: value.ID, NameOrIdValue: value.NameOrIdValue, Count: 0 }); + reportData.push({ ID: value.ID, NameOrIdValue: value.NameOrIdValue, MandatoryCount: 0, NonMandatoryCount: 0, Count: 0 }); } else { let foundTrn = false; reportData.forEach(async (worker, key) => { @@ -135,7 +139,7 @@ const createExpireExpiringData = async (trainingData, reportData) => { } }); if (!foundTrn) { - reportData.push({ ID: value.ID, NameOrIdValue: value.NameOrIdValue, Count: 0 }); + reportData.push({ ID: value.ID, NameOrIdValue: value.NameOrIdValue, MandatoryCount: 0, NonMandatoryCount: 0, Count: 0 }); } } }); @@ -157,8 +161,18 @@ const getTrainingReportData = async establishmentId => { trainingCounts.expiredTrainingCount = 0; trainingCounts.expiringTrainingCount = 0; trainingCounts.upToDateTrainingCount = 0; + trainingCounts.expiredMandatoryTrainingCount = 0; + trainingCounts.expiredNonMandatoryTrainingCount = 0; + trainingCounts.upToDateMandatoryTrainingCount = 0; + trainingCounts.upToDateNonMandatoryTrainingCount = 0; if (expiredWorkerTrainings.length > 0 && expiringWorkerTrainings.length > 0) { for(let i = 0; i < trainingData.length; i++){ + let mandatoryTrainingDetails = await getMndatoryTrainingDetails(trainingData[i], establishmentId); + if(mandatoryTrainingDetails && +mandatoryTrainingDetails[0].count !== 0){ + trainingData[i].MandatoryTraining = 'Yes'; + }else{ + trainingData[i].MandatoryTraining = 'No'; + } trainingData[i].Title = (trainingData[i].Title === null)? '': unescape(trainingData[i].Title); trainingData[i].Completed = trainingData[i].Completed === null? '': trainingData[i].Completed; trainingData[i].Accredited = trainingData[i].Accredited === null? '': trainingData[i].Accredited; @@ -172,30 +186,60 @@ const getTrainingReportData = async establishmentId => { let expiringDate = moment(trainingData[i].Expires); let currentDate = moment(); if (currentDate > expiringDate) { + if(trainingData[i].MandatoryTraining === 'Yes'){ + trainingCounts.expiredMandatoryTrainingCount++; + }else{ + trainingCounts.expiredNonMandatoryTrainingCount++; + } trainingCounts.expiredTrainingCount++; trainingData[i].Status = 'Expired'; //create expired workers data expiredWorkerTrainings.forEach(async worker => { if (worker.ID === trainingData[i].ID) { + if(trainingData[i].MandatoryTraining === 'Yes'){ + worker.MandatoryCount++; + }else{ + worker.NonMandatoryCount++; + } worker.Count++; } }); } else if (expiringDate.diff(currentDate, 'days') <= 90) { + if(trainingData[i].MandatoryTraining === 'Yes'){ + trainingCounts.expiringMandatoryTrainingCount++; + }else{ + trainingCounts.expiringNonMandatoryTrainingCount++; + } trainingCounts.expiringTrainingCount++; trainingData[i].Status = 'Expiring soon'; //create expiring workers data expiringWorkerTrainings.forEach(worker => { if (worker.ID === trainingData[i].ID) { + if(trainingData[i].MandatoryTraining === 'Yes'){ + worker.MandatoryCount++; + }else{ + worker.NonMandatoryCount++; + } worker.Count++; } }); } else { trainingData[i].Status = 'Up-to-date'; trainingCounts.upToDateTrainingCount++; + if(trainingData[i].MandatoryTraining === 'Yes'){ + trainingCounts.upToDateMandatoryTrainingCount++; + }else{ + trainingCounts.upToDateNonMandatoryTrainingCount++; + } } } else { trainingData[i].Status = 'Up-to-date'; trainingCounts.upToDateTrainingCount++; + if(trainingData[i].MandatoryTraining === 'Yes'){ + trainingCounts.upToDateMandatoryTrainingCount++; + }else{ + trainingCounts.upToDateNonMandatoryTrainingCount++; + } trainingData[i].ExpiredOn = ''; } updateProps.forEach(prop => { @@ -223,29 +267,31 @@ const styleLookup = { A: 2, B: 6, C: 2, - // D: 2, - // E: 2, D: 2, E: 2, - F: 11, + F: 2, + G: 2, + H: 11, // G: 1, - H: 12, I: 12, J: 12, + K: 12, + L: 12, }, OVRLAST: { A: 2, B: 16, C: 2, - // D: 2, - // E: 2, D: 2, E: 2, - F: 21, + F: 2, + G: 2, + H: 21, //G: 22, - H: 22, I: 22, J: 22, + K: 22, + L: 22, }, TRNREGULAR: { A: 8, @@ -253,10 +299,10 @@ const styleLookup = { C: 8, D: 8, E: 55, - //F: 7, - F: 8, + F: 6, G: 8, - H: 6, + H: 8, + I: 6, }, TRNLAST: { A: 9, @@ -264,10 +310,10 @@ const styleLookup = { C: 9, D: 9, E: 56, - //F: 13, - F: 9, + F: 7, G: 9, - H: 7, + H: 9, + I: 7, }, }, RED: { @@ -275,29 +321,29 @@ const styleLookup = { A: 2, B: 6, C: 7, - // D: 67, - // E: 9, D: 67, E: 9, - F: 65, - G: 11, - H: 21, - I: 12, - J: 66, + F: 67, + G: 9, + H: 65, + I: 11, + J: 21, + K: 12, + L: 66, }, OVRLAST: { A: 2, B: 16, C: 17, - // D: 67, - // E: 19, D: 67, E: 19, - F: 66, - G: 22, - H: 22, - I: 66, - J: 66, + F: 67, + G: 19, + H: 66, + I: 22, + J: 22, + K: 66, + L: 66, }, TRNREGULAR: { A: 10, @@ -305,10 +351,10 @@ const styleLookup = { C: 10, D: 10, E: 10, - //F: 12, - F: 10, + F: 6, G: 10, - H: 12, + H: 10, + I: 12, }, TRNLAST: { A: 11, @@ -316,10 +362,10 @@ const styleLookup = { C: 11, D: 11, E: 11, - //F: 13, - F: 11, + F: 7, G: 11, - H: 13, + H: 11, + I: 13, }, }, }; @@ -382,39 +428,63 @@ const updateOverviewSheet = ( sharedStringsUniqueCount, sharedStringsCount ); + // put total expired mandatory training count + putString(overviewSheet.querySelector("c[r='D6']"), trainingCounts.expiredMandatoryTrainingCount); + // put total expired non mandatory training count + putString(overviewSheet.querySelector("c[r='E6']"), trainingCounts.expiredNonMandatoryTrainingCount); // put total expired training count - putString(overviewSheet.querySelector("c[r='D6']"), trainingCounts.expiredTrainingCount); + putString(overviewSheet.querySelector("c[r='F6']"), trainingCounts.expiredTrainingCount); + // put total up-to-date mandatory training count + putString(overviewSheet.querySelector("c[r='D5']"), trainingCounts.upToDateMandatoryTrainingCount); + // put total up-to-date non mandatory training count + putString(overviewSheet.querySelector("c[r='E5']"), trainingCounts.upToDateNonMandatoryTrainingCount); // put total up-to-date training count - putString(overviewSheet.querySelector("c[r='D5']"), trainingCounts.upToDateTrainingCount); + putString(overviewSheet.querySelector("c[r='F5']"), trainingCounts.upToDateTrainingCount); putString( - overviewSheet.querySelector("c[r='G5']"), + overviewSheet.querySelector("c[r='I5']"), `You have ${trainingCounts.expiredTrainingCount} expired training records` ); - overviewSheet.querySelector("c[r='G5']").setAttribute('s', 32); + overviewSheet.querySelector("c[r='I5']").setAttribute('s', 32); + // put total expiring soon mandatory training count + putString(overviewSheet.querySelector("c[r='D7']"), trainingCounts.expiringMandatoryTrainingCount); + // put total expiring soon non mandatory training count + putString(overviewSheet.querySelector("c[r='E7']"), trainingCounts.expiringNonMandatoryTrainingCount); // put total expiring soon training count - putString(overviewSheet.querySelector("c[r='D7']"), trainingCounts.expiringTrainingCount); + putString(overviewSheet.querySelector("c[r='F7']"), trainingCounts.expiringTrainingCount); putString( - overviewSheet.querySelector("c[r='G7']"), + overviewSheet.querySelector("c[r='I7']"), `You have ${trainingCounts.expiringTrainingCount} records expiring soon` ); - overviewSheet.querySelector("c[r='G7']").setAttribute('s', 33); + overviewSheet.querySelector("c[r='I7']").setAttribute('s', 33); - // put total expiring soon/expired training count + // put total expiring soon/expired mandatory training count putString( overviewSheet.querySelector("c[r='D8']"), + `${trainingCounts.expiredMandatoryTrainingCount + trainingCounts.expiringMandatoryTrainingCount + trainingCounts.upToDateMandatoryTrainingCount}` + ); + + // put total expiring soon/expired non mandatory training count + putString( + overviewSheet.querySelector("c[r='E8']"), + `${trainingCounts.expiredNonMandatoryTrainingCount + trainingCounts.expiringNonMandatoryTrainingCount + trainingCounts.upToDateNonMandatoryTrainingCount}` + ); + + // put total expiring soon/expired training count + putString( + overviewSheet.querySelector("c[r='F8']"), `${trainingCounts.expiredTrainingCount + trainingCounts.expiringTrainingCount + trainingCounts.upToDateTrainingCount}` ); putString( - overviewSheet.querySelector("c[r='G9']"), + overviewSheet.querySelector("c[r='I9']"), `You have ${expiredOrExpiringWorkerRecords.length} staff members with expired or` ); - overviewSheet.querySelector("c[r='G9']").setAttribute('s', 34); + overviewSheet.querySelector("c[r='I9']").setAttribute('s', 34); - putString(overviewSheet.querySelector("c[r='G10']"), `expiring training records`); - overviewSheet.querySelector("c[r='G10']").setAttribute('s', 35); + putString(overviewSheet.querySelector("c[r='I10']"), `expiring training records`); + overviewSheet.querySelector("c[r='I10']").setAttribute('s', 35); //put all expiring traing details let currentRowBottom = overviewSheet.querySelector("row[r='18']"); @@ -493,6 +563,16 @@ const updateOverviewSheet = ( } break; case 'D': + { + basicValidationUpdate(putString, cellToChange, expiringWorkerTrainings[row].MandatoryCount, columnText, rowType); + } + break; + case 'E': + { + basicValidationUpdate(putString, cellToChange, expiringWorkerTrainings[row].NonMandatoryCount, columnText, rowType); + } + break; + case 'F': { basicValidationUpdate(putString, cellToChange, expiringWorkerTrainings[row].Count, columnText, rowType); } @@ -553,6 +633,16 @@ const updateOverviewSheet = ( } break; case 'D': + { + basicValidationUpdate(putString, cellToChange, expiredWorkerTrainings[row].MandatoryCount, columnText, rowType); + } + break; + case 'E': + { + basicValidationUpdate(putString, cellToChange, expiredWorkerTrainings[row].NonMandatoryCount, columnText, rowType); + } + break; + case 'F': { basicValidationUpdate(putString, cellToChange, expiredWorkerTrainings[row].Count, columnText, rowType); } @@ -687,17 +777,23 @@ const updateTrainingsSheet = ( case 'F': { - basicValidationUpdate(putString, cellToChange, trainingArray[row].ExpiredOn, columnText, rowType); + basicValidationUpdate(putString, cellToChange, trainingArray[row].MandatoryTraining, columnText, rowType); } break; case 'G': { - basicValidationUpdate(putString, cellToChange, trainingArray[row].Completed, columnText, rowType); + basicValidationUpdate(putString, cellToChange, trainingArray[row].ExpiredOn, columnText, rowType); } break; case 'H': + { + basicValidationUpdate(putString, cellToChange, trainingArray[row].Completed, columnText, rowType); + } + break; + + case 'I': { basicValidationUpdate(putString, cellToChange, trainingArray[row].Accredited, columnText, rowType); } From 001d1d4caacca49824db8955e2e4e22d1f8feecb Mon Sep 17 00:00:00 2001 From: Manish Kumar Srivastava Date: Tue, 17 Mar 2020 14:51:15 +0530 Subject: [PATCH 137/305] Staff record changes (#2046) --- src/app/core/breadcrumb/journey.workplaces.ts | 4 +- .../create-basic-records.component.html | 4 +- .../delete-worker-dialog.component.html | 12 ++-- .../delete-worker-dialog.component.ts | 16 +++-- .../move-worker-dialog.component.html | 66 +++++++++++-------- .../move-worker-dialog.component.ts | 56 +++++++--------- .../staff-details.component.html | 4 +- .../worker-save-success.component.html | 6 +- .../worker-save-success.component.ts | 2 +- .../employment/employment.component.html | 2 +- .../personal-details.component.html | 4 +- ...qualifications-and-training.component.html | 6 +- src/assets/scss/modules/_utils.scss | 3 + 13 files changed, 94 insertions(+), 91 deletions(-) diff --git a/src/app/core/breadcrumb/journey.workplaces.ts b/src/app/core/breadcrumb/journey.workplaces.ts index af7342f4d2..96a1682023 100644 --- a/src/app/core/breadcrumb/journey.workplaces.ts +++ b/src/app/core/breadcrumb/journey.workplaces.ts @@ -14,7 +14,7 @@ enum Path { export const myWorkplaceJourney: JourneyRoute = { children: [ { - title: 'Staff record summary', + title: 'Staff record', path: Path.STAFF_RECORD, referrer: { path: Path.DASHBOARD, @@ -65,7 +65,7 @@ export const allWorkplacesJourney: JourneyRoute = { path: Path.WORKPLACE, children: [ { - title: 'Staff record summary', + title: 'Staff record', path: Path.STAFF_RECORD, referrer: { path: Path.WORKPLACE, diff --git a/src/app/features/workers/create-basic-records/create-basic-records.component.html b/src/app/features/workers/create-basic-records/create-basic-records.component.html index 1a5098f550..9b2b03efc4 100644 --- a/src/app/features/workers/create-basic-records/create-basic-records.component.html +++ b/src/app/features/workers/create-basic-records/create-basic-records.component.html @@ -79,7 +79,7 @@

    Staff record {{ i + 1 + totalWorkers }}

    " > Staff record {{ i + 1 + totalWorkers }}

    [formControlName]="'mainJobRole'" id="mainJobRole-{{ i }}" > - + diff --git a/src/app/features/workers/delete-worker-dialog/delete-worker-dialog.component.html b/src/app/features/workers/delete-worker-dialog/delete-worker-dialog.component.html index afe687514e..d706707ad1 100644 --- a/src/app/features/workers/delete-worker-dialog/delete-worker-dialog.component.html +++ b/src/app/features/workers/delete-worker-dialog/delete-worker-dialog.component.html @@ -8,11 +8,8 @@

    - - - - -
    -
    - - Delete +
    +
    +
    + + + + {{ getFormErrorMessage('categories.trainingCategory', 'required') }} + + + +
    +
    + + Remove +
    -
    -
    - {{ vacancyType }} -
    - - +
    +
    + + + Which job roles need this training? + + +
    + {{ vacancyType }} +
    + + +
    -
    -
    +
    +
    - - - {{ getFormErrorMessage('vacancies.id', 'required') }} - -
    - +
    + + + + {{ getFormErrorMessage('vacancies.id', 'required') }} + + + +
    -
    - Delete +
    + Remove
    -
    @@ -139,13 +113,9 @@

    Mandatory training

    -
    diff --git a/src/app/features/add-mandatory-training/add-mandatory-training.component.ts b/src/app/features/add-mandatory-training/add-mandatory-training.component.ts index 408bb4b6eb..b6121e21b4 100644 --- a/src/app/features/add-mandatory-training/add-mandatory-training.component.ts +++ b/src/app/features/add-mandatory-training/add-mandatory-training.component.ts @@ -1,7 +1,6 @@ import { Component, OnInit } from '@angular/core'; import { FormArray, FormBuilder, FormGroup, Validators } from '@angular/forms'; import { Router } from '@angular/router'; -import { JourneyType } from '@core/breadcrumb/breadcrumb.model'; import { ErrorDefinition, ErrorDetails } from '@core/model/errorSummary.model'; import { allMandatoryTrainingCategories, @@ -12,14 +11,13 @@ import { import { Job } from '@core/model/job.model'; import { TrainingCategory } from '@core/model/training.model'; import { URLStructure } from '@core/model/url.model'; -import { BreadcrumbService } from '@core/services/breadcrumb.service'; +import { BackService } from '@core/services/back.service'; import { ErrorSummaryService } from '@core/services/error-summary.service'; import { EstablishmentService } from '@core/services/establishment.service'; import { JobService } from '@core/services/job.service'; import { TrainingService } from '@core/services/training.service'; import { Subscription } from 'rxjs'; import { take } from 'rxjs/internal/operators/take'; -import { BackService } from '@core/services/back.service'; @Component({ selector: 'app-add-mandatory-training', @@ -41,11 +39,11 @@ export class AddMandatoryTrainingComponent implements OnInit { public existingMandatoryTrainings: allMandatoryTrainingCategories; public vacanciesOptions = [ { - label: 'For all job roles', + label: 'All job roles', value: mandatoryTrainingJobOption.all, }, { - label: `For selected job roles only`, + label: `Selected job roles only`, value: mandatoryTrainingJobOption.selected, }, ]; @@ -57,7 +55,7 @@ export class AddMandatoryTrainingComponent implements OnInit { protected establishmentService: EstablishmentService, private jobService: JobService, protected router: Router, - ) {} + ) { } get categoriesArray(): FormArray { return this.form.get('categories') as FormArray; @@ -135,7 +133,7 @@ export class AddMandatoryTrainingComponent implements OnInit { type: [ { name: 'required', - message: 'A training category is required.', + message: 'Select the mandatory training', }, ], }, @@ -144,7 +142,7 @@ export class AddMandatoryTrainingComponent implements OnInit { type: [ { name: 'required', - message: 'A job role is required.', + message: 'Select the job role', }, ], }, diff --git a/src/app/features/workplace/view-all-mandatory-trainings/view-all-mandatory-training.component.html b/src/app/features/workplace/view-all-mandatory-trainings/view-all-mandatory-training.component.html index 2cc5065899..0acd6f5ac4 100644 --- a/src/app/features/workplace/view-all-mandatory-trainings/view-all-mandatory-training.component.html +++ b/src/app/features/workplace/view-all-mandatory-trainings/view-all-mandatory-training.component.html @@ -1,22 +1,32 @@ - +
    +
    +

    + {{ workplceName }} + Mandatory training ({{ mandatoryTrainings.length }}) +

    +
    +
    +

    Last updated {{ lastUpdated | date: 'd MMMM y' }}

    +
    +
    + +
    -
    -

    - {{ workplceName }} - Mandatory training ({{ mandatoryTrainings.length }}) -

    -
    -
    -

    Last updated on {{ lastUpdated | date: 'd MMMM y' }}

    +
    + + You have not added any mandatory training for your workplace. +
    Manage mandatory training + +     +

    Select the training you want to make mandatory for your workplace. Mandatory training can be set for all job + roles or selected job roles only.

    - - + + + + @@ -35,35 +45,24 @@

    @@ -71,23 +70,16 @@

    {{ mandatoryTraining.quantity }}

    - +
    - expired + expired {{ mandatoryTraining.catExpiredTrainingCount }} Expired
    - expiring + expiring {{ mandatoryTraining.catExpiringTrainingCount }} Expiring soon
    - missing mandatory training + missing mandatory training {{ mandatoryTraining.catMissingMandatoryTrainingCount }} Missing
    -
    +
    {{ mandatoryTraining.upToDateTrainingCount }} Up-to-date
    		- {{ + {{ mandatoryTrainingsDetailsLabel[mandatoryTraining.trainingCategoryId] ? mandatoryTrainingsDetailsLabel[mandatoryTraining.trainingCategoryId] : 'Open' - }} + }}
    @@ -111,32 +103,25 @@

    diff --git a/src/app/shared/components/trianing-link-panel/trianing-link-panel.component.html b/src/app/shared/components/trianing-link-panel/trianing-link-panel.component.html index 613a0661b4..9b59133865 100644 --- a/src/app/shared/components/trianing-link-panel/trianing-link-panel.component.html +++ b/src/app/shared/components/trianing-link-panel/trianing-link-panel.component.html @@ -24,7 +24,7 @@ Set up mandatory training + >Manage mandatory training
    From 150b866cd330c3d821606ae4464cbcdf9a5872e2 Mon Sep 17 00:00:00 2001 From: Aaron Russell Date: Thu, 9 Apr 2020 15:16:49 +0100 Subject: [PATCH 173/305] Corrected spelling of qualifications on view all mandatory training page --- .../trianing-link-panel/trianing-link-panel.component.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/shared/components/trianing-link-panel/trianing-link-panel.component.html b/src/app/shared/components/trianing-link-panel/trianing-link-panel.component.html index 9b59133865..6d01c9dd2f 100644 --- a/src/app/shared/components/trianing-link-panel/trianing-link-panel.component.html +++ b/src/app/shared/components/trianing-link-panel/trianing-link-panel.component.html @@ -16,7 +16,7 @@ draggable="false" [routerLink]="['/dashboard']" [fragment]="'staff-training-and-qualifications'" - >View staff training and qualificationView staff training and qualifications
    From 06e508f50c81cc3e8cd9ee81be7d38bd3834d427 Mon Sep 17 00:00:00 2001 From: Aaron Russell Date: Thu, 9 Apr 2020 16:10:53 +0100 Subject: [PATCH 174/305] Change staff training and qualifications to just training and qualifications --- src/app/features/dashboard/dashboard.component.html | 4 ++-- .../training-and-qualifications-tab.component.html | 2 +- .../trianing-link-panel/trianing-link-panel.component.html | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/app/features/dashboard/dashboard.component.html b/src/app/features/dashboard/dashboard.component.html index c6975d8d9c..7eb648bac5 100644 --- a/src/app/features/dashboard/dashboard.component.html +++ b/src/app/features/dashboard/dashboard.component.html @@ -71,7 +71,7 @@

    *ngIf="workplace && canViewListOfWorkers" [alert]="trainingAlert === 1" [redAlert]="trainingAlert === 2" - [title]="'Staff training and qualifications'" + [title]="'Training and qualifications'" > @@ -81,4 +81,4 @@

    - \ No newline at end of file + diff --git a/src/app/shared/components/training-and-qualifications-tab/training-and-qualifications-tab.component.html b/src/app/shared/components/training-and-qualifications-tab/training-and-qualifications-tab.component.html index 62ea75fb60..090755bb6f 100644 --- a/src/app/shared/components/training-and-qualifications-tab/training-and-qualifications-tab.component.html +++ b/src/app/shared/components/training-and-qualifications-tab/training-and-qualifications-tab.component.html @@ -1,5 +1,5 @@
    -

    Staff training and qualifications ({{ totalRecords || 0 }})

    +

    Training and qualifications ({{ totalRecords || 0 }})

    diff --git a/src/app/shared/components/trianing-link-panel/trianing-link-panel.component.html b/src/app/shared/components/trianing-link-panel/trianing-link-panel.component.html index 6d01c9dd2f..ff1a461260 100644 --- a/src/app/shared/components/trianing-link-panel/trianing-link-panel.component.html +++ b/src/app/shared/components/trianing-link-panel/trianing-link-panel.component.html @@ -16,7 +16,7 @@ draggable="false" [routerLink]="['/dashboard']" [fragment]="'staff-training-and-qualifications'" - >View staff training and qualificationsView training and qualifications From 5b52d976e9aefba986cc7321890bd00f565bc1f5 Mon Sep 17 00:00:00 2001 From: Aaron Russell Date: Tue, 14 Apr 2020 09:54:31 +0100 Subject: [PATCH 175/305] Added ability to save establishments with NOCHANGE on Bulk Upload --- server/models/classes/establishment.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/server/models/classes/establishment.js b/server/models/classes/establishment.js index f292eed199..b612e14c7d 100644 --- a/server/models/classes/establishment.js +++ b/server/models/classes/establishment.js @@ -914,8 +914,9 @@ class Establishment extends EntityValidator { // the saving of an Establishment can be initiated within // an external transaction const thisTransaction = externalTransaction || t; + const buChanged = this._status === 'NOCHANGE'; // now append the extendable properties - const modifedUpdateDocument = this._properties.save(savedBy.toLowerCase(), {}); + const modifedUpdateDocument = this._properties.save(savedBy.toLowerCase(), {},buChanged); if(modifedUpdateDocument && !modifedUpdateDocument.ShareDataValue){ modifedUpdateDocument.shareWithCQC = false; modifedUpdateDocument.shareWithLA = false; From c391d23749d4564d6cf9425a72f44330654dea49 Mon Sep 17 00:00:00 2001 From: Aaron Russell Date: Tue, 14 Apr 2020 09:55:00 +0100 Subject: [PATCH 176/305] Formatted function --- server/models/classes/establishment.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/models/classes/establishment.js b/server/models/classes/establishment.js index b612e14c7d..c5ab7f1dbd 100644 --- a/server/models/classes/establishment.js +++ b/server/models/classes/establishment.js @@ -916,7 +916,7 @@ class Establishment extends EntityValidator { const thisTransaction = externalTransaction || t; const buChanged = this._status === 'NOCHANGE'; // now append the extendable properties - const modifedUpdateDocument = this._properties.save(savedBy.toLowerCase(), {},buChanged); + const modifedUpdateDocument = this._properties.save(savedBy.toLowerCase(), {}, buChanged); if(modifedUpdateDocument && !modifedUpdateDocument.ShareDataValue){ modifedUpdateDocument.shareWithCQC = false; modifedUpdateDocument.shareWithLA = false; From 6138c8a3cbb2a64987de200d60c7ade0cb12d87a Mon Sep 17 00:00:00 2001 From: Aaron Russell Date: Tue, 14 Apr 2020 10:42:52 +0100 Subject: [PATCH 177/305] Fixed the mandatory count --- server/data/trainingReport.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/data/trainingReport.js b/server/data/trainingReport.js index f686ca18e7..34ee42b235 100644 --- a/server/data/trainingReport.js +++ b/server/data/trainingReport.js @@ -49,7 +49,7 @@ exports.getMndatoryTrainingDetails = async (trainingData, establishmentId) => replacements: { establishmentId, jobId: trainingData.MainJobFKValue, - categoryId: trainingData.ID, + categoryId: trainingData.CategoryID, zero: 0 }, type: db.QueryTypes.SELECT From 4d9eb605770a73a5cd4beaedd8933f8518ad0a2c Mon Sep 17 00:00:00 2001 From: Aaron Russell Date: Tue, 14 Apr 2020 12:03:09 +0100 Subject: [PATCH 178/305] Added a mandatory training row to overview --- .../template/xl/worksheets/sheet1.xml | 88 ++++++++++-------- .../routes/reports/trainingReport/training.js | 92 ++++++++++--------- 2 files changed, 101 insertions(+), 79 deletions(-) diff --git a/server/routes/reports/trainingReport/template/xl/worksheets/sheet1.xml b/server/routes/reports/trainingReport/template/xl/worksheets/sheet1.xml index d7539d1ccf..82ad3803c5 100644 --- a/server/routes/reports/trainingReport/template/xl/worksheets/sheet1.xml +++ b/server/routes/reports/trainingReport/template/xl/worksheets/sheet1.xml @@ -71,8 +71,8 @@ - - 4 + + 0 20 @@ -85,10 +85,18 @@ - - - - + + 4 + + + 20 + + + 20 + + + 20 + @@ -97,84 +105,90 @@ - + + + + + + + 5 - + 2 - + 3 - + 4 - - - + + + 20 - + 20 - + 20 - - - + + + 6 - + 2 - + 3 - + 4 - - - + + + 20 - + 20 - + 20 - - - + + + 0 - + 2 - + 3 - + 4 - - - + + + 20 - + 20 - + 20 diff --git a/server/routes/reports/trainingReport/training.js b/server/routes/reports/trainingReport/training.js index b3a5066d91..fd0442cc6b 100644 --- a/server/routes/reports/trainingReport/training.js +++ b/server/routes/reports/trainingReport/training.js @@ -459,6 +459,33 @@ const updateOverviewSheet = ( sharedStringsUniqueCount, sharedStringsCount ); + + //insert total sum records in all three tables data + let expiringMandatoryCounts = 0; + let expiringNonMandatoryCounts = 0; + let expiringTotalCounts = 0; + for(let i = 0; i < expiringWorkerTrainings.length; i++){ + expiringMandatoryCounts = expiringMandatoryCounts + expiringWorkerTrainings[i].MandatoryCount; + expiringNonMandatoryCounts = expiringNonMandatoryCounts + expiringWorkerTrainings[i].NonMandatoryCount; + expiringTotalCounts = expiringTotalCounts + expiringWorkerTrainings[i].Count; + } + expiringWorkerTrainings.push({ ID: -1, NameOrIdValue: 'Total', MandatoryCount: expiringMandatoryCounts, NonMandatoryCount: expiringNonMandatoryCounts, Count: expiringTotalCounts}); + let expiredMandatoryCounts = 0; + let expiredNonMandatoryCounts = 0; + let expiredTotalCounts = 0; + for(let i = 0; i < expiredWorkerTrainings.length; i++){ + expiredMandatoryCounts = expiredMandatoryCounts + expiredWorkerTrainings[i].MandatoryCount; + expiredNonMandatoryCounts = expiredNonMandatoryCounts + expiredWorkerTrainings[i].NonMandatoryCount; + expiredTotalCounts = expiredTotalCounts + expiredWorkerTrainings[i].Count; + } + expiredWorkerTrainings.push({ ID: -1, NameOrIdValue: 'Total', MandatoryCount: expiredMandatoryCounts, NonMandatoryCount: expiredNonMandatoryCounts, Count: expiredTotalCounts}); + + let totalMissingMandatoryTrainingCount = 0; + for(let i = 0; i < missingMandatoryTrainingRecords.length; i++){ + missingMandatoryTrainingRecords[i].count = 'Non applicable'; + totalMissingMandatoryTrainingCount = totalMissingMandatoryTrainingCount + missingMandatoryTrainingRecords[i].missingMandatoryTrainingCount; + } + missingMandatoryTrainingRecords.push({ ID: -1, NameOrIdValue: 'Total', missingMandatoryTrainingCount: totalMissingMandatoryTrainingCount, count: 0}); // put total expired mandatory training count putString(overviewSheet("c[r='B3']"), trainingCounts.expiredMandatoryTrainingCount); // put total expired non mandatory training count @@ -479,55 +506,36 @@ const updateOverviewSheet = ( // put total expiring soon training count putString(overviewSheet("c[r='D4']"), trainingCounts.expiringTrainingCount); + // put total missing mandatory training count + putString(overviewSheet("c[r='B5']"), totalMissingMandatoryTrainingCount); + // put total missing non mandatory training count + putString(overviewSheet("c[r='C5']"), 'Non applicable'); + // put total missing training count + putString(overviewSheet("c[r='D5']"), totalMissingMandatoryTrainingCount); + // put total expiring soon/expired mandatory training count putString( - overviewSheet("c[r='B5']"), - `${trainingCounts.expiredMandatoryTrainingCount + trainingCounts.expiringMandatoryTrainingCount + trainingCounts.upToDateMandatoryTrainingCount}` + overviewSheet("c[r='B6']"), + `${trainingCounts.expiredMandatoryTrainingCount + trainingCounts.expiringMandatoryTrainingCount + trainingCounts.upToDateMandatoryTrainingCount + totalMissingMandatoryTrainingCount}` ); // put total expiring soon/expired non mandatory training count putString( - overviewSheet("c[r='C5']"), + overviewSheet("c[r='C6']"), `${trainingCounts.expiredNonMandatoryTrainingCount + trainingCounts.expiringNonMandatoryTrainingCount + trainingCounts.upToDateNonMandatoryTrainingCount}` ); // put total expiring soon/expired training count putString( - overviewSheet("c[r='D5']"), - `${trainingCounts.expiredTrainingCount + trainingCounts.expiringTrainingCount + trainingCounts.upToDateTrainingCount}` + overviewSheet("c[r='D6']"), + `${trainingCounts.expiredTrainingCount + trainingCounts.expiringTrainingCount + trainingCounts.upToDateTrainingCount + totalMissingMandatoryTrainingCount}` ); - //insert total sum records in all three tables data - let expiringMandatoryCounts = 0; - let expiringNonMandatoryCounts = 0; - let expiringTotalCounts = 0; - for(let i = 0; i < expiringWorkerTrainings.length; i++){ - expiringMandatoryCounts = expiringMandatoryCounts + expiringWorkerTrainings[i].MandatoryCount; - expiringNonMandatoryCounts = expiringNonMandatoryCounts + expiringWorkerTrainings[i].NonMandatoryCount; - expiringTotalCounts = expiringTotalCounts + expiringWorkerTrainings[i].Count; - } - expiringWorkerTrainings.push({ ID: -1, NameOrIdValue: 'Total', MandatoryCount: expiringMandatoryCounts, NonMandatoryCount: expiringNonMandatoryCounts, Count: expiringTotalCounts}); - let expiredMandatoryCounts = 0; - let expiredNonMandatoryCounts = 0; - let expiredTotalCounts = 0; - for(let i = 0; i < expiredWorkerTrainings.length; i++){ - expiredMandatoryCounts = expiredMandatoryCounts + expiredWorkerTrainings[i].MandatoryCount; - expiredNonMandatoryCounts = expiredNonMandatoryCounts + expiredWorkerTrainings[i].NonMandatoryCount; - expiredTotalCounts = expiredTotalCounts + expiredWorkerTrainings[i].Count; - } - expiredWorkerTrainings.push({ ID: -1, NameOrIdValue: 'Total', MandatoryCount: expiredMandatoryCounts, NonMandatoryCount: expiredNonMandatoryCounts, Count: expiredTotalCounts}); - - let totalMissingMandatoryTrainingCount = 0; - for(let i = 0; i < missingMandatoryTrainingRecords.length; i++){ - missingMandatoryTrainingRecords[i].count = 'Non applicable'; - totalMissingMandatoryTrainingCount = totalMissingMandatoryTrainingCount + missingMandatoryTrainingRecords[i].missingMandatoryTrainingCount; - } - missingMandatoryTrainingRecords.push({ ID: -1, NameOrIdValue: 'Total', missingMandatoryTrainingCount: totalMissingMandatoryTrainingCount, count: 0}); //put all missing mandatory traing details - let currentRowMandatory = overviewSheet("row[r='17']"); - let rowIndexMandatory = 17; + let currentRowMandatory = overviewSheet("row[r='18']"); + let rowIndexMandatory = 18; let updateMandatoryRowIndex = rowIndexMandatory + (expiredWorkerTrainings.length - 1) + (expiringWorkerTrainings.length-1); - for (; rowIndexMandatory >= 14; rowIndexMandatory--, updateMandatoryRowIndex--) { + for (; rowIndexMandatory >= 15; rowIndexMandatory--, updateMandatoryRowIndex--) { if (currentRowMandatory.children('c').length) { currentRowMandatory.children('c').each((index, element) => { @@ -545,7 +553,7 @@ const updateOverviewSheet = ( } } - let bottomMandatoryRowIndex = 17 + (expiredWorkerTrainings.length - 1) + (expiringWorkerTrainings.length-1); + let bottomMandatoryRowIndex = 18 + (expiredWorkerTrainings.length - 1) + (expiringWorkerTrainings.length-1); const templateRowMissing = overviewSheet(`row[r='${bottomMandatoryRowIndex}']`); let currentRowMissing = templateRowMissing; let rowIndexMissing = bottomMandatoryRowIndex + 1; @@ -615,10 +623,10 @@ const updateOverviewSheet = ( } //put all expiring traing details - let currentRowBottom = overviewSheet("row[r='13']"); - let rowIndexBottom = 13; + let currentRowBottom = overviewSheet("row[r='14']"); + let rowIndexBottom = 14; let updateRowIndex = rowIndexBottom + expiredWorkerTrainings.length - 1; - for (; rowIndexBottom >= 10; rowIndexBottom--, updateRowIndex--) { + for (; rowIndexBottom >= 11; rowIndexBottom--, updateRowIndex--) { if (currentRowBottom.children('c').length) { currentRowBottom.children('c').each((index, element) => { @@ -636,7 +644,7 @@ const updateOverviewSheet = ( } } - let bottomRowIndex = 13 + expiredWorkerTrainings.length - 1; + let bottomRowIndex = 14 + expiredWorkerTrainings.length - 1; const templateRowExpiring = overviewSheet(`row[r='${bottomRowIndex}']`); let currentRowExpiring = templateRowExpiring; let rowIndexExpiring = bottomRowIndex + 1; @@ -701,9 +709,9 @@ const updateOverviewSheet = ( //put all expired training details // clone the row the apropriate number of times - const templateRow = overviewSheet("row[r='9']"); + const templateRow = overviewSheet("row[r='10']"); let currentRow = templateRow; - let rowIndex = 10; + let rowIndex = 11; if (expiredWorkerTrainings.length > 0) { for (let i = 0; i < expiredWorkerTrainings.length - 1; i++) { const tempRow = templateRow.clone(true); @@ -729,7 +737,7 @@ const updateOverviewSheet = ( for (let column = 0; column < 10; column++) { const columnText = String.fromCharCode(column + 65); - const cellToChange = currentRow.children(`c[r='${columnText}${row + 9}']`); + const cellToChange = currentRow.children(`c[r='${columnText}${row + 10}']`); switch (columnText) { case 'A': { From 22696513e53ad9d1b7897d6d7b6ec1f5aebd2b40 Mon Sep 17 00:00:00 2001 From: Aaron Russell Date: Tue, 14 Apr 2020 12:58:54 +0100 Subject: [PATCH 179/305] Fixed issue with active tab for training --- src/app/core/breadcrumb/journey.mandatory_training.ts | 2 +- src/app/core/breadcrumb/journey.workplaces.ts | 4 ++-- .../add-mandatory-training.component.ts | 2 +- .../trianing-link-panel/trianing-link-panel.component.html | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/app/core/breadcrumb/journey.mandatory_training.ts b/src/app/core/breadcrumb/journey.mandatory_training.ts index ed9e7b9ba3..55e5442a1f 100644 --- a/src/app/core/breadcrumb/journey.mandatory_training.ts +++ b/src/app/core/breadcrumb/journey.mandatory_training.ts @@ -13,7 +13,7 @@ export const mandatoryTrainingJourney: JourneyRoute = { path: Path.MANDATORY_TRAINING, referrer: { path: Path.DASHBOARD, - fragment: 'staff-training-and-qualifications', + fragment: 'training-and-qualifications', }, }, ], diff --git a/src/app/core/breadcrumb/journey.workplaces.ts b/src/app/core/breadcrumb/journey.workplaces.ts index 8d883225d4..c6f8bb8409 100644 --- a/src/app/core/breadcrumb/journey.workplaces.ts +++ b/src/app/core/breadcrumb/journey.workplaces.ts @@ -26,7 +26,7 @@ export const myWorkplaceJourney: JourneyRoute = { path: Path.TRAINING_AND_QUALIFICATIONS_RECORD, referrer: { path: Path.DASHBOARD, - fragment: 'staff-training-and-qualifications', + fragment: 'training-and-qualifications', }, }, { @@ -77,7 +77,7 @@ export const allWorkplacesJourney: JourneyRoute = { path: Path.TRAINING_AND_QUALIFICATIONS_RECORD, referrer: { path: Path.WORKPLACE, - fragment: 'staff-training-and-qualifications', + fragment: 'training-and-qualifications', }, }, { diff --git a/src/app/features/add-mandatory-training/add-mandatory-training.component.ts b/src/app/features/add-mandatory-training/add-mandatory-training.component.ts index b6121e21b4..e874923862 100644 --- a/src/app/features/add-mandatory-training/add-mandatory-training.component.ts +++ b/src/app/features/add-mandatory-training/add-mandatory-training.component.ts @@ -70,7 +70,7 @@ export class AddMandatoryTrainingComponent implements OnInit { if (value === true) { this.return = { url: ['/workplace/view-all-mandatory-training'] }; } else { - this.return = { url: ['/dashboard'], fragment: 'staff-training-and-qualifications' }; + this.return = { url: ['/dashboard'], fragment: 'training-and-qualifications' }; } }); diff --git a/src/app/shared/components/trianing-link-panel/trianing-link-panel.component.html b/src/app/shared/components/trianing-link-panel/trianing-link-panel.component.html index ff1a461260..d61fdcf827 100644 --- a/src/app/shared/components/trianing-link-panel/trianing-link-panel.component.html +++ b/src/app/shared/components/trianing-link-panel/trianing-link-panel.component.html @@ -15,7 +15,7 @@ role="button" draggable="false" [routerLink]="['/dashboard']" - [fragment]="'staff-training-and-qualifications'" + [fragment]="'training-and-qualifications'" >View training and qualifications From b5ea315d93f845b948b9e9da91885bf280a7a617 Mon Sep 17 00:00:00 2001 From: Aaron Russell Date: Tue, 14 Apr 2020 14:13:23 +0100 Subject: [PATCH 180/305] Added meta tag for analytics --- index.html | 1 + 1 file changed, 1 insertion(+) diff --git a/index.html b/index.html index c80afb9726..8487e13867 100644 --- a/index.html +++ b/index.html @@ -6,6 +6,7 @@ +

    - expired + expired {{ worker.expiredTrainingCount }} Expired
    - expiring + expiring {{ worker.expiringTrainingCount }} Expiring soon
    - missing mandatory training + missing mandatory training {{ worker.missingMandatoryTrainingCount }} Missing
    -
    Up-to-date
    +
    + Up-to-date