Compare commits

...

212 Commits

Author SHA1 Message Date
dependabot[bot]
5b9d40bf76 Bump commons-io in /quartz-manager-parent/quartz-manager-starter-api
Bumps commons-io from 1.3.2 to 2.7.

---
updated-dependencies:
- dependency-name: commons-io:commons-io
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-11-19 09:38:45 +00:00
Fabio Formosa
694e199709 Merge pull request #84 from fabioformosa/develop
v4.0.0
2022-11-19 10:36:20 +01:00
Fabio Formosa
77cf0a06d6 bump version to 4.0.0 2022-11-18 00:34:07 +01:00
Fabio Formosa
d9c7bcaad9 added mvn bin 2022-11-18 00:31:33 +01:00
Fabio Formosa
d9469b7dcc preparing for releasing 2022-11-18 00:24:02 +01:00
Fabio Formosa
1a57a4b04e Update README.md 2022-11-16 23:20:46 +01:00
Fabio Formosa
10d871be2e Update README.md 2022-11-15 00:19:55 +01:00
Fabio Formosa
8b75cc1891 Update README.md 2022-11-15 00:18:40 +01:00
Fabio Formosa
f6522a9a79 Update README.md 2022-11-15 00:15:42 +01:00
Fabio Formosa
96449c8aeb resized the swagger screenshot 2022-11-15 00:15:03 +01:00
Fabio Formosa
1d03027efe Update README.md 2022-11-14 23:01:31 +01:00
Fabio Formosa
69750267f6 Update README.md 2022-11-14 23:01:18 +01:00
Fabio Formosa
2640e91055 added a README file within the multi-module maven proj 2022-11-14 22:59:05 +01:00
Fabio Formosa
9ccefe90ee Update README.md 2022-11-14 20:30:21 +01:00
Fabio Formosa
c538ea95ee fixed some compiler warnings 2022-11-12 20:43:33 +01:00
Fabio Formosa
933975ce70 Update README.md 2022-11-12 17:49:32 +01:00
Fabio Formosa
d189feea87 Update README.md 2022-11-12 17:16:15 +01:00
Fabio Formosa
9637658b89 Update README.md 2022-11-12 16:50:49 +01:00
Fabio Formosa
c3c6265dc6 Update README.md 2022-11-12 16:25:20 +01:00
Fabio Formosa
63f871f649 Update README.md 2022-11-12 16:09:28 +01:00
Fabio Formosa
a9259fd30d Update README.md 2022-11-12 00:11:42 +01:00
Fabio Formosa
43e1fd3f04 Update README.md 2022-11-11 00:21:10 +01:00
Fabio Formosa
8e1e4344e4 Update README.md 2022-11-11 00:19:32 +01:00
Fabio Formosa
2186b0b007 Update README.md 2022-11-11 00:02:43 +01:00
Fabio Formosa
9f7238021b Update README.md 2022-11-11 00:01:12 +01:00
Fabio Formosa
db2a5949dc Update README.md 2022-11-10 23:56:27 +01:00
Fabio Formosa
73293095f6 Update README.md 2022-11-10 23:43:48 +01:00
Fabio Formosa
879fae55ce Update README.md 2022-11-10 20:45:38 +01:00
Fabio Formosa
b2da564469 Update README.md 2022-11-10 00:21:11 +01:00
Fabio Formosa
b52834a2d8 Update README.md 2022-11-10 00:18:59 +01:00
Fabio Formosa
c8c4ad37c8 #64 added the swagger screenshot 2022-11-09 23:03:47 +01:00
Fabio Formosa
6fa7375f13 Update README.md 2022-11-09 20:26:40 +01:00
Fabio Formosa
9127a50433 Update README.md 2022-11-09 19:43:53 +01:00
Fabio Formosa
cabbec3d3b #64 added the new screenshot 2022-11-09 19:40:42 +01:00
Fabio Formosa
e42b26fa73 #78 fixed some smells 2022-11-08 23:53:24 +01:00
Fabio Formosa
018c0f18dc #78 fixed some smells 2022-11-08 23:38:48 +01:00
Fabio Formosa
a4b0a1bafb #78 fixed some smells 2022-11-08 22:59:07 +01:00
Fabio Formosa
6eededed2c #78 fixed some smells 2022-11-08 22:41:24 +01:00
Fabio Formosa
b62455836a #78 fixed a smell 2022-11-08 22:34:50 +01:00
Fabio Formosa
9dfe06e346 #74 added an alert in case of no eligible jobs 2022-11-08 00:35:54 +01:00
Fabio Formosa
461c31e7ea #71 added illustrations for 403 and 404 also 2022-11-06 13:02:40 +01:00
Fabio Formosa
29a1903b21 #71 added an illustration when there a no logs to display 2022-11-05 20:53:55 +01:00
Fabio Formosa
83401a2ecb #71 added a generic error view 2022-11-05 20:28:56 +01:00
Fabio Formosa
3242457cce #57 fixed tests 2022-11-05 17:53:21 +01:00
Fabio Formosa
12f91fa85c #57 enhanced the layout of the trigger form 2022-11-05 17:47:50 +01:00
Fabio Formosa
85ba371b72 #57 enhanced the layout of the trigger form 2022-11-05 17:43:48 +01:00
Fabio Formosa
014c348a89 #57 added custom validations to the trigger form 2022-11-05 17:04:08 +01:00
Fabio Formosa
a44d041e93 #57 attempt to fix the flaky tests 2022-11-05 13:47:07 +01:00
Fabio Formosa
9ea4afcaef #57 attempt to fix the flaky tests 2022-11-05 13:36:39 +01:00
Fabio Formosa
9b32f5e598 #57 attempt to fix the flaky tests 2022-11-05 13:26:35 +01:00
Fabio Formosa
f4dd8519a9 #57 attempt to fix the flaky tests 2022-11-05 13:19:45 +01:00
Fabio Formosa
1b1be180c6 #57 clean up 2022-11-05 13:15:33 +01:00
Fabio Formosa
026bdc6f18 #57 attempt to solve the flaky test 2022-11-04 23:12:55 +01:00
Fabio Formosa
1207a646c7 #57 temporary disabled a flaky assertion 2022-11-04 00:21:42 +01:00
Fabio Formosa
3e90a9b22c #57 fixed a test 2022-11-04 00:18:22 +01:00
Fabio Formosa
459aa136c1 #57 added an error message for required fields 2022-11-03 23:58:17 +01:00
Fabio Formosa
d164cb9363 #57 fixed tests 2022-11-03 23:24:59 +01:00
Fabio Formosa
a8fb990966 #57 fixed tests 2022-11-03 22:11:44 +01:00
Fabio Formosa
121f2e364f #57 converted template-driven form in reactive form 2022-11-02 20:18:50 +01:00
Fabio Formosa
b968329fb3 #57 added new validation checks to the simple trigger input 2022-10-29 11:31:28 +02:00
Fabio Formosa
d9ff379d59 #57 improved some oas captions 2022-10-29 10:29:19 +02:00
Fabio Formosa
5c9a8d21a3 #78 fixed the sonar props 2022-10-29 10:28:52 +02:00
Fabio Formosa
9d24c1587f #78 fixed the sonar props 2022-10-29 00:55:23 +02:00
Fabio Formosa
436821a831 #78 fixed the sonar props 2022-10-29 00:45:01 +02:00
Fabio Formosa
ecb07dc682 #78 fixed the sonar props 2022-10-29 00:35:43 +02:00
Fabio Formosa
8f08927aad #78 fixed sonar smells 2022-10-29 00:24:38 +02:00
Fabio Formosa
e29fd8dc92 #78 fixed sonar smells 2022-10-29 00:18:55 +02:00
Fabio Formosa
3af5eb076e #78 fixed sonar smells 2022-10-29 00:07:15 +02:00
Fabio Formosa
c190c15889 #78 fixed sonar smells 2022-10-29 00:04:48 +02:00
Fabio Formosa
540bdf35a5 #78 fixed sonar smells 2022-10-28 23:53:33 +02:00
Fabio Formosa
33b4d88d52 #57 added validation checks onto the SimpleTrigger 2022-10-28 01:14:53 +02:00
Fabio Formosa
ad3eec4abe #78 fixed a major sonar finding 2022-10-27 23:55:49 +02:00
Fabio Formosa
7b87a9485e #78 fixed a major sonar finding 2022-10-27 23:46:39 +02:00
Fabio Formosa
a8a027ed88 #62 added the jacoco plugin 2022-10-27 23:39:42 +02:00
Fabio Formosa
69b62032b2 #57 #62 fixed an integration tests 2022-10-27 23:36:40 +02:00
Fabio Formosa
f411659ad6 #57 #62 added an integration test to check the mandatory fields in scheduling a simple trigger 2022-10-27 23:29:28 +02:00
Fabio Formosa
0c33eda68c added a test for DateUtils 2022-10-27 22:58:56 +02:00
Fabio Formosa
4013c4c08f added the sonar github action 2022-10-27 20:04:42 +02:00
Fabio Formosa
ae3c2d72a1 added a github action for sonar 2022-10-27 19:57:41 +02:00
Fabio Formosa
5a96f81338 added a github action for sonar 2022-10-27 19:56:33 +02:00
Fabio Formosa
31208f9883 Update README.md
Added the npm github badge to the README
2022-10-27 19:41:56 +02:00
Fabio Formosa
a64a06d663 tuned the npm github action 2022-10-27 19:40:36 +02:00
Fabio Formosa
02a73762b0 added the working directory in the npm github action 2022-10-27 01:26:29 +02:00
Fabio Formosa
2ca24a9aae added the working directory in the npm github action 2022-10-27 01:17:41 +02:00
Fabio Formosa
fc1ea9166c added the working directory in the npm github action 2022-10-27 01:08:56 +02:00
Fabio Formosa
71ee075cfa added the working directory in the npm github action 2022-10-27 01:06:20 +02:00
Fabio Formosa
33f4a7544c added the working directory in the npm github action 2022-10-27 01:04:53 +02:00
Fabio Formosa
d16b681362 added the working directory in the npm github action 2022-10-27 00:59:38 +02:00
Fabio Formosa
5547b7e868 added the working directory in the npm github action 2022-10-27 00:51:16 +02:00
Fabio Formosa
3722d0ca24 removed the package-lock.json from the gitignore 2022-10-27 00:47:28 +02:00
Fabio Formosa
41d11372ce minor commit 2022-10-27 00:45:55 +02:00
Fabio Formosa
3582ef4125 fixed the npm github action 2022-10-27 00:40:44 +02:00
Fabio Formosa
8e32fe531a added npm github action 2022-10-27 00:39:42 +02:00
Fabio Formosa
17201aad08 Update README.md
replace travis badge with github badge
2022-10-27 00:18:42 +02:00
Fabio Formosa
4fb70ac8e8 minor commit 2022-10-26 23:57:19 +02:00
Fabio Formosa
425de89469 fixed the maven github action 2022-10-26 23:54:21 +02:00
Fabio Formosa
5746cb43c3 fixing the maven github action 2022-10-26 23:22:34 +02:00
Fabio Formosa
704f31581f fixing the maven github action 2022-10-26 23:19:46 +02:00
Fabio Formosa
7cb7dde65d added a github action 2022-10-26 23:07:35 +02:00
Fabio Formosa
bdc86b5510 added a missing dep 2022-10-26 23:04:02 +02:00
Fabio Formosa
59816c9693 #48 fixed some tests 2022-10-26 22:02:11 +02:00
Fabio Formosa
4f8b75a8f9 #48 made configurable the misfire instruction 2022-10-26 21:56:02 +02:00
Fabio Formosa
5ea8f2adb1 #58 hidden the progress bar in case of endless repeat count 2022-10-22 20:12:32 +02:00
Fabio Formosa
80cd607d17 #66 made the log panel fixed height 2022-10-22 18:03:05 +02:00
Fabio Formosa
488916bcd7 #66 increased the font size of the logs 2022-10-22 16:13:22 +02:00
Fabio Formosa
b5abeac093 #66 removed the hint in the login page 2022-10-22 16:12:57 +02:00
Fabio Formosa
ed266dea15 removed a dependency from spring security in the module web-showcase 2022-10-22 15:31:36 +02:00
Fabio Formosa
65558c7ee8 #66 fixed a divider 2022-10-22 15:27:19 +02:00
Fabio Formosa
e5d2c33d9a #77 made the oas dependency optional and conditional 2022-10-22 13:56:48 +02:00
Fabio Formosa
7f00f5de99 #77 made the oas dependency optional and conditional 2022-10-22 00:27:29 +02:00
Fabio Formosa
b2906d09f4 #77 added a validation test on the in-memory user props and renamed the username field 2022-10-15 18:03:53 +02:00
Fabio Formosa
3f0d036dad #76 upgraded the java version to 9 2022-10-15 18:03:15 +02:00
Fabio Formosa
9d66cd85f0 #75 renamed the main security config class 2022-10-15 18:02:37 +02:00
Fabio Formosa
0a21920ad9 #75 removed the deprecated WebSecurityConfigurerAdapter 2022-10-15 18:02:17 +02:00
Fabio Formosa
bda37213f8 #75 removed the deprecated WebSecurityConfigurerAdapter 2022-10-15 15:38:44 +02:00
Fabio Formosa
c725871a4e minor refactoring of packages 2022-10-15 15:38:16 +02:00
Fabio Formosa
39a10681bf #75 removed the deprecated WebSecurityConfigurerAdapter 2022-10-14 00:16:44 +02:00
Fabio Formosa
381cfa1486 added a docker-compose.yml file to the web-showcase module 2022-10-12 00:23:08 +02:00
Fabio Formosa
4d4385b7ba #40 customized the quartz.properties file for quartz-manager in managed-quartz.properties 2022-10-08 13:05:01 +02:00
Fabio Formosa
ec7debe8c5 #40 customized the quartz.properties file for quartz-manager in managed-quartz.properties 2022-10-08 12:23:23 +02:00
Fabio Formosa
05591546b3 #67 put a qualifier name to the quartz-scheduler instance 2022-10-07 23:44:35 +02:00
Fabio Formosa
2b0644b495 #67 declouped the basePackageScanning from the schedulerConfig 2022-10-07 23:09:54 +02:00
Fabio Formosa
a30bd9e2c7 #63 temporary commented the ROLE_ADMIN 2022-10-07 22:33:00 +02:00
Fabio Formosa
6eed819364 #63 added a missing log 2022-10-07 22:32:35 +02:00
Fabio Formosa
a1780b1087 #73 made optional the quartz.properties 2022-10-07 22:32:18 +02:00
Fabio Formosa
c70dc3181e #63 fixed a circular spring dependency 2022-10-07 22:31:46 +02:00
Fabio Formosa
8ee0435738 #63 added missing logs 2022-10-07 19:54:06 +02:00
Fabio Formosa
72e1415038 #63 extracted a constant 2022-10-07 19:53:56 +02:00
Fabio Formosa
65c3653494 #63 added a missing js dep 2022-10-07 19:53:31 +02:00
Fabio Formosa
304a1e7f71 #63 renamed the base package of the api module 2022-10-06 23:54:04 +02:00
Fabio Formosa
6972915a5c #63 fixed tests 2022-10-06 22:57:36 +02:00
Fabio Formosa
77ea248457 #63 added sql script to create a local postgresql db 2022-10-06 20:15:50 +02:00
Fabio Formosa
14c1f7ea85 #63 fixed the injection of the quartz properties of the modules 2022-10-06 20:15:24 +02:00
Fabio Formosa
0652a6ec5e #63 fixed the appearance of the login button 2022-10-06 20:14:54 +02:00
Fabio Formosa
cecd30309f #63 replaced some "any" with actual type and conformed the log notifier to the progress notifier 2022-10-06 01:13:33 +02:00
Fabio Formosa
22762d7d84 #66 fixed lint errors 2022-10-05 00:43:18 +02:00
Fabio Formosa
6715665072 #63 clean up 2022-10-04 23:30:09 +02:00
Fabio Formosa
b92d8275db #63 renamed a DTO 2022-10-04 23:26:16 +02:00
Fabio Formosa
b4acc378e3 #63 removed unused app prop 2022-10-04 23:23:36 +02:00
Fabio Formosa
a313d8b19d #63 ui gets 404 calling whoami in case of no sec config 2022-10-04 20:17:57 +02:00
Fabio Formosa
93152f8157 #63 tested the default name assignment to the scheduler instance 2022-10-01 17:29:05 +02:00
Fabio Formosa
1e99602c68 #63 tested the default name assignment to the scheduler instance 2022-10-01 17:20:41 +02:00
Fabio Formosa
1571ab6d12 #63 made as default behaviour the creation of a scheduler instance 2022-10-01 16:12:26 +02:00
Fabio Formosa
44d6854bc5 #63 added security test to test the whitelisted endpoints 2022-10-01 15:48:01 +02:00
Fabio Formosa
727403d420 #63 left the main security config class in the spring.factories 2022-10-01 00:50:24 +02:00
Fabio Formosa
b06b130d20 #63 clean up 2022-10-01 00:45:01 +02:00
Fabio Formosa
94107f2210 #63 removed properties which have a default value from the showcase 2022-10-01 00:40:58 +02:00
Fabio Formosa
adb8e06f0a #63 added mvc tests on security 2022-09-30 23:42:30 +02:00
Fabio Formosa
8cb0ac09e8 #63 removed the app name which has a default value 2022-09-29 19:31:19 +02:00
Fabio Formosa
8935d77d0f #63 extracted a constant for the quartz-manager 2022-09-29 19:28:52 +02:00
Fabio Formosa
0adb8bf94b #59 fixed tests 2022-09-29 00:34:07 +02:00
Fabio Formosa
7e21437dfc #63 #66 clean up 2022-09-29 00:34:07 +02:00
Fabio Formosa
bfba79448b Update README.md 2022-09-24 16:46:21 +02:00
Fabio Formosa
5be49a4090 #59 fixed animation on logs 2022-09-16 23:39:49 +02:00
Fabio Formosa
e0b0378329 #59 changed the layout of the job progress card 2022-09-15 00:37:54 +02:00
Fabio Formosa
5f3ae667b0 #52 removed an unused app property 2022-09-14 20:26:31 +02:00
Fabio Formosa
b14cf64124 #59 reduced the size of the trigger form 2022-09-14 20:26:10 +02:00
Fabio Formosa
d9f9ee96af #52 added the jobClass selection 2022-09-13 23:38:31 +02:00
Fabio Formosa
a644dd6052 #52 made read-only the trigger name of an existing trigger 2022-09-07 20:45:34 +02:00
Fabio Formosa
3e5b25b37a #52 selected a new trigger once created 2022-09-07 20:36:27 +02:00
Fabio Formosa
a693e2aa0c #52 no changes at the trigger list in case of rescheduling of an existing trigger 2022-09-07 00:26:34 +02:00
Fabio Formosa
599b6fb0b4 #52 added the job className to the trigger detail view 2022-09-03 16:30:51 +02:00
Fabio Formosa
9638667368 #52 added the trigger name to the trigger form 2022-09-03 15:50:34 +02:00
Fabio Formosa
21f3f7dca2 #59 highlighted the selected trigger into the list 2022-09-02 00:19:23 +02:00
Fabio Formosa
b4bb16130c #59 added unit tests for the new trigger 2022-08-31 23:46:53 +02:00
Fabio Formosa
f1c9fba68e #56 step into layout revamp 2022-08-04 00:43:53 +02:00
Fabio Formosa
09df7795a9 #56 minor commit 2022-07-05 19:06:21 +02:00
Fabio Formosa
6bb768de59 #56 added a new FE component to schedule a simple trigger 2022-03-05 20:50:23 +01:00
Fabio Formosa
86badb8f41 #56 added the simpleTrigger to the API 2022-03-05 20:49:24 +01:00
Fabio Formosa
54999ce735 #56 added the simpleTrigger to the API 2022-03-05 20:48:53 +01:00
Fabio Formosa
851100b774 added a .editorconfig file 2022-03-05 20:44:04 +01:00
Fabio Formosa
3ba2bafc55 #55 fixed mockMvcTests 2021-12-07 23:56:50 +01:00
Fabio Formosa
cbd3066f57 #55 migrated the API doc from swagger2 to OpenAPI 3 2021-12-04 17:14:06 +01:00
Fabio Formosa
f3506304d9 #44 added the login operation to the OpenApi doc 2021-12-04 17:11:10 +01:00
Fabio Formosa
c9b90478dd #55 migrated swagger2 to openApi specification 3 2021-11-10 01:16:36 +01:00
Fabio Formosa
2ca2ba7ffc #55 migrated swagger2 to openApi specification 3 2021-11-09 23:39:38 +01:00
Fabio Formosa
3df1abd46e #37 added input validation to the trigger rescheduling 2021-11-09 00:14:49 +01:00
Fabio Formosa
34f21a58c9 #37 added input validation to the trigger creation 2021-11-09 00:11:47 +01:00
Fabio Formosa
233b56f282 #37 added some mockMvcTest to TriggerController 2021-11-06 01:17:50 +01:00
Fabio Formosa
1cd7f605e3 upgraded spring boot version to 2.5.6 2021-11-06 01:17:10 +01:00
Fabio Formosa
efee7b575f Merge remote-tracking branch 'origin/master' into develop 2021-11-06 01:14:22 +01:00
Fabio Formosa
870a813c61 Update README.md 2021-11-03 00:09:21 +01:00
Fabio Formosa
24285c7885 Update README.md 2021-11-03 00:01:45 +01:00
Fabio Formosa
69e2ab3977 Merge pull request #50 from fabioformosa/develop
Develop
2021-11-02 23:03:32 +01:00
Fabio Formosa
8218c63bba [maven-release-plugin] prepare for next development iteration 2021-11-01 23:28:05 +01:00
Fabio Formosa
d89a2af1aa [maven-release-plugin] prepare release 3.1.0 2021-11-01 23:28:04 +01:00
Fabio Formosa
09e9b18f96 [maven-release-plugin] rollback the release of quartz-manager-parent-3.1.0 2021-11-01 23:26:06 +01:00
Fabio Formosa
e70bbcff62 [maven-release-plugin] prepare release quartz-manager-parent-3.1.0 2021-11-01 23:25:44 +01:00
Fabio Formosa
085d2f1706 [maven-release-plugin] rollback the release of quartz-manager-parent-3.1.0 2021-11-01 23:24:43 +01:00
Fabio Formosa
4746ba9489 [maven-release-plugin] prepare release quartz-manager-parent-3.1.0 2021-11-01 23:18:00 +01:00
Fabio Formosa
27fab8acca #39 cleanUp 2021-11-01 19:15:25 +01:00
Fabio Formosa
734bb1b087 [maven-release-plugin] rollback the release of quartz-manager-parent-3.1.0 2021-11-01 19:13:23 +01:00
Fabio Formosa
81d9e92450 [maven-release-plugin] prepare for next development iteration 2021-11-01 18:39:34 +01:00
Fabio Formosa
5d794536e3 [maven-release-plugin] prepare release quartz-manager-parent-3.1.0 2021-11-01 18:39:32 +01:00
Fabio Formosa
4f3efc50fc temporary disabled a test 2021-11-01 16:35:49 +01:00
Fabio Formosa
37ad22090c Merge pull request #49 from fabioformosa/feature/#14
Feature/#14
2021-11-01 16:20:23 +01:00
Fabio Formosa
95fa102720 #39 changed the appearance of the fields in the config param form 2021-11-01 16:17:29 +01:00
Fabio Formosa
f37ad1ae58 #37 added the mockMvcTest for the TriggerController 2021-11-01 13:02:31 +01:00
Fabio Formosa
fb2d8da53d #14 cleanup 2021-10-30 16:22:21 +02:00
Fabio Formosa
87ee4bebb3 #14 added a new line to the .gitignore 2021-10-30 00:56:08 +02:00
Fabio Formosa
9bf0871ff6 #14 imported quartz-manager-persistence into the web-showcase 2021-10-30 00:55:24 +02:00
Fabio Formosa
70827393b7 #14 fixed the trigger rescheduling 2021-10-30 00:22:44 +02:00
Fabio Formosa
c4e8eb94d6 #14 clean up 2021-10-26 00:32:38 +02:00
fabio.formosa
e50a48bd4c Changed API and frontend to handle stored triggers and jobs 2021-10-17 13:15:54 +02:00
fabio.formosa
10df1116bd #14 added a new module for persistence 2021-07-24 19:44:24 +02:00
fabio.formosa
03f45346a7 #38 changed misfire instruction 2021-03-05 00:59:02 +01:00
fabio.formosa
6170e8f1ae #38 changed misfire instruction 2021-03-05 00:57:53 +01:00
fabio.formosa
0a718e897b #35 fixes config retrieve 2021-02-27 17:11:53 +01:00
Fabio Formosa
d243c3a8e8 Update README.md 2021-02-07 13:47:20 +01:00
Fabio Formosa
49020d9bd0 Update README.md 2021-02-07 13:42:17 +01:00
Fabio Formosa
1457f3fdea Update README.md 2021-02-07 13:39:52 +01:00
Fabio Formosa
42c63b963f Create CHANGELOG.md 2021-02-07 13:37:20 +01:00
269 changed files with 26689 additions and 4118 deletions

