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 #95

Merged
merged 66 commits into from
Feb 22, 2024
Merged

[pull] main from geonetwork:main #95

merged 66 commits into from
Feb 22, 2024

Conversation

pull[bot]
Copy link

@pull pull bot commented Jan 26, 2024

See Commits and Changes for more details.


Created by pull[bot]

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

dependabot bot and others added 3 commits January 25, 2024 17:59
…#7655)

Bumps [advanced-security/maven-dependency-submission-action](https://github.com/advanced-security/maven-dependency-submission-action) from 3 to 4.
- [Release notes](https://github.com/advanced-security/maven-dependency-submission-action/releases)
- [Commits](advanced-security/maven-dependency-submission-action@v3...v4)

---
updated-dependencies:
- dependency-name: advanced-security/maven-dependency-submission-action
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps [github/codeql-action](https://github.com/github/codeql-action) from 2 to 3.
- [Release notes](https://github.com/github/codeql-action/releases)
- [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md)
- [Commits](github/codeql-action@v2...v3)

---
updated-dependencies:
- dependency-name: github/codeql-action
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Update copyright year to 2024.
@pull pull bot added the ⤵️ pull label Jan 26, 2024
jodygarnett and others added 26 commits January 29, 2024 10:44
Some file extension can produce invalid MIME types, for example text/txt, image/jpg, image/tif.
Also added htm to the list so that it would not produce application/htm.
* Metadata editor / distributions

* Editor / Distribution / Quick selection or upload from filestore.

* Editor / Distribution / Extract URL alert template. To be discussed if we move more URL validation logic in a service and if we simplify the layout to a simple green/orange/red icon + message.

* Editor / Distribution / Add possibility to customize label per field depending on the type of resource linked.

* Editor / Distribution / Do not set filename in resource name.

* Editor / Distribution / update the directives so can be used in the record view also. Improved conversion of metadata links to the format required by the online resources dialog

* Editor / Distribution / Simplify and add documentation for gnDistributionResourcesContainer directive

* Editor / Distribution / Simplify distributions configurations and cleanup gnRelatedDistribution

* Editor / Distribution / Labels.

* Clean console log.

* Editor / Distribution / Type is required to make distinction of various type of links. The type is used to find the proper process to use.

* Editor / Distribution / Change order - API - legend - download - dq - fcats - link.

* Editor / Distribution / Fix refresh of distributions in the metadata editor after updating the online resources

* Editor / Distribution / Generate thumbnail - set the url automatically with the url of the thumbnail generated

* Editor / Distribution / Synch config between view and edit mode. Add OGC API choices.

* Editor / Distribution / Add group filter.

* Editor / Distribution / Add DOI and WFS component. Move DOI utility to DOIService.

* List styling for related records in the editor sidebar

* Style related distribution lists when displayed in the main column as well as in the side column.

Add an icon before the link

* Harvesting / WFS / Add timeout for displaying alert if WFS service not found. By default, no alert displayed.

* Editor / Distributions / Fix on edit existing link.

* Editor / Distribution / Suggestion / Add info from WMS.

* Editor / Distribution / Remove data downloader in edit mode for WFS and ATOM.

* Editor / Distribution / Suggest data model creation when WFS available.

* Editor / Distribution / More consistent config for ISO schema with same config on all tabs.

* Prettier.

* Editor / Distributions / Avoid refresh call. Convert once.

* Editor / Distributions / Add support for multilingual links.

* Editor / Distribution / Dublin core configuration.

* Add `type` label to the related link in the editor

* Improve whitespace in the related records list

* Display the URL check message inline and not in the footer

* Standard / ISO19115-3 / Suggestion / Avoid error on multilinugal record

* Editor / Distribution / Add configuration for associated panel.

* Editor / Distribution / Add configuration for associated panel / Editor config to default.

* Editor / Distribution / Add some extra space between link and edit action

* Standard / ISO19115-3 / Suggestion / Avoid exception on multilingual records

* Standard / ISO19115-3 / Suggestion / WMS bbox improvements

Better support of adding bbox from WMS from various layers in same record. Avoid to add multiple time the extent.

* Fix 'External links without noopener/noreferrer are a potential security risk' and Prettier formatting

* Editor / Distribution / Fix JS error in non debug mode due to missing var declaration.

---------

Co-authored-by: Francois Prunayre <[email protected]>
Co-authored-by: Michel Gabriel <[email protected]>
…o undefined property in gnLinkToMetadata directive
…en the metadata has 1 WMS layer (#7646)

* Metadata editor / Fix javascript error in the add thumbnail option when the metadata has 1 WMS layer:

Error: [orderBy:notarray] http://errors.angularjs.org/1.8.2/orderBy/notarray\?p0\=%7B%22resource%22%3A%7B%22ref%22%3A%22172%22%2C%22refParent%22%3A%22171%22%2C%22name%22%3A%222%22%2C%22url%22%3A%22https%3A%2F%2Fmaps-cartes.ec.gc.ca%2Farcgis%2Fservices%2FDMS%2FStressCumulatifLittorales%2FMapServer%2FWMSServer%3Frequest%3DGetCapabilities%26service%3DWMS%22%2C%22title%22%3A%22Metadata%20WMS%20layer%22%2C%22abstract%22%3A%22The%20ISO19115%20metadata%20standard%20is%20the%20preferred%20metadata%20standard%20to%20use.%20If%20unsure%20what%20templates%20to%20start%20with%2C%20use%20this%20one.%22%2C%22protocol%22%3A%22OGC%3AWMS%22%7D%7D
    at lib.js?v=65b94734a63ca8491dba95d7439baf1be02c2450:21:168

* Metadata editor / Improve layer configuration init. (#96)

* Metadata editor / Improve layer configuration init.

Related to #7646.

* Metadata editor / Improve layer configuration init.

* Metadata editor / Remove log.

---------

Co-authored-by: François Prunayre <[email protected]>
Follow up of #7591 (comment)

Fix form content when adding 
* a resource maintenance and then User defined maintenance frequency
* or temporal resolution
in ISO19115-3
…eters.

By default injectable parameters are excluded from request parameters. Map is one of those object however it does occur where map objects are supplied as parameters and they should be added to open api spec.  There are currently no cases where a map is injected on purpose into the request parameters.
This will fix issues with missing request parameters documentation which are based on Map objects.
This fixes bug where some apis will not execute correctly from the swagger pager due to the wrong enum value being supplied.
i.e.
visibility should be using enum values PUBLIC/PRIVATE instead of public/private
in formatters/zip api, the format should be SIMPLE/PARTIAL/FULL instead of simple/partial/full
…sources being returned.

Update attachment api
   "Get a metadata resource" should indicate that gets a file resource
   Also "Create a new resource" should identify that it consumes any resources
Update keywords api
   "Download a thesaurus by name" should indicate that gets a file resource
…ceLib / Sonarlint improvements (#7692)

* Remove empty class SourcesLib and deprecated/unused methods in ResourceLib

* Sonalint improvements
Updated-dependencies:
- dependency-name: commons-fileupload:commons-fileupload
  dependency-type: direct:production

---
In GN it is only used in SiteApi class in the services module.
Other occurrences are introduced by openrdf-utils dependency.

---------

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Juan Luis Rodríguez <[email protected]>
…nd configuring-search-fields (#7696)

* Addressing docs translation glitch #7687- fixes adding-static-pages and configuring-search-fields
* Addressing docs translation glitch #7687- fixes creating-custom-editor
* Add a role and feature matrix to the GeoNetwork documentation

* Removed to entries that are no longer available

* Update docs/manual/docs/administrator-guide/managing-users-and-groups/index.md

---------

Co-authored-by: Jose García <[email protected]>
* Remove non required data-translate directive usage in gnMetadataGroupUpdater directive

* Enable preemptive in CSW http requests with credentials. Fixes #5492

Co-authored-by: josegar74 <[email protected]>
Bumps [stCarolas/setup-maven](https://github.com/stcarolas/setup-maven) from 4 to 5.
- [Release notes](https://github.com/stcarolas/setup-maven/releases)
- [Commits](stCarolas/setup-maven@v4...v5)

---
updated-dependencies:
- dependency-name: stCarolas/setup-maven
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* Bump org.json:json from 20140107 to 20240205

Bumps [org.json:json](https://github.com/douglascrockford/JSON-java) from 20140107 to 20240205.
- [Release notes](https://github.com/douglascrockford/JSON-java/releases)
- [Changelog](https://github.com/stleary/JSON-java/blob/master/docs/RELEASES.md)
- [Commits](https://github.com/douglascrockford/JSON-java/commits)

---
updated-dependencies:
- dependency-name: org.json:json
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <[email protected]>

* Add org.json:json to dependency management

Remove the version from common/pom.xml and add the dependency to
dependencyManagement section of root pom.xml.

---------

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Juan Luis Rodríguez <[email protected]>
Removed unused dependency on jslint-maven-plugin from web-ui.
* Vertical extent label modification

* fetching unit from index

- default frontend fallback
- example default value in -3 indexer
* Update to Elasticsearch 8. Use of Elasticsearch Java API Client instead of Java High Level REST Client

* Update to Elasticsearch 8 / WFS indexing draft. (#88)

* Update to Elasticsearch 8 / remove TODOs

* Update Elasticsearch client to version 8.11.3

* Elasticsearch / Update maven plugin.

* Associated record / Store all relations in index / Remove experimental feature, not used. Related to #4912

* Elasticsearch / Update maven plugin configuration. Avoid error like ERROR: Elasticsearch exited unexpectedly, with exit code 143

* Elasticsearch / Update MetadataUtils.getAssociated to retrieve scripted overview field

* Elasticsearch / Update MetadataUtils.getAssociated remove TODO comment

* Elasticsearch / Fix and refactor index readonly health check

* Elasticsearch / Log query error details

* Elasticsearch / Sonarlint improvements

* Elasticsearch / WrapperQuery use base64 encoded JSON string query.

* Elasticsearch / Remove unused commented code from EsSearchManager

* Elasticsearch / More strict Xlink query based on UUID and fix check on hits. A request may return no hits but can be used to check number of hits. In such case we should avoid using hits.hits.size and use hits.total.value to get number of match.

* Elasticsearch / Health check / Fix number of hits info.

* Elasticsearch / Cleaning / No need to retrieve hits to only get matches.

* Elasticsearch / Deprecated field [include] used, expected [includes] instead.

* Elasticsearch / Remove 'Clear XLink cache' from Administration > Tools, clear the Xlink cache automatically before indexing and remove non-implemented code to retrieve metadata with XLink (not required anymore)

* Kibana / Update install instruction

Related to elastic/kibana#82521.

* Elasticsearch / Remove unused imports

* Kibana / Update default dashboards.

* Elasticsearch / Documentation / Update Elasticsearch version

* Elasticsearch / Fix logger module name typo

---------

Co-authored-by: François Prunayre <[email protected]>
fxprunayre and others added 29 commits February 12, 2024 08:37
A number of DCAT related vocabularies are published using OWL format describing a concept schema and concepts.
eg. https://mobilitydcat-ap.github.io/controlled-vocabularies/network-coverage/latest/index.html

```xml
<owl:NamedIndividual rdf:about="https://w3id.org/mobilitydcat-ap/mobility-theme/accesibility-information-for-vehicles">
    <rdf:type rdf:resource="http://www.w3.org/2004/02/skos/core#Concept"/>
    <skos:broader rdf:resource="https://w3id.org/mobilitydcat-ap/mobility-theme/data-content-sub-category"/>
    <skos:broader rdf:resource="https://w3id.org/mobilitydcat-ap/mobility-theme/public-transport-non-scheduled-transport"/>
    <skos:inScheme rdf:resource="https://w3id.org/mobilitydcat-ap/mobility-theme"/>
    <skos:prefLabel xml:lang="en">Accesibility information for vehicles</skos:prefLabel>
</owl:NamedIndividual>

```

Add the possibility to import those files directly by converting them from OWL to SKOS format supported by GeoNetwork.

API changes:
* when using the `stylesheet` parameter of the upload thesaurus operation, restrict the use to known file in
`xslt/services/thesaurus/` folder.

Also some Sonar lint items.

Funded by Wallonia region (SPW)
…in the same group (#7679)

* Create a metadata / Add dynamic and download privileges to the users in the same group

* Update core/src/main/java/org/fao/geonet/kernel/datamanager/base/BaseMetadataOperations.java

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

---------

Co-authored-by: Ian <[email protected]>
Error was Validation Failed: 1: script or doc is missing.

Related to ES8 migration #7599
Remove handlebars.js and use loadsh template instead already included in GN.
* Fix ISO19139 German labels

---------

Co-authored-by: Juan Luis Rodríguez Ponce <[email protected]>
* Fix HTML syntax in users.html. Fix extra quote and remove form-control class from checkbox.
* Fix alignment of checkbox
…XML in order to fix duplicate operation Id

- By having multiple @RequestMapping was causing to create operation id as getRecordAs and getRecordAs_1

Fixed @ApiResponse so that it returns a resource.
And fixed getRecord response for 403 and 404 so that it is only text mime types as it does not make sense to return a zip file on 403 errors.
… for the operation.

This fixes the bug with 2 GET operation on /{portal}/api/sources
Without this fix springdoc would randomly pick between 2 conflicting schemas and this could produce incorrect results in the open api spec.
… in open api spec (#7627)

The reason the response was missing was because MetadataStatusResponse was extending MetadataStatus which contains a bunch of objects that caused issues with spring docs.
This fix removes the extends and moves the required fields into MetadataStatusResponse
… openAPI specification (#7572)

* Removed @RequestHeader for "Accept" headers as it is not supported by openAPI specification.

From the following
    https://github.com/OAI/OpenAPI-Specification/blob/main/versions/3.0.2.md#fixed-fields-10
    If in is "header" and the name field is "Accept", "Content-Type" or "Authorization", the parameter definition SHALL be ignored.

* Update services/src/main/java/org/fao/geonet/api/registries/vocabularies/KeywordsApi.java

Co-authored-by: Jose García <[email protected]>
… This new icon has more visual differences with the lock icon and it's therefore easier for a user to see the difference.
ISO19115-3 adds possibility to provide descriptive results (and not only conformance and quantitative results). Properly index them in order to render them in measure table in record view (#7180)

```xml
<mdb:dataQualityInfo>
      <mdq:DQ_DataQuality>
         <mdq:scope>
            <mcc:MD_Scope>
               <mcc:level>
                  <mcc:MD_ScopeCode codeList="http://standards.iso.org/iso/19115/resources/Codelists/cat/codelists.xml#MD_ScopeCode"
                                    codeListValue="dataset"/>
               </mcc:level>
            </mcc:MD_Scope>
         </mdq:scope>
         <mdq:report>
            <mdq:DQ_QuantitativeAttributeAccuracy>
               <mdq:measure>
                  <mdq:DQ_MeasureReference>
                     <mdq:nameOfMeasure>
                        <gco:CharacterString>Accuracy - overall</gco:CharacterString>
                     </mdq:nameOfMeasure>
                     <mdq:measureDescription>
                        <gco:CharacterString>Assessment of accuracy, linked to a certain Data Set or domain, which is summarising the various components into one single measure.

This metadata element is used to describe the main sources of random and systematic error in the statistical outputs, and provide a summary assessment of all errors with special focus on the impact on key estimates. The bias assessment can be in quantitative or qualitative terms, or both. It should reflect the producer's best current understanding (sign and order of magnitude) including actions taken to reduce bias. Revision aspects should also be included here if considered relevant.</gco:CharacterString>
                     </mdq:measureDescription>
                  </mdq:DQ_MeasureReference>
               </mdq:measure>
               <mdq:result>
                  <mdq:DQ_DescriptiveResult>
                     <mdq:statement>
                        <gco:CharacterString>-text-</gco:CharacterString>
                     </mdq:statement>
                  </mdq:DQ_DescriptiveResult>
               </mdq:result>
               <mdq:result>
                  <mdq:DQ_QuantitativeResult>
                     <mdq:value>
                        <gco:Record>1111</gco:Record>
                     </mdq:value>
                  </mdq:DQ_QuantitativeResult>
               </mdq:result>
            </mdq:DQ_QuantitativeAttributeAccuracy>
         </mdq:report>
      </mdq:DQ_DataQuality>
  </mdb:dataQualityInfo>
```
@juanluisrp juanluisrp merged commit 23aa8c4 into GeoCat:main Feb 22, 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.

10 participants