From b20fb9e9c3adb28fc34f5f4076e5b28e98d6fb9e Mon Sep 17 00:00:00 2001 From: Fabio Formosa Date: Sat, 19 Nov 2022 12:09:41 +0100 Subject: [PATCH 1/4] bump version to 4.0.4-SNAPSHOT --- quartz-manager-parent/pom.xml | 12 ++++++------ .../quartz-manager-common/pom.xml | 2 +- .../quartz-manager-starter-api/pom.xml | 2 +- .../quartz-manager-starter-persistence/pom.xml | 2 +- .../quartz-manager-starter-security/pom.xml | 2 +- .../quartz-manager-starter-ui/pom.xml | 2 +- .../quartz-manager-web-showcase/pom.xml | 14 +++++++------- 7 files changed, 18 insertions(+), 18 deletions(-) diff --git a/quartz-manager-parent/pom.xml b/quartz-manager-parent/pom.xml index d7f60c0..9a5e02e 100644 --- a/quartz-manager-parent/pom.xml +++ b/quartz-manager-parent/pom.xml @@ -10,7 +10,7 @@ it.fabioformosa.quartz-manager quartz-manager-parent - 4.0.3 + 4.0.4-SNAPSHOT pom @@ -69,27 +69,27 @@ it.fabioformosa.quartz-manager quartz-manager-common - 4.0.3 + 4.0.4-SNAPSHOT it.fabioformosa.quartz-manager quartz-manager-starter-api - 4.0.3 + 4.0.4-SNAPSHOT it.fabioformosa.quartz-manager quartz-manager-starter-security - 4.0.3 + 4.0.4-SNAPSHOT it.fabioformosa.quartz-manager quartz-manager-starter-persistence - 4.0.3 + 4.0.4-SNAPSHOT it.fabioformosa.quartz-manager quartz-manager-starter-ui - 4.0.3 + 4.0.4-SNAPSHOT diff --git a/quartz-manager-parent/quartz-manager-common/pom.xml b/quartz-manager-parent/quartz-manager-common/pom.xml index 77068cc..74203b6 100644 --- a/quartz-manager-parent/quartz-manager-common/pom.xml +++ b/quartz-manager-parent/quartz-manager-common/pom.xml @@ -3,7 +3,7 @@ it.fabioformosa.quartz-manager quartz-manager-parent - 4.0.3 + 4.0.4-SNAPSHOT quartz-manager-common diff --git a/quartz-manager-parent/quartz-manager-starter-api/pom.xml b/quartz-manager-parent/quartz-manager-starter-api/pom.xml index 207f105..a18f054 100644 --- a/quartz-manager-parent/quartz-manager-starter-api/pom.xml +++ b/quartz-manager-parent/quartz-manager-starter-api/pom.xml @@ -5,7 +5,7 @@ it.fabioformosa.quartz-manager quartz-manager-parent - 4.0.3 + 4.0.4-SNAPSHOT quartz-manager-starter-api diff --git a/quartz-manager-parent/quartz-manager-starter-persistence/pom.xml b/quartz-manager-parent/quartz-manager-starter-persistence/pom.xml index 027c32d..26bc5d1 100644 --- a/quartz-manager-parent/quartz-manager-starter-persistence/pom.xml +++ b/quartz-manager-parent/quartz-manager-starter-persistence/pom.xml @@ -3,7 +3,7 @@ it.fabioformosa.quartz-manager quartz-manager-parent - 4.0.3 + 4.0.4-SNAPSHOT quartz-manager-starter-persistence diff --git a/quartz-manager-parent/quartz-manager-starter-security/pom.xml b/quartz-manager-parent/quartz-manager-starter-security/pom.xml index a0b13d5..9f850ef 100644 --- a/quartz-manager-parent/quartz-manager-starter-security/pom.xml +++ b/quartz-manager-parent/quartz-manager-starter-security/pom.xml @@ -4,7 +4,7 @@ it.fabioformosa.quartz-manager quartz-manager-parent - 4.0.3 + 4.0.4-SNAPSHOT quartz-manager-starter-security diff --git a/quartz-manager-parent/quartz-manager-starter-ui/pom.xml b/quartz-manager-parent/quartz-manager-starter-ui/pom.xml index 9d1b811..fe5714e 100644 --- a/quartz-manager-parent/quartz-manager-starter-ui/pom.xml +++ b/quartz-manager-parent/quartz-manager-starter-ui/pom.xml @@ -4,7 +4,7 @@ it.fabioformosa.quartz-manager quartz-manager-parent - 4.0.3 + 4.0.4-SNAPSHOT quartz-manager-starter-ui diff --git a/quartz-manager-parent/quartz-manager-web-showcase/pom.xml b/quartz-manager-parent/quartz-manager-web-showcase/pom.xml index fc4213b..9a4aad6 100644 --- a/quartz-manager-parent/quartz-manager-web-showcase/pom.xml +++ b/quartz-manager-parent/quartz-manager-web-showcase/pom.xml @@ -5,7 +5,7 @@ it.fabioformosa.quartz-manager quartz-manager-parent - 4.0.3 + 4.0.4-SNAPSHOT quartz-manager-web-showcase @@ -129,12 +129,12 @@ org.springframework.boot spring-boot-maven-plugin - - - repackage - - - + + + repackage + + + org.apache.maven.plugins From bd5276116ba048b430acf58830a77fff3ad43382 Mon Sep 17 00:00:00 2001 From: Fabio Formosa Date: Sat, 19 Nov 2022 12:18:36 +0100 Subject: [PATCH 2/4] fixed the redirect to the login in case of security layer enabled --- quartz-manager-frontend/src/app/services/user.service.ts | 3 ++- quartz-manager-parent/quartz-manager-web-showcase/pom.xml | 8 ++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/quartz-manager-frontend/src/app/services/user.service.ts b/quartz-manager-frontend/src/app/services/user.service.ts index 1f2d376..ae0bf61 100644 --- a/quartz-manager-frontend/src/app/services/user.service.ts +++ b/quartz-manager-frontend/src/app/services/user.service.ts @@ -42,8 +42,9 @@ export class UserService { this.router.initialNavigation(); return; } - if (httpErrorResponse.status < 200 || httpErrorResponse.status > 399) + if (httpErrorResponse.status !== 401 && (httpErrorResponse.status < 200 || httpErrorResponse.status > 399)) { this.router.navigateByUrl('/error'); + } }); } diff --git a/quartz-manager-parent/quartz-manager-web-showcase/pom.xml b/quartz-manager-parent/quartz-manager-web-showcase/pom.xml index 9a4aad6..2de5e46 100644 --- a/quartz-manager-parent/quartz-manager-web-showcase/pom.xml +++ b/quartz-manager-parent/quartz-manager-web-showcase/pom.xml @@ -31,10 +31,10 @@ it.fabioformosa.quartz-manager quartz-manager-starter-ui - - - - + + it.fabioformosa.quartz-manager + quartz-manager-starter-security + From 28715cdf6239e43da70936377eeae0df3de72443 Mon Sep 17 00:00:00 2001 From: Fabio Formosa Date: Sat, 19 Nov 2022 12:40:23 +0100 Subject: [PATCH 3/4] enhanced the info message within the UnsupportedMultipleJobsDialog --- .../trigger-list/trigger-list.component.ts | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/quartz-manager-frontend/src/app/components/trigger-list/trigger-list.component.ts b/quartz-manager-frontend/src/app/components/trigger-list/trigger-list.component.ts index 1d759dd..9e98f91 100644 --- a/quartz-manager-frontend/src/app/components/trigger-list/trigger-list.component.ts +++ b/quartz-manager-frontend/src/app/components/trigger-list/trigger-list.component.ts @@ -2,13 +2,25 @@ import {Component, EventEmitter, Input, OnInit, Output} from '@angular/core'; import {TriggerService} from '../../services/trigger.service'; import {TriggerKey} from '../../model/triggerKey.model'; import {SimpleTrigger} from '../../model/simple-trigger.model'; -import {MatDialog} from '@angular/material/dialog'; +import {MatDialog, MatDialogRef} from '@angular/material/dialog'; @Component({ - template: 'Multiple jobs not supported yet - Coming Soon...', + template: ` +

Coming Soon

+
+

This feature is in roadmap and it will come with the next releases

+
+
+ +
`, }) // tslint:disable-next-line:component-class-suffix export class UnsupportedMultipleJobsDialog { + constructor(public dialogRef: MatDialogRef) { + } + closeDialog(): void { + this.dialogRef.close(); + } } @Component({ @@ -69,7 +81,7 @@ export class TriggerListComponent implements OnInit { } onNewTriggerBtnClicked() { - if (this.triggerKeys && this.triggerKeys.length > 0) { + if (this.getTriggerKeyList() && this.getTriggerKeyList().length > 0) { this.dialog.open(UnsupportedMultipleJobsDialog) } else { this.onNewTriggerClicked.emit(); From 93ab9c55bc0fb48f8697efd26e3fca8131c27939 Mon Sep 17 00:00:00 2001 From: Fabio Formosa Date: Sat, 19 Nov 2022 13:00:39 +0100 Subject: [PATCH 4/4] bump version to 4.0.4 --- quartz-manager-parent/pom.xml | 12 ++++++------ quartz-manager-parent/quartz-manager-common/pom.xml | 2 +- .../quartz-manager-starter-api/pom.xml | 2 +- .../quartz-manager-starter-persistence/pom.xml | 2 +- .../quartz-manager-starter-security/pom.xml | 2 +- .../quartz-manager-starter-ui/pom.xml | 2 +- .../quartz-manager-web-showcase/pom.xml | 2 +- 7 files changed, 12 insertions(+), 12 deletions(-) diff --git a/quartz-manager-parent/pom.xml b/quartz-manager-parent/pom.xml index 9a5e02e..e1d298c 100644 --- a/quartz-manager-parent/pom.xml +++ b/quartz-manager-parent/pom.xml @@ -10,7 +10,7 @@ it.fabioformosa.quartz-manager quartz-manager-parent - 4.0.4-SNAPSHOT + 4.0.4 pom @@ -69,27 +69,27 @@ it.fabioformosa.quartz-manager quartz-manager-common - 4.0.4-SNAPSHOT + 4.0.4 it.fabioformosa.quartz-manager quartz-manager-starter-api - 4.0.4-SNAPSHOT + 4.0.4 it.fabioformosa.quartz-manager quartz-manager-starter-security - 4.0.4-SNAPSHOT + 4.0.4 it.fabioformosa.quartz-manager quartz-manager-starter-persistence - 4.0.4-SNAPSHOT + 4.0.4 it.fabioformosa.quartz-manager quartz-manager-starter-ui - 4.0.4-SNAPSHOT + 4.0.4 diff --git a/quartz-manager-parent/quartz-manager-common/pom.xml b/quartz-manager-parent/quartz-manager-common/pom.xml index 74203b6..75e2d0b 100644 --- a/quartz-manager-parent/quartz-manager-common/pom.xml +++ b/quartz-manager-parent/quartz-manager-common/pom.xml @@ -3,7 +3,7 @@ it.fabioformosa.quartz-manager quartz-manager-parent - 4.0.4-SNAPSHOT + 4.0.4 quartz-manager-common diff --git a/quartz-manager-parent/quartz-manager-starter-api/pom.xml b/quartz-manager-parent/quartz-manager-starter-api/pom.xml index a18f054..516b598 100644 --- a/quartz-manager-parent/quartz-manager-starter-api/pom.xml +++ b/quartz-manager-parent/quartz-manager-starter-api/pom.xml @@ -5,7 +5,7 @@ it.fabioformosa.quartz-manager quartz-manager-parent - 4.0.4-SNAPSHOT + 4.0.4 quartz-manager-starter-api diff --git a/quartz-manager-parent/quartz-manager-starter-persistence/pom.xml b/quartz-manager-parent/quartz-manager-starter-persistence/pom.xml index 26bc5d1..102afcb 100644 --- a/quartz-manager-parent/quartz-manager-starter-persistence/pom.xml +++ b/quartz-manager-parent/quartz-manager-starter-persistence/pom.xml @@ -3,7 +3,7 @@ it.fabioformosa.quartz-manager quartz-manager-parent - 4.0.4-SNAPSHOT + 4.0.4 quartz-manager-starter-persistence diff --git a/quartz-manager-parent/quartz-manager-starter-security/pom.xml b/quartz-manager-parent/quartz-manager-starter-security/pom.xml index 9f850ef..9843430 100644 --- a/quartz-manager-parent/quartz-manager-starter-security/pom.xml +++ b/quartz-manager-parent/quartz-manager-starter-security/pom.xml @@ -4,7 +4,7 @@ it.fabioformosa.quartz-manager quartz-manager-parent - 4.0.4-SNAPSHOT + 4.0.4 quartz-manager-starter-security diff --git a/quartz-manager-parent/quartz-manager-starter-ui/pom.xml b/quartz-manager-parent/quartz-manager-starter-ui/pom.xml index fe5714e..a56be98 100644 --- a/quartz-manager-parent/quartz-manager-starter-ui/pom.xml +++ b/quartz-manager-parent/quartz-manager-starter-ui/pom.xml @@ -4,7 +4,7 @@ it.fabioformosa.quartz-manager quartz-manager-parent - 4.0.4-SNAPSHOT + 4.0.4 quartz-manager-starter-ui diff --git a/quartz-manager-parent/quartz-manager-web-showcase/pom.xml b/quartz-manager-parent/quartz-manager-web-showcase/pom.xml index 2de5e46..bf66627 100644 --- a/quartz-manager-parent/quartz-manager-web-showcase/pom.xml +++ b/quartz-manager-parent/quartz-manager-web-showcase/pom.xml @@ -5,7 +5,7 @@ it.fabioformosa.quartz-manager quartz-manager-parent - 4.0.4-SNAPSHOT + 4.0.4 quartz-manager-web-showcase