Merge pull request #89 from fabioformosa/develop

fabioformosa · web-flow · commit ff43103f3758 · 2022-11-19T13:01:44.000+01:00
v4.0.4
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
@@ -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: `
+    <h3 mat-dialog-title>Coming Soon</h3>
+    <div mat-dialog-content>
+      <p>This feature is in roadmap and it will come with the next releases</p>
+    </div>
+    <div mat-dialog-actions>
+      <button mat-button (click)="closeDialog()" style="padding: 0.5em;width: 5em;">Ok</button>
+    </div>`,
 })
 // tslint:disable-next-line:component-class-suffix
 export class UnsupportedMultipleJobsDialog {
+  constructor(public dialogRef: MatDialogRef<UnsupportedMultipleJobsDialog>) {
+  }
+  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();
diff --git 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/pom.xml b/quartz-manager-parent/pom.xml
@@ -10,7 +10,7 @@
 
   <groupId>it.fabioformosa.quartz-manager</groupId>
   <artifactId>quartz-manager-parent</artifactId>
-  <version>4.0.3</version>
+  <version>4.0.4</version>
 
   <packaging>pom</packaging>
 
@@ -69,27 +69,27 @@
       <dependency>
         <groupId>it.fabioformosa.quartz-manager</groupId>
         <artifactId>quartz-manager-common</artifactId>
-        <version>4.0.3</version>
+        <version>4.0.4</version>
       </dependency>
       <dependency>
         <groupId>it.fabioformosa.quartz-manager</groupId>
         <artifactId>quartz-manager-starter-api</artifactId>
-        <version>4.0.3</version>
+        <version>4.0.4</version>
       </dependency>
       <dependency>
         <groupId>it.fabioformosa.quartz-manager</groupId>
         <artifactId>quartz-manager-starter-security</artifactId>
-        <version>4.0.3</version>
+        <version>4.0.4</version>
       </dependency>
       <dependency>
         <groupId>it.fabioformosa.quartz-manager</groupId>
         <artifactId>quartz-manager-starter-persistence</artifactId>
-        <version>4.0.3</version>
+        <version>4.0.4</version>
       </dependency>
       <dependency>
         <groupId>it.fabioformosa.quartz-manager</groupId>
         <artifactId>quartz-manager-starter-ui</artifactId>
-        <version>4.0.3</version>
+        <version>4.0.4</version>
       </dependency>
     </dependencies>
   </dependencyManagement>
diff --git a/quartz-manager-parent/quartz-manager-common/pom.xml b/quartz-manager-parent/quartz-manager-common/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <groupId>it.fabioformosa.quartz-manager</groupId>
     <artifactId>quartz-manager-parent</artifactId>
-    <version>4.0.3</version>
+    <version>4.0.4</version>
   </parent>
   <artifactId>quartz-manager-common</artifactId>
 
diff --git a/quartz-manager-parent/quartz-manager-starter-api/pom.xml b/quartz-manager-parent/quartz-manager-starter-api/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>it.fabioformosa.quartz-manager</groupId>
     <artifactId>quartz-manager-parent</artifactId>
-    <version>4.0.3</version>
+    <version>4.0.4</version>
   </parent>
 
   <artifactId>quartz-manager-starter-api</artifactId>
diff --git a/quartz-manager-parent/quartz-manager-starter-persistence/pom.xml b/quartz-manager-parent/quartz-manager-starter-persistence/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <groupId>it.fabioformosa.quartz-manager</groupId>
     <artifactId>quartz-manager-parent</artifactId>
-    <version>4.0.3</version>
+    <version>4.0.4</version>
   </parent>
 
   <artifactId>quartz-manager-starter-persistence</artifactId>
diff --git a/quartz-manager-parent/quartz-manager-starter-security/pom.xml b/quartz-manager-parent/quartz-manager-starter-security/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>it.fabioformosa.quartz-manager</groupId>
     <artifactId>quartz-manager-parent</artifactId>
-    <version>4.0.3</version>
+    <version>4.0.4</version>
   </parent>
 
   <artifactId>quartz-manager-starter-security</artifactId>
diff --git a/quartz-manager-parent/quartz-manager-starter-ui/pom.xml b/quartz-manager-parent/quartz-manager-starter-ui/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>it.fabioformosa.quartz-manager</groupId>
 		<artifactId>quartz-manager-parent</artifactId>
-        <version>4.0.3</version>
+        <version>4.0.4</version>
 	</parent>
 
 	<artifactId>quartz-manager-starter-ui</artifactId>
diff --git a/quartz-manager-parent/quartz-manager-web-showcase/pom.xml b/quartz-manager-parent/quartz-manager-web-showcase/pom.xml
@@ -5,7 +5,7 @@
     <parent>
       <groupId>it.fabioformosa.quartz-manager</groupId>
       <artifactId>quartz-manager-parent</artifactId>
-      <version>4.0.3</version>
+      <version>4.0.4</version>
     </parent>
 
 	<artifactId>quartz-manager-web-showcase</artifactId>
@@ -31,10 +31,10 @@
           <groupId>it.fabioformosa.quartz-manager</groupId>
           <artifactId>quartz-manager-starter-ui</artifactId>
         </dependency>
-<!--        <dependency>-->
-<!--          <groupId>it.fabioformosa.quartz-manager</groupId>-->
-<!--          <artifactId>quartz-manager-starter-security</artifactId>-->
-<!--        </dependency>-->
+        <dependency>
+          <groupId>it.fabioformosa.quartz-manager</groupId>
+          <artifactId>quartz-manager-starter-security</artifactId>
+        </dependency>
 <!--        <dependency>-->
 <!--          <groupId>it.fabioformosa.quartz-manager</groupId>-->
 <!--          <artifactId>quartz-manager-starter-persistence</artifactId>-->
@@ -129,12 +129,12 @@
 					<groupId>org.springframework.boot</groupId>
 					<artifactId>spring-boot-maven-plugin</artifactId>
 					<executions>
-	                    <execution>
-	                        <goals>
-	                            <goal>repackage</goal>
-	                        </goals>
-	                    </execution>
-	                </executions>
+              <execution>
+                  <goals>
+                      <goal>repackage</goal>
+                  </goals>
+              </execution>
+          </executions>
 				</plugin>
 			    <plugin>
 			      <groupId>org.apache.maven.plugins</groupId>

Original file line number	Diff line number	Diff line change
`@@ -42,8 +42,9 @@ export class UserService {`
`42`	`42`	`this.router.initialNavigation();`
`43`	`43`	`return;`
`44`	`44`	`}`
`45`		`- if (httpErrorResponse.status < 200 \|\| httpErrorResponse.status > 399)`
	`45`	`+ if (httpErrorResponse.status !== 401 && (httpErrorResponse.status < 200 \|\| httpErrorResponse.status > 399)) {`
`46`	`46`	`this.router.navigateByUrl('/error');`
	`47`	`+ }`
`47`	`48`	`});`
`48`	`49`	`}`
`49`	`50`