46
.github/workflows/maven-release.yml vendored Normal file
View File

@@ -0,0 +1,46 @@
name: Publish package to the Maven Central Repository
on:
release:
types: [created]
jobs:
publish:
runs-on: ubuntu-latest
permissions:
contents: read
packages: write
steps:
- uses: actions/checkout@v3
- name: Set up Java 11 for publishing to Maven Central Repository
uses: actions/setup-java@v3
with:
java-version: '11'
distribution: 'temurin'
server-id: ossrh
server-username: MAVEN_USERNAME
server-password: MAVEN_PASSWORD
gpg-private-key: ${{ secrets.OSSRH_GPG_SECRET_KEY }}
gpg-passphrase: MAVEN_GPG_PASSPHRASE
- name: Build with Maven
run: mvn -B package
- name: Publish to maven central
run: mvn deploy --batch-mode -P release-maven-central, build-webjar
env:
MAVEN_USERNAME: ${{ secrets.OSSRH_USERNAME }}
MAVEN_PASSWORD: ${{ secrets.OSSRH_TOKEN }}
MAVEN_GPG_PASSPHRASE: ${{ secrets.OSSRH_GPG_SECRET_KEY_PASSWORD }}
- name: Set up Java 11 for publishing to GitHub Packages
uses: actions/setup-java@v3
with:
java-version: '11'
distribution: 'temurin'
- name: Publish to GitHub Packages Apache Maven
run: mvn deploy -P deploy-github, build-webjar
env:
GITHUB_TOKEN: ${{ github.token }}

36
.github/workflows/maven.yml vendored Normal file
View File

@@ -0,0 +1,36 @@
# This workflow will build a Java project with Maven, and cache/restore any dependencies to improve the workflow execution time
# For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-java-with-maven
# This workflow uses actions that are not certified by GitHub.
# They are provided by a third-party and are governed by
# separate terms of service, privacy policy, and support
# documentation.
name: Java CI with Maven
on:
push:
branches:
- develop
- master
paths: [ 'quartz-manager-parent/**' ]
pull_request:
branches:
- develop
- master
jobs:
build:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- name: Set up JDK 11
uses: actions/setup-java@v3
with:
java-version: '11'
distribution: 'temurin'
cache: maven
- name: Build and test with Maven
run: mvn -B package --file quartz-manager-parent/pom.xml

44
.github/workflows/npm.yml vendored Normal file
View File

@@ -0,0 +1,44 @@
# This workflow will do a clean installation of node dependencies, cache/restore them, build the source code and run tests across different versions of node
# For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-nodejs
name: npm CI
on:
push:
branches:
- develop
- master
paths: [ 'quartz-manager-frontend/**' ]
pull_request:
branches:
- develop
- master
defaults:
run:
working-directory: ./quartz-manager-frontend
jobs:
build:
runs-on: ubuntu-latest
strategy:
matrix:
node-version: [16.x]
# See supported Node.js release schedule at https://nodejs.org/en/about/releases/
steps:
- uses: actions/checkout@v3
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v3
with:
node-version: ${{ matrix.node-version }}
cache: 'npm'
cache-dependency-path: ./quartz-manager-frontend/package-lock.json
- name: 'install'
run: npm ci
- name: 'test'
run: npm test
- name: 'build'
run: npm run build --if-present

39
.github/workflows/sonar-java.yml vendored Normal file
View File

@@ -0,0 +1,39 @@
name: SonarCloud Analysis for Java
on:
push:
branches:
- master
- develop
# paths: [ 'quartz-manager-parent/**' ]
pull_request:
types: [opened, synchronize, reopened]
jobs:
build:
name: Build and analyze
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
with:
fetch-depth: 0 # Shallow clones should be disabled for a better relevancy of analysis
- name: Set up JDK 11
uses: actions/setup-java@v1
with:
java-version: 11
- name: Cache SonarCloud packages
uses: actions/cache@v1
with:
path: ~/.sonar/cache
key: ${{ runner.os }}-sonar
restore-keys: ${{ runner.os }}-sonar
- name: Cache Maven packages
uses: actions/cache@v1
with:
path: ~/.m2
key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
restore-keys: ${{ runner.os }}-m2
- name: Build and analyze
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # Needed to get PR information, if any
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
run: mvn -B verify org.sonarsource.scanner.maven:sonar-maven-plugin:sonar -Dsonar.projectKey=fabioformosa_quartz-manager --file quartz-manager-parent/pom.xml

8
CHANGELOG.md Normal file
View File

@@ -0,0 +1,8 @@
## **v3.0.1**
Quartz-Manager is now publicly available into the maven central repo into 3 different packages.
You can import:
* `quartz-manager-starter-api` to have a REST API layer to control your scheduler
* `quartz-manager-starter-ui` to import the UI also, in your spring webapp.
* `quartz-manager-starter-security` if you want to give access to the quartz-manager UI and API only to authenticated users

404
README.md
View File

