Skip to content
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

[pull] main from geonetwork:main #97

Merged
merged 276 commits into from
Oct 7, 2024
Merged

[pull] main from geonetwork:main #97

merged 276 commits into from
Oct 7, 2024

Conversation

pull[bot]
Copy link

@pull pull bot commented Feb 22, 2024

See Commits and Changes for more details.


Created by pull[bot]

Can you help keep this open source service alive? 💖 Please sponsor : )

@pull pull bot added the ⤵️ pull label Feb 22, 2024
ticheler and others added 29 commits March 6, 2024 21:02
… of trying to retrieve the file details, to avoid confusing NoSuchFileException exception (#7577)

* GeoNetwork harvester / Check if a resource exists to save it, instead of trying to retrieve the file details, to avoid confusing NoSuchFileException exception

* GeoNetwork harvester / Optimise save file check
Follow up of #7468

Refresh list when user remove the last link of a record. In that case md.link is undefined and we need to reload distributions.
thesaurus block

Fixes #7841

Use the current-group which contains all grouped blocks.
Also fix record view which in this case was repeating keywords because
the `otherKeywords-` prefix was matching other thesaurus key eg
`otherKeywords-place`.
* Extend URITemplateProxyServlet to support urls with a duplicated
parameter with different values, like: param1=value1&param1=value2&param1=value3
* Fix wrong init parameter name
… as anchor (#7798)

* ISO19139 / Index online resources application profile element encoded as anchor

* Update schemas/iso19139/src/main/plugin/iso19139/index-fields/index.xsl

Co-authored-by: François Prunayre <[email protected]>

* ISO19115-3.2008 / Index online resources application profile element encoded as anchor

---------

Co-authored-by: François Prunayre <[email protected]>
…#7712)

* Standard / ISO19115-3 / Batch edit may trigger error on creation date 

This should not happen when records are created using the editor but importing a record with no creation date and then directly applying a batch editing (which does not update dates) will trigger the following error: 

```
"; SystemID: file://web/src/main/webapp/WEB-INF/data/config/schema_plugins/iso19115-3.2018/update-fixed-info.xsl; Line#: 134; 
An empty sequence is not allowed as the first argument of gn-fn-iso19115-3.2018:write-date-or-dateTime()
```

Avoiding that case.

* Update update-fixed-info.xsl
…7851)

* add necessary welsh language files for translating the application

* update loc-wel-default.sql with the welsh translations

* include welsh string translations
This is required for https://issues.apache.org/jira/browse/MNG-7214 which avoids problems with competing javax annotations (example jsr250-api and javax.annotation-api)
* Editor / Associated metadata improvements

* Editor / Associated metadata improvements / Add ISO19110 and Dublin core support

* Editor / Associated metadata improvements
- Support conditions to process associate resources configurations.
- Fix link to metadata selection.
- Fix source datasets configuration

* Editor / Associated metadata improvements / Fix evaluation of conditions to process associate resources configurations

* Editor / Associated metadata improvements / Map relation types between UI and updates to load the relations in the associated resources container directive

* Editor / Associated metadata improvements / Configurations with predefined fields:
- Fix display of the asssociated resources.
- Readonly association and initiative types fields in the link to siblings dialog.
- Code cleanup.

* Editor / Associated metadata improvements / Support multiple remote URL mode

* Editor / Associated metadata improvements / Support multiple remote urls

* Editor / Associated metadata improvements / DOI panel updates

* Editor / Associated resource / Read label and search params from configuration.

* Editor / Associated resource / Update labels as siblings are more and more used now.

* Editor / Associated resource / Update labels

* Editor / Associated resource / Avoid JS error and replace all query placeholders in case of more complex queries eg. titles.title:{query} OR person-id:{query} OR doi:{query}.

* Associated resource / Search / Allows unselect.

* Associated resource / Add support for link to md or link to service.

* Associated resource / allow to deselect DOI resources and add link to view the DOI resource

* Associated resource / fix scope reference of metadata selection

* Associated resource / Improve link to sibling styling for metadata results and doi searches

* Associated resource / Improve link to sibling icons styling

* Associated resource / Improve link to sibling icons styling - remove duplicated icon

* Editor / Associated metadata improvements - add rel=noopener noreferrer' to external links in doi search panel

* Editor / Associated resources / Group by type.

---------

Co-authored-by: Francois Prunayre <[email protected]>
* always remove all expired tokens

* cleanup imports

* added unit test

* added copyright preamble
SRV XSD 2.1 was removed on TC211 ISO-TC211/XML@06bb6bc
after we added the schema in GeoNetwork. 2.0 is the version to use.

Following discussion #7578 (comment)
Follow up of #6650

Matrixset is not always a SRS code eg. https://services.arcgisonline.com/arcgis/rest/services/Ocean/World_Ocean_Base/MapServer/WMTS/1.0.0/WMTSCapabilities.xml

Create image should use the SRS code. 

Test configuration
```xml
  <util:map id="regionGetMapBackgroundLayers">
    <entry key="osm"
           value="\${map.bbox.background.service}"/>
    <entry key='arcgis'
           value='{
                    "wmtsGetCapabilitiesURL":"https://services.arcgisonline.com/arcgis/rest/services/Ocean/World_Ocean_Base/MapServer/WMTS/1.0.0/WMTSCapabilities.xml",
                    "layerName":"Ocean_World_Ocean_Base",
                    "SRID2MatrixSet": {
                         "EPSG:3857":"GoogleMapsCompatible"
                    }
                  }'
    />
  </util:map>
```

Test URL http://localhost:8080/geonetwork/srv/api/regions/geom.png?geomsrs=EPSG:4326&geom=POLYGON((175.015%20-26.7199,175.015%20-14.83,156.25%20-14.83,156.25%20-26.7199,175.015%20-26.7199))&background=arcgis
Also properly select first location search service if not default defined.
* Handle geom field like other array fields to better support multiple geometries
* Add support for point (if bounding box south=north, west=east)
* Consistent styling when highlighting point or geom (stroke color was not the same)
* Metadata liks analysis / Fix test single url link

* Metadata liks analysis / Execute the process in a thread, code refactor

* Metadata liks analysis / Track process finished status and date

* Metadata links analysis:

- Links analysis UI: Improved search form, disable buttons while a process is running, remove finished processes older than 5 minutes from the list.
- Link API: remove finished processes

* Metadata links analysis: cleanup UI code, refresh results when the analysis is finished and fix double empty entry in group published combo

* Metadata links analysis - Sonarlint improvements in LinksApi

* Metadata links analysis - remove unused reference in LinksApi

* Metadata links analysis - add LinkRespositoryTest and code quality improvements

* Metadata links analysis - LinkRepository.findOneByUrl use Optional, code quality improvements

* Metadata links analysis - add unit tests for LinkSpecs

* Admin / Link analysis improvements

* More compact layout for progress bar
* Add missing translations
* Fix reset of selection list
* Fix vertical alignement of checkbox
* Improve alignement of form filters
* Stop refreshing status once complete

---------

Co-authored-by: Francois Prunayre <[email protected]>
…e with updating/deleting resources with same url (#7431)

* Passing the index into remove process xslt for iso 19139

* Updated resource logic to use 2 new field called idx and hash and revert id back to the old method.  This will ensure backward compatibility
Also update xslt for add and remove thumbnail/onlines recources

* Add missing <xsl:copy> that was causing bugs.

* unit test fix

* Fix issues based on code review.
  - Fix issue with ordering of elements.
  - Fix issue with md5Hex not working

* Update schemas/iso19139/src/main/plugin/iso19139/process/thumbnail-remove.xsl

Co-authored-by: Jose García <[email protected]>

* Update schemas/iso19139/src/main/plugin/iso19139/process/onlinesrc-add.xsl

Co-authored-by: Jose García <[email protected]>

* Update schemas/iso19139/src/main/plugin/iso19139/process/onlinesrc-remove.xsl

Co-authored-by: Jose García <[email protected]>

* Update schemas/iso19139/src/main/plugin/iso19139/process/onlinesrc-remove.xsl

Co-authored-by: Ian <[email protected]>

* Update schemas/iso19139/src/main/plugin/iso19139/process/thumbnail-remove.xsl

Co-authored-by: Ian <[email protected]>

* Add hash and index to search indexing. Remove thumbnail hash and indexing as the backend file/store will get deleted.

* Fix unit test

* Remove unwanted method in XslUtils

* fix unit test

* code review comment

---------

Co-authored-by: Ian Allen <[email protected]>
Co-authored-by: Jose García <[email protected]>
fxprunayre and others added 29 commits September 2, 2024 16:50
When adding a source for example, the button label may be empty. Add a default one.
…rtain conditions (#8069)

* CSW Harvester / Avoid increment 2 metrics for a single metadata in certain conditions.

Retrieve metadata method increments metrics under certain conditions and returns null. Methods calling the retrieve metadata method increments additionally the unretrievable metric if null is returned. Sonarlint fixeas are already applied. Fixes #8039

* CSW Harvester / Use primitive boolean for 'force' parameter
…adata page. (#8290)

This commit adds the `<img>` in the `alt` attribute when there is a name, otherwise a default string is used.

The image name used to be the caption underneath the thumbnail, but is now removed

Extra: the `max-height` is increased in order to have the full width of the image.
Follow up of #7059

* Add elements taking into account the API version 1 or 2
* Do not put free text in an ISO field which is an enumeration (which avoids to mix facet icons and translations for topic category)
  *  Provide a mapping based on default ODS values for french and english
  * Add a dedicated keyword block with the free text values
* Add tooltip with API query to inform user which fields are used for the
search.
* Ignore https://doi.org prefix as most of the time user search using
  the DOI URL but the API https://support.datacite.org/docs/api-queries
search is only based on prefix/id
Ignore all schemas plugins.
…#8378)

* Xsl utility / Add a function to retrieve thesaurus title with its key

Some schema (eg. DCAT) does not contain thesaurus name in the metadata record. While indexing we add the thesaurus title in the index. This utility function allows to retrieve it with the thesaurus key (eg. external.theme.publisher-type).

* Update core/src/main/java/org/fao/geonet/util/XslUtil.java

Co-authored-by: Jose García <[email protected]>

---------

Co-authored-by: Jose García <[email protected]>
* Indexing / DCAT multilingual support

* Use 3 letter code for field ID like in ISO
* Fix position to properly index a set of multilingual elements 

```xml
<dct:title xml:lang="nl">NL</dct:title>
<dct:title xml:lang="en">EN</dct:title>
```


Related to metadata101/dcat-ap#5

* Update web/src/main/webapp/xslt/common/index-utils.xsl

Co-authored-by: Jose García <[email protected]>

---------

Co-authored-by: Jose García <[email protected]>
…r field

When using temporal range for aggregations

```
 resourceTemporalDateRange: {
                gnBuildFilterForRange: {
                  field: "resourceTemporalDateRange",
                  buckets: 2024 - 1970,
                  dateFormat: "YYYY",
                  dateSelectMode: "years",
                  vegaDateFormat: "%Y",
                  from: 1970,
                  to: 2024,
                  mark: "area"
                },
                meta: {
                  vega: "timeline",
                  collapsed: true
                }
              },
```

browser autocomplete may overlap with calendar
…metadata.

Previously the values were converted to UTC. If the timezone defined in the server is Europe/Madrid and the metadata has a creation date '2023-01-01T00:00:00', the index field creationYearForResource had the value 2022
* These changes fix the overlapping filter settings and the customize options dropdown on the `User Interface` page. The 2 buttons (save and delete) got an improvement alignment.

Further improvements:
- spacing between title and UI config name
- fix paddings on smaller screens
- whitespace between buttons and inputs

* Fix for a few cases where the layout was still wrong and too small. Every width now displays the buttons below the 2 inputs

* Remove commented style
* Visual and UX improvements to the WFS preview:
- added whitespace
- remove border for the selection lists
- re-order buttons
- toolbar positioned on the right of the table
- larger buttons in the metadata page and map

* Visual and UX improvements to the WFS preview:
- pushed missing changes

* Visual and UX improvements to the WFS preview:
- fix the removal of borders in all map panels

* Fix for the missing variables: they have been replaced by actual values
)

This happens with existing metadata managed by another harvester if the uuid collision policy is set to override
* Thesaurus / Date parsing fix.

https://github.com/geonetwork/core-geonetwork/pull/6972/files#diff-c7548d94bdb4268915f50f66df5a90f1f7868e4fb1de2f3d2938397e202aaf2fR1057
added month and year format support. This was resolving thesaurus date
to the last matching format ie. 1st January for the default date.

This can be tested using regions thesaurus which will contains 2 dates
for the thesaurus block.

* Thesaurus / Avoid having multiple dates with same type code

#6972 adds retrieval of `dct:issued|modified|created` dates but multiple dates could be added more than one time with same date type code. Improve the mapping.

* Thesaurus / INSPIRE registry / Only keep one date to avoid validation errors

* Thesaurus / LD registry registry / Only keep one date

No need for duplicated date
* Support multiple DOI servers

* Admin / DOI configuration / Add common API endpoints

* Prettier

* Admin / DOI / Only create directive for doiCreationTask

Avoid calling doiserver API on each steps.

* Formatter / Datacite / Update schemalocation to HTTPs URL.

* Add DoiServerRepository unit tests

* Add DoiServersApi integration tests and fix add a DOI server response

* Admin / DOI icon menu

* Admin / Add translations for DOI url values and trigger form dirty property when selecting a value from the list

* DoiServersApi / Sort servers that can be used with a metadata alphabetically

* Admin / set the public url when selecting a server from the servers dropdown

* Admin / DOI / Move username to main form so that reset password only takes care of password.

* Update web/src/main/webapp/WEB-INF/classes/setup/sql/migrate/v445/DoiServerDatabaseMigration.java

Co-authored-by: François Prunayre <[email protected]>

---------

Co-authored-by: François Prunayre <[email protected]>
* Don't capitalize the labels for the facet filter values

* Record view / Do not capitalize keywords (#104)

Display the label as defined in the vocabulary. Some are lower case (eg. GEMET), some capitalized (eg. INSPIRE themes) and some others are case sensitive (eg. Unit of measures).

---------

Co-authored-by: François Prunayre <[email protected]>
@juanluisrp juanluisrp merged commit e030fce into GeoCat:main Oct 7, 2024
6 of 7 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.