feat: require bundled app overrides to be configured with the coreApp flag in the manifest #6111

amcgee · 2020-09-08T17:51:00Z

This does two things:

(important!) this adds a check on application install to ensure that any app which will override a bundled app has the new core_app=true flag set in its manifest. This ensures that override apps are explicitly built to be served from the /dhis-web-xyz namespace rather than the /api/apps/xyz namespace, and should help prevent unintentional bundled app overrides.
(minor) This adds a little more information to /dhis-web-apps/index.html and /dhis-web-apps/apps-bundle.json, specifying the name of the application (which can then be used for overrides)

… flag in the manifest

varl

JS changes approved.

There is one sentence where "if" has an extra "f".

amcgee · 2020-09-08T18:22:15Z

There is one sentence where "if" has an extra "f".

@varl that's actually intentional - iff === "if and only if" ;-) it's standard logic terminology but maybe obscure enough to warrant writing out?

Philip-Larsen-Donnelly · 2020-09-08T19:17:14Z

How does it change /dhis-web-apps/index.html ?
I'm asking as we reference the list of apps from there for our smoke tests.

Philip-Larsen-Donnelly

Approve of the changes - but have not reviewed technically.

larshelge · 2020-09-08T19:54:42Z

dhis-2/dhis-api/src/main/java/org/hisp/dhis/appmanager/App.java


-    private boolean isBundledApp = false;


I think a better name here is just bundled. The "is" prefix is normally avoided in primitive booleans, as "is" the regular prefix for get methods. The "app" part is implicit since the object is called App.

The the getter/setter become isBundled and setBundled.