@@ -1,249 +1,287 @@
[![Build Status](https://travis-ci.org/fabioformosa/quartz-manager.svg?branch=master)](https://travis-ci.org/fabioformosa/quartz-manager)
[![Java CI with Maven](https://github.com/fabioformosa/quartz-manager/actions/workflows/maven.yml/badge.svg)](https://github.com/fabioformosa/quartz-manager/actions/workflows/maven.yml)
[![npm CI](https://github.com/fabioformosa/quartz-manager/actions/workflows/npm.yml/badge.svg)](https://github.com/fabioformosa/quartz-manager/actions/workflows/npm.yml)
[![Maven Central](https://maven-badges.herokuapp.com/maven-central/it.fabioformosa.quartz-manager/quartz-manager-starter-api/badge.svg)](https://maven-badges.herokuapp.com/maven-central/it.fabioformosa.quartz-manager/quartz-manager-starter-api)
[![Gitter](https://badges.gitter.im/quartz-manager/community.svg)](https://gitter.im/quartz-manager/community?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge)
# QUARTZ MANAGER
Quartz Manager is a library you can import in your spring webapp to easily enable the [Quartz Scheduler](http://www.quartz-scheduler.org/) and to control it by REST APIs or by a UI Manager Panel (angular-based).
In the last decade, the [Quartz Scheduler](http://www.quartz-scheduler.org/) has become the most adopted opensource job scheduling library for Java applications.
Your Spring Webapp should provide the java class of the job you want schedule. Importing the Quartz Manager your project will have the REST API and (optionally) the UI to launch and control the job.
The UI Dashboard is composed by a management panel to set the quartz trigger, to start/stop the scheduler and a log panel with a progress bar to display the job output.
**Quartz Manager** enriches it with a **REST API** layer and a handy **UI console** to easily control and monitor a Quartz Scheduler.
![](https://github.com/fabioformosa/quartz-manager/blob/master/quartz-manager-parent/quartz-manager-web-showcase/src/main/resources/quartz-manager-2-screenshot_800.PNG)
Quartz Manager is a Java library you can import in your Spring-Based Web Application to run scheduled jobs, start&stop them and get the job outcomes. You can do it through HTTP calls to the the Quartz Manager API or in a visual manner through the Quartz Manager UI dashboard.
## HOW IT WORKS
* Set up the trigger into the left sidebar in terms of: daily frequency and and max occurrences.
* Press the start button
* The GUI manager updates the progress bar and reports all logs of your quartz job.
## QUICK START
## QUARTZ MANAGER UI
The **Quartz Manager UI** is a dashboard in the form of a single-page-application provided by the Quartz Manager Java library itself. You can have it embedded in your project, as well as you get embedded the Swagger UI.
It leverages the websockets to receive in real-time the trigger updates and the outcomes of the job executions.
* **Requirements**
Java 8+
![](https://github.com/fabioformosa/quartz-manager/blob/develop/quartz-manager-parent/quartz-manager-web-showcase/src/main/resources/quartz-manager-4-screenshot.png)
* **add the dependency**
## QUARTZ MANAGER API
Quart-Manager exposes REST endpoints to interact with the Quartz Scheduler. This endpoints are invoked by Quartz Manager UI also.
The REST API are documented by an OpenAPI Specification interface.
MAVEN
![](https://github.com/fabioformosa/quartz-manager/blob/develop/quartz-manager-parent/quartz-manager-web-showcase/src/main/resources/quartz-manager-4-swagger.png)
# HOW IT WORKS
Quartz Manager can either coexist with your existing instance of Quartz or it can import itself the Quartz dependency.
In the first case, Quartz Manager is compatible with Quartz v2.3.x . Quartz Manager creates and configures its own instance of Quartz Scheduler and it manages only the jobs and the triggers created through it. Your other jobs and triggers, running in the existing quartz instance, are out of the scope of Quartz Manager.
In the latter case, in which there isn't an existing quartz instance, you can rely on Quartz Manager to speed up the setup of a Quartz instance, with a persistent storage also if you need it. Futhermore, if you start a bare project from scratch, just to run scheduled jobs, Quartz Manager comes with the option to enable a security layer to protect the API and the UI with an authentication model based on [JWT](https://jwt.io).
**FEATURES**
* You can schedule a [Quartz Simple Trigger](http://www.quartz-scheduler.org/documentation/quartz-2.3.0/tutorials/tutorial-lesson-05.html) which allows you to start a job now or in a specific date-time, to set it as a recurring job with a certain time frequency, unlimited or limited on the number of fires and within a certain end date.
* You can start, pause and resume the quartz scheduler via API or clicking the start/stop buttons at the UI console.
* Leveraging on an active web-socket, the `Quartz-Manager-UI` updates in real time the progress bar and it displays the list of the latest logs produced by your quartz job.
* You can enable a secure layer, if your project doesn't have any, to give access at the API and the UI only to authenticated users.
* You can enable a persistent layer, to persist the config and the progress of your trigger, in a postgresql database.
# QUICK START
**Requirements**
Java 9+, Spring Framework 5+ (Spring Boot 2.x)
Quart Manager is a modular library:
* quartz-manager-starter-api (mandatory)
* quartz-manager-starter-ui (optional)
* quartz-manager-starter-security (optional)
* quartz-manager-starter-persistence (optional)
In order to decrease the overall configuration time for the project, all modules of the library follow the approach of Spring Starters. Thus, it's enough to import the dependency to get started.
Below the list of the quartz-manager modules you can import.
## Quartz Manager API Lib
This is the only mandatory module of the library.
Add the dependency, make eligible for Quart Manager the job classes and set the props in your `application.properties` file.
### Step 1. Dependency
#### Maven
```
<dependency>
<groupId>it.fabioformosa.quartz-manager</groupId>
<artifactId>quartz-manager-starter-api</artifactId>
<version>3.0.1</version>
</dependency>
<!-- OPTIONALLY -->
<dependency>
<groupId>it.fabioformosa.quartz-manager</groupId>
<artifactId>quartz-manager-starter-ui</artifactId>
<version>3.0.1</version>
<version>4.0.0</version>
</dependency>
```
GRADLE
#### Gradle
```
compile group: 'it.fabioformosa.quartz-manager', name: 'quartz-manager-starter-api', version: '3.0.1'
//optionally
compile group: 'it.fabioformosa.quartz-manager', name: 'quartz-manager-starter-ui', version: '3.0.1'
```
Import `quartz-manager-starter-ui` as well, if you want use the Quartz Manager API by the angular frontend.
* **add a `quartz.properties` file in the classpath (`src/main/resources`)**
```
org.quartz.scheduler.instanceName=example
org.quartz.scheduler.instanceId=AUTO
org.quartz.threadPool.threadCount=1
implementation group: 'it.fabioformosa.quartz-manager', name: 'quartz-manager-starter-api', version: '4.0.0'
```
### Step 2. Quartz Manager Job Classes
The job classes, which can be eligible for triggers managed by Quartz Manager, must extend the super-class `AbstractLoggingJob`.
In this way, Quartz Manager is able to collect and display the outcomes at the UI console.
* **Create the job class that you want to schedule**
```
public class SampleJob extends AbstractLoggingJob {
@Override
public LogRecord doIt(JobExecutionContext jobExecutionContext) {
... do stuff ...
return new LogRecord(LogType.INFO, "Hello from QuartManagerDemo!");
}
}
```
Extend the super-class `AbstractLoggingJob`
### Step 3. Quartz Manager API - App Props
| Property | Values |Mandatory | Default | Description |
| :--- |:--- |:--- |:--- |:-- |
| quartz-manager.jobClassPackages | string | Yes | |java base package which contains your job classes |
| quartz-manager.oas.enabled | boolean | No | false |whether to create an OpenAPI instance to expose the OAS and the Swagger UI |
* **Enable quartz-manager adding into the application.yml**
```
quartz:
enabled: true
job:
frequency: 4000
repeatCount: 19
quartz-manager:
jobClass: <QUALIFIED NAME OF THE YOUR JOB CLASS>
```
* **REST API**
You can access the REST API, through the swagger-ui. Open the URL:
### REST API & OpenAPI Specification
Set the app prop `quartz-manager.oas.enabled=true` you want to expose the OpenApi Specification of the Quartz Manager APIs.
Reach out the swagger-ui at the URL:
[http://localhost:8080/swagger-ui.html](http://localhost:8080/swagger-ui.html)
(Change the port and the contextPath accordingly with the setup of your webapp)
If your project has already an OpenAPI instance and you've set `quartz-manager.oas.enabled=true`, then make sure to add an OpenApiGroup to group the API of your application. Quart Manager exposes its API in group called "Quartz Manager".
* **Frontend**
If you've imported the `quartz-manager-starter-ui` you can open the UI at URL:
[http://localhost:8080/quartz-manager-ui/index.html](http://localhost:8080/quartz-manager-ui/index.html)
### QUARTZ SETTINGS
Quartz Manager creates its own instance of a [Quartz Scheduler](http://www.quartz-scheduler.org/).
(Change the port and the contextPath accordingly with the setup of your webapp)
By default, the managed quartz instance is instantiated with the following props:
* **Security**
If you want enable a security layer and allow the access to the REST API and to the UI only to authenticated users, add the dependency:
```
org.quartz.scheduler.instanceName=quartz-manager-scheduler
org.quartz.threadPool.threadCount=1
```
MAVEN
You can customize the configuration of the Quartz managed by Quartz Manager creating a file `managed-quartz.properties` in the classpath (`src/main/resources`).
For further details about the quartz properties, click [here](http://www.quartz-scheduler.org/documentation/quartz-2.3.0/configuration/).
#### Existing Quartz Instance
Quarz Manager imports transitively the [Quartz Scheduler library](https://mvnrepository.com/artifact/org.quartz-scheduler/quartz) ver 2.3.2.
However, Quartz Manager can be imported even thought you've already imported the quartz scheduler lib. Indeed Quartz Manager coexists with the existing Quarz Scheduler Instance you've created in your project. In that case, Quartz Manager will manage the triggers created by it and it won't interfere with the other quartz instances.
The prerequesite is that you've imported a quartz scheduler ver 2.3.x.
You can configure the Quartz instance managed by Quartz Manager through the file `managed-quartz.properties` and your own Quartz instance through the file `quartz.properties`.
If you've created a `SchedulerFactoryBean`, tag it as @Primary to avoid conflicts in-type, since Quartz Manager creates another bean of the same type.
```
@Primary
@Bean
public SchedulerFactoryBean schedulerFactoryBean( JobFactory jobFactory, Properties quartzProperties) {
SchedulerFactoryBean factory = new SchedulerFactoryBean();
...
return factory;
}
```
## Quartz Manager UI Lib
You can optionally import the following dependency to have the UI Dashboard to interact with the Quartz Manager API.
### Dependency
#### Maven
```
<dependency>
<groupId>it.fabioformosa.quartz-manager</groupId>
<artifactId>quartz-manager-starter-ui</artifactId>
<version>4.0.0</version>
</dependency>
```
#### Gradle
```
implementation group: 'it.fabioformosa.quartz-manager', name: 'quartz-manager-starter-ui', version: '4.0.0'
```
### Reach out the UI Console at URL
if you run locally [http://localhost:8080/quartz-manager-ui/index.html](http://localhost:8080/quartz-manager-ui/index.html)
## Quartz Manager Security Lib
Import this optional dependency, if you want to enable a security layer and allow the access to the REST API and UI only to authenticated users.
The authentication model of Quartz Manager is based on [JWT](https://jwt.io/).
If you're going to import Quartz Manager in a project with an existing configuration of Spring Security, consider the following:
- Only if your existing security is cookie-based, actually you don't need to import the module `quartz-manager-security-lib`. Simply, Quartz Manager will be under the hat of your security setup. In all other cases (based on HTTP headers, query params, etc) Quartz Manager is not aware about your auth token and it will implement its own authentication model.
- Quartz Manager Security relies on Spring Security upon a dedicated *HTTP Spring Security Chain* applied to the base path `/quartz-manager`. So it doesn't interfere with your existing security setup.
- Quartz Manager Security keeps simple the authentication, adopting the InMemory Model. You have to define the users (in terms of username/credentials passed via `application.properties`) can access to Quartz Manager.
- By default, the UI attaches the JWT Token to each request in the authorization header in the "Bearer" format.
Future development: the Quart Manager Security OAuth2 client.
### Dependency
#### Maven
```
<dependency>
<groupId>it.fabioformosa.quartz-manager</groupId>
<artifactId>quartz-manager-starter-security</artifactId>
<version>3.0.1</version>
<version>4.0.0</version>
</dependency>
```
GRADLE
#### Gradle
```
compile group: 'it.fabioformosa.quartz-manager', name: 'quartz-manager-starter-security', version: '3.0.1'
compile group: 'it.fabioformosa.quartz-manager', name: 'quartz-manager-starter-security', version: '4.0.0'
```
and in your application.yml:
### Quartz Manager Security Lib - App Props
| Property | Values |Mandatory | Default | Description |
| :--- |:--- |:--- |:--- |:-- |
| quartz-manager.security.jwt.secret | string | | | Secret to sign the JWT Token |
| quartz-manager.security.jwt.expiration-in-sec | number | no | 28800 | |
| quartz-manager.security.accounts.in-memory.enabled | boolean | no | true | |
|quartz-manager.security.accounts.in-memory.users[0].username | string | yes (if enabled) | | |
|quartz-manager.security.accounts.in-memory.users[0].password | string | yes | | |
|quartz-manager.security.accounts.in-memory.users[0].roles[0] | string | yes | | set the value ADMIN |
## Quart Manager Persistence Lib
By default, Quartz Manager runs with a `org.quartz.simpl.RAMJobStore` that stores your managed scheduler in memory. The RAMJobStore is the simplest store and also the most performant. However it comes with the drawback that all scheduling data are lost if your applications ends or crashes. In case of a restarting of your app, you can't resume the scheduler from the point it stopped.
Import the Quartz Manager Persistence Module if you want to persist your scheduler data.
The pre-requesite is the availability of Postgresql database where Quartz Manager can store its information. You have to provide it a bare database and a postresql user granted for DDL and DML queries. About the DDL, consider that Quartz Manager Persistence will create all tables it needs to work at the bootstrap.
### Dependency
#### Maven
```
quartz-manager:
security:
login-model:
form-login-enabled: true
userpwd-filter-enabled : false
jwt:
enabled: true
secret: "PLEASE_TYPE_HERE_A_SECRET"
expiration-in-sec: 28800 # 8 hours
header-strategy:
enabled: false
header: "Authorization"
cookie-strategy:
enabled: true
cookie: AUTH-TOKEN
accounts:
in-memory:
enabled: true
users:
- name: admin
password: admin
roles:
- ADMIN
<dependency>
<groupId>it.fabioformosa.quartz-manager</groupId>
<artifactId>quartz-manager-starter-persistence</artifactId>
<version>4.0.0</version>
</dependency>
```
* **DEMO**
#### Gradle
Take a loot to the project [Quartz-Manager Demo](https://github.com/fabioformosa/quartz-manager-demo), it is an example of how-to:
* import the quartz-manager-api library in your webapp
* include the quartz-manager frontend (angular based) through a webjar
* set properties into the application.yml
* add a secure layer to allow the API only to logged users
* schedule a custom job (a dummy `hello world`)
```
compile group: 'it.fabioformosa.quartz-manager', name: 'quartz-manager-starter-persistence', version: '4.0.0'
```
### Quartz Manager Persistence Lib - App Props
| Property | Values |Mandatory | Default | Description |
| :--- |:--- |:--- |:--- |:-- |
| quartz-manager.persistence.quartz.datasource.url | string | yes | |eg. jdbc:postgresql://localhost:5432/quartzmanager |
| quartz-manager.persistence.quartz.datasource.user | string | yes | | |
| quartz-manager.persistence.quartz.datasource.password | string | yes | | |
## Examples
You can find some examples of different scenarios of projects which import Quartz Manager at the repository [quartz-manager-use-cases] (https://github.com/fabioformosa/quartz-manager-use-cases)
* *simply-spring* - tipical scenario in which you create a minimal spring project from scratch dedicated to launch your scheduled jobs. Imported libraries: Quartz Manager API, Quartz Manager UI and Quartz Manager security.
* *simply-spring-no-security* - as simple-spring, without the security
* *existing-security-cookie-based* - It demonstrates how Quartz Manager stays under the security of your project, in case of an auth model based on cookies
* *existing-security-header-based* - It demonstrates how Quartz Manager Security can coexists with another Spring Security Config present in your project
* *existing-quartz* - It demonstrates how to Quartz Manager can coexist with a Quartz instance already present in your project
* *existing-quartz-and-storage* - It demonstrates how to Quartz Manager Persistence can coexist with a Quartz instance already present in your project
## Limitations
> Step by step, day by day
Quartz Manager has a work-in-progress roadmap to be full-fledged library to manage a [Quartz Scheduler](http://www.quartz-scheduler.org/).
At this stage of the roadmap, these are the limitations:
* Currently you cannot start multiple triggers or multiple jobs. At the moment a workaround is to launch multiple projects based on Quartz Manager.
* Currently you can only start [Quartz Simple Trigger](http://www.quartz-scheduler.org/documentation/quartz-2.3.0/tutorials/tutorial-lesson-05.html). The support to other kind of triggers will come soon: [Calendar Interval Trigger](https://www.quartz-scheduler.org/api/2.3.0/org/quartz/CalendarIntervalTrigger.html), [Cron Interval Trigger](https://www.quartz-scheduler.org/api/2.3.0/org/quartz/CronTrigger.html), [Daily Interval Trigger](https://www.quartz-scheduler.org/api/2.3.0/org/quartz/DailyTimeIntervalTrigger.html)
* Currently the cluster mode is not supported
* Currently the persistence of Quartz Manager supports only the PostgreSQL. The support to other king of triggers will come soon: MySQL, MariaDB, SqlServer, Oracle, H2.
## ROADMAP
Open the [Project Roadmap](https://github.com/fabioformosa/quartz-manager/projects) to take a look at the plan of Quartz Manager.
Take a look a the [Project Roadmap](https://github.com/users/fabioformosa/projects/1).
Don't hesitate to give your feedback, your opinion is important to understand the priority.
Next steps in the roadmap are:
* to add a persistent layer to save all job setup.
* to add a complete setup UI panel for quartz, in term of cronjobs and multiple jobs.
* to add CI/CD pipeline to ease the deploy pulling a docker container.
* Enabling adapters for integrations: kafka, etc.
* Manage multiple triggers and jobs
* Cluster mode support
* Support to other all types of Quartz Triggers: [Calendar Interval Trigger](https://www.quartz-scheduler.org/api/2.3.0/org/quartz/CalendarIntervalTrigger.html), [Cron Interval Trigger](https://www.quartz-scheduler.org/api/2.3.0/org/quartz/CronTrigger.html), [Daily Interval Trigger](https://www.quartz-scheduler.org/api/2.3.0/org/quartz/DailyTimeIntervalTrigger.html)
* UI Re-styling
* OAuth Client
* Support to other DBMS than PostreSQL: MySQL, MariaDB, SqlServer, Oracle, H2.
## Repository
Checkout the **master branch** to get the sourcecode of the latest released versions.
Checkout the **develop branch** to take a look at the sourcecode of the incoming release.
## HOW-TO CONTRIBUTE
### PROJECT STRUCTURE
* **quartz-parent/quartz-manager-starter-api** is the library that can be imported in webapp to have the quartz-manager API.
* **quartz-parent/quartz-manager-starter-ui** is a maven module to build and package the angular frontend in a webjar.
* **quartz-parent/quartz-manager-starter-security** is ther library that can be imported in a webapp to have a security layer (login) over the quartz-manager API.
* **quartz-parent/quartz-manager-web-showcase** is an example of webapp that imports quartz-manager-api. Useful to develop the frontend started locally with the webpack dev server.
* **quartz-frontend** is the angular app that interacts with the Quartz Manager API.
### PROJECT DETAILS
**[requirements]** Make sure you have installed
* [Java 8](https://java.com/download/) or greater
* [Maven](https://maven.apache.org/)
* [npm](https://www.npmjs.com/get-npm), [node](https://nodejs.org) and [angular-cli](https://cli.angular.io/)
To build&run quartz-manager in your machine:
```
#CLONE REPOSITORY
git clone https://github.com/fabioformosa/quartz-manager.git
# START QUARTZ-MANAGER-WEB
cd quartz-manager/quartz-parent
mvn install
cd quartz-manager/quartz-parent/quartz-manager-web-showcase
mvn spring-boot:run
# START QUARTZ-MANAGER-FRONTEND
cd quartz-manager/quartz-manager-frontend
npm install
npm start
```
1. Open browser at [http://localhost:4200](http://localhost:4200)
1. Log in with **default credentials**: `admin/admin`
If you are not confident with maven CLI, you can start it by your IDE. For more details [spring boot ref.](http://docs.spring.io/spring-boot/docs/current/reference/html/using-boot-running-your-application.html)
## HOW TO RUN YOUR SCHEDULED JOB
By default, `quartz-manager-web-showcase` executes the dummy job that logs "hello world!".
Replace the dummy job (class: `it.fabioformosa.quartzmanager.jobs.SampleJob`) with yours. Follow these steps:
1. Extend the super class `it.fabioformosa.quartzmanager.jobs.AbstractLoggingJob`
1. set property `quartz-manager.jobClass` with qualified name of your custom Job Class (default job is SampleJob.class)
## HOW TO CHANGE SETTINGS
* Num of Threads: `/quartz-manager-parent/quartz-manager-web/src/main/resources/quartz.properties`
* Credentials: To change admin's password, set ENV var `quartz-manager.account.pwd`
* quartz-manager backend context path (default `/quartz-manager`) and port (default `8080`): `/quartz-manager/src/main/resources/application.properties`
## HOW TO BROWSE REST API DOC
Swagger has been added as library. So, you can get REST API doc opening: [http://localhost:8080/quartz-manager/swagger-ui.html](http://localhost:8080/quartz-manager/swagger-ui.html)
## Tech Overview
**Backend Stack** Java 8, Spring Boot 2.1.4 (Spring MVC 5.1.6, Spring Security 5.1.5, Spring AOP 5.1.6), Quartz Scheduler 2.3.1
**Application Server** Tomcat (embedded)
**Frontend** Angular 9.1.4, Web-Socket (stompjs 2.3.3)
**Style** angular material, FontAwesome 5
From quartz manager ver 2.x.x, the new structure of project is:
* REST API backend
* Single Page Application frontend (angular 9)
(The previous version of quartz manager was a monolithic backend that provided also frontend developed with angularjs 1.6.x. You can find it at the branch 1.x.x)
## Contributes
Every contribution is welcome. Open a issue, so we can discuss about new features and implement them.
## Credits
* this project has been created from [angular-spring-starter](https://github.com/bfwg/angular-spring-starter)
For tech details, how-to run locally the project and how-to contribute, reach out this other [README.md](https://github.com/fabioformosa/quartz-manager/blob/develop/quartz-manager-parent/README.md)
## ❤️ SUPPORT THE PROJECT ❤️
Sometimes it's a matter of a kind action. You can support Quartz Manager and its continuous improvement turning on a github star on this project ⭐

View File

@@ -40,6 +40,3 @@ testem.log
# System Files
.DS_Store
Thumbs.db
#package-lock.json
package-lock.json

View File

@@ -5,6 +5,7 @@
"projects": {
"angular-spring-starter": {
"root": "",
"prefix": "qrzmng",
"sourceRoot": "src",
"projectType": "application",
"architect": {
@@ -108,11 +109,11 @@
"defaultProject": "angular-spring-starter",
"schematics": {
"@schematics/angular:component": {
"prefix": "app",
"prefix": "qrzmng",
"style": "css"
},
"@schematics/angular:directive": {
"prefix": "app"
"prefix": "qrzmng"
}
}
}
}

18628
quartz-manager-frontend/package-lock.json generated Normal file

File diff suppressed because it is too large Load Diff

View File

@@ -12,6 +12,8 @@
},
"private": true,
"dependencies": {
"@angular-material-components/datetime-picker": "2.0.4",
"@angular-material-components/moment-adapter": "2.0.2",
"@angular/animations": "9.1.4",
"@angular/cdk": "9.2.1",
"@angular/common": "9.1.4",
@@ -29,8 +31,10 @@
"@fortawesome/fontawesome-free-regular": "^5.0.8",
"@fortawesome/fontawesome-free-solid": "^5.0.8",
"@stomp/ng2-stompjs": "^0.6.3",
"@types/jest": "^27.0.2",
"core-js": "2.5.1",
"hammerjs": "2.0.8",
"moment": "^2.29.1",
"net": "^1.0.2",
"rxjs": "6.5.5",
"stompjs": "^2.3.3",
@@ -65,6 +69,8 @@
},
"jest": {
"preset": "jest-preset-angular",
"setupFilesAfterEnv": ["<rootDir>/jest.setup.ts"]
"setupFilesAfterEnv": [
"<rootDir>/jest.setup.ts"
]
}
}

File diff suppressed because one or more lines are too long

View File

@@ -1,15 +1,13 @@
import { NgModule } from '@angular/core';
import { Routes, RouterModule } from '@angular/router';
import { AppComponent } from './app.component';
import { LoginComponent } from './views/login';
import { LoginGuard } from './guards';
import { GuestGuard, AdminGuard } from './guards';
import { NotFoundComponent } from './views/not-found';
import { ChangePasswordComponent } from './views/change-password';
import { ForbiddenComponent } from './views/forbidden';
import {NgModule} from '@angular/core';
import {RouterModule, Routes} from '@angular/router';
import {LoginComponent} from './views/login';
import {AdminGuard, GuestGuard} from './guards';
import {NotFoundComponent} from './views/not-found';
import {ForbiddenComponent} from './views/forbidden';
import {ManagerComponent} from './views/manager';
import {GenericErrorComponent} from './views/error/genericError.component';
import { ManagerComponent } from './views/manager';
export const routes: Routes = [
{
path: '',
@@ -28,11 +26,6 @@ export const routes: Routes = [
component: LoginComponent,
canActivate: [GuestGuard]
},
// {
// path: 'change-password',
// component: ChangePasswordComponent,
// canActivate: [LoginGuard]
// },
{
path: '404',
component: NotFoundComponent
@@ -41,6 +34,10 @@ export const routes: Routes = [
path: '403',
component: ForbiddenComponent
},
{
path: 'error',
component: GenericErrorComponent
},
{
path: '**',
redirectTo: '/404'
@@ -48,7 +45,9 @@ export const routes: Routes = [
];
@NgModule({
imports: [RouterModule.forRoot(routes)],
imports: [RouterModule.forRoot(routes, {
initialNavigation: false
})],
exports: [RouterModule],
providers: []
})

View File

@@ -1,5 +1,8 @@
<app-header></app-header>
<div class="content">
<router-outlet></router-outlet>
<div fxLayout="column" fxLayoutAlign="space-between stretch" fxFill>
<app-header fxFlex="0 0 auto"></app-header>
<div class="content" fxFlex="100" fxFill>
<router-outlet></router-outlet>
</div>
<app-footer fxFlex="0 0 auto"></app-footer>
</div>
<app-footer></app-footer>

View File

@@ -2,20 +2,9 @@
display: block;
color: rgba(0,0,0,.54);
font-family: Roboto,"Helvetica Neue";
height: 100%;
}
.content {
margin: 50px 70px;
}
@media screen and (min-width: 600px) and (max-width: 1279px) {
.content {
margin: 20px 30px;
}
}
@media screen and (max-width: 599px) {
.content {
margin: 8px 12px;
}
padding: 20px;
}

View File

@@ -3,7 +3,7 @@ import { NgModule, APP_INITIALIZER} from '@angular/core';
import { FormsModule, ReactiveFormsModule } from '@angular/forms';
import { HttpClientModule } from '@angular/common/http';
import {JWT_OPTIONS, JwtModule} from "@auth0/angular-jwt";
import {JWT_OPTIONS, JwtModule} from '@auth0/angular-jwt';
// material
import {MatIconRegistry} from '@angular/material/icon';
@@ -17,6 +17,14 @@ import {MatToolbarModule} from '@angular/material/toolbar';
import {MatIconModule} from '@angular/material/icon';
import {MatButtonModule} from '@angular/material/button';
import {MatCardModule} from '@angular/material/card';
import {MatDatepickerModule} from '@angular/material/datepicker';
import {MatSelectModule} from '@angular/material/select';
import {MatListModule} from '@angular/material/list';
import {MatSidenavModule} from '@angular/material/sidenav';
import {MatNativeDateModule} from '@angular/material/core';
import { NgxMatTimepickerModule, NgxMatDatetimePickerModule} from '@angular-material-components/datetime-picker';
import { NgxMatMomentModule } from '@angular-material-components/moment-adapter';
import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
import { FlexLayoutModule } from '@angular/flex-layout';
@@ -32,10 +40,10 @@ import {
HeaderComponent,
FooterComponent,
GithubComponent,
SchedulerConfigComponent,
SchedulerControlComponent,
LogsPanelComponent,
ProgressPanelComponent
ProgressPanelComponent,
TriggerListComponent
} from './components';
import {
@@ -46,15 +54,17 @@ import {
ConfigService,
ProgressWebsocketService,
LogsWebsocketService,
getHtmlBaseUrl
getHtmlBaseUrl,
TriggerService
} from './services';
import { ChangePasswordComponent } from './views/change-password/change-password.component';
import { ForbiddenComponent } from './views/forbidden/forbidden.component';
import { APP_BASE_HREF } from '@angular/common';
import { environment } from '../environments/environment';
import {SimpleTriggerConfigComponent} from './components/simple-trigger-config';
import JobService from './services/job.service';
import {GenericErrorComponent} from './views/error/genericError.component';
export function initUserFactory(userService: UserService) {
return () => userService.jsessionInitUser();
return () => userService.fetchLoggedUser();
}
@@ -101,12 +111,13 @@ export function jwtOptionsFactory(apiService: ApiService) {
LoginComponent,
NotFoundComponent,
AccountMenuComponent,
SchedulerConfigComponent,
SimpleTriggerConfigComponent,
SchedulerControlComponent,
LogsPanelComponent,
ProgressPanelComponent,
ChangePasswordComponent,
ForbiddenComponent
ForbiddenComponent,
GenericErrorComponent,
TriggerListComponent
],
imports: [
BrowserAnimationsModule,
@@ -128,10 +139,16 @@ export function jwtOptionsFactory(apiService: ApiService) {
MatChipsModule,
MatIconModule,
MatInputModule,
MatSelectModule,
MatToolbarModule,
MatCardModule,
MatListModule,
MatProgressSpinnerModule,
MatProgressBarModule,
MatDatepickerModule, MatNativeDateModule,
NgxMatMomentModule,
NgxMatDatetimePickerModule,
MatSidenavModule,
FlexLayoutModule
],
providers: [
@@ -149,6 +166,8 @@ export function jwtOptionsFactory(apiService: ApiService) {
GuestGuard,
AdminGuard,
SchedulerService,
JobService,
TriggerService,
ProgressWebsocketService,
LogsWebsocketService,
AuthService,

View File

@@ -1,7 +1,8 @@
<p style="margin: 0px auto; padding: 0px; color: rgba(255, 255, 255, 0.541176); max-width: 356px;">
Hand crafted with love by
<a href="https://github.com/fabioformosa" style="color: rgba(255, 255, 255, 0.870588);">Fabio Formosa</a>
</p>
<a style="margin-top: 22px;" mat-icon-button href="https://github.com/fabioformosa/quartz-manager">
<img src="assets/image/github.png"/>
</a>
<mat-toolbar id="footer" style="color: rgba(255, 255, 255, 0.541176);" fxLayout="row" fxLayoutAlign="center center">
<a mat-icon-button href="https://github.com/fabioformosa/quartz-manager">
<img src="assets/image/github.png"/>
&nbsp; Quartz Manager
</a>
<!-- Hand crafted with love by &nbsp;-->
<!-- <a href="https://github.com/fabioformosa" style="color: rgba(255, 255, 255, 0.870588);">Fabio Formosa</a>-->
</mat-toolbar>

View File

@@ -1,18 +1,20 @@
:host {
display: block;
font-weight: 300;
font-size: 15px;
display: block;
:host{
//position: absolute;
bottom: 0;
left: 0;
right: 0;
height: 64px;
}
#footer{
background-color: rgb(33, 33, 33);
height: 236px;
padding: 72px 24px;
font-size: 15px;
box-sizing: border-box;
text-align: center;
a {
text-decoration: none;
cursor: auto;
cursor: pointer;
color: #FFFFFF;
margin-top: 32px;
}
h3 {
@@ -21,7 +23,5 @@
font-weight: 300;
font-size: 22px;
}
}

View File

@@ -1,2 +1 @@
<button mat-menu-item [routerLink]="['/change-password']">CHANGE PASSWORD</button>
<button mat-menu-item (click)="logout()">SIGN OUT</button>
<button mat-menu-item (click)="logout()">Logout</button>

View File

@@ -1,12 +1,12 @@
<mat-toolbar color="primary" class="app-navbar">
<button mat-button mat-ripple routerLink="/">
<img alt="Quartz Manager" class="app-angular-logo" src="assets/image/angular-white-transparent.svg">
<!-- <img alt="Quartz Manager" class="app-angular-logo" src="assets/image/angular-white-transparent.svg">-->
<span>Quartz Manager</span>
</button>
<div class="right">
<div fxFlex="1 1 auto" fxLayout="row" fxLayoutAlign="flex-end center">
<button *ngIf="!hasSignedIn()" routerLink="/login" mat-button mat-ripple>
<button *ngIf="!hasSignedIn() && !noAuthenticationRequired()" routerLink="/login" mat-button mat-ripple>
<span>Login</span>
</button>
<button

View File

@@ -2,7 +2,7 @@ import { Component, OnInit } from '@angular/core';
import {
UserService,
AuthService,
NO_AUTH
// NO_AUTH
} from '../../services';
import { Router } from '@angular/router';
@@ -32,8 +32,8 @@ export class HeaderComponent implements OnInit {
return !!this.userService.currentUser;
}
noAuthenticationRequired = () => this.hasSignedIn() && this.userService.currentUser === NO_AUTH;
noAuthenticationRequired = () => !this.hasSignedIn() && this.userService.isAnAnonymousUser === true;
userName() {
const user = this.userService.currentUser;

View File

@@ -2,6 +2,6 @@ export * from './header';
export * from './github';
export * from './footer';
export * from './logs-panel';
export * from './scheduler-config';
export * from './scheduler-control';
export * from './progress-panel';
export * from './trigger-list';

View File

@@ -1,29 +1,35 @@
<mat-card>
<mat-card-header>
<mat-card-title><b>JOB LOGS</b></mat-card-title>
<mat-card fxFlex="1 1 auto">
<mat-card-header fxLayout="row" fxLayoutAlign="space-between none" style="padding-right: 1em;">
<mat-card-subtitle><b>JOB LOGS</b></mat-card-subtitle>
</mat-card-header>
<mat-card-content>
<div id="logs">
<div *ngFor = "let log of logs" fxLayout="row" fxLayout.xs="column">
<div fxFlex="1 1 20%">
<span [ngClass]="{'animated zoomIn firstLog': $first}"> [{{log.time|date:'medium'}}]</span>
</div>
<div fxFlex="1 1 10%">
<span [ngClass]="{'animated zoomIn firstLog': $first}">
<i class = "fas" [ngClass]="{'fa-check-circle green': log.type == 'INFO',
'fa-exclamation-triangle yellow': log.type == 'WARN',
'fa-times-circle red': log.type == 'ERROR'}"></i>
</span>
</div>
<div fxFlex="1 1 20%">
<span [ngClass]="{'animated zoomIn firstLog': $first}">
{{log.threadName}}
</span>
</div>
<div fxFlex="1 1 50%">
<span [ngClass]="{'animated zoomIn firstLog': $first}"> {{log.msg}}</span>
</div>
</div>
<mat-card-content style="position: relative; height: calc(100% - 3em);">
<div *ngIf="!logs || logs.length == 0" fxLayout="row" fxFlexAlign="center stretch" style="text-align: center">
<div fxFill style="height: 100%;">
<img src="assets/image/logs.svg" alt="no logs" width="320" style="margin-top: 6em;" />
</div>
</div>
<div id="logs" style="overflow-y: auto; position: absolute; left: 0; right: 0; top: 0; bottom: 0; overflow: auto;">
<div
*ngFor = "let log of logs; let first = first" fxLayout="row" fxLayout.xs="column" fxLayoutAlign="start" fxLayoutGap="10px">
<div fxFlex="0 1 300px">
<span [ngClass]="{'animate__animated animate__zoomIn zoomIn firstLog': first}"> [{{log.time|date:'medium'}}]</span>
</div>
<div fxFlex="1 1 16px">
<span [ngClass]="{'animated zoomIn firstLog': first}">
<i class = "fas" [ngClass]="{'fa-check-circle green': log.type == 'INFO',
'fa-exclamation-triangle yellow': log.type == 'WARN',
'fa-times-circle red': log.type == 'ERROR'}"></i>
</span>
</div>
<div fxFlex="0 1 250px">
<span [ngClass]="{'animate__animated animate__zoomIn zoomIn firstLog': first}">
{{log.threadName}}
</span>
</div>
<div fxFlex="1 1">
<span [ngClass]="{'animate__animated animate__zoomIn zoomIn firstLog': first}"> {{log.msg}}</span>
</div>
</div>
</div>
</mat-card-content>
</mat-card>
</mat-card>

View File

@@ -7,4 +7,30 @@
.yellow{
color: gold;
}
}
#logs{
font-size: 1em;
}
/* ===== Scrollbar CSS ===== */
/* Firefox */
* {
scrollbar-width: auto;
scrollbar-color: #b8b8b8 #ffffff;
}
/* Chrome, Edge, and Safari */
*::-webkit-scrollbar {
width: 12px;
}
*::-webkit-scrollbar-track {
background: #ffffff;
}
*::-webkit-scrollbar-thumb {
background-color: #b8b8b8;
border-radius: 10px;
border: 3px solid #ffffff;
}

View File

@@ -1,7 +1,7 @@
import { Component, OnInit, Input, Output, EventEmitter } from '@angular/core';
import {Component, OnInit, Input, Output, EventEmitter} from '@angular/core';
import { LogsWebsocketService, ApiService } from '../../services';
import { Observable } from 'rxjs';
import {LogsWebsocketService, ApiService} from '../../services';
import {Observable} from 'rxjs';
@Component({
selector: 'logs-panel',
@@ -10,39 +10,44 @@ import { Observable } from 'rxjs';
})
export class LogsPanelComponent implements OnInit {
MAX_LOGS : number = 20;
MAX_LOGS = 30;
logs : Array<any> = new Array();
logs = new Array();
constructor(
private logsWebsocketService: LogsWebsocketService,
private apiService : ApiService
) { }
private apiService: ApiService
) {
}
ngOnInit() {
let obs = this.logsWebsocketService.getObservable()
const obs = this.logsWebsocketService.getObservable()
obs.subscribe({
'next' : this.onNewLogMsg,
'error' : (err) => {console.log(err)}
'next': this.onNewLogMsg,
'error': (err) => {
console.log(err)
}
});
}
onNewLogMsg = (receivedMsg) => {
if(receivedMsg.type == 'SUCCESS')
if (receivedMsg.type === 'SUCCESS') {
this._showNewLog(receivedMsg.message);
else if(receivedMsg.type == 'ERROR')
this._refreshSession(); //if websocket has been closed for session expiration, try to refresh it
} else if (receivedMsg.type === 'ERROR') {
this._refreshSession();
} // if websocket has been closed for session expiration, try to refresh it
};
_showNewLog = (logRecord) => {
if(this.logs.length > this.MAX_LOGS)
if (this.logs.length > this.MAX_LOGS) {
this.logs.pop();
}
this.logs.unshift({
time : logRecord.date,
type : logRecord.type,
msg : logRecord.message,
threadName : logRecord.threadName
time: logRecord.date,
type: logRecord.type,
msg: logRecord.message,
threadName: logRecord.threadName
});
}

View File

@@ -1,36 +1,43 @@
<!-- <div class="progress" [hidden]="progress.percentage < 0">
<div class="progress-bar"
role="progressbar"
<div class="progress-bar"
role="progressbar"
[ngStyle]="{width: percentageStr}">
{{percentageStr}}
</div>
</div> -->
<mat-card>
<mat-card style="padding-bottom: 0">
<mat-card-header>
<mat-card-title><b>JOB PROGRESS</b></mat-card-title>
<mat-card-subtitle><b>JOB PROGRESS</b></mat-card-subtitle>
</mat-card-header>
<mat-card-content>
<div>
<mat-progress-bar mode="determinate" value="{{progress.percentage}}"></mat-progress-bar>
{{percentageStr}}
</div>
<br>
<div id="progressBarBox" *ngIf="progress.percentage !== -1">
<mat-progress-bar mode="determinate" value="{{progress.percentage}}"></mat-progress-bar>
{{percentageStr}}
</div>
<div>
<mat-chip>counter</mat-chip>&nbsp;
<span class="animated pulse">{{progress.timesTriggered}}</span> <span ng-show="progress.repeatCount > 0">/ {{progress.repeatCount}} </span>
<br/><br/>
<mat-chip>job key</mat-chip> <span class="animated pulse">{{progress.jobKey}}</span><br>
<mat-chip>job class</mat-chip> <span class="animated pulse">{{progress.jobClass}}</span><br/>
<br/>
<mat-chip>prev fire time</mat-chip> <span class="animated pulse">{{progress.previousFireTime|date:'dd-MM-yyyy HH:mm:ss'}}</span><br/>
<mat-chip>next fire time</mat-chip> <span class="animated pulse">{{progress.nextFireTime|date:'dd-MM-yyyy HH:mm:ss'}}</span><br/>
<mat-chip>final fire time</mat-chip> <span class="animated pulse">{{progress.finalFireTime|date:'dd-MM-yyyy HH:mm:ss'}}</span><br/>
</div>
<div id="counterBox" fxLayout="row" fxLayoutAlign="center" *ngIf="progress.timesTriggered">
<span id="timesTriggeredCounter" class="animated pulse">{{progress.timesTriggered}}</span>
<span id="totCounter" *ngIf="progress.repeatCount > 0">&nbsp;/&nbsp;{{progress.repeatCount}} </span>
</div>
<mat-divider *ngIf="progress.timesTriggered"></mat-divider>
<div fxLayout="row" fxLayoutAlign="space-around center">
<div class="fireBox">
<div class="fireBoxHeader">prev fire time</div>
<div class="fireBoxContent"><span class="animated pulse">{{progress.previousFireTime|date:'dd-MM-yyyy HH:mm:ss'}}</span></div>
<div class="fireBoxContent" [hidden]="progress.previousFireTime"><span>-</span></div>
</div>
<div class="fireBox">
<div class="fireBoxHeader">next fire time</div>
<div class="fireBoxContent"><span class="animated pulse">{{progress.nextFireTime|date:'dd-MM-yyyy HH:mm:ss'}}</span></div>
<div class="fireBoxContent" [hidden]="progress.nextFireTime"><span>-</span></div>
</div>
<div class="fireBox">
<div class="fireBoxHeader">final fire time</div>
<div class="fireBoxContent"><span class="animated pulse">{{progress.finalFireTime|date:'dd-MM-yyyy HH:mm:ss'}}</span></div>
<div class="fireBoxContent" [hidden]="progress.finalFireTime"><span>-</span></div>
</div>
</div>
</mat-card-content>
</mat-card>
</mat-card>

View File

@@ -0,0 +1,33 @@
#timesTriggeredCounter{
font-size: 2em;
}
#totCounter{
margin-top: auto;
text-align: center;
margin-bottom: 5px;
font-size: 0.8em;
}
#counterBox{
margin-bottom: 1em;
}
.fireBox{
width: 100%;
border-right: 1px solid rgba(0,0,0,.12);
margin: 8px;
}
.fireBox:last-child {
border-right: 0;
}
.fireBoxHeader{
font-size: 0.8em;
text-align: center;
color: grey;
margin-bottom: 0.5em;
}
.fireBoxContent{
text-align: center;
}

View File

@@ -1,7 +1,8 @@
import { Component, OnInit, Input, Output, EventEmitter } from '@angular/core'
import { ProgressWebsocketService } from '../../services';
import {ProgressWebsocketService, QuartzManagerWebsocketMessage} from '../../services';
import { Observable } from 'rxjs';
import TriggerFiredBundle from '../../model/trigger-fired-bundle.model';
// import {Message} from '@stomp/stompjs';
// import { Subscription } from 'rxjs/Subscription';
@@ -19,8 +20,8 @@ import { Observable } from 'rxjs';
})
export class ProgressPanelComponent implements OnInit {
progress : any = {}
percentageStr : string
progress: TriggerFiredBundle = new TriggerFiredBundle();
percentageStr: string;
// // Stream of messages
// private subscription: Subscription;
@@ -31,24 +32,22 @@ export class ProgressPanelComponent implements OnInit {
// public mq: Array<string> = [];
// private socketSubscription
constructor(
private progressWebsocketService: ProgressWebsocketService,
// private _stompService: StompService,
// private serverSocket : ServerSocket
) { }
onNewProgressMsg = (receivedMsg) => {
if (receivedMsg.type == 'SUCCESS') {
var newStatus = receivedMsg.message;
onNewProgressMsg = (receivedMsg: QuartzManagerWebsocketMessage) => {
if (receivedMsg.type === 'SUCCESS') {
const newStatus = receivedMsg.message;
this.progress = newStatus;
this.percentageStr = this.progress.percentage + '%';
}
}
ngOnInit() {
let obs = this.progressWebsocketService.getObservable()
const obs = this.progressWebsocketService.getObservable()
obs.subscribe({
'next' : this.onNewProgressMsg,
'error' : (err) => {console.log(err)}

View File

@@ -1 +0,0 @@
export * from './scheduler-config.component';

View File

@@ -1,38 +0,0 @@
<mat-card>
<mat-card-header>
<mat-card-title><b>SCHEDULER CONFIG</b></mat-card-title>
</mat-card-header>
<mat-card-content>
<div fxLayout="column">
<form name="configForm" fxFlex="1 1 100%" #configForm="ngForm">
<mat-form-field>
<input matInput placeholder="Freq [Num per day]" [(ngModel)]="config.triggerPerDay" name="triggerPerDay" type="number">
</mat-form-field>
<mat-form-field>
<input matInput placeholder="Max Occurrences" [(ngModel)]="config.maxCount" name="maxCount" type="number">
</mat-form-field>
<br>
<div>
<h5>Misfire Policy</h5>
<div>RESCHEDULE NEXT WITH EXISTING COUNT</div>
<div class="small">
In case of misfire event, the trigger is re-scheduled to the next scheduled time after 'now' with the repeat count left unchanged (missed events are definitively lost).
<br/>
<strong>Warning:</strong> This policy could cause the trigger to go directly to the complete state if the end-time of the trigger has arrived,
so this misfire instruction doesn't guarantee that the repeat counter reaches your max value, but it guarantees that the end-time doesn't go over the expected final fire time.
</div>
</div>
<br>
<button mat-raised-button
type="button"
(click)="submitConfig()">
Submit
</button>
</form>
</div>
</mat-card-content>
</mat-card>

View File

@@ -1,40 +0,0 @@
import { Component, OnInit, Input, Output, EventEmitter } from '@angular/core';
import { SchedulerService } from '../../services';
import { SchedulerConfig } from '../../model/schedulerConfig.model'
@Component({
selector: 'scheduler-config',
templateUrl: './scheduler-config.component.html',
styleUrls: ['./scheduler-config.component.scss']
})
export class SchedulerConfigComponent implements OnInit {
constructor(
private schedulerService: SchedulerService
) { }
config : SchedulerConfig = new SchedulerConfig()
configBackup : SchedulerConfig = new SchedulerConfig()
ngOnInit() {
this.retrieveConfig()
}
retrieveConfig = () => {
this.schedulerService.getConfig()
.subscribe(res => {
this.config = new SchedulerConfig(res.triggerPerDay, res.maxCount)
this.configBackup = res
})
}
submitConfig = () => {
this.schedulerService.updateConfig(this.config)
.subscribe(res => {
this.configBackup = this.config;
}, error => {
this.config = this.configBackup;
});
};
}

View File

@@ -1,15 +1,26 @@
<mat-card>
<mat-card-header>
<mat-card-title><b>SCHEDULER CONTROLLER</b></mat-card-title>
</mat-card-header>
<mat-card-content>
<button id="schedulerControllerBtn1" mat-raised-button class="btn btn-default large-btn" (click)="startOrPause()">
<span *ngIf = "schedulerState === 'running'">
<i class="fas fa-pause red"></i>
</span>
<span *ngIf = "schedulerState === 'stopped' || schedulerState === 'paused'">
<i class="fas fa-play green"></i>
</span>
</button>
<div fxLayout="row" fxLayoutAlign="left stretch" fxLayoutGap="30px">
<button id="schedulerControllerBtn" mat-raised-button class="btn btn-default large-btn" (click)="startOrPause()">
<span *ngIf = "scheduler?.status === 'RUNNING'">
<i class="fas fa-pause red"></i>
</span>
<span *ngIf = "scheduler?.status === 'STOPPED' || scheduler?.status === 'PAUSED'">
<i class="fas fa-play green"></i>
</span>
</button>
<div fxLayout="column center">
<mat-card-subtitle style="margin: auto;"><b>SCHEDULER</b></mat-card-subtitle>
</div>
<mat-divider [vertical]="true"></mat-divider>
<div fxLayout="column">
<div><label>Name</label></div>
<div><span id="scheduler-name">{{scheduler?.name}}</span></div>
</div>
<div fxLayout="column">
<div><label>Instance ID</label></div>
<div><span id="scheduler-instance">{{scheduler?.instanceId}}</span></div>
</div>
</div>
</mat-card-content>
</mat-card>
</mat-card>

View File

@@ -3,4 +3,15 @@
}
.green{
color: green;
}
}
label{
color: grey;
font-variant: small-caps;
font-size: smaller;
}
#scheduler-name{
text-transform: capitalize;
font-size: larger;
}

View File

@@ -0,0 +1,105 @@
import {async, ComponentFixture, TestBed} from '@angular/core/testing';
import {SchedulerControlComponent} from './scheduler-control.component';
import {ApiService, ConfigService, SchedulerService, UserService} from '../../services';
import {HttpClient} from '@angular/common/http';
import {HttpClientTestingModule, HttpTestingController} from '@angular/common/http/testing';
import {RouterTestingModule} from '@angular/router/testing';
import {DebugElement} from '@angular/core';
import {By} from '@angular/platform-browser';
import {Scheduler} from '../../model/scheduler.model';
import {MatCardModule} from '@angular/material/card';
import {MatIconModule} from '@angular/material/icon';
import {MatDividerModule} from '@angular/material/divider';
describe('SchedulerControlComponent', () => {
let component: SchedulerControlComponent;
let fixture: ComponentFixture<SchedulerControlComponent>;
let httpClient: HttpClient;
let httpTestingController: HttpTestingController;
beforeEach(async(() => {
TestBed.configureTestingModule({
imports: [MatCardModule, MatDividerModule, MatIconModule, HttpClientTestingModule, RouterTestingModule],
declarations: [SchedulerControlComponent],
providers: [UserService, SchedulerService, ApiService, ConfigService]
}).compileComponents();
httpClient = TestBed.inject(HttpClient);
httpTestingController = TestBed.inject(HttpTestingController);
}));
beforeEach(() => {
fixture = TestBed.createComponent(SchedulerControlComponent);
component = fixture.componentInstance;
fixture.detectChanges();
});
it('should display the play button at the beginning since the scheduler is stopped', () => {
expect(component).toBeDefined();
const getSchedulerReq = httpTestingController.expectOne('/quartz-manager/scheduler');
const mockScheduler = new Scheduler('test-scheduler', 'test-id', 'STOPPED', []);
getSchedulerReq.flush(mockScheduler);
expect(component.scheduler).toEqual(mockScheduler);
expect(component.scheduler.status).toEqual('STOPPED');
fixture.detectChanges();
const schedulerControlComponentDe: DebugElement = fixture.debugElement;
const schedulerBtnDe = schedulerControlComponentDe.query(By.css('#schedulerControllerBtn'));
expect(schedulerBtnDe).toBeTruthy();
const playIconDe = schedulerBtnDe.query(By.css('.fa-play'));
expect(playIconDe).toBeTruthy();
});
it('should switch the button to pause when the scheduler is started', () => {
expect(component).toBeDefined();
const getSchedulerReq = httpTestingController.expectOne('/quartz-manager/scheduler');
const mockScheduler = new Scheduler('test-scheduler', 'test-id', 'STOPPED', []);
getSchedulerReq.flush(mockScheduler);
fixture.detectChanges();
const schedulerControlComponentDe: DebugElement = fixture.debugElement;
let schedulerBtnDe = schedulerControlComponentDe.query(By.css('#schedulerControllerBtn'));
expect(schedulerBtnDe).toBeTruthy();
const playIconDe = schedulerBtnDe.query(By.css('.fa-play'));
expect(playIconDe).toBeTruthy();
schedulerBtnDe.nativeElement.click();
const startSchedulerReq = httpTestingController.expectOne('/quartz-manager/scheduler/run');
startSchedulerReq.flush(null);
fixture.detectChanges();
schedulerBtnDe = schedulerControlComponentDe.query(By.css('#schedulerControllerBtn'));
const pauseIconDe = schedulerBtnDe.query(By.css('.fa-pause'));
expect(pauseIconDe).toBeTruthy();
})
it('should switch the button to play when the scheduler is stopped', () => {
expect(component).toBeDefined();
const getSchedulerReq = httpTestingController.expectOne('/quartz-manager/scheduler');
const mockScheduler = new Scheduler('test-scheduler', 'test-id', 'RUNNING', []);
getSchedulerReq.flush(mockScheduler);
fixture.detectChanges();
const schedulerControlComponentDe: DebugElement = fixture.debugElement;
let schedulerBtnDe = schedulerControlComponentDe.query(By.css('#schedulerControllerBtn'));
expect(schedulerBtnDe).toBeTruthy();
const pauseIconDe = schedulerBtnDe.query(By.css('.fa-pause'));
expect(pauseIconDe).toBeTruthy();
schedulerBtnDe.nativeElement.click();
const startSchedulerReq = httpTestingController.expectOne('/quartz-manager/scheduler/pause');
startSchedulerReq.flush(null);
fixture.detectChanges();
schedulerBtnDe = schedulerControlComponentDe.query(By.css('#schedulerControllerBtn'));
const playIconDe = schedulerBtnDe.query(By.css('.fa-play'));
expect(playIconDe).toBeTruthy();
})
});

View File

@@ -1,54 +1,80 @@
import { Component, OnInit, Input, Output, EventEmitter } from '@angular/core';
import { UserService, SchedulerService } from '../../services';
import {Component, OnInit} from '@angular/core';
import {SchedulerService, UserService} from '../../services';
import {Scheduler} from '../../model/scheduler.model';
@Component({
selector: 'scheduler-control',
selector: 'qrzmng-scheduler-control',
templateUrl: './scheduler-control.component.html',
styleUrls: ['./scheduler-control.component.scss']
})
export class SchedulerControlComponent implements OnInit {
schedulerState;
scheduler: Scheduler;
constructor(
private userService: UserService,
private schedulerService: SchedulerService
) { }
) {
}
ngOnInit() {
this.schedulerService.getStatus().subscribe(res => {this.schedulerState = res.data}, err => {console.log(err)});
this._getScheduler();
}
startScheduler = function(){
this.schedulerService.startScheduler().subscribe((res) => {this.schedulerState = 'running'}, (res) => {console.log(JSON.stringify(res))});
private _getScheduler() {
this.schedulerService.getScheduler()
.subscribe(resp => this.scheduler = resp);
}
startScheduler = function () {
this.schedulerService.startScheduler().subscribe((res) => {
this.scheduler.status = 'RUNNING'
}, (res) => {
console.log(JSON.stringify(res))
});
};
stopScheduler = function(){
this.schedulerService.stopScheduler().subscribe((res) => {this.schedulerState = 'stopped'}, (res) => {console.log(JSON.stringify(res))});
stopScheduler = function () {
this.schedulerService.stopScheduler().subscribe((res) => {
this.scheduler.status = 'STOPPED'
}, (res) => {
console.log(JSON.stringify(res))
});
};
pauseScheduler = function(){
this.schedulerService.pauseScheduler().subscribe((res) => {this.schedulerState = 'paused'}, (res) => {console.log(JSON.stringify(res))});
pauseScheduler = function () {
this.schedulerService.pauseScheduler().subscribe((res) => {
this.scheduler.status = 'PAUSED'
}, (res) => {
console.log(JSON.stringify(res))
});
};
resumeScheduler = function(){
this.schedulerService.resumeScheduler().subscribe((res) => {this.schedulerState = 'running'}, (res) => {console.log(JSON.stringify(res))});
resumeScheduler = function () {
this.schedulerService.resumeScheduler().subscribe((res) => {
this.scheduler.status = 'RUNNING'
}, (res) => {
console.log(JSON.stringify(res))
});
};
stop = function(){
if(this.schedulerState != 'stopped')
stop = function () {
if (this.scheduler.status !== 'STOPPED') {
this.stopScheduler();
}
}
startOrPause = function(){
switch (this.schedulerState) {
case 'running': this.pauseScheduler();
break;
case 'paused': this.resumeScheduler();
break;
default:
this.startScheduler();
break;
startOrPause = function () {
switch (this.scheduler.status) {
case 'RUNNING':
this.pauseScheduler();
break;
case 'PAUSED':
this.resumeScheduler();
break;
default:
this.startScheduler();
break;
}
};

View File

@@ -0,0 +1,2 @@
export * from './simple-trigger-config.component';
export {SimpleTriggerCommand} from '../../model/simple-trigger.command';

View File

@@ -0,0 +1,198 @@
<mat-card fxFlex="1 1 auto">
<mat-card-header>
<mat-card-subtitle><b>TRIGGER DETAILS</b></mat-card-subtitle>
</mat-card-header>
<mat-divider></mat-divider>
<mat-card-content *ngIf="shouldShowTheTriggerCardContent()" style="position: relative; height: 100%">
<div fxLayout="column" style="overflow-y: auto; position: absolute; left: 0; right: 0; top: 0; bottom: 0;
overflow: auto;height: calc(100% - 3em); padding-top: 1em;">
<mat-card id="noEligibleJobsAlert" *ngIf="jobs?.length === 0" style="background-color: #ff6385">
<mat-card-content>
<i class="fas fa-exclamation-circle" style="color: #fff"></i>&nbsp;<strong>WARNING</strong>
Not found any eligible job classes for quartz-manager! <br/>
<p style="font-size: 0.8em">Please, make sure you have extended <i>AbstractQuartzManagerJob</i> and set the
app prop <i>quartz-manager.jobClassPackages</i> with the correct java package </p>
</mat-card-content>
</mat-card>
<form name="triggerConfigForm" fxFlex="1 1 100%"
[formGroup]="simpleTriggerReactiveForm" (ngSubmit)="onSubmitTriggerConfig()">
<div>
<mat-form-field
[appearance]="enabledTriggerForm && !trigger ? 'standard': 'none'"
class="full-size-input">
<mat-label>Trigger Name *</mat-label>
<input id="triggerName"
[readonly]="!enabledTriggerForm || trigger"
matInput placeholder="name of the trigger (unique)"
formControlName="triggerName" name="triggerName">
<mat-error *ngIf="simpleTriggerReactiveForm.controls.triggerName.errors?.required">
Name is <strong>required</strong>
</mat-error>
</mat-form-field>
</div>
<div>
<mat-form-field
[appearance]="enabledTriggerForm ? 'standard': 'none'"
class="full-size-input"
>
<mat-label>Job Class *</mat-label>
<mat-select id="jobClass" name="jobClass" formControlName="jobClass" [disabled]="!enabledTriggerForm">
<mat-option *ngFor="let job of jobs" [value]="job" style="font-size: 0.8em">
{{job}}
</mat-option>
</mat-select>
<mat-error *ngIf="simpleTriggerReactiveForm.controls.jobClass.errors?.required">
Job is <strong>required</strong>
</mat-error>
</mat-form-field>
</div>
<div>
<mat-form-field
[appearance]="enabledTriggerForm ? 'standard': 'none'"
class="full-size-input"
>
<mat-label>Misfire Instruction *</mat-label>
<mat-select id="misfireInstruction" name="misfireInstruction" formControlName="misfireInstruction"
[disabled]="!enabledTriggerForm" style="font-size: 0.8em">
<mat-option value="MISFIRE_INSTRUCTION_FIRE_NOW">FIRE NOW</mat-option>
<mat-option value="MISFIRE_INSTRUCTION_RESCHEDULE_NOW_WITH_EXISTING_REPEAT_COUNT">RESCHEDULE NOW WITH
EXISTING REPEAT COUNT
</mat-option>
<mat-option value="MISFIRE_INSTRUCTION_RESCHEDULE_NOW_WITH_REMAINING_REPEAT_COUNT">RESCHEDULE NOW WITH
REMAINING REPEAT COUNT
</mat-option>
<mat-option value="MISFIRE_INSTRUCTION_RESCHEDULE_NEXT_WITH_REMAINING_COUNT">RESCHEDULE NEXT WITH
REMAINING COUNT
</mat-option>
<mat-option value="MISFIRE_INSTRUCTION_RESCHEDULE_NEXT_WITH_EXISTING_COUNT">RESCHEDULE NEXT WITH EXISTING
COUNT
</mat-option>
</mat-select>
<mat-error *ngIf="simpleTriggerReactiveForm.controls.misfireInstruction.errors?.required">
The misfire instruction is <strong>required</strong>
</mat-error>
</mat-form-field>
<div class="small" [innerHTML]="getMisfireInstructionCaption()"></div>
</div>
<br/>
<div formGroupName="triggerPeriod">
<div>
<mat-form-field
[appearance]="enabledTriggerForm ? 'standard': 'none'"
class="full-size-input"
>
<mat-label>Start Date (optional)</mat-label>
<input id="startDate"
[readonly]="!enabledTriggerForm"
matInput
[ngxMatDatetimePicker]="startDatePicker" placeholder="Choose a start date"
formControlName="startDate" name="startDate">
<mat-datepicker-toggle matSuffix [for]="startDatePicker"></mat-datepicker-toggle>
<ngx-mat-datetime-picker #startDatePicker showSpinners="true" showSeconds="true">
<!-- [stepHour]="stepHour"-->
<!-- [stepMinute]="stepMinute" [stepSecond]="stepSecond" [touchUi]="touchUi" [color]="color"-->
<!-- [enableMeridian]="enableMeridian" [disableMinute]="disableMinute" [hideTime]="hideTime">-->
</ngx-mat-datetime-picker>
</mat-form-field>
</div>
<div>
<mat-form-field
[appearance]="enabledTriggerForm ? 'standard': 'none'"
class="full-size-input"
>
<mat-label>End Date (optional)</mat-label>
<input id="endDate"
[readonly]="!enabledTriggerForm"
matInput
[ngxMatDatetimePicker]="endDatePicker" placeholder="Choose a end date"
formControlName="endDate" name="endDate"
>
<mat-datepicker-toggle matSuffix [for]="endDatePicker"></mat-datepicker-toggle>
<ngx-mat-datetime-picker #endDatePicker showSpinners="true" showSeconds="true">
<!-- [stepHour]="stepHour"-->
<!-- [stepMinute]="stepMinute" [stepSecond]="stepSecond" [touchUi]="touchUi" [color]="color"-->
<!-- [enableMeridian]="enableMeridian" [disableMinute]="disableMinute" [hideTime]="hideTime">-->
</ngx-mat-datetime-picker>
</mat-form-field>
<mat-error *ngIf="simpleTriggerReactiveForm.controls.triggerPeriod.errors?.invalidTriggerPeriod" style="font-size: small">
the end date cannot be <strong>before</strong> the start date
</mat-error>
</div>
</div>
<div formGroupName="triggerRecurrence">
<div>
<mat-form-field
[appearance]="enabledTriggerForm ? 'standard': 'none'"
class="full-size-input"
>
<mat-label>Repeat Interval [in mills]</mat-label>
<input id="repeatInterval"
[readonly]="!enabledTriggerForm"
matInput placeholder="Repeat Interval [in mills]" type="number"
formControlName="repeatInterval" name="repeatInterval"
>
<mat-error *ngIf="simpleTriggerReactiveForm.controls.triggerRecurrence.errors?.invalidTriggerRecurrence">
repeatCount and repeatInterval must be <strong>both</strong> set or unset
</mat-error>
</mat-form-field>
<!-- <mat-error *ngIf="simpleTriggerReactiveForm.controls.triggerRecurrence.errors?.invalidTriggerRecurrence" style="font-size: small">-->
<!-- repeatCount and repeatInterval must be <strong>both</strong> set or unset-->
<!-- </mat-error>-->
</div>
<div>
<mat-form-field
[appearance]="enabledTriggerForm ? 'standard': 'none'"
class="full-size-input"
>
<mat-label>Repeat Count</mat-label>
<input id="repeatCount"
[readonly]="!enabledTriggerForm"
matInput placeholder="Repeat Count (-1 REPEAT INDEFINITELY)" type="number"
formControlName="repeatCount" name="repeatCount"
>
<mat-error *ngIf="simpleTriggerReactiveForm.controls.triggerRecurrence.errors?.invalidTriggerRecurrence">
repeatCount and repeatInterval must be <strong>both</strong> set or unset
</mat-error>
</mat-form-field>
</div>
</div>
<br/>
<div fxLayout="row" fxFlexAlign="space-evenly center" style="padding-bottom: 1em;">
<div fxFlex="1 1 auto" style="text-align: center" *ngIf="enabledTriggerForm">
<button mat-raised-button
type="button"
*ngIf="enabledTriggerForm"
(click)="onResetReactiveForm()">
Cancel
</button>
</div>
<div fxFlex="1 1 auto" style="text-align: center" *ngIf="enabledTriggerForm">
<button mat-raised-button
type="submit" color="primary"
[disabled]="simpleTriggerReactiveForm.invalid"
*ngIf="enabledTriggerForm">
Submit
</button>
</div>
<div fxFlex="1 1 auto" style="text-align: center" *ngIf="!enabledTriggerForm">
<button mat-raised-button type="button"
*ngIf="!enabledTriggerForm"
(click)="enabledTriggerForm = true">
Reschedule
</button>
</div>
</div>
</form>
</div>
</mat-card-content>
</mat-card>

View File

@@ -0,0 +1,29 @@
.small{
font-size: 0.8em;
}
.full-size-input{
width: 100%;
}
/* ===== Scrollbar CSS ===== */
/* Firefox */
* {
scrollbar-width: auto;
scroll-margin-right: 0;
scrollbar-color: #b8b8b8 #ffffff;
}
/* Chrome, Edge, and Safari */
*::-webkit-scrollbar {
width: 12px;
}
*::-webkit-scrollbar-track {
background: #ffffff;
}
*::-webkit-scrollbar-thumb {
background-color: #b8b8b8;
border-radius: 10px;
border: 3px solid #ffffff;
}

View File

@@ -0,0 +1,247 @@
import {async, ComponentFixture, TestBed} from '@angular/core/testing';
import {MatCardModule} from '@angular/material/card';
import {SimpleTriggerConfigComponent} from './simple-trigger-config.component';
import {ApiService, ConfigService, CONTEXT_PATH, SchedulerService} from '../../services';
import {HttpClient} from '@angular/common/http';
import {HttpClientTestingModule, HttpTestingController} from '@angular/common/http/testing';
import {DebugElement, NO_ERRORS_SCHEMA} from '@angular/core';
import {By} from '@angular/platform-browser';
import {RouterTestingModule} from '@angular/router/testing';
import {MatIconModule} from '@angular/material/icon';
import {FormBuilder, FormsModule, ReactiveFormsModule} from '@angular/forms';
import {MatFormFieldModule} from '@angular/material/form-field';
import {MatNativeDateModule} from '@angular/material/core';
import {MatInputModule} from '@angular/material/input';
import {BrowserAnimationsModule} from '@angular/platform-browser/animations';
import {TriggerKey} from '../../model/triggerKey.model';
import {Trigger} from '../../model/trigger.model';
import {JobDetail} from '../../model/jobDetail.model';
import {SimpleTrigger} from '../../model/simple-trigger.model';
import JobService from '../../services/job.service';
import {MatSelectModule} from '@angular/material/select';
import {MisfireInstruction} from '../../model/misfire-instruction.model';
describe('SimpleTriggerConfig', () => {
let component: SimpleTriggerConfigComponent;
let fixture: ComponentFixture<SimpleTriggerConfigComponent>;
let httpClient: HttpClient;
let httpTestingController: HttpTestingController;
beforeEach(async( () => {
TestBed.configureTestingModule({
imports: [FormsModule, MatFormFieldModule, MatFormFieldModule, MatSelectModule, MatInputModule, BrowserAnimationsModule,
MatNativeDateModule, ReactiveFormsModule,
MatCardModule, MatIconModule, HttpClientTestingModule, RouterTestingModule],
declarations: [SimpleTriggerConfigComponent],
providers: [SchedulerService, ApiService, ConfigService, JobService, FormBuilder],
schemas: [NO_ERRORS_SCHEMA]
}).compileComponents();
httpClient = TestBed.inject(HttpClient);
httpTestingController = TestBed.inject(HttpTestingController);
}));
beforeEach(() => {
fixture = TestBed.createComponent(SimpleTriggerConfigComponent);
component = fixture.componentInstance;
fixture.detectChanges();
});
it('should fetch no triggers at the init', () => {
expect(component).toBeTruthy();
httpTestingController.expectNone(`${CONTEXT_PATH}/simple-triggers/my-simple-trigger`);
});
function setInputValue(componentDe: DebugElement, inputSelector: string, value: string) {
const inputDe = componentDe.query(By.css(inputSelector));
const inputEl = inputDe.nativeElement;
inputEl.value = value;
inputEl.dispatchEvent(new Event('input'));
fixture.detectChanges();
}
function setDropdownValue(componentDe: DebugElement, dropdownSelector: string, value: string) {
const dropdownDe = componentDe.query(By.css(dropdownSelector));
const dropdownEl = dropdownDe.nativeElement;
dropdownEl.value = value;
dropdownEl.dispatchEvent(new Event('change'));
fixture.detectChanges();
}
function setDropdownValueByIndex(componentDe: DebugElement, dropdownSelector: string, index: number) {
const dropdownDe = componentDe.query(By.css(dropdownSelector));
const dropdownEl = dropdownDe.nativeElement;
dropdownEl.value = dropdownEl.options[index].value;
dropdownEl.dispatchEvent(new Event('change'));
fixture.detectChanges();
}
async function setMatSelectValueByIndex(componentDe: DebugElement, dropdownSelector: string, index: number) {
const dropdownDe = componentDe.query(By.css(dropdownSelector));
dropdownDe.nativeElement.click();
fixture.detectChanges();
const matOptionDe = componentDe.query(By.css('.mat-select-panel')).queryAll(By.css('.mat-option'));
matOptionDe[index].nativeElement.click();
fixture.detectChanges();
}
function openFormAndFillAllMandatoryFields() {
component.openTriggerForm();
fixture.detectChanges();
const getJobsReq = httpTestingController.expectOne(`${CONTEXT_PATH}/jobs`);
getJobsReq.flush(['TestJob']);
const componentDe: DebugElement = fixture.debugElement;
const submitButton = componentDe.query(By.css('form button[color="primary"]'));
expect(submitButton.nativeElement.textContent.trim()).toEqual('Submit');
expect(submitButton.nativeElement.getAttribute('disabled')).toEqual('');
setInputValue(componentDe, '#triggerName', 'test-trigger');
expect(component.simpleTriggerReactiveForm.controls.triggerName.value).toEqual('test-trigger');
expect(submitButton.nativeElement.getAttribute('disabled')).toEqual('');
setMatSelectValueByIndex(componentDe, '#misfireInstruction', 0);
expect(component.simpleTriggerReactiveForm.controls.misfireInstruction.value).toEqual('MISFIRE_INSTRUCTION_FIRE_NOW');
expect(submitButton.nativeElement.getAttribute('disabled')).toEqual('');
setMatSelectValueByIndex(componentDe, '#jobClass', 0);
expect(submitButton.nativeElement.getAttribute('disabled')).toEqual(null);
setInputValue(componentDe, '#repeatCount', '1000');
expect(submitButton.nativeElement.getAttribute('disabled')).toEqual('');
setInputValue(componentDe, '#repeatInterval', '2000');
expect(submitButton.nativeElement.getAttribute('disabled')).toEqual(null);
}
it('should enabled the submit only when the form is valid', () => {
openFormAndFillAllMandatoryFields();
});
it('should emit an event when a new trigger is submitted', () => {
const componentDe: DebugElement = fixture.debugElement;
const mockTrigger = new Trigger();
mockTrigger.triggerKeyDTO = new TriggerKey('test-trigger', null);
mockTrigger.jobDetailDTO = <JobDetail>{jobClassName: 'TestJob', description: null};
mockTrigger.misfireInstruction = MisfireInstruction.MISFIRE_INSTRUCTION_FIRE_NOW;
openFormAndFillAllMandatoryFields();
setInputValue(componentDe, '#repeatInterval', '2000');
expect(component.simpleTriggerReactiveForm.controls.triggerRecurrence.value.repeatInterval).toEqual(2000);
setInputValue(componentDe, '#repeatCount', '100');
expect(component.simpleTriggerReactiveForm.controls.triggerRecurrence.value.repeatCount).toEqual(100);
const submitButton = componentDe.query(By.css('form button[color="primary"]'));
expect(submitButton.nativeElement.textContent.trim()).toEqual('Submit');
let actualNewTrigger;
component.onNewTrigger.subscribe(simpleTrigger => actualNewTrigger = simpleTrigger);
submitButton.nativeElement.click();
const postSimpleTriggerReq = httpTestingController.expectOne(`${CONTEXT_PATH}/simple-triggers/test-trigger`);
postSimpleTriggerReq.flush(mockTrigger);
expect(actualNewTrigger).toEqual(mockTrigger);
});
it('should not emit an event when an existing trigger is edited', () => {
const mockTriggerKey = new TriggerKey('test-trigger', null);
component.triggerKey = mockTriggerKey;
fixture.detectChanges();
const mockTrigger = new SimpleTrigger();
mockTrigger.triggerKeyDTO = new TriggerKey('test-trigger', null);
mockTrigger.jobDetailDTO = <JobDetail>{jobClassName: 'TestJob', description: null};
mockTrigger.mayFireAgain = true;
mockTrigger.misfireInstruction = MisfireInstruction.MISFIRE_INSTRUCTION_FIRE_NOW;
const getSimpleTriggerReq = httpTestingController.expectOne(`${CONTEXT_PATH}/simple-triggers/test-trigger`);
getSimpleTriggerReq.flush(mockTrigger);
component.simpleTriggerReactiveForm.setValue({
triggerName: 'test-trigger',
jobClass: 'TestJob',
triggerRecurrence: {
repeatInterval: 2000,
repeatCount: 100,
},
triggerPeriod: {
startDate: null,
endDate: null
},
misfireInstruction: MisfireInstruction.MISFIRE_INSTRUCTION_FIRE_NOW.toString()
});
component.openTriggerForm();
fixture.detectChanges();
const componentDe: DebugElement = fixture.debugElement;
setInputValue(componentDe, '#repeatInterval', '4000');
expect(component.simpleTriggerReactiveForm.controls.triggerRecurrence.value.repeatInterval).toEqual(4000);
const submitButton = componentDe.query(By.css('form button[color="primary"]'));
expect(submitButton.nativeElement.textContent.trim()).toEqual('Submit');
let actualNewTrigger;
component.onNewTrigger.subscribe(simpleTrigger => actualNewTrigger = simpleTrigger);
submitButton.nativeElement.click();
const putSimpleTriggerReq = httpTestingController.expectOne(`${CONTEXT_PATH}/simple-triggers/test-trigger`);
putSimpleTriggerReq.flush(mockTrigger);
expect(actualNewTrigger).toBeUndefined();
});
it('should fetch and display the trigger when the triggerKey is passed as input', () => {
const mockTriggerKey = new TriggerKey('my-simple-trigger', null);
component.triggerKey = mockTriggerKey;
fixture.detectChanges();
const mockTrigger = new Trigger();
mockTrigger.triggerKeyDTO = mockTriggerKey;
mockTrigger.jobDetailDTO = <JobDetail>{jobClassName: 'TestJob', description: null};
const getSimpleTriggerReq = httpTestingController.expectOne(`${CONTEXT_PATH}/simple-triggers/my-simple-trigger`);
getSimpleTriggerReq.flush(mockTrigger);
const componentDe: DebugElement = fixture.debugElement;
const submitButton = componentDe.query(By.css('form button'));
expect(submitButton.nativeElement.textContent.trim()).toEqual('Reschedule');
});
it('should display the form if the openTriggerForm method is called', () => {
component.openTriggerForm();
fixture.detectChanges();
const componentDe: DebugElement = fixture.debugElement;
const submitButton = componentDe.query(By.css('form button[color="primary"]'));
expect(submitButton.nativeElement.textContent.trim()).toEqual('Submit');
});
it('should display the warning if there are no eligible jobs', () => {
fixture.detectChanges();
const getJobsReq = httpTestingController.expectOne(`${CONTEXT_PATH}/jobs`);
getJobsReq.flush([]);
fixture.detectChanges();
const componentDe: DebugElement = fixture.debugElement;
const warningCard = componentDe.query(By.css('#noEligibleJobsAlert'));
expect(warningCard).toBeTruthy();
});
it('should not display the warning if there are eligible jobs', () => {
fixture.detectChanges();
const getJobsReq = httpTestingController.expectOne(`${CONTEXT_PATH}/jobs`);
getJobsReq.flush(['sampleJob']);
fixture.detectChanges();
const componentDe: DebugElement = fixture.debugElement;
const warningCard = componentDe.query(By.css('#noEligibleJobsAlert'));
expect(warningCard).toBeFalsy();
});
});

View File

@@ -0,0 +1,196 @@
import {Component, EventEmitter, Input, OnInit, Output} from '@angular/core';
import {SchedulerService} from '../../services';
import {Scheduler} from '../../model/scheduler.model';
import {SimpleTriggerCommand} from '../../model/simple-trigger.command';
import {SimpleTrigger} from '../../model/simple-trigger.model';
import {SimpleTriggerForm} from '../../model/simple-trigger.form';
import * as moment from 'moment';
import {TriggerKey} from '../../model/triggerKey.model';
import JobService from '../../services/job.service';
import {MisfireInstruction, MisfireInstructionCaption} from '../../model/misfire-instruction.model';
import {AbstractControl, FormBuilder, FormControl, FormGroup, ValidationErrors, ValidatorFn, Validators} from '@angular/forms';
@Component({
selector: 'qrzmng-simple-trigger-config',
templateUrl: './simple-trigger-config.component.html',
styleUrls: ['./simple-trigger-config.component.scss']
})
export class SimpleTriggerConfigComponent implements OnInit {
trigger: SimpleTrigger;
simpleTriggerReactiveForm: FormGroup = this.formBuilder.group({
triggerName: [this.trigger?.triggerKeyDTO.name, Validators.required],
jobClass: [this.trigger?.jobDetailDTO.jobClassName, Validators.required],
triggerPeriod: this.formBuilder.group({
startDate: [this.trigger?.startTime && moment(this.trigger?.startTime)],
endDate: [this.trigger?.endTime && moment(this.trigger?.endTime)]
}, {validators: this._triggerPeriodValidator}),
triggerRecurrence: this.formBuilder.group({
repeatCount: [this.trigger?.repeatCount],
repeatInterval: [this.trigger?.repeatInterval]
}, {validators: this._triggerRepetitionValidator}),
misfireInstruction: [MisfireInstruction[this.trigger?.misfireInstruction], Validators.required]
});
scheduler: Scheduler;
triggerLoading = true;
private fetchedTriggers = false;
private triggerInProgress = false;
private selectedTriggerKey: TriggerKey;
private jobs: Array<String>;
enabledTriggerForm = false;
@Output()
onNewTrigger = new EventEmitter<SimpleTrigger>();
constructor(
private formBuilder: FormBuilder,
private schedulerService: SchedulerService,
private jobService: JobService
) {
}
ngOnInit() {
this.fetchJobs();
}
private fetchJobs() {
this.jobService.fetchJobs().subscribe(jobs => this.jobs = jobs);
}
openTriggerForm() {
this.enabledTriggerForm = true;
}
private closeTriggerForm() {
this.enabledTriggerForm = false;
}
@Input()
set triggerKey(triggerKey: TriggerKey) {
this.selectedTriggerKey = {...triggerKey} as TriggerKey;
this.fetchSelectedTrigger();
}
fetchSelectedTrigger = () => {
this.triggerLoading = true;
this.schedulerService.getSimpleTriggerConfig(this.selectedTriggerKey.name)
.subscribe((retTrigger: SimpleTrigger) => {
this.trigger = retTrigger;
this.simpleTriggerReactiveForm.setValue(this._fromTriggerToReactiveForm(retTrigger))
this.triggerLoading = false;
this.triggerInProgress = this.trigger.mayFireAgain;
})
}
shouldShowTheTriggerCardContent = (): boolean => this.trigger !== null || this.enabledTriggerForm;
existsATriggerInProgress = (): boolean => this.trigger && this.triggerInProgress;
onResetReactiveForm = () => {
this.simpleTriggerReactiveForm.setValue(this._fromTriggerToReactiveForm(this.trigger));
this.closeTriggerForm();
};
onSubmitTriggerConfig = () => {
const schedulerServiceCall = this.existsATriggerInProgress() ?
this.schedulerService.updateSimpleTriggerConfig : this.schedulerService.saveSimpleTriggerConfig;
const simpleTriggerCommand = this._fromReactiveFormToCommand();
schedulerServiceCall(simpleTriggerCommand)
.subscribe((retTrigger: SimpleTrigger) => {
this.trigger = retTrigger;
this.simpleTriggerReactiveForm.setValue(this._fromTriggerToReactiveForm(retTrigger));
this.fetchedTriggers = true;
this.triggerInProgress = this.trigger.mayFireAgain;
if (schedulerServiceCall === this.schedulerService.saveSimpleTriggerConfig) {
this.onNewTrigger.emit(retTrigger);
}
this.closeTriggerForm();
}, error => {
this.simpleTriggerReactiveForm.setValue(this._fromTriggerToReactiveForm(this.trigger));
});
}
private _triggerPeriodValidator(control: AbstractControl): ValidationErrors | null {
const startDate = control.get('startDate');
const endDate = control.get('endDate');
if (startDate.value && endDate.value) {
return endDate.value.isBefore(startDate.value) ?
<ValidationErrors>{invalidTriggerPeriod: true} : null;
}
return null;
}
private _triggerRepetitionValidator(control: AbstractControl): ValidationErrors | null {
const repeatInterval = control.get('repeatInterval');
const repeatCount = control.get('repeatCount');
if ((repeatCount.value && repeatInterval.value) || (!repeatCount.value && !repeatInterval.value)) {
repeatInterval.setErrors(null);
repeatCount.setErrors(null);
return null;
}
const errors = <ValidationErrors>{invalidTriggerRecurrence: true};
repeatInterval.setErrors(errors);
repeatCount.setErrors(errors);
return errors;
}
private _fromTriggerToReactiveForm = (simpleTrigger: SimpleTrigger): SimpleTriggerReactiveForm => {
const simpleTriggerReactiveForm = new SimpleTriggerReactiveForm();
simpleTriggerReactiveForm.triggerName = simpleTrigger.triggerKeyDTO.name;
simpleTriggerReactiveForm.jobClass = simpleTrigger.jobDetailDTO.jobClassName;
simpleTriggerReactiveForm.triggerRecurrence.repeatCount = simpleTrigger.repeatCount || null;
simpleTriggerReactiveForm.triggerRecurrence.repeatInterval = simpleTrigger.repeatInterval || null;
simpleTriggerReactiveForm.triggerPeriod.startDate = (simpleTrigger.startTime && moment(simpleTrigger.startTime)) || null;
simpleTriggerReactiveForm.triggerPeriod.endDate = (simpleTrigger.endTime && moment(simpleTrigger.endTime)) || null;
simpleTriggerReactiveForm.misfireInstruction = (simpleTrigger.misfireInstruction
&& MisfireInstruction[simpleTrigger.misfireInstruction]) || null;
return simpleTriggerReactiveForm;
};
private _fromReactiveFormToCommand = (): SimpleTriggerCommand => {
const reactiveFormValue = this.simpleTriggerReactiveForm.value;
const simpleTriggerCommand = new SimpleTriggerCommand();
simpleTriggerCommand.triggerName = reactiveFormValue.triggerName;
simpleTriggerCommand.jobClass = reactiveFormValue.jobClass;
simpleTriggerCommand.repeatCount = reactiveFormValue.triggerRecurrence.repeatCount;
simpleTriggerCommand.repeatInterval = reactiveFormValue.triggerRecurrence.repeatInterval;
simpleTriggerCommand.startDate = reactiveFormValue.triggerPeriod.startDate?.toDate();
simpleTriggerCommand.endDate = reactiveFormValue.triggerPeriod.endDate?.toDate();
simpleTriggerCommand.misfireInstruction = reactiveFormValue.misfireInstruction;
return simpleTriggerCommand;
}
getMisfireInstructionCaption(): string {
const misfireInstructionKey = this.simpleTriggerReactiveForm.controls
.misfireInstruction.value as unknown as keyof typeof MisfireInstruction;
return MisfireInstructionCaption.get(MisfireInstruction[misfireInstructionKey]);
}
}
class SimpleTriggerReactiveForm {
triggerName: string;
jobClass: string;
triggerPeriod: {
startDate?;
endDate?;
} = {};
triggerRecurrence: {
repeatCount?: number;
repeatInterval?: number;
} = {};
misfireInstruction: string;
}

View File

@@ -0,0 +1 @@
export * from './trigger-list.component'

View File

@@ -0,0 +1,17 @@
<mat-card fxFlex="1 1 auto" style="padding-left: 0; padding-right: 0">
<mat-card-header fxLayout="row" fxLayoutAlign="space-between none" style="padding-right: 1em;" >
<mat-card-subtitle><b>TRIGGERS</b></mat-card-subtitle>
<button *ngIf="!triggerFormIsOpen" mat-raised-button style="top: -0.5em" color="primary" (click)="onNewTriggerBtnClicked()">
new
</button>
</mat-card-header>
<mat-divider></mat-divider>
<mat-card-content style="position: relative; height: 100%">
<mat-nav-list style="overflow-y: auto; position: absolute; left: 0; right: 0; top: 0; bottom: 0; overflow: auto; height: calc(100% - 3em)">
<mat-list-item *ngFor="let triggerKey of getTriggerKeyList()" class="triggerItemList"
[ngClass]="{'selectedTrigger': selectedTrigger && selectedTrigger.name==triggerKey.name}">
<a matLine>{{ triggerKey.name }}</a>
</mat-list-item>
</mat-nav-list>
</mat-card-content>
</mat-card>

View File

@@ -0,0 +1,25 @@
/* ===== Scrollbar CSS ===== */
/* Firefox */
* {
scrollbar-width: auto;
scrollbar-color: #b8b8b8 #ffffff;
}
/* Chrome, Edge, and Safari */
*::-webkit-scrollbar {
width: 16px;
}
*::-webkit-scrollbar-track {
background: #ffffff;
}
*::-webkit-scrollbar-thumb {
background-color: #b8b8b8;
border-radius: 10px;
border: 3px solid #ffffff;
}
.selectedTrigger{
background-color: #dddddd;
}

View File

@@ -0,0 +1,86 @@
import {async, ComponentFixture, TestBed} from '@angular/core/testing';
import {ApiService, ConfigService, CONTEXT_PATH, TriggerService} from '../../services';
import {HttpClient} from '@angular/common/http';
import {HttpClientTestingModule, HttpTestingController} from '@angular/common/http/testing';
import {RouterTestingModule} from '@angular/router/testing';
import {DebugElement} from '@angular/core';
import {By} from '@angular/platform-browser';
import {MatCardModule} from '@angular/material/card';
import {MatIconModule} from '@angular/material/icon';
import {MatDividerModule} from '@angular/material/divider';
import {TriggerListComponent} from './trigger-list.component';
import {MatListModule} from '@angular/material/list';
import {TriggerKey} from '../../model/triggerKey.model';
import {MatDialogModule} from '@angular/material/dialog';
describe('TriggerListComponent', () => {
let component: TriggerListComponent;
let fixture: ComponentFixture<TriggerListComponent>;
let httpClient: HttpClient;
let httpTestingController: HttpTestingController;
beforeEach(async(() => {
TestBed.configureTestingModule({
imports: [MatCardModule, MatDialogModule, MatDividerModule,
MatIconModule, MatListModule, HttpClientTestingModule, RouterTestingModule],
declarations: [TriggerListComponent],
providers: [TriggerService, ApiService, ConfigService]
}).compileComponents();
httpClient = TestBed.inject(HttpClient);
httpTestingController = TestBed.inject(HttpTestingController);
}));
beforeEach(() => {
fixture = TestBed.createComponent(TriggerListComponent);
component = fixture.componentInstance;
fixture.detectChanges();
});
it('should select the first trigger of the list', () => {
expect(component).toBeDefined();
let actualSelectedTrigger: TriggerKey;
component.onSelectedTrigger.subscribe(selectedTrigger => actualSelectedTrigger = selectedTrigger);
const getTriggerListReq = httpTestingController.expectOne(`${CONTEXT_PATH}/triggers`);
const mockExistingTriggers = new Array<TriggerKey>();
const firstTriggerKey = new TriggerKey('trigger1', 'group1');
mockExistingTriggers.push(firstTriggerKey);
const secondTriggerKey = new TriggerKey('trigger2', 'group2');
mockExistingTriggers.push(secondTriggerKey);
getTriggerListReq.flush(mockExistingTriggers);
fixture.detectChanges();
const triggerListComponentDe: DebugElement = fixture.debugElement;
const triggerItemList = triggerListComponentDe.queryAll(By.css('.triggerItemList'));
expect(triggerItemList.length).toEqual(2);
expect(actualSelectedTrigger).toEqual(firstTriggerKey);
});
it('should open the trigger form if the trigger list is empty', () => {
expect(component).toBeDefined();
let actualSelectedTrigger: TriggerKey;
component.onSelectedTrigger.subscribe(selectedTrigger => actualSelectedTrigger = selectedTrigger);
let expectedOpenedNewTriggerFormEvent: boolean;
component.onNewTriggerClicked.subscribe(() => expectedOpenedNewTriggerFormEvent = true);
const getTriggerListReq = httpTestingController.expectOne(`${CONTEXT_PATH}/triggers`);
getTriggerListReq.flush(new Array<TriggerKey>());
fixture.detectChanges();
const triggerListComponentDe: DebugElement = fixture.debugElement;
const triggerItemList = triggerListComponentDe.queryAll(By.css('.triggerItemList'));
expect(triggerItemList.length).toEqual(0);
expect(expectedOpenedNewTriggerFormEvent).toBeTruthy();
expect(actualSelectedTrigger).toBeUndefined();
});
});

View File

@@ -0,0 +1,85 @@
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';
@Component({
template: 'Multiple jobs not supported yet - Coming Soon...',
})
// tslint:disable-next-line:component-class-suffix
export class UnsupportedMultipleJobsDialog {
}
@Component({
selector: 'qrzmng-trigger-list',
templateUrl: './trigger-list.component.html',
styleUrls: ['./trigger-list.component.scss']
})
export class TriggerListComponent implements OnInit {
newTriggers: Array<SimpleTrigger> = new Array<SimpleTrigger>();
loading = true;
triggerKeys: Array<TriggerKey> = new Array<TriggerKey>();
@Output() onNewTriggerClicked = new EventEmitter<void>();
triggerFormIsOpen = false;
selectedTrigger: TriggerKey;
@Output() onSelectedTrigger = new EventEmitter<TriggerKey>();
constructor(
private triggerService: TriggerService,
public dialog: MatDialog
) {
}
ngOnInit() {
this.loading = true;
this.fetchTriggers();
}
@Input()
set openedNewTriggerForm(triggerFormIsOpen: boolean) {
this.triggerFormIsOpen = triggerFormIsOpen;
}
getTriggerKeyList = () => {
const newTriggerKeys = this.newTriggers.map(simpleTrigger => simpleTrigger.triggerKeyDTO);
return newTriggerKeys.concat(this.triggerKeys);
}
private fetchTriggers() {
this.triggerService.fetchTriggers()
.subscribe((triggerKeys: Array<TriggerKey>) => {
this.triggerKeys = triggerKeys;
if (!triggerKeys || triggerKeys.length === 0) {
this.onNewTriggerBtnClicked();
} else {
this.selectTrigger(this.triggerKeys[0]);
}
})
}
selectTrigger(triggerKey: TriggerKey) {
this.selectedTrigger = triggerKey;
this.onSelectedTrigger.emit(triggerKey);
}
onNewTriggerBtnClicked() {
if (this.triggerKeys && this.triggerKeys.length > 0) {
this.dialog.open(UnsupportedMultipleJobsDialog)
} else {
this.onNewTriggerClicked.emit();
}
}
onNewTrigger(newTrigger: SimpleTrigger) {
this.newTriggers = [newTrigger, ...this.newTriggers];
this.selectedTrigger = newTrigger.triggerKeyDTO;
}
}

View File

@@ -1,105 +0,0 @@
import { TestBed, async, inject } from '@angular/core/testing';
import { Router } from '@angular/router';
import { NO_AUTH, UserService } from '../services';
import { AdminGuard } from './admin.guard';
import {jest} from '@jest/globals'
export class RouterStub {
navigate(commands?: any[], extras?: any) {}
}
const RouterSpy = jest.spyOn(RouterStub.prototype, 'navigate');
const MockUserServiceNoAuth = jest.fn(() => ({currentUser: NO_AUTH}));
const MockUserService = jest.fn(() => ({
currentUser: {
authorities: ['ROLE_ADMIN']
}
}));
const MockUserServiceForbidden = jest.fn(() => ({
currentUser: {
authorities: ['ROLE_GUEST']
}
}));
describe('AdminGuard NoAuth', () => {
beforeEach(() => {
TestBed.configureTestingModule({
providers: [
AdminGuard,
{
provide: Router,
useClass: RouterStub
},
{
provide: UserService,
useClass: MockUserServiceNoAuth
}
]
});
});
it('should run', inject([AdminGuard], (guard: AdminGuard) => {
expect(guard).toBeTruthy();
}));
it('returns true if user is NO_AUTH',inject([AdminGuard], (guard: AdminGuard) => {
expect(guard.canActivate(null, null)).toBeTruthy();
}));
});
describe('AdminGuard activates the route', () => {
beforeEach(() => {
TestBed.configureTestingModule({
providers: [
AdminGuard,
{
provide: Router,
useClass: RouterStub
},
{
provide: UserService,
useClass: MockUserService
}
]
});
});
it('should run', inject([AdminGuard], (guard: AdminGuard) => {
expect(guard).toBeTruthy();
}));
it('returns true if user has admin role',inject([AdminGuard], (guard: AdminGuard) => {
expect(guard.canActivate(null, null)).toBeTruthy();
}));
});
describe('AdminGuard redirects to 403', () => {
beforeEach(() => {
TestBed.configureTestingModule({
providers: [
AdminGuard,
{
provide: Router,
useClass: RouterStub
},
{
provide: UserService,
useClass: MockUserServiceForbidden
}
]
});
});
it('should run', inject([AdminGuard], (guard: AdminGuard) => {
expect(guard).toBeTruthy();
}));
it('returns false if user is not authorized',inject([AdminGuard], (guard: AdminGuard) => {
expect(guard.canActivate(null, null)).toBeFalsy();
expect(RouterSpy).toHaveBeenCalledTimes(1);
}));
});

View File

@@ -1,25 +1,29 @@
import { Injectable } from '@angular/core';
import { Router, CanActivate, ActivatedRouteSnapshot, RouterStateSnapshot } from '@angular/router';
import { UserService } from '../services';
import { Observable } from 'rxjs';
import {Injectable} from '@angular/core';
import {Router, CanActivate, ActivatedRouteSnapshot, RouterStateSnapshot} from '@angular/router';
import {UserService} from '../services';
import {Observable} from 'rxjs';
@Injectable()
export class AdminGuard implements CanActivate {
constructor(private router: Router, private userService: UserService) {}
constructor(private router: Router, private userService: UserService) {
}
canActivate(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): boolean {
if (this.userService.isAnAnonymousUser) {
return true;
}
if (this.userService.currentUser) {
if(this.userService.currentUser === 'NO_AUTH')
return true;
if (JSON.stringify(this.userService.currentUser.authorities).search('ROLE_ADMIN') !== -1)
return true;
else {
this.router.navigate(['/403']);
return false;
}
return true;
// to be enable again in the scope of the card #65
// if (JSON.stringify(this.userService.currentUser.authorities).search('ROLE_ADMIN') !== -1) {
// return true;
// } else {
// this.router.navigate(['/403']);
// return false;
// }
} else {
console.log('NOT AN ADMIN ROLE');
this.router.navigate(['/login'], { queryParams: { returnUrl: state.url }});
this.router.navigate(['/login'], {queryParams: {returnUrl: state.url}});
return false;
}
}

View File

@@ -1,4 +1,7 @@
export class SocketEndpoint{
client : any
stomp : any
}
import SockJS from 'sockjs-client';
import Stomp from 'stompjs';
export class SocketEndpoint {
client: SockJS;
stomp: Stomp;
}

View File

@@ -1,17 +1,20 @@
export class SocketOption{
socketUrl : string;
topicName : string;
brokerName : string;
reconnectionTimeout : number = 30000
export class SocketOption {
socketUrl: string;
topicName: string;
brokerName: string;
reconnectionTimeout = 30000
getAccessToken: Function = () => null;
getAccessToken: Function = () => null;
constructor(socketUrl : string, topicName : string, getAccessToken?: Function, brokerName : string = null, reconnectionTimeout : number = 30000){
this.socketUrl = socketUrl;
this.topicName = topicName;
this.brokerName = brokerName;
this.reconnectionTimeout = reconnectionTimeout;
this.getAccessToken = getAccessToken || (() => null);
}
}
constructor(socketUrl: string,
topicName: string,
getAccessToken?: Function,
brokerName: string = null,
reconnectionTimeout: number = 30000) {
this.socketUrl = socketUrl;
this.topicName = topicName;
this.brokerName = brokerName;
this.reconnectionTimeout = reconnectionTimeout;
this.getAccessToken = getAccessToken || (() => null);
}
}

View File

@@ -0,0 +1,4 @@
export class JobDetail {
jobClassName: string;
description: string;
}

View File

@@ -0,0 +1,4 @@
export class JobKeyModel {
name: string;
group: string;
}

View File

@@ -0,0 +1,56 @@
export enum MisfireInstruction {
MISFIRE_INSTRUCTION_FIRE_NOW = 1,
MISFIRE_INSTRUCTION_RESCHEDULE_NOW_WITH_EXISTING_REPEAT_COUNT = 2,
MISFIRE_INSTRUCTION_RESCHEDULE_NOW_WITH_REMAINING_REPEAT_COUNT = 3 ,
MISFIRE_INSTRUCTION_RESCHEDULE_NEXT_WITH_REMAINING_COUNT = 4,
MISFIRE_INSTRUCTION_RESCHEDULE_NEXT_WITH_EXISTING_COUNT = 5
}
export function getMisfireInstructionByIndex(index: number) {
return Object.keys(MisfireInstruction)[index];
}
// function enumFromStringValue<T> (enm: { [s: string]: T}, value: string): T | undefined {
// return (Object.values(enm) as unknown as string[]).includes(value)
// ? value as unknown as T
// : undefined;
// }
//
// export function parseMisfireInstruction(str: string): MisfireInstruction {
// return enumFromStringValue<MisfireInstruction>(MisfireInstruction, str);
// // return (<any>MisfireInstruction)[str]
// // const indexOfStr = Object.values(MisfireInstruction).indexOf(str as unknown as MisfireInstruction);
// // const key = Object.keys(Sizes)[indexOfStr];
// // return MisfireInstruction[k]
// // return Object.values(MisfireInstruction).find(val => val === str);
// }
export const MisfireInstructionCaption = new Map<number, string>([
[MisfireInstruction.MISFIRE_INSTRUCTION_FIRE_NOW,
`The job is executed immediately after the scheduler discovers misfire situation.<br/>
In case of the trigger has been set with a repeat count, this policy is equals to RESCHEDULE NOW WITH REMAINING REPEAT COUNT`
],
[MisfireInstruction.MISFIRE_INSTRUCTION_RESCHEDULE_NOW_WITH_EXISTING_REPEAT_COUNT,
`First misfired trigger is executed immediately. Then the scheduler waits desired interval and executes all remaining triggers.<br/>
Effectively the first fire time of the misfired trigger is moved to current time with no other changes.`
],
[MisfireInstruction.MISFIRE_INSTRUCTION_RESCHEDULE_NOW_WITH_REMAINING_REPEAT_COUNT,
`First misfired execution runs immediately. Remaining misfired executions are discarded. Remaining not-yet-fired triggers are executed
with desired interval, starting from the recovered misfired execution.<br/>
Use this policy if your constraint is to honor the end date time.<br/>
<strong>Warning</strong> The actual number of job executions could be less than initially set,
because some of the misfired triggers are ignored. The end date time you set is always `
],
[MisfireInstruction.MISFIRE_INSTRUCTION_RESCHEDULE_NEXT_WITH_REMAINING_COUNT,
`In case of misfire event, the scheduler won't do anything immediately. Instead it will wait for next scheduled time the trigger and
run all triggers with scheduled interval. Misfired trigger are simply post-poned but not ignored.<br/>
Use this policy if your constraint is to execute the job for the all times equals to the repeation counter.<br/>' +
'<strong>Warning</strong> The scheduler can completed over the end date time you set `],
[MisfireInstruction.MISFIRE_INSTRUCTION_RESCHEDULE_NEXT_WITH_EXISTING_COUNT,
`In case of misfire event, the trigger is re-scheduled to the next scheduled time after 'now'
with the repeat count set to what it would be if it had not missed any firings.<br/>
Use this policy if no jobs must run after the end date time.<br/>
<strong>Warning</strong> The actual number of job executions could be less than initially set, because the misfired trigger are ignored.<br/>
This policy could cause the Trigger to go directly to the 'COMPLETE' state if all fire-times where missed.`
]
]);

View File

@@ -0,0 +1,15 @@
import {TriggerKey} from './triggerKey.model';
export class Scheduler {
name: string;
instanceId: string;
status: string;
triggerKeys: TriggerKey[];
constructor(name: string, instanceId: string, status: string, triggerKeys: TriggerKey[]) {
this.name = name;
this.status = status;
this.instanceId = instanceId;
this.triggerKeys = triggerKeys;
}
}

View File

@@ -1,11 +0,0 @@
export class SchedulerConfig {
triggerPerDay : number = 0
maxCount : number = 0
constructor(triggerPerDay = 0, maxCount = 0) {
this.triggerPerDay = triggerPerDay
this.maxCount = maxCount
}
}

View File

@@ -0,0 +1,9 @@
export class SimpleTriggerCommand {
triggerName: string;
jobClass: string;
startDate: Date;
endDate: Date;
repeatCount: number;
repeatInterval: number;
misfireInstruction: string;
}

View File

@@ -0,0 +1,11 @@
import {Moment} from 'moment/moment';
export class SimpleTriggerForm {
triggerName: string;
jobClass: string;
startDate: Moment;
endDate: Moment;
repeatCount: number;
repeatInterval: number;
misfireInstruction: string;
}

View File

@@ -0,0 +1,7 @@
import {Trigger} from './trigger.model';
export class SimpleTrigger extends Trigger {
repeatCount: number;
repeatInterval: number;
timesTriggered: number;
}

View File

@@ -0,0 +1,10 @@
export default class TriggerFiredBundle {
timesTriggered: number;
repeatCount: number;
finalFireTime: string;
nextFireTime: string;
previousFireTime: string;
jobKey: string;
jobClass: string;
percentage: number;
}

View File

@@ -0,0 +1,17 @@
import {TriggerKey} from './triggerKey.model';
import {JobKeyModel} from './jobKey.model';
import {JobDetail} from './jobDetail.model';
export class Trigger {
triggerKeyDTO: TriggerKey = new TriggerKey();
priority: number;
startTime: Date;
description: string;
endTime: Date;
finalFireTime: Date;
misfireInstruction: number;
nextFireTime: Date;
jobKeyDTO: JobKeyModel;
jobDetailDTO: JobDetail = new JobDetail();
mayFireAgain: boolean;
}

View File

@@ -0,0 +1,9 @@
export class TriggerKey {
name: string;
group: string;
constructor(name?: string, group?: string) {
this.name = name;
this.group = group;
}
}

View File

@@ -1,83 +1,83 @@
import { TestBed } from "@angular/core/testing";
import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing';
import { ApiService } from './api.service';
import { HttpClient, HttpHeaders } from '@angular/common/http';
import { Router} from '@angular/router';
import {TestBed} from '@angular/core/testing';
import {HttpClientTestingModule, HttpTestingController} from '@angular/common/http/testing';
import {ApiService} from './api.service';
import {HttpClient, HttpHeaders} from '@angular/common/http';
import {Router} from '@angular/router';
import {jest} from '@jest/globals'
class Data{
name: string
class Data {
name: string
}
class HttpResponseMock {
constructor(
public body: unknown,
public opts?: {
headers?:
| HttpHeaders
| {
[name: string]: string | string[];
};
status?: number;
statusText?: string;
}
) {}
constructor(
public body: unknown,
public opts?: {
headers?:
| HttpHeaders
| {
[name: string]: string | string[];
};
status?: number;
statusText?: string;
}
) {
}
}
const routerSpy = jest.spyOn(Router.prototype, 'navigateByUrl');
describe('ApiServiceTest', () => {
let apiService: ApiService;
let httpClient: HttpClient;
let httpTestingController: HttpTestingController;
let apiService: ApiService;
let httpClient: HttpClient;
let httpTestingController: HttpTestingController;
const SAMPLE_URL = '/sample-url';
const URL_401 = '/url-response-401';
const testData: Data = {name: 'Test Data'};
const SAMPLE_URL = '/sample-url';
const URL_401 = '/url-response-401';
const testData: Data = {name: 'Test Data'};
beforeEach(() => {
beforeEach(() => {
TestBed.configureTestingModule({
imports: [HttpClientTestingModule],
providers: [ApiService, {provide: Router, useValue: routerSpy}]
});
apiService = TestBed.inject(ApiService);
TestBed.configureTestingModule({
imports: [HttpClientTestingModule],
providers: [ApiService, {provide: Router, useValue: routerSpy}]
});
apiService = TestBed.inject(ApiService);
httpClient = TestBed.inject(HttpClient);
httpTestingController = TestBed.inject(HttpTestingController);
httpClient = TestBed.inject(HttpClient);
httpTestingController = TestBed.inject(HttpTestingController);
});
it('should be created', (): void => {
expect(apiService).toBeTruthy();
});
it('can test HttpClient.get', (): void => {
apiService.get(SAMPLE_URL).subscribe((res: Data) => {
expect(res).toEqual(testData);
});
it('should be created', (): void => {
expect(apiService).toBeTruthy();
const req = httpTestingController.expectOne(SAMPLE_URL)
expect(req.request.method).toEqual('GET');
req.flush(new HttpResponseMock(testData));
httpTestingController.verify();
});
it('doesn\'t do anything if 401 is received', (): void => {
apiService.get(URL_401).subscribe((res: Data) => {
expect(false);
}, (error) => {
expect(error.status).toBe(401);
expect(routerSpy).toHaveBeenCalledTimes(1);
});
it('can test HttpClient.get', (): void => {
const req = httpTestingController.expectOne(URL_401)
expect(req.request.method).toEqual('GET');
req.flush(null, {status: 401, statusText: 'unauthenticated'});
httpTestingController.verify();
});
apiService.get(SAMPLE_URL).subscribe((res: Data) => {
expect(res).toEqual(testData);
});
const req = httpTestingController.expectOne(SAMPLE_URL)
expect(req.request.method).toEqual('GET');
req.flush(new HttpResponseMock(testData));
httpTestingController.verify();
});
it('doesn\'t do anything if 401 is received', (): void => {
apiService.get(URL_401).subscribe((res: Data) => {
expect(false);
}, (error) =>
{
expect(error.status).toBe(401);
expect(routerSpy).toHaveBeenCalledTimes(1);
});
const req = httpTestingController.expectOne(URL_401)
expect(req.request.method).toEqual('GET');
req.flush(null, {status: 401, statusText: 'unauthenticated'});
httpTestingController.verify();
});
});
});

View File

@@ -1,9 +1,9 @@
import { HttpClient, HttpHeaders, HttpResponse, HttpRequest, HttpEventType, HttpParams } from '@angular/common/http';
import { Router} from '@angular/router';
import { Injectable } from '@angular/core';
import { Observable } from 'rxjs';
import { catchError, map, filter, tap } from 'rxjs/operators'
import { serialize } from '../shared/utilities/serialize';
import {HttpClient, HttpHeaders, HttpResponse, HttpRequest, HttpEventType, HttpParams} from '@angular/common/http';
import {Router} from '@angular/router';
import {Injectable} from '@angular/core';
import {Observable} from 'rxjs';
import {catchError, map, filter, tap} from 'rxjs/operators'
import {serialize} from '../shared/utilities/serialize';
export enum RequestMethod {
Get = 'GET',
@@ -18,17 +18,6 @@ export enum RequestMethod {
@Injectable()
export class ApiService {
private static extractTokenFromHttpResponse(res: HttpResponse<any>): string {
let authorization: string = null;
let headers: HttpHeaders = res.headers;
if (headers && headers.has('Authorization')){
authorization = headers.get('Authorization');
if(authorization.startsWith('Bearer '))
authorization = authorization.substring(7);
}
return authorization;
}
headers = new HttpHeaders({
'Accept': 'application/json',
'Content-Type': 'application/json'
@@ -36,7 +25,20 @@ export class ApiService {
private jwtToken: string;
constructor( private http: HttpClient, private router: Router) { }
private static extractTokenFromHttpResponse(res: HttpResponse<any>): string {
let authorization: string = null;
const headers: HttpHeaders = res.headers;
if (headers && headers.has('Authorization')) {
authorization = headers.get('Authorization');
if (authorization.startsWith('Bearer ')) {
authorization = authorization.substring(7);
}
}
return authorization;
}
constructor(private http: HttpClient, private router: Router) {
}
setToken(token: string) {
this.jwtToken = token;
@@ -50,8 +52,9 @@ export class ApiService {
withCredentials: true
};
if (args)
if (args) {
options['params'] = serialize(args);
}
return this.http.get(path, options)
.pipe(catchError(this.checkError.bind(this)));
@@ -73,20 +76,21 @@ export class ApiService {
const options = {
headers: customHeaders || this.headers,
withCredentials: true
}
}
const req = new HttpRequest(method, path, body, options);
return this.http.request(req)
.pipe(
filter(response => response instanceof HttpResponse),
tap((resp: HttpResponse<any>) => {
let jwtToken = ApiService.extractTokenFromHttpResponse(resp);
if(jwtToken)
this.setToken(jwtToken);
}),
map((response: HttpResponse<any>) => response.body),
catchError(error => this.checkError(error))
filter(response => response instanceof HttpResponse),
tap((resp: HttpResponse<any>) => {
const jwtToken = ApiService.extractTokenFromHttpResponse(resp);
if (jwtToken) {
this.setToken(jwtToken);
}
}),
map((response: HttpResponse<any>) => response.body),
catchError(error => this.checkError(error))
)
}
@@ -100,6 +104,5 @@ export class ApiService {
throw error;
}
}

View File

@@ -1,9 +1,9 @@
import { Injectable } from '@angular/core';
import { HttpHeaders, HttpResponse } from '@angular/common/http';
import { ApiService } from './api.service';
import { UserService } from './user.service';
import { ConfigService } from './config.service';
import { map } from 'rxjs/operators';
import {Injectable} from '@angular/core';
import {HttpHeaders, HttpResponse} from '@angular/common/http';
import {ApiService} from './api.service';
import {UserService} from './user.service';
import {ConfigService} from './config.service';
import {map} from 'rxjs/operators';
@Injectable()
export class AuthService {
@@ -12,7 +12,8 @@ export class AuthService {
private apiService: ApiService,
private userService: UserService,
private config: ConfigService,
) { }
) {
}
login(user) {
const loginHeaders = new HttpHeaders({
@@ -21,24 +22,14 @@ export class AuthService {
});
const body = `username=${user.username}&password=${user.password}`;
return this.apiService.post(this.config.login_url, body, loginHeaders)
.pipe(
map(() => {
console.log("Login success");
this.userService.getMyInfo().subscribe();
})
);
.pipe(
map(() => {
console.log('Login success');
this.userService.getUserInfo().subscribe();
})
);
}
signup(user){
const signupHeaders = new HttpHeaders({
'Accept': 'application/json',
'Content-Type': 'application/json'
});
return this.apiService.post(this.config.signup_url, JSON.stringify(user), signupHeaders).pipe(map(() =>{
console.log("Sign up success");
}));
}
logout() {
return this.apiService.post(this.config.logout_url, {})
.pipe(map(() => {
@@ -47,9 +38,4 @@ export class AuthService {
}));
}
changePassword(passwordChanger) {
return this.apiService.post(this.config.change_password_url, passwordChanger);
}
}

View File

@@ -1,79 +1,57 @@
import { Injectable } from '@angular/core';
import { environment } from '../../environments/environment';
import {Injectable} from '@angular/core';
import {environment} from '../../environments/environment';
const WEBJAR_PATH = '/quartz-manager-ui/';
export function getHtmlBaseUrl(){
const baseUrl = getBaseUrl() || '/';
return environment.production ? getBaseUrl() + WEBJAR_PATH: '/';
}
export const CONTEXT_PATH = '/quartz-manager';
export function getBaseUrl(){
if(environment.production){
let contextPath: string = window.location.pathname.split('/')[1] || '';
if(contextPath && ('/' + contextPath + '/') === WEBJAR_PATH)
return '';
if(contextPath)
contextPath = '/' + contextPath;
return contextPath;
}
return '';
export function getHtmlBaseUrl() {
const baseUrl = getBaseUrl() || '/';
return environment.production ? getBaseUrl() + WEBJAR_PATH : '/';
}
export function getBaseUrl() {
if (environment.production) {
let contextPath: string = window.location.pathname.split('/')[1] || '';
if (contextPath && ('/' + contextPath + '/') === WEBJAR_PATH) {
return '';
}
if (contextPath) {
contextPath = '/' + contextPath;
}
return contextPath;
}
return '';
}
@Injectable()
export class ConfigService {
private _api_url = getBaseUrl() + '/quartz-manager/api'
private _auth_url = getBaseUrl() + `${CONTEXT_PATH}/auth`
private _refresh_token_url = this._api_url + '/refresh';
private _refresh_token_url = this._auth_url + '/refresh';
private _login_url = this._api_url + '/login';
private _login_url = this._auth_url + '/login';
private _logout_url = this._api_url + '/logout';
private _logout_url = this._auth_url + '/logout';
private _change_password_url = this._api_url + '/changePassword';
private _whoami_url = this._api_url + '/whoami';
private _user_url = this._api_url + '/user';
private _users_url = this._user_url + '/all';
private _reset_credentials_url = this._user_url + '/reset-credentials';
private _signup_url = this._api_url + '/signup';
get reset_credentials_url(): string {
return this._reset_credentials_url;
}
private _whoami_url = this._auth_url + '/whoami';
get refresh_token_url(): string {
return this._refresh_token_url;
return this._refresh_token_url;
}
get whoami_url(): string {
return this._whoami_url;
}
get users_url(): string {
return this._users_url;
return this._whoami_url;
}
get login_url(): string {
return this._login_url;
return this._login_url;
}
get logout_url(): string {
return this._logout_url;
}
get change_password_url(): string {
return this._change_password_url;
}
get signup_url():string {
return this._signup_url;
return this._logout_url;
}
}

View File

@@ -6,4 +6,7 @@ export * from './scheduler.service';
export * from './websocket.service';
export * from './progress.websocket.service';
export * from './logs.websocket.service';
export * from './trigger.service'
export * from './job.service'

View File

@@ -0,0 +1,18 @@
import {Injectable} from '@angular/core';
import {ApiService} from './api.service';
import {CONTEXT_PATH, getBaseUrl} from './config.service';
import {Observable} from 'rxjs';
@Injectable()
export default class JobService {
constructor(
private apiService: ApiService
) {
}
fetchJobs = (): Observable<string[]> => {
return this.apiService.get(getBaseUrl() + `${CONTEXT_PATH}/jobs`)
}
}

View File

@@ -1,12 +1,12 @@
import { Injectable } from '@angular/core';
import { WebsocketService, ApiService, getBaseUrl } from '.';
import { SocketOption } from '../model/SocketOption.model';
import {Injectable} from '@angular/core';
import {WebsocketService, ApiService, getBaseUrl, CONTEXT_PATH} from '.';
import {SocketOption} from '../model/SocketOption.model';
@Injectable()
export class LogsWebsocketService extends WebsocketService {
constructor(private apiService: ApiService){
super(new SocketOption( getBaseUrl() +'/quartz-manager/logs', '/topic/logs', apiService.getToken))
}
constructor(private apiService: ApiService) {
super(new SocketOption(getBaseUrl() + `${CONTEXT_PATH}/logs`, '/topic/logs', apiService.getToken))
}
}
}

View File

@@ -1,12 +1,12 @@
import { Injectable } from '@angular/core';
import { WebsocketService, ApiService, getBaseUrl } from '.';
import { SocketOption } from '../model/SocketOption.model';
import {Injectable} from '@angular/core';
import {WebsocketService, ApiService, getBaseUrl, CONTEXT_PATH} from '.';
import {SocketOption} from '../model/SocketOption.model';
@Injectable()
export class ProgressWebsocketService extends WebsocketService {
constructor(private apiService: ApiService){
super(new SocketOption(getBaseUrl() + '/quartz-manager/progress', '/topic/progress', apiService.getToken))
}
constructor(private apiService: ApiService) {
super(new SocketOption(getBaseUrl() + `${CONTEXT_PATH}/progress`, '/topic/progress', apiService.getToken))
}
}
}

View File

@@ -1,6 +1,11 @@
import { Injectable } from '@angular/core';
import { getBaseUrl } from '.';
import { ApiService } from './api.service';
import {Injectable} from '@angular/core';
import {CONTEXT_PATH, getBaseUrl} from '.';
import {ApiService} from './api.service';
import {Trigger} from '../model/trigger.model';
import {Observable} from 'rxjs';
import {SimpleTriggerCommand} from '../model/simple-trigger.command';
import {Scheduler} from '../model/scheduler.model';
@Injectable()
export class SchedulerService {
@@ -9,31 +14,41 @@ export class SchedulerService {
private apiService: ApiService
) { }
startScheduler = () => {
return this.apiService.get(getBaseUrl() + '/quartz-manager/scheduler/run')
startScheduler = (): Observable<void> => {
return this.apiService.get(getBaseUrl() + `${CONTEXT_PATH}/scheduler/run`);
}
stopScheduler = () => {
return this.apiService.get(getBaseUrl() + '/quartz-manager/scheduler/stop')
stopScheduler = (): Observable<void> => {
return this.apiService.get(getBaseUrl() + `${CONTEXT_PATH}/scheduler/stop`);
}
pauseScheduler = () => {
return this.apiService.get(getBaseUrl() + '/quartz-manager/scheduler/pause')
pauseScheduler = (): Observable<void> => {
return this.apiService.get(getBaseUrl() + `${CONTEXT_PATH}/scheduler/pause`);
}
resumeScheduler = () => {
return this.apiService.get(getBaseUrl() + '/quartz-manager/scheduler/resume')
resumeScheduler = (): Observable<void> => {
return this.apiService.get(getBaseUrl() + `${CONTEXT_PATH}/scheduler/resume`);
}
getStatus = () => {
return this.apiService.get(getBaseUrl() + '/quartz-manager/scheduler')
return this.apiService.get(getBaseUrl() + `${CONTEXT_PATH}/scheduler/status`);
}
getConfig = () => {
return this.apiService.get(getBaseUrl() + '/quartz-manager/scheduler/config')
getScheduler = (): Observable<Scheduler> => {
return this.apiService.get(getBaseUrl() + `${CONTEXT_PATH}/scheduler`);
}
updateConfig = (config: Object) => {
return this.apiService.post(getBaseUrl() + '/quartz-manager/scheduler/config', config)
getSimpleTriggerConfig = (triggerName: string): Observable<Trigger> => {
return this.apiService.get(getBaseUrl() + `${CONTEXT_PATH}/simple-triggers/${triggerName}`);
}
saveSimpleTriggerConfig = (config: SimpleTriggerCommand) => {
return this.apiService.post(getBaseUrl() + `${CONTEXT_PATH}/simple-triggers/${config.triggerName}`, config)
}
updateSimpleTriggerConfig = (config: SimpleTriggerCommand) => {
return this.apiService.put(getBaseUrl() + `${CONTEXT_PATH}/simple-triggers/${config.triggerName}`, config)
}
}

View File

@@ -0,0 +1,20 @@
import {ApiService} from './api.service';
import {Injectable} from '@angular/core';
import {Observable} from 'rxjs';
import {Trigger} from '../model/trigger.model';
import {TriggerKey} from '../model/triggerKey.model';
import {CONTEXT_PATH, getBaseUrl} from './config.service';
@Injectable()
export class TriggerService {
constructor(
private apiService: ApiService) {
}
fetchTriggers = (): Observable<Array<TriggerKey>> => {
return this.apiService.get(getBaseUrl() + `${CONTEXT_PATH}/triggers`);
}
}

View File

@@ -1,55 +1,55 @@
import { Injectable } from '@angular/core';
import { ApiService } from './api.service';
import { ConfigService } from './config.service';
import {Injectable} from '@angular/core';
import {ApiService} from './api.service';
import {ConfigService} from './config.service';
import { map } from 'rxjs/operators'
export const NO_AUTH: string = 'NO_AUTH'
import {map} from 'rxjs/operators'
import {HttpErrorResponse} from '@angular/common/http';
import {Router} from '@angular/router';
@Injectable()
export class UserService {
currentUser;
isAnAnonymousUser: boolean;
currentUser: any;
constructor(
private apiService: ApiService,
private config: ConfigService
) { }
private config: ConfigService,
private router: Router
) {
}
jwtInitUser() {
const promise = this.apiService.get(this.config.refresh_token_url).toPromise()
.then(res => {
if (res.access_token !== null) {
return this.getMyInfo().toPromise()
.then(user => {
this.currentUser = user;
});
refreshToken() {
this.apiService.get(this.config.refresh_token_url).subscribe(res => {
if (res.accessToken !== null) {
return this.getUserInfo().toPromise()
.then(user => {
this.currentUser = user;
});
}
})
}
fetchLoggedUser() {
this.getUserInfo().subscribe(user => {
this.currentUser = user;
this.router.initialNavigation();
}, err => {
console.log(`error retrieving current user due to ` + JSON.stringify(err));
const httpErrorResponse = err as HttpErrorResponse;
if (httpErrorResponse.status === 404) {
this.isAnAnonymousUser = true;
this.router.initialNavigation();
return;
}
})
.catch(() => null);
return promise;
if (httpErrorResponse.status < 200 || httpErrorResponse.status > 399)
this.router.navigateByUrl('/error');
});
}
jsessionInitUser() {
return this.getMyInfo().toPromise()
.then(user => {
this.currentUser = user;
}, err => {
//not logged
console.log(`error retrieving current user due to ` + err);
});
}
resetCredentials() {
return this.apiService.get(this.config.reset_credentials_url);
}
getMyInfo() {
return this.apiService.get(this.config.whoami_url).pipe(map(user => this.currentUser = user));
}
getAll() {
return this.apiService.get(this.config.users_url);
getUserInfo() {
return this.apiService.get(this.config.whoami_url)
.pipe(map(user => this.currentUser = user));
}
}

View File

@@ -1,125 +1,136 @@
import { Observable } from 'rxjs';
import { SocketEndpoint } from '../model/SocketEndpoint.model'
import {Observable, Subscriber} from 'rxjs';
import {SocketEndpoint} from '../model/SocketEndpoint.model'
import Stomp from 'stompjs';
import SockJS from 'sockjs-client';
import { SocketOption } from '../model/SocketOption.model';
import {SocketOption} from '../model/SocketOption.model';
interface WebsocketSubscriber {
index: number,
observer: Subscriber<any>
}
export interface QuartzManagerWebsocketMessage {
type: string;
message: any;
headers: any;
self: boolean;
}
export class WebsocketService {
_options : SocketOption;
_options: SocketOption;
_socket : SocketEndpoint = new SocketEndpoint();
observableStompConnection : Observable<any>;
subscribers : Array<any> = [];
subscriberIndex : number = 0;
_socket: SocketEndpoint = new SocketEndpoint();
_messageIds : Array<any> = [];
observableStompConnection: Observable<any>;
subscribers: Array<WebsocketSubscriber> = [];
subscriberIndex = 0;
reconnectionPromise : any;
_messageIds: Array<any> = [];
constructor(options : SocketOption){
this._options = options
this.createObservableSocket();
this.connect();
reconnectionPromise: any;
constructor(options: SocketOption) {
this._options = options
this.createObservableSocket();
this.connect();
}
getOptions = () => {
}
private createObservableSocket = () => {
this.observableStompConnection = new Observable((observer) => {
const subscriberIndex = this.subscriberIndex++;
this.addToSubscribers({index: subscriberIndex, observer});
return () => this.removeFromSubscribers(subscriberIndex);
});
}
private addToSubscribers = (subscriber) => {
this.subscribers.push(subscriber);
}
private removeFromSubscribers = (index) => {
this.subscribers = this.subscribers.filter(subscriber => subscriber.index !== index);
}
getObservable = () => {
return this.observableStompConnection;
};
getMessage = function (data): QuartzManagerWebsocketMessage {
const out: QuartzManagerWebsocketMessage = <QuartzManagerWebsocketMessage>{};
out.type = 'SUCCESS';
out.message = JSON.parse(data.body);
out.headers = {};
out.headers.messageId = data.headers['message-id'];
const messageIdIndex = this._messageIds.indexOf(out.headers.messageId);
if (messageIdIndex > -1) {
out.self = true;
this._messageIds = this._messageIds.splice(messageIdIndex, 1);
}
return out;
};
_socketListener = (frame) => {
console.log('Connected: ' + frame);
this._socket.stomp.subscribe(
this._options.topicName,
data => this.subscribers.forEach(subscriber => subscriber.observer.next(this.getMessage(data)))
);
}
_onSocketError = (errorMsg) => {
const out: any = {};
out.type = 'ERROR';
out.message = errorMsg;
this.subscribers.forEach(subscriber => subscriber.observer.error(out));
this.scheduleReconnection();
}
scheduleReconnection = () => {
this.reconnectionPromise = setTimeout(() => {
console.log('Socket reconnecting... (if it fails, next attempt in ' + this._options.reconnectionTimeout + ' msec)');
this.connect();
}, this._options.reconnectionTimeout);
}
reconnectNow = function () {
this._socket.stomp.disconnect();
if (this.reconnectionPromise && this.reconnectionPromise.cancel) {
this.reconnectionPromise.cancel();
}
this.connect();
};
send = (message) => {
const id = Math.floor(Math.random() * 1000000);
this._socket.stomp.send(this._options.brokerName, {
priority: 9
}, JSON.stringify({
message: message,
id: id
}));
this._messageIds.push(id);
};
connect = () => {
const headers = {};
let socketUrl = this._options.socketUrl;
if (this._options.getAccessToken()) {
socketUrl += `?access_token=${this._options.getAccessToken()}`;
}
//TO BE OVERIDDEN
getOptions = () => {return {}}
private createObservableSocket = () => {
this.observableStompConnection = new Observable((observer) => {
const subscriberIndex = this.subscriberIndex++;
this.addToSubscribers({ index: subscriberIndex, observer });
return () => this.removeFromSubscribers(subscriberIndex);
});
}
this._socket.client = new SockJS(socketUrl);
this._socket.stomp = Stomp.over(this._socket.client);
this._socket.stomp.connect(headers, this._socketListener, this._onSocketError);
this._socket.stomp.onclose = this.scheduleReconnection;
}
addToSubscribers = (subscriber) => {
this.subscribers.push(subscriber);
}
removeFromSubscribers = (index) => {
if(index > this.subscribers.length)
throw new Error(`Unexpected error removing subscriber from websocket, because index ${index} is greater than subscriber length ${this.subscribers.length}`);
this.subscribers.splice(index, 1);
}
getObservable = () => {
return this.observableStompConnection;
};
getMessage = function(data) {
let out : any = {};
out.type = 'SUCCESS';
out.message = JSON.parse(data.body);
out.headers = {};
out.headers.messageId = data.headers["message-id"];
let messageIdIndex = this._messageIds.indexOf(out.headers.messageId);
if ( messageIdIndex > -1) {
out.self = true;
this._messageIds = this._messageIds.splice(messageIdIndex, 1);
}
return out;
};
_socketListener = (frame) => {
console.log('Connected: ' + frame);
this._socket.stomp.subscribe(
this._options.topicName,
data => this.subscribers.forEach(subscriber => subscriber.observer.next(this.getMessage(data)))
);
}
_onSocketError = (errorMsg) => {
let out: any = {};
out.type = 'ERROR';
out.message = errorMsg;
this.subscribers.forEach(subscriber => subscriber.observer.error(out));
this.scheduleReconnection();
}
scheduleReconnection = () => {
this.reconnectionPromise = setTimeout(() => {
console.log("Socket reconnecting... (if it fails, next attempt in " + this._options.reconnectionTimeout + " msec)");
this.connect();
}, this._options.reconnectionTimeout);
}
reconnectNow = function(){
this._socket.stomp.disconnect();
if(this.reconnectionPromise && this.reconnectionPromise.cancel)
this.reconnectionPromise.cancel();
this.connect();
};
send = (message) => {
var id = Math.floor(Math.random() * 1000000);
this._socket.stomp.send(this._options.brokerName, {
priority: 9
}, JSON.stringify({
message: message,
id: id
}));
this._messageIds.push(id);
};
connect = () => {
const headers = {};
let socketUrl = this._options.socketUrl;
if(this._options.getAccessToken())
socketUrl += `?access_token=${this._options.getAccessToken()}`
this._socket.client = new SockJS(socketUrl);
this._socket.stomp = Stomp.over(this._socket.client);
this._socket.stomp.connect(headers, this._socketListener, this._onSocketError);
this._socket.stomp.onclose = this.scheduleReconnection;
}
}
}

View File

@@ -1,18 +0,0 @@
<div class="content" fxLayout="row" fxLayoutAlign="center">
<mat-card elevation="5" fxFlex>
<mat-card-subtitle>Change Your Password</mat-card-subtitle>
<p [class]="notification.msgType" *ngIf="notification">{{notification.msgBody}}</p>
<mat-card-content>
<form *ngIf="!submitted" [formGroup]="form" (ngSubmit)="onSubmit()" #changePasswordForm="ngForm">
<mat-form-field>
<input matInput formControlName="oldPassword" required type="password" placeholder="old password">
</mat-form-field>
<mat-form-field>
<input matInput formControlName="newPassword" required type="password" placeholder="new password">
</mat-form-field>
<button type="submit" [disabled]="!changePasswordForm.form.valid" mat-raised-button color="primary">Change Password</button>
</form>
<mat-spinner *ngIf="submitted" mode="indeterminate"></mat-spinner>
</mat-card-content>
</mat-card>
</div>

View File

@@ -1,45 +0,0 @@
.content {
width: 100%;
}
mat-card {
max-width: 350px;
text-align: center;
animation: fadein 1s;
-o-animation: fadein 1s; /* Opera */
-moz-animation: fadein 1s; /* Firefox */
-webkit-animation: fadein 1s; /* Safari and Chrome */
}
mat-form-field {
width: 100%;
}
mat-spinner {
width: 25px;
height: 25px;
margin: 20px auto 0 auto;
}
.error {
color: #D50000;
}
.success {
color: #8BC34A;
}
@media screen and (max-width: 599px) {
.content {
/* https://github.com/angular/flex-layout/issues/295 */
display: block !important;
}
mat-card {
/* https://github.com/angular/flex-layout/issues/295 */
display: block !important;
max-width: 999px;
}
}

View File

@@ -1,52 +0,0 @@
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
import { FormsModule, ReactiveFormsModule } from '@angular/forms';
import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
import { RouterTestingModule } from '@angular/router/testing';
import {
ApiService,
AuthService,
UserService,
ConfigService
} from '../../services';
import { MockApiService } from '../../services/mocks';
import { ChangePasswordComponent } from './change-password.component';
describe('ChangePasswordComponent', () => {
let component: ChangePasswordComponent;
let fixture: ComponentFixture<ChangePasswordComponent>;
beforeEach(async(() => {
TestBed.configureTestingModule({
imports: [
RouterTestingModule,
FormsModule,
ReactiveFormsModule
],
declarations: [
ChangePasswordComponent
],
providers: [
{
provide: ApiService,
useClass: MockApiService
},
AuthService,
UserService,
ConfigService
],
schemas: [CUSTOM_ELEMENTS_SCHEMA]
})
.compileComponents();
}));
beforeEach(() => {
fixture = TestBed.createComponent(ChangePasswordComponent);
component = fixture.componentInstance;
fixture.detectChanges();
});
it('should be created', () => {
expect(component).toBeTruthy();
});
});

View File

@@ -1,64 +0,0 @@
import { Component, OnInit } from '@angular/core';
import { FormBuilder, FormGroup, Validators } from '@angular/forms';
import { AuthService } from '../../services';
import { Router } from '@angular/router';
import { DisplayMessage } from '../../shared/models/display-message';
import { delay, mergeMap } from 'rxjs/operators';
@Component({
selector: 'app-change-password',
templateUrl: './change-password.component.html',
styleUrls: ['./change-password.component.scss']
})
export class ChangePasswordComponent implements OnInit {
form: FormGroup;
/**
* Boolean used in telling the UI
* that the form has been submitted
* and is awaiting a response
*/
submitted = false;
/**
* Diagnostic message from received
* form request error
*/
notification: DisplayMessage;
constructor(
private authService: AuthService,
private router: Router,
private formBuilder: FormBuilder
) {
}
ngOnInit() {
this.form = this.formBuilder.group({
oldPassword: ['', Validators.compose([Validators.required, Validators.minLength(3), Validators.maxLength(64)])],
newPassword: ['', Validators.compose([Validators.required, Validators.minLength(3), Validators.maxLength(32)])]
});
}
onSubmit() {
/**
* Innocent until proven guilty
*/
this.notification = undefined;
this.submitted = true;
this.authService.changePassword(this.form.value)
.pipe(delay(1000), mergeMap(() => this.authService.logout()))
.subscribe(() => {
this.router.navigate(['/login', { msgType: 'success', msgBody: 'Success! Please sign in with your new password.'}]);
}, error => {
this.submitted = false;
this.notification = { msgType: 'error', msgBody: 'Invalid old password.'};
});
}
}

View File

@@ -1 +0,0 @@
export * from './change-password.component';

View File

@@ -0,0 +1,13 @@
<div fxLayout="column" fxLayoutAlign="center" style="text-align: center">
<div>
<div>
<p style="font-size: 4em; margin-bottom: 0">Unexpected Error</p>
<p>Please try again later!</p>
</div>
</div>
<div>
<p>
<img src="assets/image/error.svg" alt="generic error"/>
</p>
</div>
</div>

View File

@@ -0,0 +1,25 @@
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
import {GenericErrorComponent} from './genericError.component';
describe('GenericComponent', () => {
let component: GenericErrorComponent;
let fixture: ComponentFixture<GenericErrorComponent>;
beforeEach(async(() => {
TestBed.configureTestingModule({
declarations: [ GenericErrorComponent ]
})
.compileComponents();
}));
beforeEach(() => {
fixture = TestBed.createComponent(GenericErrorComponent);
component = fixture.componentInstance;
fixture.detectChanges();
});
it('should be created', () => {
expect(component).toBeTruthy();
});
});

View File

@@ -0,0 +1,15 @@
import { Component, OnInit } from '@angular/core';
@Component({
selector: 'qrzmng-generic-error',
templateUrl: './genericError.component.html',
styleUrls: ['./genericError.component.css']
})
export class GenericErrorComponent implements OnInit {
constructor() { }
ngOnInit() {
}
}

View File

@@ -1,3 +1,13 @@
<p>
Your access doesn't allow!!
</p>
<div fxLayout="column" fxLayoutAlign="center" style="text-align: center">
<div>
<div>
<p style="font-size: 4em; margin-bottom: 0">Forbidden - Access Senied</p>
<p>you're not authorized to access</p>
</div>
</div>
<div>
<p>
<img src="assets/image/access_denied.svg" width="480" alt="access denied"/>
</p>
</div>
</div>

View File

@@ -1,7 +1,7 @@
<div class="content" fxLayout="row" fxLayoutAlign="center" style="padding-bottom:160px;">
<mat-card elevation="5" fxFlex>
<mat-card-subtitle>
<h2>Quartz Manager</h2>
</mat-card-subtitle>
@@ -25,9 +25,6 @@
</form>
<mat-spinner *ngIf="submitted" mode="indeterminate"></mat-spinner>
<br>
<p> <i style="color: #b5b5b5; font-size: 10px">(Default credentials are admin/admin)</i></p>
</mat-card-content>
</mat-card>

View File

@@ -1,18 +1,11 @@
import { Inject } from '@angular/core';
import { Component, OnInit, OnDestroy } from '@angular/core';
import { FormBuilder, FormGroup, Validators } from '@angular/forms';
import { Router, ActivatedRoute } from '@angular/router';
import { DisplayMessage } from '../../shared/models/display-message';
import { Subscription } from 'rxjs';
import { takeUntil, delay } from 'rxjs/operators'
import {Component, OnDestroy, OnInit} from '@angular/core';
import {FormBuilder, FormGroup, Validators} from '@angular/forms';
import {ActivatedRoute, Router} from '@angular/router';
import {DisplayMessage} from '../../shared/models/display-message';
import {Subject} from 'rxjs';
import {delay, takeUntil} from 'rxjs/operators'
import {
UserService,
AuthService
} from '../../services';
import { Observable } from 'rxjs';
import { Subject } from 'rxjs';
import {AuthService, UserService} from '../../services';
@Component({
selector: 'app-login',
@@ -59,18 +52,6 @@ export class LoginComponent implements OnInit, OnDestroy {
this.ngUnsubscribe.complete();
}
// onResetCredentials() {
// this.userService.resetCredentials()
// .takeUntil(this.ngUnsubscribe)
// .subscribe(res => {
// if (res.result === 'success') {
// alert('Password has been reset to 123 for all accounts');
// } else {
// alert('Server error');
// }
// });
// }
repository() {
window.location.href = this.githubLink;
}

View File

@@ -1,19 +1,40 @@
<div class="content" fxLayout="row" fxLayoutAlign="center none">
<div id="managerViewContainer" fxLayout="column" fxLayoutAlign="left stretch" fxLayoutGap="10px" fxFill>
<div fxFlex="1 1 30%" fxFill>
<div fxLayout="column">
<scheduler-control></scheduler-control>
<br/>
<scheduler-config></scheduler-config>
</div>
</div>
<div fxFlex="1 1 70%" style="margin-left: 20px">
<div fxLayout="column">
<div fxFlex="1 1 100%"><progress-panel></progress-panel></div>
<br/>
<div fxFlex="1 1 100%"><logs-panel></logs-panel></div>
</div>
</div>
<div id="schedulerBarContainer" fxLayout="column" fxLayoutAlign="left stretch">
<qrzmng-scheduler-control></qrzmng-scheduler-control>
</div>
<div fxLayout="row" fxLayoutGap="8px" fxLayoutAlign="center stretch" fxFlex="1 1 auto">
<div fxFlex="0 0 250px">
<div fxLayout="row" fxLayoutAlign="stretch" fxFill>
<qrzmng-trigger-list
(onNewTriggerClicked)="onNewTriggerRequested()"
[openedNewTriggerForm]="newTriggerFormOpened"
(onSelectedTrigger)="setSelectedTrigger($event)"
fxFill></qrzmng-trigger-list>
</div>
</div>
<div fxFlex="1 1 350px">
<div fxLayout="row" fxFill>
<div fxLayout="column" fxFill>
<qrzmng-simple-trigger-config fxFill
[triggerKey]="selectedTriggerKey"
(onNewTrigger)="onNewTriggerCreated($event)">
</qrzmng-simple-trigger-config>
</div>
</div>
</div>
<div fxFlex="1 1 auto" style="margin-left: 20px;">
<div fxFlex="1 1 auto" fxLayout="column" fxLayoutAlign="start stretch" fxLayoutGap="6px">
<progress-panel></progress-panel>
<logs-panel fxFlex="1 1 auto" fxFill></logs-panel>
</div>
</div>
</div>
</div>

View File

@@ -1,8 +1,12 @@
import { Component, OnInit } from '@angular/core';
import {Component, OnInit, ViewChild} from '@angular/core';
import {
ConfigService,
UserService
} from '../../services';
import {SimpleTrigger} from '../../model/simple-trigger.model';
import {TriggerKey} from '../../model/triggerKey.model';
import {SimpleTriggerConfigComponent} from '../../components/simple-trigger-config';
import {TriggerListComponent} from '../../components';
@Component({
selector: 'manager',
@@ -11,14 +15,32 @@ import {
})
export class ManagerComponent implements OnInit {
whoamIResponse = {};
allUserResponse = {};
@ViewChild(SimpleTriggerConfigComponent)
private triggerConfigComponent!: SimpleTriggerConfigComponent;
@ViewChild(TriggerListComponent)
private triggerListComponent: TriggerListComponent;
newTriggerFormOpened = false;
selectedTriggerKey: TriggerKey;
constructor(
private config: ConfigService,
private userService: UserService
) { }
ngOnInit() {
}
onNewTriggerRequested() {
this.triggerConfigComponent.openTriggerForm();
}
onNewTriggerCreated(newTrigger: SimpleTrigger) {
this.triggerListComponent.onNewTrigger(newTrigger);
}
setSelectedTrigger(triggerKey: TriggerKey) {
this.selectedTriggerKey = triggerKey;
}
}

View File

@@ -1,5 +1,12 @@
<div class="container-fluid">
<div class="page-header">
<h1>Page Not Found</h1>
<div fxLayout="column" fxLayoutAlign="center" style="text-align: center">
<div>
<div>
<p style="font-size: 4em; margin-bottom: 0">Not Found!</p>
</div>
</div>
</div>
<div>
<p>
<img src="assets/image/page_not_found.svg" width="480" alt="not found"/>
</p>
</div>
</div>

View File

@@ -23,10 +23,10 @@ describe('NotFoundComponent', () => {
expect(component).toBeTruthy();
});
it('<h1> tag should contains \'Page Not Found\'', () => {
it('should contains the text \'Not Found\'', () => {
fixture = TestBed.createComponent(NotFoundComponent);
fixture.detectChanges();
const compiled = fixture.debugElement.nativeElement;
expect(compiled.querySelector('h1').textContent).toContain('Page Not Found');
expect(compiled.querySelector('p').textContent).toContain('Not Found');
});
});

View File

@@ -1 +0,0 @@
// export * from './signup.component';

View File

@@ -1,56 +0,0 @@
<div class="content" fxLayout="row" fxLayoutAlign="center">
<mat-card elevation="5" fxFlex>
<mat-card-subtitle>
<h2>Angular Spring Starter</h2>
</mat-card-subtitle>
<mat-card-title>
<h2>{{ title }}</h2>
</mat-card-title>
<mat-card-content>
<p [class]="notification.msgType" *ngIf="notification">{{notification.msgBody}}</p>
<form *ngIf="!submitted" [formGroup]="form" (ngSubmit)="onSubmit()" #signupForm="ngForm">
<mat-form-field>
<label>Username: </label>
<input matInput formControlName="username" required>
</mat-form-field>
<mat-form-field>
<label>Password: </label>
<input matInput formControlName="password" required type="password">
</mat-form-field>
<mat-form-field>
<label>First Name: </label>
<input matInput formControlName="firstname">
</mat-form-field>
<mat-form-field>
<label>Last Name: </label>
<input matInput formControlName="lastname">
</mat-form-field>
<button type="submit" [disabled]="!signupForm.form.valid" mat-raised-button color="primary">Sign up</button>
</form>
<br>
<mat-spinner *ngIf="submitted" mode="indeterminate"></mat-spinner>
<br>
<hr>
<p>
<i>Created by
<a href="https://github.com/bfwg">Fan Jin</a>
</i>
</p>
<p>
<i>Click below to go to repository</i>
</p>
<button (click)="repository()" mat-raised-button color="accent">GitHub Repository</button>
</mat-card-content>
</mat-card>
</div>

View File

@@ -1,59 +0,0 @@
.content {
width: 100%;
}
mat-card {
max-width: 350px;
text-align: center;
animation: fadein 1s;
-o-animation: fadein 1s; /* Opera */
-moz-animation: fadein 1s; /* Firefox */
-webkit-animation: fadein 1s; /* Safari and Chrome */
}
mat-form-field {
display: block;
}
mat-spinner {
width: 25px;
height: 25px;
margin: 20px auto 0 auto;
}
button {
display: block;
width: 100%;
}
.error {
color: #D50000;
}
.success {
color: #8BC34A;
}
@media screen and (max-width: 599px) {
.content {
/* https://github.com/angular/flex-layout/issues/295 */
display: block !important;
}
mat-card {
/* https://github.com/angular/flex-layout/issues/295 */
display: block !important;
max-width: 999px;
}
}
a {
text-decoration: none;
cursor: auto;
color: #FFFFFF;
}

View File

@@ -1,61 +0,0 @@
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
import { MatCardModule} from '@angular/material/card';
import { MatInputModule} from '@angular/material/input';
import {MatProgressSpinnerModule} from '@angular/material/progress-spinner';
import { MatProgressBarModule } from '@angular/material/progress-bar';
import { SignupComponent } from './signup.component';
import { ReactiveFormsModule } from '@angular/forms';
import { RouterTestingModule } from '@angular/router/testing';
import {
MockUserService,
MockApiService
} from '../../services/mocks';
import {
UserService,
AuthService,
ApiService,
ConfigService
} from '../../services';
describe('SignupComponent', () => {
let component: SignupComponent;
let fixture: ComponentFixture<SignupComponent>;
beforeEach(async(() => {
TestBed.configureTestingModule({
declarations: [ SignupComponent ],
imports : [RouterTestingModule,
BrowserAnimationsModule,
MatCardModule,
MatInputModule,
MatProgressSpinnerModule,
MatProgressBarModule,
ReactiveFormsModule],
providers: [
{
provide: UserService,
useClass: MockUserService
},
{
provide: ApiService,
useClass: MockApiService
},
AuthService,
ConfigService]
})
.compileComponents();
}));
beforeEach(() => {
fixture = TestBed.createComponent(SignupComponent);
component = fixture.componentInstance;
fixture.detectChanges();
});
it('should create', () => {
expect(component).toBeTruthy();
});
});

View File

@@ -1,104 +0,0 @@
import { Inject } from '@angular/core';
import { Component, OnInit, OnDestroy } from '@angular/core';
import { FormBuilder, FormGroup, Validators } from '@angular/forms';
import { Router, ActivatedRoute } from '@angular/router';
import { DisplayMessage } from '../../shared/models/display-message';
import { Subscription } from 'rxjs';
import { takeUntil, delay } from 'rxjs/operators'
import {
UserService,
AuthService
} from '../../services';
import { Observable } from 'rxjs';
import { Subject } from 'rxjs';
@Component({
selector: 'app-signup',
templateUrl: './signup.component.html',
styleUrls: ['./signup.component.scss']
})
export class SignupComponent implements OnInit, OnDestroy {
title = 'Sign up';
githubLink = 'https://github.com/bfwg/angular-spring-starter';
form: FormGroup;
/**
* Boolean used in telling the UI
* that the form has been submitted
* and is awaiting a response
*/
submitted = false;
/**
* Notification message from received
* form request or router
*/
notification: DisplayMessage;
returnUrl: string;
private ngUnsubscribe: Subject<void> = new Subject<void>();
constructor(
private userService: UserService,
private authService: AuthService,
private router: Router,
private route: ActivatedRoute,
private formBuilder: FormBuilder
) {
}
ngOnInit() {
this.route.params.pipe(
takeUntil(this.ngUnsubscribe)
)
.subscribe((params: DisplayMessage) => {
this.notification = params;
});
// get return url from route parameters or default to '/'
this.returnUrl = this.route.snapshot.queryParams['returnUrl'] || '/';
this.form = this.formBuilder.group({
username: ['', Validators.compose([Validators.required, Validators.minLength(3), Validators.maxLength(64)])],
password: ['', Validators.compose([Validators.required, Validators.minLength(3), Validators.maxLength(32)])],
firstname:[''],
lastname: ['']
});
}
ngOnDestroy() {
this.ngUnsubscribe.next();
this.ngUnsubscribe.complete();
}
repository() {
window.location.href = this.githubLink;
}
onSubmit() {
/**
* Innocent until proven guilty
*/
this.notification = undefined;
this.submitted = true;
this.authService.signup(this.form.value)
// show me the animation
.pipe(delay(1000))
.subscribe(data => {
console.log(data);
this.authService.login(this.form.value).subscribe(data =>{
this.userService.getMyInfo().subscribe();
})
this.router.navigate([this.returnUrl]);
},
error => {
this.submitted = false;
console.log("Sign up error" + JSON.stringify(error));
this.notification = { msgType: 'error', msgBody: error['error'].errorMessage };
});
}
}

File diff suppressed because one or more lines are too long

After

Width:  |  Height:  |  Size: 8.7 KiB

File diff suppressed because one or more lines are too long

After

Width:  |  Height:  |  Size: 8.7 KiB

File diff suppressed because one or more lines are too long

After

Width:  |  Height:  |  Size: 7.0 KiB

File diff suppressed because one or more lines are too long

After

Width:  |  Height:  |  Size: 23 KiB

File diff suppressed because one or more lines are too long

After

Width:  |  Height:  |  Size: 21 KiB

View File

@@ -1,6 +1,14 @@
/* You can add global styles to this file, and also import other style files */
@import '~@angular/material/prebuilt-themes/deeppurple-amber.css';
@import "animate.css";
html {
display: flex;
flex-direction: column;
height: 100%;
}
body {
margin: 0;
flex:1;
background-color: #f1f1f1;
}

Some files were not shown because too many files have changed in this diff Show More