A rewrite of geOrchestra's console webapp using updated versions of the dependencies, and ported to spring boot.
Current runtime target: Java 21.
To run the app in dev:
- start the dev Docker services
cd docker/dev
docker compose -f docker-compose-dev.yaml up -d- launch the Spring Boot app locally
mvn spring-boot:run \
-Dspring-boot.run.jvmArguments="-Dgeorchestra.datadir=$(pwd)/docker/dev/datadir" \
-Dspring-boot.run.arguments=--server.port=8081Then:
- direct access:
http://localhost:8081/console - through the gateway:
http://localhost:8080/console
- Get rid of the
org.georchestra.console.ws.backoffice.utils.ResponseUtilclass - Get rid of
@Autowiredannotations and xml-based configurations - rewrite tests to remove IT / Tests ?
integrationpackage ? - Get rid of Junit4 & rewrite testsuite to Junit5
- Add a maven formatter plugin
Add an area selector for the organization. I tried to minimize dependencies on other frameworks. Also removed the information used to center and zoom the map; this is now handled directly based on the data extent.
Add mandatory field and add validation on uniq org shortname
Try to add optimisation on ldap query, but modification are to be made in georchestra-ldap-account-management
Init doc template
- Work done in the train to come back to Brittany, try to make some changes to be more RGAA compliant see - https://www.info.gouv.fr/accessibilite/tests-et-audits add html lang and make it dynamics, add main-content, change hero.p to h1, add skip informations, use aria-describedby/aria-invalid for form error add Integration test with jsoup and séparate Unit Test and Integration Test ( Ignore legacy IT test) Need to quit train quickly, I might have introduce an error /manager/home and /manager/logs won't work anymore ( erreur in database ERROR: relation "console.admin_log" does not exist)
- Add missing template for new password
- Add manager for users, orgs, roles, delegation ( add sort feature )
- remove ActiveMq link to georchestra/georchestra#4644
- Change manager angular to thymeleaf, but adding role to user need validation click. In current version non click needed ( perhaps to do but not the time in the community sprint, same fonctionnality different step to do it )
- remove all temporary Angularjs
- We also finished the keg of beer
On the frontend side, the zone skills feature still needs to be redone (no migration done), and the UI needs a general polish across all interfaces. I haven’t deployed it to a server—only locally using the dev Docker Compose setup. The configuration files still need to be placed in the data directory; we’ll probably need to convert the console.properties file to YAML and add all the new email templates into the data directory. We should also check whether the small amount of JavaScript is properly minified. The GDPR-related features for data deletion and data export have not been tested.
End migration JSP in Thymeleaf Start migration Angular in Thymeleaf, for the moment some angular are copied in project to test quickly, to be removed exemple http://localhost:8080/console/manager/logs Style need to be review In createAccoutForm, new org with areas is not working
Added a dedicated development environment:
spring-boot-devtoolsfor local development- a dedicated Docker stack in
docker/dev/docker-compose-dev.yaml - a dedicated development datadir in
docker/dev/datadir - a some Thymleaf template for userdetail and changingemail
- New feature add localisation for mail body
I WIP-ed a bit this morning on it, here is I went thus far:
- creating a new spring boot app from start.spring.io along with the expected dependencies
- added org.georchestra.georchestra-testcontainers as a dependency
I think that something is wrong in the way we are doing testcontainers, so I created the following issue: georchestra/georchestra#4533 ; but I am pretty sure I created another one several weeks ago, as I already encountered a similar problem running the integration testsuite somewhere in geOrchestra.
Before integrating the existing code, mvnw clean verify works, and it launches 2 geOrchestra containers
(ldap, db), next step is to import the existing code from the console (backend related), and start rewrite it
in a more “spring-boot” way (getting rid of xml config files, returning Java object and leave jackson do its
magick instead of building json strings ...).
Integrating the existing code, I have now a lot of compilation errors to deal with.
Some issues to solve when porting the former code:
- recaptcha v2 ? not sure where the backend vs frontend frontier is in regards to this feature
- porting code to newer library versions (javax → jakarta, ldaptive v2.x)
- issue with JSON hibernate type, is the dependency to hibernate-types-xy still needed ?
- rework rabbitMq activation in a more spring-boot fashion (dropping the xml definition files)
At the end of this day, I had still 129 errors, 3 warnings to fix.
Still WIP on integrating the existing code, fixing the compilation errors.
- added database-rider as dependency but I am still wondering if we should not rewrite the test using testcontainers.
- mockito upgrade was quite straightforward compilation-wise: just replace Matchers by ArgumentMatchers.
- A test NewAccountFormControllerTest is a bit tricky to port, as it was making use of powermock + a junit4 integration, leaving it for now. It also seems that powermock was used to mock reCaptcha, and we still don't know what to do with it, see previous section.
At the end of the session, only 19 compilation errors left. Many more in idea because of disfunctional lombok integration.
Fixed all compilation errors, but obviously the testsuite is broken:
[ERROR] Tests run: 219, Failures: 3, Errors: 19, Skipped: 4
The console is able to boot with ./mvnw spring-boot:run. It is even able to provide
the /internal/ webservices being used by GeoNetwork synchronization.
Unfortunately, performances are quite poor on huge LDAP tree, tested on the one from
Rennes-Métropole, I was hoping that it would perform faster than the former console.
Trying to write some tests to target the /internal/ webservices, figuring out that
the spring-boot version being used is already outdated, and will require to upgrade to 4.0.x
so that I could have the WebTestClient framework.
WIPPing a bit on the testsuite today, deactivating a test class, and the CICD turned green !
Wondering what is next though: shall I try to port some parts of the frontend and some JSP views to thymeleaf ? How far should I go to make sure we are isofunctional ? Either improve test coverage of each controller, or trying to get a frontend part somehow ?
The rabbitMq part is still broken though, but not my priority.
Tests follow the standard Maven layout:
- unit and slice tests in
src/test/java - integration tests in
src/test/java, named*IT - test fixtures in
src/test/resources
Maven execution is split as follows:
./mvnw testruns fast tests only, through Surefire./mvnw verifyruns fast tests and integration tests, with*ITexecuted through Failsafe
Useful commands:
./mvnw test
./mvnw verify
./mvnw -Dtest=org.georchestra.console.boot.ConsoleApplicationTests test
./mvnw -Dit.test=org.georchestra.console.boot.AxeCoreAccessibilityIT verifyThe documentation is built with MkDocs. To run it locally:
python3 -m venv .venv
source .venv/bin/activate
pip install -r mkdocs_requirements.txt
mkdocs serveIt is then available at http://127.0.0.1:8000/.