From e72a6707fc7f6b1938d50d8a4c1eb7dd0d3711bf Mon Sep 17 00:00:00 2001 From: Julien Dubois Date: Tue, 27 Feb 2018 23:43:01 +0100 Subject: [PATCH] automatic project update --- .yo-rc.json | 2 +- README.md | 14 +++++++------- package.json | 6 +++--- pom.xml | 4 ++-- .../app/account/register/register.component.ts | 7 ++++--- .../account/register/register.component.spec.ts | 8 ++------ webpack/webpack.prod.js | 2 +- 7 files changed, 20 insertions(+), 23 deletions(-) diff --git a/.yo-rc.json b/.yo-rc.json index 51654449a..1548c55d9 100644 --- a/.yo-rc.json +++ b/.yo-rc.json @@ -23,7 +23,7 @@ "en" ], "serverPort": 8080, - "jhipsterVersion": "4.14.0", + "jhipsterVersion": "4.14.1", "enableSocialSignIn": false, "useSass": false, "jhiPrefix": "jhi", diff --git a/README.md b/README.md index ee66c74b0..70cb52108 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ # jhipsterSampleApplication -This application was generated using JHipster 4.14.0, you can find documentation and help at [http://www.jhipster.tech/documentation-archive/v4.14.0](http://www.jhipster.tech/documentation-archive/v4.14.0). +This application was generated using JHipster 4.14.1, you can find documentation and help at [http://www.jhipster.tech/documentation-archive/v4.14.1](http://www.jhipster.tech/documentation-archive/v4.14.1). ## Development @@ -152,13 +152,13 @@ For more information refer to [Using Docker and Docker-Compose][], this page als To configure CI for your project, run the ci-cd sub-generator (`jhipster ci-cd`), this will let you generate configuration files for a number of Continuous Integration systems. Consult the [Setting up Continuous Integration][] page for more information. [JHipster Homepage and latest documentation]: http://www.jhipster.tech -[JHipster 4.14.0 archive]: http://www.jhipster.tech/documentation-archive/v4.14.0 +[JHipster 4.14.1 archive]: http://www.jhipster.tech/documentation-archive/v4.14.1 -[Using JHipster in development]: http://www.jhipster.tech/documentation-archive/v4.14.0/development/ -[Using Docker and Docker-Compose]: http://www.jhipster.tech/documentation-archive/v4.14.0/docker-compose -[Using JHipster in production]: http://www.jhipster.tech/documentation-archive/v4.14.0/production/ -[Running tests page]: http://www.jhipster.tech/documentation-archive/v4.14.0/running-tests/ -[Setting up Continuous Integration]: http://www.jhipster.tech/documentation-archive/v4.14.0/setting-up-ci/ +[Using JHipster in development]: http://www.jhipster.tech/documentation-archive/v4.14.1/development/ +[Using Docker and Docker-Compose]: http://www.jhipster.tech/documentation-archive/v4.14.1/docker-compose +[Using JHipster in production]: http://www.jhipster.tech/documentation-archive/v4.14.1/production/ +[Running tests page]: http://www.jhipster.tech/documentation-archive/v4.14.1/running-tests/ +[Setting up Continuous Integration]: http://www.jhipster.tech/documentation-archive/v4.14.1/setting-up-ci/ [Gatling]: http://gatling.io/ [Node.js]: https://nodejs.org/ diff --git a/package.json b/package.json index 94db62c71..bf31db740 100644 --- a/package.json +++ b/package.json @@ -15,7 +15,7 @@ "@angular/platform-browser": "5.2.0", "@angular/platform-browser-dynamic": "5.2.0", "@angular/router": "5.2.0", - "@ng-bootstrap/ng-bootstrap": "1.0.0-beta.9", + "@ng-bootstrap/ng-bootstrap": "1.0.0", "bootstrap": "4.0.0", "core-js": "2.4.1", "font-awesome": "4.7.0", @@ -47,7 +47,7 @@ "exports-loader": "0.6.4", "extract-text-webpack-plugin": "3.0.2", "file-loader": "1.1.5", - "generator-jhipster": "4.14.0", + "generator-jhipster": "4.14.1", "html-loader": "0.5.0", "html-webpack-plugin": "2.30.1", "jasmine-core": "2.7.0", @@ -85,7 +85,7 @@ "webpack-notifier": "1.5.1", "webpack-visualizer-plugin": "0.1.11", "web-app-manifest-loader": "0.1.1", - "workbox-webpack-plugin": "3.0.0-alpha.3", + "workbox-webpack-plugin": "3.0.0-beta.1", "write-file-webpack-plugin": "4.1.0" }, "engines": { diff --git a/pom.xml b/pom.xml index 42e0518a6..240615480 100644 --- a/pom.xml +++ b/pom.xml @@ -29,10 +29,10 @@ - 0.1.7 + 0.1.8 - 1.5.9.RELEASE + 1.5.10.RELEASE 5.2.12.Final diff --git a/src/main/webapp/app/account/register/register.component.ts b/src/main/webapp/app/account/register/register.component.ts index 41a0914fc..2adebc115 100644 --- a/src/main/webapp/app/account/register/register.component.ts +++ b/src/main/webapp/app/account/register/register.component.ts @@ -1,4 +1,5 @@ import { Component, OnInit, AfterViewInit, Renderer, ElementRef } from '@angular/core'; +import { HttpErrorResponse } from '@angular/common/http'; import { NgbModalRef } from '@ng-bootstrap/ng-bootstrap'; import { JhiLanguageService } from 'ng-jhipster'; @@ -59,11 +60,11 @@ export class RegisterComponent implements OnInit, AfterViewInit { this.modalRef = this.loginModalService.open(); } - private processError(response) { + private processError(response: HttpErrorResponse) { this.success = null; - if (response.status === 400 && response.json().type === LOGIN_ALREADY_USED_TYPE) { + if (response.status === 400 && response.error.type === LOGIN_ALREADY_USED_TYPE) { this.errorUserExists = 'ERROR'; - } else if (response.status === 400 && response.json().type === EMAIL_ALREADY_USED_TYPE) { + } else if (response.status === 400 && response.error.type === EMAIL_ALREADY_USED_TYPE) { this.errorEmailExists = 'ERROR'; } else { this.error = 'ERROR'; diff --git a/src/test/javascript/spec/app/account/register/register.component.spec.ts b/src/test/javascript/spec/app/account/register/register.component.spec.ts index 96f489e9a..b0475f30b 100644 --- a/src/test/javascript/spec/app/account/register/register.component.spec.ts +++ b/src/test/javascript/spec/app/account/register/register.component.spec.ts @@ -69,9 +69,7 @@ describe('Component Tests', () => { fakeAsync((service: Register) => { spyOn(service, 'save').and.returnValue(Observable.throw({ status: 400, - json() { - return {type : LOGIN_ALREADY_USED_TYPE}; - } + error: { type: LOGIN_ALREADY_USED_TYPE } })); comp.registerAccount.password = comp.confirmPassword = 'password'; @@ -90,9 +88,7 @@ describe('Component Tests', () => { fakeAsync((service: Register) => { spyOn(service, 'save').and.returnValue(Observable.throw({ status: 400, - json() { - return {type : EMAIL_ALREADY_USED_TYPE}; - } + error: { type: EMAIL_ALREADY_USED_TYPE } })); comp.registerAccount.password = comp.confirmPassword = 'password'; diff --git a/webpack/webpack.prod.js b/webpack/webpack.prod.js index 88bf59aea..a8857a9fb 100644 --- a/webpack/webpack.prod.js +++ b/webpack/webpack.prod.js @@ -86,7 +86,7 @@ module.exports = webpackMerge(commonConfig({ env: ENV }), { minimize: true, debug: false }), - new WorkboxPlugin({ + new WorkboxPlugin.GenerateSW({ clientsClaim: true, skipWaiting: true, })