Commit Graph

72 Commits

Author SHA1 Message Date
Konstantinos Triantafyllou 273858cc2c Replace let with var in update.js 2023-05-31 16:27:15 +03:00
Konstantinos Triantafyllou 06be4d37ce Update script with alias of default-fl1. 2023-05-31 14:07:56 +03:00
Konstantinos Triantafyllou 31f758d534 Add addFundingStreamInDefaultMSCA in migration script. 2023-05-30 16:26:45 +03:00
Konstantinos Triantafyllou e363a04f84 Pom: Add spring-boot-version in maven-plugin 2023-05-19 16:47:19 +03:00
Konstantina Galouni 1119c1fdcf [Monitor Service | master]: Stakeholder.java: Added field private String statsProfile = "monitor"; and getter/setter methods | IndicatorPath.java: Added field private Format format = Format.NUMBER; where Format is enum {NUMBER, PERCENTAGE} and getter/setter methods | IndicatorController.java: On method "onUpdateDefaultIndicator()" check if format was changed | update_db.js: Added method "statsProfileOfIndicatorsAsVariable()". 2023-05-03 13:02:56 +03:00
Konstantina Galouni 806e1e16d8 [Monitor Service | master]: MonitorController.java: In method "updatePortal()" call also pageService.updatePid if pid was changed | pom.xml: Updated version of uoa-admin-tools-library to 1.0.7 (previous was 1.0.6). 2023-05-03 12:58:13 +03:00
Konstantinos Triantafyllou 29cc52a65f Merge branch 'log4j2' 2022-11-22 17:43:46 +02:00
Konstantina Galouni 4080c5326e StakeholderController.java: update return type of 'changeStakeholderVisibility()' and 'changeStakeholderVisibilityTree()' from Visibility to Stakeholder. 2022-10-21 17:24:49 +03:00
Konstantina Galouni 5d46d84a96 [Monitor Service | log4j]: SwaggerConfig.java: Updated swagger to add separate folders for libraries. 2022-10-20 10:40:08 +03:00
Konstantina Galouni 05aec3af4a StakeholderController.java: update return type of 'changeStakeholderVisibility()' and 'changeStakeholderVisibilityTree()' from Visibility to Stakeholder. 2022-10-16 11:41:19 +03:00
Konstantina Galouni 637554d3e8 [Monitor Service | log4j2] pom.xml: Removed groupid 2022-10-10 15:29:34 +03:00
Konstantina Galouni adf8cb5e70 pom.xml: Updated parent and versions of libraries | Moved to log4j2 & set spring log file as default | Added swagger 2022-10-10 15:27:17 +03:00
Konstantina Galouni 82a8f8ad56 [Trunk | Monitor Service]: StakeholderController.java & TopicController.java & CategoryController.java & SubCategoryController.java & SectionController.java & IndicatorController.java: Updated /change-visibility methods and added @RequestParam(required = false) Boolean propagate, to allow changing visibility of all contents of the updated entity too & updated return type to return the entity instead its visibility & added everywhere method "changeVisibilityTree()". 2022-09-14 18:02:47 +03:00
Konstantinos Triantafyllou 902a666c8e [maven-release-plugin] rollback the release of uoa-monitor-service-1.0.4 2022-09-14 11:19:09 +03:00
Konstantinos Triantafyllou d274c2e95a [maven-release-plugin] prepare for next development iteration 2022-09-14 11:18:43 +03:00
Konstantinos Triantafyllou edba8457d1 [maven-release-plugin] prepare release uoa-monitor-service-1.0.4 2022-09-14 11:18:38 +03:00
Konstantinos Triantafyllou e473740e9c Add info messages during merge 2022-09-13 13:01:53 +03:00
Konstantinos Triantafyllou c6d613eb64 Increase snapshot version for next release 2022-09-13 12:20:08 +03:00
Konstantinos Triantafyllou e7c32e0efc Merge branch 'master' of code-repo.d4science.org:MaDgIK/uoa-monitor-service 2022-09-13 12:06:54 +03:00
Konstantinos Triantafyllou e95ebbdb87 Add merge.sh 2022-09-13 12:06:45 +03:00
Konstantina Galouni dd7537f5d0 [Trunk | Monitor Service]: IndicatorController.java: Updated methods "saveBulkIndicators()" and "createSectionsAndSaveBulk()" to import List<Section<Indicator>> instead of List<Indicator> | pom.xml: Inreased version. 2022-09-08 23:37:03 +03:00
Konstantina Galouni 61b947737b Merge branch 'master' of code-repo.d4science.org:MaDgIK/uoa-monitor-service 2022-09-08 23:35:20 +03:00
Konstantina Galouni cddb8a2de1 [Trunk | Monitor Service]: Updated methods "saveBulkIndicators()" and "createSectionsAndSaveBulk()" to import List<Section<Indicator>> instead of List<Indicator>. 2022-09-08 23:34:25 +03:00
Konstantinos Triantafyllou d4381c3a46 Remove HEAD from scm info 2022-09-02 16:15:31 +03:00
Konstantinos Triantafyllou 64e61e8a0e Revert "Revert "Change scm info to ssh url""
This reverts commit 3e2922581b.
2022-09-01 22:19:39 +03:00
Konstantinos Triantafyllou 3e2922581b Revert "Change scm info to ssh url"
This reverts commit 43c8e471c7.
2022-09-01 14:10:33 +03:00
Konstantinos Triantafyllou 43c8e471c7 Change scm info to ssh url 2022-09-01 13:49:25 +03:00
Konstantinos Triantafyllou 2d0209d3e8 Merge branch 'master' of code-repo.d4science.org:MaDgIK/uoa-monitor-service 2022-09-01 13:43:03 +03:00
Konstantinos Triantafyllou 75716a0f10 Add scm information in pom.xml 2022-09-01 13:42:56 +03:00
Konstantina Galouni 44f52c36d9 Adding make.sh in .gitignore 2022-08-31 16:42:22 +03:00
Konstantinos Triantafyllou b98a581ef9 Add gitignore 2022-08-31 16:20:02 +03:00
Konstantina Galouni a03001c90e [Trunk | Monitor Service]: 1.. pom.xml: Updated version of admin-tools-library to 1.0.5 (used to be 1.0.4) | 2. StakeholderController.java: In method "buildFullStakeholder()", when creating Stakeholder, create Portal if not exists (pid = alias) and in method "deleteStakeholder()", when deleting a Stakeholder, delete Portal as well. 2022-07-27 11:51:56 +00:00
Konstantinos Triantafyllou 99161920d5 Update version in pom 2022-01-12 15:08:43 +00:00
Konstantinos Triantafyllou 3b6dac86ed Update notification service with fix 2022-01-12 15:07:59 +00:00
Konstantinos Triantafyllou 3db8d35d42 Update version 2021-12-07 09:31:20 +00:00
Konstantinos Triantafyllou 827fd60a87 Add idea files to ignore svn list. Update notification and admin tools library 2021-12-07 09:30:43 +00:00
Konstantina Galouni feb43d186c [Trunk | Monitor Service]: pom.xml: Updated to 1.0.3 uoa-notification-service & uoa-admin-tools-library | uoa-authorization-library dependency removed (it is included in admin tools library). 2021-11-30 11:58:59 +00:00
Konstantina Galouni a11cf9c642 [Trunk | Monitor Service]:
1. pom.xml: Updated version of "uoa-admin-tools-library" from 1.0.1 to 1.0.2, "uoa-authorization-library" from 1.0.0 to 2.0.1, "uoa-notification-service" from 1.0.0 to 1.0.2.
2. GlobalVars.java: Added field "version" (version of project in pom).
3. MonitorServiceCheckDeployController.java: Expose globalBars.version in /health_check/advanced.
4. monitorservice.properties: Added monitorservice.globalVars.version=@version@ (initialized by pom version).
2021-11-17 23:00:52 +00:00
Konstantina Galouni 61a6d5d89d [Trunk | Monitor Service]: pom.xml: Update version of uoa-admin-tools-library to 1.0.1. 2021-10-25 09:57:50 +00:00
Konstantina Galouni 2e0e215e69 [Trunk | Monitor Service]: pom.xml: In dependency "uoa-admin-tools-library" remove snapshot from version (the library is released on http://maven.research-infrastructures.eu/nexus/content/repositories/dnet45-releases/eu/dnetlib/uoa-admin-tools-library/) 2021-10-12 12:43:10 +00:00
Konstantina Galouni 1ec72b25b2 [Trunk | Monitor Service]: pom.xml: Revert from r61631 changes for parent and plugins: now from "dnet45-parent" to "spring-boot-starter-parent". 2021-10-12 09:54:08 +00:00
Konstantina Galouni 3f0bbbd81c [Trunk | Monitor Service]:
1. StakeholderController.java: In method "getAllRealStakeholders()" (/stakeholder), return also stakeholders with "restricted" visibility, without checking user's roles.
2. pom.xml: 
	a. Update parent from "spring-boot-starter-parent" to "dnet45-parent" ==> add <dependencyManagement> and "maven-war-plugin" and comment "spring-boot-maven-plugin".
	b. For dependencies "uoa-authorization-library" and "uoa-notification-service", use version 1.0.0 (released version), not 1.0.0-SNAPSHOT.
2021-10-05 21:01:19 +00:00
Konstantina Galouni 9b18159e2f [Trunk | Monitor Service]:
1. pom.xml: 
        a. Added timestamp in properties.
        b. In <build> added <resources> with filtering set to true.
2. GlobalVars.java: Added GlobalVars class for date of deploy & date of build.
3. UoaMonitorServiceApplication.java: 
        a. Added @PropertySource("classpath:admintoolslibrary.properties") and @PropertySource("classpath:notification.properties")
        b. In @EnableConfigurationProperties added GlobalVars.class.
4. MonitorServiceCheckDeployController.java: Added exposing date of deploy and date of build.
5. monitorservice.properties: Added property monitorservice.globalVars.buildDate=@timestamp@
2021-09-15 22:17:52 +00:00
Konstantina Galouni 7d4273bea4 [Trunk | Monitor Service]:
1. MonitorServiceCheckDeployController.java: In method "checkEverything()" (/health_check/advanced), added "Date of build" field with current date.
2. Indicator.java: In method "copyFromDefault()" set visibility of new indicator to "RESTRICTED" (instead of copying the default indicator's visibility).
3. IndicatorController.java: [NEW] Bulk add for indicators (imported from file) - get charts and numbers in a list and create chart and number sections to put them.
	a. Added API call  method "saveBulkIndicators()" (POST /{stakeholderId}/{topicId}/{categoryId}/{subcategoryId}/save-bulk).
	b. Added helper methods "createSectionsAndSaveBulk()", "createSection()", "saveIndicatorAndAddInSection()".
2021-07-21 09:46:49 +00:00
Konstantina Galouni 44e325ddc7 [Trunk | Monitor Service]:
1. MonitorController.java: [Bug fix] In class @RequestMapping, added "/organization" (this portal type was missing).
2. update_db.js: Commnented old functions and added "addHomePageInPortalType()", "addFooterDivIdForPortalType()", "addFooterHelpTextForPortalType()" for portalTypes: funder, ri, organization.
2021-06-23 15:19:20 +00:00
Konstantina Galouni 0c9bc6f006 [Trunk | Monitor Service]:
1. MonitorServiceCheckDeployController.java: [NEW] Controller added and
        a. "hello()" method (@RequestMapping(value = {"", "/health_check"}, method = RequestMethod.GET)) which just prints and returns a greeting message.
        b. "checkEverything()" method @RequestMapping(value = "/health_check/advanced", method = RequestMethod.GET) only accessible by PORTAL ADMINS which checks connection with db and prints properties.
2. TestController.java: Comment "index()" method with @RequestMapping("/").
3. IndicatorController.java: [Bug fix]
        a. Added a check when the value of an indicator path parameter is null
        b. When an indicator path parameter from a default profile is deleted, delete this parameter also from all profiles based on this default.
2021-04-22 10:05:43 +00:00
Konstantina Galouni ac869dd75b [Trunk | Monitor Service]:
1. pom.xml: Add dependency for notification service: uoa-notification-service.
2. UoaMonitorServiceApplication.java: In @SpringBootApplication, add in scanBasePackages "eu.dnetlib.uoanotificationservice".
2021-03-31 15:28:05 +00:00
Konstantina Galouni a284d8449a [Trunk | Monitor Service]:
1. RolesUtils.java: Comment all contents of this file (should be removed in next commit). This file is added in uoa-admin-tools-library.
2. StakeholderController.java & TopicController.java & CategoryController.java & SubCategoryController.java & SectionController.java & IndicatorController.java: Import RolesUtils from uoa-admin-tools-library.
3. StakeholderController.java: In "getAllRealStakeholders()" method, add optional parameter "defaultId", to get Stakeholders based on a default profile.
2021-02-24 19:22:19 +00:00
Konstantina Galouni d6901a49f7 [Trunk | Monitor Service]:
1. StakeholderController.java: 
	a. Method "getMyRealStakeholders()" (/my-stakeholder) returns basic Stakeholder info (Topics are not full object anymore).
	b. Method "saveStakeholder()" (/save) gets basic or full object for Stakeholder and returns whatever format it received.
2. IndicatorController.java: [Bug fix] In method "onUpdateDefaultIndicator()" improve checks (there were missing cases, e.g. chartObject of previous-saved indicatorPath was null).
2020-12-22 09:29:17 +00:00
Konstantina Galouni 38a5a09d8a [Trunk | Monitor Service]:
1. StakeholderController.java & TopicController.java & CategoryController.java & SubCategoryController.java && SectionController.java && IndicatorController.java:
	a. Comment logs for get requests.
	b. Use "ForbiddenException" instead of "AccessDeniedException"
	c. On /save, if full entity has id (already in DB), if not found in DB throw EntityNotFoundException.
	d. Get children (e.g. when saving a Topic, get its categories) from DB.
2. TopicController.java & CategoryController.java & SubCategoryController.java & SectionController.java:
	In /reorder, if there are in DB, ids that are missing from reordered list, do reordering and add in the end of list the missing ids.
3. ReorderEvent.java: [NEW] Added class ReorderEvent with fields "action" (String), "target" (String), "ids" (List<String>) (used in IndicatorController.java).
4. IndicatorController.java: 
	a. In /reorder, @RequestBody changed from List<String> indicators to  ReorderEvent reorderEvent.
	b. If there are in DB, ids that are missing from reordered list AND missing id is not moved to other section (action = removed and target = missing id), do reordering and add in the end of list the missing ids.
5. ExceptionsHandler.java: exception handler methods "invalidInput()", "nullPointerException()", "notFoundException()" moved to "Admin Tools Library" - "accessDeniedException()" is removed.
6. responses/ExceptionResponse.java: File and folder deleted (moved to "Admin Tools Library").
7. RolesUtils.java: Added method "isLoggedIn()" (checks if no roles for user, or user has role "ROLE_ANONYMOUS").
2020-12-09 14:24:27 +00:00