Geonetwork 4.2.7 #260
Merged
Geonetwork 4.2.7 #260
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…iguration of the online resources. Fixes #7103
…r information. This allows to display a sort by a field in ascending and descending order, for example the metadata title
* Fix selection / filter Only my records * Fix selection / filter Only my records: use setting to enable Only my records in the editor application, not in the search application
…h the case where no port is set in the settings manager
… that we can see the real error in the logs. (#7119)
* Allow multiple request matchers to decide if require CSRF token * Fix a problem with the Keycloak configuration that was making the server to require CSRF tokens for GN URLs that shouldn't be protected by CSRF. To do this, now the GeonetworkCsrfSecurityRequestMatcher allows to be configured with additional RequestMatchers, for example the KeycloakCsrfRequestMatcher. If Keycloak security is enabled, then the KeycloakCsrfRequestMatcher is added to the original GeoNetwork patterns listed in `config-security-core.xml`
The link for 'Installing from source code' is broken. The label of Maintainer Guide is also incorrect and should be Installation Guide.
…ustom status (#7104) * Core cleanup translation. * Workflow / Remove magic numbers in label and avoid issue when using custom status. The status workflow index field contains 2 numbers concatenated - status of the record + status of the draft. If using custom status, the concatenation of the number can match other status number eg. 111 can be 1+11 or 11+1 so we can't always get a label from that value. Use status name instead of ids and rely on db translation as much as possible (there is still room for improvements when custom status are used). Co-authored-by: Joachim Nielandt <[email protected]> * Workflow / Add configuration for the list of status for which to start a draft. Co-authored-by: Joachim Nielandt <[email protected]> * Workflow / Better build label. Co-authored-by: Joachim Nielandt <[email protected]> * Workflow / Record view / Use db translations. * Workflow / Label improvement. --------- Co-authored-by: Joachim Nielandt <[email protected]>
…abel in German (#7122)
…se insensitive and ignore accents
…ved (#7074) When a metadata is published / un-published it can be configured a mail notification. When the metadata workflow is enabled, published metadata can be edited and re-approved. This change request expands the email notifications in this case, to send an email to let you know that a published metadata has been re-approved, with a new version published. Related to #6457 --------- Co-authored-by: Juan Luis Rodríguez <[email protected]>
…ual URL Avoid error on multilingual URL. Can be tested with https://ecoscope.svc.groupcls.com/geonetwork/srv/api/records/19b09201-c9a5-42e7-ac18-8e48c95dec38/formatters/xml
…nd labels (#7076) * UI / Language picker / Display all entries on focus. Search by code and english. * Prettier.
* Map / Layer manager / Add support for multilingual layer title.
Metadata may be multilingual and provide multilingual layer name in the
online source description field. GetCapabilities document do not provide
multilingual support, so this adds the possibility to translate layer
name in maps.
A multilingual description in a link:
```xml
<gmd:onLine>
<gmd:CI_OnlineResource>
<gmd:linkage>
<gmd:URL>https://data.apps.fao.org/map/gsrv/gsrv1/geonetwork/ows?SERVICE=WMS&</gmd:URL>
</gmd:linkage>
<gmd:protocol>
<gmx:MimeFileType type="">OGC:WMS</gmx:MimeFileType>
</gmd:protocol>
<gmd:name xsi:type="gmd:PT_FreeText_PropertyType">
<gco:CharacterString>geonetwork:basins_296</gco:CharacterString>
<gmd:PT_FreeText>
<gmd:textGroup>
<gmd:LocalisedCharacterString locale="#EN">geonetwork:basins_296</gmd:LocalisedCharacterString>
</gmd:textGroup>
<gmd:textGroup>
<gmd:LocalisedCharacterString locale="#FR" />
</gmd:textGroup>
</gmd:PT_FreeText>
</gmd:name>
<gmd:description xsi:type="gmd:PT_FreeText_PropertyType">
<gco:CharacterString>Hydrological basins in Africa</gco:CharacterString>
<gmd:PT_FreeText>
<gmd:textGroup>
<gmd:LocalisedCharacterString locale="#EN">Hydrological basins in Africa</gmd:LocalisedCharacterString>
</gmd:textGroup>
<gmd:textGroup>
<gmd:LocalisedCharacterString locale="#FR">Bassins versants en Afrique</gmd:LocalisedCharacterString>
</gmd:textGroup>
</gmd:PT_FreeText>
</gmd:description>
</gmd:CI_OnlineResource>
</gmd:onLine>
```
The description is retrieved from the metadata on load from the metadata
UUID which is attached to the layer (and saved in the OWS context
extension of the layer) using the service URL and the layer name.
This also allows to override layer name when a group of layer (eg.
`a,b,c`) is used in the online source name.
* Map / When loading a map, switch to layer tool panel.
* Map / Layer manager / Add support for multilingual layer title / Layer search.
* Map / Layer manager / Add support for multilingual layer title / Layer filter.
* Remove openTool after map load.
Configuration done in geonetwork/core-geonetwork#7126
* Map / Background layer / Fix active layer on load.
Test:
* Open the map
* Reload page
* Active background is not enabled.
This was related to the fact that the search map is also affecting bgLayers.
Only the main map viewer is defining the bgLayers which is used for the base switcher directive.
In case of the context has no active background, use the first one (and log a warning).
Reset default map :
* may fail if no context defined. Add a fallback to the default one (and log a warning).
* tried to use the map layer config if no context defined as it was ignored (but not working - require more work or removal of those unused ? settings)
* Map / Avoid JSON parse error on context having layer with filter. Clear
queue on context load.
Context layer can contain a JSON extension which could be formatted and
XML formatting may add extra space which needs to be clean up for proper
JSON string:
```xml
<ows-context:Layer name="surval_parametre_point" group="/Human Activities" hidden="false" opacity="1"
showLayerInfo="true">
<ows:Title>Surval données par paramètre (point)</ows:Title>
<ows-context:Server service="urn:ogc:serviceType:WMS" version="1.3.0">
<ows-context:OnlineResource xlink:href="https://sextant.ifremer.fr/services/wms/environnement_marin"/>
</ows-context:Server>
<ows-context:Extension>{"uuid":"cf5048f6-5bbf-4e44-ba74-e6f429af51ea","label":"Surval données par paramètre
(point)","filters":{"qParams":{"ft_LIEU_LIBELLE_s":{"type":"terms","values":{"001-P-003 - Zuydcoote
filière":true}}}},"wfsUrl":"https://sextant.ifremer.fr/services/wfs/environnement_marin"}
</ows-context:Extension>
</ows-context:Layer>
```
Clear map queue on load - may have side effect when loading differents
maps quickly.
Avoid JS error if server layer is not defined (which should not be the
case unless custom context with new layer types was created).
* Update OwsContextDirective.js
* Map / Add option to configure default active tool and default active tool after map load.
* Update OwsContextService.js
|
Don't know if related, but metadata template called "Template for feature catalogue" cannot be edited |
I could edit the title. What was the error message ? |
|
Probably a local error on MEL integration then. |
|
passing by and stumbled upon #272, upstreaming stalled in geonetwork/core-geonetwork#5826.. should i rebase the PR on top of your branch (since it's the future..) or recreate/cherrypick 1ec55be ? @pmauduit ? |
|
@landryb maybe pushing it directly in this PR with updating the doc in geonetwork-migrations ? Or you can PR it on gn-4.2.x and it should create conflict here I'll resolve when merging it. Both suits me ! |
|
#277, #278 and #279 should/could be added/pushed to that georchestra-gn4.2.x-rebase branch.. or the branch should be rebased on those once merged ? |
|
I think I'll rebase before merging in order to update the documentation. I edit the description of this PR to remember to add your PRs. By the way, I implemented a backport bot on geochestra and geor/gn, see #276. |
i've seen it and i'll gladly try it once the PRs are merged :) |
landryb
approved these changes
Jan 16, 2024
f-necas
force-pushed
the
georchestra-gn4.2.x
branch
from
4eb9b94 to
5dc598b
Compare
f-necas
force-pushed
the
georchestra-gn4.2.x-rebase
branch
4 times, most recently
from
7dd1867 to
a15df19
Compare
logging configuration file should be taken from georchestra datadir fix: add missing import
dont ship an extra version of groovy jar (fixes #267)
Placeholder for ogc api features added as external resource
remove docker build
f-necas
force-pushed
the
georchestra-gn4.2.x-rebase
branch
from
8af78f2 to
8765a1d
Compare
|
WOO! :) |
|
👏
|
One thing at a time. 😄 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Geonetwork 4.2.7 in Georchestra
This PR implements 4.2.7 changes of
geonetwork/core-geonetwork repoin Georchestra.List of changes
Major changes:
API / CSV export / Add support for custom export.
Map / WFS Features / Improvements
and more ... see 4.2.6 issues and pull requests for full details.
TODO
docs/manualfor GHA workflow (already fixed in 4.4)