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

Translated the index warnings / errors / Align with main #3

Conversation

fxprunayre
Copy link

Align with main and update to Elastic 8 (geonetwork#7599)

@joachimnielandt can you double check if fine and then I can merge upstream.

wangf1122 and others added 30 commits January 10, 2024 15:02
* Service context null pointer

* Service context null pointer for JCloud and S3
* Fix duplicate API endpoint
There were GET 2 apis with the end point /feeds.
One was renamed to /feedsAsHtml

* Based on feedback.  Removed /feedsAsHtml endpoint and now check Accept header when calling /feeds to determine if XML or HTML should be returned.
…geonetwork#7601)

* Changed http to https for urls that appear in open api specification.
Also fixed some minor formatting.


Co-authored-by: Jose García <[email protected]>
…earch query (geonetwork#7529)

CSW GetRecords doesn't escape query values when creating the Elasticsearch query / Escape Elasticsearch special chars in EQUAL / NOT EQUAL / IS LIKE literal queries

Fixes geonetwork#7527.
---------

Co-authored-by: Juan Luis Rodríguez <[email protected]>
* Fix SpringDoc duplicate OperationId
OperationId are generally created based on the function name.  In some cases multiple function names were the same and this was causing OperationId conflicts which was causing one to be called functionName and the other to be called functionName_1.  By simply renaming the function names, it resolves the duplicate OperationId

* Update services/src/main/java/org/fao/geonet/api/records/MetadataSharingApi.java

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

---------

Co-authored-by: Jose García <[email protected]>
…eonetwork#7594)

* Add missing @ApiResponse status for successful api search response.
Otherwise OpenAPI spec was missing response which caused issues when using codegen.

Fixed body parameters and removed httpEntity.getBody()
Also added example value for body.

* Remove @Schema from request body as maps object will be corrected in PR geonetwork#7611

* Revert request body back to string.
The insert api only accepts XML so remove others.
This will remove application/json as the default which causes issues with codegen.
…k#7619)

* schemas now uses `SNAPSHOTS`, no longer to manage schemas `3.8` explicitly.
* Remember to include `-Drelease` flag so that all modules (even optional modules) are compiled and tested during QA.
* Troubleshoot release module order of execution and profile activation and handling of jetty folder.
* Web profile with-doc profile needs dependency to build docs first.
---------

Signed-off-by: Jody Garnett <[email protected]>
Sonarcloud analyzer now requires at least Java 17.
Bumps [actions/setup-java](https://github.com/actions/setup-java) from 3.12.0 to 4.0.0.
- [Release notes](https://github.com/actions/setup-java/releases)
- [Commits](actions/setup-java@v3.12.0...v4.0.0)

---
updated-dependencies:
- dependency-name: actions/setup-java
  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>
* Remove the custom grid styles, the latest version of Material for MkDocs has this as a default option.

The minimum version for Material for MkDocs is 9.5, this is added in the `requirements.txt`
Minor text edits
…me (geonetwork#7457)

* unpack iso19139 sample data, create mef file at build time

Signed-off-by: Jody Garnett <[email protected]>

* unpack iso19155-3.2018 sample data, create mef file at build time

Signed-off-by: Jody Garnett <[email protected]>

* unpack dublin-core sample data, create mef file at build time

Signed-off-by: Jody Garnett <[email protected]>

---------

Signed-off-by: Jody Garnett <[email protected]>
…twork#7412)

* move changes to their own folder

Signed-off-by: Jody Garnett <[email protected]>

* update doing a release for doc updates prior to tagging release

# Conflicts:
#	docs/manual/docs/contributing/doing-a-release.md

* automation used to deploy manual, manual deploy during release not longer required

* changelog management using git notes to document major features

* housekeeping: clean up commented out pom.xml snippet

Signed-off-by: Jody Garnett <[email protected]>

* update docs/README.md description to reflect contents

Signed-off-by: Jody Garnett <[email protected]>

* gitIgnore WEB-INF schemapublication folder

Signed-off-by: Jody Garnett <[email protected]>

* Change to 4.4.1 release example

* Update build procedure to deploy datastorages

Signed-off-by: Jody Garnett <[email protected]>

---------

Signed-off-by: Jody Garnett <[email protected]>
Bumps [actions/cache](https://github.com/actions/cache) from 3 to 4.
- [Release notes](https://github.com/actions/cache/releases)
- [Changelog](https://github.com/actions/cache/blob/main/RELEASES.md)
- [Commits](actions/cache@v3...v4)

---
updated-dependencies:
- dependency-name: actions/cache
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <[email protected]>
The column is added automatically by Hibernate when GeoNetwork starts. Removing it
from the SQL because it makes the process to fail with
```
Duplicate column name "ICON"; SQL statement:
 ALTER TABLE public.spg_page ADD icon varchar NUL [42121-212]
```

Related to geonetwork#7536.
Fix some incorrect comments
Remove class prefix as it was not required.
Added missing license.
These services aren't available anymore. This commit remove the implementing classes from GeoNetwork source code.
Services removed:

* `profiles.Get`
* `util.ping`
* `RegExpReplace`
* `db.select`
* `http.Get`
* `session.Put`
* Upgrade guidance for geonetwork 3 users

- Includes mitigation guidance for removed serivces
- housekeeping: Address mkdocs warnings with due to changing emoji library
- change maven build to use --strict flag to prevent mkdoc regressions

Signed-off-by: Jody Garnett <[email protected]>

* Update docs/manual/docs/maintainer-guide/updating/index.md

* Update docs/manual/docs/maintainer-guide/updating/index.md

* Update docs/manual/docs/maintainer-guide/updating/index.md

* Update docs/manual/docs/maintainer-guide/updating/index.md

* Update docs/manual/docs/maintainer-guide/updating/index.md

* Update doc typos

---------

Signed-off-by: Jody Garnett <[email protected]>
Co-authored-by: Jose García <[email protected]>
dependabot bot and others added 27 commits February 8, 2024 10:55
* 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. (geonetwork#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 geonetwork#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]>
Updated summary and description to differentiate these two end points.
…ork#7722)

* Documentation / Elasticsearch query endpoint - query samples

* Add step by step instructions for running eamples

* Update docs/manual/docs/api/search.md

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

* Update docs/manual/docs/api/search.md

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

* Update docs/manual/docs/api/search.md

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

---------

Co-authored-by: Jody Garnett <[email protected]>
Co-authored-by: François Prunayre <[email protected]>
…figuration (geonetwork#7702)

* Standard / ISO19115-3 / Editor configuration / Add support for custom label on date field

Add support to label override for `cit:date` element:

eg.
```xml
<field xpath="/mdb:MD_Metadata/mdb:identificationInfo/*/mri:citation/*/cit:date"
                 or="date"
                 in="/mdb:MD_Metadata/mdb:identificationInfo/*/mri:citation/*"
                 name="Date de la donnée"/>
```

* Standard / ISO19115-3 / Handle setting to hide time in calendar

Was only supported in ISO19139
geonetwork#7700)

* Standard / ISO19115-3 / Improve french translation for temporal extent

* Update codelists.xml
Make sure it is clear to report a vulnerability directly through Github.
This can facilitate customization of the style of the editor.

Previously only the tab identifier was provided making more difficult to define global editor styles common for all tabs and was not providing simple way to customize the side panel.
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 (geonetwork#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]>
…ersion-4.0.2 and tutorials/deployment/index
…tievlaanderen/metadata-geonetwork into Informatievlaanderen-feature/translate-index-errormsg
@joachimnielandt
Copy link
Collaborator

Align with main and update to Elastic 8 (geonetwork#7599)

@joachimnielandt can you double check if fine and then I can merge upstream.

@fxprunayre as far as I could test, this seems to behave as expected:

  • running on elasticsearch 8.11.3 (going off the version mentioned in the ES8 PR)
  • starting from a clean database based on your branch
  • imported dataset, modified a temporal extent to be "upper < lower"
  • the expected and translated indexingErrorMsg pops up

@joachimnielandt joachimnielandt merged commit c366fde into Informatievlaanderen:feature/translate-index-errormsg Feb 16, 2024
3 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

10 participants