From 04af77734ef558e38e7e06f701f6f04cbd68556b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 5 Feb 2024 16:00:30 +0100 Subject: [PATCH 1/5] Bump commons-fileupload from 1.3.3 to 1.5 (#6851) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Juan Luis Rodríguez --- core/pom.xml | 4 ---- pom.xml | 2 +- services/pom.xml | 4 ++++ web/pom.xml | 4 ---- 4 files changed, 5 insertions(+), 9 deletions(-) diff --git a/core/pom.xml b/core/pom.xml index 1b010541e3c..36ee42ae577 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -340,10 +340,6 @@ org.apache.xmlgraphics xmlgraphics-commons - - commons-fileupload - commons-fileupload - commons-collections commons-collections diff --git a/pom.xml b/pom.xml index d6699fae764..61e3bcfedf2 100644 --- a/pom.xml +++ b/pom.xml @@ -525,7 +525,7 @@ commons-fileupload commons-fileupload - 1.3.3 + 1.5 commons-collections diff --git a/services/pom.xml b/services/pom.xml index d95e6fa9990..8d749eaf07f 100644 --- a/services/pom.xml +++ b/services/pom.xml @@ -222,6 +222,10 @@ org.apache.commons commons-csv + + commons-fileupload + commons-fileupload + diff --git a/web/pom.xml b/web/pom.xml index c27f820ec45..764ffe4f8b6 100644 --- a/web/pom.xml +++ b/web/pom.xml @@ -227,10 +227,6 @@ org.apache.xmlgraphics xmlgraphics-commons - - commons-fileupload - commons-fileupload - commons-collections commons-collections From 7c5e656d90c2edc7034d860262fb706e88517602 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Juan=20Luis=20Rodri=CC=81guez?= Date: Tue, 6 Feb 2024 13:18:41 +0100 Subject: [PATCH 2/5] Automatic formatting --- .../catalog/components/metadatamanager/EditorService.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/web-ui/src/main/resources/catalog/components/metadatamanager/EditorService.js b/web-ui/src/main/resources/catalog/components/metadatamanager/EditorService.js index 4ff822de1b4..527e6f8b2ae 100644 --- a/web-ui/src/main/resources/catalog/components/metadatamanager/EditorService.js +++ b/web-ui/src/main/resources/catalog/components/metadatamanager/EditorService.js @@ -380,7 +380,9 @@ // and is depending on each schema. If emtpy an empty array is set. var getLayerConfiguration = function () { var configuration = angular.fromJson(getInputValue("layerConfig")) || []; - return Array.isArray(configuration) ? configuration : [configuration.resource]; + return Array.isArray(configuration) + ? configuration + : [configuration.resource]; }; var extent = [], From 9cefa225f229fdcc72ce00c36e7c928282877dad Mon Sep 17 00:00:00 2001 From: Jo Cook Date: Tue, 6 Feb 2024 16:36:13 +0000 Subject: [PATCH 3/5] Addressing docs translation glitch #7687- fixes adding-static-pages and 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 --- .../adding-static-pages.md | 18 +++++++++--------- .../configuring-search-fields.md | 4 ++-- .../editor-ui/creating-custom-editor.md | 16 ++++++++-------- 3 files changed, 19 insertions(+), 19 deletions(-) diff --git a/docs/manual/docs/customizing-application/adding-static-pages.md b/docs/manual/docs/customizing-application/adding-static-pages.md index d1c31a506f7..0d0fd982b9a 100644 --- a/docs/manual/docs/customizing-application/adding-static-pages.md +++ b/docs/manual/docs/customizing-application/adding-static-pages.md @@ -8,13 +8,13 @@ This feature allows to store the HTML content for static pages and show the link - Each page can be in 3 states: - - `EN`: visible to administrator. - - `TE`: visible to logged users. - - `IC`: visible to everyone. + - `HIDDEN`: visible to administrator. + - `PRIVATE`: visible to logged users. + - `PUBLIC`: visible to everyone. -- Pages can be added to different page sections. Currently the sections implemented are `OP` (top menu of the main page) and `ER` (footer of the main page). +- Pages can be added to different page sections. Currently the sections implemented are `TOP` (top menu of the main page) and `FOOTER` (footer of the main page). -- Only the administrator can edit the pages and see the pages in `EN` status. +- Only the administrator can edit the pages and see the pages in `HIDDEN` status. - The creation and the management of the content is done via the API. @@ -80,10 +80,10 @@ curl -X DELETE "http://localhost:8080/geonetwork/srv/api/pages/eng/contactus?for The status of the page can be changed with the method PUT `/api/pages/{language}/{pageId}/{status}` where status could assume these values: -- `IC` - Visible to every user -- `LY` - Visible to not logged users -- `TE` - Visible to logged users -- `EN` - Hidden to anyone +- `PUBLIC` - Visible to every user +- `PUBLIC_ONLY` - Visible to not logged users +- `PRIVATE` - Visible to logged users +- `HIDDEN` - Hidden to anyone Other methods in the API are to change/delete a page and to GET the list of the pages or the info of a specific one. diff --git a/docs/manual/docs/customizing-application/configuring-search-fields.md b/docs/manual/docs/customizing-application/configuring-search-fields.md index c03b2184ba8..266e107b046 100644 --- a/docs/manual/docs/customizing-application/configuring-search-fields.md +++ b/docs/manual/docs/customizing-application/configuring-search-fields.md @@ -195,7 +195,7 @@ curl -X POST "localhost:8080/geonetwork/srv/api/search/records/_search" \ To customize how the field is indexed see `web/src/main/webResources/WEB-INF/data/config/index/records.json`. -To return it in the search response, use the `ce` parameter of the query. See . +To return it in the search response, use the `_source` parameter of the query. See . ## Boosting at search time @@ -248,4 +248,4 @@ By default, the search score is defined as (see `web-ui/src/main/resources/catal ## Language analyzer -By default a `rd` analyzer is used. If the catalog content is english, it may make sense to change the analyzer to `sh`. To customize the analyzer see `web/src/main/webResources/WEB-INF/data/config/index/records.json` +By default a `standard` analyzer is used. If the catalog content is english, it may make sense to change the analyzer to `english`. To customize the analyzer see `web/src/main/webResources/WEB-INF/data/config/index/records.json` diff --git a/docs/manual/docs/customizing-application/editor-ui/creating-custom-editor.md b/docs/manual/docs/customizing-application/editor-ui/creating-custom-editor.md index db72ca078f2..c4e16d8965b 100644 --- a/docs/manual/docs/customizing-application/editor-ui/creating-custom-editor.md +++ b/docs/manual/docs/customizing-application/editor-ui/creating-custom-editor.md @@ -59,7 +59,7 @@ The other option to define a more advanced field type is to catch the element us ## Grouping element from the standards {#creating-custom-editor-fieldsWithFieldset} -List of elements to be displayed in a fieldset (i.e. boxed element). Those elements usually contain children elements and define major sections in the standard. For example, in ISO19139, `on` and `on` are major sections and should usually be displayed as a group of `on`. +List of elements to be displayed in a fieldset (i.e. boxed element). Those elements usually contain children elements and define major sections in the standard. For example, in ISO19139, `identification` and `distribution` are major sections and should usually be displayed as a group of `information`. ``` xml @@ -127,7 +127,7 @@ A view has a label and defines a specific rendering of the metadata records. A v ``` -The view could be displayed or not according to the metadata record content or the current user session using the `rd` and `fo` attributes. +The view could be displayed or not according to the metadata record content or the current user session using the `displayIfRecord` and `displayIfServiceInfo` attributes. Attributes: @@ -334,7 +334,7 @@ e.g. only 2 INSPIRE themes: ## Adding a section to a tab {#creating-custom-editor-section} -A section is a group of fields. If a `me` attribute is provided, then it will create an HTML fieldset which is collapsible. If no `me` attribute is provided, then it will just render the inner elements. For example, if you need a tab without a root fieldset, just create the mandatory section with no name and then the inner elements. +A section is a group of fields. If a `name` attribute is provided, then it will create an HTML fieldset which is collapsible. If no `name` attribute is provided, then it will just render the inner elements. For example, if you need a tab without a root fieldset, just create the mandatory section with no name and then the inner elements. Attributes: @@ -433,13 +433,13 @@ displayIfRecord and displayIfServiceInfo could be combined. An AND operator is u ## Adding a field {#creating-custom-editor-field} -To display a simple element use the `th` attribute to point to the element to display: +To display a simple element use the `xpath` attribute to point to the element to display: ``` xml ``` -To override a field label use the `me` attribute and define that new label in `{schema}/loc/{lang}/strings.xml`: +To override a field label use the `name` attribute and define that new label in `{schema}/loc/{lang}/strings.xml`: ``` xml ``` -`el` attribute can be used in template mode or not. Example to remove `on` while only editing `or` or `ce`. `or` or `ce` are mandatory, but as the `el` element points to the `on` ancestor, there is no mandatory flag displayed and the remove control removes the `on` element. +`del` attribute can be used in template mode or not. Example to remove `spatialResolution` while only editing `denominator` or `distance`. `denominator` or `distance` are mandatory, but as the `del` element points to the `spatialResolution` ancestor, there is no mandatory flag displayed and the remove control removes the `spatialResolution` element. ``` xml Date: Wed, 7 Feb 2024 15:25:57 +0100 Subject: [PATCH 5/5] Enable preemptive for csw requests with credentials (#5497) (#7706) * Remove non required data-translate directive usage in gnMetadataGroupUpdater directive * Enable preemptive in CSW http requests with credentials. Fixes #5492 Co-authored-by: josegar74 --- .../java/org/fao/geonet/csw/common/requests/CatalogRequest.java | 1 + 1 file changed, 1 insertion(+) diff --git a/csw-server/src/main/java/org/fao/geonet/csw/common/requests/CatalogRequest.java b/csw-server/src/main/java/org/fao/geonet/csw/common/requests/CatalogRequest.java index a254a26c3f0..8718d565fa8 100644 --- a/csw-server/src/main/java/org/fao/geonet/csw/common/requests/CatalogRequest.java +++ b/csw-server/src/main/java/org/fao/geonet/csw/common/requests/CatalogRequest.java @@ -186,6 +186,7 @@ public Element execute() throws Exception { public void setCredentials(String username, String password) { client.setCredentials(username, password); + client.setPreemptiveBasicAuth(true); } //---------------------------------------------------------------------------