Static pages / add support for mail links (#8605)

* Static pages / add support for mail links

* Static pages / update documentation page

* Update common/src/main/java/org/fao/geonet/utils/EmailUtil.java

Co-authored-by: Juan Luis Rodríguez Ponce <juanluisrp@gmail.com>

* Update common/src/test/java/org/fao/geonet/utils/EmailUtilTest.java

Co-authored-by: Juan Luis Rodríguez Ponce <juanluisrp@gmail.com>

* Update common/src/test/java/org/fao/geonet/utils/EmailUtilTest.java

---------

Co-authored-by: Juan Luis Rodríguez Ponce <juanluisrp@gmail.com>

Author: josegar74

common/src/main/java/org/fao/geonet/utils/EmailUtil.java

@@ -0,0 +1,43 @@
+//=============================================================================
+//===	Copyright (C) 2001-2025 Food and Agriculture Organization of the
+//===	United Nations (FAO-UN), United Nations World Food Programme (WFP)
+//===	and United Nations Environment Programme (UNEP)
+//===
+//===	This library is free software; you can redistribute it and/or
+//===	modify it under the terms of the GNU Lesser General Public
+//===	License as published by the Free Software Foundation; either
+//===	version 2.1 of the License, or (at your option) any later version.
+//===
+//===	This library is distributed in the hope that it will be useful,
+//===	but WITHOUT ANY WARRANTY; without even the implied warranty of
+//===	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//===	Lesser General Public License for more details.
+//===
+//===	You should have received a copy of the GNU Lesser General Public
+//===	License along with this library; if not, write to the Free Software
+//===	Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+//===
+//===	Contact: Jeroen Ticheler - FAO - Viale delle Terme di Caracalla 2,
+//===	Rome - Italy. email: geonetwork@osgeo.org
+//==============================================================================
+
+package org.fao.geonet.utils;
+
+public class EmailUtil {
+    private static final String OWASP_EMAIL_REGEX = "^[a-zA-Z0-9_+&*-]+(?:\\.[a-zA-Z0-9_+&*-]+)*@(?:[a-zA-Z0-9-]+\\.)+[a-zA-Z]{2,}$";
+    private static final java.util.regex.Pattern OWASP_EMAIL_PATTERN = java.util.regex.Pattern.compile(OWASP_EMAIL_REGEX);
+
+    private EmailUtil() {
+        throw new UnsupportedOperationException();
+    }
+
+    /**
+     * Checks if a string contains a valid email address format.
+     *
+     * @param emailAddress Value to validate.
+     * @return  true if the value contains a valid email address format, otherwise false.
+     */
+    public static boolean isValidEmailAddress(String emailAddress) {
+        return OWASP_EMAIL_PATTERN.matcher(emailAddress).matches();
+    }
+}

common/src/test/java/org/fao/geonet/utils/EmailUtilTest.java

@@ -0,0 +1,45 @@
+//=============================================================================
+//===	Copyright (C) 2001-2025 Food and Agriculture Organization of the
+//===	United Nations (FAO-UN), United Nations World Food Programme (WFP)
+//===	and United Nations Environment Programme (UNEP)
+//===
+//===	This library is free software; you can redistribute it and/or
+//===	modify it under the terms of the GNU Lesser General Public
+//===	License as published by the Free Software Foundation; either
+//===	version 2.1 of the License, or (at your option) any later version.
+//===
+//===	This library is distributed in the hope that it will be useful,
+//===	but WITHOUT ANY WARRANTY; without even the implied warranty of
+//===	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//===	Lesser General Public License for more details.
+//===
+//===	You should have received a copy of the GNU Lesser General Public
+//===	License along with this library; if not, write to the Free Software
+//===	Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+//===
+//===	Contact: Jeroen Ticheler - FAO - Viale delle Terme di Caracalla 2,
+//===	Rome - Italy. email: geonetwork@osgeo.org
+//==============================================================================
+
+package org.fao.geonet.utils;
+
+import org.junit.Test;
+
+import static org.junit.Assert.assertEquals;
+
+public class EmailUtilTest {
+    @Test
+    public void testEmailAddress() {
+        assertEquals(true, EmailUtil.isValidEmailAddress("test@domain.com"));
+
+        assertEquals(true, EmailUtil.isValidEmailAddress("test@example.international"));
+        
+        assertEquals(true, EmailUtil.isValidEmailAddress("test.user@domain.com"));
+
+        assertEquals(true, EmailUtil.isValidEmailAddress("test.user@domain.subdomain.com"));
+
+        assertEquals(false, EmailUtil.isValidEmailAddress("test.user"));
+
+        assertEquals(false, EmailUtil.isValidEmailAddress("test.user@domain"));
+    }
+}

docs/manual/docs/customizing-application/adding-static-pages.md

@@ -1,95 +1,55 @@
 # Adding static pages
 
-This feature allows to store the HTML content for static pages and show the links to these pages in specific sections of the user interface:
+This function allows storing the HTML content of static pages and displaying links to these pages in specific sections of the user interface. 
 
--   The HTML content is stored in a new table of the GN's database.
+To add new static pages go to **Admin Console** -->  **Settings** -->  **Static Pages** and select the **+ New Static Page** option, providing the following information:
 
--   The link to pages can be showed in different points of the GN's GUI according to a list of "sections" associated to each page. In this PR is introduced the support to show the links for the top toolbar and the footer.
+- **Language**: User interface language in which the static page will be displayed.
+- **Page identifier**: A unique text identifier for the page.
+- **Page label**: Label to display on the link.
+- **Page icon**: (Optional) Icon to display next to the link label.
+- **Format**: Format of the static page:
 
--   Each page can be in 3 states:
+    - **Web link**: Link to a web page.
+    - **HTML content displayed embedded in the app**
+    - **HTML content displayed in a new browser tab**
+    - **Plain text content**
+    - **Email link**: Email address. Opens the system's mail client to send mail to the configured address.
 
-    -   `HIDDEN`: visible to administrator.
-    -   `PRIVATE`: visible to logged users.
-    -   `PUBLIC`: visible to everyone.
+- **Link**: Available for **Web link** / **Email link** formats.
 
--   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).
+    - For **Web link** the link to a web page.
+    - For **Email link**, the email address to which the email will be sent.
 
