-
-
Notifications
You must be signed in to change notification settings - Fork 21
Bump to GN 4.4.7 #321
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Bump to GN 4.4.7 #321
Conversation
* Add settings fields for localized emails * Add spring bean to initialize feedback email locales from settings field * Modify settings manager to update feedback locales when the settings fields are saved * Create classes for localized emails, their components, and the components' parameters * Implement lang in getIndexField * Localize workflow status emails * Localize metadata publication emails * Localize user feedback emails * Localize RegisterApi emails * Localize PasswordApi emails * Localize WatchListNotifier emails * Localize MailApi emails * Update migration script to only insert settings fields if not present * Add static enum imports for readability * Log a warning when a locale is invalid or missing * Update log modules and messages * Trim language codes defined in settings to handle spaces after commas * Rename translation follows label to translation follows text for consistency * Add back resource bundle 'messages' that was unused before merging main * Add logic to break from loop when email subject and text messages fail
* Associated resource / Consistent labels
Create one directive to display associated resources labels with icon.
The directive is used in all places:
* Record view (list and card layout)
* Editor side panel
* Editor popup
Add the possibility to customize an association label by adding custom translation key in `${lang}-custom.json`
eg.
```json
{
"crossReference-study": "Publication",
"crossReference-campaign": "Campaign",
"crossReference-reuse": "Reuse"
}
```
* Editor / Associated resource popup / Fix element using same DOM id.
* Record view / Improve alignement of source datasets
* Update UtilityDirective.js
* Update related.html
* Associated resource / Consistent labels / Missing template.
* Record view / Associated / Fallback on URL if no title. Do not display twice the list
…#8152) * Fix canViewRecord function so that it returned the workflow record. Prior to this fix, it would always return working copy record if it exists. Also updated getInternalId to have better error handling * Update services/src/main/java/org/fao/geonet/api/ApiUtils.java Co-authored-by: Jose García <[email protected]> * Fix number check based on review - was checking wrong value. --------- Co-authored-by: Jose García <[email protected]>
* removed double translation * additional fix for double translation
When using tools to convert OpenAPI to client code eg. ```bash npx openapi-ts -i ./src/gapi/gapi.json -o src/gapi ``` Some reserved word may create invalid generated code. eg. when building typescript: ``` TS1102: 'delete' cannot be called on an identifier in strict mode. [ ```
…e (#8178) * Add info logs to make transaction of working copy merge more traceable * build fix * Update listeners/src/main/java/org/fao/geonet/listener/metadata/draft/DraftUtilities.java Co-authored-by: Jose García <[email protected]> * Update listeners/src/main/java/org/fao/geonet/listener/metadata/draft/DraftUtilities.java Co-authored-by: Jose García <[email protected]> * Update datastorages/cmis/src/main/java/org/fao/geonet/api/records/attachments/CMISStore.java Co-authored-by: Jose García <[email protected]> * Update datastorages/cmis/src/main/java/org/fao/geonet/api/records/attachments/CMISStore.java Co-authored-by: Jose García <[email protected]> * add more logs for delete folder * build fix * build fix * Update core/src/main/java/org/fao/geonet/api/records/attachments/FilesystemStore.java Co-authored-by: Jose García <[email protected]> --------- Co-authored-by: Jose García <[email protected]> Co-authored-by: Ian <[email protected]>
Related to JQuery update.
…able (#8229) * Standard / ISO19139 / Formatter / Do not display extent if none available * Update schemas/iso19139/src/main/plugin/iso19139/formatter/xsl-view/view.xsl Co-authored-by: Jose García <[email protected]> --------- Co-authored-by: Jose García <[email protected]>
…d uuid in CSV export (#8238)
Show a warning to the user when an error happens while deleting one or more metadata records.
If an error happens while using the delete, validate or other option of the editor dashboard metadata actions menu then remove the text "Please wait" and the spinner from the button to allow to perform a new action.
Improve documentation and properly target node to delete in case the
forEach loop element is not the one to remove.
eg.
```xml
<section name="Axe - Time"
forEach="/mdb:MD_Metadata/mdb:spatialRepresentationInfo/*/msr:axisDimensionProperties/*[msr:dimensionName/*/@codeListValue = 'time']"
del="ancestor::msr:axisDimensionProperties">
<field xpath="msr:dimensionSize"/>
<field xpath="msr:resolution"/>
</section>
```
Before the change, the remove button was not displayed.
Most of the time the loop element is the one to delete and this case was
fine.
`xmlns:srv` was declared 2 times. Fixes geonetwork/core-geonetwork#8221 Related to geonetwork/core-geonetwork@27a69df#diff-1f83f3131214c0592eea4a9f65ed3a58a889689a64e9f07bc0753544c0427b29
Fixes "md:scope will be gmd:MD_Scope when it should be gmd:DQ_Scope" See geonetwork/core-geonetwork#8220
…etadataUuid}/formatters/{formatterId:.+} (#8269)
This affect PDF exports on working copies.
…69 (#8262) Use the UI language for the metadata information, when exporting a metadata selection to CSV / PDF. The API for these services accept a new optional parameter language that defaults to English as previously. Fixes #7969.
* Zoom to map popup remains active on non-map pages. Fixes #8260 Fixes also wrong values for add alert delay, provided in some pages in milliseconds, but the method expects seconds. * Zoom to map popup remains active on non-map pages - remove alerts only when switching from the map * Increase timeout to hide layer added popup to 15 seconds
In the register user, metadata feedback and user feedback forms, sometimes the settings with the recaptcha keys takes a bit longer to load making the recaptcha widget not to load. This commit fixes that updating the values of the recaptcha settings when the settings have finished loading. It also resets the recaptcha widget if there is any problem returned by the server after sending the form.
…sfer options block are used. (#8281) * Standard / ISO19139 / Fix removal of online source when multiple transfer options block are used. Follow up of geonetwork/core-geonetwork#7431 * Fix online resource update/delete so that it supports multiple gmd:MD_DigitalTransferOptions blocks. --------- Co-authored-by: Ian Allen <[email protected]>
* Update batch PDF export to skip working copies * Capitalize boolean operators in lucene query
Before only maintenance frequency was displayed but more information may be provided about the maintenance (eg. custom frequency, next update date, note).
On application startup, the translation pack may report an error like the following
```
org.fao.geonet.api.exception.ResourceNotFoundException
at org.fao.geonet.api.standards.StandardsUtils.getCodelistOrLabel(StandardsUtils.java:72)
at org.fao.geonet.api.standards.StandardsUtils.getLabel(StandardsUtils.java:55)
at org.fao.geonet.api.tools.i18n.TranslationPackBuilder.getStandardLabel(TranslationPackBuilder.java:217)
```
due to a missing french translation for element `DQ_EvaluationMethodTypeCode`
Follow up of geonetwork/core-geonetwork#7180
- other harvester have same or higher loglevel as well - helps to identify invalid metadata
… logged in (#8312)
…317) * Repository Citation.cff metadata for DUI regestration with zenodo * Update CITATION.cff Minor updates, additions and clean up * Update CITATION.cff Simplified the list to only include active PSC members --------- Co-authored-by: Jeroen Ticheler <[email protected]>
Tag for 4.4.7-0 release
|
Fwiw this PR builds fine here, and produces a minor nit: the |
right |
i had a quick look at plugins/README.md, trying to add it to the parent/toplevel Makefile with this: does actually try to build the plugin, one just needs to remember to i havent tested it yet at runtime, but that generates a jar in the webapp: |
if so, then we should have everything in place, huge thanks for testing it |
|
As said in private, it's just missing for gn-datahub-integration.jar by default :) Also to check:
Changes in georchestra/docker which works for me:docker-compose.yml elasticsearch:
image: docker.elastic.co/elasticsearch/elasticsearch:8.14.3
...
environment:
...
xpack.security.enabled: false
xpack.security.enrollment.enabled: false
kibana:
image: docker.elastic.co/kibana/kibana:8.14.3resources/kibana/kibana.yml #Comment kibana.index line
#kibana.index: ".dashboards" |
it should not as long as the datahub-integration maven profile is being activated (which is one thing to do afterwards, e.g. adapting the CICD processes in geOrchestra to do so). This is what I suggested in the PR comment:
|
…urces scanning Note: this has been reported/merged upstream, see geonetwork/core-geonetwork#8765
|
About the PR on |
Ofc ! It's just to have a reminder somewhere and links between PRs |
The docker composition is making use of official images, so I don't think there is a need for a fork on our side anymore ? I'll contribute a sample-docker-composition to runtime test easily though. |
|
ready to merge ? |

geOrchestra/geonetwork checklist
Note: this PR suggests to change the way we are building GN in geOrchestra. About the docker profile, it attaches the build docker-maven-plugin goal to the package maven phase. It is then unecessary to
mvn docker:buildanymore, asmvn packagewill do, as long as the docker profile is activated.Also, the
datafeeder-integrationhas been made optional upstream, we probably want it as a standard in the geOrchestra fork, but if we don't want to diverge much from upstream, I suggest to keep it "optional", but enforce its build in our CIs (GHA, buildbot). It is just a matter of activating a maven plugin anyway.