@larshelge makes sense. This line is actually removed, now we only have the getter and setter (previously the variable wasn't set until initialization with a contextPath, which caused problems when trying to evaluate the app at installation time). Should I update the getter here or leave it as before?

Ah okay, right. Will be break any clients by making that change? If not, go for it.

I'll have to update all the references to it (there are a few) but doable

amcgee · 2020-09-08T20:02:49Z

(For reference)

Revamped dhis-web-apps/index.html:

Revamped dhis-web-apps/apps-bundle.json:

amcgee · 2020-09-08T20:04:17Z

How does it change /dhis-web-apps/index.html ?
I'm asking as we reference the list of apps from there for our smoke tests.

Minor addition of link to json file should be fixed in dhis2/e2e-tests#50, otherwise kept it compatible with the smoke test which just iterates over the page links.

larshelge · 2020-09-08T20:15:37Z

...vices/dhis-service-core/src/main/java/org/hisp/dhis/appmanager/JCloudsAppStorageService.java

+            {
+                log.error(
+                    String.format(
+                        "Failed to install app '%s': bundled app overrides muse be declared with core_app=true",


Typo: "muse" -> "must".

lgtm-com · 2020-09-08T20:17:37Z

This pull request introduces 1 alert when merging e0741fe into d15b75f - view on LGTM.com

new alerts:

1 for Unused variable, import, function or class

larshelge · 2020-09-08T20:18:16Z

...vices/dhis-service-core/src/main/java/org/hisp/dhis/appmanager/JCloudsAppStorageService.java

@@ -271,6 +271,63 @@ public void cleanUp()
        return reservedNamespaces;
    }

+    private boolean validateApp( App app, Cache<App> appCache )


A unit test would be appropriate here, as this code can easily be tested. Method could be made public (or just default modifier). Can wait until after hard freeze.

Java serialization is changing in dhis2/dhis2-core#6111

sonarcloud · 2020-09-08T20:46:29Z

Kudos, SonarCloud Quality Gate passed!

0 Bugs
0 Vulnerabilities (and 0 Security Hotspots to review)
0 Code Smells

6.6% Coverage
0.0% Duplication

The version of Java (1.8.0_265) you have used to run this analysis is deprecated and we will stop accepting it from October 2020. Please update to at least Java 11.
Read more here

lgtm-com · 2020-09-08T20:57:57Z

This pull request fixes 1 alert when merging 9c3a2ae into 3af90ec - view on LGTM.com

fixed alerts:

1 for Unused variable, import, function or class

@configuration

* feat: Convert xml based config files to java annotation based config Convert all .xml spring config files to Java config classes using spring @configuration instead (except Struts bean.xml config files). Convert web.xml files to use Java bases classes extending WebApplicationInitializer. Remove support for OpenID ver. 1 (this is for preparing for OIDC support later). Migrate some filters to use @webfilter configuration. Upgrade Spring, Spring Security, Struts and more depenendices to latest versions. Add maven-enforcer rules to enforce better dependency controll. Add exclusions for overlapping and clashing dependencies. * feat: Convert xml based config files to java annotation based config Fix broken unit tests, add missing deps. to ldap. * feat: Convert xml based config files to java annotation based config Remove usage of DhisTest in the web layer * feat: Convert xml based config files to java annotation based config Some doc and minor cleanup of unused code and commented code. * feat: Convert xml based config files to java annotation based config * Fixed wrong config for opens session in view * Added default user startup task populator, removed old automatic accces provider system * Added authority provider config for struts * removed ununsed dep. * feat: Convert xml based config files to java annotation based config * Downgrade Hibernate back to 5.2.17 * feat: Convert xml based config files to java annotation based config * Disable broken e2e test * feat: Convert xml based config files to java annotation based config * Revert DefaultAuditObjectFactory change * feat: Convert xml based config files to java annotation based config * Added back custom entry point for form based entry to bypass web/form if a custom header is present. * feat: Convert xml based config files to java annotation based config * Reenable web-apps module... * feat: OpenID Connect support for authentication * feat: Convert xml based config files to java annotation based config * Fix review comments * feat: Convert xml based config files to java annotation based config * Add CurrentUserHandlerMethodArgumentResolver * feat: OpenID Connect support for authentication * Add dynamic reg id look up * feat: Convert xml based config files to java annotation based config * Remove deprecated org.olap4j.impl.ArrayMap usage * feat: OpenID Connect support for authentication * feat: OpenID Connect support for authentication * feat: OpenID Connect support for authentication * Basic google oidc support * feat: OpenID Connect support for authentication * Tweak logging * feat: OpenID Connect support for authentication * feat: OpenID Connect support for authentication * Add conditional enable/disable feature for OIDC * Fixed TECriteriaMapperTest * fix: Use error code for delete not allowed exception (#6004) Use error code for delete not allowed exception, used when a metadata entity cannot be deleted. (cherry picked from commit 0cd2c83) * feat: implement bundled application overrides * fix: redirect to launch url from index.action legacy requests * Fixed TECriteriaMapperTest * chore: revert log4j config changes (#6007) * fix: inject full context path rather than relative URL to manifest.webapp * feat: add flags of the world (2.35) DHIS2-7621 (#5956) * chore: revert to original app authority translation * chore: remove bundledAppNames endpoint * chore: Remove system setting key GOOGLE_CLOUD_API_KEY * Fixed integration tests. Empty ids when getting teis. Empty tet ids during acl checks. * Ignored TEICriteriaMapperTest * fix: DHIS2-9268 AssignedUser in Event (New Tracker Importer) (#5985) * initial * Added specific serializer to assignedUser. Added override methods for hook * Update AssignedUserValidationHookTest.java * Update AssignedUserValidationHook.java * Fixed issue in SQL related to usergroup Access control for TET (#6011) * test: adds expectation for error code (#6019) # Conflicts: # dhis-2/dhis-e2e-test/src/test/java/org/hisp/dhis/metadata/orgunits/OrgUnitsRemovalTest.java * chore: adjust security headers * Tweak security headers to align with pre xml to java config refactoring Signed-off-by: Morten Svanaes <[email protected]> * fix: adds name to UserDto * chore: add back original struts config * Re-enable struts security interceptor * Disable struts dev mode Signed-off-by: Morten Svanaes <[email protected]> * chore: revert commit wrongly based on master into 2.35 Revert "chore: revert log4j config changes (#6007)" This reverts commit 218794f Signed-off-by: Morten Svanaes <[email protected]> * chore: revert log4j config changes (#6006) (#6034) (cherry picked from commit 8b708da) * chore: fix login error message not showing (#6038) * fix missing error message when login fail * add back auth logging Signed-off-by: Morten Svanaes <[email protected]> * fix: Get tei api refactor tests and configs (#6024) * trying different profile for defaultconfigprovider * Disable OIDC configuration check if test run * Changed flyway to accept mixed mode to include both non-ts and ts statements within a migration group * Fix enrollment followup tests, to use getBoolean and wasNull instead of getString * Force hibernate flush and clear to reload entities saved using jdbctemplate in tests * LGTM alert fix * fix: periodType integration test error (#6046) * chore: try to fix unstable spring dependency wiring problem (#6035) * chore: try to fix unstable spring dependency wiring problem * Add @lazy annotation to AuthenticationManger parameter in AuthenticationProviderConfig Signed-off-by: Morten Svanaes <[email protected]> * chore: try to fix unstable spring dependency wiring problem * Add @lazy annotation to AuthenticationManger parameter in AuthenticationProviderConfig Signed-off-by: Morten Svanaes <[email protected]> * chore: try to fix unstable spring dependency wiring problem * Add ifTest check in OIDC condition (config enabler) this was starting the DefaultDhisConfigurationProvider in the integrations tests Signed-off-by: Morten Svanaes <[email protected]> * chore: try to fix unstable spring dependency wiring problem * Disable DataApprovalStoreIntegrationTest until we have a solution for the failing tests Signed-off-by: Morten Svanaes <[email protected]> * chore: try to fix unstable spring dependency wiring problem * Disable DataValueSetServiceTest until we have a solution for the failing tests Signed-off-by: Morten Svanaes <[email protected]> * fix: eventStatus ACTIVE is not respected in tei filtering (#6041) * fix: event status ACTIVE is not considered in teis api (#6052) * feat: [DHIS2-9374] Change trackedEntityAttributeValueAudit primary key to bigint (2.35) (#6044) * feat: [DHIS2-9374] Change trackedEntityAttributeValueAudit primary key to bigint * Ignoring DataApprovalStoreIntegrationTests * Revert ignore dataapproval test * chore: remove explicit wiring of an AuthenticationManager into XWorkSecurityInterceptor (#6053) Remove explicit wiring of an AuthenticationManager into XWorkSecurityInterceptor, this seems to fix an issue of Spring failing to startup because dep. wiring unstability. * chore: set missing service to DefaultOrganisationUnitSelectionManager (#6055) * test: adds API tests for user lookup endpoint (#6050) * test: fixes compilation error (#6057) * feat: Add support for tracker object deletion (#6023) * fix: failing unit test due to invalid period length (#6059) (#6064) (cherry picked from commit 6073423) * chore: add missing permitall to urls (#6060) * chore: add missing permitall to urls * Adds permit all rule to urls that are outside (before) authentication * Add missing service to DefaultSelectionTreeManager * Add null check for user details on AuthenticationLoggerListener.java (happens when you register user and login automatically, and then try to log out) Signed-off-by: Morten Svanaes <[email protected]> * chore: add missing permitall to urls * Add login.js til permit all list Signed-off-by: Morten Svanaes <[email protected]> * chore: add missing permitall to urls * Add wildcard permit to security/* Signed-off-by: Morten Svanaes <[email protected]> * feat: support collections for UserPropertyTransformer (#6045) (#6077) * fix: re-enable property transformer for getMembers * minor * fix: minor code fixes, npe checks * fix: re-fetch schema for transformed properties * minor fixes * fix: support field expansion for property transformers * fix: npe check * fix: add missing set 2fa on usercredentials in me controller (#6078) * The setting of 2fa property in the account view is not working because the /me controller is not properly setting the user credentials property when PUT is called. Issue: [DHIS2-9392] Signed-off-by: Morten Svanaes <[email protected]> * chore: add missing TwoFactorWebAuthenticationDetailsSource to form login (#6075) * add missing TwoFactorWebAuthenticationDetailsSource to form login Signed-off-by: Morten Svanaes <[email protected]> * fix: apply UserPropertyTransformer transforms (#6084) (#6086) * fix: Adds back User properties into UserDto (#6087) (#6090) * feat: Add proxy API endpoint for App Hub [DHIS2-9093] (#6085) (cherry picked from commit 1a6a4cb) * fix: Use name instead of UID for pivot column download [DHIS2-9026] (#5758) Creating a simple object (DimensionDescriptor.java) to map raw dimension identifiers and its related type so it can be used in a later stage when setting the report headers during the download in the Pivot table app. (cherry picked from commit 8a12362) * feat: fetch Org Unit coordinate in event analytics query (#5912) Allows to return the Org Unit coordinates of an Event attribute, if present. (cherry picked from commit fe6b538) * fix: assigned user related filters in hql formation (#6092) * fix: [DHIS2-9286] add exception handling globally to catch any unhandled ones and notify job correctly (#6083) * feat: add main exception handling in new tracker import job * Add error report into import report in case of exceptions * minor * Minor refactor * Added logging * Remove rethrowing of exception * Formatting * Fixed a test to solve potential race condition * Added a new constructor to avoid too many nulls in constructor * Revert weird tes * fix: [DHIS2-9410] include tei parameter when searching for existing psi (2.35) (#6093) * fix: [DHIS2-9410] include tei parameter when searching for existing psi * minor fix * Fix tests * Fix sonar complaint * fix: (2.35) Use program id instead of program rule id (#6094) * chore: Use releases versions for rule-engine and antlr parser (#6018) * feat: Add pagination to endpoint dimensions/<uid>/items (#6096) * fix: remove firstName, surname from UserDto (#6099) * fix: Add 501 NOT IMPLEMENTED to POST /tracker, due to importer not being 100% complete (#6100) * chore: add missing multipart resovler (#6105) * chore: fix broken content negotiation manager config (#6109) * chore: hide exception stacktrace on struts actions error page (#6110) * feat: require bundled app overrides to be configured with the coreApp flag in the manifest (#6111) * feat(apps to bundle): add cache cleaner to bundled apps v35 (#6108) * refactor(apps to bundle cache cleaner): use master branch * docs(apps to bundle): add 2.35 feature toggle apps column * fix: cache-cleaner app is feature-toggling, not capture app * fix: prevent db deadlock during Event update (#6131) - Make sure that events are sorted by UID before doing a batch update. This prevents multiple concurrent transactions to trigger a Postgres deadlock, when the list of events is "out of order" - Make sure that the TEI are sorted when updating TEI after an Event update - Added javadoc to interfaces - Code clean-up * fix: audit for event importer are now present (#6138) fix: explaining reason for AbstractEventAuditPostProcessor fix: added comment to lombok.config fix: adding @nonnull to component dependencies where explicit constructor was replaced by @requiredargsconstructor * feat: add SMS Configuration App (#6136) * feat: [DHIS2-9487] Adding support for font style configs (2.35) (#6141) Backporting from 2.36 (master) * Fix sonar issues Co-authored-by: Morten Svanaes <[email protected]> Co-authored-by: Ameen <[email protected]> Co-authored-by: Lars Helge Øverland <[email protected]> Co-authored-by: Austin McGee <[email protected]> Co-authored-by: Philip-Larsen-Donnelly <[email protected]> Co-authored-by: Gintare Vilkelyte <[email protected]> Co-authored-by: Morten Olav Hansen <[email protected]> Co-authored-by: Viet Nguyen <[email protected]> Co-authored-by: Zubair Asghar <[email protected]> Co-authored-by: Luciano Fiandesio <[email protected]> Co-authored-by: Morten Hansen <[email protected]> Co-authored-by: Maikel Arabori <[email protected]> Co-authored-by: Enrico Colasante <[email protected]> Co-authored-by: Jan-Gerke Salomon <[email protected]> Co-authored-by: Giuseppe Nespolino <[email protected]>

commit 88bbb27019da9932a644bbefc9f7f93a4d95b5cd Author: Morten Hansen <[email protected]> Date: Tue Oct 13 09:58:46 2020 +0200 feat: adds API version 36 (#6385) * feat: adds API version 36 commit e5b6e5d9e447f02da47b66bf195523d34666c979 Author: @dhis2-bot <[email protected]> Date: Tue Oct 13 01:47:47 2020 +0200 fix(translations): sync translations from transifex (master) Automatically merged. commit f77813d6de104339d5091133db97b7e0a1611fb7 Author: @dhis2-bot <[email protected]> Date: Sat Oct 10 01:42:39 2020 +0200 fix(translations): sync translations from transifex (master) Automatically merged. commit 1aa6ea69b0aa6f3bb9a900131deef8a5d3dcdcd9 Author: netroms <[email protected]> Date: Thu Oct 8 21:02:02 2020 +0800 chore: fix refactoring bug in api security config affecting redirect (#6355) * A bug was introduced under refactoring of the /api endpoint security config, resulting in reverting another fix for redirect to login page on unauthorized access to /api endpoints. Signed-off-by: Morten Svanaes <[email protected]> commit 6ee31f1b3c0f5179c92fb1eb919804851b1616e0 Author: netroms <[email protected]> Date: Thu Oct 8 21:01:25 2020 +0800 chore: align 2.35 and master, with missing change from 2.35 (#6359) * A small PR comment change seems to have get lost when merging/backporting changes Signed-off-by: Morten Svanaes <[email protected]> commit 1704e2c4aa2d31cf7da63e1a4ed523f3f8797853 Author: Lars Helge Øverland <[email protected]> Date: Thu Oct 8 13:28:09 2020 +0200 chore: Clean up dependencies in DefaultCurrentUserService (#6332) commit e259a67af17001db629c027c5eb173f21026ef19 Author: netroms <[email protected]> Date: Wed Oct 7 18:37:03 2020 +0800 fix: make sure all tests run on Java 11+ (#6341) commit 251161b0366ea37ba7940aafefcd629a7b8f77cb Author: Mohamed Ameen <[email protected]> Date: Wed Oct 7 12:35:55 2020 +0200 feat: [TECH-436] Add btree index in tei table for orgunitid column (m… (#6334) * feat: [TECH-436] Add btree index in tei table for orgunitid column (master) * fixed flyway script version commit 9a37d438148380330a8b4815d215a7f5b706a1b7 Author: Enrico Colasante <[email protected]> Date: Wed Oct 7 09:50:25 2020 +0200 fix: [DHIS2-9023] Block programStageSection deletion when a program rule is linked to it (#6284) commit 9073e9de1f1ff92352a313b86b101ca7cf3d528e Author: Zubair Asghar <[email protected]> Date: Wed Oct 7 12:47:10 2020 +0500 fix: SMS confidential values [DHIS2-9582] Include confidential parameters in response while fetching SMS configurations. commit e67199e7212f203d9c350c60e2f83e0b28e00866 Author: @dhis2-bot <[email protected]> Date: Tue Oct 6 01:44:17 2020 +0200 fix(translations): sync translations from transifex (master) Automatically merged. commit affc76f2434f0ed9aeb7d708f379398a3dc2b90a Author: Mohamed Ameen <[email protected]> Date: Sun Oct 4 15:12:49 2020 +0200 fix: [DHIS2-9625] totalPages param when used ignores maxteicount setting (#6306) commit 68eac6452756d93fec537f10527378e88693e92f Author: netroms <[email protected]> Date: Fri Oct 2 21:48:00 2020 +0800 chore: fix broken Google OIDC svg icon (#6298) commit b51853f420b130976d9ac4fef9bb15c6d0ff3b98 Author: Viet Nguyen <[email protected]> Date: Fri Oct 2 20:47:32 2020 +0700 fix: Skip deletionHandler for embedded objects. (#6307) commit 134f8204a3be6b2d4cd43a33cfedb0cbed2d6bb6 Author: Viet Nguyen <[email protected]> Date: Fri Oct 2 20:46:51 2020 +0700 fix: translations in login page. (#6309) commit 990098868d5a58e04bc764c4337041f9da9e40b2 Author: Viet Nguyen <[email protected]> Date: Fri Oct 2 19:11:47 2020 +0700 fix: Deserialization issue of DashboardItem.users (#6305) commit 695c57075dfc2e72171767b16d1ce30b29c21f5b Author: Enrico Colasante <[email protected]> Date: Fri Oct 2 12:42:38 2020 +0200 fix: [DHIS2-8872] Attach event import summary to the correct enrollment (#6318) commit f267d1d60ea43d96d2d0c34a8e25847bc6a69a26 Author: Giuseppe Nespolino <[email protected]> Date: Fri Oct 2 11:52:33 2020 +0200 Dhis2 9667 program rule variables duplicate name (#6302) * fix: program rule names and program rule variable names check for duplicate now does not fail on update* fix: Flyway migration to normalize a situation where different rules and rule variables under the same program could have the same names * fix: Flyway migration enhancement to reduce duplicated code and generate a list of affected rules at the end of migration * fix: Flyway migration minor method naming fix * fix: applicating Peer Review suggestions commit 87ef26080354e452d282d374e4dc6de996844a1c Author: Zubair Asghar <[email protected]> Date: Fri Oct 2 12:53:53 2020 +0500 test: Add integration tests for tracker side effects (#5833) * test side effect handler services * add sample Tracker events payload * Use IntegrationTestBase to run tests against Postgress * remove unused dependency * Add tracker side effect converter service * Add tracker domain objects for rule-engine * add json annotations * code refactor * fix valid date * Use awaitility to test side effect thread execution * rename resource file * minor code refactor * change rule-engine version * text fixes * ignore unit tests for now * fix sonar code smells * fix code smells * use Transactional annotation at class level * rename TrackerSideEffect class * reduce waiting time to 2 seconds * add java doc for TrackerRuleEngineSideEffect * add ProgramNotificationInstanceService * code style changes * Add mocked currentUserService * Add service layer class for ProgramNotificationTemplate * update notification implementation test * fix sonar code smells * changes for new rule engine set up in tracker importer * fix conflict after merging master * Revert "fix conflict after merging master" This reverts commit e418cd2c94f424b34cdfeaa566833d6a4b9d3c3f. * fix unit tests * fix integration test * set waiting time to 2 seconds commit ec7480bc75f1374667f532c71ef2f970c309eb01 Author: Viet Nguyen <[email protected]> Date: Fri Oct 2 14:49:59 2020 +0700 fix: lazy exception in AuditObjectFactory (#6176) commit 7b71a4df5ab92cd5aca2c87010cc6b6689293b18 Author: netroms <[email protected]> Date: Fri Oct 2 15:42:45 2020 +0800 Update codeql-analysis.yml (#6315) commit e577f25f0dc42e963646454c49661c4e0ccdcf1c Author: Lars Helge Øverland <[email protected]> Date: Fri Oct 2 09:29:12 2020 +0200 refactor: Constructor instead of set method init of DataSourceManager (#6303) * Rename * Minor * Add top and bottom to text align * Minor * Revert * Cleanup * Javadoc * Minor * Javadoc * Code style * System settings * Refactor * Minor commit 56fc7559fe63e7722e76d571e90a851ba55a1ad5 Author: Abyot Asalefew Gizaw <[email protected]> Date: Fri Oct 2 09:21:16 2020 +0200 fix: Reject duplicate events from current payload (#6267) * fix: Reject duplicate events from current payload * chore: Move validation tasks to the hooks commit c8bef4f937b0a3719a7227c088751f689b6003f1 Author: Enrico Colasante <[email protected]> Date: Fri Oct 2 09:17:15 2020 +0200 fix: [DHIS2-8872] Fix import summary count for events in enrollment (#6257) commit 8bcecd537a43bcef4148300dcaaa97562887bc2a Author: Luciano Fiandesio <[email protected]> Date: Fri Oct 2 09:16:15 2020 +0200 fix: SQL query to fetch category option combo (#6234) During Event Import, the system tries to fetch a Category Option Combo by Category Combo ID and category options, based on the input. The SQL query for fetching the Category Option Combo was using an incorrect `join`, which in certain cases, was not returning any result. ref: DHIS2-9565 (cherry picked from commit b61d3f6648fd3dd95481d6a877bf29c93835e9ab) (cherry picked from commit cf7cadc05f06671c5b8a244b9d51abcf33e7adcb) commit 2a6af5fe3c745123be67bd3a84127d32f04761f4 Author: netroms <[email protected]> Date: Fri Oct 2 15:14:04 2020 +0800 fix: broken Hibernate5module usage (#6300) (#6317) * Remove all usage of Hibernate5Module Current Hibernate5module configuration breaks the JSON deserialization. The Hibernate5module is meant to be used in context when there is no open session in view, like background tasks and asynchronous tasks. In DHIS2 this used for scheduled background tasks and the audit system. Another PR to reconfigure Hibernate5Module will come later. Issue: [DHIS2-9451] Signed-off-by: Morten Svanaes <[email protected]> commit 845c07d7f13ba5c6c5183b9d1ea14ab5bf6fd41e Author: netroms <[email protected]> Date: Thu Oct 1 20:14:23 2020 +0800 feat: add codeql-analysis.yml file to setup CodeQL code scanning (#6304) * Create codeql-analysis.yml file for running CodeQL code scanning on all pull requests commit cf2d9ecee02d5c116428856a5b12700d83fddeb8 Author: Zubair Asghar <[email protected]> Date: Thu Oct 1 13:43:48 2020 +0500 chore: Bump ANTLR library version (#6271) commit ea08b6641eb0f1c05bcd85ec22ebb1c33e39fc0d Author: Lars Helge Øverland <[email protected]> Date: Thu Oct 1 10:21:43 2020 +0200 fix: Remove invalid @JsonSerialize annotation from MapView (#6301) * Rename * Minor * Add top and bottom to text align * Minor * Revert * Cleanup * Javadoc * Minor * Javadoc * Code style * System settings * fix: Remove invalid @JsonSerialize annotation commit 987e8638bef0480df048bff138717482bdcb5adb Author: Hendrik de Graaf <[email protected]> Date: Thu Oct 1 09:41:49 2020 +0200 chore(web-apps): update feature-toggle readme for usage-analytics (#6241) commit 36d0d1bb857f77af68d755cdc2a10fa563f807aa Author: Mohamed Ameen <[email protected]> Date: Wed Sep 30 10:33:36 2020 +0200 fix: [DHIS2-8782] handle old sms gatewayconfig from 2.33 and before and convert into new config during upgrade (master) (#6290) commit 123a7dfb16be8a08f806d6383cba0d1f442a26c7 Author: Mohamed Ameen <[email protected]> Date: Wed Sep 30 09:47:04 2020 +0200 fix: backported flyway script to make it idempotent (master 2.36) (#6283) commit c55ad875d1635b54a717455487bb46722461c16b Author: Morten Hansen <[email protected]> Date: Wed Sep 30 09:09:00 2020 +0200 fix: if system setting == null, return empty string (#6279) commit cb11f373acfdd551b765322a9ae63b068d245b43 Author: @dhis2-bot <[email protected]> Date: Wed Sep 30 01:43:06 2020 +0200 fix(translations): sync translations from transifex (master) Automatically merged. commit 5eb561a26fccf3a421f7c73feb4d7f204ed4366a Author: Morten Hansen <[email protected]> Date: Tue Sep 29 12:29:02 2020 +0200 fix: convert all values from getSystemSettingOrTranslation into string (#6276) commit 9eef51fcafacb850aac4bf030735a055624f3e29 Author: Viet Nguyen <[email protected]> Date: Tue Sep 29 13:25:34 2020 +0700 fix: Add audit for hard delete TEI (#5756) commit a7145f06cc4974fa2628a2aad9c1e2d9d47cc5cc Author: Giuseppe Nespolino <[email protected]> Date: Mon Sep 28 10:07:17 2020 +0200 fix: DHIS2-9519 different error message when a TEI has already been d… (#6239) * fix: DHIS2-9519 different error message when a TEI has already been deleted * fix: DHIS2-9519 avoiding unnecessary query commit 32f74a48b0137443902cc43f9229daf98e0fd782 Author: Viet Nguyen <[email protected]> Date: Mon Sep 28 00:42:00 2020 +0700 fix: remove custom serialization for OU.getChildren() (#6268) commit 2d739e03e51eab4bddeecc0b50e5d6181514f1e0 Author: netroms <[email protected]> Date: Sun Sep 27 17:54:49 2020 +0800 chore: fix typo in OIDC configuration variable (#6263) Signed-off-by: Morten Svanaes <[email protected]> commit fd390439257d09c3c2a8bf15de56f1a4a36b5521 Author: Lars Helge Øverland <[email protected]> Date: Sun Sep 27 11:51:57 2020 +0200 fix: Avoid toString call for individual system setting serialization (#6259) The API endpoint for individual system settings (/api/systemSettings/{key}) currently calls toString on the Serializable system setting value, presumably to harmonize it with potential translations. This has unintended effects: - For object typed values such as Date, the Date is serialized according to the toString method instead of letting Jackson control the serialization according to the standard Date format in DHIS 2. - It creates an inconsistency with the system settings endpoint (/api/systemSettings), where toString is not called (which is the correct behavior). - It makes it impossible to handle Date values programmatically by clients. This patch removes the toString invocation and returns the value typed as Serializable commit f278306c26a62beea1ce99367bec3c18a872c627 Author: @dhis2-bot <[email protected]> Date: Sat Sep 26 01:42:55 2020 +0200 fix(translations): sync translations from transifex (master) Automatically merged. commit d2bf3ea34a5ac6225fb8880e68f78945bb1e9f4b Author: Lars Helge Øverland <[email protected]> Date: Fri Sep 25 15:58:51 2020 +0200 chore: Add Javadoc (#6258) commit 1085dbd85da6b2aa209a64a9ba52d038c2bfafe6 Author: netroms <[email protected]> Date: Fri Sep 25 15:50:26 2020 +0800 feat: add sign in with Google button to login page (#6254) commit c17c543e685f106402d9d1b467a37b276417e2ce Author: Morten Hansen <[email protected]> Date: Fri Sep 25 09:15:02 2020 +0200 fix: update with correct authority, M_dhis-web-sms-configuration (#6245) * feat: adds sms authority migration where mobile authority is present * fix: update with correct authority, M_dhis-web-sms-configuration commit b71e63893e703edcf205ab5d931068c4aead157e Author: Maikel Arabori <[email protected]> Date: Thu Sep 24 17:01:00 2020 +0200 fix: [DHIS2-9520] Adding user DB settings into interceptor (#6242) commit 39de257d787ae134dec297ddd9c954e86ba1620f Author: Lars Helge Øverland <[email protected]> Date: Thu Sep 24 14:54:54 2020 +0200 refactor: Remove class-scoped display properties from various classes (#6224) This is a minor refactor of the translation solution, where the class-scoped "display" properties are removed from various classes. The logic for retrieving translations are moved purely into the getDisplay{Property} methods. commit a2a1e9a3eeaffdff41a26698027cf32d63896249 Author: Maikel Arabori <[email protected]> Date: Thu Sep 24 14:25:41 2020 +0200 fix: [DHIS2-9520] Adding user context interceptor to the request flow (#6236) commit 59dd9f885626473b854e69c58d37f24fce424eaf Author: Luciano Fiandesio <[email protected]> Date: Thu Sep 24 10:38:11 2020 +0200 test: added tests for the ACL section of the ProgramSupplier (#6230) The ProgramSupplier class (used by Tracker Import for Events) spawns a number of ACL related queries which were not covered by unit tests. This PR adds integration tests for checking the ACL queries for user and user groups for: - Program - Program Stage - Tracked Entity Type commit 8f4a22bdb1afeaa06d911adb845852aa01ebc51e Author: Maikel Arabori <[email protected]> Date: Thu Sep 24 09:23:28 2020 +0200 fix: [DHIS2-8588] handling division by ZERO error (#6153) * fix: [DHIS2-8588] handling division by ZERO error Some data elements, which are not compulsory are returned as NULL values for this query. So, when converting to ZERO, we can face a division by ZERO error. This happens in cases when we have a division operation in the formula and the denominator is set to ZERO (for the cases when they are NULL). * fix: [DHIS2-8588] Code formatting * fix: [DHIS2-8588] Code formatting * fix: [DHIS2-8588] Sonarqube issue * Update dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/event/data/JdbcEventAnalyticsManager.java Co-authored-by: Stian Sandvold <[email protected]> commit 5ac11d3c823686de0e062512182fb40c72c66fb4 Author: Jim Grace <[email protected]> Date: Thu Sep 24 03:21:30 2020 -0400 feat: Log dashboard favorite views DHIS2-9553 (#6178) * feat: Log dashboard favorite views DHIS2-9553 * Update favorite name commit 52b8f7c48def44670be7ba9d25d0ee963fe9441e Author: Giuseppe Nespolino <[email protected]> Date: Thu Sep 24 09:19:03 2020 +0200 fix: Coordinate class removed, drop support for old implementation (#6172) * fix: Coordinate class removed, drop support for old implementation * fix: fixing SonarQube warnings * fix: fixing SonarQube warning * Update dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/events/trackedentity/store/mapper/EnrollmentRowCallbackHandler.java Co-authored-by: Stian Sandvold <[email protected]> * fix: fixing pom dependency for lombok fix: fixing SonarQube warning fix: fixing SonarQube warnings fix: Coordinate class removed, drop support for old implementation * fix: boyscout rule * fix: fixing pom dependency for lombok Co-authored-by: Stian Sandvold <[email protected]> commit 3842dbb7380aa65d77c873ee56bf213ac036f596 Author: Giuseppe Nespolino <[email protected]> Date: Wed Sep 23 17:05:34 2020 +0200 fix: [DHIS2-7418] adding validation rule for ProgramRule and ProgramRuleVariable (#6223) commit d21fd5df4ff5cb85ddceba60c8e35e97978b9f78 Author: Luciano Fiandesio <[email protected]> Date: Wed Sep 23 16:51:35 2020 +0200 fix: fix User Access SQL query for programs (#6222) During event import, the query that fetches user access for programs was using an incorrect join, which was causing no rows to return. (cherry picked from commit 1eaad52e08503ba82b067a2b7ba02bf7e9fec6ad) commit 8aaeab2ee4dd7a9ffa927147931dff8609ef787a Author: Lars Helge Øverland <[email protected]> Date: Wed Sep 23 15:33:34 2020 +0200 chore: Remove unused imports (#6219) commit 836e261bbf5db21380e1292643536d25a0459728 Author: Lars Helge Øverland <[email protected]> Date: Wed Sep 23 15:20:14 2020 +0200 fix: Remove set display property methods (#6218) Removes set methods for the various display properties, in order to make these properties immutable. commit 103ab94ca46df3be4346c3aab130fe8469cdaae9 Author: Maikel Arabori <[email protected]> Date: Wed Sep 23 14:14:49 2020 +0200 fix: [DHIS2-9510] Adding back filter support for start/end dates (#6168) commit f9e7fabef132ceabb3c205a793d615a9feb76c45 Author: Lars Helge Øverland <[email protected]> Date: Wed Sep 23 14:12:46 2020 +0200 fix: Introduce `dimensionDisplayName` property for dimensional object (#6213) * Code style * fix: Introduce dimensionDisplayName property to BaseDimensionalObject * Fix test * Fix test * Fix test * Clean up commit cf3960749dbefe7afc82c710478f10ddf672bac7 Author: Enrico Colasante <[email protected]> Date: Wed Sep 23 13:59:29 2020 +0200 fix: [DHIS-9395] Untick YES_ONLY attribute values was not working (#6181) commit 63da3ca7b67edfed4bfc868cf213c055ea6faf06 Author: Luciano Fiandesio <[email protected]> Date: Wed Sep 23 13:42:18 2020 +0200 fix: DB pool saturation under heavy concurrency (#6173) Removes the `@Transactional` annotation from the newly added `getTrackedEntityInstances2`. The annotation was causing the C3P0 pool to saturate with 200+ concurrent users. The first 80 threads were keeping the Transaction open (80 is the default pool size), while executing the TEI fetching logic. The other 120 threads were also trying to access the DB, but could not get a connection from the pool. This PR also: - Makes the TEI fetching use a dedicated Executor to avoid using the default JVM ThreadPool - Adds 3 local caches for TEI Attribute Type, TEI Attribute by Program and security context - Adds a method to persist TEI Audit in batch, rather than executing an INSERT statement for each TEI to audit - Uses lombok annotation to remove constuctors - Minor code cleanup (cherry picked from commit 1786eab57673b1733622ef38734b517905cc2af7) commit 5d97c3d6fc838a5869857a03270c859738810da7 Author: Zubair Asghar <[email protected]> Date: Wed Sep 23 13:18:28 2020 +0200 fix: Rule expression description when using d2 functions [DHIS2-9580] (#6209) * fix: Rule expression description when using d2 functions * minor refactor commit 21deacf0db7f6574998c178350004cb846b534de Author: netroms <[email protected]> Date: Wed Sep 23 18:03:29 2020 +0800 feat: add Azure AD OpenID Connect provider support (#6189) Adds support for using Azure AD as an OIDC provider Add support for logout session with OIDC providers that support it Adjust Authmanager configurations to be explicit for each authentication endpoint Remove redundant Lombok dependency in main pom.xml Small adjustment to comments text commit 1bd8ee38126fbac22f805db44dad0cdcba7b14a6 Author: Luciano Fiandesio <[email protected]> Date: Wed Sep 23 11:30:37 2020 +0200 fix: allow updating an Event with File data type [DHIS2-9559] Data Value of type File Type were making the update process to fail. Introduced a more solid handling of mandatory data (e.g. Program Instance, Org Unit) since we can't always assume that the client will send all the required data. Added some tests. Added new test library to assert dates. ref: DHIS2-9559 (cherry picked from commit: e522e985d6d4fcd5bc5d6546b9337d6ab07dcfe7) commit 7beda2ceeec04961eb876575c25f2b32e5ac7494 Author: Giuseppe Nespolino <[email protected]> Date: Tue Sep 22 16:02:48 2020 +0200 fix: DHIS2-8910 filter out Data Element which are not present in Program Stage (#6165) * fix: filter out Data Element which are not present in Program Stage * fix: javadoc comment on FilteringOutUndeclaredDataElementsProcessor * fix: FilteringOutUndeclaredDataElementsProcessor unit test added * fix: Integration test failing * Apply suggestions from code review Co-authored-by: Stian Sandvold <[email protected]> commit 42a2433b818ec05b1ee28fabe3d8eed5bddac230 Author: Enrico Colasante <[email protected]> Date: Tue Sep 22 14:04:11 2020 +0200 fix: [DHIS2-9023] Block programStage deletion when a program rule is linked to it (#6163) * fix: [DHIS2-9023] Block programStage deletion when a program rule is linked to it commit 65c8ee5078d6ce8565d39554ec8624883cb1aadb Author: Enrico Colasante <[email protected]> Date: Mon Sep 21 23:12:00 2020 +0200 fix: [DHIS2-9564] Fill storeBy field for comments using current user username if no value is present in the payload (#6192) commit ffc2b4b374d92ff8d3312694572cf1d9188fdf96 Author: Jim Grace <[email protected]> Date: Sat Sep 19 06:47:19 2020 -0400 feat: Cascade Delete Dashboard Items DHIS2-5584 (#6167) commit e4ff88027eb8dd823a539ef0ed82daeff5072e7c Author: Luciano Fiandesio <[email protected]> Date: Fri Sep 18 16:43:42 2020 +0200 fix: prevent db deadlock during Event update (#6135) - Make sure that events are sorted by UID before doing a batch update. This prevents multiple concurrent transactions to trigger a Postgres deadlock, when the list of events is "out of order" - fix: prevent db deadlock during Event update - Make sure that the TEI are sorted when updating TEI after an Event update - Added missing javadoc to Event-related interface methods - Minor code cleanup ref: DHIS2-9383 (cherry picked from commit 3348897)] commit 82930982ea069f2819c8faa0d083dc09c9bc557c Author: Mohamed Ameen <[email protected]> Date: Fri Sep 18 14:05:48 2020 +0200 fix: [DHIS2-9405] Avoid leaking sensitive sql messages in case of sensitive exceptions like sqlgrammarexceptions etc (master) (#6145) * fix: [DHIS2-9405] Avoid leaking sensitive sql messages in case of badsqlgrammarexceptions etc * format commit 53a5939779c99b8d827e054a9fe164d711c32f1c Author: Mohamed Ameen <[email protected]> Date: Fri Sep 18 13:08:48 2020 +0200 feat: [DHIS2-9496] Add content disposition for datavalueset file downloads (master) (#6180) commit cd19f7ccda9ae0b343188e416b02785cf30bba2a Author: @dhis2-bot <[email protected]> Date: Fri Sep 18 01:42:20 2020 +0200 fix(translations): sync translations from transifex (master) Automatically merged. commit ec774b8d30cac4a668ea130a9b659595e682e42b Author: Mohamed Ameen <[email protected]> Date: Thu Sep 17 16:12:19 2020 +0200 feat: [DHIS2-9445] Add downloadable options to get tei api (#6162) * feat: [DHIS2-9445] Add downloadable options to get tei api (master) * reused constants * formatting fix commit 403fb8595b1ac4cbe747f35e9ab24f4bf2e601c6 Author: @dhis2-bot <[email protected]> Date: Thu Sep 17 01:41:48 2020 +0200 fix(translations): sync translations from transifex (master) Automatically merged. commit ff11f1768b9b94d0a1275c13e1bc26f4eea2765b Author: Morten Hansen <[email protected]> Date: Wed Sep 16 15:16:50 2020 +0200 feat: add sms authority migration where mobile authority is present (#6154) commit c3ab110d72f55cf3f97a7166b80531d3f452aeb1 Author: Giuseppe Nespolino <[email protected]> Date: Wed Sep 16 11:16:14 2020 +0200 fix: daoEntityInstance null check (#6158) * fix: deoEntityInstance null check * Update dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/events/trackedentity/AbstractTrackedEntityInstanceService.java Co-authored-by: Stian Sandvold <[email protected]> commit ad8addc26177efac29fba1987865b2be585f93b2 Author: @dhis2-bot <[email protected]> Date: Wed Sep 16 01:41:42 2020 +0200 fix(translations): sync translations from transifex (master) Automatically merged. commit 55e411fdd03ee5ae46ed305e85d8feb26d53a201 Author: Giuseppe Nespolino <[email protected]> Date: Tue Sep 15 16:52:41 2020 +0200 fix: DryRun flag and ProgramNotificationPostProcessor (DHIS2-9484) (#6144) * fix: now dryrun flag is considered while importing fix: added ProgramNotificationPostProcessor in eventInsertPostProcessorMap * fix: peer review ProgramNotificationPostProcessor in shared package Small change for better readability commit 20ae7d1ed19072116ee92e47a760e281039159ce Author: Enrico Colasante <[email protected]> Date: Tue Sep 15 11:32:35 2020 +0200 fix: [DHIS2-9428] Use report mode parameter to filter report data (#6122) * fix: [DHIS2-9428] Use report mode parameter to filter report data * Update dhis-2/dhis-services/dhis-service-tracker/src/test/java/org/hisp/dhis/tracker/utils/ImportUtils.java Co-authored-by: Stian Sandvold <[email protected]> commit 3fb60c0914fe4262434b72324e617e428f741c1a Author: Jim Grace <[email protected]> Date: Tue Sep 15 05:03:16 2020 -0400 fix: DHIS2-3602 Event import AOC error message (#6097) commit c1849f7f91f075434ead3e45050346f037e096ea Author: netroms <[email protected]> Date: Tue Sep 15 16:51:03 2020 +0800 chore: hide exception stacktrace in struts (#6120) * Due do changed handling of how exception are shown in struts action, we need to disable show exception parameter, due to possibly broken behaviour pre 2.35 Signed-off-by: Morten Svanaes <[email protected]> commit 0bf885729a34607045311aa619f52c1148c6f455 Author: Jim Grace <[email protected]> Date: Tue Sep 15 04:42:38 2020 -0400 feat: Logarithms in expressions DHIS2-9322 (#6143) commit 0d92ad5de4a939d363007518548ac12b6f2e6adc Author: Maikel Arabori <[email protected]> Date: Tue Sep 15 10:14:12 2020 +0200 fix: [DHIS2-9483] Update FOP deps (#6147) This fix a NoSuchMethodError in the PDF generation. commit 0d35843121f0ad3004fad015f1520c5b06a5c337 Author: Stian Sandvold <[email protected]> Date: Tue Sep 15 09:24:33 2020 +0200 Merge 2.35 into master (#6149) * feat: Convert xml based config files to java annotation based config Convert all .xml spring config files to Java config classes using spring @Configuration instead (except Struts bean.xml config files). Convert web.xml files to use Java bases classes extending WebApplicationInitializer. Remove support for OpenID ver. 1 (this is for preparing for OIDC support later). Migrate some filters to use @WebFilter configuration. Upgrade Spring, Spring Security, Struts and more depenendices to latest versions. Add maven-enforcer rules to enforce better dependency controll. Add exclusions for overlapping and clashing dependencies. * feat: Convert xml based config files to java annotation based config Fix broken unit tests, add missing deps. to ldap. * feat: Convert xml based config files to java annotation based config Remove usage of DhisTest in the web layer * feat: Convert xml based config files to java annotation based config Some doc and minor cleanup of unused code and commented code. * feat: Convert xml based config files to java annotation based config * Fixed wrong config for opens session in view * Added default user startup task populator, removed old automatic accces provider system * Added authority provider config for struts * removed ununsed dep. * feat: Convert xml based config files to java annotation based config * Downgrade Hibernate back to 5.2.17 * feat: Convert xml based config files to java annotation based config * Disable broken e2e test * feat: Convert xml based config files to java annotation based config * Revert DefaultAuditObjectFactory change * feat: Convert xml based config files to java annotation based config * Added back custom entry point for form based entry to bypass web/form if a custom header is present. * feat: Convert xml based config files to java annotation based config * Reenable web-apps module... * feat: OpenID Connect support for authentication * feat: Convert xml based config files to java annotation based config * Fix review comments * feat: Convert xml based config files to java annotation based config * Add CurrentUserHandlerMethodArgumentResolver * feat: OpenID Connect support for authentication * Add dynamic reg id look up * feat: Convert xml based config files to java annotation based config * Remove deprecated org.olap4j.impl.ArrayMap usage * feat: OpenID Connect support for authentication * feat: OpenID Connect support for authentication * feat: OpenID Connect support for authentication * Basic google oidc support * feat: OpenID Connect support for authentication * Tweak logging * feat: OpenID Connect support for authentication * feat: OpenID Connect support for authentication * Add conditional enable/disable feature for OIDC * Fixed TECriteriaMapperTest * fix: Use error code for delete not allowed exception (#6004) Use error code for delete not allowed exception, used when a metadata entity cannot be deleted. (cherry picked from commit 0cd2c831a5e2413fa0c61c41100d888ea06052ae) * feat: implement bundled application overrides * fix: redirect to launch url from index.action legacy requests * Fixed TECriteriaMapperTest * chore: revert log4j config changes (#6007) * fix: inject full context path rather than relative URL to manifest.webapp * feat: add flags of the world (2.35) DHIS2-7621 (#5956) * chore: revert to original app authority translation * chore: remove bundledAppNames endpoint * chore: Remove system setting key GOOGLE_CLOUD_API_KEY * Fixed integration tests. Empty ids when getting teis. Empty tet ids during acl checks. * Ignored TEICriteriaMapperTest * fix: DHIS2-9268 AssignedUser in Event (New Tracker Importer) (#5985) * initial * Added specific serializer to assignedUser. Added override methods for hook * Update AssignedUserValidationHookTest.java * Update AssignedUserValidationHook.java * Fixed issue in SQL related to usergroup Access control for TET (#6011) * test: adds expectation for error code (#6019) # Conflicts: # dhis-2/dhis-e2e-test/src/test/java/org/hisp/dhis/metadata/orgunits/OrgUnitsRemovalTest.java * chore: adjust security headers * Tweak security headers to align with pre xml to java config refactoring Signed-off-by: Morten Svanaes <[email protected]> * fix: adds name to UserDto * chore: add back original struts config * Re-enable struts security interceptor * Disable struts dev mode Signed-off-by: Morten Svanaes <[email protected]> * chore: revert commit wrongly based on master into 2.35 Revert "chore: revert log4j config changes (#6007)" This reverts commit 218794f4 Signed-off-by: Morten Svanaes <[email protected]> * chore: revert log4j config changes (#6006) (#6034) (cherry picked from commit 8b708daf837c8387e25b5cb2f018680f5e53c4dd) * chore: fix login error message not showing (#6038) * fix missing error message when login fail * add back auth logging Signed-off-by: Morten Svanaes <[email protected]> * fix: Get tei api refactor tests and configs (#6024) * trying different profile for defaultconfigprovider * Disable OIDC configuration check if test run * Changed flyway to accept mixed mode to include both non-ts and ts statements within a migration group * Fix enrollment followup tests, to use getBoolean and wasNull instead of getString * Force hibernate flush and clear to reload entities saved using jdbctemplate in tests * LGTM alert fix * fix: periodType integration test error (#6046) * chore: try to fix unstable spring dependency wiring problem (#6035) * chore: try to fix unstable spring dependency wiring problem * Add @Lazy annotation to AuthenticationManger parameter in AuthenticationProviderConfig Signed-off-by: Morten Svanaes <[email protected]> * chore: try to fix unstable spring dependency wiring problem * Add @Lazy annotation to AuthenticationManger parameter in AuthenticationProviderConfig Signed-off-by: Morten Svanaes <[email protected]> * chore: try to fix unstable spring dependency wiring problem * Add ifTest check in OIDC condition (config enabler) this was starting the DefaultDhisConfigurationProvider in the integrations tests Signed-off-by: Morten Svanaes <[email protected]> * chore: try to fix unstable spring dependency wiring problem * Disable DataApprovalStoreIntegrationTest until we have a solution for the failing tests Signed-off-by: Morten Svanaes <[email protected]> * chore: try to fix unstable spring dependency wiring problem * Disable DataValueSetServiceTest until we have a solution for the failing tests Signed-off-by: Morten Svanaes <[email protected]> * fix: eventStatus ACTIVE is not respected in tei filtering (#6041) * fix: event status ACTIVE is not considered in teis api (#6052) * feat: [DHIS2-9374] Change trackedEntityAttributeValueAudit primary key to bigint (2.35) (#6044) * feat: [DHIS2-9374] Change trackedEntityAttributeValueAudit primary key to bigint * Ignoring DataApprovalStoreIntegrationTests * Revert ignore dataapproval test * chore: remove explicit wiring of an AuthenticationManager into XWorkSecurityInterceptor (#6053) Remove explicit wiring of an AuthenticationManager into XWorkSecurityInterceptor, this seems to fix an issue of Spring failing to startup because dep. wiring unstability. * chore: set missing service to DefaultOrganisationUnitSelectionManager (#6055) * test: adds API tests for user lookup endpoint (#6050) * test: fixes compilation error (#6057) * feat: Add support for tracker object deletion (#6023) * fix: failing unit test due to invalid period length (#6059) (#6064) (cherry picked from commit 6073423954f00614d59b1a983342d2bbbb34a67c) * chore: add missing permitall to urls (#6060) * chore: add missing permitall to urls * Adds permit all rule to urls that are outside (before) authentication * Add missing service to DefaultSelectionTreeManager * Add null check for user details on AuthenticationLoggerListener.java (happens when you register user and login automatically, and then try to log out) Signed-off-by: Morten Svanaes <[email protected]> * chore: add missing permitall to urls * Add login.js til permit all list Signed-off-by: Morten Svanaes <[email protected]> * chore: add missing permitall to urls * Add wildcard permit to security/* Signed-off-by: Morten Svanaes <[email protected]> * feat: support collections for UserPropertyTransformer (#6045) (#6077) * fix: re-enable property transformer for getMembers * minor * fix: minor code fixes, npe checks * fix: re-fetch schema for transformed properties * minor fixes * fix: support field expansion for property transformers * fix: npe check * fix: add missing set 2fa on usercredentials in me controller (#6078) * The setting of 2fa property in the account view is not working because the /me controller is not properly setting the user credentials property when PUT is called. Issue: [DHIS2-9392] Signed-off-by: Morten Svanaes <[email protected]> * chore: add missing TwoFactorWebAuthenticationDetailsSource to form login (#6075) * add missing TwoFactorWebAuthenticationDetailsSource to form login Signed-off-by: Morten Svanaes <[email protected]> * fix: apply UserPropertyTransformer transforms (#6084) (#6086) * fix: Adds back User properties into UserDto (#6087) (#6090) * feat: Add proxy API endpoint for App Hub [DHIS2-9093] (#6085) (cherry picked from commit 1a6a4cb01b60c98998cc4816ee356dfdb05d8a13) * fix: Use name instead of UID for pivot column download [DHIS2-9026] (#5758) Creating a simple object (DimensionDescriptor.java) to map raw dimension identifiers and its related type so it can be used in a later stage when setting the report headers during the download in the Pivot table app. (cherry picked from commit 8a123624a741085d598de614d0b5c3be2513eb9e) * feat: fetch Org Unit coordinate in event analytics query (#5912) Allows to return the Org Unit coordinates of an Event attribute, if present. (cherry picked from commit fe6b538a0c57fa8a385acbc8f93e02e154c325ca) * fix: assigned user related filters in hql formation (#6092) * fix: [DHIS2-9286] add exception handling globally to catch any unhandled ones and notify job correctly (#6083) * feat: add main exception handling in new tracker import job * Add error report into import report in case of exceptions * minor * Minor refactor * Added logging * Remove rethrowing of exception * Formatting * Fixed a test to solve potential race condition * Added a new constructor to avoid too many nulls in constructor * Revert weird tes * fix: [DHIS2-9410] include tei parameter when searching for existing psi (2.35) (#6093) * fix: [DHIS2-9410] include tei parameter when searching for existing psi * minor fix * Fix tests * Fix sonar complaint * fix: (2.35) Use program id instead of program rule id (#6094) * chore: Use releases versions for rule-engine and antlr parser (#6018) * feat: Add pagination to endpoint dimensions/<uid>/items (#6096) * fix: remove firstName, surname from UserDto (#6099) * fix: Add 501 NOT IMPLEMENTED to POST /tracker, due to importer not being 100% complete (#6100) * chore: add missing multipart resovler (#6105) * chore: fix broken content negotiation manager config (#6109) * chore: hide exception stacktrace on struts actions error page (#6110) * feat: require bundled app overrides to be configured with the coreApp flag in the manifest (#6111) * feat(apps to bundle): add cache cleaner to bundled apps v35 (#6108) * refactor(apps to bundle cache cleaner): use master branch * docs(apps to bundle): add 2.35 feature toggle apps column * fix: cache-cleaner app is feature-toggling, not capture app * fix: prevent db deadlock during Event update (#6131) - Make sure that events are sorted by UID before doing a batch update. This prevents multiple concurrent transactions to trigger a Postgres deadlock, when the list of events is "out of order" - Make sure that the TEI are sorted when updating TEI after an Event update - Added javadoc to interfaces - Code clean-up * fix: audit for event importer are now present (#6138) fix: explaining reason for AbstractEventAuditPostProcessor fix: added comment to lombok.config fix: adding @NonNull to component dependencies where explicit constructor was replaced by @RequiredArgsConstructor * feat: add SMS Configuration App (#6136) * feat: [DHIS2-9487] Adding support for font style configs (2.35) (#6141) Backporting from 2.36 (master) * Fix sonar issues Co-authored-by: Morten Svanaes <[email protected]> Co-authored-by: Ameen <[email protected]> Co-authored-by: Lars Helge Øverland <[email protected]> Co-authored-by: Austin McGee <[email protected]> Co-authored-by: Philip-Larsen-Donnelly <[email protected]> Co-authored-by: Gintare Vilkelyte <[email protected]> Co-authored-by: Morten Olav Hansen <[email protected]> Co-authored-by: Viet Nguyen <[email protected]> Co-authored-by: Zubair Asghar <[email protected]> Co-authored-by: Luciano Fiandesio <[email protected]> Co-authored-by: Morten Hansen <[email protected]> Co-authored-by: Maikel Arabori <[email protected]> Co-authored-by: Enrico Colasante <[email protected]> Co-authored-by: Jan-Gerke Salomon <[email protected]> Co-authored-by: Giuseppe Nespolino <[email protected]> commit 4756c0b378e5b1c823c194525c3a0cc1ecba7b2b Author: netroms <[email protected]> Date: Mon Sep 14 18:54:16 2020 +0800 chore: fix broken content negotiation manager config (#6119) commit d050b4efe4292adf2fa5f76d3e9f653524d3959b Author: Marcos Campos <[email protected]> Date: Mon Sep 14 11:50:45 2020 +0200 feat: Icons update for 2.35 (#6134) * feat: Update svg icons to 2.35 version * feat: support for deleted icons names, descriptions and keywords commit 74d8f0712b3a02a3b94f7f3321b832c1d048ce1d Author: Maikel Arabori <[email protected]> Date: Sun Sep 13 16:44:42 2020 +0200 feat: [DHIS2-9487] Adding support for font style configs (#6142) * feat: [DHIS2-9487] Adding support for font style configs * fix: Code formatting commit f8cfa7437ac99962a94ceef4b9150478899ceb2b Author: Giuseppe Nespolino <[email protected]> Date: Fri Sep 11 13:59:14 2020 +0200 fix: audit for event importer are now present (#6138) (#6140) fix: explaining reason for AbstractEventAuditPostProcessor fix: added comment to lombok.config fix: adding @NonNull to component dependencies where explicit constructor was replaced by @RequiredArgsConstructor commit a1a56da8bc2b9247d4825f1392cb34cbbd2509d9 Author: netroms <[email protected]> Date: Thu Sep 10 13:08:38 2020 +0800 chore: fix HTTP basic auth to redirect to form login on 401 (#6123) commit eaebb34293113109667e2215e3c93251eb90d503 Author: @dhis2-bot <[email protected]> Date: Thu Sep 10 01:43:13 2020 +0200 fix(translations): sync translations from transifex (master) Automatically merged. commit 1775146057dbef2da11c4e554b339f150f2f4857 Author: Giuseppe Nespolino <[email protected]> Date: Wed Sep 9 08:34:03 2020 +0200 perf: [DHIS-9415] avoid querying programstageinstancecomments if not necessary (#6103) * perf: avoid querying programstageinstancecomments if not necessary * perf: JdbcEvenCommentStore invocation moved to an upper layer (code-review) commit b8bc3ddcd8c6ccb7223035ac40431317b5879a2d Author: @dhis2-bot <[email protected]> Date: Wed Sep 9 01:43:05 2020 +0200 fix(translations): sync translations from transifex (master) Automatically merged. commit c2e0b3718cd8c7597ee5ec2e5193e7eafacf5827 Author: Luciano Fiandesio <[email protected]> Date: Tue Sep 8 09:47:19 2020 +0200 fix: prevent Hibernate session errors with User object (#6063) Introduce a `TrackerUserService` dedicated to fetch the `User` object within a read-only Transaction: this allows to initialize the `User`'s proxied collections. The User object can now be used safely across the different Tracker layers. commit 3c1d3b31a7d1f3e6daddb0e147514dc629ff4643 Author: Maikel Arabori <[email protected]> Date: Mon Sep 7 15:43:49 2020 +0200 feat: [DHIS2-9272] Add pagination to endpoint dimensions/<uid>/items (#6102) commit a2ca0b1dc0ff43a075d36ed2d9fa0653f7ab8860 Author: Morten Hansen <[email protected]> Date: Mon Sep 7 11:55:15 2020 +0200 fix: remove firstName, surname from UserDto (#6098) commit cb2ee65c0210c0d4b2bd8851789da8d4adfaf04d Author: Enrico Colasante <[email protected]> Date: Mon Sep 7 10:28:21 2020 +0200 fix: [DHIS2-9287] Fix the stats in the import summary (#6062) * fix: [DHIS2-9287] Fix the stats in the import summary * Fix renaming * More fixes * Removing unused fields from report commit f444c3e4c96f17d93dbb4726691cc50b9bf802dd Author: Zubair Asghar <[email protected]> Date: Fri Sep 4 16:36:40 2020 +0200 fix: Use program id instead of program rule id (#6095) commit 1a6a4cb01b60c98998cc4816ee356dfdb05d8a13 Author: Lars Helge Øverland <[email protected]> Date: Fri Sep 4 11:20:46 2020 +0200 feat: Add proxy API endpoint for App Hub [DHIS2-9093] (#6085) commit 5e590e7becebcfd87c9c9c1b5141ee29c3927284 Author: Morten Hansen <[email protected]> Date: Thu Sep 3 16:12:18 2020 +0200 fix: Adds back User properties into UserDto (#6087) commit f2a0a1da38e3499c1233fe60b654df428505f960 Author: Enrico Colasante <[email protected]> Date: Thu Sep 3 12:57:13 2020 +0200 chore: Use releases versions for rule-engine and antlr parser (#6000) commit 9a1f42bfb23e0ef33e0e9bca768e473ae95db000 Author: Morten Hansen <[email protected]> Date: Thu Sep 3 12:50:37 2020 +0200 fix: apply UserPropertyTransformer transforms (#6084) commit 8a123624a741085d598de614d0b5c3be2513eb9e Author: Maikel Arabori <[email protected]> Date: Thu Sep 3 10:56:31 2020 +0200 fix: Use name instead of UID for pivot column download [DHIS2-9026] (#5758) Creating a simple object (DimensionDescriptor.java) to map raw dimension identifiers and its related type so it can be used in a later stage when setting the report headers during the download in the Pivot table app. commit acc94653e63d87ba1997cd724022596c8b6197cf Author: netroms <[email protected]> Date: Thu Sep 3 15:40:32 2020 +0800 fix: add missing set 2fa on usercredentials in me controller (#6074) * The setting of 2fa property in the account view is not working because the /me controller is not properly setting the user credentials property when PUT is called. Issue: [DHIS2-9392] Signed-off-by: Morten Svanaes <[email protected]> commit c37fc29f7b6291f297451c8b0309aeda9512b6ac Author: netroms <[email protected]> Date: Thu Sep 3 15:39:50 2020 +0800 chore: add missing TwoFactorWebAuthenticationDetailsSource to form login (#6076) * add missing TwoFactorWebAuthenticationDetailsSource to form login Signed-off-by: Morten Svanaes <[email protected]> commit 28e42c9f4dfa144d037668588a3d0ae4fb24a6a1 Author: Morten Hansen <[email protected]> Date: Thu Sep 3 08:23:56 2020 +0200 feat: support collections for UserPropertyTransformer (#6045) * fix: re-enable property transformer for getMembers * minor * fix: minor code fixes, npe checks * fix: re-fetch schema for transformed properties * minor fixes * fix: support field expansion for property transformers * fix: npe check commit c73098e87e0e99799356905491d99a5d44de3820 Author: @dhis2-bot <[email protected]> Date: Thu Sep 3 01:44:51 2020 +0200 fix(translations): sync translations from transifex (master) Automatically merged. commit 9baff290958de9a80cb5c568f3c0e95a07698f08 Author: netroms <[email protected]> Date: Wed Sep 2 23:39:42 2020 +0800 chore: add missing permitall to urls (#6061) * chore: add missing permitall to urls * Adds permit all rule to urls that are outside (before) authentication * Add missing service to DefaultSelectionTreeManager * Add null check for user details on AuthenticationLoggerListener.java (happens when you register user and login automatically, and then try to log out) Signed-off-by: Morten Svanaes <[email protected]> * chore: add missing permitall to urls * Add login.js til permit all list Signed-off-by: Morten Svanaes <[email protected]> * chore: add missing permitall to urls * Add wildcard permit to security/* Signed-off-by: Morten Svanaes <[email protected]> commit e1c0824055a397c912b3a8c6a69a5e7abe098594 Author: netroms <[email protected]> Date: Wed Sep 2 18:15:39 2020 +0800 chore: try to fix unstable spring dependency wiring problem (#6058) * Add ifTest check in OIDC condition (config enabler) this was starting the DefaultDhisConfigurationProvider in the integrations tests Signed-off-by: Morten Svanaes <[email protected]> commit 6012e61df13078edd7d67e098def0093dda3f3f1 Author: Philip-Larsen-Donnelly <[email protected]> Date: Wed Sep 2 11:31:42 2020 +0200 chore: fix incorrect merge from 2.35 commit 6073423954f00614d59b1a983342d2bbbb34a67c Author: Luciano Fiandesio <[email protected]> Date: Wed Sep 2 10:11:55 2020 +0200 fix: failing unit test due to invalid period length (#6059) commit a08346e00cfbb6783e4b7a5dd75c5f7cb8ce3f08 Author: netroms <[email protected]> Date: Wed Sep 2 00:40:14 2020 +0800 chore: set missing service to DefaultOrganisationUnitSelectionManager (#6056) * The DefaultOrganisationUnitSelectionManager was missing a service, causing a np Signed-off-by: Morten Svanaes <[email protected]> commit 6fa8a445c5a9fb5aac87ce05eda4bdbb1c6628e8 Author: netroms <[email protected]> Date: Tue Sep 1 22:27:08 2020 +0800 chore: remove explicit wiring of an AuthenticationManager into XWorkSecurityInterceptor (#6054) Remove explicit wiring of an AuthenticationManager into XWorkSecurityInterceptor, this seems to fix an issue of Spring failing to startup because dep. wiring unstability. commit 96615f1c0cf4be8658eaf3676fc0ef76d32b017c Author: netroms <[email protected]> Date: Tue Sep 1 19:58:59 2020 +0800 chore: fix login error message not showing (#6037) * chore: fix login error message not showing * fix missing error message when login fail * add back auth logging Signed-off-by: Morten Svanaes <[email protected]> * chore: try to fix unstable spring dependency wiring problem * Add @Lazy annotation to AuthenticationManger parameter in AuthenticationProviderConfig Signed-off-by: Morten Svanaes <[email protected]> * chore: fix login error message not showing * Ignore failing integration test Signed-off-by: Morten Svanaes <[email protected]> commit 0a35e20be1df978ff48a12398d1fb6ae0e03f4ec Author: netroms <[email protected]> Date: Tue Sep 1 19:32:45 2020 +0800 chore: try to fix unstable spring dependency wiring problem (#6036) * chore: try to fix unstable spring dependency wiring problem * Add @Lazy annotation to AuthenticationManger parameter in AuthenticationProviderConfig Signed-off-by: Morten Svanaes <[email protected]> * chore: try to fix unstable spring dependency wiring problem * Ignore failing integration test Signed-off-by: Morten Svanaes <[email protected]> commit 9c376d044884264375ba7a412c2a1502318c0fe7 Author: Viet Nguyen <[email protected]> Date: Tue Sep 1 17:11:02 2020 +0700 fix: periodType integration test error (#6043) commit fe6b538a0c57fa8a385acbc8f93e02e154c325ca Author: Luciano Fiandesio <[email protected]> Date: Tue Sep 1 08:59:47 2020 +0200 feat: fetch Org Unit coordinate in event analytics query (#5912) Allows to return the Org Unit coordinates of an Event attribute, if present.

feat: require bundled app overrides to be configured with the coreApp…

a1926fc

… flag in the manifest

amcgee requested review from mortenoh, varl, larshelge, stian-sandvold and Philip-Larsen-Donnelly September 8, 2020 17:51

chore: add comment describing core_app property

5af47f5

varl approved these changes Sep 8, 2020

View reviewed changes

refactor: extract app validation logic

5e12106

amcgee mentioned this pull request Sep 8, 2020

fix: support new apps index with link to bundle JSON dhis2/e2e-tests#50

Merged

Philip-Larsen-Donnelly approved these changes Sep 8, 2020

View reviewed changes

chore: add details to dhis-web-apps index and json

e0741fe

larshelge reviewed Sep 8, 2020

View reviewed changes

larshelge approved these changes Sep 8, 2020

View reviewed changes

amcgee added a commit to dhis2/app-management-app that referenced this pull request Sep 8, 2020

fix: use isBundled instead of isBundledApp

d43fc25

Java serialization is changing in dhis2/dhis2-core#6111

amcgee mentioned this pull request Sep 8, 2020

fix: use bundled instead of isBundledApp dhis2/app-management-app#139

Merged

chore: use simpler boolean getters, setters, and properties

9c3a2ae

larshelge merged commit 81735f2 into 2.35 Sep 8, 2020

larshelge deleted the 35-app-manifest-core-app-flag branch September 8, 2020 20:46

amcgee mentioned this pull request Sep 8, 2020

feat: add core_app flag to app manifest dhis2/app-platform#457

Merged

varl mentioned this pull request Dec 8, 2020

fix: add react to dhis-web-commons (2.35) #6852

Merged

amcgee mentioned this pull request Feb 12, 2021

feat: require bundled app overrides to be configured with the coreApp flag in the manifest (DHIS2-9555) #7352

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat: require bundled app overrides to be configured with the coreApp flag in the manifest #6111

feat: require bundled app overrides to be configured with the coreApp flag in the manifest #6111

amcgee commented Sep 8, 2020

varl left a comment

amcgee commented Sep 8, 2020

Philip-Larsen-Donnelly commented Sep 8, 2020

Philip-Larsen-Donnelly left a comment

larshelge Sep 8, 2020 •

edited

Loading

amcgee Sep 8, 2020

larshelge Sep 8, 2020

amcgee Sep 8, 2020

amcgee commented Sep 8, 2020

amcgee commented Sep 8, 2020

larshelge Sep 8, 2020

lgtm-com bot commented Sep 8, 2020

larshelge Sep 8, 2020

sonarcloud bot commented Sep 8, 2020

lgtm-com bot commented Sep 8, 2020

feat: require bundled app overrides to be configured with the coreApp flag in the manifest #6111

feat: require bundled app overrides to be configured with the coreApp flag in the manifest #6111

Conversation

amcgee commented Sep 8, 2020

varl left a comment

Choose a reason for hiding this comment

amcgee commented Sep 8, 2020

Philip-Larsen-Donnelly commented Sep 8, 2020

Philip-Larsen-Donnelly left a comment

Choose a reason for hiding this comment

larshelge Sep 8, 2020 • edited Loading

Choose a reason for hiding this comment

amcgee Sep 8, 2020

Choose a reason for hiding this comment

larshelge Sep 8, 2020

Choose a reason for hiding this comment

amcgee Sep 8, 2020

Choose a reason for hiding this comment

amcgee commented Sep 8, 2020

amcgee commented Sep 8, 2020

larshelge Sep 8, 2020

Choose a reason for hiding this comment

lgtm-com bot commented Sep 8, 2020

larshelge Sep 8, 2020

Choose a reason for hiding this comment

sonarcloud bot commented Sep 8, 2020

lgtm-com bot commented Sep 8, 2020

larshelge Sep 8, 2020 •

edited

Loading