--   Only the administrator can edit the pages and see the pages in `HIDDEN` status.
+- **Page content file**: For formats other than **Web link** or **Email link**, allows uploading a file with the HTML content / text to be displayed.
 
--   The creation and the management of the content is done via the API.
+- **Page content**: For formats other than **Web link** or **Email link**, allows editing the HTML / text content to display.
 
-    ![](img/pages-api.png)
+- **Page section**: Section of the page to display the link. Currently implemented sections are `TOP` (top menu of the main page) and `FOOTER` (footer of the main page).
 
-Some restrictions:
-
--   It is not possible to apply custom CSS to the page.
--   Any external image must be loaded externally.
-
-## Examples of API usage
-
-Before executing the following examples, see [Example of CSRF call using curl](misc.md#example-csrf-curl) for details on the usage of the CSRF token (instead of the value `"X-XSRF-TOKEN: e934f557-17a3-47f2-8e6b-bdf1a3c90a97"` used in the examples) and cookies in the requests.
-
-### Load a page in the top menu bar
-
-In this example we're going to upload a file ``contactus.html`` and link it in the top menu:
-
-1.  Load the content by using the method POST `/api/pages/`, the mandatory fields are:
-
-    -   language (3 letters like 'eng', 'ita', 'fra' \...)
-    -   pageId (the identifier/link description of the page)
-    -   format (must be LINK if a link is associated to the page)
-    -   the content: data (a file with the page content) or a link (URL to another page). Define both is not possible.
-
-    ``` bash
-    $ curl -X POST "http://localhost:8080/geonetwork/srv/api/pages/?language=eng&pageId=contactus&format=HTML" -H "accept: */*" -H "Content-Type: multipart/form-data" -H "X-XSRF-TOKEN: e934f557-17a3-47f2-8e6b-bdf1a3c90a97" -d contactus.html
-    ```
-
-    At this point the page is created but not visible because is in status HIDDEN and is not loaded explicitly in any section of the page, except DRAFT that is not visible (in the future could be added to a page with an editor interface). Similar requests should be done for each UI language supported.
-
-2.  To associate the link to the top bar is necessary to use the method POST `/api/pages/{language}/{pageId}/{section}` with the `TOP` value for the section.
+- **Status**: Defines which users can see the link.
 
-    ``` bash
-    $ curl -X POST "http://localhost:8080/geonetwork/srv/api/pages/eng/contactus/TOP" -H "accept: */*" -H "X-XSRF-TOKEN: 7cfa1a0d-3335-4846-8061-a5bf176687b5"  --user admin:admin -b /tmp/cookie
-    ```
+    - **Visible only to the administrator**
+    - **Visible to logged users**
+    - **Visible to users belonging to groups**
+    - **Visible to every one**
 
-### Load a link in the footer bar
+  ![](img/add-static-page.png)
 
-In this example we're going to add a link to an external resource <http://myorganisation/contactus.html> and link it in the footer:
 
-1.  Add the link by using the method POST `/api/pages/` with the `link` parameter in the request:
+  ![](img/static-page-footer.png)
 
-    ``` bash
-    $ curl -X POST "http://localhost:8080/geonetwork/srv/api/pages/?language=eng&pageId=contactus&format=LINK&link=http://myorganisation/contactus.html" -H "accept: */*" -H "X-XSRF-TOKEN: e934f557-17a3-47f2-8e6b-bdf1a3c90a97"
-    ```
 
-2.  To associate the link to the footer is necessary to use the method POST `/api/pages/{language}/{pageId}/{section}` with the `FOOTER` value for the section.
-
-    ``` bash
-    $ curl -X POST "http://localhost:8080/geonetwork/srv/api/pages/eng/contactus/FOOTER" -H "accept: */*" -H "X-XSRF-TOKEN: 7cfa1a0d-3335-4846-8061-a5bf176687b5"  --user admin:admin -b /tmp/cookie
-    ```
-
-### Remove a page from a section
-
-To remove a page from a section DELETE `/api/pages/{language}/{pageId}/{section}`
-
-``` bash
-curl -X DELETE "http://localhost:8080/geonetwork/srv/api/pages/eng/contactus?format=LINK" -H "accept: */*" -H "X-XSRF-TOKEN: 7cfa1a0d-3335-4846-8061-a5bf176687b5"  --user admin:admin -b /tmp/cookie
-```
-
-### Change the page status
-
-The status of the page can be changed with the method PUT `/api/pages/{language}/{pageId}/{status}` where status could assume these values:
+Some restrictions:
 
--   `PUBLIC` - Visible to every user
--   `PUBLIC_ONLY` - Visible to not logged users
--   `PRIVATE` - Visible to logged users
--   `HIDDEN` - Hidden to anyone
+-   It is not possible to apply custom CSS to the page.
+-   Any external image must be loaded externally.
 
-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.
+## Change the menu order in the top toolbar
 
-### Change the menu order in the top toolbar
+In the top bar, pages can be inserted between the default menu of the catalogue. This can be configured in **Admin Console** -->  **Settings** -->  **User interface**, in the **Header custom menu items** section.
 
-Pages can be inserted in between catalogue default menu which are:
+By default, the order of the items in the top bar is as follows:
 
 ``` json
 ["gn-site-name-menu",
@@ -100,7 +60,7 @@ Pages can be inserted in between catalogue default menu which are:
  "gn-admin-menu"]
 ```
 
-Insert a page as a simple menu using its id or as a submenu using an object:
+Insert a page as a simple menu using the page identifier or as a submenu using an object:
 
 ``` json
 ["gn-site-name-menu",
@@ -115,3 +75,8 @@ Insert a page as a simple menu using its id or as a submenu using an object:
  "gn-admin-menu",
  "documentation"]
 ```
+
+## Change the static pages order in the footer
+
+The order of the footer pages can be configured in **Admin Console** -->  **Settings** -->  **User interface**, in the **Footer custom menu items** section.
+

docs/manual/docs/customizing-application/img/add-static-page.png

@@ -90,7 +90,7 @@ public enum PageStatus {
     }
 
     public enum PageFormat {
-        LINK, HTML, HTMLPAGE, TEXT;
+        LINK, HTML, HTMLPAGE, TEXT, EMAILLINK;
     }
 
     // These are the sections where is shown the link to the Page object

docs/manual/docs/customizing-application/img/pages-api.png

@@ -45,6 +45,7 @@
 import org.fao.geonet.repository.UserGroupRepository;
 import org.fao.geonet.repository.page.PageRepository;
 import org.fao.geonet.repository.specification.UserGroupSpecs;
+import org.fao.geonet.utils.EmailUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
@@ -58,6 +59,7 @@
 
 import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpSession;
+import javax.validation.constraints.Email;
 import javax.validation.constraints.NotNull;
 import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
@@ -178,7 +180,11 @@ private ResponseEntity<String> createPage(PageProperties pageProperties,
         }
 
         if (!StringUtils.isBlank(link)) {
-            format = Page.PageFormat.LINK;
+            if (EmailUtil.isValidEmailAddress(link)) {
+                format = Page.PageFormat.EMAILLINK;
+            } else {
+                format = Page.PageFormat.LINK;
+            }
         }
 
         checkMandatoryContent(data, link, content);
@@ -499,8 +505,8 @@ public Page.PageStatus[] getPageStatus() {
     }
 
     private void checkCorrectFormat(final MultipartFile data, final Page.PageFormat format) {
-        if (Page.PageFormat.LINK.equals(format) && data != null && !data.isEmpty()) {
-            throw new IllegalArgumentException("Wrong format. Cannot set format to LINK and upload a file.");
+        if ((Page.PageFormat.LINK.equals(format) || Page.PageFormat.EMAILLINK.equals(format)) && data != null && !data.isEmpty()) {
+            throw new IllegalArgumentException("Wrong format. Cannot set format to LINK or EMAILLINK and upload a file.");
         }
     }
 
@@ -619,15 +625,24 @@ private void fillContent(final MultipartFile data,
             page.setData(content.getBytes());
         } else if (page.getData() == null) {
             // Check the link, unless it refers to a file uploaded to the page, that contains the original file name.
-            if (StringUtils.isNotBlank(link) && !UrlUtils.isValidRedirectUrl(link)) {
-                throw new IllegalArgumentException("The link provided is not valid");
-            } else {
-                page.setLink(link);
+            // The link should be a valid URL or mailto address
+            if (page.getFormat() == Page.PageFormat.LINK) {
+                if (StringUtils.isNotBlank(link) && !UrlUtils.isValidRedirectUrl(link)) {
+                    throw new IllegalArgumentException("The link provided is not valid");
+                } else {
+                    page.setLink(link);
+                }
+            } else if (page.getFormat() == Page.PageFormat.EMAILLINK) {
+                if (StringUtils.isNotBlank(link) && !EmailUtil.isValidEmailAddress(link)) {
+                    throw new IllegalArgumentException("The link provided is not valid");
+                } else {
+                    page.setLink(link);
+                }
             }
         }
-
     }
 
+
     /**
      * Check is the user is in designated group to access the static page when page permission level is set to GROUP
      * @param us Current User Session

docs/manual/docs/customizing-application/img/static-page-footer.png

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2001-2024 Food and Agriculture Organization of the
+ * Copyright (C) 2001-2025 Food and Agriculture Organization of the
  * United Nations (FAO-UN), United Nations World Food Programme (WFP)
  * and United Nations Environment Programme (UNEP)
  *
@@ -27,6 +27,7 @@
 import org.fao.geonet.api.users.model.UserRegisterDto;
 import org.fao.geonet.constants.Params;
 import org.fao.geonet.repository.UserRepository;
+import org.fao.geonet.utils.EmailUtil;
 import org.springframework.util.StringUtils;
 import org.springframework.validation.Errors;
 import org.springframework.validation.ValidationUtils;
@@ -37,8 +38,6 @@
  *
  */
 public class UserRegisterDtoValidator implements Validator {
-    private static final String OWASP_EMAIL_REGEX = "^[a-zA-Z0-9_+&*-]+(?:\\.[a-zA-Z0-9_+&*-]+)*@(?:[a-zA-Z0-9-]+\\.)+[a-zA-Z]{2,7}$";
-    private static final java.util.regex.Pattern OWASP_EMAIL_PATTERN = java.util.regex.Pattern.compile(OWASP_EMAIL_REGEX);
 
     @Override
     public boolean supports(Class<?> clazz) {
@@ -55,7 +54,7 @@ public void validate(Object target, Errors errors) {
         ValidationUtils.rejectIfEmptyOrWhitespace(errors, "email", "field.required", Params.EMAIL
             + " is required");
 
-        if (StringUtils.hasLength(userRegisterDto.getEmail()) && !OWASP_EMAIL_PATTERN.matcher(userRegisterDto.getEmail()).matches()) {
+        if (StringUtils.hasLength(userRegisterDto.getEmail()) && !EmailUtil.isValidEmailAddress(userRegisterDto.getEmail())) {
             errors.rejectValue("email", "field.notvalid", "Email address is not valid");
         }
 

domain/src/main/java/org/fao/geonet/domain/page/Page.java

@@ -153,7 +153,13 @@
                   $scope.page = $scope.pagesMenu[0];
                   $scope.isSubmenu = $scope.page.type === "submenu";
                   $scope.isExternalLink =
-                    $scope.page.format == "LINK" || $scope.page.format == "HTMLPAGE";
+                    $scope.page.format === "LINK" ||
+                    $scope.page.format === "EMAILLINK" ||
+                    $scope.page.format === "HTMLPAGE";
+
+                  if ($scope.page.format === "EMAILLINK") {
+                    $scope.page.link = "mailto:" + $scope.page.link;
+                  }
                 }
               },
               function (response) {